From f5a7bd8201d2dcfd342fd68da70528920fb7b571 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Fri, 30 Apr 2021 23:55:18 -0400 Subject: [PATCH 0001/1858] New port sleepy-discord --- ports/sleepy-discord/portfile.cmake | 24 ++++++++++++++++++++++ ports/sleepy-discord/vcpkg.json | 32 +++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 ports/sleepy-discord/portfile.cmake create mode 100644 ports/sleepy-discord/vcpkg.json diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake new file mode 100644 index 00000000000000..dcc7f40dd2e7da --- /dev/null +++ b/ports/sleepy-discord/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "websocketpp" USE_WEBSOCKETPP + "websocketpp" USE_BOOST_ASIO + "cpr" USE_CPR + "voice" ENABLE_VOICE +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yourWaifu/sleepy-discord + REF 2cc4f007e6282b6a8fb6d83a400332976606e3e7 + SHA512 6c0d353bb42f4f347e07ca0eca2741def4a79a2af702cf6c45833c7a4ef08ef21597ffb79d622de0747e90a1db24e75962575a6a72701909f9923258371ec78a + HEAD_REF develop +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -DSLEEPY_VCPKG=ON -DAUTO_DOWNLOAD_LIBRARY=OFF ${FEATURE_OPTIONS} + PREFER_NINJA +) +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json new file mode 100644 index 00000000000000..296cdaf4064411 --- /dev/null +++ b/ports/sleepy-discord/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "sleepy-discord", + "version-string": "2021_04_30", + "description": "C++ library for the Discord chat client", + "homepage": "https://github.com/yourWaifu/sleepy-discord", + "features": { + "websocketpp": { + "description": "Use Websocketpp for handling WebSockets", + "dependencies": [ + "websocketpp", + "boost-random" + ] + }, + "cpr": { + "description": "Use CPR library for handling HTTPS", + "dependencies": [ + "cpr" + ] + }, + "voice": { + "description": "Voice Chat support", + "dependencies": [ + "opus", + "libsodium" + ] + } + }, + "default-features": [ + "websocketpp", + "cpr" + ] +} \ No newline at end of file From 46671add3bb83951cb2bfa782585352c0f0832d2 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 1 May 2021 00:07:21 -0400 Subject: [PATCH 0002/1858] Add versions for Sleepy Discord --- versions/baseline.json | 4 ++++ versions/s-/sleepy-discord.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/s-/sleepy-discord.json diff --git a/versions/baseline.json b/versions/baseline.json index 1f18cd12869d70..256018f6d63724 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5628,6 +5628,10 @@ "baseline": "1.13.0", "port-version": 0 }, + "sleepy-discord": { + "baseline": "2021_04_30", + "port-version": 0 + }, "slikenet": { "baseline": "2019-10-22-2", "port-version": 0 diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json new file mode 100644 index 00000000000000..e602c7c22af533 --- /dev/null +++ b/versions/s-/sleepy-discord.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ff79402a3ad874126583532c306f1744df678833", + "version-string": "2021_04_30", + "port-version": 0 + } + ] +} From e5010b0cbca9ee49829aca28d8e2714b01242dab Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 1 May 2021 00:43:23 -0400 Subject: [PATCH 0003/1858] SleepyDiscord: use website as homepage --- ports/sleepy-discord/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 296cdaf4064411..5d0e983a607019 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -2,7 +2,7 @@ "name": "sleepy-discord", "version-string": "2021_04_30", "description": "C++ library for the Discord chat client", - "homepage": "https://github.com/yourWaifu/sleepy-discord", + "homepage": "https://yourwaifu.dev/sleepy-discord/", "features": { "websocketpp": { "description": "Use Websocketpp for handling WebSockets", From 77f8f7e598261c2dd7978eb658f9ad520e3a03db Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 1 May 2021 04:30:18 -0400 Subject: [PATCH 0004/1858] SleepyDiscord: Remove No newline at end git diff --- ports/sleepy-discord/portfile.cmake | 48 +++++++++++----------- ports/sleepy-discord/vcpkg.json | 64 ++++++++++++++--------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index dcc7f40dd2e7da..12c2fc11b7b2de 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -1,24 +1,24 @@ -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "websocketpp" USE_WEBSOCKETPP - "websocketpp" USE_BOOST_ASIO - "cpr" USE_CPR - "voice" ENABLE_VOICE -) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO yourWaifu/sleepy-discord - REF 2cc4f007e6282b6a8fb6d83a400332976606e3e7 - SHA512 6c0d353bb42f4f347e07ca0eca2741def4a79a2af702cf6c45833c7a4ef08ef21597ffb79d622de0747e90a1db24e75962575a6a72701909f9923258371ec78a - HEAD_REF develop -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DSLEEPY_VCPKG=ON -DAUTO_DOWNLOAD_LIBRARY=OFF ${FEATURE_OPTIONS} - PREFER_NINJA -) -vcpkg_install_cmake() - -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "websocketpp" USE_WEBSOCKETPP + "websocketpp" USE_BOOST_ASIO + "cpr" USE_CPR + "voice" ENABLE_VOICE +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO yourWaifu/sleepy-discord + REF 2cc4f007e6282b6a8fb6d83a400332976606e3e7 + SHA512 6c0d353bb42f4f347e07ca0eca2741def4a79a2af702cf6c45833c7a4ef08ef21597ffb79d622de0747e90a1db24e75962575a6a72701909f9923258371ec78a + HEAD_REF develop +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -DSLEEPY_VCPKG=ON -DAUTO_DOWNLOAD_LIBRARY=OFF ${FEATURE_OPTIONS} + PREFER_NINJA +) +vcpkg_install_cmake() + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 5d0e983a607019..160a171430d5ab 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,32 +1,32 @@ -{ - "name": "sleepy-discord", - "version-string": "2021_04_30", - "description": "C++ library for the Discord chat client", - "homepage": "https://yourwaifu.dev/sleepy-discord/", - "features": { - "websocketpp": { - "description": "Use Websocketpp for handling WebSockets", - "dependencies": [ - "websocketpp", - "boost-random" - ] - }, - "cpr": { - "description": "Use CPR library for handling HTTPS", - "dependencies": [ - "cpr" - ] - }, - "voice": { - "description": "Voice Chat support", - "dependencies": [ - "opus", - "libsodium" - ] - } - }, - "default-features": [ - "websocketpp", - "cpr" - ] -} \ No newline at end of file +{ + "name": "sleepy-discord", + "version-string": "2021_04_30", + "description": "C++ library for the Discord chat client", + "homepage": "https://yourwaifu.dev/sleepy-discord/", + "features": { + "websocketpp": { + "description": "Use Websocketpp for handling WebSockets", + "dependencies": [ + "websocketpp", + "boost-random" + ] + }, + "cpr": { + "description": "Use CPR library for handling HTTPS", + "dependencies": [ + "cpr" + ] + }, + "voice": { + "description": "Voice Chat support", + "dependencies": [ + "opus", + "libsodium" + ] + } + }, + "default-features": [ + "websocketpp", + "cpr" + ] +} From 03237cd5185c6e6538c2587dce7d935614437b7f Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 1 May 2021 15:33:30 -0400 Subject: [PATCH 0005/1858] SleepyDiscord: format manifest --- ports/sleepy-discord/vcpkg.json | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 160a171430d5ab..0a554b59e8a712 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,32 +1,32 @@ { - "name": "sleepy-discord", - "version-string": "2021_04_30", - "description": "C++ library for the Discord chat client", - "homepage": "https://yourwaifu.dev/sleepy-discord/", - "features": { - "websocketpp": { - "description": "Use Websocketpp for handling WebSockets", - "dependencies": [ - "websocketpp", - "boost-random" - ] - }, - "cpr": { - "description": "Use CPR library for handling HTTPS", - "dependencies": [ - "cpr" - ] - }, - "voice": { - "description": "Voice Chat support", - "dependencies": [ - "opus", - "libsodium" - ] - } - }, - "default-features": [ - "websocketpp", + "name": "sleepy-discord", + "version-string": "2021_04_30", + "description": "C++ library for the Discord chat client", + "homepage": "https://yourwaifu.dev/sleepy-discord/", + "default-features": [ + "cpr", + "websocketpp" + ], + "features": { + "cpr": { + "description": "Use CPR library for handling HTTPS", + "dependencies": [ "cpr" - ] + ] + }, + "voice": { + "description": "Voice Chat support", + "dependencies": [ + "libsodium", + "opus" + ] + }, + "websocketpp": { + "description": "Use Websocketpp for handling WebSockets", + "dependencies": [ + "boost-random", + "websocketpp" + ] + } + } } From d638d8e18c6007dc02fa26bf21e00dd9ada2b9be Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 1 May 2021 23:17:34 -0400 Subject: [PATCH 0006/1858] SleepyDiscord: rerun x-add-version --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index e602c7c22af533..d5f327ee832020 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ff79402a3ad874126583532c306f1744df678833", + "git-tree": "14e387f629dc0fa6e036940f902e16eeedf1daed", "version-string": "2021_04_30", "port-version": 0 } From 4bb8300825c8b7bc141485ba534a0f355f979d27 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sun, 2 May 2021 01:04:48 -0400 Subject: [PATCH 0007/1858] SleepyDiscord: add compression feature --- ports/sleepy-discord/portfile.cmake | 5 +++-- ports/sleepy-discord/vcpkg.json | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index 12c2fc11b7b2de..97fb6bc5b83ede 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -4,13 +4,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "websocketpp" USE_BOOST_ASIO "cpr" USE_CPR "voice" ENABLE_VOICE + "compression" USE_ZLIB ) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yourWaifu/sleepy-discord - REF 2cc4f007e6282b6a8fb6d83a400332976606e3e7 - SHA512 6c0d353bb42f4f347e07ca0eca2741def4a79a2af702cf6c45833c7a4ef08ef21597ffb79d622de0747e90a1db24e75962575a6a72701909f9923258371ec78a + REF adc4551d835d0b73c631207278d0a2a9038a79a4 + SHA512 d0869f690fde66e2d28cb8de4ede964650c2fbd1fbcc8d3db08671e28ae7b814df79c108abdcc2f4aab4146f4f4a37c17b75f22487ccc9d5607c0c665db94c34 HEAD_REF develop ) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 0a554b59e8a712..8c2332f9da1123 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -8,6 +8,12 @@ "websocketpp" ], "features": { + "compression": { + "description": "Allow compression for Websockets connection", + "dependencies": [ + "zlib" + ] + }, "cpr": { "description": "Use CPR library for handling HTTPS", "dependencies": [ From f7edd5e7293020a667fddcd1c168977b3cd0d544 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sun, 2 May 2021 06:34:32 -0400 Subject: [PATCH 0008/1858] SleepyDiscord: Update version string --- ports/sleepy-discord/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sleepy-discord.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 8c2332f9da1123..9f249917f0a35a 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sleepy-discord", - "version-string": "2021_04_30", + "version-string": "2021_05_02", "description": "C++ library for the Discord chat client", "homepage": "https://yourwaifu.dev/sleepy-discord/", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 256018f6d63724..cbad0ccdc123bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5629,7 +5629,7 @@ "port-version": 0 }, "sleepy-discord": { - "baseline": "2021_04_30", + "baseline": "2021_05_02", "port-version": 0 }, "slikenet": { diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index d5f327ee832020..42ec0b14a3fe78 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "14e387f629dc0fa6e036940f902e16eeedf1daed", - "version-string": "2021_04_30", + "git-tree": "26cedfa7215780016eb054e6e9342b53e5fd6180", + "version-string": "2021_05_02", "port-version": 0 } ] From 3d01760e570f09e314c6714ac7e6d40865278887 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sun, 2 May 2021 06:46:41 -0400 Subject: [PATCH 0009/1858] SleepyDiscord: rerun x-add-version again --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 42ec0b14a3fe78..fc1b403ab26676 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "26cedfa7215780016eb054e6e9342b53e5fd6180", + "git-tree": "a9295a25cec5afb05f935b2505eaf820df2c4d62", "version-string": "2021_05_02", "port-version": 0 } From 9f7080127361c6071b449ca5bedc92273b0db584 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Tue, 4 May 2021 16:27:34 -0400 Subject: [PATCH 0010/1858] SleepyDiscord: set version-date --- ports/sleepy-discord/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 9f249917f0a35a..61901a07e1f0f8 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sleepy-discord", - "version-string": "2021_05_02", + "version-date": "2021-05-02", "description": "C++ library for the Discord chat client", "homepage": "https://yourwaifu.dev/sleepy-discord/", "default-features": [ From 2da2bc5edbb0908d932d2d5d4049428be80f55ca Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Tue, 4 May 2021 16:34:02 -0400 Subject: [PATCH 0011/1858] SleepyDiscord: rerun add-version --- versions/baseline.json | 2 +- versions/s-/sleepy-discord.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index cbad0ccdc123bf..a786234432eb1e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5629,7 +5629,7 @@ "port-version": 0 }, "sleepy-discord": { - "baseline": "2021_05_02", + "baseline": "2021-05-02", "port-version": 0 }, "slikenet": { diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index fc1b403ab26676..8ad04be073191a 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "a9295a25cec5afb05f935b2505eaf820df2c4d62", - "version-string": "2021_05_02", + "git-tree": "5521ce965d32e90496969e09e0732810fd3b35c5", + "version-date": "2021-05-02", "port-version": 0 } ] From cc143b4643063a943f7868753c512539e1e76d27 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 8 May 2021 15:15:34 -0400 Subject: [PATCH 0012/1858] SleepyDiscord: Add requested changes --- ports/sleepy-discord/portfile.cmake | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index 97fb6bc5b83ede..1b5d70119d2e98 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -1,10 +1,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "websocketpp" USE_WEBSOCKETPP - "websocketpp" USE_BOOST_ASIO - "cpr" USE_CPR - "voice" ENABLE_VOICE - "compression" USE_ZLIB + FEATURES + "websocketpp" USE_WEBSOCKETPP + "websocketpp" USE_BOOST_ASIO + "cpr" USE_CPR + "voice" ENABLE_VOICE + "compression" USE_ZLIB ) vcpkg_from_github( @@ -17,8 +17,11 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DSLEEPY_VCPKG=ON -DAUTO_DOWNLOAD_LIBRARY=OFF ${FEATURE_OPTIONS} PREFER_NINJA + OPTIONS + -DSLEEPY_VCPKG=ON + -DAUTO_DOWNLOAD_LIBRARY=OFF + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() From 51171f1b32f6b95bf919a308fb9edd1dad4c3f19 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 8 May 2021 15:17:12 -0400 Subject: [PATCH 0013/1858] SleepyDiscord: run add version --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 8ad04be073191a..c3a3d740299810 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "5521ce965d32e90496969e09e0732810fd3b35c5", + "git-tree": "76f9a953e3d103c2f577d1cc843e84ba8afa7a75", "version-date": "2021-05-02", "port-version": 0 } From 9d201e13d5f4fcbe5c68917b4344450f184f8a5a Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 8 May 2021 16:14:51 -0400 Subject: [PATCH 0014/1858] SleepyDiscord: update library --- ports/sleepy-discord/portfile.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index 1b5d70119d2e98..69ccef50b3b29f 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -10,8 +10,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yourWaifu/sleepy-discord - REF adc4551d835d0b73c631207278d0a2a9038a79a4 - SHA512 d0869f690fde66e2d28cb8de4ede964650c2fbd1fbcc8d3db08671e28ae7b814df79c108abdcc2f4aab4146f4f4a37c17b75f22487ccc9d5607c0c665db94c34 + REF dd9d186ec78fd092292f00f0f42008191b4d3f59 + SHA512 c8d3e3d390525b8bc88d7c195d8bf3c2c7fd806234f7e56ef231f760b1d8731cc2747c0bc43bda23a99c98682da489ca0ec2750c47cd82bffb5fa3a4a2866777 HEAD_REF develop ) From b3cbdf9bc4b44b2c95dd19d76d5f16ff7666ccad Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Sat, 8 May 2021 16:16:04 -0400 Subject: [PATCH 0015/1858] SleepyDiscord: rerun x-add-version --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index c3a3d740299810..bc4a697b5f96bc 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "76f9a953e3d103c2f577d1cc843e84ba8afa7a75", + "git-tree": "24662fab8c37b4c82cfe6e4cca0cfeb4abecccc2", "version-date": "2021-05-02", "port-version": 0 } From b0cbe8eada6872461e876e2d7133f091d1236cd5 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Thu, 20 May 2021 17:01:23 -0400 Subject: [PATCH 0016/1858] SleepyDiscord: copy config file to share folder --- ports/sleepy-discord/portfile.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index 69ccef50b3b29f..ddb9b1ac099248 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -10,8 +10,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yourWaifu/sleepy-discord - REF dd9d186ec78fd092292f00f0f42008191b4d3f59 - SHA512 c8d3e3d390525b8bc88d7c195d8bf3c2c7fd806234f7e56ef231f760b1d8731cc2747c0bc43bda23a99c98682da489ca0ec2750c47cd82bffb5fa3a4a2866777 + REF c63f6779246450e29f8e16fe19405a17d68623fc + SHA512 f4c1192c2574d083d1d179435552588705d4a7c0b561ebfdb793c663cc0266c6736adf7a4f3d390fd8ff449b5f6c4c0040212eab717db718565ce18bd9346e71 HEAD_REF develop ) @@ -25,4 +25,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +vcpkg_copy_pdbs() + +file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/sleepy_discord/sleepy-discord-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From f457f5741928a13f9a5c75c482855fb43c50f248 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Thu, 20 May 2021 17:02:23 -0400 Subject: [PATCH 0017/1858] SleepyDiscord: run add-version --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index bc4a697b5f96bc..25e34687c4c0c6 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "24662fab8c37b4c82cfe6e4cca0cfeb4abecccc2", + "git-tree": "9497fa059d90a2296e573e6cd3119eae21a33eef", "version-date": "2021-05-02", "port-version": 0 } From df221fd4d61c00ff9200bb0f2dc428a50e1f212e Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Thu, 20 May 2021 22:42:04 -0400 Subject: [PATCH 0018/1858] SleepyDiscord: Fix issue with parallel configuring --- ports/sleepy-discord/portfile.cmake | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index ddb9b1ac099248..3ba9ef1d26814b 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -10,11 +10,23 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yourWaifu/sleepy-discord - REF c63f6779246450e29f8e16fe19405a17d68623fc - SHA512 f4c1192c2574d083d1d179435552588705d4a7c0b561ebfdb793c663cc0266c6736adf7a4f3d390fd8ff449b5f6c4c0040212eab717db718565ce18bd9346e71 + REF 52059a39ff0b435724e5c67ef364dcada655a07a + SHA512 025c91e178136b5a4fd19f2015a540fe2b725f384abf04621429422578117c002cf5f4eea311102c0fe62e09ff937035888124e2ffc4369b71b9f3265fa3aeab HEAD_REF develop ) +# Handle version data here to prevent issues from doing this twice in parallel +set(SLEEPY_DISCORD_VERSION_HASH 52059a39ff0b435724e5c67ef364dcada655a07a) +set(SLEEPY_DISCORD_VERSION_BUILD 890) +set(SLEEPY_DISCORD_VERSION_BRANCH "develop") +set(SLEEPY_DISCORD_VERSION_IS_MASTER 0) +set(SLEEPY_DISCORD_VERSION_DESCRIPTION_CONCAT " ") +set(SLEEPY_DISCORD_VERSION_DESCRIPTION "52059a39") +configure_file( + "${SOURCE_PATH}/include/sleepy_discord/version.h.in" + "${SOURCE_PATH}/include/sleepy_discord/version.h" +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA From 858e2e62a8bf3149acc6c8822977309ad350a2f5 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Thu, 20 May 2021 22:42:23 -0400 Subject: [PATCH 0019/1858] SleepyDiscord: x-add-version --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 25e34687c4c0c6..eee1a32ce438a5 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9497fa059d90a2296e573e6cd3119eae21a33eef", + "git-tree": "b487bcc4e129f473acebce3479857604f69def7e", "version-date": "2021-05-02", "port-version": 0 } From 51941a0cab36b3973da45bd399c63c102f980356 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Thu, 3 Jun 2021 11:39:46 -0400 Subject: [PATCH 0020/1858] SleepyDiscord: replace deprecated functions --- ports/sleepy-discord/portfile.cmake | 5 ++--- ports/sleepy-discord/vcpkg.json | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index 3ba9ef1d26814b..d08d7a732e721a 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -27,15 +27,14 @@ configure_file( "${SOURCE_PATH}/include/sleepy_discord/version.h" ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DSLEEPY_VCPKG=ON -DAUTO_DOWNLOAD_LIBRARY=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 61901a07e1f0f8..cf31a436d7d44a 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -3,6 +3,12 @@ "version-date": "2021-05-02", "description": "C++ library for the Discord chat client", "homepage": "https://yourwaifu.dev/sleepy-discord/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "default-features": [ "cpr", "websocketpp" From 22f9ce192573f085d0583f077d474ae140621bdd Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Thu, 3 Jun 2021 11:40:52 -0400 Subject: [PATCH 0021/1858] SleepyDiscord: x-add-version --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index eee1a32ce438a5..ab6fc0685109fd 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b487bcc4e129f473acebce3479857604f69def7e", + "git-tree": "742d4e5aecff2a82a98d1f7a72c66e0fd8ff537f", "version-date": "2021-05-02", "port-version": 0 } From 17b56582930f658b33b2ded35472a89a70b1dbdd Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Wed, 23 Jun 2021 20:16:05 -0400 Subject: [PATCH 0022/1858] SleepyDiscord: Install config during configure --- ports/sleepy-discord/portfile.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index d08d7a732e721a..a9500ec056bfd4 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -10,18 +10,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yourWaifu/sleepy-discord - REF 52059a39ff0b435724e5c67ef364dcada655a07a - SHA512 025c91e178136b5a4fd19f2015a540fe2b725f384abf04621429422578117c002cf5f4eea311102c0fe62e09ff937035888124e2ffc4369b71b9f3265fa3aeab + REF 1d818e1084b85e56b8ab99852f79b974d615c66d + SHA512 b137ba378c00d476d1bb725c9d52801b5e0114f96743f842b7b8332ed2050185dd49a58efff233c91217abb1e31b8a35d37f8a45f6497d96953bbb38c77ea202 HEAD_REF develop ) # Handle version data here to prevent issues from doing this twice in parallel -set(SLEEPY_DISCORD_VERSION_HASH 52059a39ff0b435724e5c67ef364dcada655a07a) -set(SLEEPY_DISCORD_VERSION_BUILD 890) +set(SLEEPY_DISCORD_VERSION_HASH 1d818e1084b85e56b8ab99852f79b974d615c66d) +set(SLEEPY_DISCORD_VERSION_BUILD 905) set(SLEEPY_DISCORD_VERSION_BRANCH "develop") set(SLEEPY_DISCORD_VERSION_IS_MASTER 0) set(SLEEPY_DISCORD_VERSION_DESCRIPTION_CONCAT " ") -set(SLEEPY_DISCORD_VERSION_DESCRIPTION "52059a39") +set(SLEEPY_DISCORD_VERSION_DESCRIPTION "1d818e1") configure_file( "${SOURCE_PATH}/include/sleepy_discord/version.h.in" "${SOURCE_PATH}/include/sleepy_discord/version.h" @@ -38,5 +38,6 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/sleepy_discord/sleepy-discord-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sleepy-discord) + file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From cbcf5f7c6f980be56ac6146b42d8905f558c54a3 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Wed, 23 Jun 2021 20:17:20 -0400 Subject: [PATCH 0023/1858] SleepyDiscord: x-add-version --- versions/s-/sleepy-discord.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index ab6fc0685109fd..94bda3d78d5422 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "742d4e5aecff2a82a98d1f7a72c66e0fd8ff537f", + "git-tree": "0d9d62b7213333d04c90878bb1e6573ad3f5316f", "version-date": "2021-05-02", "port-version": 0 } From a1511d88d24c3a0559690f5b92041515ee8ba894 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Wed, 7 Jul 2021 14:12:28 -0400 Subject: [PATCH 0024/1858] [sleepy-discord] update: add Select Menus --- ports/sleepy-discord/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index a9500ec056bfd4..b59a2779f6ca95 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -10,18 +10,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yourWaifu/sleepy-discord - REF 1d818e1084b85e56b8ab99852f79b974d615c66d - SHA512 b137ba378c00d476d1bb725c9d52801b5e0114f96743f842b7b8332ed2050185dd49a58efff233c91217abb1e31b8a35d37f8a45f6497d96953bbb38c77ea202 + REF 53e68d6a569ab6da17b74279e308bf94919db933 + SHA512 1ee6de7aa70f3d7fc6ec0e21f5e65c6a868c23a29b4f26f614b59bbce3425c1305ce192562bf287d40f98060301b8638bc4bef95789fe8594ce5809adb6dc1e5 HEAD_REF develop ) # Handle version data here to prevent issues from doing this twice in parallel -set(SLEEPY_DISCORD_VERSION_HASH 1d818e1084b85e56b8ab99852f79b974d615c66d) -set(SLEEPY_DISCORD_VERSION_BUILD 905) +set(SLEEPY_DISCORD_VERSION_HASH 53e68d6a569ab6da17b74279e308bf94919db933) +set(SLEEPY_DISCORD_VERSION_BUILD 908) set(SLEEPY_DISCORD_VERSION_BRANCH "develop") set(SLEEPY_DISCORD_VERSION_IS_MASTER 0) set(SLEEPY_DISCORD_VERSION_DESCRIPTION_CONCAT " ") -set(SLEEPY_DISCORD_VERSION_DESCRIPTION "1d818e1") +set(SLEEPY_DISCORD_VERSION_DESCRIPTION "53e68d6") configure_file( "${SOURCE_PATH}/include/sleepy_discord/version.h.in" "${SOURCE_PATH}/include/sleepy_discord/version.h" From a3c6c2b51006b6750b9fc6ade12ad6c311920ef1 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Wed, 7 Jul 2021 14:17:09 -0400 Subject: [PATCH 0025/1858] [sleepy-discord] run add-version --- ports/sleepy-discord/vcpkg.json | 2 +- versions/s-/sleepy-discord.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index cf31a436d7d44a..2e4ff128eeb36a 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sleepy-discord", - "version-date": "2021-05-02", + "version-date": "2021-07-07", "description": "C++ library for the Discord chat client", "homepage": "https://yourwaifu.dev/sleepy-discord/", "dependencies": [ diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 94bda3d78d5422..c0c0a2b80213e5 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94c2c97f1bef12ef941f3f0329c48414360ff3cc", + "version-date": "2021-07-07", + "port-version": 0 + }, { "git-tree": "0d9d62b7213333d04c90878bb1e6573ad3f5316f", "version-date": "2021-05-02", From 90e416024fdee76ba06d904e4739c574f44674f0 Mon Sep 17 00:00:00 2001 From: Sleepy Flower Girl Date: Wed, 7 Jul 2021 14:33:06 -0400 Subject: [PATCH 0026/1858] [sleepy-discord] rerun add-verion --- versions/baseline.json | 8 ++++---- versions/s-/sleepy-discord.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4a04bc4e55f1fb..0b60b3cbd3b8d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5796,14 +5796,14 @@ "baseline": "1.13.0", "port-version": 0 }, - "sleepy-discord": { - "baseline": "2021-05-02", - "port-version": 0 - }, "sleef": { "baseline": "3.5.1", "port-version": 0 }, + "sleepy-discord": { + "baseline": "2021-07-07", + "port-version": 0 + }, "slikenet": { "baseline": "2019-10-22-2", "port-version": 0 diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index c0c0a2b80213e5..49b1554c315898 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "94c2c97f1bef12ef941f3f0329c48414360ff3cc", + "git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda", "version-date": "2021-07-07", "port-version": 0 }, From 3fc13bdf29617e3a1878e63801b0847d8bc12e5e Mon Sep 17 00:00:00 2001 From: Billy Robert ONeal III Date: Wed, 30 Jun 2021 00:51:32 -0700 Subject: [PATCH 0027/1858] [vcpkg internal] Update compiler test scripts to use asset caching. --- scripts/azure-pipelines/windows-unstable/job.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml index d440ef7fa82189..93690e957df794 100644 --- a/scripts/azure-pipelines/windows-unstable/job.yml +++ b/scripts/azure-pipelines/windows-unstable/job.yml @@ -14,6 +14,9 @@ jobs: value: D:\ - name: VCPKG_DOWNLOADS value: D:\downloads + - group: vcpkg-asset-caching-credentials + - name: X_VCPKG_ASSET_SOURCES + value: "x-azurl,$(root-url),$(sas),readwrite" steps: - task: DownloadBuildArtifacts@0 From 2ebb8d7ff567cae9588e87f608a94ad9efae919a Mon Sep 17 00:00:00 2001 From: evpobr Date: Thu, 1 Jul 2021 01:06:48 +0500 Subject: [PATCH 0028/1858] [mpg123] Upgrade to 1.28.0 (#18403) * [mpg123] Upgrade to 1.28.0 * [libopenmpt] Upgrade to 2017-01-28-cf2390140-2 * [mpg123] Disable UWP port * Fix libmpg123 UWP build * Fix libout123 UWP build * Fix libsyn123 UWP build * Update ports/libopenmpt/CMakeLists.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libopenmpt/CMakeLists.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libopenmpt] Update libopenmpt.json * [mpg123] Separate UWP patches Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/libopenmpt/CMakeLists.txt | 46 +-- ports/libopenmpt/vcpkg.json | 2 +- ports/mpg123/0001-fix-checkcpuarch-path.patch | 13 + ports/mpg123/0001-fix-x86-build.patch | 37 --- .../mpg123/0002-fix-libmpg123-uwp-build.patch | 21 ++ .../mpg123/0003-fix-libout123-uwp-build.patch | 266 ++++++++++++++++++ .../mpg123/0004-fix-libsyn123-uwp-build.patch | 52 ++++ ports/mpg123/portfile.cmake | 88 ++---- ports/mpg123/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/l-/libopenmpt.json | 5 + versions/m-/mpg123.json | 5 + 12 files changed, 401 insertions(+), 140 deletions(-) create mode 100644 ports/mpg123/0001-fix-checkcpuarch-path.patch delete mode 100644 ports/mpg123/0001-fix-x86-build.patch create mode 100644 ports/mpg123/0002-fix-libmpg123-uwp-build.patch create mode 100644 ports/mpg123/0003-fix-libout123-uwp-build.patch create mode 100644 ports/mpg123/0004-fix-libsyn123-uwp-build.patch diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt index e1aa118e4fb79b..6f4ad1b57627a4 100644 --- a/ports/libopenmpt/CMakeLists.txt +++ b/ports/libopenmpt/CMakeLists.txt @@ -11,21 +11,11 @@ endif() find_package(ZLIB REQUIRED) -find_path(MPG123_INCLUDE_DIR NAMES mpg123.h) -find_library(MPG123_LIBRARY NAMES mpg123 libmpg123) +find_package(MPG123 REQUIRED) +find_package(Vorbis REQUIRED) +find_package(FLAC REQUIRED) -find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h) -find_path(OGG_INCLUDE_DIR ogg/ogg.h) - -find_library(OGG_LIBRARY NAMES ogg) -find_library(VORBIS_LIBRARY NAMES vorbis) -find_library(VORBISFILE_LIBRARY NAMES vorbisfile) - -find_path(FLAC_INCLUDE_DIR FLAC/all.h) -find_library(FLAC_LIBRARY NAMES FLAC flac) - -find_path(PORTAUDIO_INCLUDE_DIR NAMES portaudio.h) -find_library(PORTAUDIO_LIBRARY NAMES portaudio) +find_package(portaudio REQUIRED) set( lib_headers @@ -52,11 +42,6 @@ include_directories( sounddsp soundlib openmpt123 - ${MPG123_INCLUDE_DIR} - ${VORBIS_INCLUDE_DIR} - ${OGG_INCLUDE_DIR} - ${FLAC_INCLUDE_DIR} - ${PORTAUDIO_INCLUDE_DIR} ) set( @@ -242,28 +227,27 @@ endif() target_link_libraries( libopenmpt PRIVATE - ${OGG_LIBRARY} - ${MPG123_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${VORBISFILE_LIBRARY} + MPG123::libmpg123 + Vorbis::vorbisfile + FLAC::FLAC ZLIB::ZLIB ) +if(BUILD_SHARED_LIBS) + set(PORTAUDIO_TARGET portaudio) +else() + set(PORTAUDIO_TARGET portaudio_static) +endif() + target_link_libraries( openmpt123 PRIVATE libopenmpt - ${OGG_LIBRARY} - ${MPG123_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBIS_LIBRARY} - ${VORBISFILE_LIBRARY} - ${FLAC_LIBRARY} - ${PORTAUDIO_LIBRARY} Winmm ZLIB::ZLIB + ${PORTAUDIO_TARGET} ) + install( TARGETS libopenmpt RUNTIME DESTINATION bin diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json index 18c3bf100a1ca0..3668ed848b6a70 100644 --- a/ports/libopenmpt/vcpkg.json +++ b/ports/libopenmpt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libopenmpt", "version-string": "2017-01-28-cf2390140", - "port-version": 1, + "port-version": 2, "description": "a library to render tracker music", "homepage": "https://github.com/OpenMPT/openmpt", "supports": "!uwp", diff --git a/ports/mpg123/0001-fix-checkcpuarch-path.patch b/ports/mpg123/0001-fix-checkcpuarch-path.patch new file mode 100644 index 00000000000000..d6d3bc4771e05e --- /dev/null +++ b/ports/mpg123/0001-fix-checkcpuarch-path.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/cmake/CheckCPUArch.cmake b/ports/cmake/cmake/CheckCPUArch.cmake +index 84dab8a..925aa09 100644 +--- a/ports/cmake/cmake/CheckCPUArch.cmake ++++ b/ports/cmake/cmake/CheckCPUArch.cmake +@@ -2,7 +2,7 @@ macro(_CHECK_CPU_ARCH ARCH ARCH_DEFINES VARIABLE) + if(NOT DEFINED HAVE_${VARIABLE}) + message(STATUS "Check CPU architecture is ${ARCH}") + set(CHECK_CPU_ARCH_DEFINES ${ARCH_DEFINES}) +- configure_file(${PROJECT_SOURCE_DIR}/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY) ++ configure_file(${PROJECT_SOURCE_DIR}/cmake/CheckCPUArch.c.in ${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c @ONLY) + try_compile(HAVE_${VARIABLE} "${PROJECT_BINARY_DIR}" + "${PROJECT_BINARY_DIR}/CMakeFiles/CMakeTmp/CheckCPUArch.c") + if(HAVE_${VARIABLE}) diff --git a/ports/mpg123/0001-fix-x86-build.patch b/ports/mpg123/0001-fix-x86-build.patch deleted file mode 100644 index 9c098c67926984..00000000000000 --- a/ports/mpg123/0001-fix-x86-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/src/libmpg123/mangle.h b/src/libmpg123/mangle.h -index e37386a..b474e7f 100644 ---- a/src/libmpg123/mangle.h -+++ b/src/libmpg123/mangle.h -@@ -85,6 +85,10 @@ - #define ASM_VALUE(a) MANGLE_MACROCAT($,a) - #endif - -+#if defined(_WIN32) && !defined(_WIN64) -+#define OPT_X86 -+#endif -+ - /* Enable position-independent code for certain platforms. */ - - #if defined(OPT_X86) -@@ -130,7 +134,7 @@ Lpic_base: \ - /* Dummies for everyone else. */ - #define LOCAL_VAR(a) a - #define GLOBAL_VAR ASM_NAME --#define GLOBAL_VAR_PTR(a) .err Cannot use indirect addressing in non-PIC object. -+#define GLOBAL_VAR_PTR(a) // #error Cannot use indirect addressing in non-PIC object. - #define FUNC ASM_NAME - #define EXTERNAL_FUNC ASM_NAME - #define GET_GOT -diff --git a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -index f2bc362..07e81cd 100644 ---- a/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -+++ b/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj -@@ -1194,7 +1194,7 @@ yasm -a x86 -p gas -r raw -f win32 -g null -m x86 -o "$(IntDir)synth_stereo_sse_ - - - -- Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) -+ Shlwapi.lib;dct36_3dnow.o;dct36_3dnowext.o;dct36_sse.o;dct64_3dnow.o;dct64_3dnowext.o;dct64_mmx.o;dct64_sse.o;dct64_sse_float.o;equalizer_3dnow.o;getcpuflags.o;synth_3dnow.o;synth_3dnowext.o;synth_i586.o;synth_mmx.o;synth_sse.o;synth_sse_float.o;synth_stereo_sse_float.o;tabinit_mmx.o;synth_sse_accurate.o;synth_sse_s32.o;synth_stereo_sse_accurate.o;synth_stereo_sse_s32.o;%(AdditionalDependencies) - $(IntDir);%(AdditionalLibraryDirectories) - true - diff --git a/ports/mpg123/0002-fix-libmpg123-uwp-build.patch b/ports/mpg123/0002-fix-libmpg123-uwp-build.patch new file mode 100644 index 00000000000000..ab37d023862426 --- /dev/null +++ b/ports/mpg123/0002-fix-libmpg123-uwp-build.patch @@ -0,0 +1,21 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index b843152..b8ff89b 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -39,8 +39,6 @@ check_include_file("termios.h" HAVE_TERMIOS) + check_include_file("unistd.h" HAVE_UNISTD_H) + check_include_file("windows.h" HAVE_WINDOWS_H) + +-check_symbol_exists(strerror "string.h" HAVE_STRERROR) +- + function(check_m) + set(CMAKE_REQUIRED_LIBRARIES m) + check_function_exists(sin HAVE_M) +@@ -59,6 +57,7 @@ check_function_exists(shmget HAVE_SHMGET) + check_function_exists(shmat HAVE_SHMAT) + check_function_exists(shmdt HAVE_SHMDT) + check_function_exists(shmctl HAVE_SHMCTL) ++check_function_exists(strerror HAVE_STRERROR) + + search_libs(gethostbyname GETHOSTBYNAME_LIB nsl socket network) + search_libs(socket SOCKET_LIB socket) diff --git a/ports/mpg123/0003-fix-libout123-uwp-build.patch b/ports/mpg123/0003-fix-libout123-uwp-build.patch new file mode 100644 index 00000000000000..2302c4283d276f --- /dev/null +++ b/ports/mpg123/0003-fix-libout123-uwp-build.patch @@ -0,0 +1,266 @@ +diff --git a/ports/cmake/CMakeLists.txt b/ports/cmake/CMakeLists.txt +index b5008da..8e6309a 100644 +--- a/ports/cmake/CMakeLists.txt ++++ b/ports/cmake/CMakeLists.txt +@@ -5,6 +5,13 @@ read_api_version(MPG123_VERSION API_VERSION OUTAPI_VERSION SYNAPI_VERSION) + + project(mpg123 VERSION ${MPG123_VERSION} LANGUAGES C ASM) + ++option(BUILD_LIBOUT123 "build libout123" ON) ++if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") ++ message(WARNING "Output module is not implemented for '${CMAKE_SYSTEM_NAME}' platform.") ++ message(WARNING "To prevent build errors 'BUILD_LIBOUT123' option is set to OFF.") ++ set(BUILD_LIBOUT123 OFF) ++endif() ++ + include(cmake/search_libs.cmake) + include(CMakePackageConfigHelpers) + include(GNUInstallDirs) +@@ -34,17 +41,28 @@ set(exec_prefix "${CMAKE_INSTALL_PREFIX}") + set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") + set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libmpg123.pc.in" libmpg123.pc @ONLY) +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY) ++if(BUILD_LIBOUT123) ++ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libout123.pc.in" libout123.pc @ONLY) ++endif() + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../libsyn123.pc.in" libsyn123.pc @ONLY) + + install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/libmpg123.pc" +- "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc" + "${CMAKE_CURRENT_BINARY_DIR}/libsyn123.pc" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + install( + FILES + "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/mpg123.1" +- "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1" + DESTINATION "${CMAKE_INSTALL_MANDIR}") ++ ++if(BUILD_LIBOUT123) ++ install( ++ FILES ++ "${CMAKE_CURRENT_BINARY_DIR}/libout123.pc" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ++ install( ++ FILES ++ "${CMAKE_CURRENT_SOURCE_DIR}/../../man1/out123.1" ++ DESTINATION "${CMAKE_INSTALL_MANDIR}") ++endif() +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index b843152..3945c7e 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -194,112 +194,114 @@ endif() + + # Modules + +-if(CHECK_MODULES) +- list(FIND CHECK_MODULES alsa ALSA_REQUIRED) +- list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED) +- list(FIND CHECK_MODULES pulse PULSE_REQUIRED) +- list(FIND CHECK_MODULES jack JACK_REQUIRED) +- list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED) +- list(FIND CHECK_MODULES win32 WIN32_REQUIRED) +- list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED) +- set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found") +-endif() +- +-if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1) +- find_package(ALSA) +- if(TARGET ALSA::ALSA) +- list(APPEND OUTPUT_MODULES alsa) +- elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1) +- message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}") ++if(BUILD_LIBOUT123) ++ if(CHECK_MODULES) ++ list(FIND CHECK_MODULES alsa ALSA_REQUIRED) ++ list(FIND CHECK_MODULES coreaudio COREAUDIO_REQUIRED) ++ list(FIND CHECK_MODULES pulse PULSE_REQUIRED) ++ list(FIND CHECK_MODULES jack JACK_REQUIRED) ++ list(FIND CHECK_MODULES tinyalsa TINYALSA_REQUIRED) ++ list(FIND CHECK_MODULES win32 WIN32_REQUIRED) ++ list(FIND CHECK_MODULES win32_wasapi WIN32_WASAPI_REQUIRED) ++ set(MODULE_NOT_FOUND_MESSAGE "module required but couldn't be found") + endif() +-endif() + +-if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1) +- if(APPLE) +- find_library(AUDIO_TOOLBOX AudioToolbox) +- list(APPEND OUTPUT_MODULES coreaudio) +- elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1) +- message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT ALSA_REQUIRED EQUAL -1) ++ find_package(ALSA) ++ if(TARGET ALSA::ALSA) ++ list(APPEND OUTPUT_MODULES alsa) ++ elseif(CHECK_MODULES AND NOT ALSA_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "alsa ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +-endif() + +-find_package(PkgConfig) +-if(PKG_CONFIG_FOUND) +- if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1) +- pkg_search_module(PULSE libpulse-simple) +- if(PULSE_FOUND) +- list(APPEND OUTPUT_MODULES pulse) +- elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1) +- message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT COREAUDIO_REQUIRED EQUAL -1) ++ if(APPLE) ++ find_library(AUDIO_TOOLBOX AudioToolbox) ++ list(APPEND OUTPUT_MODULES coreaudio) ++ elseif(CHECK_MODULES AND NOT COREAUDIO_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "coreaudio ${MODULE_NOT_FOUND_MESSAGE}") + endif() + endif() + +- if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1) +- pkg_search_module(JACK jack) +- if(JACK_FOUND) +- list(APPEND OUTPUT_MODULES jack) +- elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1) +- message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}") ++ find_package(PkgConfig) ++ if(PKG_CONFIG_FOUND) ++ if(NOT CHECK_MODULES OR NOT PULSE_REQUIRED EQUAL -1) ++ pkg_search_module(PULSE libpulse-simple) ++ if(PULSE_FOUND) ++ list(APPEND OUTPUT_MODULES pulse) ++ elseif(CHECK_MODULES AND NOT PULSE_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "pulse ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() ++ endif() ++ ++ if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1) ++ pkg_search_module(JACK jack) ++ if(JACK_FOUND) ++ list(APPEND OUTPUT_MODULES jack) ++ elseif(CHECK_MODULES AND NOT JACK_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "jack ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +- endif() + +- if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1) +- pkg_search_module(TINYALSA tinyalsa) +- if(TINYALSA_FOUND) +- list(APPEND OUTPUT_MODULES tinyalsa) +- elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1) +- message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT TINYALSA_REQUIRED EQUAL -1) ++ pkg_search_module(TINYALSA tinyalsa) ++ if(TINYALSA_FOUND) ++ list(APPEND OUTPUT_MODULES tinyalsa) ++ elseif(CHECK_MODULES AND NOT TINYALSA_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "tinyalsa ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() + endif() +-endif() + +-if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1) +- if(HAVE_WINDOWS_H) +- set(WIN32_LIBRARIES winmm) +- list(APPEND OUTPUT_MODULES win32) +- elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1) +- message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT WIN32_REQUIRED EQUAL -1) ++ if(HAVE_WINDOWS_H) ++ set(WIN32_LIBRARIES winmm) ++ list(APPEND OUTPUT_MODULES win32) ++ elseif(CHECK_MODULES AND NOT WIN32_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "win32 ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +-endif() + +-if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1) +- set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h") +- check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI) +- if(HAVE_WASAPI) +- set(WIN32_WASAPI_LIBRARIES ole32 avrt) +- list(APPEND OUTPUT_MODULES win32_wasapi) +- elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1) +- message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}") ++ if(NOT CHECK_MODULES OR NOT WIN32_WASAPI_REQUIRED EQUAL -1) ++ set(WASAPI_INCLUDES "initguid.h" "audioclient.h" "mmdeviceapi.h" "avrt.h") ++ check_include_files("${WASAPI_INCLUDES}" HAVE_WASAPI) ++ if(HAVE_WASAPI) ++ set(WIN32_WASAPI_LIBRARIES ole32 avrt) ++ list(APPEND OUTPUT_MODULES win32_wasapi) ++ elseif(CHECK_MODULES AND NOT WIN32_WASAPI_REQUIRED EQUAL -1) ++ message(FATAL_ERROR "win32_wasapi ${MODULE_NOT_FOUND_MESSAGE}") ++ endif() + endif() +-endif() + +-if(CHECK_MODULES) +- list(REMOVE_AT CHECK_MODULES +- ${ALSA_REQUIRED} +- ${COREAUDIO_REQUIRED} +- ${PULSE_REQUIRED} +- ${JACK_REQUIRED} +- ${TINYALSA_REQUIRED} +- ${WIN32_REQUIRED} +- ${WIN32_WASAPI_REQUIRED}) +- list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH) +- if(NOT CHECK_MODULES_LENGTH EQUAL 0) +- message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}") ++ if(CHECK_MODULES) ++ list(REMOVE_AT CHECK_MODULES ++ ${ALSA_REQUIRED} ++ ${COREAUDIO_REQUIRED} ++ ${PULSE_REQUIRED} ++ ${JACK_REQUIRED} ++ ${TINYALSA_REQUIRED} ++ ${WIN32_REQUIRED} ++ ${WIN32_WASAPI_REQUIRED}) ++ list(LENGTH CHECK_MODULES CHECK_MODULES_LENGTH) ++ if(NOT CHECK_MODULES_LENGTH EQUAL 0) ++ message(FATAL_ERROR "Dunno how to find modules: ${CHECK_MODULES}") ++ endif() + endif() +-endif() + +-if(NOT OUTPUT_MODULES) +- set(DEFAULT_OUTPUT_MODULE dummy) +- set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE}) +-else() +- list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE) +- set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module") +- if(BUILD_SHARED_LIBS) +- string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}") +- else() ++ if(NOT OUTPUT_MODULES) ++ set(DEFAULT_OUTPUT_MODULE dummy) + set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE}) ++ else() ++ list(GET OUTPUT_MODULES 0 _DEFAULT_OUTPUT_MODULE) ++ set(DEFAULT_OUTPUT_MODULE ${_DEFAULT_OUTPUT_MODULE} CACHE STRING "Default output module") ++ if(BUILD_SHARED_LIBS) ++ string(REPLACE ";" "," DEFAULT_OUTPUT_MODULES "${OUTPUT_MODULES}") ++ else() ++ set(DEFAULT_OUTPUT_MODULES ${DEFAULT_OUTPUT_MODULE}) ++ endif() ++ set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES}) + endif() +- set_property(CACHE DEFAULT_OUTPUT_MODULE PROPERTY STRINGS ${OUTPUT_MODULES}) + endif() + + option(ACCURATE_ROUNDING "use rounding instead of fast truncation for integer output, where possible" ON) +@@ -362,7 +364,9 @@ add_compile_options( + + add_subdirectory("compat") + add_subdirectory("libmpg123") +-add_subdirectory("libout123") ++if(BUILD_LIBOUT123) ++ add_subdirectory("libout123") ++endif() + add_subdirectory("libsyn123") + + if(UNIX) diff --git a/ports/mpg123/0004-fix-libsyn123-uwp-build.patch b/ports/mpg123/0004-fix-libsyn123-uwp-build.patch new file mode 100644 index 00000000000000..803296dedeb491 --- /dev/null +++ b/ports/mpg123/0004-fix-libsyn123-uwp-build.patch @@ -0,0 +1,52 @@ +diff --git a/src/libmpg123/sample.h b/src/libmpg123/sample.h +index 4d244fe..ed3ef86 100644 +--- a/src/libmpg123/sample.h ++++ b/src/libmpg123/sample.h +@@ -171,7 +171,7 @@ static inline int16_t ftoi16(float x) + ( (u >= 2147483648UL) \ + ? (int32_t)((uint32_t)u - (uint32_t)2147483648UL) \ + : ((u == 0) \ +- ? (int32_t)-2147483648UL \ ++ ? -(int32_t)2147483648UL \ + : -(int32_t)((uint32_t)2147483648UL - u) ) \ + ) + +diff --git a/src/libsyn123/resample.c b/src/libsyn123/resample.c +index b92f7f2..3552ffa 100644 +--- a/src/libsyn123/resample.c ++++ b/src/libsyn123/resample.c +@@ -2005,7 +2005,7 @@ syn123_resample_intotal_64(long inrate, long outrate, int64_t outs) + // First offset is -inrate. + // You may want to work it out for yourself. Or trust me;-) + int err; +- uint64_t vtot = muloffdiv64(outs, vinrate, -vinrate, voutrate, &err, NULL); ++ uint64_t vtot = muloffdiv64(outs, vinrate, -(int64_t)vinrate, voutrate, &err, NULL); + if(err) + return SYN123_OVERFLOW; + if(vtot == UINT64_MAX) +diff --git a/src/libsyn123/sampleconv.c b/src/libsyn123/sampleconv.c +index 6e8fb3f..7179957 100644 +--- a/src/libsyn123/sampleconv.c ++++ b/src/libsyn123/sampleconv.c +@@ -21,6 +21,8 @@ + #include "syn123_int.h" + #include "sample.h" + #include "debug.h" ++// Avoid conflict with pragmas in isnan() and friends. ++#undef warning + + /* Conversions between native byte order encodings. */ + +diff --git a/src/libsyn123/volume.c b/src/libsyn123/volume.c +index de018a2..a80851d 100644 +--- a/src/libsyn123/volume.c ++++ b/src/libsyn123/volume.c +@@ -12,6 +12,8 @@ + #define NO_SMAX + #include "syn123_int.h" + #include "debug.h" ++// Avoid conflict with pragmas in isnan() and friends. ++#undef warning + + static const double db_min = -SYN123_DB_LIMIT; + static const double db_max = SYN123_DB_LIMIT; diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index eea5769e1575c8..dd12ddc0d595e5 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -1,26 +1,13 @@ -set(MPG123_VERSION 1.26.5) -set(MPG123_HASH 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a) +set(MPG123_VERSION 1.28.0) +set(MPG123_HASH 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77) -#architecture detection -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(MPG123_ARCH Win32) - set(MPG123_CONFIGURATION _x86) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(MPG123_ARCH x64) - set(MPG123_CONFIGURATION _x86) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - set(MPG123_ARCH ARM) - set(MPG123_CONFIGURATION _Generic) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - set(MPG123_ARCH ARM64) - set(MPG123_CONFIGURATION _Generic) -else() - message(FATAL_ERROR "unsupported architecture") -endif() - -#linking -if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(MPG123_CONFIGURATION_SUFFIX _Dll) +set(PATCHES "") +if(VCPKG_TARGET_IS_UWP) + set(PATCHES + 0002-fix-libmpg123-uwp-build.patch + 0003-fix-libout123-uwp-build.patch + 0004-fix-libsyn123-uwp-build.patch + ) endif() vcpkg_from_sourceforge( @@ -30,60 +17,25 @@ vcpkg_from_sourceforge( FILENAME "mpg123-${MPG123_VERSION}.tar.bz2" SHA512 ${MPG123_HASH} PATCHES - 0001-fix-x86-build.patch + 0001-fix-checkcpuarch-path.patch + ${PATCHES} ) include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) yasm_tool_helper(APPEND_TO_PATH) -macro(read_api_version) - file(READ "${SOURCE_PATH}/configure.ac" configure_ac) - string(REGEX MATCH "API_VERSION=([0-9]+)" result ${configure_ac}) - set(API_VERSION ${CMAKE_MATCH_1}) -endmacro() - -if(VCPKG_TARGET_IS_UWP) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH ports/MSVC++/2015/uwp/libmpg123/libmpg123.vcxproj - OPTIONS /p:UseEnv=True - PLATFORM ${MPG123_ARCH} - RELEASE_CONFIGURATION Release_uwp - DEBUG_CONFIGURATION Debug_uwp - ) - - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/mpg123.h - ${SOURCE_PATH}/src/libmpg123/fmt123.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include - ) +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - read_api_version() - configure_file( - ${SOURCE_PATH}/src/libmpg123/mpg123.h.in - ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY - ) - -elseif(VCPKG_TARGET_IS_WINDOWS) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj - OPTIONS /p:UseEnv=True - RELEASE_CONFIGURATION Release${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} - DEBUG_CONFIGURATION Debug${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX} - ) - - file(INSTALL - ${SOURCE_PATH}/ports/MSVC++/mpg123.h - ${SOURCE_PATH}/src/libmpg123/fmt123.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/ports/cmake + OPTIONS -DUSE_MODULES=OFF ) + vcpkg_install_cmake() + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + vcpkg_fixup_pkgconfig() - read_api_version() - configure_file( - ${SOURCE_PATH}/src/libmpg123/mpg123.h.in - ${CURRENT_PACKAGES_DIR}/include/mpg123.h.in @ONLY - ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) set(MPG123_OPTIONS diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index 1661997476cdd7..e699f891557b0e 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mpg123", - "version": "1.26.5", + "version": "1.28.0", "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0b60b3cbd3b8d5..ad91f9e58e39b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3406,7 +3406,7 @@ }, "libopenmpt": { "baseline": "2017-01-28-cf2390140", - "port-version": 1 + "port-version": 2 }, "libopusenc": { "baseline": "0.2.1", @@ -4137,7 +4137,7 @@ "port-version": 0 }, "mpg123": { - "baseline": "1.26.5", + "baseline": "1.28.0", "port-version": 0 }, "mpi": { diff --git a/versions/l-/libopenmpt.json b/versions/l-/libopenmpt.json index d97f5018173262..30e4512e13ead9 100644 --- a/versions/l-/libopenmpt.json +++ b/versions/l-/libopenmpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "465b2d6e597952e0ef962af05dce08769dba11e7", + "version-string": "2017-01-28-cf2390140", + "port-version": 2 + }, { "git-tree": "a6579258d2dab9e661a439e241ff20f2427b918e", "version-string": "2017-01-28-cf2390140", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 60740511bea295..098759f80d31ab 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b34c661c7e28355ade113c330d1c3b93a77a4e13", + "version": "1.28.0", + "port-version": 0 + }, { "git-tree": "6e185d93bd44a85eda8d650c24df2f96da710d56", "version": "1.26.5", From cee1977ca141cb45c24b06862d535738893f45c6 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 30 Jun 2021 22:12:06 +0200 Subject: [PATCH 0029/1858] [vcpkg_configure_make] Fix mingw (cross) build issues (#18554) * Set ENV{WINDRES} for mingw * Fix passing of '${prefix}' for mingw cross builds --- scripts/cmake/vcpkg_configure_make.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 86b42a17348703..d1b87d454a0848 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -385,6 +385,8 @@ function(vcpkg_configure_make) _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") _vcpkg_append_to_configure_environment(CONFIGURE_ENV CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + _vcpkg_append_to_configure_environment(CONFIGURE_ENV RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + _vcpkg_append_to_configure_environment(CONFIGURE_ENV WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") if(VCPKG_DETECTED_CMAKE_AR) _vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "${VCPKG_DETECTED_CMAKE_AR}") else() @@ -791,8 +793,10 @@ function(vcpkg_configure_make) unset(_link_path) unset(_lib_env_vars) - if(VCPKG_TARGET_IS_WINDOWS) + if(CMAKE_HOST_WIN32) set(command "${base_cmd}" -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") + elseif(VCPKG_TARGET_IS_WINDOWS) + set(command "${base_cmd}" -c "${CONFIGURE_ENV} $@" -- "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) else() set(command "${base_cmd}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) endif() From a3971135a42f552094e059c84e5f343f6e42f6d0 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Thu, 1 Jul 2021 04:16:16 +0800 Subject: [PATCH 0030/1858] [vcpkg] Add static triplet for arm-windows (#18300) --- triplets/community/arm-windows-static.cmake | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 triplets/community/arm-windows-static.cmake diff --git a/triplets/community/arm-windows-static.cmake b/triplets/community/arm-windows-static.cmake new file mode 100644 index 00000000000000..9ba5feed79f78d --- /dev/null +++ b/triplets/community/arm-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) From 851c44c7fa25d2aaa503e44eff069a3d5e4544a9 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 30 Jun 2021 22:16:51 +0200 Subject: [PATCH 0031/1858] [scripts] Add vcpkg_completions.zsh (#18274) * Add vcpkg_completions.zsh * Update scripts/vcpkg_completion.zsh --- scripts/vcpkg_completion.zsh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 scripts/vcpkg_completion.zsh diff --git a/scripts/vcpkg_completion.zsh b/scripts/vcpkg_completion.zsh new file mode 100644 index 00000000000000..ee499f67161567 --- /dev/null +++ b/scripts/vcpkg_completion.zsh @@ -0,0 +1,9 @@ + +_vcpkg_completions() +{ + local vcpkg_executable=${COMP_WORDS[0]} + local remaining_command_line=${COMP_LINE:(${#vcpkg_executable}+1)} + COMPREPLY=($(${vcpkg_executable} autocomplete "${remaining_command_line}" -- 2>/dev/null)) +} + +complete -F _vcpkg_completions vcpkg From 3cac78885f1c42291b8b0ecb41e5fd8e5331e0a4 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 1 Jul 2021 22:14:24 +0800 Subject: [PATCH 0032/1858] [vcpkg baseline][simage] Update to 1.8.1 (#18645) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [simage] Update to 1.8.1 * Format manifest and update version files * Revert the changes for arm and uwp in ci.baseline.txt * Update versions/s-/simage.json * Update ports/simage/portfile.cmake * Update ports/simage/portfile.cmake * Update ports/simage/portfile.cmake * Update versions/s-/simage.json * Add options to packages * Update versions/s-/simage.json * Update portfile.cmake * Update versions/s-/simage.json * Update portfile.cmake * Update versions/s-/simage.json * [simage] Reorganize all features, add features * Install tool simage-config on non-Windows * fix typo * Add supports field and update ci.baseline.txt * Update versions/s-/simage.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY --- ports/simage/CONTROL | 6 - ports/simage/disable-cpackd.patch | 10 -- ports/simage/disable-examples.patch | 44 ------- ports/simage/disable-tests.patch | 49 -------- ports/simage/link-flac-library.patch | 60 --------- ports/simage/link-math-library.patch | 14 --- ports/simage/link-ogg-library.patch | 16 --- ports/simage/portfile.cmake | 97 ++++++++------ ...uninitialized-local-pointer-variable.patch | 26 ---- ports/simage/requies-all-dependencies.patch | 37 ++++++ ports/simage/vcpkg.json | 118 ++++++++++++++++++ scripts/ci.baseline.txt | 4 - versions/baseline.json | 8 +- versions/s-/simage.json | 5 + 14 files changed, 220 insertions(+), 274 deletions(-) delete mode 100644 ports/simage/CONTROL delete mode 100644 ports/simage/disable-cpackd.patch delete mode 100644 ports/simage/disable-examples.patch delete mode 100644 ports/simage/disable-tests.patch delete mode 100644 ports/simage/link-flac-library.patch delete mode 100644 ports/simage/link-math-library.patch delete mode 100644 ports/simage/link-ogg-library.patch delete mode 100644 ports/simage/potentially-uninitialized-local-pointer-variable.patch create mode 100644 ports/simage/requies-all-dependencies.patch create mode 100644 ports/simage/vcpkg.json diff --git a/ports/simage/CONTROL b/ports/simage/CONTROL deleted file mode 100644 index e25840834342e1..00000000000000 --- a/ports/simage/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: simage -Version: 1.8.0 -Port-Version: 1 -Description: Image file format library abstraction layer -Build-Depends: giflib (!windows&!osx), libjpeg-turbo (!windows&!osx), libpng (!windows&!osx), libsndfile, tiff (!windows&!osx), libvorbis, zlib (!windows&!osx) -Homepage: https://github.com/coin3d/simage diff --git a/ports/simage/disable-cpackd.patch b/ports/simage/disable-cpackd.patch deleted file mode 100644 index 6fd227a62a5bb6..00000000000000 --- a/ports/simage/disable-cpackd.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..e3deb01 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -627,4 +627,4 @@ install(EXPORT ${PROJECT_NAME} - - # ############################################################################ - # New CPACK section, please see the README file inside cpack.d directory. --add_subdirectory(cpack.d) -+#add_subdirectory(cpack.d) diff --git a/ports/simage/disable-examples.patch b/ports/simage/disable-examples.patch deleted file mode 100644 index dc9236c97f5449..00000000000000 --- a/ports/simage/disable-examples.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..fbd81b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -482,23 +489,23 @@ endif() - # Build examples - # ############################################################################ - --set(SIMAGE_EXAMPLE_SOURCE -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c -+#set(SIMAGE_EXAMPLE_SOURCE -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/audio2raw.c -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/img2avi.c - # ${CMAKE_CURRENT_SOURCE_DIR}/examples/mpeg2enc.cpp # requires Coin to build -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c -- ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c --) -- --foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) -- get_filename_component(_example ${_source} NAME_WE) -- add_executable(${_example} ${_source}) -- target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) -- target_link_libraries(${_example} simage) -- if(UNIX) -- target_link_libraries(${_example} m) -- endif() --endforeach() -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-convert.c -+# ${CMAKE_CURRENT_SOURCE_DIR}/examples/simage-read-line-test.c -+#) -+ -+#foreach(_source ${SIMAGE_EXAMPLE_SOURCE}) -+# get_filename_component(_example ${_source} NAME_WE) -+# add_executable(${_example} ${_source}) -+# target_compile_definitions(${_example} PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) -+# target_link_libraries(${_example} simage) -+# if(UNIX) -+# target_link_libraries(${_example} m) -+# endif() -+#endforeach() - - # ############################################################################ - # Build tests diff --git a/ports/simage/disable-tests.patch b/ports/simage/disable-tests.patch deleted file mode 100644 index 46790227fa21df..00000000000000 --- a/ports/simage/disable-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..b82734a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -504,25 +511,25 @@ endforeach() - # Build tests - # ############################################################################ - --enable_testing() -- --add_executable(loaders tests/loaders.c) --target_link_libraries(loaders simage) --target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) --if(UNIX) -- target_link_libraries(loaders m) --endif() -- --add_test( -- loaders -- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga -- ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif --) -+#enable_testing() -+ -+#add_executable(loaders tests/loaders.c) -+#target_link_libraries(loaders simage) -+#target_compile_definitions(loaders PRIVATE _CRT_NONSTDC_NO_DEPRECATE _CRT_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES) -+#if(UNIX) -+# target_link_libraries(loaders m) -+#endif() -+ -+#add_test( -+# loaders -+# ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/loaders -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.gif -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.jpg -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.png -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.rgb -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tga -+# ${CMAKE_CURRENT_SOURCE_DIR}/tests/img.tif -+#) - - # Add a target to generate API documentation with Doxygen - if(SIMAGE_BUILD_DOCUMENTATION) diff --git a/ports/simage/link-flac-library.patch b/ports/simage/link-flac-library.patch deleted file mode 100644 index 7b8e35a10c28ae..00000000000000 --- a/ports/simage/link-flac-library.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 775037a..2de9b9f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -108,6 +108,10 @@ find_package(Jasper) - find_package(OggVorbis) - find_package(Sndfile) - -+if(SNDFILE_FOUND) -+ find_package(FLAC) -+endif() -+ - if(APPLE AND SIMAGE_USE_CGIMAGE) - check_cxx_source_compiles(" - #include -@@ -467,6 +471,9 @@ endif() - if(SNDFILE_FOUND) - target_include_directories(simage PRIVATE ${SNDFILE_INCLUDE_DIRS}) - target_link_libraries(simage PRIVATE ${SNDFILE_LIBRARIES}) -+ if(FLAC_FOUND) -+ target_link_libraries(simage PRIVATE ${FLAC_LIBRARIES}) -+ endif() - endif() - - if(TIFF_FOUND) -diff --git a/FindFLAC.cmake b/FindFLAC.cmake -new file mode 100644 -index 0000000..ce40a11 ---- /dev/null -+++ b/FindFLAC.cmake -@@ -0,0 +1,29 @@ -+include(FindPackageHandleStandardArgs) -+ -+find_path(FLAC_INCLUDE_DIR FLAC/all.h) -+ -+mark_as_advanced(FLAC_INCLUDE_DIR) -+ -+set(FLAC_INCLUDE_DIRS ${FLAC_INCLUDE_DIR}) -+ -+find_library(FLAC_LIBRARY NAMES FLAC) -+ -+mark_as_advanced( -+ FLAC_INCLUDE_DIR -+ FLAC_LIBRARY -+) -+ -+set(FLAC_LIBRARIES ${FLAC_LIBRARY}) -+ -+find_package_handle_standard_args( -+ FLAC -+ DEFAULT_MSG -+ FLAC_INCLUDE_DIRS -+ FLAC_LIBRARIES -+) -+ -+if(FLAC_FOUND AND NOT TARGET FLAC::FLAC) -+ add_library(FLAC::FLAC UNKNOWN IMPORTED) -+ set_target_properties(FLAC::FLAC PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FLAC_INCLUDE_DIR}") -+ set_property(TARGET FLAC::FLAC APPEND PROPERTY IMPORTED_LOCATION "${FLAC_LIBRARY}") -+endif() diff --git a/ports/simage/link-math-library.patch b/ports/simage/link-math-library.patch deleted file mode 100644 index 4ffe98bf1aba39..00000000000000 --- a/ports/simage/link-math-library.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4a978dd..e7abd57 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -454,6 +454,9 @@ endif() - if(PNG_FOUND) - target_include_directories(simage PRIVATE ${PNG_INCLUDE_DIR}) - target_link_libraries(simage PRIVATE ${PNG_LIBRARIES}) -+ if(UNIX) -+ target_link_libraries(simage PRIVATE m) -+ endif() - endif() - - if(SIMAGE_QIMAGE_SUPPORT) diff --git a/ports/simage/link-ogg-library.patch b/ports/simage/link-ogg-library.patch deleted file mode 100644 index 752754411bfbe2..00000000000000 --- a/ports/simage/link-ogg-library.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/FindOggVorbis.cmake b/FindOggVorbis.cmake -index a33e63e..7e2708b 100644 ---- a/FindOggVorbis.cmake -+++ b/FindOggVorbis.cmake -@@ -28,10 +28,10 @@ mark_as_advanced( - - set( - OGGVORBIS_LIBRARIES -- ${OGG_LIBRARY} - ${VORBIS_LIBRARY} - ${VORBISFILE_LIBRARY} - ${VORBISENC_LIBRARY} -+ ${OGG_LIBRARY} - ) - - find_package_handle_standard_args( diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index 6b890c8a5c75b3..6868fb16e13bc3 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -1,64 +1,79 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + +set(SIMAGE_VERSION 1.8.1) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Coin3D/simage - REF simage-1.8.0 - SHA512 7070c845fc72094a97b1253d23a5f60f90e71dc6ed968c9c7da67e05660b05245a807fbdf0f592a1d459c7c3b725783c55f59f867182b11cb9ec40741d7ad58c + REF 72bdc2fddb171ab08325ced9c4e04b27bbd2da6c #v1.8.1 + SHA512 8e0d4b246318e9a08d9a17e0550fae4e3902e5d14ff9d7e43569624d1ceb9308c1cbc2401cedc4bff4da8b136fc57fc6b11c6800f1db15914b13186b0d5dc8f1 HEAD_REF master - PATCHES - disable-cpackd.patch - disable-examples.patch - disable-tests.patch - link-flac-library.patch - link-math-library.patch - link-ogg-library.patch - potentially-uninitialized-local-pointer-variable.patch + PATCHES requies-all-dependencies.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(SIMAGE_BUILD_SHARED_LIBS OFF) -else() - set(SIMAGE_BUILD_SHARED_LIBS ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SIMAGE_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMAGE_USE_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" SIMAGE_USE_MSVC_STATIC_RUNTIME) -set(OSX_OR_WINDOWS OFF) -if((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_OSX) - set(OSX_OR_WINDOWS ON) -endif() -if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) - set(SIMAGE_USE_AVIENC ON) - set(SIMAGE_USE_GDIPLUS ON) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + oggvorbis SIMAGE_OGGVORBIS_SUPPORT + sndfile SIMAGE_LIBSNDFILE_SUPPORT +) + +# Depends on the platform +if(VCPKG_TARGET_IS_WINDOWS) + set(SIMAGE_ON_WIN ON) + set(SIMAGE_ON_NON_WIN OFF) else() - set(SIMAGE_USE_AVIENC OFF) - set(SIMAGE_USE_GDIPLUS OFF) + set(SIMAGE_ON_WIN OFF) + set(SIMAGE_ON_NON_WIN ON) endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DSIMAGE_BUILD_SHARED_LIBS=${SIMAGE_BUILD_SHARED_LIBS} - -DSIMAGE_USE_AVIENC=${SIMAGE_USE_AVIENC} - -DSIMAGE_USE_GDIPLUS=${SIMAGE_USE_GDIPLUS} - -DCMAKE_DISABLE_FIND_PACKAGE_FLAC=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_GIF=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_PNG=${OSX_OR_WINDOWS} - -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=${OSX_OR_WINDOWS} + OPTIONS ${FEATURE_OPTIONS} + -DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS} + -DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS} + -DSIMAGE_USE_MSVC_STATIC_RUNTIME:BOOL=${SIMAGE_USE_MSVC_STATIC_RUNTIME} + -DSIMAGE_USE_AVIENC=${SIMAGE_ON_WIN} + -DSIMAGE_USE_GDIPLUS=${SIMAGE_ON_WIN} + # Available on Linux, OSX and Windows without gdiplus + -DSIMAGE_ZLIB_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_GIF_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_JPEG_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_PNG_SUPPORT=${SIMAGE_ON_NON_WIN} + -DSIMAGE_TIFF_SUPPORT=${SIMAGE_ON_NON_WIN} + # + -DSIMAGE_USE_CGIMAGE=OFF + -DSIMAGE_USE_QIMAGE=OFF + -DSIMAGE_USE_QT6=OFF + -DSIMAGE_USE_QT5=OFF + -DSIMAGE_USE_CPACK=OFF + -DSIMAGE_LIBJASPER_SUPPORT=OFF + -DSIMAGE_EPS_SUPPORT=OFF + -DSIMAGE_MPEG2ENC_SUPPORT=OFF + -DSIMAGE_PIC_SUPPORT=OFF + -DSIMAGE_RGB_SUPPORT=OFF + -DSIMAGE_XWD_SUPPORT=OFF + -DSIMAGE_TGA_SUPPORT=OFF + -DSIMAGE_BUILD_MSVC_MP=OFF + -DSIMAGE_BUILD_EXAMPLES=OFF + -DSIMAGE_BUILD_TESTS=OFF + -DSIMAGE_BUILD_DOCUMENTATION=OFF ) vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-1.8.0) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/simage/potentially-uninitialized-local-pointer-variable.patch b/ports/simage/potentially-uninitialized-local-pointer-variable.patch deleted file mode 100644 index 1b74a2f89878cd..00000000000000 --- a/ports/simage/potentially-uninitialized-local-pointer-variable.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/examples/img2avi.c b/examples/img2avi.c -index 7a5ca96..d0ee057 100644 ---- a/examples/img2avi.c -+++ b/examples/img2avi.c -@@ -30,7 +30,7 @@ int main(int argc, char *argv[]) - int first; - int width; - int height; -- s_movie * movie; -+ s_movie * movie = NULL; - s_params * params; - s_image *image; - char formatbuf[20]; -diff --git a/mpeg2enc/putvlc.c b/mpeg2enc/putvlc.c -index 6a84fbd..b373fea 100644 ---- a/mpeg2enc/putvlc.c -+++ b/mpeg2enc/putvlc.c -@@ -103,7 +103,7 @@ void - simpeg_encode_putAC(simpeg_encode_context * context,int run, int signed_level, int vlcformat) - { - int level, len; -- VLCtable *ptab; -+ VLCtable *ptab = NULL; - - level = (signed_level<0) ? -signed_level : signed_level; /* abs(signed_level) */ - diff --git a/ports/simage/requies-all-dependencies.patch b/ports/simage/requies-all-dependencies.patch new file mode 100644 index 00000000000000..ef0536a960c65e --- /dev/null +++ b/ports/simage/requies-all-dependencies.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d869715..073a73f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,10 +117,10 @@ endif() + # On Windows GDI+ supports GIF, JPEG, EXIF, PNG, and TIFF. + # see https://docs.microsoft.com/en-us/windows/desktop/gdiplus/-gdiplus-types-of-bitmaps-about + if(SIMAGE_USE_GDIPLUS) +- find_package(GdiPlus) ++ find_package(GdiPlus REQUIRED) + endif() + if(SIMAGE_USE_AVIENC) +- find_package(Vfw) ++ find_package(Vfw REQUIRED) + endif() + + # On macOS QuickTime supports BMP, GIF, JPEG, JPEG 2000, PNG, TIFF, and TGA. +@@ -267,7 +267,7 @@ if(SIMAGE_OGGVORBIS_SUPPORT) + find_package(Ogg REQUIRED) + find_package(Vorbis REQUIRED) + if(OGG_FOUND) +- find_package(Opus) ++ find_package(Opus REQUIRED) + endif() + endif() + +@@ -287,8 +287,8 @@ if(NOT SIMAGE_QUICKTIME_SUPPORT AND NOT SIMAGE_CGIMAGE_SUPPORT AND NOT SIMAGE_GD + if(SIMAGE_TIFF_SUPPORT) + find_package(TIFF REQUIRED) + if(TIFF_FOUND) +- find_package(LibLZMA) +- find_package(Zstd) ++ find_package(LibLZMA REQUIRED) ++ find_package(Zstd REQUIRED) + endif() + endif() + diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json new file mode 100644 index 00000000000000..2b50a2c6dc19f6 --- /dev/null +++ b/ports/simage/vcpkg.json @@ -0,0 +1,118 @@ +{ + "name": "simage", + "version-semver": "1.8.1", + "description": "Image file format library abstraction layer", + "homepage": "https://github.com/coin3d/simage", + "supports": "!uwp", + "default-features": [ + "all" + ], + "features": { + "all": { + "description": "Enable all features", + "dependencies": [ + { + "name": "simage", + "default-features": false, + "features": [ + "oggvorbis" + ] + }, + { + "name": "simage", + "default-features": false, + "features": [ + "sndfile" + ] + }, + { + "name": "simage", + "default-features": false, + "features": [ + "giflib" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "jpeg" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "png" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "tiff" + ], + "platform": "!windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "zlib" + ], + "platform": "!windows" + } + ] + }, + "giflib": { + "description": "Enable support for GIF images", + "dependencies": [ + "giflib" + ] + }, + "jpeg": { + "description": "Enable support for JPEG images", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "oggvorbis": { + "description": "Enable support for ogg/vorbis extensions", + "dependencies": [ + "libogg", + "libvorbis", + "opus" + ] + }, + "png": { + "description": "Enable support for PNG images", + "dependencies": [ + "libpng" + ] + }, + "sndfile": { + "description": "Use libsndfile to load/save sampled sound", + "dependencies": [ + "libflac", + "libsndfile" + ] + }, + "tiff": { + "description": "Enable support for TIFF images", + "dependencies": [ + "liblzma", + "tiff", + "zstd" + ] + }, + "zlib": { + "description": "Enable support for zlib library", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dbf417741b856d..bd0f256d4008a8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1796,9 +1796,5 @@ dimcli:x64-windows-static=fail # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. cppgraphqlgen:x64-osx=fail -# Visual Studio 2019 version 16.10's XAML compiler seems to be crashing processing this port -simage:x64-uwp=fail -simage:arm-uwp=fail - # Changes in Python have broken tensorflow on our osx hardware tensorflow-cc:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index ad91f9e58e39b7..95ba95d9afe84b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3539,8 +3539,8 @@ "libsigcpp-3": { "baseline": "3.0.3", "port-version": 1 - }, - "libsmb2": { + }, + "libsmb2": { "baseline": "2021-04-29", "port-version": 0 }, @@ -5769,8 +5769,8 @@ "port-version": 0 }, "simage": { - "baseline": "1.8.0", - "port-version": 1 + "baseline": "1.8.1", + "port-version": 0 }, "simde": { "baseline": "0.7.0", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index e245aca0bee948..d20b1cd9065457 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "429f5758def1d9514aa6f3f2bbcb98d8a3f19cd1", + "version-semver": "1.8.1", + "port-version": 0 + }, { "git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339", "version-string": "1.8.0", From d9900f3d54d4e3fb91b58854149bde135246b97c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 1 Jul 2021 16:22:56 +0200 Subject: [PATCH 0033/1858] [curl] Fix linker flags in curl-config and libcurl.pc for osx (#17790) * Fix exported framework linker flags for osx * x-add-version * Remove cmake version check * Update git-tree --- ports/curl/0020-fix-pc-file.patch | 16 ++++++++++++++++ ports/curl/portfile.cmake | 1 + ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/curl/0020-fix-pc-file.patch diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch new file mode 100644 index 00000000000000..cd79597821941e --- /dev/null +++ b/ports/curl/0020-fix-pc-file.patch @@ -0,0 +1,16 @@ +diff -urw a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-05-10 20:46:52.204346972 +0200 ++++ b/CMakeLists.txt 2021-05-11 19:39:00.065235266 +0200 +@@ -1482,6 +1482,12 @@ + message(WARNING "Bad lib in library list: ${_libname}") + continue() + endif() ++ elseif(_lib MATCHES "^(.*)/([^/]*)[.]framework$") ++ if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) ++ set(_lib "-framework ${CMAKE_MATCH_2}") ++ else() ++ set(_lib "-framework ${_lib}") ++ endif() + endif() + if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-") + set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}") diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 3512adeaf81e58..6d410fb58b9231 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0010_fix_othertests_cmake.patch 0011_fix_static_build.patch 0012-fix-dependency-idn2.patch + 0020-fix-pc-file.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 6efa34f0f645d4..7059f6d4749868 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curl", "version": "7.74.0", - "port-version": 7, + "port-version": 8, "description": "A library for transferring data with URLs", "homepage": "https://github.com/curl/curl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 95ba95d9afe84b..8d3e9036618978 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1562,7 +1562,7 @@ }, "curl": { "baseline": "7.74.0", - "port-version": 7 + "port-version": 8 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index dfca5d4c4a0045..e0b511bb645e8b 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd05855cc1cd2d0f221664f0bfbe639b685fa028", + "version": "7.74.0", + "port-version": 8 + }, { "git-tree": "2184d79bb98ed36af015203385175cade013d8af", "version": "7.74.0", From 3873570c5e1c28eb24277bd0b15daf5d2959ff2f Mon Sep 17 00:00:00 2001 From: Alex Reinking Date: Thu, 1 Jul 2021 07:24:48 -0700 Subject: [PATCH 0034/1858] [halide] Fix several issues with the Halide port after v12 (#18747) * Fix several issues with the Halide port after v12 1. Use vcpkg-cmake and vcpkg-cmake-config ports 2. Fix usage file to point to relevant documentation 3. Remove OpenGL feature (Halide 12 dropped support) 4. Drop VCPKG_POLICY_EMPTY_PACKAGE 5. Set new Halide packaging variables for better vcpkg compliance. * update versions --- ports/halide/portfile.cmake | 28 ++++++++++++++++------------ ports/halide/usage | 2 +- ports/halide/vcpkg.json | 13 +++++++++---- versions/baseline.json | 2 +- versions/h-/halide.json | 5 +++++ 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/ports/halide/portfile.cmake b/ports/halide/portfile.cmake index 83e8399aa58bab..486726c289e395 100644 --- a/ports/halide/portfile.cmake +++ b/ports/halide/portfile.cmake @@ -1,10 +1,5 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -# Halide distributes some loadable modules that belong in lib on all platforms. -# CMake defaults module DLLs into the lib folder, which is incompatible with -# vcpkg’s current policy. This sidesteps that issue, a bit bluntly. -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO halide/Halide @@ -25,15 +20,13 @@ vcpkg_check_features( target-mips TARGET_MIPS target-nvptx TARGET_NVPTX target-opencl TARGET_OPENCL - target-opengl TARGET_OPENGL target-powerpc TARGET_POWERPC target-riscv TARGET_RISCV target-x86 TARGET_X86 ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DWITH_DOCS=NO -DWITH_PYTHON_BINDINGS=NO @@ -42,10 +35,14 @@ vcpkg_configure_cmake( -DWITH_UTILS=NO -DCMAKE_INSTALL_LIBDIR=bin -DCMAKE_INSTALL_DATADIR=share/${PORT} - -DHALIDE_INSTALL_CMAKEDIR=share/${PORT} + -DHalide_INSTALL_CMAKEDIR=share/${PORT} + -DHalide_INSTALL_HELPERSDIR=share/HalideHelpers + -DHalide_INSTALL_PLUGINDIR=bin ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +# ADD_BIN_TO_PATH needed to compile autoschedulers, +# which use Halide.dll (and deps) during the build. +vcpkg_cmake_install(ADD_BIN_TO_PATH) vcpkg_copy_tools( TOOL_NAMES @@ -56,9 +53,16 @@ vcpkg_copy_tools( AUTO_CLEAN ) -vcpkg_copy_pdbs() +# Release mode MODULE targets in CMake don't get PDBs. +# Exclude those to avoid warning with default globs. +vcpkg_copy_pdbs( + BUILD_PATHS + "${CURRENT_PACKAGES_DIR}/bin/Halide.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" +) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() +vcpkg_cmake_config_fixup(PACKAGE_NAME HalideHelpers) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/halide/usage b/ports/halide/usage index 117e243b6c0507..591e497db458ef 100644 --- a/ports/halide/usage +++ b/ports/halide/usage @@ -11,4 +11,4 @@ The package halide provides CMake targets: target_link_libraries(main PRIVATE filter) For more information see: - https://github.com/halide/Halide/blob/v11.0.1/README_cmake.md + https://github.com/halide/Halide/blob/v12.0.1/README_cmake.md diff --git a/ports/halide/vcpkg.json b/ports/halide/vcpkg.json index c66fef61b0da60..baa99449ae8893 100644 --- a/ports/halide/vcpkg.json +++ b/ports/halide/vcpkg.json @@ -1,6 +1,7 @@ { "name": "halide", "version": "12.0.1", + "port-version": 1, "description": "Halide is a programming language designed to make it easier to write high-performance image and array processing code on modern machines.", "homepage": "https://github.com/halide/Halide", "supports": "!uwp", @@ -12,6 +13,14 @@ "enable-rtti", "tools" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ @@ -82,7 +91,6 @@ "target-mips", "target-nvptx", "target-opencl", - "target-opengl", "target-powerpc", "target-riscv", "target-x86" @@ -159,9 +167,6 @@ "target-opencl": { "description": "Include OpenCL-C target" }, - "target-opengl": { - "description": "Include OpenGL/GLSL target" - }, "target-powerpc": { "description": "Include PowerPC target", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8d3e9036618978..e5dce753ef1153 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2458,7 +2458,7 @@ }, "halide": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "happly": { "baseline": "2021-03-19", diff --git a/versions/h-/halide.json b/versions/h-/halide.json index 9d1bf20db20a67..8a2628d869f258 100644 --- a/versions/h-/halide.json +++ b/versions/h-/halide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "512cb4dd40ca40afbf0c6a35f7bdc595589a0b10", + "version": "12.0.1", + "port-version": 1 + }, { "git-tree": "50e2c4835a57bb4a172c4b82b2a0e0a3077088ab", "version": "12.0.1", From 55ad45cb16848cf827ac431915d613cfe609a63e Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 1 Jul 2021 22:25:35 +0800 Subject: [PATCH 0035/1858] [nettle] Remove from ci.baseline.txt (#18745) * [nettle] Test on x64 windows * Revert the changes for nettle --- scripts/ci.baseline.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bd0f256d4008a8..668d0e0f2416bb 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1030,9 +1030,6 @@ nativefiledialog:arm-uwp=fail nativefiledialog:x64-uwp=fail nethost:x64-uwp=fail nethost:arm-uwp=fail -nettle:x64-windows-static=skip -nettle:x64-windows-static-md=skip -nettle:x64-windows=skip ngspice:x64-windows-static=fail nng:arm-uwp=fail nng:x64-uwp=fail From e6d1f77705eb4ab11944b2114844504150234eb4 Mon Sep 17 00:00:00 2001 From: aggieNick02 Date: Thu, 1 Jul 2021 09:27:37 -0500 Subject: [PATCH 0036/1858] [tbb] Remove ability to disable exception support in TBB runtime (#18740) * After filing an issue with TBB (https://github.com/oneapi-src/oneTBB/issues/414), I found out that building the library with exceptions explicitly disabled as I had added support for had gone from not officially supported to more explicitly disallowed * update tbb port-version * run x-add-version --- ports/tbb/CMakeLists.txt | 6 +----- ports/tbb/CONTROL | 2 +- ports/tbb/portfile.cmake | 15 --------------- versions/baseline.json | 2 +- versions/t-/tbb.json | 5 +++++ 5 files changed, 8 insertions(+), 22 deletions(-) diff --git a/ports/tbb/CMakeLists.txt b/ports/tbb/CMakeLists.txt index a485d119d53dfb..ae53c40f2a6251 100644 --- a/ports/tbb/CMakeLists.txt +++ b/ports/tbb/CMakeLists.txt @@ -1,13 +1,9 @@ project(tbb CXX) -option(DISABLE_EXCEPTIONS "Set exceptions=0 for make to turn off exception support in TBB" OFF) file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*) file(COPY ${SOURCES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/src) include(${CMAKE_CURRENT_BINARY_DIR}/src/cmake/TBBBuild.cmake REQUIRED) -if(DISABLE_EXCEPTIONS) - set(DISABLE_EXCEPTIONS_ARG exceptions=0) -endif() if(NOT BUILD_SHARED_LIBS) set(TBB_STATIC_INCLUDE extra_inc=big_iron.inc) endif() @@ -30,7 +26,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() endif() -tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${DISABLE_EXCEPTIONS_ARG} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) +tbb_build(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/src MAKE_ARGS ${arch} ${CPLUS} ${CONLY} ${TBB_STATIC_INCLUDE} ${FORWARD_SDK_ROOT}) set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/tbb_cmake_build/tbb_cmake_build_subdir) if(CMAKE_BUILD_TYPE STREQUAL "Release") diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL index ea2bdc140dea17..b089a3e7d91707 100644 --- a/ports/tbb/CONTROL +++ b/ports/tbb/CONTROL @@ -1,6 +1,6 @@ Source: tbb Version: 2020_U3 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/01org/tbb Description: Intel's Threading Building Blocks. Supports: !(uwp|arm|arm64) | linux | osx diff --git a/ports/tbb/portfile.cmake b/ports/tbb/portfile.cmake index ada16a7d7138ad..bf65511b788943 100644 --- a/ports/tbb/portfile.cmake +++ b/ports/tbb/portfile.cmake @@ -14,22 +14,11 @@ vcpkg_from_github( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -if (TBB_DISABLE_EXCEPTIONS) - message(STATUS "Building TBB with exception-handling constructs disabled because TBB_DISABLE_EXCEPTIONS is set to ON.") -else() - message(STATUS "TBB uses exception-handling constructs by default (if supported by the compiler). This use can be disabled with 'SET(TBB_DISABLE_EXCEPTIONS ON)' in your custom triplet.") -endif() if (NOT VCPKG_TARGET_IS_WINDOWS) - if (TBB_DISABLE_EXCEPTIONS) - set(DISABLE_EXCEPTIONS ON) - else() - set(DISABLE_EXCEPTIONS OFF) - endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DDISABLE_EXCEPTIONS=${DISABLE_EXCEPTIONS} ) vcpkg_install_cmake() @@ -73,10 +62,6 @@ else() string(REPLACE "\/D_CRT_SECURE_NO_DEPRECATE" "\/D_CRT_SECURE_NO_DEPRECATE \/DIN_CILK_RUNTIME" SLN_CONFIGURE "${SLN_CONFIGURE}") endif() - if (TBB_DISABLE_EXCEPTIONS) - string(REPLACE "%(PreprocessorDefinitions)<\/PreprocessorDefinitions>" - "TBB_USE_EXCEPTIONS=0;%(PreprocessorDefinitions)<\/PreprocessorDefinitions>" SLN_CONFIGURE "${SLN_CONFIGURE}") - endif() file(WRITE ${CONFIGURE_FILE_NAME} "${SLN_CONFIGURE}") endmacro() diff --git a/versions/baseline.json b/versions/baseline.json index e5dce753ef1153..956d6e02c782e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6098,7 +6098,7 @@ }, "tbb": { "baseline": "2020_U3", - "port-version": 4 + "port-version": 5 }, "tcl": { "baseline": "core-9-0-a1", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 2655af3fd20897..71c441dbf8051e 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "475f44cf5033c6f3bfb5c69c5a301cddf18e7aa0", + "version-string": "2020_U3", + "port-version": 5 + }, { "git-tree": "4e6228578b0ca40358f584aa1ea8b4a9ac2d4ed9", "version-string": "2020_U3", From d3adc3c585030fdec3725be4f45dce86d104973a Mon Sep 17 00:00:00 2001 From: Yuriy O'Donnell Date: Thu, 1 Jul 2021 16:29:16 +0200 Subject: [PATCH 0037/1858] [libressl] update to 3.3.3 (#18729) Resolves #18682 --- ports/libressl/0001-enable-ocspcheck-on-msvc.patch | 2 +- ports/libressl/0002-suppress-msvc-warnings.patch | 2 +- ports/libressl/CONTROL | 8 -------- ports/libressl/portfile.cmake | 10 ++++++---- ports/libressl/vcpkg.json | 11 +++++++++++ versions/baseline.json | 4 ++-- versions/l-/libressl.json | 5 +++++ 7 files changed, 26 insertions(+), 16 deletions(-) delete mode 100644 ports/libressl/CONTROL create mode 100644 ports/libressl/vcpkg.json diff --git a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch index fa1884a2e45646..53083d314e8229 100644 --- a/ports/libressl/0001-enable-ocspcheck-on-msvc.patch +++ b/ports/libressl/0001-enable-ocspcheck-on-msvc.patch @@ -9,7 +9,7 @@ index 3c80458..e8d3bf5 100644 OCSPCHECK_SRC http.c @@ -13,13 +11,27 @@ else() - set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/memmem.c) + set(OCSPCHECK_SRC ${OCSPCHECK_SRC} compat/strtonum.c) endif() +check_function_exists(getopt HAVE_GETOPT) diff --git a/ports/libressl/0002-suppress-msvc-warnings.patch b/ports/libressl/0002-suppress-msvc-warnings.patch index 7a5bf0038ec1ca..79d756622b42b4 100644 --- a/ports/libressl/0002-suppress-msvc-warnings.patch +++ b/ports/libressl/0002-suppress-msvc-warnings.patch @@ -3,7 +3,7 @@ index a6a7554..b20fd4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,6 +111,11 @@ if(WIN32) - set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32) + set(PLATFORM_LIBS ${PLATFORM_LIBS} ws2_32 bcrypt) endif() +if(MSVC AND MSVC_VERSION GREATER_EQUAL 1912) diff --git a/ports/libressl/CONTROL b/ports/libressl/CONTROL deleted file mode 100644 index 2b7d62ec20a9a6..00000000000000 --- a/ports/libressl/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: libressl -Version: 2.9.1 -Port-Version: 3 -Description: LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes. -Supports: !(uwp|arm) - -Feature: tools -Description: Build openssl and ocspcheck executables diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 7e37c207edd966..7483e02c880e92 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") -set(LIBRESSL_VERSION 2.9.1) -set(LIBRESSL_HASH 7051911e566bb093c48a70da72c9981b870e3bf49a167ba6c934eece873084cc41221fbe3cd0c8baba268d0484070df7164e4b937854e716337540a87c214354) +set(LIBRESSL_VERSION 3.3.3) +set(LIBRESSL_HASH 2d0b5f4cfe37d573bc64d5967abb77f536dbe581fbad9637d925332bcdfd185fe6810335b2af80a89f92d7e6edaa8ea3ba2492c60a117e47ea1b2d6aacf01f0f) vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE @@ -26,7 +26,8 @@ vcpkg_extract_source_archive_ex( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "tools" LIBRESSL_APPS + FEATURES + "tools" LIBRESSL_APPS ) vcpkg_configure_cmake( @@ -59,6 +60,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc/ssl/certs" + "${CURRENT_PACKAGES_DIR}/debug/etc/ssl/certs" "${CURRENT_PACKAGES_DIR}/share/man" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" @@ -68,7 +70,7 @@ vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -if((VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(GLOB_RECURSE LIBS "${CURRENT_PACKAGES_DIR}/*.lib") foreach(LIB ${LIBS}) string(REGEX REPLACE "(.+)-[0-9]+\\.lib" "\\1.lib" LINK "${LIB}") diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json new file mode 100644 index 00000000000000..59c18243c2fb50 --- /dev/null +++ b/ports/libressl/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libressl", + "version": "3.3.3", + "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", + "supports": "!(uwp | arm)", + "features": { + "tools": { + "description": "Build openssl and ocspcheck executables" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 956d6e02c782e0..459ef31666b6e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3501,8 +3501,8 @@ "port-version": 0 }, "libressl": { - "baseline": "2.9.1", - "port-version": 3 + "baseline": "3.3.3", + "port-version": 0 }, "librsvg": { "baseline": "2.40.20", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index 62ab6a809d3ef2..c8d28210087c96 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24a18d6ed79f2b8c4c01c5201998981b2d831a1a", + "version": "3.3.3", + "port-version": 0 + }, { "git-tree": "3de8a5b9f15524db17ccff3c0a4c61266d8fb3b1", "version-string": "2.9.1", From d7cc773a6ea04635861a2b8036b01a957af9a0c5 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 1 Jul 2021 16:29:42 +0200 Subject: [PATCH 0038/1858] [asio] update to 1.18.2 (#18728) * [asio] update to 1.18.2 * update versions --- ports/asio/inline_dummy_return.patch | 13 ------------- ports/asio/portfile.cmake | 7 ++----- ports/asio/vcpkg.json | 3 +-- versions/a-/asio.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 ports/asio/inline_dummy_return.patch diff --git a/ports/asio/inline_dummy_return.patch b/ports/asio/inline_dummy_return.patch deleted file mode 100644 index 7df7ca641e5336..00000000000000 --- a/ports/asio/inline_dummy_return.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp -index 60a6f5cd..af7be635 100644 ---- a/asio/include/asio/impl/use_awaitable.hpp -+++ b/asio/include/asio/impl/use_awaitable.hpp -@@ -236,7 +236,7 @@ T dummy_return() - } - - template <> --void dummy_return() -+inline void dummy_return() - { - } - #endif // defined(_MSC_VER) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index af3683874e75d1..d5f65149acdd39 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-18-1 - SHA512 c84e6fca448ed419a976756840f3f4543291a5a7d4f62d4de7c06945b2cd9ececca6633049ad5e36367d60f67a4f2735be017445514ae9fa9497d4af2a4d48f8 + REF asio-1-18-2 + SHA512 5a2312f1a14106e3109a9f02e8ac65a1d639b411834f0aa301767a4dd30d8384f6f1a94034b6016ef989c7d7880fd4c8de11c7be0cb58b4dc64a49ec335a7113 HEAD_REF master - PATCHES - inline_dummy_return.patch ) # Always use "ASIO_STANDALONE" to avoid boost dependency @@ -30,4 +28,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 076b4f60894754..5f285c16fa15a0 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "asio", - "version": "1.18.1", - "port-version": 1, + "version": "1.18.2", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index abb5129252526a..658bbdd9af9d03 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae594f45685a04883ec38208caf740ee9c9635e8", + "version": "1.18.2", + "port-version": 0 + }, { "git-tree": "09afe8ce875f1c4e5e46d54c7c8bd5d0b9b512fc", "version": "1.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index 459ef31666b6e1..e9624319f28250 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -165,8 +165,8 @@ "port-version": 0 }, "asio": { - "baseline": "1.18.1", - "port-version": 1 + "baseline": "1.18.2", + "port-version": 0 }, "asiosdk": { "baseline": "2.3.3", From 332232f2de696ae3c0140a637aa84bbb8587885a Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 1 Jul 2021 17:30:13 +0300 Subject: [PATCH 0039/1858] [json-dto] Update to 0.2.13 (#18710) * json_dto updated to 0.2.13. * x-add-version for json-dto. --- ports/json-dto/portfile.cmake | 5 +++-- ports/json-dto/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/json-dto.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/json-dto/portfile.cmake b/ports/json-dto/portfile.cmake index 682991ae1a4b09..dd888973ab9ea6 100644 --- a/ports/json-dto/portfile.cmake +++ b/ports/json-dto/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/json_dto - REF a1375492e93cc698af60fe7937511ff28d87a5c8 # v.0.2.12 - SHA512 d9306b7ea8b682ae7d76c6df518c64c444772c47b2b6750f5ebb609476aac5bd9ad529be802ad3348775e30169b0e86d8588aa897766d2f51c2f5186f7cb1354 + REF 7fce92cd3bdacdcd0b41ed26d2cc981e3f70956e # v.0.2.13 + SHA512 f678545cc60828ab76d6e8532ac9dbf8e4e68d873d0a98f17d62934dd0b3a3e255b38adf838b65a12e0d954edc7866eb6393f6783709f6f7fac29167886e7bf3 ) vcpkg_configure_cmake( @@ -23,3 +23,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/json-dto/vcpkg.json b/ports/json-dto/vcpkg.json index b97740acaeb93e..8681bd20fc10e7 100644 --- a/ports/json-dto/vcpkg.json +++ b/ports/json-dto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "json-dto", - "version": "0.2.12", + "version": "0.2.13", "description": "A small header-only library for converting data between json representation and c++ structs.", "homepage": "https://github.com/Stiffstream/json_dto", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index e9624319f28250..58715bcc0ab15e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2773,7 +2773,7 @@ "port-version": 1 }, "json-dto": { - "baseline": "0.2.12", + "baseline": "0.2.13", "port-version": 0 }, "json-schema-validator": { diff --git a/versions/j-/json-dto.json b/versions/j-/json-dto.json index eea4d02cff5ff2..d04ece23db4d60 100644 --- a/versions/j-/json-dto.json +++ b/versions/j-/json-dto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4576b8566a843cf16e9a38143d1a99ae832d130", + "version": "0.2.13", + "port-version": 0 + }, { "git-tree": "9a981571e3da6bf7df6ad44cb3ee5f816134c5f9", "version": "0.2.12", From 1bf88acc6243b6c561ffb193a26decbbd7d90da4 Mon Sep 17 00:00:00 2001 From: goyarn <59996142+goyarn@users.noreply.github.com> Date: Thu, 1 Jul 2021 23:35:24 +0900 Subject: [PATCH 0040/1858] [README_ko_KR.md] Fix typo for korean doc (#18673) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ì›ë„ìš° -> 윈ë„ìš° --- README_ko_KR.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_ko_KR.md b/README_ko_KR.md index f9270fe7cc60b4..3f76ac0c5c0d67 100644 --- a/README_ko_KR.md +++ b/README_ko_KR.md @@ -20,7 +20,7 @@ vcpkg ì‚¬ìš©ì„ ì‹œìž‘í•˜ëŠ” ë°©ë²•ì€ [시작하기](#시작하기) ì„¹ì…˜ì„ - [Vcpkg: 개요 둘러보기](#vcpkg-개요) - [목차](#목차) - [시작하기](#시작하기) - - [빠르게 시작하기: ì›ë„ìš°](#빠르게-시작하기-ì›ë„ìš°) + - [빠르게 시작하기: 윈ë„ìš°](#빠르게-시작하기-윈ë„ìš°) - [빠르게 시작하기: 유닉스](#빠르게-시작하기-유닉스) - [리눅스 ê°œë°œìž ë„구 설치하기](#리눅스-개발ìž-ë„구-설치하기) - [macOS ê°œë°œìž ë„구 설치하기](#macos-개발ìž-ë„구-설치하기) From bef319649e26e29af1791b0e59fe25e08b68cc92 Mon Sep 17 00:00:00 2001 From: Charles Karney Date: Thu, 1 Jul 2021 10:35:58 -0400 Subject: [PATCH 0041/1858] [geographiclib] Update to version 1.52 (#18694) * [geographiclib] Update to version 1.52 * run ./vcpkg x-add-version geographiclib * ports/geographiclib/vcpkg.json: version-string -> version * Another iteration with x-add-version --- ports/geographiclib/cxx-library-only.patch | 19 +++---------------- ports/geographiclib/portfile.cmake | 4 ++-- ports/geographiclib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/geographiclib.json | 5 +++++ 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/ports/geographiclib/cxx-library-only.patch b/ports/geographiclib/cxx-library-only.patch index 2e3893a9745fe4..d1201794b55597 100644 --- a/ports/geographiclib/cxx-library-only.patch +++ b/ports/geographiclib/cxx-library-only.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 345df69b..cb891034 100644 +index eb08bd48..88552153 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,6 +196,11 @@ else () @@ -74,23 +74,10 @@ index 345df69b..cb891034 100644 if (GEOGRAPHICLIB_PRECISION EQUAL 2) set (NETGEOGRAPHICLIB_LIBRARIES NETGeographicLib) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index cbc21961..69c923bc 100644 +index fd0669f2..4744e08d 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -33,10 +33,10 @@ configure_file (project-config.cmake.in - configure_file (project-config-version.cmake.in - "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-config-version.cmake" @ONLY) - export (TARGETS -- ${PROJECT_ALL_LIBRARIES} ${TOOLS} -+ ${PROJECT_ALL_LIBRARIES} - FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-targets.cmake") - export (TARGETS -- ${PROJECT_ALL_LIBRARIES} ${TOOLS} -+ ${PROJECT_ALL_LIBRARIES} - NAMESPACE ${PROJECT_NAME}:: - FILE "${PROJECT_BINARY_DIR}/${PROJECT_NAME_LOWER}-namespace-targets.cmake") - -@@ -44,13 +44,7 @@ export (TARGETS +@@ -56,13 +56,7 @@ export (TARGETS # ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative # path to the root from there. (Note that the whole install tree can # be relocated.) diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index e948114cd65649..3b7bd3f51fa256 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_sourceforge ( OUT_SOURCE_PATH SOURCE_PATH REPO geographiclib REF distrib - FILENAME "GeographicLib-1.51.tar.gz" - SHA512 34487a09fa94a34d24179cfe9fd2e5fdda28675966703ca137cbfe6cc88760c2fbde55f76c464de060b58bfe0a516e22c0f59318cf85ae7cc01c5c6a73dd6ead + FILENAME "GeographicLib-1.52.tar.gz" + SHA512 98a4d33764db4a4755851a7db639fd9e055dcf4f1f949258e112fce2e198076b5896fcae2c1ea36b37fe1000d28eec326636a730e70f25bc19a1610423ba6859 PATCHES cxx-library-only.patch ) diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index 18deaa7714082e..df18eaf32021b4 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "geographiclib", - "version-string": "1.51", + "version": "1.52", "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 58715bcc0ab15e..b01def7acb67d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2221,7 +2221,7 @@ "port-version": 3 }, "geographiclib": { - "baseline": "1.51", + "baseline": "1.52", "port-version": 0 }, "geos": { diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index dd034bcd511365..8fd320c34ee033 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b80d69df97ec60b98b202270c5357b72729fbc90", + "version": "1.52", + "port-version": 0 + }, { "git-tree": "eafff91d7abd708bd49584dc4070e091d427e333", "version-string": "1.51", From 1441ec4eafcca66876eb871886a6c2ab8417b9e8 Mon Sep 17 00:00:00 2001 From: Daumantas Kavolis <12998363+dkavolis@users.noreply.github.com> Date: Thu, 1 Jul 2021 15:36:27 +0100 Subject: [PATCH 0042/1858] [spdlog] Do not build examples (#18639) * Don't build spdlog examples * Update port version --- ports/spdlog/portfile.cmake | 1 + ports/spdlog/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/spdlog.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 1af8b142b0735a..0d95db43a76aab 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -21,6 +21,7 @@ vcpkg_cmake_configure( -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_INSTALL=ON -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED} + -DSPDLOG_BUILD_EXAMPLE=OFF ) vcpkg_cmake_install() diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index aa24c34b7246c4..21f33d83defaac 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdlog", "version-semver": "1.8.5", - "port-version": 2, + "port-version": 3, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b01def7acb67d4..5bd298deca9165 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5930,7 +5930,7 @@ }, "spdlog": { "baseline": "1.8.5", - "port-version": 2 + "port-version": 3 }, "spectra": { "baseline": "0.9.0", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index 533df0dca00405..f0dd94172b7e08 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f74643a7b8056237da08c41a653f5b0592870906", + "version-semver": "1.8.5", + "port-version": 3 + }, { "git-tree": "9aa80a12ad92e29cfc19df70b9fd615b4aa5997b", "version-semver": "1.8.5", From 62382b3a8aede0472b89ec06b09477a8913960ca Mon Sep 17 00:00:00 2001 From: An Tao Date: Thu, 1 Jul 2021 22:36:43 +0800 Subject: [PATCH 0043/1858] [drogon] Update to 1.7.1 (#18643) --- ports/drogon/CONTROL | 2 +- ports/drogon/portfile.cmake | 8 +++++--- ports/drogon/ssize_t.patch | 13 ------------- versions/baseline.json | 2 +- versions/d-/drogon.json | 5 +++++ 5 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 ports/drogon/ssize_t.patch diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL index e4da939a31efdb..fc00ee3ad3b79a 100644 --- a/ports/drogon/CONTROL +++ b/ports/drogon/CONTROL @@ -1,5 +1,5 @@ Source: drogon -Version: 1.6.0 +Version: 1.7.1 Homepage: https://github.com/an-tao/drogon Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows) diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 69ea0cf5559259..0171af1d511968 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.6.0 - SHA512 3e3012bbee0a12cfabf79581bc0f57592065bc9618ed18c17ef77afee55750c8a8b8626053863208928b173cd0629f271a14a07e602f8ea93976c43b3ba5c9db + REF v1.7.1 + SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6 HEAD_REF master PATCHES vcpkg.patch resolv.patch drogon_config.patch - ssize_t.patch ) vcpkg_check_features( @@ -30,6 +29,9 @@ vcpkg_install_cmake() # Fix CMake files vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon) + +vcpkg_fixup_pkgconfig() + # Copy drogon_ctl if("ctl" IN_LIST FEATURES) message("copying tools") diff --git a/ports/drogon/ssize_t.patch b/ports/drogon/ssize_t.patch deleted file mode 100644 index aae977522a37ef..00000000000000 --- a/ports/drogon/ssize_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/orm_lib/inc/drogon/orm/Mapper.h b/orm_lib/inc/drogon/orm/Mapper.h -index d248625..8911f7f 100644 ---- a/orm_lib/inc/drogon/orm/Mapper.h -+++ b/orm_lib/inc/drogon/orm/Mapper.h -@@ -21,7 +21,7 @@ - #include - - #ifdef _WIN32 --using ssize_t = std::intptr_t; -+using ssize_t = long long; - #endif - - namespace drogon diff --git a/versions/baseline.json b/versions/baseline.json index 5bd298deca9165..7c2e34188ae409 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1749,7 +1749,7 @@ "port-version": 0 }, "drogon": { - "baseline": "1.6.0", + "baseline": "1.7.1", "port-version": 0 }, "dtl": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index fad0fff2c3f229..309d7689d78652 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a325c34025250341e3f721353d5d3dfa66017e2b", + "version-string": "1.7.1", + "port-version": 0 + }, { "git-tree": "29f71d851bbd006bfed9aaad62b34158b3f7cc0a", "version-string": "1.6.0", From 9ece68a3d005091a77de5651d410bc06674f64df Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 1 Jul 2021 22:38:43 +0800 Subject: [PATCH 0044/1858] [socket-io-client] update to 3.0.0 (#18646) * [socket-io-client] update to 3.0.0 * update version * update patch file * update version --- ports/socket-io-client/CONTROL | 4 -- ports/socket-io-client/fix-error-C3321.patch | 13 +++++++ .../socket-io-client/fix-file-not-found.patch | 38 +++++++++++++++++++ ports/socket-io-client/fix-install.patch | 22 ----------- ports/socket-io-client/portfile.cmake | 13 ++++--- ports/socket-io-client/vcpkg.json | 11 ++++++ versions/baseline.json | 2 +- versions/s-/socket-io-client.json | 5 +++ 8 files changed, 76 insertions(+), 32 deletions(-) delete mode 100644 ports/socket-io-client/CONTROL create mode 100644 ports/socket-io-client/fix-error-C3321.patch create mode 100644 ports/socket-io-client/fix-file-not-found.patch delete mode 100644 ports/socket-io-client/fix-install.patch create mode 100644 ports/socket-io-client/vcpkg.json diff --git a/ports/socket-io-client/CONTROL b/ports/socket-io-client/CONTROL deleted file mode 100644 index bd7b036a8d09e9..00000000000000 --- a/ports/socket-io-client/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: socket-io-client -Version: 1.6.1-1 -Description: C++11 implementation of Socket.IO client -Build-Depends: boost, rapidjson, websocketpp diff --git a/ports/socket-io-client/fix-error-C3321.patch b/ports/socket-io-client/fix-error-C3321.patch new file mode 100644 index 00000000000000..6a36e9d979f87d --- /dev/null +++ b/ports/socket-io-client/fix-error-C3321.patch @@ -0,0 +1,13 @@ +diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp +index f78aea4..6780e26 100644 +--- a/src/internal/sio_client_impl.cpp ++++ b/src/internal/sio_client_impl.cpp +@@ -286,7 +286,7 @@ namespace sio + if(ec || m_con.expired()) + { + if (ec != asio::error::operation_aborted) +- LOG("ping exit,con is expired?"< Date: Thu, 1 Jul 2021 10:39:09 -0400 Subject: [PATCH 0045/1858] [morton-nd] Update to v4.0.0. (#18652) * Update morton-nd to v4.0.0. * Update baselines. --- ports/morton-nd/CONTROL | 2 +- ports/morton-nd/portfile.cmake | 6 +++--- versions/baseline.json | 2 +- versions/m-/morton-nd.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/morton-nd/CONTROL b/ports/morton-nd/CONTROL index e6866779ecc869..34bd160e57f36b 100644 --- a/ports/morton-nd/CONTROL +++ b/ports/morton-nd/CONTROL @@ -1,4 +1,4 @@ Source: morton-nd -Version: 3.0.0 +Version: 4.0.0 Homepage: https://github.com/kevinhartman/morton-nd Description: header-only constexpr library for fast Morton encoding/decoding in N dimensions. diff --git a/ports/morton-nd/portfile.cmake b/ports/morton-nd/portfile.cmake index 46aa5bef5ecdbe..bd2d6dd0018d0e 100644 --- a/ports/morton-nd/portfile.cmake +++ b/ports/morton-nd/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kevinhartman/morton-nd - REF v3.0.0 - SHA512 659c903c0c4a4ee4179d01950a952fe0c40d2c426063c10515ae5d2ad13ec8ca6b83d8de50c9eb86dd3c2c3747e1594d832f0c28cd6d414703baf9a7ab2f1f36 - HEAD_REF master + REF v4.0.0 + SHA512 19dc51ae5d7fc868625a9c9f0dddec95a77fdeac714300033008f096bc3a83f146738e525e8a0ec541903263355a7fec84b1873d8eacfca4b93d3cd8945653da + HEAD_REF main ) vcpkg_configure_cmake( diff --git a/versions/baseline.json b/versions/baseline.json index 849dba53d617c9..1d60739cc3647c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4105,7 +4105,7 @@ "port-version": 0 }, "morton-nd": { - "baseline": "3.0.0", + "baseline": "4.0.0", "port-version": 0 }, "mosquitto": { diff --git a/versions/m-/morton-nd.json b/versions/m-/morton-nd.json index 9ae9a06d431d46..d21bc7c5418717 100644 --- a/versions/m-/morton-nd.json +++ b/versions/m-/morton-nd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "949f90299960d91f4cfd457a093dd70c5e285782", + "version-string": "4.0.0", + "port-version": 0 + }, { "git-tree": "acdac4e47f9b91d7a7dd27aa9689f029fdd43895", "version-string": "3.0.0", From 61de4bd1594ca3d03d8e95c89f4f31e617a9542c Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 1 Jul 2021 23:25:25 +0800 Subject: [PATCH 0046/1858] [libdatachannel] Fix usage (#18621) * [libdatachannel] Fix usage * Update version files --- ports/libdatachannel/portfile.cmake | 10 +++++++++- ports/libdatachannel/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 563224524f9692..4104d890a6bf88 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -34,4 +34,12 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libdatachannel) vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake DATACHANNEL_CONFIG) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake " +include(CMakeFindDependencyMacro) +find_dependency(Threads) +find_dependency(OpenSSL) +find_dependency(libjuice) +${DATACHANNEL_CONFIG}") + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 7ba32db68fba45..903b994033788d 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.12.2", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1d60739cc3647c..1964256abbdad6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3078,7 +3078,7 @@ }, "libdatachannel": { "baseline": "0.12.2", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.10-3", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 2b289cd5d9c467..ea8a70416a8504 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a13526e9cfc5bfca3aa00e95afa184b498890f69", + "version-semver": "0.12.2", + "port-version": 1 + }, { "git-tree": "dd3107dd99419236f97e299ce4b61c2379a08f55", "version-semver": "0.12.2", From 8dc0fc6cc946d12d5f2aa7cbcac7ce1029bf9aa4 Mon Sep 17 00:00:00 2001 From: Matt Haynie Date: Thu, 1 Jul 2021 08:26:35 -0700 Subject: [PATCH 0047/1858] [fmt] Fix an easily avoidable compilation warning (#18622) * Fix an unconditional #pragma warning breaking other compilers. * Increase fmt version * re-ran vcpkg x-add-version --all --overwrite-version, this time it produced a different result for some reason --- ports/fmt/fix-warning4189.patch | 6 ++++-- ports/fmt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fmt.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch index 0efab0f1c98985..76431c3672b268 100644 --- a/ports/fmt/fix-warning4189.patch +++ b/ports/fmt/fix-warning4189.patch @@ -2,11 +2,13 @@ diff --git a/include/fmt/format.h b/include/fmt/format.h index 4e96539..0f1d179 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h -@@ -33,6 +33,7 @@ +@@ -33,6 +33,9 @@ #ifndef FMT_FORMAT_H_ #define FMT_FORMAT_H_ - + ++#ifdef _MSC_VER +#pragma warning(disable:4189) ++#endif #include #include #include diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index 2328012478dde5..b55b731cca125d 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fmt", "version": "7.1.3", - "port-version": 4, + "port-version": 5, "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1964256abbdad6..f097454a254ff5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2054,7 +2054,7 @@ }, "fmt": { "baseline": "7.1.3", - "port-version": 4 + "port-version": 5 }, "folly": { "baseline": "2020.10.19.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 69976a238ea7fc..13c7be1723249b 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d", + "version": "7.1.3", + "port-version": 5 + }, { "git-tree": "230e140a15afbb9089537e153d8b83f5b994adbe", "version": "7.1.3", From 1b1c9966831a7e95e467e50ac85f20f95a03a7df Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 1 Jul 2021 17:37:59 +0200 Subject: [PATCH 0048/1858] [sentry-native] Update to 0.4.10 (#18627) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 6 +++--- ports/sentry-native/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 706d212d21b471..e810d504ced2b7 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -3,9 +3,9 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.9/sentry-native.zip" - FILENAME "sentry-native-0.4.9.zip" - SHA512 152e3c6cfc7a72421f088f0e9853f016b62e2c22c580edb6255355648d293a31507974bc5c12ef3c0cd721d07797b9948f53ecafa1482d3264504cafac1fe8a3 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.10/sentry-native.zip" + FILENAME "sentry-native-0.4.10.zip" + SHA512 fd7aa8de707b19dfc3704e3f1d73bb35aa65cf26e95df0baf2061ce756232b76b26d406ffc11b53e57d949f5f14899265095d8d4d3f8ff4777cdeceeca5b6f94 ) vcpkg_extract_source_archive_ex( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index cca64cbfbf2e91..131b08ce3b6f0f 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sentry-native", - "version-semver": "0.4.9", - "port-version": 1, + "version-semver": "0.4.10", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index f097454a254ff5..95c43062581485 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5705,8 +5705,8 @@ "port-version": 0 }, "sentry-native": { - "baseline": "0.4.9", - "port-version": 1 + "baseline": "0.4.10", + "port-version": 0 }, "septag-sx": { "baseline": "2019-05-07-2", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index f85102c8e50735..995604ea7dfcf1 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "487eaee55f15e263063288c15aab12d296ac598f", + "version-semver": "0.4.10", + "port-version": 0 + }, { "git-tree": "8200b5e337c4e6074c67a6a2398fa7bbbb3c2e4b", "version-semver": "0.4.9", From 70d4b378fd8a27f7a4b28b2691d1f3cf5c8ca2ad Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Thu, 1 Jul 2021 17:38:44 +0200 Subject: [PATCH 0049/1858] [Vc] Update to 1.4.2 (#18601) --- ports/vc/CONTROL | 3 +-- ports/vc/portfile.cmake | 4 ++-- versions/baseline.json | 4 ++-- versions/v-/vc.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL index c3962f4b49e55f..8b905405668846 100644 --- a/ports/vc/CONTROL +++ b/ports/vc/CONTROL @@ -1,6 +1,5 @@ Source: vc -Version: 1.4.1 -Port-Version: 1 +Version: 1.4.2 Homepage: https://github.com/VcDevel/Vc Description: SIMD Vector Classes for C++ . Supports: !arm64 diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index 7853834d1a61b8..3b51c814190784 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc - REF 1.4.1 - SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a + REF 1.4.2 + SHA512 9a929cd48bdf6b8e94765bd649e7ec42b10dea28e36eff288223d72cffa5f4fc8693e942aa3f780b42d8a0c1824fcabff22ec0622aa8ea5232c9123858b8bbbf HEAD_REF 1.4 PATCHES "correct_cmake_config_path.patch" diff --git a/versions/baseline.json b/versions/baseline.json index 95c43062581485..35b33ad07982c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6501,8 +6501,8 @@ "port-version": 0 }, "vc": { - "baseline": "1.4.1", - "port-version": 1 + "baseline": "1.4.2", + "port-version": 0 }, "vcglib": { "baseline": "1.0.1", diff --git a/versions/v-/vc.json b/versions/v-/vc.json index 8777c912d0eac4..11a39281256508 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "510cde85ec14ef88187857247829183c1c275f63", + "version-string": "1.4.2", + "port-version": 0 + }, { "git-tree": "1ab229fb781ff549e05917c4ec46a1fcd6bd1a3a", "version-string": "1.4.1", From d24731dd4ac80157e5c1b3abee3c9803d38ca005 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Thu, 1 Jul 2021 08:41:40 -0700 Subject: [PATCH 0050/1858] [seal] Fixed cannot find SEAL. (#18596) * Fixed cannot find seal. * Updated versioning. --- ports/seal/portfile.cmake | 2 +- ports/seal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/seal.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index f24241a3f9475d..b458c9067f7209 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -31,7 +31,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/") +vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/SEAL-3.6") if("hexl" IN_LIST FEATURES) vcpkg_fixup_pkgconfig(SKIP_CHECK) diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index ef5b166a57de3f..f7a7928dd8e3ee 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "seal", "version-semver": "3.6.6", + "port-version": 1, "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "supports": "!windows | (windows & static)", diff --git a/versions/baseline.json b/versions/baseline.json index 35b33ad07982c8..3e91c82a771d87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5690,7 +5690,7 @@ }, "seal": { "baseline": "3.6.6", - "port-version": 0 + "port-version": 1 }, "secp256k1": { "baseline": "2017-19-10", diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 53e227f6dae866..56f081d64ba5ed 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89d120a6c3ac5306d90e29913048b518dc5a2c9b", + "version-semver": "3.6.6", + "port-version": 1 + }, { "git-tree": "e487b9120a78480800a1fd914477acf03f677919", "version-semver": "3.6.6", From fa450cb56d76f01734d80b3becff20dc757d77ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 1 Jul 2021 19:03:05 +0300 Subject: [PATCH 0051/1858] [mongo-c-driver] Fix for custom VCPKG_BUILD_TYPE (#18569) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix mongo-c-driver for custom VCPKG_BUILD_TYPE * Update version * Update ports/mongo-c-driver/portfile.cmake * Update versions/m-/mongo-c-driver.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III --- ports/mongo-c-driver/CONTROL | 2 +- ports/mongo-c-driver/portfile.cmake | 34 ++++++++++++++++++----------- versions/baseline.json | 2 +- versions/m-/mongo-c-driver.json | 5 +++++ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL index 6472ce1a20fca9..54a225a02e5a46 100644 --- a/ports/mongo-c-driver/CONTROL +++ b/ports/mongo-c-driver/CONTROL @@ -1,6 +1,6 @@ Source: mongo-c-driver Version: 1.16.1 -Port-Version: 4 +Port-Version: 5 Build-Depends: libbson, openssl (!windows), zlib Description: Client library written in C for MongoDB. Homepage: https://github.com/mongodb/mongo-c-driver diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index 9ddf3a6b41da61..eca359bd6dc728 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -85,20 +85,28 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_TARGET_IS_UWP) - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + if(NOT VCPKG_TARGET_IS_WINDOWS) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) + endif() else() - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + endif() endif() # drop the __declspec(dllimport) when building static diff --git a/versions/baseline.json b/versions/baseline.json index 3e91c82a771d87..d0a31ceedfacdc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4078,7 +4078,7 @@ }, "mongo-c-driver": { "baseline": "1.16.1", - "port-version": 4 + "port-version": 5 }, "mongo-cxx-driver": { "baseline": "3.4.0-5", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index ae610504943f88..033ff1e25338d8 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7", + "version-string": "1.16.1", + "port-version": 5 + }, { "git-tree": "6b948f7f7ff67f47481c2630ba40ab300bceee01", "version-string": "1.16.1", From 080fa10c3a71b1959d01dd92e3a669bfd9aa550a Mon Sep 17 00:00:00 2001 From: bucurb Date: Thu, 1 Jul 2021 17:10:50 +0100 Subject: [PATCH 0052/1858] [protobuf] Fixed protoc path (#18741) * fixed protoc path * bumped version --- ports/protobuf/vcpkg-cmake-wrapper.cmake | 2 +- ports/protobuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/protobuf/vcpkg-cmake-wrapper.cmake b/ports/protobuf/vcpkg-cmake-wrapper.cmake index 542a16c2b8a300..7269aedcca508f 100644 --- a/ports/protobuf/vcpkg-cmake-wrapper.cmake +++ b/ports/protobuf/vcpkg-cmake-wrapper.cmake @@ -11,6 +11,6 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3) cmake_policy(POP) endif() -find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../../@HOST_TRIPLET@/tools/protobuf" NO_DEFAULT_PATH) +find_program(Protobuf_PROTOC_EXECUTABLE NAMES protoc PATHS "${CMAKE_CURRENT_LIST_DIR}/../../tools/protobuf" NO_DEFAULT_PATH) _find_package(${ARGS}) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 5f1926a088ef4d..0e85e376c0ca9e 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "protobuf", "version-semver": "3.15.8", - "port-version": 2, + "port-version": 3, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d0a31ceedfacdc..b3c19ad22b8afe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4986,7 +4986,7 @@ }, "protobuf": { "baseline": "3.15.8", - "port-version": 2 + "port-version": 3 }, "protobuf-c": { "baseline": "1.3.2-2", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 7ce8bc35fdf464..547ba83f2e6606 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88066eeef097b56edc3bff316ce292d57c132d12", + "version-semver": "3.15.8", + "port-version": 3 + }, { "git-tree": "1c52c3eb43c2dfd9603673eb5c173ec69c21ea73", "version-semver": "3.15.8", From 724a0a4c3f17d19ca91f633afaaeda88e5750b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 2 Jul 2021 00:14:08 +0800 Subject: [PATCH 0053/1858] [recast] Export unofficial target (#18671) * [recast] Export unofficial target * update version record * Export INTERFACE_INCLUDE_DIRECTORIES * Export more include dirs. * Update versions/r-/recast.json --- ports/recast/CMakeLists.txt | 26 ++++++++++++++++++-------- ports/recast/CONTROL | 4 ---- ports/recast/portfile.cmake | 12 +++++++----- ports/recast/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++-- versions/r-/recast.json | 5 +++++ 6 files changed, 49 insertions(+), 19 deletions(-) delete mode 100644 ports/recast/CONTROL create mode 100644 ports/recast/vcpkg.json diff --git a/ports/recast/CMakeLists.txt b/ports/recast/CMakeLists.txt index 5b54f6e208a621..7ccc0828a1f31b 100644 --- a/ports/recast/CMakeLists.txt +++ b/ports/recast/CMakeLists.txt @@ -1,14 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(recast) -include_directories( - DebugUtils/Include - Detour/Include - DetourCrowd/Include - DetourTileCache/Include - Recast/Include -) - set(SRC DebugUtils/Source/DebugDraw.cpp DebugUtils/Source/DetourDebugDraw.cpp @@ -42,12 +34,30 @@ set(SRC add_library(recast ${SRC}) +target_include_directories( + recast PUBLIC + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ + $ +) + install( TARGETS recast + EXPORT unofficial-recast-config LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) +install(EXPORT unofficial-recast-config DESTINATION share/unofficial-recast) + if(NOT DISABLE_INSTALL_HEADERS) install(DIRECTORY DebugUtils/Include/ DESTINATION include/recast/DebugUtils) install(DIRECTORY Detour/Include/ DESTINATION include/recast/Detour) diff --git a/ports/recast/CONTROL b/ports/recast/CONTROL deleted file mode 100644 index 3726b99d501307..00000000000000 --- a/ports/recast/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: recast -Version: 1.5.1-3 -Homepage: https://github.com/recastnavigation/recastnavigation -Description: Navigation-mesh Toolset for Games diff --git a/ports/recast/portfile.cmake b/ports/recast/portfile.cmake index 3b6038e41c5b92..11484caa16b9d1 100644 --- a/ports/recast/portfile.cmake +++ b/ports/recast/portfile.cmake @@ -8,16 +8,18 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/recast RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-recast CONFIG_PATH share/unofficial-recast) vcpkg_copy_pdbs() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/recast/vcpkg.json b/ports/recast/vcpkg.json new file mode 100644 index 00000000000000..5abe9f93b06f5d --- /dev/null +++ b/ports/recast/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "recast", + "version": "1.5.1", + "port-version": 4, + "description": "Navigation-mesh Toolset for Games", + "homepage": "https://github.com/recastnavigation/recastnavigation", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b3c19ad22b8afe..6ac5f11392233e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5469,8 +5469,8 @@ "port-version": 1 }, "recast": { - "baseline": "1.5.1-3", - "port-version": 0 + "baseline": "1.5.1", + "port-version": 4 }, "redis-plus-plus": { "baseline": "1.2.3", diff --git a/versions/r-/recast.json b/versions/r-/recast.json index d4fcf997122c22..82f778cd71bafd 100644 --- a/versions/r-/recast.json +++ b/versions/r-/recast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f34af0b398b4c37f0cdf3fcd8dc9db965e4dd5e", + "version": "1.5.1", + "port-version": 4 + }, { "git-tree": "41f8cc06fc981d330671b88e08d02de55934155c", "version-string": "1.5.1-3", From ca019a9dc053c7ecafe87b9e3556289947706d27 Mon Sep 17 00:00:00 2001 From: Sander Cox Date: Thu, 1 Jul 2021 18:21:55 +0200 Subject: [PATCH 0054/1858] [vcpkg] Expand Architecture list with escape chars (#18156) * Expand Architecture list with escape chars This expands the architecture lists with escape characters. When building FAT binaries for macos using multiple architectures in the values they need to be escaped otherwise they are passed on to CMake incorrectly #14932 * Adding the architecture fix to vcpkg-cmake port updating port vcpkg-cmake version * updated version in baseline --- ports/vcpkg-cmake/vcpkg.json | 4 ++-- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 6 ++++-- scripts/cmake/vcpkg_configure_cmake.cmake | 7 ++++--- versions/baseline.json | 4 ++-- versions/v-/vcpkg-cmake.json | 5 +++++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 8e2ac9ec664858..ffda714e3fe066 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", - "version-date": "2021-02-28", - "port-version": 3 + "version-date": "2021-06-25", + "port-version": 4 } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index acc6f365547aa8..beffd32b0519ba 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -251,6 +251,7 @@ function(vcpkg_cmake_configure) endif() + list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecture_string) list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" @@ -274,7 +275,7 @@ function(vcpkg_cmake_configure) "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" - "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" + "-DVCPKG_TARGET_ARCHITECTURE=${target_architecture_string}" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" @@ -289,7 +290,8 @@ function(vcpkg_cmake_configure) # Sets configuration variables for macOS builds foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) if(DEFINED VCPKG_${config_var}) - list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") + list(JOIN VCPKG_${config_var} "\;" config_var_value) + list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}") endif() endforeach() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index fdf054e43ee975..1eb50e852b9699 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -231,7 +231,7 @@ function(vcpkg_configure_cmake) endif() endif() - + list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecure_string) list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" @@ -255,7 +255,7 @@ function(vcpkg_configure_cmake) "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" - "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" + "-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" @@ -272,7 +272,8 @@ function(vcpkg_configure_cmake) # Sets configuration variables for macOS builds foreach(config_var INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) if(DEFINED VCPKG_${config_var}) - list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") + list(JOIN VCPKG_${config_var} "\;" config_var_value) + list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}") endif() endforeach() diff --git a/versions/baseline.json b/versions/baseline.json index 6ac5f11392233e..8c66d48619a147 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6509,8 +6509,8 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-02-28", - "port-version": 3 + "baseline": "2021-06-25", + "port-version": 4 }, "vcpkg-cmake-config": { "baseline": "2021-05-22", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 1f1fb408b63923..96d5eb75da9fca 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "acc25ec22f8fd8887a865705580b1d6de041616d", + "version-date": "2021-06-25", + "port-version": 4 + }, { "git-tree": "0e8bb94599a00fd9c61fd0ae524c22a067c21420", "version-date": "2021-02-28", From 2cc84239f4d79a3e4a721bb997adf87e603abc4e Mon Sep 17 00:00:00 2001 From: omartijn <44672243+omartijn@users.noreply.github.com> Date: Thu, 1 Jul 2021 18:24:59 +0200 Subject: [PATCH 0055/1858] [ffmpeg] multi arch support (#18635) * Expand Architecture list with escape chars This expands the architecture lists with escape characters. When building FAT binaries for macos using multiple architectures in the values they need to be escaped otherwise they are passed on to CMake incorrectly #14932 * Adding the architecture fix to vcpkg-cmake port updating port vcpkg-cmake version * updated version in baseline * Allow building ffmpeg for multiple architectures on macOS Since ffmpeg does _not_ support multi-arch builds due to their use of autotools and config.h which then includes the wrong platform-dependent functions, we must perform two separate builds and join them using lipo * fixup! Allow building ffmpeg for multiple architectures on macOS * fixup! Allow building ffmpeg for multiple architectures on macOS Co-authored-by: Sander Cox Co-authored-by: Martijn Otto --- ports/ffmpeg/build.sh.in | 93 ++++++++++++++++++++++++++++++++++--- ports/ffmpeg/portfile.cmake | 27 ++++++++++- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 ++ 5 files changed, 119 insertions(+), 10 deletions(-) diff --git a/ports/ffmpeg/build.sh.in b/ports/ffmpeg/build.sh.in index 58040884b11f6c..b7e53982c14f2c 100644 --- a/ports/ffmpeg/build.sh.in +++ b/ports/ffmpeg/build.sh.in @@ -15,6 +15,61 @@ cygpath() { fi } +move_binary() { + SOURCE=$1 + TARGET=$2 + BINARY=$3 + + # run lipo over the command to check whether it really + # is a binary that we need to merge architectures + lipo $SOURCE/$BINARY -info &> /dev/null || return 0 + + # get the directory name the file is in + DIRNAME=$(dirname $BINARY) + + # ensure the directory to move the binary to exists + mkdir -p $TARGET/$DIRNAME + + # now finally move the binary + mv $SOURCE/$BINARY $TARGET/$BINARY +} + +move_binaries() { + SOURCE=$1 + TARGET=$2 + + [ ! -d $SOURCE ] && return 0 + pushd $SOURCE + + for BINARY in $(find . -type f); do + move_binary $SOURCE $TARGET $BINARY + done + + popd +} + +merge_binaries() { + TARGET=$1 + SOURCE=$2 + + shift + shift + + pushd $SOURCE/$1 + BINARIES=$(find . -type f) + popd + + for BINARY in $BINARIES; do + COMMAND="lipo -create -output $TARGET/$BINARY" + + for ARCH in $@; do + COMMAND="$COMMAND -arch $ARCH $SOURCE/$ARCH/$BINARY" + done + + $($COMMAND) + done +} + export PKG_CONFIG_PATH="$(cygpath -p "${PKG_CONFIG_PATH}")" # Export HTTP(S)_PROXY as http(s)_proxy: @@ -27,19 +82,45 @@ PATH_TO_PACKAGE_DIR=$(cygpath "@INST_PREFIX@") JOBS=@VCPKG_CONCURRENCY@ +OSX_ARCHS="@OSX_ARCHS@" +OSX_ARCH_COUNT=0@OSX_ARCH_COUNT@ + # Default to hardware concurrency if unset. : ${JOBS:=$(nproc)} +build_ffmpeg() { + echo "=== CONFIGURING ===" + + sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ $@ + + echo "=== BUILDING ===" + + make -j${JOBS} + + echo "=== INSTALLING ===" + + make install +} + cd "$PATH_TO_BUILD_DIR" -echo "=== CONFIGURING ===" +if [ $OSX_ARCH_COUNT -gt 1 ]; then + for ARCH in $OSX_ARCHS; do + echo "=== CLEANING FOR $ARCH ===" + + make clean && make distclean -sh "$PATH_TO_SRC_DIR/configure" "--prefix=$PATH_TO_PACKAGE_DIR" @CONFIGURE_OPTIONS@ + build_ffmpeg --enable-cross-compile --arch=$ARCH --extra-cflags=-arch --extra-cflags=$ARCH --extra-ldflags=-arch --extra-ldflags=$ARCH -echo "=== BUILDING ===" + echo "=== COLLECTING BINARIES FOR $ARCH ===" -make -j${JOBS} + move_binaries $PATH_TO_PACKAGE_DIR/lib $PATH_TO_BUILD_DIR/stage/$ARCH/lib + move_binaries $PATH_TO_PACKAGE_DIR/bin $PATH_TO_BUILD_DIR/stage/$ARCH/bin + done -echo "=== INSTALLING ===" + echo "=== MERGING ARCHITECTURES ===" -make install + merge_binaries $PATH_TO_PACKAGE_DIR $PATH_TO_BUILD_DIR/stage $OSX_ARCHS +else + build_ffmpeg +fi diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 0f3121bf4a9628..1dfe4b18e21a14 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -550,8 +550,22 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() +set(CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/vars.cmake") +vcpkg_internal_get_cmake_vars(OUTPUT_FILE CMAKE_VARS_FILE) +include("${CMAKE_VARS_FILE}") + if (VCPKG_TARGET_IS_OSX) + # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us + if ("${VCPKG_OSX_SYSROOT}" STREQUAL "") + set(VCPKG_OSX_SYSROOT ${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}) + endif() + set(OPTIONS "${OPTIONS} --disable-vdpau") # disable vdpau in OSX + set(OPTIONS "${OPTIONS} --extra-cflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"") + set(OPTIONS "${OPTIONS} --extra-ldflags=\"-isysroot ${VCPKG_OSX_SYSROOT}\"") + + list(JOIN VCPKG_OSX_ARCHITECTURES " " OSX_ARCHS) + LIST(LENGTH VCPKG_OSX_ARCHITECTURES OSX_ARCH_COUNT) endif() set(OPTIONS_CROSS "") @@ -564,8 +578,17 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${GAS_ITEM_PATH}") endforeach(GAS_PATH) - elseif(VCPKG_TARGET_IS_OSX) # VCPKG_TARGET_ARCHITECTURE = arm64 - set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64") + elseif(VCPKG_TARGET_IS_OSX AND NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") # VCPKG_TARGET_ARCHITECTURE = arm64 + # get the number of architectures requested + list(LENGTH VCPKG_OSX_ARCHITECTURES ARCHITECTURE_COUNT) + + # ideally we should check the CMAKE_HOST_SYSTEM_PROCESSOR, but that seems to be + # broken when inside a vcpkg port, so we only set it when doing a simple build + # for a single platform. multi-platform builds use a different script + if (ARCHITECTURE_COUNT LESS 2) + message(STATUS "Building on host: ${CMAKE_SYSTEM_PROCESSOR}") + set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=arm64 --extra-ldflags=-arch --extra-ldflags=arm64 --extra-cflags=-arch --extra-cflags=arm64 --extra-cxxflags=-arch --extra-cxxflags=arm64") + endif() endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index fe16cfed194c3f..1b5c40f0a0d672 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 5, + "port-version": 6, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index 8c66d48619a147..54b5aae3bdcc3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 5 + "port-version": 6 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index a39b1d79a8f05f..14c7c2f68b7c56 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", + "version": "4.4", + "port-version": 6 + }, { "git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94", "version": "4.4", From 0e7acdf93a2395e288f633811e3d05bc10fe2b62 Mon Sep 17 00:00:00 2001 From: bucurb Date: Thu, 1 Jul 2021 17:49:04 +0100 Subject: [PATCH 0056/1858] [libxml2] Fix target (#18714) * fix LibXml2 target dependencies * updated version files --- ports/libxml2/vcpkg-cmake-wrapper.cmake | 3 +++ ports/libxml2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libxml2.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 405b94670762ea..31bab78f790b65 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -12,6 +12,9 @@ if(LibXml2_FOUND) select_library_configurations(ICONV) select_library_configurations(CHARSET) list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB") + endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) endif() diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 617e3a4a5b4a50..fbcd7b114e5841 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.10", - "port-version": 7, + "port-version": 8, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 54b5aae3bdcc3c..368dd93848e6c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3710,7 +3710,7 @@ }, "libxml2": { "baseline": "2.9.10", - "port-version": 7 + "port-version": 8 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 3675ab5183614a..6fe34d800a2f9e 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0cf9aec6fb5cd87ae6358e9015e92e9d113c1f1", + "version-semver": "2.9.10", + "port-version": 8 + }, { "git-tree": "f86ba7081b940af77e935875fbdf9cbf69446b9f", "version-semver": "2.9.10", From 4c45fb56ac2ebcfe160830bb0e32a766d973a2f8 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 2 Jul 2021 01:14:42 +0800 Subject: [PATCH 0057/1858] [bzip2] Update repository (#18705) * [bzip2] Update repository * Update version files --- ports/bzip2/portfile.cmake | 16 ++++++++++------ ports/bzip2/vcpkg.json | 4 ++-- versions/b-/bzip2.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 19314eb0ee6446..36141ffcbc6e8b 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -1,10 +1,14 @@ -vcpkg_from_git( +set(BZIP2_VERSION 1.0.8) +vcpkg_download_distfile(ARCHIVE + URLS "https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz" + FILENAME "bzip2-${BZIP2_VERSION}.tar.gz" + SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 +) + +vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - URL https://sourceware.org/git/bzip2.git - REF 75a94bea3918e612b879d6a11ca64b8689526147 # REFERENCE BZIP2 VERSION 1.0.8 - SHA512 4611105f9090477b5f6f6dbd303a282099df71644e04d8a998ef81de487f6c8cac4c0ec1283ad737f6767c51f1e3b4e24e2ee021c6dd085925617d9ed145b2ba - PATCHES - fix-import-export-macros.patch + ARCHIVE ${ARCHIVE} + PATCHES fix-import-export-macros.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json index 8c7520de83e597..2f8b8aabf328a9 100644 --- a/ports/bzip2/vcpkg.json +++ b/ports/bzip2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bzip2", - "version-string": "1.0.8", - "port-version": 1, + "version-semver": "1.0.8", + "port-version": 2, "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.", "homepage": "https://sourceware.org/bzip2/", "documentation": "https://sourceware.org/bzip2/docs.html" diff --git a/versions/b-/bzip2.json b/versions/b-/bzip2.json index 807881050df8b7..7025c509f3b16e 100644 --- a/versions/b-/bzip2.json +++ b/versions/b-/bzip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1ea352502e69888a565563d9151d3f7ab609fb1", + "version-semver": "1.0.8", + "port-version": 2 + }, { "git-tree": "5a1b1b8d666b9ef64e8596e4716c2e2f654f4532", "version-string": "1.0.8", diff --git a/versions/baseline.json b/versions/baseline.json index 368dd93848e6c6..1b69040baa4f87 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1090,7 +1090,7 @@ }, "bzip2": { "baseline": "1.0.8", - "port-version": 1 + "port-version": 2 }, "c-ares": { "baseline": "1.17.1", From 3107079035341790bad8a1193868f19a93a2b3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 2 Jul 2021 01:20:48 +0800 Subject: [PATCH 0058/1858] [tgui] Fix feature tool dependency (#18724) * [tgui] Fix feature tool dependency * update version record --- ports/tgui/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 2 +- versions/t-/tgui.json | 5 +++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ports/tgui/vcpkg.json b/ports/tgui/vcpkg.json index 96fef2d0973832..387a20c909c0ac 100644 --- a/ports/tgui/vcpkg.json +++ b/ports/tgui/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tgui", "version-date": "2021-04-19", - "port-version": 1, + "port-version": 2, "description": "TGUI is an easy to use, cross-platform, C++ GUI for SFML.", "homepage": "https://tgui.eu", "default-features": [ @@ -35,7 +35,16 @@ ] }, "tool": { - "description": "Build GUI builder" + "description": "Build GUI builder", + "dependencies": [ + { + "name": "tgui", + "features": [ + "sdl2", + "sfml" + ] + } + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 1b69040baa4f87..a549f318f4009d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6154,7 +6154,7 @@ }, "tgui": { "baseline": "2021-04-19", - "port-version": 1 + "port-version": 2 }, "theia": { "baseline": "0.8", diff --git a/versions/t-/tgui.json b/versions/t-/tgui.json index 184813be079cae..f04e637e79f05e 100644 --- a/versions/t-/tgui.json +++ b/versions/t-/tgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fd517c4e738da62e959b791a6cdd952e7bd8345", + "version-date": "2021-04-19", + "port-version": 2 + }, { "git-tree": "354b5135bda4bcef9c5e7cbfeaff3d457b336e8c", "version-date": "2021-04-19", From 361ce8d0dbdd32681284e4041792be3f3e18ec6b Mon Sep 17 00:00:00 2001 From: Lev Stipakov Date: Thu, 1 Jul 2021 20:21:44 +0300 Subject: [PATCH 0059/1858] [OpenSSL] support for "no-autoload-config" config option (#18389) * [OpenSSL]: support for "no-autoload-config" config option OpenSSL has "no-autoload-config" config option, which disables automatic config loading: https://github.com/openssl/openssl/pull/5959 This patch allows to set above option via variable in custom triplet: # build-openssl-no-autoload-config.cmake set(OPENSSL_NO_AUTOLOAD_CONFIG ON) and use it like: vcpkg install --overlay-triplets= \ openssl:build-openssl-no-autoload-config Signed-off-by: Lev Stipakov * [OpenSSL] bump version Signed-off-by: Lev Stipakov --- ports/openssl/vcpkg.json | 2 +- ports/openssl/windows/portfile.cmake | 4 ++++ versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index cd7b732c001604..547f7ba5daf086 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 5, + "port-version": 6, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 7a3bf08ed57c4b..3065abddc6f04f 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -29,6 +29,10 @@ if(DEFINED OPENSSL_USE_NOPINSHARED) set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-pinshared) endif() +if(OPENSSL_NO_AUTOLOAD_CONFIG) + set(CONFIGURE_OPTIONS ${CONFIGURE_OPTIONS} no-autoload-config) +endif() + set(CONFIGURE_COMMAND "${PERL}" Configure ${CONFIGURE_OPTIONS}) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") diff --git a/versions/baseline.json b/versions/baseline.json index a549f318f4009d..571b240a3b9402 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4606,7 +4606,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 5 + "port-version": 6 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 281a232db0cb6e..21a4dfb25adc98 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3", + "version-string": "1.1.1k", + "port-version": 6 + }, { "git-tree": "9cbfcf1a35e62330f5ebddca9d0f1ea493172ef7", "version-string": "1.1.1k", From 8bc972105afa10789cd672e774f8e441099edaef Mon Sep 17 00:00:00 2001 From: "Michael R. P. Ragazzon" Date: Thu, 1 Jul 2021 19:25:42 +0200 Subject: [PATCH 0060/1858] [rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat --- ports/rmlui/add-robin-hood.patch | 38 ++++++++++++++++++++++ ports/rmlui/portfile.cmake | 56 ++++++++++++++++++++++++++++++++ ports/rmlui/vcpkg.json | 34 +++++++++++++++++++ versions/baseline.json | 4 +++ versions/r-/rmlui.json | 9 +++++ 5 files changed, 141 insertions(+) create mode 100644 ports/rmlui/add-robin-hood.patch create mode 100644 ports/rmlui/portfile.cmake create mode 100644 ports/rmlui/vcpkg.json create mode 100644 versions/r-/rmlui.json diff --git a/ports/rmlui/add-robin-hood.patch b/ports/rmlui/add-robin-hood.patch new file mode 100644 index 00000000000000..4a39a8a5a1aa96 --- /dev/null +++ b/ports/rmlui/add-robin-hood.patch @@ -0,0 +1,38 @@ +diff --git a/CMake/FileList.cmake b/CMake/FileList.cmake +index 9c3042c..c3820df 100644 +--- a/CMake/FileList.cmake ++++ b/CMake/FileList.cmake +@@ -133,7 +133,6 @@ set(Core_PUB_HDR_FILES + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ComputedValues.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_map.hpp + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/chobo/flat_set.hpp +- ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Containers/robin_hood.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/Context.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ContextInstancer.h + ${PROJECT_SOURCE_DIR}/Include/RmlUi/Core/ConvolutionFilter.h +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62432f1..d9287c9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -387,6 +387,8 @@ if( ENABLE_SVG_PLUGIN ) + message("-- Can SVG plugin be enabled - yes - lunasvg library found") + endif() + ++find_path(ROBIN_HOOD_INCLUDE_DIR robin_hood.h) ++include_directories(${ROBIN_HOOD_INCLUDE_DIR}) + + if(NOT BUILD_FRAMEWORK) + #=================================== +diff --git a/Include/RmlUi/Config/Config.h b/Include/RmlUi/Config/Config.h +index dc42753..5249e1d 100644 +--- a/Include/RmlUi/Config/Config.h ++++ b/Include/RmlUi/Config/Config.h +@@ -57,7 +57,7 @@ + #else + #include "../Core/Containers/chobo/flat_map.hpp" + #include "../Core/Containers/chobo/flat_set.hpp" +-#include "../Core/Containers/robin_hood.h" ++#include + #endif // RMLUI_NO_THIRDPARTY_CONTAINERS + + namespace Rml { diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake new file mode 100644 index 00000000000000..cf9ec6f057002d --- /dev/null +++ b/ports/rmlui/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mikke89/RmlUi + REF 4.1 + SHA512 f79bd30104c42469142e4c79a81f120c61f5bd3ae918df9847fa42d05fcda372d3adb5f6884c81c8517a440a81235e70ffcdde8d98751a14d2e4265fc2051a01 + HEAD_REF master + PATCHES + add-robin-hood.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + lua BUILD_LUA_BINDINGS + INVERTED_FEATURES + freetype NO_FONT_INTERFACE_DEFAULT +) + +# Remove built-in header, instead we use vcpkg version (from robin-hood-hashing port) +file(REMOVE ${SOURCE_PATH}/Include/RmlUi/Core/Containers/robin_hood.h) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH lib/RmlUi/cmake +) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/lib/RmlUi + ${CURRENT_PACKAGES_DIR}/lib/RmlUi +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Core/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Debugger/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + if ("lua" IN_LIST FEATURES) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/RmlUi/Lua/Header.h + "#if !defined RMLUI_STATIC_LIB" + "#if 0" + ) + endif() +endif() + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json new file mode 100644 index 00000000000000..9b42867c63570c --- /dev/null +++ b/ports/rmlui/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "rmlui", + "version": "4.1", + "maintainers": "Michael R. P. Ragazzon ", + "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", + "homepage": "https://github.com/mikke89/RmlUi", + "documentation": "https://mikke89.github.io/RmlUiDoc/", + "license": "MIT", + "dependencies": [ + "robin-hood-hashing", + "vcpkg-cmake", + "vcpkg-cmake-config" + ], + "default-features": [ + "freetype" + ], + "features": { + "freetype": { + "description": "Include font engine based on FreeType", + "dependencies": [ + { + "name": "freetype", + "default-features": false + } + ] + }, + "lua": { + "description": "Build Lua bindings", + "dependencies": [ + "lua" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 571b240a3b9402..3b6dcaaf1453d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5524,6 +5524,10 @@ "baseline": "0.3.0", "port-version": 0 }, + "rmlui": { + "baseline": "4.1", + "port-version": 0 + }, "roaring": { "baseline": "2019-03-05-2", "port-version": 0 diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json new file mode 100644 index 00000000000000..f3c15b656f8e82 --- /dev/null +++ b/versions/r-/rmlui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "83f463f3ebcc4e415d6903bea260fb1601a14dd2", + "version": "4.1", + "port-version": 0 + } + ] +} From 832da541c153672cd1231761d09b6973ebf77db6 Mon Sep 17 00:00:00 2001 From: mathijs727 Date: Thu, 1 Jul 2021 19:41:20 +0200 Subject: [PATCH 0061/1858] [cnl] Update to version 1.1.7 (#18439) * [cnl] update to version 1.1.7 * Update baseline.json * Update ports/cnl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/cnl/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update HEAD_REF to point to main * Bump port-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Run vcpkg x-add-version cnl * Update versions/c-/cnl.json Co-authored-by: Robert Schumacher * Update ports/cnl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/c-/cnl.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update git tree with vcpkg x-add-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/cnl/CONTROL | 3 ++- ports/cnl/portfile.cmake | 7 +++---- versions/baseline.json | 2 +- versions/c-/cnl.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL index 8daea5ae60981d..ac6f8f2caa1b92 100644 --- a/ports/cnl/CONTROL +++ b/ports/cnl/CONTROL @@ -1,3 +1,4 @@ Source: cnl -Version: 2019-06-23 +Version: 1.1.7 Description: A Compositional Numeric Library for C++ +Homepage: https://github.com/johnmcfarlane/cnl diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index da03f7900e57ca..3c54e457914edc 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -1,11 +1,10 @@ # header-only library - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO johnmcfarlane/cnl - REF 48428242e72b8239cb14c963e40f724929d54df7 - SHA512 c7e012d99409977137a44915dd7a4df5014b6e8540ceee3e82492052541ce77a254d79e624d766b510e7d3a6b17a9d9b02391c6993ae55d3904334116e747983 - HEAD_REF develop + REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7 + SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572 + HEAD_REF main ) vcpkg_configure_cmake( diff --git a/versions/baseline.json b/versions/baseline.json index 3b6dcaaf1453d7..7f01d5d1325a4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1325,7 +1325,7 @@ "port-version": 0 }, "cnl": { - "baseline": "2019-06-23", + "baseline": "1.1.7", "port-version": 0 }, "coin": { diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index 9f2ab96483c086..dc0a2ce0168c5b 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "645e64c52fc7d6d9570376aba9c684ca45038f54", + "version-string": "1.1.7", + "port-version": 0 + }, { "git-tree": "4778a9818faef4bfac563accbca398763a725cfc", "version-string": "2019-06-23", From 39088a0d18aa10d5c73c7de5a7976ce7606f5404 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 1 Jul 2021 10:45:01 -0700 Subject: [PATCH 0062/1858] [vcpkg.cmake] fix X_VCPKG_APPLOCAL_DEPS_INSTALL (#18607) * [vcpkg.cmake] fix X_VCPKG_APPLOCAL_DEPS_INSTALL * Billy CR --- scripts/buildsystems/vcpkg.cmake | 95 +++++++++++++++++++------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 58d3da956a0a10..a25f0f716c1d7b 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -609,29 +609,48 @@ endfunction() # # Note that this function requires CMake 3.14 for policy CMP0087 function(x_vcpkg_install_local_dependencies) - if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "windows|uwp") - cmake_parse_arguments(PARSE_ARGV 0 __VCPKG_APPINSTALL "" "DESTINATION;COMPONENT" "TARGETS") + if(CMAKE_VERSION VERSION_LESS "3.14") + message(FATAL_ERROR "x_vcpkg_install_local_dependencies and X_VCPKG_APPLOCAL_DEPS_INSTALL require at least CMake 3.14 +(current version: ${CMAKE_VERSION})" + ) + endif() + + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "DESTINATION;COMPONENT" + "TARGETS" + ) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_DESTINATION) + message(FATAL_ERROR "DESTINATION must be specified") + endif() + + if(Z_VCPKG_TARGET_TRIPLET_PLAT MATCHES "^(windows|uwp)$") + # Install CODE|SCRIPT allow the use of generator expressions + cmake_policy(SET CMP0087 NEW) + z_vcpkg_set_powershell_path() - if(NOT IS_ABSOLUTE "${__VCPKG_APPINSTALL_DESTINATION}") - set(__VCPKG_APPINSTALL_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${__VCPKG_APPINSTALL_DESTINATION}") + if(NOT IS_ABSOLUTE "${arg_DESTINATION}") + set(arg_DESTINATION "\${CMAKE_INSTALL_PREFIX}/${arg_DESTINATION}") endif() - if(__VCPKG_APPINSTALL_COMPONENT) - set(__VCPKG_APPINSTALL_COMPONENT COMPONENT ${__VCPKG_APPINSTALL_COMPONENT}) + + set(component_param "") + if(DEFINED arg_COMPONENT) + set(component_param COMPONENT "${arg_COMPONENT}") endif() - foreach(TARGET IN LISTS __VCPKG_APPINSTALL_TARGETS) - get_target_property(TARGETTYPE "${TARGET}" TYPE) - if(NOT TARGETTYPE STREQUAL "INTERFACE_LIBRARY") - # Install CODE|SCRIPT allow the use of generator expressions - if(POLICY CMP0087) - cmake_policy(SET CMP0087 NEW) - endif() - install(CODE "message(\"-- Installing app dependencies for ${TARGET}...\") + + foreach(target IN LISTS arg_TARGETS) + get_target_property(target_type "${target}" TYPE) + if(NOT target_type STREQUAL "INTERFACE_LIBRARY") + install(CODE "message(\"-- Installing app dependencies for ${target}...\") execute_process(COMMAND \"${Z_VCPKG_POWERSHELL_PATH}\" -noprofile -executionpolicy Bypass -file \"${Z_VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1\" - -targetBinary \"${__VCPKG_APPINSTALL_DESTINATION}/$\" + -targetBinary \"${arg_DESTINATION}/$\" -installedDir \"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$:/debug>/bin\" -OutVariable out)" - ${__VCPKG_APPINSTALL_COMPONENT} - ) + ${component_param} + ) endif() endforeach() endif() @@ -644,41 +663,43 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL) if(ARGV0 STREQUAL "TARGETS") # Will contain the list of targets - set(PARSED_TARGETS "") + set(parsed_targets "") # Destination - [RUNTIME] DESTINATION argument overrides this - set(DESTINATION "bin") + set(destination "bin") + + set(component_param "") # Parse arguments given to the install function to find targets and (runtime) destination - set(MODIFIER "") # Modifier for the command in the argument - set(LAST_COMMAND "") # Last command we found to process - foreach(ARG IN LISTS ARGS) - if(ARG MATCHES "ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES") - set(MODIFIER "${ARG}") + set(modifier "") # Modifier for the command in the argument + set(last_command "") # Last command we found to process + foreach(arg IN LISTS ARGS) + if(arg MATCHES "^(ARCHIVE|LIBRARY|RUNTIME|OBJECTS|FRAMEWORK|BUNDLE|PRIVATE_HEADER|PUBLIC_HEADER|RESOURCE|INCLUDES)$") + set(modifier "${arg}") continue() endif() - if(ARG MATCHES "TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT") - set(LAST_COMMAND "${ARG}") + if(arg MATCHES "^(TARGETS|DESTINATION|PERMISSIONS|CONFIGURATIONS|COMPONENT|NAMELINK_COMPONENT|OPTIONAL|EXCLUDE_FROM_ALL|NAMELINK_ONLY|NAMELINK_SKIP|EXPORT)$") + set(last_command "${arg}") continue() endif() - if(LAST_COMMAND STREQUAL "TARGETS") - list(APPEND PARSED_TARGETS "${ARG}") + if(last_command STREQUAL "TARGETS") + list(APPEND parsed_targets "${arg}") endif() - if(LAST_COMMAND STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME")) - set(DESTINATION "${ARG}") + if(last_command STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME")) + set(destination "${arg}") endif() - if(LAST_COMMAND STREQUAL "COMPONENT") - set(COMPONENT "${ARG}") + if(last_command STREQUAL "COMPONENT") + set(component_param "COMPONENT" "${arg}") endif() endforeach() - # COMPONENT is optional only set it when it's been set by the install rule - if(COMPONENT) - set(COMPONENT "COMPONENT" ${COMPONENT}) - endif() - x_vcpkg_install_local_dependencies(TARGETS "${PARSED_TARGETS}" DESTINATION "${DESTINATION}" ${COMPONENT}) + x_vcpkg_install_local_dependencies( + TARGETS ${parsed_targets} + DESTINATION "${destination}" + ${component_param} + ) endif() endfunction() endif() From 198a76e4cee797567790da6356fe915209dccc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Maia?= Date: Tue, 6 Jul 2021 18:29:48 +0100 Subject: [PATCH 0063/1858] [klein] create a new port (#18279) * [klein] new port * [klein] Replace version-string by version * [klein] Add call to vcpkg_fixup_pkgconfig() * [klein] Replace klein by ${PORT} * [klein] Add patch to avoid using FetchContent * [klein] Change version to version-date * update version * Apply suggestions from code review Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update git-tree version Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/klein/find_simde_first.patch | 23 +++++++++++++++++++++++ ports/klein/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/klein/usage | 10 ++++++++++ ports/klein/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/klein.json | 9 +++++++++ 6 files changed, 91 insertions(+) create mode 100644 ports/klein/find_simde_first.patch create mode 100644 ports/klein/portfile.cmake create mode 100644 ports/klein/usage create mode 100644 ports/klein/vcpkg.json create mode 100644 versions/k-/klein.json diff --git a/ports/klein/find_simde_first.patch b/ports/klein/find_simde_first.patch new file mode 100644 index 00000000000000..ab9f715c6bddc4 --- /dev/null +++ b/ports/klein/find_simde_first.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c5d6f3f..a3ba161 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,16 +29,7 @@ endif() + option(KLEIN_BUILD_SYM "Enable compilation of symbolic Klein utility" ON) + option(KLEIN_BUILD_C_BINDINGS "Enable compilation of the Klein C bindings" ON) + +-include(FetchContent) +-FetchContent_Declare( +- simde +- GIT_REPOSITORY https://github.com/simd-everywhere/simde +- GIT_TAG v0.7.2 +- GIT_SHALLOW ON +-) +-FetchContent_GetProperties(simde) +-if(NOT simde_POPULATED) +- FetchContent_Populate(simde) +-endif() ++find_path(SIMDE_INCLUDE_DIR "simde/x86/sse4.1.h" REQUIRED) ++set(simde_SOURCE_DIR ${SIMDE_INCLUDE_DIR}/simde) + + # The default platform and instruction set is x86 SSE3 diff --git a/ports/klein/portfile.cmake b/ports/klein/portfile.cmake new file mode 100644 index 00000000000000..aea4b100a3b902 --- /dev/null +++ b/ports/klein/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO jeremyong/klein + REF 92023c6a946af84e716deb1488cad22048d3e08d + SHA512 5d12ae143f07173992a6f9aa90539c4cb6c895a7169e5c086a10f78a31f7b2c9d64faf5ce1db014bd3badd92d24ff612dd2d2dc2f7508baac59307e3dccb6ebe + HEAD_REF master + PATCHES + "find_simde_first.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DKLEIN_ENABLE_PERF=OFF + -DKLEIN_ENABLE_TESTS=OFF + -DKLEIN_VALIDATE=OFF + -DKLEIN_BUILD_SYM=OFF + -DKLEIN_BUILD_C_BINDINGS=OFF + -DKLEIN_INSTALL=ON +) + +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + diff --git a/ports/klein/usage b/ports/klein/usage new file mode 100644 index 00000000000000..63658e26e8b645 --- /dev/null +++ b/ports/klein/usage @@ -0,0 +1,10 @@ +The package klein:x64-windows provides CMake targets: + + find_package(klein CONFIG REQUIRED) + target_link_libraries(main PRIVATE klein::klein) + + # Or use the C++ 11 version + target_link_libraries(main PRIVATE klein::klein_cxx11) + + # Or use the SSE4.1 version + target_link_libraries(main PRIVATE klein::klein_sse42) diff --git a/ports/klein/vcpkg.json b/ports/klein/vcpkg.json new file mode 100644 index 00000000000000..9b6393b3bc6f74 --- /dev/null +++ b/ports/klein/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "klein", + "version-date": "2021-05-09", + "description": "Klein is an implementation of P(R*_{3, 0, 1}), aka 3D Projective Geometric Algebra. It is designed for applications that demand high-throughput (animation libraries, kinematic solvers, etc).", + "dependencies": [ + "simde", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7f01d5d1325a4e..67ccd90762436b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2920,6 +2920,10 @@ "baseline": "2020-03-30", "port-version": 0 }, + "klein": { + "baseline": "2021-05-09", + "port-version": 0 + }, "knet": { "baseline": "1.0.2", "port-version": 0 diff --git a/versions/k-/klein.json b/versions/k-/klein.json new file mode 100644 index 00000000000000..37c6367090e3b2 --- /dev/null +++ b/versions/k-/klein.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5a367eafd82860f61245c54f64306b35a9e0978c", + "version-date": "2021-05-09", + "port-version": 0 + } + ] +} From 5804ca7eb38d97de1d10d4d6ad22d7142282b333 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 7 Jul 2021 04:29:20 +0800 Subject: [PATCH 0064/1858] [vcpkg baseline][cnl] Disable tests (#18767) --- ports/cnl/CONTROL | 4 ---- ports/cnl/disable-test.patch | 15 +++++++++++++++ ports/cnl/portfile.cmake | 2 ++ ports/cnl/vcpkg.json | 7 +++++++ versions/baseline.json | 2 +- versions/c-/cnl.json | 5 +++++ 6 files changed, 30 insertions(+), 5 deletions(-) delete mode 100644 ports/cnl/CONTROL create mode 100644 ports/cnl/disable-test.patch create mode 100644 ports/cnl/vcpkg.json diff --git a/ports/cnl/CONTROL b/ports/cnl/CONTROL deleted file mode 100644 index ac6f8f2caa1b92..00000000000000 --- a/ports/cnl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cnl -Version: 1.1.7 -Description: A Compositional Numeric Library for C++ -Homepage: https://github.com/johnmcfarlane/cnl diff --git a/ports/cnl/disable-test.patch b/ports/cnl/disable-test.patch new file mode 100644 index 00000000000000..58ecad53552ba9 --- /dev/null +++ b/ports/cnl/disable-test.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 73111fc..a0cb3db 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,8 +9,8 @@ project(cnl) + + cmake_minimum_required(VERSION 3.5.1) + +-include(CTest) +-add_subdirectory("test") ++# include(CTest) ++# add_subdirectory("test") + + # the CNL library + add_library(Cnl INTERFACE) diff --git a/ports/cnl/portfile.cmake b/ports/cnl/portfile.cmake index 3c54e457914edc..13ba7327585ffb 100644 --- a/ports/cnl/portfile.cmake +++ b/ports/cnl/portfile.cmake @@ -5,6 +5,8 @@ vcpkg_from_github( REF 2dde6e62e608a4adc3c5504f067575efa4910568 #v1.1.7 SHA512 33a81ea726802c71a684bcd002b5119cde4db471ebc9ba02cd15c7487ab468eeca09fb8dcaed953e3f3cded2cd813a903f808d97527b0ec7f393647b64a22572 HEAD_REF main + PATCHES + disable-test.patch ) vcpkg_configure_cmake( diff --git a/ports/cnl/vcpkg.json b/ports/cnl/vcpkg.json new file mode 100644 index 00000000000000..930fcdeed6706b --- /dev/null +++ b/ports/cnl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cnl", + "version-string": "1.1.7", + "port-version": 1, + "description": "A Compositional Numeric Library for C++", + "homepage": "https://github.com/johnmcfarlane/cnl" +} diff --git a/versions/baseline.json b/versions/baseline.json index 67ccd90762436b..6cd2595158b09a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1326,7 +1326,7 @@ }, "cnl": { "baseline": "1.1.7", - "port-version": 0 + "port-version": 1 }, "coin": { "baseline": "4.0.0", diff --git a/versions/c-/cnl.json b/versions/c-/cnl.json index dc0a2ce0168c5b..a7f667331c872e 100644 --- a/versions/c-/cnl.json +++ b/versions/c-/cnl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fe1aa7188d2e673265a0c1f20616bdf647c7390", + "version-string": "1.1.7", + "port-version": 1 + }, { "git-tree": "645e64c52fc7d6d9570376aba9c684ca45038f54", "version-string": "1.1.7", From c3b5f13ecc312c560fa2c9b75626c31a3e8f5d1e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 6 Jul 2021 22:34:41 +0200 Subject: [PATCH 0065/1858] [hdf5] Fix linking order in pc file (#18825) * Fix link order in pc file * x-add-version --- ports/hdf5/pkgconfig-link-order.patch | 11 +++++++++++ ports/hdf5/portfile.cmake | 1 + ports/hdf5/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hdf5.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/hdf5/pkgconfig-link-order.patch diff --git a/ports/hdf5/pkgconfig-link-order.patch b/ports/hdf5/pkgconfig-link-order.patch new file mode 100644 index 00000000000000..66349c66c9b108 --- /dev/null +++ b/ports/hdf5/pkgconfig-link-order.patch @@ -0,0 +1,11 @@ +diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in +index 4a2ebaa..3cb42d2 100644 +--- a/config/cmake/libhdf5.pc.in ++++ b/config/cmake/libhdf5.pc.in +@@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@ + Requires: @_PKG_CONFIG_REQUIRES@ +-Libs.private: @_PKG_CONFIG_LIBS_PRIVATE@ @_PKG_CONFIG_LIBS@ ++Libs.private: @_PKG_CONFIG_LIBS@ @_PKG_CONFIG_LIBS_PRIVATE@ + Requires.private: @_PKG_CONFIG_REQUIRES_PRIVATE@ diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index 0cd1cb52c1b428..cd85ab359c5dcd 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( szip.patch mingw-import-libs.patch pkgconfig-requires.patch + pkgconfig-link-order.patch ) if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 1cb6985d5b5af7..3912a629ea26c9 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hdf5", "version": "1.12.0", - "port-version": 3, + "port-version": 4, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 6cd2595158b09a..f64a52911a1394 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2478,7 +2478,7 @@ }, "hdf5": { "baseline": "1.12.0", - "port-version": 3 + "port-version": 4 }, "healpix": { "baseline": "1.12.10", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 72096684eb9a7c..0440a7f6fd933e 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77eb81be380363280c67a3b15043696f6cee2001", + "version": "1.12.0", + "port-version": 4 + }, { "git-tree": "0a7e8bbf885fa0b111c3041102cb2c9adb45f5c3", "version": "1.12.0", From 4c51bc8e54c6dac752d990c6881cf8950d4617a7 Mon Sep 17 00:00:00 2001 From: LE GARREC Vincent Date: Tue, 6 Jul 2021 22:36:25 +0200 Subject: [PATCH 0066/1858] [catch2] Fix linux build in NTFS fs (#18814) file(RENAME Camel lower) works fine when running vcpkg in Windows Powershell with triplet x64-windows in NTFS fs. file(RENAME Camel lower) does not work fine when running vcpkg in WSL with triplet x64-linux in NTFS. --- ports/catch2/portfile.cmake | 6 ++++-- ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 1d0291a5717b06..0b2c4c0e752208 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -16,8 +16,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/share/catch2") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2) diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index ddca8ee6722333..e0199bffa190c2 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "2.13.6", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2" } diff --git a/versions/baseline.json b/versions/baseline.json index f64a52911a1394..c862b670953267 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1146,7 +1146,7 @@ }, "catch2": { "baseline": "2.13.6", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index a9aa348e991af0..cca4c3a0064f3d 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c", + "version-semver": "2.13.6", + "port-version": 1 + }, { "git-tree": "17d502dbaa50c2e6d255331addb14259372fb6c5", "version-semver": "2.13.6", From b385e78174059477978d6a7ee52f161efe20cea9 Mon Sep 17 00:00:00 2001 From: Julian Xhokaxhiu Date: Tue, 6 Jul 2021 22:37:15 +0200 Subject: [PATCH 0067/1858] [binarycaching.md] Improve Azure DevOps example (#18807) Add a missing, but required task for Azure DevOps Pipelines, to automatically authenticate against the Artifacts registry. This should help any vcpkg newcomer to integrate easily. --- docs/users/binarycaching.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index f646ad7896bec2..0e2ea19cb54a49 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -130,6 +130,10 @@ Next, you will need to create a feed for your project; see the [Azure DevOps Art variables: - name: VCPKG_BINARY_SOURCES value: 'clear;nuget,,readwrite' + +steps: +# Remember to add this task to allow vcpkg to upload archives via NuGet +- task: NuGetAuthenticate@0 ``` If you are using custom agents with a non-Windows OS, you will need to install Mono to run `nuget.exe` (`apt install mono-complete`, `brew install mono`, etc). From 483441ef4c55498f11c4a0f93929ad46579819c0 Mon Sep 17 00:00:00 2001 From: JackMacWindows Date: Tue, 6 Jul 2021 16:38:46 -0400 Subject: [PATCH 0068/1858] [sdl2-mixer] Add fluidsynth feature (#18826) * [sdl2-mixer] Add fluidsynth feature * [sdl2-mixer] Add fluidsynth feature * [sdl2-mixer] Add fluidsynth feature * Updated versions & fixed style * Fixed version hash --- ports/sdl2-mixer/CMakeLists.txt | 12 ++++++++++++ ports/sdl2-mixer/portfile.cmake | 3 ++- ports/sdl2-mixer/vcpkg.json | 8 +++++++- versions/baseline.json | 2 +- versions/s-/sdl2-mixer.json | 5 +++++ 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index 6b422142c2e4df..b350d5bc332b34 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -74,6 +74,18 @@ if(SDL_MIXER_ENABLE_OPUS) endif() endif() +# Fluidsynth support +if(SDL_MIXER_ENABLE_FLUIDSYNTH) + find_path(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h) + find_library(FLUIDSYNTH_LIBRARY fluidsynth) + list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR}) + list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH) + if (SDL_DYNAMIC_LOAD) + get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE) + list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}") + endif() +endif() + add_library(SDL2_mixer effect_position.c effect_stereoreverse.c diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 16e45c5d88ab76..122df61e183d2f 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -35,6 +35,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS libvorbis SDL_MIXER_ENABLE_OGGVORBIS opusfile SDL_MIXER_ENABLE_OPUS nativemidi SDL_MIXER_ENABLE_NATIVEMIDI + fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH ) vcpkg_configure_cmake( @@ -53,4 +54,4 @@ vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index acd9b060ecdccc..4ea851c9e42a8b 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdl2-mixer", "version": "2.0.4", - "port-version": 11, + "port-version": 12, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://www.libsdl.org/projects/SDL_mixer", "dependencies": [ @@ -14,6 +14,12 @@ "dynamic-load": { "description": "Load plugins with dynamic call." }, + "fluidsynth": { + "description": "Support for FluidSynth MIDI/SF2 audio format.", + "dependencies": [ + "fluidsynth" + ] + }, "libflac": { "description": "Support for FLAC audio format.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c862b670953267..050b43d26caafb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5682,7 +5682,7 @@ }, "sdl2-mixer": { "baseline": "2.0.4", - "port-version": 11 + "port-version": 12 }, "sdl2-net": { "baseline": "2.0.1-8", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index b563ccff515654..2828ed5b13fbe6 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe2777f2acc7962d9d08092e4778221468e212cd", + "version": "2.0.4", + "port-version": 12 + }, { "git-tree": "1ccb56f06529841debee949a42b71f5ce4ad1f16", "version": "2.0.4", From b96fbdd4904956d7c642d9388abec77eaad06a00 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 7 Jul 2021 04:40:02 +0800 Subject: [PATCH 0069/1858] [paho-mqtt] update to 1.3.9 (#18765) * [paho-mqtt] update to 1.3.9 * update version * revert patch format * update version --- ports/paho-mqtt/CONTROL | 5 ----- ports/paho-mqtt/fix-install-path.patch | 8 ++++---- ports/paho-mqtt/portfile.cmake | 10 +++++----- ports/paho-mqtt/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/p-/paho-mqtt.json | 5 +++++ 6 files changed, 24 insertions(+), 15 deletions(-) delete mode 100644 ports/paho-mqtt/CONTROL create mode 100644 ports/paho-mqtt/vcpkg.json diff --git a/ports/paho-mqtt/CONTROL b/ports/paho-mqtt/CONTROL deleted file mode 100644 index 590722471c53ed..00000000000000 --- a/ports/paho-mqtt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: paho-mqtt -Version: 1.3.8 -Homepage: https://github.com/eclipse/paho.mqtt.c -Description: Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things -Build-Depends: openssl diff --git a/ports/paho-mqtt/fix-install-path.patch b/ports/paho-mqtt/fix-install-path.patch index 06bf396a92ea61..68cb3b4c4b89cc 100644 --- a/ports/paho-mqtt/fix-install-path.patch +++ b/ports/paho-mqtt/fix-install-path.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3df385a..1ee7be0 100644 +index aa4ad05..669adde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,8 +60,8 @@ IF (NOT PAHO_BUILD_SHARED AND NOT PAHO_BUILD_STATIC) @@ -10,11 +10,11 @@ index 3df385a..1ee7be0 100644 - set(CMAKE_INSTALL_DOCDIR share/doc/libpaho-mqtt) +IF(1) + set(CMAKE_INSTALL_DOCDIR share/paho-mqtt) + set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) + set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=") ENDIF() - - ADD_SUBDIRECTORY(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 20b578a..75dc833 100644 +index 0bc7194..db4a0ac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -183,7 +183,7 @@ IF (PAHO_BUILD_STATIC) diff --git a/ports/paho-mqtt/portfile.cmake b/ports/paho-mqtt/portfile.cmake index a5215dd82e8735..7c7875bb2be7b6 100644 --- a/ports/paho-mqtt/portfile.cmake +++ b/ports/paho-mqtt/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/paho.mqtt.c - REF 317fb008e1541838d1c29076d2bc5c3e4b6c4f53 # v1.3.8 - SHA512 065d850dbcd20144e7f5534d0cac30170c7f90b1cdca90f4eaaa6b7d69056d9e1bfe951ef34aa7e1a2d3bbc193e95a1526d4dee40ea2f243f3120620b577aacb + REF 3b7ae6348bc917d42c04efa962e4868c09bbde9f # v1.3.9 + SHA512 73c10b7da7aa228100511db280ae56484cb8c42b8f0cfafb2fa3f6e230b4bb1d6b3611aa9219736a0baa9d7de0baf802dd70dbf308077f1a745bd61a67a797c7 HEAD_REF master PATCHES - remove_compiler_options.patch - fix-install-path.patch - fix-unresolvedsymbol-arm.patch + remove_compiler_options.patch + fix-install-path.patch + fix-unresolvedsymbol-arm.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PAHO_BUILD_STATIC) diff --git a/ports/paho-mqtt/vcpkg.json b/ports/paho-mqtt/vcpkg.json new file mode 100644 index 00000000000000..186e1299ef7af0 --- /dev/null +++ b/ports/paho-mqtt/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "paho-mqtt", + "version-semver": "1.3.9", + "description": "Paho project provides open-source client implementations of MQTT and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet of Things", + "homepage": "https://github.com/eclipse/paho.mqtt.c", + "dependencies": [ + "openssl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 050b43d26caafb..07c65eeea958d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4709,7 +4709,7 @@ "port-version": 0 }, "paho-mqtt": { - "baseline": "1.3.8", + "baseline": "1.3.9", "port-version": 0 }, "paho-mqttpp3": { diff --git a/versions/p-/paho-mqtt.json b/versions/p-/paho-mqtt.json index c441cbd9a4fb01..91f6400606605e 100644 --- a/versions/p-/paho-mqtt.json +++ b/versions/p-/paho-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b35399fddec4f6e4eb68e16308d2b1d86b0e5427", + "version-semver": "1.3.9", + "port-version": 0 + }, { "git-tree": "a8ecb2168805d1f3745453512d5f82cccd7d391a", "version-string": "1.3.8", From 44212dafa5040edc4d1d11274bea3ab0ec0c04b1 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 6 Jul 2021 22:43:23 +0200 Subject: [PATCH 0070/1858] [Qt6] Update to 6.1.2 (#18787) * update qt to 6.1.2 * version stuff --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtbase/clang-cl_source_location.patch | 5 ++- ports/qtbase/cmake/qt_port_details.cmake | 48 ++++++++++----------- ports/qtbase/dc5e7b6.diff | 22 ---------- ports/qtbase/portfile.cmake | 1 - ports/qtbase/vcpkg.json | 2 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquickcontrols2/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- versions/baseline.json | 48 ++++++++++----------- versions/q-/qt.json | 5 +++ versions/q-/qt5compat.json | 5 +++ versions/q-/qtactiveqt.json | 5 +++ versions/q-/qtbase.json | 5 +++ versions/q-/qtcharts.json | 5 +++ versions/q-/qtcoap.json | 5 +++ versions/q-/qtdatavis3d.json | 5 +++ versions/q-/qtdeclarative.json | 5 +++ versions/q-/qtdoc.json | 5 +++ versions/q-/qtimageformats.json | 5 +++ versions/q-/qtlottie.json | 5 +++ versions/q-/qtmqtt.json | 5 +++ versions/q-/qtnetworkauth.json | 5 +++ versions/q-/qtopcua.json | 5 +++ versions/q-/qtquick3d.json | 5 +++ versions/q-/qtquickcontrols2.json | 5 +++ versions/q-/qtquicktimeline.json | 5 +++ versions/q-/qtscxml.json | 5 +++ versions/q-/qtshadertools.json | 5 +++ versions/q-/qtsvg.json | 5 +++ versions/q-/qttools.json | 5 +++ versions/q-/qttranslations.json | 5 +++ versions/q-/qtvirtualkeyboard.json | 5 +++ versions/q-/qtwayland.json | 5 +++ 53 files changed, 195 insertions(+), 97 deletions(-) delete mode 100644 ports/qtbase/dc5e7b6.diff diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 2c4c3da6322638..ffe756fdd5d668 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 85c1e355ac06e7..5397492fdbd16b 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index 99dbf9e75899d0..ac68a5c1ee2270 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch index 6432202454e209..1eeb67aaf74c07 100644 --- a/ports/qtbase/clang-cl_source_location.patch +++ b/ports/qtbase/clang-cl_source_location.patch @@ -2,12 +2,13 @@ diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 823b2057b..4a8cd4fa8 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h -@@ -49,7 +49,7 @@ +@@ -49,8 +49,8 @@ #include -#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) +#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) - #include + #include + #if defined(__cpp_lib_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std #define QT_PROPERTY_COLLECT_BINDING_LOCATION diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index e86a38c650e6b3..ac9fab8f4fad92 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,4 +1,4 @@ -set(QT_VERSION 6.1.1) +set(QT_VERSION 6.1.2) set(QT_GIT_TAG v${QT_VERSION}) #set(QT_UPDATE_VERSION TRUE) @@ -37,30 +37,30 @@ foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF 9461362fb0aa5ec91bcfafe1169bd32cf9cfc828) -set(qttools_REF 3fa59b12c7e23e0eb3fbb0f3a9d3f7fee2669f72) -set(qtdeclarative_REF 34d723b38ef9b2ef851f589dfd0523420f4c5acc) -set(qtsvg_REF 242d6a797b6051baccd101978f3e138293701159) -set(qt5compat_REF 57202ccee96b7297202ba11c867178cff32b6eef) -set(qtshadertools_REF 954b90fa332b37ba1b60a2fcd92c06a0de6a6322) -set(qtquicktimeline_REF 2cb89aa7b120ec0ac84426d9f50bf8c613bbcd1e) -set(qtquick3d_REF 6c5ec5b14829f4181d035ad357f594e32e0e4119) -set(qttranslations_REF 47deef3a86795ef97708ec1da403a06cf696ec1c) -set(qtwayland_REF f2c5c1304fc1a5123243a3a83ac8d8f3f67138ca) -set(qtdoc_REF 097bdcbf52a3cd798b66318f2b453cd01640e06b) -set(qtimageformats_REF 6cd036f63ff4b939f2ceb02fda98303a89a1b4b1) -set(qtmqtt_REF d5c00c7245916a919b408578a6dd17bfac0e064d) -set(qtquickcontrols2_REF 1d84dc70059a6e324faab3535cb3958c6fa52fab) -set(qtnetworkauth_REF a903abe7e43123ecd727ca2e29d552c5ed639552) -set(qtcoap_REF 160c3fb6850be44c09142150aef165a09946a608) -set(qtopcua_REF c025fe5182a369723a67be06d64cbfbf2760ba0e) -set(qtactiveqt_REF b9cf1840e44d5283f2212a73ba7b74ec18564d5a) -set(qtdatavis3d_REF 1629d860192ffc644a5c0c7d63e18a6ee6d5e295) +set(qtbase_REF c7c05ab0610ca521a7fcbfdd8d063358d62531b0) +set(qttools_REF 304bae0d5acdee4313405c25dcd259db92dff23d) +set(qtdeclarative_REF bfe2822fb615fb9264c19cebc07994c7a719d159) +set(qtsvg_REF e4950cbb5810fb9e0fd1c42ba888e6d77c21d4b6) +set(qt5compat_REF ff070674ce05e580f023634d5c0fb33c27bb95fd) +set(qtshadertools_REF 2e4aae72dad87eb6d32aa505d6fdcc51b7be057a) +set(qtquicktimeline_REF 72f2f03964068d7a66f878949e739fa933d12246) +set(qtquick3d_REF 261ad084def2fb0147a9def96a55d9ca2c469268) +set(qttranslations_REF caa1100446f659ab992585aecd647612df1d0755) +set(qtwayland_REF 549e6892a0932b76ff7f4004057644980445df36) +set(qtdoc_REF 5a1cc893a66e84155924a94d538ab9401aa02976) +set(qtimageformats_REF 99a0ff33dc46582235363f5ca64a01ce3c1b9fe3) +set(qtmqtt_REF cef4c58c9b60248ab4fb0ae60815efb906a20f2a) +set(qtquickcontrols2_REF 2d2e99d44337867585fa0dba8de5bd7ecd7ad6e7) +set(qtnetworkauth_REF b3e45d0dad36a0ec402bb6e3e85459546378ed22) +set(qtcoap_REF aa40b3cd7d699c926c8527fe7708436cc47eeced) +set(qtopcua_REF 615ea73989fa5b2a7f560a292d3054af5d0663ed) +set(qtactiveqt_REF 020d8da4e22be449846eefcfaa805cd8309cac20) +set(qtdatavis3d_REF a4ea8afeba164d2dc8229e693c541d364e99f3de) #set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF f6a4557b1484b9ad7db4bae8c5b6b264618876e5) -set(qtscxml_REF 666adc604fec06fa5b38be4d4f1b0e9b56f16c2b) -set(qtvirtualkeyboard_REF 5c7df0c55a96e9855bd27c23a18d6f2d91305d31) -set(qtcharts_REF 251d18d960a6f6ee04f07ba338beb317c425e0a2) +set(qtlottie_REF 35e46e52d8849caf84269f92701a5b342824582c) +set(qtscxml_REF d92013adb0a4ad0a80e94a265ec13b5c1730ee05) +set(qtvirtualkeyboard_REF 4e71c9ae1ef8bfe1d9193cd14d11a4e1cf9ea7bc) +set(qtcharts_REF 68a5725a5c97adad88a9d7a6318b06547f7bf1a3) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qtbase/dc5e7b6.diff b/ports/qtbase/dc5e7b6.diff deleted file mode 100644 index e420267b2a80aa..00000000000000 --- a/ports/qtbase/dc5e7b6.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake -index 0eeccce..2ee41c2 100644 ---- a/cmake/QtFlagHandlingHelpers.cmake -+++ b/cmake/QtFlagHandlingHelpers.cmake -@@ -421,7 +421,7 @@ - # cache variable with FORCE will overwrite the non-cache variable in this - # function scope, but we need to use the original value before that change. - foreach(flag_value IN LISTS flag_values) -- string(${replace_type} "${flag_value}" "" ${flag_var_name} "${${flag_var_name}}") -+ string(${replace_type} "${flag_value}" " " ${flag_var_name} "${${flag_var_name}}") - endforeach() - string(STRIP "${${flag_var_name}}" ${flag_var_name}) - set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE) -@@ -433,7 +433,7 @@ - # Work exclusively on cache variable value only. - set(mod_flags $CACHE{${flag_var_name}}) - foreach(flag_value IN LISTS flag_values) -- string(${replace_type} "${flag_value}" "" mod_flags "${mod_flags}") -+ string(${replace_type} "${flag_value}" " " mod_flags "${mod_flags}") - endforeach() - string(STRIP "${mod_flags}" mod_flags) - get_property(help_text CACHE ${flag_var_name} PROPERTY HELPSTRING) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 0ae81659b9e1f3..9d48e0ed5c445d 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -12,7 +12,6 @@ set(${PORT}_PATCHES dont_force_cmakecache.patch fix_find_dep.patch 20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch. - dc5e7b6.diff clang-cl_source_location.patch ) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 3ca8dc78838632..4f1ba221496c08 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 4129cdfcaaea92..f95150d161a0be 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 0b1deb3cd25174..b35622815042eb 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 35bdd4a67c5e72..9f31e8fb5426b1 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 9e70f72cf797ee..63ef0793508f17 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 59bf0aaf249a09..12196eae89e65b 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 22353d2a81ec31..ef42be64d9f8ee 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index c235aa64043eea..d0e7964840c22d 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index fb1be27af8e9da..e54eb9bbae5730 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index ddc43cbb29b328..bbfb1d0d9a0d3e 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 22226b88535c46..dc096d20e4c378 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 6ec42763f386e5..980faf4759bb9e 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index 699d9f53d21701..139b2a8289f208 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickcontrols2", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Quick Controls 2", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 5ed5f43bd456af..aec0718bd95983 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 4cc3c4d0ca1e8b..c6d3ac8a89392b 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 4821d9e198895f..5810e64f779a1c 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 817abf5e7b0678..9b1a0bd7dd0794 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 7567f22208a8c4..2ec5a91edf5ff7 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index c6b80e9434b825..d4fb9d8c46d9e2 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index e73d5f3e9bfc15..fca230939277ef 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index a8f732f6a617dd..9799150e1db707 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version-semver": "6.1.1", + "version-semver": "6.1.2", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "supports": "!windows", diff --git a/versions/baseline.json b/versions/baseline.json index 07c65eeea958d1..73e81bb1bac004 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5077,7 +5077,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5257,7 +5257,7 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qt6betablock": { @@ -5265,35 +5265,35 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtbase": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtcharts": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtcoap": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtdoc": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtimageformats": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtkeychain": { @@ -5301,59 +5301,59 @@ "port-version": 0 }, "qtlottie": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtmqtt": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtopcua": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtquick3d": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtscxml": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtshadertools": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtsvg": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qttools": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qttranslations": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "qtwayland": { - "baseline": "6.1.1", + "baseline": "6.1.2", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index cc389853f57517..0f5fca8a6aa584 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6744ad0c2da924c58372492b96d9ea9b43747440", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "21fd23ba62f5f9c76024d715eb025a6d7458266b", "version-semver": "6.1.1", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 927a76006c580f..6933b9db0ba8e5 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3d8792b65b0a5f83423ed425d01bf77759c33d0", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "b47025d88998f99cdfe58e3df9498c3a08d72883", "version-semver": "6.1.1", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 590f24102bdd95..e0a42c7e938f6e 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "746af755dc6d69853c6a369b2fa61aad7ec33c45", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "3e20968097c4a9d81833f16c2f6637b67e72258f", "version-semver": "6.1.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index b351db070bcc47..784fc5be001804 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "953b2fbc4ecc9e3ec83df47f2470d078f21758bd", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "8f4c208e4c4606ae0f7663901399720437358e76", "version-semver": "6.1.1", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 1a1d8b8bdead07..e65901685f8605 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74995a3fee551bc872bd44d0a0592a67cc20f3bb", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "5c3e47558bcd193afac22d72771d726b4e4721a1", "version-semver": "6.1.1", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 198ee4ec557d5d..0b674f5e105615 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10c8de5683f1878cdee669c101dcbf50fefaf10e", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "2dec36ef658a413500ce4486e1d82fe377b3a99c", "version-semver": "6.1.1", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 855b909e927066..8ff8df3dddb62a 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b25e2c719ecc3c1476ceb68579e97f3562eb9899", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "0940f08a99ce3d6f46e2ad01242645ee4b4d61d5", "version-semver": "6.1.1", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index ba440fd7b8b206..f995b8a92007d7 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b283ef4063b4040b652dcfe42bf37006cded85a5", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "54b33929f07b96d7284b3b79923cafd06bdcb207", "version-semver": "6.1.1", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 67e0524dc0aaf6..0d5ec5fa97826a 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a74cb89e81a66827639d45083efcc0e19260f70", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "5bf8d66cd624cdbc6158070163895171a76feb3e", "version-semver": "6.1.1", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 31046ef5b33607..a0a9ca9d6224da 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e3d92605b4a236be559ec0bfb55a5a282de0fe7", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "e5b06628ae9af1093a1b5a858cec9ca49d0488a6", "version-semver": "6.1.1", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 9188cc93328108..86d633bc8bc9f1 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d8b35dbd8e41a85097752ce057623380ae023f2", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "58c76699b4615a2d73f708a7216bee9f1e04e265", "version-semver": "6.1.1", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 0761cb41b659a2..da47891ded765b 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c21f77ae949388eb4787d5abc8e3a94667ee584", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "a1503fed7d188e3ec61c12c590c34dd5bd80c88c", "version-semver": "6.1.1", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index e30eed15f990de..1d69784b3a2d02 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3dbdc5974015e8c9e41087a13cd2d83b5f33394", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "1176858af90b88c983584218ed702abdb184b942", "version-semver": "6.1.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 0356ac85e53e96..03ca84289fef7e 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "477ed1c8be16624d2d7ca9b548aea3d733c30c5e", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "12ea0d30494f580a959c288490e0443e06ecc5b8", "version-semver": "6.1.1", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 58346078dfbdda..ee1d8c034212a8 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f9db44634b543a34b525ffc1444f764afe0241e", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "a9df9d17c45c39e2a6bf24cff0458bc690f16f1c", "version-semver": "6.1.1", diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index d6728198442b30..0c5c05551768f7 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7a3f18e05756732c1344a336558851d7f1adafc", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "ab667ec0d159c9e2b729dd42c7a0225c9cca6000", "version-semver": "6.1.1", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index f00a9a40b1db04..140017053cd854 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd4994e897733cbbdab700567854117998f2986a", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "8ae8944b42dacf2e13322dd2946e008056b27dea", "version-semver": "6.1.1", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 2934589e7f48bf..53261ba801b86b 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12a020d23caf6939a8b10c126bd6dd5230f3c5bf", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "fab8ae306010c0bc21189d746169b8f52d728c40", "version-semver": "6.1.1", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 5c3be9ac5f793d..df6dd8f4845f8e 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef324b3fad33f5340cc707700c6666663ca94de2", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "68ddad00b0176a27f54fa87b04c55e612f9ee87f", "version-semver": "6.1.1", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 54177ac31eac17..dfa7c1ea33157a 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fafae2d0f01bb61cff47d039ea5fa28f1f17967", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "12588c47b6c0faa970cdfc550f5f1526e8811c79", "version-semver": "6.1.1", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 5054857f584f87..4f9682210a1d73 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f09d833f7ce9934bcc02650cd9c580b84932f6bc", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "93ebe354c38cc124370c24d066d2a631444347e8", "version-semver": "6.1.1", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index ffb86daf3ae02f..72e6c3bfc3e3f4 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "899f3c456dd7aad0a3680083ef8d0f118b6c6761", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "8a70306f29690e0d5bb1a8fa99ed1c4108b5a247", "version-semver": "6.1.1", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 354106b8b0a52b..71bfc82866b0ca 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1ed3185f1204d32b530464acdd1f843e5edbf95", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "6d8d0ee73c77d2b796669b3e874f91d0c7270aa7", "version-semver": "6.1.1", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 8391bd3793be12..63008b3e47883f 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39df5f0a73c89113b633ae47582d88e6b63b09c3", + "version-semver": "6.1.2", + "port-version": 0 + }, { "git-tree": "3b9d48c269a94eb37c62a7e81358855065cdd6cf", "version-semver": "6.1.1", From f8387a7e1d512ac528814324047a6e34ee168bf6 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Tue, 6 Jul 2021 21:45:15 +0100 Subject: [PATCH 0071/1858] [ffmpeg] fix LGPL build, disable avisynthplus on static builds (#18803) * [ffmpeg] do not pull in postproc for LGPL build * [ffmpeg] disable avisynthplus on static builds (as it is not functional) * [ffmpeg] bump port version * [ffmpeg] x-add-version --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 35 ++++++++++++++++++++++++++++++++--- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1dfe4b18e21a14..9b70694c2a5688 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -20,8 +20,8 @@ if("ass" IN_LIST FEATURES) endif() if("avisynthplus" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS)) - message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp'") + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (NOT VCPKG_TARGET_IS_WINDOWS) OR (VCPKG_LIBRARY_LINKAGE STREQUAL "static")) + message(FATAL_ERROR "Feature 'avisynthplus' does not support '!windows | arm | uwp | static'") endif() endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 1b5c40f0a0d672..8ce76f9e343ce4 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 6, + "port-version": 7, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -28,7 +28,12 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ + "avcodec", + "avdevice", + "avfilter", + "avformat", "avresample", "bzip2", "freetype", @@ -40,6 +45,8 @@ "snappy", "soxr", "speex", + "swresample", + "swscale", "theora", "vorbis", "vpx", @@ -49,6 +56,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "sdl2" ], @@ -56,6 +64,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "opencl" ], @@ -63,6 +72,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "openh264" ], @@ -70,6 +80,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "xml2" ], @@ -77,6 +88,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ilbc" ], @@ -84,6 +96,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ass" ], @@ -91,6 +104,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fribidi" ], @@ -98,6 +112,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "ssh" ], @@ -105,6 +120,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "dav1d" ], @@ -112,6 +128,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "modplug" ], @@ -119,6 +136,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "tensorflow" ], @@ -126,6 +144,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "opengl" ], @@ -133,6 +152,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "nvcodec" ], @@ -140,6 +160,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "tesseract" ], @@ -147,6 +168,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fontconfig" ], @@ -159,13 +181,16 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all", - "gpl" + "gpl", + "postproc" ] }, { "name": "ffmpeg", + "default-features": false, "features": [ "x264" ], @@ -173,6 +198,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "x265" ], @@ -180,10 +206,11 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "avisynthplus" ], - "platform": "windows & !arm & !uwp" + "platform": "windows & !arm & !uwp & !static" } ] }, @@ -192,6 +219,7 @@ "dependencies": [ { "name": "ffmpeg", + "default-features": false, "features": [ "all-gpl", "nonfree", @@ -200,6 +228,7 @@ }, { "name": "ffmpeg", + "default-features": false, "features": [ "fdk-aac" ], diff --git a/versions/baseline.json b/versions/baseline.json index 73e81bb1bac004..fc4efa09e3c6f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1982,7 +1982,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 6 + "port-version": 7 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 14c7c2f68b7c56..c510b16ed25c50 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", + "version": "4.4", + "port-version": 7 + }, { "git-tree": "8405d9f6850d7ceb6cede89a791b42c41253ef29", "version": "4.4", From 7cf065c34e24c7e9a710a922786c572aa9d0d8ff Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 6 Jul 2021 16:46:21 -0400 Subject: [PATCH 0072/1858] [google-cloud-cpp] update to latest release (v1.29.0) (#18759) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 6c3378c2f6f83a..101f01a83c2550 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.28.0 - SHA512 066655495d9d1a5a183b3efb682daf5b97e6f76943c7f6075694386075b9e8efacd102927e2e265bd4b509317088b4af70584695648e598b2a21d0df4111a6b6 + REF v1.29.0 + SHA512 1dda15eaece6d574ba49eb3756e8a72eac6c9b508acf30ed1de0a0234e1e36a352f11494411a84533f8412779040da3e3ffc98d33d43a99b3626c15627513f20 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index bd486a0457edba..c402577ae895f9 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.28.0", + "version": "1.29.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index fc4efa09e3c6f8..6115ca58e1bd57 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2345,7 +2345,7 @@ "port-version": 6 }, "google-cloud-cpp": { - "baseline": "1.28.0", + "baseline": "1.29.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 15642cef76ece6..e4907ec96a499d 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47a4d6d3258efe94ffe95b10abd1f0a19c48aab2", + "version": "1.29.0", + "port-version": 0 + }, { "git-tree": "41623bc51fa4b9763aa83d192130ff37119afe33", "version": "1.28.0", From b4fe9daefa7ef6c658a9e53888266d005fa15945 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 7 Jul 2021 04:48:44 +0800 Subject: [PATCH 0073/1858] [exiv2] update to 0.27.4 (#18750) * [exiv2] update to 0.27.4 * update version --- ports/exiv2/CONTROL | 17 ------------- ports/exiv2/fix-ninja-error.patch | 42 +++++++++++++++++++++++++++++++ ports/exiv2/portfile.cmake | 36 ++++++++++++++++++++------ ports/exiv2/vcpkg.json | 32 +++++++++++++++++++++++ versions/baseline.json | 4 +-- versions/e-/exiv2.json | 5 ++++ 6 files changed, 109 insertions(+), 27 deletions(-) delete mode 100644 ports/exiv2/CONTROL create mode 100644 ports/exiv2/fix-ninja-error.patch create mode 100644 ports/exiv2/vcpkg.json diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL deleted file mode 100644 index 17141299b0a151..00000000000000 --- a/ports/exiv2/CONTROL +++ /dev/null @@ -1,17 +0,0 @@ -Source: exiv2 -Version: 0.27.3 -Port-Version: 4 -Build-Depends: zlib, libiconv, gettext -Description: Image metadata library and tools -Homepage: https://www.exiv2.org -Supports: !uwp - -Feature: unicode -Description: Compile with unicode support on windows - -Feature: xmp -Description: Build with XMP metadata support -Build-Depends: expat - -Feature: video -Description: Build video support into library diff --git a/ports/exiv2/fix-ninja-error.patch b/ports/exiv2/fix-ninja-error.patch new file mode 100644 index 00000000000000..71f52f5615e62e --- /dev/null +++ b/ports/exiv2/fix-ninja-error.patch @@ -0,0 +1,42 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c52b352..b19c438 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -149,7 +149,7 @@ set_target_properties( exiv2lib_int PROPERTIES + + target_include_directories(exiv2lib_int PRIVATE ${ZLIB_INCLUDE_DIR}) + target_include_directories(exiv2lib PRIVATE +- $ ++ ${PROJECT_SOURCE_DIR}/xmpsdk/include + ${ZLIB_INCLUDE_DIR} + ) + +@@ -215,7 +215,7 @@ else() + endif() + + if( EXIV2_ENABLE_PNG ) +- target_link_libraries( exiv2lib PRIVATE $) ++ target_link_libraries( exiv2lib PRIVATE ${ZLIB_LIBRARIES}) + endif() + + if( EXIV2_ENABLE_NLS ) +diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt +index a22698f..ca6ffe0 100644 +--- a/xmpsdk/CMakeLists.txt ++++ b/xmpsdk/CMakeLists.txt +@@ -27,13 +27,12 @@ add_library(exiv2-xmp STATIC + ) + + target_link_libraries(exiv2-xmp +- PRIVATE +- $ ++ PRIVATE ${EXPAT_LIBRARY} + ) + + target_include_directories(exiv2-xmp + PRIVATE +- $ ++ ${PROJECT_SOURCE_DIR}/xmpsdk/include + ${EXPAT_INCLUDE_DIR} + ) + diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index 01fa8c6ae67110..eea46e2ba5212e 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -4,17 +4,23 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Exiv2/exiv2 - REF 194bb65ac568a5435874c9d9d73b1c8a68e4edec #v0.27.3 - SHA512 35a5a41e0a6cfe04d1ed005c8116ad4430516402b925db3d4f719e2385e2cfb09359eb7ab51853bc560138f221900778cd2e2d39f108c513b3e7d22dbb9bf503 + REF 15098f4ef50cc721ad0018218acab2ff06e60beb #v0.27.4 + SHA512 4be0a9c4c64c65a9ca85291ba2cf54efacc5a88dae534c2d9252986df4e12212899c33093b07695369108e3763b3d74592a6153d832743694ec95c9a03c7e2c3 HEAD_REF master + PATCHES + fix-ninja-error.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - unicode EXIV2_ENABLE_WIN_UNICODE - xmp EXIV2_ENABLE_XMP - video EXIV2_ENABLE_VIDEO + FEATURES + unicode EXIV2_ENABLE_WIN_UNICODE + xmp EXIV2_ENABLE_XMP + video EXIV2_ENABLE_VIDEO + png EXIV2_ENABLE_PNG ) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" EXIV2_CRT_DYNAMIC) + if("unicode" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) message(FATAL_ERROR "Feature unicode only supports Windows platform.") endif() @@ -24,9 +30,23 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DEXIV2_BUILD_EXIV2_COMMAND:BOOL=FALSE - -DEXIV2_BUILD_UNIT_TESTS:BOOL=FALSE - -DEXIV2_BUILD_SAMPLES:BOOL=FALSE + -DEXIV2_BUILD_EXIV2_COMMAND=OFF + -DEXIV2_BUILD_UNIT_TESTS=OFF + -DEXIV2_BUILD_SAMPLES=OFF + -DEXIV2_BUILD_DOC=OFF + -DEXIV2_ENABLE_EXTERNAL_XMP=OFF + -DEXIV2_ENABLE_NLS=OFF + -DEXIV2_ENABLE_PRINTUCS2=OFF + -DEXIV2_ENABLE_LENSDATA=ON + -DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC} + -DEXIV2_ENABLE_WEBREADY=OFF + -DEXIV2_ENABLE_CURL=OFF + -DEXIV2_ENABLE_SSH=OFF + -DEXIV2_ENABLE_BMFF=OFF + -DEXIV2_TEAM_EXTRA_WARNINGS=OFF + -DEXIV2_TEAM_WARNINGS_AS_ERRORS=OFF + -DEXIV2_TEAM_PACKAGING=OFF + -DEXIV2_TEAM_USE_SANITIZERS=OFF ) vcpkg_install_cmake() diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json new file mode 100644 index 00000000000000..2b9a3675537bf8 --- /dev/null +++ b/ports/exiv2/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "exiv2", + "version": "0.27.4", + "description": "Image metadata library and tools", + "homepage": "https://www.exiv2.org", + "supports": "!uwp", + "dependencies": [ + "gettext", + "libiconv" + ], + "features": { + "png": { + "description": "Build with png support (requires libz)", + "dependencies": [ + "libpng", + "zlib" + ] + }, + "unicode": { + "description": "Compile with unicode support on windows" + }, + "video": { + "description": "Build video support into library" + }, + "xmp": { + "description": "Build with XMP metadata support", + "dependencies": [ + "expat" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 6115ca58e1bd57..f8762a9c3e9f2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1889,8 +1889,8 @@ "port-version": 4 }, "exiv2": { - "baseline": "0.27.3", - "port-version": 4 + "baseline": "0.27.4", + "port-version": 0 }, "expat": { "baseline": "2.4.1", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 6f6848cc146cb0..f02a909cc0f3ee 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f716a33e59b24c79140216d836644fe0603e322b", + "version": "0.27.4", + "port-version": 0 + }, { "git-tree": "e38c35650c00596aafb8dda45b0d0e7f0a591563", "version-string": "0.27.3", From 40ccaf8c82ffcfb3e7881f8c7666faf424d2b9c7 Mon Sep 17 00:00:00 2001 From: Luca Schlecker Date: Tue, 6 Jul 2021 22:49:23 +0200 Subject: [PATCH 0074/1858] [crow] update to v0.3+1 (#18706) Signed-off-by: Luca Schlecker --- ports/crow/portfile.cmake | 4 ++-- ports/crow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/crow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index eac8694c7109bb..fefc42cba15723 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF fc27f73f84967ffc1140cfd106dcab35bc8bca9e #0.3 - SHA512 efc47833ec84757898c72a63018e383611261cfbbf121984c272c6183025ef6551595941177ae41627c623982343c1d824c4ec25c3141c6c01a9aee0fade8ac3 + REF 6a1623b69c5f788b1ea248f0046634fa1e7b0e03 #0.3+1 + SHA512 6c3e1e89e0f0ea9dcbe9206071189ad692c34400b1a3e101002e9bd97729851db94a40ce45b8fc9aa747df409cfdbdbdf09af806361d1e7df6f515f4c50e7a80 HEAD_REF master ) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index c512e753d79487..9bf62431d8ac29 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "crow", - "version": "0.3", + "version": "0.3.1", "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow" } diff --git a/versions/baseline.json b/versions/baseline.json index f8762a9c3e9f2e..d34daaed8ae052 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1517,7 +1517,7 @@ "port-version": 0 }, "crow": { - "baseline": "0.3", + "baseline": "0.3.1", "port-version": 0 }, "cryptopp": { diff --git a/versions/c-/crow.json b/versions/c-/crow.json index 1f50e34a832856..fcad8922338947 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c50547dfc3c5f5bf5a08887d6515e51a7203130", + "version": "0.3.1", + "port-version": 0 + }, { "git-tree": "4a0d69a7e34aa3d77de7ba2c01ce45ae730478a1", "version": "0.3", From 724fc338218b31fa5d3bc885b058fa82bad3484c Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Wed, 7 Jul 2021 06:51:11 +1000 Subject: [PATCH 0075/1858] [irrlicht] Add OSX support (#18725) * Fix Irrlicht compilation on OSX * Update port description * Update portfile instructions * Update version * Fix patch files * Add missing cmake dependencies * Remove obsolete comment * Update version * Remove OBJCXX language from project definition to prevent Windows builds from failing * Update versions * Code review tweaks * Update version * Update versions/i-/irrlicht.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix qt5-3d build failure on OSX * Update qt5-3d version * Update port-version for qt5-3d * Update version for qt5-3d * [qt5-3d] Revert modification to previous version entry Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/irrlicht/CMakeLists.txt | 57 +++++++++++++++++------- ports/irrlicht/CONTROL | 9 ++-- ports/irrlicht/fix-osx-compilation.patch | 28 ++++++++++++ ports/irrlicht/portfile.cmake | 16 ++++--- ports/qt5-3d/CONTROL | 1 + ports/qt5-3d/portfile.cmake | 2 + scripts/ci.baseline.txt | 1 - versions/baseline.json | 6 +-- versions/i-/irrlicht.json | 5 +++ versions/q-/qt5-3d.json | 5 +++ 10 files changed, 100 insertions(+), 30 deletions(-) create mode 100644 ports/irrlicht/fix-osx-compilation.patch diff --git a/ports/irrlicht/CMakeLists.txt b/ports/irrlicht/CMakeLists.txt index d7e0c8f50ff405..cc6edc785b5916 100644 --- a/ports/irrlicht/CMakeLists.txt +++ b/ports/irrlicht/CMakeLists.txt @@ -1,11 +1,11 @@ # # Irrlicht 3D engine # -cmake_minimum_required(VERSION 3.8) -project(Irrlicht) +cmake_minimum_required(VERSION 3.16) +project(Irrlicht LANGUAGES C CXX) set_property(GLOBAL PROPERTY USE_FOLDERS ON) - + # Irrlicht directories # ------------------------------------------------------------------------------------------------- set(IRR_SRC_DIR "source/Irrlicht") @@ -48,7 +48,15 @@ glob_c_cpp_sources(IRR_TOOL_FILES_FILE_TO_HEADER ${IRR_TOOL_DIR}/FileToHeader glob_c_cpp_sources(IRR_TOOL_FILES_GUI_EDITOR ${IRR_TOOL_DIR}/GUIEditor/) glob_c_cpp_sources(IRR_TOOL_FILES_FONT_TOOL ${IRR_TOOL_DIR}/IrrFontTool/newFontTool/) glob_c_cpp_sources(IRR_TOOL_FILES_MESH_CONVERTER ${IRR_TOOL_DIR}/MeshConverter/) - + +if(APPLE) + file(GLOB IRR_SRC_FILES_OSX + "${IRR_SRC_DIR}/MacOSX/*.mm" + "${IRR_SRC_DIR}/MacOSX/*.h") + + set(IRR_SRC_FILES ${IRR_SRC_FILES} ${IRR_SRC_FILES_OSX}) +endif() + # Group files # ------------------------------------------------------------------------------------------------- source_group(Irrlicht\\engine FILES ${IRR_SRC_FILES}) @@ -79,11 +87,29 @@ else() add_library(Irrlicht STATIC ${IRR_ALL_SRC_FILES}) endif() -target_link_libraries(Irrlicht PRIVATE - ${PNG_LIBRARY} - ${JPEG_LIBRARY} +if(APPLE) + target_include_directories(Irrlicht PRIVATE ${IRR_SRC_DIR}/MacOSX) + + target_compile_definitions(Irrlicht PRIVATE SYSTEM=MacOSX) + + target_link_libraries(Irrlicht ${OSX_LIBRARIES}) + + target_compile_options(Irrlicht PRIVATE "-ObjC++") + + set(ADDITIONAL_LIRARIES + "-framework OpenGL" + "-framework IOKit" + "-framework Carbon" + "-framework AppKit" + "-framework Cocoa") +endif() + +target_link_libraries(Irrlicht PRIVATE + ${PNG_LIBRARY} + ${JPEG_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARY} + ${ADDITIONAL_LIRARIES} ) if(IRR_BUILD_TOOLS) @@ -112,7 +138,7 @@ target_include_directories(Irrlicht ) # I dont realy understand why this is necesary or what it is doing, -# but it is necesarry to build and export a package. +# but it is necesarry to build and export a package. # See: https://cmake.org/cmake/help/v3.8/command/target_include_directories.html target_include_directories(Irrlicht PUBLIC $ @@ -177,7 +203,6 @@ if(WIN32) target_compile_options(Irrlicht PRIVATE /arch:SSE2) endif() endif() - elseif(UNIX) # Standard mode target_compile_options(Irrlicht @@ -185,7 +210,7 @@ elseif(UNIX) PRIVATE -pipe PRIVATE -fno-exceptions PRIVATE -fno-strict-aliasing) - + # Disable RTTI on C++ files only (no sense for C files) set_source_files_properties(${IRR_SRC_FILES} ${IRR_SRC_FILES_AESGLADMAN} PROPERTIES COMPILE_FLAGS -fno-rtti) @@ -194,10 +219,12 @@ elseif(UNIX) target_compile_options(Irrlicht PRIVATE $<$:-D_DEBUG>) # X11 and OpenGL - target_link_libraries(Irrlicht - PRIVATE X11 - PRIVATE GL - PRIVATE Xxf86vm) + if(NOT APPLE) + target_link_libraries(Irrlicht + PRIVATE X11 + PRIVATE GL + PRIVATE Xxf86vm) + endif() endif() # Installation @@ -214,7 +241,7 @@ install(FILES ${IRR_SRC_FILES_INTERFACE} DESTINATION "include/irrlicht" CONFIGUR if(IRR_BUILD_TOOLS) install( - TARGETS FileToHeader GUIEditor FontTool MeshConverter + TARGETS FileToHeader GUIEditor FontTool MeshConverter RUNTIME DESTINATION tools/irrlicht/ CONFIGURATIONS Release ) diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL index e8ff45bdd81fd5..5161a33b2671d0 100644 --- a/ports/irrlicht/CONTROL +++ b/ports/irrlicht/CONTROL @@ -1,9 +1,10 @@ Source: irrlicht -Version: 1.8.4-10 +Version: 1.8.4 +Port-Version: 11 Homepage: http://irrlicht.sourceforge.net -Description: Irrlicht lightning fast 3d engine -Build-Depends: zlib, libpng, bzip2, libjpeg-turbo -Supports: !(arm|uwp|osx) +Description: The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers. +Build-Depends: zlib, libpng, bzip2, libjpeg-turbo, vcpkg-cmake, vcpkg-cmake-config +Supports: !(arm|uwp) Feature: unicode Description: Support unicode path on windows diff --git a/ports/irrlicht/fix-osx-compilation.patch b/ports/irrlicht/fix-osx-compilation.patch new file mode 100644 index 00000000000000..6f623db265e214 --- /dev/null +++ b/ports/irrlicht/fix-osx-compilation.patch @@ -0,0 +1,28 @@ +diff --git a/source/Irrlicht/CImageLoaderJPG.cpp b/source/Irrlicht/CImageLoaderJPG.cpp +index 66144326c..4ea224c24 100644 +--- a/source/Irrlicht/CImageLoaderJPG.cpp ++++ b/source/Irrlicht/CImageLoaderJPG.cpp +@@ -68,7 +68,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo) + boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) + { + // DO NOTHING +- return 1; ++ return TRUE; + } + + +diff --git a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +index 53029eb45..e75b707e1 100644 +--- a/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm ++++ b/source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm +@@ -495,8 +495,8 @@ long GetDictionaryLong(CFDictionaryRef theDict, const void* key) + if(!CreationParams.WindowId) //load menus if standalone application + { + [[NSAutoreleasePool alloc] init]; +- [NSApplication sharedApplication]; +- [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; ++ [[NSApplication sharedApplication] activateIgnoringOtherApps]; ++ [NSApp setDelegate:(id)[[[AppDelegate alloc] initWithDevice:this] autorelease]]; + [NSBundle loadNibNamed:@"MainMenu" owner:[NSApp delegate]]; + [NSApp finishLaunching]; + } diff --git a/ports/irrlicht/portfile.cmake b/ports/irrlicht/portfile.cmake index 754119f3ed9ec2..9641f8fddc837d 100644 --- a/ports/irrlicht/portfile.cmake +++ b/ports/irrlicht/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "osx" "uwp") +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -6,7 +6,10 @@ vcpkg_from_sourceforge( REF 1.8/1.8.4 FILENAME "irrlicht-1.8.4.zip" SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 - PATCHES fix-encoding.patch fix-sysctl.patch + PATCHES + fix-encoding.patch + fix-sysctl.patch + fix-osx-compilation.patch ) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) @@ -21,17 +24,16 @@ vcpkg_check_features( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIB) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS + OPTIONS -DIRR_SHARED_LIB=${SHARED_LIB} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() if("tools" IN_LIST FEATURES) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/irrlicht/) diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL index 7868a6595c2c04..1ec0c15a669e54 100644 --- a/ports/qt5-3d/CONTROL +++ b/ports/qt5-3d/CONTROL @@ -1,4 +1,5 @@ Source: qt5-3d Version: 5.15.2 +Port-Version: 1 Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering Build-Depends: qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad, assimp diff --git a/ports/qt5-3d/portfile.cmake b/ports/qt5-3d/portfile.cmake index 912bad83dc6b51..62a01e4de459a9 100644 --- a/ports/qt5-3d/portfile.cmake +++ b/ports/qt5-3d/portfile.cmake @@ -45,6 +45,8 @@ if(BZ2_DBG) endif() if(VCPKG_TARGET_IS_WINDOWS) set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib") +elseif(VCPKG_TARGET_IS_OSX) + set(SYSTEM_LIBS "-framework OpenGL -framework Cocoa -framework Carbon -framework IOKit -framework AppKit") else() set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11") endif() diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 668d0e0f2416bb..f8f39297af4904 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -487,7 +487,6 @@ intelrdfpmathlib:x64-linux=fail intelrdfpmathlib:x64-uwp=fail irrlicht:arm64-windows=fail irrlicht:arm-uwp=fail -irrlicht:x64-osx=fail irrlicht:x64-uwp=fail isal:arm64-windows=fail isal:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index d34daaed8ae052..677cc5627b117e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2701,8 +2701,8 @@ "port-version": 2 }, "irrlicht": { - "baseline": "1.8.4-10", - "port-version": 0 + "baseline": "1.8.4", + "port-version": 11 }, "irrxml": { "baseline": "0", @@ -5090,7 +5090,7 @@ }, "qt5-3d": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-activeqt": { "baseline": "5.15.2", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index a5fb44f207eb38..6d884cfe326ed8 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18ae08d6099b5457ccedbdb7209c79321a9e9027", + "version-string": "1.8.4", + "port-version": 11 + }, { "git-tree": "e2b2dd836e693401dab067c5064665e926a46b07", "version-string": "1.8.4-10", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index d29595cbe01ae1..ca2dd24e74b219 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c3c15324a4764d3501798299c8ad8087905b136", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "c9a8b7a2360c554409f283143edf9202bebe6a3b", "version-string": "5.15.2", From 264ef6ae4c6a700b1ab6b52ae3150aacc4aa1dba Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Tue, 6 Jul 2021 22:57:41 +0200 Subject: [PATCH 0076/1858] [mapbox-wagyu] add new port (#18771) * add wagyu * add versions * update hash * update versions --- ports/mapbox-wagyu/portfile.cmake | 15 +++++++++++++++ ports/mapbox-wagyu/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/m-/mapbox-wagyu.json | 9 +++++++++ 4 files changed, 34 insertions(+) create mode 100644 ports/mapbox-wagyu/portfile.cmake create mode 100644 ports/mapbox-wagyu/vcpkg.json create mode 100644 versions/m-/mapbox-wagyu.json diff --git a/ports/mapbox-wagyu/portfile.cmake b/ports/mapbox-wagyu/portfile.cmake new file mode 100644 index 00000000000000..b43c60ce2ca0c4 --- /dev/null +++ b/ports/mapbox-wagyu/portfile.cmake @@ -0,0 +1,15 @@ +#header-only library + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/wagyu + REF 0.5.0 + SHA512 d2ef6c056b25e60677da4f53154790558ddb43c56aa117a4d5108f8c7686cceff9e5d54d71138e2eb504f053315d28f7cb8190ff45833c5606d511b685acf40d + HEAD_REF master +) + +# Copy header files +file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") + +# Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/mapbox-wagyu/vcpkg.json b/ports/mapbox-wagyu/vcpkg.json new file mode 100644 index 00000000000000..8da0b64441f4ee --- /dev/null +++ b/ports/mapbox-wagyu/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mapbox-wagyu", + "version-semver": "0.5.0", + "description": "A general library for geometry operations of union, intersections, difference, and xor", + "homepage": "https://github.com/mapbox/wagyu" +} diff --git a/versions/baseline.json b/versions/baseline.json index 677cc5627b117e..5727a6c7fb1022 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3908,6 +3908,10 @@ "baseline": "1.2.0", "port-version": 0 }, + "mapbox-wagyu": { + "baseline": "0.5.0", + "port-version": 0 + }, "marble": { "baseline": "19.08.2", "port-version": 2 diff --git a/versions/m-/mapbox-wagyu.json b/versions/m-/mapbox-wagyu.json new file mode 100644 index 00000000000000..8efd1e5f02d870 --- /dev/null +++ b/versions/m-/mapbox-wagyu.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "84cb6917fd5563c88998e47c219f429e05aea9d5", + "version-semver": "0.5.0", + "port-version": 0 + } + ] +} From 945e1efeaa271c30d3224323ef37f579c8561598 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 7 Jul 2021 05:01:56 +0800 Subject: [PATCH 0077/1858] [ftxui] Add new port (fix #16327) (#18360) * [ftxui] Add new port (fix #16327) * [ftxui] x-add-version ftxui * [ftxui] Drop UWP support * [ftxui] Update to 2021-06-16 * [ftxui] Overwrite version * [ftxui] Try to fix linux and macOS build * [ftxui] Overwrite version * [ftxui] Fail fast on UWP * [ftxui] Clean version file * [ftxui] Overwrite version * [ftxui] Update to 2021-06-17 * [ftxui] Overwrite version * [ftxui] Remove debug/share * [ftxui] Overwrite version * [ftxui] Quote paths * [ftxui] Overwrite version --- ports/ftxui/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/ftxui/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/f-/ftxui.json | 9 +++++++++ 4 files changed, 59 insertions(+) create mode 100644 ports/ftxui/portfile.cmake create mode 100644 ports/ftxui/vcpkg.json create mode 100644 versions/f-/ftxui.json diff --git a/ports/ftxui/portfile.cmake b/ports/ftxui/portfile.cmake new file mode 100644 index 00000000000000..bdb21781fc95c0 --- /dev/null +++ b/ports/ftxui/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ArthurSonzogni/FTXUI + REF 3d5e4eb6ca11a0827bff68a04f4bf68ca9820e20 + SHA512 670b0e5d95f7e6132ca7115005efdb1dee645146af82566af3e48bfff64d82dbc058c2f524b8b9d1d92182e4835ff6024067f0eab8dd6204514efa0207b3d33c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DFTXUI_BUILD_EXAMPLES=OFF + -DFTXUI_ENABLE_INSTALL=ON + -DFTXUI_BUILD_TESTS=OFF + -DFTXUI_BUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ftxui/vcpkg.json b/ports/ftxui/vcpkg.json new file mode 100644 index 00000000000000..34557d19ac9c94 --- /dev/null +++ b/ports/ftxui/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ftxui", + "version-date": "2021-06-17", + "description": "C++ Functional Terminal User Interface", + "homepage": "https://github.com/ArthurSonzogni/FTXUI", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5727a6c7fb1022..286f38c14a5b35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2144,6 +2144,10 @@ "baseline": "2.4.0-2", "port-version": 0 }, + "ftxui": { + "baseline": "2021-06-17", + "port-version": 0 + }, "function2": { "baseline": "4.2.0", "port-version": 0 diff --git a/versions/f-/ftxui.json b/versions/f-/ftxui.json new file mode 100644 index 00000000000000..329be420782cad --- /dev/null +++ b/versions/f-/ftxui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d7dd27584c015a37dd3266255530e889b16aebcf", + "version-date": "2021-06-17", + "port-version": 0 + } + ] +} From e17968d7cfda5c5ad3a2e69dd146e6c8bca77618 Mon Sep 17 00:00:00 2001 From: Ronald <3665590+playgithub@users.noreply.github.com> Date: Wed, 7 Jul 2021 05:04:12 +0800 Subject: [PATCH 0078/1858] [xlsxio] new port (#18438) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add port: xlsxio * vcpkg x-add-version xlsxio * fix deps * add vcpkg_fixup_pkgconfig() * Apply suggestions from code review To be consistent, `OUT_FEATURE_OPTIONS FEATURE_OPTIONS` in a new line, as in `vcpkg_from_git`. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/xlsxio/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * format * use date as version string * vcpkg format-manifest * Update ports/xlsxio/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * patch for dependency * fix typo * vcpkg x-add-version * remove feature wide * Update ports/xlsxio/vcpkg.json deprecate libzip that's an alternative and imperfect Co-authored-by: Robert Schumacher * Update ports/xlsxio/vcpkg.json Co-authored-by: Robert Schumacher * Update versions/x-/xlsxio.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Remove x64-windows-cpp17 community triplet Co-authored-by: abc Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/xlsxio/fix-dependencies.patch | 16 ++++++++++ ports/xlsxio/portfile.cmake | 46 +++++++++++++++++++++++++++++ ports/xlsxio/vcpkg.json | 15 ++++++++++ versions/baseline.json | 4 +++ versions/x-/xlsxio.json | 9 ++++++ 5 files changed, 90 insertions(+) create mode 100644 ports/xlsxio/fix-dependencies.patch create mode 100644 ports/xlsxio/portfile.cmake create mode 100644 ports/xlsxio/vcpkg.json create mode 100644 versions/x-/xlsxio.json diff --git a/ports/xlsxio/fix-dependencies.patch b/ports/xlsxio/fix-dependencies.patch new file mode 100644 index 00000000000000..7a02d8f9de7635 --- /dev/null +++ b/ports/xlsxio/fix-dependencies.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 490ee5c..05c7ee5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,9 +49,8 @@ IF(WITH_LIBZIP) + SET(ANYZIP_LIBRARIES ${LIBZIP_LIBRARIES}) + SET(ANYZIP_DEF USE_LIBZIP) + ELSE() +- FIND_PACKAGE(Minizip REQUIRED) +- SET(ANYZIP_INCLUDE_DIRS ${MINIZIP_INCLUDE_DIRS}) +- SET(ANYZIP_LIBRARIES ${MINIZIP_LIBRARIES}) ++ FIND_PACKAGE(minizip CONFIG REQUIRED) ++ SET(ANYZIP_LIBRARIES minizip::minizip) + SET(ANYZIP_DEF USE_MINIZIP) + ENDIF() + # dependancy: expat diff --git a/ports/xlsxio/portfile.cmake b/ports/xlsxio/portfile.cmake new file mode 100644 index 00000000000000..74b004755dc9da --- /dev/null +++ b/ports/xlsxio/portfile.cmake @@ -0,0 +1,46 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO brechtsanders/xlsxio + REF e3acace39e5fb153f5ce3500a4952c2bf93175bd + SHA512 8148b89c43cf45653c583d51fb8050714d3cd0a76ab9a05d46604f3671a06487e4fc58d3f6f9f2a9f9b57a9f9fe1863ef07017c74197f151390576c5aac360ea + HEAD_REF master + PATCHES fix-dependencies.patch +) + +file(REMOVE ${SOURCE_PATH}/CMake/FindMinizip.cmake) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libzip WITH_LIBZIP +) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILD_STATIC ON) + set(BUILD_SHARED OFF) +else() + set(BUILD_SHARED ON) + set(BUILD_STATIC OFF) +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} + -DBUILD_SHARED=${BUILD_SHARED} + -DBUILD_STATIC=${BUILD_STATIC} + -DWITH_WIDE=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_PC_FILES=OFF + -DBUILD_TOOLS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/xlsxio/vcpkg.json b/ports/xlsxio/vcpkg.json new file mode 100644 index 00000000000000..bc61d92e4176c8 --- /dev/null +++ b/ports/xlsxio/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "xlsxio", + "version-date": "2021-03-24", + "description": "Cross-platform C library for reading values from and writing values to .xlsx files", + "homepage": "https://github.com/brechtsanders/xlsxio", + "dependencies": [ + "expat", + { + "name": "minizip", + "features": [ + "bzip2" + ] + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 286f38c14a5b35..75ef40ca02a42f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6732,6 +6732,10 @@ "baseline": "1.5.0", "port-version": 1 }, + "xlsxio": { + "baseline": "2021-03-24", + "port-version": 0 + }, "xmlsec": { "baseline": "1.2.32", "port-version": 0 diff --git a/versions/x-/xlsxio.json b/versions/x-/xlsxio.json new file mode 100644 index 00000000000000..167faf72b63b99 --- /dev/null +++ b/versions/x-/xlsxio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "363ef11ba53c472f8ec8186c455f964b49088d7f", + "version-date": "2021-03-24", + "port-version": 0 + } + ] +} From fd547ed89c618a2783b1e9e18d7a5b37aa1b2753 Mon Sep 17 00:00:00 2001 From: omartijn <44672243+omartijn@users.noreply.github.com> Date: Tue, 6 Jul 2021 23:05:13 +0200 Subject: [PATCH 0079/1858] [boost-modular-build-helper] Fix boost build toolchain options not being used (#18529) * Fix boost build toolchain options not being used The issue was due to the options only being set for the gcc toolchain, and then only for a specific version. On platforms defaulting to a different toolchain (e.g. macOS) this didn't work at all. Additionally, some missing flags were not propagated, in particular the CMAKE_OSX_DEPLOYMENT_TARGET, CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES * [boost-modular-build-helper] Apply CR comments Co-authored-by: Martijn Otto Co-authored-by: Robert Schumacher --- .../boost-modular-build-helper/CMakeLists.txt | 37 ++++++++++++++++--- .../boost-modular-build.cmake | 1 + .../user-config.jam | 2 +- ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++ versions/baseline.json | 2 +- 6 files changed, 41 insertions(+), 8 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 043636ee8d9629..b38b0e3137fdef 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -46,13 +46,17 @@ else() endif() if(APPLE) - list(APPEND B2_OPTIONS target-os=darwin toolset=clang) + set(B2_TOOLSET clang) + list(APPEND B2_OPTIONS target-os=darwin) elseif(WIN32) - list(APPEND B2_OPTIONS target-os=windows toolset=gcc) + set(B2_TOOLSET gcc) + list(APPEND B2_OPTIONS target-os=windows) elseif(ANDROID) - list(APPEND B2_OPTIONS target-os=android toolset=gcc) + set(B2_TOOLSET gcc) + list(APPEND B2_OPTIONS target-os=android) else() - list(APPEND B2_OPTIONS target-os=linux toolset=gcc) + set(B2_TOOLSET gcc) + list(APPEND B2_OPTIONS target-os=linux) endif() if(WIN32) @@ -80,6 +84,28 @@ elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") endif() endif() +if(APPLE) + if(CMAKE_OSX_DEPLOYMENT_TARGET) + set(CXXFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CXXFLAGS}") + set(CFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${CFLAGS}") + set(LDFLAGS "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET} ${LDFLAGS}") + endif() + + if(CMAKE_OSX_SYSROOT) + set(CXXFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CXXFLAGS}") + set(CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${CFLAGS}") + set(LDFLAGS "-isysroot ${CMAKE_OSX_SYSROOT} ${LDFLAGS}") + endif() + + # if specific architectures are set, configure them, + # if not set, this will still default to current arch + foreach(ARCH IN LISTS CMAKE_OSX_ARCHITECTURES) + set(CXXFLAGS "-arch ${ARCH} ${CXXFLAGS}") + set(CFLAGS "-arch ${ARCH} ${CFLAGS}") + set(LDFLAGS "-arch ${ARCH} ${LDFLAGS}") + endforeach() +endif() + string(STRIP "${CXXFLAGS}" CXXFLAGS) string(STRIP "${CFLAGS}" CFLAGS) string(STRIP "${LDFLAGS}" LDFLAGS) @@ -122,7 +148,7 @@ foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES}) endforeach() if(APPLE) - set(CXXFLAGS "${CXXFLAGS} -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") + set(CXXFLAGS "${CXXFLAGS} -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") set(LDFLAGS "${LDFLAGS} -stdlib=libc++") endif() @@ -157,6 +183,7 @@ endif() add_custom_target(boost ALL COMMAND "${B2_EXE}" + toolset=${B2_TOOLSET} --user-config=${CMAKE_CURRENT_BINARY_DIR}/user-config.jam --stagedir=${CMAKE_CURRENT_BINARY_DIR}/stage --build-dir=${CMAKE_CURRENT_BINARY_DIR} diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 3acc75afda72a2..69eb899a16db99 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -84,6 +84,7 @@ function(boost_modular_build) if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") endif() + vcpkg_configure_cmake( SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build PREFER_NINJA diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 550423965fd33c..afd1d7dc6ac06c 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -10,7 +10,7 @@ if "@VCPKG_PLATFORM_TOOLSET@" != "external" } else { - using gcc : 5.4.1 : @CMAKE_CXX_COMPILER@ + using @B2_TOOLSET@ : : @CMAKE_CXX_COMPILER@ : @CMAKE_RANLIB@ @CMAKE_AR@ diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index e8475362d26a99..699b93b47809bf 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.75.0", - "port-version": 9, + "port-version": 10, "dependencies": [ "boost-build", "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index cdd24d924b3fb3..67ffb430dc2550 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95cad6d5f2d9a858aacbb3b2bc0e3a0db4b06b4b", + "version-string": "1.75.0", + "port-version": 10 + }, { "git-tree": "c475b268ac42e886acfdc783944e1e3a988b0ac8", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index 75ef40ca02a42f..2c1f3fbb724ae6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -738,7 +738,7 @@ }, "boost-modular-build-helper": { "baseline": "1.75.0", - "port-version": 9 + "port-version": 10 }, "boost-move": { "baseline": "1.75.0", From da53774cc61a1d71927deafe425bf7d6069ba922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Tue, 6 Jul 2021 23:05:52 +0200 Subject: [PATCH 0080/1858] [libzippp] Update to 4.1-1.8.0 (#18553) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cédric Tabin --- ports/libzippp/CONTROL | 3 +-- ports/libzippp/portfile.cmake | 16 ++++++++-------- versions/baseline.json | 4 ++-- versions/l-/libzippp.json | 5 +++++ 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ports/libzippp/CONTROL b/ports/libzippp/CONTROL index 42aec5142c66f5..93964ad5f7402a 100644 --- a/ports/libzippp/CONTROL +++ b/ports/libzippp/CONTROL @@ -1,6 +1,5 @@ Source: libzippp -Version: 4.0-1.7.3 -Port-Version: 3 +Version: 4.1-1.8.0 Homepage: https://github.com/ctabin/libzippp Description: Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling Build-Depends: zlib, libzip[core,bzip2] diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index 85a1bb3681d1b6..9a011f8014e2cf 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp - REF 791bdc43eb18b87e3bdfa087493e3e32217e672c #v4.0-1.7.3 with CXX std version c++11 - SHA512 c6a90ecec21bb2d9e3af681c35d7eec0bee7b356fc1438004dc84be32ee7b94d047c35817d46b222237d54699ea54afa4fd3ae5deeba40dfce4fd2035a38b0e5 - HEAD_REF libzippp-v4.0-1.7.3 + REF 8299422194ce3c5be0677550ce3d6d4e15d40dd8 #v4.1-1.8.0 with CXX std version c++11 + SHA512 091c744377707899456b027a35059e048e1552e013330c68920f88f94a42904cf1a6afc7f853cf34cc9bbb3956c3c16907f089520e808520a671c59646d5e351 + HEAD_REF master PATCHES fix-find-lzma.patch ) -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTIONS - encryption LIBZIPPP_ENABLE_ENCRYPTION -) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + encryption LIBZIPPP_ENABLE_ENCRYPTION) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -34,4 +34,4 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index 2c1f3fbb724ae6..5f002f432b050c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3753,8 +3753,8 @@ "port-version": 2 }, "libzippp": { - "baseline": "4.0-1.7.3", - "port-version": 3 + "baseline": "4.1-1.8.0", + "port-version": 0 }, "licensepp": { "baseline": "2020-05-19", diff --git a/versions/l-/libzippp.json b/versions/l-/libzippp.json index f82ee71731c57f..25607575ce671d 100644 --- a/versions/l-/libzippp.json +++ b/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6ab6d33444f3671ea875f4c98bc2937b2d32ee9", + "version-string": "4.1-1.8.0", + "port-version": 0 + }, { "git-tree": "b599e7e8cf8101b7ad23965c00bca32c24de4b88", "version-string": "4.0-1.7.3", From 454630cf126da3f84fb67621a736269265c8be74 Mon Sep 17 00:00:00 2001 From: shishirb-MSFT <50385517+shishirb-MSFT@users.noreply.github.com> Date: Wed, 7 Jul 2021 09:24:53 -0700 Subject: [PATCH 0081/1858] [proxywrapper] Remove proxywrapper package (#18692) * Remove proxywrapper package * [proxywrapper] Remove from baseline since there is no longer a tested version of the port Co-authored-by: Robert Schumacher --- ports/proxywrapper/CONTROL | 5 ----- ports/proxywrapper/fix-find-libproxy.patch | 20 ------------------- ports/proxywrapper/fix-macos-build.patch | 15 -------------- ports/proxywrapper/portfile.cmake | 23 ---------------------- versions/baseline.json | 4 ---- 5 files changed, 67 deletions(-) delete mode 100644 ports/proxywrapper/CONTROL delete mode 100644 ports/proxywrapper/fix-find-libproxy.patch delete mode 100644 ports/proxywrapper/fix-macos-build.patch delete mode 100644 ports/proxywrapper/portfile.cmake diff --git a/ports/proxywrapper/CONTROL b/ports/proxywrapper/CONTROL deleted file mode 100644 index c982b2c5b7f191..00000000000000 --- a/ports/proxywrapper/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: proxywrapper -Version: 1.0.0 -Description: Provides a standalone wrapper around the libproxy library. -Homepage: https://github.com/microsoft/proxy-wrapper -Build-Depends: libproxy diff --git a/ports/proxywrapper/fix-find-libproxy.patch b/ports/proxywrapper/fix-find-libproxy.patch deleted file mode 100644 index aeb45b98def77e..00000000000000 --- a/ports/proxywrapper/fix-find-libproxy.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a867a4..3ba85fa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,11 +5,12 @@ project(proxywrapper) - - include(GNUInstallDirs) - --find_library(proxy REQUIRED) -+find_package(libproxy REQUIRED) - --add_library(proxywrapper SHARED ProxyWrapper.cpp) -+add_library(proxywrapper ProxyWrapper.cpp) - --target_link_libraries(proxywrapper proxy) -+target_link_libraries(proxywrapper PRIVATE ${LIBPROXY_LIBRARIES}) -+target_include_directories(proxywrapper PRIVATE ${LIBPROXY_INCLUDE_DIR}) - - install(TARGETS proxywrapper EXPORT proxywrapper DESTINATION ${CMAKE_INSTALL_LIBDIR}) - diff --git a/ports/proxywrapper/fix-macos-build.patch b/ports/proxywrapper/fix-macos-build.patch deleted file mode 100644 index 8bdaeac5674abf..00000000000000 --- a/ports/proxywrapper/fix-macos-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ba85fa..f18fd1e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,9 @@ - - cmake_minimum_required(VERSION 3.8) - --project(proxywrapper) -+project(proxywrapper C CXX) -+ -+set(CMAKE_CXX_STANDARD 11) - - include(GNUInstallDirs) - diff --git a/ports/proxywrapper/portfile.cmake b/ports/proxywrapper/portfile.cmake deleted file mode 100644 index 048a9f995dcab7..00000000000000 --- a/ports/proxywrapper/portfile.cmake +++ /dev/null @@ -1,23 +0,0 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO microsoft/proxy-wrapper - REF b113aa0a284508ce0c2878febf9073d1f03b59dc - SHA512 9793ec8b9cc0467c88d850ea51a96a0fdc3c3027cc5b7fd9f5d0362d7fd559e909f19a4eaca6554a9316d6e3a86bb5f541034ca9ce2fb8797fb2e5bdff42b0de - HEAD_REF master - PATCHES - fix-find-libproxy.patch - fix-macos-build.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/versions/baseline.json b/versions/baseline.json index 5f002f432b050c..4873bfbdc25d33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5016,10 +5016,6 @@ "baseline": "2020.10.19.00", "port-version": 0 }, - "proxywrapper": { - "baseline": "1.0.0", - "port-version": 0 - }, "psimd": { "baseline": "2021-02-21", "port-version": 0 From 62b15505f5c5b894fe9d5e727d95e80a5372d9c1 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 8 Jul 2021 00:26:06 +0800 Subject: [PATCH 0082/1858] [glew] Improve messages for system opengl dependency (#18672) * [glew] Fix the dependency * Update baseline version * Adress the review suggestions * Update the baseline revision --- ports/glew/CONTROL | 6 ------ ports/glew/portfile.cmake | 4 ++++ ports/glew/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/g-/glew.json | 5 +++++ 5 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 ports/glew/CONTROL create mode 100644 ports/glew/vcpkg.json diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL deleted file mode 100644 index 5d8250fd5b7665..00000000000000 --- a/ports/glew/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: glew -Version: 2.1.0 -Port-Version: 10 -Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. -Homepage: https://github.com/nigels-com/glew -Build-Depends: opengl diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 6ca6591d9f47ee..5dd0c03ce3dfb9 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} requires the following libraries from the system package manager:\n libxmu-dev\n libxi-dev\n libgl-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxmu-dev libxi-dev libgl-dev.") +endif() + # Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases. # More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 vcpkg_download_distfile(ARCHIVE diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json new file mode 100644 index 00000000000000..22271d883d6107 --- /dev/null +++ b/ports/glew/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "glew", + "version-string": "2.1.0", + "port-version": 11, + "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", + "homepage": "https://github.com/nigels-com/glew", + "dependencies": [ + "opengl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 4873bfbdc25d33..36a1a98ab0aad6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2294,7 +2294,7 @@ }, "glew": { "baseline": "2.1.0", - "port-version": 10 + "port-version": 11 }, "glfw3": { "baseline": "3.3.4", diff --git a/versions/g-/glew.json b/versions/g-/glew.json index 78ebd98dd8f36b..8969554ac1c67c 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "622e27b2a746c088f0acd2f98445c0968f485a69", + "version-string": "2.1.0", + "port-version": 11 + }, { "git-tree": "c87d7f619c69630fa4d1bd0bf3767f0d31ef22d6", "version-string": "2.1.0", From 617a8bca4a503d0f487e15b3b622876826042134 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 8 Jul 2021 00:26:53 +0800 Subject: [PATCH 0083/1858] [socket-io-client]fix socket-io-client use (#18768) * update patch file * update version --- .../socket-io-client/fix-file-not-found.patch | 19 +++++++++++++------ ports/socket-io-client/portfile.cmake | 2 -- ports/socket-io-client/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/socket-io-client.json | 5 +++++ 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/ports/socket-io-client/fix-file-not-found.patch b/ports/socket-io-client/fix-file-not-found.patch index a7fbdb1e3a48c9..f733b56a079075 100644 --- a/ports/socket-io-client/fix-file-not-found.patch +++ b/ports/socket-io-client/fix-file-not-found.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 19c5e54..ca8a00d 100644 +index 19c5e54..9d2e1ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,16 +31,20 @@ add_definitions( +@@ -31,17 +31,20 @@ add_definitions( -D_WEBSOCKETPP_CPP11_FUNCTIONAL_ ) @@ -20,13 +20,13 @@ index 19c5e54..ca8a00d 100644 set_property(TARGET sioclient PROPERTY CXX_STANDARD 11) set_property(TARGET sioclient PROPERTY CXX_STANDARD_REQUIRED ON) -+target_link_libraries(sioclient PRIVATE websocketpp::websocketpp) -+target_link_libraries(sioclient PRIVATE asio asio::asio) -+target_link_libraries(sioclient PRIVATE rapidjson) ++target_link_libraries(sioclient PRIVATE websocketpp::websocketpp asio asio::asio rapidjson) ++ if(BUILD_SHARED_LIBS) set_target_properties(sioclient -@@ -56,9 +60,6 @@ if(OPENSSL_FOUND) + PROPERTIES +@@ -56,15 +59,12 @@ if(OPENSSL_FOUND) add_library(sioclient_tls ${ALL_SRC}) target_include_directories(sioclient_tls PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src @@ -36,3 +36,10 @@ index 19c5e54..ca8a00d 100644 ${OPENSSL_INCLUDE_DIR} ) + set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD 11) + set_property(TARGET sioclient_tls PROPERTY CXX_STANDARD_REQUIRED ON) +-target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} ) ++target_link_libraries(sioclient_tls PRIVATE ${OPENSSL_LIBRARIES} websocketpp::websocketpp asio asio::asio rapidjson) + target_compile_definitions(sioclient_tls PRIVATE -DSIO_TLS) + if(BUILD_SHARED_LIBS) + set_target_properties(sioclient_tls diff --git a/ports/socket-io-client/portfile.cmake b/ports/socket-io-client/portfile.cmake index 7b81118ba8ff3b..1dafa3221060f8 100644 --- a/ports/socket-io-client/portfile.cmake +++ b/ports/socket-io-client/portfile.cmake @@ -11,8 +11,6 @@ vcpkg_from_github( fix-error-C3321.patch ) -file(REMOVE "${SOURCE_PATH}/cmake/modules/Findzstd.cmake") - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/socket-io-client/vcpkg.json b/ports/socket-io-client/vcpkg.json index 6ecf8b90b43fd5..7a182c190ecc19 100644 --- a/ports/socket-io-client/vcpkg.json +++ b/ports/socket-io-client/vcpkg.json @@ -1,6 +1,7 @@ { "name": "socket-io-client", "version": "3.0.0", + "port-version": 1, "description": "C++11 implementation of Socket.IO client", "homepage": "https://github.com/socketio/socket.io-client-cpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 36a1a98ab0aad6..6e264a25a297ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5854,7 +5854,7 @@ }, "socket-io-client": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "sockpp": { "baseline": "0.7", diff --git a/versions/s-/socket-io-client.json b/versions/s-/socket-io-client.json index d81657ab177c61..5b757efdf2e1b2 100644 --- a/versions/s-/socket-io-client.json +++ b/versions/s-/socket-io-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb9a92d56d3208354e66f4a449698af2e2d2fd2f", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "a84a0e4ab231050bf881b44603070de5da27ae05", "version": "3.0.0", From e554de6bb8d78014f0a1b25441f83c2fa51c95af Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 7 Jul 2021 21:31:06 +0200 Subject: [PATCH 0084/1858] [boost] update to 1.76.0 (#17335) * [boost] update generator script for boost 1.76 * [boost] update ports to 1.76.0 (run generator) * [boost] fix windows build? * [quantlib] update and fix mac build * [symengine] update and fix build * [avro-cpp] update to latest master and fix windows build * [folly] update to 2021.05.31.00 * [fbthrift, fizz, wangle] update to v2021.05.31.00 and fix build * [proxygen] update to version 2021.05.31.00 * [fizz, proxygen, fbthrift] fix sodium target * [proxygen] also works on macOS * [quantlib] use fix from upstream to fix mac build * [symengine] minimize patch file and fix deprecation warning * [folly,proxygen,wangle,fizz,fbthrift] update to 2021.06.14.00 * [fbthrift] remove unnecessary dependency rsocket I couldn't find any information that this dependency exists. The term is used in the code, but not in the context of a dependency * [fizz,fbthrift] fix zlib dependency * [fbthrift] pass required flex executable to cmake configure * add version files * [boost] generate-ports.ps1: Apply code review * [boost] changes from new version of generate-ports script * update version files * [boost] generate-ports.ps1: Apply code review --- ports/avro-cpp/CONTROL | 10 - ports/avro-cpp/fix-windows-build.patch | 33 ++ ports/avro-cpp/install.patch | 22 +- ports/avro-cpp/portfile.cmake | 5 +- ports/avro-cpp/vcpkg.json | 30 ++ ports/boost-accumulators/portfile.cmake | 4 +- ports/boost-accumulators/vcpkg.json | 2 +- ports/boost-algorithm/portfile.cmake | 4 +- ports/boost-algorithm/vcpkg.json | 2 +- ports/boost-align/portfile.cmake | 4 +- ports/boost-align/vcpkg.json | 2 +- ports/boost-any/portfile.cmake | 4 +- ports/boost-any/vcpkg.json | 2 +- ports/boost-array/portfile.cmake | 4 +- ports/boost-array/vcpkg.json | 2 +- ports/boost-asio/inline_dummy_return.patch | 13 - ports/boost-asio/portfile.cmake | 8 +- ports/boost-asio/vcpkg.json | 5 +- ports/boost-assert/portfile.cmake | 4 +- ports/boost-assert/vcpkg.json | 2 +- ports/boost-assign/portfile.cmake | 4 +- ports/boost-assign/vcpkg.json | 2 +- ports/boost-atomic/portfile.cmake | 4 +- ports/boost-atomic/vcpkg.json | 4 +- ports/boost-beast/portfile.cmake | 4 +- ports/boost-beast/vcpkg.json | 2 +- ports/boost-bimap/portfile.cmake | 4 +- ports/boost-bimap/vcpkg.json | 2 +- ports/boost-bind/portfile.cmake | 4 +- ports/boost-bind/vcpkg.json | 2 +- ports/boost-callable-traits/portfile.cmake | 4 +- ports/boost-callable-traits/vcpkg.json | 2 +- ports/boost-chrono/portfile.cmake | 4 +- ports/boost-chrono/vcpkg.json | 3 +- ports/boost-circular-buffer/portfile.cmake | 4 +- ports/boost-circular-buffer/vcpkg.json | 3 +- ports/boost-compatibility/portfile.cmake | 4 +- ports/boost-compatibility/vcpkg.json | 2 +- ports/boost-compute/portfile.cmake | 4 +- ports/boost-compute/vcpkg.json | 2 +- .../fix-warning-c4834.patch | 13 - ports/boost-concept-check/portfile.cmake | 6 +- ports/boost-concept-check/vcpkg.json | 3 +- ports/boost-config/portfile.cmake | 4 +- ports/boost-config/vcpkg.json | 3 +- ports/boost-container-hash/portfile.cmake | 4 +- ports/boost-container-hash/vcpkg.json | 3 +- ports/boost-container/portfile.cmake | 4 +- ports/boost-container/vcpkg.json | 9 +- ...xports_for_32bit_GNU_asm_for_windows.patch | 45 --- ports/boost-context/portfile.cmake | 5 +- ports/boost-context/vcpkg.json | 4 +- ports/boost-contract/portfile.cmake | 4 +- ports/boost-contract/vcpkg.json | 3 +- ports/boost-conversion/portfile.cmake | 4 +- ports/boost-conversion/vcpkg.json | 2 +- ports/boost-convert/portfile.cmake | 4 +- ports/boost-convert/vcpkg.json | 2 +- ports/boost-core/portfile.cmake | 4 +- ports/boost-core/vcpkg.json | 3 +- ports/boost-coroutine/portfile.cmake | 4 +- ports/boost-coroutine/vcpkg.json | 4 +- ports/boost-coroutine2/portfile.cmake | 4 +- ports/boost-coroutine2/vcpkg.json | 2 +- ports/boost-crc/portfile.cmake | 4 +- ports/boost-crc/vcpkg.json | 3 +- ports/boost-date-time/portfile.cmake | 4 +- ports/boost-date-time/vcpkg.json | 5 +- ports/boost-detail/portfile.cmake | 4 +- ports/boost-detail/vcpkg.json | 3 +- ports/boost-dll/portfile.cmake | 4 +- ports/boost-dll/vcpkg.json | 3 +- ports/boost-dynamic-bitset/portfile.cmake | 4 +- ports/boost-dynamic-bitset/vcpkg.json | 10 +- ports/boost-endian/portfile.cmake | 4 +- ports/boost-endian/vcpkg.json | 3 +- ports/boost-exception/portfile.cmake | 4 +- ports/boost-exception/vcpkg.json | 3 +- ports/boost-fiber/portfile.cmake | 4 +- ports/boost-fiber/vcpkg.json | 3 +- ports/boost-filesystem/portfile.cmake | 4 +- ports/boost-filesystem/vcpkg.json | 4 +- ports/boost-flyweight/portfile.cmake | 4 +- ports/boost-flyweight/vcpkg.json | 2 +- ports/boost-foreach/portfile.cmake | 4 +- ports/boost-foreach/vcpkg.json | 2 +- ports/boost-format/portfile.cmake | 4 +- ports/boost-format/vcpkg.json | 3 +- ports/boost-function-types/portfile.cmake | 4 +- ports/boost-function-types/vcpkg.json | 2 +- ports/boost-function/portfile.cmake | 4 +- ports/boost-function/vcpkg.json | 2 +- ports/boost-functional/portfile.cmake | 4 +- ports/boost-functional/vcpkg.json | 2 +- ports/boost-fusion/portfile.cmake | 4 +- ports/boost-fusion/vcpkg.json | 2 +- ports/boost-geometry/portfile.cmake | 4 +- ports/boost-geometry/vcpkg.json | 2 +- ports/boost-gil/portfile.cmake | 4 +- ports/boost-gil/vcpkg.json | 2 +- ports/boost-graph-parallel/portfile.cmake | 4 +- ports/boost-graph-parallel/vcpkg.json | 3 +- ports/boost-graph/portfile.cmake | 4 +- ports/boost-graph/vcpkg.json | 4 +- ports/boost-hana/portfile.cmake | 4 +- ports/boost-hana/vcpkg.json | 2 +- ports/boost-heap/portfile.cmake | 4 +- ports/boost-heap/vcpkg.json | 4 +- ports/boost-histogram/portfile.cmake | 4 +- ports/boost-histogram/vcpkg.json | 2 +- ports/boost-hof/portfile.cmake | 4 +- ports/boost-hof/vcpkg.json | 2 +- ports/boost-icl/portfile.cmake | 4 +- ports/boost-icl/vcpkg.json | 2 +- ports/boost-integer/portfile.cmake | 4 +- ports/boost-integer/vcpkg.json | 3 +- ports/boost-interprocess/portfile.cmake | 4 +- ports/boost-interprocess/vcpkg.json | 3 +- ports/boost-interval/portfile.cmake | 4 +- ports/boost-interval/vcpkg.json | 3 +- ports/boost-intrusive/portfile.cmake | 4 +- ports/boost-intrusive/vcpkg.json | 3 +- ports/boost-io/portfile.cmake | 4 +- ports/boost-io/vcpkg.json | 2 +- ports/boost-iostreams/portfile.cmake | 4 +- ports/boost-iostreams/vcpkg.json | 3 +- ports/boost-iterator/portfile.cmake | 4 +- ports/boost-iterator/vcpkg.json | 3 +- ports/boost-json/portfile.cmake | 5 +- ports/boost-json/vcpkg.json | 3 +- ports/boost-lambda/portfile.cmake | 4 +- ports/boost-lambda/vcpkg.json | 5 +- ports/boost-leaf/portfile.cmake | 4 +- ports/boost-leaf/vcpkg.json | 2 +- ports/boost-lexical-cast/portfile.cmake | 4 +- ports/boost-lexical-cast/vcpkg.json | 3 +- ports/boost-local-function/portfile.cmake | 4 +- ports/boost-local-function/vcpkg.json | 2 +- ports/boost-locale/portfile.cmake | 4 +- ports/boost-locale/vcpkg.json | 4 +- ports/boost-lockfree/portfile.cmake | 4 +- ports/boost-lockfree/vcpkg.json | 2 +- ports/boost-log/portfile.cmake | 4 +- ports/boost-log/vcpkg.json | 5 +- ports/boost-logic/portfile.cmake | 4 +- ports/boost-logic/vcpkg.json | 2 +- ports/boost-math/b2-options.cmake | 3 + ports/boost-math/portfile.cmake | 15 +- ports/boost-math/vcpkg.json | 8 +- ports/boost-metaparse/portfile.cmake | 4 +- ports/boost-metaparse/vcpkg.json | 2 +- ports/boost-modular-build-helper/Jamroot.jam | 4 +- .../boost-modular-build.cmake | 2 +- ports/boost-modular-build-helper/vcpkg.json | 3 +- ports/boost-move/portfile.cmake | 4 +- ports/boost-move/vcpkg.json | 4 +- ports/boost-mp11/portfile.cmake | 4 +- ports/boost-mp11/vcpkg.json | 2 +- ports/boost-mpi/portfile.cmake | 4 +- ports/boost-mpi/vcpkg.json | 4 +- ports/boost-mpl/portfile.cmake | 4 +- ports/boost-mpl/vcpkg.json | 2 +- ports/boost-msm/portfile.cmake | 4 +- ports/boost-msm/vcpkg.json | 2 +- ports/boost-multi-array/portfile.cmake | 4 +- ports/boost-multi-array/vcpkg.json | 13 +- ports/boost-multi-index/portfile.cmake | 4 +- ports/boost-multi-index/vcpkg.json | 3 +- ports/boost-multiprecision/portfile.cmake | 4 +- ports/boost-multiprecision/vcpkg.json | 8 +- ports/boost-nowide/portfile.cmake | 4 +- ports/boost-nowide/vcpkg.json | 3 +- ports/boost-numeric-conversion/portfile.cmake | 4 +- ports/boost-numeric-conversion/vcpkg.json | 6 +- ports/boost-odeint/portfile.cmake | 4 +- ports/boost-odeint/vcpkg.json | 2 +- ports/boost-optional/portfile.cmake | 4 +- ports/boost-optional/vcpkg.json | 2 +- ports/boost-outcome/portfile.cmake | 4 +- ports/boost-outcome/vcpkg.json | 4 +- ports/boost-parameter-python/portfile.cmake | 4 +- ports/boost-parameter-python/vcpkg.json | 2 +- ports/boost-parameter/portfile.cmake | 4 +- ports/boost-parameter/vcpkg.json | 2 +- ports/boost-pfr/portfile.cmake | 4 +- ports/boost-pfr/vcpkg.json | 2 +- ports/boost-phoenix/portfile.cmake | 4 +- ports/boost-phoenix/vcpkg.json | 2 +- ports/boost-poly-collection/portfile.cmake | 4 +- ports/boost-poly-collection/vcpkg.json | 2 +- ports/boost-polygon/portfile.cmake | 4 +- ports/boost-polygon/vcpkg.json | 3 +- ports/boost-pool/portfile.cmake | 4 +- ports/boost-pool/vcpkg.json | 3 +- ports/boost-predef/portfile.cmake | 4 +- ports/boost-predef/vcpkg.json | 2 +- ports/boost-preprocessor/portfile.cmake | 4 +- ports/boost-preprocessor/vcpkg.json | 2 +- ports/boost-process/portfile.cmake | 4 +- ports/boost-process/vcpkg.json | 2 +- ports/boost-program-options/portfile.cmake | 4 +- ports/boost-program-options/vcpkg.json | 4 +- ports/boost-property-map/portfile.cmake | 4 +- ports/boost-property-map/vcpkg.json | 3 +- ports/boost-property-tree/portfile.cmake | 4 +- ports/boost-property-tree/vcpkg.json | 3 +- ports/boost-proto/portfile.cmake | 4 +- ports/boost-proto/vcpkg.json | 2 +- ports/boost-ptr-container/portfile.cmake | 4 +- ports/boost-ptr-container/vcpkg.json | 2 +- ports/boost-python/portfile.cmake | 4 +- ports/boost-python/vcpkg.json | 4 +- ports/boost-qvm/portfile.cmake | 4 +- ports/boost-qvm/vcpkg.json | 7 +- ports/boost-random/portfile.cmake | 4 +- ports/boost-random/vcpkg.json | 7 +- ports/boost-range/portfile.cmake | 4 +- ports/boost-range/vcpkg.json | 3 +- ports/boost-ratio/portfile.cmake | 4 +- ports/boost-ratio/vcpkg.json | 2 +- ports/boost-rational/portfile.cmake | 4 +- ports/boost-rational/vcpkg.json | 2 +- ports/boost-regex/portfile.cmake | 4 +- ports/boost-regex/vcpkg.json | 4 +- ports/boost-safe-numerics/portfile.cmake | 4 +- ports/boost-safe-numerics/vcpkg.json | 2 +- ports/boost-scope-exit/portfile.cmake | 4 +- ports/boost-scope-exit/vcpkg.json | 2 +- ports/boost-serialization/portfile.cmake | 4 +- ports/boost-serialization/vcpkg.json | 4 +- ports/boost-signals2/portfile.cmake | 4 +- ports/boost-signals2/vcpkg.json | 2 +- ports/boost-smart-ptr/portfile.cmake | 4 +- ports/boost-smart-ptr/vcpkg.json | 3 +- ports/boost-sort/portfile.cmake | 4 +- ports/boost-sort/vcpkg.json | 4 +- ports/boost-spirit/portfile.cmake | 4 +- ports/boost-spirit/vcpkg.json | 4 +- ports/boost-stacktrace/portfile.cmake | 4 +- ports/boost-stacktrace/vcpkg.json | 3 +- ports/boost-statechart/portfile.cmake | 4 +- ports/boost-statechart/vcpkg.json | 2 +- ports/boost-static-assert/portfile.cmake | 4 +- ports/boost-static-assert/vcpkg.json | 2 +- ports/boost-static-string/portfile.cmake | 4 +- ports/boost-static-string/vcpkg.json | 2 +- ports/boost-stl-interfaces/portfile.cmake | 4 +- ports/boost-stl-interfaces/vcpkg.json | 2 +- ports/boost-system/portfile.cmake | 4 +- ports/boost-system/vcpkg.json | 4 +- ports/boost-test/portfile.cmake | 4 +- ports/boost-test/vcpkg.json | 5 +- ports/boost-thread/portfile.cmake | 4 +- ports/boost-thread/vcpkg.json | 4 +- ports/boost-throw-exception/portfile.cmake | 4 +- ports/boost-throw-exception/vcpkg.json | 2 +- ports/boost-timer/portfile.cmake | 4 +- ports/boost-timer/vcpkg.json | 5 +- ports/boost-tokenizer/portfile.cmake | 4 +- ports/boost-tokenizer/vcpkg.json | 2 +- ports/boost-tti/portfile.cmake | 4 +- ports/boost-tti/vcpkg.json | 2 +- ports/boost-tuple/portfile.cmake | 4 +- ports/boost-tuple/vcpkg.json | 2 +- ports/boost-type-erasure/portfile.cmake | 4 +- ports/boost-type-erasure/vcpkg.json | 3 +- ports/boost-type-index/portfile.cmake | 4 +- ports/boost-type-index/vcpkg.json | 3 +- ports/boost-type-traits/portfile.cmake | 4 +- ports/boost-type-traits/vcpkg.json | 2 +- ports/boost-typeof/portfile.cmake | 4 +- ports/boost-typeof/vcpkg.json | 2 +- ports/boost-ublas/portfile.cmake | 4 +- ports/boost-ublas/vcpkg.json | 2 +- ports/boost-units/portfile.cmake | 4 +- ports/boost-units/vcpkg.json | 2 +- ports/boost-unordered/portfile.cmake | 4 +- ports/boost-unordered/vcpkg.json | 3 +- ports/boost-utility/portfile.cmake | 4 +- ports/boost-utility/vcpkg.json | 3 +- ports/boost-uuid/portfile.cmake | 4 +- ports/boost-uuid/vcpkg.json | 4 +- ports/boost-variant/portfile.cmake | 4 +- ports/boost-variant/vcpkg.json | 2 +- ports/boost-variant2/portfile.cmake | 4 +- ports/boost-variant2/vcpkg.json | 3 +- ports/boost-vmd/portfile.cmake | 4 +- ports/boost-vmd/vcpkg.json | 2 +- ports/boost-wave/portfile.cmake | 4 +- ports/boost-wave/vcpkg.json | 4 +- ports/boost-winapi/portfile.cmake | 4 +- ports/boost-winapi/vcpkg.json | 2 +- ports/boost-xpressive/portfile.cmake | 4 +- ports/boost-xpressive/vcpkg.json | 3 +- ports/boost-yap/portfile.cmake | 4 +- ports/boost-yap/vcpkg.json | 2 +- ports/boost/portfile.cmake | 2 +- ports/boost/vcpkg.json | 2 +- ports/fbthrift/CONTROL | 6 - ports/fbthrift/fix-sodium-target.patch | 16 + ports/fbthrift/fix-zlib.patch | 100 +++++ ports/fbthrift/portfile.cmake | 11 +- ports/fbthrift/vcpkg.json | 24 ++ ports/fizz/CONTROL | 5 - ports/fizz/find-zlib.patch | 14 - ports/fizz/fix-zlib.patch | 36 ++ ports/fizz/portfile.cmake | 14 +- ports/fizz/vcpkg.json | 13 + ports/folly/CONTROL | 31 -- ports/folly/fix-windows-minmax.patch | 12 + ports/folly/missing-include-atomic.patch | 12 - ports/folly/portfile.cmake | 6 +- ports/folly/vcpkg.json | 68 ++++ ports/proxygen/CONTROL | 6 - ports/proxygen/fix-duplicated-target.patch | 16 + ports/proxygen/portfile.cmake | 7 +- ports/proxygen/remove-register.patch | 12 + ports/proxygen/vcpkg.json | 23 ++ ports/quantlib/CONTROL | 5 - ports/quantlib/fix-mac-build.patch | 15 + ports/quantlib/portfile.cmake | 12 +- ports/quantlib/vcpkg.json | 40 ++ ports/symengine/CONTROL | 30 -- ports/symengine/fix-build.patch | 13 + ports/symengine/portfile.cmake | 15 +- ports/symengine/vcpkg.json | 52 +++ ports/wangle/CONTROL | 6 - ports/wangle/portfile.cmake | 4 +- ports/wangle/vcpkg.json | 19 + scripts/boost/generate-ports.ps1 | 98 ++--- scripts/boost/post-source-stubs/json.cmake | 1 + scripts/boost/post-source-stubs/math.cmake | 6 + versions/a-/avro-cpp.json | 5 + versions/b-/boost-accumulators.json | 5 + versions/b-/boost-algorithm.json | 5 + versions/b-/boost-align.json | 5 + versions/b-/boost-any.json | 5 + versions/b-/boost-array.json | 5 + versions/b-/boost-asio.json | 5 + versions/b-/boost-assert.json | 5 + versions/b-/boost-assign.json | 5 + versions/b-/boost-atomic.json | 5 + versions/b-/boost-beast.json | 5 + versions/b-/boost-bimap.json | 5 + versions/b-/boost-bind.json | 5 + versions/b-/boost-callable-traits.json | 5 + versions/b-/boost-chrono.json | 5 + versions/b-/boost-circular-buffer.json | 5 + versions/b-/boost-compatibility.json | 5 + versions/b-/boost-compute.json | 5 + versions/b-/boost-concept-check.json | 5 + versions/b-/boost-config.json | 5 + versions/b-/boost-container-hash.json | 5 + versions/b-/boost-container.json | 5 + versions/b-/boost-context.json | 5 + versions/b-/boost-contract.json | 5 + versions/b-/boost-conversion.json | 5 + versions/b-/boost-convert.json | 5 + versions/b-/boost-core.json | 5 + versions/b-/boost-coroutine.json | 5 + versions/b-/boost-coroutine2.json | 5 + versions/b-/boost-crc.json | 5 + versions/b-/boost-date-time.json | 5 + versions/b-/boost-detail.json | 5 + versions/b-/boost-dll.json | 5 + versions/b-/boost-dynamic-bitset.json | 5 + versions/b-/boost-endian.json | 5 + versions/b-/boost-exception.json | 5 + versions/b-/boost-fiber.json | 5 + versions/b-/boost-filesystem.json | 5 + versions/b-/boost-flyweight.json | 5 + versions/b-/boost-foreach.json | 5 + versions/b-/boost-format.json | 5 + versions/b-/boost-function-types.json | 5 + versions/b-/boost-function.json | 5 + versions/b-/boost-functional.json | 5 + versions/b-/boost-fusion.json | 5 + versions/b-/boost-geometry.json | 5 + versions/b-/boost-gil.json | 5 + versions/b-/boost-graph-parallel.json | 5 + versions/b-/boost-graph.json | 5 + versions/b-/boost-hana.json | 5 + versions/b-/boost-heap.json | 5 + versions/b-/boost-histogram.json | 5 + versions/b-/boost-hof.json | 5 + versions/b-/boost-icl.json | 5 + versions/b-/boost-integer.json | 5 + versions/b-/boost-interprocess.json | 5 + versions/b-/boost-interval.json | 5 + versions/b-/boost-intrusive.json | 5 + versions/b-/boost-io.json | 5 + versions/b-/boost-iostreams.json | 5 + versions/b-/boost-iterator.json | 5 + versions/b-/boost-json.json | 5 + versions/b-/boost-lambda.json | 5 + versions/b-/boost-leaf.json | 5 + versions/b-/boost-lexical-cast.json | 5 + versions/b-/boost-local-function.json | 5 + versions/b-/boost-locale.json | 5 + versions/b-/boost-lockfree.json | 5 + versions/b-/boost-log.json | 5 + versions/b-/boost-logic.json | 5 + versions/b-/boost-math.json | 5 + versions/b-/boost-metaparse.json | 5 + versions/b-/boost-modular-build-helper.json | 6 +- versions/b-/boost-move.json | 5 + versions/b-/boost-mp11.json | 5 + versions/b-/boost-mpi.json | 5 + versions/b-/boost-mpl.json | 5 + versions/b-/boost-msm.json | 5 + versions/b-/boost-multi-array.json | 5 + versions/b-/boost-multi-index.json | 5 + versions/b-/boost-multiprecision.json | 5 + versions/b-/boost-nowide.json | 5 + versions/b-/boost-numeric-conversion.json | 5 + versions/b-/boost-odeint.json | 5 + versions/b-/boost-optional.json | 5 + versions/b-/boost-outcome.json | 5 + versions/b-/boost-parameter-python.json | 5 + versions/b-/boost-parameter.json | 5 + versions/b-/boost-pfr.json | 5 + versions/b-/boost-phoenix.json | 5 + versions/b-/boost-poly-collection.json | 5 + versions/b-/boost-polygon.json | 5 + versions/b-/boost-pool.json | 5 + versions/b-/boost-predef.json | 5 + versions/b-/boost-preprocessor.json | 5 + versions/b-/boost-process.json | 5 + versions/b-/boost-program-options.json | 5 + versions/b-/boost-property-map.json | 5 + versions/b-/boost-property-tree.json | 5 + versions/b-/boost-proto.json | 5 + versions/b-/boost-ptr-container.json | 5 + versions/b-/boost-python.json | 5 + versions/b-/boost-qvm.json | 5 + versions/b-/boost-random.json | 5 + versions/b-/boost-range.json | 5 + versions/b-/boost-ratio.json | 5 + versions/b-/boost-rational.json | 5 + versions/b-/boost-regex.json | 5 + versions/b-/boost-safe-numerics.json | 5 + versions/b-/boost-scope-exit.json | 5 + versions/b-/boost-serialization.json | 5 + versions/b-/boost-signals2.json | 5 + versions/b-/boost-smart-ptr.json | 5 + versions/b-/boost-sort.json | 5 + versions/b-/boost-spirit.json | 5 + versions/b-/boost-stacktrace.json | 5 + versions/b-/boost-statechart.json | 5 + versions/b-/boost-static-assert.json | 5 + versions/b-/boost-static-string.json | 5 + versions/b-/boost-stl-interfaces.json | 5 + versions/b-/boost-system.json | 5 + versions/b-/boost-test.json | 5 + versions/b-/boost-thread.json | 5 + versions/b-/boost-throw-exception.json | 5 + versions/b-/boost-timer.json | 5 + versions/b-/boost-tokenizer.json | 5 + versions/b-/boost-tti.json | 5 + versions/b-/boost-tuple.json | 5 + versions/b-/boost-type-erasure.json | 5 + versions/b-/boost-type-index.json | 5 + versions/b-/boost-type-traits.json | 5 + versions/b-/boost-typeof.json | 5 + versions/b-/boost-ublas.json | 5 + versions/b-/boost-units.json | 5 + versions/b-/boost-unordered.json | 5 + versions/b-/boost-utility.json | 5 + versions/b-/boost-uuid.json | 5 + versions/b-/boost-variant.json | 5 + versions/b-/boost-variant2.json | 5 + versions/b-/boost-vmd.json | 5 + versions/b-/boost-wave.json | 5 + versions/b-/boost-winapi.json | 5 + versions/b-/boost-xpressive.json | 5 + versions/b-/boost-yap.json | 5 + versions/b-/boost.json | 5 + versions/baseline.json | 372 +++++++++--------- versions/f-/fbthrift.json | 5 + versions/f-/fizz.json | 5 + versions/f-/folly.json | 5 + versions/p-/proxygen.json | 5 + versions/q-/quantlib.json | 5 + versions/s-/symengine.json | 5 + versions/w-/wangle.json | 5 + 485 files changed, 2046 insertions(+), 1041 deletions(-) delete mode 100644 ports/avro-cpp/CONTROL create mode 100644 ports/avro-cpp/fix-windows-build.patch create mode 100644 ports/avro-cpp/vcpkg.json delete mode 100644 ports/boost-asio/inline_dummy_return.patch delete mode 100644 ports/boost-concept-check/fix-warning-c4834.patch delete mode 100644 ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch create mode 100644 ports/boost-math/b2-options.cmake delete mode 100644 ports/fbthrift/CONTROL create mode 100644 ports/fbthrift/fix-sodium-target.patch create mode 100644 ports/fbthrift/fix-zlib.patch create mode 100644 ports/fbthrift/vcpkg.json delete mode 100644 ports/fizz/CONTROL delete mode 100644 ports/fizz/find-zlib.patch create mode 100644 ports/fizz/fix-zlib.patch create mode 100644 ports/fizz/vcpkg.json delete mode 100644 ports/folly/CONTROL create mode 100644 ports/folly/fix-windows-minmax.patch delete mode 100644 ports/folly/missing-include-atomic.patch create mode 100644 ports/folly/vcpkg.json delete mode 100644 ports/proxygen/CONTROL create mode 100644 ports/proxygen/fix-duplicated-target.patch create mode 100644 ports/proxygen/remove-register.patch create mode 100644 ports/proxygen/vcpkg.json delete mode 100644 ports/quantlib/CONTROL create mode 100644 ports/quantlib/fix-mac-build.patch create mode 100644 ports/quantlib/vcpkg.json delete mode 100644 ports/symengine/CONTROL create mode 100644 ports/symengine/fix-build.patch create mode 100644 ports/symengine/vcpkg.json delete mode 100644 ports/wangle/CONTROL create mode 100644 ports/wangle/vcpkg.json create mode 100644 scripts/boost/post-source-stubs/math.cmake diff --git a/ports/avro-cpp/CONTROL b/ports/avro-cpp/CONTROL deleted file mode 100644 index 85518d7577fcb7..00000000000000 --- a/ports/avro-cpp/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: avro-cpp -Version: 1.9.2 -Homepage: https://github.com/apache/avro -Description: Apache Avro is a data serialization system -Build-Depends: boost-format, boost-thread, boost-filesystem, boost-iostreams, boost-program-options, boost-random, boost-crc, boost-test, libzip, bzip2, liblzma, zlib, zstd -Supports: !(windows&static) - -Feature: snappy -Build-Depends: snappy -Description: Support Snappy for compression diff --git a/ports/avro-cpp/fix-windows-build.patch b/ports/avro-cpp/fix-windows-build.patch new file mode 100644 index 00000000000000..b20706fdc1485c --- /dev/null +++ b/ports/avro-cpp/fix-windows-build.patch @@ -0,0 +1,33 @@ +diff --git a/lang/c++/impl/avrogencpp.cc b/lang/c++/impl/avrogencpp.cc +index 61570413..0b6b35a2 100644 +--- a/lang/c++/impl/avrogencpp.cc ++++ b/lang/c++/impl/avrogencpp.cc +@@ -804,8 +804,8 @@ static string readGuard(const string &filename) { + + int main(int argc, char **argv) { + const string NS("namespace"); +- const string OUT("output"); +- const string IN("input"); ++ const string OUT_FILE("output"); ++ const string IN_FILE("input"); + const string INCLUDE_PREFIX("include-prefix"); + const string NO_UNION_TYPEDEF("no-union-typedef"); + +@@ -817,14 +817,14 @@ int main(int argc, char **argv) { + po::store(po::parse_command_line(argc, argv, desc), vm); + po::notify(vm); + +- if (vm.count("help") || vm.count(IN) == 0 || vm.count(OUT) == 0) { ++ if (vm.count("help") || vm.count(IN_FILE) == 0 || vm.count(OUT_FILE) == 0) { + std::cout << desc << std::endl; + return 1; + } + + string ns = vm.count(NS) > 0 ? vm[NS].as() : string(); +- string outf = vm.count(OUT) > 0 ? vm[OUT].as() : string(); +- string inf = vm.count(IN) > 0 ? vm[IN].as() : string(); ++ string outf = vm.count(OUT_FILE) > 0 ? vm[OUT_FILE].as() : string(); ++ string inf = vm.count(IN_FILE) > 0 ? vm[IN_FILE].as() : string(); + string incPrefix = vm[INCLUDE_PREFIX].as(); + bool noUnion = vm.count(NO_UNION_TYPEDEF) != 0; + if (incPrefix == "-") { diff --git a/ports/avro-cpp/install.patch b/ports/avro-cpp/install.patch index 12ead28612157d..1035b3bf35c8f1 100644 --- a/ports/avro-cpp/install.patch +++ b/ports/avro-cpp/install.patch @@ -1,8 +1,8 @@ diff --git a/lang/c++/CMakeLists.txt b/lang/c++/CMakeLists.txt -index 30a5d66..f7f2b94 100644 +index bf764ce4..e84524d0 100644 --- a/lang/c++/CMakeLists.txt +++ b/lang/c++/CMakeLists.txt -@@ -40,6 +40,8 @@ set (AVRO_VERSION_MINOR "0") +@@ -48,6 +48,8 @@ list(GET AVRO_VERSION 2 AVRO_VERSION_PATCH) project (Avro-cpp) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) @@ -11,12 +11,13 @@ index 30a5d66..f7f2b94 100644 if (WIN32 AND NOT CYGWIN AND NOT MSYS) add_definitions (/EHa) add_definitions ( -@@ -118,11 +120,11 @@ set_target_properties (avrocpp PROPERTIES +@@ -125,12 +127,12 @@ set_target_properties (avrocpp PROPERTIES set_target_properties (avrocpp_s PROPERTIES - VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}) + VERSION ${AVRO_VERSION_MAJOR}.${AVRO_VERSION_MINOR}.${AVRO_VERSION_PATCH}) -target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +target_link_libraries (avrocpp ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) + target_include_directories(avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR}) add_executable (precompile test/precompile.cc) @@ -25,13 +26,12 @@ index 30a5d66..f7f2b94 100644 macro (gen file ns) add_custom_command (OUTPUT ${file}.hh -@@ -151,34 +153,40 @@ gen (crossref cr) - gen (primitivetypes pt) +@@ -160,37 +162,42 @@ gen (primitivetypes pt) + gen (cpp_reserved_words cppres) add_executable (avrogencpp impl/avrogencpp.cc) -target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES}) +target_link_libraries (avrogencpp avrocpp_s ${Boost_LIBRARIES} ${SNAPPY_LIBRARIES} ZLIB::ZLIB) -+ -enable_testing() +if(BUILD_TESTING) @@ -57,6 +57,9 @@ index 30a5d66..f7f2b94 100644 -unittest (JsonTests) -unittest (AvrogencppTests) -unittest (CompilerTests) +-unittest (AvrogencppTestReservedWords) +- +-add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) - -add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh - tweet_hh @@ -75,6 +78,9 @@ index 30a5d66..f7f2b94 100644 + unittest (JsonTests) + unittest (AvrogencppTests) + unittest (CompilerTests) ++ unittest (AvrogencppTestReservedWords) ++ ++ add_dependencies (AvrogencppTestReservedWords cpp_reserved_words_hh) + + add_dependencies (AvrogencppTests bigrecord_hh bigrecord_r_hh bigrecord2_hh + tweet_hh @@ -86,7 +92,7 @@ index 30a5d66..f7f2b94 100644 include (InstallRequiredSystemLibraries) -@@ -189,9 +197,9 @@ include (CPack) +@@ -201,9 +208,9 @@ include (CPack) install (TARGETS avrocpp avrocpp_s LIBRARY DESTINATION lib ARCHIVE DESTINATION lib diff --git a/ports/avro-cpp/portfile.cmake b/ports/avro-cpp/portfile.cmake index 49f0af20ce77b2..43a2fd27814ffe 100644 --- a/ports/avro-cpp/portfile.cmake +++ b/ports/avro-cpp/portfile.cmake @@ -3,11 +3,12 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/avro - REF release-1.9.2 - SHA512 6a6980901eea964c050eb3d61fadf28712e2f02c36985bf8e5176b668bba48985f6a666554a1964435448de29b18d790ab86b787d0288a22fd9cba00746a7846 + REF 2ab8fa85d05f04387bd5d63b10ad1c8fd2243616 + SHA512 fd21f0919b0e5e884bdf4d66c4d5ba056f04c426b309ec0b5ab26642a5f6b00d46f4dd965431b10130bc5f0d81699e2195780e90e127f63049ee5763403ef7c8 HEAD_REF master PATCHES install.patch + fix-windows-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/avro-cpp/vcpkg.json b/ports/avro-cpp/vcpkg.json new file mode 100644 index 00000000000000..72cf168bc81c4f --- /dev/null +++ b/ports/avro-cpp/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "avro-cpp", + "version-date": "2021-06-01", + "description": "Apache Avro is a data serialization system", + "homepage": "https://github.com/apache/avro", + "supports": "!(windows & static)", + "dependencies": [ + "boost-crc", + "boost-filesystem", + "boost-format", + "boost-iostreams", + "boost-program-options", + "boost-random", + "boost-test", + "boost-thread", + "bzip2", + "liblzma", + "libzip", + "zlib", + "zstd" + ], + "features": { + "snappy": { + "description": "Support Snappy for compression", + "dependencies": [ + "snappy" + ] + } + } +} diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index c16b8fbeef241d..c89e31181c5280 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.75.0 - SHA512 1ac43f8a6df1d184261a022c37ffefe9db505e1cc3d4f17cf7ffdf42648d79ebc55653ed299089ff4cf56ccfb90ca565a71fef81735805ef435ac858cf65fae4 + REF boost-1.76.0 + SHA512 51c5a64ec68274c77a674dfa15b106df2a341018498501a882d1fbeddcdee40944422184cf102986ce5c5fb1e7e5bf388566f94893a2bb6da98ec666fa20287d HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index a45654ef940d55..b0d7a0cc1e4e53 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-accumulators", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "dependencies": [ diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 03817d4c82c101..056fdcd511d43a 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.75.0 - SHA512 6ae80682fcd31caf4dc593f60df6b0c6c26688e2d8aa39277077c29556ae7c4a314cd9037b4d36464ddd3ce28350aa6691e4343617220aae813f98f25611af1a + REF boost-1.76.0 + SHA512 1a421f88244e07de254ea8f050e74ed0b0de889ea7a39d95daaf1f55ec5455d9dc7bcb3ae55970885dc6cd5ac6b5f9637146420eadcc59a12fc2753c842207c3 HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index f324572f0abec1..98aa477b93bf89 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-algorithm", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "dependencies": [ diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index be2905a3d14312..c19f35cb6fe74c 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.75.0 - SHA512 51d138b368a565ecdd9484a333eb0e1a97a23606d3e195ac3a3aa6f64f9b028f1c2abdfa4b28bc49e11044f8f73692a5d86b5591e8ecaf7aa292a0892361a132 + REF boost-1.76.0 + SHA512 5b9f646512a79c7848989b5d9c2d1e67b3db86cc751d2e1034969412715c7d27a7558ecfececcad3db3ddb49a9b4ca664c9ae844f3e57b32d443549968e2ac9b HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index e1ec625282e39d..6556e1dafdf306 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-align", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "dependencies": [ diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index 60bda37d8a2c0e..cbfc500920d099 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.75.0 - SHA512 426c4c1b47f86e1637514be45ad60ff2df40c91012c275819a2817ec0edd3fa6de107a16fbdc2cdd3d51d50fa76232f6bfc6b80a963e2fc60e94dd464a7994be + REF boost-1.76.0 + SHA512 38f0bf6dddcdf5ce5527d068057de1ce9594605d51dde8f1591decb6423a912be2047fd2ed1b77acf42eb22d5e44a29276db9e9a24fad1596c589a58354307ba HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index 0360a82dc15486..ccddcf0a54d520 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-any", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "dependencies": [ diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 677ecd161c1b5e..9dbcd35278b178 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.75.0 - SHA512 0ba02e3b084cb7c334d9709ea12d1408461d0ff0b32b35e69869d0cd81e30bd3ab06c2941fa16b51194d5961648d7283e15ebd0d8c8b843d7491a4470e72dd53 + REF boost-1.76.0 + SHA512 76109a4c45ba9ec880fd419cb6287ffc7f78b141c3b42f8ac934317093fbb632376381895863fa874187252e3047cd9cf4501f3fef04b559fb90a66e3b6acb50 HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index 552296090bbc37..dd907b0d824ab4 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-array", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "dependencies": [ diff --git a/ports/boost-asio/inline_dummy_return.patch b/ports/boost-asio/inline_dummy_return.patch deleted file mode 100644 index b4c29a6316d1b0..00000000000000 --- a/ports/boost-asio/inline_dummy_return.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/asio/include/asio/impl/use_awaitable.hpp b/asio/include/asio/impl/use_awaitable.hpp -index 60a6f5cd..af7be635 100644 ---- a/include/boost/asio/impl/use_awaitable.hpp -+++ b/include/boost/asio/impl/use_awaitable.hpp -@@ -236,7 +236,7 @@ T dummy_return() - } - - template <> --void dummy_return() -+inline void dummy_return() - { - } - #endif // defined(_MSC_VER) diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index 2c511452696963..a2da348041f418 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,12 +3,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.75.0 - SHA512 5f332644207f87af8ffbf93d9f1f72b7ca6dfa96d77a871308951c492ae27fac20bad2bfdf4e1de06585c1405d1875c4d4335786b3fc08aa0a76ef4de3626c27 + REF boost-1.76.0 + SHA512 d9706045510dc65dfb5d84fded39cb7bbbf44d9f1ba079efc3802962f30ba36ceb7b1610d47822348a910bbca857d0fee8ffef767921a9a75ee9565f9eb63a79 HEAD_REF master - PATCHES - windows_alloca_header.patch - inline_dummy_return.patch + PATCHES windows_alloca_header.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 2c95b02eb78d33..8effa61df868a9 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-asio", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "supports": "!emscripten", @@ -10,7 +9,6 @@ "boost-assert", "boost-bind", "boost-chrono", - "boost-compatibility", "boost-config", { "name": "boost-coroutine", @@ -19,7 +17,6 @@ "boost-date-time", "boost-detail", "boost-function", - "boost-integer", "boost-regex", "boost-smart-ptr", "boost-system", diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index 5ec9af67128c7d..b50ec9f1b11da2 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.75.0 - SHA512 3a20f892b6f49d03e0d8488623e1cd3dff3eff708c77851007e50ad7e8bb2e80696a333da7dfa95cacc30e4ddc9f25dce061793670c9b8733df9227631501a08 + REF boost-1.76.0 + SHA512 bcd8d1fea358916d4ac8a707edee13bdc4b269a05f1456c3780fa525a2fe1438e8af1ca8689171da8bb3bb7ea2b02f0ed10ddc1204a5b52a885e2eebd1ba4f23 HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index 9c038a8bc4fa79..9e92a39cac3a48 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assert", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "dependencies": [ diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 790de67746939d..3628044ae12d88 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.75.0 - SHA512 33c5adc9fe35b670ab9be1e68d61970e6c1ea0a870791fd446669cf501e665e615e72da5bb50a61e0e6bc6d7e695513d1bf73e91f845c5d1b47e694868da2baf + REF boost-1.76.0 + SHA512 fce24fed1b909d108176ed9c52e9c8dfd53aa7eab063f99d83bf7b0d37db64494c5d47fe60bcade57d59afb4da53c50c0101c4a14316b043e5a018444ed4e34a HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index e8a960f18e8181..512d9b55aa7412 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assign", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "dependencies": [ diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 01ec5674495c02..2c5f291955f93a 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.75.0 - SHA512 4045b4b9cd920854bd8a98298ba8662000bd045fe1322748c7ef0b96fdcb17ce8b55a16e3f10bc7344f37993d1c6df0720ddcc1b5b4255b54a5ca1fc29e253f1 + REF boost-1.76.0 + SHA512 8677c5bd03f089b75f8fac891f9d0383510096c64490936b766a94fdbfd984cd550f41e3e7dbed76372ca81ab8264d2d5fc2dcaadb87a52b4ebb7b0aa3b6feeb HEAD_REF master ) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 037194b3d2765c..4a684f35575602 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-atomic", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "dependencies": [ @@ -12,7 +11,6 @@ "host": true }, "boost-config", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index a99c6d6c1d1f09..b4d0f94efa4041 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.75.0 - SHA512 c153b550610834d27e07786d9ad651429d0dea9e47e57578fccd17e463722d413259a4cfbd039a4b30a06b2bd99bd519869ff94e1029e8f22ea1c7f5d9c5ec5f + REF boost-1.76.0 + SHA512 8fca87bdbd17ba7701fab6527043ff33c15b0c544b62448a2c269e4c0baab51fcedaf7f4bce746eb7a8d9390a37234aa96d0519fba7507d34656f20097a60c9e HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index d1f0fdf941cb16..1373359a59f865 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-beast", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "supports": "!emscripten", diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index 0ca4f115b51068..cbd7bd71f1ec4a 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.75.0 - SHA512 fa8d6666554090b4d37795284e6c3c8e631c4c5e1288ca38da391ff13515d92ef7ba2407ae0b6f45df3bc1cbb736f774bbb58fe582c36514068281e3138d83ad + REF boost-1.76.0 + SHA512 efa156483c4b696bf88e1f752f1810916699254cb22038d7ea2f3399938dcaebf14795572a2a42558bed356e19d0be154443282bdadc20c8235a057ac5a72fb6 HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index be69ae87edd2c1..fc9dcd3c69a6c9 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bimap", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "dependencies": [ diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 1f3b06150772b8..9ce296fe9fe9ba 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.75.0 - SHA512 6c3ef2f4be49222956ad9d8770413486f1f7b216c489bdd9793a859f15b38d15813e16b2554e77314f373ecdfafa6b88c4862c34f5f058752d17a9942b4adf9e + REF boost-1.76.0 + SHA512 a2e40c56d5092818bcddd22b90c6fe6705e2d322b9d96e5abb3524fa166e1d7fc6e5a9c98acf14409663a639c77274d12f9e9840eaa4c963b872c7363caa54ba HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index b6523bb7427cc3..f39026aa03363e 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bind", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "dependencies": [ diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index cb9e910b9995f4..80cd42a75da807 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.75.0 - SHA512 fbed9560bff606778f1ff30978a6a87bb03f55bef5160f3c40329aa06262e2232fcafeb4a56994c697141bdba3c24b9615b299309a8b3adeb50e4321773596ce + REF boost-1.76.0 + SHA512 9ccc62f33001179b9ab6576cc6ac9a3e1a8117a557fbdd65c7eec0b522aa1b7e5e4f31601205819d1e3507afa4e327cfd56d58589974404c8f9c14f970bad79f HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index c5021b3ca623b6..83bdb17a423aeb 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-callable-traits", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "dependencies": [ diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index 2ab75a2533c2c5..a02bebd10822eb 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.75.0 - SHA512 97ce109ad99a9687d2528c7b15f56059dcbdfcb120646644a6707cb98f1a9407a70b9c8d295dc933375b923348e6a33817b596fd55d45a8c96e3f1ab9a335ac2 + REF boost-1.76.0 + SHA512 ebfea42589e69152256fb175175d753fbb86f96d988fd2678e0df82d6bf7c2e226c8223280ab044cbb1533a690692e23134ee09f665db38a5d1a7e10dd79da22 HEAD_REF master ) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index 402856f5ad5655..234f656ddfe149 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-chrono", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "dependencies": [ diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 4aff473d55b356..25afaf23f36b33 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.75.0 - SHA512 08a51f1d6947802097245d2e97ab23be89447fbaa47ff9538f04ce9e1a3077b6bf0b7ec8be5e21d02eb24c6721f330ed485f57d2fd2e4759021eef508690d5f2 + REF boost-1.76.0 + SHA512 0e85b0cd8d66552f8cbf2c90dcd3685d4666b2d4608f5352c68e3f1e03e68cdaf368777235b0cc6a17420e07c767c61ca026f753d1d1d6e35c6d7c3a11deac9f HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index 86d9ad60647c5e..0edf67d872b34c 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-circular-buffer", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-concept-check", "boost-config", "boost-core", diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index e51625ca932f81..562fa62a5871ac 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.75.0 - SHA512 9a7dfa28325cdc257d26de9203d64015453a3245c90de63895c7fd8a0ef24e3acea5203737d6ccf69ce51563010772ff7807137e2531f55a1fa7f63e4b2d0547 + REF boost-1.76.0 + SHA512 ca17b6a6021d7f87692a37aa8e558b76235095f6e7850432ebc3c945afe25c01ce0b7d26e8d239636ff38d2d697ba057b9109f8c06b7d70ae154a4b8223733ce HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index 1f8d2d19a3d21d..cd59ff838f2a04 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compatibility", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "dependencies": [ diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index e2a9b1624d441a..7b85fd92a17a9c 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.75.0 - SHA512 740e351c466d133058b2730311194198f958504b6b0c20517e54ad7809d71d3fe11d35b7935d6bf49f191d4dea7a9f37be21fa4f8d363331588a32d73febc047 + REF boost-1.76.0 + SHA512 93f20c281e71ba205fdfc458a40f437cec09c2c9593e41ccf59e927b2f9e6c2f31b89389605c5a1f5b4893097928f16ded38b794dccf95adbdfac68f4e016ad9 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index 7ebc60191015e0..a994479bc81440 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compute", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "dependencies": [ diff --git a/ports/boost-concept-check/fix-warning-c4834.patch b/ports/boost-concept-check/fix-warning-c4834.patch deleted file mode 100644 index 1932163912a5da..00000000000000 --- a/ports/boost-concept-check/fix-warning-c4834.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/boost/concept_check.hpp b/include/boost/concept_check.hpp -index abbadb7..cab58e5 100644 ---- a/include/boost/concept_check.hpp -+++ b/include/boost/concept_check.hpp -@@ -352,7 +352,7 @@ namespace boost - private: - void test(boost::false_type) - { -- f(first,second); -+ (void) f(first,second); - Return r = f(first, second); // require operator() - (void)r; - } diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index a643ad9d370b19..3b1b2373fc5174 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.75.0 - SHA512 823e3af47881c98f864c70686a3a2f6c9b7d5e6bf0ae61f2983f6c2ba26a70aaa888b683a74ef504ec7f5f479609731e35fad3518f1731954e01e7d67636e5d4 + REF boost-1.76.0 + SHA512 f10bcd81ed88a036078188647a0b8aa2245d0c343fe29d4c13c16fe8dc551d843281bbe1fb903c71026c8183f02f57bbad2cbbf3eb6c3f4f885ec8773afb8bde HEAD_REF master - PATCHES - fix-warning-c4834.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index 6feae5b412c823..4017b24b9ee32a 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-concept-check", - "version-string": "1.75.0", - "port-version": 2, + "version": "1.76.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "dependencies": [ diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 10850a47bb2a21..31de221d14d9d3 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.75.0 - SHA512 458cd2e2d1649b6cba86eb1b0be61259a36ca716ccc418d5501dbcc78f2884226ae5d2ddcb99a644df6c90ea1601a2f7d8a0484389ccd2148e18cee137165f23 + REF boost-1.76.0 + SHA512 cef30b35f4d791c9220aad28b347acb28ed87e58ecf319c9fe7dfdb0c36d8c2a1ba7f996fbf2da201a2c4fae8cf2ca1b45224754482c7ecb074cee382f33e7ab HEAD_REF master ) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index 3b4035dc8d550c..dd1e63c10f1274 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,10 +1,9 @@ { "name": "boost-config", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "dependencies": [ - "boost-compatibility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index e35664e365cd47..7fd29b82f630e8 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.75.0 - SHA512 4d1a8381e9b7554884597db4b1e365465845b1fd7e665ec5bc89c38f859fb4b62e024e77b2cd818f3bdf959476dedae0fc49fc43e28e4e9043e0386a366f9a43 + REF boost-1.76.0 + SHA512 59dbd3028e65ff5a499ebf316354eb4e46dcefa736d07954b9f99471cf0195b080821180925923814fad50f44e21f93e0a90b2d86ef3a6cf1b7d478a6d1122bf HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index c2d8bee8920116..48f987d51f8fb8 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-container-hash", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index f595c1a14b3567..133d7aecdbab2b 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.75.0 - SHA512 b49609fcf1195f8661b1603d8328bd6009d2667c85dce5a4b3309582976c5e73ae21bc64a58100a9a7ef8fa10bc18075bb0c06f0e56cc16c50cda8b31cea26dc + REF boost-1.76.0 + SHA512 5e73508ea1bb67ccbb83785c1f7db4a92d0cf9435a6383394dd1aecd83f88697a16b054c762bdd4d06c3ec92629d1f4b89cf32d2fafefa0a0702318bc01d5dd4 HEAD_REF master ) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index d4b72049e6627c..c63d37c106d63f 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-container", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "dependencies": [ @@ -11,9 +10,8 @@ "host": true }, "boost-config", - "boost-container-hash", "boost-core", - "boost-integer", + "boost-detail", "boost-intrusive", { "name": "boost-modular-build-helper", @@ -22,6 +20,7 @@ "boost-move", "boost-static-assert", "boost-type-traits", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + "boost-winapi" ] } diff --git a/ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch b/ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch deleted file mode 100644 index 30d38af1eb1eac..00000000000000 --- a/ports/boost-context/fix_exports_for_32bit_GNU_asm_for_windows.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d52ce8ca89674e31e689a7af3b0fc9304018be5a Mon Sep 17 00:00:00 2001 -From: Julien Schueller -Date: Thu, 20 Aug 2020 12:51:30 +0200 -Subject: [PATCH] Revert "Fix exports for 32-bit GNU assembler files targeting - Windows." - -This reverts 85783e8, as the wrong linker was used - -Closes #136 ---- - src/asm/jump_i386_ms_pe_gas.asm | 2 +- - src/asm/make_i386_ms_pe_gas.asm | 2 +- - src/asm/ontop_i386_ms_pe_gas.asm | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/asm/jump_i386_ms_pe_gas.asm b/src/asm/jump_i386_ms_pe_gas.asm -index bf5c75a4..6eb45326 100644 ---- a/src/asm/jump_i386_ms_pe_gas.asm -+++ b/src/asm/jump_i386_ms_pe_gas.asm -@@ -120,4 +120,4 @@ _jump_fcontext: - jmp *%ecx - - .section .drectve --.ascii " -export:\"_jump_fcontext\"" -+.ascii " -export:\"jump_fcontext\"" -diff --git a/src/asm/make_i386_ms_pe_gas.asm b/src/asm/make_i386_ms_pe_gas.asm -index 10277bb5..608ddf3a 100644 ---- a/src/asm/make_i386_ms_pe_gas.asm -+++ b/src/asm/make_i386_ms_pe_gas.asm -@@ -150,4 +150,4 @@ finish: - .def __exit; .scl 2; .type 32; .endef /* standard C library function */ - - .section .drectve --.ascii " -export:\"_make_fcontext\"" -+.ascii " -export:\"make_fcontext\"" -diff --git a/src/asm/ontop_i386_ms_pe_gas.asm b/src/asm/ontop_i386_ms_pe_gas.asm -index c23e18a2..abe9002a 100644 ---- a/src/asm/ontop_i386_ms_pe_gas.asm -+++ b/src/asm/ontop_i386_ms_pe_gas.asm -@@ -128,4 +128,4 @@ _ontop_fcontext: - jmp *%ecx - - .section .drectve --.ascii " -export:\"_ontop_fcontext\"" -+.ascii " -export:\"ontop_fcontext\"" diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index 8563ece8398029..df48741264584c 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,10 +3,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.75.0 - SHA512 e1ba126cf1c785c38e196c1eddc347b5b06badf980d3b83d7b1c41d77ca060fbe18b34758d5beadcb53d54e13ce76775fcea24963f1754fab4e482da099cfade + REF boost-1.76.0 + SHA512 f004e38d63b73e96492ab7267a2e4c3b9993eebc7df6e17fbc5daeb4feb002ee8be815ad8db26ec954471678eefd3609d12a81a34adab3115032209002b663eb HEAD_REF master - PATCHES fix_exports_for_32bit_GNU_asm_for_windows.patch ) file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 22f652b556a06b..0faddcdb5feb54 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-context", - "version-string": "1.75.0", - "port-version": 4, + "version": "1.76.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "supports": "!uwp & !emscripten", @@ -14,7 +13,6 @@ "boost-config", "boost-core", "boost-detail", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index b83962defe0bc2..2317a74e0a88d2 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.75.0 - SHA512 6dc5bad8e9d54c9a33f68da89956fbcf89af51bedbd4b8c539cff23d59e14ed93f521f88d247b66816ed8bc4d13634d2573ff52e3e05356906e1141490615966 + REF boost-1.76.0 + SHA512 964290bd77ca345330e50ee76af6e976aba2190bf2186a5376f4fd4b581d2a62f4e5bf6d74938e36f9f06179471ba434721948e1190dd07e41b6b3b0deb9258f HEAD_REF master ) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 1c1765b3f84d7c..369eacd3266cb7 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-contract", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "dependencies": [ diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index a085460733e659..1e22924881a47c 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.75.0 - SHA512 0f9f1d7eb9a6b9cf69322aa5007c237cf4775a2778613b2f14da6be6158dad18dcf266ade7a9394a7ac9f85cc9e3b2d600f4a978f2139aa41cfee7f404a161ba + REF boost-1.76.0 + SHA512 2f14ad44d8fc8645704c1f9aeca7a824747c35422ee795faedc6ae78341d28f38f7100b063107a25fc62cb84a5cdedbe4a6308607168196322cde4abb1453bdd HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index da1ac08150a804..790eff2c6536bb 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-conversion", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "dependencies": [ diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index a21f716390e184..693fca09a64832 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.75.0 - SHA512 e977b0336ea5cc01d9597cd6b2a4ed814c8f84520837742fa40f671dfaa2f49df7f133464fc86819c837f32afcff15c66e399d9b77de020c245e223501399e7e + REF boost-1.76.0 + SHA512 104a220d275b16654f53edcd7048ef78123b38ac820d7bb3d76a0493fc31714d55706a61d0a1f7097daa5190b27c666c22beb19024bb15c52a365cd0cfcfd603 HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index 9a36044b4c1b67..20bf35943bbe40 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-convert", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "dependencies": [ diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index 4b79ee17a0216a..fa1e14078d150c 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.75.0 - SHA512 316fb165037850b7c70d24d1c78ebd188613049d389cc2d59a1da4a3d130708ce945191e46a599452e9aa2bc224ac12fe23ad6f118e8335c474d4a202c6a8d6e + REF boost-1.76.0 + SHA512 95fc5db2580ebd4d8de1a377c7b006e3f89e99c3613620334caa2747b82e28356bb8e023a79f53fca9425a6a9aa9af28b53eefc2cb7222f0f5c5447f448c0143 HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index 6486bb72857267..74767a24ee593b 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,10 +1,11 @@ { "name": "boost-core", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "dependencies": [ "boost-config", + "boost-static-assert", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index e65e5d422174c9..6df9c62ce3a974 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.75.0 - SHA512 0fe4181896b4cca48c8aced4fba47974a06547e5d7477284b7e6564171ab61ae0f2564b720e164a27b5c7cebeae911f8741732f9516d2bdb04c8dd3aff835051 + REF boost-1.76.0 + SHA512 9554ef6a3200b7bd79d6ca953af65ae229e2c8649b2f4e67f911d0844924856163e0eb88fdce03e2c1cb120737e1a9f6cb8bf326ae0b44f161aac213b11b1640 HEAD_REF master ) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 1f83361372f458..9fb993438be750 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-coroutine", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "supports": "!arm & !uwp & !emscripten", @@ -19,7 +18,6 @@ "boost-core", "boost-detail", "boost-exception", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index ee3f3c7f5f97c0..b2d9b451ba8a62 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.75.0 - SHA512 76fb3edec0edc82b9aea20e8b3732a9848f5eab7851a3ff287d4b043c89a99ceb217b797630234131bb1c8163af799a48da25dbbb7ff9d276823186da41f3330 + REF boost-1.76.0 + SHA512 746f03de8f9b2108d95eca2d940462c16660db2021b0612966f0f3e46a5a0d16708a3ef19c605ee56574a5427a93d435597c7dc7a411c2ffbba117afd660b291 HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index 23262aaad941fa..ff9ecae6219e3e 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine2", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "supports": "!emscripten", diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 9f37576607a901..1685331f55e4f8 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.75.0 - SHA512 500ee5b9b91d45dfb00486905e0953e88be5a64f7c1d256c1bd5af0497a1ff02f6c64c22b07a31c2331480bf1b3d6956ca79dabc2183110662b271b76a8541f8 + REF boost-1.76.0 + SHA512 714041c7525dff54ca47d61482d691a06fbb8bf65c93cf87a34f522798657d2d4a01633c2d23c9688626b13e37e4f9f18ab66dccf1499518ba9927499f59e8b2 HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index 5bed63a5fc8f98..e87e147c25eb77 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-crc", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "dependencies": [ "boost-array", - "boost-compatibility", "boost-config", "boost-integer", "boost-type-traits", diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 2c4d40bcb8610b..91971f2cc51e57 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.75.0 - SHA512 9500e4db431c7a805d6a1acdd3c71c464aed2ad4c42fe6f86fea05f1144b4243fc5fab90c79e41d4723323f5efe747b48c2edceb43e101c00a5117a5c0f5ad09 + REF boost-1.76.0 + SHA512 f3d2f78e595762b9d31241d3df3d89a54520557d9cbea945c85a0604ad4a1499382dcb7e55e2c33e45908cbca71d9eb36c9bf72ce1392b7dc24ee34e3b18ba02 HEAD_REF master ) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index 12ea0168a2e477..36be9680caa6e8 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-date-time", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "dependencies": [ @@ -11,11 +10,9 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", - "boost-integer", "boost-io", "boost-lexical-cast", "boost-math", diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index 8a832f186c23c3..eff68f8902aa4f 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.75.0 - SHA512 69950608f8c1a923fdad229b479230c2e2e63bddb813b0621ae196afed2a79edf35676ef6e63f13b2fb85b39d5354139b96fdf0a67092d9850d4c2025880a91c + REF boost-1.76.0 + SHA512 c1958a1ef6ab2fd9fbf2a16d6a0a4a8e49237e66b36c1f8f515d4c84386c1e98bac6d519f1395628441b9a7cdf01b479ebd28dd203835992e99f614dee5b609b HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index 1b9204c63a8cf4..39db2d8557dcea 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,10 +1,9 @@ { "name": "boost-detail", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "dependencies": [ - "boost-compatibility", "boost-config", "boost-preprocessor", "boost-vcpkg-helpers" diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index e4b63ea78e780b..c626a92c5950ef 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.75.0 - SHA512 ae9490fb8fdcad0f350d2e3fa99eae4c72d890503b64f7bf1a2a2fad18babe27c18ddfc5fb0075a3d101ddbc6791df5bb0eaf295d6cc59ea9dcec11ab9fde11b + REF boost-1.76.0 + SHA512 df41f44a89d1f661b87f1863b0dc551a44040ccd002c9eab6728dc4ad4cc789853ab29c04ce6b17f0d94303cbd9f06ba53521c54f7ec614a061e2cb02db1462a HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index 623816e38511a5..cbf24031081932 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-dll", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "dependencies": [ @@ -12,7 +12,6 @@ "platform": "!uwp" }, "boost-function", - "boost-integer", "boost-move", "boost-predef", "boost-smart-ptr", diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 67146a1ef13877..9f02f766e3fbec 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.75.0 - SHA512 6612007e0c344ef6ec9ff502922e43aba9422c6f80e50830be9f02817310df4424a6b8b15d70088491e1d6b0b4a5ede5c69150b1833afcbb72c70e04274e0050 + REF boost-1.76.0 + SHA512 5ca3153b18b2a57574c158e09af1bc3e79b769f73988de8d16fc16d4fddb375ce9aaebbee3204a8b5afaaafe6ca484d8a2d85162dec6a576c6bc52674c9d4a3f HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index a98c6d58188025..46a5834bd4b039 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,10 +1,18 @@ { "name": "boost-dynamic-bitset", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "dependencies": [ + "boost-assert", + "boost-config", "boost-core", + "boost-detail", + "boost-functional", + "boost-integer", + "boost-move", + "boost-static-assert", + "boost-throw-exception", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index 7731ffa6aaa3e0..b7451f6aa5e2f8 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.75.0 - SHA512 cd8ba3b22303424b848e2c985cd3e1da632ce299bff1e0fa7ff42539a077707cf50389505786c7418b6b6786c545728583baeaba8a65ead37c8c595457e64458 + REF boost-1.76.0 + SHA512 8075e7127872d134954708287aef372f872937ecec50db91fd78cc9de33056ba732519a8f7f76ce9bbcfbec0894416b3f3738259ba93ad2cc47702e58366516f HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index 33e92015997543..209e7119b5cc62 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-endian", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "dependencies": [ "boost-config", "boost-core", - "boost-integer", "boost-static-assert", "boost-type-traits", "boost-vcpkg-helpers" diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index b6fcea59b80cea..4414015ea2904f 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.75.0 - SHA512 fe7c62f3970b7041ac94922105305696374fbee59f8cfe3a48035f6487e616f430a1a577bfad997e2be34dc50393b9301726ca27612689f9275b64633c3fab1e + REF boost-1.76.0 + SHA512 e77b6c6088ad7a5443b635d2336605eb5c04fa97849fae7150df2b2521fe47916bf5c17fead55eefa3aa278eb826ca22058c4145d01e09ccc41c0a7ccf961506 HEAD_REF master ) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index f5e67cf901fd5c..aadce7d0c7c6f6 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-exception", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "dependencies": [ diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index dad07c59e75938..c9fbc34da7065e 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.75.0 - SHA512 8b6355aaf804bbf8c33d65e7cb8c5c0e26ca33af0f4da49369073b92ff2afe84c992adf204c1aeedb137daa7f544ed7b40550fca294ed2ba62c8a615b4e5f7da + REF boost-1.76.0 + SHA512 b7994427313de7959144b929806a947fae20087c7215df25e2925dbd553e2aa88d8f1c39a70cbbde61f111c005cded7a664961bf633f0251be4b204e42f1fcbb HEAD_REF master ) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index 35d537197a554f..97cace4b1d4093 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-fiber", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "supports": "!osx & !uwp & !arm & !emscripten", diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index e1bc985ea920ea..55241314a0567b 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.75.0 - SHA512 e79008f39568eaa4763110e4c172b022220b0667d7f05c606daed92f6f5c3977f2478063b6b16db6517b3e33b2df8ec13f8f0ae134fb2020a93d64895170b08d + REF boost-1.76.0 + SHA512 1df89b441c2528844218e447e420c7c9aea0d72f8563ff20f86acebbc7d0d69ed9661422b3625e51005b975d73d7fac3efb69692e21ee13dd92fc1855f119088 HEAD_REF master ) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index dd89855eeeb6bc..d5f6438d160daa 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-filesystem", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "supports": "!uwp", @@ -15,7 +14,6 @@ "boost-core", "boost-detail", "boost-functional", - "boost-integer", "boost-io", "boost-iterator", { diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 35e6593b59ae9e..9d14c96eee7fd5 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.75.0 - SHA512 ab39e5c10f2e2ef75caefd7fa56f2cae013a3d45554e3e66466bf985ef56c942a69a4b5da98de415258119b420a7514fe9b28d1e62f8822eaeacdf4d15e25451 + REF boost-1.76.0 + SHA512 f772c0e7c3efd66c191383c6490ace32294b34f67af569c885abb375c2afdbfeb64de810b50096a902d90bc9f05bae19323a8ec9546f0cc3b9021cdbc497e97a HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index afc8d8019abd8b..39b9f8965d383b 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-flyweight", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "dependencies": [ diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index ffca9e681d803e..1c2ded7100758c 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.75.0 - SHA512 6e88997825127ed0876c3d496b108b4bb7cdfba0e37705288868491150ed455a52624bec49653d9ffc547d98288e1395fd9b95c09a31d763618c76184c9d4853 + REF boost-1.76.0 + SHA512 b2d82918147aa9e22fba6ad798479fc4fca6a437a73c005cde715c5d19adf7320f986637a270742783d0d40bcadb11ae1cc7abbec4358363496d08b8c8d908e0 HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index fe096e9dd1ef76..2f117a39234b5b 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-foreach", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "dependencies": [ diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 600a66bfa40ddc..33456281ba9e64 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.75.0 - SHA512 618ad8b4d7b2982973b21b69e4c8d9c982b56d775756b52399aea3dbdece718e6e77a202e8ecaeec5597a5781227893acc2da837a224ce89f439579d8395b05a + REF boost-1.76.0 + SHA512 7f988f0a3bf2e483d09edc7eb698128286b5c19bb9c4e39e9947ec4d1457b5c3d0b6d7b6f656dd9a2f96e4d372745d62843cd2836b12b96624059576c1905e3b HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index 7dbab9f356196b..e824cf9d2ba28c 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-format", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index 35c6b81318001b..c0486271721c1d 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.75.0 - SHA512 990e67e874a7bf135d1a4c3ef4654a2a5e4879e8d21445c1fee56c37be76477ade7401bd4106b8bac07de54e1cf14a5a9ec643ff647c170877e1153a878ba762 + REF boost-1.76.0 + SHA512 d95ffacc507baf0bedb495f1ea7e0639a19db45b1d55f212dee1eea1e0a9de932e4b74da623200666eef5ead3aea60b66bf7f73cda845b95e54d26714dcdc2e6 HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 39362d0fab2a06..539544f2f816ff 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function-types", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "dependencies": [ diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index b73fdd694543e6..afce6022126d4d 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.75.0 - SHA512 5e7753aa8857a032d77abdbeded9633b00df5cf93f79dd3f53e957db00fbbe3b6ee5fe9a01c3fc9830c159f0dd62aac1fbf062909e832c5fa7dabed003003822 + REF boost-1.76.0 + SHA512 d8ad636b47fc77208b3b438494c8bfc286938fd310e91adb9a55a099b552f70a86dfde263fcf100c77fe43b300050dd19c289802366beaa9bd36f38a8539b34e HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index 9f13b38beb3382..4d760713048b5b 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "dependencies": [ diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index 54ba8db2b969a8..dba5df091fbffd 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.75.0 - SHA512 f5f9b759b27c92b8b948c0043f83eaebef206e75430b85a4da27d2f643e15cf31c56ca06ad9b30b291d28fadcc93eabaa0b13277a3d14be0abe9eb5a07259393 + REF boost-1.76.0 + SHA512 9b63cdbba4a997c04a887775dd4d351eb3fce55ebc6f620865f88f696d969cc56d47675c21ed7a976f19b64eee4875b0e47dd0949e56a576f19fb1a6c59fe31a HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index a20b8c410cd948..df76a7e8763af7 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-functional", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "dependencies": [ diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 7d11ff35d24dae..707ca68e867574 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.75.0 - SHA512 13c0dcd2b0c9466f240843c5edaef7e292c118f26e598595b9fe30d3ae5952c0617b3c7786e93cf1589e419444d87f1bb2fa5254878c89e422497d86fb25428d + REF boost-1.76.0 + SHA512 4e8244962d5f165de9953f7669248002d36c82c213ae3e6374c2b997a3a39f151cf1bee2a5e5e45ae06f9ee7eb0322aeeb0ef7e4215d0829e9aa94f9000ee4b9 HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index ebfa81e5fb09cf..c32b2d333df5fb 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-fusion", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "dependencies": [ diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 1a34a81d04d3f2..0bba9bc932b396 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.75.0 - SHA512 d5fb18363bb4a9e25079b36190b253e5134196ad8942e935c4be31a8495750343779115e83e9e6c787692ff22cf6c6b41f1263abcf49d2cbaf1e6e6328edff15 + REF boost-1.76.0 + SHA512 2ae1af6337cbb820cef2c34c24b55fb032e4b57ead2a5fc5ee041a083f08e1c35c873e94a135d1c990809e1f160d19aedb31d8a1715f2c211361279fd9707236 HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index 884a4093742f7c..573f8e2ded62b8 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-geometry", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "dependencies": [ diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index e2d12ee2ebe4dd..ac480b26286ccf 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.75.0 - SHA512 aff1ea0e3455ce18faf691b02481e8c591e5cf0918981d1a3cf95971ea93f31ed72a51efbf7b8557ab51d186d4a7fbed03dbf996c7f2e0be28c5d5fc67277048 + REF boost-1.76.0 + SHA512 ba3504fb8af75406c1e41d5f17fe8a31629949902cee75719890250bdbe45ab170d36e66f76e20dfe8612fb1888f152158bc21f4488e85a5a25ebc3aad18dd4d HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index de58f8e5aea6f5..402b9e0fdd3188 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-gil", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "dependencies": [ diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index ef24ef770a9259..03830932976c98 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.75.0 - SHA512 46d86b9d6822a0b762d9587d96da35cf784b21853d99e2ea4d6172c4b2a1382158037652f0a73d0545793edabdde5e21e6515c01991cb761a1a3fa304bfa742e + REF boost-1.76.0 + SHA512 6328aa909cb611728e10cb23f666b68ce11d2a79130946e60da3ce664c5aa71da43e05269720455647f0b52f4b4d7e941ea1cfd1e203bf42a494a44f770185c2 HEAD_REF master ) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index 48600dda68e3a8..7fbb59aa391fa4 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-graph-parallel", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-concept-check", "boost-config", "boost-container-hash", diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index 2978a9d0f2aeac..bff59f5c57ce0b 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.75.0 - SHA512 163ddbd6e439bcb53632cd3ec1e670d128e69ec5347737a6e10c5b5af231ad7cc085d594f1bf55894f342a81a141ca4309582f660c74b0db3fe1f7aa78c208cf + REF boost-1.76.0 + SHA512 4a5699193adea6ad2df7c1fc9152be58a1234e79fad03a92dd7eca32cac41d2295b1b529b876b7d179b21097baadd8663e68a7d237abcf4b255772ed18f42a1a HEAD_REF master ) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index c4c8bf1164615c..eb3e7e79fd24e0 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-graph", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "dependencies": [ @@ -15,7 +14,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-concept-check", "boost-config", "boost-container-hash", diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index dfa8be6aa9cfd2..324cc11bd7fca5 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.75.0 - SHA512 6c5ea81f9f7bdb735035a8a49fd82768102d2586cc4a1ee65e83260b26e3a39244f8053266b4d41a3260d8922bca667609fe9f360d1fe09a7f778035b318fbe5 + REF boost-1.76.0 + SHA512 839eb1684335ae541dd9342fda8ef5df5003b470922abd5fd72c175e03be4f0158d5cb2892bbce071358b641f5591a852c180f81ac3fb9777e2b88dd095491f2 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index 4d00d9a5fc22f2..1a075a79b978eb 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hana", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "dependencies": [ diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index c20839543af52f..34a53fdf0bf84b 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.75.0 - SHA512 1f8127aba16efce6694451dd04130cae92a88257937d87860fdbf9111405f458e8a162f3d541b00c5e4d0e3eba4cadc1c9fd2424eb03e52ce1302cd8ef1e0af5 + REF boost-1.76.0 + SHA512 11f16b0a573108d2c2f58ba9669371d2db5e6090f9d50abc367fd295fb5966a985793081e222742305e9cc86d950c8545f1afa0a855d43eab6cabf41a36e9335 HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index 20b631d6aeb747..a59c675fd3709f 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-heap", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "dependencies": [ @@ -8,8 +8,8 @@ "boost-assert", "boost-bind", "boost-concept-check", + "boost-config", "boost-core", - "boost-integer", "boost-intrusive", "boost-iterator", "boost-parameter", diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 37d244bab68317..1246b2a273c887 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.75.0 - SHA512 de5299b1c3f05bbb052c0bca0537ed8b7cf4268741a263b1ed12c97dd7a94f52571d8b566c33c27d387f1409e26d5a70b2eaf92a346aa9226403930cba6c1bca + REF boost-1.76.0 + SHA512 0bef1cfbc328f73f14bd364902a157a519343ade5751466db3bfdfc63ab76490a9c7f11f8b6d0e24450646f7c26bb967f93719a0fb49f399de6e71b7a19827ff HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 868625a863b4cb..00e04b7a5d5e02 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-histogram", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "dependencies": [ diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index c99bc95d300f46..7f07484da253f8 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.75.0 - SHA512 85bc5fa2d479557f5265480d310a8a18885980bb1c516a99d73d445758ddc2132ae3cab7162652fd9091918fa2ac440703837f3c7b81466aa43dfd66898e549c + REF boost-1.76.0 + SHA512 40d70bd531c1c69bcefe0105001ff9c423e23029197a60e46c163abf2b66c726e7d8411503c1201946a1d6d0aa8aef5caded9942968b7844023fbe023a1509c8 HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 200b09dd44521b..3695f5ac94f79c 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hof", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "dependencies": [ diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index 8f356be608d277..ce5ffd240124a1 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.75.0 - SHA512 6fb317621c19c0bd6ab7ca8cc9048c42e4d362496f32973d5c226a0d91ecb861af54d59d6396587e7241d184f04ca445657dd4f033665be2e31ac21e913e3e59 + REF boost-1.76.0 + SHA512 e8561b8217cc8048b8bcaed49f827ec26ab6f0169050d299a5d85bd87bc2fcbc6cf9a078ff9de2751f8a419e9a1556f93b70742cec6bea2e88a353ce17db5e12 HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 684746c5bcd731..69d0c261f6d3dc 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-icl", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "dependencies": [ diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index d158c13790dc47..618bafcf9e5a24 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.75.0 - SHA512 ed1b7749052c57e1535005d75ca2fe3707a0fa7bb7261b6ca0c2db12dfbe024aeda4aba2104209b5706f5b1c87bfb9b69115e1433e3f84456a70180e6fbebce5 + REF boost-1.76.0 + SHA512 d0df93ba10d4c6004c4b23aca512e3346c40cf6684d53059090b79dfcc633e89449beeae3b2f8f4e0c721076b55f92159dd5c6a7665405e426c66251ea2913a8 HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index f06684ccffe307..5f6bc4df062fb9 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-integer", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index 2e682eb3181c26..f4f402123ab593 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.75.0 - SHA512 02c01e16a3050e24b179290fbf72056599c22e766035121a44e72277cbc4535f2ba959bca7b5746f64a397b01bd78424dc05490217f7accd4f01f08d3ed0a837 + REF boost-1.76.0 + SHA512 853cb0d6a51d42223d2c242d03b339f723e18c54c7a1f4e2be841a85a816ebc1524f5b9b90441c054072d5a408a724ee8dbeac22997ef5dfb3cf78c87c2acf71 HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index b5b376a37e5db2..765d308702f400 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-interprocess", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-container", "boost-core", diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 95876e633fe73d..88017359bff32b 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.75.0 - SHA512 25ba8052f562585ca1d98be93fe97facd0d485a70e230f0f7d95911a6ce92bd60d3d56844782e5136a89a51303fbf8d751897578ac4e9bc8c2672b84cac7cc3d + REF boost-1.76.0 + SHA512 72e7712634c314fe51733ecf8dcad5ddf6361cbae9df4471ec632b4b8c126a0965f3ded1a15c9229e2b2c817024cf27ec1febbe641b10fefa2572611ace5f4b7 HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index 6402338cad0256..fccc60b6609768 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,10 +1,9 @@ { "name": "boost-interval", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "dependencies": [ - "boost-compatibility", "boost-config", "boost-detail", "boost-logic", diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index c1fd05513b1d50..9a7a4f0afe5baa 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.75.0 - SHA512 4d211523102861cbfa01413dcdaff153bc51ce095e98f8a7cab061901f6dec79ba1cdc898df0e217cff1d1f3febbb9ee4c3188ef200d6161c883b3c6a928d08a + REF boost-1.76.0 + SHA512 272ad56917b9f54d1a4ff578ac690766a692932ca7226a496b9a161d399c9a2e00f762db21924d7de6a446757f1dc5723af5e977a62ccfe408e4422c80cf76a8 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index b56916ebc995b0..2f043a7b6a6f10 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-intrusive", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "dependencies": [ @@ -8,7 +8,6 @@ "boost-config", "boost-container-hash", "boost-core", - "boost-integer", "boost-move", "boost-static-assert", "boost-vcpkg-helpers" diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index d72f41f29d7be9..ba9c1f960b6607 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.75.0 - SHA512 0c5efe91d1a83a7a42e035de0720e92d7f4ca9af692913845d9a5a5e3ba994c5b9664c87b60d5f6345c5dd395e8d0c2074827e37d8e76f75548d95f845c194d2 + REF boost-1.76.0 + SHA512 e03511225fe52fb18842404f1218bf1cab4b36010d43c65ae8296a6b845e0dfce4b7efdb15c8784b54ad099cfe1ab46b535b628cff193d98662bb268d7db6d41 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index f9ed7c1fbc74b1..06a482f8d79bc7 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-io", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "dependencies": [ diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 4a506016001dcc..3c6838f269e7e5 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.75.0 - SHA512 683a3fba09c0732168d4f1c7cbe4f7e29fe9dce737ed5ee08a56000084c467a1816d67d46ec04c6ba8e18413a66ac6cad896e2364491b3fc18c20eb423ed645c + REF boost-1.76.0 + SHA512 3107bc329adf835b4f8592ec2c8988b377910bc6a724ba2f378dccf9e050da14ef593e5927ad53029e3ed8a51febbbef36af3dc6e889999c4768d8b9c1616393 HEAD_REF master PATCHES Removeseekpos.patch ) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 4f772d939b6cf6..98d632ddbcf228 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-iostreams", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "supports": "!uwp", diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index 241b8e4008480a..f55e4328eef63f 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.75.0 - SHA512 28148a5980f31e8d6e553800387335c9cb9ace06533c54825337178488efe1726f8ceb333da80dff394685c64aaf4848598845555a7f16bbde0bd73cf5c80e9b + REF boost-1.76.0 + SHA512 0c890932dc16d87e350f3cfa0942aa92e9a590174d6f330259fe0b1eb2ead9ca3f1d0e0c2bb56e086e5eda9f2122e2eda2b67b52a4df8e614876a64ab014a300 HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index 805fcb3193963f..df8348d3933b71 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-iterator", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-concept-check", "boost-config", "boost-conversion", diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 6dbc2ee5314117..882daae7d4295a 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.75.0 - SHA512 887a8758d247eb76b41526107e4006de7d18f107afc9692d95eb2ba7beb9cfa6d5f2e721523a8d4530aec38bd1f6eb0f6364aa05b5bf95f5428f4c9fa3d24b7c + REF boost-1.76.0 + SHA512 86807c1efafc582d41d6d46b0d83f95dcb4eebe071e8b6f25cb6c2706ee4c1f5be6dc70c5a28d76877390654889b3c02a77f655a132f715690f794be0336a00e HEAD_REF master ) @@ -13,6 +13,7 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n /boost//container/off" "") vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "..//check_basic_alignas" "..//..//..//check_basic_alignas") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index 0b36bbf832602d..e58aac4e250785 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-json", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "dependencies": [ diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index c0b0b4e91dd13f..8a17fdb72f8b70 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.75.0 - SHA512 c459cb7d64fa1a8d5b755f2a1153dcea77fdcbeacf117db54e3288b8599998b58cb138a801c7c68c682296f72e28787027ce84ead424b6dda56b23c23ce71168 + REF boost-1.76.0 + SHA512 3cde15d39798398938a896b9bba624ff78ca3eb22ae04b3293f7f63fa5408bfac227ce191b0cee8753ca8f521e16b682b2d035125d75788815635586f122355a HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index 49f999875016cf..f8ae2329f4a342 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,13 +1,16 @@ { "name": "boost-lambda", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "dependencies": [ "boost-bind", "boost-config", + "boost-core", "boost-detail", "boost-mpl", + "boost-preprocessor", + "boost-tuple", "boost-type-traits", "boost-utility", "boost-vcpkg-helpers" diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index fd9db4cb9644fb..7f158826071add 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.75.0 - SHA512 9570e3c7964e7e3999fe469a1ca71edec7bd5435865ca0230b232b94ba84bcc1d218773262855868b379483a902bf9bdda50ddcceec7c5d282be208a39c5f6d6 + REF boost-1.76.0 + SHA512 3ab95ba1d75cb9137805e656d7331cbf9fa290400ee88dc4f2088d26983c6c948c4fc7f05615f3bf5b9533aab84b259ec2158a97b4447f619f907b5377571b55 HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index 7ff64d65237018..72ee4ace096e2c 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-leaf", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "dependencies": [ diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index 3af9340f7549b3..fae7b7fdbc06db 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.75.0 - SHA512 6c1454cb9224dd5aba6d575fe266af3299433a1789253a4a15f4d8227fe82f7fd71e2754e9c83b4f70fb50293f5597b5e90c5b9eaee8f7d7b0d296d987236b02 + REF boost-1.76.0 + SHA512 80f3fe792e2f66fab4096c9d327091bce66f004b3355de0ee28c2c1ea438412fceae2a84799113f7e901393e86fa8dacddf6b6338d3e6265f528c636065dd06a HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index a976cf7d8ec3c9..5767a4253a41f7 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-lexical-cast", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "dependencies": [ "boost-array", "boost-assert", - "boost-compatibility", "boost-config", "boost-container", "boost-core", diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 010a55479c6b38..9b3f1bc7f11083 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.75.0 - SHA512 83807dfc36810a27194841eac25b70905572f6da656e75d5f04e5b4d4abec58710a34d17e69fb6588154950f1099702c8205c26c47770fe21f875a9bd7641fe6 + REF boost-1.76.0 + SHA512 e1637f892c70e0e7df67e1e9c28658787305b873198d9c1a60826d4bd581a0b866aa675339d7c85927bb74d74711d14eb8bbb47663ab69fa10945ca21a5ec220 HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index 1d5f9ac682d2cc..74d77a16fbee09 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-local-function", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "dependencies": [ diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index fb0f617c4153f0..981ce574329fe8 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.75.0 - SHA512 13bc48ef4ae0805abd5eecde90406486a00c350187343ae2cc7da9b7e94d15be952312c1c07c4faf4d62e13401c6e450c3c3d06649af01a690fc7200a20744ed + REF boost-1.76.0 + SHA512 509de7eb111cb408d1e4f766ab60388a4ecf593cb644ab22572765d0e0c6197937d6da886627d341e3665bdaa697f2c8cc4adef2f298858f16d72ae1029e5dac HEAD_REF master PATCHES 0001-Fix-boost-ICU-support.patch diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 7e800829019306..014a13569aacf6 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-locale", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "supports": "!uwp", @@ -13,7 +12,6 @@ }, "boost-config", "boost-function", - "boost-integer", "boost-iterator", { "name": "boost-modular-build-helper", diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index f94ebccb16d716..8156322ee345ec 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.75.0 - SHA512 e4b6db2595688f6a13e9adbfe647b692db3e45ab40b213565e675a5de39d4556d3eca9c6b626690737163d22b80c7447c7e9df40ac2c726173ffa820677c4f61 + REF boost-1.76.0 + SHA512 eb4f387306e843ed4fa16e4a8709d6ef8a54280f42dd453347ad9485d301835541bf256edcf237aefc7da94029b044ad3b8bc429b5afdeeebda75fa9bf8df2bd HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index 05ed46e19e8ba2..f889222381526a 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lockfree", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "dependencies": [ diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index ea35d818200cd9..9b16049e95f5e8 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.75.0 - SHA512 4c500217aa8ba0fe88afdff5f901da2a8977f7825a37fcc0de4a46a723dbfc3be8a25a712e4e49cf2ae4a95432dc80d66b5e8860815f320b7cb90d66592dc6bf + REF boost-1.76.0 + SHA512 9d29404852d9e79241bd745757960563e11c854887d2aa2fad5a0306f7c327351a70f526ebb8e9c603c79c6979678ca220071e6a62e0148a2bd51f30af952f07 HEAD_REF master ) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 8c4752f7f552dc..1b700bb911ca7d 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-log", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "supports": "!uwp & !emscripten", @@ -19,7 +18,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-container", "boost-core", @@ -32,7 +30,6 @@ }, "boost-function-types", "boost-fusion", - "boost-integer", "boost-interprocess", "boost-intrusive", "boost-io", diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index 5b286f404845fd..2d2c461bc2772d 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.75.0 - SHA512 145654dc2397cf5740cd2cf161b0428d608a1ca02d7b53c6ebf363342bbf9d3db351913772820a853a599b8edff862d83ffc9324dbf3162ba4a913bfdd904ad8 + REF boost-1.76.0 + SHA512 6795e97a02f1b02c115951a075338fb62bf7458e30bd297071940d5a68990f0860736b29a18adbcf6bd3ca8c1af4042ddf64054c2ba873e54da3cbd587c098c4 HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index f4ea7c967dbd60..440963f50e1880 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-logic", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "dependencies": [ diff --git a/ports/boost-math/b2-options.cmake b/ports/boost-math/b2-options.cmake new file mode 100644 index 00000000000000..57388346841878 --- /dev/null +++ b/ports/boost-math/b2-options.cmake @@ -0,0 +1,3 @@ +if(APPLE) + list(APPEND B2_OPTIONS cxxstd=11) +endif() diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index b5a1f2b39b30fa..9fbcba6a6d41ab 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,15 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.75.0 - SHA512 d0b31cc55d2c0788b7376bc8be877acb30b0f23a71f83aa6df27d47fc8887542924df9f33b1d69da2befdb4ab087d6905d126ee3a8ae98a91aba0ad3c70311ee + REF boost-1.76.0 + SHA512 50967b962ac4b3cfc799733e5cbbcc15215c27135368a739d2441a70aa6e4a7ccfb617bf3ccd571201568d8bacb209d2a98acbe0593cde7714c7da9faa09ee17 HEAD_REF master ) +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "import ../../config/checks/config" "import config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "check-target-builds ../config//has_gcc_visibility" "check-target-builds ../has_gcc_visibility.cpp") + +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-math requires a newer version of vcpkg in order to build.") endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) -boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index bce6096a226175..044d88f7a53380 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-math", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "dependencies": [ @@ -13,12 +12,10 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-concept-check", "boost-config", "boost-core", "boost-detail", - "boost-fusion", "boost-integer", "boost-lambda", "boost-lexical-cast", @@ -26,14 +23,11 @@ "name": "boost-modular-build-helper", "host": true }, - "boost-mp11", - "boost-mpl", "boost-predef", "boost-range", "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", - "boost-tuple", "boost-type-traits", "boost-utility", "boost-vcpkg-helpers" diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 44721ab236ef7e..4056d81fe901b0 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.75.0 - SHA512 a998db95cf70e24183b7f850f2ae4b9cb7994ede7ddbdbe560c686a0fde3437657c4d40d5d29b07ed03bf1be5756edfce22ec121eb8694edfffe1247e780e2a6 + REF boost-1.76.0 + SHA512 27a9cc14b97f815960682da087137e656479069a0a5d57b26f9fbd43467217ba34b0d2f2336318e2394190c5d34d95d4fa71c6b3a2f95ccdae5a6010299e5783 HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index b24d2b231e327a..f91cd2f8c01599 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-metaparse", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "dependencies": [ diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index 4117fce60134d7..7917408c36d7a5 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.75.0 ; -constant BOOST_VERSION_ABI_TAG : 1_75 ; +constant BOOST_VERSION : 1.76.0 ; +constant BOOST_VERSION_ABI_TAG : 1_76 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; import boostcpp ; diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 69eb899a16db99..fecb98651c1348 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -416,7 +416,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-1_75" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries + string(REPLACE "-1_76" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 699b93b47809bf..d7460d8dbe38ee 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-modular-build-helper", - "version-string": "1.75.0", - "port-version": 10, + "version-string": "1.76.0", "dependencies": [ "boost-build", "boost-uninstall" diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index 7a773d10c6b19e..2ebcbc847c24de 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.75.0 - SHA512 73cd70bb613cfbb2f6b2f15a2a2fd0d40411de7b8ea7639c18d40a80471bc084ee845037bf9175bb50dfeedc750289ccd126a6f2a147d2fb3cb86f3da49480c2 + REF boost-1.76.0 + SHA512 f136696c88f398d27e97f77141f10c1ab80b0bccf9acdecc3c0e886c8f32e8e9bc9fe51ba563c814e20d71a15c01f70d96ffd88d5a6c5e297f568959492bc982 HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index 2386e134af1823..e197249a9bee88 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,15 +1,13 @@ { "name": "boost-move", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-integer", "boost-static-assert", - "boost-utility", "boost-vcpkg-helpers", "boost-winapi" ] diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 77f933c59182cf..759f4849f57585 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.75.0 - SHA512 bacad2fe97d687e9bb49d0274cd97f6b9344bc6f00537b93a3075603b2b486deaf472fd819635eca435b814486c2dff13a8ca572ac216cb0452340fd08492b15 + REF boost-1.76.0 + SHA512 fcdf427339f5e9a617d4ebcb5bbbf81eb6fd25568dbac64ad8f570df53997372d0c03e04b2c32d5ee704576a98008015f489d2a64726b50732da1cc3ab331531 HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 7128f6b324b68b..4eb15cb1d83e83 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mp11", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "dependencies": [ diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index ec27ec0b284ab8..e8d6079d95a885 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.75.0 - SHA512 0fc0721564c431a959bfe5d5c8c5b8b3c1d2eba32f14a3158746386806be0eaee8abedadce1b4bbb9a82a63764ff351d5b1e3c2be224ea49cd55ef4ebfa9ae5f + REF boost-1.76.0 + SHA512 42870fa1a8d85814aa125664bdadfd986112b6e9eb4b1007835f3434c4eacccad8971fc0767e9ac7b935068ed0c0031cea5820cbb79291d2b281ace565cd8bc5 HEAD_REF master ) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 36f924a6aa5893..3fadfc06003232 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-mpi", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", "dependencies": [ @@ -10,7 +9,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-foreach", diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 1c741009d92bc8..982679e0146d15 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.75.0 - SHA512 21326d25fd6b9e95ba066ac06585d4b1c643b5cf2d3e927db5f8d94bb804ab8bc6a85f500c793756187f96b0b7c4b06462a9a11d77e00822a213ae46004ee416 + REF boost-1.76.0 + SHA512 90362fbe99563754c9b692466f61a0c5cfbb1bcb7c24d107d9e1525755b928cb9bb741768ba2dceaf4f44efd4c644cf1ea184d2ee3fbf419459dfc12a42430f1 HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index 1bf8235732a932..999fbb596b40d4 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mpl", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "dependencies": [ diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index dc0a89607e4a43..37b9e89a023720 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.75.0 - SHA512 e476c5c316c9e80d98f579f873150d2e1fbc9a80cc7f5cb0dd4f034ade5abfe0297c4b7d22dab96be07095cf9ba0c280420a489e0d94df2b5fdb98c42d6f51b8 + REF boost-1.76.0 + SHA512 88734ef44bd8b8fe41920ed2e2d0576c87b86604fe8bb33e5512e01719593287028475bbd1a597ba4b8d32bc7cc119e2c62d9efc8006f772abce0fb988f8e9d1 HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index ac45635322c54a..4704144e07136a 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-msm", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "dependencies": [ diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 01dc570cf9b4e7..625a9c98882736 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.75.0 - SHA512 4455eb06192091522a17473bba1b14eb34626a74e3201e92a5a5c57e2dd56501079b4a48bb6e61d223a5c6b87e9d930c38d5ddda294e6ece326640ae23fdba23 + REF boost-1.76.0 + SHA512 1e6487b127e8205ba9ce790fefa39994bfe85417e9f87ef332e73f4465f8e26ea2ffc54e4d3096f6c7d48dd30768e910f6bf2ebd3b49d0ba490be7f0bda0c965 HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index 16477bd4e8aff1..07804cbd4a2046 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,11 +1,20 @@ { "name": "boost-multi-array", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "dependencies": [ - "boost-compatibility", + "boost-array", + "boost-assert", + "boost-concept-check", "boost-config", + "boost-core", + "boost-functional", + "boost-iterator", + "boost-mpl", + "boost-static-assert", + "boost-type-traits", + "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index 1295859041acc2..e8ac4693463505 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.75.0 - SHA512 162ee2d46ee899cf15f27e12248dbb02b34d22f38f63afb90abc8ac24aabd2ca58864acc56af0eded999baebac36452ca502e59fc985ce2146df24d5f9e43f01 + REF boost-1.76.0 + SHA512 b7b19d5fb3f7c93009d7af6ab8e80694208f045d012778637bd57b018360311ce14d3921d0ee6163e0aaa01001a466c2b68cf32017361ef6c0c9858db14d8615 HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index cb9a5467ab92ae..4bc77042b7982b 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-multi-index", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "dependencies": [ "boost-assert", "boost-bind", - "boost-compatibility", "boost-config", "boost-container-hash", "boost-core", diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 618981a8b4e919..8002d71867e9fd 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.75.0 - SHA512 e937cf51cb41178ffe6edd7359cf63a55b36931cf835e6a7528dbaad0a09fa5b3fdc52bd07fe9f7552770b83e06050f6927d176622033f806c84fd845f693d59 + REF boost-1.76.0 + SHA512 ced4b1d4f1f4549dcc5d9f1ea470af5fe69af79208e8609656d5d807c5c1f54b0835f0807eda476b8ac59103ba1045a0458ea124bfd61439aa3e3d56d011313d HEAD_REF master ) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index cb4e8d0970aa78..523e5fb2ce253c 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,26 +1,20 @@ { "name": "boost-multiprecision", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "dependencies": [ "boost-array", "boost-assert", - "boost-atomic", "boost-config", "boost-container-hash", "boost-core", "boost-functional", "boost-integer", "boost-lexical-cast", - "boost-mpl", "boost-predef", "boost-rational", - "boost-smart-ptr", - "boost-static-assert", "boost-throw-exception", - "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index b4fc82d51733f0..924d952de876c0 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.75.0 - SHA512 15f836928459477339e11780b7ead2aa7f1721ec5c443a5370e1d6dd732228185f9055cbad169982aa6dee3d5c9efdce3076d9228d12cebfbe40475490503128 + REF boost-1.76.0 + SHA512 42acb8ef8d0c3ab01673814ada908dcfb6673c8fb6a4f056043b0a81bbeb9cc8bdd7b52febe0d06d5899d39af9717fa2e63f3678f7005e56d0bc4765e8a232c0 HEAD_REF master ) diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index f23a27d273001b..08d1daca387c9f 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-nowide", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 437ddfd2418872..24ebf24f7205dd 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.75.0 - SHA512 bea107d1281a7ba8f988eee849872bc8c61f3585e1f61e2af06c988cb72213ff2162436a5e9e67e03df9d5e20a19343da76ad931894dbb0137c06e85a461ece1 + REF boost-1.76.0 + SHA512 cd659c91ae7f3b25e3d0b13b44c028fcc86295fe414fde70e5decbe1d8fcb1dbd233c6a36b90b33def4e0709075a41661aa311305329f38ba36810326306427b HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index eec4c866d6a9e0..a25310104e6e18 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,17 +1,17 @@ { "name": "boost-numeric-conversion", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "dependencies": [ - "boost-compatibility", "boost-config", "boost-conversion", "boost-core", "boost-detail", - "boost-integer", + "boost-mpl", "boost-preprocessor", "boost-throw-exception", + "boost-type-traits", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index a354baf2c4409c..0a7c9e2fb3685d 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.75.0 - SHA512 972afd04ca564aa1ac8d803d36b07ccf8fac7f3931e7c916c7459435313de13d511508793364d67e0aa19a79ba91c50ce4dc774ae2702142afdcb4b08de192e9 + REF boost-1.76.0 + SHA512 8bc70dd31f948f467249caa4c67bf9dcb58bba524edd303cd4312037cff49409108c88321649ff31363da4897f8fa6053e4e5b632fbfe19f0529db4fdc734cd8 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index f3025958e44bcc..483ea6e86b8c1b 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-odeint", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "dependencies": [ diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 829dcfecf499f6..0705d960add47d 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.75.0 - SHA512 0ca750030089267e1fc2f5a91b85bdddb239ffb2dfa02457176c7bee2caa926457a70cf8bcaec78658668b36e70c9d927823d7cf960d5a37ce8d879cefb3029d + REF boost-1.76.0 + SHA512 4802a27da00446384ae4c91075593f0d67628192d9f9cbc2378a190d1ef5491979c40934b3ac0e72145522847d0abbd1afd44345696cd936875189ab0013138c HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 7afa11956ee9eb..5cfaf9a3aba305 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-optional", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "dependencies": [ diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index 1a22d038ccc380..b434f1f22fdd50 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.75.0 - SHA512 838c4a0a698cf3250891ef02184669d14e0891f366c52e646e76b25727be5d2fc0596a3ed95ac18f5d180ea35a1c24db3b8e8913277d62683908900d0394b9b1 + REF boost-1.76.0 + SHA512 0e15ccdbb06db9308524e4e11b75b6c1802aec0237d139bcc6929a2dbeeee1cec21f2819cb8a881ba4d9d1d1934a91527cbf4a0044de34f9ff2c3bfdd01cb543 HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index 01622ebbd7aed7..fe9ab77a21c146 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,10 +1,12 @@ { "name": "boost-outcome", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "dependencies": [ "boost-config", + "boost-exception", + "boost-system", "boost-throw-exception", "boost-vcpkg-helpers" ] diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index 46b6a368974aac..79ef14dbaa5d9b 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter_python - REF boost-1.75.0 - SHA512 8a9591c51ea7f39b231293d0f731572cc014288c43f1cbaa5a3fd98d6eccb4359b6c8c064554efa438495b13866f475fde7dbfee255c7ee471bbfd4e94770ad9 + REF boost-1.76.0 + SHA512 d9e1cc0adae766e9c78fdd5002f2740902092f57f4c187f95e18d3cd9062bf8f9e5678caa9e7e2bc8a27d009302ba335ef8e7b7795a1e2577ab166c6adce9d7d HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index d9f704e7319b7c..104daca2d96c69 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter-python", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "supports": "!emscripten", diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index f4382824e0342f..2d9c1acc512241 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.75.0 - SHA512 aebb583003b532566d6e8527a1f307b0baac0083d89e88ad63eb3aac7861832aad557a4412adaf56a962c721629056e2e56b8334964e0fafd3e23cdbf82f25c6 + REF boost-1.76.0 + SHA512 737dac55fac0e4e31e80fb4adfa75880a857a41007d2cdbfacb58f89171410b7136bae69cee590a9de3735b58dc9c9bbf8c724f3ef4b4ac4cf27f695f8efc640 HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index 3012eca5854e8f..d662d36a764c45 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "dependencies": [ diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index abde62533232a6..7c6489e2771c84 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.75.0 - SHA512 68f4c111451f8d9d695d083b713ffb6efaa6d81e5b83ffa8ee901cd43e1eb41abe75a80be03b039036d53625c5629daa12a999217d1ac8aebc5806d1916f6ace + REF boost-1.76.0 + SHA512 cb6108970c50fff93677f70f4610376d1d917b372633c913290fcefbd92c24329717fd95060a9403afe19daf9a525ee129c88eed7ce5320dd44dd6c56c7ec63f HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index ace648fd1bdc31..6c6cbf410192c2 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-pfr", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "dependencies": [ diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 2f51ff7fbc1737..9c3f00410bb765 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.75.0 - SHA512 e888960ee154d73f9eb5d5d97d681aa5a8bba7295ab2150d80a316ab6c8aaf66efb3187ac618d59ad21aa0459b29ce68dcd106d5f6242b7db2ec3d61c92fa107 + REF boost-1.76.0 + SHA512 515895386647ea13a40045814f8f91989aa1ec257f139fff150401247fdf8684e8b1df73b18edd69ffeee87d6c25d4d895dbd6dbef54fec61ba0f192904eaad1 HEAD_REF master ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index 63a44db1d132c0..49196cb71e1b2a 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-phoenix", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "dependencies": [ diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 7234d833b37c93..695cc40c86e141 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.75.0 - SHA512 b647e6256d566117dc35ec3452c849aadbcc06a71b70426d7b41e63e2e369e0c3373628f7a33e2b16eefd86efb128cd03ee7b49473f1d83da775ae2cd1043709 + REF boost-1.76.0 + SHA512 9bc910a72b232e8615d43e967f5a19d2b5910dcaf1641c71b9bbc67ea72e8fb96a834fab8657bce89be574ec9d56e298cb8f36d7663476a5604876fba6ae1cde HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 25999dba871c72..50040ac1a376d1 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-poly-collection", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "dependencies": [ diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index ed8e27acf084ae..6f81c5c16ff109 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.75.0 - SHA512 8c4241e1c392fb63b118c3e59a9207126627e02a4e3ecb5be1e7c73adfe156320d4d61ccf8274c6434447cdcdf2dfb960574437be8edb771ad143f7bfce14377 + REF boost-1.76.0 + SHA512 3b735ae15c75581297ad920a79c30ad3e58da4a747333ff9c6637ad10e08c536d0e9b495b20ecc743af98a9d46af92aa602b52aede50c1a77de84f121cd13a4a HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 7f42e2c93564fe..89a857b1bd939b 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-polygon", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "dependencies": [ "boost-config", - "boost-integer", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index de1145ad21886d..a2d4d2296f2ceb 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.75.0 - SHA512 6726fd14ae1aafdabe65529d081fcc2d66e61b622b4c4312bced797dc5484211d03e1c93f18ecb1fe995557291f079bdaef89049eea94e2f3dabe492e4d9b9e6 + REF boost-1.76.0 + SHA512 df25c5df62471b176699300aac2b8fdfced427ebcf76bf9ef4f17679e5dfd52c25c227e628654de487b3403ecbd64c4a864d1c2ef52d52b58f185c5acbe9588e HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 94ad6b384a50ad..8cdb410b3f8016 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-pool", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-detail", "boost-integer", diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 2f58cb3ebfaf89..50f64847e149e9 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.75.0 - SHA512 ecac133772c24c0e2da6ebcb9a39fb9a14b23cdc14689421eca7c59513bc559f822b3ecff70643df4175379c05d435e8fa9300231dafac61f1d0857179b47c58 + REF boost-1.76.0 + SHA512 89c04eff29e31010072fbe79c8d4ecb3baa0dd48cd8eba8847b836fe6d355a5e1243726156ff7343be11d849096049cdb9420d5238792ea116dbe8e2645f3bf6 HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index 0290057040d2b9..2c571dccf6c461 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-predef", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "dependencies": [ diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index 025a06b879e358..b70eb0a1c3afbe 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.75.0 - SHA512 e76c3e6d810ca0c21d6f58ccf421cbba3078e3e300cb967b0e1b7ade1000d8c984fa1133d6e47b6b0d6c1a6507de4e5ef47934f0415c2acdc10442cf4bd052e5 + REF boost-1.76.0 + SHA512 f7849c57fe0985ba872e591133fed8adf24bfd337b04847d1a30c5978881a8cc2050ad43b4e9ce0bc32a593bd87c14e9f0433aeb7d0b61a9d05ec3bd9d53c7b7 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index a78c26e7547595..c92339abe02d29 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-preprocessor", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "dependencies": [ diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index f7bb992e6361a8..c59feceb935003 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.75.0 - SHA512 2cb372836c5341eef1399eed54a792a11a42e915837d12cb03049681160cc496e8e47cf9d8937caa860a50da52d1572c620cc082a9e2814277684ddd2bcacbe9 + REF boost-1.76.0 + SHA512 d704892dee6ca83b4234bea9b267dae7db8d78ee740b037e054ab15051de0e09ea9bb9707be545c3c6d423f4a58259300de563cee54c3c76f632f13ab6bdce21 HEAD_REF master ) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 61fac938120b4b..580cfbfa6d77d6 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-process", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "supports": "!emscripten", diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 4b1d8bd0749f23..77bc117b6653fc 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.75.0 - SHA512 62d0a56afc111783ba49928a6aeeee4d9ad1cba6b8e59933cb49b64594e5e845a17ba4627d45a392199e327e3c9d3694a4c5e4a5d8934f6c26e7a21d6859355b + REF boost-1.76.0 + SHA512 5cbd02923de60da9b8b4ac232daabc4b3ac8c07f46d8de1a69576c331d1f13951166d4c61649328c68405d7e4d2cb2bf5996521a53c211f5399bd67acb546bce HEAD_REF master ) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index ebad7f23e4e0d8..f4bab0e24d9a28 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-program-options", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "dependencies": [ @@ -11,7 +10,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index 453830eae71382..c3e8e212730b1c 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.75.0 - SHA512 f7af2810712609b6c7911a2a209e2affab70cadc443bced3b660bff4dc53b280e1c77b2e86d21410b8e9120b0cb18365d9c888183df4b911d34abb00009f2fc7 + REF boost-1.76.0 + SHA512 aa9778cc00a11af811a8163ab1530b92d23ded36b48b1fa3edfeef0926530c9318be93da0c3e5c13691a841c288d5189145d89d4f1d321884dc1f0a84fc2feba HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index 11640d4c326986..d9960f408719fe 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-map", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "dependencies": [ @@ -11,7 +11,6 @@ "boost-config", "boost-core", "boost-function", - "boost-integer", "boost-iterator", "boost-lexical-cast", "boost-math", diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index c255361f000bed..dd20b347b53560 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.75.0 - SHA512 387499ce979696e248a260471b8abdd6d41ea6e631ac30977dcb4c63c8f40b4c1f496b66aef28d5471fb82bb8e92e2a87b7369d0d547413d4affdc3b1bc094f5 + REF boost-1.76.0 + SHA512 bd138f9ead12144b2975cf961d9820d6df4729491c259123b15f49f85c54b0391093874a5f825fbc9fce6d67746cef0a0bde893b448d0e07489abec67aa1eee1 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index b519b086f647b5..c01c411e2b19a8 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-property-tree", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "dependencies": [ "boost-any", "boost-assert", "boost-bind", - "boost-compatibility", "boost-config", "boost-core", "boost-format", diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index 3621ef27af16b1..e643b8bb4a7347 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.75.0 - SHA512 cccd53370972656d13c27fcc7c8726fc4d940bb4767e45d0a427337980ed2f7c7b1902a49e58502975dc2741ea4ab5c4809df44282812da3174d1d7541897a29 + REF boost-1.76.0 + SHA512 0acca1fe1e0d41f919fd721a60dedcba9c88fc490a37012cdda617272caac036a2f1686bbf8cc380b3989cee4e3cfce9fed4ebe3242ef9b7394b944212ba545d HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 55fb7f458fe4bf..9adf4165390def 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-proto", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "dependencies": [ diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index 21f4855da3c42c..da341f87842a19 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.75.0 - SHA512 6c5a1739fa5cf15aa7732794cf030e30279f7d51dc8e4a978df512a8ce5dd2c2debccc6ec9076f6839f0147ff69c46ff05435b20ebc12f1a59e4ad6a1d0e9e1f + REF boost-1.76.0 + SHA512 11a08ff378e0e70f18a79ded47c339eee9e1bf4fb7bd7ea5283f9d7b888112904453d8e6e3970993706f3d90069bd765bf848ec9a8b8edb0595f5b40f19ce1d8 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 79440cbccbb048..1edc6dfe2fb379 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ptr-container", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "dependencies": [ diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 9293a86f8fc4a5..097f770f2073e4 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.75.0 - SHA512 aca87fde436e8dd98d64149c1ba85f2bef33a76fa9cfc650d23055aa3ce12e94ac39b72b0704e7fd6d0d4adc55c4ec93d841b37bac3297ceb04264ed9adfffab + REF boost-1.76.0 + SHA512 ab2d99f752dced241045c597408d3a76f78c800717752dc091510542a754fb86140359fdab81b57ff8405d05a1814083c3ddfa032b0d692cc40c3af4af496e91 HEAD_REF master ) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 8751ddd8e59e79..02c309ff467f1c 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-python", - "version-string": "1.75.0", - "port-version": 3, + "version": "1.76.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "supports": "!uwp & !(arm & windows) & !emscripten", @@ -11,7 +10,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-conversion", "boost-core", diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index 3cf0c2e6ea2e86..eaf65eb1f2f9dc 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.75.0 - SHA512 7bba9ea21bc86699a54d571c45bd994353ad3207ac7696a111c5e8f08e9de03b6344236b8ce11a19d10696a682fdbd8cc5c4bca84c2337f4f009b92c82e77c81 + REF boost-1.76.0 + SHA512 98fc06a38ca220e53383295b0dae966272871e2d99ef23e2fb14790722ce36d75de158ef6d34bc44e99ee8692e33cae69762d2f058e88059e625574012e336ce HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index eedba0c2cf9d03..9ead8ef80be78b 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,14 +1,9 @@ { "name": "boost-qvm", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "dependencies": [ - "boost-assert", - "boost-exception", - "boost-static-assert", - "boost-throw-exception", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index fe0763aa0aa6c7..1786248e6bdb6a 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.75.0 - SHA512 b18c8b6d1c0a3ae551e81a1b4d2c213910f748f236358b54eafc25342a6fba4cf7a4eafec2bf972446ee8aed5a937c5fea00a46b6c678604a42f5449319d7c73 + REF boost-1.76.0 + SHA512 d34405b2b5d9e4de201b07d97a2440dbc49f54eba6e1f13f37a50f453d2e09ca7e0a0c2559706eab7f57651219325d2606cd29e91bff0710af269976504abb73 HEAD_REF master ) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 5a67fca81801d3..4f40f9d6c1798c 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,28 +1,25 @@ { "name": "boost-random", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "dependencies": [ + "boost-array", "boost-assert", { "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", "boost-dynamic-bitset", "boost-integer", "boost-io", - "boost-math", { "name": "boost-modular-build-helper", "host": true }, - "boost-multiprecision", "boost-range", "boost-static-assert", "boost-system", diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index a4810e59c96658..aa78a1ae6c47b2 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.75.0 - SHA512 f722aadac7ad61bf7a773eb701c762b209e68c121948bb79bef5257539e1e7f62557430ef52f58e7758124f9e005426644a89702d40647f1b66be84fe4056e3c + REF boost-1.76.0 + SHA512 dc7801aad1bb271c28d9a0ec6e132b5b6992d4638b90c007e392148903acb27ef9bfe1273d00db181416e0325beb756eac26f458a360740889c521b8f5424fb4 HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index 4d65bf99863d31..b17779eed83b05 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-range", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "dependencies": [ @@ -12,7 +12,6 @@ "boost-conversion", "boost-core", "boost-detail", - "boost-integer", "boost-iterator", "boost-mpl", "boost-numeric-conversion", diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 09d44f9df64753..9c87047e74118c 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.75.0 - SHA512 f7e17ba770041af85a4a5c2dce36681de73bb5513b38d128c9d1d54a0a0b41ecd118f23beb2bebfb4bc67e0df37938249587ab10f0f31330564734542703e080 + REF boost-1.76.0 + SHA512 514fa35a91604ff823ee6c4736a5e5d6059ba445466884e2e58c38f6daba6e36c18f4071ca928bbc338036e67435d210d130822b122e029a3440c409507df201 HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index 75772ccc51b69b..e3f71c4a6a432f 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ratio", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "dependencies": [ diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 02726eb14e4e7e..61cf338a57ccc5 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.75.0 - SHA512 72b499b5abc825a2bcd06dd2c1047004d77271c9134bbb9c30860e87c347d366f0189849fd0159c886de86b1dce050ea6b96be497bf05d83bd21c47a7e07b5b8 + REF boost-1.76.0 + SHA512 399c1f49a73701f6db9304ac476f88af50470d96d400a68695ed3b3f8462622b4dde671053c6b3fcdd6474e5c2e7527946b79a5ea378af77337eee3b0ed16680 HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index fcd8367b8685bf..b3d2a6091ef377 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-rational", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "dependencies": [ diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index aa7afe23825215..e5c7381147b112 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.75.0 - SHA512 966cd68fc8190b92f0a23e7e1f08602b5ab50674c6fe4d93761de46f8758a6e1a2dfa7fef5e5f814f94a8acfca57e842b914f2f2013768e6a91e427fb2de4559 + REF boost-1.76.0 + SHA512 03af2b4ced7e09c3cf14fe9d7befed41e2be1f6e999445d2c376f0a6fcf82fa29ee39d6bdab976d76281a388466d39e71cb9ea069bc8df079137427d4576e264 HEAD_REF master ) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 0bbcb88c9f7bfa..96f3069106e911 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-regex", - "version-string": "1.75.0", - "port-version": 2, + "version": "1.76.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "dependencies": [ @@ -10,7 +9,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-concept-check", "boost-config", "boost-container-hash", diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index ab9552626aa763..0994a9ba594f8a 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/safe_numerics - REF boost-1.75.0 - SHA512 47b576b702c01eb32c6211e5b23ce4495504c37b6f65318f43af21898200681f3ebf08ca5b1b0c54e763ce863e2f427e7e51eab019c3f941a34ddd60b739df23 + REF boost-1.76.0 + SHA512 450b69bbd03713189d8ea0e309ffa3e397d832ef0422862b67a8bca9d4615698cc3380a19cdb7b97f53c32ceb7afd18f258f0be7552a5641bf83351ac41b3973 HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index 27ed80ed66a846..bbe3943bebc256 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-safe-numerics", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "dependencies": [ diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index 589e9e1c876237..cf95910f72e856 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.75.0 - SHA512 2b2887087a748374466fd518c9bfb092f3ff07d998cc8ff5e8230a1f1b8444b7b73d27fe7cbcd5fb2629dfc91035291776bdd514a5cbc5d85ebef22748ca09e5 + REF boost-1.76.0 + SHA512 addc6040749187ca5c6d22d9c33ef839422658f80588841b2c722c508049e04c6b41a228c739066438c9562ffc1c35cc2ec3f3e4ea5b2443fdef532e5708d08f HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index d9bf5bdbee3c3c..7f0b9400c711ad 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-scope-exit", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "dependencies": [ diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index 27609925f8579c..c0ffebaef8ed52 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.75.0 - SHA512 0398ff271722509719fcdf54ff752df386dcc5f94364e7d0e695e52db3daa1b0ca26db8c20279525d149d26d640ec2bf8e56121064ededf536bacb039f71a197 + REF boost-1.76.0 + SHA512 ac9a0453f6244518a250c3d51f341b001618f2032b723467ad7a93aaf77a66d970d22b4a06072e98d4fc30b1b850c3cb9a7c7e3b46d6e4ea1adb2d9b55ff4b68 HEAD_REF master ) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index ffaea91bbd0afe..172efc1629264e 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-serialization", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "dependencies": [ @@ -11,7 +10,6 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index ae3e6e1e48f370..f65973dd6784f3 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.75.0 - SHA512 6ccacd7bc2d210ea36913f5dc8af5264633b79e89a81f8cd75ddbf7e62257577359509dcf83561f2254dfc55298ff509bbf96f7d9511e338621130ac08163f3c + REF boost-1.76.0 + SHA512 d298a325c35dc0eda9614b6e8a4e84e7ef240e83e2b5938bc521ac99e5095c13b7a4e6a48b1b30bf1c038dd4c3e43d23dd85c14473da942cf65c5723fbb1c954 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index 48d8728a6c67cd..caebbac00cca80 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-signals2", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "dependencies": [ diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index fb57f61fde7741..83120dd9896b84 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.75.0 - SHA512 0c8e41eec34e81e12cb7accfe2fe76454e2121e30c9a719922a27e2c173d9eb0210af5bf090ee107b0f8946e33893ce6a36d8faea31b17a71262df45099ec699 + REF boost-1.76.0 + SHA512 e6ac81d1da13daf080d67f046fae19e98ef4f1eeb17b65743b8ff52e4a28b15152b6fdf083662f9a2555694a93064f78fd0ec432bfe09d617d13fa7422e7f28b HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index d199b31cf4666a..c50e9a2e6cb631 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-smart-ptr", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-integer", "boost-move", "boost-static-assert", "boost-throw-exception", diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 0f1516a8957dfe..08925d5f70eff5 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.75.0 - SHA512 e7b193f54de684e7f7dde9e1283cba1979b9f5337ea10a60c83d1aff3346c431d85674167a24cc11300b49005db6c4476650039a6f39a757bb46cbb8ceb82224 + REF boost-1.76.0 + SHA512 71fd8a9b5ccf29d5971bdb2b58288555a6a63c12b5463dcd0e11fc7132f0c620a77fde4492005204e8ef4a9084a9ecb29f6c9ad8e325227e491a99ba033f2080 HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index fd4b9c73644a1b..ec6278f4915b07 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,10 +1,10 @@ { "name": "boost-sort", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "dependencies": [ - "boost-integer", + "boost-config", "boost-range", "boost-static-assert", "boost-type-traits", diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 3ff4e47fb5cb27..829172d4836448 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.75.0 - SHA512 83d4cb3aad1e635e14640dace19d44db7886a0e25a30f9c5ff5384c5be8f6961231f947f4df0baf07f9bbda6893988ed9099700d596f99ff39ea22151e436912 + REF boost-1.76.0 + SHA512 0ef312d514fac39636c9f7f1aff1746592eaf69be820d488503a99ce28530e2c987f7102f7d2928f31a263de5e1053500a29ec512684fac3489d0bc48a44cfa2 HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index 382e0954f3d277..3ba81888f24125 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-spirit", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "dependencies": [ "boost-array", "boost-assert", - "boost-compatibility", "boost-config", "boost-core", "boost-detail", @@ -18,7 +17,6 @@ "boost-integer", "boost-io", "boost-iterator", - "boost-math", "boost-move", "boost-mpl", "boost-optional", diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index 11f5f706880c92..ccc0d595894e78 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.75.0 - SHA512 e5445ecbebf9a3099f95beaf7f9e77cec958f2f35c20261ec9d96d1f2100ec781fb7ed3553d189cab0a0568c6dff02bddeca1835795b1070ea1a080dd13db5e4 + REF boost-1.76.0 + SHA512 4a3ea0279fd41f19755ea6f90d7bb0b271d1e6c43c6e631acd17104a200bd425b9dd58a9cfcd7b1b1203e86c5a9216507d8e033f125bd582c5b68564a2a8200f HEAD_REF master ) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index 870b8dd7d4b1bb..ff1b17488b2c08 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-stacktrace", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "supports": "!uwp", diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index 9b80a27aa197d1..d1271b2dd5937c 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.75.0 - SHA512 7f7344f272c2172b5297ee2c83af44791843003da624ff24fc0b51c6adb5eec2ac55453e92e35a5174b019379e63a38eef9888710f51108bbb887f8f4ad63c81 + REF boost-1.76.0 + SHA512 3b9476d1b59ecaf867c19f106c4e6ff9e66c5b26f9793256a52b8dc47c26ca63dfd67dfef374b20596287764589d7b274bf88e079fc191ff186321946ae3050d HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index ef30a780315d61..b1a7d268751a57 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-statechart", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "dependencies": [ diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index 999f87e8673962..ab617b641acda2 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.75.0 - SHA512 dbb17a379e745a888c6ddafbec14565cadd2270356bff5787096d7dc00bc4804bdf17b424891edb3b2df8db4e2bb79ce08c57b59b76ba185fa4c83f37195c610 + REF boost-1.76.0 + SHA512 efd94b25d66f9841d41c8ad22e751e8489fc78de68172554ec2a82be61b7163c6b90fff56ab8dcf14da7b03770c6f2d14f317be5abbef796dc4d4366efd6498f HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index beb398fab484c8..6a27f491a5f0ed 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-assert", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "dependencies": [ diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 8468e38aabbf08..5b1936e93e8fae 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_string - REF boost-1.75.0 - SHA512 d3d0326250743783434c57d9c5c9f60c195978be862fa9bf377952385b06ce44f236f63c1423c5267b093ba28ac3aef74a4fd8e012bfb2f30620afc5e16cafbd + REF boost-1.76.0 + SHA512 cf7908b40eddc0ef478479834ce73f3352c8f29729a77698f9ebfa4fdf944b2aafce82410977764b5bedf4bfc92e000fc2c7c0df4cbdf487e0bb790cd5f35111 HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index 0406e828a05ec4..0137445f012e54 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-string", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "dependencies": [ diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 8ddeaa61ad531a..21d0f03fe9a70f 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stl_interfaces - REF boost-1.75.0 - SHA512 9cf6d2fb8d7bd0730a383068847d711ba3e5b5b979f72448a1606a50c26ceb903ccebbec5bbf57e35388c720b9030278a3f385b29c78d4548d9c1f61fdb5a585 + REF boost-1.76.0 + SHA512 6e260882bda4b57369fefbd4515273617b84708bd5b68f1e5ee77038b1a80e88efb43bddf1931ec6af346bfe25ae4afe7e282fb65712eb3959da88ff0d110ece HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 23ff866f3e163b..8939c1fa4d1001 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-stl-interfaces", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "dependencies": [ diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index e26a02be7c8af6..bfc5dee5af2e2f 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.75.0 - SHA512 8d079906e513605d9c372fc42dcc29e0e537ef690ecd2140040bd8c40619a218e61950d6a59074d11db910f6a68e8306633b5bc2b6190813fcd47c7aacbdb0ad + REF boost-1.76.0 + SHA512 7943bab559c0629fec008fca6e4377fb34ac45f809fd67250cda8a364f5a47149bbb3541d1e684a7f92903e7b3b90c1fb0f6902c7a827c1f69a3ab7b5da1facd HEAD_REF master ) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index f311f0c8b0fa8d..39ffb53b2f4394 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-system", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "dependencies": [ @@ -10,7 +9,6 @@ "host": true }, "boost-config", - "boost-integer", { "name": "boost-modular-build-helper", "host": true diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 858ec62b715f5f..0f98c557d09b6f 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.75.0 - SHA512 7ea116de82140b50113d7971e861d5ee7f2664c11ac79861f453066adf41d4581d3aadb7c484045050f88e7aca3b4d90a078f916dbb6c7f40a1ff9bf6a7c1d47 + REF boost-1.76.0 + SHA512 87b4e949adefd840ca1ac61ad97b5798508742ef10ca12d05be0181150b5cd23fa25e473ff5cb077a55afb04d61846b96f7dae298c2dbb2deb71589e6dbcc968 HEAD_REF master ) diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 6ae0847b08c374..6b2c8edffbab63 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-test", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "supports": "!uwp", @@ -13,13 +12,11 @@ "name": "boost-build", "host": true }, - "boost-compatibility", "boost-config", "boost-core", "boost-detail", "boost-exception", "boost-function", - "boost-integer", "boost-io", "boost-iterator", { diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index f16abdf672a6ed..564a247abe7b02 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.75.0 - SHA512 b5fb6aed2ff3dd59f8b91c3e2758e27264f2bbb40636371f6b0aa130a6dad8b4dba93eeaa37ec960d56ea30fa28f9559a98349c9b7e40d08f6b7273a1aa49246 + REF boost-1.76.0 + SHA512 ed833316025be8a52ccfb620b874f9b9956c778e453de01a657745563184efc123f461dd54dc048946df3319c1b512810a9ce1fb8940fd75771a171c95349e28 HEAD_REF master ) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index be64e494b7a555..9e76367b9f2c2d 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-thread", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "dependencies": [ @@ -23,7 +22,6 @@ "boost-detail", "boost-exception", "boost-function", - "boost-integer", "boost-intrusive", "boost-io", "boost-lexical-cast", diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index 79e121bdd7aec2..592e1402a47276 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.75.0 - SHA512 b4bd96f9ef37f1345db8eb26715b1da43a9f7ea2b7eaf4618be2caf3e7e4e6904fa5a32e2b62fd032dd6ebb99d0bbd7e37efbd94edb31aeb3d49c68065f3be28 + REF boost-1.76.0 + SHA512 875d7332eb2d80ff30a3bf51817d20260cae9fc598c3e51b0e1e1fe3627f86003a36da6a3a4fe957b943bb8afe33ba1fdb4931d067024a01cd3e6a34c13aa86f HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index b32ea2c12b7609..8718629dd0eaf3 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-throw-exception", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "dependencies": [ diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index 0cc16578d30bd5..fcca8cb5b98ec0 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.75.0 - SHA512 718b469ed561ea8897bee96c12aa90a2840ba9c4772e963ab35d53d0d161ad39e630ef954b393155f834309607d1cd4f7b63b537e4465b8e50ad303438e3ba30 + REF boost-1.76.0 + SHA512 c61fa1957a193600091959b49f5d84137ce8823fbe53bb3761bd40c9c0bd7d3660b7e449c0a903cdd6249e21d84ee19d86e26449aabe0df8404e400af946aa87 HEAD_REF master ) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index 82da293c24dd22..aceb8db8758337 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-timer", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "dependencies": [ @@ -10,10 +9,8 @@ "host": true }, "boost-chrono", - "boost-compatibility", "boost-config", "boost-core", - "boost-integer", "boost-io", { "name": "boost-modular-build-helper", diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index e655ef33352c0e..9d00409818a91a 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.75.0 - SHA512 12b86b1295d1080192f3537a1a984c234a2351e7021829dea8af635680ed8007485bba1843452b1d7706dcf9fd2754967cd8db784b06ad9c9d626e8ae87f6f67 + REF boost-1.76.0 + SHA512 287916582c98aaf8c6549899f9258b1428a0c20942677cfe10b9285487918ac10a17cb7896eaceb800ed645587dcdbab5a58d3e7c18bb13eec230d00056fc453 HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index 3b52cc9a142e73..f679818ddd174f 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tokenizer", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "dependencies": [ diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index 6fee186c3060f6..b61649bc632085 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.75.0 - SHA512 9cb18d992e5f149f9b35b3e97ea63b41752ed03cba8c23b68dfd5b9d55538a55d1aa13abe1d16a6bfd596a144c85947ad0609a64715dbc72a6cede7f3961be71 + REF boost-1.76.0 + SHA512 7ccc41099e3b800fab74d90ed47943e3358f4c0dd88c1fe901d9f81f601794e78a6d0df9c7ab04dd59261870820371d89a8d5bb5c4983143b48bd9d5a22394a2 HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index aebf9f124ea167..d64351cea337bf 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tti", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "dependencies": [ diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 36e605055921f7..5f731c81a0d0e1 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.75.0 - SHA512 6ccc5e0e1c115f2c2840a2780e4639b184665f9993d1e21b8524b7ca775fecb38a554c53bc01eeec8a2643e45172540f176dddc8af684a5dbd14b98c6ded8b6b + REF boost-1.76.0 + SHA512 22c40d1c9f63cd22d0b632d81b15b30767273be019afe4ae8030cd9ac740e84f50e2db202b62448e9aa44bad2d8f0a3102e54cf1648b414ab7e30814c9da6219 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 832c954651227a..3ec8a549cb5f1a 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tuple", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "dependencies": [ diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index 339449d5f09fc6..b7afec0973ed29 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.75.0 - SHA512 b25841b9ce94a5567c05fa465b0539bead832d8cc12beb66ee0739a8717641d422f7b894b06d8465cf1d1cf18ef914bf8f27a4a38da22b72d1b639eb2aa9c584 + REF boost-1.76.0 + SHA512 8f304de312dfb59d3d02d90f1806908bf91a74459c6ad156902bbc7d72ad326e98e07c43f6cef76b6b82ba37d3f074584722e04212100272cdea613e4c47104e HEAD_REF master ) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 1ea175c18969be..867e95e8879b2a 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-type-erasure", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "dependencies": [ diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index bb59d8395be5cc..64942aefe29881 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.75.0 - SHA512 f76b38f82ea2ba8508715122c6b899034a57e206ac01a4560220df03c185885a6b50f56559f070ae873addccd8b05df2dc1f35dffeee36e8384e8de2f6f5e220 + REF boost-1.76.0 + SHA512 8103eea4f14f15046761adc0b438a182adb1cfc245f02dc8211b9a7985d67c859f88fae2de2d7aef8f2bd969dcaccc28515e1339c0207551fa44e43ff4d8fbbf HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index 7f9a1931ec019d..ecc5bdaf5b9fe7 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-index", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "dependencies": [ @@ -8,7 +8,6 @@ "boost-container-hash", "boost-core", "boost-preprocessor", - "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", "boost-type-traits", diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index a7dc81bec82e20..10bf763268d956 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.75.0 - SHA512 bf6dd23c9c2194a6507a0e513b1622e6444ce57d2da42079bea6acbe72d5ce5a510b5c223a0031cba7cd00b77bc51ebbd483296a9f598c80b82d1b8a658e94aa + REF boost-1.76.0 + SHA512 3dcaedf9dbb95c6b96ce5d836ad85c1a5cdf766a3421b3235dfa4a0e4db94d0322d714e03d53961a7a0cbe597bf0c7c8689c61a23274b2c9c70f90780b349659 HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 8033416b8399c2..93322f28eb885e 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-traits", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "dependencies": [ diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index 5140a906a45250..d162575d4bc275 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.75.0 - SHA512 d0b2bf6c129054471c945b76d871e3e7281f115e8373d7a7d659a80e05fac50f64a3f2b0958c40d5570cc5815516d99327a4cb155b33fcde2b08d754a617c2cf + REF boost-1.76.0 + SHA512 3126a39a1e37cfe20d98f46ddecf88d8d6ed6f996a08087d47771d6eab8229b08ebc9e949e92363f109936de9ea9df1004f6df6d433f9b4957f8f7812d845da3 HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index f69177c5a7d86b..489c94e4ec3bca 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-typeof", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "dependencies": [ diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index d322ded2a2c771..0e856f5d0fdabf 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.75.0 - SHA512 a6c20d97c92c7d2706aeeec71a2bf6672099ba17eb90e3bae9f0a01417b0e68fc2886d1867914aba2c975fcacbd243c5bcefdebdc4eb1b4947571a93c91881a5 + REF boost-1.76.0 + SHA512 b685374b8871f0f2edb8b1d2431ca448a28285e8d267123ee2cc9abe39e97775eacb47fc7f098547da7e3537ded1a3ba2b9ae73a7774302bf7cbe50d558431dd HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 9c63a113170c00..1b0d943b44b5ed 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ublas", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "dependencies": [ diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index bcfdcdf88897c2..7ac447db4467a8 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.75.0 - SHA512 6003fc27913be7f3d31e98fbb2493a487e0d1bf9ff93da318761dcefb93c19ab1754c9d6ad74a332ac0959fe827dba2771ac7b72170160d734ad89ca4252d152 + REF boost-1.76.0 + SHA512 84eff531365db19254d52ef0cdc31631a6806b766a8d2be6f01aaf0b468b367c8cd9f4979d2c28434c19c6377f8be5a42851f0e90bb876501738b1da9245ebb4 HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 15b5d9eabb03cc..7b5b94d2561cc3 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-units", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "dependencies": [ diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index d8d3e8d647faf8..4e443ec3261fd2 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.75.0 - SHA512 57dc180b31e2132ef260971fddfbb51792660bbde24f7146825ddf66b0bc80725e089b756f7187d4367ca86a988e042880fffb8e19522438a927feec45705cab + REF boost-1.76.0 + SHA512 77047942a8561c84a196606fc4d6964687f52c7da52b419e69cc0f73a8751ba937393ff25e2a7d3fa9f0487df1c78f34cd633c9440a1b2c47da53cfe66d5b526 HEAD_REF master ) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 4b65536cac373c..8675aff1b4e2af 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-unordered", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-container", "boost-container-hash", diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index cb854087df2ca6..6ae1500d91546a 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.75.0 - SHA512 43c02e8e1ca9e81e6de660c677ea6af6a84a82de0be06a24db1277bb38150b15da0c5466adc7b8f1c527718ebcbd51945671b8362c790322ae9468e4381b1752 + REF boost-1.76.0 + SHA512 48beacbe0853d4d8cd7c5099639c0e52595640ee31827a039f1b06bf6f13b108a86bb6bafe1eb2eee03ec2a2d4e9fa65d8ee87cb45522eaa89f6b6672024468a HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index 1370bd4ac1f92c..66b6454166ed4b 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-utility", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "dependencies": [ @@ -8,7 +8,6 @@ "boost-container-hash", "boost-core", "boost-detail", - "boost-integer", "boost-io", "boost-preprocessor", "boost-throw-exception", diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index a7a38462db1de4..bfe621ed0469fc 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.75.0 - SHA512 f1df5e8a2a4e2bb5c9a4c6ee9876e55d060e75cfeb893163302bafb32048da43b3960fbae82f7da17c60005c236c6535fc802b49f2448a87464bea26debd4856 + REF boost-1.76.0 + SHA512 9d0a4ee60cc941e8458a0796955860a2e760eff30bff0faa665a9e9dac78631af0f06a6b6d8146b73059d968f9cbc2065b341943bbaa6606bd6d02f4db9bfcb9 HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index 71664c694eaadf..f703a3a6e6e7ba 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,16 +1,14 @@ { "name": "boost-uuid", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-container-hash", "boost-conversion", "boost-core", - "boost-integer", "boost-io", "boost-move", "boost-numeric-conversion", diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index 1bcac29c625c3c..e7768285453def 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.75.0 - SHA512 094bd5f932f621e265afcc6aad08c159ac83a061bb63c370480e2d243d41395378e565e7d2ff5c852cbd0fdaabec294373dadaab01fdc114a347555e1073696d + REF boost-1.76.0 + SHA512 d4c5afd1bda28021b4c1eaa0a98db16320144aec2595cf52564486da3c33d89b7a486ec35389af228169a37b928956b6e6405fe86c3dfb3f949cf3e26f372779 HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index b22a988c91b1ff..0d3547aab4cb7b 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-variant", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "dependencies": [ diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 809170e6d228fe..5519083b326905 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.75.0 - SHA512 f1aee0b7729935f0ea41aaffeeea81c9eb3870dc3f4719be6f28a007ff5a83b49ca0abce55118d3a165bb477a87a11895ed346d357a2b4b8aba57a0da8067880 + REF boost-1.76.0 + SHA512 5888d24d5ccfeea6d1e774f4388e9820a7fbc1e9899d8cee35942777df5120c959ea2cb16668ed7d5d7105f3fc42e4dbe5175ae98037a9ef80ac8f003742e50e HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index 4c9b060f691fd8..e4a06c5a0f7573 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-variant2", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "dependencies": [ "boost-config", "boost-detail", - "boost-integer", "boost-mp11", "boost-vcpkg-helpers" ] diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index eb7f809b691f59..1754882e45e58c 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.75.0 - SHA512 863365347baa8980e5aa9aaa2b13293167af6479eb93c0d6860634468578499662bc0cec7dbc7abc9f3f07df82341e18ab20e0de0d88c34a08adf6f949aef6a9 + REF boost-1.76.0 + SHA512 a5abe1352bce1a8358230df914ad19acc99ecb6a077248274bf2aca956a0bd0f7b9490f38891c51e3ee3323b37878c4098e39b61ea86e63f0f915a81f8553283 HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index 126c0a6acad1dc..125cc7fc56e08c 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-vmd", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "dependencies": [ diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index 1f6f1765a0df23..db17a26737eccb 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.75.0 - SHA512 16d26051a92b6902e9729473802027ff6f9f301593fff7ab72c1d6ad09325e876d2acaef766bfc82befbe7e720f8d5b3036c6254a3d63181dca1625fdbfb4b2f + REF boost-1.76.0 + SHA512 eb44ee15a836d926fa24585389a7e3eb355141846401e9e9b3a69754235d8a99fa3a01107462b8e4081dff072be47222b7e52c510b2ca884dfdb65dfaff2fe1e HEAD_REF master ) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index 8be600478f56c4..2d07b287d25c8b 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-wave", - "version-string": "1.75.0", - "port-version": 1, + "version": "1.76.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "supports": "!uwp", @@ -19,7 +18,6 @@ "name": "boost-filesystem", "platform": "!uwp" }, - "boost-integer", "boost-iterator", "boost-lexical-cast", "boost-math", diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index 64104479ce14ff..c95542ab5e58c7 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.75.0 - SHA512 ae1cc764c2190e42f5b409fda214e6653a0b46cdb6ee4272406f6e416bf0ee8f497d4edfab45ccb52412ef1645a0a30c418e6b72e7004b3ea5421fc09bce06ce + REF boost-1.76.0 + SHA512 f16965928f0781123a17d13b0f73b1af33d22baa412f87acf4355c6f110318f424b535a559d366d61b111ed1f9eda9140e7cc357f50936e0f8049e1fd44bbe47 HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index baf2b9c0d22cee..804e1be14e4933 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-winapi", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "dependencies": [ diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 043f7b9ae8440a..302004ee91da9d 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.75.0 - SHA512 09b06dc00fc7a7d0ec30454195a6ba437c45b9b3deb770b80735e726fbf808d24035fc65b6ac924043c7ba62423590ec06f54db54daa913c5127713593d7c326 + REF boost-1.76.0 + SHA512 ce0ecfde6f1bbd0dcb0765a8a4648a6978e090f5563c7828e0bd95ea35e91788d1871965c3cec4f2a6d366cd9d2ef29f75b47474a8bfeb684873d074c002e1f1 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index 8a27ba751d6767..99c4899e2017e0 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-xpressive", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "dependencies": [ "boost-assert", - "boost-compatibility", "boost-config", "boost-conversion", "boost-core", diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index 54cb5d7c239b8e..d2a6e23f92d55a 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.75.0 - SHA512 3680933d091a4b89094be7d123d5813d5f7e882e4fa4d2e233623a950a0d37ec750f3697e50e9f49bfe66191ca032ab412ce40c2f25d5870f52338d7a35cafbf + REF boost-1.76.0 + SHA512 88c97e7b36748f925b2566c6308729b74419c118095de17011900497017bd3a0a445a0c29a0912da8852284b6fdf5d0e34bb63e7aa6790a9213b460ad57d1983 HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index 58d2c84dfac9b0..58313ddbf6a03d 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-yap", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "dependencies": [ diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index 0283a20857db3e..df3ab59c3ba7c0 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -1,2 +1,2 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - + diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index eecff5fbcf1ec8..2ea1d4d3b8f83d 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost", - "version-string": "1.75.0", + "version": "1.76.0", "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "dependencies": [ diff --git a/ports/fbthrift/CONTROL b/ports/fbthrift/CONTROL deleted file mode 100644 index d650963821926e..00000000000000 --- a/ports/fbthrift/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: fbthrift -Version: 2020.10.19.00 -Homepage: https://github.com/facebook/fbthrift -Description: Facebook's branch of Apache Thrift, including a new C++ server. -Build-Depends: openssl, zlib, fmt, gflags, glog, rsocket, fizz, folly, wangle, zstd, boost-context, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread -Supports: x64 diff --git a/ports/fbthrift/fix-sodium-target.patch b/ports/fbthrift/fix-sodium-target.patch new file mode 100644 index 00000000000000..89d32e53db647d --- /dev/null +++ b/ports/fbthrift/fix-sodium-target.patch @@ -0,0 +1,16 @@ +diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake +index c664ccbe3..3c3f1245c 100644 +--- a/build/fbcode_builder/CMake/FindSodium.cmake ++++ b/build/fbcode_builder/CMake/FindSodium.cmake +@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) + else() + set(_LIB_TYPE SHARED) + endif() +-add_library(sodium ${_LIB_TYPE} IMPORTED) ++ ++if(NOT TARGET sodium) ++ add_library(sodium ${_LIB_TYPE} IMPORTED) ++endif() + + set_target_properties(sodium PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/ports/fbthrift/fix-zlib.patch b/ports/fbthrift/fix-zlib.patch new file mode 100644 index 00000000000000..d9a185ad1ffeaa --- /dev/null +++ b/ports/fbthrift/fix-zlib.patch @@ -0,0 +1,100 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 150671504a9..7b248a0105e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,7 +106,7 @@ if(lib_only OR build_all) + find_package(fizz CONFIG REQUIRED) + find_package(fmt CONFIG REQUIRED) + find_package(wangle CONFIG REQUIRED) +- find_package(Zlib REQUIRED) ++ find_package(ZLIB REQUIRED) + find_package(Zstd REQUIRED) + # https://cmake.org/cmake/help/v3.9/module/FindThreads.html + set(THREADS_PREFER_PTHREAD_FLAG ON) +@@ -115,7 +115,6 @@ if(lib_only OR build_all) + ${LIBGFLAGS_INCLUDE_DIR} + ${GLOG_INCLUDE_DIRS} + ${OPENSSL_INCLUDE_DIR} +- ${ZLIB_INCLUDE_DIRS} + ${ZSTD_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ) +diff --git a/thrift/cmake/FBThriftConfig.cmake.in b/thrift/cmake/FBThriftConfig.cmake.in +index 69b29b948c5..e1297ed18c3 100644 +--- a/thrift/cmake/FBThriftConfig.cmake.in ++++ b/thrift/cmake/FBThriftConfig.cmake.in +@@ -28,6 +28,8 @@ else() + set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1") + endif() + ++find_dependency(ZLIB REQUIRED) ++ + if (NOT TARGET FBThrift::thriftcpp2) + include("${FBTHRIFT_CMAKE_DIR}/FBThriftTargets.cmake") + endif() +diff --git a/thrift/cmake/FindZlib.cmake b/thrift/cmake/FindZlib.cmake +deleted file mode 100644 +index c15525b411f..00000000000 +--- a/thrift/cmake/FindZlib.cmake ++++ /dev/null +@@ -1,46 +0,0 @@ +-# Copyright (c) Facebook, Inc. and its affiliates. +-# +-# Licensed under the Apache License, Version 2.0 (the "License"); +-# you may not use this file except in compliance with the License. +-# You may obtain a copy of the License at +-# +-# http://www.apache.org/licenses/LICENSE-2.0 +-# +-# Unless required by applicable law or agreed to in writing, software +-# distributed under the License is distributed on an "AS IS" BASIS, +-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-# See the License for the specific language governing permissions and +-# limitations under the License. +- +-# +-# - Try to find Facebook zstd library +-# This will define +-# ZLIB_FOUND +-# ZLIB_INCLUDE_DIR +-# ZLIB_LIBRARIES +-# +- +-find_path( +- ZLIB_INCLUDE_DIRS zlib.h +- HINTS +- $ENV{ZLIB_ROOT}/include +- ${ZLIB_ROOT}/include +-) +- +-find_library( +- ZLIB_LIBRARIES z zlib +- HINTS +- $ENV{ZLIB_ROOT}/lib +- ${ZLIB_ROOT}/lib +-) +- +-# For some reason ZLIB_FOUND is never marked as TRUE +-set(ZLIB_FOUND TRUE) +-mark_as_advanced(ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) +- +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Zstd ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES) +- +-if(ZLIB_FOUND AND NOT ZLIB_FIND_QUIETLY) +- message(STATUS "ZLIB: ${ZLIB_INCLUDE_DIRS}") +-endif() +diff --git a/thrift/lib/cpp/CMakeLists.txt b/thrift/lib/cpp/CMakeLists.txt +index 681622594c9..3df0b5717db 100644 +--- a/thrift/lib/cpp/CMakeLists.txt ++++ b/thrift/lib/cpp/CMakeLists.txt +@@ -77,8 +77,8 @@ target_link_libraries( + thrift-core + rpcmetadata + Folly::folly ++ ZLIB::ZLIB + ${OPENSSL_LIBRARIES} +- ${ZLIB_LIBRARIES} + ${ZSTD_LIBRARIES} + ) + diff --git a/ports/fbthrift/portfile.cmake b/ports/fbthrift/portfile.cmake index 62c1a7a2e2e8f0..016fac181af6a6 100644 --- a/ports/fbthrift/portfile.cmake +++ b/ports/fbthrift/portfile.cmake @@ -6,9 +6,12 @@ vcpkg_find_acquire_program(BISON) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/fbthrift - REF e184b41448dab2f462094fa005ed05269cfba3e3 # v2020.10.19.00 - SHA512 df03e1779fd3f1868ed7be21292bcd91ae65bcca591b0265a40391dde7e3b3b81d83fe7eb4ec8dd5c440be471375b8e2c8c24befefaca3ae0cab9ce10bfd362c + REF v2021.06.14.00 + SHA512 e59465adcd57722626e5a4407529b164472cde3942bd100b3d6e92c5057f88f1a8544b7181a01e05ed3077ffd2b3811b687aa6741d08aedef6b79aea02305798 HEAD_REF master + PATCHES + fix-sodium-target.patch # fixed in master + fix-zlib.patch # fixed in master ) vcpkg_configure_cmake( @@ -16,6 +19,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBISON_EXECUTABLE=${BISON} + -DFLEX_EXECUTABLE=${FLEX} ) vcpkg_install_cmake() @@ -41,7 +45,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/reflection/docs ${CURRENT_PACKAGES_DIR}/include/thrift/lib/cpp2/util/test ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test - ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/test + ${CURRENT_PACKAGES_DIR}/include/thrift/lib/py3/benchmark + ${CURRENT_PACKAGES_DIR}/include/thrift/lib/thrift/annotation ) vcpkg_copy_tools(TOOL_NAMES thrift1 AUTO_CLEAN) diff --git a/ports/fbthrift/vcpkg.json b/ports/fbthrift/vcpkg.json new file mode 100644 index 00000000000000..4e9237e2c5f6ed --- /dev/null +++ b/ports/fbthrift/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "fbthrift", + "version-string": "2021.06.14.00", + "description": "Facebook's branch of Apache Thrift, including a new C++ server.", + "homepage": "https://github.com/facebook/fbthrift", + "supports": "x64", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "fizz", + "fmt", + "folly", + "gflags", + "glog", + "openssl", + "wangle", + "zlib", + "zstd" + ] +} diff --git a/ports/fizz/CONTROL b/ports/fizz/CONTROL deleted file mode 100644 index 19b03e429fffa2..00000000000000 --- a/ports/fizz/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fizz -Version: 2020.10.19.00 -Homepage: https://github.com/facebookincubator/fizz -Build-Depends: folly, openssl, libsodium, zlib, fmt -Description: a TLS 1.3 implementation by Facebook \ No newline at end of file diff --git a/ports/fizz/find-zlib.patch b/ports/fizz/find-zlib.patch deleted file mode 100644 index 7222db04e5003d..00000000000000 --- a/ports/fizz/find-zlib.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt -index 7e3347b..76ee974 100644 ---- a/fizz/CMakeLists.txt -+++ b/fizz/CMakeLists.txt -@@ -89,6 +89,9 @@ else() - list(APPEND FIZZ_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR}) - endif() - -+find_package(ZLIB REQUIRED) -+list(APPEND FIZZ_SHINY_DEPENDENCIES ZLIB::ZLIB) -+ - set(FIZZ_HEADER_DIRS - client - crypto diff --git a/ports/fizz/fix-zlib.patch b/ports/fizz/fix-zlib.patch new file mode 100644 index 00000000000000..88b6fabe9d727d --- /dev/null +++ b/ports/fizz/fix-zlib.patch @@ -0,0 +1,36 @@ +diff --git a/fizz/CMakeLists.txt b/fizz/CMakeLists.txt +index 485e38fc..471d61a5 100644 +--- a/fizz/CMakeLists.txt ++++ b/fizz/CMakeLists.txt +@@ -87,6 +87,8 @@ else() + list(APPEND CMAKE_REQUIRED_INCLUDES ${LIBGFLAGS_INCLUDE_DIR}) + endif() + ++find_package(ZLIB REQUIRED) ++ + find_package(Libevent CONFIG QUIET) + if(TARGET event) + message(STATUS "Found libevent from package config") +@@ -246,6 +248,7 @@ target_link_libraries(fizz + ${OPENSSL_LIBRARIES} + sodium + Threads::Threads ++ ZLIB::ZLIB + PRIVATE + ${GLOG_LIBRARIES} + ${GFLAGS_LIBRARIES} +diff --git a/fizz/cmake/fizz-config.cmake.in b/fizz/cmake/fizz-config.cmake.in +index d9918469..679b0e61 100644 +--- a/fizz/cmake/fizz-config.cmake.in ++++ b/fizz/cmake/fizz-config.cmake.in +@@ -25,7 +25,10 @@ endif() + + set(FIZZ_LIBRARIES fizz::fizz) + ++include(CMakeFindDependencyMacro) + find_dependency(Sodium) ++find_dependency(folly CONFIG) ++find_dependency(ZLIB) + + if (NOT fizz_FIND_QUIETLY) + message(STATUS "Found fizz: ${PACKAGE_PREFIX_DIR}") diff --git a/ports/fizz/portfile.cmake b/ports/fizz/portfile.cmake index 459c6a8079c170..8af6d336fdc7d8 100644 --- a/ports/fizz/portfile.cmake +++ b/ports/fizz/portfile.cmake @@ -3,11 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookincubator/fizz - REF 1c40fde31b5eff8a05f928497429bffe7425b4fd # v2020.10.19.00 - SHA512 9e0de756855941c377f2a52d9b751e6ae066c8d8ae4e7a06211b2537a039e533cbc782cbce947cb703d7bd4c5cb5fb4420e71eeafdcb5f1264d788ca3eb0b76d + REF v2021.06.14.00 + SHA512 ff55f933d55031128b5355707fd025649ad90d261d91ec5f9d793433a77e63d3c2527a7f0111d6a3151667ab29f4117f96a505bcb80c1a4a99bd60346f05f4de HEAD_REF master PATCHES - find-zlib.patch + fix-zlib.patch ) # Prefer installed config files @@ -29,13 +29,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fizz) vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake _contents) -string(REPLACE "lib/cmake/fizz" "share/fizz" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake -"include(CMakeFindDependencyMacro) -find_dependency(folly CONFIG) -find_dependency(ZLIB) -${_contents}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fizz/fizz-config.cmake" "lib/cmake/fizz" "share/fizz") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include diff --git a/ports/fizz/vcpkg.json b/ports/fizz/vcpkg.json new file mode 100644 index 00000000000000..efc70e89783540 --- /dev/null +++ b/ports/fizz/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "fizz", + "version-string": "2021.06.14.00", + "description": "a TLS 1.3 implementation by Facebook", + "homepage": "https://github.com/facebookincubator/fizz", + "dependencies": [ + "fmt", + "folly", + "libsodium", + "openssl", + "zstd" + ] +} diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL deleted file mode 100644 index 8b31a73b67f2ba..00000000000000 --- a/ports/folly/CONTROL +++ /dev/null @@ -1,31 +0,0 @@ -Source: folly -Version: 2020.10.19.00 -Homepage: https://github.com/facebook/folly -Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows -Build-Depends: openssl, libevent, double-conversion, glog, gflags, boost-chrono, boost-context, boost-conversion, boost-crc, boost-date-time, boost-filesystem, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-thread, boost-smart-ptr, fmt -Default-Features: zlib -Supports: x64 - -Feature: zlib -Build-Depends: zlib -Description: Support zlib for compression - -Feature: bzip2 -Build-Depends: bzip2 -Description: Support bzip2 for compression - -Feature: lzma -Build-Depends: liblzma -Description: Support LZMA for compression - -Feature: zstd -Build-Depends: zstd -Description: Support zstd for compression - -Feature: snappy -Build-Depends: snappy -Description: Support Snappy for compression - -Feature: lz4 -Build-Depends: lz4 -Description: Support lz4 for compression diff --git a/ports/folly/fix-windows-minmax.patch b/ports/folly/fix-windows-minmax.patch new file mode 100644 index 00000000000000..1fc69a43a83e5b --- /dev/null +++ b/ports/folly/fix-windows-minmax.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake +index ec2ce1a1d..16deda71c 100644 +--- a/CMake/FollyCompilerMSVC.cmake ++++ b/CMake/FollyCompilerMSVC.cmake +@@ -289,6 +289,7 @@ function(apply_folly_compile_options_to_target THETARGET) + # And the extra defines: + target_compile_definitions(${THETARGET} + PUBLIC ++ NOMINMAX + _CRT_NONSTDC_NO_WARNINGS # Don't deprecate posix names of functions. + _CRT_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps. + _SCL_SECURE_NO_WARNINGS # Don't deprecate the non _s versions of various standard library functions, because safety is for chumps. diff --git a/ports/folly/missing-include-atomic.patch b/ports/folly/missing-include-atomic.patch deleted file mode 100644 index 54c1a48170509e..00000000000000 --- a/ports/folly/missing-include-atomic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/folly/portability/PThread.cpp b/folly/portability/PThread.cpp -index 2891c4c..7c98975 100644 ---- a/folly/portability/PThread.cpp -+++ b/folly/portability/PThread.cpp -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 3016caec974385..a2e8a436e88ac7 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -12,14 +12,14 @@ vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/folly - REF 430aa0d8db79989dd56f8a0361fcb1c305618e41 # v2020.10.19.00 - SHA512 d9f6aa0f7a8aee044c01af289d71e4c80d63e40ff128ac840663e3103d19cdd0da161a0b0d106493d950b9ac9a905c5e2abf8c1970c2f16b94dd95c0d1b1943e + REF v2021.06.14.00 + SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c HEAD_REF master PATCHES - missing-include-atomic.patch reorder-glog-gflags.patch disable-non-underscore-posix-names.patch boost-1.70.patch + fix-windows-minmax.patch ) file(COPY diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json new file mode 100644 index 00000000000000..e7762e6cf923e2 --- /dev/null +++ b/ports/folly/vcpkg.json @@ -0,0 +1,68 @@ +{ + "name": "folly", + "version-string": "2021.06.14.00", + "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", + "homepage": "https://github.com/facebook/folly", + "supports": "x64", + "dependencies": [ + "boost-chrono", + "boost-context", + "boost-conversion", + "boost-crc", + "boost-date-time", + "boost-filesystem", + "boost-multi-index", + "boost-program-options", + "boost-regex", + "boost-smart-ptr", + "boost-system", + "boost-thread", + "double-conversion", + "fmt", + "gflags", + "glog", + "libevent", + "openssl" + ], + "default-features": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "Support bzip2 for compression", + "dependencies": [ + "bzip2" + ] + }, + "lz4": { + "description": "Support lz4 for compression", + "dependencies": [ + "lz4" + ] + }, + "lzma": { + "description": "Support LZMA for compression", + "dependencies": [ + "liblzma" + ] + }, + "snappy": { + "description": "Support Snappy for compression", + "dependencies": [ + "snappy" + ] + }, + "zlib": { + "description": "Support zlib for compression", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Support zstd for compression", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/ports/proxygen/CONTROL b/ports/proxygen/CONTROL deleted file mode 100644 index 5b660c3df5f072..00000000000000 --- a/ports/proxygen/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: proxygen -Version: 2020.10.19.00 -Homepage: https://github.com/facebook/proxygen -Description: It comprises the core C++ HTTP abstractions used at Facebook. -Build-Depends: folly, fizz, wangle, zstd, zlib, openssl, boost-iostreams, boost-context, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread -Supports: !windows&!osx diff --git a/ports/proxygen/fix-duplicated-target.patch b/ports/proxygen/fix-duplicated-target.patch new file mode 100644 index 00000000000000..89d32e53db647d --- /dev/null +++ b/ports/proxygen/fix-duplicated-target.patch @@ -0,0 +1,16 @@ +diff --git a/build/fbcode_builder/CMake/FindSodium.cmake b/build/fbcode_builder/CMake/FindSodium.cmake +index c664ccbe3..3c3f1245c 100644 +--- a/build/fbcode_builder/CMake/FindSodium.cmake ++++ b/build/fbcode_builder/CMake/FindSodium.cmake +@@ -254,7 +254,10 @@ if(sodium_USE_STATIC_LIBS) + else() + set(_LIB_TYPE SHARED) + endif() +-add_library(sodium ${_LIB_TYPE} IMPORTED) ++ ++if(NOT TARGET sodium) ++ add_library(sodium ${_LIB_TYPE} IMPORTED) ++endif() + + set_target_properties(sodium PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${sodium_INCLUDE_DIR}" diff --git a/ports/proxygen/portfile.cmake b/ports/proxygen/portfile.cmake index abe5633e20aac9..d2789572d9d96d 100644 --- a/ports/proxygen/portfile.cmake +++ b/ports/proxygen/portfile.cmake @@ -3,9 +3,12 @@ vcpkg_fail_port_install(ON_TARGET "Windows") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/proxygen - REF bb2b1f2b3660fa1f15bbdff14ddba2a4ff5c43fa #v2020.10.19.00 - SHA512 8547a8c329764f8448a9f294811ef1dfcfcfa77a15fa2fdd9ab25a5f7ab8d40c9932348d3a1b16b87ba56844c13ebf918e7080f247ff7fadad7363a70e2d0fe2 + REF v2021.06.14.00 + SHA512 f5ab54514575f86897438f40a481796c34031101775b61a01581338c91686159995e4f822909e42eed4c006b2c6a6351887d469cc9df1df80711dba10cc15a19 HEAD_REF master + PATCHES + remove-register.patch + fix-duplicated-target.patch # fixed in master ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/proxygen/remove-register.patch b/ports/proxygen/remove-register.patch new file mode 100644 index 00000000000000..18a930649c3a43 --- /dev/null +++ b/ports/proxygen/remove-register.patch @@ -0,0 +1,12 @@ +diff --git a/proxygen/lib/utils/gen_perfect_hash_table.sh b/proxygen/lib/utils/gen_perfect_hash_table.sh +index a870b2d67..2dec9c5a1 100755 +--- a/proxygen/lib/utils/gen_perfect_hash_table.sh ++++ b/proxygen/lib/utils/gen_perfect_hash_table.sh +@@ -35,6 +35,7 @@ function generate_perfect_hash_table { + LC_ALL=C sort -u ${1?} | awk "${6?}" - "${5?}" | \ + ${8:-gperf} -m5 -D --output-file="${7?}" + perl -p -i -e "s/\/\*FALLTHROUGH\*\//FOLLY_FALLTHROUGH;/g" "${7?}" ++ perl -p -i -e "s/register//g" "${7?}" + + # Here we delete one of the comment lines gperf adds to the top of the file. + # i.e. /* Command-line: .../gperf -m5 --output-file=... */ diff --git a/ports/proxygen/vcpkg.json b/ports/proxygen/vcpkg.json new file mode 100644 index 00000000000000..2e8dd6606b95db --- /dev/null +++ b/ports/proxygen/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "proxygen", + "version-string": "2021.06.14.00", + "description": "It comprises the core C++ HTTP abstractions used at Facebook.", + "homepage": "https://github.com/facebook/proxygen", + "supports": "!windows", + "dependencies": [ + "boost-context", + "boost-date-time", + "boost-filesystem", + "boost-iostreams", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "fizz", + "folly", + "openssl", + "wangle", + "zlib", + "zstd" + ] +} diff --git a/ports/quantlib/CONTROL b/ports/quantlib/CONTROL deleted file mode 100644 index 50c006335b6b38..00000000000000 --- a/ports/quantlib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: quantlib -Version: 2019-09-02 -Description: The QuantLib C++ library -Homepage: https://www.quantlib.org/ -Build-Depends: boost-accumulators, boost-algorithm, boost-any, boost-array, boost-assert, boost-assign, boost-atomic, boost-bind, boost-config, boost-core, boost-date-time, boost-dynamic-bitset, boost-format, boost-function, boost-functional, boost-iterator, boost-lexical-cast, boost-math, boost-multi-array, boost-multiprecision, boost-optional, boost-preprocessor, boost-random, boost-serialization, boost-signals2, boost-smart-ptr, boost-thread, boost-tuple, boost-type-traits, boost-ublas, boost-unordered, boost-utility diff --git a/ports/quantlib/fix-mac-build.patch b/ports/quantlib/fix-mac-build.patch new file mode 100644 index 00000000000000..a114f96e7d56ae --- /dev/null +++ b/ports/quantlib/fix-mac-build.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 62ab08a115..2b383c1dd5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,10 @@ cmake_minimum_required() + + project(QuantLib) + ++if(APPLE AND NOT CMAKE_CXX_STANDARD) ++ set(CMAKE_CXX_STANDARD 11) ++endif() ++ + include(CTest) + include(${CMAKE_CURRENT_LIST_DIR}/cmake/quantlib.cmake) + diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index 9479252ec40daf..f7cf9b7770da75 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,11 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF f09141b5cce9134c0bcdbaf36e81359e6ba30705 - SHA512 d4b19d33594a7072a0d90b7eac3d74fb27c526269713a9223b84c0451b1e06a58f0c98350305d68a55086d1971260ff249049112aaadea59397ec195a3291490 + REF QuantLib-v1.22 + SHA512 279c2e9273dd0fbc03d19ac19814e8a3b5544545cc1441982232f89bd313fe76b6e252dbcae8a3d146ecc4f1d1e64632ac412096b89da882ba879a66776fdb91 HEAD_REF master PATCHES disable-examples-tests.patch + fix-mac-build.patch # fixed in next release ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" USE_BOOST_DYNAMIC_LIBRARIES) @@ -14,13 +15,6 @@ set(QL_MSVC_RUNTIME ${VCPKG_LIBRARY_LINKAGE}) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -# TODO: Fix it in the upstream -vcpkg_replace_string( - "${SOURCE_PATH}/ql/userconfig.hpp" - "//# define QL_USE_STD_UNIQUE_PTR" - "# define QL_USE_STD_UNIQUE_PTR" -) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json new file mode 100644 index 00000000000000..ee732abc26e96f --- /dev/null +++ b/ports/quantlib/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "quantlib", + "version": "1.22", + "description": "The QuantLib C++ library", + "homepage": "https://www.quantlib.org/", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-any", + "boost-array", + "boost-assert", + "boost-assign", + "boost-atomic", + "boost-bind", + "boost-config", + "boost-core", + "boost-date-time", + "boost-dynamic-bitset", + "boost-format", + "boost-function", + "boost-functional", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-multi-array", + "boost-multiprecision", + "boost-optional", + "boost-preprocessor", + "boost-random", + "boost-serialization", + "boost-signals2", + "boost-smart-ptr", + "boost-thread", + "boost-tuple", + "boost-type-traits", + "boost-ublas", + "boost-unordered", + "boost-utility" + ] +} diff --git a/ports/symengine/CONTROL b/ports/symengine/CONTROL deleted file mode 100644 index 4e829ba5ba3090..00000000000000 --- a/ports/symengine/CONTROL +++ /dev/null @@ -1,30 +0,0 @@ -Source: symengine -Version: 2020-05-25 -Description: SymEngine is a fast symbolic manipulation library -Homepage: https://github.com/symengine/symengine -Build-Depends: boost-math, boost-random -Default-Features: integer-class-boostmp - -Feature: arb -Description: Build with arb -Build-Depends: arb - -Feature: flint -Description: Build with flint -Build-Depends: flint - -Feature: mpfr -Description: Build with mpfr -Build-Depends: mpfr - -Feature: integer-class-boostmp -Description: Use Boost.multiprecision integer class -Build-Depends: boost-multiprecision - -Feature: integer-class-flint -Description: Use flint integer class -Build-Depends: flint, gmp - -Feature: tcmalloc -Description: Build with tcmalloc -Build-Depends: gperftools diff --git a/ports/symengine/fix-build.patch b/ports/symengine/fix-build.patch new file mode 100644 index 00000000000000..5087428e60f7f7 --- /dev/null +++ b/ports/symengine/fix-build.patch @@ -0,0 +1,13 @@ +diff --git a/symengine/mp_boost.cpp b/symengine/mp_boost.cpp +index db20930c4..f3997707e 100644 +--- a/symengine/mp_boost.cpp ++++ b/symengine/mp_boost.cpp +@@ -279,7 +279,7 @@ unsigned long mp_scan1(const integer_class &i) + if (i == 0) { + return ULONG_MAX; + } +- return find_lsb(i, int_<0>()); ++ return find_lsb(i, {}); + } + + // define simple 2x2 matrix with exponentiation by repeated squaring diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index d61271d6806802..a0677af8a2dcbc 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -1,17 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO symengine/symengine - REF 4f669d5954977e86f4da0f53cb5110d2eb6320b6 - SHA512 091ebc83240d3823fb73e0f65f80732d2a85e55f19c8e1a3d1435f05cfa0d1b95d893e8a3c432e1698953a35c56a6af78044ee59db04f03706cf33e0798a02c7 + REF v0.7.0 + SHA512 fd3198bc4a05ca2b9b8a58039cc21af65b44457f295362a1a9b8dbf9c6e3df5186c0c84b289bc9fe85d9efd5ac1a683f6b7ba9a661fb6d913d6ceefb14ee2348 HEAD_REF master + PATCHES + fix-build.patch ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - arb WITH_ARB - flint WITH_FLINT - mpfr WITH_MPFR - tcmalloc WITH_TCMALLOC + FEATURES + arb WITH_ARB + flint WITH_FLINT + mpfr WITH_MPFR + tcmalloc WITH_TCMALLOC ) if(integer-class-boostmp IN_LIST FEATURES) diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json new file mode 100644 index 00000000000000..4768ffb5660858 --- /dev/null +++ b/ports/symengine/vcpkg.json @@ -0,0 +1,52 @@ +{ + "name": "symengine", + "version": "0.7.0", + "description": "SymEngine is a fast symbolic manipulation library", + "homepage": "https://github.com/symengine/symengine", + "dependencies": [ + "boost-math", + "boost-random" + ], + "default-features": [ + "integer-class-boostmp" + ], + "features": { + "arb": { + "description": "Build with arb", + "dependencies": [ + "arb" + ] + }, + "flint": { + "description": "Build with flint", + "dependencies": [ + "flint" + ] + }, + "integer-class-boostmp": { + "description": "Use Boost.multiprecision integer class", + "dependencies": [ + "boost-multiprecision" + ] + }, + "integer-class-flint": { + "description": "Use flint integer class", + "dependencies": [ + "flint", + "gmp" + ] + }, + "mpfr": { + "description": "Build with mpfr", + "dependencies": [ + "mpfr" + ] + }, + "tcmalloc": { + "description": "Build with tcmalloc", + "dependencies": [ + "gperftools" + ] + } + } +} diff --git a/ports/wangle/CONTROL b/ports/wangle/CONTROL deleted file mode 100644 index 2e7e17686eaa5c..00000000000000 --- a/ports/wangle/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: wangle -Version: 2020.10.19.00 -Port-Version: 1 -Homepage: https://github.com/facebook/wangle -Build-Depends: fizz, folly, openssl, glog, libevent, double-conversion, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context -Description: Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way. diff --git a/ports/wangle/portfile.cmake b/ports/wangle/portfile.cmake index f63ae8781eb46b..dca45cfe4502b1 100644 --- a/ports/wangle/portfile.cmake +++ b/ports/wangle/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/wangle - REF 4bf3896ad5e938a01ba20efaf1ea59317d846fb2 # v2020.10.19.00 - SHA512 1c21199225ebfe9a95391c2bb607412ebadc7aac326373e30dc9d49223a2437b382b4c3160fb2147a505bc2182f03f651c95f7c67f916e336ac81af76884f5fa + REF v2021.06.14.00 + SHA512 15fd2c9515ec3d0c3293a8f96d01d3e91e2ef82694d592aae6573648957f691a7da5d7c2aef7391a827a67e2f58fef7668778e0f0323aac11c5b16a1ba889cc3 HEAD_REF master PATCHES fix-config-cmake.patch diff --git a/ports/wangle/vcpkg.json b/ports/wangle/vcpkg.json new file mode 100644 index 00000000000000..c499e71f04ece4 --- /dev/null +++ b/ports/wangle/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wangle", + "version-string": "2021.06.14.00", + "description": "Wangle is a framework providing a set of common client/server abstractions for building services in a consistent, modular, and composable way.", + "homepage": "https://github.com/facebook/wangle", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-regex", + "boost-system", + "boost-thread", + "double-conversion", + "fizz", + "folly", + "glog", + "libevent", + "openssl" + ] +} diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index f863d8811095a1..38e7b2671efc16 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,7 +1,7 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.75.0", + $version = "1.76.0", $portsDir = $null ) @@ -27,12 +27,6 @@ else # Clear this array when moving to a new boost version $port_versions = @{ #e.g. "asio" = 1; - "asio" = 1; - "python" = 3; - "context" = 3; - "concept-check" = 2; - "regex" = 2; - "json" = 1; } $per_port_data = @{ @@ -84,9 +78,9 @@ function TransformReference() [string]$library ) - if ($per_port_data[$library].supports) + if ($per_port_data.Contains($library) -and $per_port_data[$library].Contains('supports')) { - @{name="boost-$library"; platform=$per_port_data[$library].supports} + @{name="boost-$library"; platform=$per_port_data[$library]['supports']} } else { @@ -107,22 +101,17 @@ function Generate() New-Item -ItemType "Directory" "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null $controlLines = @{ name="boost-$PortName"; ` - "version-string"=$version; ` + "version"=$version; ` dependencies=$Depends; ` homepage="https://github.com/boostorg/$Name"; ` description="Boost $Name module" ` } - if ($port_versions[$PortName]) + if ($port_versions.Contains($PortName)) { $controlLines["port-version"] = $port_versions[$PortName] } - elseif ($NeedsBuild) - { - # This can be removed on next update; this is used to track the host dependencies change - $controlLines["port-version"] = 1 - } - if ($per_port_data[$PortName]) + if ($per_port_data.Contains($PortName)) { $controlLines += $per_port_data[$PortName] } @@ -150,8 +139,8 @@ function Generate() " SHA512 $Hash" " HEAD_REF master" ) - $patches = Get-ChildItem $portsDir/boost-$PortName/*.patch - if ($patches.Count -eq 0) + [Array]$patches = Get-Item -Path "$portsDir/boost-$PortName/*.patch" + if ($null -eq $patches -or $patches.Count -eq 0) { } elseif ($patches.Count -eq 1) @@ -227,7 +216,10 @@ function Generate() } $portfileLines += @("") - $($portfileLines -join "`r`n") | out-file -enc ascii "$portsDir/boost-$PortName/portfile.cmake" -NoNewline + Set-Content -LiteralPath "$portsDir/boost-$PortName/portfile.cmake" ` + -Value "$($portfileLines -join "`r`n")" ` + -Encoding UTF8 ` + -NoNewline } if (!(Test-Path "$scriptsDir/boost")) @@ -318,27 +310,19 @@ foreach ($library in $libraries) pushd $unpacked try { - if ($IsWindows) - { - $groups = $( - findstr /si /C:"include ).*", "`$1" ` - -replace "/|\.hp?p?| ","" } | group | % name | % { + -replace " *# *include *[<`"]boost/([a-zA-Z0-9\._]*)[/>`"].*", "`$1" ` + -replace "/|\.hp?p?| ","" + } | group | % name | % { # mappings Write-Verbose "${library}: $_" if ($_ -match "aligned_storage") { "type_traits" } @@ -346,9 +330,9 @@ foreach ($library in $libraries) elseif ($_ -eq "type") { "core" } elseif ($_ -match "concept|concept_archetype") { "concept_check" } elseif ($_ -match "unordered_") { "unordered" } - elseif ($_ -match "cstdint|integer_fwd|integer_traits") { "integer" } + elseif ($_ -match "integer_fwd|integer_traits") { "integer" } elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" } - elseif ($_ -match "^version|^workaround") { "config" } + elseif ($_ -match "^version|^workaround|^config|cstdint|cxx11_char_types|limits") { "config" } elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_cast|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" } elseif ($_ -match "iterator_adaptors|generator_iterator|pointee") { "iterator" } elseif ($_ -eq "regex_fwd") { "regex" } @@ -358,7 +342,6 @@ foreach ($library in $libraries) elseif ($_ -eq "circular_buffer_fwd") { "circular_buffer" } elseif ($_ -eq "archive") { "serialization" } elseif ($_ -match "none|none_t") { "optional" } - elseif ($_ -eq "limits") { "compatibility" } elseif ($_ -match "cstdfloat|math_fwd") { "math" } elseif ($_ -eq "cast") { "conversion"; "numeric_conversion" } # DEPRECATED header file, includes and elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" } @@ -373,7 +356,9 @@ foreach ($library in $libraries) elseif ($_ -eq "numeric" -and $library -notmatch "numeric_conversion|interval|odeint|ublas") { "numeric_conversion"; "interval"; "odeint"; "ublas" } elseif ($_ -eq "io_fwd") { "io" } else { $_ } - } | group | % name | ? { $_ -ne $library } + } | group | % name | ? { + $_ -ne $library + } #"`nFor ${library}:" " [known] " + $($groups | ? { $libraries_found -contains $_ }) @@ -467,23 +452,26 @@ if ($libraries_in_boost_port.length -gt 1) { $boostDependsList = $libraries_in_boost_port | ? { $_ -notmatch "boost-mpi" } @{ - name="boost"; - "version-string"=$version; - "port-version"= $port_versions.boost ? $port_versions.boost : 0; - homepage="https://boost.org"; - description="Peer-reviewed portable C++ source libraries"; - dependencies=$boostDependsList; - features=@( + name = "boost"; + "version" = $version; + "port-version" = $port_versions.Contains('boost') ? $port_versions['boost'] : 0; + homepage = "https://boost.org"; + description = "Peer-reviewed portable C++ source libraries"; + dependencies = $boostDependsList; + features = @( @{ - name="mpi"; - description="Build with MPI support"; - dependencies=@("boost-mpi"); + name = "mpi"; + description = "Build with MPI support"; + dependencies = @("boost-mpi"); } ); - } | ConvertTo-Json -Depth 10 -Compress | out-file -enc ascii $portsDir/boost/vcpkg.json + } ` + | ConvertTo-Json -Depth 10 -Compress ` + | Out-File -Encoding UTF8 -FilePath "$portsDir/boost/vcpkg.json" & $vcpkg format-manifest "$portsDir/boost/vcpkg.json" - "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" | out-file -enc ascii $portsDir/boost/portfile.cmake + Set-Content -LiteralPath "$portsDir/boost/portfile.cmake" ` + -Value "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" ` + -Encoding UTF8 ` + -NoNewline } - -return diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake index 698c7060a32e62..bdc751886f89f7 100644 --- a/scripts/boost/post-source-stubs/json.cmake +++ b/scripts/boost/post-source-stubs/json.cmake @@ -3,5 +3,6 @@ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/ vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n /boost//container/off" "") vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "..//check_basic_alignas" "..//..//..//check_basic_alignas") file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") diff --git a/scripts/boost/post-source-stubs/math.cmake b/scripts/boost/post-source-stubs/math.cmake new file mode 100644 index 00000000000000..fcbdd58149f1a2 --- /dev/null +++ b/scripts/boost/post-source-stubs/math.cmake @@ -0,0 +1,6 @@ +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "import ../../config/checks/config" "import config/checks/config") +vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "check-target-builds ../config//has_gcc_visibility" "check-target-builds ../has_gcc_visibility.cpp") + +file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/build/config") +file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/") diff --git a/versions/a-/avro-cpp.json b/versions/a-/avro-cpp.json index 51e35c874836fc..0fb40249df62a3 100644 --- a/versions/a-/avro-cpp.json +++ b/versions/a-/avro-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecafbb456636115f10c5670a8bb484181c133d89", + "version-date": "2021-06-01", + "port-version": 0 + }, { "git-tree": "e6253ca701d576b97c1625beeb8a1767eb73bae4", "version-string": "1.9.2", diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index f916e3c4f3e357..91997673a2de26 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94824d664d1b512dd44c3c84652b59da7726273a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5b1b9c1e8dbb75740b1795ae712e8a4612e91c58", "version-string": "1.75.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index 04901523949df1..d4abb0b559e95d 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6ce23e02aaf8b595e852e9746677fa7f85819ca", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c720beaff3f3325f63ed3c0d76bfce956e2d9442", "version-string": "1.75.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index da2cad1dca9ba7..53a6ac2c0819c7 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28cfbc210773962783f57f6526678f1085be471", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9f77d89d4c76cf998be2d4f15aa922e04f233f1c", "version-string": "1.75.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index 54e0c539b4771b..c548b6c62c022c 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20631fecfd4ef3388bcaca6a3491d27b23bde42d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c78437716768273f86dc2f9132d865a0f44a0971", "version-string": "1.75.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index 6a3a3ec2cf83c2..2f0eb1855c5e42 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bea67607788bd73e3c83b93848a507090f886b7c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5cc33df23211b2d4a2ed7b0b563140ddd74a7358", "version-string": "1.75.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 8000bfd27b1527..1043fdf4e953d1 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c422367cb9f7a8de0fcbf1809e1a2cab1983bce9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "43233c66944ac53a423bba45a46708a308d786e3", "version-string": "1.75.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index a91b00d33b2729..38aa1d4aef9d52 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d756c428b49e3aed8ce71c1d0b946426e929ef8a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3393715b4ebe30fe1c3b68acf7f84363e611f156", "version-string": "1.75.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 8b0b744625abcf..1ee54c914b441c 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b026e0722c90b595f8125caab74275b68dcd81f9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "593134d9603cdcd0232608aea11c4969df7f5b1f", "version-string": "1.75.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index 182248dc4f9017..be30f33fed6b10 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfe27152cb82633d279f5c55b3eb9ba3b454e23e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b0eb6bd0f609a494f58910e9f5c640144d5f8890", "version-string": "1.75.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index 2ee59827ce49fe..f3d48090a1a0dc 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d135f2fabb815ef2c643e71db48e227494aa3dd", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cf5aa1fd8b53f127b259d919c0bbf4659d3196e0", "version-string": "1.75.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index 765ede68ba247c..afb682e39ff2b1 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a01b028c11f40a89e1f0157f97e866ed4d53046", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ca2e28851246c3fcbba2e8c5b36ba2b1e43587a7", "version-string": "1.75.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index b7822f37ccbb75..bf814c60da97a8 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e622ce41f16af974c759e51dd9a250b054b3a71", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "110fc6710128cce06256143e5c2df83bf3060a42", "version-string": "1.75.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index aa3cfb2628691b..adc0b9f7b85de2 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61e468bd018412606e863d2b43d9b01c54205ba8", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7f76365f342942ba11c0c1352434d980dc905f13", "version-string": "1.75.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index fa4098f6af9fc6..92397aedc80356 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9852214af239e8f5f34ba4299ac07b5e207f01da", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "23fe79b0d84dee32f51951fa275a5949e1188930", "version-string": "1.75.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index 311c0cc4d7f9b3..0d7578bab4845c 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcf85566e4489a3d73496650c2ae9481ff3640ef", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b3714023e5d74d66c24ef7aad21acf08146cb200", "version-string": "1.75.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 8fbd1de76d96a0..2c9f8fb1e4b7f3 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06fb2597b509bc3d29528cb737c46db0ee09ecdc", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cda5675366367789659c59aca65fc57d03c51deb", "version-string": "1.75.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index 412e344161d8d3..34cca0afd07914 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "805aad1fd978317024fd94885e2cfde0b90af4ef", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "37841dcc219f46d503d6c8d6710e759583403020", "version-string": "1.75.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index f7e82f958e5db1..a8e62830292a1c 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6c3818b3fbea8e53859becf5f7a80ab8e583a85", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5dc46166c76c1f47d2d6dd9ee3e2f5287b81fff0", "version-string": "1.75.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 61c6ba3c590e16..05000084115e7c 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a840275c02416548a8fa29b9d6170cb0a6e14680", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ca82ca1b9c1739c91f3cf42c68cee56c896ae6bd", "version-string": "1.75.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index 49df2775691a98..ca606953d67d27 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8f8aa1976367c2a674b1a8a91ec5e2ceee25a4c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "bf472c23d29c3d80b562c43471eb92cea998f372", "version-string": "1.75.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index e5995c4e89f8cb..2da6fb4ca8a376 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d24b325327cadb5031964d839a0c89ca482d87ad", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5d351bf7c795d3dd8437d2beed167bd3cd66e10b", "version-string": "1.75.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 5b8f1d427c8176..57b42e3d475a14 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7543f135833a2b698617f25a5206dd4194fe01bb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "73ede4d1c06f12b1162f39e0b03935cc429c763a", "version-string": "1.75.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index f97dcb6b6192e9..6a3914a3853c10 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b8c36f8582d262cc3c02dc91e98309dd53b5a4b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "caa424eb6255cef5c6b00c3d9f1b7b38c9b84b60", "version-string": "1.75.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index bdffee7bec2318..339724897c4afb 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a18dc435cbe0aa35d32830fbe85d7d5ab0b71bf0", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9f366dd9e7f48c0cbf16725eff9b035ed7ff2d5a", "version-string": "1.75.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index 7cf739e9b822ea..b12a031b753a8a 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d13b694428c83a3f00302d0a4af2d2c457f13f05", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5c71e3bd86d4e105b3ec7722e5f1468a50ad6fb5", "version-string": "1.75.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 54c24b14d77399..03ec7ef2090feb 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f72d1f923bbbf99709e9cbaf54f36b7c2d22d169", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "20a19f6ece37686a02eed33e1f58add8b7a2582a", "version-string": "1.75.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index 692a304edc6852..f00bc267b98ddc 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55c94396b67927007f75ce08b2acc2b9adc908e5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cb03de5030c0a5c3b49eff0acb5b363156c458ba", "version-string": "1.75.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index e0c61519093a0b..a77f8efe666668 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fe20c2b3573e82f0db30917b005310bc8697f88", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2123dd1b276ae094358dc982c1f37661d0f38e04", "version-string": "1.75.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index 0c84cc46d92141..b3f8af42036c7a 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9fb53c9bd706bc62d747a6e19e7d0639da9805d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d85306a89ba8e94f3f9ce92dcff832b54b6fe36c", "version-string": "1.75.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index a31abe162c0d72..7f7d43699c327e 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47a2624a239c59fd89846f7b24fc3b108b31e82b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7aa83d25af20b0a43ab00bc3e00a16ab41bd45d4", "version-string": "1.75.0", diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index fb255c7c0c83d6..6697d99353ed4d 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69e27a71e0cacff0f2a9b005f03bc6262fe97210", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "96744251f025f9b3c856a275dfc338031876777b", "version-string": "1.75.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index bb21663e21f0e7..fd55ed1b7e57ac 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b04bd18cc23d270ccaf152f5d28d5948ca69a664", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d3a8b7568bf78bb6d894cfbf857dee96be2298b9", "version-string": "1.75.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index 04f10d446a162a..a8f5f199bbd1b8 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d3d3b2abd89405fba3564e8db5e05a02fb2902", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8616ee67880d16f75306371c1c1be70f8df9a189", "version-string": "1.75.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 2ab901a183e08b..45e4a268e7f554 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c191f1b591ce4455f933fa254ca32dfa5796058d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "4c89bc4f6b5208fc931ba4d79223ad085bb4490a", "version-string": "1.75.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 3d6d792165fb4d..5dc5968a1ce35c 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa0a09700d91a3cd3bf1fbf6b8463e20ede77053", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "913ecf461f245ac3467948fdddf49ce4b6f1b6ff", "version-string": "1.75.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index 8843076c5654d2..fc78d022445ba7 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9b109cf5a3f708a5036ddeee8b58676357b3db9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5bc8081de24231b39f115cbc347055f2d71c151d", "version-string": "1.75.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index 36731112625790..b26dbff27f8211 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9265c46ce355c8470fa5bf8941b59dd27428d92e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "58be75cc63e0e3e34cf5e38841e7a9b397ff6c0f", "version-string": "1.75.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index fca664ca7cc617..06bb8dcdfa2038 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "476c374b6a92402048db19b98376eff8b3e05782", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "dee29c76a897b9430f109238464d04d1a892b2c5", "version-string": "1.75.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index ffd3e94757445a..e5dec6f11b9c26 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e0fdd6589d7f0f04406efec82efcec315fa337e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "0858efd566bcda59a52b99a57203ef4d6fbfe1cf", "version-string": "1.75.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index 73adda35f84b7d..e398345e83b313 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "352c9212fd097f4c147caf0dab9cec05cd47aa1a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9ebb4d57edeea6e294e0974f2fa68c61267d7c1e", "version-string": "1.75.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index 1ea97fc7c2cdb5..b7af3e73873dad 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f33a85bf7a578c9659b4bccd02296568bae3f3e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "a6cb5686b38457ecccc96480f5268772bef6a6fb", "version-string": "1.75.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index 037a6c1f982cd2..eb9a5ce127640e 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad37e24486926b336f2ee015a3fa88cc8f8a2490", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7698d7fd2822972ca04cfe1c9778c9f04fb56c3e", "version-string": "1.75.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index 84a3d600a332df..cc58bf42acdd02 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e84b797bddccd2a46e818d4364f71810f687b117", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "f74e3af1a511361a97810fef8ed7aedbfff6706e", "version-string": "1.75.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index cf200027f501f1..58cb0d00bfbcc2 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6168fcf7f513e57e8f01f5c0ab19f446a66cd57", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "4a2c7b6ae8f3faad83ee354e4bf9023ab9e7d1c1", "version-string": "1.75.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index 5e380e53277cbd..a0b8d11cf2fcc1 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7de8c6c9ed0908a5d85b3dd739d27922fa213931", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1d40cdf7af5bd875fe73020d7efa5e7a61ea07a1", "version-string": "1.75.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index e8c0565e0ac4d2..b1f28b1fb07cf1 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d323694c269cffa88a705e2eec5339c1dd391d3", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1e6fa6894d7d35173abae2aab50e772fe6219340", "version-string": "1.75.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index d78c07d7071449..8bb123d97a9aa9 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e71dd1ba560f6dfcfefa262a5c6762a15b94e3d4", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2dac60f2be18293521f7b65f6b47cd1f94760491", "version-string": "1.75.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index a815ee5961010d..41ac721d97992f 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c14b7885fb22225d265897b942a090ee43bcc1c3", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "699b83c06257c66df62492390eacfd6b1608b9c0", "version-string": "1.75.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index 94fd4bab003972..469ac151c7cf69 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55d762dd0711b68ad1e494dc5d7f3e88ba6b6889", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1e41f17ca0e3d7b6918bb37a2918cee5399c0b39", "version-string": "1.75.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 0f60a30c5ec458..5053b07d52a525 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7901583dc54be5f2453147da8fc772c5295f3ccd", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b9b42d92244a3cbc265a562cee71f792997fe5a9", "version-string": "1.75.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 065ff002b88fec..928b7b07867675 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcdf8ce8a1b3b6563bc1aae0ef60afaaac061f89", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ab55551ec17e50829409f586a5a34adf5a50ae5c", "version-string": "1.75.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index 189ceaf26e3e48..15433f00b380f2 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bc8af27f9d16f09f9c17a179abdf230d39a24eb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6f5fab9a08a313e03867147bf73ba966873039b7", "version-string": "1.75.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index 782e1d5de7540b..96f0dbfdabc863 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70080f8e245f5ba2caa54b447f946bee8c998ec8", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ed49dae8b85d0e4833c06dee49367ea99083cb8b", "version-string": "1.75.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 163716e558d517..511c3d1539c271 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77a69013cb4d850223122dff3bff12318a140d82", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "de70ce0d1500df1eda3496c4f98f42f5db256b4a", "version-string": "1.75.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 35135b8b445639..48908e0498c2b1 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e0c78814b07fcfe58e421f651bda285081dcd48", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1ad6903e562cc3464bbb35bcef49019bdfc81c5c", "version-string": "1.75.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index 68ff4e08f36eba..5f1944f771b3c8 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c7ee56a1456d43b67e772976c40eab0f96e10e8", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "f397df607d232f6a241571ee0b105bcdac4eb6d9", "version-string": "1.75.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index e36f203d997b06..a691948cfcd569 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c63e249209fcddec92063bb59266892ed6bfab38", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "138cc5e30e17278c8247882027053e5e55983edb", "version-string": "1.75.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index 5833ed32ae15d9..2ca5c987ab6a0f 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33d8fc8dd5a42e12f4d1cd0989c147a674d5c6f1", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7bf3407372f8fc2a99321d24a0e952d44fe25bf3", "version-string": "1.75.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index ec3b267e73e7dd..348cd0d1e2b618 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0909e271c34f98d1e5857091ce21b16e1d165e05", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1f0088410d7f47204c0e74c97aff4bde77c75a9c", "version-string": "1.75.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index 9bc957fc342f84..69f4d6577466fa 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "504d724993ea74e0bc0b17b4101539cd603460d5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9796d7066c411c9e540919d37456d79e54cdc2cc", "version-string": "1.75.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index 7b3ab3d307732f..b09be2c5fda44a 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7a48d6f43ab6578d7f25969c0aaf0c385036c8a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cece09f870caaed77b754156a1f568ee05c9e653", "version-string": "1.75.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index 3cbfcd3ed0aaa3..f1bd8dd4251949 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63ee28b3c29f04ba5d62bb8d0c9ab8e4b051dd1c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c3c314ac0cc6971f58c7dd9fc1708caaa059b7ae", "version-string": "1.75.0", diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index f1202177d2671f..429812e0a37fc3 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5d414a21f12b33a083b6595ef485d21e6e4df76", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b6f4d7fa7cc1bdf8c780bf165d4c4d1fcbb337ff", "version-string": "1.75.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index a4ed70008ff562..378637e5a2d6c9 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "966a986af9237664ffc3b35384ccbe006b83e196", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8f6324928977e29a23540dcd6c8c3ec74984362d", "version-string": "1.75.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index 06d2d473219c5f..b4821984049c25 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e9c798dfb0bba3dd3833464354ff492e735231e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d7fd32b69bcf0f1037f2fa6a136b8a48622f32f6", "version-string": "1.75.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index 229eeebf4ff46b..7bd52febbd9ccc 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76b51eadd7efd7d81d23c39d126a50abd1cb82e5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "57d2fc3f09cab641387b6e152fb5df483d8944a2", "version-string": "1.75.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index acbbc4fa320d22..66c9bc446ac270 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22166eccd3d3b536062ee1648d147ee357a058ed", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b844f385ea73f91499660ae8626dc9cb01548988", "version-string": "1.75.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index c537db15de60a8..d7baec9dfaa3f6 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e1221d665804faaebfc9c5b91c89a6b3f66f91d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "87961d58edfbf7464239d5ca351243d88ae9adf7", "version-string": "1.75.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index 971463989d6eec..5abc466097af6a 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee745d1ee8b0842a39a46d7830655c765b438bca", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "39dcf6bd80995585db199c583ab79be17711948c", "version-string": "1.75.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index ea2008d7057c10..413344d928d060 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "448de1ada43d74ffd7b4511c34319a5cc25bbec0", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c64c9882971998a3d0330928f7e8c48a3e584658", "version-string": "1.75.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index 865769be3b67dd..4b3a52a0e436d5 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44ca94c8ff9e03288a08adedfbccd61541867d75", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "06142d599d8265c27584b59a352f07264b5137c7", "version-string": "1.75.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 67ffb430dc2550..7ba71e16edd113 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "95cad6d5f2d9a858aacbb3b2bc0e3a0db4b06b4b", - "version-string": "1.75.0", - "port-version": 10 + "git-tree": "e0f858222eaf2c58a7270d10d649bc88e2e149b6", + "version-string": "1.76.0", + "port-version": 0 }, { "git-tree": "c475b268ac42e886acfdc783944e1e3a988b0ac8", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index 5e36bc27d777b8..e8cebf7bebc3be 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6563abd760c2241004acc0da699152ab8c4b294", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ffdab61d5b17d4a25826bc539dba867ed992b276", "version-string": "1.75.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index 21eee097b35d61..77668299003d03 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8aa7b3c86aa66c1629ac5cf5ce4e4b6a4a95b61e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d70457824e1e3084281f6841211641a548a2ea56", "version-string": "1.75.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index d06d6d81dc22f5..57f691cb92834c 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21a8e85d8e04d477e9127f80d78b6abf1d130651", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "e3cf57eeb5bb24cb4e1d9743f0aae9f327a155d5", "version-string": "1.75.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index 9a7aa904760c7a..59a9f4267bd220 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "250327ba168c480f1f530792a14e87cd4d13b63d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3c6847d1a221443ccdfefc9a8618c928af1137da", "version-string": "1.75.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 12e907338d44e5..4e4dcbbd53d885 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba54ee9c431c0c499935a7d7bc8a255cd5e9cac7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "cf4e64e71731c3fc1db88a352aa9727082f80626", "version-string": "1.75.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index 1f4fd3c26e0244..e705e3ca788dde 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc5acbb8051e16c1e48d8e82ea0fac48c6024287", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "44693eca97005d75a9871243de567016b1716a56", "version-string": "1.75.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index a57ae6486c167e..d0fa4e3195257f 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1e0c81cdc2adb33d2963722016c0b13a15055f7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6de9dddaca9c32451cad1f9ab60a27ecdcb345e6", "version-string": "1.75.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index 82418b10f48dd5..aec911444d9378 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55ee6b85fe02f7875374cb3f78a427365ba7beb5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6d5a003c951b208d27de281020c305977859eedb", "version-string": "1.75.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 1b327fde828721..79290c812354cf 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b1a6083440b08b8b266524dac6a8aa200e417dc", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "641c12e14ae3d025d4c55e5de19b00a65f916dcf", "version-string": "1.75.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 4fe4b9b3cd8cbc..290443486eef2d 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ab3a3a915ad6bff1aa094641e7471e5ddc8a11d", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9de299c79ee96b9090a3a27cbbaee41b62455003", "version-string": "1.75.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index 2fc3ae4f86b6fa..c0d98ace1af294 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89c69f304356b50d3e4e58155bb08009629de385", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "92ab84d7e417a2d14c7358145cf83af87e7c85c0", "version-string": "1.75.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index 10afad5dc6d61c..00a11e946e0542 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a824aac647806d7f8d03ea8ec715faea895d54a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "bc9caf056bf385d810fd7cea00b6ef7a646edee6", "version-string": "1.75.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index a98413cf640b91..3944d0a8183b07 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ea91b17815f03d2702bf3721f8002cb8d64cb85", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "078abc59d831a640ca9ab5391f63e8aa8a95bf99", "version-string": "1.75.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index ef367d39bb4b80..746e6f6c960d9c 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e57e6544326fe84416a0060a9d93723d05b9bb54", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "dec159c5ad8645f1527a9c00d9cd56840a7bea2a", "version-string": "1.75.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index f896a6d384b1cf..73318e03cd26d5 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e064373327329af8a7624ad00073dbfdbc196a48", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "04759c54c296fc98c5fd452b7e1707b5d2e8908d", "version-string": "1.75.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 6909df69afbe4e..072e5835d00a79 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f58af0deba41766f33ad383428463f59cf38d976", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "96688c29c3a5a60c3b347391664756f884eda90d", "version-string": "1.75.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 82ed89c3d88a73..114477982c1621 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20af48e0084ec80f69c580872c2fc4e01fffd4fc", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5f58bbd7060a9f72ea2a61edb03250ee079965a4", "version-string": "1.75.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 6c08f6628d8a96..5072c7ed77c65b 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "603662ddf6590592848f2dd714fb08776d3a9616", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6867f4f5795c457b9f726b907606da8570c9f66f", "version-string": "1.75.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index f82066aaa585c7..85a7bea32b3500 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a6ab42b35df132f8a1f7c52dc7d92eb8a7cb894", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "990f655bf0d76d2a916bd7c0631f01a7a6516c05", "version-string": "1.75.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index 61dd5c74ea64ba..0ddce84599ecca 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ae22b07f1f3b91d8b90f8532480abfbd0a24ac", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "90d72e8d8b2f27deb72fc883542f130142878a86", "version-string": "1.75.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index ed3a483c27219c..5428d428aeb1a6 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "240a1963be7f74c2de3f507bf034e765c632f033", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d4eea152778c8edf5ac36cfc804b4a4c38e2586a", "version-string": "1.75.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index f71afabc17e264..dd306d354b2786 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c618127e3c475a0991c59922fa57c2fee6eabd40", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8d78b8ba2e9f54cb00137115ddd2ffec1c63c149", "version-string": "1.75.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index 10fe607619719d..df9877e51715a0 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd105bdb8e892a098738e054cfb90cb1786c856e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5d47762887873d2311645a3bd38757e2cb657f8e", "version-string": "1.75.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index c2b54cfcded3d1..b147dcb9d588ec 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e841e59b06375faa95855cefe7cf14515ddcc42", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ee283d4e95ac33a966a83743758d49db470bb4c9", "version-string": "1.75.0", diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index 693df9881c2d31..b14a178136f604 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68d4dfac2cedfe5786ecfb96bbe974c7257c73c7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5d13650ce8dc9bd2f1af435bc5a3ee2f96e699a3", "version-string": "1.75.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index befd8639c729c6..260a3a16b915a4 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "099a09d3ed31651c57f2f3c735da5948dce45b66", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "dbd7fa06c82727307d26033c3ce4679c05489726", "version-string": "1.75.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index afd97bf4e22744..b1a2f8bfca3bb9 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7d8b52790eabfc30fa162d68055d3fe30c8b20c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "212e0551c299f67ccaf077cf376ed9da38af6b5b", "version-string": "1.75.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index 96c9433b0e3440..da82a8157a191b 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a46fb253999b4a420c6ae8c060351bb56dfb303", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "a864f78b06709be6f35ed5b8e64919f3794a5a74", "version-string": "1.75.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index 22f4660751f813..7735ac9e1b2b53 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22a76d7b62c1e7eab693c827b1ca942acdb46a1b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "f5565087e1c90779cbe05bd19ba172a699ccc743", "version-string": "1.75.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 6803932b17db30..423359537de1b8 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70b5734ed30839efbf4048f5749af11e292df641", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "93abe1969976dcf265014b8e7f5463ee3b3b76d1", "version-string": "1.75.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 479aa64446d608..7ab2951c76318b 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "174356d3aa0622ffc40c5a8a2c4c4d2813498a2e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "69bb9f285b6db1c861d662eb9b449ef5e2b2b5e4", "version-string": "1.75.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index 8bcfa6406d2a2f..5eb03734bbe21e 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e595f4b0f7135b43d0bef283fec3c0d4d742dc51", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "57c3a7dae1c551c1839a35a2d518c2ea0dd43795", "version-string": "1.75.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index c421a7ae32e1fb..0f17ec5e3ae618 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "002edb9b01fe471f968eba09c80bed4ea60fa865", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "bfdcac03e6dd3a24818ca99a96f464a2404f2f0b", "version-string": "1.75.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index 37dd056f1b3575..749b85e1dbcfbd 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f6911d5b98ba7669956568acb155112e623927b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "27fc174ae8a94007819eecfa02e8830e85017ebd", "version-string": "1.75.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 80880dcfed2de6..756cd71c8f30f7 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7803a877c9e9acd2162106e3bc15eb363b6b069a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9b5c6faa967ec00a8f3ed0aa1bb1f82564e3e064", "version-string": "1.75.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 2e6eea223a21a1..388d351f2d33b2 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69c7ccf5d656e92b0a71e2456933481338ddb675", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1a6a483b16ebab8a08db06a64157d9eb563ec0ea", "version-string": "1.75.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 5cb79cdaf32a6b..351561ea0be17f 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "419330b673f261bc92184d6f65b442bda6fb0fbb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b9b04d9a4c678589f8944d4bdb2b33746cfe21d5", "version-string": "1.75.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 512e8ba3c3239d..127e96e7c1da79 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cd97a04356c141db68bfb6aec62c68e467f9ea6", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "69941aa4846ac99c267c3173ddd5d4fc0e64aa42", "version-string": "1.75.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index 5ab1948051e437..a03b6c18449e9f 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c574224ceed1d97eb67edfdb398117fb908b91c9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "767d42c39507b5461591bf3c212ac5c5f1f29b91", "version-string": "1.75.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 4b2552d12a6586..08a929562f634e 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f43e22c2f1e0d71baa91b8ac5d995ab0cc0a802e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d18232c6100b5b8836e3c14faca691fa9afb1e1a", "version-string": "1.75.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index eb02daa301ae9e..2d9c8e0517190d 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "078e3d6c36e55a55d2af19d02036437d6dabff5e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6838da5ade313772c95807dadf2c6f10978887b8", "version-string": "1.75.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 72d3e3862ebd83..4ec1efb6e5dffb 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fd209b14daf0b5990c60a1e10a6d92dd03c009c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7e42477706e50953271cf2b9ce6d3f4ad9669124", "version-string": "1.75.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 6de4d470bfe5a7..06611a53b9f9d3 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02837608d604cde8de8bcbd5dcc706e406a808dd", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "eabe320c7c22c3c4a389aa75ed6ea630fffc5020", "version-string": "1.75.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index f4359f237fb5cf..934fe3ac9f9791 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94c1acd6353e0db7370f742c082c160114f7af8a", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "0a5df3d26698c16a1152ab418b6f6258621eff40", "version-string": "1.75.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index bd3d32b8e716d9..5a1eef7dfe40dd 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc334c3a07d041efa802d868ece12150bdef34b9", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2a41c4703c7122de25b1c60510c43edc9371f63d", "version-string": "1.75.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index 7fcb2fdc9e036e..ce71f6e327c466 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "990abb2e15b868e2f80750422c3750e11700bc17", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3bbe6c7f88321969abd4926c439851286fa4cfb0", "version-string": "1.75.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index fe5a16137bb850..4b44371ba7992f 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b74daa481d1f60e2d6f9c6b221a80dc8668cde7", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "39f712a73b762150961fda9a9f81edfe2ecaea32", "version-string": "1.75.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 6ffab9dcd42aff..61c8f4ce493fe5 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0286de08a3fa5ba043e432b986df78f4defcc96", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "0a1188e2c052f77ac0b2152eb3ad78e19ed29e0c", "version-string": "1.75.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index 488330588fef73..de7fd15ef740e6 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bab6b8839833eda9df6a0016d8634d129fef485", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "5ae561192927eb3f6f55b6e4370e5f85d18f72f0", "version-string": "1.75.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index 392d113b6d11ff..b6358cf03ec3af 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef29c4cc84cd28ca6cc812794dfb264709dac11e", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "281c8b8c17e414c9b0fd0b0bc6a569fba02d4fff", "version-string": "1.75.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 0f4fbc0ac2cf55..673c72566a54b9 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29a39e0d594d74febccddce3a077ff39c484fe21", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "b13bdf32a20786a0165cc20205ef63765cac0627", "version-string": "1.75.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 0d6fc6351297d9..70ad94f66e17c6 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e8fe8dd0d1524fc679c48bf4ca41f31a99ebc36", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "7375c2b2d13b38482bd523adda933c11bd113b51", "version-string": "1.75.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index 143d1c7b486c1b..ab96011fdd1445 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b9b3cbc205006491c43f7244cd4a046961e610c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ce248c1ba37037937a656c72bfaafb0d523559e4", "version-string": "1.75.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 2ef3e80d8bdf46..49ab50a25cfffe 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "878a097bf8023343a8af384bb30e0eee437a6904", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9881d849d33fedde2628cd86c41a58731c18f3e7", "version-string": "1.75.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 7ea3faa97c7cb0..47483eab79645a 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b10179f5ffe71f697610799b865c72d7be1dfb2", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "22e3d000a178a88992c430d8ae8a0244c7dea674", "version-string": "1.75.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index 34cf302a64b03b..4e4fa5edf48b10 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b488a742d2f94e05da4f00a2fd3c9cb46fba13df", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "9daa807310b682ea2ed54c59d9428d3b2723c32f", "version-string": "1.75.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 01d346a59973cb..5c43e79438857f 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2125b24468cfbf25aaf0c3f600cda9b6773ffb18", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "1ed3f10185cfa0140d6b5dd5e7be18b7b3b447c6", "version-string": "1.75.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index 313697d7f2b480..0769cc4346d054 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2feae16df79f9f3d24b98d407e542458706426c5", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "8829793f6c6c913257314caa317599f8d253a5ca", "version-string": "1.75.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index ab03fa8bfe94a1..fe3d24d7eb02f4 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f493f75125a3d4c8b69fccc3c72ed6b868368c4", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "99523ccd2d55e2f3f04e1548a5e9ad899d482740", "version-string": "1.75.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index d7fb9dee6bb47b..843391a4c5a522 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "845a49ec34532fe2ba0d071e489eec10808499ab", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "c1e8379989f44bf779ee47f1b102bb450963799d", "version-string": "1.75.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index 4bcdd75fff047e..df5f79b312cad6 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fce0be543d0eabb6160e3294f89c10165623e53f", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "2ffcf405ef8f3b0cf735c47a21bd7082ccc17779", "version-string": "1.75.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index 7f546635cbd509..a68e71d84cc4ca 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f950f2d90f50ec8d7982801ae8df77ab848285a6", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "28c6f9fc668fed0a0f193cda0a99619e8beeb398", "version-string": "1.75.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index 430739b7df1f12..94ad46f2c516f2 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa3e587e5d4f80c8aa934cde043ac5940adaed55", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "47572946bf6a63c731b9c4142eecb8bef3d3b270", "version-string": "1.75.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index 538d1378648fcb..92e4a8ec156cb1 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5da2f125967693081c7afcf81a327fb6b63343f0", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "6fdc41ce442e95260c89dbb925edf9de8fe69fa4", "version-string": "1.75.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index a7903a3a0197f0..87d228c23607c3 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc3ce58ddedfd3cf1d23a75154f3939a1f7604bb", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "3ecbd86059d27b3f63278089ffe13cf974f11926", "version-string": "1.75.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index cc9b33a05f53bf..3482f58425a9d8 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3a2b15165133dd1a0ab0c5477e521e25ad02a31", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "fe84b0a24b896d88677494ee69347a7501746002", "version-string": "1.75.0", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index 560d29677a759e..1bd9429ef119fb 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2e44500c55aa436e9d239130203e1953f4d713c", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "68de048561ba7a30f2cbba3c472c19cae63230e4", "version-string": "1.75.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index 56c5cba1d2730b..1e613bd3028a49 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b25e696df99e6186c1018a04d8c66607d330b89", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d32de46cd9dde4e3a3206a7fa1d48743ec92928b", "version-string": "1.75.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index e7dfd17457bd09..fe729f3679eabc 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48b21bc998317a6d60c63e07b38c83f4126b107b", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "e7ad07379e1cbc96c79a08a773441845e8f86691", "version-string": "1.75.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index f2ef5a871db8b8..eef160d461f8c5 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fea61636685db99cf11030e507f028cfa212bee", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "4529a218720a8856e510778eaf5e2c8c1f1ca971", "version-string": "1.75.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 61b63f81cd9e86..7365300b554a48 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daf7f224a26824ae0f4deb4e605e952d97755eb6", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "ecf8a43a095687fe67389aa43323e30464646089", "version-string": "1.75.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index fe86c1f0b9f943..6c3c1e0c95a598 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e18b90b86df900244b7c8c7001ceeac37b083ae", + "version": "1.76.0", + "port-version": 0 + }, { "git-tree": "d24cc9e13f1aef8ae26b68f3b3e34495431110e3", "version-string": "1.75.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6e264a25a297ff..b65f6934337b37 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -233,7 +233,7 @@ "port-version": 0 }, "avro-cpp": { - "baseline": "1.9.2", + "baseline": "2021-06-01", "port-version": 0 }, "aws-c-common": { @@ -441,55 +441,55 @@ "port-version": 0 }, "boost": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-accumulators": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-algorithm": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-align": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-any": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-array": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-asio": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-assert": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-assign": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-atomic": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-beast": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-bimap": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-bind": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-build": { @@ -497,79 +497,79 @@ "port-version": 0 }, "boost-callable-traits": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-chrono": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-compatibility": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-compute": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-concept-check": { - "baseline": "1.75.0", - "port-version": 2 + "baseline": "1.76.0", + "port-version": 0 }, "boost-config": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-container": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-container-hash": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-context": { - "baseline": "1.75.0", - "port-version": 4 + "baseline": "1.76.0", + "port-version": 0 }, "boost-contract": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-conversion": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-convert": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-core": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-coroutine": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-crc": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-date-time": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-detail": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-di": { @@ -577,407 +577,407 @@ "port-version": 0 }, "boost-dll": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-endian": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-exception": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-fiber": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-filesystem": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-flyweight": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-foreach": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-format": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-function": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-function-types": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-functional": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-fusion": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-geometry": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-gil": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-graph": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-hana": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-heap": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-histogram": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-hof": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-icl": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-integer": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-interprocess": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-interval": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-intrusive": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-io": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-iostreams": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-iterator": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-json": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-lambda": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-leaf": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-local-function": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-locale": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-lockfree": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-log": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-logic": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-math": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-metaparse": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.75.0", - "port-version": 10 + "baseline": "1.76.0", + "port-version": 0 }, "boost-move": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-mp11": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-mpi": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-mpl": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-msm": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-multi-array": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-multi-index": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-nowide": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-odeint": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-optional": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-outcome": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-parameter": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-pfr": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-phoenix": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-polygon": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-pool": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-predef": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-process": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-program-options": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-property-map": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-property-tree": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-proto": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-python": { - "baseline": "1.75.0", - "port-version": 3 + "baseline": "1.76.0", + "port-version": 0 }, "boost-qvm": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-random": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-range": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-ratio": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-rational": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-regex": { - "baseline": "1.75.0", - "port-version": 2 + "baseline": "1.76.0", + "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-serialization": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-signals2": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-sort": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-spirit": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-statechart": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-static-assert": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-static-string": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-system": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-test": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-thread": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-timer": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-tti": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-tuple": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-type-index": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-type-traits": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-typeof": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-ublas": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-uninstall": { @@ -985,27 +985,27 @@ "port-version": 1 }, "boost-units": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-unordered": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-utility": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-uuid": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-variant": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-variant2": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-vcpkg-helpers": { @@ -1013,23 +1013,23 @@ "port-version": 2 }, "boost-vmd": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-wave": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.76.0", + "port-version": 0 }, "boost-winapi": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-xpressive": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boost-yap": { - "baseline": "1.75.0", + "baseline": "1.76.0", "port-version": 0 }, "boringssl": { @@ -1965,7 +1965,7 @@ "port-version": 1 }, "fbthrift": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "fcl": { @@ -2005,7 +2005,7 @@ "port-version": 0 }, "fizz": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "flann": { @@ -2057,7 +2057,7 @@ "port-version": 5 }, "folly": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "font-chef": { @@ -5013,7 +5013,7 @@ "port-version": 0 }, "proxygen": { - "baseline": "2020.10.19.00", + "baseline": "2021.06.14.00", "port-version": 0 }, "psimd": { @@ -5365,7 +5365,7 @@ "port-version": 0 }, "quantlib": { - "baseline": "2019-09-02", + "baseline": "1.22", "port-version": 0 }, "quaternions": { @@ -6073,7 +6073,7 @@ "port-version": 2 }, "symengine": { - "baseline": "2020-05-25", + "baseline": "0.7.0", "port-version": 0 }, "systemc": { @@ -6597,8 +6597,8 @@ "port-version": 0 }, "wangle": { - "baseline": "2020.10.19.00", - "port-version": 1 + "baseline": "2021.06.14.00", + "port-version": 0 }, "wavelib": { "baseline": "2020-05-29", diff --git a/versions/f-/fbthrift.json b/versions/f-/fbthrift.json index c5ab1556e9a5c8..e6231a686d009c 100644 --- a/versions/f-/fbthrift.json +++ b/versions/f-/fbthrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f57f144d8d7fe3db4534798d827e2e217f6e9b35", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "4f77ee90c3b33600d679483776c5b5f7cb59def7", "version-string": "2020.10.19.00", diff --git a/versions/f-/fizz.json b/versions/f-/fizz.json index 84d20909bca4ba..076a17f99ede8e 100644 --- a/versions/f-/fizz.json +++ b/versions/f-/fizz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "522047f79c1dde2cfbc509a21b4f1faf910efb12", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "2ff51a6f541e733b1c5ae13927be1fd83c7ea977", "version-string": "2020.10.19.00", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 827da2bec249c4..28e912a52ddf90 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a11b9cd2ca209a5277f7b90bc8d1c6c6b501079", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "d7afcb1c0bffe2133bdb889652977a7c31937828", "version-string": "2020.10.19.00", diff --git a/versions/p-/proxygen.json b/versions/p-/proxygen.json index 326f97c3419466..24859be6070a5e 100644 --- a/versions/p-/proxygen.json +++ b/versions/p-/proxygen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4a04ef230bcd866c6c1a078ac3e11d926333b21", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "bfaabcaacfc585c9597b455a0853c1f4497e6e69", "version-string": "2020.10.19.00", diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 4e0e8260b62992..5e0cca721eb777 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2d3e38a4ca6467154bf1a46fd2663d937c3858b", + "version": "1.22", + "port-version": 0 + }, { "git-tree": "bc5ea971009318ab7528c34d8ef715c3e59ed96e", "version-string": "2019-09-02", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index ef1fa5c75dc9c6..d926e2391ee137 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33504d33db8201730839751693d6c4f643f7e0c9", + "version": "0.7.0", + "port-version": 0 + }, { "git-tree": "3d7345924811530e7b9a5e0b3ae588bbb32be2b1", "version-string": "2020-05-25", diff --git a/versions/w-/wangle.json b/versions/w-/wangle.json index 1b2e88f0d18b62..80d9cd9a5f87c4 100644 --- a/versions/w-/wangle.json +++ b/versions/w-/wangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "070f35ba95d1f0b817f225896daa7bd48ce3e47d", + "version-string": "2021.06.14.00", + "port-version": 0 + }, { "git-tree": "ec02b3b7d30905067fdd9af8ae6e11652ea78a00", "version-string": "2020.10.19.00", From e7eb720558e7048992a19bfef82f1f368c87b7c1 Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Wed, 7 Jul 2021 23:15:45 +0200 Subject: [PATCH 0085/1858] [cctag] Add new port (#16719) * [cctag] add port * [cctag] using version-semver * [cctag] fix for multithreaded compilation * [cctag] update ci.baseline * [cctag] fix format json * [cctag] fix version with semver * [cctag] update version sha * [cctag] v1.0.0-rc2 * [cctag] v1.0.0-rc3 with vcpkg_copy_tools(), much simpler * [cctag] update port file * [cctag] v1.0.0-rc4 * [cctag] update version file * [cctag] v1.0.0 * [cctag] update version file v1.0.0 --- ports/cctag/portfile.cmake | 49 +++++++++++++++++++++++++++++++++++ ports/cctag/vcpkg.json | 52 ++++++++++++++++++++++++++++++++++++++ scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 +++ versions/c-/cctag.json | 9 +++++++ 5 files changed, 115 insertions(+) create mode 100644 ports/cctag/portfile.cmake create mode 100644 ports/cctag/vcpkg.json create mode 100644 versions/c-/cctag.json diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake new file mode 100644 index 00000000000000..36cf48c04c4950 --- /dev/null +++ b/ports/cctag/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alicevision/cctag + REF v1.0.0 + SHA512 49028356215dd703727b2eedd6aa72d81af84e5ca36f8dc7e9caf85a85c7f500b3eeaaa7369314a40049a72593d70049b709b453c30ff352d98ab0dea3afef76 + HEAD_REF develop +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + cuda CCTAG_WITH_CUDA + apps CCTAG_BUILD_APPS +) + +if("cuda" IN_LIST FEATURES) + include(${CURRENT_INSTALLED_DIR}/share/vcpkg_find_cuda/vcpkg_find_cuda.cmake) + vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) + + message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") +endif() + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DCCTAG_BUILD_TESTS:BOOL=OFF ${FEATURE_OPTIONS} +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CCTag) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + +# remove test files +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/geometry/test" "${CURRENT_PACKAGES_DIR}/include/cctag/test") +# remove cuda headers +if(NOT "cuda" IN_LIST FEATURES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cctag/cuda") +endif() + + # move the bin directory to tools +if ("apps" IN_LIST FEATURES) + set(CCTAG_TOOLS detection regression simulation) + vcpkg_copy_tools(TOOL_NAMES ${CCTAG_TOOLS} AUTO_CLEAN) +endif() + +file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctag RENAME copyright) \ No newline at end of file diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json new file mode 100644 index 00000000000000..b90383fc79d1ed --- /dev/null +++ b/ports/cctag/vcpkg.json @@ -0,0 +1,52 @@ +{ + "name": "cctag", + "version-semver": "1.0.0", + "maintainers": "alicevision-team@googlegroups.com", + "description": "Computer vision library for detecting CCTag markers made up of concentric circles", + "homepage": "https://github.com/alicevision/CCTag", + "documentation": "https://cctag.readthedocs.io/", + "supports": "!(uwp | arm | arm64 | android | x86)", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-container", + "boost-date-time", + "boost-exception", + "boost-filesystem", + "boost-iterator", + "boost-lexical-cast", + "boost-math", + "boost-mpl", + "boost-multi-array", + "boost-program-options", + "boost-ptr-container", + "boost-serialization", + "boost-spirit", + "boost-stacktrace", + "boost-static-assert", + "boost-test", + "boost-thread", + "boost-throw-exception", + "boost-timer", + "boost-type-traits", + "boost-unordered", + "eigen3", + "opencv3", + "tbb" + ], + "features": { + "apps": { + "description": "Sample applications for detecting CCTag markers in images and videos", + "dependencies": [ + "boost-program-options", + "boost-system" + ] + }, + "cuda": { + "description": "Enable Cuda support for faster detection", + "dependencies": [ + "cuda" + ] + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f8f39297af4904..d81db9b1ba9b11 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -91,6 +91,7 @@ catch-classic:x64-windows-static-md=skip catch-classic:x86-windows = skip ccd:arm-uwp=fail ccd:x64-uwp=fail +cctag:x64-windows-static-md=fail cello:arm-uwp=fail cello:x64-uwp=fail cfitsio:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index b65f6934337b37..ba7a0da077e289 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1160,6 +1160,10 @@ "baseline": "2.5", "port-version": 7 }, + "cctag": { + "baseline": "1.0.0", + "port-version": 0 + }, "cctz": { "baseline": "2.3-2", "port-version": 0 diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json new file mode 100644 index 00000000000000..fafc644be20c20 --- /dev/null +++ b/versions/c-/cctag.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8abc2227c7e5fc5232f928d407d5dac772afb48b", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} From 622365a30f02ab4243a8bb07147c207d99741846 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 7 Jul 2021 18:24:13 -0700 Subject: [PATCH 0086/1858] Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used (#18858) Alternative resolution of https://github.com/microsoft/vcpkg/pull/18846/ --- ports/gl3w/CONTROL | 5 ----- ports/gl3w/portfile.cmake | 25 +++++++++++++++---------- ports/gl3w/vcpkg.json | 10 ++++++++++ versions/baseline.json | 4 ++-- versions/g-/gl3w.json | 5 +++++ 5 files changed, 32 insertions(+), 17 deletions(-) delete mode 100644 ports/gl3w/CONTROL create mode 100644 ports/gl3w/vcpkg.json diff --git a/ports/gl3w/CONTROL b/ports/gl3w/CONTROL deleted file mode 100644 index 02550fdc5d2eab..00000000000000 --- a/ports/gl3w/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gl3w -Version: 2018-05-31-2 -Homepage: https://github.com/skaslev/gl3w -Description: Simple OpenGL core profile loading -Build-Depends: opengl-registry diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake index da12c18cbbe4ce..1cf3e0f2beba9f 100644 --- a/ports/gl3w/portfile.cmake +++ b/ports/gl3w/portfile.cmake @@ -8,19 +8,27 @@ vcpkg_from_github( 0001-enable-shared-build.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h DESTINATION ${SOURCE_PATH}/include/GL) +# Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used +vcpkg_download_distfile(KHRPLATFORM_H + URLS "https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h" + FILENAME khrplatform.h + SHA512 93d9075718eddb69c44482acdc72bbbd3511741272a6124d05ab1ef0702ef03e918501403b6fd334faf2c61f3332f34b7730158aa090db3d448c32b5dd9d9e67 + ) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL") +file(COPY "${KHRPLATFORM_H}" DESTINATION "${SOURCE_PATH}/include/KHR") vcpkg_find_acquire_program(PYTHON3) vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${SOURCE_PATH}/gl3w_gen.py - WORKING_DIRECTORY ${SOURCE_PATH} + COMMAND "${PYTHON3}" "${SOURCE_PATH}/gl3w_gen.py" + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME gl3w-gen ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) @@ -30,10 +38,7 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(HEADER ${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h) - file(READ ${HEADER} _contents) - string(REPLACE "#define GL3W_API" "#define GL3W_API __declspec(dllimport)" _contents "${_contents}") - file(WRITE ${HEADER} "${_contents}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)") endif() -file(INSTALL ${SOURCE_PATH}/UNLICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gl3w RENAME copyright) +file(INSTALL "${SOURCE_PATH}/UNLICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gl3w/vcpkg.json b/ports/gl3w/vcpkg.json new file mode 100644 index 00000000000000..f38702da242839 --- /dev/null +++ b/ports/gl3w/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gl3w", + "version-date": "2018-05-31", + "port-version": 3, + "description": "Simple OpenGL core profile loading", + "homepage": "https://github.com/skaslev/gl3w", + "dependencies": [ + "opengl-registry" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ba7a0da077e289..3d5327d7e9dce5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2285,8 +2285,8 @@ "port-version": 0 }, "gl3w": { - "baseline": "2018-05-31-2", - "port-version": 0 + "baseline": "2018-05-31", + "port-version": 3 }, "glad": { "baseline": "0.1.34", diff --git a/versions/g-/gl3w.json b/versions/g-/gl3w.json index 0cfc000c43214a..a718bca62bd5d1 100644 --- a/versions/g-/gl3w.json +++ b/versions/g-/gl3w.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbd82479631534cfe954646d63d29734c3b7728f", + "version-date": "2018-05-31", + "port-version": 3 + }, { "git-tree": "7786d613957355b4d238d8fd2278f78fbab5a886", "version-string": "2018-05-31-2", From e9a041d90d9173aa77f0576a299bf7fa850255c8 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 8 Jul 2021 00:17:17 -0700 Subject: [PATCH 0087/1858] [azure-core-cpp] Update to 1.1.0 (#18779) * [azure-core-cpp] Update to 1.1.0 ## 1.1.0 (2021-07-02) ### Bugs Fixed - Fixed a memory leak issue in `Base64Encode()`. (A community contribution, courtesy of _[jorgen](https://github.com/jorgen)_) ### Other Changes - Made internal-only changes to support the Azure Key Vault client library. ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Jorgen Lind _([GitHub](https://github.com/jorgen))_ * [azure-storage-common-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a memory leak issue while parsing XML. * [azure-storage-blobs-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob. * [azure-storage-files-datalake-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob. * [azure-storage-files-shares-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) No API changes since `12.0.0`. * Remove curl version from vcpkg manifest * Update version files Co-authored-by: Anton Kolesnyk --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 5 +++-- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 8 +++++--- ports/azure-storage-common-cpp/portfile.cmake | 4 ++-- ports/azure-storage-common-cpp/vcpkg.json | 8 +++++--- ports/azure-storage-files-datalake-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-datalake-cpp/vcpkg.json | 8 +++++--- ports/azure-storage-files-shares-cpp/portfile.cmake | 4 ++-- ports/azure-storage-files-shares-cpp/vcpkg.json | 8 +++++--- versions/a-/azure-core-cpp.json | 5 +++++ versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-files-datalake-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 10 +++++----- 16 files changed, 63 insertions(+), 29 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index d1e06d0b573dc0..4f83c7daa23b37 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.0.0 - SHA512 84b1f56103677166b0bff1aa4837fed950545a4851e260f3aaf304d797d7fb270b5dc52d373fcb73de0c3e6a9366d860ff4f4d90eae9ba3f8e2ffe4eb211e3f2 + REF azure-core_1.1.0 + SHA512 83d8ba283179531fbd5b1e81b468b5fdb1d3aa846b2b9edd579a4e56a44f412986ad3558c98009a274e8c8fda301a5a434caf62dd990e3d9e8b07993d5218520 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 8cf29fd1a9f75f..496f70b0e46fe0 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,12 +1,13 @@ { "name": "azure-core-cpp", - "version-semver": "1.0.0", + "version-semver": "1.1.0", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/core/azure-core", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "openssl", diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index fa93714038d557..e046137a5e59d5 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.0.0 - SHA512 1e7b30c99131fa69ec7a7255a6c192e47b39d62347dc417fc71934f6ff73287e1639fb8daf96a74e3e6c7414fa7a338594169e365ab731b2ea7868fbe9410aff + REF azure-storage-blobs_12.0.1 + SHA512 401905e0c593a34a5985e73ef529989bd42a268c52c9b0623965e062d47667e37be3648ee7df3bdfe5f965534796c6aab87eaeb0fec261a263c036bc0ee53d23 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 01306454a8681e..62eb9e91e53b27 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-blobs", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.0.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 913075574662e6..79a3ceda75bdfc 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.0.0 - SHA512 3e1dc8cb7a3cbf6384f20ce263eb7cbb3ccc428ea2f1314b182d48534dfeb5094fe56316e9777389a9c8aee104f2774a6014b4e9cf1d4d90401059b458996b92 + REF azure-storage-common_12.0.1 + SHA512 72f345fb128888f40485112a4d8a95837f93bdd6667c532cab17c35a471c7081d7a0c72625b3853cd51ec8c06357af6235434e8876eb7850fd5f5f532b8a6fbd ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index dec543c059b98e..fa955270ce04fe 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-common", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.0.0" }, "libxml2", { diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index df5b5620bf9bca..0107feffb06e44 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.0.0 - SHA512 481ea3e314574a66ab9ccd7fc306f9c6624f8925e2f8207899e234de218f471cb6a467c2bfe890fb56f4f3c09e9eccb41a12458caad3187d2c177e898ddaa821 + REF azure-storage-files-datalake_12.0.1 + SHA512 2f952f7b300b90ff1ade6165ccd9e0441a5155797334a3c327c47dd35c5e9e54fc16ee737d6dceb68f5d898358325fed9cbccecbbe2b032b791929a2ececce3c ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index ffb8633ad1355d..79a8a8b80301ef 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-datalake", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-blobs-cpp", - "default-features": false + "default-features": false, + "version>=": "12.0.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 0bc5ec77ec51e4..612afb3ffb007f 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.0.0 - SHA512 6554c84caae7e57f7a1e1d696a75c1c7b012eae4326d9a6b6fd4381b6c6eb8db4bec83e28430c5e8f4660ca3cab7da8cdbf8b2041f72ae32a36d48b6baa0e48c + REF azure-storage-files-shares_12.0.1 + SHA512 d38dcf6bca6047b15972199c2bce2ca463b9ce83106703ac5395c3b91ebc3b3ec8e4dabc63703a7fc9700102eaf222dc476625c762bd78747dfca93bd287ce3f ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 6f82b759fdbe96..73a2d9c82817b8 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.0.0", + "version-semver": "12.0.1", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/storage/azure-storage-files-shares", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.0.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 9211c149f79968..f0d6d6571ae52e 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b330962cc2223833ef92e2be4e8d7e825dd3e141", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "15d579e95b536829e42fc2fda4c8b6365180eb3a", "version-semver": "1.0.0", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 1058f4c0628305..9360d7da82ac53 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07131431279c91d81edd9ec56005ee8628c3efdb", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "71e03bcc9bb5f7443f1db8724b6cc4fd4e43647b", "version-semver": "12.0.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index c8ac1fbef7e6b9..fba5190b1da0b0 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4ce9c53796add134d3ce8f29a9be4e33eba6c2a", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "2f672ff6a49e9d420141dc67013b50726f85684c", "version-semver": "12.0.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index ee56e63c8a841c..d677d463b89563 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "305658dfe1b6b28abc8be014794e6b21e8ba5722", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "392c7e0294f16ed82323ccc8b5b7961f20b0b2e3", "version-semver": "12.0.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index 199740ca765709..e574f13dd00e6c 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70c68c7920b221b2b571ba85d48ba215c0e9cb58", + "version-semver": "12.0.1", + "port-version": 0 + }, { "git-tree": "354a077c26bd9cce9ade81180e2f9b1dfaf6f514", "version-semver": "12.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3d5327d7e9dce5..46fef4b8236ce3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -265,7 +265,7 @@ "port-version": 1 }, "azure-core-cpp": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "azure-identity-cpp": { @@ -293,11 +293,11 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-storage-cpp": { @@ -305,11 +305,11 @@ "port-version": 0 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.0.0", + "baseline": "12.0.1", "port-version": 0 }, "azure-uamqp-c": { From 25545a6ac8e31763c72c4c15bc759030109b4522 Mon Sep 17 00:00:00 2001 From: Twice Date: Fri, 9 Jul 2021 00:03:30 +0800 Subject: [PATCH 0088/1858] [protopuf] Update to 2.1.0 (#18757) * [protopuf] update to 2.1.0 * [protopuf] add version info --- ports/protopuf/portfile.cmake | 4 ++-- ports/protopuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protopuf.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/protopuf/portfile.cmake b/ports/protopuf/portfile.cmake index 083e72d58686d1..80b7535e484873 100644 --- a/ports/protopuf/portfile.cmake +++ b/ports/protopuf/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PragmaTwice/protopuf - REF v2.0.0 - SHA512 30af4132e9fa04936da2d9639b98cc0080cb71a5a0bea8cdba149eb0948327b4427b2ea84c18d3302850b5ba63995101c5fd76f8f293f3419c3b037f9470aed1 + REF v2.1.0 + SHA512 328fe2a861009c8eaa38299bf1ba31d3a47d73220018d3539b8457bb1d5d512c05e9652769a0261f0ae18be4e1e4e839e5471dfabdf0e6d130361e719ff6aadc HEAD_REF master ) diff --git a/ports/protopuf/vcpkg.json b/ports/protopuf/vcpkg.json index 959330012fcd92..82833fd83a84e7 100644 --- a/ports/protopuf/vcpkg.json +++ b/ports/protopuf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "protopuf", - "version-semver": "2.0.0", + "version-semver": "2.1.0", "description": "A little, highly templated, and protobuf-compatible serialization/deserialization library written in C++20", "homepage": "https://github.com/PragmaTwice/protopuf" } diff --git a/versions/baseline.json b/versions/baseline.json index 46fef4b8236ce3..b5232c1f4c40c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5009,7 +5009,7 @@ "port-version": 0 }, "protopuf": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "protozero": { diff --git a/versions/p-/protopuf.json b/versions/p-/protopuf.json index 4b20ed99ebdbfe..824b017b3f93c4 100644 --- a/versions/p-/protopuf.json +++ b/versions/p-/protopuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ba0da5deda1a9f0acd728f149206d1c1c5644a1", + "version-semver": "2.1.0", + "port-version": 0 + }, { "git-tree": "96530b73da47255f08d702838bc39791a8fcbb32", "version-semver": "2.0.0", From 2c10130400a83b5e350fc4b504d2781899bde38e Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 9 Jul 2021 01:50:43 +0800 Subject: [PATCH 0089/1858] [utf8proc] Export cmake targets (#18860) * [utf8proc] Export cmake targets * Update the baseline version --- ports/utf8proc/CONTROL | 4 ---- ports/utf8proc/export-cmake-targets.patch | 27 ++++++++++++++++++++++ ports/utf8proc/portfile.cmake | 28 +++++++++++++++-------- ports/utf8proc/vcpkg.json | 16 +++++++++++++ versions/baseline.json | 2 +- versions/u-/utf8proc.json | 5 ++++ 6 files changed, 67 insertions(+), 15 deletions(-) delete mode 100644 ports/utf8proc/CONTROL create mode 100644 ports/utf8proc/export-cmake-targets.patch create mode 100644 ports/utf8proc/vcpkg.json diff --git a/ports/utf8proc/CONTROL b/ports/utf8proc/CONTROL deleted file mode 100644 index 8dd63aebcc52de..00000000000000 --- a/ports/utf8proc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: utf8proc -Version: 2.5.0 -Homepage: https://github.com/JuliaLang/utf8proc -Description: Clean C library for processing UTF-8 Unicode data. diff --git a/ports/utf8proc/export-cmake-targets.patch b/ports/utf8proc/export-cmake-targets.patch new file mode 100644 index 00000000000000..9c75e4a46b88dc --- /dev/null +++ b/ports/utf8proc/export-cmake-targets.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea6b80e..5e5e829 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -22,7 +22,7 @@ add_library (utf8proc + ) + + # expose header path, for when this is part of a larger cmake project +-target_include_directories(utf8proc PUBLIC .) ++target_include_directories(utf8proc PUBLIC $ $) + + if (BUILD_SHARED_LIBS) + # Building shared library +@@ -51,10 +51,13 @@ set_target_properties (utf8proc PROPERTIES + + if (UTF8PROC_INSTALL) + install(TARGETS utf8proc ++ EXPORT unofficial-utf8proc-config + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + ++ install(EXPORT unofficial-utf8proc-config DESTINATION share/unofficial-utf8proc) ++ + install( + FILES + "${PROJECT_SOURCE_DIR}/utf8proc.h" diff --git a/ports/utf8proc/portfile.cmake b/ports/utf8proc/portfile.cmake index b4629defa524bc..e8e4f9c05db097 100644 --- a/ports/utf8proc/portfile.cmake +++ b/ports/utf8proc/portfile.cmake @@ -1,25 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JuliaLang/utf8proc - REF 0890a538bf8238cded9be0c81171f57e43f2c755 # v2.5.0 - SHA512 5daca349dc9ba6575efbd93d7a4e072202a2e1c2e55233d2e52be20586bb5fb26455654a77ec53336e9cdf59806457d1c31d1a926f7ef5bdd56b0232d96190dc + REF 3203baa7374d67132384e2830b2183c92351bffc # v2.6.1 + SHA512 582831c4c2d118f1c6f9e6de812878b96428d8fa1b9a2bbca32633a3853cb1981c917c724d2a8db51282ed13fd1654ca45f5d227731f5b90b17e7fc3acc93b07 + PATCHES + export-cmake-targets.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA) + OPTIONS + -DUTF8PROC_ENABLE_TESTING=OFF + -DUTF8PROC_INSTALL=ON +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-utf8proc CONFIG_PATH share/unofficial-utf8proc) -vcpkg_install_cmake() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(READ ${CURRENT_PACKAGES_DIR}/include/utf8proc.h UTF8PROC_H) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(READ "${CURRENT_PACKAGES_DIR}/include/utf8proc.h" UTF8PROC_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) string(REPLACE "defined UTF8PROC_SHARED" "0" UTF8PROC_H "${UTF8PROC_H}") else() string(REPLACE "defined UTF8PROC_SHARED" "1" UTF8PROC_H "${UTF8PROC_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/utf8proc.h "${UTF8PROC_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/utf8proc.h" "${UTF8PROC_H}") -file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/utf8proc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/utf8proc/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/utf8proc/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/utf8proc/vcpkg.json b/ports/utf8proc/vcpkg.json new file mode 100644 index 00000000000000..4ecd90926b7e3c --- /dev/null +++ b/ports/utf8proc/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "utf8proc", + "version": "2.6.1", + "description": "Clean C library for processing UTF-8 Unicode data.", + "homepage": "https://github.com/JuliaLang/utf8proc", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b5232c1f4c40c5..2273b9db88d367 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6465,7 +6465,7 @@ "port-version": 0 }, "utf8proc": { - "baseline": "2.5.0", + "baseline": "2.6.1", "port-version": 0 }, "utfcpp": { diff --git a/versions/u-/utf8proc.json b/versions/u-/utf8proc.json index 3c2983307ce655..bfe00d35236fb2 100644 --- a/versions/u-/utf8proc.json +++ b/versions/u-/utf8proc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "659423c8c76de9194980ba25a2755bde258ed173", + "version": "2.6.1", + "port-version": 0 + }, { "git-tree": "2b0e7ac6367f7dbe8fc0e6fea7d0ad81cbbedba6", "version-string": "2.5.0", From eb8a714e2840e4876305e548f076f65c73b2e7fe Mon Sep 17 00:00:00 2001 From: Xing Ji <33065325+jixingcn@users.noreply.github.com> Date: Fri, 9 Jul 2021 01:51:05 +0800 Subject: [PATCH 0090/1858] [gli] upgrade the gli to latest (#18715) * upgrade the gli to latest * update the version of gli * update the version of gli * [gli] Revert patch, use date scheme Co-authored-by: Robert Schumacher --- ports/gli/CONTROL | 5 ----- ports/gli/portfile.cmake | 6 +++--- ports/gli/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/g-/gli.json | 5 +++++ 5 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 ports/gli/CONTROL create mode 100644 ports/gli/vcpkg.json diff --git a/ports/gli/CONTROL b/ports/gli/CONTROL deleted file mode 100644 index ffd0ea80449d21..00000000000000 --- a/ports/gli/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gli -Version: dd17acf-1 -Build-Depends: glm -Description: OpenGL Image (GLI) -Homepage: https://gli.g-truc.net \ No newline at end of file diff --git a/ports/gli/portfile.cmake b/ports/gli/portfile.cmake index c958eb95ba6dc9..5168aca1e5d738 100644 --- a/ports/gli/portfile.cmake +++ b/ports/gli/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/gli - REF dd17acf9cc7fc6e6abe9f9ec69949eeeee1ccd82 - SHA512 9e3a4ab9ee73d5c271b8346cf81339cd3cd0c20d20991524b816313b6a99e8d3a01863316a38cf1a52ef9c5b31d689ecccf6248b12d1d270460c048bf904650b + REF 779b99ac6656e4d30c3b24e96e0136a59649a869 + SHA512 6e7ab46b7943cb185c8c1f6e45b765f5463e03628973043a0e8b866458ccceb5249f69a2a77b5e69c73f3ace85af96c7b9b2137685ceb6d0fcb67e491a49be69 HEAD_REF master PATCHES disable-test.patch @@ -17,7 +17,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli TARGET_PATH share/gli) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/gli) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) diff --git a/ports/gli/vcpkg.json b/ports/gli/vcpkg.json new file mode 100644 index 00000000000000..e1d746619608c9 --- /dev/null +++ b/ports/gli/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "gli", + "version-date": "2021-07-06", + "description": "OpenGL Image (GLI)", + "homepage": "https://gli.g-truc.net", + "dependencies": [ + "glm" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2273b9db88d367..5764d1ebb854ad 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2305,7 +2305,7 @@ "port-version": 0 }, "gli": { - "baseline": "dd17acf-1", + "baseline": "2021-07-06", "port-version": 0 }, "glib": { diff --git a/versions/g-/gli.json b/versions/g-/gli.json index 07cfbac5b5e035..bf68470d3fbaa8 100644 --- a/versions/g-/gli.json +++ b/versions/g-/gli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8960dd5e56bd32e4cd09edacd38a7a311e05fcd", + "version-date": "2021-07-06", + "port-version": 0 + }, { "git-tree": "d6453871d306fd1f5501954f4b3722f97cd525d4", "version-string": "dd17acf-1", From 67bc86b44d1893c5bd8fd934892f9ad029116337 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Thu, 8 Jul 2021 19:51:32 +0200 Subject: [PATCH 0091/1858] [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 c8e1403716eb8b..00000000000000 --- 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 55703492df19fa..fda45303cc87cb 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 00000000000000..aae619a1e56c20 --- /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 5764d1ebb854ad..f5c94fe903d8c3 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 d29b982255cc4d..d05d0ecf2306ca 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", From a05715dec2ae10c113a156e73a6f0390acdd3d5a Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 8 Jul 2021 19:53:01 +0200 Subject: [PATCH 0092/1858] [sentry-native] Update to 0.4.11 (#18856) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 6 +++--- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index e810d504ced2b7..7fac38cf575ae0 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -3,9 +3,9 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.10/sentry-native.zip" - FILENAME "sentry-native-0.4.10.zip" - SHA512 fd7aa8de707b19dfc3704e3f1d73bb35aa65cf26e95df0baf2061ce756232b76b26d406ffc11b53e57d949f5f14899265095d8d4d3f8ff4777cdeceeca5b6f94 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.11/sentry-native.zip" + FILENAME "sentry-native-0.4.11.zip" + SHA512 3d66295526c0cd068a0b7c2180dbeae7594775b3eb3199a74da7efe634cbc19cff6eba8d44b1479037c43c6eb58a9ba4fdaf8da6995767f27c585a0d42582c37 ) vcpkg_extract_source_archive_ex( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 131b08ce3b6f0f..afbe40dc8f3dc1 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sentry-native", - "version-semver": "0.4.10", + "version-semver": "0.4.11", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index f5c94fe903d8c3..5c01f067dd78ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5721,7 +5721,7 @@ "port-version": 0 }, "sentry-native": { - "baseline": "0.4.10", + "baseline": "0.4.11", "port-version": 0 }, "septag-sx": { diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 995604ea7dfcf1..1d4503503aa30f 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8343307e093e40faaf7e894be6aed4f60cb327d0", + "version-semver": "0.4.11", + "port-version": 0 + }, { "git-tree": "487eaee55f15e263063288c15aab12d296ac598f", "version-semver": "0.4.10", From 23325f2639a3c81816afbf8218896c12ff5dd3ac Mon Sep 17 00:00:00 2001 From: Charlie Barto Date: Thu, 8 Jul 2021 11:04:14 -0700 Subject: [PATCH 0093/1858] [ avcpp ] Update version (#18436) * remove avcpp patch that was accepted upstream. revert port version * update versions --- .../0001-remove-problematic-compound-literal.patch | 14 -------------- ports/avcpp/portfile.cmake | 5 ++--- ports/avcpp/vcpkg.json | 3 +-- versions/a-/avcpp.json | 5 +++++ versions/baseline.json | 4 ++-- 5 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 ports/avcpp/0001-remove-problematic-compound-literal.patch diff --git a/ports/avcpp/0001-remove-problematic-compound-literal.patch b/ports/avcpp/0001-remove-problematic-compound-literal.patch deleted file mode 100644 index aa6c58cc234617..00000000000000 --- a/ports/avcpp/0001-remove-problematic-compound-literal.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/avutils.h b/src/avutils.h -index 29c4ae0..3bfaf82 100644 ---- a/src/avutils.h -+++ b/src/avutils.h -@@ -42,7 +42,7 @@ namespace av { - // Basic FFmpeg constants - constexpr auto NoPts = static_cast(AV_NOPTS_VALUE); - constexpr auto TimeBase = static_cast(AV_TIME_BASE); --constexpr auto TimeBaseQ = static_cast(AV_TIME_BASE_Q); -+constexpr auto TimeBaseQ = AVRational{1, AV_TIME_BASE}; - - - template - diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index c472590ee1e34b..fcbf37585e8839 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -4,11 +4,10 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO h4tr3d/avcpp - REF d1a39cf6e1ccfe78ababe5a65d02d57f1e65bea1 - SHA512 48eb3bdd8729c9f61c53b152f0bb7283b40d2c8f043a1d6bb4fb1fadb0ceebf754822eeb7fa85edcacbca267eea0999dd9e78e378b04984db6dc25f9a6fab7d0 + REF fa9a1ef70bbf9e9f3963fbaa4540e8aac4ad8daa + SHA512 e0821d8e01e0fdb28d58564c87cafa7f9349b1b31dc90d4f2ea4c22c51fc16555f4a01f30d7575798138067921a011faa10e4d2ac2ac02acdf224546724e0338 HEAD_REF master PATCHES - 0001-remove-problematic-compound-literal.patch 0002-av_init_packet_deprecation.patch ) diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json index 8a2495d98e80c5..9f1e0673844488 100644 --- a/ports/avcpp/vcpkg.json +++ b/ports/avcpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "avcpp", - "version-date": "2021-05-06", - "port-version": 1, + "version-date": "2021-06-14", "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", "homepage": "https://github.com/h4tr3d/avcpp", "dependencies": [ diff --git a/versions/a-/avcpp.json b/versions/a-/avcpp.json index 56837510f3e241..4b4edbcc803fd2 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19", + "version-date": "2021-06-14", + "port-version": 0 + }, { "git-tree": "102cfc337c2a08e57246c399812a540315ae4531", "version-date": "2021-05-06", diff --git a/versions/baseline.json b/versions/baseline.json index 5c01f067dd78ba..61cd12944d1de3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -221,8 +221,8 @@ "port-version": 0 }, "avcpp": { - "baseline": "2021-05-06", - "port-version": 1 + "baseline": "2021-06-14", + "port-version": 0 }, "avisynthplus": { "baseline": "3.7.0", From 78e0a509129262318d96e712fa795865c6aacb0e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Sat, 10 Jul 2021 16:47:55 -0700 Subject: [PATCH 0094/1858] Update pool to get print spooler CVE fix. (#18891) --- scripts/azure-pipelines/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 9d00684dc4ae37..12d3ffd920d554 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,7 +2,7 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-06-11' + windows-pool: 'PrWin-2021-07-09' linux-pool: 'PrLin-2021-06-11' osx-pool: 'PrOsx-2021-04-16' From 6c9bd4dbc4c026aaa62649f5edd31d1ea0304a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sun, 11 Jul 2021 22:11:03 +0800 Subject: [PATCH 0095/1858] [vcpkg baseline][tensorflow] Skip osx check in baseline (#18812) * [vcpkg baseline][tensorflow] Skip osx check in baseline * move item under tensorflow:x64-osx --- scripts/ci.baseline.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d81db9b1ba9b11..3c705195b57cab 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1794,4 +1794,5 @@ dimcli:x64-windows-static=fail cppgraphqlgen:x64-osx=fail # Changes in Python have broken tensorflow on our osx hardware +tensorflow:x64-osx=fail tensorflow-cc:x64-osx=fail From 2a671fbcc4d62df005e83e5c1db0f013eec9456a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Tue, 13 Jul 2021 21:49:24 +0200 Subject: [PATCH 0096/1858] [implot] Update to 0.11 (#18909) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [implot] Update to 0.11 * [implot] Update version files Co-authored-by: Rémy Tassoux --- ports/implot/portfile.cmake | 4 ++-- ports/implot/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/implot.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/implot/portfile.cmake b/ports/implot/portfile.cmake index a4c0ce41af02ea..f0195be8c1202d 100644 --- a/ports/implot/portfile.cmake +++ b/ports/implot/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO epezent/implot - REF v0.9 - SHA512 99aad342661dd6515b1af10c5ac9bc15db28050d14ac493ef81731452bca2c876ecb2c6f1746e0ba8f251c95a884ca9fe745c8113706f5ffaee92f1b447d3179 + REF v0.11 + SHA512 161e709fcd872abd414129915501261085df531a0b5a9b33ed40422a082603627242467de59b11116948352fdb62b5d28131658b603f48692edd43429513ba29 HEAD_REF master ) diff --git a/ports/implot/vcpkg.json b/ports/implot/vcpkg.json index 4f199478118e08..be6d42b8d794b0 100644 --- a/ports/implot/vcpkg.json +++ b/ports/implot/vcpkg.json @@ -1,6 +1,6 @@ { "name": "implot", - "version": "0.9", + "version": "0.11", "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 61cd12944d1de3..4d1d347dc5fcf9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2665,7 +2665,7 @@ "port-version": 0 }, "implot": { - "baseline": "0.9", + "baseline": "0.11", "port-version": 0 }, "indicators": { diff --git a/versions/i-/implot.json b/versions/i-/implot.json index 4b7059bc1edaed..e14ae4e9381bf3 100644 --- a/versions/i-/implot.json +++ b/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cd65daef775cef7aa1fef67949dc644a4b42b73", + "version": "0.11", + "port-version": 0 + }, { "git-tree": "ae02479b485bcea0b2a659208319fa7c97ed917d", "version": "0.9", From 2ca9de6de5a10afec7e012018d18f8ed733da74b Mon Sep 17 00:00:00 2001 From: Take Vos Date: Tue, 13 Jul 2021 21:49:41 +0200 Subject: [PATCH 0097/1858] Update of the ttauri port to 0.4.0 (#18910) --- ports/ttauri/portfile.cmake | 4 ++-- ports/ttauri/vcpkg.json | 6 ++---- versions/baseline.json | 2 +- versions/t-/ttauri.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/ttauri/portfile.cmake b/ports/ttauri/portfile.cmake index 1c875eaea6f403..7a998177537592 100644 --- a/ports/ttauri/portfile.cmake +++ b/ports/ttauri/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ttauri-project/ttauri - REF v0.3.0 - SHA512 8e01ea28516063902483da3fae1ecf8524d47803b3809c289ce6bba39fd47e6ba20d8882f2cfce9a0f7101b917f51659592dfe38f0353f91977e6db7f94e0400 + REF v0.4.0 + SHA512 85a15b9d9b1b98b5811a5833415d1ab8a34b39e055959038507b3d873c3544b5193817ce8d474ffc4f8b7ad1602bc0f6401e3565225cf58a90ddee3f9f0a0731 HEAD_REF main ) diff --git a/ports/ttauri/vcpkg.json b/ports/ttauri/vcpkg.json index 192d05441e0773..7b989bb4cc3b5c 100644 --- a/ports/ttauri/vcpkg.json +++ b/ports/ttauri/vcpkg.json @@ -1,14 +1,12 @@ { "name": "ttauri", - "version": "0.3.0", + "version": "0.4.0", "maintainers": "@takev", - "description": "A portable, low latency, retained-mode GUI library written in C++.", + "description": "A portable, low latency, retained-mode GUI framework written in C++.", "homepage": "https://github.com/ttauri-project/ttauri", "license": "BSL-1.0", "supports": "windows & x64", "dependencies": [ - "date", - "fmt", "vulkan", "vulkan-memory-allocator" ] diff --git a/versions/baseline.json b/versions/baseline.json index 4d1d347dc5fcf9..f6150ef34bfdb1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6369,7 +6369,7 @@ "port-version": 0 }, "ttauri": { - "baseline": "0.3.0", + "baseline": "0.4.0", "port-version": 0 }, "turbobase64": { diff --git a/versions/t-/ttauri.json b/versions/t-/ttauri.json index 409b4dff1998aa..e44489240ff81d 100644 --- a/versions/t-/ttauri.json +++ b/versions/t-/ttauri.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "640bce2fd18c48a41a148e9c0c9ee19f6537b171", + "version": "0.4.0", + "port-version": 0 + }, { "git-tree": "053cdf5774b35c81572b9a2f398d8074e91d764f", "version": "0.3.0", From 41efa7636cc1839361bade6c6d37f515f961a2bb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 13 Jul 2021 21:51:35 +0200 Subject: [PATCH 0098/1858] [vcpkg] remove unused testing files (#18788) --- .../default-baseline-1/vcpkg.json | 8 -------- .../default-baseline-2/vcpkg.json | 8 -------- .../default-baseline-2/versions/z-/zlib.json | 14 ------------- .../version-files/ports/cat/portfile.cmake | 1 - .../version-files/ports/cat/vcpkg.json | 4 ---- .../version-files/ports/dog/portfile.cmake | 1 - .../version-files/ports/dog/vcpkg.json | 4 ---- .../version-files/ports/duck/portfile.cmake | 1 - .../version-files/ports/duck/vcpkg.json | 4 ---- .../version-files/ports/mouse/portfile.cmake | 1 - .../version-files/ports/mouse/vcpkg.json | 4 ---- .../ports_incomplete/cat/portfile.cmake | 1 - .../ports_incomplete/cat/vcpkg.json | 4 ---- .../ports_incomplete/dog/portfile.cmake | 1 - .../ports_incomplete/dog/vcpkg.json | 5 ----- .../ports_incomplete/duck/portfile.cmake | 1 - .../ports_incomplete/duck/vcpkg.json | 4 ---- .../ports_incomplete/ferret/portfile.cmake | 1 - .../ports_incomplete/ferret/vcpkg.json | 4 ---- .../ports_incomplete/fish/portfile.cmake | 1 - .../ports_incomplete/fish/vcpkg.json | 5 ----- .../ports_incomplete/mouse/portfile.cmake | 1 - .../ports_incomplete/mouse/vcpkg.json | 4 ---- .../version-files/versions/baseline.json | 20 ------------------- .../version-files/versions/c-/cat.json | 9 --------- .../version-files/versions/d-/dog.json | 9 --------- .../version-files/versions/d-/duck.json | 9 --------- .../version-files/versions/m-/mouse.json | 9 --------- .../versions_incomplete/baseline.json | 20 ------------------- .../versions_incomplete/c-/cat.json | 9 --------- .../versions_incomplete/d-/dog.json | 9 --------- .../versions_incomplete/f-/fish.json | 9 --------- .../versions_incomplete/m-/mouse.json | 9 --------- .../without-default-baseline-2/vcpkg.json | 7 ------- .../versions/z-/zlib.json | 14 ------------- 35 files changed, 215 deletions(-) delete mode 100644 scripts/testing/version-files/default-baseline-1/vcpkg.json delete mode 100644 scripts/testing/version-files/default-baseline-2/vcpkg.json delete mode 100644 scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json delete mode 100644 scripts/testing/version-files/ports/cat/portfile.cmake delete mode 100644 scripts/testing/version-files/ports/cat/vcpkg.json delete mode 100644 scripts/testing/version-files/ports/dog/portfile.cmake delete mode 100644 scripts/testing/version-files/ports/dog/vcpkg.json delete mode 100644 scripts/testing/version-files/ports/duck/portfile.cmake delete mode 100644 scripts/testing/version-files/ports/duck/vcpkg.json delete mode 100644 scripts/testing/version-files/ports/mouse/portfile.cmake delete mode 100644 scripts/testing/version-files/ports/mouse/vcpkg.json delete mode 100644 scripts/testing/version-files/ports_incomplete/cat/portfile.cmake delete mode 100644 scripts/testing/version-files/ports_incomplete/cat/vcpkg.json delete mode 100644 scripts/testing/version-files/ports_incomplete/dog/portfile.cmake delete mode 100644 scripts/testing/version-files/ports_incomplete/dog/vcpkg.json delete mode 100644 scripts/testing/version-files/ports_incomplete/duck/portfile.cmake delete mode 100644 scripts/testing/version-files/ports_incomplete/duck/vcpkg.json delete mode 100644 scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake delete mode 100644 scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json delete mode 100644 scripts/testing/version-files/ports_incomplete/fish/portfile.cmake delete mode 100644 scripts/testing/version-files/ports_incomplete/fish/vcpkg.json delete mode 100644 scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake delete mode 100644 scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json delete mode 100644 scripts/testing/version-files/versions/baseline.json delete mode 100644 scripts/testing/version-files/versions/c-/cat.json delete mode 100644 scripts/testing/version-files/versions/d-/dog.json delete mode 100644 scripts/testing/version-files/versions/d-/duck.json delete mode 100644 scripts/testing/version-files/versions/m-/mouse.json delete mode 100644 scripts/testing/version-files/versions_incomplete/baseline.json delete mode 100644 scripts/testing/version-files/versions_incomplete/c-/cat.json delete mode 100644 scripts/testing/version-files/versions_incomplete/d-/dog.json delete mode 100644 scripts/testing/version-files/versions_incomplete/f-/fish.json delete mode 100644 scripts/testing/version-files/versions_incomplete/m-/mouse.json delete mode 100644 scripts/testing/version-files/without-default-baseline-2/vcpkg.json delete mode 100644 scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json diff --git a/scripts/testing/version-files/default-baseline-1/vcpkg.json b/scripts/testing/version-files/default-baseline-1/vcpkg.json deleted file mode 100644 index 51e65c82ca1942..00000000000000 --- a/scripts/testing/version-files/default-baseline-1/vcpkg.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "default-baseline-test", - "version-string": "0", - "builtin-baseline": "fca18ba3572f8aebe3b8158c359db62a7e26134e", - "dependencies": [ - "zlib" - ] -} \ No newline at end of file diff --git a/scripts/testing/version-files/default-baseline-2/vcpkg.json b/scripts/testing/version-files/default-baseline-2/vcpkg.json deleted file mode 100644 index 34f4434588a868..00000000000000 --- a/scripts/testing/version-files/default-baseline-2/vcpkg.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "default-baseline-test-2", - "version-string": "0", - "builtin-baseline": "d5cd6b8c74ee548cfc9ff83cefdac4843cc1503f", - "dependencies": [ - "zlib" - ] -} diff --git a/scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json b/scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json deleted file mode 100644 index f5ee7cb9dc66d6..00000000000000 --- a/scripts/testing/version-files/default-baseline-2/versions/z-/zlib.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "versions": [ - { - "git-tree": "7bb2b2f3783303a4dd41163553fe4cc103dc9262", - "version-string": "1.2.11", - "port-version": 9 - }, - { - "git-tree": "4927735fa9baca564ebddf6e6880de344b20d7a8", - "version-string": "1.2.11", - "port-version": 8 - } - ] -} \ No newline at end of file diff --git a/scripts/testing/version-files/ports/cat/portfile.cmake b/scripts/testing/version-files/ports/cat/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports/cat/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/cat/vcpkg.json b/scripts/testing/version-files/ports/cat/vcpkg.json deleted file mode 100644 index b87e4a2dac957d..00000000000000 --- a/scripts/testing/version-files/ports/cat/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "cat", - "version": "1.0" -} \ No newline at end of file diff --git a/scripts/testing/version-files/ports/dog/portfile.cmake b/scripts/testing/version-files/ports/dog/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports/dog/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/dog/vcpkg.json b/scripts/testing/version-files/ports/dog/vcpkg.json deleted file mode 100644 index 028447b3e3aec4..00000000000000 --- a/scripts/testing/version-files/ports/dog/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "dog", - "version-date": "2001-01-01" -} \ No newline at end of file diff --git a/scripts/testing/version-files/ports/duck/portfile.cmake b/scripts/testing/version-files/ports/duck/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports/duck/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/duck/vcpkg.json b/scripts/testing/version-files/ports/duck/vcpkg.json deleted file mode 100644 index d780d01bfc83ef..00000000000000 --- a/scripts/testing/version-files/ports/duck/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "duck", - "version-string": "mallard" -} \ No newline at end of file diff --git a/scripts/testing/version-files/ports/mouse/portfile.cmake b/scripts/testing/version-files/ports/mouse/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports/mouse/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports/mouse/vcpkg.json b/scripts/testing/version-files/ports/mouse/vcpkg.json deleted file mode 100644 index fd6cab451f0cf1..00000000000000 --- a/scripts/testing/version-files/ports/mouse/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "mouse", - "version-semver": "1.0.0" -} \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/cat/portfile.cmake b/scripts/testing/version-files/ports_incomplete/cat/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/cat/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/cat/vcpkg.json b/scripts/testing/version-files/ports_incomplete/cat/vcpkg.json deleted file mode 100644 index d8b8fd81ec0831..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/cat/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "cat", - "version": "1.0" -} diff --git a/scripts/testing/version-files/ports_incomplete/dog/portfile.cmake b/scripts/testing/version-files/ports_incomplete/dog/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/dog/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/dog/vcpkg.json b/scripts/testing/version-files/ports_incomplete/dog/vcpkg.json deleted file mode 100644 index 847857f6cf0272..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/dog/vcpkg.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "dog", - "version-date": "2001-01-01", - "port-version": 1 -} diff --git a/scripts/testing/version-files/ports_incomplete/duck/portfile.cmake b/scripts/testing/version-files/ports_incomplete/duck/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/duck/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/duck/vcpkg.json b/scripts/testing/version-files/ports_incomplete/duck/vcpkg.json deleted file mode 100644 index f6e7aba53e5263..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/duck/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "duck", - "version-string": "mallard" -} diff --git a/scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake b/scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/ferret/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json b/scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json deleted file mode 100644 index 3c444c42c1bdd6..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/ferret/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "ferret", - "version": "1" -} diff --git a/scripts/testing/version-files/ports_incomplete/fish/portfile.cmake b/scripts/testing/version-files/ports_incomplete/fish/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/fish/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/fish/vcpkg.json b/scripts/testing/version-files/ports_incomplete/fish/vcpkg.json deleted file mode 100644 index 044ef847414e68..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/fish/vcpkg.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "fish", - "version-string": "1.0.0", - "description": "This description causes an intentional discrepancy between the local SHA and the SHA in fish.json for version 1.0.0" -} diff --git a/scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake b/scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake deleted file mode 100644 index 0015715fb66c72..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/mouse/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) \ No newline at end of file diff --git a/scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json b/scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json deleted file mode 100644 index 8cbe81f9305f6a..00000000000000 --- a/scripts/testing/version-files/ports_incomplete/mouse/vcpkg.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "mouse", - "version-semver": "1.0.0" -} diff --git a/scripts/testing/version-files/versions/baseline.json b/scripts/testing/version-files/versions/baseline.json deleted file mode 100644 index 44a4764a14fe6c..00000000000000 --- a/scripts/testing/version-files/versions/baseline.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "default": { - "cat": { - "baseline": "1.0", - "port-version": 0 - }, - "dog": { - "baseline": "2001-01-01", - "port-version": 0 - }, - "duck": { - "baseline": "mallard", - "port-version": 0 - }, - "mouse": { - "baseline": "1.0.0", - "port-version": 0 - } - } -} diff --git a/scripts/testing/version-files/versions/c-/cat.json b/scripts/testing/version-files/versions/c-/cat.json deleted file mode 100644 index e39cd6d4e8cb48..00000000000000 --- a/scripts/testing/version-files/versions/c-/cat.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "5dd257451526d5b9e560f5f35d7029ba40d88587", - "version": "1.0", - "port-version": 0 - } - ] -} diff --git a/scripts/testing/version-files/versions/d-/dog.json b/scripts/testing/version-files/versions/d-/dog.json deleted file mode 100644 index 49c086c389f7a2..00000000000000 --- a/scripts/testing/version-files/versions/d-/dog.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "e170a2ed0da7ba5d434c4a0a98ffd7a3159e3200", - "version-date": "2001-01-01", - "port-version": 0 - } - ] -} diff --git a/scripts/testing/version-files/versions/d-/duck.json b/scripts/testing/version-files/versions/d-/duck.json deleted file mode 100644 index 4f4b209e22a33c..00000000000000 --- a/scripts/testing/version-files/versions/d-/duck.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "0a52a9d722c75b3bfe47d5f5db6c9eb1a64af156", - "version-string": "mallard", - "port-version": 0 - } - ] -} diff --git a/scripts/testing/version-files/versions/m-/mouse.json b/scripts/testing/version-files/versions/m-/mouse.json deleted file mode 100644 index 139c8450fac4a1..00000000000000 --- a/scripts/testing/version-files/versions/m-/mouse.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "55ed624191e0a1905bd97af29fdf6a1d7f4e6d7c", - "version-semver": "1.0.0", - "port-version": 0 - } - ] -} diff --git a/scripts/testing/version-files/versions_incomplete/baseline.json b/scripts/testing/version-files/versions_incomplete/baseline.json deleted file mode 100644 index 7f27e5b65e0663..00000000000000 --- a/scripts/testing/version-files/versions_incomplete/baseline.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "default": { - "cat": { - "baseline": "1.0", - "port-version": 0 - }, - "dog": { - "baseline": "2001-01-01", - "port-version": 0 - }, - "duck": { - "baseline": "mallard", - "port-version": 0 - }, - "fish": { - "baseline": "1.0.0", - "port-version": 0 - } - } -} diff --git a/scripts/testing/version-files/versions_incomplete/c-/cat.json b/scripts/testing/version-files/versions_incomplete/c-/cat.json deleted file mode 100644 index f7cb466930c473..00000000000000 --- a/scripts/testing/version-files/versions_incomplete/c-/cat.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "e635ee8b3277303dfc7231d526e04f1102b56605", - "version": "1.0", - "port-version": 0 - } - ] -} diff --git a/scripts/testing/version-files/versions_incomplete/d-/dog.json b/scripts/testing/version-files/versions_incomplete/d-/dog.json deleted file mode 100644 index 49c086c389f7a2..00000000000000 --- a/scripts/testing/version-files/versions_incomplete/d-/dog.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "e170a2ed0da7ba5d434c4a0a98ffd7a3159e3200", - "version-date": "2001-01-01", - "port-version": 0 - } - ] -} diff --git a/scripts/testing/version-files/versions_incomplete/f-/fish.json b/scripts/testing/version-files/versions_incomplete/f-/fish.json deleted file mode 100644 index dc457aabde6440..00000000000000 --- a/scripts/testing/version-files/versions_incomplete/f-/fish.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "cf3be634f203c1b4152b65ec7700d5695a1fca5c", - "version-string": "1.0.0", - "port-version": 0 - } - ] -} \ No newline at end of file diff --git a/scripts/testing/version-files/versions_incomplete/m-/mouse.json b/scripts/testing/version-files/versions_incomplete/m-/mouse.json deleted file mode 100644 index 9b8ec60928476c..00000000000000 --- a/scripts/testing/version-files/versions_incomplete/m-/mouse.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "f8882feb032d2aacd83340decb0966c2dacc3fd6", - "version-semver": "1.0.0", - "port-version": 0 - } - ] -} diff --git a/scripts/testing/version-files/without-default-baseline-2/vcpkg.json b/scripts/testing/version-files/without-default-baseline-2/vcpkg.json deleted file mode 100644 index 839418fb71ecbf..00000000000000 --- a/scripts/testing/version-files/without-default-baseline-2/vcpkg.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "without-default-baseline-test-2", - "version-string": "0", - "dependencies": [ - "zlib" - ] -} \ No newline at end of file diff --git a/scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json b/scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json deleted file mode 100644 index f5ee7cb9dc66d6..00000000000000 --- a/scripts/testing/version-files/without-default-baseline-2/versions/z-/zlib.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "versions": [ - { - "git-tree": "7bb2b2f3783303a4dd41163553fe4cc103dc9262", - "version-string": "1.2.11", - "port-version": 9 - }, - { - "git-tree": "4927735fa9baca564ebddf6e6880de344b20d7a8", - "version-string": "1.2.11", - "port-version": 8 - } - ] -} \ No newline at end of file From a0bdc1b86c30352281101dfdb312f91379a442f1 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 14 Jul 2021 04:06:51 +0800 Subject: [PATCH 0099/1858] [PMDK] update to 1.11 (#18848) * [PMDK] update to 1.11.0 * update version * remove patch * update version --- ports/pmdk/CONTROL | 5 ----- ports/pmdk/portfile.cmake | 8 +++----- ports/pmdk/remove-non-ascii-character.patch | 17 ----------------- ports/pmdk/vcpkg.json | 7 +++++++ versions/baseline.json | 2 +- versions/p-/pmdk.json | 5 +++++ 6 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 ports/pmdk/CONTROL delete mode 100644 ports/pmdk/remove-non-ascii-character.patch create mode 100644 ports/pmdk/vcpkg.json diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL deleted file mode 100644 index 2c84efbfda06ec..00000000000000 --- a/ports/pmdk/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pmdk -Version: 1.9 -Homepage: https://github.com/pmem/pmdk -Description: Persistent Memory Development Kit -Supports: !(arm|x86) \ No newline at end of file diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake index 6f436e969ec2e0..60d53e11a06c3f 100644 --- a/ports/pmdk/portfile.cmake +++ b/ports/pmdk/portfile.cmake @@ -2,16 +2,14 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) vcpkg_fail_port_install(ON_ARCH "arm" "x86") -set(PMDK_VERSION "1.9") +set(PMDK_VERSION "1.11.0") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pmem/pmdk - REF 1926ffb8f3f5f0617b3b3ed32029d437c272f187 #Commit id corresponding to the version 1.9 - SHA512 dc828866291f1c4a6901de5845d21a60eb2c7951c6b5ebc680b309a4e5f7596b0d9bea663f997dff9f08f666124850aecd2219caf12bab571b4c2b63db28ec7f + REF 8583fcfd68764ac6779e6f93db89b06971b26704 #Commit id corresponding to the version 1.11.0 + SHA512 6d0a9697c97f75ac10e9e8736c2397c6ee23c26af96b65c746e0c32bc2d16f083b177e52bc399aa93c6f2e29ac6106c2696c6bbf9779788d9d19167ac07000b8 HEAD_REF master - PATCHES - remove-non-ascii-character.patch ) # Build only the selected projects diff --git a/ports/pmdk/remove-non-ascii-character.patch b/ports/pmdk/remove-non-ascii-character.patch deleted file mode 100644 index a133bee95186e0..00000000000000 --- a/ports/pmdk/remove-non-ascii-character.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/libpmemobj/critnib.c b/src/libpmemobj/critnib.c -index 41fec79..f201dbd 100644 ---- a/src/libpmemobj/critnib.c -+++ b/src/libpmemobj/critnib.c -@@ -360,9 +360,9 @@ alloc_leaf(struct critnib *__restrict c) - * crinib_insert -- write a key:value pair to the critnib structure - * - * Returns: -- * • 0 on success -- * • EEXIST if such a key already exists -- * • ENOMEM if we're out of memory -+ * 0 on success -+ * EEXIST if such a key already exists -+ * ENOMEM if we're out of memory - * - * Takes a global write lock but doesn't stall any readers. - */ diff --git a/ports/pmdk/vcpkg.json b/ports/pmdk/vcpkg.json new file mode 100644 index 00000000000000..b51a613f0ff579 --- /dev/null +++ b/ports/pmdk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pmdk", + "version": "1.11.0", + "description": "Persistent Memory Development Kit", + "homepage": "https://github.com/pmem/pmdk", + "supports": "!(arm | x86)" +} diff --git a/versions/baseline.json b/versions/baseline.json index f6150ef34bfdb1..339691058b8bea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4905,7 +4905,7 @@ "port-version": 0 }, "pmdk": { - "baseline": "1.9", + "baseline": "1.11.0", "port-version": 0 }, "pngpp": { diff --git a/versions/p-/pmdk.json b/versions/p-/pmdk.json index ab02e859f38d16..e8e653c481c8de 100644 --- a/versions/p-/pmdk.json +++ b/versions/p-/pmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2083c3fd577af1074c046235d2d0c73ad77d011", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "f71d109fdac523675cae5c60bb81194e654de8f6", "version-string": "1.9", From f2a6261c9109db8e7b9e2cbac619ca7fc6c860f6 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Tue, 13 Jul 2021 16:13:06 -0400 Subject: [PATCH 0100/1858] [python3] Update to 3.9.6 (#18754) * [python3] Bump to 3.9.6 * x-add-version * Update all tools to Python 3.9.6. --- ports/python3/portfile.cmake | 4 ++-- ports/python3/vcpkg.json | 3 +-- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++--- scripts/vcpkgTools.xml | 8 ++++---- versions/baseline.json | 4 ++-- versions/p-/python3.json | 5 +++++ 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 4ee2b825da7d4b..2765b6a196daa2 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MINOR 9) -set(PYTHON_VERSION_PATCH 5) +set(PYTHON_VERSION_PATCH 6) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -32,7 +32,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 6bef5174f133e7eb48ad54d14b07f77500ac2cdcfb397cac9f19ecaaf5334fbcc999f755719883c99c0d173b7b816a2def56537666c20e7b11cb783572fc6e00 + SHA512 a484de98044d180c3494ccf199f146516650cf7bc917b7d4a85f1e9b42b3938c2540f82298cb3f59332ae41c927e2335b4d91265de3496db4a14693a25a6a772 HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 2f562e6c6d004e..84aec1b9a3afbb 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version-string": "3.9.5", - "port-version": 1, + "version-semver": "3.9.6", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 327bc5fa5926f9..f6157aebad0cc7 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -148,17 +148,17 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "PYTHON3") if(CMAKE_HOST_WIN32) set(PROGNAME python) - set(PYTHON_VERSION 3.9.5) + set(PYTHON_VERSION 3.9.6) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(SUBDIR "python-${PYTHON_VERSION}-x86") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip") - set(HASH f0ff0760684f4d91bfe1270438e5dda691ae38a7558500d32b9a763ac9498d3ccac6e843cee5220c5e3dc841863ae3e1af256fa25354f2665cc34dc35fe4c2c7) + set(HASH 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c) else() set(SUBDIR "python-${PYTHON_VERSION}-x64") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip") - set(HASH 92ba1b50c05c6978af3dde395c66319b181bc8d6cc5921d8f63cac333d574bc7e71ad85331356b79181d4a312a6133c246eaa9da242855e1e75a316487120897) + set(HASH f8946471ed7dbc8cbffc72298f99330794b127ce6aa60abc87e80b31bd26099a2f637db85af88ce78c06dcf6e19064184ef3768edf4b1a0f97c25898e379d121) endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 16f6f27fb0dc36..4df3264db02534 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,11 +1,11 @@ - 3.9.5 + 3.9.6 python.exe - https://www.python.org/ftp/python/3.9.5/python-3.9.5-embed-win32.zip - f0ff0760684f4d91bfe1270438e5dda691ae38a7558500d32b9a763ac9498d3ccac6e843cee5220c5e3dc841863ae3e1af256fa25354f2665cc34dc35fe4c2c7 - python-3.9.5-embed-win32.zip + https://www.python.org/ftp/python/3.9.6/python-3.9.6-embed-win32.zip + 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c + python-3.9.6-embed-win32.zip 3.20.2 diff --git a/versions/baseline.json b/versions/baseline.json index 339691058b8bea..f3f4ad231a536b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5057,8 +5057,8 @@ "port-version": 1 }, "python3": { - "baseline": "3.9.5", - "port-version": 1 + "baseline": "3.9.6", + "port-version": 0 }, "qca": { "baseline": "2.3.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 1cdad20b6b1220..6b75aa7fcf7a3e 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0628d684afd26b15be6a1a6bb162e56744a442a7", + "version-semver": "3.9.6", + "port-version": 0 + }, { "git-tree": "0c58aaaa7b980102912bbd8b13ba3ac227b37bd4", "version-string": "3.9.5", From 45cd89e6f3ac59726ebe5a8badde53d19255ec48 Mon Sep 17 00:00:00 2001 From: Anichitei Ionel-Cristinel <49393881+ianichitei@users.noreply.github.com> Date: Tue, 13 Jul 2021 23:15:22 +0300 Subject: [PATCH 0101/1858] [bddisasm] Update to 1.33.0 (#18873) * Add bddisasm port Currently fetching bddisasm from my fork of the project * bddisasm: Build with BDD_INCLUDE_TOOL=OFF * bddisasm: Use PREFER_NINJA * bddisasm: Update REF * bddisasm: Don't use vcpkg_install_msbuild * bddisasm: Switch to release 1.32.1 from the bitdefender repo * Add the result of ./vcpkg x-add-version --all * Replace the control file with a manifest Converted with ./vcpkg format-manifest * Add more details to bddisasm/vcpkg.json Added port-version, license, homepage, documentation, and port mantainers * Fix bddisasm/vcpkg.json * Fix the version file * List arm as not supported * Update version file * Fail install on arm * Use the new vcpkg_cmake_* functions * Remove the LICENSE file * Fix version * Update version file * build only static library bddisasm only supports being built as a static library, so say that in the portfile * bddisasm: Update port to version 1.33.0 Co-authored-by: nicole mazzuca --- ports/bddisasm/portfile.cmake | 4 ++-- ports/bddisasm/vcpkg.json | 2 +- versions/b-/bddisasm.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 3444aa10fbf8d3..8ce6176b6cb91e 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bitdefender/bddisasm - REF v1.32.1 - SHA512 78062081ab38f208c29e1a8cd50daad9203c93ab68cb3e48250fc3b38b7bfdb6a878a995c353f63ac7a6144f305dbdc0f5d60d67558f0403a669197979143de1 + REF v1.33.0 + SHA512 d9085187026c1c362a53fcd9de1aa8872fc93d2cf6492a6f9b081396b28a8098121c62fd7aed5b1e07f0a42fbc74e781f0bc5f041363cd19ee25ac1c30ee0554 HEAD_REF master ) diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index 9dbf7e0c465f3d..a4979a22e85564 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bddisasm", - "version": "1.32.1", + "version": "1.33.0", "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index 66bde09a4dbc48..53f84baadc8f6b 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbd28192161e817afeb6526098f105788225816f", + "version": "1.33.0", + "port-version": 0 + }, { "git-tree": "252ddf848e0ed2e3c58537bf0cc09bc6ccd067f1", "version": "1.32.1", diff --git a/versions/baseline.json b/versions/baseline.json index f3f4ad231a536b..794f7bb5972c9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -333,7 +333,7 @@ "port-version": 0 }, "bddisasm": { - "baseline": "1.32.1", + "baseline": "1.33.0", "port-version": 0 }, "bde": { From 51a5a74ecd6d0027b899429c30b82d062a16be8d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 14 Jul 2021 04:15:39 +0800 Subject: [PATCH 0102/1858] [ensmallen] Update to the 2.17.0 (#18877) * [ensmallen] Update to the 2.17.0 * update version * delete PREFER_NINJA * update version --- ports/ensmallen/CONTROL | 5 ----- ports/ensmallen/portfile.cmake | 13 ++++++------- ports/ensmallen/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 2 +- versions/e-/ensmallen.json | 5 +++++ 5 files changed, 31 insertions(+), 13 deletions(-) delete mode 100644 ports/ensmallen/CONTROL create mode 100644 ports/ensmallen/vcpkg.json diff --git a/ports/ensmallen/CONTROL b/ports/ensmallen/CONTROL deleted file mode 100644 index 10d51ce79f0a94..00000000000000 --- a/ports/ensmallen/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ensmallen -Version: 2.14.2 -Homepage: https://github.com/mlpack/ensmallen -Description: A header-only C++ library for mathematical optimization. -Build-Depends: blas, lapack, armadillo diff --git a/ports/ensmallen/portfile.cmake b/ports/ensmallen/portfile.cmake index 76be857ead344b..2e1a71e1e123a6 100644 --- a/ports/ensmallen/portfile.cmake +++ b/ports/ensmallen/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mlpack/ensmallen - REF 8d9c03715346f2048e61e3e370a6a6c7a5e55d3b # 2.14.2 - SHA512 2aebdd485265f8f6adcf9eb00c78e5f79f5d19e62566bdfcd024c44443d5658a7b92ea4ca62c29041f1b512cf67f8148fdc8b6894c9aa4c69ef305580916e24a + REF 9bd4bc25275066fa03173f65e1cbd789472e8f9b # 2.17.0 + SHA512 8b665e6307e73ad3273eb28c17ec62e8d0d968623d41b5460771be41a74f6a8088ddadb1764b9b4dc496dbceae6e791895cee0997de8614dc9a7426b6db663e0 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ensmallen TARGET_PATH share/ensmallen) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ensmallen) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/COPYRIGHT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ensmallen/vcpkg.json b/ports/ensmallen/vcpkg.json new file mode 100644 index 00000000000000..f5648353cbf4b3 --- /dev/null +++ b/ports/ensmallen/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ensmallen", + "version-semver": "2.17.0", + "description": "A header-only C++ library for mathematical optimization", + "homepage": "https://github.com/mlpack/ensmallen", + "dependencies": [ + "armadillo", + "blas", + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 794f7bb5972c9e..1d13df61403923 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1869,7 +1869,7 @@ "port-version": 0 }, "ensmallen": { - "baseline": "2.14.2", + "baseline": "2.17.0", "port-version": 0 }, "entityx": { diff --git a/versions/e-/ensmallen.json b/versions/e-/ensmallen.json index 488a414f739acc..0f5add203fe078 100644 --- a/versions/e-/ensmallen.json +++ b/versions/e-/ensmallen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98fdc863799d6cadd208a558f158894df03fdcaf", + "version-semver": "2.17.0", + "port-version": 0 + }, { "git-tree": "9d153b1e8d36e03fedd90ef42d8477380cf264a4", "version-string": "2.14.2", From a87bec74fc69b6247a097785e451202dcc86b6e3 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 14 Jul 2021 14:45:18 -0500 Subject: [PATCH 0103/1858] [rollup:2021-07-06] Rollup PR (#18838) * [rollup:2021-07-06 1/8] PR #18272 (@strega-nil) [scripts-audit] vcpkg_from_* * [rollup:2021-07-06 2/8] PR #18319 (@strega-nil) [scripts-audit] add guidelines for cmake * [rollup 2021-07-06 3/8] PR #18410 (@mheyman) [vcpkg-cmake-config] documentation fix * [rollup:2021-07-06 4/8] PR #18488 (@strega-nil) [scripts-audit] vcpkg_execute_* * [rollup:2021-07-06 5/8] PR #18517 (@strega-nil) [scripts-audit] vcpkg_extract_source_archive * [rollup:2021-07-06 6/8] PR #18674 (@NancyLi1013) [vcpkg doc] Update examples * [rollup:2021-07-06 7/8] PR #18695 (@JackBoosY) [vcpkg] Update the minimum version of vcpkg * [rollup:2021-07-06 8/8] PR #18758 (@ras0219-msft) [vcpkg_from_git] Fix error if downloads folder does not exist * build docs! * fix bond:*-windows * fix nmap Co-authored-by: nicole mazzuca Co-authored-by: Michael Heyman Co-authored-by: NancyLi1013 Co-authored-by: JackBoosY Co-authored-by: Robert Schumacher --- docs/README.md | 1 + docs/maintainers/cmake-guidelines.md | 127 +++++++++ .../z_vcpkg_forward_output_variable.md | 38 +++ docs/maintainers/portfile-functions.md | 1 + .../vcpkg_cmake_config_fixup.md | 2 +- docs/maintainers/vcpkg_clean_msbuild.md | 2 +- docs/maintainers/vcpkg_download_distfile.md | 6 + .../vcpkg_execute_in_download_mode.md | 21 +- .../vcpkg_execute_required_process_repeat.md | 3 +- .../vcpkg_extract_source_archive.md | 71 ++++- .../vcpkg_extract_source_archive_ex.md | 54 +--- docs/maintainers/vcpkg_from_bitbucket.md | 1 - docs/maintainers/vcpkg_from_git.md | 11 +- docs/maintainers/vcpkg_from_sourceforge.md | 7 +- docs/maintainers/vcpkg_install_msbuild.md | 4 +- docs/regenerate.ps1 | 3 +- ports/avisynthplus/portfile.cmake | 4 +- ports/avisynthplus/vcpkg.json | 1 + ports/bond/CONTROL | 9 - ports/bond/portfile.cmake | 10 +- ports/bond/vcpkg.json | 22 ++ ports/nmap/CONTROL | 4 - ports/nmap/portfile.cmake | 33 +-- ports/nmap/vcpkg.json | 25 ++ ports/opencv3/portfile.cmake | 4 +- ports/opencv3/vcpkg.json | 1 + ports/qcustomplot/CONTROL | 4 - ports/qcustomplot/portfile.cmake | 4 +- ports/qcustomplot/vcpkg.json | 12 + ports/qt5-mqtt/CONTROL | 4 - ports/qt5-mqtt/portfile.cmake | 9 +- ports/qt5-mqtt/vcpkg.json | 12 + ports/vcpkg-cmake-config/vcpkg.json | 3 +- .../vcpkg_cmake_config_fixup.cmake | 2 +- scripts/buildsystems/vcpkg.cmake | 4 +- scripts/cmake/execute_process.cmake | 3 + scripts/cmake/vcpkg_clean_msbuild.cmake | 2 +- scripts/cmake/vcpkg_download_distfile.cmake | 15 +- .../cmake/vcpkg_execute_build_process.cmake | 191 +++++++------- .../vcpkg_execute_in_download_mode.cmake | 82 +++--- .../vcpkg_execute_required_process.cmake | 121 +++++---- ...cpkg_execute_required_process_repeat.cmake | 85 ++++-- .../cmake/vcpkg_extract_source_archive.cmake | 242 ++++++++++++++++-- .../vcpkg_extract_source_archive_ex.cmake | 156 ++--------- .../cmake/vcpkg_find_acquire_program.cmake | 4 + scripts/cmake/vcpkg_from_bitbucket.cmake | 182 +++++-------- scripts/cmake/vcpkg_from_git.cmake | 192 +++++++------- scripts/cmake/vcpkg_from_github.cmake | 204 ++++++--------- scripts/cmake/vcpkg_from_gitlab.cmake | 186 +++++++------- scripts/cmake/vcpkg_from_sourceforge.cmake | 118 ++++----- scripts/cmake/vcpkg_install_msbuild.cmake | 4 +- .../z_vcpkg_forward_output_variable.cmake | 48 ++++ scripts/detect_compiler/CMakeLists.txt | 2 +- scripts/get_cmake_vars/CMakeLists.txt | 2 +- scripts/ports.cmake | 5 +- scripts/vcpkgTools.xml | 7 - versions/a-/avisynthplus.json | 5 + versions/b-/bond.json | 5 + versions/baseline.json | 18 +- versions/n-/nmap.json | 5 + versions/o-/opencv3.json | 5 + versions/q-/qcustomplot.json | 5 + versions/q-/qt5-mqtt.json | 5 + versions/v-/vcpkg-cmake-config.json | 5 + 64 files changed, 1393 insertions(+), 1030 deletions(-) create mode 100644 docs/maintainers/cmake-guidelines.md create mode 100644 docs/maintainers/internal/z_vcpkg_forward_output_variable.md delete mode 100644 ports/bond/CONTROL create mode 100644 ports/bond/vcpkg.json delete mode 100644 ports/nmap/CONTROL create mode 100644 ports/nmap/vcpkg.json delete mode 100644 ports/qcustomplot/CONTROL create mode 100644 ports/qcustomplot/vcpkg.json delete mode 100644 ports/qt5-mqtt/CONTROL create mode 100644 ports/qt5-mqtt/vcpkg.json create mode 100644 scripts/cmake/z_vcpkg_forward_output_variable.cmake diff --git a/docs/README.md b/docs/README.md index 04d9557112125b..7ef5c0d0659269 100644 --- a/docs/README.md +++ b/docs/README.md @@ -33,6 +33,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Common CMake definitions](maintainers/vcpkg_common_definitions.md) - [Maintainer Guidelines](maintainers/maintainer-guide.md) - [Creating Registries](maintainers/registries.md) +- [CMake Guidelines](maintainers/cmake-guidelines.md) ### [Vcpkg-Tool](https://github.com/microsoft/vcpkg-tool) Maintainer Help diff --git a/docs/maintainers/cmake-guidelines.md b/docs/maintainers/cmake-guidelines.md new file mode 100644 index 00000000000000..77cdf737204148 --- /dev/null +++ b/docs/maintainers/cmake-guidelines.md @@ -0,0 +1,127 @@ +# CMake Guidelines + +We expect that all CMake scripts that are either: + +- In the `scripts/` directory, or +- In a `vcpkg-*` port + +should follow the guidelines laid out in this document. +Existing scripts may not follow these guidelines yet; +it is expected that we will continue to update old scripts +to fall in line with these guidelines. + +These guidelines are intended to create stability in our scripts. +We hope that they will make both forwards and backwards compatibility easier. + +## The Guidelines + +- Except for out-parameters, we always use `cmake_parse_arguments()` + rather than function parameters or referring to `${ARG}`. + - This doesn't necessarily need to be followed for "script-local helper functions" + - In this case, positional parameters should be put in the function + declaration (rather than using `${ARG}`), + and should be named according to local rules (i.e. `snake_case`). + - Exception: positional parameters that are optional should be + given a name via `set(argument_name "${ARG}")`, after checking `ARGC`. + - Out-parameters should be the first parameter to a function. Example: + ```cmake + function(format out_var) + cmake_parse_arguments(PARSE_ARGV 1 "arg" ...) + # ... set(buffer "output") + set("${out_var}" "${buffer}" PARENT_SCOPE) + endfunction() + ``` +- There are no unparsed or unused arguments. + Always check for `ARGN` or `arg_UNPARSED_ARGUMENTS`. + `FATAL_ERROR` when possible, `WARNING` if necessary for backwards compatibility. +- All `cmake_parse_arguments` must use `PARSE_ARGV`. +- All `foreach` loops must use `IN LISTS` and `IN ITEMS`. +- The variables `${ARGV}` and `${ARGN}` are unreferenced, + except in helpful messages to the user. + - (i.e., `message(FATAL_ERROR "blah was passed extra arguments: ${ARGN}")`) +- We always use functions, not macros or top level code. + - Exception: "script-local helper macros". It is sometimes helpful to define a small macro. + This should be done sparingly, and functions should be preferred. + - Exception: `vcpkg.cmake`'s `find_package`. +- Scripts in the scripts tree should not be expected to need observable changes + as part of normal operation. + - Example violation: `vcpkg_acquire_msys()` has hard-coded packages and versions that need updating over time due to the MSYS project dropping old packages. + - Example exception: `vcpkg_from_sourceforge()` has a list of mirrors which needs maintenance but does not have an observable behavior impact on the callers. +- All variable expansions are in quotes `""`, + except those which are intended to be passed as multiple arguments. + - Example: + ```cmake + set(working_directory "") + if(DEFINED arg_WORKING_DIRECTORY) + set(working_directory "WORKING_DIRECTORY" "${arg_WORKING_DIRECTORY}") + endif() + # calls do_the_thing() if NOT DEFINED arg_WORKING_DIRECTORY, + # else calls do_the_thing(WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}") + do_the_thing(${working_directory}) + ``` +- There are no "pointer" or "in-out" parameters + (where a user passes a variable name rather than the contents), + except for simple out-parameters. +- Variables are not assumed to be empty. + If the variable is intended to be used locally, + it must be explicitly initialized to empty with `set(foo "")`. +- All variables expected to be inherited from the parent scope across an API boundary (i.e. not a file-local function) should be documented. Note that all variables mentioned in triplets.md are considered documented. +- Out parameters are only set in `PARENT_SCOPE` and are never read. + See also the helper `z_vcpkg_forward_output_variable()` to forward out parameters through a function scope. +- `CACHE` variables are used only for global variables which are shared internally among strongly coupled + functions and for internal state within a single function to avoid duplicating work. + These should be used extremely sparingly and should use the `Z_VCPKG_` prefix to avoid + colliding with any local variables that would be defined by any other code. + - Examples: + - `vcpkg_cmake_configure`'s `Z_VCPKG_CMAKE_GENERATOR` + - `z_vcpkg_get_cmake_vars`'s `Z_VCPKG_GET_CMAKE_VARS_FILE` +- `include()`s are only allowed in `ports.cmake` or `vcpkg-port-config.cmake`. +- `foreach(RANGE)`'s arguments _must always be_ natural numbers, + and `` _must always be_ less than or equal to ``. + - This must be checked by something like: + ```cmake + if(start LESS_EQUAL end) + foreach(RANGE start end) + ... + endforeach() + endif() + ``` +- All port-based scripts must use `include_guard(GLOBAL)` + to avoid being included multiple times. +- `set(var)` should not be used. Use `unset(var)` to unset a variable, + and `set(var "")` to set it to the empty value. _Note: this works for use as a list and as a string_ + +### CMake Versions to Require + +- All CMake scripts, except for `vcpkg.cmake`, + may assume the version of CMake that is present in the + `cmake_minimum_required` of `ports.cmake`. + - This `cmake_minimum_required` should be bumped every time a new version + of CMake is added to `vcpkgTools.xml`, as should the + `cmake_minimum_required` in all of the helper `CMakeLists.txt` files. +- `vcpkg.cmake` must assume a version of CMake back to 3.1 in general + - Specific functions and options may assume a greater CMake version; + if they do, make sure to comment that function or option + with the required CMake version. + + +### Changing Existing Functions + +- Never remove arguments in non-internal functions; + if they should no longer do anything, just take them as normal and warn on use. +- Never add a new mandatory argument. + +### Naming Variables + +- `cmake_parse_arguments`: set prefix to `"arg"` +- Local variables are named with `snake_case` +- Internal global variable names are prefixed with `Z_VCPKG_`. +- External experimental global variable names are prefixed with `X_VCPKG_`. + +- Internal functions are prefixed with `z_vcpkg_` + - Functions which are internal to a single function (i.e., helper functions) + are named `[z_]_`, where `` is the name of the function they are + a helper to, and `` is what the helper function does. + - `z_` should be added to the front if `` doesn't have a `z_`, + but don't name a helper function `z_z_foo_bar`. +- Public global variables are named `VCPKG_`. diff --git a/docs/maintainers/internal/z_vcpkg_forward_output_variable.md b/docs/maintainers/internal/z_vcpkg_forward_output_variable.md new file mode 100644 index 00000000000000..10c5855df6dba0 --- /dev/null +++ b/docs/maintainers/internal/z_vcpkg_forward_output_variable.md @@ -0,0 +1,38 @@ +# z_vcpkg_forward_output_variable + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +This macro helps with forwarding values from inner function calls, +through a local function scope, into pointer out parameters. + +```cmake +z_vcpkg_forward_output_variable(ptr_to_parent_var var_to_forward) +``` + +is equivalent to + +```cmake +if(DEFINED ptr_to_parent_var) + if(DEFINED value_var) + set("${ptr_to_parent_var}" "${value_var}" PARENT_SCOPE) + else() + unset("${ptr_to_parent_var}" PARENT_SCOPE) + endif() +endif() +``` + +Take note that the first argument should be a local variable that has a value of the parent variable name. +Most commonly, this local is the result of a pointer-out parameter to a function. +If the variable in the first parameter is not defined, this function does nothing, +simplifying functions with optional out parameters. +Most commonly, this should be used in cases like: + +```cmake +function(my_function out_var) + file(SHA512 "somefile.txt" local_var) + z_vcpkg_forward_output_variable(out_var local_var) +endfunction() +``` + +## Source +[scripts/cmake/z\_vcpkg\_forward\_output\_variable.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_forward_output_variable.cmake) diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 0b8e7f3b50dbdb..d6acc6471db91c 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -58,6 +58,7 @@ - [vcpkg\_internal\_get\_cmake\_vars](internal/vcpkg_internal_get_cmake_vars.md) - [z\_vcpkg\_apply\_patches](internal/z_vcpkg_apply_patches.md) +- [z\_vcpkg\_forward\_output\_variable](internal/z_vcpkg_forward_output_variable.md) - [z\_vcpkg\_function\_arguments](internal/z_vcpkg_function_arguments.md) - [z\_vcpkg\_prettify\_command\_line](internal/z_vcpkg_prettify_command_line.md) diff --git a/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md b/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md index 33509d1174ef8a..e4b486798ca388 100644 --- a/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md +++ b/docs/maintainers/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md @@ -10,7 +10,7 @@ Additionally corrects common issues with targets, such as absolute paths and inc vcpkg_cmake_config_fixup( [PACKAGE_NAME ] [CONFIG_PATH ] - [DO_NOT_DELETE_CONFIG_PATH_PARENT] + [DO_NOT_DELETE_PARENT_CONFIG_PATH] [NO_PREFIX_CORRECTION] ) ``` diff --git a/docs/maintainers/vcpkg_clean_msbuild.md b/docs/maintainers/vcpkg_clean_msbuild.md index 00e5358682bcd1..3474076b53ac31 100644 --- a/docs/maintainers/vcpkg_clean_msbuild.md +++ b/docs/maintainers/vcpkg_clean_msbuild.md @@ -11,7 +11,7 @@ vcpkg_clean_msbuild() ## Examples -* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) +* [python3](https://github.com/Microsoft/vcpkg/blob/master/ports/python3/portfile.cmake) ## Source [scripts/cmake/vcpkg\_clean\_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_clean_msbuild.cmake) diff --git a/docs/maintainers/vcpkg_download_distfile.md b/docs/maintainers/vcpkg_download_distfile.md index 9b1bda73738566..62fde14553073b 100644 --- a/docs/maintainers/vcpkg_download_distfile.md +++ b/docs/maintainers/vcpkg_download_distfile.md @@ -13,6 +13,7 @@ vcpkg_download_distfile( URLS ... FILENAME SHA512 <5981de...> + [ALWAYS_REDOWNLOAD] ) ``` ## Parameters @@ -38,6 +39,11 @@ Skip SHA512 hash check for file. This switch is only valid when building with the `--head` command line flag. +### ALWAYS_REDOWNLOAD +Avoid caching; this is a REST call or otherwise unstable. + +Requires `SKIP_SHA512`. + ### HEADERS A list of headers to append to the download request. This can be used for authentication during a download. diff --git a/docs/maintainers/vcpkg_execute_in_download_mode.md b/docs/maintainers/vcpkg_execute_in_download_mode.md index c4931714cca6a2..a9fb5bffb806c8 100644 --- a/docs/maintainers/vcpkg_execute_in_download_mode.md +++ b/docs/maintainers/vcpkg_execute_in_download_mode.md @@ -7,28 +7,13 @@ Execute a process even in download mode. ## Usage ```cmake vcpkg_execute_in_download_mode( - COMMAND [] - [WORKING_DIRECTORY ] - [TIMEOUT ] - [RESULT_VARIABLE ] - [OUTPUT_VARIABLE ] - [ERROR_VARIABLE ] - [INPUT_FILE ] - [OUTPUT_FILE ] - [ERROR_FILE ] - [OUTPUT_QUIET] - [ERROR_QUIET] - [OUTPUT_STRIP_TRAILING_WHITESPACE] - [ERROR_STRIP_TRAILING_WHITESPACE] - [ENCODING ] + ... ) ``` -The signature of this function is identical to `execute_process()` except that -it only accepts one COMMAND argument, i.e., does not support chaining multiple -commands with pipes. +The signature of this function is identical to `execute_process()`. -See [`execute_process()`] for a detailed description of the parameters. +See [`execute_process()`] for more details. [`execute_process()`]: https://cmake.org/cmake/help/latest/command/execute_process.html diff --git a/docs/maintainers/vcpkg_execute_required_process_repeat.md b/docs/maintainers/vcpkg_execute_required_process_repeat.md index e6c9d0def13090..22dcfc4afbe827 100644 --- a/docs/maintainers/vcpkg_execute_required_process_repeat.md +++ b/docs/maintainers/vcpkg_execute_required_process_repeat.md @@ -7,10 +7,11 @@ Execute a process until the command succeeds, or until the COUNT is reached. ## Usage ```cmake vcpkg_execute_required_process_repeat( - COUNT COMMAND [] + COUNT WORKING_DIRECTORY LOGNAME + [ALLOW_IN_DOWNLOAD_MODE] ) ``` diff --git a/docs/maintainers/vcpkg_extract_source_archive.md b/docs/maintainers/vcpkg_extract_source_archive.md index 5e17d2d8d01c17..1d807edc8eb706 100644 --- a/docs/maintainers/vcpkg_extract_source_archive.md +++ b/docs/maintainers/vcpkg_extract_source_archive.md @@ -2,27 +2,74 @@ The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_extract_source_archive.md). -Extract an archive into the source directory. Deprecated in favor of [`vcpkg_extract_source_archive_ex`](vcpkg_extract_source_archive_ex.md). +Extract an archive into the source directory. ## Usage +There are two "overloads" of this function. The first is deprecated: + ```cmake -vcpkg_extract_source_archive( - <${ARCHIVE}> [<${TARGET_DIRECTORY}>] +vcpkg_extract_source_archive(<${ARCHIVE}> [<${TARGET_DIRECTORY}>]) +``` + +This overload should not be used. + +The latter is suggested to use for all future `vcpkg_extract_source_archive`s. + +```cmake +vcpkg_extract_source_archive( + ARCHIVE + [NO_REMOVE_ONE_LEVEL] + [PATCHES ...] + [SOURCE_BASE ] + [BASE_DIRECTORY | WORKING_DIRECTORY ] ) ``` -## Parameters -### ARCHIVE -The full path to the archive to be extracted. -This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). +`vcpkg_extract_source_archive` takes an archive and extracts it. +It replaces existing uses of `vcpkg_extract_source_archive_ex`. +The simplest use of it is: + +```cmake +vcpkg_download_distfile(archive ...) +vcpkg_extract_source_archive(source_path ARCHIVE "${archive}") +``` + +The general expectation is that an archives are laid out with a base directory, +and all the actual files underneath that directory; in other words, if you +extract the archive, you'll get something that looks like: + +``` +zlib-1.2.11/ + doc/ + ... + examples/ + ... + ChangeLog + CMakeLists.txt + README + zlib.h + ... +``` -### TARGET_DIRECTORY -If specified, the archive will be extracted into the target directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. +`vcpkg_extract_source_archive` automatically removes this directory, +and gives you the items under it directly. However, this only works +when there is exactly one item in the top level of an archive. +Otherwise, you'll have to pass the `NO_REMOVE_ONE_LEVEL` argument to +prevent `vcpkg_extract_source_archive` from performing this transformation. -This can be used to mimic git submodules, by extracting into a subdirectory of another archive. +If the source needs to be patched in some way, the `PATCHES` argument +allows one to do this, just like other `vcpkg_from_*` functions. -## Notes -This command will also create a tracking file named .extracted in the TARGET_DIRECTORY. This file, when present, will suppress the extraction of the archive. +`vcpkg_extract_source_archive` extracts the files to +`${CURRENT_BUILDTREES_DIR}//-.clean`. +When in editable mode, no `.clean` is appended, +to allow for a user to modify the sources. +`base-directory` defaults to `src`, +and `source-base` defaults to the stem of ``. +You can change these via the `BASE_DIRECTORY` and `SOURCE_BASE` arguments +respectively. +If you need to extract to a location that is not based in `CURRENT_BUILDTREES_DIR`, +you can use the `WORKING_DIRECTORY` argument to do the same. ## Examples diff --git a/docs/maintainers/vcpkg_extract_source_archive_ex.md b/docs/maintainers/vcpkg_extract_source_archive_ex.md index 0692846f7627b4..72b45d87cf6a8c 100644 --- a/docs/maintainers/vcpkg_extract_source_archive_ex.md +++ b/docs/maintainers/vcpkg_extract_source_archive_ex.md @@ -2,57 +2,25 @@ The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_extract_source_archive_ex.md). -Extract an archive into the source directory. Replaces [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md). +Extract an archive into the source directory. +Originally replaced [`vcpkg_extract_source_archive()`], +but new ports should instead use the second overload of +[`vcpkg_extract_source_archive()`]. ## Usage ```cmake vcpkg_extract_source_archive_ex( - SKIP_PATCH_CHECK - OUT_SOURCE_PATH - ARCHIVE <${ARCHIVE}> - [REF <1.0.0>] - [NO_REMOVE_ONE_LEVEL] - [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>] - [PATCHES ...] + [OUT_SOURCE_PATH ] + ... ) ``` -## Parameters -### SKIP_PATCH_CHECK -If this option is set the failure to apply a patch is ignored. -### OUT_SOURCE_PATH -Specifies the out-variable that will contain the extracted location. +See the documentation for [`vcpkg_extract_source_archive()`] for other parameters. +Additionally, `vcpkg_extract_source_archive_ex()` adds the `REF` and `WORKING_DIRECTORY` +parameters, which are wrappers around `SOURCE_BASE` and `BASE_DIRECTORY` +respectively. -This should be set to `SOURCE_PATH` by convention. - -### ARCHIVE -The full path to the archive to be extracted. - -This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). - -### REF -A friendly name that will be used instead of the filename of the archive. If more than 10 characters it will be truncated. - -By convention, this is set to the version number or tag fetched - -### WORKING_DIRECTORY -If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. - -Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). - -### PATCHES -A list of patches to be applied to the extracted sources. - -Relative paths are based on the port directory. - -### NO_REMOVE_ONE_LEVEL -Specifies that the default removal of the top level folder should not occur. - -## Examples - -* [bzip2](https://github.com/Microsoft/vcpkg/blob/master/ports/bzip2/portfile.cmake) -* [sqlite3](https://github.com/Microsoft/vcpkg/blob/master/ports/sqlite3/portfile.cmake) -* [cairo](https://github.com/Microsoft/vcpkg/blob/master/ports/cairo/portfile.cmake) +[`vcpkg_extract_source_archive()`]: vcpkg_extract_source_archive.md ## Source [scripts/cmake/vcpkg\_extract\_source\_archive\_ex.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_extract_source_archive_ex.cmake) diff --git a/docs/maintainers/vcpkg_from_bitbucket.md b/docs/maintainers/vcpkg_from_bitbucket.md index dd32fde023df0e..c37e9e74b3254c 100644 --- a/docs/maintainers/vcpkg_from_bitbucket.md +++ b/docs/maintainers/vcpkg_from_bitbucket.md @@ -3,7 +3,6 @@ The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_from_bitbucket.md). Download and extract a project from Bitbucket. -Enables support for installing HEAD `vcpkg.exe install --head `. ## Usage: ```cmake diff --git a/docs/maintainers/vcpkg_from_git.md b/docs/maintainers/vcpkg_from_git.md index ce6daa5e7c240b..85bb3f90929bb5 100644 --- a/docs/maintainers/vcpkg_from_git.md +++ b/docs/maintainers/vcpkg_from_git.md @@ -10,7 +10,7 @@ vcpkg_from_git( OUT_SOURCE_PATH URL REF <59f7335e4d...> - [TAG ] + [HEAD_REF ] [PATCHES ...] ) ``` @@ -27,17 +27,16 @@ The url of the git repository. ### REF The git sha of the commit to download. -### TAG -An optional git tag to be verified against the `REF`. If the remote repository's tag does not match the specified `REF`, the build will fail. +### HEAD_REF +The git branch to use when the package is requested to be built from the latest sources. + +Example: `main`, `develop`, `HEAD` ### PATCHES A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. -### X_OUT_REF (internal only) -This parameter is used for automatic REF updates for certain ports in the central vcpkg catalog. It should not be used by any ports outside the central catalog and within the central catalog it should not be used on any user path. This parameter may change behavior incompatibly or be removed at any time. - ## Notes: `OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. diff --git a/docs/maintainers/vcpkg_from_sourceforge.md b/docs/maintainers/vcpkg_from_sourceforge.md index 7ce256b2ef3f99..3c1574facd174c 100644 --- a/docs/maintainers/vcpkg_from_sourceforge.md +++ b/docs/maintainers/vcpkg_from_sourceforge.md @@ -4,6 +4,10 @@ The latest version of this document lives in the [vcpkg repo](https://github.com Download and extract a project from sourceforge. +This function automatically checks a set of sourceforge mirrors. +Additional mirrors can be injected through the `VCPKG_SOURCEFORGE_EXTRA_MIRRORS` +list variable in the triplet. + ## Usage: ```cmake vcpkg_from_sourceforge( @@ -54,9 +58,6 @@ A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. -### DISABLE_SSL -Disable ssl when downloading source. - ### NO_REMOVE_ONE_LEVEL Specifies that the default removal of the top level folder should not occur. diff --git a/docs/maintainers/vcpkg_install_msbuild.md b/docs/maintainers/vcpkg_install_msbuild.md index 151a42410f5b07..8d0a31051aeff5 100644 --- a/docs/maintainers/vcpkg_install_msbuild.md +++ b/docs/maintainers/vcpkg_install_msbuild.md @@ -88,8 +88,8 @@ Additional options passed to msbuild for Debug builds. These are in addition to ## Examples -* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) -* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) +* [libirecovery](https://github.com/Microsoft/vcpkg/blob/master/ports/libirecovery/portfile.cmake) +* [libfabric](https://github.com/Microsoft/vcpkg/blob/master/ports/libfabric/portfile.cmake) ## Source [scripts/cmake/vcpkg\_install\_msbuild.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_msbuild.cmake) diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1 index df78e2fca3a5c6..7844055efedfcf 100755 --- a/docs/regenerate.ps1 +++ b/docs/regenerate.ps1 @@ -212,7 +212,7 @@ function ParseCmakeDocComment $Docs.HasError = $True } - if ($contents.Length -ne 0) + if (-not [String]::IsNullOrEmpty($contents)) { $Docs.ActualDocumentation = $contents } @@ -311,6 +311,7 @@ function GetDeprecationMessage Param( [CMakeDocumentation]$Doc ) + $message = '' if ($Doc.IsDeprecated) { $message = " (deprecated" diff --git a/ports/avisynthplus/portfile.cmake b/ports/avisynthplus/portfile.cmake index 8bbc5eace1f708..af6641c3f97246 100644 --- a/ports/avisynthplus/portfile.cmake +++ b/ports/avisynthplus/portfile.cmake @@ -15,8 +15,8 @@ vcpkg_download_distfile(GHC_ARCHIVE ) file(REMOVE_RECURSE ${SOURCE_PATH}/filesystem) -vcpkg_extract_source_archive(${GHC_ARCHIVE} ${SOURCE_PATH}) -file(RENAME ${SOURCE_PATH}/filesystem-3f1c185ab414e764c694b8171d1c4d8c5c437517 ${SOURCE_PATH}/filesystem) +vcpkg_extract_source_archive(extracted_archive ARCHIVE "${GHC_ARCHIVE}") +file(RENAME "${extracted_archive}" "${SOURCE_PATH}/filesystem") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json index 58d064b2d00bd9..88e47ac016c0a5 100644 --- a/ports/avisynthplus/vcpkg.json +++ b/ports/avisynthplus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "avisynthplus", "version-semver": "3.7.0", + "port-version": 1, "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness", "homepage": "http://avs-plus.net/", "supports": "!arm & !uwp" diff --git a/ports/bond/CONTROL b/ports/bond/CONTROL deleted file mode 100644 index 64673d992b2364..00000000000000 --- a/ports/bond/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: bond -Version: 9.0.3 -Description: Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services. -Homepage: https://github.com/Microsoft/bond -Build-Depends: rapidjson, boost-config, boost-utility, boost-assign, boost-locale - -Feature: bond-over-grpc -Description: Bond-over-gRPC provides code generation from Bond IDL service definitions to send Bond objects via gRPC. -Build-Depends: grpc diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index f4b9cdd9498e6b..6a56a4534e92be 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -21,13 +21,13 @@ if (VCPKG_TARGET_IS_WINDOWS) # Clear the generator to prevent it from updating file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/tools/) # Extract the precompiled gbc - vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/) - set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe) + vcpkg_extract_source_archive(extracted_tool_dir ARCHIVE "${GBC_ARCHIVE}" NO_REMOVE_ONE_LEVEL) + file(RENAME "${extracted_tool_dir}" "${CURRENT_BUILDTREES_DIR}/tools") - if (NOT EXISTS "${FETCHED_GBC_PATH}") - message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.") + set(FETCHED_GBC_PATH "${CURRENT_BUILDTREES_DIR}/tools/gbc-${BOND_VER}-amd64.exe") + if(NOT EXISTS "${FETCHED_GBC_PATH}") + message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exist, but it doesn't.") endif() - else() # According to the readme on https://github.com/microsoft/bond/ # The build needs a version of the Haskel Tool stack that is newer than some distros ship with. diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json new file mode 100644 index 00000000000000..524cc9d0f5b7da --- /dev/null +++ b/ports/bond/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "bond", + "version-string": "9.0.3", + "port-version": 1, + "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", + "homepage": "https://github.com/Microsoft/bond", + "dependencies": [ + "boost-assign", + "boost-config", + "boost-locale", + "boost-utility", + "rapidjson" + ], + "features": { + "bond-over-grpc": { + "description": "Bond-over-gRPC provides code generation from Bond IDL service definitions to send Bond objects via gRPC.", + "dependencies": [ + "grpc" + ] + } + } +} diff --git a/ports/nmap/CONTROL b/ports/nmap/CONTROL deleted file mode 100644 index a703b496fa35a3..00000000000000 --- a/ports/nmap/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nmap -Version: 7.70-4 -Build-Depends: winpcap (windows), libpcap (!windows), lua, openssl, python2 (windows), libssh2, zlib, pcre -Description: A library for scanning network ports. diff --git a/ports/nmap/portfile.cmake b/ports/nmap/portfile.cmake index 829153310bdbf2..c0252af8dac02e 100644 --- a/ports/nmap/portfile.cmake +++ b/ports/nmap/portfile.cmake @@ -58,59 +58,60 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() else() set(ENV{LDFLAGS} "$ENV{LDFLAGS} -pthread") - foreach(BUILD_TYPE rel dbg) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) - # Since nmap makefile has strong relationshop with codes, copy codes to obj path - vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}) - - endforeach() set(OPTIONS --without-nmap-update --with-openssl=${CURRENT_INSTALLED_DIR} --with-libssh2=${CURRENT_INSTALLED_DIR} --with-libz=${CURRENT_INSTALLED_DIR} --with-libpcre=${CURRENT_INSTALLED_DIR}) message(STATUS "Building Options: ${OPTIONS}") if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Release) + # Since nmap makefile has strong relationshop with codes, copy codes to obj path message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/nmap-7.70) + vcpkg_extract_source_archive(source_path_release + ARCHIVE "${ARCHIVE}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + ) vcpkg_execute_required_process( COMMAND "./configure" ${OPTIONS} - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${source_path_release}" LOGNAME config-${TARGET_TRIPLET}-rel ) message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH_RELEASE} + WORKING_DIRECTORY "${source_path_release}" LOGNAME build-${TARGET_TRIPLET}-rel ) message(STATUS "Installing ${TARGET_TRIPLET}-rel") - file(INSTALL ${SOURCE_PATH_RELEASE}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/tools) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL Debug) + # Since nmap makefile has strong relationshop with codes, copy codes to obj path message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/nmap-7.70) + vcpkg_extract_source_archive(source_path_debug + ARCHIVE "${ARCHIVE}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + ) vcpkg_execute_required_process( COMMAND "./configure" ${OPTIONS} - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY ${source_path_debug} LOGNAME config-${TARGET_TRIPLET}-dbg ) message(STATUS "Building ${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND make - WORKING_DIRECTORY ${SOURCE_PATH_DEBUG} + WORKING_DIRECTORY ${source_path_debug} LOGNAME build-${TARGET_TRIPLET}-dbg ) message(STATUS "Installing ${TARGET_TRIPLET}-dbg") - file(INSTALL ${SOURCE_PATH_RELEASE}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) + file(INSTALL ${source_path_release}/nmap DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) endif() - set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/nmap-7.70) + set(SOURCE_PATH "${source_path_release}") endif() vcpkg_copy_pdbs() diff --git a/ports/nmap/vcpkg.json b/ports/nmap/vcpkg.json new file mode 100644 index 00000000000000..6aba23611c541d --- /dev/null +++ b/ports/nmap/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "nmap", + "version": "7.70", + "port-version": 5, + "description": "A library for scanning network ports.", + "dependencies": [ + { + "name": "libpcap", + "platform": "!windows" + }, + "libssh2", + "lua", + "openssl", + "pcre", + { + "name": "python2", + "platform": "windows" + }, + { + "name": "winpcap", + "platform": "windows" + }, + "zlib" + ] +} diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 4d93c4f1a14f9e..5e298acbc1f200 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -135,9 +135,9 @@ if("contrib" IN_LIST FEATURES) FILENAME "opencv_3rdparty-${COMMIT}.zip" SHA512 ${HASH} ) - vcpkg_extract_source_archive(${OCV_DOWNLOAD}) + vcpkg_extract_source_archive(extracted_ocv ARCHIVE "${OCV_DOWNLOAD}") file(MAKE_DIRECTORY "${DOWNLOADS}/opencv-cache/${ID}") - file(GLOB XFEATURES2D_I ${CURRENT_BUILDTREES_DIR}/src/opencv_3rdparty-${COMMIT}/*) + file(GLOB XFEATURES2D_I "${extracted_ocv}/*") foreach(FILE ${XFEATURES2D_I}) file(COPY ${FILE} DESTINATION "${DOWNLOADS}/opencv-cache/${ID}") get_filename_component(XFEATURES2D_I_NAME "${FILE}" NAME) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index cf7bb123405c99..50d927750ac693 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv3", "version": "3.4.14", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL deleted file mode 100644 index ec7dac08fc670c..00000000000000 --- a/ports/qcustomplot/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qcustomplot -Version: 2.0.1-4 -Description: QCustomPlot is a Qt C++ widget for plotting and data visualization. -Build-Depends: qt5-base[core] diff --git a/ports/qcustomplot/portfile.cmake b/ports/qcustomplot/portfile.cmake index b180d8bd7ab5d7..026f62fb381356 100644 --- a/ports/qcustomplot/portfile.cmake +++ b/ports/qcustomplot/portfile.cmake @@ -16,7 +16,9 @@ vcpkg_download_distfile(ARCHIVE FILENAME "QCustomPlot-sharedlib-${QCP_VERSION}.tar.gz" SHA512 ce90540fca7226eac37746327e1939a9c7af38fc2595f385ed04d6d1f49560da08fb5fae15d1b9d22b6ba578583f70de8f89ef26796770d41bf599c1b15c535d ) -vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}) +vcpkg_extract_source_archive(SharedLib_SOURCE_PATH ARCHIVE "${ARCHIVE}") +file(RENAME "${SharedLib_SOURCE_PATH}" "${SOURCE_PATH}/qcustomplot-sharedlib") + vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro diff --git a/ports/qcustomplot/vcpkg.json b/ports/qcustomplot/vcpkg.json new file mode 100644 index 00000000000000..6d2c2c66533708 --- /dev/null +++ b/ports/qcustomplot/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qcustomplot", + "version": "2.0.1", + "port-version": 5, + "description": "QCustomPlot is a Qt C++ widget for plotting and data visualization.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL deleted file mode 100644 index eeb831a9f81366..00000000000000 --- a/ports/qt5-mqtt/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-mqtt -Version: 5.15.2 -Description: Qt5 MQTT module. -Build-Depends: qt5-base[core] diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake index 77ef1144b18865..ca6e25d0d4d746 100644 --- a/ports/qt5-mqtt/portfile.cmake +++ b/ports/qt5-mqtt/portfile.cmake @@ -1,20 +1,19 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) #qt_submodule_installation() No binary package for this port. if(QT_UPDATE_VERSION) - set(UPDATE_PORT_GIT_OPTIONS X_OUT_REF NEW_REF) # TO get an SHA512 error if the variable is set. + set(VCPKG_USE_HEAD_VERSION ON) endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL git://code.qt.io/qt/qtmqtt.git - TAG v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER} REF ${QT_HASH_${PORT}} - ${UPDATE_PORT_GIT_OPTIONS} + HEAD_REF "v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}" PATCHES ${_qis_PATCHES} ) -if(NEW_REF) - message(STATUS "New qtmqtt ref: ${NEW_REF}") +if(QT_UPDATE_VERSION) + message(STATUS "New qtmqtt ref: ${VCPKG_HEAD_VERSION}") endif() # qt module builds from a git repository require a .git entry to invoke syncqt diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json new file mode 100644 index 00000000000000..c4dac430ad181d --- /dev/null +++ b/ports/qt5-mqtt/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-mqtt", + "version": "5.15.2", + "port-version": 1, + "description": "Qt5 MQTT module.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index fde8492dc57d48..49faaf4d402b37 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-05-22" + "version-date": "2021-05-22", + "port-version": 1 } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index 03a6c1d0982351..a145d324a91d8c 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -9,7 +9,7 @@ Additionally corrects common issues with targets, such as absolute paths and inc vcpkg_cmake_config_fixup( [PACKAGE_NAME ] [CONFIG_PATH ] - [DO_NOT_DELETE_CONFIG_PATH_PARENT] + [DO_NOT_DELETE_PARENT_CONFIG_PATH] [NO_PREFIX_CORRECTION] ) ``` diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index a25f0f716c1d7b..8ab2878524e204 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -46,7 +46,9 @@ mark_as_advanced(VCPKG_VERBOSE) option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON) option(X_VCPKG_APPLOCAL_DEPS_SERIALIZED "(experimental) Add USES_TERMINAL to VCPKG_APPLOCAL_DEPS to force serialization." OFF) -option(X_VCPKG_APPLOCAL_DEPS_INSTALL "(experimental) Automatically copy dependencies into the install target directory for executables." OFF) + +# requires CMake 3.14 +option(X_VCPKG_APPLOCAL_DEPS_INSTALL "(experimental) Automatically copy dependencies into the install target directory for executables. Requires CMake 3.14." OFF) option(VCPKG_PREFER_SYSTEM_LIBS "Appends the vcpkg paths to CMAKE_PREFIX_PATH, CMAKE_LIBRARY_PATH and CMAKE_FIND_ROOT_PATH so that vcpkg libraries/packages are found after toolchain/system libraries/packages." OFF) # Manifest options and settings diff --git a/scripts/cmake/execute_process.cmake b/scripts/cmake/execute_process.cmake index 206bd95b1219da..be45604d6b4c46 100644 --- a/scripts/cmake/execute_process.cmake +++ b/scripts/cmake/execute_process.cmake @@ -14,5 +14,8 @@ if (NOT DEFINED Z_VCPKG_OVERRIDEN_EXECUTE_PROCESS) function(execute_process) message(FATAL_ERROR "This command cannot be executed in Download Mode.\nHalting portfile execution.\n") endfunction() + set(Z_VCPKG_EXECUTE_PROCESS_NAME "_execute_process") + else() + set(Z_VCPKG_EXECUTE_PROCESS_NAME "execute_process") endif() endif() diff --git a/scripts/cmake/vcpkg_clean_msbuild.cmake b/scripts/cmake/vcpkg_clean_msbuild.cmake index 5a2432c33c559a..068208fb8b6345 100644 --- a/scripts/cmake/vcpkg_clean_msbuild.cmake +++ b/scripts/cmake/vcpkg_clean_msbuild.cmake @@ -10,7 +10,7 @@ vcpkg_clean_msbuild() ## Examples -* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) +* [python3](https://github.com/Microsoft/vcpkg/blob/master/ports/python3/portfile.cmake) #]===] function(vcpkg_clean_msbuild) diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index c859c98a017dcd..557024351ee204 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -12,6 +12,7 @@ vcpkg_download_distfile( URLS ... FILENAME SHA512 <5981de...> + [ALWAYS_REDOWNLOAD] ) ``` ## Parameters @@ -37,6 +38,11 @@ Skip SHA512 hash check for file. This switch is only valid when building with the `--head` command line flag. +### ALWAYS_REDOWNLOAD +Avoid caching; this is a REST call or otherwise unstable. + +Requires `SKIP_SHA512`. + ### HEADERS A list of headers to append to the download request. This can be used for authentication during a download. @@ -55,7 +61,7 @@ The helper [`vcpkg_from_github`](vcpkg_from_github.md) should be used for downlo include(vcpkg_execute_in_download_mode) function(vcpkg_download_distfile VAR) - set(options SKIP_SHA512 SILENT_EXIT QUIET) + set(options SKIP_SHA512 SILENT_EXIT QUIET ALWAYS_REDOWNLOAD) set(oneValueArgs FILENAME SHA512) set(multipleValuesArgs URLS HEADERS) # parse parameters such that semicolons in options arguments to COMMAND don't get erased @@ -70,6 +76,9 @@ function(vcpkg_download_distfile VAR) if(vcpkg_download_distfile_SILENT_EXIT) message(WARNING "SILENT_EXIT has been deprecated as an argument to vcpkg_download_distfile -- remove the argument to resolve this warning") endif() + if(vcpkg_download_distfile_ALWAYS_REDOWNLOAD AND NOT vcpkg_download_distfile_SKIP_SHA512) + message(FATAL_ERROR "ALWAYS_REDOWNLOAD option requires SKIP_SHA512 as well") + endif() if(_VCPKG_INTERNAL_NO_HASH_CHECK) set(vcpkg_download_distfile_SKIP_SHA512 1) else() @@ -125,7 +134,9 @@ function(vcpkg_download_distfile VAR) endif() endfunction() - if(EXISTS "${downloaded_file_path}") + # vcpkg_download_distfile_ALWAYS_REDOWNLOAD only triggers when NOT _VCPKG_NO_DOWNLOADS + # this could be de-morgan'd out but it's more clear this way + if(EXISTS "${downloaded_file_path}" AND NOT (vcpkg_download_distfile_ALWAYS_REDOWNLOAD AND NOT _VCPKG_NO_DOWNLOADS)) if(NOT vcpkg_download_distfile_QUIET) message(STATUS "Using ${downloaded_file_path}") endif() diff --git a/scripts/cmake/vcpkg_execute_build_process.cmake b/scripts/cmake/vcpkg_execute_build_process.cmake index 52c03e445e8074..914c07e0d3054a 100644 --- a/scripts/cmake/vcpkg_execute_build_process.cmake +++ b/scripts/cmake/vcpkg_execute_build_process.cmake @@ -34,120 +34,129 @@ conflict when building multiple at once. * [icu](https://github.com/Microsoft/vcpkg/blob/master/ports/icu/portfile.cmake) #]===] +set(Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES + "LINK : fatal error LNK1102:" + " fatal error C1060: " + # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. + "LINK : fatal error LNK1318:" + "LINK : fatal error LNK1104:" + "LINK : fatal error LNK1201:" + # Multiple threads using the same directory at the same time cause conflicts, will try again. + "Cannot create parent directory" + "Cannot write file" + # Multiple threads caused the wrong order of creating folders and creating files in folders + "Can't open" +) +list(JOIN Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES "|" Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES) + function(vcpkg_execute_build_process) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _ebp "" "WORKING_DIRECTORY;LOGNAME" "COMMAND;NO_PARALLEL_COMMAND") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "WORKING_DIRECTORY;LOGNAME" "COMMAND;NO_PARALLEL_COMMAND") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + foreach(required_arg IN ITEMS WORKING_DIRECTORY COMMAND) + if(NOT DEFINED arg_${required_arg}) + message(FATAL_ERROR "${required_arg} must be specified.") + endif() + endforeach() - set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out.log") - set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-err.log") + if(NOT DEFINED arg_LOGNAME) + message(WARNING "LOGNAME should be specified.") + set(arg_LOGNAME "build") + endif() + + set(log_prefix "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}") + set(log_out "${log_prefix}-out.log") + set(log_err "${log_prefix}-err.log") + set(all_logs "${log_out}" "${log_err}") execute_process( - COMMAND ${_ebp_COMMAND} - WORKING_DIRECTORY ${_ebp_WORKING_DIRECTORY} - OUTPUT_FILE ${LOG_OUT} - ERROR_FILE ${LOG_ERR} + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" RESULT_VARIABLE error_code ) - if(error_code) - file(READ ${LOG_OUT} out_contents) - file(READ ${LOG_ERR} err_contents) - - if(out_contents) - list(APPEND LOGS ${LOG_OUT}) - endif() - if(err_contents) - list(APPEND LOGS ${LOG_ERR}) - endif() - - if(out_contents MATCHES "LINK : fatal error LNK1102:" OR out_contents MATCHES " fatal error C1060: " - OR err_contents MATCHES "LINK : fatal error LNK1102:" OR err_contents MATCHES " fatal error C1060: " - OR out_contents MATCHES "LINK : fatal error LNK1318: Unexpected PDB error; ACCESS_DENIED" - OR out_contents MATCHES "LINK : fatal error LNK1104:" - OR out_contents MATCHES "LINK : fatal error LNK1201:" - # The linker ran out of memory during execution. We will try continuing once more, with parallelism disabled. - OR err_contents MATCHES "Cannot create parent directory" OR err_contents MATCHES "Cannot write file" - # Multiple threads using the same directory at the same time cause conflicts, will try again. - OR err_contents MATCHES "Can't open" - # Multiple threads caused the wrong order of creating folders and creating files in folders - ) + if(NOT error_code EQUAL "0") + file(READ "${log_out}" out_contents) + file(READ "${log_err}" err_contents) + set(all_contents "${out_contents}${err_contents}") + if(all_contents MATCHES "${Z_VCPKG_EXECUTE_BUILD_PROCESS_RETRY_ERROR_MESSAGES}") message(STATUS "Restarting Build without parallelism because memory exceeded") - set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-out-1.log") - set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${_ebp_LOGNAME}-err-1.log") + set(log_out "${log_prefix}-out-1.log") + set(log_err "${log_prefix}-err-1.log") + list(APPEND all_logs "${log_out}" "${log_err}") - if(_ebp_NO_PARALLEL_COMMAND) + if(DEFINED arg_NO_PARALLEL_COMMAND) execute_process( - COMMAND ${_ebp_NO_PARALLEL_COMMAND} - WORKING_DIRECTORY ${_ebp_WORKING_DIRECTORY} - OUTPUT_FILE ${LOG_OUT} - ERROR_FILE ${LOG_ERR} + COMMAND ${arg_NO_PARALLEL_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" RESULT_VARIABLE error_code ) else() execute_process( - COMMAND ${_ebp_COMMAND} - WORKING_DIRECTORY ${_ebp_WORKING_DIRECTORY} - OUTPUT_FILE ${LOG_OUT} - ERROR_FILE ${LOG_ERR} + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" RESULT_VARIABLE error_code ) endif() - - if(error_code) - file(READ ${LOG_OUT} out_contents) - file(READ ${LOG_ERR} err_contents) - - if(out_contents) - list(APPEND LOGS ${LOG_OUT}) - endif() - if(err_contents) - list(APPEND LOGS ${LOG_ERR}) - endif() - endif() - elseif(out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: ") + elseif(all_contents MATCHES "mt : general error c101008d: ") # Antivirus workaround - occasionally files are locked and cause mt.exe to fail message(STATUS "mt.exe has failed. This may be the result of anti-virus. Disabling anti-virus on the buildtree folder may improve build speed") - set(ITERATION 0) - while (ITERATION LESS 3 AND (out_contents MATCHES "mt : general error c101008d: " OR out_contents MATCHES "mt.exe : general error c101008d: ")) - MATH(EXPR ITERATION "${ITERATION}+1") - message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${ITERATION}") + foreach(iteration RANGE 1 3) + message(STATUS "Restarting Build ${TARGET_TRIPLET}-${SHORT_BUILDTYPE} because of mt.exe file locking issue. Iteration: ${iteration}") + + set(log_out "${log_prefix}-out-${iteration}.log") + set(log_err "${log_prefix}-err-${iteration}.log") + list(APPEND all_logs "${log_out}" "${log_err}") execute_process( - COMMAND ${_ebp_COMMAND} - OUTPUT_FILE "${LOGPREFIX}-out-${ITERATION}.log" - ERROR_FILE "${LOGPREFIX}-err-${ITERATION}.log" + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" RESULT_VARIABLE error_code - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE}) - - if(error_code) - file(READ "${LOGPREFIX}-out-${ITERATION}.log" out_contents) - file(READ "${LOGPREFIX}-err-${ITERATION}.log" err_contents) - - if(out_contents) - list(APPEND LOGS "${LOGPREFIX}-out-${ITERATION}.log") - endif() - if(err_contents) - list(APPEND LOGS "${LOGPREFIX}-err-${ITERATION}.log") - endif() - else() + ) + + if(error_code EQUAL "0") break() endif() - endwhile() - elseif(out_contents MATCHES "fatal error: ld terminated with signal 9 [Killed]") + + file(READ "${log_out}" out_contents) + file(READ "${log_err}" err_contents) + set(all_contents "${out_contents}${err_contents}") + if(NOT all_contents MATCHES "mt : general error c101008d: ") + break() + endif() + endforeach() + elseif(all_contents MATCHES "fatal error: ld terminated with signal 9 [Killed]") message(WARNING "ld was terminated with signal 9 [killed], please ensure your system has sufficient hard disk space and memory.") endif() + endif() - if(error_code) - set(STRINGIFIED_LOGS) - foreach(LOG ${LOGS}) - file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG) - list(APPEND STRINGIFIED_LOGS " ${NATIVE_LOG}\n") - endforeach() - z_vcpkg_prettify_command_line(_ebp_COMMAND_PRETTY ${_ebp_COMMAND}) - message(FATAL_ERROR - " Command failed: ${_ebp_COMMAND_PRETTY}\n" - " Working Directory: ${_ebp_WORKING_DIRECTORY}\n" - " See logs for more information:\n" - ${STRINGIFIED_LOGS}) - endif(error_code) - endif(error_code) -endfunction(vcpkg_execute_build_process) + if(NOT error_code EQUAL "0") + set(stringified_logs "") + foreach(log IN LISTS all_logs) + if(NOT EXISTS "${log}") + continue() + endif() + file(SIZE "${log}" log_size) + if(NOT log_size EQUAL "0") + file(TO_NATIVE_PATH "${log}" native_log) + string(APPEND stringified_logs " ${native_log}\n") + endif() + endforeach() + z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) + message(FATAL_ERROR + " Command failed: ${pretty_command}\n" + " Working Directory: ${arg_WORKING_DIRECTORY}\n" + " See logs for more information:\n" + "${stringified_logs}" + ) + endif() +endfunction() diff --git a/scripts/cmake/vcpkg_execute_in_download_mode.cmake b/scripts/cmake/vcpkg_execute_in_download_mode.cmake index 8ef77372953de8..bd88f8f5dce9ce 100644 --- a/scripts/cmake/vcpkg_execute_in_download_mode.cmake +++ b/scripts/cmake/vcpkg_execute_in_download_mode.cmake @@ -6,62 +6,60 @@ Execute a process even in download mode. ## Usage ```cmake vcpkg_execute_in_download_mode( - COMMAND [] - [WORKING_DIRECTORY ] - [TIMEOUT ] - [RESULT_VARIABLE ] - [OUTPUT_VARIABLE ] - [ERROR_VARIABLE ] - [INPUT_FILE ] - [OUTPUT_FILE ] - [ERROR_FILE ] - [OUTPUT_QUIET] - [ERROR_QUIET] - [OUTPUT_STRIP_TRAILING_WHITESPACE] - [ERROR_STRIP_TRAILING_WHITESPACE] - [ENCODING ] + ... ) ``` -The signature of this function is identical to `execute_process()` except that -it only accepts one COMMAND argument, i.e., does not support chaining multiple -commands with pipes. +The signature of this function is identical to `execute_process()`. -See [`execute_process()`] for a detailed description of the parameters. +See [`execute_process()`] for more details. [`execute_process()`]: https://cmake.org/cmake/help/latest/command/execute_process.html #]===] function(vcpkg_execute_in_download_mode) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 vcpkg_execute_in_download_mode - "OUTPUT_QUIET;ERROR_QUIET;OUTPUT_STRIP_TRAILING_WHITESPACE;ERROR_STRIP_TRAILING_WHITESPACE" - "WORKING_DIRECTORY;TIMEOUT;RESULT_VARIABLE;RESULTS_VARIABLE;OUTPUT_VARIABLE;ERROR_VARIABLE;INPUT_FILE;OUTPUT_FILE;ERROR_FILE;ENCODING" - "COMMAND") + # this allows us to grab the value of the output variables, but pass through the rest of the arguments + cmake_parse_arguments(PARSE_ARGV 0 arg "" "RESULT_VARIABLE;RESULTS_VARIABLE;OUTPUT_VARIABLE;ERROR_VARIABLE" "") - # collect all other present parameters - set(other_args "") - foreach(arg OUTPUT_QUIET ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE) - if(vcpkg_execute_in_download_mode_${arg}) - list(APPEND other_args ${arg}) + set(output_and_error_same OFF) + set(output_variable_param "") + set(error_variable_param "") + set(result_variable_param "") + set(results_variable_param "") + if(DEFINED arg_OUTPUT_VARIABLE AND DEFINED arg_ERROR_VARIABLE AND arg_OUTPUT_VARIABLE STREQUAL arg_ERROR_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_err_var) + set(error_variable_param ERROR_VARIABLE out_err_var) + set(output_and_error_same ON) + else() + if(DEFINED arg_OUTPUT_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_var) endif() - endforeach() - foreach(arg WORKING_DIRECTORY TIMEOUT RESULT_VARIABLE RESULTS_VARIABLE OUTPUT_VARIABLE ERROR_VARIABLE INPUT_FILE OUTPUT_FILE ERROR_FILE ENCODING) - if(vcpkg_execute_in_download_mode_${arg}) - list(APPEND other_args ${arg} ${vcpkg_execute_in_download_mode_${arg}}) + if(DEFINED arg_ERROR_VARIABLE) + set(error_variable_param ERROR_VARIABLE err_var) endif() - endforeach() + endif() + if(DEFINED arg_RESULT_VARIABLE) + set(result_variable_param RESULT_VARIABLE result_var) + endif() + if(DEFINED arg_RESULTS_VARIABLE) + set(results_variable_param RESULTS_VARIABLE results_var) + endif() + + cmake_language(CALL "${Z_VCPKG_EXECUTE_PROCESS_NAME}" + ${arg_UNPARSED_ARGUMENTS} + ${output_variable_param} + ${error_variable_param} + ${result_variable_param} + ${results_variable_param} + ) - if (DEFINED VCPKG_DOWNLOAD_MODE) - _execute_process(COMMAND ${vcpkg_execute_in_download_mode_COMMAND} ${other_args}) + if(output_and_error_same) + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_err_var) else() - execute_process(COMMAND ${vcpkg_execute_in_download_mode_COMMAND} ${other_args}) + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_var) + z_vcpkg_forward_output_variable(arg_ERROR_VARIABLE err_var) endif() - # pass output parameters back to caller's scope - foreach(arg RESULT_VARIABLE RESULTS_VARIABLE OUTPUT_VARIABLE ERROR_VARIABLE) - if(vcpkg_execute_in_download_mode_${arg}) - set(${vcpkg_execute_in_download_mode_${arg}} ${${vcpkg_execute_in_download_mode_${arg}}} PARENT_SCOPE) - endif() - endforeach() + z_vcpkg_forward_output_variable(arg_RESULT_VARIABLE result_var) + z_vcpkg_forward_output_variable(arg_RESULTS_VARIABLE results_var) endfunction() diff --git a/scripts/cmake/vcpkg_execute_required_process.cmake b/scripts/cmake/vcpkg_execute_required_process.cmake index c38fd2ed80be94..27024fecfce862 100644 --- a/scripts/cmake/vcpkg_execute_required_process.cmake +++ b/scripts/cmake/vcpkg_execute_required_process.cmake @@ -48,28 +48,27 @@ This should be a unique name for different triplets so that the logs don't confl #]===] function(vcpkg_execute_required_process) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 vcpkg_execute_required_process "ALLOW_IN_DOWNLOAD_MODE" "WORKING_DIRECTORY;LOGNAME;TIMEOUT;OUTPUT_VARIABLE;ERROR_VARIABLE" "COMMAND") - set(LOG_OUT "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-out.log") - set(LOG_ERR "${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_LOGNAME}-err.log") + cmake_parse_arguments(PARSE_ARGV 0 arg + "ALLOW_IN_DOWNLOAD_MODE" + "WORKING_DIRECTORY;LOGNAME;TIMEOUT;OUTPUT_VARIABLE;ERROR_VARIABLE" + "COMMAND" + ) - if(vcpkg_execute_required_process_TIMEOUT) - set(TIMEOUT_PARAM "TIMEOUT;${vcpkg_execute_required_process_TIMEOUT}") - else() - set(TIMEOUT_PARAM "") - endif() - if(vcpkg_execute_required_process_OUTPUT_VARIABLE) - set(OUTPUT_VARIABLE_PARAM "OUTPUT_VARIABLE;${vcpkg_execute_required_process_OUTPUT_VARIABLE}") - else() - set(OUTPUT_VARIABLE_PARAM "") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if(vcpkg_execute_required_process_ERROR_VARIABLE) - set(ERROR_VARIABLE_PARAM "ERROR_VARIABLE;${vcpkg_execute_required_process_ERROR_VARIABLE}") - else() - set(ERROR_VARIABLE_PARAM "") + foreach(required_arg IN ITEMS WORKING_DIRECTORY COMMAND) + if(NOT DEFINED arg_${required_arg}) + message(FATAL_ERROR "${required_arg} must be specified.") + endif() + endforeach() + + if(NOT DEFINED arg_LOGNAME) + message(WARNING "LOGNAME should be specified.") + set(arg_LOGNAME "required") endif() - if (DEFINED VCPKG_DOWNLOAD_MODE AND NOT vcpkg_execute_required_process_ALLOW_IN_DOWNLOAD_MODE) + if (VCPKG_DOWNLOAD_MODE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) message(FATAL_ERROR [[ This command cannot be executed in Download Mode. @@ -77,43 +76,69 @@ Halting portfile execution. ]]) endif() - vcpkg_execute_in_download_mode( - COMMAND ${vcpkg_execute_required_process_COMMAND} - OUTPUT_FILE ${LOG_OUT} - ERROR_FILE ${LOG_ERR} - RESULT_VARIABLE error_code - WORKING_DIRECTORY ${vcpkg_execute_required_process_WORKING_DIRECTORY} - ${TIMEOUT_PARAM} - ${OUTPUT_VARIABLE_PARAM} - ${ERROR_VARIABLE_PARAM}) - if(error_code) - set(LOGS) - file(READ "${LOG_OUT}" out_contents) - file(READ "${LOG_ERR}" err_contents) - if(out_contents) - list(APPEND LOGS "${LOG_OUT}") + set(log_out "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log") + set(log_err "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") + + set(timeout_param "") + set(output_and_error_same OFF) + set(output_variable_param "") + set(error_variable_param "") + + if(DEFINED arg_TIMEOUT) + set(timeout_param TIMEOUT "${arg_TIMEOUT}") + endif() + if(DEFINED arg_OUTPUT_VARIABLE AND DEFINED arg_ERROR_VARIABLE AND arg_OUTPUT_VARIABLE STREQUAL arg_ERROR_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_err_var) + set(error_variable_param ERROR_VARIABLE out_err_var) + set(output_and_error_same ON) + else() + if(DEFINED arg_OUTPUT_VARIABLE) + set(output_variable_param OUTPUT_VARIABLE out_var) endif() - if(err_contents) - list(APPEND LOGS "${LOG_ERR}") + if(DEFINED arg_ERROR_VARIABLE) + set(error_variable_param ERROR_VARIABLE err_var) endif() - set(STRINGIFIED_LOGS) - foreach(LOG ${LOGS}) - file(TO_NATIVE_PATH "${LOG}" NATIVE_LOG) - list(APPEND STRINGIFIED_LOGS " ${NATIVE_LOG}\n") + endif() + + vcpkg_execute_in_download_mode( + COMMAND ${arg_COMMAND} + OUTPUT_FILE "${log_out}" + ERROR_FILE "${log_err}" + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + ${timeout_param} + ${output_variable_param} + ${error_variable_param} + ) + if(NOT error_code EQUAL 0) + set(stringified_logs "") + foreach(log IN ITEMS "${log_out}" "${log_err}") + if(NOT EXISTS "${log}") + continue() + endif() + file(SIZE "${log}" log_size) + if(NOT log_size EQUAL "0") + file(TO_NATIVE_PATH "${log}" native_log) + string(APPEND stringified_logs " ${native_log}\n") + endif() endforeach() - z_vcpkg_prettify_command_line(vcpkg_execute_required_process_COMMAND_PRETTY ${vcpkg_execute_required_process_COMMAND}) + + z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) message(FATAL_ERROR - " Command failed: ${vcpkg_execute_required_process_COMMAND_PRETTY}\n" - " Working Directory: ${vcpkg_execute_required_process_WORKING_DIRECTORY}\n" + " Command failed: ${pretty_command}\n" + " Working Directory: ${arg_WORKING_DIRECTORY}\n" " Error code: ${error_code}\n" " See logs for more information:\n" - ${STRINGIFIED_LOGS} + "${stringified_logs}" ) endif() + # pass output parameters back to caller's scope - foreach(arg OUTPUT_VARIABLE ERROR_VARIABLE) - if(vcpkg_execute_required_process_${arg}) - set(${vcpkg_execute_required_process_${arg}} ${${vcpkg_execute_required_process_${arg}}} PARENT_SCOPE) - endif() - endforeach() + if(output_and_error_same) + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_err_var) + # arg_ERROR_VARIABLE = arg_OUTPUT_VARIABLE, so no need to set it again + else() + z_vcpkg_forward_output_variable(arg_OUTPUT_VARIABLE out_var) + z_vcpkg_forward_output_variable(arg_ERROR_VARIABLE err_var) + endif() endfunction() diff --git a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake index 3e63a998c61fd8..3ad8d05ce9fe1a 100644 --- a/scripts/cmake/vcpkg_execute_required_process_repeat.cmake +++ b/scripts/cmake/vcpkg_execute_required_process_repeat.cmake @@ -6,48 +6,79 @@ Execute a process until the command succeeds, or until the COUNT is reached. ## Usage ```cmake vcpkg_execute_required_process_repeat( - COUNT COMMAND [] + COUNT WORKING_DIRECTORY LOGNAME + [ALLOW_IN_DOWNLOAD_MODE] ) ``` #]===] function(vcpkg_execute_required_process_repeat) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 vcpkg_execute_required_process_repeat "ALLOW_IN_DOWNLOAD_MODE" "COUNT;WORKING_DIRECTORY;LOGNAME" "COMMAND") - #debug_message("vcpkg_execute_required_process_repeat(${vcpkg_execute_required_process_repeat_COMMAND})") - if (DEFINED VCPKG_DOWNLOAD_MODE AND NOT vcpkg_execute_required_process_repeat_ALLOW_IN_DOWNLOAD_MODE) + cmake_parse_arguments(PARSE_ARGV 0 arg + "ALLOW_IN_DOWNLOAD_MODE" + "COUNT;WORKING_DIRECTORY;LOGNAME" + "COMMAND" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + foreach(required_arg IN ITEMS COUNT WORKING_DIRECTORY LOGNAME COMMAND) + if(NOT DEFINED arg_${required_arg}) + message(FATAL_ERROR "${required_arg} must be specified.") + endif() + endforeach() + + # also checks for COUNT being an integer + if(NOT arg_COUNT GREATER_EQUAL "1") + message(FATAL_ERROR "COUNT (${arg_COUNT}) must be greater than or equal to 1.") + endif() + + if (DEFINED VCPKG_DOWNLOAD_MODE AND NOT arg_ALLOW_IN_DOWNLOAD_MODE) message(FATAL_ERROR [[ This command cannot be executed in Download Mode. Halting portfile execution. ]]) endif() - set(SUCCESSFUL_EXECUTION FALSE) - foreach(loop_count RANGE ${vcpkg_execute_required_process_repeat_COUNT}) + + set(all_logs "") + foreach(loop_count RANGE 1 ${arg_COUNT}) + set(out_log "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out-${loop_count}.log") + set(err_log "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out-${loop_count}.log") + list(APPEND all_logs "${out_log}" "${err_log}") + vcpkg_execute_in_download_mode( - COMMAND ${vcpkg_execute_required_process_repeat_COMMAND} - OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_repeat_LOGNAME}-out-${loop_count}.log - ERROR_FILE ${CURRENT_BUILDTREES_DIR}/${vcpkg_execute_required_process_repeat_LOGNAME}-err-${loop_count}.log + COMMAND ${arg_COMMAND} + OUTPUT_FILE "${out_log}" + ERROR_FILE "${err_log}" RESULT_VARIABLE error_code - WORKING_DIRECTORY ${vcpkg_execute_required_process_repeat_WORKING_DIRECTORY}) - #debug_message("error_code=${error_code}") - file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}" NATIVE_BUILDTREES_DIR) - if(NOT error_code) - set(SUCCESSFUL_EXECUTION TRUE) - break() - endif() - endforeach(loop_count) - if (NOT SUCCESSFUL_EXECUTION) - z_vcpkg_prettify_command_line(vcpkg_execute_required_process_repeat_COMMAND_PRETTY ${vcpkg_execute_required_process_repeat_COMMAND}) - message(FATAL_ERROR - " Command failed: ${vcpkg_execute_required_process_repeat_COMMAND_PRETTY}\n" - " Working Directory: ${vcpkg_execute_required_process_repeat_WORKING_DIRECTORY}\n" - " See logs for more information:\n" - " ${NATIVE_BUILDTREES_DIR}\\${vcpkg_execute_required_process_repeat_LOGNAME}-out.log\n" - " ${NATIVE_BUILDTREES_DIR}\\${vcpkg_execute_required_process_repeat_LOGNAME}-err.log\n" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" ) - endif() + if(error_code EQUAL "0") + return() + endif() + endforeach() + + set(stringified_logs "") + foreach(log IN LISTS all_logs) + if(NOT EXISTS "${log}") + continue() + endif() + file(SIZE "${log}" log_size) + if(NOT log_size EQUAL "0") + file(TO_NATIVE_PATH "${log}" native_log) + string(APPEND stringified_logs " ${native_log}\n") + endif() + endforeach() + + z_vcpkg_prettify_command_line(pretty_command ${arg_COMMAND}) + message(FATAL_ERROR + " Command failed: ${pretty_command}\n" + " Working Directory: ${arg_WORKING_DIRECTORY}\n" + " See logs for more information:\n" + "${stringifed_logs}" + ) endfunction() diff --git a/scripts/cmake/vcpkg_extract_source_archive.cmake b/scripts/cmake/vcpkg_extract_source_archive.cmake index 631d6da59f9e78..59daac7d914b0a 100644 --- a/scripts/cmake/vcpkg_extract_source_archive.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive.cmake @@ -1,27 +1,74 @@ #[===[.md: # vcpkg_extract_source_archive -Extract an archive into the source directory. Deprecated in favor of [`vcpkg_extract_source_archive_ex`](vcpkg_extract_source_archive_ex.md). +Extract an archive into the source directory. ## Usage +There are two "overloads" of this function. The first is deprecated: + ```cmake -vcpkg_extract_source_archive( - <${ARCHIVE}> [<${TARGET_DIRECTORY}>] +vcpkg_extract_source_archive(<${ARCHIVE}> [<${TARGET_DIRECTORY}>]) +``` + +This overload should not be used. + +The latter is suggested to use for all future `vcpkg_extract_source_archive`s. + +```cmake +vcpkg_extract_source_archive( + ARCHIVE + [NO_REMOVE_ONE_LEVEL] + [PATCHES ...] + [SOURCE_BASE ] + [BASE_DIRECTORY | WORKING_DIRECTORY ] ) ``` -## Parameters -### ARCHIVE -The full path to the archive to be extracted. -This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). +`vcpkg_extract_source_archive` takes an archive and extracts it. +It replaces existing uses of `vcpkg_extract_source_archive_ex`. +The simplest use of it is: + +```cmake +vcpkg_download_distfile(archive ...) +vcpkg_extract_source_archive(source_path ARCHIVE "${archive}") +``` + +The general expectation is that an archives are laid out with a base directory, +and all the actual files underneath that directory; in other words, if you +extract the archive, you'll get something that looks like: + +``` +zlib-1.2.11/ + doc/ + ... + examples/ + ... + ChangeLog + CMakeLists.txt + README + zlib.h + ... +``` -### TARGET_DIRECTORY -If specified, the archive will be extracted into the target directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. +`vcpkg_extract_source_archive` automatically removes this directory, +and gives you the items under it directly. However, this only works +when there is exactly one item in the top level of an archive. +Otherwise, you'll have to pass the `NO_REMOVE_ONE_LEVEL` argument to +prevent `vcpkg_extract_source_archive` from performing this transformation. -This can be used to mimic git submodules, by extracting into a subdirectory of another archive. +If the source needs to be patched in some way, the `PATCHES` argument +allows one to do this, just like other `vcpkg_from_*` functions. -## Notes -This command will also create a tracking file named .extracted in the TARGET_DIRECTORY. This file, when present, will suppress the extraction of the archive. +`vcpkg_extract_source_archive` extracts the files to +`${CURRENT_BUILDTREES_DIR}//-.clean`. +When in editable mode, no `.clean` is appended, +to allow for a user to modify the sources. +`base-directory` defaults to `src`, +and `source-base` defaults to the stem of ``. +You can change these via the `BASE_DIRECTORY` and `SOURCE_BASE` arguments +respectively. +If you need to extract to a location that is not based in `CURRENT_BUILDTREES_DIR`, +you can use the `WORKING_DIRECTORY` argument to do the same. ## Examples @@ -30,25 +77,166 @@ This command will also create a tracking file named .extracted in the * [msgpack](https://github.com/Microsoft/vcpkg/blob/master/ports/msgpack/portfile.cmake) #]===] -include(vcpkg_execute_required_process) +function(z_vcpkg_extract_source_archive_deprecated_mode archive working_directory) + cmake_path(GET archive FILENAME archive_filename) + if(NOT EXISTS "${working_directory}/${archive_filename}.extracted") + message(STATUS "Extracting source ${archive}") + file(MAKE_DIRECTORY "${working_directory}") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${CMAKE_COMMAND}" -E tar xjf "${archive}" + WORKING_DIRECTORY "${working_directory}" + LOGNAME extract + ) + file(TOUCH "${working_directory}/${archive_filename}.extracted") + endif() +endfunction() -function(vcpkg_extract_source_archive ARCHIVE) - if(NOT ARGC EQUAL 2) - set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src") +function(vcpkg_extract_source_archive) + if(ARGC LESS_EQUAL "2") + z_vcpkg_deprecation_message( "Deprecated form of vcpkg_extract_source_archive used: + Please use the `vcpkg_extract_source_archive( ARCHIVE )` form.") + if(ARGC EQUAL "0") + message(FATAL_ERROR "vcpkg_extract_source_archive requires at least one argument.") + endif() + + set(archive "${ARGV0}") + if(ARGC EQUAL "1") + set(working_directory "${CURRENT_BUILDTREES_DIR}/src") + else() + set(working_directory "${ARGV1}") + endif() + + z_vcpkg_extract_source_archive_deprecated_mode("${archive}" "${working_directory}") + return() + endif() + + set(out_source_path "${ARGV0}") + cmake_parse_arguments(PARSE_ARGV 1 "arg" + "NO_REMOVE_ONE_LEVEL;SKIP_PATCH_CHECK;Z_ALLOW_OLD_PARAMETER_NAMES" + "ARCHIVE;SOURCE_BASE;BASE_DIRECTORY;WORKING_DIRECTORY;REF" + "PATCHES" + ) + + if(DEFINED arg_REF) + if(NOT arg_Z_ALLOW_OLD_PARAMETER_NAMES) + message(FATAL_ERROR "Unexpected argument REF") + elseif(DEFINED arg_SOURCE_BASE) + message(FATAL_ERROR "Cannot specify both REF and SOURCE_BASE") + else() + string(REPLACE "/" "-" arg_SOURCE_BASE "${arg_REF}") + endif() + endif() + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_ARCHIVE) + message(FATAL_ERROR "ARCHIVE must be specified") + endif() + + if(DEFINED arg_WORKING_DIRECTORY) + if(DEFINED arg_BASE_DIRECTORY) + message(FATAL_ERROR "Cannot specify both BASE_DIRECTORY and WORKING_DIRECTORY") + elseif(NOT IS_ABSOLUTE "${arg_WORKING_DIRECTORY}") + message(FATAL_ERROR "WORKING_DIRECTORY (${arg_WORKING_DIRECTORY}) must be an absolute path") + endif() + set(working_directory "${arg_WORKING_DIRECTORY}") else() - set(WORKING_DIRECTORY ${ARGV1}) + if(NOT DEFINED arg_BASE_DIRECTORY) + set(arg_BASE_DIRECTORY "src") + elseif(IS_ABSOLUTE "${arg_BASE_DIRECTORY}") + message(FATAL_ERROR "BASE_DIRECTORY (${arg_BASE_DIRECTORY}) must be a relative path") + endif() + cmake_path(APPEND CURRENT_BUILDTREES_DIR "${arg_BASE_DIRECTORY}" + OUTPUT_VARIABLE working_directory) endif() - get_filename_component(ARCHIVE_FILENAME "${ARCHIVE}" NAME) - if(NOT EXISTS ${WORKING_DIRECTORY}/${ARCHIVE_FILENAME}.extracted) - message(STATUS "Extracting source ${ARCHIVE}") - file(MAKE_DIRECTORY ${WORKING_DIRECTORY}) - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND ${CMAKE_COMMAND} -E tar xjf ${ARCHIVE} - WORKING_DIRECTORY ${WORKING_DIRECTORY} - LOGNAME extract + if(NOT DEFINED arg_SOURCE_BASE) + cmake_path(GET arg_ARCHIVE STEM arg_SOURCE_BASE) + elseif(arg_SOURCE_BASE MATCHES [[\\|/]]) + message(FATAL_ERROR "SOURCE_BASE (${arg_SOURCE_BASE}) must not contain slashes") + endif() + + # Take the last 10 chars of the base + set(base_max_length 10) + string(LENGTH "${arg_SOURCE_BASE}" source_base_length) + if(source_base_length GREATER base_max_length) + math(EXPR start "${source_base_length} - ${base_max_length}") + string(SUBSTRING "${arg_SOURCE_BASE}" "${start}" -1 arg_SOURCE_BASE) + endif() + + # Hash the archive hash along with the patches. Take the first 10 chars of the hash + file(SHA512 "${arg_ARCHIVE}" patchset_hash) + foreach(patch IN LISTS arg_PATCHES) + cmake_path(ABSOLUTE_PATH patch + BASE_DIRECTORY "${CURRENT_PORT_DIR}" + OUTPUT_VARIABLE absolute_patch ) - file(WRITE ${WORKING_DIRECTORY}/${ARCHIVE_FILENAME}.extracted) + if(NOT EXISTS "${absolute_patch}") + message(FATAL_ERROR "Could not find patch: '${patch}'") + endif() + file(SHA512 "${absolute_patch}" current_hash) + string(APPEND patchset_hash "${current_hash}") + endforeach() + + string(SHA512 patchset_hash "${patchset_hash}") + string(SUBSTRING "${patchset_hash}" 0 10 patchset_hash) + cmake_path(APPEND working_directory "${arg_SOURCE_BASE}-${patchset_hash}" + OUTPUT_VARIABLE source_path + ) + + if(_VCPKG_EDITABLE AND EXISTS "${source_path}") + set("${out_source_path}" "${source_path}" PARENT_SCOPE) + message(STATUS "Using source at ${source_path}") + return() + elseif(NOT _VCPKG_EDITABLE) + cmake_path(APPEND_STRING source_path ".clean") + if(EXISTS "${source_path}") + message(STATUS "Cleaning sources at ${source_path}. Use --editable to skip cleaning for the packages you specify.") + file(REMOVE_RECURSE "${source_path}") + endif() + endif() + + message(STATUS "Extracting source ${arg_ARCHIVE}") + cmake_path(APPEND_STRING source_path ".tmp" OUTPUT_VARIABLE temp_dir) + file(REMOVE_RECURSE "${temp_dir}") + file(MAKE_DIRECTORY "${temp_dir}") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${CMAKE_COMMAND}" -E tar xjf "${arg_ARCHIVE}" + WORKING_DIRECTORY "${temp_dir}" + LOGNAME extract + ) + + if(arg_NO_REMOVE_ONE_LEVEL) + cmake_path(SET temp_source_path "${temp_dir}") + else() + file(GLOB archive_directory "${temp_dir}/*") + # make sure `archive_directory` is only a single file + if(NOT archive_directory MATCHES ";" AND IS_DIRECTORY "${archive_directory}") + cmake_path(SET temp_source_path "${archive_directory}") + else() + message(FATAL_ERROR "Could not unwrap top level directory from archive. Pass NO_REMOVE_ONE_LEVEL to disable this.") + endif() + endif() + + if (arg_Z_SKIP_PATCH_CHECK) + set(quiet_param QUIET) + else() + set(quiet_param "") endif() + + z_vcpkg_apply_patches( + SOURCE_PATH "${temp_source_path}" + PATCHES ${arg_PATCHES} + ${quiet_param} + ) + + file(RENAME "${temp_source_path}" "${source_path}") + file(REMOVE_RECURSE "${temp_dir}") + + set("${out_source_path}" "${source_path}" PARENT_SCOPE) + message(STATUS "Using source at ${source_path}") endfunction() + diff --git a/scripts/cmake/vcpkg_extract_source_archive_ex.cmake b/scripts/cmake/vcpkg_extract_source_archive_ex.cmake index 633b40b1aec571..fb48c799d8d3c7 100644 --- a/scripts/cmake/vcpkg_extract_source_archive_ex.cmake +++ b/scripts/cmake/vcpkg_extract_source_archive_ex.cmake @@ -1,157 +1,35 @@ #[===[.md: # vcpkg_extract_source_archive_ex -Extract an archive into the source directory. Replaces [`vcpkg_extract_source_archive`](vcpkg_extract_source_archive.md). +Extract an archive into the source directory. +Originally replaced [`vcpkg_extract_source_archive()`], +but new ports should instead use the second overload of +[`vcpkg_extract_source_archive()`]. ## Usage ```cmake vcpkg_extract_source_archive_ex( - SKIP_PATCH_CHECK - OUT_SOURCE_PATH - ARCHIVE <${ARCHIVE}> - [REF <1.0.0>] - [NO_REMOVE_ONE_LEVEL] - [WORKING_DIRECTORY <${CURRENT_BUILDTREES_DIR}/src>] - [PATCHES ...] + [OUT_SOURCE_PATH ] + ... ) ``` -## Parameters -### SKIP_PATCH_CHECK -If this option is set the failure to apply a patch is ignored. -### OUT_SOURCE_PATH -Specifies the out-variable that will contain the extracted location. +See the documentation for [`vcpkg_extract_source_archive()`] for other parameters. +Additionally, `vcpkg_extract_source_archive_ex()` adds the `REF` and `WORKING_DIRECTORY` +parameters, which are wrappers around `SOURCE_BASE` and `BASE_DIRECTORY` +respectively. -This should be set to `SOURCE_PATH` by convention. - -### ARCHIVE -The full path to the archive to be extracted. - -This is usually obtained from calling [`vcpkg_download_distfile`](vcpkg_download_distfile.md). - -### REF -A friendly name that will be used instead of the filename of the archive. If more than 10 characters it will be truncated. - -By convention, this is set to the version number or tag fetched - -### WORKING_DIRECTORY -If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. - -Note that the archive will still be extracted into a subfolder underneath that directory (`${WORKING_DIRECTORY}/${REF}-${HASH}/`). - -### PATCHES -A list of patches to be applied to the extracted sources. - -Relative paths are based on the port directory. - -### NO_REMOVE_ONE_LEVEL -Specifies that the default removal of the top level folder should not occur. - -## Examples - -* [bzip2](https://github.com/Microsoft/vcpkg/blob/master/ports/bzip2/portfile.cmake) -* [sqlite3](https://github.com/Microsoft/vcpkg/blob/master/ports/sqlite3/portfile.cmake) -* [cairo](https://github.com/Microsoft/vcpkg/blob/master/ports/cairo/portfile.cmake) +[`vcpkg_extract_source_archive()`]: vcpkg_extract_source_archive.md #]===] -include(vcpkg_extract_source_archive) - function(vcpkg_extract_source_archive_ex) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments( - PARSE_ARGV 0 - _vesae - "NO_REMOVE_ONE_LEVEL;SKIP_PATCH_CHECK" - "OUT_SOURCE_PATH;ARCHIVE;REF;WORKING_DIRECTORY" - "PATCHES" - ) - - if(NOT _vesae_ARCHIVE) - message(FATAL_ERROR "Must specify ARCHIVE parameter to vcpkg_extract_source_archive_ex()") - endif() - - if(NOT DEFINED _vesae_OUT_SOURCE_PATH) - message(FATAL_ERROR "Must specify OUT_SOURCE_PATH parameter to vcpkg_extract_source_archive_ex()") + # OUT_SOURCE_PATH is an out-parameter so we need to parse it + cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "OUT_SOURCE_PATH" "") + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified") endif() - if(NOT DEFINED _vesae_WORKING_DIRECTORY) - set(_vesae_WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src) - endif() - - if(NOT DEFINED _vesae_REF) - get_filename_component(_vesae_REF ${_vesae_ARCHIVE} NAME_WE) - endif() - - string(REPLACE "/" "-" SANITIZED_REF "${_vesae_REF}") - - # Take the last 10 chars of the REF - set(REF_MAX_LENGTH 10) - string(LENGTH ${SANITIZED_REF} REF_LENGTH) - math(EXPR FROM_REF ${REF_LENGTH}-${REF_MAX_LENGTH}) - if(FROM_REF LESS 0) - set(FROM_REF 0) - endif() - string(SUBSTRING ${SANITIZED_REF} ${FROM_REF} ${REF_LENGTH} SHORTENED_SANITIZED_REF) - - # Hash the archive hash along with the patches. Take the first 10 chars of the hash - file(SHA512 ${_vesae_ARCHIVE} PATCHSET_HASH) - foreach(PATCH IN LISTS _vesae_PATCHES) - get_filename_component(ABSOLUTE_PATCH "${PATCH}" ABSOLUTE BASE_DIR "${CURRENT_PORT_DIR}") - file(SHA512 ${ABSOLUTE_PATCH} CURRENT_HASH) - string(APPEND PATCHSET_HASH ${CURRENT_HASH}) - endforeach() - - string(SHA512 PATCHSET_HASH ${PATCHSET_HASH}) - string(SUBSTRING ${PATCHSET_HASH} 0 10 PATCHSET_HASH) - set(SOURCE_PATH "${_vesae_WORKING_DIRECTORY}/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}") - if (NOT _VCPKG_EDITABLE) - string(APPEND SOURCE_PATH ".clean") - if(EXISTS ${SOURCE_PATH}) - message(STATUS "Cleaning sources at ${SOURCE_PATH}. Use --editable to skip cleaning for the packages you specify.") - file(REMOVE_RECURSE ${SOURCE_PATH}) - endif() - endif() - - if(NOT EXISTS ${SOURCE_PATH}) - set(TEMP_DIR "${_vesae_WORKING_DIRECTORY}/${SHORTENED_SANITIZED_REF}-${PATCHSET_HASH}.tmp") - file(REMOVE_RECURSE ${TEMP_DIR}) - vcpkg_extract_source_archive("${_vesae_ARCHIVE}" "${TEMP_DIR}") - - if(_vesae_NO_REMOVE_ONE_LEVEL) - set(TEMP_SOURCE_PATH ${TEMP_DIR}) - else() - file(GLOB _ARCHIVE_FILES "${TEMP_DIR}/*") - list(LENGTH _ARCHIVE_FILES _NUM_ARCHIVE_FILES) - set(TEMP_SOURCE_PATH) - foreach(dir IN LISTS _ARCHIVE_FILES) - if (IS_DIRECTORY ${dir}) - set(TEMP_SOURCE_PATH "${dir}") - break() - endif() - endforeach() - - if(NOT _NUM_ARCHIVE_FILES EQUAL 2 OR NOT TEMP_SOURCE_PATH) - message(FATAL_ERROR "Could not unwrap top level directory from archive. Pass NO_REMOVE_ONE_LEVEL to disable this.") - endif() - endif() - - if (_vesae_SKIP_PATCH_CHECK) - set (QUIET QUIET) - else() - set (QUIET) - endif() - - z_vcpkg_apply_patches( - ${QUIET} - SOURCE_PATH ${TEMP_SOURCE_PATH} - PATCHES ${_vesae_PATCHES} - ) - - file(RENAME ${TEMP_SOURCE_PATH} ${SOURCE_PATH}) - file(REMOVE_RECURSE ${TEMP_DIR}) - endif() + vcpkg_extract_source_archive(source_path ${arg_UNPARSED_ARGUMENTS} Z_ALLOW_OLD_PARAMETER_NAMES) - set(${_vesae_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) - message(STATUS "Using source at ${SOURCE_PATH}") - return() + set("${arg_OUT_SOURCE_PATH}" "${source_path}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index f6157aebad0cc7..e279073cad4714 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -522,6 +522,10 @@ function(vcpkg_find_acquire_program VAR) if(DEFINED SUBDIR) list(APPEND PATHS ${PROG_PATH_SUBDIR}) endif() + if("${PROG_PATH_SUBDIR}" MATCHES [[^(.*)[/\\]$]]) + # remove trailing slash, which may turn into a trailing `\` which CMake _does not like_ + set(PROG_PATH_SUBDIR "${CMAKE_MATCH_1}") + endif() do_find() if(NOT ${VAR}) diff --git a/scripts/cmake/vcpkg_from_bitbucket.cmake b/scripts/cmake/vcpkg_from_bitbucket.cmake index a376e810591b56..442ea642dc2922 100644 --- a/scripts/cmake/vcpkg_from_bitbucket.cmake +++ b/scripts/cmake/vcpkg_from_bitbucket.cmake @@ -2,7 +2,6 @@ # vcpkg_from_bitbucket Download and extract a project from Bitbucket. -Enables support for installing HEAD `vcpkg.exe install --head `. ## Usage: ```cmake @@ -58,144 +57,95 @@ This exports the `VCPKG_HEAD_VERSION` variable during head builds. #]===] function(vcpkg_from_bitbucket) - set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 HEAD_REF) - set(multipleValuesArgs PATCHES) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vdud "" "${oneValueArgs}" "${multipleValuesArgs}") + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;REPO;REF;SHA512;HEAD_REF" + "PATCHES") - if(NOT _vdud_OUT_SOURCE_PATH) - message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_bitbucket was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if((_vdud_REF AND NOT _vdud_SHA512) OR (NOT _vdud_REF AND _vdud_SHA512)) + if(DEFINED arg_REF AND NOT DEFINED arg_SHA512) message(FATAL_ERROR "SHA512 must be specified if REF is specified.") endif() + if(NOT DEFINED arg_REF AND DEFINED arg_SHA512) + message(FATAL_ERROR "REF must be specified if SHA512 is specified.") + endif() - if(NOT _vdud_REPO) + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + if(NOT DEFINED arg_REPO) message(FATAL_ERROR "The Bitbucket repository must be specified.") endif() - if(NOT _vdud_REF AND NOT _vdud_HEAD_REF) - message(FATAL_ERROR "At least one of REF and HEAD_REF must be specified.") + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") endif() - string(REGEX REPLACE ".*/" "" REPO_NAME ${_vdud_REPO}) - string(REGEX REPLACE "/.*" "" ORG_NAME ${_vdud_REPO}) - - macro(set_SOURCE_PATH BASE BASEREF) - set(SOURCE_PATH "${BASE}/${ORG_NAME}-${REPO_NAME}-${BASEREF}") - if(EXISTS ${SOURCE_PATH}) - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) - else() - # Sometimes GitHub strips a leading 'v' off the REF. - string(REGEX REPLACE "^v" "" REF ${BASEREF}) - set(SOURCE_PATH "${BASE}/${ORG_NAME}-${REPO_NAME}-${REF}") - if(EXISTS ${SOURCE_PATH}) - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) - else() - message(FATAL_ERROR "Could not determine source path: '${BASE}/${ORG_NAME}-${REPO_NAME}-${BASEREF}' does not exist") - endif() - endif() - endmacro() - - if(VCPKG_USE_HEAD_VERSION AND NOT _vdud_HEAD_REF) - message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") - set(VCPKG_USE_HEAD_VERSION OFF) + if(NOT arg_REPO MATCHES "^([^/]*)/([^/]*)$") + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name: + must be an organization name followed by a repository name separated by a single slash.") endif() - - # Handle --no-head scenarios - if(NOT VCPKG_USE_HEAD_VERSION) - if(NOT _vdud_REF) - message(FATAL_ERROR "Package does not specify REF. It must built using --head.") - endif() - - set(URL "https://bitbucket.com/${ORG_NAME}/${REPO_NAME}/get/${_vdud_REF}.tar.gz") - set(downloaded_file_path "${DOWNLOADS}/${ORG_NAME}-${REPO_NAME}-${_vdud_REF}.tar.gz") - - file(DOWNLOAD "https://api.bitbucket.com/2.0/repositories/${ORG_NAME}/${REPO_NAME}/refs/tags/${_vdud_REF}" - ${downloaded_file_path}.version - STATUS download_status - ) - list(GET download_status 0 status_code) - if ("${status_code}" STREQUAL "0") - # Parse the github refs response with regex. - # TODO: use some JSON swiss-army-knife utility instead. - file(READ "${downloaded_file_path}.version" _contents) - string(REGEX MATCH "\"hash\": \"[a-f0-9]+\"" x "${_contents}") - string(REGEX REPLACE "\"hash\": \"([a-f0-9]+)\"" "\\1" _version ${x}) - string(SUBSTRING ${_version} 0 12 _version) # Get the 12 first numbers from commit hash + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + + set(redownload_param "") + set(working_directory_param "") + set(sha512_param "SHA512" "${arg_SHA512}") + set(ref_to_use "${arg_REF}") + if(VCPKG_USE_HEAD_VERSION) + if(DEFINED arg_HEAD_REF) + set(redownload_param "ALWAYS_REDOWNLOAD") + set(sha512_param "SKIP_SHA512") + set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + set(ref_to_use "${arg_HEAD_REF}") else() - string(SUBSTRING ${_vdud_REF} 0 12 _version) # Get the 12 first numbers from commit hash + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") endif() - - vcpkg_download_distfile(ARCHIVE - URLS "https://bitbucket.com/${ORG_NAME}/${REPO_NAME}/get/${_vdud_REF}.tar.gz" - SHA512 "${_vdud_SHA512}" - FILENAME "${ORG_NAME}-${REPO_NAME}-${_vdud_REF}.tar.gz" - ) - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF "${_vdud_REF}" - PATCHES ${_vdud_PATCHES} - ) - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) - return() + elseif(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") endif() - # The following is for --head scenarios - set(URL "https://bitbucket.com/${ORG_NAME}/${REPO_NAME}/get/${_vdud_HEAD_REF}.tar.gz") - set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${_vdud_HEAD_REF}.tar.gz") - set(downloaded_file_path "${DOWNLOADS}/${downloaded_file_name}") - - if(_VCPKG_NO_DOWNLOADS) - if(NOT EXISTS ${downloaded_file_path} OR NOT EXISTS ${downloaded_file_path}.version) - message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.") - endif() - message(STATUS "Using cached ${downloaded_file_path}") - else() - if(EXISTS ${downloaded_file_path}) - message(STATUS "Purging cached ${downloaded_file_path} to fetch latest (use --no-downloads to suppress)") - file(REMOVE ${downloaded_file_path}) - endif() - if(EXISTS ${downloaded_file_path}.version) - file(REMOVE ${downloaded_file_path}.version) - endif() - if(EXISTS ${CURRENT_BUILDTREES_DIR}/src/head) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src/head) - endif() + # avoid using either - or _, to allow both `foo/bar` and `foo-bar` to coexist + # we assume that no one will name a ref "foo_-bar" + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") - # Try to download the file and version information from bitbucket. - vcpkg_download_distfile(ARCHIVE_VERSION - URLS "https://api.bitbucket.com/2.0/repositories/${ORG_NAME}/${REPO_NAME}/refs/branches/${_vdud_HEAD_REF}" + # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. + if(VCPKG_USE_HEAD_VERSION) + vcpkg_download_distfile(archive_version + URLS "https://api.bitbucket.com/2.0/repositories/${org_name}/${repo_name}/refs/branches/${arg_HEAD_REF}" FILENAME "${downloaded_file_name}.version" SKIP_SHA512 + ALWAYS_REDOWNLOAD ) - - vcpkg_download_distfile(ARCHIVE - URLS "${URL}" - FILENAME "${downloaded_file_name}" - SKIP_SHA512 - ) + # Parse the github refs response with regex. + # TODO: add json-pointer support to vcpkg + file(READ "${archive_version}" version_contents) + if(NOT version_contents MATCHES [["hash": "([a-f0-9]+)"]]) + message(FATAL_ERROR "Failed to parse API response from '${version_url}': + +${version_contents} +") + endif() + set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) endif() - # Parse the github refs response with regex. - # TODO: use some JSON swiss-army-knife utility instead. - file(READ "${ARCHIVE_VERSION}" _contents) - string(REGEX MATCH "\"hash\": \"[a-f0-9]+\"" x "${_contents}") - string(REGEX REPLACE "\"hash\": \"([a-f0-9]+)\"" "\\1" _version ${x}) - string(SUBSTRING ${_version} 0 12 _vdud_HEAD_REF) # Get the 12 first numbers from commit hash - - # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. - set(VCPKG_HEAD_VERSION ${_version} PARENT_SCOPE) - + # download the file information from bitbucket. + vcpkg_download_distfile(archive + URLS "https://bitbucket.com/${org_name}/${repo_name}/get/${ref_to_use}.tar.gz" + FILENAME "${downloaded_file_name}" + ${sha512_param} + ${redownload_param} + ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${downloaded_file_path}" - REF "${_vdud_HEAD_REF}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head" - PATCHES ${_vdud_PATCHES} + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + ${working_directory_param} ) - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index d2055f82e07311..ac46e32cc194a2 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -9,7 +9,7 @@ vcpkg_from_git( OUT_SOURCE_PATH URL REF <59f7335e4d...> - [TAG ] + [HEAD_REF ] [PATCHES ...] ) ``` @@ -26,17 +26,16 @@ The url of the git repository. ### REF The git sha of the commit to download. -### TAG -An optional git tag to be verified against the `REF`. If the remote repository's tag does not match the specified `REF`, the build will fail. +### HEAD_REF +The git branch to use when the package is requested to be built from the latest sources. + +Example: `main`, `develop`, `HEAD` ### PATCHES A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. -### X_OUT_REF (internal only) -This parameter is used for automatic REF updates for certain ports in the central vcpkg catalog. It should not be used by any ports outside the central catalog and within the central catalog it should not be used on any user path. This parameter may change behavior incompatibly or be removed at any time. - ## Notes: `OUT_SOURCE_PATH`, `REF`, and `URL` must be specified. @@ -48,94 +47,107 @@ This parameter is used for automatic REF updates for certain ports in the centra include(vcpkg_execute_in_download_mode) function(vcpkg_from_git) - set(oneValueArgs OUT_SOURCE_PATH URL REF TAG X_OUT_REF) - set(multipleValuesArgs PATCHES) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vdud "" "${oneValueArgs}" "${multipleValuesArgs}") - - if(NOT DEFINED _vdud_OUT_SOURCE_PATH) - message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") - endif() - - if(NOT DEFINED _vdud_URL) - message(FATAL_ERROR "The git url must be specified") - endif() - - if(NOT DEFINED _vdud_REF) - message(FATAL_ERROR "The git ref must be specified.") - endif() - - if(NOT DEFINED _vdud_TAG) - set(_vdud_TAG ${_vdud_REF}) - endif() - - # using .tar.gz instead of .zip because the hash of the latter is affected by timezone. - string(REPLACE "/" "-" SANITIZED_REF "${_vdud_TAG}") - set(TEMP_ARCHIVE "${DOWNLOADS}/temp/${PORT}-${SANITIZED_REF}.tar.gz") - set(ARCHIVE "${DOWNLOADS}/${PORT}-${SANITIZED_REF}.tar.gz") - set(TEMP_SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${SANITIZED_REF}") - - if(NOT EXISTS "${ARCHIVE}") - if(_VCPKG_NO_DOWNLOADS) - message(FATAL_ERROR "Downloads are disabled, but '${ARCHIVE}' does not exist.") - endif() - message(STATUS "Fetching ${_vdud_URL}...") - find_program(GIT NAMES git git.cmd) - # Note: git init is safe to run multiple times - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND ${GIT} init git-tmp - WORKING_DIRECTORY ${DOWNLOADS} - LOGNAME git-init-${TARGET_TRIPLET} - ) - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND ${GIT} fetch ${_vdud_URL} ${_vdud_TAG} --depth 1 -n - WORKING_DIRECTORY ${DOWNLOADS}/git-tmp - LOGNAME git-fetch-${TARGET_TRIPLET} + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;URL;REF;HEAD_REF;TAG" + "PATCHES" ) - vcpkg_execute_in_download_mode( - COMMAND ${GIT} rev-parse FETCH_HEAD - OUTPUT_VARIABLE REV_PARSE_HEAD - ERROR_VARIABLE REV_PARSE_HEAD - RESULT_VARIABLE error_code - WORKING_DIRECTORY ${DOWNLOADS}/git-tmp - ) - if(error_code) - message(FATAL_ERROR "unable to determine FETCH_HEAD after fetching git repository") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_git was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(DEFINED arg_TAG) + message(WARNING "The TAG argument to vcpkg_from_git has been deprecated and has no effect.") endif() - string(REGEX REPLACE "\n$" "" REV_PARSE_HEAD "${REV_PARSE_HEAD}") - if(NOT REV_PARSE_HEAD STREQUAL _vdud_REF AND NOT DEFINED _vdud_X_OUT_REF) - message(STATUS "[Expected : ( ${_vdud_REF} )]") - message(STATUS "[ Actual : ( ${REV_PARSE_HEAD} )]") - message(FATAL_ERROR "REF (${_vdud_REF}) does not match FETCH_HEAD (${REV_PARSE_HEAD})") - elseif(DEFINED _vdud_X_OUT_REF) - set(${_vdud_X_OUT_REF} ${REV_PARSE_HEAD} PARENT_SCOPE) - return() + + + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + if(NOT DEFINED arg_URL) + message(FATAL_ERROR "The git url must be specified") + endif() + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") + endif() + + set(working_directory_param "") + set(ref_to_use "${arg_REF}") + if(VCPKG_USE_HEAD_VERSION) + if(DEFINED arg_HEAD_REF) + set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + set(ref_to_use "${arg_HEAD_REF}") + else() + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") + endif() + elseif(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + endif() + + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + set(temp_archive "${DOWNLOADS}/temp/${PORT}-${sanitized_ref}.tar.gz") + set(archive "${DOWNLOADS}/${PORT}-${sanitized_ref}.tar.gz") + + if(NOT EXISTS "${archive}") + if(_VCPKG_NO_DOWNLOADS) + message(FATAL_ERROR "Downloads are disabled, but '${archive}' does not exist.") + endif() + message(STATUS "Fetching ${arg_URL} ${ref_to_use}...") + find_program(GIT NAMES git git.cmd) + file(MAKE_DIRECTORY "${DOWNLOADS}") + # Note: git init is safe to run multiple times + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" init git-tmp + WORKING_DIRECTORY "${DOWNLOADS}" + LOGNAME "git-init-${TARGET_TRIPLET}" + ) + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_use}" --depth 1 -n + WORKING_DIRECTORY "${DOWNLOADS}/git-tmp" + LOGNAME "git-fetch-${TARGET_TRIPLET}" + ) + vcpkg_execute_in_download_mode( + COMMAND "${GIT}" rev-parse FETCH_HEAD + OUTPUT_VARIABLE rev_parse_head + ERROR_VARIABLE rev_parse_head + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${DOWNLOADS}/git-tmp" + ) + if(error_code) + message(FATAL_ERROR "unable to determine FETCH_HEAD after fetching git repository") + endif() + string(STRIP "${rev_parse_head}" rev_parse_head) + if(VCPKG_USE_HEAD_VERSION) + set(VCPKG_HEAD_VERSION "${rev_parse_head}" PARENT_SCOPE) + elseif(NOT rev_parse_head STREQUAL arg_REF) + message(FATAL_ERROR "REF (${arg_REF}) does not match FETCH_HEAD (${rev_parse_head}) + [Expected : ( ${arg_REF} )]) + [ Actual : ( ${rev_parse_head} )]" + ) + endif() + + file(MAKE_DIRECTORY "${DOWNLOADS}/temp") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND "${GIT}" archive "${rev_parse_head}" -o "${temp_archive}" + WORKING_DIRECTORY "${DOWNLOADS}/git-tmp" + LOGNAME git-archive + ) + file(RENAME "${temp_archive}" "${archive}") + else() + message(STATUS "Using cached ${archive}") endif() - file(MAKE_DIRECTORY "${DOWNLOADS}/temp") - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND ${GIT} archive FETCH_HEAD -o "${TEMP_ARCHIVE}" - WORKING_DIRECTORY ${DOWNLOADS}/git-tmp - LOGNAME git-archive + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + NO_REMOVE_ONE_LEVEL + ${working_directory_param} ) - get_filename_component(downloaded_file_dir "${ARCHIVE}" DIRECTORY) - file(MAKE_DIRECTORY "${downloaded_file_dir}") - file(RENAME "${TEMP_ARCHIVE}" "${ARCHIVE}") - else() - message(STATUS "Using cached ${ARCHIVE}") - endif() - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF "${SANITIZED_REF}" - PATCHES ${_vdud_PATCHES} - NO_REMOVE_ONE_LEVEL - ) - - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index cda1fc395e6894..8a6a709243506e 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -73,159 +73,115 @@ This exports the `VCPKG_HEAD_VERSION` variable during head builds. #]===] function(vcpkg_from_github) - set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 HEAD_REF GITHUB_HOST AUTHORIZATION_TOKEN FILE_DISAMBIGUATOR) - set(multipleValuesArgs PATCHES) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vdud "" "${oneValueArgs}" "${multipleValuesArgs}") + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;REPO;REF;SHA512;HEAD_REF;GITHUB_HOST;AUTHORIZATION_TOKEN;FILE_DISAMBIGUATOR" + "PATCHES") - if(NOT DEFINED _vdud_OUT_SOURCE_PATH) - message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_github was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if((DEFINED _vdud_REF AND NOT DEFINED _vdud_SHA512) OR (NOT DEFINED _vdud_REF AND DEFINED _vdud_SHA512)) + if(DEFINED arg_REF AND NOT DEFINED arg_SHA512) message(FATAL_ERROR "SHA512 must be specified if REF is specified.") endif() - - if(NOT DEFINED _vdud_REPO) - message(FATAL_ERROR "The GitHub repository must be specified.") + if(NOT DEFINED arg_REF AND DEFINED arg_SHA512) + message(FATAL_ERROR "REF must be specified if SHA512 is specified.") endif() - if(NOT DEFINED _vdud_REF AND NOT DEFINED _vdud_HEAD_REF) - message(FATAL_ERROR "At least one of REF and HEAD_REF must be specified.") + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") endif() - - if(NOT DEFINED _vdud_GITHUB_HOST) - set(GITHUB_HOST https://github.com) - set(GITHUB_API_URL https://api.github.com) - else() - set(GITHUB_HOST "${_vdud_GITHUB_HOST}") - set(GITHUB_API_URL "${_vdud_GITHUB_HOST}/api/v3") + if(NOT DEFINED arg_REPO) + message(FATAL_ERROR "The GitHub repository must be specified.") endif() - if(DEFINED _vdud_AUTHORIZATION_TOKEN) - set(HEADERS "HEADERS" "Authorization: token ${_vdud_AUTHORIZATION_TOKEN}") + if(NOT DEFINED arg_GITHUB_HOST) + set(github_host "https://github.com") + set(github_api_url "https://api.github.com") else() - set(HEADERS) + set(github_host "${arg_GITHUB_HOST}") + set(github_api_url "${arg_GITHUB_HOST}/api/v3") endif() - string(REGEX REPLACE ".*/" "" REPO_NAME "${_vdud_REPO}") - string(REGEX REPLACE "/.*" "" ORG_NAME "${_vdud_REPO}") - - macro(set_TEMP_SOURCE_PATH BASE BASEREF) - set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${BASEREF}") - if(NOT EXISTS "${TEMP_SOURCE_PATH}") - # Sometimes GitHub strips a leading 'v' off the REF. - string(REGEX REPLACE "^v" "" REF "${BASEREF}") - string(REPLACE "/" "-" REF "${REF}") - set(TEMP_SOURCE_PATH "${BASE}/${REPO_NAME}-${REF}") - if(NOT EXISTS "${TEMP_SOURCE_PATH}") - message(FATAL_ERROR "Could not determine source path: '${BASE}/${REPO_NAME}-${BASEREF}' does not exist") - endif() - endif() - endmacro() - - if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED _vdud_HEAD_REF) - message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") - set(VCPKG_USE_HEAD_VERSION OFF) + set(headers_param "") + if(DEFINED arg_AUTHORIZATION_TOKEN) + set(headers_param "HEADERS" "Authorization: token ${arg_AUTHORIZATION_TOKEN}") endif() - # Handle --no-head scenarios - if(NOT VCPKG_USE_HEAD_VERSION) - if(NOT _vdud_REF) - message(FATAL_ERROR "Package does not specify REF. It must built using --head.") - endif() - string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}") + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") + endif() - set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}") - if (_vdud_FILE_DISAMBIGUATOR) - set(downloaded_file_name "${downloaded_file_name}-${_vdud_FILE_DISAMBIGUATOR}") + if(NOT arg_REPO MATCHES "^([^/]*)/([^/]*)$") + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name: + must be an organization name followed by a repository name separated by a single slash.") + endif() + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + + set(redownload_param "") + set(working_directory_param "") + set(sha512_param "SHA512" "${arg_SHA512}") + set(ref_to_use "${arg_REF}") + if(VCPKG_USE_HEAD_VERSION) + if(DEFINED arg_HEAD_REF) + set(redownload_param "ALWAYS_REDOWNLOAD") + set(sha512_param "SKIP_SHA512") + set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + set(ref_to_use "${arg_HEAD_REF}") + else() + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") endif() - - set(downloaded_file_name "${downloaded_file_name}.tar.gz") - - vcpkg_download_distfile(ARCHIVE - URLS "${GITHUB_HOST}/${ORG_NAME}/${REPO_NAME}/archive/${_vdud_REF}.tar.gz" - SHA512 "${_vdud_SHA512}" - FILENAME "${downloaded_file_name}" - ${HEADERS} - ) - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF "${SANITIZED_REF}" - PATCHES ${_vdud_PATCHES} - ) - - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) - return() + elseif(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") endif() - # The following is for --head scenarios - set(URL "${GITHUB_HOST}/${ORG_NAME}/${REPO_NAME}/archive/${_vdud_HEAD_REF}.tar.gz") - string(REPLACE "/" "-" SANITIZED_HEAD_REF "${_vdud_HEAD_REF}") - set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${SANITIZED_HEAD_REF}") - if (_vdud_FILE_DISAMBIGUATOR) - set(downloaded_file_name "${downloaded_file_name}-${_vdud_FILE_DISAMBIGUATOR}") + # avoid using either - or _, to allow both `foo/bar` and `foo-bar` to coexist + # we assume that no one will name a ref "foo_-bar" + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_VERSION) + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") + else() + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") endif() - set(downloaded_file_name "${downloaded_file_name}.tar.gz") - - set(downloaded_file_path "${DOWNLOADS}/${downloaded_file_name}") - if(_VCPKG_NO_DOWNLOADS) - if(NOT EXISTS "${downloaded_file_path}" OR NOT EXISTS "${downloaded_file_path}.version") - message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.") - endif() - message(STATUS "Using cached ${downloaded_file_path}") - else() - if(EXISTS "${downloaded_file_path}") - message(STATUS "Purging cached ${downloaded_file_path} to fetch latest (use --no-downloads to suppress)") - file(REMOVE "${downloaded_file_path}") - endif() - if(EXISTS "${downloaded_file_path}.version") - file(REMOVE "${downloaded_file_path}.version") - endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/head") - file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/src/head") - endif() - - # Try to download the file and version information from github. - vcpkg_download_distfile(ARCHIVE_VERSION - URLS "${GITHUB_API_URL}/repos/${ORG_NAME}/${REPO_NAME}/git/refs/heads/${_vdud_HEAD_REF}" + # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. + if(VCPKG_USE_HEAD_VERSION) + vcpkg_download_distfile(archive_version + URLS "${github_api_url}/repos/${org_name}/${repo_name}/git/refs/heads/${arg_HEAD_REF}" FILENAME "${downloaded_file_name}.version" SKIP_SHA512 - ${HEADERS} + ALWAYS_REDOWNLOAD ) - - vcpkg_download_distfile(ARCHIVE - URLS ${URL} - FILENAME "${downloaded_file_name}" - SKIP_SHA512 - ${HEADERS} - ) - endif() - - # Parse the github refs response with regex. - # TODO: use some JSON swiss-army-knife utility instead. - file(READ "${downloaded_file_path}.version" _contents) - string(REGEX MATCH "\"sha\": \"[a-f0-9]+\"" x "${_contents}") - string(REGEX REPLACE "\"sha\": \"([a-f0-9]+)\"" "\\1" _version ${x}) - - # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. - # When multiple vcpkg_from_github's are used after each other, only use the version from the first (hopefully the primary one). - if(NOT DEFINED VCPKG_HEAD_VERSION) - set(VCPKG_HEAD_VERSION "${_version}" PARENT_SCOPE) + # Parse the github refs response with regex. + # TODO: add json-pointer support to vcpkg + file(READ "${archive_version}" version_contents) + if(NOT version_contents MATCHES [["sha": "([a-f0-9]+)"]]) + message(FATAL_ERROR "Failed to parse API response from '${version_url}': + +${version_contents} +") + endif() + set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) endif() + # Try to download the file information from github + vcpkg_download_distfile(archive + URLS "${github_host}/${org_name}/${repo_name}/archive/${ref_to_use}.tar.gz" + FILENAME "${downloaded_file_name}" + ${headers_param} + ${sha512_param} + ${redownload_param} + ) vcpkg_extract_source_archive_ex( - SKIP_PATCH_CHECK OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${downloaded_file_path}" - REF "${SANITIZED_HEAD_REF}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/src/head" - PATCHES ${_vdud_PATCHES} + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + ${working_directory_param} ) - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index 865c5326ea3a14..75b09601f3ae8f 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -70,132 +70,120 @@ This exports the `VCPKG_HEAD_VERSION` variable during head builds. include(vcpkg_execute_in_download_mode) function(vcpkg_from_gitlab) - set(oneValueArgs OUT_SOURCE_PATH GITLAB_URL USER REPO REF SHA512 HEAD_REF FILE_DISAMBIGUATOR) - set(multipleValuesArgs PATCHES) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vdud "" "${oneValueArgs}" "${multipleValuesArgs}") + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "" + "OUT_SOURCE_PATH;GITLAB_URL;REPO;REF;SHA512;HEAD_REF;FILE_DISAMBIGUATOR" + "PATCHES") - if(NOT DEFINED _vdud_GITLAB_URL) - message(FATAL_ERROR "GITLAB_URL must be specified.") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_from_gitlab was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if(NOT DEFINED _vdud_OUT_SOURCE_PATH) - message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + if(NOT DEFINED arg_GITLAB_URL) + message(FATAL_ERROR "GITLAB_URL must be specified.") endif() - if((DEFINED _vdud_REF AND NOT DEFINED _vdud_SHA512) OR (NOT DEFINED _vdud_REF AND DEFINED _vdud_SHA512)) + if(DEFINED arg_REF AND NOT DEFINED arg_SHA512) message(FATAL_ERROR "SHA512 must be specified if REF is specified.") endif() + if(NOT DEFINED arg_REF AND DEFINED arg_SHA512) + message(FATAL_ERROR "REF must be specified if SHA512 is specified.") + endif() - if(NOT DEFINED _vdud_REPO) - message(FATAL_ERROR "REPO must be specified.") + if(NOT DEFINED arg_OUT_SOURCE_PATH) + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + endif() + if(NOT DEFINED arg_REPO) + message(FATAL_ERROR "The GitHub repository must be specified.") endif() - if(NOT DEFINED _vdud_REF AND NOT DEFINED _vdud_HEAD_REF) - message(FATAL_ERROR "At least one of REF and HEAD_REF must be specified.") + set(headers_param "") + if(DEFINED arg_AUTHORIZATION_TOKEN) + set(headers_param "HEADERS" "Authorization: token ${arg_AUTHORIZATION_TOKEN}") endif() - if(VCPKG_USE_HEAD_VERSION AND NOT DEFINED _vdud_HEAD_REF) - message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") - set(VCPKG_USE_HEAD_VERSION OFF) + if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") endif() - string(REPLACE "/" ";" GITLAB_REPO_LINK ${_vdud_REPO}) - - list(LENGTH GITLAB_REPO_LINK len) - if(${len} EQUAL "2") - list(GET GITLAB_REPO_LINK 0 ORG_NAME) - list(GET GITLAB_REPO_LINK 1 REPO_NAME) - set(GITLAB_LINK ${_vdud_GITLAB_URL}/${ORG_NAME}/${REPO_NAME}) - endif() - - if(${len} EQUAL "3") - list(GET GITLAB_REPO_LINK 0 ORG_NAME) - list(GET GITLAB_REPO_LINK 1 GROUP_NAME) - list(GET GITLAB_REPO_LINK 2 REPO_NAME) - set(GITLAB_LINK ${_vdud_GITLAB_URL}/${ORG_NAME}/${GROUP_NAME}/${REPO_NAME}) - endif() - - # Handle --no-head scenarios - if(NOT VCPKG_USE_HEAD_VERSION) - if(NOT _vdud_REF) - message(FATAL_ERROR "Package does not specify REF. It must built using --head.") - endif() + if(arg_REPO MATCHES [[^([^/]*)/([^/]*)$]]) # 2 elements + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") + set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${repo_name}") + elseif(arg_REPO MATCHES [[^([^/]*)/([^/]*)/([^/]*)$]]) # 3 elements + set(org_name "${CMAKE_MATCH_1}") + set(group_name "${CMAKE_MATCH_2}") + set(repo_name "${CMAKE_MATCH_3}") + set(gitlab_link "${arg_GITLAB_URL}/${org_name}/${group_name}/${repo_name}") + else() + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be: + - an organization name followed by a repository name separated by a single slash, or + - an organization name, group name, and repository name separated by slashes.") + endif() - string(REPLACE "/" "-" SANITIZED_REF "${_vdud_REF}") - set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${SANITIZED_REF}") - if (_vdud_FILE_DISAMBIGUATOR) - set(downloaded_file_name "${downloaded_file_name}-${_vdud_FILE_DISAMBIGUATOR}") + set(redownload_param "") + set(working_directory_param "") + set(sha512_param "SHA512" "${arg_SHA512}") + set(ref_to_use "${arg_REF}") + if(VCPKG_USE_HEAD_VERSION) + if(DEFINED arg_HEAD_REF) + set(redownload_param "ALWAYS_REDOWNLOAD") + set(sha512_param "SKIP_SHA512") + set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + set(ref_to_use "${arg_HEAD_REF}") + else() + message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") endif() + elseif(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + endif() - set(downloaded_file_name "${downloaded_file_name}.tar.gz") - - vcpkg_download_distfile(ARCHIVE - URLS "${GITLAB_LINK}/-/archive/${_vdud_REF}/${REPO_NAME}-${_vdud_REF}.tar.gz" - SHA512 "${_vdud_SHA512}" - FILENAME "${downloaded_file_name}" - ) - - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${ARCHIVE}" - REF "${SANITIZED_REF}" - PATCHES ${_vdud_PATCHES} - ) - - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) - return() + # avoid using either - or _, to allow both `foo/bar` and `foo-bar` to coexist + # we assume that no one will name a ref "foo_-bar" + string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") + if(DEFINED arg_FILE_DISAMBIGUATOR AND NOT VCPKG_USE_HEAD_VERSION) + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}-${arg_FILE_DISAMBIGUATOR}.tar.gz") + else() + set(downloaded_file_name "${org_name}-${repo_name}-${sanitized_ref}.tar.gz") endif() - # The following is for --head scenarios - set(URL "${GITLAB_LINK}/-/archive/${_vdud_HEAD_REF}/${_vdud_HEAD_REF}.tar.gz") - string(REPLACE "/" "-" SANITIZED_HEAD_REF "${_vdud_HEAD_REF}") - set(downloaded_file_name "${ORG_NAME}-${REPO_NAME}-${SANITIZED_HEAD_REF}.tar.gz") - set(downloaded_file_path "${DOWNLOADS}/${downloaded_file_name}") - if(_VCPKG_NO_DOWNLOADS) - if(NOT EXISTS ${downloaded_file_path} OR NOT EXISTS ${downloaded_file_path}.version) - message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.") - endif() - message(STATUS "Using cached ${downloaded_file_path}") - else() - if(EXISTS ${downloaded_file_path}) - message(STATUS "Purging cached ${downloaded_file_path} to fetch latest (use --no-downloads to suppress)") - file(REMOVE ${downloaded_file_path}) + # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. + if(VCPKG_USE_HEAD_VERSION) + # There are issues with the Gitlab API project paths being URL-escaped, so we use git here to get the head revision + vcpkg_execute_in_download_mode(COMMAND ${GIT} ls-remote + "${gitlab_link}.git" "${arg_HEAD_REF}" + RESULT_VARIABLE git_result + OUTPUT_VARIABLE git_output + ) + if(NOT git_result EQUAL 0) + message(FATAL_ERROR "git ls-remote failed to read ref data of repository: '${gitlab_link}'") endif() - if(EXISTS ${downloaded_file_path}.version) - file(REMOVE ${downloaded_file_path}.version) + if(NOT git_output MATCHES "^([a-f0-9]*)\t") + message(FATAL_ERROR "git ls-remote returned unexpected result: +${git_output} +") endif() - if(EXISTS ${CURRENT_BUILDTREES_DIR}/src/head) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src/head) + # When multiple vcpkg_from_gitlab's are used after each other, only use the version from the first (hopefully the primary one). + if(NOT DEFINED VCPKG_HEAD_VERSION) + set(VCPKG_HEAD_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) endif() - - vcpkg_download_distfile(ARCHIVE - URLS ${URL} - FILENAME ${downloaded_file_name} - SKIP_SHA512 - ) endif() - # There are issues with the Gitlab API project paths being URL-escaped, so we use git here to get the head revision - vcpkg_execute_in_download_mode(COMMAND ${GIT} ls-remote - "${GITLAB_LINK}.git" "${_vdud_HEAD_REF}" - RESULT_VARIABLE _git_result - OUTPUT_VARIABLE _git_output + # download the file information from gitlab + vcpkg_download_distfile(archive + URLS "${gitlab_link}/-/archive/${ref_to_use}/${repo_name}-${ref_to_use}.tar.gz" + FILENAME "${downloaded_file_name}" + ${headers_param} + ${sha512_param} + ${redownload_param} ) - string(REGEX MATCH "[a-f0-9]+" _version "${_git_output}") - # exports VCPKG_HEAD_VERSION to the caller. This will get picked up by ports.cmake after the build. - # When multiple vcpkg_from_gitlab's are used after each other, only use the version from the first (hopefully the primary one). - if(NOT DEFINED VCPKG_HEAD_VERSION) - set(VCPKG_HEAD_VERSION ${_version} PARENT_SCOPE) - endif() - vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE "${downloaded_file_path}" - REF "${SANITIZED_HEAD_REF}" - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/src/head - PATCHES ${_vdud_PATCHES} + ARCHIVE "${archive}" + REF "${sanitized_ref}" + PATCHES ${arg_PATCHES} + ${working_directory_param} ) - set(${_vdud_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_from_sourceforge.cmake b/scripts/cmake/vcpkg_from_sourceforge.cmake index de0e6c509ed9b0..a65cd725205693 100644 --- a/scripts/cmake/vcpkg_from_sourceforge.cmake +++ b/scripts/cmake/vcpkg_from_sourceforge.cmake @@ -3,6 +3,10 @@ Download and extract a project from sourceforge. +This function automatically checks a set of sourceforge mirrors. +Additional mirrors can be injected through the `VCPKG_SOURCEFORGE_EXTRA_MIRRORS` +list variable in the triplet. + ## Usage: ```cmake vcpkg_from_sourceforge( @@ -53,9 +57,6 @@ A list of patches to be applied to the extracted sources. Relative paths are based on the port directory. -### DISABLE_SSL -Disable ssl when downloading source. - ### NO_REMOVE_ONE_LEVEL Specifies that the default removal of the top level folder should not occur. @@ -67,67 +68,51 @@ Specifies that the default removal of the top level folder should not occur. #]===] function(vcpkg_from_sourceforge) - set(booleanValueArgs DISABLE_SSL NO_REMOVE_ONE_LEVEL) - set(oneValueArgs OUT_SOURCE_PATH REPO REF SHA512 FILENAME WORKING_DIRECTORY) - set(multipleValuesArgs PATCHES) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vdus "${booleanValueArgs}" "${oneValueArgs}" "${multipleValuesArgs}") + cmake_parse_arguments(PARSE_ARGV 0 "arg" + "DISABLE_SSL;NO_REMOVE_ONE_LEVEL" + "OUT_SOURCE_PATH;REPO;REF;SHA512;FILENAME;WORKING_DIRECTORY" + "PATCHES") - if(NOT DEFINED _vdus_OUT_SOURCE_PATH) + if(NOT DEFINED arg_OUT_SOURCE_PATH) message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") endif() - - if(NOT DEFINED _vdus_SHA512) + if(NOT DEFINED arg_SHA512) message(FATAL_ERROR "SHA512 must be specified.") endif() - - if(NOT DEFINED _vdus_REPO) + if(NOT DEFINED arg_REPO) message(FATAL_ERROR "The sourceforge repository must be specified.") endif() - if(DEFINED _vdus_WORKING_DIRECTORY) - set(WORKING_DIRECTORY WORKING_DIRECTORY "${_vdus_WORKING_DIRECTORY}") - else() - set(WORKING_DIRECTORY) - endif() - if (_vdus_DISABLE_SSL) - set(URL_PROTOCOL http:) - else() - set(URL_PROTOCOL https:) + if(arg_DISABLE_SSL) + message(WARNING "DISABLE_SSL has been deprecated and has no effect") endif() - set(SOURCEFORGE_HOST ${URL_PROTOCOL}//sourceforge.net/projects) - - string(FIND ${_vdus_REPO} "/" FOUND_ORG) - if (NOT FOUND_ORG EQUAL -1) - string(SUBSTRING "${_vdus_REPO}" 0 ${FOUND_ORG} ORG_NAME) - math(EXPR FOUND_ORG "${FOUND_ORG} + 1") # skip the slash - string(SUBSTRING "${_vdus_REPO}" ${FOUND_ORG} -1 REPO_NAME) - if (REPO_NAME MATCHES "/") - message(FATAL_ERROR "REPO should contain at most one slash (found ${_vdus_REPO}).") - endif() - set(ORG_NAME ${ORG_NAME}/) + set(sourceforge_host "https://sourceforge.net/projects") + + if(arg_REPO MATCHES "^([^/]*)$") # just one element + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "") + elseif(arg_REPO MATCHES "^([^/]*)/([^/]*)$") # two elements + set(org_name "${CMAKE_MATCH_1}") + set(repo_name "${CMAKE_MATCH_2}") else() - set(ORG_NAME ${_vdus_REPO}/) - set(REPO_NAME ) + message(FATAL_ERROR "REPO (${arg_REPO}) is not a valid repo name. It must be: + - an organization name without any slashes, or + - an organization name followed by a repository name separated by a single slash") endif() - if (DEFINED _vdus_REF) - set(URL "${SOURCEFORGE_HOST}/${ORG_NAME}files/${REPO_NAME}/${_vdus_REF}/${_vdus_FILENAME}") + if(DEFINED arg_REF) + set(url "${sourceforge_host}/${org_name}/files/${repo_name}/${arg_REF}/${arg_FILENAME}") + elseif(DEFINED repo_name) + set(url "${sourceforge_host}/${org_name}/${repo_name}/files/${arg_FILENAME}") else() - set(URL "${SOURCEFORGE_HOST}/${ORG_NAME}${REPO_NAME}/files/${_vdus_FILENAME}") + set(url "${sourceforge_host}/${org_name}/files/${arg_FILENAME}") endif() - set(NO_REMOVE_ONE_LEVEL ) - if (_vdus_NO_REMOVE_ONE_LEVEL) - set(NO_REMOVE_ONE_LEVEL "NO_REMOVE_ONE_LEVEL") - endif() - - string(SUBSTRING "${_vdus_SHA512}" 0 10 SANITIZED_REF) + string(SUBSTRING "${arg_SHA512}" 0 10 sanitized_ref) - set(Z_VCPKG_SOURCEFORGE_MIRRORS ${SOURCEFORGE_MIRRORS}) - list(APPEND Z_VCPKG_SOURCEFORGE_MIRRORS + set(sourceforge_mirrors cfhcable # United States pilotfiber # New York, NY gigenet # Chicago, IL @@ -149,26 +134,43 @@ function(vcpkg_from_sourceforge) ufpr # Curitiba, Brazil tenet # Wynberg, South Africa ) + if(DEFINED SOURCEFORGE_MIRRORS AND NOT DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) + message(WARNING "Extension point SOURCEFORGE_MIRRORS has been deprecated. + Please use the replacement VCPKG_SOURCEFORGE_EXTRA_MIRRORS variable instead.") + list(APPEND sourceforge_mirrors "${SOURCEFORGE_MIRRORS}") + list(REMOVE_DUPLICATES sourceforge_mirrors) + elseif(DEFINED VCPKG_SOURCEFORGE_EXTRA_MIRRORS) + list(APPEND sourceforge_mirrors "${VCPKG_SOURCEFORGE_EXTRA_MIRRORS}") + list(REMOVE_DUPLICATES sourceforge_mirrors) + endif() - set(URLS "${URL}/download") - foreach(SOURCEFORGE_MIRROR IN LISTS Z_VCPKG_SOURCEFORGE_MIRRORS) - list(APPEND URLS "${URL}/download?use_mirror=${SOURCEFORGE_MIRROR}") + set(all_urls "${url}/download") + foreach(mirror IN LISTS sourceforge_mirrors) + list(APPEND all_urls "${url}/download?use_mirror=${mirror}") endforeach() - + vcpkg_download_distfile(ARCHIVE - URLS ${URLS} - SHA512 "${_vdus_SHA512}" - FILENAME "${_vdus_FILENAME}" + URLS ${all_urls} + SHA512 "${arg_SHA512}" + FILENAME "${arg_FILENAME}" ) + set(no_remove_one_level_param "") + set(working_directory_param "") + if(arg_NO_REMOVE_ONE_LEVEL) + set(no_remove_one_level_param "NO_REMOVE_ONE_LEVEL") + endif() + if(DEFINED arg_WORKING_DIRECTORY) + set(working_directory_param "WORKING_DIRECTORY" "${arg_WORKING_DIRECTORY}") + endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" - REF "${SANITIZED_REF}" - ${NO_REMOVE_ONE_LEVEL} - ${WORKING_DIRECTORY} - PATCHES ${_vdus_PATCHES} + REF "${sanitized_ref}" + ${no_remove_one_level_param} + ${working_directory_param} + PATCHES ${arg_PATCHES} ) - set(${_vdus_OUT_SOURCE_PATH} "${SOURCE_PATH}" PARENT_SCOPE) + set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake index 811cedf8f76878..a6b9ec9c2973fd 100644 --- a/scripts/cmake/vcpkg_install_msbuild.cmake +++ b/scripts/cmake/vcpkg_install_msbuild.cmake @@ -87,8 +87,8 @@ Additional options passed to msbuild for Debug builds. These are in addition to ## Examples -* [xalan-c](https://github.com/Microsoft/vcpkg/blob/master/ports/xalan-c/portfile.cmake) -* [libimobiledevice](https://github.com/Microsoft/vcpkg/blob/master/ports/libimobiledevice/portfile.cmake) +* [libirecovery](https://github.com/Microsoft/vcpkg/blob/master/ports/libirecovery/portfile.cmake) +* [libfabric](https://github.com/Microsoft/vcpkg/blob/master/ports/libfabric/portfile.cmake) #]===] function(vcpkg_install_msbuild) diff --git a/scripts/cmake/z_vcpkg_forward_output_variable.cmake b/scripts/cmake/z_vcpkg_forward_output_variable.cmake new file mode 100644 index 00000000000000..4d775b8cc478f5 --- /dev/null +++ b/scripts/cmake/z_vcpkg_forward_output_variable.cmake @@ -0,0 +1,48 @@ +#[===[.md: +# z_vcpkg_forward_output_variable + +This macro helps with forwarding values from inner function calls, +through a local function scope, into pointer out parameters. + +```cmake +z_vcpkg_forward_output_variable(ptr_to_parent_var var_to_forward) +``` + +is equivalent to + +```cmake +if(DEFINED ptr_to_parent_var) + if(DEFINED value_var) + set("${ptr_to_parent_var}" "${value_var}" PARENT_SCOPE) + else() + unset("${ptr_to_parent_var}" PARENT_SCOPE) + endif() +endif() +``` + +Take note that the first argument should be a local variable that has a value of the parent variable name. +Most commonly, this local is the result of a pointer-out parameter to a function. +If the variable in the first parameter is not defined, this function does nothing, +simplifying functions with optional out parameters. +Most commonly, this should be used in cases like: + +```cmake +function(my_function out_var) + file(SHA512 "somefile.txt" local_var) + z_vcpkg_forward_output_variable(out_var local_var) +endfunction() +``` +#]===] + +macro(z_vcpkg_forward_output_variable ptr_to_parent_var var_to_forward) + if("${ARGC}" GREATER "2") + message(FATAL_ERROR "z_vcpkg_forward_output_variable was passed extra arguments: ${ARGN}") + endif() + if(DEFINED "${ptr_to_parent_var}") + if(DEFINED "${var_to_forward}") + set("${${ptr_to_parent_var}}" "${${var_to_forward}}" PARENT_SCOPE) + else() + unset("${${ptr_to_parent_var}}" PARENT_SCOPE) + endif() + endif() +endmacro() diff --git a/scripts/detect_compiler/CMakeLists.txt b/scripts/detect_compiler/CMakeLists.txt index 5ae17c5b27f385..c55da9ebb2bdeb 100644 --- a/scripts/detect_compiler/CMakeLists.txt +++ b/scripts/detect_compiler/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.20) project(detect_compiler NONE) if(CMAKE_GENERATOR STREQUAL "Ninja" AND CMAKE_SYSTEM_NAME STREQUAL "Windows") diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index 2b0bd671a51832..084042fb116ab2 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.17) +cmake_minimum_required(VERSION 3.20) set(VCPKG_LANGUAGES "C;CXX" CACHE STRING "Languages to enables for this project") diff --git a/scripts/ports.cmake b/scripts/ports.cmake index d91c81b0b284e7..ce6fc557b775a1 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -1,5 +1,5 @@ # rebuild: 1 -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.20) set(SCRIPTS "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location to stored scripts") include("${SCRIPTS}/cmake/z_vcpkg_function_arguments.cmake") @@ -26,7 +26,7 @@ endif() list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake") include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake") -vcpkg_minimum_required(VERSION 2021-01-13) +vcpkg_minimum_required(VERSION 2021-05-05) file(TO_CMAKE_PATH "${BUILDTREES_DIR}" BUILDTREES_DIR) file(TO_CMAKE_PATH "${PACKAGES_DIR}" PACKAGES_DIR) @@ -134,6 +134,7 @@ if(CMD MATCHES "^BUILD$") include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake") include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake") + include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake") include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake") include("${CURRENT_PORT_DIR}/portfile.cmake") diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 4df3264db02534..785d1b8b4e3c60 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -28,13 +28,6 @@ 1e81c37d3b144cfb81478140e7921f314134845d2f0e0f941109ef57d510e7bd37dda6cc292ec00782472e7f1671349b857be9aac1c3f974423c8d1875a46302 cmake-3.20.2-linux-x86_64.tar.gz - - 3.12.4 - cmake-3.12.4-FreeBSD-x86_64/bin/cmake - https://github.com/ivysnow/CMake/releases/download/v3.12.4/cmake-3.12.4-FreeBSD-x86_64.tar.gz - b5aeb2de36f3c29757c9404e33756da88580ddfa07f29079c7f275ae0d6d018fdfe3f55d54d1403f38e359865cf93436e084c6b1ea91f26c88bc01dde3793479 - cmake-3.12.4-FreeBSD-x86_64.tar.gz - 2.26.2-1 mingw32\bin\git.exe diff --git a/versions/a-/avisynthplus.json b/versions/a-/avisynthplus.json index 73c4843932863b..c8cd5d877581bf 100644 --- a/versions/a-/avisynthplus.json +++ b/versions/a-/avisynthplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "747e0dd9f81ace8b2f473dc455871938d930df28", + "version-semver": "3.7.0", + "port-version": 1 + }, { "git-tree": "3d573152a7d82faefcb525b1d6cf688a1465a71b", "version-semver": "3.7.0", diff --git a/versions/b-/bond.json b/versions/b-/bond.json index d4c2879d564df5..88acf8925e8ae7 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29fa989c86f7846056f2afc162152f79169ec813", + "version-string": "9.0.3", + "port-version": 1 + }, { "git-tree": "bde4f6ac4c95a05f823e8de810f57df015738ac4", "version-string": "9.0.3", diff --git a/versions/baseline.json b/versions/baseline.json index 1d13df61403923..29454476b8b506 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -226,7 +226,7 @@ }, "avisynthplus": { "baseline": "3.7.0", - "port-version": 0 + "port-version": 1 }, "avro-c": { "baseline": "1.9.2-1", @@ -434,7 +434,7 @@ }, "bond": { "baseline": "9.0.3", - "port-version": 0 + "port-version": 1 }, "boolinq": { "baseline": "3.0.1", @@ -4349,8 +4349,8 @@ "port-version": 0 }, "nmap": { - "baseline": "7.70-4", - "port-version": 0 + "baseline": "7.70", + "port-version": 5 }, "nmslib": { "baseline": "2.0.6", @@ -4554,7 +4554,7 @@ }, "opencv3": { "baseline": "3.4.14", - "port-version": 0 + "port-version": 1 }, "opencv4": { "baseline": "4.5.2", @@ -5065,8 +5065,8 @@ "port-version": 2 }, "qcustomplot": { - "baseline": "2.0.1-4", - "port-version": 0 + "baseline": "2.0.1", + "port-version": 5 }, "qhull": { "baseline": "8.0.2", @@ -5162,7 +5162,7 @@ }, "qt5-mqtt": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-multimedia": { "baseline": "5.15.2", @@ -6530,7 +6530,7 @@ }, "vcpkg-cmake-config": { "baseline": "2021-05-22", - "port-version": 0 + "port-version": 1 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/n-/nmap.json b/versions/n-/nmap.json index 64104cebb57b76..16b6862f6cbbab 100644 --- a/versions/n-/nmap.json +++ b/versions/n-/nmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b435c01d439c57ba46d2de58b81fd1da81555776", + "version": "7.70", + "port-version": 5 + }, { "git-tree": "83ebdc9303a1f8917df4275921160636cdb05eef", "version-string": "7.70-4", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 3237895a29d590..2294e2eb7d528f 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "850be938a178de206c52be71229048d501bd61e8", + "version": "3.4.14", + "port-version": 1 + }, { "git-tree": "766b570f861ad21af950db7c02e5dc48d4fd1a1e", "version": "3.4.14", diff --git a/versions/q-/qcustomplot.json b/versions/q-/qcustomplot.json index ccae06e9571136..f22ce4aebaf6cb 100644 --- a/versions/q-/qcustomplot.json +++ b/versions/q-/qcustomplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fcc18d2987ed5b3af803d5e0ac5c9afd026fc37", + "version": "2.0.1", + "port-version": 5 + }, { "git-tree": "c995c8e160e05060606844f9a0ea84b1fd5d61d3", "version-string": "2.0.1-4", diff --git a/versions/q-/qt5-mqtt.json b/versions/q-/qt5-mqtt.json index c4a29965ffbd1e..36e684e44ada85 100644 --- a/versions/q-/qt5-mqtt.json +++ b/versions/q-/qt5-mqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a02099176012e710ae215855f4e72fe6f5b704a", + "version": "5.15.2", + "port-version": 1 + }, { "git-tree": "af160578b6f6fe501b01817d6d171d123a4841d1", "version-string": "5.15.2", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index 0b1778c5c43605..1a528ef23c9aeb 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5", + "version-date": "2021-05-22", + "port-version": 1 + }, { "git-tree": "2d4f997a32b8e8bfe98d12beb2bfe6be713c7086", "version-date": "2021-05-22", From e62b87b1c743f3498a3a65614dce4a35c78bb497 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 14 Jul 2021 12:46:05 -0700 Subject: [PATCH 0104/1858] Update to Ubuntu 20.04. (#18892) * Update Ubuntu to 20.04. * [tfhe] Disable -Wall -Werror * [sophus] Disable -Werror. * Fix typo in deployment of CUDA. * Add libxxf86vm-dev for opensubdiv. * [opensubdiv] Fix OpenCL search on Ubuntu 20.04, and document libxxf86vm-dev dependency * [msgpack11] Disable -Werror. * [qtwayland, qt5wayland] Add system library notice. * Add python-is-python3 to unbreak tensorflow, v8, and others * [graphqlparser] Remove directive rejected by Bison 3.5.1 * [ogdf] Mark as failing in ci.baseline.txt. Issue filed https://github.com/microsoft/vcpkg/issues/18936 * [bde] Mark failing in ci.baseline.txt, issue filed https://github.com/microsoft/vcpkg/issues/18937 * [soem] Patch out -Werror * Update pool. --- ports/graphqlparser/CONTROL | 3 -- ports/graphqlparser/portfile.cmake | 1 + .../remove-invalid-bison-directive.patch | 13 ++++++ ports/graphqlparser/vcpkg.json | 6 +++ ports/msgpack11/CONTROL | 6 --- ports/msgpack11/disable-werror.patch | 14 +++++++ ports/msgpack11/portfile.cmake | 9 ++-- ports/msgpack11/vcpkg.json | 10 +++++ ports/opensubdiv/fix-version-search.patch | 13 ++++++ ports/opensubdiv/portfile.cmake | 5 ++- ports/opensubdiv/vcpkg.json | 2 +- ports/qt5-wayland/CONTROL | 4 -- ports/qt5-wayland/portfile.cmake | 8 ++-- ports/qt5-wayland/vcpkg.json | 13 ++++++ ports/qtwayland/portfile.cmake | 4 ++ ports/qtwayland/vcpkg.json | 1 + ports/soem/CONTROL | 5 --- ports/soem/disable-werror.patch | 42 +++++++++++++++++++ ports/soem/portfile.cmake | 3 +- ports/soem/vcpkg.json | 14 +++++++ ports/sophus/CONTROL | 5 --- ports/sophus/disable-werror.patch | 18 ++++++++ ports/sophus/portfile.cmake | 3 +- ports/sophus/vcpkg.json | 12 ++++++ ports/tfhe/CONTROL | 4 -- ports/tfhe/portfile.cmake | 5 ++- ports/tfhe/vcpkg.json | 8 ++++ scripts/azure-pipelines/azure-pipelines.yml | 2 +- scripts/azure-pipelines/linux/create-vmss.ps1 | 4 +- .../azure-pipelines/linux/provision-image.sh | 23 ++++++---- scripts/ci.baseline.txt | 18 ++------ versions/baseline.json | 24 +++++------ versions/g-/graphqlparser.json | 5 +++ versions/m-/msgpack11.json | 5 +++ versions/o-/opensubdiv.json | 5 +++ versions/q-/qt5-wayland.json | 5 +++ versions/q-/qtwayland.json | 5 +++ versions/s-/soem.json | 5 +++ versions/s-/sophus.json | 5 +++ versions/t-/tfhe.json | 5 +++ 40 files changed, 266 insertions(+), 76 deletions(-) delete mode 100644 ports/graphqlparser/CONTROL create mode 100644 ports/graphqlparser/remove-invalid-bison-directive.patch create mode 100644 ports/graphqlparser/vcpkg.json delete mode 100644 ports/msgpack11/CONTROL create mode 100644 ports/msgpack11/disable-werror.patch create mode 100644 ports/msgpack11/vcpkg.json create mode 100644 ports/opensubdiv/fix-version-search.patch delete mode 100644 ports/qt5-wayland/CONTROL create mode 100644 ports/qt5-wayland/vcpkg.json delete mode 100644 ports/soem/CONTROL create mode 100644 ports/soem/disable-werror.patch create mode 100644 ports/soem/vcpkg.json delete mode 100644 ports/sophus/CONTROL create mode 100644 ports/sophus/disable-werror.patch create mode 100644 ports/sophus/vcpkg.json delete mode 100644 ports/tfhe/CONTROL create mode 100644 ports/tfhe/vcpkg.json diff --git a/ports/graphqlparser/CONTROL b/ports/graphqlparser/CONTROL deleted file mode 100644 index 128c494989cbe3..00000000000000 --- a/ports/graphqlparser/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: graphqlparser -Version: 0.7.0-1 -Description: A GraphQL query parser in C++ with C and C++ APIs diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake index 67b8a2231599d3..92e36911089508 100644 --- a/ports/graphqlparser/portfile.cmake +++ b/ports/graphqlparser/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES win-cmake.patch static-compile-fix.patch + remove-invalid-bison-directive.patch ) if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") diff --git a/ports/graphqlparser/remove-invalid-bison-directive.patch b/ports/graphqlparser/remove-invalid-bison-directive.patch new file mode 100644 index 00000000000000..0e0b896dcb566b --- /dev/null +++ b/ports/graphqlparser/remove-invalid-bison-directive.patch @@ -0,0 +1,13 @@ +diff --git a/parser.ypp b/parser.ypp +index 2afbcac..baa9cab 100644 +--- a/parser.ypp ++++ b/parser.ypp +@@ -7,8 +7,6 @@ + * of patent rights can be found in the PATENTS file in the same directory. + */ + +-%require "3" +- + %skeleton "lalr1.cc" + + %defines diff --git a/ports/graphqlparser/vcpkg.json b/ports/graphqlparser/vcpkg.json new file mode 100644 index 00000000000000..d859a1f19f7567 --- /dev/null +++ b/ports/graphqlparser/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "graphqlparser", + "version-string": "0.7.0", + "port-version": 2, + "description": "A GraphQL query parser in C++ with C and C++ APIs" +} diff --git a/ports/msgpack11/CONTROL b/ports/msgpack11/CONTROL deleted file mode 100644 index 3fde8f39ca5d5f..00000000000000 --- a/ports/msgpack11/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: msgpack11 -Version: 0.0.10-1 -Homepage: https://msgpack.org -Build-Depends: gtest -Description: msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11. - diff --git a/ports/msgpack11/disable-werror.patch b/ports/msgpack11/disable-werror.patch new file mode 100644 index 00000000000000..eb4a17e084acbf --- /dev/null +++ b/ports/msgpack11/disable-werror.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 080cefa..b73072a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,9 +9,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + add_library(msgpack11 STATIC msgpack11.cpp) + target_include_directories(msgpack11 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + target_compile_options(msgpack11 PRIVATE -fno-rtti) +-if(NOT MSVC) +- target_compile_options(msgpack11 PRIVATE -Wall -Wextra -Werror) +-endif() + configure_file("msgpack11.pc.in" "msgpack11.pc" @ONLY) + + if (MSGPACK11_BUILD_TESTS) diff --git a/ports/msgpack11/portfile.cmake b/ports/msgpack11/portfile.cmake index cf828f6b12017d..f4dc73c63c4730 100644 --- a/ports/msgpack11/portfile.cmake +++ b/ports/msgpack11/portfile.cmake @@ -8,19 +8,20 @@ vcpkg_from_github( PATCHES msvc.patch fix-additerator.patch + disable-werror.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DMSGPACK11_BUILD_TESTS=OFF - -DMSGPACK11_BUILD_EXAMPLES=OFF + -DMSGPACK11_BUILD_TESTS=OFF + -DMSGPACK11_BUILD_EXAMPLES=OFF ) vcpkg_install_cmake() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/msgpack11/vcpkg.json b/ports/msgpack11/vcpkg.json new file mode 100644 index 00000000000000..0072e7dfd09d04 --- /dev/null +++ b/ports/msgpack11/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "msgpack11", + "version": "0.0.10", + "port-version": 2, + "description": "msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11.", + "homepage": "https://msgpack.org", + "dependencies": [ + "gtest" + ] +} diff --git a/ports/opensubdiv/fix-version-search.patch b/ports/opensubdiv/fix-version-search.patch new file mode 100644 index 00000000000000..7973472854feae --- /dev/null +++ b/ports/opensubdiv/fix-version-search.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake +index 485e55e..1c98b91 100644 +--- a/cmake/FindOpenCL.cmake ++++ b/cmake/FindOpenCL.cmake +@@ -177,7 +177,7 @@ if(_OPENCL_CPP_INCLUDE_DIRS) + + if(EXISTS "${OPENCL_INCLUDE_DIRS}/CL/cl.h") + +- file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_.*$") ++ file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_[0-9]+_[0-9]+.*$") + + foreach(LINE ${LINES}) + diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index defd00a5a414d8..03ec368c22f1fb 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -8,14 +8,15 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_compile-option.patch + fix-version-search.patch ) if(VCPKG_TARGET_IS_LINUX) message( "OpenSubdiv currently requires the following libraries from the system package manager: - xinerama + xinerama xxf86vm -These can be installed on Ubuntu systems via sudo apt install libxinerama-dev") +These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev") endif() vcpkg_find_acquire_program(PYTHON2) diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index 42a86d483f50ec..dc6b41f65afcab 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opensubdiv", "version-semver": "3.4.3", - "port-version": 1, + "port-version": 2, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", "supports": "!arm & !uwp" diff --git a/ports/qt5-wayland/CONTROL b/ports/qt5-wayland/CONTROL deleted file mode 100644 index 84f8cd621c685d..00000000000000 --- a/ports/qt5-wayland/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-wayland -Version: 5.15.2 -Description: Qt5 wayland Module; -Build-Depends: qt5-base[core] diff --git a/ports/qt5-wayland/portfile.cmake b/ports/qt5-wayland/portfile.cmake index a9d16989ea4643..42560f179f777b 100644 --- a/ports/qt5-wayland/portfile.cmake +++ b/ports/qt5-wayland/portfile.cmake @@ -1,6 +1,8 @@ -#Will not build on Windows! +#Will not build on Windows! message(WARNING "This port is just a placeholder until the required wayland libraries have been added into VCPKG! \ As such the build will most likely fail until your system has the required wayland libraries installed (untested)") - +message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with +sudo apt install libwayland-dev +on Ubuntu systems.") include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation() diff --git a/ports/qt5-wayland/vcpkg.json b/ports/qt5-wayland/vcpkg.json new file mode 100644 index 00000000000000..7ccb51624c5972 --- /dev/null +++ b/ports/qt5-wayland/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-wayland", + "version-string": "5.15.2", + "port-version": 2, + "description": "Qt5 wayland Module;", + "supports": "linux", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qtwayland/portfile.cmake b/ports/qtwayland/portfile.cmake index 787758cbbd36ef..cac3fa73e388d2 100644 --- a/ports/qtwayland/portfile.cmake +++ b/ports/qtwayland/portfile.cmake @@ -1,6 +1,10 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") +message(WARNING "qtwayland requires libwayland-dev from your system package manager. You can install it with +sudo apt install libwayland-dev +on Ubuntu systems.") + set(${PORT}_PATCHES) set(TOOL_NAMES qtwaylandscanner) diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 9799150e1db707..ae2d9d17b4f352 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtwayland", "version-semver": "6.1.2", + "port-version": 2, "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "supports": "!windows", diff --git a/ports/soem/CONTROL b/ports/soem/CONTROL deleted file mode 100644 index f3194a53bc28fc..00000000000000 --- a/ports/soem/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: soem -Version: 1.4.0 -Homepage: https://github.com/OpenEtherCATsociety/SOEM -Description: Simple Open Source EtherCAT Master -Build-Depends: winpcap (windows) diff --git a/ports/soem/disable-werror.patch b/ports/soem/disable-werror.patch new file mode 100644 index 00000000000000..7c1fd96850f875 --- /dev/null +++ b/ports/soem/disable-werror.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1778965..4c481b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE) + + if(WIN32) + set(OS "win32") +- find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) +- find_library(winpcap_LIBRARY NAMES wpcap) +- find_library(packet_LIBRARY NAMES packet) +- include_directories(${winpcap_INCLUDE_DIRS}) ++ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) ++ find_library(winpcap_LIBRARY NAMES wpcap) ++ find_library(packet_LIBRARY NAMES packet) ++ include_directories(${winpcap_INCLUDE_DIRS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +- set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) ++ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) + elseif(UNIX AND NOT APPLE) + set(OS "linux") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") + set(OS_LIBS pthread rt) + elseif(APPLE) + # This must come *before* linux or MacOSX will identify as Unix. + set(OS "macosx") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") + set(OS_LIBS pthread pcap) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") + set(OS "rtk") +@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") + include_directories(oshw/${OS}/${ARCH}) + file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c) + set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format") + set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group") + elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems") + message("Building for RTEMS") diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake index 3eccfeb3a192ec..e80e64a3e1e5d8 100644 --- a/ports/soem/portfile.cmake +++ b/ports/soem/portfile.cmake @@ -8,8 +8,9 @@ vcpkg_from_github( REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0 SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817 HEAD_REF master - PATCHES + PATCHES winpcap.patch + disable-werror.patch ) vcpkg_configure_cmake( diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json new file mode 100644 index 00000000000000..ffa002687d1149 --- /dev/null +++ b/ports/soem/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "soem", + "version-string": "1.4.0", + "port-version": 2, + "description": "Simple Open Source EtherCAT Master", + "homepage": "https://github.com/OpenEtherCATsociety/SOEM", + "supports": "!uwp", + "dependencies": [ + { + "name": "winpcap", + "platform": "windows" + } + ] +} diff --git a/ports/sophus/CONTROL b/ports/sophus/CONTROL deleted file mode 100644 index d3c81de7744a9c..00000000000000 --- a/ports/sophus/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sophus -Version: 1.0.0-6 -Build-Depends: eigen3, ceres, suitesparse -Homepage: https://github.com/strasdat/Sophus -Description: Lie group library for C++ diff --git a/ports/sophus/disable-werror.patch b/ports/sophus/disable-werror.patch new file mode 100644 index 00000000000000..60bfa7d5bab48c --- /dev/null +++ b/ports/sophus/disable-werror.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 844f304..952915b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,11 +16,11 @@ set(CMAKE_CXX_STANDARD 14) + IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") + SET(CMAKE_CXX_FLAGS_RELEASE "-O3") +- SET(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -Wno-deprecated-register -std=c++14 -stdlib=libc++ -Wno-deprecated-register") ++ SET(CMAKE_CXX_FLAGS "-std=c++14 -stdlib=libc++") + ELSEIF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") + SET(CMAKE_CXX_FLAGS_RELEASE "-O3") +- SET(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra -std=c++14 -Wno-deprecated-declarations -ftemplate-backtrace-limit=0") ++ SET(CMAKE_CXX_FLAGS "-std=c++14 -ftemplate-backtrace-limit=0") + SET(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_DEBUG} --coverage -fno-inline -fno-inline-small-functions -fno-default-inline") + SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE "${CMAKE_EXE_LINKER_FLAGS_DEBUG} --coverage") + SET(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "${CMAKE_SHARED_LINKER_FLAGS_DEBUG} --coverage") diff --git a/ports/sophus/portfile.cmake b/ports/sophus/portfile.cmake index ee7a6d576f354c..a906401262388e 100644 --- a/ports/sophus/portfile.cmake +++ b/ports/sophus/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_cmakelists.patch + disable-werror.patch ) vcpkg_configure_cmake( @@ -20,4 +21,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sophus/vcpkg.json b/ports/sophus/vcpkg.json new file mode 100644 index 00000000000000..ef8001d5eca167 --- /dev/null +++ b/ports/sophus/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "sophus", + "version": "1.0.0", + "port-version": 7, + "description": "Lie group library for C++", + "homepage": "https://github.com/strasdat/Sophus", + "dependencies": [ + "ceres", + "eigen3", + "suitesparse" + ] +} diff --git a/ports/tfhe/CONTROL b/ports/tfhe/CONTROL deleted file mode 100644 index 514e5fbee92ec0..00000000000000 --- a/ports/tfhe/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tfhe -Version: 1.0.1-1 -Homepage: https://github.com/tfhe/tfhe -Description: TFHE is open-source software distributed under the terms of the Apache 2.0 license. diff --git a/ports/tfhe/portfile.cmake b/ports/tfhe/portfile.cmake index aa98703ebcf9df..fc06a54a600b4f 100644 --- a/ports/tfhe/portfile.cmake +++ b/ports/tfhe/portfile.cmake @@ -10,6 +10,9 @@ vcpkg_from_github( mac-fix.patch ) +# Workaround for https://github.com/tfhe/tfhe/issues/246 +vcpkg_replace_string("${SOURCE_PATH}/src/CMakeLists.txt" "-Wall -Werror" "") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/src PREFER_NINJA @@ -20,4 +23,4 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/tfhe/vcpkg.json b/ports/tfhe/vcpkg.json new file mode 100644 index 00000000000000..73898248b8f2d9 --- /dev/null +++ b/ports/tfhe/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "tfhe", + "version-semver": "1.0.1", + "port-version": 2, + "description": "TFHE is open-source software distributed under the terms of the Apache 2.0 license.", + "homepage": "https://github.com/tfhe/tfhe", + "supports": "!windows" +} diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 12d3ffd920d554..43d729a42e658f 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -3,7 +3,7 @@ # variables: windows-pool: 'PrWin-2021-07-09' - linux-pool: 'PrLin-2021-06-11' + linux-pool: 'PrLin-2021-07-13' osx-pool: 'PrOsx-2021-04-16' stages: diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 2bfaae2f0af5ee..52ce23774fd8f8 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -225,8 +225,8 @@ $VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id $VM = Set-AzVMSourceImage ` -VM $VM ` -PublisherName 'Canonical' ` - -Offer 'UbuntuServer' ` - -Skus '18.04-LTS' ` + -Offer '0001-com-ubuntu-server-focal' ` + -Skus '20_04-lts' ` -Version latest $VM = Set-AzVMBootDiagnostic -VM $VM -Disable diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 5336e86f6eb50b..66d8fe9321d2c3 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -8,7 +8,7 @@ sudo apt -y dist-upgrade # Install common build dependencies APT_PACKAGES="at curl unzip tar libxt-dev gperf libxaw7-dev cifs-utils \ build-essential g++ gfortran zip libx11-dev libxkbcommon-x11-dev libxi-dev \ - libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev \ + libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxinerama-dev libxxf86vm-dev \ libxcursor-dev yasm libnuma1 libnuma-dev python-six python3-six python-yaml \ flex libbison-dev autoconf libudev-dev libncurses5-dev libtool libxrandr-dev \ xutils-dev dh-autoreconf autoconf-archive libgles2-mesa-dev ruby-full \ @@ -39,8 +39,17 @@ APT_PACKAGES="$APT_PACKAGES python3-pip" # Additionally required by rtaudio APT_PACKAGES="$APT_PACKAGES libasound2-dev" +# Additionally required by qtwebengine +APT_PACKAGES="$APT_PACKAGES nodejs" + +# Additionally required by qtwayland +APT_PACKAGES="$APT_PACKAGES libwayland-dev" + +# Additionally required by all GN projects +APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" + # Additionally required/installed by Azure DevOps Scale Set Agents -APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu60" +APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" sudo apt -y install $APT_PACKAGES @@ -58,16 +67,16 @@ cd ~ curl -sSL https://get.haskellstack.org/ | sudo sh # Install CUDA -wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-ubuntu1804.pin -sudo mv cuda-ubuntu1804.pin /etc/apt/preferences.d/cuda-repository-pin-600 -sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub -sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/ /" +wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin +sudo mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 +sudo apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub +sudo add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/ /" sudo apt -y update sudo apt install -y --no-install-recommends cuda-compiler-11-3 cuda-libraries-dev-11-3 cuda-driver-dev-11-3 \ cuda-cudart-dev-11-3 libcublas-11-3 libcurand-dev-11-3 libcudnn8-dev libnccl2 libnccl-dev # Install PowerShell -wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb +wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb sudo dpkg -i packages-microsoft-prod.deb sudo apt update sudo add-apt-repository universe diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3c705195b57cab..8d6ac650b7e9e0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -52,6 +52,8 @@ azure-storage-cpp:arm64-windows=fail aubio:arm-uwp=fail aubio:x64-uwp=fail +# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 +bde:x64-linux=fail blend2d:arm64-windows=fail blend2d:arm-uwp=fail blend2d:x64-uwp=fail @@ -1066,6 +1068,8 @@ ogdf:x64-windows = skip ogdf:x64-windows-static = skip ogdf:x64-windows-static-md=skip ogdf:x86-windows = skip +# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18936 +ogdf:x64-linux=fail ogre:x64-osx=fail # Conflicts with ogre ogre-next:arm64-windows = skip @@ -1290,11 +1294,6 @@ qt5-canvas3d:x86-windows=skip # Missing system libraries qt5-wayland:x64-osx=fail qtwayland:x64-osx=fail -# Missing libraries -qt5-wayland:x86-windows=fail -qt5-wayland:x64-windows=fail -qt5-wayland:x64-windows-static=fail -qt5-wayland:x64-windows-static-md=fail # Missing prerequisites for CI success qt5-webengine:x64-linux=fail qt5-webengine:x64-osx=fail @@ -1475,8 +1474,6 @@ soci:arm-uwp=fail soci:x64-uwp=fail sockpp:arm-uwp=fail sockpp:x64-uwp=fail -soem:x64-uwp=fail -soem:arm-uwp=fail soil2:arm-uwp=fail soil2:x64-uwp=fail soqt:arm64-windows=fail @@ -1541,13 +1538,6 @@ teemo:arm64-windows=fail teemo:x64-osx=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail -tfhe:x86-windows=fail -tfhe:x64-windows=fail -tfhe:x64-windows-static=fail -tfhe:x64-windows-static-md=fail -tfhe:x64-uwp=fail -tfhe:arm64-windows=fail -tfhe:arm-uwp=fail theia:arm64-windows = skip theia:arm-uwp = skip theia:x64-uwp = skip diff --git a/versions/baseline.json b/versions/baseline.json index 29454476b8b506..e979be2477a84d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2397,8 +2397,8 @@ "port-version": 0 }, "graphqlparser": { - "baseline": "0.7.0-1", - "port-version": 0 + "baseline": "0.7.0", + "port-version": 2 }, "greatest": { "baseline": "1.4.2", @@ -4193,8 +4193,8 @@ "port-version": 0 }, "msgpack11": { - "baseline": "0.0.10-1", - "port-version": 0 + "baseline": "0.0.10", + "port-version": 2 }, "msinttypes": { "baseline": "2018-02-25", @@ -4638,7 +4638,7 @@ }, "opensubdiv": { "baseline": "3.4.3", - "port-version": 1 + "port-version": 2 }, "opentracing": { "baseline": "1.6.0", @@ -5230,7 +5230,7 @@ }, "qt5-wayland": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 2 }, "qt5-webchannel": { "baseline": "5.15.2", @@ -5362,7 +5362,7 @@ }, "qtwayland": { "baseline": "6.1.2", - "port-version": 0 + "port-version": 2 }, "quadtree": { "baseline": "2020-04-13", @@ -5866,7 +5866,7 @@ }, "soem": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 2 }, "soil": { "baseline": "2021-04-22", @@ -5889,8 +5889,8 @@ "port-version": 0 }, "sophus": { - "baseline": "1.0.0-6", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 7 }, "soqt": { "baseline": "1.6.0", @@ -6157,8 +6157,8 @@ "port-version": 8 }, "tfhe": { - "baseline": "1.0.1-1", - "port-version": 0 + "baseline": "1.0.1", + "port-version": 2 }, "tgbot-cpp": { "baseline": "1.2.1", diff --git a/versions/g-/graphqlparser.json b/versions/g-/graphqlparser.json index d577bf05e9f84d..e1240fb532907e 100644 --- a/versions/g-/graphqlparser.json +++ b/versions/g-/graphqlparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bddecee3cfbfe8826912f0b5de6bdf0b4f1a880", + "version-string": "0.7.0", + "port-version": 2 + }, { "git-tree": "24d87a9dc777a9ebd15ec9ff2ab7ade51134c86d", "version-string": "0.7.0-1", diff --git a/versions/m-/msgpack11.json b/versions/m-/msgpack11.json index a5ac8ea6ced495..ae8c3847cdd489 100644 --- a/versions/m-/msgpack11.json +++ b/versions/m-/msgpack11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d1352df08016b8ba7b2de4fa027e4b37825bb8e", + "version": "0.0.10", + "port-version": 2 + }, { "git-tree": "893e52e19e5a4b783a02f7be49825f9fa3903255", "version-string": "0.0.10-1", diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json index d0c5cb18ce34ae..6fd0886032aad5 100644 --- a/versions/o-/opensubdiv.json +++ b/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8158645b04f25a236cd3fdf2debc67b10cfd945", + "version-semver": "3.4.3", + "port-version": 2 + }, { "git-tree": "2ca1bb01f46ea1e8d94d453dfc9e535a8bb220b0", "version-semver": "3.4.3", diff --git a/versions/q-/qt5-wayland.json b/versions/q-/qt5-wayland.json index f9bfb9c789f915..5960d4316a8e43 100644 --- a/versions/q-/qt5-wayland.json +++ b/versions/q-/qt5-wayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10dc10d68dd34e3db201364ec60567459c6857dc", + "version-string": "5.15.2", + "port-version": 2 + }, { "git-tree": "d35832bb03e8a61250192130ec88cd32ad432c48", "version-string": "5.15.2", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 63008b3e47883f..b688f4d87b0865 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c520a4f068d807c3ec5bc04accf5af463007a1b8", + "version-semver": "6.1.2", + "port-version": 2 + }, { "git-tree": "39df5f0a73c89113b633ae47582d88e6b63b09c3", "version-semver": "6.1.2", diff --git a/versions/s-/soem.json b/versions/s-/soem.json index bcdf0b6c387736..5cf0babc9b1050 100644 --- a/versions/s-/soem.json +++ b/versions/s-/soem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df36d49ff0f6b1755c5a1a046c98c4d0df0e7d77", + "version-string": "1.4.0", + "port-version": 2 + }, { "git-tree": "629ce214f8cc2718e87c5130d2bdce15490bf20e", "version-string": "1.4.0", diff --git a/versions/s-/sophus.json b/versions/s-/sophus.json index d4d1283e43e0d7..f31dd71d63d7af 100644 --- a/versions/s-/sophus.json +++ b/versions/s-/sophus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4826fe050e6cfd22a46d50ab3d6258a39d2bb69f", + "version": "1.0.0", + "port-version": 7 + }, { "git-tree": "079947ab617bc50fc9c45b4a88a152c94c31ec58", "version-string": "1.0.0-6", diff --git a/versions/t-/tfhe.json b/versions/t-/tfhe.json index 6f952afd33463c..d44f73e0c2f499 100644 --- a/versions/t-/tfhe.json +++ b/versions/t-/tfhe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e87faaf58cb9feb686fe28d31f24cedf27e2aec1", + "version-semver": "1.0.1", + "port-version": 2 + }, { "git-tree": "ee11a6e5e9e756c531b78822f6465a4b43dc048e", "version-string": "1.0.1-1", From 8beb41dd97eb387b2fd9d06e68920facb72a75b7 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Thu, 15 Jul 2021 00:10:29 +0200 Subject: [PATCH 0105/1858] [sciter ] Updated sciter version to 4.4.8.3 (#18924) * Updated sciter version to 4.4.8.3 * Update CONTROL * Update baseline.json * Update sciter.json * Update portfile.cmake * Fixed git tree hash --- ports/sciter/CONTROL | 2 +- ports/sciter/portfile.cmake | 10 +++++----- versions/baseline.json | 2 +- versions/s-/sciter.json | 5 +++++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL index 5b0b7439daaf54..2790f56c4f227a 100644 --- a/ports/sciter/CONTROL +++ b/ports/sciter/CONTROL @@ -1,5 +1,5 @@ Source: sciter -Version: 4.4.3.20 +Version: 4.4.8.3 Homepage: https://github.com/c-smile/sciter-sdk Description: Sciter is an embeddable HTML/CSS/scripting engine. Supports: !uwp diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index 84e76332d11bf3..eab17e4e65cf64 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -7,8 +7,8 @@ endif() # header-only library set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -set(SCITER_REVISION 63c9328e88c1877deea721cbe060b19c4fce7cb6) -set(SCITER_SHA 151ae3f74980e76fa04e0d5ef54ed56efcee312b4654c906a04b017384073ddf9ae353c29d9f0a12f681fd83d42e57b9ed3b563c641979406ddad0b3cc26d49c) +set(SCITER_REVISION 29a598b6d20220b93848b5e8abab704619296857) +set(SCITER_SHA dc9ebcc59a4ca7b154efcbd96c7e0aa53dc344f6a2cfa91f8c351c1edc5a0f060129715f8eac85e00df9b6c153322a9ba36b430da5020d38769740434cbcd52c) if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) set(SCITER_ARCH x64) @@ -72,7 +72,7 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) file(INSTALL ${SCITER_BIN}/inspector.app DESTINATION ${SCITER_TOOLS}) file(INSTALL ${SCITER_BIN}/sciter.app DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter-osx-64.dylib DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${SCITER_TOOLS}) # not sure whether there is a better way to do this, because # `file(INSTALL sciter.app FILE_PERMISSIONS EXECUTE)` @@ -80,8 +80,8 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) execute_process(COMMAND sh -c "chmod +x sciter.app/Contents/MacOS/sciter" WORKING_DIRECTORY ${SCITER_TOOLS}) execute_process(COMMAND sh -c "chmod +x inspector.app/Contents/MacOS/inspector" WORKING_DIRECTORY ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter-osx-64.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/sciter-osx-64.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) else() set(SCITER_BIN ${SOURCE_PATH}/bin.win/${SCITER_ARCH}) diff --git a/versions/baseline.json b/versions/baseline.json index e979be2477a84d..0ea6984335d9b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5645,7 +5645,7 @@ "port-version": 0 }, "sciter": { - "baseline": "4.4.3.20", + "baseline": "4.4.8.3", "port-version": 0 }, "scnlib": { diff --git a/versions/s-/sciter.json b/versions/s-/sciter.json index 2c1f7e515d394f..01058a39bf0bea 100644 --- a/versions/s-/sciter.json +++ b/versions/s-/sciter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07df67d641b4bdc057ee8a42a69552c24b381866", + "version-string": "4.4.8.3", + "port-version": 0 + }, { "git-tree": "f705d7e1c384257717b5f2e87808a370ac8cc861", "version-string": "4.4.3.20", From 26ce4f53f61c76799919dbc7345861bbec8fa5b5 Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 15 Jul 2021 16:00:19 +0200 Subject: [PATCH 0106/1858] [glslang] Update to 11.1.0 (#15719) * [shaderc] remove port since it does not build * [glslang] updated to version 11.1.0 * [glslang] Add python path * [glslang] baseline.json and glslang.json updated * Update portfile.cmake * Update CONTROL * Update port_versions * Update port_versions * Update port_versions * Update port_versions * Update port_versions * [glslang] port update to version 11.4.0 * [glslang] port version removed from json * [glslang] remove shaderc * [glslang] baseline update * [glslang] versions hash update * [glslang] portfile format fix + use of ${PORT} * [glslang] new hash * [glslang] revert portfile back * [glslang] portfile apply changes * [glslang] update hash for x86 windows * [glslang] update to 1.5.0 * [glslang] git-tree hash update * [glslang] remove old version 1.4.0 * [glslang] git-tree hash update * [glslang][shaderc] Update and fix targets to match upstream * Update versions Co-authored-by: Lukas Lipp Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: JonLiu1993 <13720414433@163.com> Co-authored-by: Robert Schumacher --- ports/glslang/CMakeLists-targets.patch | 121 ------------------ ports/glslang/CMakeLists-windows.patch | 12 -- .../always-install-resource-limits.patch | 13 ++ ports/glslang/glslang-config.cmake | 7 + ports/glslang/ignore-crt.patch | 9 ++ ports/glslang/portfile.cmake | 32 +++-- ports/glslang/vcpkg.json | 3 +- ports/shaderc/CMakeLists.txt | 31 ----- ports/shaderc/CONTROL | 6 - ports/shaderc/build-version.inc | 6 +- ports/shaderc/disable-update-version.patch | 23 +--- ports/shaderc/fix-build-type.patch | 70 ++++------ ports/shaderc/fix-install.patch | 26 ---- ports/shaderc/glslang/CMakeLists.txt | 13 ++ ports/shaderc/portfile.cmake | 19 +-- .../CMakeLists.txt} | 0 ports/shaderc/vcpkg.json | 10 ++ versions/baseline.json | 8 +- versions/g-/glslang.json | 6 +- versions/s-/shaderc.json | 5 + 20 files changed, 124 insertions(+), 296 deletions(-) delete mode 100644 ports/glslang/CMakeLists-targets.patch delete mode 100644 ports/glslang/CMakeLists-windows.patch create mode 100644 ports/glslang/always-install-resource-limits.patch create mode 100644 ports/glslang/glslang-config.cmake create mode 100644 ports/glslang/ignore-crt.patch delete mode 100644 ports/shaderc/CMakeLists.txt delete mode 100644 ports/shaderc/CONTROL delete mode 100644 ports/shaderc/fix-install.patch create mode 100644 ports/shaderc/glslang/CMakeLists.txt rename ports/shaderc/{CMakeLists_spirv.txt => spirv-tools/CMakeLists.txt} (100%) create mode 100644 ports/shaderc/vcpkg.json diff --git a/ports/glslang/CMakeLists-targets.patch b/ports/glslang/CMakeLists-targets.patch deleted file mode 100644 index 53cf5bf8f08671..00000000000000 --- a/ports/glslang/CMakeLists-targets.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff --git a/ChooseMSVCCRT.cmake b/ChooseMSVCCRT.cmake -index 2097881..f6320a9 100644 ---- a/ChooseMSVCCRT.cmake -+++ b/ChooseMSVCCRT.cmake -@@ -102,4 +102,3 @@ set(MSVC_CRT - MT - MTd) - --choose_msvc_crt(MSVC_CRT) -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index 5bb3f0e..90ba3be 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -9,6 +9,7 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- install(TARGETS OGLCompiler -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(TARGETS OGLCompiler EXPORT glslangConfig -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index 1997e74..e2a0229 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -46,7 +46,6 @@ endif(ENABLE_NV_EXTENSIONS) - add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) - set_property(TARGET SPIRV PROPERTY FOLDER glslang) - set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) --target_include_directories(SPIRV PUBLIC ..) - - if (ENABLE_SPVREMAPPER) - add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -@@ -78,13 +77,13 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- if(BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS OR TRUE) - if (ENABLE_SPVREMAPPER) - install(TARGETS SPVRemapper - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -- install(TARGETS SPIRV -+ install(TARGETS SPIRV EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - else() -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 5f51476..7f11498 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -86,7 +86,6 @@ add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${H - set_property(TARGET glslang PROPERTY FOLDER glslang) - set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) - target_link_libraries(glslang OGLCompiler OSDependent) --target_include_directories(glslang PUBLIC ..) - - if(WIN32 AND BUILD_SHARED_LIBS) - set_target_properties(glslang PROPERTIES PREFIX "") -@@ -105,10 +104,15 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- if(BUILD_SHARED_LIBS) -- install(TARGETS glslang -+ if(BUILD_SHARED_LIBS OR TRUE) -+ install(TARGETS glslang EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install( -+ EXPORT glslangConfig -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/glslang" -+ NAMESPACE glslang:: -+ ) - else() - install(TARGETS glslang - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index e652f45..a9673fe 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -20,6 +20,6 @@ else() - endif() - - if(ENABLE_GLSLANG_INSTALL) -- install(TARGETS OSDependent -+ install(TARGETS OSDependent EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index f918d7a..329800f 100644 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -32,8 +32,8 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- if(BUILD_SHARED_LIBS) -- install(TARGETS HLSL -+ if(BUILD_SHARED_LIBS OR TRUE) -+ install(TARGETS HLSL EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - else() -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 5cea53d9..43e45534 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -46,7 +46,7 @@ if(ENABLE_GLSLANG_INSTALL) - install(TARGETS spirv-remap - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - -- if(BUILD_SHARED_LIBS) -+ if(BUILD_SHARED_LIBS OR TRUE) - install(TARGETS glslang-default-resource-limits - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() diff --git a/ports/glslang/CMakeLists-windows.patch b/ports/glslang/CMakeLists-windows.patch deleted file mode 100644 index 76ccf6077c75c2..00000000000000 --- a/ports/glslang/CMakeLists-windows.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt -index f257418..82a3f3c 100644 ---- a/glslang/OSDependent/Windows/CMakeLists.txt -+++ b/glslang/OSDependent/Windows/CMakeLists.txt -@@ -15,6 +15,6 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- install(TARGETS OSDependent -+ install(TARGETS OSDependent EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif(ENABLE_GLSLANG_INSTALL) diff --git a/ports/glslang/always-install-resource-limits.patch b/ports/glslang/always-install-resource-limits.patch new file mode 100644 index 00000000000000..56c34dfc44386a --- /dev/null +++ b/ports/glslang/always-install-resource-limits.patch @@ -0,0 +1,13 @@ +diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt +index 751d1cd71..0f5cf0dc0 100644 +--- a/StandAlone/CMakeLists.txt ++++ b/StandAlone/CMakeLists.txt +@@ -98,7 +98,7 @@ if(ENABLE_GLSLANG_INSTALL) + install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + endif() + +- if(BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS OR TRUE) + install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} diff --git a/ports/glslang/glslang-config.cmake b/ports/glslang/glslang-config.cmake new file mode 100644 index 00000000000000..5eb356151f53ae --- /dev/null +++ b/ports/glslang/glslang-config.cmake @@ -0,0 +1,7 @@ +include(CMakeFindDependencyMacro) + +find_dependency(Threads) + +foreach(targets OGLCompiler OSDependent glslang glslang-default-resource-limits glslangValidator HLSL SPIRV spirv-remap SPVRemapper) + include("${CMAKE_CURRENT_LIST_DIR}/${targets}Targets.cmake" OPTIONAL) +endforeach() diff --git a/ports/glslang/ignore-crt.patch b/ports/glslang/ignore-crt.patch new file mode 100644 index 00000000000000..0835b49a9f2239 --- /dev/null +++ b/ports/glslang/ignore-crt.patch @@ -0,0 +1,9 @@ +diff --git a/ChooseMSVCCRT.cmake b/ChooseMSVCCRT.cmake +index b1561263..b6c8c3a6 100644 +--- a/ChooseMSVCCRT.cmake ++++ b/ChooseMSVCCRT.cmake +@@ -135,4 +135,3 @@ set(MSVC_CRT + MT + MTd) + +-choose_msvc_crt(MSVC_CRT) diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index da955a888533c5..2ee7c9b3af0837 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -3,14 +3,18 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF f88e5824d2cfca5edc58c7c2101ec9a4ec36afac - SHA512 92dc287e8930db6e00bde23b770f763dc3cf8a405a37b682bbd65e1dbde1f1f5161543fcc70b09eef07a5ce8bbe8f368ef84ac75003c122f42d1f6b9eaa8bd50 + REF ae2a562936cc8504c9ef2757cceaff163147834f + SHA512 1c5a91e60c1809c6c26f11649659090a75501b0570f3147e5b27ac65c539b591967f258d14c399d33019317864ede823353ea44e0015bc3f7afc5a787f046cc7 HEAD_REF master PATCHES - CMakeLists-targets.patch - CMakeLists-windows.patch + ignore-crt.patch + always-install-resource-limits.patch ) +vcpkg_find_acquire_program(PYTHON3) +get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY) +vcpkg_add_to_path("${PYTHON_PATH}") + if(VCPKG_TARGET_IS_IOS) # this case will report error since all executable will require BUNDLE DESTINATION set(BUILD_BINARIES OFF) @@ -22,24 +26,32 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DCMAKE_DEBUG_POSTFIX=d -DSKIP_GLSLANG_INSTALL=OFF + -DBUILD_EXTERNAL=OFF -DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES} ) vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/glslang) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/glslang) vcpkg_copy_pdbs() if(NOT BUILD_BINARIES) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) else() - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/glslang) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/bin) -# Handle copyright -file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glslang) +if(EXISTS ${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake OR EXISTS ${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake) + message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile") +endif() + +file(COPY + ${CMAKE_CURRENT_LIST_DIR}/copyright + ${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +) + diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index 24579e689004c6..addd408f36af45 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,7 +1,6 @@ { "name": "glslang", - "version-string": "2019-03-05", - "port-version": 3, + "version": "11.5.0", "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", "homepage": "https://github.com/KhronosGroup/glslang" } diff --git a/ports/shaderc/CMakeLists.txt b/ports/shaderc/CMakeLists.txt deleted file mode 100644 index 7ecdd03f91e267..00000000000000 --- a/ports/shaderc/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -option(SUFFIX_D "Add d Suffix to lib" ${SUFFIX_D}) -if(NOT SUFFIX_D) - find_library(GLSLANG glslang) - find_library(OSDEPENDENT OSDependent) - find_library(OGLCOMPILER OGLCompiler) - find_library(HLSLLIB HLSL) - find_library(SPIRVLIB SPIRV) -ELSE() - find_library(GLSLANG glslangd) - find_library(OSDEPENDENT OSDependentd) - find_library(OGLCOMPILER OGLCompilerd) - find_library(HLSLLIB HLSLd) - find_library(SPIRVLIB SPIRVd) -ENDIF() - -add_library(glslang STATIC IMPORTED GLOBAL) -set_property(TARGET glslang PROPERTY IMPORTED_LOCATION "${GLSLANG}") -find_path(glslang_SOURCE_DIR glslang/Include/Common) -set_property(TARGET glslang APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${glslang_SOURCE_DIR}") - -add_library(OSDependent STATIC IMPORTED GLOBAL) -set_property(TARGET OSDependent PROPERTY IMPORTED_LOCATION "${OSDEPENDENT}") - -add_library(OGLCompiler STATIC IMPORTED GLOBAL) -set_property(TARGET OGLCompiler PROPERTY IMPORTED_LOCATION "${OGLCOMPILER}") - -add_library(HLSL STATIC IMPORTED GLOBAL) -set_property(TARGET HLSL PROPERTY IMPORTED_LOCATION "${HLSLLIB}") - -add_library(SPIRV STATIC IMPORTED GLOBAL) -set_property(TARGET SPIRV PROPERTY IMPORTED_LOCATION "${SPIRVLIB}") diff --git a/ports/shaderc/CONTROL b/ports/shaderc/CONTROL deleted file mode 100644 index e700a40103c9c4..00000000000000 --- a/ports/shaderc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: shaderc -Version: 2019-06-26 -Port-Version: 2 -Homepage: https://github.com/google/shaderc -Description: A collection of tools, libraries and tests for shader compilation. -Build-Depends: glslang, spirv-tools \ No newline at end of file diff --git a/ports/shaderc/build-version.inc b/ports/shaderc/build-version.inc index 00c140577a64f2..d5b1449e2bbda4 100644 --- a/ports/shaderc/build-version.inc +++ b/ports/shaderc/build-version.inc @@ -1,5 +1 @@ -"shaderc v2019.0-dev unknown hash, 2019-05-08\n" -"spirv-tools v2019.3-dev unknown hash, 2019-04-03\n" -"glslang unknown hash, 2019-03-05\n" - - +"shaderc v2021.1-dev unknown hash, 2021-06-21\n" diff --git a/ports/shaderc/disable-update-version.patch b/ports/shaderc/disable-update-version.patch index 5ee016bcb13c34..7bf47bd508d5f6 100644 --- a/ports/shaderc/disable-update-version.patch +++ b/ports/shaderc/disable-update-version.patch @@ -2,19 +2,18 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index a4e779b..dc5f1a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -81,12 +81,6 @@ add_subdirectory(libshaderc) - add_subdirectory(glslc) - add_subdirectory(examples) +@@ -121,11 +121,6 @@ if(${SHADERC_ENABLE_EXAMPLES}) + add_subdirectory(examples) + endif() -add_custom_target(build-version - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py -- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} +- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") -- + function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL - COMMAND ${CMAKE_COMMAND} diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt index acf6fb0..d0df7db 100644 --- a/glslc/CMakeLists.txt @@ -27,15 +26,3 @@ index acf6fb0..d0df7db 100644 shaderc_add_tests( TEST_PREFIX glslc -diff --git a/spvc/CMakeLists.txt b/spvc/CMakeLists.txt -index f465972..76f8c2e 100644 ---- a/spvc/CMakeLists.txt -+++ b/spvc/CMakeLists.txt -@@ -3,7 +3,6 @@ shaderc_default_compile_options(spvc_exe) - target_include_directories(spvc_exe PRIVATE ${shaderc_SOURCE_DIR}/libshaderc/include ${spirv-tools_SOURCE_DIR}/include) - set_target_properties(spvc_exe PROPERTIES OUTPUT_NAME spvc) - target_link_libraries(spvc_exe PRIVATE shaderc_spvc shaderc_util) --add_dependencies(spvc_exe build-version) - - shaderc_add_asciidoc(spvc_doc_README README) - diff --git a/ports/shaderc/fix-build-type.patch b/ports/shaderc/fix-build-type.patch index 959610e3b483a9..8e5cd22db15ee2 100644 --- a/ports/shaderc/fix-build-type.patch +++ b/ports/shaderc/fix-build-type.patch @@ -1,85 +1,67 @@ diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt -index 0ffa06f..3476170 100644 +index 3ada419..f3277f0 100644 --- a/libshaderc/CMakeLists.txt +++ b/libshaderc/CMakeLists.txt -@@ -10,10 +10,11 @@ set(SHADERC_SOURCES +@@ -24,13 +24,16 @@ set(SHADERC_SOURCES src/shaderc_private.h ) +if (NOT BUILD_SHARED_LIBS) add_library(shaderc STATIC ${SHADERC_SOURCES}) shaderc_default_compile_options(shaderc) - target_include_directories(shaderc PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) -- + target_include_directories(shaderc + PUBLIC include + PRIVATE ${glslang_SOURCE_DIR} + ${SPIRV-Headers_SOURCE_DIR}/include) ++set(shaderc_install_target shaderc) + +else() add_library(shaderc_shared SHARED ${SHADERC_SOURCES}) shaderc_default_compile_options(shaderc_shared) - target_include_directories(shaderc_shared PUBLIC include PRIVATE ${glslang_SOURCE_DIR}) -@@ -22,6 +23,7 @@ target_compile_definitions(shaderc_shared + target_include_directories(shaderc_shared +@@ -42,6 +45,8 @@ target_compile_definitions(shaderc_shared PUBLIC SHADERC_SHAREDLIB ) set_target_properties(shaderc_shared PROPERTIES SOVERSION 1) ++set(shaderc_install_target shaderc_shared) +endif() if(SHADERC_ENABLE_INSTALL) install( -@@ -34,10 +36,17 @@ if(SHADERC_ENABLE_INSTALL) +@@ -54,7 +59,7 @@ if(SHADERC_ENABLE_INSTALL) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/shaderc) - install(TARGETS shaderc shaderc_shared -+ if (NOT BUILD_SHARED_LIBS) -+ install(TARGETS shaderc -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ else() -+ install(TARGETS shaderc_shared ++ install(TARGETS ${shaderc_install_target} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ endif() - endif(SHADERC_ENABLE_INSTALL) - - find_package(Threads) -@@ -47,10 +56,13 @@ set(SHADERC_LIBS - SPIRV # from glslang +@@ -68,8 +73,11 @@ set(SHADERC_LIBS SPIRV-Tools ) -- -+if (NOT BUILD_SHARED_LIBS) + ++if(NOT BUILD_SHARED_LIBS) target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS}) +else() target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS}) +endif() -+if (NOT BUILD_SHARED_LIBS) shaderc_add_tests( TEST_PREFIX shaderc - LINK_LIBS shaderc -@@ -60,7 +72,7 @@ shaderc_add_tests( - shaderc +@@ -93,6 +101,7 @@ shaderc_add_tests( shaderc_cpp shaderc_private) -- -+else() - shaderc_add_tests( - TEST_PREFIX shaderc_shared - LINK_LIBS shaderc_shared SPIRV-Tools -@@ -70,7 +82,9 @@ shaderc_add_tests( - shaderc - shaderc_cpp - shaderc_private) -- -+endif() -+# Do not combine all dependencies to static library -+if (0) + ++if(0) shaderc_combine_static_lib(shaderc_combined shaderc) if(SHADERC_ENABLE_INSTALL) -@@ -106,3 +120,4 @@ if(${SHADERC_ENABLE_TESTS}) - target_link_libraries(shaderc_c_smoke_test PRIVATE shaderc) - add_test(NAME shaderc_c_smoke_test COMMAND shaderc_c_smoke_test) - endif() +@@ -121,6 +130,7 @@ shaderc_add_tests( + TEST_NAMES + shaderc + shaderc_cpp) +endif() -\ No newline at end of file + + if(${SHADERC_ENABLE_TESTS}) + add_executable(shaderc_c_smoke_test ./src/shaderc_c_smoke_test.c) diff --git a/ports/shaderc/fix-install.patch b/ports/shaderc/fix-install.patch deleted file mode 100644 index 1857ed8fed5d70..00000000000000 --- a/ports/shaderc/fix-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt -index 9d07136..0ffa06f 100644 ---- a/libshaderc/CMakeLists.txt -+++ b/libshaderc/CMakeLists.txt -@@ -84,7 +84,7 @@ if(SHADERC_ENABLE_INSTALL) - # around this problem by manually substitution. - string(REPLACE "$(Configuration)" "\${CMAKE_INSTALL_CONFIG_NAME}" - install_location "${generated_location}") -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(FILES ${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - else() - install(FILES ${generated_location} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -diff --git a/libshaderc_spvc/CMakeLists.txt b/libshaderc_spvc/CMakeLists.txt -index fae235e..b503e70 100644 ---- a/libshaderc_spvc/CMakeLists.txt -+++ b/libshaderc_spvc/CMakeLists.txt -@@ -84,7 +84,7 @@ if(SHADERC_ENABLE_INSTALL) - # around this problem by manually substitution. - string(REPLACE "$(Configuration)" "\${CMAKE_INSTALL_CONFIG_NAME}" - install_location "${generated_location}") -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+ install(FILES ${install_location} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - else() - install(FILES ${generated_location} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() diff --git a/ports/shaderc/glslang/CMakeLists.txt b/ports/shaderc/glslang/CMakeLists.txt new file mode 100644 index 00000000000000..0e745779dbd5d1 --- /dev/null +++ b/ports/shaderc/glslang/CMakeLists.txt @@ -0,0 +1,13 @@ +cmake_minimum_required(VERSION 3.11) + +find_package(glslang CONFIG REQUIRED) + +set_property(TARGET glslang PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET OSDependent PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET OGLCompiler PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET HLSL PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET SPIRV PROPERTY IMPORTED_GLOBAL TRUE) +set_property(TARGET MachineIndependent PROPERTY IMPORTED_GLOBAL TRUE) + +find_path(glslang_SOURCE_DIR glslang/Public/ShaderLang.h) +set(glslang_SOURCE_DIR "${glslang_SOURCE_DIR}/glslang" "${glslang_SOURCE_DIR}" CACHE STRING "" FORCE) diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index 40005d52bd98b6..7d9596781ced99 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -4,20 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/shaderc - REF 05c766a1f4615ee37d37d09271aaabca30ffd293 - SHA512 329697e8e23d619313440d57ef740a94c49d13533e1b8734fc8ff72fd5092c2addabb306f64cb69160fa5fee373a05ba39a5ee6d92d95e5e2e9c7ec96a51aadc + REF adca18dcadd460eb517fe44f6cd2460fa0650ebe + SHA512 3a27d4c51be9e9396b9a854cb96d88e78ff2ca6dcb8400bd3288f6984d25876af0eae649aa1c72ad613edbbcfa4324a12809f13ceb7a0134eef41cb1a698dfdf HEAD_REF master PATCHES disable-update-version.patch - fix-install.patch fix-build-type.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/third_party/glslang) - -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_spirv.txt DESTINATION ${SOURCE_PATH}/third_party/spirv-tools) -file(RENAME ${SOURCE_PATH}/third_party/spirv-tools/CMakeLists_spirv.txt ${SOURCE_PATH}/third_party/spirv-tools/CMakeLists.txt) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/build-version.inc DESTINATION ${SOURCE_PATH}/glslc/src) set(OPTIONS) @@ -36,12 +30,9 @@ vcpkg_configure_cmake( OPTIONS ${OPTIONS} -DSHADERC_SKIP_TESTS=true - -Dglslang_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include - -Dspirv-tools_SOURCE_DIR=${CURRENT_INSTALLED_DIR}/include - OPTIONS_DEBUG - -DSUFFIX_D=true - OPTIONS_RELEASE - -DSUFFIX_D=false + -DSHADERC_GLSLANG_DIR=${CMAKE_CURRENT_LIST_DIR}/glslang + -DSHADERC_SPIRV_TOOLS_DIR=${CMAKE_CURRENT_LIST_DIR}/spirv-tools + -DSHADERC_ENABLE_EXAMPLES=OFF ) vcpkg_install_cmake() diff --git a/ports/shaderc/CMakeLists_spirv.txt b/ports/shaderc/spirv-tools/CMakeLists.txt similarity index 100% rename from ports/shaderc/CMakeLists_spirv.txt rename to ports/shaderc/spirv-tools/CMakeLists.txt diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json new file mode 100644 index 00000000000000..9d7b57a131ccc5 --- /dev/null +++ b/ports/shaderc/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "shaderc", + "version": "2021.1", + "description": "A collection of tools, libraries and tests for shader compilation.", + "homepage": "https://github.com/google/shaderc", + "dependencies": [ + "glslang", + "spirv-tools" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0ea6984335d9b1..0c9184aad8307e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2333,8 +2333,8 @@ "port-version": 0 }, "glslang": { - "baseline": "2019-03-05", - "port-version": 3 + "baseline": "11.5.0", + "port-version": 0 }, "glui": { "baseline": "2019-11-30", @@ -5753,8 +5753,8 @@ "port-version": 0 }, "shaderc": { - "baseline": "2019-06-26", - "port-version": 2 + "baseline": "2021.1", + "port-version": 0 }, "shaderwriter": { "baseline": "1.1.0", diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 1f1a95eaafefb7..9d0ddcbad91896 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "a7d9b6a3d936d273c6b1966eb3b8fe8cb1ba28d1", - "version-string": "2019-03-05", - "port-version": 3 + "git-tree": "e1d95a78d1dee917b157cbdef0896ab7256ea637", + "version": "11.5.0", + "port-version": 0 }, { "git-tree": "29f2d736c8273c412c4fcf0fd50da379d1ec9a0b", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index b58c9a2a802d65..6a07dae4444c5e 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bf34bbfc26bddfe440bb115157a3b5cd07e7e79", + "version": "2021.1", + "port-version": 0 + }, { "git-tree": "684cc1ffce4fe1fe48788484436e1e6d5886859e", "version-string": "2019-06-26", From 5935d21a32360e6edc3e77d1a7a21a5f12e9d9f1 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 15 Jul 2021 13:47:58 -0700 Subject: [PATCH 0107/1858] Change VM size to Standard_D32ds_v4. For some reason they are cheaper than D16 right now??? (#18953) Remove no longer used "unstable" scaffolding. Use ephemeral OS disks for better latency. Add ability to change whether temp disks are used or explicitly provisioned disks are used; explicitly provisioned disks turned out to be more expensive than expected before. Disable Windows Updates in the scale set because the machines are very short lived; working on a mechanism of patching the images instead. --- scripts/azure-pipelines/azure-pipelines.yml | 4 +- scripts/azure-pipelines/linux/create-vmss.ps1 | 58 ++++++++++++------ .../azure-pipelines/windows/create-vmss.ps1 | 59 ++++++++++--------- 3 files changed, 72 insertions(+), 49 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 43d729a42e658f..3d89b3793927c7 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-07-09' - linux-pool: 'PrLin-2021-07-13' + windows-pool: 'PrWin-2021-07-14' + linux-pool: 'PrLin-2021-07-14' osx-pool: 'PrOsx-2021-04-16' stages: diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index 52ce23774fd8f8..d5651bd8e39a8a 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -20,9 +20,11 @@ This script assumes you have installed the OpenSSH Client optional Windows compo $Location = 'westus2' $Prefix = 'PrLin-' + (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32_v4' +$VMSize = 'Standard_D32ds_v4' $ProtoVMName = 'PROTOTYPE' $LiveVMPrefix = 'BUILD' +$MakeInstalledDisk = $false +$InstalledDiskSizeInGB = 1024 $ErrorActionPreference = 'Stop' $ProgressActivity = 'Creating Scale Set' @@ -189,6 +191,12 @@ $SasToken = New-AzStorageAccountSASToken ` $SasToken = $SasToken.Substring(1) # strip leading ? +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating storage account' ` + -CurrentOperation 'Locking down network' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress) # note no ++ + # Note that we put the storage account into the firewall after creating the above SAS token or we # would be denied since the person running this script isn't one of the VMs we're creating here. Set-AzStorageAccount ` @@ -292,7 +300,8 @@ Set-AzVM ` $VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName $PrototypeOSDiskName = $VM.StorageProfile.OsDisk.Name $ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -$Image = New-AzImage -Image $ImageConfig -ImageName $ProtoVMName -ResourceGroupName $ResourceGroupName +$ImageName = "$Prefix-BaseImage" +$Image = New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName $ResourceGroupName #################################################################################################### Write-Progress ` @@ -333,28 +342,41 @@ $Vmss = Add-AzVmssNetworkInterfaceConfiguration ` $VmssPublicKey = New-Object -TypeName 'Microsoft.Azure.Management.Compute.Models.SshPublicKey' ` -ArgumentList @('/home/AdminUser/.ssh/authorized_keys', $sshPublicKey) -$Vmss = Set-AzVmssOsProfile ` - -VirtualMachineScaleSet $Vmss ` - -ComputerNamePrefix $LiveVMPrefix ` - -AdminUsername AdminUser ` - -AdminPassword $AdminPW ` - -LinuxConfigurationDisablePasswordAuthentication $true ` - -PublicKey @($VmssPublicKey) ` - -CustomData ([Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("#!/bin/bash`n/etc/provision-disks.sh`n"))) +if ($MakeInstalledDisk) { + $Vmss = Set-AzVmssOsProfile ` + -VirtualMachineScaleSet $Vmss ` + -ComputerNamePrefix $LiveVMPrefix ` + -AdminUsername AdminUser ` + -AdminPassword $AdminPW ` + -LinuxConfigurationDisablePasswordAuthentication $true ` + -PublicKey @($VmssPublicKey) ` + -CustomData ([Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("#!/bin/bash`n/etc/provision-disks.sh`n"))) +} else { + $Vmss = Set-AzVmssOsProfile ` + -VirtualMachineScaleSet $Vmss ` + -ComputerNamePrefix $LiveVMPrefix ` + -AdminUsername AdminUser ` + -AdminPassword $AdminPW ` + -LinuxConfigurationDisablePasswordAuthentication $true ` + -PublicKey @($VmssPublicKey) +} $Vmss = Set-AzVmssStorageProfile ` -VirtualMachineScaleSet $Vmss ` -OsDiskCreateOption 'FromImage' ` - -OsDiskCaching ReadWrite ` + -OsDiskCaching ReadOnly ` + -DiffDiskSetting Local ` -ImageReferenceId $Image.Id -$Vmss = Add-AzVmssDataDisk ` - -VirtualMachineScaleSet $Vmss ` - -Lun 0 ` - -Caching 'ReadWrite' ` - -CreateOption Empty ` - -DiskSizeGB 1024 ` - -StorageAccountType 'StandardSSD_LRS' +if ($MakeInstalledDisk) { + $Vmss = Add-AzVmssDataDisk ` + -VirtualMachineScaleSet $Vmss ` + -Lun 0 ` + -Caching 'ReadWrite' ` + -CreateOption Empty ` + -DiskSizeGB $InstalledDiskSizeInGB ` + -StorageAccountType 'StandardSSD_LRS' +} New-AzVmss ` -ResourceGroupName $ResourceGroupName ` diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 index c3ea470d74e487..7e93dded48eb24 100644 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -15,13 +15,6 @@ This script assumes you have installed Azure tools into PowerShell by following at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 or are running from Azure Cloud Shell. -.PARAMETER Unstable -If this parameter is set, the machine is configured for use in the "unstable" pool used for testing -the compiler rather than for testing vcpkg. Differences: -* The machine prefix is changed to VcpkgUnstable instead of PrWin. -* No storage account or "archives" share is provisioned. -* The firewall is not opened to allow communication with Azure Storage. - .PARAMETER CudnnPath The path to a CUDNN zip file downloaded from NVidia official sources (e.g. https://developer.nvidia.com/compute/machine-learning/cudnn/secure/8.1.1.33/11.2_20210301/cudnn-11.2-windows-x64-v8.1.1.33.zip @@ -30,28 +23,28 @@ downloaded in a browser with an NVidia account logged in.) [CmdLetBinding()] Param( - [switch]$Unstable = $false, [parameter(Mandatory=$true)] [string]$CudnnPath ) $Location = 'westus2' -if ($Unstable) { - $Prefix = 'VcpkgUnstable-' -} else { - $Prefix = 'PrWin-' -} +$Prefix = 'PrWin-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32_v4' +$VMSize = 'Standard_D32ds_v4' $ProtoVMName = 'PROTOTYPE' $LiveVMPrefix = 'BUILD' $WindowsServerSku = '2019-Datacenter' +$MakeInstalledDisk = $false $InstalledDiskSizeInGB = 1024 $ErrorActionPreference = 'Stop' $ProgressActivity = 'Creating Scale Set' -$TotalProgress = 21 +$TotalProgress = 20 +if ($MakeInstalledDisk) { + $TotalProgress++ +} + $CurrentProgress = 1 Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking @@ -274,14 +267,16 @@ $VM = Set-AzVMSourceImage ` -Version latest $InstallDiskName = $ProtoVMName + "InstallDisk" -$VM = Add-AzVMDataDisk ` - -Vm $VM ` - -Name $InstallDiskName ` - -Lun 0 ` - -Caching ReadWrite ` - -CreateOption Empty ` - -DiskSizeInGB $InstalledDiskSizeInGB ` - -StorageAccountType 'StandardSSD_LRS' +if ($MakeInstalledDisk) { + $VM = Add-AzVMDataDisk ` + -Vm $VM ` + -Name $InstallDiskName ` + -Lun 0 ` + -Caching ReadWrite ` + -CreateOption Empty ` + -DiskSizeInGB $InstalledDiskSizeInGB ` + -StorageAccountType 'StandardSSD_LRS' +} $VM = Set-AzVMBootDiagnostic -VM $VM -Disable New-AzVm ` @@ -437,8 +432,10 @@ try { Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName #################################################################################################### -Invoke-ScriptWithPrefix -ScriptName 'deploy-install-disk.ps1' -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +if ($MakeInstalledDisk) { + Invoke-ScriptWithPrefix -ScriptName 'deploy-install-disk.ps1' + Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +} #################################################################################################### Write-Progress ` @@ -481,7 +478,8 @@ Set-AzVM ` $VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName $PrototypeOSDiskName = $VM.StorageProfile.OsDisk.Name $ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -$Image = New-AzImage -Image $ImageConfig -ImageName $ProtoVMName -ResourceGroupName $ResourceGroupName +$ImageName = "$Prefix-BaseImage" +$Image = New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName $ResourceGroupName #################################################################################################### Write-Progress ` @@ -491,7 +489,9 @@ Write-Progress ` Remove-AzVM -Id $VM.ID -Force Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $PrototypeOSDiskName -Force -Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $InstallDiskName -Force +if ($MakeInstalledDisk) { + Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $InstallDiskName -Force +} #################################################################################################### Write-Progress ` @@ -526,12 +526,13 @@ $Vmss = Set-AzVmssOsProfile ` -AdminUsername 'AdminUser' ` -AdminPassword $AdminPW ` -WindowsConfigurationProvisionVMAgent $true ` - -WindowsConfigurationEnableAutomaticUpdate $true + -WindowsConfigurationEnableAutomaticUpdate $false $Vmss = Set-AzVmssStorageProfile ` -VirtualMachineScaleSet $Vmss ` -OsDiskCreateOption 'FromImage' ` - -OsDiskCaching ReadWrite ` + -OsDiskCaching ReadOnly ` + -DiffDiskSetting Local ` -ImageReferenceId $Image.Id New-AzVmss ` From ae97158153a0f5fa766da94e26e2f8922b65bcf5 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 16 Jul 2021 05:52:47 +0800 Subject: [PATCH 0108/1858] [Pistache] update to HEAD (#17013) * [Pistache] update to HEAD * update version * fix linux Error * update version Co-authored-by: Billy Robert O'Neal III --- ports/pistache/CONTROL | 5 ---- ports/pistache/fix-debug-empty.patch | 36 ++++++++++++++++++++++++++++ ports/pistache/portfile.cmake | 18 +++++++------- ports/pistache/vcpkg.json | 7 ++++++ versions/baseline.json | 2 +- versions/p-/pistache.json | 5 ++++ 6 files changed, 58 insertions(+), 15 deletions(-) delete mode 100644 ports/pistache/CONTROL create mode 100644 ports/pistache/fix-debug-empty.patch create mode 100644 ports/pistache/vcpkg.json diff --git a/ports/pistache/CONTROL b/ports/pistache/CONTROL deleted file mode 100644 index 307fe019164c12..00000000000000 --- a/ports/pistache/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pistache -Version: 2019-08-05 -Homepage: https://github.com/oktal/pistache -Description: Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API. -Supports: linux \ No newline at end of file diff --git a/ports/pistache/fix-debug-empty.patch b/ports/pistache/fix-debug-empty.patch new file mode 100644 index 00000000000000..f6a7b97a0cbd8d --- /dev/null +++ b/ports/pistache/fix-debug-empty.patch @@ -0,0 +1,36 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9aeed1e..7316732 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -48,12 +48,12 @@ if (BUILD_SHARED_LIBS) + add_library(pistache_shared SHARED $) + target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) + target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) +-endif () ++else () + + add_library(pistache_static STATIC $) + target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) + target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) +- ++endif() + if (PISTACHE_USE_SSL) + target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) + target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) +@@ -72,8 +72,15 @@ if (BUILD_SHARED_LIBS) + OUTPUT_NAME ${Pistache_OUTPUT_NAME}-${VERSION} + SOVERSION ${SONAME_VERSION_MAJOR}.${SONAME_VERSION_MINOR} + ) +-endif () ++else () + + set_target_properties(pistache_static PROPERTIES + OUTPUT_NAME ${Pistache_OUTPUT_NAME} + ) ++endif() ++install( ++ TARGETS pistache ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++) diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake index ea7deba191e2ab..409c0e0f663771 100644 --- a/ports/pistache/portfile.cmake +++ b/ports/pistache/portfile.cmake @@ -1,13 +1,15 @@ -if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(NOT VCPKG_TARGET_IS_LINUX) message(FATAL_ERROR "${PORT} currently only supports Linux platform.") endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO oktal/pistache - REF 4dc9e3ef9a1b953a62e5fadbed88e72b4b3734de - SHA512 427b6a6e7200e5f91ce8737cd1cc5d6cd689025033c85979c96f0ece64ae05d9c6839a936d7d6015b0e1065dc72362f6f70ab588ea7cae7aa718dfe5cd288554 + REPO pistacheio/pistache + REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31 + SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4 HEAD_REF master + PATCHES + fix-debug-empty.patch ) vcpkg_configure_cmake( @@ -17,13 +19,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/RapidJSON) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json new file mode 100644 index 00000000000000..30a1bf4ed1f68c --- /dev/null +++ b/ports/pistache/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pistache", + "version-date": "2021-03-31", + "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", + "homepage": "https://github.com/oktal/pistache", + "supports": "linux" +} diff --git a/versions/baseline.json b/versions/baseline.json index 0c9184aad8307e..be1787a55645aa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4849,7 +4849,7 @@ "port-version": 0 }, "pistache": { - "baseline": "2019-08-05", + "baseline": "2021-03-31", "port-version": 0 }, "pixel": { diff --git a/versions/p-/pistache.json b/versions/p-/pistache.json index 2c9491e148a03e..68755a316274a6 100644 --- a/versions/p-/pistache.json +++ b/versions/p-/pistache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2c28dea6191ea1f399a862889d095f1d268a3f0", + "version-date": "2021-03-31", + "port-version": 0 + }, { "git-tree": "63fa37bfa9925b106a2e5a66db9133e381dc499e", "version-string": "2019-08-05", From e96c02ce54fcd2eda7b1929609d44195b59a9c07 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 16 Jul 2021 05:55:58 +0800 Subject: [PATCH 0109/1858] [czmq] Update to v4.2.1 (#17989) * [czmq] Update to 4.2.1 * [czmq] vcpkg x-add-version czmq * [czmq] Quote paths * [czmq] Overwrite version * [czmq] Fix curl winldap linkage when built as static library * [czmq] Overwrite version * [czmq] Fix dependencies * [czmq] Overwrite version * [czmq] Modernize * [czmq] Overwrite version --- ports/czmq/CONTROL | 27 ------------- ports/czmq/Findlibcurl.cmake | 62 ++++++------------------------ ports/czmq/Findlibmicrohttpd.cmake | 14 ++++--- ports/czmq/Findlibzmq.cmake | 8 +--- ports/czmq/Findlz4.cmake | 8 +++- ports/czmq/Finduuid.cmake | 10 +++-- ports/czmq/fix-dependencies.patch | 8 ++-- ports/czmq/portfile.cmake | 42 ++++++++++---------- ports/czmq/vcpkg.json | 53 +++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/c-/czmq.json | 5 +++ 11 files changed, 119 insertions(+), 120 deletions(-) delete mode 100644 ports/czmq/CONTROL create mode 100644 ports/czmq/vcpkg.json diff --git a/ports/czmq/CONTROL b/ports/czmq/CONTROL deleted file mode 100644 index 2d190c3940697c..00000000000000 --- a/ports/czmq/CONTROL +++ /dev/null @@ -1,27 +0,0 @@ -Source: czmq -Version: 2019-06-10-4 -Build-Depends: zeromq -Description: High-level C binding for ZeroMQ -Homepage: https://github.com/zeromq/czmq - -Feature: tool -Description: Build and install czmq tools (zmakecert) - -Feature: draft -Description: Build and install draft APIs - -Feature: curl -Description: Build with libcurl -Build-Depends: curl - -Feature: lz4 -Description: Build with lz4 -Build-Depends: lz4 - -Feature: httpd -Description: Build with HTTP server support (libmicrohttpd) -Build-Depends: libmicrohttpd - -Feature: uuid -Description: Build with libuuid -Build-Depends: libuuid (!windows&!uwp&!osx) diff --git a/ports/czmq/Findlibcurl.cmake b/ports/czmq/Findlibcurl.cmake index 6c943e2d71c738..6a8f90bbd4b98d 100644 --- a/ports/czmq/Findlibcurl.cmake +++ b/ports/czmq/Findlibcurl.cmake @@ -1,51 +1,11 @@ -find_path( - LIBCURL_INCLUDE_DIRS - NAMES curl/curl.h -) - -find_library( - LIBCURL_LIBRARY_DEBUG - NAMES libcurl-d_imp libcurl-d curl-d curl -) - -find_library( - LIBCURL_LIBRARY_RELEASE - NAMES libcurl_imp libcurl curl -) - -include(SelectLibraryConfigurations) -select_library_configurations(LIBCURL) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - LIBCURL - REQUIRED_VARS LIBCURL_LIBRARIES LIBCURL_INCLUDE_DIRS -) - -# CURL dependencies -# https://github.com/Microsoft/vcpkg/issues/4312 -# https://github.com/microsoft/vcpkg/commit/ee325d14276e7bd7961e94e58293b02d6e9e92da -# https://github.com/microsoft/vcpkg/pull/6698 -if (LIBCURL_FOUND) - find_package(OpenSSL QUIET) - find_package(ZLIB QUIET) - - if (OPENSSL_FOUND) - list(APPEND LIBCURL_LIBRARIES - OpenSSL::SSL - OpenSSL::Crypto - ) - endif () - - if (ZLIB_FOUND) - list(APPEND LIBCURL_LIBRARIES - ZLIB::ZLIB - ) - endif () - - if (WIN32) - list(APPEND LIBCURL_LIBRARIES - Crypt32 - ) - endif () -endif () +find_package(CURL CONFIG QUIET) + +if(CURL_FOUND) + set(LIBCURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS}) + set(LIBCURL_LIBRARIES CURL::libcurl) + set(LIBCURL_FOUND TRUE) + message(STATUS "Found libcurl: ${LIBCURL_LIBRARIES}") +else() + set(LIBCURL_FOUND FALSE) + message(STATUS "Could not find libcurl") +endif() diff --git a/ports/czmq/Findlibmicrohttpd.cmake b/ports/czmq/Findlibmicrohttpd.cmake index 476cb2add52825..c7d0b4c19f3b2b 100644 --- a/ports/czmq/Findlibmicrohttpd.cmake +++ b/ports/czmq/Findlibmicrohttpd.cmake @@ -1,17 +1,17 @@ -find_path(LIBMICROHTTPD_INCLUDE_DIRS NAMES microhttpd.h) +find_path(LIBMICROHTTPD_INCLUDE_DIR NAMES microhttpd.h) -get_filename_component(_prefix_path ${LIBMICROHTTPD_INCLUDE_DIRS} PATH) +get_filename_component(_prefix_path ${LIBMICROHTTPD_INCLUDE_DIR} PATH) find_library( LIBMICROHTTPD_LIBRARY_DEBUG - NAMES libmicrohttpd microhttpd + NAMES libmicrohttpd-dll_d libmicrohttpd microhttpd PATHS ${_prefix_path}/debug/lib NO_DEFAULT_PATH ) find_library( LIBMICROHTTPD_LIBRARY_RELEASE - NAMES libmicrohttpd microhttpd + NAMES libmicrohttpd-dll libmicrohttpd microhttpd PATHS ${_prefix_path}/lib NO_DEFAULT_PATH ) @@ -24,5 +24,9 @@ select_library_configurations(LIBMICROHTTPD) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( LIBMICROHTTPD - REQUIRED_VARS LIBMICROHTTPD_LIBRARIES LIBMICROHTTPD_INCLUDE_DIRS + REQUIRED_VARS LIBMICROHTTPD_LIBRARY LIBMICROHTTPD_INCLUDE_DIR ) + +if(LIBMICROHTTPD_FOUND) + set(LIBMICROHTTPD_INCLUDE_DIRS ${LIBMICROHTTPD_INCLUDE_DIR}) +endif() diff --git a/ports/czmq/Findlibzmq.cmake b/ports/czmq/Findlibzmq.cmake index 706f063c388716..80ce140e7c991e 100644 --- a/ports/czmq/Findlibzmq.cmake +++ b/ports/czmq/Findlibzmq.cmake @@ -2,9 +2,5 @@ find_package(ZeroMQ CONFIG REQUIRED) set(LIBZMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR}) set(LIBZMQ_LIBRARIES libzmq libzmq-static) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - LIBZMQ - REQUIRED_VARS LIBZMQ_LIBRARIES LIBZMQ_INCLUDE_DIRS -) +set(LIBZMQ_FOUND TRUE) +message(STATUS "Found libzmq: ${LIBZMQ_LIBRARIES}") diff --git a/ports/czmq/Findlz4.cmake b/ports/czmq/Findlz4.cmake index 8ce17c5bd7f878..bb97973681d24e 100644 --- a/ports/czmq/Findlz4.cmake +++ b/ports/czmq/Findlz4.cmake @@ -1,4 +1,4 @@ -find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) +find_path(LZ4_INCLUDE_DIR NAMES lz4.h) find_library(LZ4_LIBRARY_DEBUG NAMES lz4d) find_library(LZ4_LIBRARY_RELEASE NAMES lz4) @@ -9,5 +9,9 @@ select_library_configurations(LZ4) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( LZ4 - REQUIRED_VARS LZ4_LIBRARIES LZ4_INCLUDE_DIRS + REQUIRED_VARS LZ4_LIBRARY LZ4_INCLUDE_DIR ) + +if(LZ4_FOUND) + set(LZ4_INCLUDE_DIRS ${LZ4_INCLUDE_DIR}) +endif() diff --git a/ports/czmq/Finduuid.cmake b/ports/czmq/Finduuid.cmake index ba89aab56765a0..96e61e057ba65d 100644 --- a/ports/czmq/Finduuid.cmake +++ b/ports/czmq/Finduuid.cmake @@ -1,9 +1,9 @@ find_path( - UUID_INCLUDE_DIRS + UUID_INCLUDE_DIR NAMES uuid/uuid.h ) -get_filename_component(_prefix_path ${UUID_INCLUDE_DIRS} PATH) +get_filename_component(_prefix_path ${UUID_INCLUDE_DIR} PATH) find_library( UUID_LIBRARY_DEBUG @@ -27,5 +27,9 @@ select_library_configurations(UUID) include(FindPackageHandleStandardArgs) find_package_handle_standard_args( UUID - REQUIRED_VARS UUID_LIBRARIES UUID_INCLUDE_DIRS + REQUIRED_VARS UUID_LIBRARY UUID_INCLUDE_DIR ) + +if(UUID_FOUND) + set(UUID_INCLUDE_DIRS ${UUID_INCLUDE_DIR}) +endif() diff --git a/ports/czmq/fix-dependencies.patch b/ports/czmq/fix-dependencies.patch index bb57247dcbd6fd..4612b8939e95a8 100644 --- a/ports/czmq/fix-dependencies.patch +++ b/ports/czmq/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/builds/cmake/Config.cmake.in b/builds/cmake/Config.cmake.in -index 9c15f36a..e1475cd6 100644 +index 9c15f36a..5afff016 100644 --- a/builds/cmake/Config.cmake.in +++ b/builds/cmake/Config.cmake.in -@@ -1,4 +1,14 @@ +@@ -1,4 +1,12 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) @@ -10,10 +10,8 @@ index 9c15f36a..e1475cd6 100644 +find_dependency(ZeroMQ) + +if ("@CZMQ_WITH_LIBCURL@" AND "@LIBCURL_FOUND@") -+ find_dependency(OpenSSL) -+ find_dependency(ZLIB) ++ find_dependency(CURL) +endif () -+ + include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") check_required_components("@PROJECT_NAME@") diff --git a/ports/czmq/portfile.cmake b/ports/czmq/portfile.cmake index 448008f0fc99a8..a24d0be9a6de83 100644 --- a/ports/czmq/portfile.cmake +++ b/ports/czmq/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/czmq - REF 7e29cf95305551daad197e32423d9cff5f9b6893 - SHA512 7d79494c904f5276c9d1e4a193a63882dc622a6db8998b9719de4aec8b223b3a8b3c92ea02be81f39afc12c1a883b310fd3662ea27ed736b0b9c7092b4843a18 + REF v4.2.1 + SHA512 65a21f7bd5935b119e1b24ce3b2ce8462031ab7c9a4ba587bb99fe618c9f8cb672cfa202993ddd79e0fb0f154ada06560b79a1b4f762fcce8f88f2f450ecee01 HEAD_REF master PATCHES fix-dependencies.patch @@ -15,27 +15,27 @@ foreach(_cmake_module Findlz4.cmake Finduuid.cmake ) - configure_file( + file(COPY ${CMAKE_CURRENT_LIST_DIR}/${_cmake_module} - ${SOURCE_PATH}/${_cmake_module} - COPYONLY + DESTINATION ${SOURCE_PATH} ) endforeach() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - draft ENABLE_DRAFTS - curl CZMQ_WITH_LIBCURL - httpd CZMQ_WITH_LIBMICROHTTPD - lz4 CZMQ_WITH_LZ4 - uuid CZMQ_WITH_UUID +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + draft ENABLE_DRAFTS + curl CZMQ_WITH_LIBCURL + httpd CZMQ_WITH_LIBMICROHTTPD + lz4 CZMQ_WITH_LZ4 + uuid CZMQ_WITH_UUID ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS -DCZMQ_BUILD_SHARED=${BUILD_SHARED} @@ -44,20 +44,22 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/share/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) + vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) endif() +vcpkg_fixup_pkgconfig() + file(COPY - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) if ("tool" IN_LIST FEATURES) @@ -66,7 +68,7 @@ endif() vcpkg_clean_executables_in_bin(FILE_NAMES zmakecert) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/czmq_library.h @@ -76,4 +78,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/czmq/vcpkg.json b/ports/czmq/vcpkg.json new file mode 100644 index 00000000000000..326c881d6bf6ae --- /dev/null +++ b/ports/czmq/vcpkg.json @@ -0,0 +1,53 @@ +{ + "name": "czmq", + "version-semver": "4.2.1", + "description": "High-level C binding for ZeroMQ", + "homepage": "https://github.com/zeromq/czmq", + "license": "MPL-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zeromq" + ], + "features": { + "curl": { + "description": "Build with libcurl", + "dependencies": [ + "curl" + ] + }, + "draft": { + "description": "Build and install draft APIs" + }, + "httpd": { + "description": "Build with HTTP server support (libmicrohttpd)", + "dependencies": [ + "libmicrohttpd" + ] + }, + "lz4": { + "description": "Build with lz4", + "dependencies": [ + "lz4" + ] + }, + "tool": { + "description": "Build and install czmq tools (zmakecert)" + }, + "uuid": { + "description": "Build with libuuid", + "dependencies": [ + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index be1787a55645aa..aca0b3c8179b9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1589,7 +1589,7 @@ "port-version": 0 }, "czmq": { - "baseline": "2019-06-10-4", + "baseline": "4.2.1", "port-version": 0 }, "d3dx12": { diff --git a/versions/c-/czmq.json b/versions/c-/czmq.json index 3d8139285e5882..45cace94635e22 100644 --- a/versions/c-/czmq.json +++ b/versions/c-/czmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e05dc72cf3b616b1fd6629ea3dc20d08ed8d8055", + "version-semver": "4.2.1", + "port-version": 0 + }, { "git-tree": "31aceda22627ab6f97f03868d5f92a4cc78a275e", "version-string": "2019-06-10-4", From 40d7a38c7365266a1aceeee78c74ae9083270bfc Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 16 Jul 2021 01:15:36 +0300 Subject: [PATCH 0110/1858] [vcpkg] Add debug_message to vcpkg_configure_meson.cmake (#18207) * Add debug_message to vcpkg_configure_meson.cmake * Update vcpkg_configure_meson.cmake * Update vcpkg_configure_meson.cmake --- scripts/cmake/vcpkg_configure_meson.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 5128422f790bb9..2ee8266b9b3755 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -219,6 +219,9 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ COMMAND uname -m OUTPUT_VARIABLE MACHINE COMMAND_ERROR_IS_FATAL ANY) + + # Show real machine architecture to visually understand whether we are in a native Apple Silicon terminal or running under Rosetta emulation + debug_message("Machine: ${MACHINE}") if(MACHINE MATCHES "arm64") set(BUILD_CPU_FAM aarch64) From 29a3513c15f643bb339986524fe5be25d4b832d1 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Thu, 15 Jul 2021 15:38:20 -0700 Subject: [PATCH 0111/1858] Use valid commmit ID for baseline (#18969) --- docs/examples/versioning.getting-started.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/examples/versioning.getting-started.md b/docs/examples/versioning.getting-started.md index d723c2942a375a..450e2b05a0e09f 100644 --- a/docs/examples/versioning.getting-started.md +++ b/docs/examples/versioning.getting-started.md @@ -24,7 +24,7 @@ Create a folder with the following files: }, "zlib" ], - "builtin-baseline": "b60f003ccf5fe8613d029f49f835c8929a66eb61" + "builtin-baseline": "68a74950d0400f5a803026d0860f49853984bf11" } ``` @@ -141,12 +141,12 @@ If you want to upgrade your dependencies, you can bump the minimum version const #### **`builtin-baseline`** ```json -{ "builtin-baseline": "b60f003ccf5fe8613d029f49f835c8929a66eb61" } +{ "builtin-baseline": "68a74950d0400f5a803026d0860f49853984bf11" } ``` This field declares the versioning baseline for all ports. Setting a baseline is required to enable versioning, otherwise you will get the current versions on the ports directory. You can run 'git rev-parse HEAD' to get the current commit of vcpkg and set it as the builtin-baseline. See the [`builtin-baseline` documentation](../users/versioning.md#builtin-baseline) for more information. -In our example, you can notice that we do not declare a version constraint for `zlib`; instead, the version is taken from the baseline. Internally, vcpkg will look in commit `b60f003ccf5fe8613d029f49f835c8929a66eb61` to find out what version of `zlib` was the latest at that point in time (in our case it was `1.2.11#9`). +In our example, you can notice that we do not declare a version constraint for `zlib`; instead, the version is taken from the baseline. Internally, vcpkg will look in commit `68a74950d0400f5a803026d0860f49853984bf11` to find out what version of `zlib` was the latest at that point in time (in our case it was `1.2.11#9`). During version resolution, baseline versions are treated as minimum version constraints. If you declare an explicit constraint that is lower than a baseline version, the explicit constraint will be upgraded to the baseline version. @@ -194,7 +194,7 @@ Let's modify our example once more, this time to force vcpkg to use version `6.0 "version>=": "1.2.11#7" } ], - "builtin-baseline": "b60f003ccf5fe8613d029f49f835c8929a66eb61", + "builtin-baseline": "68a74950d0400f5a803026d0860f49853984bf11", "overrides": [ { "name": "fmt", From d26d23223e318ea98ffcf9b70fb345ca82f3375c Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Thu, 15 Jul 2021 17:38:30 -0500 Subject: [PATCH 0112/1858] Adapting for HPX V1.7.0 (#18966) --- ports/hpx/CONTROL | 7 ----- ports/hpx/hpx-1.7.0-format-from-string.patch | 12 +++++++++ ports/hpx/portfile.cmake | 10 +++----- ports/hpx/vcpkg.json | 27 ++++++++++++++++++++ versions/baseline.json | 2 +- versions/h-/hpx.json | 5 ++++ 6 files changed, 49 insertions(+), 14 deletions(-) delete mode 100644 ports/hpx/CONTROL create mode 100644 ports/hpx/hpx-1.7.0-format-from-string.patch create mode 100644 ports/hpx/vcpkg.json diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL deleted file mode 100644 index 021b412c5d3a7e..00000000000000 --- a/ports/hpx/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: hpx -Version: 1.6.0 -Port-Version: 0 -Build-Depends: hwloc, boost-accumulators, boost-asio, boost-bimap, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi -Homepage: https://github.com/STEllAR-GROUP/hpx -Description: The C++ Standards Library for Concurrency and Parallelism - HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case. diff --git a/ports/hpx/hpx-1.7.0-format-from-string.patch b/ports/hpx/hpx-1.7.0-format-from-string.patch new file mode 100644 index 00000000000000..2aa2d3eb4c154c --- /dev/null +++ b/ports/hpx/hpx-1.7.0-format-from-string.patch @@ -0,0 +1,12 @@ +diff --git a/libs/core/format/include/hpx/util/from_string.hpp b/libs/core/format/include/hpx/util/from_string.hpp +index 07eb9b68dfb..c3d0d857143 100644 +--- a/libs/core/format/include/hpx/util/from_string.hpp ++++ b/libs/core/format/include/hpx/util/from_string.hpp +@@ -10,6 +10,7 @@ + #include + + #include ++#include + #include + #include + #include diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 28143f171e9eec..aee67742ec3540 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -4,17 +4,17 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.6.0 - SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc + REF 1.7.0 + SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518 HEAD_REF stable + PATCHES + hpx-1.7.0-format-from-string.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - "-DBOOST_ROOT=${CURRENT_INSTALLED_DIR}/share/boost" - "-DHWLOC_ROOT=${CURRENT_INSTALLED_DIR}/share/hwloc" -DHPX_WITH_VCPKG=ON -DHPX_WITH_TESTS=OFF -DHPX_WITH_EXAMPLES=OFF @@ -79,13 +79,11 @@ if(DLLS) file(REMOVE ${DLLS}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/bazel) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json new file mode 100644 index 00000000000000..fdb0c630612dd5 --- /dev/null +++ b/ports/hpx/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "hpx", + "version-string": "1.7.0", + "description": [ + "The C++ Standards Library for Concurrency and Parallelism", + "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." + ], + "homepage": "https://github.com/STEllAR-GROUP/hpx", + "dependencies": [ + "asio", + "boost-accumulators", + "boost-config", + "boost-context", + "boost-dynamic-bitset", + "boost-exception", + "boost-filesystem", + "boost-iostreams", + "boost-lockfree", + "boost-range", + "boost-spirit", + "boost-system", + "boost-throw-exception", + "boost-variant", + "boost-winapi", + "hwloc" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index aca0b3c8179b9e..77ac754303f616 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2521,7 +2521,7 @@ "port-version": 1 }, "hpx": { - "baseline": "1.6.0", + "baseline": "1.7.0", "port-version": 0 }, "http-parser": { diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 04b0fbd2c26f14..fc9d09da7f7899 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6abaf9002afc0d46fd8700438776403d63959ebf", + "version-string": "1.7.0", + "port-version": 0 + }, { "git-tree": "3e07ee0cdfdf093d41ddb40267f5910f71bfd944", "version-string": "1.6.0", From 0b8f6a1281542c30c2a88375b58828ea961a9bbf Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Fri, 16 Jul 2021 08:00:28 +0900 Subject: [PATCH 0113/1858] [spdlog] support wchar when target is Windows (#18041) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [spdlog] support wchar when targeting Windows * filename will be `std::string` * functions `wstr_to_utf8buf`, `utf8_to_wstrbuf` will be added * [spdlog] update baseline and git-tree SHA * [spdlog] make wchar_t options to port features * new feature: `wchar`, `wchar-filenames` * update git-tree SHA * Update ports/spdlog/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/spdlog/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * [spdlog] more clear SPDLOG_WCHAR_FILENAMES usage * Update versions/s-/spdlog.json * Update ports/spdlog/vcpkg.json Co-authored-by: Robert Schumacher * Update ports/spdlog/portfile.cmake Co-authored-by: Robert Schumacher * Update ports/spdlog/portfile.cmake Co-authored-by: Robert Schumacher * [spdlog] update version SHA * [spdlog] update port version Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/spdlog/portfile.cmake | 16 +++++++++++++++- ports/spdlog/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/s-/spdlog.json | 5 +++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 0d95db43a76aab..1943ad86d77cf7 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -9,9 +9,22 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - benchmark SPDLOG_BUILD_BENCH + benchmark SPDLOG_BUILD_BENCH + wchar SPDLOG_WCHAR_SUPPORT ) +# configured in triplet file +if(NOT DEFINED SPDLOG_WCHAR_FILENAMES) + set(SPDLOG_WCHAR_FILENAMES OFF) +endif() +if(NOT VCPKG_TARGET_IS_WINDOWS) + if("wchar" IN_LIST FEATURES) + message(WARNING "Feature 'wchar' is only supported for Windows and has no effect on other platforms.") + elseif(SPDLOG_WCHAR_FILENAMES) + message(FATAL_ERROR "Build option 'SPDLOG_WCHAR_FILENAMES' is for Windows.") + endif() +endif() + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SPDLOG_BUILD_SHARED) vcpkg_cmake_configure( @@ -21,6 +34,7 @@ vcpkg_cmake_configure( -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_INSTALL=ON -DSPDLOG_BUILD_SHARED=${SPDLOG_BUILD_SHARED} + -DSPDLOG_WCHAR_FILENAMES=${SPDLOG_WCHAR_FILENAMES} -DSPDLOG_BUILD_EXAMPLE=OFF ) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index 21f33d83defaac..ec5df5609a499c 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,9 +1,10 @@ { "name": "spdlog", "version-semver": "1.8.5", - "port-version": 3, + "port-version": 4, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", + "license": "MIT", "dependencies": [ "fmt", { @@ -21,6 +22,9 @@ "dependencies": [ "benchmark" ] + }, + "wchar": { + "description": "Build with wchar_t (Windows only)" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 77ac754303f616..247bf707b19b3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5946,7 +5946,7 @@ }, "spdlog": { "baseline": "1.8.5", - "port-version": 3 + "port-version": 4 }, "spectra": { "baseline": "0.9.0", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index f0dd94172b7e08..1c0c72dae5822e 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac601a8d86ea3edc831933ad7e12eee11ac6e6db", + "version-semver": "1.8.5", + "port-version": 4 + }, { "git-tree": "f74643a7b8056237da08c41a653f5b0592870906", "version-semver": "1.8.5", From e8180bc32e68dc1dbc0e51b899858ea4ddbba938 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 16 Jul 2021 01:01:16 +0200 Subject: [PATCH 0114/1858] [cairo] Fix static cairo builds (#18103) * fix static cairo builds * remove outdated patch * version stuff * try getting cairo back into static CI builds --- ports/cairo/cairo_static_fix.patch | 92 ++++++++++++++++++++++++++++++ ports/cairo/portfile.cmake | 1 + ports/cairo/vcpkg.json | 2 +- ports/cairo/win_dll_def.patch | 13 ----- scripts/ci.baseline.txt | 4 ++ versions/baseline.json | 2 +- versions/c-/cairo.json | 5 ++ 7 files changed, 104 insertions(+), 15 deletions(-) create mode 100644 ports/cairo/cairo_static_fix.patch delete mode 100644 ports/cairo/win_dll_def.patch diff --git a/ports/cairo/cairo_static_fix.patch b/ports/cairo/cairo_static_fix.patch new file mode 100644 index 00000000000000..8030679b1dfaf3 --- /dev/null +++ b/ports/cairo/cairo_static_fix.patch @@ -0,0 +1,92 @@ +diff --git a/util/cairo-fdr/meson.build b/util/cairo-fdr/meson.build +index 3cb66c678..b12b90036 100644 +--- a/util/cairo-fdr/meson.build ++++ b/util/cairo-fdr/meson.build +@@ -4,7 +4,7 @@ cairo_fdr_sources = [ + + libcairofdr = library('cairo-fdr', cairo_fdr_sources, + include_directories: [incbase, incsrc], +- c_args: ['-DHAVE_CONFIG_H'], ++ c_args: ['-DHAVE_CONFIG_H'] + static_definition, + dependencies: deps, + install: true, + install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'), +diff --git a/util/cairo-script/meson.build b/util/cairo-script/meson.build +index a782ec63f..7e21f6c04 100644 +--- a/util/cairo-script/meson.build ++++ b/util/cairo-script/meson.build +@@ -26,7 +26,7 @@ csi_trace_sources = [ + + libcairoscript = library('cairo-script-interpreter', + cairoscript_interpreter_sources, +- c_args: ['-DHAVE_CONFIG_H'], ++ c_args: ['-DHAVE_CONFIG_H'] + static_definition, + include_directories: [incbase, incsrc], + dependencies: deps, + link_with: [libcairo], +@@ -41,14 +41,14 @@ libcairoscript_dep = declare_dependency(link_with: libcairoscript, + include_directories: [incbase, inccairoscript]) + + csi_replay_exe = executable('csi-replay', csi_replay_sources, +- c_args: ['-DHAVE_CONFIG_H'], ++ c_args: ['-DHAVE_CONFIG_H'] + static_definition, + include_directories: [incbase, incsrc], + link_with: [libcairo, libcairoscript], + dependencies: deps, + ) + + csi_exec_exe = executable('csi-exec', csi_exec_sources, +- c_args: ['-DHAVE_CONFIG_H'], ++ c_args: ['-DHAVE_CONFIG_H'] + static_definition, + include_directories: [incbase, incsrc], + link_with: [libcairo, libcairoscript], + dependencies: deps, +@@ -56,7 +56,7 @@ csi_exec_exe = executable('csi-exec', csi_exec_sources, + + if feature_conf.get('CAIRO_HAS_SCRIPT_SURFACE', 0) == 1 and conf.get('HAVE_LIBGEN_H', 0) == 1 + csi_trace_exe = executable('csi-trace', csi_trace_sources, +- c_args: ['-DHAVE_CONFIG_H'], ++ c_args: ['-DHAVE_CONFIG_H'] + static_definition, + include_directories: [incbase, incsrc], + link_with: [libcairo, libcairoscript], + dependencies: deps, +diff --git a/util/cairo-trace/meson.build b/util/cairo-trace/meson.build +index e836f98cf..76ee372a2 100644 +--- a/util/cairo-trace/meson.build ++++ b/util/cairo-trace/meson.build +@@ -12,7 +12,7 @@ libcairotrace = library('cairo-trace', cairo_trace_sources, + include_directories: [incbase, incsrc], + dependencies: deps, + link_args: extra_link_args, +- c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args, ++ c_args: ['-DSHARED_LIB_EXT="@0@"'.format(shared_lib_ext), '-DHAVE_CONFIG_H'] + pthread_c_args + static_definition, + install: true, + install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'cairo'), + ) +diff --git a/util/meson.build b/util/meson.build +index 016955cea..a90363115 100644 +--- a/util/meson.build ++++ b/util/meson.build +@@ -2,6 +2,14 @@ subdir('cairo-missing') + + cairo_utils = [] + ++static_definition=[] ++if host_machine.system() == 'windows' ++ lib_default = get_option('default_library') ++ if lib_default == 'static' ++ static_definition=['-DCAIRO_WIN32_STATIC_BUILD'] ++ endif ++endif ++ + if feature_conf.get('CAIRO_HAS_GOBJECT_FUNCTIONS', 0) == 1 + subdir('cairo-gobject') + endif +@@ -55,6 +63,7 @@ foreach util : cairo_utils + include_directories: [incbase, incsrc, inccairoscript], + dependencies: deps + util_deps, + link_with: [libcairo, libcairoscript], ++ c_args: static_definition + ) + endforeach + diff --git a/ports/cairo/portfile.cmake b/ports/cairo/portfile.cmake index f14e1b609ef5da..61a7108b177eb2 100644 --- a/ports/cairo/portfile.cmake +++ b/ports/cairo/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_gitlab( SHA512 2c516ad3ffe56cf646b2435d6ef3cf25e8c05aeb13d95dd18a7d0510d134d9990cba1b376063352ff99483cfc4e5d2af849afd2f9538f9136f22d44d34be362c HEAD_REF master PATCHES 0001-meson-fix-macOS-build-and-add-macOS-ci.patch + cairo_static_fix.patch ) if("fontconfig" IN_LIST FEATURES) diff --git a/ports/cairo/vcpkg.json b/ports/cairo/vcpkg.json index 3372061c1d8990..e7de197c48ad64 100644 --- a/ports/cairo/vcpkg.json +++ b/ports/cairo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cairo", "version": "1.17.4", - "port-version": 1, + "port-version": 2, "description": "Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.", "homepage": "https://cairographics.org", "dependencies": [ diff --git a/ports/cairo/win_dll_def.patch b/ports/cairo/win_dll_def.patch deleted file mode 100644 index 0e50ed7872341d..00000000000000 --- a/ports/cairo/win_dll_def.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index df6de0136..b8de9669c 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -72,7 +72,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers) - $(EGREP) '^cairo_.* \(' | \ - sed -e 's/[ ].*//' | \ - sort; \ -- echo LIBRARY libcairo-$(CAIRO_VERSION_SONUM).dll; \ -+ echo LIBRARY cairo-$(CAIRO_VERSION_SONUM).dll; \ - ) >$@ - @ ! grep -q cairo_ERROR $@ || ($(RM) $@; false) - diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8d6ac650b7e9e0..d5ece9826a321d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -425,6 +425,8 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail +gtk:x64-windows-static=fail +gtk:x64-windows-static-md=fail gts:x64-osx=fail guetzli:x64-osx=fail h3:arm64-windows=fail @@ -1194,6 +1196,8 @@ orocos-kdl:arm-uwp=fail orocos-kdl:x64-uwp=fail paho-mqtt:arm-uwp=fail paho-mqtt:x64-uwp=fail +pango:x64-windows-static=fail +pango:x64-windows-static-md=fail pangomm:arm64-windows=fail pdal:x64-linux=fail pdal:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index 247bf707b19b3f..1b8e387e65c49e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1110,7 +1110,7 @@ }, "cairo": { "baseline": "1.17.4", - "port-version": 1 + "port-version": 2 }, "cairomm": { "baseline": "1.16.0", diff --git a/versions/c-/cairo.json b/versions/c-/cairo.json index 3dca4069620481..60935f639e22a4 100644 --- a/versions/c-/cairo.json +++ b/versions/c-/cairo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96aa6adbfefae2d4f2e3d79e012876b1d4a40b93", + "version": "1.17.4", + "port-version": 2 + }, { "git-tree": "a2fa5a9972a7b796f56fdda01f644b5c40d93580", "version": "1.17.4", From a5612fc931d94aa19821896db98c17761491d38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Guzm=C3=A1n?= Date: Thu, 15 Jul 2021 17:20:14 -0600 Subject: [PATCH 0115/1858] [vcpkg docs] Update Spanish readme (#18655) * sync Spanish readme with English readme * Update README_es.md Co-authored-by: Victor Romero --- README_es.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/README_es.md b/README_es.md index 161e30c8c7cb95..0ed0474f63d1d2 100644 --- a/README_es.md +++ b/README_es.md @@ -151,6 +151,18 @@ Para instalar las librerías para su proyecto, ejecute: $ ./vcpkg/vcpkg install [paquetes a instalar] ``` +Nota: por defecto se instalarán las librerías x86, para instalar x64, ejecute: + +```cmd +> .\vcpkg\vcpkg install [paquete a instalar]:x64-windows +``` + +O si desea instalar varios paquetes: + +```cmd +> .\vcpkg\vcpkg install [paquetes a instalar] --triplet=x64-windows +``` + También puede buscar las librerías que necesita con el subcomando `search`: ```sh @@ -365,7 +377,9 @@ ver la [documentación](docs/README.md) para tutoriales específicos, incluyendo [agregando un nuevo paquete desde un archivo comprimido](docs/examples/packaging-zipfiles.md), [agregando un nuevo paquete desde un repositorio en GitHub](docs/examples/packaging-github-repos.md). -Nuestra documentación se encuentra online en ReadTheDocs: ! +Nuestra documentación también esta disponible en nuestro sitio web [vcpkg.io](https://vcpkg.io/). +Si necesita ayuda puede [crear un incidente](https://github.com/vcpkg/vcpkg.github.io/issues). +¡Apreciamos cualquier retroalimentación! Ver un [video de demostración](https://www.youtube.com/watch?v=y41WFKbQFTw) de 4 minutos. From df4ce9668b5b0fcc50aa99415d996871cfcc3bcd Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Fri, 16 Jul 2021 09:39:25 +1000 Subject: [PATCH 0116/1858] [ffmpeg] Enable fdk on arm or uwp. (#18659) --- ports/ffmpeg/portfile.cmake | 6 ------ ports/ffmpeg/vcpkg.json | 11 ++--------- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 9b70694c2a5688..1b677396eef14d 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -31,12 +31,6 @@ if("dav1d" IN_LIST FEATURES) endif() endif() -if("fdk-aac" IN_LIST FEATURES) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) - message(FATAL_ERROR "Feature 'fdk-aac' does not support 'uwp | arm'") - endif() -endif() - if("fontconfig" IN_LIST FEATURES) if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) message(FATAL_ERROR "Feature 'fontconfig' does not support 'uwp | arm | (windows & static)'") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 8ce76f9e343ce4..efdb888bf1d341 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 7, + "port-version": 8, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -222,17 +222,10 @@ "default-features": false, "features": [ "all-gpl", + "fdk-aac", "nonfree", "openssl" ] - }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "fdk-aac" - ], - "platform": "!arm & !uwp" } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 1b8e387e65c49e..9c13bff86d7bf5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1986,7 +1986,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 7 + "port-version": 8 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index c510b16ed25c50..04750b6afad5ca 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b", + "version": "4.4", + "port-version": 8 + }, { "git-tree": "efdbc20f5003313df2fde681a28ab8718455495f", "version": "4.4", From 3d84f77e42cd691dc000072bd973c25a981116b3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 16 Jul 2021 02:19:56 +0200 Subject: [PATCH 0117/1858] [libxml2] Update to 2.9.12 and use upstream CMakeLists.txt (#17945) * vcpkg_fixup_pkgconfig for allgero5 * version stuff * Update port * version stuff * add missing patch * version stuff * deactivate ICU linkage * add missing 2 * fix include issue in dependend ports. * fix include dirs in wrapper * always install wrapper for corrections * target also needs fixing. * fix install of wrapper * version stuff * libxml define LIBXML_STATIC in the header in static builds * libxslt build only one type of library to avoid link issues * version stuff * add cmake policy * version stuff * remove accidental cmake_minimum_required(VERSION) * version stuff * version stuff * add feature tools to build tools * version stuff * fix version stuff * add ws2_32 to the target which was missing. * version stuff * add liblzma and zlib to the target * no need to adjust in config mode * version stuff * apply some of the CR suggestions * version update * remove icu dependency. * version stuff * setting uwp builds of libxml2 to fail. (icu supports:!uwp) * add !uwp into supports due to getenv call * version stuff * baseline stuff * Restore old version record for libxml2. Co-authored-by: Robert Schumacher --- ports/libxml2/CMakeLists.txt | 183 -------------------- ports/libxml2/config.linux.h | 56 ------ ports/libxml2/config.osx.h | 54 ------ ports/libxml2/fix_cmakelist.patch | 119 +++++++++++++ ports/libxml2/portfile.cmake | 90 +++++++--- ports/libxml2/rcVersion.h.in | 4 - ports/libxml2/usage | 5 +- ports/libxml2/vcpkg-cmake-wrapper.cmake | 36 +++- ports/libxml2/vcpkg.json | 11 +- ports/libxslt/CONTROL | 6 - ports/libxslt/only_build_one_lib_type.patch | 56 ++++++ ports/libxslt/portfile.cmake | 14 +- ports/libxslt/vcpkg.json | 12 ++ versions/baseline.json | 6 +- versions/l-/libxml2.json | 5 + versions/l-/libxslt.json | 5 + 16 files changed, 320 insertions(+), 342 deletions(-) delete mode 100644 ports/libxml2/CMakeLists.txt delete mode 100644 ports/libxml2/config.linux.h delete mode 100644 ports/libxml2/config.osx.h create mode 100644 ports/libxml2/fix_cmakelist.patch delete mode 100644 ports/libxml2/rcVersion.h.in delete mode 100644 ports/libxslt/CONTROL create mode 100644 ports/libxslt/only_build_one_lib_type.patch create mode 100644 ports/libxslt/vcpkg.json diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt deleted file mode 100644 index 372111771a8ea2..00000000000000 --- a/ports/libxml2/CMakeLists.txt +++ /dev/null @@ -1,183 +0,0 @@ -cmake_minimum_required(VERSION 3.8) -project(libxml2 C) -include(GNUInstallDirs) -set(WITH_TRIO 0 CACHE BOOL "Add trio support") -set(WITH_THREADS 1 CACHE BOOL "Add multithread support") -set(WITH_THREAD_ALLOC 0 CACHE BOOL "Add per-thread memory") -set(WITH_TREE 1 CACHE BOOL "Add the DOM like tree manipulation APIs") -set(WITH_OUTPUT 1 CACHE BOOL "Add the serialization support") -set(WITH_PUSH 1 CACHE BOOL "Add the PUSH parser interfaces") -set(WITH_READER 1 CACHE BOOL "Add the xmlReader parsing interface") -set(WITH_PATTERN 1 CACHE BOOL "Add the xmlPattern selection interface") -set(WITH_WRITER 1 CACHE BOOL "Add the xmlWriter saving interface") -set(WITH_SAX1 1 CACHE BOOL "Add the older SAX1 interface") -set(WITH_VALID 1 CACHE BOOL "Add the DTD validation support") -set(WITH_HTML 1 CACHE BOOL "Add the HTML support") -set(WITH_LEGACY 1 CACHE BOOL "Add deprecated APIs for compatibility") -set(WITH_C14N 1 CACHE BOOL "Add the Canonicalization support") -set(WITH_CATALOG 1 CACHE BOOL "Add the Catalog support") -set(WITH_DOCB 1 CACHE BOOL "Add Docbook SGML support") -set(WITH_XPATH 1 CACHE BOOL "Add the XPATH support") -set(WITH_XPTR 1 CACHE BOOL "Add the XPointer support") -set(WITH_XINCLUDE 1 CACHE BOOL "Add the XInclude support") -set(WITH_ICONV 1 CACHE BOOL "Add ICONV support") -set(WITH_ICU 0 CACHE BOOL "Add ICU support") -set(WITH_ISO8859X 1 CACHE BOOL "Add ISO8859X support if no iconv") -set(WITH_DEBUG 1 CACHE BOOL "Add the memory debugging module") -set(WITH_MEM_DEBUG 0 CACHE BOOL "Add the memory debugging module") -set(WITH_RUN_DEBUG 0 CACHE BOOL "Add the runtime debugging module") -set(WITH_REGEXPS 1 CACHE BOOL "Add Regular Expressions support") -set(WITH_SCHEMAS 1 CACHE BOOL "Add Relax-NG and Schemas support") -set(WITH_SCHEMATRON 1 CACHE BOOL "Add Schematron support") -set(WITH_MODULES 1 CACHE BOOL "Add the dynamic modules support") -set(WITH_ZLIB 1 CACHE BOOL "Add zlib support") -set(WITH_LZMA 1 CACHE BOOL "Add liblzma support") -set(WITH_HTTP 1 CACHE BOOL "Add the HTTP support") -set(WITH_FTP 1 CACHE BOOL "Add the FTP support") - -option(INSTALL_HEADERS "Install public header files" ON) - -set(MODULE_EXTENSION ".so") - -set(CMAKE_SHARED_LIBRARY_PREFIX) -set(CMAKE_STATIC_LIBRARY_PREFIX) - -find_package(ZLIB REQUIRED) -find_package(LibLZMA REQUIRED) -find_package(Iconv REQUIRED) - -file(GLOB SOURCES *.c) -list(FILTER SOURCES EXCLUDE REGEX "/(run|test|trio)[^/]*$") -list(FILTER SOURCES EXCLUDE REGEX "xml(lint|catalog).c$") -list(FILTER SOURCES EXCLUDE REGEX "rngparser\.c$") - -# Generate xmlexports with fixed definition of LIBXML_STATIC -file(READ include/libxml/xmlexports.h XMLEXPORTS_H) -if(BUILD_SHARED_LIBS) - string(REPLACE "!defined(LIBXML_STATIC)" "1" XMLEXPORTS_H "${XMLEXPORTS_H}") -else() - string(REPLACE "!defined(LIBXML_STATIC)" "0" XMLEXPORTS_H "${XMLEXPORTS_H}") -endif() -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/xmlexports.h "${XMLEXPORTS_H}") - -if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - configure_file(include/win32config.h config.h COPYONLY) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") - configure_file("${PORT_DIR}/config.osx.h" config.h COPYONLY) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - configure_file("${PORT_DIR}/config.linux.h" config.h COPYONLY) -else() - message(FATAL_ERROR "No config.h checked in for the target platform. Please run ./configure for libxml2 and add the resulting config.h into this port.") -endif() - -message(STATUS "Reading version info from configure.ac") - -file(STRINGS "configure.ac" - _libxml_version_defines REGEX "LIBXML_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") - -foreach(ver ${_libxml_version_defines}) - if(ver MATCHES "LIBXML_(MAJOR|MINOR|MICRO)_VERSION=([0-9]+)$") - set(LIBXML_${CMAKE_MATCH_1}_VERSION "${CMAKE_MATCH_2}" CACHE INTERNAL "") - endif() -endforeach() - -set(VERSION ${LIBXML_MAJOR_VERSION}.${LIBXML_MINOR_VERSION}.${LIBXML_MICRO_VERSION}) -math(EXPR LIBXML_VERSION_NUMBER - "${LIBXML_MAJOR_VERSION} * 10000 + ${LIBXML_MINOR_VERSION} * 100 + ${LIBXML_MICRO_VERSION}") - -message(STATUS "LIBXML_MAJOR_VERSION: ${LIBXML_MAJOR_VERSION}") -message(STATUS "LIBXML_MINOR_VERSION: ${LIBXML_MINOR_VERSION}") -message(STATUS "LIBXML_MICRO_VERSION: ${LIBXML_MICRO_VERSION}") -message(STATUS "VERSION: ${VERSION}") -message(STATUS "LIBXML_VERSION_NUMBER: ${LIBXML_VERSION_NUMBER}") - -if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(WITH_CATALOG 0) - set(WITH_MODULES 0) -endif() - -message(STATUS "Generating xmlversion.h") - -configure_file(include/libxml/xmlversion.h.in include/libxml/xmlversion.h) - -add_library(libxml2 ${SOURCES}) -if(INSTALL_HEADERS) - file(GLOB PUBLIC_HEADERS include/libxml/*.h ${CMAKE_CURRENT_BINARY_DIR}/include/libxml/xmlversion.h) - list(FILTER PUBLIC_HEADERS EXCLUDE REGEX "xmlexports\\.h$") - list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/xmlexports.h) - - set_target_properties(libxml2 PROPERTIES PUBLIC_HEADER "${PUBLIC_HEADERS}") -endif() -target_include_directories(libxml2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include include ${LIBLZMA_INCLUDE_DIRS}) -get_property(LIBRARIES TARGET Iconv::Iconv PROPERTY INTERFACE_LINK_LIBRARIES) -if(LIBRARIES) - set_property(TARGET Iconv::Iconv PROPERTY INTERFACE_LINK_LIBRARIES "") - foreach(LIBRARY ${LIBRARIES}) - # Since `libc.so` has no SONAME, CMake maps e.g. `/usr/lib/x86_64-linux-gnu/libc.so` to `-llibc`. - # This is not found: it should be mapped to `-lc`. - if(LIBRARY MATCHES "/libc\\.so$") - set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES "c") - else() - set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${LIBRARY}") - endif() - endforeach() -endif() -target_link_libraries(libxml2 PRIVATE - Iconv::Iconv - ZLIB::ZLIB - ${LIBLZMA_LIBRARIES} -) -if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - target_include_directories(libxml2 PRIVATE win32/vc10) - target_link_libraries(libxml2 PRIVATE - wsock32.lib - ws2_32.lib - ) - target_compile_definitions(libxml2 PRIVATE - -DHAVE_WIN32_THREADS - _WINSOCK_DEPRECATED_NO_WARNINGS - ) - target_sources(libxml2 PRIVATE win32/libxml2.rc) - configure_file("${PORT_DIR}/rcVersion.h.in" include/rcVersion.h @ONLY) -endif() - -target_compile_definitions(libxml2 PRIVATE - -D_CRT_SECURE_NO_DEPRECATE - -D_CRT_NONSTDC_NO_DEPRECATE - -D_REENTRANT - -DNOLIBTOOL - -DHAVE_ZLIB_H - -DHAVE_LZMA_H -) -if(NOT BUILD_SHARED_LIBS) - target_compile_definitions(libxml2 PRIVATE -DLIBXML_STATIC) -endif() - -set(TARGET_INSTALL_OPTIONS) -if(INSTALL_HEADERS) - set(TARGET_INSTALL_OPTIONS PUBLIC_HEADER DESTINATION include/libxml) -endif() - -install(TARGETS libxml2 - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - ${TARGET_INSTALL_OPTIONS} -) - -# pkgconfig -if(NOT Iconv_IS_BUILT_IN) - set(ICONV_LIBS "-liconv") -endif() -if(UNIX) - set(M_LIBS "-lm") - set(THREAD_LIBS "-pthread") -endif() -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix "\${prefix}") -set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) -set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) -set(XML_INCLUDEDIR "-I\"\${includedir}\"") - -configure_file(libxml-2.0.pc.in libxml-2.0.pc @ONLY) -install(FILES ${CMAKE_BINARY_DIR}/libxml-2.0.pc DESTINATION lib/pkgconfig) diff --git a/ports/libxml2/config.linux.h b/ports/libxml2/config.linux.h deleted file mode 100644 index d029e95cfa5d11..00000000000000 --- a/ports/libxml2/config.linux.h +++ /dev/null @@ -1,56 +0,0 @@ -#define GETHOSTBYNAME_ARG_CAST /**/ -#define HAVE_ANSIDECL_H 1 -#define HAVE_ARPA_INET_H 1 -#define HAVE_ARPA_NAMESER_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_DIRENT_H 1 -#define HAVE_DLFCN_H 1 -#define HAVE_DLOPEN /**/ -#define HAVE_ERRNO_H 1 -#define HAVE_FCNTL_H 1 -#define HAVE_FLOAT_H 1 -#define HAVE_FTIME 1 -#define HAVE_GETADDRINFO /**/ -#define HAVE_GETTIMEOFDAY 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_ISASCII 1 -#define HAVE_LIMITS_H 1 -#define HAVE_LOCALTIME 1 -#define HAVE_LZMA_H 1 -#define HAVE_MALLOC_H 1 -#define HAVE_MATH_H 1 -#define HAVE_MMAP 1 -#define HAVE_NETDB_H 1 -#define HAVE_NETINET_IN_H 1 -#define HAVE_POLL_H 1 -#define HAVE_PTHREAD_H /**/ -#define HAVE_PUTENV 1 -#define HAVE_RAND 1 -#define HAVE_RAND_R 1 -#define HAVE_RESOLV_H 1 -#define HAVE_SIGNAL_H 1 -#define HAVE_SRAND 1 -#define HAVE_STAT 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRFTIME 1 -#define HAVE_STRINGS_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYS_MMAN_H 1 -#define HAVE_SYS_SELECT_H 1 -#define HAVE_SYS_SOCKET_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TIMEB_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_TIME 1 -#define HAVE_TIME_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_VA_COPY 1 -#define HAVE_ZLIB_H 1 -#define ICONV_CONST -#define SEND_ARG2_CAST /**/ -#define SUPPORT_IP6 /**/ -#define VA_LIST_IS_ARRAY 1 -#define XML_SOCKLEN_T socklen_t diff --git a/ports/libxml2/config.osx.h b/ports/libxml2/config.osx.h deleted file mode 100644 index 95d83edc1fd232..00000000000000 --- a/ports/libxml2/config.osx.h +++ /dev/null @@ -1,54 +0,0 @@ -#define GETHOSTBYNAME_ARG_CAST /**/ -#define HAVE_ARPA_INET_H 1 -#define HAVE_ARPA_NAMESER_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_DIRENT_H 1 -#define HAVE_DLFCN_H 1 -#define HAVE_DLOPEN /**/ -#define HAVE_ERRNO_H 1 -#define HAVE_FCNTL_H 1 -#define HAVE_FLOAT_H 1 -#define HAVE_FTIME 1 -#define HAVE_GETADDRINFO /**/ -#define HAVE_GETTIMEOFDAY 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_ISASCII 1 -#define HAVE_LIMITS_H 1 -#define HAVE_LOCALTIME 1 -#define HAVE_LZMA_H 1 -#define HAVE_MATH_H 1 -#define HAVE_MMAP 1 -#define HAVE_NETDB_H 1 -#define HAVE_NETINET_IN_H 1 -#define HAVE_POLL_H 1 -#define HAVE_PTHREAD_H /**/ -#define HAVE_PUTENV 1 -#define HAVE_RAND 1 -#define HAVE_RAND_R 1 -#define HAVE_RESOLV_H 1 -#define HAVE_SIGNAL_H 1 -#define HAVE_SRAND 1 -#define HAVE_STAT 1 -#define HAVE_STDARG_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRFTIME 1 -#define HAVE_STRINGS_H 1 -#define HAVE_STRING_H 1 -#define HAVE_SYS_MMAN_H 1 -#define HAVE_SYS_SELECT_H 1 -#define HAVE_SYS_SOCKET_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TIMEB_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_TIME 1 -#define HAVE_TIME_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_VA_COPY 1 -#define HAVE_ZLIB_H 1 -#define ICONV_CONST -#define SEND_ARG2_CAST /**/ -#define SUPPORT_IP6 /**/ -#define VA_LIST_IS_ARRAY 1 -#define XML_SOCKLEN_T socklen_t diff --git a/ports/libxml2/fix_cmakelist.patch b/ports/libxml2/fix_cmakelist.patch new file mode 100644 index 00000000000000..b98ca86eca16e2 --- /dev/null +++ b/ports/libxml2/fix_cmakelist.patch @@ -0,0 +1,119 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a437717ba..0a11039d1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.15) + +-project(libxml2 VERSION 2.9.10 LANGUAGES C) ++project(libxml2 VERSION 2.9.12 LANGUAGES C) + + include(CheckCSourceCompiles) + include(CheckFunctionExists) +@@ -465,15 +465,15 @@ endif() + if(LIBXML2_WITH_ICU) + target_link_libraries(LibXml2 PRIVATE ICU::data ICU::i18n ICU::uc) + if(WIN32) +- set(ICU_LIBS "-licudt -licuin -licuuc") ++ set(ICU_LIBS "icu-i18n") + else() +- set(ICU_LIBS "-licudata -licui18n -licuuc") ++ set(ICU_LIBS "icu-i18n") + endif() + endif() + + if(LIBXML2_WITH_LZMA) + target_link_libraries(LibXml2 PRIVATE LibLZMA::LibLZMA) +- set(LZMA_LIBS "-llzma") ++ set(LZMA_LIBS "liblzma") + endif() + + if(LIBXML2_WITH_THREADS) +@@ -483,7 +483,7 @@ endif() + + if(LIBXML2_WITH_ZLIB) + target_link_libraries(LibXml2 PRIVATE ZLIB::ZLIB) +- set(Z_LIBS "-lz") ++ set(Z_LIBS "zlib") + endif() + + set_target_properties( +@@ -495,24 +495,9 @@ set_target_properties( + PREFIX lib + VERSION ${PROJECT_VERSION} + ) +- ++set(XML_LIB_NAME xml2) + if(MSVC) +- if(BUILD_SHARED_LIBS) +- set_target_properties( +- LibXml2 +- PROPERTIES +- DEBUG_POSTFIX d +- ) +- else() +- set_target_properties( +- LibXml2 +- PROPERTIES +- DEBUG_POSTFIX sd +- MINSIZEREL_POSTFIX s +- RELEASE_POSTFIX s +- RELWITHDEBINFO_POSTFIX s +- ) +- endif() ++ set(XML_LIB_NAME libxml2) + endif() + + install(FILES ${LIBXML2_HDRS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libxml2/libxml COMPONENT development) +@@ -659,30 +644,30 @@ install(DIRECTORY doc/ DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/libxml2 COMPONEN + + configure_package_config_file( + libxml2-config.cmake.cmake.in libxml2-config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + ) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + COMPONENT development + ) + + write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake + VERSION ${PROJECT_VERSION} +- COMPATIBILITY ExactVersion ++ COMPATIBILITY SameMinorVersion + ) + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + COMPONENT development + ) + + install( + EXPORT LibXml2 +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2-${PROJECT_VERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libxml2 + NAMESPACE LibXml2:: + FILE libxml2-export.cmake + COMPONENT development +diff --git a/libxml-2.0.pc.in b/libxml-2.0.pc.in +index 2653a7c56..d1bff5bcc 100644 +--- a/libxml-2.0.pc.in ++++ b/libxml-2.0.pc.in +@@ -7,7 +7,8 @@ modules=@WITH_MODULES@ + Name: libXML + Version: @VERSION@ + Description: libXML library version2. +-Requires: +-Libs: -L${libdir} -lxml2 +-Libs.private: @ICU_LIBS@ @THREAD_LIBS@ @Z_LIBS@ @LZMA_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ ++Requires: ++Requires.private: @ICU_LIBS@ @Z_LIBS@ @LZMA_LIBS@ ++Libs: -L${libdir} -l@XML_LIB_NAME@ ++Libs.private: @THREAD_LIBS@ @ICONV_LIBS@ @M_LIBS@ @WIN32_EXTRA_LIBADD@ @LIBS@ + Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index fdd4ac0e912f4b..a176d6871d6c68 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -1,13 +1,14 @@ -vcpkg_from_github( +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.gnome.org/ OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxml2 - REF v2.9.10 - SHA512 de8d7c6c90f9d0441747deec320c4887faee1fd8aff9289115caf7ce51ab73b6e2c4628ae7eaad4a33a64561d23a92fd5e8a5afa7fa74183bdcd9a7b06bc67f1 + REF b48e77cf4f6fa0792c5f4b639707a2b0675e461b + SHA512 2d20867961b8d8a0cb0411192146882b976c1276d2e8ecd9a7ee3f1eb287f64e59282736f58c641b66abf63ba45c9421f27e13ec09a0b10814cd56987b18cb5b HEAD_REF master + PATCHES + fix_cmakelist.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - if (VCPKG_TARGET_IS_UWP) message(WARNING "Feature network couldn't be enabled on UWP, disable http and ftp automatically.") set(ENABLE_NETWORK 0) @@ -15,36 +16,79 @@ else() set(ENABLE_NETWORK 1) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "tools" LIBXML2_WITH_PROGRAMS +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DPORT_DIR=${CMAKE_CURRENT_LIST_DIR} - -DWITH_HTTP=${ENABLE_NETWORK} - -DWITH_FTP=${ENABLE_NETWORK} - OPTIONS_DEBUG - -DINSTALL_HEADERS=OFF + ${FEATURE_OPTIONS} + -DLIBXML2_WITH_TESTS=OFF + -DLIBXML2_WITH_HTTP=${ENABLE_NETWORK} + -DLIBXML2_WITH_FTP=${ENABLE_NETWORK} + -DLIBXML2_WITH_HTML=ON + -DLIBXML2_WITH_C14N=ON + -DLIBXML2_WITH_CATALOG=ON + -DLIBXML2_WITH_DEBUG=ON + -DLIBXML2_WITH_DOCB=ON + -DLIBXML2_WITH_ICONV=ON + -DLIBXML2_WITH_ISO8859X=ON + -DLIBXML2_WITH_ZLIB=ON + -DLIBXML2_WITH_ICU=OFF # Culprit of linkage issues? Solving this is probably another PR + -DLIBXML2_WITH_LZMA=ON + -DLIBXML2_WITH_LEGACY=ON + -DLIBXML2_WITH_MEM_DEBUG=OFF + -DLIBXML2_WITH_MODULES=ON + -DLIBXML2_WITH_OUTPUT=ON + -DLIBXML2_WITH_PATTERN=ON + -DLIBXML2_WITH_PUSH=ON + -DLIBXML2_WITH_PYTHON=OFF + -DLIBXML2_WITH_READER=ON + -DLIBXML2_WITH_REGEXPS=ON + -DLIBXML2_WITH_RUN_DEBUG=OFF + -DLIBXML2_WITH_SAX1=ON + -DLIBXML2_WITH_SCHEMAS=ON + -DLIBXML2_WITH_SCHEMATRON=ON + -DLIBXML2_WITH_THREADS=ON + -DLIBXML2_WITH_THREAD_ALLOC=OFF + -DLIBXML2_WITH_TREE=ON + -DLIBXML2_WITH_VALID=ON + -DLIBXML2_WITH_WRITER=ON + -DLIBXML2_WITH_XINCLUDE=ON + -DLIBXML2_WITH_XPATH=ON + -DLIBXML2_WITH_XPTR=ON ) vcpkg_install_cmake() -if(VCPKG_TARGET_IS_WINDOWS) - if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libxml-2.0.pc" "-lxml2" "-llibxml2") - endif() - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxml-2.0.pc" "-lxml2" "-llibxml2") -endif () -if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libxml-2.0.pc" "\nRequires:\n" "\nRequires.private: liblzma zlib\n") -endif() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxml-2.0.pc" "\nRequires:\n" "\nRequires.private: liblzma zlib\n") +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libxml2) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES xmllint xmlcatalog AUTO_CLEAN) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(_file "${CURRENT_PACKAGES_DIR}/include/libxml2/libxml/xmlexports.h") + file(READ "${_file}" _contents) + string(REPLACE "#ifdef LIBXML_STATIC" "#undef LIBXML_STATIC\n#define LIBXML_STATIC\n#ifdef LIBXML_STATIC" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CURRENT_PACKAGES_DIR}/include/libxml2/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # TODO: Fix usage in all dependent ports hardcoding the wrong include path. + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +#Cleanup +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xml2Conf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xml2Conf.sh") \ No newline at end of file diff --git a/ports/libxml2/rcVersion.h.in b/ports/libxml2/rcVersion.h.in deleted file mode 100644 index 0ef94b97e06713..00000000000000 --- a/ports/libxml2/rcVersion.h.in +++ /dev/null @@ -1,4 +0,0 @@ -#define LIBXML_MAJOR_VERSION @LIBXML_MAJOR_VERSION@ -#define LIBXML_MINOR_VERSION @LIBXML_MINOR_VERSION@ -#define LIBXML_MICRO_VERSION @LIBXML_MICRO_VERSION@ -#define LIBXML_DOTTED_VERSION "@VERSION@" diff --git a/ports/libxml2/usage b/ports/libxml2/usage index fd94c4b4e442da..c77cdbce5dd551 100644 --- a/ports/libxml2/usage +++ b/ports/libxml2/usage @@ -1,5 +1,4 @@ The package libxml2 is compatible with built-in CMake targets: - find_package(LibXml2 REQUIRED) - target_include_directories(main PRIVATE ${LIBXML2_INCLUDE_DIR}) - target_link_libraries(main PRIVATE ${LIBXML2_LIBRARIES}) + find_package(LibXml2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE LibXml2::LibXml2) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 31bab78f790b65..0e3ad69e6d75d4 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -1,27 +1,52 @@ _find_package(${ARGS}) if(LibXml2_FOUND) + list(APPEND LIBXML2_INCLUDE_DIRS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + list(APPEND LIBXML2_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") # This is wrong but downstream doesn't correctly use _DIR vs _DIRS variables + if(TARGET LibXml2::LibXml2) + target_include_directories(LibXml2::LibXml2 INTERFACE "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + endif() +endif() +if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0}_CONFIG) find_package(LibLZMA) find_package(ZLIB) include(SelectLibraryConfigurations) + find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) + find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib) find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib) + unset(LIBXML2_LIBRARIES) + unset(LIBXML2_LIBRARY CACHE) + select_library_configurations(LIBXML2) select_library_configurations(ICONV) select_library_configurations(CHARSET) list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) - if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB") + if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_RELEASE) + set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBXML2_LIBRARY_RELEASE}") + endif() + if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_DEBUG) + set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_DEBUG "${LIBXML2_LIBRARY_DEBUG}") endif() + cmake_policy(PUSH) + cmake_policy(SET CMP0079 NEW) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE "m") + endif() + elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + list(APPEND LIBXML2_LIBRARIES ws2_32) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE "ws2_32") + endif() endif() if(ICONV_LIBRARIES) list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES}) if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES} ) + target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES}) endif() endif() if(CHARSET_LIBRARIES) @@ -30,7 +55,8 @@ if(LibXml2_FOUND) target_link_libraries(LibXml2::LibXml2 INTERFACE ${CHARSET_LIBRARIES}) endif() endif() - if(CMAKE_SYSTEM_NAME STREQUAL "Windows") - list(APPEND LIBXML2_LIBRARIES ws2_32) + if(TARGET LibXml2::LibXml2) + target_link_libraries(LibXml2::LibXml2 INTERFACE ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) endif() + cmake_policy(POP) endif() diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index fbcd7b114e5841..b19b12779db9f7 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,12 +1,17 @@ { "name": "libxml2", - "version-semver": "2.9.10", - "port-version": 8, + "version-semver": "2.9.12", "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", + "supports": "!uwp", "dependencies": [ "libiconv", "liblzma", "zlib" - ] + ], + "features": { + "tools": { + "description": "Build tools" + } + } } diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL deleted file mode 100644 index 8a5cc43d4c2ef2..00000000000000 --- a/ports/libxslt/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libxslt -Version: 1.1.34 -Homepage: https://github.com/GNOME/libxslt -Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT -Build-Depends: libxml2, liblzma -Supports: !uwp diff --git a/ports/libxslt/only_build_one_lib_type.patch b/ports/libxslt/only_build_one_lib_type.patch new file mode 100644 index 00000000000000..ae1ef8a421b289 --- /dev/null +++ b/ports/libxslt/only_build_one_lib_type.patch @@ -0,0 +1,56 @@ +diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc +index f803a747c..f43a54f51 100644 +--- a/win32/Makefile.msvc ++++ b/win32/Makefile.msvc +@@ -163,7 +163,11 @@ _VC_MANIFEST_EMBED_EXE= + _VC_MANIFEST_EMBED_DLL= + !endif + +-all : libxslt libxslta libexslt libexslta utils ++!if "$(STATIC)" == "1" ++all : libxslta libexslta utils ++!else ++all : libxslt libexslt utils ++!endif + + libxslt : $(BINDIR)\$(XSLT_SO) + +@@ -196,12 +200,15 @@ install-libs : all + if not exist $(LIBPREFIX) mkdir $(LIBPREFIX) + copy $(XSLT_SRCDIR)\*.h $(INCPREFIX)\$(XSLT_BASENAME) + copy $(EXSLT_SRCDIR)\*.h $(INCPREFIX)\$(EXSLT_BASENAME) ++!if "$(STATIC)" != "1" + copy $(BINDIR)\$(XSLT_SO) $(SOPREFIX) +- copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX) + copy $(BINDIR)\$(XSLT_IMP) $(LIBPREFIX) + copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX) +- copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) + copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX) ++!else ++ copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX) ++ copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX) ++!endif + + install : install-libs + copy $(BINDIR)\*.exe $(BINPREFIX) +@@ -313,7 +320,6 @@ $(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) $(EXSLT_INTDIR)\$(EXSLT_DEF) lib + $(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta + $(AR) $(ARFLAGS) /OUT:$(BINDIR)\$(EXSLT_A) $(EXSLT_OBJS_A) + +- + # Creates the utils intermediate directory. + $(UTILS_INTDIR) : + if not exist $(UTILS_INTDIR) mkdir $(UTILS_INTDIR) +@@ -336,7 +342,11 @@ APPLIBS = $(LIBS) libxml2.lib + !endif + + # Builds xsltproc and friends. Uses the implicit rule for commands. +-$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libxslta libexslt libexslta ++!if "$(STATIC)" == "1" ++$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslta libexslta ++!else ++$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libexslt ++!endif + + # plugins only work with non-static builds currently. + !if "$(STATIC)" == "0" diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index b8ee03d6bff979..2c72cf8d025b6a 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_from_github( 0001-Fix-makefile.patch 0002-Fix-lzma.patch 0003-Fix-configure.patch + only_build_one_lib_type.patch ) if (VCPKG_TARGET_IS_WINDOWS) @@ -26,14 +27,23 @@ if (VCPKG_TARGET_IS_WINDOWS) endif() set(CONFIGURE_COMMAND_TEMPLATE cruntime=@CRUNTIME@ + static=@BUILDSTATIC@ debug=@DEBUGMODE@ prefix=@INSTALL_DIR@ include=@INCLUDE_DIR@ lib=@LIB_DIR@ bindir=$(PREFIX)\\bin sodir=$(PREFIX)\\bin + zlib=yes + lzma=yes ) - # Debug params + # Common + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILDSTATIC yes) + else() + set(BUILDSTATIC no) + endif() + # Release params if(VCPKG_CRT_LINKAGE STREQUAL dynamic) set(CRUNTIME /MD) else() @@ -47,7 +57,7 @@ if (VCPKG_TARGET_IS_WINDOWS) file(TO_NATIVE_PATH "${INCLUDE_DIR}" INCLUDE_DIR) file(TO_NATIVE_PATH "${INSTALL_DIR}" INSTALL_DIR) string(CONFIGURE "${CONFIGURE_COMMAND_TEMPLATE}" CONFIGURE_COMMAND_REL) - # Release params + # Debug params if(VCPKG_CRT_LINKAGE STREQUAL dynamic) set(CRUNTIME /MDd) else() diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json new file mode 100644 index 00000000000000..74f77de2ab6799 --- /dev/null +++ b/ports/libxslt/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libxslt", + "version": "1.1.34", + "port-version": 1, + "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", + "homepage": "https://github.com/GNOME/libxslt", + "supports": "!uwp", + "dependencies": [ + "liblzma", + "libxml2" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 9c13bff86d7bf5..8a7bb218d20883 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3721,8 +3721,8 @@ "port-version": 0 }, "libxml2": { - "baseline": "2.9.10", - "port-version": 8 + "baseline": "2.9.12", + "port-version": 0 }, "libxmlmm": { "baseline": "0.6.0", @@ -3738,7 +3738,7 @@ }, "libxslt": { "baseline": "1.1.34", - "port-version": 0 + "port-version": 1 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 6fe34d800a2f9e..3b5409d25f684f 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6fe9f85f9c0a1f9349de95425b786cf6462314c", + "version-semver": "2.9.12", + "port-version": 0 + }, { "git-tree": "b0cf9aec6fb5cd87ae6358e9015e92e9d113c1f1", "version-semver": "2.9.10", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 9506ef25df7022..64c6ee78caf1e7 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5021817ac7038fcfc53721d55a17fbab42ceb59", + "version": "1.1.34", + "port-version": 1 + }, { "git-tree": "1893a874d7cc6d1bfd903ae9a341f9d1e6419b78", "version-string": "1.1.34", From f3e0d2b16a325d22a493565e7c9a7a8cfbea4267 Mon Sep 17 00:00:00 2001 From: aggieNick02 Date: Fri, 16 Jul 2021 02:14:27 -0500 Subject: [PATCH 0118/1858] [presentmon] Update presentmon port from 1.6.0 release to 1.7.0 (#18234) * update presentmon to 1.7.0 release * Commit running of x-add-version for presentmon port update * fixes for presentmon port * rerun x-add-version --- ports/presentmon/CMakeLists.txt | 6 ++---- ports/presentmon/portfile.cmake | 9 ++++----- ports/presentmon/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/presentmon.json | 5 +++++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ports/presentmon/CMakeLists.txt b/ports/presentmon/CMakeLists.txt index d1ff455fce49ad..1c8bd8620c9228 100644 --- a/ports/presentmon/CMakeLists.txt +++ b/ports/presentmon/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.11) project(presentmon) -set(PRESENTMON_VERSION 1.6.0) - option(INSTALL_HEADERS "Install presentmon headers" ON) option(BUILD_TOOLS "Build tool PresentMon" OFF) @@ -26,7 +24,7 @@ set(PRESENTDATA_HDRS file(GLOB EXTRA_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/PresentData/ETW/*.h) -file(WRITE ${CMAKE_BINARY_DIR}/generated/version.h "char const* PRESENT_MON_VERSION = \"1.6.0\";") +file(WRITE ${CMAKE_BINARY_DIR}/generated/version.h "char const* PRESENT_MON_VERSION = \"1.7.0\";") add_library(PresentData STATIC ${PRESENTDATA_SRCS} ${PRESENTDATA_HDRS} ${EXTRA_INCLUDES}) @@ -70,4 +68,4 @@ endif() if (INSTALL_HEADERS) install(FILES ${PRESENTDATA_HDRS} DESTINATION include/presentmon) install(FILES ${EXTRA_INCLUDES} DESTINATION include/presentmon/ETW) -endif() \ No newline at end of file +endif() diff --git a/ports/presentmon/portfile.cmake b/ports/presentmon/portfile.cmake index dd55cad5c3e905..b6a00824bde1fd 100644 --- a/ports/presentmon/portfile.cmake +++ b/ports/presentmon/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_fail_port_install(ON_TARGET "linux" "osx" "uwp" "ios" "android" "freebsd") -set(PRESENTMON_VERSION 1.6.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GameTechDev/PresentMon - REF 6ddc9e15d2ef169cdce954b589c1ba190b3a25bd # 1.6.0 - SHA512 2522b0e3218d4a6588531a09bc82631f14ad05c20f4560fe0574f00f2f5eece114ae04320f920eb52ba64173cea5cdf15bb223b7395c3782e4a6465afb5d9bec + REF 47669ad0efaddc9787772d5e4900734417b2c07c # 1.7.0 + SHA512 fac2e2ca4d8476e2cdde7c3f77cf1881b7d7a9208387f12dbf07f3ea7f4012ce79602f4fedbf1e778871fd9ce898b101659a6f192de29dc6a4404213aee444be HEAD_REF main ) @@ -16,7 +15,7 @@ file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - tools BUILD_TOOLS + tools BUILD_TOOLS ) vcpkg_configure_cmake( @@ -33,4 +32,4 @@ if("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES presentmon AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/presentmon/vcpkg.json b/ports/presentmon/vcpkg.json index 427249ea06c2fd..b4e05670cba237 100644 --- a/ports/presentmon/vcpkg.json +++ b/ports/presentmon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "presentmon", - "version-string": "1.6.0", + "version-semver": "1.7.0", "description": "PresentMon is a tool to capture and analyze ETW events related to swap chain presentation on Windows.", "supports": "windows & !uwp", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 8a7bb218d20883..2a19c0fc7deef9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4985,7 +4985,7 @@ "port-version": 0 }, "presentmon": { - "baseline": "1.6.0", + "baseline": "1.7.0", "port-version": 0 }, "proj": { diff --git a/versions/p-/presentmon.json b/versions/p-/presentmon.json index 185037fbd0dc03..5c83b268f77025 100644 --- a/versions/p-/presentmon.json +++ b/versions/p-/presentmon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d57616105f23dbcceb4477bb30354e0d3e4a5b6", + "version-semver": "1.7.0", + "port-version": 0 + }, { "git-tree": "581eeeb1e8761811f3393a6cd0e4041609b162d0", "version-string": "1.6.0", From 249a63a2f2a4d72d66e80be3149b444a24e48f31 Mon Sep 17 00:00:00 2001 From: Carsten Rudolph <18394207+crud89@users.noreply.github.com> Date: Fri, 16 Jul 2021 09:15:17 +0200 Subject: [PATCH 0119/1858] [d3d12-memory-allocator] new port (#18212) * Added d3d12 memory allocator port. * Fixed leftover name from vulkan memory allocator. * Remove single header patch. * Don't apply patch. * Properly set interface sources. * Bump version and update manifest format. * Build static library instead of using an interface target. * Properly export and fixup config. * Update baseline. * Remove `PREFER_NINJA`. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update version. * Use `version-date` instead of `version`. * Update baseline. * Remove leftover version. Co-authored-by: Robert Schumacher Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher Co-authored-by: Billy Robert O'Neal III --- ports/d3d12-memory-allocator/CMakeLists.txt | 21 ++++++++++++++++++++ ports/d3d12-memory-allocator/portfile.cmake | 22 +++++++++++++++++++++ ports/d3d12-memory-allocator/vcpkg.json | 19 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/d-/d3d12-memory-allocator.json | 9 +++++++++ 5 files changed, 75 insertions(+) create mode 100644 ports/d3d12-memory-allocator/CMakeLists.txt create mode 100644 ports/d3d12-memory-allocator/portfile.cmake create mode 100644 ports/d3d12-memory-allocator/vcpkg.json create mode 100644 versions/d-/d3d12-memory-allocator.json diff --git a/ports/d3d12-memory-allocator/CMakeLists.txt b/ports/d3d12-memory-allocator/CMakeLists.txt new file mode 100644 index 00000000000000..884610b06184cc --- /dev/null +++ b/ports/d3d12-memory-allocator/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required(VERSION 3.0) +project(d3d12-memory-allocator) + +add_library(${PROJECT_NAME} STATIC + "src/D3D12MemAlloc.h" + "src/D3D12MemAlloc.cpp" +) + +set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "src/D3D12MemAlloc.h") +#target_include_directories(${PROJECT_NAME} PRIVATE "src/") + +install( + TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-config + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION include/ +) +install( + EXPORT ${PROJECT_NAME}-config DESTINATION cmake/ + NAMESPACE "unofficial::" +) \ No newline at end of file diff --git a/ports/d3d12-memory-allocator/portfile.cmake b/ports/d3d12-memory-allocator/portfile.cmake new file mode 100644 index 00000000000000..89a4093bb4e6df --- /dev/null +++ b/ports/d3d12-memory-allocator/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator + REF 10f148cef0dfd34ae1a9373b9396beb1581c992a + SHA512 c99934a606ce5a5c9c59e05faf2e659bfad2e485b58aaf00f38219a6c89f17b62033f4a69935915f0d5269a4f0ecba41037b044913ae6f4077fa981eaab470c8 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake/) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/d3d12-memory-allocator/vcpkg.json b/ports/d3d12-memory-allocator/vcpkg.json new file mode 100644 index 00000000000000..b31b48509a0dab --- /dev/null +++ b/ports/d3d12-memory-allocator/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "d3d12-memory-allocator", + "version-date": "2021-05-05", + "description": "Easy to integrate D3d12 memory allocation library from GPUOpen", + "homepage": "https://gpuopen.com/gaming-product/d3d12-memory-allocator/", + "license": "MIT", + "supports": "windows", + "dependencies": [ + "directx-headers", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2a19c0fc7deef9..a25491dbf6a07c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1592,6 +1592,10 @@ "baseline": "4.2.1", "port-version": 0 }, + "d3d12-memory-allocator": { + "baseline": "2021-05-05", + "port-version": 0 + }, "d3dx12": { "baseline": "may2021", "port-version": 0 diff --git a/versions/d-/d3d12-memory-allocator.json b/versions/d-/d3d12-memory-allocator.json new file mode 100644 index 00000000000000..0be166fc9ddeb8 --- /dev/null +++ b/versions/d-/d3d12-memory-allocator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "988836f8b901c1a30f4b667ac37f81f1ef3bcdd8", + "version-date": "2021-05-05", + "port-version": 0 + } + ] +} From 7a4a9c686c43aa84e3809caee6801a4529149383 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 16 Jul 2021 08:16:41 +0100 Subject: [PATCH 0120/1858] [ffmpeg] enable opengl feature on osx (#18624) * [ffmpeg] enable opengl feature on osx * [ffmpeg] x-add-version * [ffmpeg] remove opengl osx check in portfile * [ffmpeg] x-add-version * Update ports/ffmpeg/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [ffmpeg] x-add-version * [ffmpeg] bump port version * [ffmpeg] x-add-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 18 +++++++++--------- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 1b677396eef14d..541f1da0c84db7 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -66,8 +66,8 @@ if("opencl" IN_LIST FEATURES) endif() if("opengl" IN_LIST FEATURES) - if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX) - message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'") + if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm)") endif() endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index efdb888bf1d341..958d56964926c0 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 8, + "port-version": 9, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -122,33 +122,33 @@ "name": "ffmpeg", "default-features": false, "features": [ - "dav1d" + "opengl" ], - "platform": "!(uwp | arm | x86 | osx)" + "platform": "!uwp & !(windows & arm)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "modplug" + "dav1d" ], - "platform": "!(windows & static) & !uwp" + "platform": "!(uwp | arm | x86 | osx)" }, { "name": "ffmpeg", "default-features": false, "features": [ - "tensorflow" + "modplug" ], - "platform": "!(x86 | arm | uwp) & !static" + "platform": "!(windows & static) & !uwp" }, { "name": "ffmpeg", "default-features": false, "features": [ - "opengl" + "tensorflow" ], - "platform": "!uwp & !(windows & arm) & !osx" + "platform": "!(x86 | arm | uwp) & !static" }, { "name": "ffmpeg", diff --git a/versions/baseline.json b/versions/baseline.json index a25491dbf6a07c..a58944d606f13c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1990,7 +1990,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 8 + "port-version": 9 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 04750b6afad5ca..0c863b404447c4 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4", + "version": "4.4", + "port-version": 9 + }, { "git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b", "version": "4.4", From 3cc80f209c0d7e2541ab76a79b0999c34dedf6dd Mon Sep 17 00:00:00 2001 From: Charles Ellis Date: Fri, 16 Jul 2021 00:17:19 -0700 Subject: [PATCH 0121/1858] CMake command docs say to use 0 for missing SHA512 (#18611) --- docs/maintainers/vcpkg_from_bitbucket.md | 2 +- docs/maintainers/vcpkg_from_github.md | 2 +- docs/maintainers/vcpkg_from_gitlab.md | 2 +- docs/maintainers/vcpkg_from_sourceforge.md | 2 ++ scripts/cmake/vcpkg_from_bitbucket.cmake | 2 +- scripts/cmake/vcpkg_from_github.cmake | 2 +- scripts/cmake/vcpkg_from_gitlab.cmake | 2 +- scripts/cmake/vcpkg_from_sourceforge.cmake | 2 ++ 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/maintainers/vcpkg_from_bitbucket.md b/docs/maintainers/vcpkg_from_bitbucket.md index c37e9e74b3254c..944d7769c9bfe3 100644 --- a/docs/maintainers/vcpkg_from_bitbucket.md +++ b/docs/maintainers/vcpkg_from_bitbucket.md @@ -35,7 +35,7 @@ If `REF` is specified, `SHA512` must also be specified. ### SHA512 The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz). -This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. ### HEAD_REF The unstable git commit-ish (ideally a branch) to pull for `--head` builds. diff --git a/docs/maintainers/vcpkg_from_github.md b/docs/maintainers/vcpkg_from_github.md index 27d03008ff4473..52ef5cbd99dd37 100644 --- a/docs/maintainers/vcpkg_from_github.md +++ b/docs/maintainers/vcpkg_from_github.md @@ -38,7 +38,7 @@ If `REF` is specified, `SHA512` must also be specified. ### SHA512 The SHA512 hash that should match the archive (https://github.com/${REPO}/archive/${REF}.tar.gz). -This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. ### HEAD_REF The unstable git commit-ish (ideally a branch) to pull for `--head` builds. diff --git a/docs/maintainers/vcpkg_from_gitlab.md b/docs/maintainers/vcpkg_from_gitlab.md index 082261effe0060..b49453da40d5ed 100644 --- a/docs/maintainers/vcpkg_from_gitlab.md +++ b/docs/maintainers/vcpkg_from_gitlab.md @@ -42,7 +42,7 @@ If `REF` is specified, `SHA512` must also be specified. The SHA512 hash that should match the archive (${GITLAB_URL}/${REPO}/-/archive/${REF}/${REPO_NAME}-${REF}.tar.gz). The REPO_NAME variable is parsed from the value of REPO. -This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. ### HEAD_REF The unstable git commit-ish (ideally a branch) to pull for `--head` builds. diff --git a/docs/maintainers/vcpkg_from_sourceforge.md b/docs/maintainers/vcpkg_from_sourceforge.md index 3c1574facd174c..88379a8e21bae6 100644 --- a/docs/maintainers/vcpkg_from_sourceforge.md +++ b/docs/maintainers/vcpkg_from_sourceforge.md @@ -48,6 +48,8 @@ The REPO is `soxr`, REF is not exist, and the FILENAME is `soxr-0.1.3-Source.tar ### SHA512 The SHA512 hash that should match the archive. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + ### WORKING_DIRECTORY If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. diff --git a/scripts/cmake/vcpkg_from_bitbucket.cmake b/scripts/cmake/vcpkg_from_bitbucket.cmake index 442ea642dc2922..e27d62218e8ffe 100644 --- a/scripts/cmake/vcpkg_from_bitbucket.cmake +++ b/scripts/cmake/vcpkg_from_bitbucket.cmake @@ -34,7 +34,7 @@ If `REF` is specified, `SHA512` must also be specified. ### SHA512 The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz). -This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. ### HEAD_REF The unstable git commit-ish (ideally a branch) to pull for `--head` builds. diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index 8a6a709243506e..a9373baf592591 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -37,7 +37,7 @@ If `REF` is specified, `SHA512` must also be specified. ### SHA512 The SHA512 hash that should match the archive (https://github.com/${REPO}/archive/${REF}.tar.gz). -This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. ### HEAD_REF The unstable git commit-ish (ideally a branch) to pull for `--head` builds. diff --git a/scripts/cmake/vcpkg_from_gitlab.cmake b/scripts/cmake/vcpkg_from_gitlab.cmake index 75b09601f3ae8f..e091ca5c084a37 100644 --- a/scripts/cmake/vcpkg_from_gitlab.cmake +++ b/scripts/cmake/vcpkg_from_gitlab.cmake @@ -41,7 +41,7 @@ If `REF` is specified, `SHA512` must also be specified. The SHA512 hash that should match the archive (${GITLAB_URL}/${REPO}/-/archive/${REF}/${REPO_NAME}-${REF}.tar.gz). The REPO_NAME variable is parsed from the value of REPO. -This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. ### HEAD_REF The unstable git commit-ish (ideally a branch) to pull for `--head` builds. diff --git a/scripts/cmake/vcpkg_from_sourceforge.cmake b/scripts/cmake/vcpkg_from_sourceforge.cmake index a65cd725205693..e1226c3b10adac 100644 --- a/scripts/cmake/vcpkg_from_sourceforge.cmake +++ b/scripts/cmake/vcpkg_from_sourceforge.cmake @@ -47,6 +47,8 @@ The REPO is `soxr`, REF is not exist, and the FILENAME is `soxr-0.1.3-Source.tar ### SHA512 The SHA512 hash that should match the archive. +This is most easily determined by first setting it to `0`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile. + ### WORKING_DIRECTORY If specified, the archive will be extracted into the working directory instead of `${CURRENT_BUILDTREES_DIR}/src/`. From 2391441ccb33fef6a858460f724d649c79a89b2f Mon Sep 17 00:00:00 2001 From: Osyotr Date: Fri, 16 Jul 2021 10:19:25 +0300 Subject: [PATCH 0122/1858] [boost-python] Allow feature python2 on Unix (#18465) * [boost-python] Allow feature python2 on Unix * Update version record --- ports/boost-python/vcpkg.json | 6 ++---- scripts/boost/generate-ports.ps1 | 3 ++- versions/b-/boost-python.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 02c309ff467f1c..754db2e9cfff3d 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-python", "version": "1.76.0", + "port-version": 1, "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "supports": "!uwp & !(arm & windows) & !emscripten", @@ -41,10 +42,7 @@ "python2": { "description": "Build with Python2 support", "dependencies": [ - { - "name": "python2", - "platform": "windows" - } + "python2" ] } } diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 38e7b2671efc16..1079514720b16b 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -27,6 +27,7 @@ else # Clear this array when moving to a new boost version $port_versions = @{ #e.g. "asio" = 1; + "python" = 1; } $per_port_data = @{ @@ -57,7 +58,7 @@ $per_port_data = @{ "supports" = "!uwp&!(arm&windows)&!emscripten"; "features" = @{ python2=@{ - dependencies=@(@{name="python2"; platform="windows"}) + dependencies=@("python2") description="Build with Python2 support" } } diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index 7735ac9e1b2b53..3b2903d194f19d 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "789047e74a9db18c96ada8dc7addda4fc867360e", + "version": "1.76.0", + "port-version": 1 + }, { "git-tree": "22a76d7b62c1e7eab693c827b1ca942acdb46a1b", "version": "1.76.0", diff --git a/versions/baseline.json b/versions/baseline.json index a58944d606f13c..c5934c34759f89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -854,7 +854,7 @@ }, "boost-python": { "baseline": "1.76.0", - "port-version": 0 + "port-version": 1 }, "boost-qvm": { "baseline": "1.76.0", From 22e11db649df06495404a449e068391c720a6d0a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 16 Jul 2021 15:48:26 +0800 Subject: [PATCH 0123/1858] [openvdb] update to v8.0.0 (#16034) --- ports/openvdb/0003-fix-cmake.patch | 61 +++++++++++------------------- ports/openvdb/CONTROL | 10 ----- ports/openvdb/portfile.cmake | 24 ++++++++---- ports/openvdb/vcpkg.json | 40 ++++++++++++++++++++ versions/baseline.json | 4 +- versions/o-/openvdb.json | 5 +++ 6 files changed, 86 insertions(+), 58 deletions(-) delete mode 100644 ports/openvdb/CONTROL create mode 100644 ports/openvdb/vcpkg.json diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/0003-fix-cmake.patch index 1c70da27d5b4c0..caaf4f256caaa7 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/0003-fix-cmake.patch @@ -1,13 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2e8c2a..749e12c 100644 +index 93a65c7..24ec864 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -353,14 +353,10 @@ endif() +@@ -338,13 +338,9 @@ endif() if(OPENVDB_INSTALL_CMAKE_MODULES) set(OPENVDB_CMAKE_MODULES - cmake/FindBlosc.cmake - cmake/FindCppUnit.cmake cmake/FindJemalloc.cmake - cmake/FindIlmBase.cmake cmake/FindLog4cplus.cmake @@ -18,22 +17,10 @@ index f2e8c2a..749e12c 100644 cmake/OpenVDBHoudiniSetup.cmake cmake/OpenVDBMayaSetup.cmake diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index b065192..7549843 100644 +index 219b90a..b280f85 100644 --- a/cmake/FindOpenVDB.cmake +++ b/cmake/FindOpenVDB.cmake -@@ -224,8 +224,9 @@ foreach(COMPONENT ${OpenVDB_FIND_COMPONENTS}) - ${OPENVDB_${COMPONENT}_ROOT} - ${OPENVDB_${COMPONENT}_INCLUDEDIR} - ) -- list(REMOVE_DUPLICATES _VDB_COMPONENT_SEARCH_DIRS) -- -+ if(_VDB_COMPONENT_SEARCH_DIRS) -+ list(REMOVE_DUPLICATES _VDB_COMPONENT_SEARCH_DIRS) -+ endif() - # Look for a standard header files. - if(${COMPONENT} STREQUAL "openvdb") - # Look for a standard OpenVDB header file. -@@ -429,8 +430,8 @@ endif() +@@ -448,8 +448,8 @@ endif() # Add standard dependencies @@ -44,7 +31,7 @@ index b065192..7549843 100644 find_package(ZLIB REQUIRED) if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) -@@ -540,7 +541,7 @@ if(NOT OPENVDB_USE_STATIC_LIBS) +@@ -588,7 +588,7 @@ else() endif() if(OpenVDB_USES_BLOSC) @@ -52,31 +39,29 @@ index b065192..7549843 100644 + find_package(blosc CONFIG REQUIRED) endif() - if(OpenVDB_USES_LOG4CPLUS) -@@ -548,8 +549,8 @@ if(OpenVDB_USES_LOG4CPLUS) - endif() - + if(OpenVDB_USES_ZLIB) +@@ -602,6 +602,8 @@ endif() if(OpenVDB_USES_EXR) -- find_package(IlmBase REQUIRED) -- find_package(OpenEXR REQUIRED) + find_package(IlmBase REQUIRED) + find_package(OpenEXR REQUIRED) + find_package(IlmBase CONFIG REQUIRED) + find_package(OpenEXR CONFIG REQUIRED) endif() if(UNIX) -@@ -610,7 +611,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) +@@ -662,7 +664,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) if(NOT OPENVDB_USE_STATIC_LIBS) if(OpenVDB_USES_BLOSC) - list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc) + list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc) endif() - - list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) -diff --git a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt -index 45b302c..d75cfd1 100644 ---- a/openvdb/CMakeLists.txt -+++ b/openvdb/CMakeLists.txt + if(OpenVDB_USES_ZLIB) + list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) +diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt +index 536bf1e..568fec1 100644 +--- a/openvdb/openvdb/CMakeLists.txt ++++ b/openvdb/openvdb/CMakeLists.txt @@ -47,7 +47,7 @@ message(STATUS "----------------------------------------------------") ########################################################################## @@ -111,7 +96,7 @@ index 45b302c..d75cfd1 100644 if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) -@@ -84,14 +90,7 @@ if(USE_LOG4CPLUS) +@@ -82,14 +88,7 @@ if(USE_LOG4CPLUS) endif() if(USE_BLOSC) @@ -127,7 +112,7 @@ index 45b302c..d75cfd1 100644 else() message(WARNING "Blosc support is disabled. It is strongly recommended to " "enable blosc for optimal builds of OpenVDB and to support compatible " -@@ -163,7 +162,7 @@ endif() +@@ -165,7 +164,7 @@ endif() # See FindOpenVDB.cmake if(USE_BLOSC) @@ -135,11 +120,11 @@ index 45b302c..d75cfd1 100644 + list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc) endif() - list(APPEND OPENVDB_CORE_DEPENDENT_LIBS -diff --git a/openvdb/cmd/CMakeLists.txt b/openvdb/cmd/CMakeLists.txt -index 2b831bb..a13b63b 100644 ---- a/openvdb/cmd/CMakeLists.txt -+++ b/openvdb/cmd/CMakeLists.txt + if(USE_BLOSC OR USE_ZLIB) +diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt +index ba78f4b..461fd2f 100644 +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt @@ -50,7 +50,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") find_package(Jemalloc REQUIRED) list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc) diff --git a/ports/openvdb/CONTROL b/ports/openvdb/CONTROL deleted file mode 100644 index a05640a98500cf..00000000000000 --- a/ports/openvdb/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: openvdb -Version: 7.1.0 -Port-Version: 2 -Build-Depends: boost-ptr-container, openexr, tbb, blosc, boost-iostreams, boost-system, boost-thread, boost-date-time, boost-any, boost-uuid, boost-interprocess, ilmbase -Homepage: https://github.com/dreamworksanimation/openvdb -Description: Sparse volume data structure and tools - -Feature: tools -Description: OpenVDB utilities: view, print and render -Build-Depends: glew, glfw3 diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 2fb9c3e6ffea8a..63867f9f404ba5 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF 2a7966ccb184092a49355c04bccb014d84956ff7 # v7.1.0 - SHA512 6d3d2481fd116c5fd8fdf84a5139cd6e6986e188c3a5def05ec3bee47bd31bee3099a1d317a330b10c2cf93094f305eeeea02cadcabfc81f8ffc60bf8acdb84e + REF 587c9ae84c2822bbc03d0d7eceb52898582841b9 # v8.0.0 + SHA512 4abc442a86dd0614492edf70e887886b755102f04d44eebd1a154df24e05e53a80de8e9b47b370946bcc3888ab7a94ae331a3addac8d784e25ae5da7523afca9 HEAD_REF master PATCHES 0003-fix-cmake.patch @@ -25,9 +25,16 @@ if ("tools" IN_LIST FEATURES) endif() endif() -vcpkg_configure_cmake( +if ("ax" IN_LIST FEATURES) + if(NOT VCPKG_TARGET_IS_WINDOWS) + set(OPENVDB_BUILD_AX ON) + else() + message(FATAL_ERROR "Currently no support for building OpenVDB AX on Windows.") + endif() +endif() + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DOPENVDB_BUILD_UNITTESTS=OFF -DOPENVDB_BUILD_PYTHON_MODULE=OFF @@ -40,11 +47,12 @@ vcpkg_configure_cmake( -DOPENVDB_BUILD_VDB_RENDER=${OPENVDB_BUILD_TOOLS} -DOPENVDB_BUILD_VDB_LOD=${OPENVDB_BUILD_TOOLS} -DUSE_PKGCONFIG=OFF + ${OPENVDB_BUILD_AX} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenVDB TARGET_PATH share/openvdb) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenVDB) vcpkg_copy_pdbs() @@ -55,5 +63,5 @@ if (OPENVDB_BUILD_TOOLS) endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/openvdb/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/openvdb/openvdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json new file mode 100644 index 00000000000000..cb7969105fa186 --- /dev/null +++ b/ports/openvdb/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "openvdb", + "version": "8.0.0", + "description": "Sparse volume data structure and tools", + "homepage": "https://github.com/dreamworksanimation/openvdb", + "dependencies": [ + "blosc", + "boost-any", + "boost-date-time", + "boost-interprocess", + "boost-iostreams", + "boost-ptr-container", + "boost-system", + "boost-thread", + "boost-uuid", + "ilmbase", + "openexr", + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "ax": { + "description": "Provides a powerful and easy way of interacting with OpenVDB volume and point data." + }, + "tools": { + "description": "OpenVDB utilities: view, print and render", + "dependencies": [ + "glew", + "glfw3" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index c5934c34759f89..12c91d01f5a50c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4649,8 +4649,8 @@ "port-version": 1 }, "openvdb": { - "baseline": "7.1.0", - "port-version": 2 + "baseline": "8.0.0", + "port-version": 0 }, "openvpn3": { "baseline": "3.4.1-1", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 5b5e207a1f0308..19b06c1bb90824 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5dd93bca4d648b1e0ab01d3cf4df79a183944688", + "version": "8.0.0", + "port-version": 0 + }, { "git-tree": "7851d7cc48fbd6ae64e2a625afc0a21024f0eb31", "version-string": "7.1.0", From 1dcdf2d8810360489958f2cc94c98fbe1a899c0f Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Fri, 16 Jul 2021 15:50:22 +0800 Subject: [PATCH 0124/1858] [c4core, ryml] Add windows arm/arm64 support (#18316) Co-authored-by: Billy Robert O'Neal III --- ports/c4core/portfile.cmake | 16 ++++++---------- ports/c4core/vcpkg.json | 4 ++-- ports/ryml/portfile.cmake | 13 ++++++------- ports/ryml/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 4 ++-- versions/c-/c4core.json | 5 +++++ versions/r-/ryml.json | 5 +++++ 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake index 3f5d7ad8fe85f4..59a4efec0cf187 100644 --- a/ports/c4core/portfile.cmake +++ b/ports/c4core/portfile.cmake @@ -1,7 +1,6 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_fail_port_install( - ON_ARCH "arm" "arm64" ON_TARGET "OSX" ) @@ -9,18 +8,18 @@ vcpkg_fail_port_install( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/c4core - REF 2413e420fca270c20dfb7a962979d44e0d4c0337 - SHA512 2b5877941a5a4bdac625d7c54fc2f0e54eea3ab0d7487d314fde29abf441fcd70ed60598b9c8614c2993a7152a508b9ab9b7b234a777d138d5142e1a9df4c023 + REF 75f879f21e75e7ee42cbbce5d6d7ce75fd315433 + SHA512 d995e7529269a3968871c48bfe4b60dac52fb863f22250674d7fa3aa45b10c9f2851db12e97799c97f1c88123863034d0545c7e68a81441292c6530806a28cd3 HEAD_REF master ) -set(CM_COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350) +set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2) # Get cmake scripts for c4core vcpkg_download_distfile(CMAKE_ARCHIVE URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" FILENAME "cmake-${CM_COMMIT_HASH}.zip" - SHA512 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2 + SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3 ) vcpkg_extract_source_archive_ex( @@ -49,12 +48,12 @@ vcpkg_extract_source_archive_ex( file(REMOVE_RECURSE "${SOURCE_PATH}/src/c4/ext/debugbreak") file(RENAME ${SOURCE_PATH_DEBUGBREAK} "${SOURCE_PATH}/src/c4/ext/debugbreak") -set(FF_COMMIT_HASH 3377facde283d36fa3bd29080f46fb0589b74bd3) +set(FF_COMMIT_HASH 8159e8bcf63c1b92f5a51fb550f966e56624b209) vcpkg_download_distfile(FAST_FLOAT_ARCHIVE URLS "https://github.com/biojppm/fast_float/archive/${FF_COMMIT_HASH}.zip" FILENAME "fast_float-${FF_COMMIT_HASH}.zip" - SHA512 e2a7b869e422113b099f2ab95e42de8aed3b13f961fdc84583a908159936fdad00990ce664bc0c2491b7ca49e3323e17fb08f2208b2ceb577015c7d89cc4d785 + SHA512 ae71f74d3bae782f62f037c034bea4e7f45462188c8285971c2959c6b2884d3bb58826681c0989f4290f26fa33237c1b63ceed77ed94f9e97c1cd01b4aa21cd3 ) vcpkg_extract_source_archive_ex( @@ -86,9 +85,6 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" _contents) string(REGEX REPLACE [[[ \t\r\n]*"\${PACKAGE_PREFIX_DIR}[\./\\]*"]] [["${PACKAGE_PREFIX_DIR}/../.."]] _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/c4core/c4coreConfig.cmake" "${_contents}") -# Fix path to header -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/c4/error.hpp" "" "\"extern/debugbreak/debugbreak.h\"") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json index 90b36aa170fc9a..aa29f86f27313a 100644 --- a/ports/c4core/vcpkg.json +++ b/ports/c4core/vcpkg.json @@ -1,7 +1,7 @@ { "name": "c4core", - "version-date": "2021-01-14", + "version-date": "2021-06-26", "description": "Library of low-level C++ utilities", "homepage": "https://github.com/biojppm/c4core", - "supports": "!(arm | arm64 | osx)" + "supports": "!osx" } diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake index e5af447b1e8867..639ac1bd90752d 100644 --- a/ports/ryml/portfile.cmake +++ b/ports/ryml/portfile.cmake @@ -1,7 +1,6 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_fail_port_install( - ON_ARCH "arm" "arm64" ON_TARGET "OSX" ) @@ -9,19 +8,19 @@ vcpkg_fail_port_install( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/rapidyaml - REF db387345abf9cd6710e0c4a487a476bfd176fea3 - SHA512 4dda145b561e3b8420f89ad01e42eb5056b51a8a28a47f3b8c91bb0a2a6420d1842016a23cbb17d9f119ebce0e2e404b4f4fb67d71bf0d3c87aa81f346c6cfe2 + REF a1d5ed7c8ace0ab14340ba19dfed60f280eddac0 + SHA512 27a7b7a3ee2f6bb63600907fbc2307b7da13a13b88605c0e7b628fe26878b120d0df9bc221d7d495c5212543db00f0b570f351e7e3e3bebb0c785a676a4d2469 HEAD_REF master PATCHES cmake-fix.patch ) -set(COMMIT_HASH 71c211187b8c52a13d5c59a7979f2ccf8429e350) +set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2) # Get cmake scripts for rapidyaml vcpkg_download_distfile(CMAKE_ARCHIVE - URLS "https://github.com/biojppm/cmake/archive/${COMMIT_HASH}.zip" - FILENAME "cmake-${COMMIT_HASH}.zip" - SHA512 d15884d985a477df47ead9c5c486cfdeb1df8b6de4f308c36bd7a8c0e901fb876980a2a4f239abd8ecb1fb0baf75ad559ca0780b50c84070762f8cbfe55cb9d2 + URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" + FILENAME "cmake-${CM_COMMIT_HASH}.zip" + SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3 ) vcpkg_extract_source_archive_ex( diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json index dba2751fa99310..5b992fb5766fc8 100644 --- a/ports/ryml/vcpkg.json +++ b/ports/ryml/vcpkg.json @@ -1,9 +1,9 @@ { "name": "ryml", - "version-date": "2021-05-27", + "version-date": "2021-06-29", "description": "Rapid YAML library", "homepage": "https://github.com/biojppm/rapidyaml", - "supports": "!(arm | arm64 | osx)", + "supports": "!osx", "dependencies": [ { "name": "c4core", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d5ece9826a321d..8dbff9980f15fa 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1395,8 +1395,6 @@ rttr:arm-uwp=fail rttr:x64-uwp=fail rxspencer:x64-uwp=fail rxspencer:arm-uwp=fail -ryml:arm-uwp=fail -ryml:arm64-windows=fail ryml:x64-osx=fail ryu:arm-uwp=fail ryu:x64-uwp=fail @@ -1709,8 +1707,6 @@ zkpp:x64-windows-static-md=fail zkpp:arm64-windows=fail zkpp:x64-uwp=fail zkpp:arm-uwp=fail -c4core:arm-uwp=fail -c4core:arm64-windows=fail c4core:x64-osx=fail # Official downloading server of CTP library is only guaranteed to be available during trading hours of China futures market diff --git a/versions/baseline.json b/versions/baseline.json index 12c91d01f5a50c..7f845342302a88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1097,7 +1097,7 @@ "port-version": 1 }, "c4core": { - "baseline": "2021-01-14", + "baseline": "2021-06-26", "port-version": 0 }, "caf": { @@ -5613,7 +5613,7 @@ "port-version": 0 }, "ryml": { - "baseline": "2021-05-27", + "baseline": "2021-06-29", "port-version": 0 }, "ryu": { diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json index 62e83925f3bc35..6afe37b39522c8 100644 --- a/versions/c-/c4core.json +++ b/versions/c-/c4core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b07f8a38bbc4d13f8411921e6734753e15f8d50", + "version-date": "2021-06-26", + "port-version": 0 + }, { "git-tree": "12b84a31469a78dd4b42dcf58a27d4600f6b2d48", "version-date": "2021-01-14", diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json index d02795d6541baf..d24417ed86f2e9 100644 --- a/versions/r-/ryml.json +++ b/versions/r-/ryml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0ae9d06c774834182bdb333b0a5c96aa8c36b52", + "version-date": "2021-06-29", + "port-version": 0 + }, { "git-tree": "783be628f42faca427a8bc1394ccd20580ef56c8", "version-date": "2021-05-27", From de37cc529f467be1c4360d1f0a03f6ee604d246f Mon Sep 17 00:00:00 2001 From: maz-1 Date: Fri, 16 Jul 2021 15:52:38 +0800 Subject: [PATCH 0125/1858] [libe57] Add new port (#18445) * [libe57] Add new port * remove deprecated entries * update version files according to maintainer guide * add dependency for linux * update cmake patch * update versioning * delete obsolete lines * fix linux/osx * fix osx include and linker problem * [libe57] remove deprecated functions --- ports/libe57/0001_cmake.patch | 88 +++++++++++ .../libe57/0002_replace_tr1_with_cpp11.patch | 96 ++++++++++++ ports/libe57/0003_fix_osx_support.patch | 145 ++++++++++++++++++ ports/libe57/portfile.cmake | 32 ++++ ports/libe57/vcpkg.json | 29 ++++ versions/baseline.json | 4 + versions/l-/libe57.json | 9 ++ 7 files changed, 403 insertions(+) create mode 100644 ports/libe57/0001_cmake.patch create mode 100644 ports/libe57/0002_replace_tr1_with_cpp11.patch create mode 100644 ports/libe57/0003_fix_osx_support.patch create mode 100644 ports/libe57/portfile.cmake create mode 100644 ports/libe57/vcpkg.json create mode 100644 versions/l-/libe57.json diff --git a/ports/libe57/0001_cmake.patch b/ports/libe57/0001_cmake.patch new file mode 100644 index 00000000000000..47001bbe466be9 --- /dev/null +++ b/ports/libe57/0001_cmake.patch @@ -0,0 +1,88 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2012-04-04 13:09:12.000000000 +0800 ++++ b/CMakeLists.txt 2021-06-16 01:14:35.669163100 +0800 +@@ -31,6 +31,8 @@ + set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) + set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_flag_overrides.cmake) + ++set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ + # Set a private module find path + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") + +@@ -81,17 +83,17 @@ + endif(NOT Boost_FOUND) + + set(Xerces_USE_STATIC_LIBS On) +-find_package(Xerces QUIET) +-if (NOT Xerces_FOUND) ++find_package(XercesC QUIET) ++if (NOT XercesC_FOUND) + set(XERCES_ROOT CACHE PATH "Location of the xerces library") + message(FATAL_ERROR + "Unable to find xerces library. + Please set the the XERCES_ROOT to point to the root of the xerces directory." + ) +-endif (NOT Xerces_FOUND) ++endif (NOT XercesC_FOUND) + +-set(XML_LIBRARIES ${Xerces_LIBRARY}) +-set(XML_INCLUDE_DIRS ${Xerces_INCLUDE_DIR}) ++set(XML_LIBRARIES ${XercesC_LIBRARY}) ++set(XML_INCLUDE_DIRS ${XercesC_INCLUDE_DIR}) + + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + add_definitions(-DLINUX) +@@ -187,12 +189,18 @@ + add_executable( las2e57 + src/tools/las2e57.cpp + ) ++ ++if (MSVC) ++ set(LAS2E57_EXTRA_LINK bcrypt) ++endif(MSVC) ++ + target_link_libraries( las2e57 + E57RefImpl + LASReader + time_conversion + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${LAS2E57_EXTRA_LINK} + ) + add_executable( e57fields + src/tools/e57fields.cpp +@@ -270,15 +270,32 @@ + install( + FILES + include/E57Foundation.h ++ include/E57Simple.h ++ include/LASReader.h + DESTINATION include/e57 + ) ++install( ++ FILES ++ include/time_conversion/time_conversion.h ++ include/time_conversion/basictypes.h ++ include/time_conversion/constants.h ++ include/time_conversion/gnss_error.h ++ DESTINATION include/e57/time_conversion ++) + + install( + FILES + CHANGES.TXT + README.TXT + src/refimpl/E57RefImplConfig.cmake +- DESTINATION . ++ DESTINATION share/e57refimpl ++) ++ ++install( ++ FILES ++ README.TXT ++ RENAME copyright ++ DESTINATION share/libe57 + ) + + #include (InstallRequiredSystemLibraries) diff --git a/ports/libe57/0002_replace_tr1_with_cpp11.patch b/ports/libe57/0002_replace_tr1_with_cpp11.patch new file mode 100644 index 00000000000000..1b48de7c22a612 --- /dev/null +++ b/ports/libe57/0002_replace_tr1_with_cpp11.patch @@ -0,0 +1,96 @@ +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-06-16 22:53:02.033465000 +0800 ++++ b/CMakeLists.txt 2021-06-16 23:01:31.542323600 +0800 +@@ -25,7 +25,9 @@ + # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + # DEALINGS IN THE SOFTWARE. + +-cmake_minimum_required(VERSION 2.8.2) ++cmake_minimum_required(VERSION 3.1) ++ ++set(CMAKE_CXX_STANDARD 11) + + # Override flags to enable prepare for linking to static runtime + set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/c_flag_overrides.cmake) +diff -Naur a/src/tools/e57fields.cpp b/src/tools/e57fields.cpp +--- a/src/tools/e57fields.cpp 2012-04-04 17:19:01.000000000 +0800 ++++ b/src/tools/e57fields.cpp 2021-06-16 22:55:02.789463000 +0800 +@@ -30,11 +30,7 @@ + #include + #include + #include +-#if defined(_MSC_VER) +-# include +-#else +-# include +-#endif ++#include + #include "E57Foundation.h" + #include "E57FoundationImpl.h" //??? for exceptions, should be in separate file + +@@ -43,7 +39,6 @@ + + using namespace e57; + using namespace std; +-using namespace std::tr1; + + //!!! prologue, file name, date, version#, total # elements + //!!! doc +@@ -446,9 +441,9 @@ + /// Only one is used, depending on the type of the E57 element. + /// One of these three should be resized to BUFFER_ELEMENT_COUNT. + /// These are smart pointers to avoid the copying (and the moving) when put on the cvElements list. +- shared_ptr > iBuffer; +- shared_ptr > dBuffer; +- shared_ptr > sBuffer; ++ std::shared_ptr > iBuffer; ++ std::shared_ptr > dBuffer; ++ std::shared_ptr > sBuffer; + + /// The precalculated parts of the element path name. + /// The only part that is missing is the record number which goes in between. +diff -Naur a/src/tools/e57unpack.cpp b/src/tools/e57unpack.cpp +--- a/src/tools/e57unpack.cpp 2011-10-06 16:01:00.000000000 +0800 ++++ b/src/tools/e57unpack.cpp 2021-06-16 22:56:57.150323800 +0800 +@@ -41,12 +41,8 @@ + #include + using std::runtime_error; + +-#if defined(_MSC_VER) +-# include +-#else +-# include +-#endif +-using std::tr1::shared_ptr; ++#include ++using std::shared_ptr; + + #include + using std::string; +diff -Naur a/src/tools/e57validate.cpp b/src/tools/e57validate.cpp +--- a/src/tools/e57validate.cpp 2011-10-06 16:01:00.000000000 +0800 ++++ b/src/tools/e57validate.cpp 2021-06-16 22:58:19.365323700 +0800 +@@ -66,11 +66,8 @@ + + + ================================================================*/ +-#if defined(_MSC_VER) +-# include +-#else +-# include +-using std::tr1::unordered_map; ++ ++#include ++using std::unordered_map; +-#endif + #include + using std::strlen; +@@ -694,7 +692,7 @@ + void dump(int indent = 0, std::ostream& os = std::cout); + //================ + private: +- typedef std::tr1::unordered_map GroupsMap; ++ typedef std::unordered_map GroupsMap; + + bool isDefined_; + bool isByRow_; diff --git a/ports/libe57/0003_fix_osx_support.patch b/ports/libe57/0003_fix_osx_support.patch new file mode 100644 index 00000000000000..2b1f1da7fe054b --- /dev/null +++ b/ports/libe57/0003_fix_osx_support.patch @@ -0,0 +1,145 @@ +diff -x '.*' -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2021-06-24 16:56:37.000000000 +0800 ++++ b/CMakeLists.txt 2021-06-24 17:30:28.000000000 +0800 +@@ -163,6 +163,13 @@ + include/time_conversion/gnss_error.h + ) + ++# fix dependency introduced by xerces ++if(APPLE) ++ find_library(CORE_FOUNDATION CoreFoundation REQUIRED) ++ find_library(CORE_SERVICES CoreServices REQUIRED) ++ set(EXTRA_LINK_FLAGS_OSX ${CORE_FOUNDATION} ${CORE_SERVICES}) ++endif() ++ + # + # Example programs + # +@@ -174,6 +181,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( DemoRead01 + src/examples/DemoRead01.cpp +@@ -182,6 +190,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + + # +@@ -203,6 +212,7 @@ + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} + ${LAS2E57_EXTRA_LINK} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57fields + src/tools/e57fields.cpp +@@ -211,6 +221,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57xmldump + src/tools/e57xmldump.cpp +@@ -219,6 +230,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57validate + src/tools/e57validate.cpp +@@ -227,6 +239,7 @@ + E57RefImpl + ${XML_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + add_executable( e57unpack + src/tools/e57unpack.cpp +@@ -236,6 +249,7 @@ + ${XML_LIBRARIES} + ${Boost_LIBRARIES} + ${CMAKE_THREAD_LIBS_INIT} ++ ${EXTRA_LINK_FLAGS_OSX} + ) + + # +diff -x '.*' -Naur a/src/refimpl/E57FoundationImpl.cpp b/src/refimpl/E57FoundationImpl.cpp +--- a/src/refimpl/E57FoundationImpl.cpp 2012-04-12 21:44:42.000000000 +0800 ++++ b/src/refimpl/E57FoundationImpl.cpp 2021-06-24 17:04:57.000000000 +0800 +@@ -57,6 +57,12 @@ + # include + # define O_BINARY (0) + # define _unlink unlink ++#elif defined( __APPLE__ ) ++# include ++# include ++# include ++# define O_BINARY (0) ++# define _unlink unlink + #else + # error "no supported OS platform defined" + #endif +@@ -4764,6 +4770,8 @@ + # endif + #elif defined(LINUX) + int64_t result = ::lseek64(fd_, offset, whence); ++#elif defined( __APPLE__ ) ++ int64_t result = ::lseek(fd_, offset, whence); + #else + # error "no supported OS platform defined" + #endif +diff -x '.*' -Naur a/src/refimpl/E57Simple.cpp b/src/refimpl/E57Simple.cpp +--- a/src/refimpl/E57Simple.cpp 2011-05-14 05:40:11.000000000 +0800 ++++ b/src/refimpl/E57Simple.cpp 2021-06-24 16:58:24.000000000 +0800 +@@ -799,6 +799,9 @@ + # define __LARGE64_FILES + # include + # include ++#elif defined( __APPLE__ ) ++# include ++# include + #else + # error "no supported OS platform defined" + #endif +diff -x '.*' -Naur a/src/refimpl/E57SimpleImpl.cpp b/src/refimpl/E57SimpleImpl.cpp +--- a/src/refimpl/E57SimpleImpl.cpp 2012-04-12 23:15:46.000000000 +0800 ++++ b/src/refimpl/E57SimpleImpl.cpp 2021-06-24 16:58:24.000000000 +0800 +@@ -74,6 +74,12 @@ + # include + # include + # include ++#elif defined(__APPLE__) ++# include ++# include ++# include ++# include ++# include + #else + # error "no supported OS platform defined" + #endif +diff -x '.*' -Naur a/src/tools/las2e57.cpp b/src/tools/las2e57.cpp +--- a/src/tools/las2e57.cpp 2012-04-04 19:09:11.000000000 +0800 ++++ b/src/tools/las2e57.cpp 2021-06-24 17:11:11.000000000 +0800 +@@ -404,12 +404,12 @@ + int64_t startIndex; + BoundingBox bbox; + +- GroupRecord(int64_t id); ++ GroupRecord(int64_t id = 0); + void addMember(double coords[3], int64_t recordIndex); + void dump(int indent = 0, std::ostream& os = std::cout); + }; + +-GroupRecord::GroupRecord(int64_t id_arg = 0) ++GroupRecord::GroupRecord(int64_t id_arg) + : id(id_arg), + count(0), + startIndex(0), diff --git a/ports/libe57/portfile.cmake b/ports/libe57/portfile.cmake new file mode 100644 index 00000000000000..1f7bfd9ea5c3f4 --- /dev/null +++ b/ports/libe57/portfile.cmake @@ -0,0 +1,32 @@ +set(VERSION 1.1.312) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/E57RefImpl_src-${VERSION}) + +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO e57-3d-imgfmt + FILENAME "E57RefImpl_src-${VERSION}.zip" + SHA512 c729cc3094131f115ddf9b8c24a9420c4ab9d16a4343acfefb42f997f4bf25247cd5563126271df2af95f103093b7f6b360dbade52c9e66ec39dd2f06e041eb7 + PATCHES + "0001_cmake.patch" + "0002_replace_tr1_with_cpp11.patch" + "0003_fix_osx_support.patch" +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/share/libe57) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES e57fields e57unpack e57validate e57xmldump las2e57 + AUTO_CLEAN +) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json new file mode 100644 index 00000000000000..4f802910afd420 --- /dev/null +++ b/ports/libe57/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libe57", + "version-semver": "1.1.312", + "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", + "homepage": "http://www.libe57.org/", + "dependencies": [ + "boost-crc", + "boost-filesystem", + "boost-format", + "boost-program-options", + "boost-system", + "boost-thread", + "boost-uuid", + "boost-variant", + { + "name": "icu", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xerces-c" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7f845342302a88..9a3c6efaa1c240 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3124,6 +3124,10 @@ "baseline": "1.2.6", "port-version": 0 }, + "libe57": { + "baseline": "1.1.312", + "port-version": 0 + }, "libepoxy": { "baseline": "1.5.5", "port-version": 0 diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json new file mode 100644 index 00000000000000..d9be12351d6f3e --- /dev/null +++ b/versions/l-/libe57.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "50300e4d95248be2c168fee27a31c5506c7b840d", + "version-semver": "1.1.312", + "port-version": 0 + } + ] +} From 04f0a337d20cb76f00aee7fcdd54af42a867f0c0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 16 Jul 2021 20:57:20 +0200 Subject: [PATCH 0126/1858] Fix nativefiledialog port using build time include dir (#18923) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix nativefiledialog port using build time include dir * Update ports/nativefiledialog/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/nativefiledialog/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update versions/n-/nativefiledialog.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update tree hash * Update versions/n-/nativefiledialog.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/nativefiledialog/CMakeLists.txt | 15 +++++++-------- ports/nativefiledialog/CONTROL | 8 -------- ports/nativefiledialog/portfile.cmake | 8 +++++--- ports/nativefiledialog/vcpkg.json | 23 +++++++++++++++++++++++ versions/baseline.json | 2 +- versions/n-/nativefiledialog.json | 5 +++++ 6 files changed, 41 insertions(+), 20 deletions(-) delete mode 100644 ports/nativefiledialog/CONTROL create mode 100644 ports/nativefiledialog/vcpkg.json diff --git a/ports/nativefiledialog/CMakeLists.txt b/ports/nativefiledialog/CMakeLists.txt index 8f5b79dfb19c61..30c9814b1851e8 100644 --- a/ports/nativefiledialog/CMakeLists.txt +++ b/ports/nativefiledialog/CMakeLists.txt @@ -45,15 +45,14 @@ target_compile_definitions( $<$:_CRT_SECURE_NO_WARNINGS> ) -target_include_directories( - nfd - PUBLIC +target_include_directories(nfd PRIVATE $ - $ -) + ${CMAKE_CURRENT_LIST_DIR}/src + ${CMAKE_CURRENT_LIST_DIR}/src/include + >) + +target_include_directories(nfd INTERFACE + $) if (GTK3_FOUND) target_include_directories(nfd PUBLIC ${GTK3_INCLUDE_DIRS}) diff --git a/ports/nativefiledialog/CONTROL b/ports/nativefiledialog/CONTROL deleted file mode 100644 index afe28357787b69..00000000000000 --- a/ports/nativefiledialog/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: nativefiledialog -Version: 2019-08-28 -Description: A tiny, neat C library that portably invokes native file open and save dialogs -Homepage: https://github.com/mlabbe/nativefiledialog -Supports: !uwp - -Feature: zenity -Description: Using Zenity backend on Linux diff --git a/ports/nativefiledialog/portfile.cmake b/ports/nativefiledialog/portfile.cmake index f0f8762bed2895..c31caab408c300 100644 --- a/ports/nativefiledialog/portfile.cmake +++ b/ports/nativefiledialog/portfile.cmake @@ -19,18 +19,20 @@ vcpkg_check_features( INVERTED_FEATURES "zenity" NFD_GTK_BACKEND ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/nativefiledialog/vcpkg.json b/ports/nativefiledialog/vcpkg.json new file mode 100644 index 00000000000000..a9fb973797db15 --- /dev/null +++ b/ports/nativefiledialog/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "nativefiledialog", + "version-date": "2019-08-28", + "port-version": 1, + "description": "A tiny, neat C library that portably invokes native file open and save dialogs", + "homepage": "https://github.com/mlabbe/nativefiledialog", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "zenity": { + "description": "Using Zenity backend on Linux" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 9a3c6efaa1c240..573e3155936ea1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4294,7 +4294,7 @@ }, "nativefiledialog": { "baseline": "2019-08-28", - "port-version": 0 + "port-version": 1 }, "nccl": { "baseline": "2.4.6", diff --git a/versions/n-/nativefiledialog.json b/versions/n-/nativefiledialog.json index 2a73212d163070..29df598c132248 100644 --- a/versions/n-/nativefiledialog.json +++ b/versions/n-/nativefiledialog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d765a8f84ba49c18701f68b7471f1b93b7313ddc", + "version-date": "2019-08-28", + "port-version": 1 + }, { "git-tree": "b2e484cc447978109bcd69b2fa61920b2059d0f9", "version-string": "2019-08-28", From ecea127c2dd82e55fc068c4ef61d1012536eb358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 17 Jul 2021 03:00:42 +0800 Subject: [PATCH 0127/1858] [nuklear] Export unofficial target, add features (#18881) * [nuklear] Export unofficial target, add features. * update version stuff * Update ports/nuklear/portfile.cmake * Update versions/n-/nuklear.json * Update ports/nuklear/CMakeLists.txt * Update ports/nuklear/CMakeLists.txt * Update ports/nuklear/CMakeLists.txt * Update versions/n-/nuklear.json --- ports/nuklear/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ ports/nuklear/CONTROL | 4 ---- ports/nuklear/portfile.cmake | 23 +++++++++++++++++++++-- ports/nuklear/vcpkg.json | 25 +++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/n-/nuklear.json | 5 +++++ 6 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 ports/nuklear/CMakeLists.txt delete mode 100644 ports/nuklear/CONTROL create mode 100644 ports/nuklear/vcpkg.json diff --git a/ports/nuklear/CMakeLists.txt b/ports/nuklear/CMakeLists.txt new file mode 100644 index 00000000000000..28009f466b754b --- /dev/null +++ b/ports/nuklear/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.16) +project(Nuklear LANGUAGES C CXX) + +option(INSTALL_EXAMPLE "Install the example code" OFF) +option(INSTALL_DEMO "Install the demo code" OFF) + +add_library(nuklear INTERFACE) + +target_include_directories(nuklear INTERFACE $) +target_compile_definitions(nuklear INTERFACE NK_IMPLEMENTATION) + +# Installation +install( + TARGETS nuklear + EXPORT unofficial-nuklear + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) + +install(FILES "${CMAKE_CURRENT_LIST_DIR}/nuklear.h" DESTINATION "include/nuklear") + + +install(EXPORT unofficial-nuklear FILE unofficial-nuklear-config.cmake DESTINATION share/unofficial-nuklear) + +if (INSTALL_EXAMPLE) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/example" DESTINATION share/nuklear) + +endif() + +if (INSTALL_DEMO) + install(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/demo" DESTINATION share/nuklear) + +endif() diff --git a/ports/nuklear/CONTROL b/ports/nuklear/CONTROL deleted file mode 100644 index 7b641a2a0676ac..00000000000000 --- a/ports/nuklear/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nuklear -Version: 2021-03-18 -Homepage: https://github.com/Immediate-Mode-UI/Nuklear -Description: This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain diff --git a/ports/nuklear/portfile.cmake b/ports/nuklear/portfile.cmake index 53dd4c41910a9f..e13332986b517e 100644 --- a/ports/nuklear/portfile.cmake +++ b/ports/nuklear/portfile.cmake @@ -5,6 +5,25 @@ vcpkg_from_github( SHA512 ce064dff721111749d4056717879f42d3e24bb94655dd2b04c137eb7391d2c90d0b1b95155912c100b537f74fd150aedc48e0ac85eb72963c66e35ac81048323 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/nuklear.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/Readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/nuklear RENAME copyright) + +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + example INSTALL_EXAMPLE + demo INSTALL_DEMO +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-nuklear) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/Readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nuklear/vcpkg.json b/ports/nuklear/vcpkg.json new file mode 100644 index 00000000000000..1e48043bf8e890 --- /dev/null +++ b/ports/nuklear/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "nuklear", + "version-date": "2021-03-18", + "port-version": 1, + "description": "This is a minimal state immediate mode graphical user interface toolkit written in ANSI C and licensed under public domain", + "homepage": "https://github.com/Immediate-Mode-UI/Nuklear", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "demo": { + "description": "Install demo files" + }, + "example": { + "description": "Install example files" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 573e3155936ea1..d9d156fbfbbcbc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4398,7 +4398,7 @@ }, "nuklear": { "baseline": "2021-03-18", - "port-version": 0 + "port-version": 1 }, "numactl": { "baseline": "2.0.12", diff --git a/versions/n-/nuklear.json b/versions/n-/nuklear.json index 82d95ffb8ad2e5..195260366136e2 100644 --- a/versions/n-/nuklear.json +++ b/versions/n-/nuklear.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c243e51fbb0d9fa4562a3e4a8eba9a7fb2e0cdd", + "version-date": "2021-03-18", + "port-version": 1 + }, { "git-tree": "2a8abfe81ed0757650f10d7fd0e2ef8ecd484ae6", "version-string": "2021-03-18", From be1f446ec762dc58d548e0ad83865bd925c68bd4 Mon Sep 17 00:00:00 2001 From: bucurb Date: Fri, 16 Jul 2021 20:03:54 +0100 Subject: [PATCH 0128/1858] [Faiss] Fix dependencies (#18780) * fixed targets * bumped port version * updated sha * lapack-reference should always write into lapack * lapack-reference sha * Fixed clapack target * versions * sha * ensure cmake finds the cuda compiler * sha --- ports/clapack/FindLAPACK.cmake | 24 ++++++++++++------- ports/clapack/vcpkg.json | 2 +- ports/faiss/fix-dependencies.patch | 34 +++++++++++++++++++++++++++ ports/faiss/portfile.cmake | 11 ++++++++- ports/faiss/vcpkg.json | 3 ++- ports/lapack-reference/CONTROL | 2 +- ports/lapack-reference/portfile.cmake | 6 ++--- versions/baseline.json | 6 ++--- versions/c-/clapack.json | 5 ++++ versions/f-/faiss.json | 5 ++++ versions/l-/lapack-reference.json | 5 ++++ 11 files changed, 83 insertions(+), 20 deletions(-) create mode 100644 ports/faiss/fix-dependencies.patch diff --git a/ports/clapack/FindLAPACK.cmake b/ports/clapack/FindLAPACK.cmake index eff9bae705479e..aa546e672be054 100644 --- a/ports/clapack/FindLAPACK.cmake +++ b/ports/clapack/FindLAPACK.cmake @@ -200,10 +200,11 @@ if(CLAPACK_FOUND AND NOT TARGET clapack::clapack) endif() endif() -if(CLAPACK_FOUND AND NOT TARGET lapack) +# Ensure consistency with both CMake's vanilla as well as lapack-reference's FindLAPACK.cmake module and register the LAPACK::LAPACK target +if(CLAPACK_FOUND AND NOT TARGET LAPACK::LAPACK) if(EXISTS "${LAPACK_LIBRARY_RELEASE_DLL}") - add_library(lapack SHARED IMPORTED) - set_target_properties(lapack PROPERTIES + add_library(LAPACK::LAPACK SHARED IMPORTED) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_RELEASE "${LAPACK_LIBRARY_RELEASE_DLL}" IMPORTED_IMPLIB_RELEASE "${oLAPACK_LIBRARY_RELEASE}" INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" @@ -211,23 +212,28 @@ if(CLAPACK_FOUND AND NOT TARGET lapack) IMPORTED_CONFIGURATIONS Release IMPORTED_LINK_INTERFACE_LANGUAGES "C") if(EXISTS "${LAPACK_LIBRARY_DEBUG_DLL}") - set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(lapack PROPERTIES + set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_DEBUG "${LAPACK_LIBRARY_DEBUG_DLL}" IMPORTED_IMPLIB_DEBUG "${oLAPACK_LIBRARY_DEBUG}") endif() else() - add_library(lapack UNKNOWN IMPORTED) - set_target_properties(lapack PROPERTIES + add_library(LAPACK::LAPACK UNKNOWN IMPORTED) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_RELEASE "${oLAPACK_LIBRARY_RELEASE}" INTERFACE_INCLUDE_DIRECTORIES "${LAPACK_INCLUDE_DIR}" IMPORTED_CONFIGURATIONS Release INTERFACE_LINK_LIBRARIES "$<$>:${oF2C_LIBRARY_RELEASE}>;$<$:${oF2C_LIBRARY_DEBUG}>;$<$>:${LAPACK_BLAS_LIBRARY_RELEASE}>;$<$:${LAPACK_BLAS_LIBRARY_DEBUG}>;$;$" IMPORTED_LINK_INTERFACE_LANGUAGES "C") if(EXISTS "${LAPACK_LIBRARY_DEBUG}") - set_property(TARGET lapack APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) - set_target_properties(lapack PROPERTIES + set_property(TARGET LAPACK::LAPACK APPEND PROPERTY IMPORTED_CONFIGURATIONS Debug) + set_target_properties(LAPACK::LAPACK PROPERTIES IMPORTED_LOCATION_DEBUG "${oLAPACK_LIBRARY_DEBUG}") endif() endif() endif() + +# Preserve backwards compatibility and also register the 'lapack' target +if(CLAPACK_FOUND AND NOT TARGET lapack) + add_library(lapack ALIAS LAPACK::LAPACK) +endif() diff --git a/ports/clapack/vcpkg.json b/ports/clapack/vcpkg.json index 18f01ec83342f0..f0fd61e8f63342 100644 --- a/ports/clapack/vcpkg.json +++ b/ports/clapack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clapack", "version-string": "3.2.1", - "port-version": 18, + "port-version": 19, "description": "CLAPACK (f2c'ed version of LAPACK)", "homepage": "https://www.netlib.org/clapack", "dependencies": [ diff --git a/ports/faiss/fix-dependencies.patch b/ports/faiss/fix-dependencies.patch new file mode 100644 index 00000000000000..caddb6b5760cb1 --- /dev/null +++ b/ports/faiss/fix-dependencies.patch @@ -0,0 +1,34 @@ +diff --git a/cmake/faiss-config.cmake.in b/cmake/faiss-config.cmake.in +index 43ea9d4c..437a7f81 100644 +--- a/cmake/faiss-config.cmake.in ++++ b/cmake/faiss-config.cmake.in +@@ -4,4 +4,7 @@ + # This source code is licensed under the BSD-style license found in the + # LICENSE file in the root directory of this source tree. + ++find_dependency(OpenMP REQUIRED) ++find_dependency(BLAS REQUIRED) ++find_dependency(LAPACK REQUIRED) + include("${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake") +diff --git a/faiss/CMakeLists.txt b/faiss/CMakeLists.txt +index 51680fd1..691f52c2 100644 +--- a/faiss/CMakeLists.txt ++++ b/faiss/CMakeLists.txt +@@ -148,14 +148,14 @@ find_package(OpenMP REQUIRED) + target_link_libraries(faiss PRIVATE OpenMP::OpenMP_CXX) + + find_package(MKL) +-if(MKL_FOUND) ++if(0) + target_link_libraries(faiss PRIVATE ${MKL_LIBRARIES}) + else() + find_package(BLAS REQUIRED) +- target_link_libraries(faiss PRIVATE ${BLAS_LIBRARIES}) ++ target_link_libraries(faiss PRIVATE BLAS::BLAS) + + find_package(LAPACK REQUIRED) +- target_link_libraries(faiss PRIVATE ${LAPACK_LIBRARIES}) ++ target_link_libraries(faiss PRIVATE LAPACK::LAPACK) + endif() + + install(TARGETS faiss diff --git a/ports/faiss/portfile.cmake b/ports/faiss/portfile.cmake index 05a4273bf8de61..51529558f9a6f9 100644 --- a/ports/faiss/portfile.cmake +++ b/ports/faiss/portfile.cmake @@ -6,12 +6,21 @@ vcpkg_from_github( REF 0fb6c00cfa9487416b5cdf514f5f796476eecb06 # v1.6.4 SHA512 c7019615103fd29124c1f4458a47faebc5fe35545eea185c41cf643f2eabe82d134dc558c85f67faea7680c292abd7477ceefde157a7c3969eda78b77a23462b HEAD_REF master + PATCHES + fix-dependencies.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - gpu FAISS_ENABLE_GPU + FEATURES + gpu FAISS_ENABLE_GPU ) +if ("${FAISS_ENABLE_GPU}") + if (NOT VCPKG_CMAKE_SYSTEM_NAME AND NOT ENV{CUDACXX}) + set(ENV{CUDACXX} "$ENV{CUDA_PATH}/bin/nvcc.exe") + endif() +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/ports/faiss/vcpkg.json b/ports/faiss/vcpkg.json index 039513d3af3949..4b9c63691d7079 100644 --- a/ports/faiss/vcpkg.json +++ b/ports/faiss/vcpkg.json @@ -1,6 +1,7 @@ { "name": "faiss", - "version-string": "1.6.4", + "version-semver": "1.6.4", + "port-version": 1, "description": "Faiss is a library for efficient similarity search and clustering of dense vectors.", "homepage": "https://github.com/facebookresearch/faiss", "license": "MIT", diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL index 701e48b7d3b2f1..3e18ebd2b3db1c 100644 --- a/ports/lapack-reference/CONTROL +++ b/ports/lapack-reference/CONTROL @@ -1,6 +1,6 @@ Source: lapack-reference Version: 3.8.0 -Port-Version: 4 +Port-Version: 5 Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/ Default-Features: blas-select Build-Depends: vcpkg-gfortran (windows) diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 11655858c9d384..70e6059fff383b 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -137,7 +137,5 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() -if(NOT VCPKG_TARGET_IS_WINDOWS) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) -endif() +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindLAPACK.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/lapack) diff --git a/versions/baseline.json b/versions/baseline.json index d9d156fbfbbcbc..ed8287a1049389 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1266,7 +1266,7 @@ }, "clapack": { "baseline": "3.2.1", - "port-version": 18 + "port-version": 19 }, "clara": { "baseline": "1.1.5", @@ -1926,7 +1926,7 @@ }, "faiss": { "baseline": "1.6.4", - "port-version": 0 + "port-version": 1 }, "fakeit": { "baseline": "2.0.7", @@ -2966,7 +2966,7 @@ }, "lapack-reference": { "baseline": "3.8.0", - "port-version": 4 + "port-version": 5 }, "lastools": { "baseline": "2020-05-09", diff --git a/versions/c-/clapack.json b/versions/c-/clapack.json index db346fb134da71..f0700bc5a0ffa4 100644 --- a/versions/c-/clapack.json +++ b/versions/c-/clapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bedf61cf9cf765a2c823e1f2427a16af6d8a711e", + "version-string": "3.2.1", + "port-version": 19 + }, { "git-tree": "229447785643f09b1a4ef53bab355ff3757e178e", "version-string": "3.2.1", diff --git a/versions/f-/faiss.json b/versions/f-/faiss.json index a8209b68eaebe8..e98b785dcbcef6 100644 --- a/versions/f-/faiss.json +++ b/versions/f-/faiss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb401df0155a10cfc7cba057bbf63d10fdc37067", + "version-semver": "1.6.4", + "port-version": 1 + }, { "git-tree": "57552b56d2871ea87459fc655463067e1b02fcf3", "version-string": "1.6.4", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 0fd9ba4d7e79f5..96db87c743a626 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1887fc1fcb0c96df1ea24fffc9b045330426e3b6", + "version-string": "3.8.0", + "port-version": 5 + }, { "git-tree": "34971ac86a76f6bffefe5962980c3991abf87a58", "version-string": "3.8.0", From b4fb3d6d6cf1f620286aad7c13e213e830c999f1 Mon Sep 17 00:00:00 2001 From: "Lucius Q. User" <31438459+Lucius-Q-User@users.noreply.github.com> Date: Fri, 16 Jul 2021 22:51:32 +0300 Subject: [PATCH 0129/1858] [openssl] Fix x86-osx -> arm64-osx cross-compilation (#18630) --- ports/openssl/unix/CMakeLists.txt | 5 +++-- ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index fd8481693ed3d5..d434cf1f8a6655 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -76,7 +76,9 @@ elseif(CMAKE_OSX_SYSROOT AND CMAKE_C_COMPILE_OPTIONS_SYSROOT) set(CFLAGS "${CFLAGS} ${CMAKE_C_COMPILE_OPTIONS_SYSROOT}${CMAKE_OSX_SYSROOT}") endif() if (CMAKE_OSX_DEPLOYMENT_TARGET AND CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG) - set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") + set(CFLAGS "${CFLAGS} ${CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}") +elseif((CMAKE_SYSTEM_NAME STREQUAL "Darwin") AND (VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")) + set(CFLAGS "${CFLAGS} -mmacosx-version-min=11.0") endif() string(REGEX REPLACE "^ " "" CFLAGS "${CFLAGS}") @@ -168,7 +170,6 @@ if(NOT IOS) VERBATIM APPEND ) - if(EMSCRIPTEN) list(APPEND DISABLES threads diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 547f7ba5daf086..6dc21f4930b45f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 6, + "port-version": 7, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/versions/baseline.json b/versions/baseline.json index ed8287a1049389..99807fbd102a7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4630,7 +4630,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 6 + "port-version": 7 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 21a4dfb25adc98..474c91547d727b 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705", + "version-string": "1.1.1k", + "port-version": 7 + }, { "git-tree": "b96689b1d7a8ec6f50f40f4e2a6e36d199dc69a3", "version-string": "1.1.1k", From 1654ce40a01709d3d8fa1fd079500cc5bdb6195d Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Sat, 17 Jul 2021 04:53:49 +0900 Subject: [PATCH 0130/1858] [liburing] create a new port (#17623) * [liburing] create a new port * [liburing] patch datadir * [liburing] add port usage * with CMake module: FindPkgConfig * Update ports/liburing/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [liburing] comments for BUILD_SHARED * update git-tree SHA * [liburing] fix portfile * [liburing] configure with ENABLE_SHARED * update git-tree SHA * Update ports/liburing/usage * [liburing] fix mistype in usage * update git-tree SHA Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/liburing/fix-configure.patch | 35 +++++++++++++++++++++++++++ ports/liburing/fix-spec-version.patch | 11 +++++++++ ports/liburing/portfile.cmake | 35 +++++++++++++++++++++++++++ ports/liburing/usage | 6 +++++ ports/liburing/vcpkg.json | 7 ++++++ versions/baseline.json | 4 +++ versions/l-/liburing.json | 9 +++++++ 7 files changed, 107 insertions(+) create mode 100644 ports/liburing/fix-configure.patch create mode 100644 ports/liburing/fix-spec-version.patch create mode 100644 ports/liburing/portfile.cmake create mode 100644 ports/liburing/usage create mode 100644 ports/liburing/vcpkg.json create mode 100644 versions/l-/liburing.json diff --git a/ports/liburing/fix-configure.patch b/ports/liburing/fix-configure.patch new file mode 100644 index 00000000000000..92ebf2826f12fd --- /dev/null +++ b/ports/liburing/fix-configure.patch @@ -0,0 +1,35 @@ +diff --git a/configure b/configure +index 3b96cde..56d5cb0 100755 +--- a/configure ++++ b/configure +@@ -18,16 +18,18 @@ for opt do + ;; + --mandir=*) mandir="$optarg" + ;; +- --datadir=*) datadir="$optarg" ++ --datarootdir=*) datadir="$optarg" + ;; + --cc=*) cc="$optarg" + ;; + --cxx=*) cxx="$optarg" + ;; ++ --enable-shared) ENABLE_SHARED=1 ++ ;; ++ --enable-static) ENABLE_SHARED=0 ++ ;; + *) +- echo "ERROR: unknown option $opt" +- echo "Try '$0 --help' for more information" +- exit 1 ++ echo "WARNING: unknown option $opt" + ;; + esac + done +@@ -119,6 +121,7 @@ echo "# Automatically generated by configure - do not modify" > $config_host_mak + printf "# Configured with:" >> $config_host_mak + printf " '%s'" "$0" "$@" >> $config_host_mak + echo >> $config_host_mak ++echo "ENABLE_SHARED=${ENABLE_SHARED}" >> $config_host_mak + + do_cxx() { + # Run the compiler, capturing its output to the log. diff --git a/ports/liburing/fix-spec-version.patch b/ports/liburing/fix-spec-version.patch new file mode 100644 index 00000000000000..9acb1fc40434bb --- /dev/null +++ b/ports/liburing/fix-spec-version.patch @@ -0,0 +1,11 @@ +diff --git a/liburing.spec b/liburing.spec +index fa4d970..8607074 100644 +--- a/liburing.spec ++++ b/liburing.spec +@@ -1,5 +1,5 @@ + Name: liburing +-Version: 0.7 ++Version: 2.0 + Release: 1%{?dist} + Summary: Linux-native io_uring I/O access library + License: (GPLv2 with exceptions and LGPLv2+) or MIT diff --git a/ports/liburing/portfile.cmake b/ports/liburing/portfile.cmake new file mode 100644 index 00000000000000..304bef5ecc676a --- /dev/null +++ b/ports/liburing/portfile.cmake @@ -0,0 +1,35 @@ +vcpkg_fail_port_install(ON_TARGET "windows" "uwp" "osx" "ios" "android") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO axboe/liburing + REF liburing-2.0 + SHA512 8a7b37600246d44a94d3fed1ca4bb60e76f9ddc60bd3c237e600b60e77961a1125c8a1f230cb7569f959acf10b68b91aafb4935c1c2fd13d5df7373b374e47f5 + HEAD_REF master + PATCHES + fix-spec-version.patch # update version value for pkgconfig(.pc) files + fix-configure.patch # ignore unsupported options, handle ENABLE_SHARED +) + +# note: check ${SOURCE_PATH}/liburing.spec before updating configure options +vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + COPY_SOURCE + NO_DEBUG +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${CURRENT_PORT_DIR}/usage + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +# note: {SOURCE_PATH}/src/Makefile makes liburing.so from liburing.a. +# For dynamic, remove intermediate file liburing.a when install is finished. +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/liburing.a + ${CURRENT_PACKAGES_DIR}/lib/liburing.a + ) +endif() +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man) diff --git a/ports/liburing/usage b/ports/liburing/usage new file mode 100644 index 00000000000000..36a7188959a198 --- /dev/null +++ b/ports/liburing/usage @@ -0,0 +1,6 @@ +The package liburing can be imported via CMake FindPkgConfig module: + + include(FindPkgConfig) + pkg_check_modules(liburing REQUIRED IMPORTED_TARGET GLOBAL liburing>=2.0) + + target_link_libraries(main PRIVATE PkgConfig::liburing) diff --git a/ports/liburing/vcpkg.json b/ports/liburing/vcpkg.json new file mode 100644 index 00000000000000..e2bb1b53e23a5f --- /dev/null +++ b/ports/liburing/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "liburing", + "version": "2.0", + "description": "Linux-native io_uring I/O access library", + "homepage": "https://github.com/axboe/liburing", + "supports": "linux" +} diff --git a/versions/baseline.json b/versions/baseline.json index 99807fbd102a7e..84820cd7582111 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3668,6 +3668,10 @@ "baseline": "4.3-0", "port-version": 0 }, + "liburing": { + "baseline": "2.0", + "port-version": 0 + }, "libusb": { "baseline": "1.0.24", "port-version": 4 diff --git a/versions/l-/liburing.json b/versions/l-/liburing.json new file mode 100644 index 00000000000000..0ec46a4a754a02 --- /dev/null +++ b/versions/l-/liburing.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b4d90242721d15d6dc5287690c3b8d42c2e8d0f0", + "version": "2.0", + "port-version": 0 + } + ] +} From d3a3e6c80502cdcc0ebd83b9609f9a95644e4d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 17 Jul 2021 03:55:36 +0800 Subject: [PATCH 0131/1858] [mlpack] Add feature openmp (#18942) * [mlpack] Add feature openmp * format manifest * add version stuff * Update ports/mlpack/portfile.cmake * Update versions/m-/mlpack.json --- ports/mlpack/fix-dependencies.patch | 13 +++++++++++++ ports/mlpack/portfile.cmake | 5 ++++- ports/mlpack/vcpkg.json | 5 ++++- versions/baseline.json | 2 +- versions/m-/mlpack.json | 5 +++++ 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 ports/mlpack/fix-dependencies.patch diff --git a/ports/mlpack/fix-dependencies.patch b/ports/mlpack/fix-dependencies.patch new file mode 100644 index 00000000000000..2de2682ac416c4 --- /dev/null +++ b/ports/mlpack/fix-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4dd92f0..bfa697d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -488,7 +488,7 @@ add_definitions(-DBOOST_TEST_DYN_LINK) + # } + # #endif + if (USE_OPENMP) +- find_package(OpenMP) ++ find_package(OpenMP REQUIRED) + endif () + + if (OPENMP_FOUND) diff --git a/ports/mlpack/portfile.cmake b/ports/mlpack/portfile.cmake index 51e2ac6f060610..058bcf9f8740a0 100644 --- a/ports/mlpack/portfile.cmake +++ b/ports/mlpack/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( cmakelists.patch fix-configure-error.patch fix-test-dependency.patch + fix-dependencies.patch ) file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindACML.cmake) @@ -22,7 +23,9 @@ file(REMOVE ${SOURCE_PATH}/CMake/ARMA_FindOpenBLAS.cmake) file(REMOVE ${SOURCE_PATH}/CMake/FindArmadillo.cmake) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools BUILD_CLI_EXECUTABLES + FEATURES + tools BUILD_CLI_EXECUTABLES + openmp USE_OPENMP ) vcpkg_configure_cmake( diff --git a/ports/mlpack/vcpkg.json b/ports/mlpack/vcpkg.json index 62317fa71eec19..2998ba1f5ce855 100644 --- a/ports/mlpack/vcpkg.json +++ b/ports/mlpack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mlpack", "version": "3.4.1", - "port-version": 1, + "port-version": 2, "description": "mlpack is a fast, flexible machine learning library, written in C++, that aims to provide fast, extensible implementations of cutting-edge machine learning algorithms.", "homepage": "https://github.com/mlpack/mlpack", "supports": "uwp", @@ -17,6 +17,9 @@ "stb" ], "features": { + "openmp": { + "description": "use OpenMP for parallelization." + }, "tools": { "description": "Build command-line executables." } diff --git a/versions/baseline.json b/versions/baseline.json index 84820cd7582111..88a4bcd85a9ef8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4082,7 +4082,7 @@ }, "mlpack": { "baseline": "3.4.1", - "port-version": 1 + "port-version": 2 }, "mman": { "baseline": "git-f5ff813-3", diff --git a/versions/m-/mlpack.json b/versions/m-/mlpack.json index 585e56e2741986..cb0e68931db259 100644 --- a/versions/m-/mlpack.json +++ b/versions/m-/mlpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "587ee2575ef7543ff9a0ed30e645154db26f0001", + "version": "3.4.1", + "port-version": 2 + }, { "git-tree": "4793fb5802e10e645d5d33e0ec2baf6f1a0a337b", "version": "3.4.1", From c8d4a28725c4a055cbef5b23762c3d85d875a8d5 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Sat, 17 Jul 2021 09:50:58 -0700 Subject: [PATCH 0132/1858] Update vcpkg-tool to 2021-07-16. (#18983) --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 6ffcddddcecf21..e1858130a18ca9 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-29/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-07-16/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0c612cff2af07e..fdf57c9716d367 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -278,8 +278,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-06-29" -vcpkgToolReleaseSha="ffaa649cdb996946deff538ed0df192dffff41eb838179566aa77f91cdaaeadea7cd058bb4b230057f4b14703fbcd3c557b398ec7388d94177d3fc31073e7b6b" +vcpkgToolReleaseTag="2021-07-16" +vcpkgToolReleaseSha="e86a70ea63c79fd86099af271e7aff7d1436e703a2bcb56b5671d1ff49924d44e2fa0d8ab64684b20d50d0872d7b4eb2c7b0800899eedf19f51bf11bf3a4fb44" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" From d267de6679c611ef07207a558640cd0ee5193cc7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 19 Jul 2021 12:11:33 -0700 Subject: [PATCH 0133/1858] [pistache] Build fixes from 2021-07-18 (#18994) --- ports/pistache/disable-warnings.patch | 12 ++++++++++++ ports/pistache/portfile.cmake | 11 ++++++----- ports/pistache/vcpkg.json | 1 + scripts/ci.baseline.txt | 8 -------- versions/baseline.json | 10 +++++----- versions/p-/pistache.json | 5 +++++ 6 files changed, 29 insertions(+), 18 deletions(-) create mode 100644 ports/pistache/disable-warnings.patch diff --git a/ports/pistache/disable-warnings.patch b/ports/pistache/disable-warnings.patch new file mode 100644 index 00000000000000..717937ff8bd980 --- /dev/null +++ b/ports/pistache/disable-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e051efa..9d65174 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,6 @@ project (pistache + + include(GNUInstallDirs) + +-add_compile_options(-Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) + + include(CheckAtomic) diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake index 409c0e0f663771..9c50d2f00d60be 100644 --- a/ports/pistache/portfile.cmake +++ b/ports/pistache/portfile.cmake @@ -10,11 +10,12 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-debug-empty.patch + disable-warnings.patch ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA ) vcpkg_install_cmake() @@ -22,8 +23,8 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/RapidJSON) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json index 30a1bf4ed1f68c..0cac84c446f3ea 100644 --- a/ports/pistache/vcpkg.json +++ b/ports/pistache/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pistache", "version-date": "2021-03-31", + "port-version": 1, "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", "homepage": "https://github.com/oktal/pistache", "supports": "linux" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8dbff9980f15fa..12292644fa60a7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -208,8 +208,6 @@ devicenameresolver:x64-windows-static=fail dimcli:arm-uwp=fail dimcli:x64-osx=fail dimcli:x64-uwp=fail -# directxtex requires GCC 9 or later for linux support -directxtex:x64-linux=fail discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail @@ -353,9 +351,6 @@ fuzzylite:x64-uwp=fail gainput:arm-uwp=fail gainput:x64-linux=fail gainput:x64-uwp=fail - -# Requires a more recent gcc than we have in the test lab -gamedev-framework:x64-linux=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail @@ -1611,8 +1606,6 @@ v8:arm64-windows=fail v8:arm-uwp=fail v8:x64-osx=fail v8:x64-uwp=fail -# The domain hosting vamp-sdk uses a newer root cert than is available in our linux CI -vamp-sdk:x64-linux=fail vectorclass:arm64-windows=fail vectorclass:arm-uwp=fail vlpp:x64-osx=fail @@ -1750,7 +1743,6 @@ libmicrohttpd:x64-windows-static-md=fail libspatialite:x64-windows-static-md=fail linenoise-ng:x64-windows-static-md=fail mmloader:x64-windows-static-md=fail -mpg123:x64-windows-static-md=fail netcdf-cxx4:x64-windows-static-md=fail open62541:x64-windows-static-md=fail openscap:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 88a4bcd85a9ef8..f9fe61ec9386f7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3120,14 +3120,14 @@ "baseline": "0.6.0-1", "port-version": 0 }, - "libebur128": { - "baseline": "1.2.6", - "port-version": 0 - }, "libe57": { "baseline": "1.1.312", "port-version": 0 }, + "libebur128": { + "baseline": "1.2.6", + "port-version": 0 + }, "libepoxy": { "baseline": "1.5.5", "port-version": 0 @@ -4862,7 +4862,7 @@ }, "pistache": { "baseline": "2021-03-31", - "port-version": 0 + "port-version": 1 }, "pixel": { "baseline": "0.3-1", diff --git a/versions/p-/pistache.json b/versions/p-/pistache.json index 68755a316274a6..bfdcc2db1e05c2 100644 --- a/versions/p-/pistache.json +++ b/versions/p-/pistache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6b15d3a79abbfb78408d1f49e8b976bcb9003f2", + "version-date": "2021-03-31", + "port-version": 1 + }, { "git-tree": "f2c28dea6191ea1f399a862889d095f1d268a3f0", "version-date": "2021-03-31", From ec859c7ff2c0b6adcb2c9d007b11710e54c52a6d Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Tue, 20 Jul 2021 02:34:57 +0700 Subject: [PATCH 0134/1858] [libffi] Update to v3.4.2 (#18995) * [libffi] Update to v3.4.2 * [vcpkg baseline] Update libffi * [libffi] Add i686 as supported processor * [vcpkg baseline] Update libffi --- ports/libffi/CMakeLists.txt | 7 +-- ports/libffi/fficonfig.h | 6 +-- ports/libffi/portfile.cmake | 9 ++-- ports/libffi/vcpkg.json | 3 +- .../win32-disable-stackframe-check.patch | 29 ------------- .../win64-disable-stackframe-check.patch | 43 ------------------- versions/baseline.json | 4 +- versions/l-/libffi.json | 5 +++ 8 files changed, 18 insertions(+), 88 deletions(-) delete mode 100644 ports/libffi/win32-disable-stackframe-check.patch delete mode 100644 ports/libffi/win64-disable-stackframe-check.patch diff --git a/ports/libffi/CMakeLists.txt b/ports/libffi/CMakeLists.txt index bfdd2e60b1bcb2..f69edfc899a361 100644 --- a/ports/libffi/CMakeLists.txt +++ b/ports/libffi/CMakeLists.txt @@ -9,9 +9,9 @@ if(NOT CMAKE_SYSTEM_PROCESSOR) endif() # config variables for ffi.h.in -set(VERSION 3.3) +set(VERSION 3.4.2) -set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 armv7l armv7-a aarch64) +set(KNOWN_PROCESSORS x86 x86_64 amd64 arm arm64 i386 i686 armv7l armv7-a aarch64) string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" lower_system_processor) @@ -74,7 +74,8 @@ endif() set(FFI_SOURCES src/closures.c src/prep_cif.c - src/types.c) + src/types.c + src/tramp.c) if ("${TARGET}" STREQUAL "ARM_WIN64" OR "${TARGET}" STREQUAL "ARM64") set(FFI_SOURCES diff --git a/ports/libffi/fficonfig.h b/ports/libffi/fficonfig.h index 2ed4e0199a43e0..fc00af94a91737 100644 --- a/ports/libffi/fficonfig.h +++ b/ports/libffi/fficonfig.h @@ -25,10 +25,10 @@ #define PACKAGE "libffi" #define PACKAGE_BUGREPORT "http://github.com/libffi/libffi/issues" #define PACKAGE_NAME "libffi" -#define PACKAGE_STRING "libffi 3.3" +#define PACKAGE_STRING "libffi 3.4.2" #define PACKAGE_TARNAME "libffi" #define PACKAGE_URL "" -#define PACKAGE_VERSION "3.3" +#define PACKAGE_VERSION "3.4.2" #define SIZEOF_DOUBLE 8 #define SIZEOF_LONG_DOUBLE 8 #ifndef _WIN64 @@ -42,7 +42,7 @@ #define SYMBOL_UNDERSCORE 1 #endif #endif -#define VERSION "3.3" +#define VERSION "3.4.2" #if defined AC_APPLE_UNIVERSAL_BUILD # if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index da39de67d7ac0d..8a9c69489fc5fe 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -1,14 +1,11 @@ -set(VERSION 3.3) +set(VERSION 3.4.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libffi/libffi - REF v3.3 - SHA512 62798fb31ba65fa2a0e1f71dd3daca30edcf745dc562c6f8e7126e54db92572cc63f5aa36d927dd08375bb6f38a2380ebe6c5735f35990681878fc78fc9dbc83 + REF v${VERSION} + SHA512 d399319efcca375fe901b05722e25eca31d11a4261c6a5d5079480bbc552d4e4b42de2026912689d3b2f886ebb3c8bebbea47102e38a2f6acbc526b8d5bba388 HEAD_REF master - PATCHES - win64-disable-stackframe-check.patch - win32-disable-stackframe-check.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index d4d8d87ee68dac..1b015d4037365d 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libffi", - "version": "3.3", - "port-version": 9, + "version": "3.4.2", "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi" } diff --git a/ports/libffi/win32-disable-stackframe-check.patch b/ports/libffi/win32-disable-stackframe-check.patch deleted file mode 100644 index f9a1b186f65f4c..00000000000000 --- a/ports/libffi/win32-disable-stackframe-check.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/x86/ffi.c b/src/x86/ffi.c -index 9a59218..9f5d703 100644 ---- a/src/x86/ffi.c -+++ b/src/x86/ffi.c -@@ -255,6 +255,14 @@ static const struct abi_params abi_params[FFI_LAST_ABI] = { - - extern void FFI_DECLARE_FASTCALL ffi_call_i386(struct call_frame *, char *) FFI_HIDDEN; - -+/* we perform some black magic here to use some of the parent's -+ * stack frame in ff_call_win() that breaks with the msvc compiler -+ * with the /RTCs or /GZ flags. Disable the 'Stack frame run time -+ * error checking' for this function so we don't hit weird exceptions -+ * in debug builds */ -+#if defined(_MSC_VER) -+#pragma runtime_checks("s", off) -+#endif - static void - ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue, - void **avalue, void *closure) -@@ -390,6 +398,9 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue, - - ffi_call_i386 (frame, stack); - } -+#if defined(_MSC_VER) -+#pragma runtime_checks("s", restore) -+#endif - - void - ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) diff --git a/ports/libffi/win64-disable-stackframe-check.patch b/ports/libffi/win64-disable-stackframe-check.patch deleted file mode 100644 index ce3d3ca5574009..00000000000000 --- a/ports/libffi/win64-disable-stackframe-check.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 53291b332b1bc061a3409d3b60c38f313609b98e Mon Sep 17 00:00:00 2001 -From: Matthew Waters -Date: Fri, 16 Mar 2018 15:10:04 +1100 -Subject: [PATCH] x86/win64: disable runtime stack frame checks with msvc - around built assembly - -MSVC can add truntime code that checks if a stack frame is mismanaged -however our custom assembly delibrately accesses and modifies the parent -stack frame. Fortunately we can disable that specific check for the -function call so do that. ---- - src/x86/ffiw64.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/x86/ffiw64.c b/src/x86/ffiw64.c -index f7875252..88bb3a34 100644 ---- a/src/x86/ffiw64.c -+++ b/src/x86/ffiw64.c -@@ -106,6 +106,14 @@ EFI64(ffi_prep_cif_machdep)(ffi_cif *cif) - return FFI_OK; - } - -+/* we perform some black magic here to use some of the parent's -+ * stack frame in ff_call_win64() that breaks with the msvc compiler -+ * with the /RTCs or /GZ flags. Disable the 'Stack frame run time -+ * error checking' for this function so we don't hit weird exceptions -+ * in debug builds */ -+#if defined(_MSC_VER) -+#pragma runtime_checks("s", off) -+#endif - static void - ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue, - void **avalue, void *closure) -@@ -170,6 +178,9 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue, - - ffi_call_win64 (stack, frame, closure); - } -+#if defined(_MSC_VER) -+#pragma runtime_checks("s", restore) -+#endif - - void - EFI64(ffi_call)(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue) diff --git a/versions/baseline.json b/versions/baseline.json index f9fe61ec9386f7..a9ab8edda04779 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3149,8 +3149,8 @@ "port-version": 0 }, "libffi": { - "baseline": "3.3", - "port-version": 9 + "baseline": "3.4.2", + "port-version": 0 }, "libfido2": { "baseline": "1.7.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index 328f93a08a7bf3..f866b768649419 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "683012a89ed0185eecbc3035b2490af7d2cd2379", + "version": "3.4.2", + "port-version": 0 + }, { "git-tree": "c40f59f0527e2336818bd5d6b0d14ae2bdc5c286", "version": "3.3", From bcd13951721fb074fdbc7962c1a137316b3ef1eb Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 20 Jul 2021 01:42:44 +0200 Subject: [PATCH 0135/1858] [exiv2] Make add nls feature (#18964) --- ports/exiv2/portfile.cmake | 9 +++++++-- ports/exiv2/vcpkg-cmake-wrapper.cmake | 8 ++++++-- ports/exiv2/vcpkg.json | 8 +++++++- versions/baseline.json | 2 +- versions/e-/exiv2.json | 5 +++++ 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/ports/exiv2/portfile.cmake b/ports/exiv2/portfile.cmake index eea46e2ba5212e..ff544138e5448c 100644 --- a/ports/exiv2/portfile.cmake +++ b/ports/exiv2/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS xmp EXIV2_ENABLE_XMP video EXIV2_ENABLE_VIDEO png EXIV2_ENABLE_PNG + nls EXIV2_ENABLE_NLS ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" EXIV2_CRT_DYNAMIC) @@ -35,7 +36,6 @@ vcpkg_configure_cmake( -DEXIV2_BUILD_SAMPLES=OFF -DEXIV2_BUILD_DOC=OFF -DEXIV2_ENABLE_EXTERNAL_XMP=OFF - -DEXIV2_ENABLE_NLS=OFF -DEXIV2_ENABLE_PRINTUCS2=OFF -DEXIV2_ENABLE_LENSDATA=ON -DEXIV2_ENABLE_DYNAMIC_RUNTIME=${EXIV2_CRT_DYNAMIC} @@ -53,6 +53,11 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/exiv2) vcpkg_fixup_pkgconfig() +if("nls" IN_LIST FEATURES) + set(EXIV2_ENABLE_NLS ON) +else() + set(EXIV2_ENABLE_NLS OFF) +endif() configure_file( ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT} @@ -70,4 +75,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/exiv2/vcpkg-cmake-wrapper.cmake b/ports/exiv2/vcpkg-cmake-wrapper.cmake index ab71ccdb702a5f..354a7909cdafa6 100644 --- a/ports/exiv2/vcpkg-cmake-wrapper.cmake +++ b/ports/exiv2/vcpkg-cmake-wrapper.cmake @@ -2,11 +2,15 @@ _find_package(${ARGS}) if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") find_package(Iconv REQUIRED) - find_package(Intl REQUIRED) + if(@EXIV2_ENABLE_NLS@) + find_package(Intl REQUIRED) + endif() if(TARGET exiv2lib) set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Iconv ) - target_link_libraries(exiv2lib INTERFACE ${Intl_LIBRARIES}) + if(@EXIV2_ENABLE_NLS@) + target_link_libraries(exiv2lib INTERFACE ${Intl_LIBRARIES}) + endif() endif() endif() diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index 2b9a3675537bf8..a043f83bfefe54 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,14 +1,20 @@ { "name": "exiv2", "version": "0.27.4", + "port-version": 1, "description": "Image metadata library and tools", "homepage": "https://www.exiv2.org", "supports": "!uwp", "dependencies": [ - "gettext", "libiconv" ], "features": { + "nls": { + "description": "Build native language support", + "dependencies": [ + "gettext" + ] + }, "png": { "description": "Build with png support (requires libz)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a9ab8edda04779..2bb97dcd7c9a7f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1898,7 +1898,7 @@ }, "exiv2": { "baseline": "0.27.4", - "port-version": 0 + "port-version": 1 }, "expat": { "baseline": "2.4.1", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index f02a909cc0f3ee..5673a816d02653 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e93f266421999dd82b931b2dbf672d255b14b43", + "version": "0.27.4", + "port-version": 1 + }, { "git-tree": "f716a33e59b24c79140216d836644fe0603e322b", "version": "0.27.4", From 803f87f332eaeb5ea03debc2b29466f0d1a7b72d Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 20 Jul 2021 08:20:59 +0800 Subject: [PATCH 0136/1858] [simdjson] Update to v0.9.6 (#18479) * [simdjson] Update to 0.9.6 * [simdjson] Update * [simdjson] Overwrite version * [simdjson] no-deprecated -> deprecated Features need to be additive, not subtractive. * [simdjson] Remove unnecessary code * [simdjson] Overwrite version * [simdjson] Enable deprecated APIs by default * [simdjson] Overwrite version --- ports/simdjson/portfile.cmake | 35 +++++++++++++++++++---------------- ports/simdjson/vcpkg.json | 21 ++++++++++++++++++--- versions/baseline.json | 4 ++-- versions/s-/simdjson.json | 5 +++++ 4 files changed, 44 insertions(+), 21 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index e3e701690e3db5..ffc1ba2fd528a2 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,23 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF c6c29c28278aeb29998e89f008908d951bb40c39 # v0.9.2 + REF e9b893ff1b13c6a70135827c62b3f3d65938d135 # v0.9.6 HEAD_REF master - SHA512 2c033e8fa253103f00606b7a14502d19c06385f22d1d09ea4b1edc6f443ba51ee95d49c790a05a64e28cd03f4350118b23c3c7f759a60e26a43da658609a5317 + SHA512 977b92ffae7219680f3d8567b1911b0d17ac1143a2ba58d7a4007cdcbf42dca6362853fcf3c3caf4af2029bc5f6a3cb8fab6139050a9d8539e8e4c7df646837d +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + exceptions SIMDJSON_EXCEPTIONS + threads SIMDJSON_ENABLE_THREADS + INVERTED_FEATURES + deprecated SIMDJSON_DISABLE_DEPRECATED_API ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTATION_ARM64) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} - -DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64} -DSIMDJSON_JUST_LIBRARY=ON - -DSIMDJSON_GOOGLE_BENCHMARKS=OFF - -DSIMDJSON_COMPETITION=OFF - -DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495 + -DSIMDJSON_SANITIZE_UNDEFINED=OFF + -DSIMDJSON_SANITIZE=OFF + -DSIMDJSON_SANITIZE_THREADS=OFF + -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} + -DSIMDJSON_DEVELOPMENT_CHECKS=OFF + -DSIMDJSON_VERBOSE_LOGGING=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -26,13 +36,6 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/simdjson.h - "#if SIMDJSON_USING_LIBRARY" - "#if 1" - ) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 0eb3ed90d7c1d1..13f89c1a7c590e 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "simdjson", - "version": "0.9.2", - "port-version": 1, + "version": "0.9.6", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", @@ -14,5 +13,21 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "default-features": [ + "deprecated", + "exceptions", + "threads" + ], + "features": { + "deprecated": { + "description": "Enable deprecated APIs" + }, + "exceptions": { + "description": "Enable exception-throwing interface" + }, + "threads": { + "description": "Link with thread support" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 2bb97dcd7c9a7f..a068e8be6ee5ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5805,8 +5805,8 @@ "port-version": 0 }, "simdjson": { - "baseline": "0.9.2", - "port-version": 1 + "baseline": "0.9.6", + "port-version": 0 }, "simple-fft": { "baseline": "2020-06-14", diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 4de86b07f85344..8570d578b415bf 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b913c5ecbf889a46c809032952c348605a78a391", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "c9528b67438ec071c4108f925f3976b937f91469", "version": "0.9.2", From d72b2335dbfc2ec1ffb51d3a61243330b303bb1f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 19 Jul 2021 19:29:59 -0700 Subject: [PATCH 0137/1858] [embree2] Fix static linking (#18985) * [embree2] Fix static linking Recently attempting to build embree2 is causing our osx workers to die. Example recent CIs: https://dev.azure.com/vcpkg/public/_build/results?buildId=56146 https://dev.azure.com/vcpkg/public/_build/results?buildId=55886 https://dev.azure.com/vcpkg/public/_build/results?buildId=55802 Notably, we don't see this problem in PRs because it is marked "fail" in ci.baseline.txt. Initially, I was going to change it to skip, but observed that the project uses an ordinary cmake build and all the failing triplets were static ones. If this PR passes, the hope is that CI with this change will pass too. * Disable embree2 more directly for mac and linux because the portfile isn't prepared for it. * Small changes * Update the baseline version * Use string(COMPARE EQUAL for EMBREE_STATIC_RUNTIME as well. Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/embree2/portfile.cmake | 48 ++++++++++++++++++------------------ ports/embree2/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 4 --- versions/baseline.json | 2 +- versions/e-/embree2.json | 5 ++++ 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake index 1cb9b6babd44bc..3c38547f85b434 100644 --- a/ports/embree2/portfile.cmake +++ b/ports/embree2/portfile.cmake @@ -8,21 +8,19 @@ vcpkg_from_github( cmake_policy.patch ) -file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake) +file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake") -if(VCPKG_CRT_LINKAGE STREQUAL static) - set(EMBREE_STATIC_RUNTIME ON) -else() - set(EMBREE_STATIC_RUNTIME OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA # Disable this option if project cannot be built with Ninja + PREFER_NINJA OPTIONS -DEMBREE_ISPC_SUPPORT=OFF -DEMBREE_TUTORIALS=OFF + -DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB} -DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME} "-DTBB_LIBRARIES=TBB::tbb" "-DTBB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include" @@ -34,19 +32,21 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() # these cmake files do not seem to contain helpful configuration for find libs, just remove them -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config-version.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree2/doc) - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree2) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree2/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree2/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/models") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/models") + +if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/embree2") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/embree2/doc") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json index 683e2eabb2114e..2ca3509644d32a 100644 --- a/ports/embree2/vcpkg.json +++ b/ports/embree2/vcpkg.json @@ -1,9 +1,10 @@ { "name": "embree2", "version-semver": "2.17.7", - "port-version": 1, + "port-version": 2, "description": "High Performance Ray Tracing Kernels.", "homepage": "https://github.com/embree/embree", + "supports": "windows", "dependencies": [ "tbb" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 12292644fa60a7..24f685e1c1e49e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -268,10 +268,6 @@ ecsutil:x64-osx=fail ecsutil:x64-uwp=fail # Checks for gnu extension so only works with gcc. elfutils:x64-osx=fail -embree2:x64-linux=fail -embree2:x64-osx=fail -embree2:x64-windows-static=fail -embree2:x64-windows-static-md=fail enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index a068e8be6ee5ab..cef33e4dee056e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1862,7 +1862,7 @@ }, "embree2": { "baseline": "2.17.7", - "port-version": 1 + "port-version": 2 }, "embree3": { "baseline": "3.12.2", diff --git a/versions/e-/embree2.json b/versions/e-/embree2.json index c586f06ec7679f..2502c3c01abcb3 100644 --- a/versions/e-/embree2.json +++ b/versions/e-/embree2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc259bcc8185631761c55b23d95afba48e8bae70", + "version-semver": "2.17.7", + "port-version": 2 + }, { "git-tree": "234d3da49438399d5df9e1a105401bc930ae22fe", "version-semver": "2.17.7", From 255a8c8c4b4568638c2d71c20aafff330ea9582f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 19 Jul 2021 19:55:00 -0700 Subject: [PATCH 0138/1858] Do not emit 'PASSING, REMOVE FROM FAIL LIST' results when using vcpkg to test prerelease versions of MSVC++ (#19011) --- scripts/azure-pipelines/analyze-test-results.ps1 | 11 ++++++++++- scripts/azure-pipelines/test-modified-ports.ps1 | 11 +++++++++-- scripts/azure-pipelines/windows-unstable/job.yml | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/azure-pipelines/analyze-test-results.ps1 b/scripts/azure-pipelines/analyze-test-results.ps1 index d96069abe6d19c..29cf01cc30d04d 100755 --- a/scripts/azure-pipelines/analyze-test-results.ps1 +++ b/scripts/azure-pipelines/analyze-test-results.ps1 @@ -23,6 +23,10 @@ The triplet to analyze. .PARAMETER baselineFile The path to the ci.baseline.txt file in the vcpkg repository. + +.PARAMETER passingIsPassing +Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used +when using vcpkg to test a prerelease MSVC++ compiler) #> [CmdletBinding()] Param( @@ -32,7 +36,8 @@ Param( [Parameter(Mandatory = $true)] [string]$triplet, [Parameter(Mandatory = $true)] - [string]$baselineFile + [string]$baselineFile, + [switch]$passingIsPassing = $false ) $ErrorActionPreference = 'Stop' @@ -400,6 +405,10 @@ function write_errors_for_summary { Write-Verbose "checking $($testName):$triplet $($test.result)" if ($test.result -eq 'Fail') { + if (($test.currentResult) -eq "pass" -and $passingIsPassing) { + continue; + } + $failure_found = $true if ($test.currentResult -eq "pass") { [System.Console]::Error.WriteLine( ` diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 11d98e5ce29a82..e089d7a1c5ca86 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -29,6 +29,10 @@ this parameter is not set, binary caching will not be used. Example: "files,W:\" The reason Azure Pipelines is running this script (controls in which mode Binary Caching is used). If BinarySourceStub is not set, this parameter has no effect. If BinarySourceStub is set and this is not, binary caching will default to read-write mode. + +.PARAMETER PassingIsPassing +Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used +when using vcpkg to test a prerelease MSVC++ compiler) #> [CmdletBinding(DefaultParameterSetName="ArchivesRoot")] @@ -47,7 +51,9 @@ Param( $UseEnvironmentSasToken = $false, [Parameter(ParameterSetName='BinarySourceStub')] $BinarySourceStub = $null, - $BuildReason = $null + $BuildReason = $null, + [switch] + $PassingIsPassing = $false ) if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { @@ -148,4 +154,5 @@ else } & "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` -triplet $Triplet ` - -baselineFile .\scripts\ci.baseline.txt + -baselineFile .\scripts\ci.baseline.txt ` + -passingIsPassing:$PassingIsPassing diff --git a/scripts/azure-pipelines/windows-unstable/job.yml b/scripts/azure-pipelines/windows-unstable/job.yml index 93690e957df794..346e2bcf3b2aac 100644 --- a/scripts/azure-pipelines/windows-unstable/job.yml +++ b/scripts/azure-pipelines/windows-unstable/job.yml @@ -72,7 +72,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -PassingIsPassing' pwsh: true - task: PowerShell@2 displayName: 'Report on Disk Space After Build' From 0f44281f866c4f9a247e895f747a99ec7534847b Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Tue, 20 Jul 2021 12:24:58 -0500 Subject: [PATCH 0139/1858] [rollup] Rollup PR 2021-07-16 (#19001) * [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY) [vcpkg-cmake] Add check for unused cmake variables * [rollup:2021-07-16 2/7] PR #18397 (@strega-nil) [vcpkg_list] add new function * [rollup:2021-07-16 3/7] PR #18782 (@strega-nil) [scripts-audit] vcpkg_build_ninja * [rollup:2021-07-16 4/7] PR #18784 (@strega-nil) [scripts-audit] vcpkg_minimum_required * [rollup:2021-07-16 5/7] PR #18785 (@strega-nil) [scripts-audit] vcpkg_replace_string * [rollup:2021-07-16 6/7] PR #18786 (@strega-nil) [scripts-audit] windows scripts * [rollup:2021-07-16 7/7] PR #18945 (@strega-nil) [many ports] remove deprecated vcpkg_check_features call [1/5] Co-authored-by: nicole mazzuca Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- docs/maintainers/portfile-functions.md | 1 + .../vcpkg-cmake/vcpkg_cmake_configure.md | 7 + docs/maintainers/vcpkg_configure_cmake.md | 4 + docs/maintainers/vcpkg_list.md | 94 ++ docs/maintainers/vcpkg_replace_string.md | 3 +- ports/apr/CONTROL | 9 - ports/apr/portfile.cmake | 3 +- ports/apr/vcpkg.json | 13 + ports/azure-iot-sdk-c/CONTROL | 12 - ports/azure-iot-sdk-c/portfile.cmake | 7 +- ports/azure-iot-sdk-c/vcpkg.json | 62 ++ ports/azure-kinect-sensor-sdk/CONTROL | 13 - ports/azure-kinect-sensor-sdk/portfile.cmake | 5 +- ports/azure-kinect-sensor-sdk/vcpkg.json | 45 + ports/bitserializer/CONTROL | 22 - ports/bitserializer/portfile.cmake | 9 +- ports/bitserializer/vcpkg.json | 42 + ports/bond/portfile.cmake | 29 +- ports/bond/vcpkg.json | 4 +- ports/botan/portfile.cmake | 3 +- ports/botan/vcpkg.json | 2 +- ports/capstone/CONTROL | 51 -- ports/capstone/portfile.cmake | 31 +- ports/capstone/vcpkg.json | 62 ++ ports/ceres/portfile.cmake | 11 +- ports/ceres/vcpkg.json | 2 +- ports/cgal/CONTROL | 10 - ports/cgal/portfile.cmake | 3 +- ports/cgal/vcpkg.json | 69 ++ ports/civetweb/CONTROL | 10 - ports/civetweb/portfile.cmake | 3 +- ports/civetweb/vcpkg.json | 16 + ports/cjson/CONTROL | 7 - ports/cjson/portfile.cmake | 3 +- ports/cjson/vcpkg.json | 12 + ports/clue/CONTROL | 7 - ports/clue/portfile.cmake | 5 +- ports/clue/vcpkg.json | 12 + ports/cppzmq/CONTROL | 9 - ports/cppzmq/portfile.cmake | 3 +- ports/cppzmq/vcpkg.json | 15 + ports/crashrpt/CONTROL | 16 - ports/crashrpt/portfile.cmake | 7 +- ports/crashrpt/vcpkg.json | 37 + ports/dlib/CONTROL | 19 - ports/dlib/portfile.cmake | 7 +- ports/dlib/vcpkg.json | 38 + ports/dmlc/CONTROL | 9 - ports/dmlc/portfile.cmake | 5 +- ports/dmlc/vcpkg.json | 13 + ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 66 +- scripts/buildsystems/vcpkg.cmake | 7 +- scripts/cmake/vcpkg_build_ninja.cmake | 33 +- scripts/cmake/vcpkg_configure_cmake.cmake | 64 +- ...g_get_program_files_platform_bitness.cmake | 13 +- scripts/cmake/vcpkg_get_windows_sdk.cmake | 10 +- .../cmake/vcpkg_internal_get_cmake_vars.cmake | 1 + scripts/cmake/vcpkg_list.cmake | 257 ++++++ scripts/cmake/vcpkg_minimum_required.cmake | 20 +- scripts/cmake/vcpkg_replace_string.cmake | 11 +- .../cmake/z_vcpkg_function_arguments.cmake | 16 +- scripts/ports.cmake | 1 + .../test_ports/unit-test-cmake/portfile.cmake | 73 ++ .../unit-test-cmake/test-vcpkg_list.cmake | 813 ++++++++++++++++++ .../test-z_vcpkg_function_arguments.cmake | 63 ++ scripts/test_ports/unit-test-cmake/vcpkg.json | 18 + versions/a-/apr.json | 5 + versions/a-/azure-iot-sdk-c.json | 5 + versions/a-/azure-kinect-sensor-sdk.json | 5 + versions/b-/bitserializer.json | 5 + versions/b-/bond.json | 5 + versions/b-/botan.json | 5 + versions/baseline.json | 36 +- versions/c-/capstone.json | 5 + versions/c-/ceres.json | 5 + versions/c-/cgal.json | 5 + versions/c-/civetweb.json | 5 + versions/c-/cjson.json | 5 + versions/c-/clue.json | 5 + versions/c-/cppzmq.json | 5 + versions/c-/crashrpt.json | 5 + versions/d-/dlib.json | 5 + versions/d-/dmlc.json | 5 + versions/v-/vcpkg-cmake.json | 5 + 85 files changed, 2140 insertions(+), 330 deletions(-) create mode 100644 docs/maintainers/vcpkg_list.md delete mode 100644 ports/apr/CONTROL create mode 100644 ports/apr/vcpkg.json delete mode 100644 ports/azure-iot-sdk-c/CONTROL create mode 100644 ports/azure-iot-sdk-c/vcpkg.json delete mode 100644 ports/azure-kinect-sensor-sdk/CONTROL create mode 100644 ports/azure-kinect-sensor-sdk/vcpkg.json delete mode 100644 ports/bitserializer/CONTROL create mode 100644 ports/bitserializer/vcpkg.json delete mode 100644 ports/capstone/CONTROL create mode 100644 ports/capstone/vcpkg.json delete mode 100644 ports/cgal/CONTROL create mode 100644 ports/cgal/vcpkg.json delete mode 100644 ports/civetweb/CONTROL create mode 100644 ports/civetweb/vcpkg.json delete mode 100644 ports/cjson/CONTROL create mode 100644 ports/cjson/vcpkg.json delete mode 100644 ports/clue/CONTROL create mode 100644 ports/clue/vcpkg.json delete mode 100644 ports/cppzmq/CONTROL create mode 100644 ports/cppzmq/vcpkg.json delete mode 100644 ports/crashrpt/CONTROL create mode 100644 ports/crashrpt/vcpkg.json delete mode 100644 ports/dlib/CONTROL create mode 100644 ports/dlib/vcpkg.json delete mode 100644 ports/dmlc/CONTROL create mode 100644 ports/dmlc/vcpkg.json create mode 100644 scripts/cmake/vcpkg_list.cmake create mode 100644 scripts/test_ports/unit-test-cmake/portfile.cmake create mode 100644 scripts/test_ports/unit-test-cmake/test-vcpkg_list.cmake create mode 100644 scripts/test_ports/unit-test-cmake/test-z_vcpkg_function_arguments.cmake create mode 100644 scripts/test_ports/unit-test-cmake/vcpkg.json diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index d6acc6471db91c..0ba3533e2c6fed 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -51,6 +51,7 @@ - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) - [vcpkg\_install\_nmake](vcpkg_install_nmake.md) - [vcpkg\_install\_qmake](vcpkg_install_qmake.md) +- [vcpkg\_list](vcpkg_list.md) - [vcpkg\_minimum\_required](vcpkg_minimum_required.md) - [vcpkg\_replace\_string](vcpkg_replace_string.md) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md index 95830313df41ba..3745df08058fec 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md @@ -18,6 +18,8 @@ vcpkg_cmake_configure( ...] [OPTIONS_DEBUG ...] + [MAYBE_UNUSED_VARIABLES + ...] ) ``` @@ -56,6 +58,11 @@ By default, this function adds flags to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS` which set the default character set to utf-8 for MSVC. If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. +This function makes certain that all options passed in are used by the +underlying CMake build system. If there are options that might be unused, +perhaps on certain platforms, pass those variable names to +`MAYBE_UNUSED_VARIABLES`. + `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `config`, and thus the logfiles end up being something like `config-x86-windows-dbg.log`. You can set it to anything you like; diff --git a/docs/maintainers/vcpkg_configure_cmake.md b/docs/maintainers/vcpkg_configure_cmake.md index 195017b3c93e80..fd6ce13187bb7a 100644 --- a/docs/maintainers/vcpkg_configure_cmake.md +++ b/docs/maintainers/vcpkg_configure_cmake.md @@ -17,6 +17,7 @@ vcpkg_configure_cmake( [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] + [MAYBE_UNUSED_VARIABLES ...] ) ``` @@ -55,6 +56,9 @@ Additional options passed to CMake during the Release configuration. These are i ### OPTIONS_DEBUG Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. +### MAYBE_UNUSED_VARIABLES +Any CMake variables which are explicitly passed in, but which may not be used on all platforms. + ### LOGNAME Name of the log to write the output of the configure call to. diff --git a/docs/maintainers/vcpkg_list.md b/docs/maintainers/vcpkg_list.md new file mode 100644 index 00000000000000..46aa7dabd35f7d --- /dev/null +++ b/docs/maintainers/vcpkg_list.md @@ -0,0 +1,94 @@ +# vcpkg_list + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_list.md). + +A replacement for CMake's `list()` function, which correctly handles elements +with internal semicolons (in other words, escaped semicolons). +Use `vcpkg_list()` instead of `list()` whenever possible. + +```cmake +vcpkg_list(SET [...]) +vcpkg_list( [...]) +``` + +In addition to all of the commands from `list()`, `vcpkg_list` adds +a `vcpkg_list(SET)` command. +This command takes its arguments, escapes them, and then concatenates +them into a list; this should be used instead of `set()` for setting any +list variable. + +Otherwise, the `vcpkg_list()` function is the same as the built-in +`list()` function, with the following restrictions: + +- `GET`, `REMOVE_ITEM`, and `REMOVE_AT` support only one index/value +- `POP_BACK` and `POP_FRONT` do not support getting the value into + another out variable. Use C++ style `GET` then `POP_(BACK|FRONT)`. +- `FILTER` and `TRANSFORM` are unsupported. + +See the [CMake documentation for `list()`](https://cmake.org/cmake/help/latest/command/list.html) +for more information. + +## Notes: Some Weirdnesses + +The most major weirdness is due to `""` pulling double-duty as "list of zero elements", +and "list of one element, which is empty". `vcpkg_list` always uses the former understanding. +This can cause weird behavior, for example: + +```cmake +set(lst "") +vcpkg_list(APPEND lst "" "") +# lst = ";" +``` + +This is because you're appending two elements to the empty list. +One very weird behavior that comes out of this would be: + +```cmake +set(lst "") +vcpkg_list(APPEND lst "") +# lst = "" +``` + +since `""` is the empty list, we append the empty element and end up with a list +of one element, which is empty. This does not happen for non-empty lists; +for example: + +```cmake +set(lst "a") +vcpkg_list(APPEND lst "") +# lst = "a;" +``` + +only the empty list has this odd behavior. + +## Examples + +### Creating a list + +```cmake +vcpkg_list(SET foo_param) +if(DEFINED arg_FOO) + vcpkg_list(SET foo_param FOO "${arg_FOO}") +endif() +``` + +### Appending to a list + +```cmake +set(OPTIONS -DFOO=BAR) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND OPTIONS "-DOS=WINDOWS;FOO") +endif() +``` + +### Popping the end off a list + +```cmake +if(NOT list STREQUAL "") + vcpkg_list(GET list end -1) + vcpkg_list(POP_BACK list) +endif() +``` + +## Source +[scripts/cmake/vcpkg\_list.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_list.cmake) diff --git a/docs/maintainers/vcpkg_replace_string.md b/docs/maintainers/vcpkg_replace_string.md index 179b8a08d7ab31..967dd3c01a6137 100644 --- a/docs/maintainers/vcpkg_replace_string.md +++ b/docs/maintainers/vcpkg_replace_string.md @@ -5,9 +5,8 @@ The latest version of this document lives in the [vcpkg repo](https://github.com Replace a string in a file. ```cmake -vcpkg_replace_string(filename match_string replace_string) +vcpkg_replace_string( ) ``` - ## Source [scripts/cmake/vcpkg\_replace\_string.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_replace_string.cmake) diff --git a/ports/apr/CONTROL b/ports/apr/CONTROL deleted file mode 100644 index cf2c0079abb35c..00000000000000 --- a/ports/apr/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: apr -Version: 1.7.0 -Port-Version: 3 -Homepage: https://apr.apache.org/ -Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems. -Supports: !uwp - -Feature: private-headers -Description: Install non-standard files required for building Apache httpd diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index de969c20fe5399..3b9bed66415f1c 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -17,7 +17,8 @@ vcpkg_extract_source_archive_ex( if (VCPKG_TARGET_IS_WINDOWS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - private-headers INSTALL_PRIVATE_H + FEATURES + private-headers INSTALL_PRIVATE_H ) vcpkg_configure_cmake( diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json new file mode 100644 index 00000000000000..91fb9c71307363 --- /dev/null +++ b/ports/apr/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "apr", + "version": "1.7.0", + "port-version": 4, + "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", + "homepage": "https://apr.apache.org/", + "supports": "!uwp", + "features": { + "private-headers": { + "description": "Install non-standard files required for building Apache httpd" + } + } +} diff --git a/ports/azure-iot-sdk-c/CONTROL b/ports/azure-iot-sdk-c/CONTROL deleted file mode 100644 index 456ec806a6493f..00000000000000 --- a/ports/azure-iot-sdk-c/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -Source: azure-iot-sdk-c -Version: 2020-12-09 -Build-Depends: azure-uamqp-c, azure-umqtt-c, azure-c-shared-utility, parson, azure-uhttp-c, azure-macro-utils-c, umock-c -Description: A C99 SDK for connecting devices to Microsoft Azure IoT services -Homepage: https://github.com/Azure/azure-iot-sdk-c - -Feature: public-preview -Description: A version of the azure-iot-sdk-c containing public-preview features. -Build-Depends: azure-uamqp-c[public-preview], azure-umqtt-c[public-preview], azure-c-shared-utility[public-preview], azure-uhttp-c[public-preview], azure-macro-utils-c[public-preview], umock-c[public-preview] - -Feature: use-prov-client -Description: Enables device provisioning client for DPS diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 39def6f618da3b..dafefb6500c501 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -25,8 +25,9 @@ else() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - use-prov-client hsm_type_symm_key - use-prov-client use_prov_client + FEATURES + use-prov-client hsm_type_symm_key + use-prov-client use_prov_client ) file(COPY ${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake DESTINATION ${SOURCE_PATH}/deps/azure-c-shared-utility/configs/) @@ -51,4 +52,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json new file mode 100644 index 00000000000000..78a74e518218aa --- /dev/null +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -0,0 +1,62 @@ +{ + "name": "azure-iot-sdk-c", + "version-date": "2020-12-09", + "port-version": 1, + "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", + "homepage": "https://github.com/Azure/azure-iot-sdk-c", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "azure-uamqp-c", + "azure-uhttp-c", + "azure-umqtt-c", + "parson", + "umock-c" + ], + "features": { + "public-preview": { + "description": "A version of the azure-iot-sdk-c containing public-preview features.", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-uamqp-c", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-uhttp-c", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-umqtt-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + }, + "use-prov-client": { + "description": "Enables device provisioning client for DPS" + } + } +} diff --git a/ports/azure-kinect-sensor-sdk/CONTROL b/ports/azure-kinect-sensor-sdk/CONTROL deleted file mode 100644 index 8b2137de48945b..00000000000000 --- a/ports/azure-kinect-sensor-sdk/CONTROL +++ /dev/null @@ -1,13 +0,0 @@ -Source: azure-kinect-sensor-sdk -Version: 1.4.1 -Homepage: https://github.com/microsoft/Azure-Kinect-Sensor-SDK -Description: Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device. -Build-Depends: azure-c-shared-utility, glfw3, gtest, imgui, libusb, spdlog, cjson, ebml, libjpeg-turbo, matroska, libsoundio, libyuv, libuvc (linux) -Supports: !osx - -Feature: docs -Description: Build K4A doxygen documentation. - -Feature: tool -Description: Build tools. -Build-Depends: gl3w, glew, imgui[glfw-binding,opengl3-glew-binding] diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 742298adfc9e6e..5255481b406981 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -19,8 +19,9 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - docs K4A_BUILD_DOCS - tool BUILD_TOOLS + FEATURES + docs K4A_BUILD_DOCS + tool BUILD_TOOLS ) # .rc file needs windows.h, so do not use PREFER_NINJA here diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json new file mode 100644 index 00000000000000..4226c5adf4d6cc --- /dev/null +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -0,0 +1,45 @@ +{ + "name": "azure-kinect-sensor-sdk", + "version": "1.4.1", + "port-version": 1, + "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", + "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", + "supports": "!osx", + "dependencies": [ + "azure-c-shared-utility", + "cjson", + "ebml", + "glfw3", + "gtest", + "imgui", + "libjpeg-turbo", + "libsoundio", + "libusb", + { + "name": "libuvc", + "platform": "linux" + }, + "libyuv", + "matroska", + "spdlog" + ], + "features": { + "docs": { + "description": "Build K4A doxygen documentation." + }, + "tool": { + "description": "Build tools.", + "dependencies": [ + "gl3w", + "glew", + { + "name": "imgui", + "features": [ + "glfw-binding", + "opengl3-glew-binding" + ] + } + ] + } + } +} diff --git a/ports/bitserializer/CONTROL b/ports/bitserializer/CONTROL deleted file mode 100644 index bc33cc5525a5da..00000000000000 --- a/ports/bitserializer/CONTROL +++ /dev/null @@ -1,22 +0,0 @@ -Source: bitserializer -Version: 0.10 -Description: Core part of C++ 17 library for serialization to JSON, XML, YAML -Homepage: https://bitbucket.org/Pavel_Kisliak/bitserializer -Default-Features: cpprestjson-archive, rapidjson-archive, pugixml-archive -Supports: !(arm|osx) - -Feature: cpprestjson-archive -Build-Depends: cpprestsdk -Description: Module for support JSON (implementation based on the CppRestSDK library) - -Feature: rapidjson-archive -Build-Depends: rapidjson -Description: Module for support JSON (implementation based on the RapidJson library) - -Feature: pugixml-archive -Build-Depends: pugixml -Description: Module for support XML (implementation based on the PugiXml library) - -Feature: rapidyaml-archive -Build-Depends: ryml (!arm&!arm64&!osx) -Description: Module for support YAML (implementation based on the RapidYaml library) diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index d4ae869792cf3c..3b8e4184fdafad 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -7,10 +7,11 @@ vcpkg_from_bitbucket( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "cpprestjson-archive" BUILD_CPPRESTJSON_ARCHIVE - "rapidjson-archive" BUILD_RAPIDJSON_ARCHIVE - "pugixml-archive" BUILD_PUGIXML_ARCHIVE - "rapidyaml-archive" BUILD_RAPIDYAML_ARCHIVE + FEATURES + "cpprestjson-archive" BUILD_CPPRESTJSON_ARCHIVE + "rapidjson-archive" BUILD_RAPIDJSON_ARCHIVE + "pugixml-archive" BUILD_PUGIXML_ARCHIVE + "rapidyaml-archive" BUILD_RAPIDYAML_ARCHIVE ) vcpkg_configure_cmake( diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json new file mode 100644 index 00000000000000..4866a2dc8d3509 --- /dev/null +++ b/ports/bitserializer/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "bitserializer", + "version": "0.10", + "port-version": 1, + "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML", + "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", + "supports": "!(arm | osx)", + "default-features": [ + "cpprestjson-archive", + "pugixml-archive", + "rapidjson-archive" + ], + "features": { + "cpprestjson-archive": { + "description": "Module for support JSON (implementation based on the CppRestSDK library)", + "dependencies": [ + "cpprestsdk" + ] + }, + "pugixml-archive": { + "description": "Module for support XML (implementation based on the PugiXml library)", + "dependencies": [ + "pugixml" + ] + }, + "rapidjson-archive": { + "description": "Module for support JSON (implementation based on the RapidJson library)", + "dependencies": [ + "rapidjson" + ] + }, + "rapidyaml-archive": { + "description": "Module for support YAML (implementation based on the RapidYaml library)", + "dependencies": [ + { + "name": "ryml", + "platform": "!arm & !arm64 & !osx" + } + ] + } + } +} diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake index 6a56a4534e92be..0d424e78f43edd 100644 --- a/ports/bond/portfile.cmake +++ b/ports/bond/portfile.cmake @@ -13,9 +13,9 @@ vcpkg_from_github( if (VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(GBC_ARCHIVE - URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip" - FILENAME "gbc-${BOND_VER}-amd64.zip" - SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd + URLS "https://github.com/microsoft/bond/releases/download/${BOND_VER}/gbc-${BOND_VER}-amd64.zip" + FILENAME "gbc-${BOND_VER}-amd64.zip" + SHA512 41a4e01a9a0f6246a3c07f516f2c0cfc8a837eff2166c2bb787877e409d6f55eeb6084e63aabc3502492775a3fa7e381bf37fde0bdfced50a9d0b39dfaca7dfd ) # Clear the generator to prevent it from updating @@ -37,20 +37,21 @@ else() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - bond-over-grpc BOND_ENABLE_GRPC + FEATURES + bond-over-grpc BOND_ENABLE_GRPC ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBOND_LIBRARIES_ONLY=TRUE - -DBOND_GBC_PATH=${FETCHED_GBC_PATH} - -DBOND_SKIP_GBC_TESTS=TRUE - -DBOND_ENABLE_COMM=FALSE - -DBOND_FIND_RAPIDJSON=TRUE - -DBOND_STACK_OPTIONS=--allow-different-user - ${FEATURE_OPTIONS} + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBOND_LIBRARIES_ONLY=TRUE + -DBOND_GBC_PATH=${FETCHED_GBC_PATH} + -DBOND_SKIP_GBC_TESTS=TRUE + -DBOND_ENABLE_COMM=FALSE + -DBOND_FIND_RAPIDJSON=TRUE + -DBOND_STACK_OPTIONS=--allow-different-user + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() diff --git a/ports/bond/vcpkg.json b/ports/bond/vcpkg.json index 524cc9d0f5b7da..5155d3a4117b1d 100644 --- a/ports/bond/vcpkg.json +++ b/ports/bond/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bond", - "version-string": "9.0.3", - "port-version": 1, + "version": "9.0.3", + "port-version": 2, "description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.", "homepage": "https://github.com/Microsoft/bond", "dependencies": [ diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index cee4a0e2722125..6d04e1e93cbd84 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -51,7 +51,8 @@ else() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - amalgamation BOTAN_AMALGAMATION + FEATURES + amalgamation BOTAN_AMALGAMATION ) function(BOTAN_BUILD BOTAN_BUILD_TYPE) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 48b62c95c10298..0dbf7567dcaba4 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.16.0", - "port-version": 1, + "port-version": 2, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/ports/capstone/CONTROL b/ports/capstone/CONTROL deleted file mode 100644 index 60e2a2a535a936..00000000000000 --- a/ports/capstone/CONTROL +++ /dev/null @@ -1,51 +0,0 @@ -Source: capstone -Version: 4.0.2 -Port-Version: 1 -Homepage: https://github.com/aquynh/capstone -Description: Multi-architecture disassembly framework - -Feature: arm -Description: Capstone disassembly support for ARM - -Feature: arm64 -Description: Capstone disassembly support for ARM64 - -Feature: evm -Description: Capstone disassembly support for EVM - -Feature: m680x -Description: Capstone disassembly support for M680X - -Feature: m68k -Description: Capstone disassembly support for M68k - -Feature: mips -Description: Capstone disassembly support for MIPS - -Feature: ppc -Description: Capstone disassembly support for PowerPC - -Feature: sparc -Description: Capstone disassembly support for SPARC - -Feature: sysz -Description: Capstone disassembly support for SysZ - -Feature: tms320c64x -Description: Capstone disassembly support for TMS320C64X - -Feature: x86 -Description: Capstone disassembly support for x86 - -Feature: x86-reduce -Description: Capstone disassembly support for x86 without support for less used instructions -Build-Depends: capstone[x86] - -Feature: xcore -Description: Capstone disassembly support for XCore - -Feature: diet -Description: Build Capstone in diet mode (reduced features for smaller size) - -Feature: osxkernel -Description: Support for emedding Capstone into OSX Kernel extensions diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake index 3e01523dfacd38..bd28511cfec6ca 100644 --- a/ports/capstone/portfile.cmake +++ b/ports/capstone/portfile.cmake @@ -10,21 +10,22 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CS_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CS_BUILD_SHARED) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "arm" CAPSTONE_ARM_SUPPORT - "arm64" CAPSTONE_ARM64_SUPPORT - "evm" CAPSTONE_EVM_SUPPORT - "m680x" CAPSTONE_M680X_SUPPORT - "m68k" CAPSTONE_M68K_SUPPORT - "mips" CAPSTONE_MIPS_SUPPORT - "osxkernel" CAPSTONE_OSXKERNEL_SUPPORT - "ppc" CAPSTONE_PPC_SUPPORT - "sparc" CAPSTONE_SPARC_SUPPORT - "sysz" CAPSTONE_SYSZ_SUPPORT - "tms320c64x" CAPSTONE_TMS320C64X_SUPPORT - "x86" CAPSTONE_X86_SUPPORT - "x86-reduce" CAPSTONE_X86_REDUCE - "xcore" CAPSTONE_XCORE_SUPPORT - "diet" CAPSTONE_BUILD_DIET + FEATURES + "arm" CAPSTONE_ARM_SUPPORT + "arm64" CAPSTONE_ARM64_SUPPORT + "evm" CAPSTONE_EVM_SUPPORT + "m680x" CAPSTONE_M680X_SUPPORT + "m68k" CAPSTONE_M68K_SUPPORT + "mips" CAPSTONE_MIPS_SUPPORT + "osxkernel" CAPSTONE_OSXKERNEL_SUPPORT + "ppc" CAPSTONE_PPC_SUPPORT + "sparc" CAPSTONE_SPARC_SUPPORT + "sysz" CAPSTONE_SYSZ_SUPPORT + "tms320c64x" CAPSTONE_TMS320C64X_SUPPORT + "x86" CAPSTONE_X86_SUPPORT + "x86-reduce" CAPSTONE_X86_REDUCE + "xcore" CAPSTONE_XCORE_SUPPORT + "diet" CAPSTONE_BUILD_DIET ) vcpkg_configure_cmake( diff --git a/ports/capstone/vcpkg.json b/ports/capstone/vcpkg.json new file mode 100644 index 00000000000000..770f479438cb16 --- /dev/null +++ b/ports/capstone/vcpkg.json @@ -0,0 +1,62 @@ +{ + "name": "capstone", + "version": "4.0.2", + "port-version": 2, + "description": "Multi-architecture disassembly framework", + "homepage": "https://github.com/aquynh/capstone", + "features": { + "arm": { + "description": "Capstone disassembly support for ARM" + }, + "arm64": { + "description": "Capstone disassembly support for ARM64" + }, + "diet": { + "description": "Build Capstone in diet mode (reduced features for smaller size)" + }, + "evm": { + "description": "Capstone disassembly support for EVM" + }, + "m680x": { + "description": "Capstone disassembly support for M680X" + }, + "m68k": { + "description": "Capstone disassembly support for M68k" + }, + "mips": { + "description": "Capstone disassembly support for MIPS" + }, + "osxkernel": { + "description": "Support for emedding Capstone into OSX Kernel extensions" + }, + "ppc": { + "description": "Capstone disassembly support for PowerPC" + }, + "sparc": { + "description": "Capstone disassembly support for SPARC" + }, + "sysz": { + "description": "Capstone disassembly support for SysZ" + }, + "tms320c64x": { + "description": "Capstone disassembly support for TMS320C64X" + }, + "x86": { + "description": "Capstone disassembly support for x86" + }, + "x86-reduce": { + "description": "Capstone disassembly support for x86 without support for less used instructions", + "dependencies": [ + { + "name": "capstone", + "features": [ + "x86" + ] + } + ] + }, + "xcore": { + "description": "Capstone disassembly support for XCore" + } + } +} diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index 78fff33b68ee6a..d0500faef27a05 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -27,11 +27,12 @@ file(REMOVE ${SOURCE_PATH}/cmake/FindEigen.cmake) file(REMOVE ${SOURCE_PATH}/cmake/FindSuiteSparse.cmake) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "suitesparse" SUITESPARSE - "cxsparse" CXSPARSE - "lapack" LAPACK - "eigensparse" EIGENSPARSE - "tools" GFLAGS + FEATURES + "suitesparse" SUITESPARSE + "cxsparse" CXSPARSE + "lapack" LAPACK + "eigensparse" EIGENSPARSE + "tools" GFLAGS ) vcpkg_configure_cmake( diff --git a/ports/ceres/vcpkg.json b/ports/ceres/vcpkg.json index 927a150a23a3f7..b1be6bde6f749c 100644 --- a/ports/ceres/vcpkg.json +++ b/ports/ceres/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ceres", "version-semver": "2.0.0", - "port-version": 4, + "port-version": 5, "description": "non-linear optimization package", "homepage": "https://github.com/ceres-solver/ceres-solver", "dependencies": [ diff --git a/ports/cgal/CONTROL b/ports/cgal/CONTROL deleted file mode 100644 index ee817113a30732..00000000000000 --- a/ports/cgal/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: cgal -Version: 5.2.2 -Port-Version: 0 -Build-Depends: mpfr, gmp, zlib, boost-accumulators, boost-algorithm, boost-bimap, boost-callable-traits, boost-concept-check, boost-container, boost-core, boost-detail, boost-filesystem, boost-functional, boost-fusion, boost-geometry, boost-graph, boost-heap, boost-intrusive, boost-iostreams, boost-iterator, boost-lambda, boost-logic, boost-math, boost-mpl, boost-multi-index, boost-multiprecision, boost-numeric-conversion, boost-optional, boost-parameter, boost-pool, boost-preprocessor, boost-property-map, boost-property-tree, boost-ptr-container, boost-random, boost-range, boost-serialization, boost-spirit, boost-thread, boost-tuple, boost-type-traits, boost-units, boost-utility, boost-variant -Homepage: https://github.com/CGAL/cgal -Description: The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry. - -Feature: qt -Build-Depends: qt5-base[core], qt5-3d, qt5-svg, qt5-xmlpatterns, qt5-script, eigen3 -Description: Qt GUI support for CGAL diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 87be4144f43d7c..729ece8953d8b0 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -9,7 +9,8 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - qt WITH_CGAL_Qt5 + FEATURES + qt WITH_CGAL_Qt5 ) vcpkg_configure_cmake( diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json new file mode 100644 index 00000000000000..1ac7f45ffb0165 --- /dev/null +++ b/ports/cgal/vcpkg.json @@ -0,0 +1,69 @@ +{ + "name": "cgal", + "version": "5.2.2", + "port-version": 1, + "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", + "homepage": "https://github.com/CGAL/cgal", + "dependencies": [ + "boost-accumulators", + "boost-algorithm", + "boost-bimap", + "boost-callable-traits", + "boost-concept-check", + "boost-container", + "boost-core", + "boost-detail", + "boost-filesystem", + "boost-functional", + "boost-fusion", + "boost-geometry", + "boost-graph", + "boost-heap", + "boost-intrusive", + "boost-iostreams", + "boost-iterator", + "boost-lambda", + "boost-logic", + "boost-math", + "boost-mpl", + "boost-multi-index", + "boost-multiprecision", + "boost-numeric-conversion", + "boost-optional", + "boost-parameter", + "boost-pool", + "boost-preprocessor", + "boost-property-map", + "boost-property-tree", + "boost-ptr-container", + "boost-random", + "boost-range", + "boost-serialization", + "boost-spirit", + "boost-thread", + "boost-tuple", + "boost-type-traits", + "boost-units", + "boost-utility", + "boost-variant", + "gmp", + "mpfr", + "zlib" + ], + "features": { + "qt": { + "description": "Qt GUI support for CGAL", + "dependencies": [ + "eigen3", + "qt5-3d", + { + "name": "qt5-base", + "default-features": false + }, + "qt5-script", + "qt5-svg", + "qt5-xmlpatterns" + ] + } + } +} diff --git a/ports/civetweb/CONTROL b/ports/civetweb/CONTROL deleted file mode 100644 index 395e244651db4d..00000000000000 --- a/ports/civetweb/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: civetweb -Version: 1.13 -Port-Version: 1 -Homepage: https://github.com/civetweb/civetweb -Description: Easy to use, powerful, C/C++ embeddable web server. -Supports: !uwp - -Feature: ssl -Build-Depends: openssl -Description: Enable SSL support \ No newline at end of file diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 2dae7f4d64025b..8af5c6d764e370 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -12,7 +12,8 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - ssl CIVETWEB_ENABLE_SSL + FEATURES + ssl CIVETWEB_ENABLE_SSL ) vcpkg_configure_cmake( diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json new file mode 100644 index 00000000000000..77ac71bf079336 --- /dev/null +++ b/ports/civetweb/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "civetweb", + "version": "1.13", + "port-version": 2, + "description": "Easy to use, powerful, C/C++ embeddable web server.", + "homepage": "https://github.com/civetweb/civetweb", + "supports": "!uwp", + "features": { + "ssl": { + "description": "Enable SSL support", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/ports/cjson/CONTROL b/ports/cjson/CONTROL deleted file mode 100644 index 27474316a4f6ed..00000000000000 --- a/ports/cjson/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: cjson -Version: 2019-11-30-1 -Description: Ultralightweight JSON parser in ANSI C -Homepage: https://github.com/DaveGamble/cJSON - -Feature: utils -Description: Enable building the cJSON_Utils library diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake index 058c9009d6745d..52e84654a91386 100644 --- a/ports/cjson/portfile.cmake +++ b/ports/cjson/portfile.cmake @@ -8,7 +8,8 @@ vcpkg_from_github( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - utils ENABLE_CJSON_UTILS + FEATURES + utils ENABLE_CJSON_UTILS ) if(CMAKE_HOST_WIN32) diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json new file mode 100644 index 00000000000000..92bec5fb2db973 --- /dev/null +++ b/ports/cjson/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cjson", + "version-date": "2019-11-30", + "port-version": 2, + "description": "Ultralightweight JSON parser in ANSI C", + "homepage": "https://github.com/DaveGamble/cJSON", + "features": { + "utils": { + "description": "Enable building the cJSON_Utils library" + } + } +} diff --git a/ports/clue/CONTROL b/ports/clue/CONTROL deleted file mode 100644 index dcd80809e5d12c..00000000000000 --- a/ports/clue/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: clue -Version: 1.0.0-alpha.7 -Homepage: https://github.com/martinmoene/clue -Description: clue is a C++03 header-only library to log messages with a severity and optional module identifier. - -Feature: test -Description: Build test \ No newline at end of file diff --git a/ports/clue/portfile.cmake b/ports/clue/portfile.cmake index 7fb67edd76d7ec..3b9715f9e98932 100644 --- a/ports/clue/portfile.cmake +++ b/ports/clue/portfile.cmake @@ -9,7 +9,8 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test CLUE_BUILD_TEST + FEATURES + test CLUE_BUILD_TEST ) vcpkg_configure_cmake( @@ -24,4 +25,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/clue/vcpkg.json b/ports/clue/vcpkg.json new file mode 100644 index 00000000000000..105741b0955ea8 --- /dev/null +++ b/ports/clue/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "clue", + "version-string": "1.0.0-alpha.7", + "port-version": 1, + "description": "clue is a C++03 header-only library to log messages with a severity and optional module identifier.", + "homepage": "https://github.com/martinmoene/clue", + "features": { + "test": { + "description": "Build test" + } + } +} diff --git a/ports/cppzmq/CONTROL b/ports/cppzmq/CONTROL deleted file mode 100644 index f148c1a7736c5e..00000000000000 --- a/ports/cppzmq/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: cppzmq -Version: 4.7.1 -Port-Version: 1 -Build-Depends: zeromq -Homepage: https://github.com/zeromq/cppzmq -Description: lightweight messaging kernel, C++ bindings - -Feature: draft -Description: Build and install draft diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake index 2789190b73a3e7..aa968e8a3fc9e2 100644 --- a/ports/cppzmq/portfile.cmake +++ b/ports/cppzmq/portfile.cmake @@ -7,7 +7,8 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - draft ENABLE_DRAFTS + FEATURES + draft ENABLE_DRAFTS ) vcpkg_configure_cmake( diff --git a/ports/cppzmq/vcpkg.json b/ports/cppzmq/vcpkg.json new file mode 100644 index 00000000000000..db7ce81fbe8e1f --- /dev/null +++ b/ports/cppzmq/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "cppzmq", + "version": "4.7.1", + "port-version": 2, + "description": "lightweight messaging kernel, C++ bindings", + "homepage": "https://github.com/zeromq/cppzmq", + "dependencies": [ + "zeromq" + ], + "features": { + "draft": { + "description": "Build and install draft" + } + } +} diff --git a/ports/crashrpt/CONTROL b/ports/crashrpt/CONTROL deleted file mode 100644 index 4b15e9d2336243..00000000000000 --- a/ports/crashrpt/CONTROL +++ /dev/null @@ -1,16 +0,0 @@ -Source: crashrpt -Version: 1.4.3 -Description: A crash reporting system for Windows applications -Homepage: http://crashrpt.sourceforge.net/ -Build-Depends: dbghelp, libjpeg-turbo, libogg, libpng, libtheora, tinyxml, wtl, zlib -Default-Features: - -Feature: probe -Description: The CrashRptProbe library - -Feature: tests -Description: Test application for crashrpt -Build-Depends: crashrpt[core,probe] - -Feature: demos -Description: Demo applications for CrashRptProbe diff --git a/ports/crashrpt/portfile.cmake b/ports/crashrpt/portfile.cmake index f52f8e19a24b8f..ffc83aa98b1976 100644 --- a/ports/crashrpt/portfile.cmake +++ b/ports/crashrpt/portfile.cmake @@ -28,9 +28,10 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CRASHRPT_BUILD_SHARED_ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" CRASHRPT_LINK_CRT_AS_DLL) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - probe CRASHRPT_BUILD_PROBE - tests CRASHRPT_BUILD_TESTS - demos CRASHRPT_BUILD_DEMOS + FEATURES + probe CRASHRPT_BUILD_PROBE + tests CRASHRPT_BUILD_TESTS + demos CRASHRPT_BUILD_DEMOS ) # PREFER_NINJA is not used below since CrashSender fails to build with errors like this one: diff --git a/ports/crashrpt/vcpkg.json b/ports/crashrpt/vcpkg.json new file mode 100644 index 00000000000000..3ed55e7312b515 --- /dev/null +++ b/ports/crashrpt/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "crashrpt", + "version": "1.4.3", + "port-version": 1, + "description": "A crash reporting system for Windows applications", + "homepage": "http://crashrpt.sourceforge.net/", + "dependencies": [ + "dbghelp", + "libjpeg-turbo", + "libogg", + "libpng", + "libtheora", + "tinyxml", + "wtl", + "zlib" + ], + "features": { + "demos": { + "description": "Demo applications for CrashRptProbe" + }, + "probe": { + "description": "The CrashRptProbe library" + }, + "tests": { + "description": "Test application for crashrpt", + "dependencies": [ + { + "name": "crashrpt", + "default-features": false, + "features": [ + "probe" + ] + } + ] + } + } +} diff --git a/ports/dlib/CONTROL b/ports/dlib/CONTROL deleted file mode 100644 index c9b8f1f6834c3c..00000000000000 --- a/ports/dlib/CONTROL +++ /dev/null @@ -1,19 +0,0 @@ -Source: dlib -Version: 19.21 -Port-Version: 4 -Build-Depends: libjpeg-turbo, libpng, blas, lapack -Homepage: https://github.com/davisking/dlib -Description: Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++ -Default-Features: fftw3, sqlite3 - -Feature: cuda -Build-Depends: cuda, cudnn -Description: CUDA support for dlib - -Feature: fftw3 -Build-Depends: fftw3 -Description: fftw3 support for dlib - -Feature: sqlite3 -Build-Depends: sqlite3 -Description: sqlite3 support for dlib diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 00f45d25f2083d..481554b90e49e9 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -22,9 +22,10 @@ string(REPLACE "PNG_LIBRARY" "PNG_LIBRARIES" DLIB_CMAKE "${DLIB_CMAKE}") file(WRITE "${SOURCE_PATH}/dlib/CMakeLists.txt" "${DLIB_CMAKE}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "sqlite3" DLIB_LINK_WITH_SQLITE3 - "fftw3" DLIB_USE_FFTW - "cuda" DLIB_USE_CUDA + FEATURES + "sqlite3" DLIB_LINK_WITH_SQLITE3 + "fftw3" DLIB_USE_FFTW + "cuda" DLIB_USE_CUDA ) vcpkg_configure_cmake( diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json new file mode 100644 index 00000000000000..bb60944f8d3111 --- /dev/null +++ b/ports/dlib/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "dlib", + "version": "19.21", + "port-version": 5, + "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", + "homepage": "https://github.com/davisking/dlib", + "dependencies": [ + "blas", + "lapack", + "libjpeg-turbo", + "libpng" + ], + "default-features": [ + "fftw3", + "sqlite3" + ], + "features": { + "cuda": { + "description": "CUDA support for dlib", + "dependencies": [ + "cuda", + "cudnn" + ] + }, + "fftw3": { + "description": "fftw3 support for dlib", + "dependencies": [ + "fftw3" + ] + }, + "sqlite3": { + "description": "sqlite3 support for dlib", + "dependencies": [ + "sqlite3" + ] + } + } +} diff --git a/ports/dmlc/CONTROL b/ports/dmlc/CONTROL deleted file mode 100644 index 7021ffdcd01347..00000000000000 --- a/ports/dmlc/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: dmlc -Version: 2019-08-12 -Port-Version: 5 -Homepage: https://github.com/dmlc/dmlc-core -Description: DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries. -Supports: !uwp - -Feature: openmp -Description: Build with openmp diff --git a/ports/dmlc/portfile.cmake b/ports/dmlc/portfile.cmake index fd339627a3f26e..3e4c7baeb39e13 100644 --- a/ports/dmlc/portfile.cmake +++ b/ports/dmlc/portfile.cmake @@ -11,7 +11,8 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - openmp ENABLE_OPENMP + FEATURES + openmp ENABLE_OPENMP ) if(VCPKG_CRT_LINKAGE STREQUAL dynamic) @@ -36,4 +37,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dmlc) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/dmlc/vcpkg.json b/ports/dmlc/vcpkg.json new file mode 100644 index 00000000000000..36a4e03953a68a --- /dev/null +++ b/ports/dmlc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "dmlc", + "version-date": "2019-08-12", + "port-version": 6, + "description": "DMLC-Core is the backbone library to support all DMLC projects, offers the bricks to build efficient and scalable distributed machine learning libraries.", + "homepage": "https://github.com/dmlc/dmlc-core", + "supports": "!uwp", + "features": { + "openmp": { + "description": "Build with openmp" + } + } +} diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index ffda714e3fe066..88ee459ff35111 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,5 @@ { "name": "vcpkg-cmake", "version-date": "2021-06-25", - "port-version": 4 + "port-version": 5 } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index beffd32b0519ba..aa99a81ce282d1 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -17,6 +17,8 @@ vcpkg_cmake_configure( ...] [OPTIONS_DEBUG ...] + [MAYBE_UNUSED_VARIABLES + ...] ) ``` @@ -55,6 +57,11 @@ By default, this function adds flags to `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS` which set the default character set to utf-8 for MSVC. If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. +This function makes certain that all options passed in are used by the +underlying CMake build system. If there are options that might be unused, +perhaps on certain platforms, pass those variable names to +`MAYBE_UNUSED_VARIABLES`. + `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `config`, and thus the logfiles end up being something like `config-x86-windows-dbg.log`. You can set it to anything you like; @@ -88,7 +95,7 @@ function(vcpkg_cmake_configure) cmake_parse_arguments(PARSE_ARGV 0 "arg" "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;WINDOWS_USE_MSBUILD;NO_CHARSET_FLAG" "SOURCE_PATH;GENERATOR;LOGFILE_BASE" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES" ) if(DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR}) @@ -102,9 +109,19 @@ function(vcpkg_cmake_configure) message(FATAL_ERROR "SOURCE_PATH must be set") endif() if(NOT DEFINED arg_LOGFILE_BASE) - set(arg_LOGFILE_BASE "config") + set(arg_LOGFILE_BASE "config-${TARGET_TRIPLET}") endif() + set(manually_specified_variables "") + foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) + if(option MATCHES "^-D([^:=]*)[:=]") + list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + endif() + endforeach() + list(REMOVE_DUPLICATES manually_specified_variables) + list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) + debug_message("manually specified variables: ${manually_specified_variables}") + if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(host_architecture "$ENV{PROCESSOR_ARCHITEW6432}") @@ -364,8 +381,11 @@ function(vcpkg_cmake_configure) vcpkg_execute_required_process( COMMAND ninja -v WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}" + LOGNAME "${arg_LOGFILE_BASE}" ) + list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-err.log") else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") @@ -379,8 +399,11 @@ function(vcpkg_cmake_configure) "-DCMAKE_BUILD_TYPE=Debug" "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - LOGNAME "${arg_LOGFILE_BASE}-${TARGET_TRIPLET}-dbg" + LOGNAME "${arg_LOGFILE_BASE}-dbg" ) + list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-dbg-err.log") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -397,7 +420,42 @@ function(vcpkg_cmake_configure) WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" LOGNAME "${arg_LOGFILE_BASE}-rel" ) + list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-rel-err.log") + endif() + endif() + + set(all_unused_variables) + foreach(config_log IN LISTS config_logs) + if(NOT EXISTS "${config_log}") + continue() endif() + file(READ "${config_log}" log_contents) + debug_message("Reading configure log ${config_log}...") + if(NOT log_contents MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") + continue() + endif() + string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n` + string(REPLACE "\n " ";" unused_variables "${unused_variables}") + debug_message("unused variables: ${unused_variables}") + foreach(unused_variable IN LISTS unused_variables) + if(unused_variable IN_LIST manually_specified_variables) + debug_message("manually specified unused variable: ${unused_variable}") + list(APPEND all_unused_variables "${unused_variable}") + else() + debug_message("unused variable (not manually specified): ${unused_variable}") + endif() + endforeach() + endforeach() + + if(DEFINED all_unused_variables) + list(REMOVE_DUPLICATES all_unused_variables) + list(JOIN all_unused_variables "\n " all_unused_variables) + message(WARNING "The following variables are not used in CMakeLists.txt: + ${all_unused_variables} +Please recheck them and remove the unnecessary options from the `vcpkg_cmake_configure` call. +If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.") endif() set(Z_VCPKG_CMAKE_GENERATOR "${generator}" CACHE INTERNAL "The generator which was used to configure CMake.") diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 8ab2878524e204..ff0873457eff28 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -153,7 +153,7 @@ macro(z_vcpkg_function_arguments OUT_VAR) message(FATAL_ERROR "z_vcpkg_function_arguments: invalid arguments (${ARGV})") endif() - set("${OUT_VAR}") + set("${OUT_VAR}" "") # this allows us to get the value of the enclosing function's ARGC set(z_vcpkg_function_arguments_ARGC_NAME "ARGC") @@ -164,8 +164,11 @@ macro(z_vcpkg_function_arguments OUT_VAR) if(NOT z_vcpkg_function_arguments_LAST_ARG LESS z_vcpkg_function_arguments_FIRST_ARG) foreach(z_vcpkg_function_arguments_N RANGE "${z_vcpkg_function_arguments_FIRST_ARG}" "${z_vcpkg_function_arguments_LAST_ARG}") string(REPLACE ";" "\\;" z_vcpkg_function_arguments_ESCAPED_ARG "${ARGV${z_vcpkg_function_arguments_N}}") - list(APPEND "${OUT_VAR}" "${z_vcpkg_function_arguments_ESCAPED_ARG}") + # adds an extra `;` on the first time through + set("${OUT_VAR}" "${${OUT_VAR}};${z_vcpkg_function_arguments_ESCAPED_ARG}") endforeach() + # remove leading `;` + string(SUBSTRING "${${OUT_VAR}}" 1 -1 "${OUT_VAR}") endif() endmacro() diff --git a/scripts/cmake/vcpkg_build_ninja.cmake b/scripts/cmake/vcpkg_build_ninja.cmake index 2c9276e63d5a8a..5a0a1755fa8c2a 100644 --- a/scripts/cmake/vcpkg_build_ninja.cmake +++ b/scripts/cmake/vcpkg_build_ninja.cmake @@ -15,26 +15,33 @@ vcpkg_build_ninja( Only build the specified targets. #]===] +function(z_vcpkg_build_ninja_build config targets) + message(STATUS "Building (${config})...") + vcpkg_execute_build_process( + COMMAND "${NINJA}" -C "${CURRENT_BUILDTREES_DIR}/${config}" ${targets} + WORKING_DIRECTORY "${SOURCE_PATH}" + LOGNAME "build-${config}" + ) +endfunction() + + function(vcpkg_build_ninja) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vbn "" "" "TARGETS") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "TARGETS") - vcpkg_find_acquire_program(NINJA) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_TARGETS) + set(arg_TARGETS "") + endif() - function(build CONFIG) - message(STATUS "Building (${CONFIG})...") - vcpkg_execute_build_process( - COMMAND "${NINJA}" -C "${CURRENT_BUILDTREES_DIR}/${CONFIG}" ${_vbn_TARGETS} - WORKING_DIRECTORY "${SOURCE_PATH}" - LOGNAME build-${CONFIG} - ) - endfunction() + vcpkg_find_acquire_program(NINJA) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - build(${TARGET_TRIPLET}-dbg) + z_vcpkg_build_ninja_build("${TARGET_TRIPLET}-dbg" "${arg_TARGETS}") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - build(${TARGET_TRIPLET}-rel) + z_vcpkg_build_ninja_build("${TARGET_TRIPLET}-rel" "${arg_TARGETS}") endif() endfunction() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 1eb50e852b9699..bce3f6af583629 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -15,6 +15,7 @@ vcpkg_configure_cmake( [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] + [MAYBE_UNUSED_VARIABLES ...] ) ``` @@ -53,6 +54,9 @@ Additional options passed to CMake during the Release configuration. These are i ### OPTIONS_DEBUG Additional options passed to CMake during the Debug configuration. These are in addition to `OPTIONS`. +### MAYBE_UNUSED_VARIABLES +Any CMake variables which are explicitly passed in, but which may not be used on all platforms. + ### LOGNAME Name of the log to write the output of the configure call to. @@ -73,9 +77,9 @@ function(vcpkg_configure_cmake) endif() cmake_parse_arguments(PARSE_ARGV 0 arg - "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG" + "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_VCPKG_IGNORE_UNUSED_VARIABLES" "SOURCE_PATH;GENERATOR;LOGNAME" - "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES" ) if(NOT VCPKG_PLATFORM_TOOLSET) @@ -87,6 +91,18 @@ function(vcpkg_configure_cmake) set(arg_LOGNAME config-${TARGET_TRIPLET}) endif() + set(manually_specified_variables "") + if(NOT arg_Z_VCPKG_IGNORE_UNUSED_VARIABLES) + foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) + if(option MATCHES "^-D([^:=]*)[:=]") + list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + endif() + endforeach() + list(REMOVE_DUPLICATES manually_specified_variables) + list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) + debug_message("manually specified variables: ${manually_specified_variables}") + endif() + if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(arg_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) @@ -326,6 +342,10 @@ function(vcpkg_configure_cmake) WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure LOGNAME ${arg_LOGNAME} ) + + list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") @@ -335,6 +355,9 @@ function(vcpkg_configure_cmake) WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg LOGNAME ${arg_LOGNAME}-dbg ) + list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-err.log") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -345,7 +368,44 @@ function(vcpkg_configure_cmake) WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel LOGNAME ${arg_LOGNAME}-rel ) + list(APPEND config_logs + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-out.log" + "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-err.log") + endif() + endif() + + # Check unused variables + set(all_unused_variables) + foreach(config_log IN LISTS config_logs) + if (NOT EXISTS "${config_log}") + continue() + endif() + file(READ "${config_log}" log_contents) + debug_message("Reading configure log ${config_log}...") + if(NOT log_contents MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") + continue() endif() + string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n` + string(REPLACE "\n " ";" unused_variables "${unused_variables}") + debug_message("unused variables: ${unused_variables}") + + foreach(unused_variable IN LISTS unused_variables) + if(unused_variable IN_LIST manually_specified_variables) + debug_message("manually specified unused variable: ${unused_variable}") + list(APPEND all_unused_variables "${unused_variable}") + else() + debug_message("unused variable (not manually specified): ${unused_variable}") + endif() + endforeach() + endforeach() + + if(DEFINED all_unused_variables) + list(REMOVE_DUPLICATES all_unused_variables) + list(JOIN all_unused_variables "\n " all_unused_variables) + message(WARNING "The following variables are not used in CMakeLists.txt: + ${all_unused_variables} +Please recheck them and remove the unnecessary options from the `vcpkg_configure_cmake` call. +If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.") endif() set(Z_VCPKG_CMAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) diff --git a/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake b/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake index 7e3a5af5265af4..b40b24c42d2497 100644 --- a/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake +++ b/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake @@ -11,13 +11,10 @@ vcpkg_get_program_files_platform_bitness() ``` #]===] -function(vcpkg_get_program_files_platform_bitness ret) - - set(ret_temp $ENV{ProgramW6432}) - if (NOT DEFINED ret_temp) - set(ret_temp $ENV{PROGRAMFILES}) +function(vcpkg_get_program_files_platform_bitness out_var) + if(DEFINED ENV{ProgramW6432}) + set("${out_var}" "$ENV{ProgramW6432}" PARENT_SCOPE) + else() + set("${out_var}" "$ENV{PROGRAMFILES}" PARENT_SCOPE) endif() - - set(${ret} ${ret_temp} PARENT_SCOPE) - endfunction() diff --git a/scripts/cmake/vcpkg_get_windows_sdk.cmake b/scripts/cmake/vcpkg_get_windows_sdk.cmake index f16d4f53e8f557..0a80d4c76c3706 100644 --- a/scripts/cmake/vcpkg_get_windows_sdk.cmake +++ b/scripts/cmake/vcpkg_get_windows_sdk.cmake @@ -9,8 +9,10 @@ vcpkg_get_windows_sdk() ``` #]===] -function(vcpkg_get_windows_sdk ret) - set(WINDOWS_SDK $ENV{WindowsSDKVersion}) - string(REPLACE "\\" "" WINDOWS_SDK "${WINDOWS_SDK}") - set(${ret} ${WINDOWS_SDK} PARENT_SCOPE) +function(vcpkg_get_windows_sdk out_var) + if("$ENV{WindowsSDKVersion}" MATCHES [[^([0-9.]*)\\?$]]) + set("${out_var}" "${CMAKE_MATCH_1}" PARENT_SCOPE) + else() + message(FATAL_ERROR "Unexpected format for ENV{WindowsSDKVersion} ($ENV{WindowsSDKVersion})") + endif() endfunction() diff --git a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake b/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake index 6c705ae8f8f429..030d74120d88f5 100644 --- a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake +++ b/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake @@ -53,6 +53,7 @@ function(vcpkg_internal_get_cmake_vars) OPTIONS_RELEASE "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log" PREFER_NINJA LOGNAME get-cmake-vars-${TARGET_TRIPLET} + Z_VCPKG_IGNORE_UNUSED_VARIABLES ) set(_include_string) diff --git a/scripts/cmake/vcpkg_list.cmake b/scripts/cmake/vcpkg_list.cmake new file mode 100644 index 00000000000000..74523dc62eb586 --- /dev/null +++ b/scripts/cmake/vcpkg_list.cmake @@ -0,0 +1,257 @@ +#[===[.md: +# vcpkg_list + +A replacement for CMake's `list()` function, which correctly handles elements +with internal semicolons (in other words, escaped semicolons). +Use `vcpkg_list()` instead of `list()` whenever possible. + +```cmake +vcpkg_list(SET [...]) +vcpkg_list( [...]) +``` + +In addition to all of the commands from `list()`, `vcpkg_list` adds +a `vcpkg_list(SET)` command. +This command takes its arguments, escapes them, and then concatenates +them into a list; this should be used instead of `set()` for setting any +list variable. + +Otherwise, the `vcpkg_list()` function is the same as the built-in +`list()` function, with the following restrictions: + +- `GET`, `REMOVE_ITEM`, and `REMOVE_AT` support only one index/value +- `POP_BACK` and `POP_FRONT` do not support getting the value into + another out variable. Use C++ style `GET` then `POP_(BACK|FRONT)`. +- `FILTER` and `TRANSFORM` are unsupported. + +See the [CMake documentation for `list()`](https://cmake.org/cmake/help/latest/command/list.html) +for more information. + +## Notes: Some Weirdnesses + +The most major weirdness is due to `""` pulling double-duty as "list of zero elements", +and "list of one element, which is empty". `vcpkg_list` always uses the former understanding. +This can cause weird behavior, for example: + +```cmake +set(lst "") +vcpkg_list(APPEND lst "" "") +# lst = ";" +``` + +This is because you're appending two elements to the empty list. +One very weird behavior that comes out of this would be: + +```cmake +set(lst "") +vcpkg_list(APPEND lst "") +# lst = "" +``` + +since `""` is the empty list, we append the empty element and end up with a list +of one element, which is empty. This does not happen for non-empty lists; +for example: + +```cmake +set(lst "a") +vcpkg_list(APPEND lst "") +# lst = "a;" +``` + +only the empty list has this odd behavior. + +## Examples + +### Creating a list + +```cmake +vcpkg_list(SET foo_param) +if(DEFINED arg_FOO) + vcpkg_list(SET foo_param FOO "${arg_FOO}") +endif() +``` + +### Appending to a list + +```cmake +set(OPTIONS -DFOO=BAR) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_list(APPEND OPTIONS "-DOS=WINDOWS;FOO") +endif() +``` + +### Popping the end off a list + +```cmake +if(NOT list STREQUAL "") + vcpkg_list(GET list end -1) + vcpkg_list(POP_BACK list) +endif() +``` +#]===] + +macro(z_vcpkg_list_escape_once_more lst) + string(REPLACE [[\;]] [[\\;]] "${lst}" "${${lst}}") +endmacro() + +function(vcpkg_list) + # NOTE: as this function replaces an existing CMake command, + # it does not use cmake_parse_arguments + + # vcpkg_list( ...) + # A0 A1 + + if(ARGC LESS "2") + message(FATAL_ERROR "vcpkg_list requires at least two arguments.") + endif() + + if(ARGV1 MATCHES "^ARGV([0-9]*)$|^ARG[CN]$|^CMAKE_CURRENT_FUNCTION") + message(FATAL_ERROR "vcpkg_list does not support the list_var being ${ARGV1}. + Please use a different variable name.") + endif() + + set(list "${${ARGV1}}") + set(operation "${ARGV0}") + set(list_var "${ARGV1}") + + if(operation STREQUAL "SET") + z_vcpkg_function_arguments(args 2) + set("${list_var}" "${args}" PARENT_SCOPE) + return() + endif() + + # Normal reading functions + if(operation STREQUAL "LENGTH") + # vcpkg_list(LENGTH ) + # A0 A1 A2 + if(NOT ARGC EQUAL "3") + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires two arguments.") + endif() + list(LENGTH list out) + set("${ARGV2}" "${out}" PARENT_SCOPE) + return() + endif() + if(operation MATCHES "^(GET|JOIN|FIND)$") + # vcpkg_list( ) + # A0 A1 A2 A3 + if(NOT ARGC EQUAL "4") + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires three arguments.") + endif() + if(operation STREQUAL "GET") + list(LENGTH list length) + if(length EQUAL "0") + message(FATAL_ERROR "vcpkg_list GET given empty list") + elseif(ARGV2 GREATER_EQUAL length OR ARGV2 LESS "-${length}") + message(FATAL_ERROR "vcpkg_list index: ${ARGV2} is not in range") + endif() + endif() + list("${operation}" list "${ARGV2}" out) + set("${ARGV3}" "${out}" PARENT_SCOPE) + return() + endif() + if(operation STREQUAL "SUBLIST") + # vcpkg_list(SUBLIST ) + # A0 A1 A2 A3 A4 + if(NOT ARGC EQUAL "5") + message(FATAL_ERROR "vcpkg_list sub-command SUBLIST requires four arguments.") + endif() + list(LENGTH list length) + if(ARGV2 LESS "0" OR (ARGV2 GREATER_EQUAL length AND NOT ARGV2 EQUAL "0")) + message(FATAL_ERROR "vcpkg_list begin index: ${ARGV2} is out of range") + endif() + z_vcpkg_list_escape_once_more(list) + list(SUBLIST list "${ARGV2}" "${ARGV3}" out) + set("${ARGV4}" "${out}" PARENT_SCOPE) + return() + endif() + + # modification functions + + if(operation MATCHES "^(APPEND|PREPEND)$") + # vcpkg_list( [...]) + # A0 A1 A2... + + # if ARGC <= 2, then we don't have to do anything + if(ARGC GREATER 2) + z_vcpkg_function_arguments(args 2) + if(list STREQUAL "") + set("${list_var}" "${args}" PARENT_SCOPE) + elseif(operation STREQUAL "APPEND") + set("${list_var}" "${list};${args}" PARENT_SCOPE) + else() + set("${list_var}" "${args};${list}" PARENT_SCOPE) + endif() + endif() + return() + endif() + if(operation STREQUAL "INSERT") + # vcpkg_list(INSERT [...]) + # A0 A1 A2 A3... + + list(LENGTH list length) + if(ARGV2 LESS "-{$length}" OR ARGV2 GREATER length) + message(FATAL_ERROR "vcpkg_list index: ${ARGV2} out of range") + endif() + if(ARGC GREATER 3) + # list(LENGTH) is one of the few subcommands that's fine + list(LENGTH list length) + if(ARGV2 LESS "0") + math(EXPR ARGV2 "${length} + ${ARGV2}") + endif() + if(ARGV2 LESS "0" OR ARGV2 GREATER length) + message(FATAL_ERROR "list index: ${ARGV2} out of range (-${length}, ${length})") + endif() + + z_vcpkg_function_arguments(args 3) + if(list STREQUAL "") + set("${list_var}" "${args}" PARENT_SCOPE) + elseif(ARGV2 EQUAL "0") + set("${list_var}" "${args};${list}" PARENT_SCOPE) + elseif(ARGV2 EQUAL length) + set("${list_var}" "${list};${args}" PARENT_SCOPE) + else() + vcpkg_list(SUBLIST list 0 "${ARGV2}" list_start) + vcpkg_list(SUBLIST list "${ARGV2}" -1 list_end) + set("${list_var}" "${list_start};${args};${list_end}" PARENT_SCOPE) + endif() + elseif(ARGC LESS 3) + message(FATAL_ERROR "vcpkg_list sub-command INSERT requires at least two arguments.") + endif() + return() + endif() + + if(operation MATCHES "^(POP_BACK|POP_FRONT|REVERSE|REMOVE_DUPLICATES)$") + # vcpkg_list( ) + # A0 A1 + if(NOT ARGC EQUAL 2) + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires one argument.") + endif() + z_vcpkg_list_escape_once_more(list) + list("${operation}" list) + set("${list_var}" "${list}" PARENT_SCOPE) + return() + endif() + + if(operation MATCHES "^(REMOVE_AT|REMOVE_ITEM)$") + # vcpkg_list( ) + # A0 A1 A2 + if(NOT ARGC EQUAL 3) + message(FATAL_ERROR "vcpkg_list sub-command ${operation} requires two arguments.") + endif() + if(operation STREQUAL "REMOVE_AT") + list(LENGTH list length) + if(ARGV2 GREATER_EQUAL length OR ARGV2 LESS "-${length}") + message(FATAL_ERROR "vcpkg_list index: ${ARGV2} out of range") + endif() + endif() + + z_vcpkg_list_escape_once_more(list) + string(REPLACE [[;]] [[\;]] ARGV2 "${ARGV2}") + + list("${operation}" list "${ARGV2}") + set("${list_var}" "${list}" PARENT_SCOPE) + return() + endif() + + message(FATAL_ERROR "vcpkg_list sub-command ${operation} is not yet implemented.") +endfunction() diff --git a/scripts/cmake/vcpkg_minimum_required.cmake b/scripts/cmake/vcpkg_minimum_required.cmake index 202935b8902914..44777875e1a1e1 100644 --- a/scripts/cmake/vcpkg_minimum_required.cmake +++ b/scripts/cmake/vcpkg_minimum_required.cmake @@ -14,7 +14,7 @@ The date-version to check against. #]===] function(vcpkg_minimum_required) - cmake_parse_arguments(PARSE_ARGV 0 _vcpkg "" "VERSION" "") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "VERSION" "") if (NOT DEFINED VCPKG_BASE_VERSION) message(FATAL_ERROR "Your vcpkg executable is outdated and is not compatible with the current CMake scripts. " @@ -22,27 +22,27 @@ function(vcpkg_minimum_required) ) endif() - set(_vcpkg_date_regex "^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]$") - if (NOT VCPKG_BASE_VERSION MATCHES "${_vcpkg_date_regex}") + set(vcpkg_date_regex "^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]$") + if (NOT VCPKG_BASE_VERSION MATCHES "${vcpkg_date_regex}") message(FATAL_ERROR - "vcpkg internal failure; \${VCPKG_BASE_VERSION} (${VCPKG_BASE_VERSION}) was not a valid date." + "vcpkg internal failure; VCPKG_BASE_VERSION (${VCPKG_BASE_VERSION}) was not a valid date." ) endif() - if (NOT _vcpkg_VERSION MATCHES "${_vcpkg_date_regex}") + if (NOT arg_VERSION MATCHES "${vcpkg_date_regex}") message(FATAL_ERROR "VERSION parameter to vcpkg_minimum_required was not a valid date. " - "Comparing with vcpkg tool version ${_vcpkg_matched_base_version}" + "Comparing with vcpkg tool version ${VCPKG_BASE_VERSION}" ) endif() - string(REPLACE "-" "." _VCPKG_BASE_VERSION_as_dotted "${VCPKG_BASE_VERSION}") - string(REPLACE "-" "." _vcpkg_VERSION_as_dotted "${_vcpkg_VERSION}") + string(REPLACE "-" "." VCPKG_BASE_VERSION_as_dotted "${VCPKG_BASE_VERSION}") + string(REPLACE "-" "." arg_VERSION_as_dotted "${arg_VERSION}") - if (_VCPKG_BASE_VERSION_as_dotted VERSION_LESS _vcpkg_VERSION_as_dotted) + if (VCPKG_BASE_VERSION_as_dotted VERSION_LESS vcpkg_VERSION_as_dotted) message(FATAL_ERROR "Your vcpkg executable is from ${VCPKG_BASE_VERSION} which is older than required by the caller " - "of vcpkg_minimum_required (${_vcpkg_VERSION}). " + "of vcpkg_minimum_required(VERSION ${arg_VERSION}). " "Please re-acquire vcpkg by running bootstrap-vcpkg." ) endif() diff --git a/scripts/cmake/vcpkg_replace_string.cmake b/scripts/cmake/vcpkg_replace_string.cmake index d24b8677ec0fd6..1f8b37b656fb6a 100644 --- a/scripts/cmake/vcpkg_replace_string.cmake +++ b/scripts/cmake/vcpkg_replace_string.cmake @@ -4,13 +4,12 @@ Replace a string in a file. ```cmake -vcpkg_replace_string(filename match_string replace_string) +vcpkg_replace_string( ) ``` - #]===] -function(vcpkg_replace_string filename match_string replace_string) - file(READ ${filename} _contents) - string(REPLACE "${match_string}" "${replace_string}" _contents "${_contents}") - file(WRITE ${filename} "${_contents}") +function(vcpkg_replace_string filename match replace) + file(READ "${filename}" contents) + string(REPLACE "${match}" "${replace}" contents "${contents}") + file(WRITE "${filename}" "${contents}") endfunction() diff --git a/scripts/cmake/z_vcpkg_function_arguments.cmake b/scripts/cmake/z_vcpkg_function_arguments.cmake index 2c5b694ed1b780..043c861910f6c3 100644 --- a/scripts/cmake/z_vcpkg_function_arguments.cmake +++ b/scripts/cmake/z_vcpkg_function_arguments.cmake @@ -32,22 +32,32 @@ macro(z_vcpkg_function_arguments OUT_VAR) set(z_vcpkg_function_arguments_FIRST_ARG 0) elseif("${ARGC}" EQUAL 2) set(z_vcpkg_function_arguments_FIRST_ARG "${ARGV1}") + + if(NOT z_vcpkg_function_arguments_FIRST_ARG GREATER_EQUAL "0" AND NOT z_vcpkg_function_arguments_FIRST_ARG LESS "0") + message(FATAL_ERROR "z_vcpkg_function_arguments: index (${z_vcpkg_function_arguments_FIRST_ARG}) is not a number") + elseif(z_vcpkg_function_arguments_FIRST_ARG LESS "0" OR z_vcpkg_function_arguments_FIRST_ARG GREATER ARGC) + message(FATAL_ERROR "z_vcpkg_function_arguments: index (${z_vcpkg_function_arguments_FIRST_ARG}) out of range") + endif() else() # vcpkg bug message(FATAL_ERROR "z_vcpkg_function_arguments: invalid arguments (${ARGV})") endif() - set("${OUT_VAR}") + set("${OUT_VAR}" "") # this allows us to get the value of the enclosing function's ARGC set(z_vcpkg_function_arguments_ARGC_NAME "ARGC") set(z_vcpkg_function_arguments_ARGC "${${z_vcpkg_function_arguments_ARGC_NAME}}") math(EXPR z_vcpkg_function_arguments_LAST_ARG "${z_vcpkg_function_arguments_ARGC} - 1") - if(z_vcpkg_function_arguments_LAST_ARG GREATER_EQUAL z_vcpkg_function_arguments_FIRST_ARG) + # GREATER_EQUAL added in CMake 3.7 + if(NOT z_vcpkg_function_arguments_LAST_ARG LESS z_vcpkg_function_arguments_FIRST_ARG) foreach(z_vcpkg_function_arguments_N RANGE "${z_vcpkg_function_arguments_FIRST_ARG}" "${z_vcpkg_function_arguments_LAST_ARG}") string(REPLACE ";" "\\;" z_vcpkg_function_arguments_ESCAPED_ARG "${ARGV${z_vcpkg_function_arguments_N}}") - list(APPEND "${OUT_VAR}" "${z_vcpkg_function_arguments_ESCAPED_ARG}") + # adds an extra ";" on the front + set("${OUT_VAR}" "${${OUT_VAR}};${z_vcpkg_function_arguments_ESCAPED_ARG}") endforeach() + # and then removes that extra semicolon + string(SUBSTRING "${${OUT_VAR}}" 1 -1 "${OUT_VAR}") endif() endmacro() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index ce6fc557b775a1..98a6e23520a9b0 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -130,6 +130,7 @@ if(CMD MATCHES "^BUILD$") include("${SCRIPTS}/cmake/vcpkg_install_nmake.cmake") include("${SCRIPTS}/cmake/vcpkg_install_qmake.cmake") include("${SCRIPTS}/cmake/vcpkg_internal_get_cmake_vars.cmake") + include("${SCRIPTS}/cmake/vcpkg_list.cmake") include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake") include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake") diff --git a/scripts/test_ports/unit-test-cmake/portfile.cmake b/scripts/test_ports/unit-test-cmake/portfile.cmake new file mode 100644 index 00000000000000..638b15974c2e40 --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -0,0 +1,73 @@ +function(set_fatal_error) + if(ARGC EQUAL 0) + set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "OFF" CACHE BOOL "" FORCE) + else() + set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "ON" CACHE BOOL "" FORCE) + set(Z_VCPKG_UNIT_TEST_FATAL_ERROR "${ARGV0}" CACHE STRING "" FORCE) + endif() +endfunction() +function(set_has_error) + set(Z_VCPKG_UNIT_TEST_HAS_ERROR ON CACHE BOOL "" FORCE) +endfunction() + +macro(message level msg) + if("${level}" STREQUAL "FATAL_ERROR") + set_fatal_error("${msg}") + return() + else() + _message("${level}" "${msg}") # note: this results in incorrect printing, but that's fine + # message(STATUS "\${asdf}") will result in + # message(STATUS "${asdf}"), since that's how macro arguments work. + endif() +endmacro() + +set(Z_VCPKG_UNIT_TEST_HAS_ERROR OFF CACHE BOOL "" FORCE) +set_fatal_error() + +function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) + cmake_language(EVAL CODE "${utcve_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + set_fatal_error() + set_has_error() + message(STATUS "${utcve_test} had an unexpected FATAL_ERROR; + expected: \"${utcve_value}\"") + message(STATUS "FATAL_ERROR: ${Z_VCPKG_UNIT_TEST_FATAL_ERROR}") + return() + endif() + + if(NOT DEFINED "${utcve_variable}") + message(STATUS "${utcve_test} failed to set ${utcve_variable}; + expected: \"${utcve_value}\"") + set_has_error() + return() + endif() + if(NOT "${${utcve_variable}}" STREQUAL "${utcve_value}") + message(STATUS "${utcve_test} resulted in the wrong value for ${utcve_variable}; + expected: \"${utcve_value}\" + actual : \"${${utcve_variable}}\"") + set_has_error() + return() + endif() +endfunction() + +function(unit_test_ensure_fatal_error utcve_test) + cmake_language(EVAL CODE "${utcve_test}") + if(NOT Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + set_has_error() + message(STATUS "${utcve_test} was expected to be a FATAL_ERROR.") + endif() + set_fatal_error() +endfunction() + +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +if("list" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_list.cmake") +endif() +if("function-arguments" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_function_arguments.cmake") +endif() + +if(Z_VCPKG_UNIT_TEST_HAS_ERROR) + _message(FATAL_ERROR "At least one test failed") +endif() diff --git a/scripts/test_ports/unit-test-cmake/test-vcpkg_list.cmake b/scripts/test_ports/unit-test-cmake/test-vcpkg_list.cmake new file mode 100644 index 00000000000000..c0f3ac8c07ecbd --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/test-vcpkg_list.cmake @@ -0,0 +1,813 @@ +# vcpkg_list(SET ...) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst a)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst a b)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(SET lst "a;b")]] + lst [[a\;b]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(SET lst "a;b" "c" [[d\;e]])]=] + lst [[a\;b;c;d\\;e]] +) + +# vcpkg_list(LENGTH ) +set(lst [[]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 0 +) +set(lst [[;]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 2 +) +set(lst [[a]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 1 +) +set(lst [[a;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 2 +) +set(lst [[a\\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 1 +) +set(lst [[a\;b;c\\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(LENGTH lst out)]] + out 2 +) + +# vcpkg_list(GET ) +set(lst "") +unit_test_ensure_fatal_error([[vcpkg_list(GET lst 0 out)]]) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "a" +) +unit_test_ensure_fatal_error([[vcpkg_list(GET lst 2 out)]]) +unit_test_ensure_fatal_error([[vcpkg_list(GET lst -2 out)]]) + +set(lst ";b") +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "b" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "b" +) + +set(lst [[a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 0 out)]] + out "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out "c" +) + +set(lst [[a;b\;c;d\\;e]]) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst 1 out)]] + out "b;c" +) +unit_test_check_variable_equal( + [[vcpkg_list(GET lst -1 out)]] + out [[d\;e]] +) + +# vcpkg_list(JOIN ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out "" +) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out "a" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out "-" +) + +set(lst [[a;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out [[a-b]] +) +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "+" out)]] + out [[a+b]] +) + +set(lst [[a;b\;c\\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(JOIN lst "-" out)]] + out [[a-b;c\;d]] +) + +# vcpkg_list(SUBLIST ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 1 out)]] + out "" +) +unit_test_ensure_fatal_error([[vcpkg_list(SUBLIST lst 1 0 out)]]) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 1 out)]] + out "a" +) +unit_test_ensure_fatal_error([[vcpkg_list(SUBLIST lst 2 0 out)]]) +unit_test_ensure_fatal_error([[vcpkg_list(SUBLIST lst 2 1 out)]]) + +set(lst ";;") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 0 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 1 out)]] + out "" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 2 out)]] + out ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 0 3 out)]] + out ";;" +) + +set(lst "a;b;c;d") +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 1 2 out)]] + out "b;c" +) + +set(lst [[a\;b;c\;d;e]]) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 1 2 out)]] + out [[c\;d;e]] +) + +set(lst [[a\;b;c\\;d;e;f;g;h]]) +unit_test_check_variable_equal( + [[vcpkg_list(SUBLIST lst 1 -1 out)]] + out [[c\\;d;e;f;g;h]] +) + +# vcpkg_list(FIND ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a" out)]] + out -1 +) + +set(lst "b") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a" out)]] + out -1 +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a" out)]] + out 0 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst b out)]] + out 1 +) + +set(lst ";b") +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "" out)]] + out 0 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst b out)]] + out 1 +) + +set(lst [[a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst "a;b" out)]] + out 0 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst c out)]] + out 1 +) +unit_test_check_variable_equal( + [[vcpkg_list(FIND lst a out)]] + out -1 +) + +set(lst [[a\\;b;c]]) +unit_test_check_variable_equal( + [=[vcpkg_list(FIND lst [[a\;b]] out)]=] + out 0 +) + +# vcpkg_list(APPEND [...]) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst [[]] +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst a)]] + lst "a" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst ";;" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst b)]] + lst ";;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "b;c" d)]] + lst [[;;b\;c;d]] +) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst "a;" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst b)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "b;c" d)]] + lst [[a;b\;c;d]] +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "")]] + lst "a;b;" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst c)]] + lst "a;b;c" +) +unit_test_check_variable_equal( + [[vcpkg_list(APPEND lst "c;d" e)]] + lst [[a;b;c\;d;e]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(APPEND lst [[c\;d]])]=] + lst [[a;b;c\\;d]] +) + +# vcpkg_list(PREPEND [...]) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst a)]] + lst "a" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst ";;" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst b)]] + lst "b;;" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "b;c" d)]] + lst [[b\;c;d;;]] +) + +set(lst "a") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst ";a" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst b)]] + lst "b;a" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "b;c" d)]] + lst [[b\;c;d;a]] +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst)]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "")]] + lst ";a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst c)]] + lst "c;a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(PREPEND lst "c;d" e)]] + lst [[c\;d;e;a;b]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(PREPEND lst [[c\;d]])]=] + lst [[c\\;d;a;b]] +) + +# list(INSERT [...]) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 "")]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 "" "")]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 "a")]] + lst "a" +) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst 1 "")]]) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst -1 "")]]) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1)]] + lst ";" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 "")]] + lst ";;" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 0 b)]] + lst "b;;" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 b)]] + lst ";b;" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 2 b)]] + lst ";;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -1 "b;c" d)]] + lst [[;b\;c;d;]] +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -2 "b;c" d)]] + lst [[b\;c;d;;]] +) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst 3 "")]]) +unit_test_ensure_fatal_error([[vcpkg_list(INSERT lst -3 "")]]) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -1 c)]] + lst "a;c;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 c)]] + lst "a;c;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 2 c)]] + lst "a;b;c" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst -2 c)]] + lst "c;a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(INSERT lst 1 "c;d")]] + lst [[a;c\;d;b]] +) +unit_test_check_variable_equal( + [=[vcpkg_list(INSERT lst 1 [[c\;d]] e)]=] + lst [[a;c\\;d;e;b]] +) + +# vcpkg_list(POP_BACK ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "a" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "a;" +) + +set(lst [[a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst [[c;a\;b]] +) + +# vcpkg_list(POP_FRONT ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(POP_BACK lst)]] + lst "" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst "b" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst ";b" +) + +set(lst [[a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst "" +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(POP_FRONT lst)]] + lst [[a\;b;c]] +) + +# vcpkg_list(REMOVE_DUPLICATES ) +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;b" +) + +set(lst "a;a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;b" +) + +set(lst "a;b;a") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;b" +) + +set(lst "c;a;b;a;c") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "c;a;b" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst "a;;b" +) + +set(lst [[a\;b;a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst [[a\;b]] +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_DUPLICATES lst)]] + lst [[c;a\;b]] +) + +# vcpkg_list(REVERSE ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst "" +) +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst ";" +) +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst "b;a" +) +set(lst "a;b;c;d;e;f;g") +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst "g;f;e;d;c;b;a" +) + +set(lst [[a\;b;a\;b\\;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst [[a\;b\\;c;a\;b]] +) +set(lst [[c;a\;b]]) +unit_test_check_variable_equal( + [[vcpkg_list(REVERSE lst)]] + lst [[a\;b;c]] +) + +# vcpkg_list(REMOVE_ITEM ) +set(lst "") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "a")]] + lst "" +) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "")]] + lst "" +) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst "b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst b)]] + lst "a" +) + +set(lst "a;a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst "b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst b)]] + lst "a;a" +) + +set(lst "a;b;c;a;d") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst b)]] + lst "a;c;a;d" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst "b;c;d" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "")]] + lst "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst a)]] + lst ";b" +) + +set(lst [[e;a\;b;c\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "a;b")]] + lst [[e;c\;d]] +) + +set(lst [[c;a\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "c")]] + lst [[a\;b]] +) + +set(lst [[c;a\\;b;c]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_ITEM lst "a\\;b")]] + lst [[c;c]] +) + +# vcpkg_list(REMOVE_AT ) +set(lst "") +unit_test_ensure_fatal_error([[vcpkg_list(REMOVE_AT lst 0)]]) + +set(lst ";") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst "" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -2)]] + lst "" +) +unit_test_ensure_fatal_error([[vcpkg_list(REMOVE_AT lst 2)]]) +unit_test_ensure_fatal_error([[vcpkg_list(REMOVE_AT lst -3)]]) + +set(lst "a;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst "b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst "a" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst "a" +) + +set(lst "a;;b") +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst ";b" +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst "a;b" +) + +set(lst [[e;a\;b;c\;d]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst [[a\;b;c\;d]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst [[e;c\;d]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst [[e;a\;b]] +) + +set(lst [[c;a\\;b;c\;d;e]]) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 0)]] + lst [[a\\;b;c\;d;e]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 1)]] + lst [[c;c\;d;e]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 2)]] + lst [[c;a\\;b;e]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst 3)]] + lst [[c;a\\;b;c\;d]] +) +unit_test_check_variable_equal( + [[vcpkg_list(REMOVE_AT lst -1)]] + lst [[c;a\\;b;c\;d]] +) diff --git a/scripts/test_ports/unit-test-cmake/test-z_vcpkg_function_arguments.cmake b/scripts/test_ports/unit-test-cmake/test-z_vcpkg_function_arguments.cmake new file mode 100644 index 00000000000000..e88eb683f9b497 --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/test-z_vcpkg_function_arguments.cmake @@ -0,0 +1,63 @@ +# these both set `args` in the top level +function(check_function_args start) + z_vcpkg_function_arguments(out "${start}") + set(args "${out}" PARENT_SCOPE) +endfunction() +function(check_all_function_args) + z_vcpkg_function_arguments(out) + set(args "${out}" PARENT_SCOPE) +endfunction() + +unit_test_ensure_fatal_error([[check_function_args(-1)]]) +unit_test_ensure_fatal_error([[check_function_args(3)]]) +unit_test_ensure_fatal_error([[check_function_args(notanumber)]]) +unit_test_check_variable_equal( + [[check_all_function_args()]] + args "" +) +unit_test_check_variable_equal( + [[check_all_function_args("")]] + args "" +) +unit_test_check_variable_equal( + [[check_all_function_args("" "")]] + args ";" +) +unit_test_check_variable_equal( + [[check_all_function_args("" "" "" "")]] + args ";;;" +) + +unit_test_check_variable_equal( + [[check_all_function_args(a b c)]] + args "a;b;c" +) +unit_test_check_variable_equal( + [[check_function_args(2 a b c)]] + args "b;c" +) +unit_test_check_variable_equal( + [[check_function_args(3 a b c)]] + args "c" +) + +unit_test_check_variable_equal( + [=[check_all_function_args("a;b" [[c\;d]] e)]=] + args [[a\;b;c\\;d;e]] +) +unit_test_check_variable_equal( + [=[check_all_function_args("a;b" [[c\;d]] [[e\\;f]])]=] + args [[a\;b;c\\;d;e\\\;f]] +) +unit_test_check_variable_equal( + [=[check_function_args(2 "a;b" [[c\;d]] e)]=] + args [[c\\;d;e]] +) +unit_test_check_variable_equal( + [=[check_function_args(3 "a;b" [[c\;d]] e)]=] + args "e" +) +unit_test_check_variable_equal( + [=[check_function_args(4 "a;b" [[c\;d]] e)]=] + args "" +) diff --git a/scripts/test_ports/unit-test-cmake/vcpkg.json b/scripts/test_ports/unit-test-cmake/vcpkg.json new file mode 100644 index 00000000000000..5079f9e739b5fc --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "unit-test-cmake", + "version-string": "0", + "description": "Ensures that the CMake scripts are unit tested.", + "supports": "x64", + "default-features": [ + "function-arguments", + "list" + ], + "features": { + "function-arguments": { + "description": "Test the z_vcpkg_function_arguments function" + }, + "list": { + "description": "Test the vcpkg_list function" + } + } +} diff --git a/versions/a-/apr.json b/versions/a-/apr.json index 6f5ea6bf9b870c..d652415aa93e90 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9e93acdaa680398eaed361f1df530096ded84ff", + "version": "1.7.0", + "port-version": 4 + }, { "git-tree": "ca62f9b23d92ff6bb375277cb56e6ea1cde2c9f1", "version-string": "1.7.0", diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index 4e77989eb34ca9..f70e69627c4baf 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5dadcecafd0c3ffdfcf438c1f5f8b106002e14d0", + "version-date": "2020-12-09", + "port-version": 1 + }, { "git-tree": "d74324af317840ffb5c5aa54f1579ef2faab4a0e", "version-string": "2020-12-09", diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index e7a2d37b5fb425..12f10ca85f24fb 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc7fdf585419fadcd96b13a800c4323b098256cd", + "version": "1.4.1", + "port-version": 1 + }, { "git-tree": "28c9dbd6d17602e942cd81f9d70aeff80f3d83f0", "version-string": "1.4.1", diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index 5e3fd467f69642..7e1ce41a5bba9c 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a840c1d638565cbc8c4fd9a4200c0f54136275d7", + "version": "0.10", + "port-version": 1 + }, { "git-tree": "7ad926d8d5b488348fb195aa2180443a986e3464", "version-string": "0.10", diff --git a/versions/b-/bond.json b/versions/b-/bond.json index 88acf8925e8ae7..98a2e01d805121 100644 --- a/versions/b-/bond.json +++ b/versions/b-/bond.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1dbc5726734016b562a6f957ae3072df17b4592", + "version": "9.0.3", + "port-version": 2 + }, { "git-tree": "29fa989c86f7846056f2afc162152f79169ec813", "version-string": "9.0.3", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 8b68bd2fb6a834..fec275a65f2f4a 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a0618dd4e015d7a0ae5339e6758c5f1fd4754a6", + "version": "2.16.0", + "port-version": 2 + }, { "git-tree": "7776bdc54cb37a29c18701d4332e4537e6be357a", "version": "2.16.0", diff --git a/versions/baseline.json b/versions/baseline.json index cef33e4dee056e..92340f420ffb6e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -102,7 +102,7 @@ }, "apr": { "baseline": "1.7.0", - "port-version": 3 + "port-version": 4 }, "apr-util": { "baseline": "1.6.1", @@ -274,11 +274,11 @@ }, "azure-iot-sdk-c": { "baseline": "2020-12-09", - "port-version": 0 + "port-version": 1 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 0 + "port-version": 1 }, "azure-macro-utils-c": { "baseline": "2020-06-17", @@ -390,7 +390,7 @@ }, "bitserializer": { "baseline": "0.10", - "port-version": 0 + "port-version": 1 }, "bitserializer-cpprestjson": { "baseline": "alias", @@ -434,7 +434,7 @@ }, "bond": { "baseline": "9.0.3", - "port-version": 1 + "port-version": 2 }, "boolinq": { "baseline": "3.0.1", @@ -1038,7 +1038,7 @@ }, "botan": { "baseline": "2.16.0", - "port-version": 1 + "port-version": 2 }, "box2d": { "baseline": "2.4.1", @@ -1126,7 +1126,7 @@ }, "capstone": { "baseline": "4.0.2", - "port-version": 1 + "port-version": 2 }, "cartographer": { "baseline": "1.0.0", @@ -1182,7 +1182,7 @@ }, "ceres": { "baseline": "2.0.0", - "port-version": 4 + "port-version": 5 }, "cfitsio": { "baseline": "3.49", @@ -1190,7 +1190,7 @@ }, "cgal": { "baseline": "5.2.2", - "port-version": 0 + "port-version": 1 }, "cgicc": { "baseline": "3.2.19-4", @@ -1254,11 +1254,11 @@ }, "civetweb": { "baseline": "1.13", - "port-version": 1 + "port-version": 2 }, "cjson": { - "baseline": "2019-11-30-1", - "port-version": 0 + "baseline": "2019-11-30", + "port-version": 2 }, "clamav": { "baseline": "0.103.0", @@ -1314,7 +1314,7 @@ }, "clue": { "baseline": "1.0.0-alpha.7", - "port-version": 0 + "port-version": 1 }, "cmark": { "baseline": "0.29.0", @@ -1474,7 +1474,7 @@ }, "cppzmq": { "baseline": "4.7.1", - "port-version": 1 + "port-version": 2 }, "cpr": { "baseline": "1.6.2", @@ -1502,7 +1502,7 @@ }, "crashrpt": { "baseline": "1.4.3", - "port-version": 0 + "port-version": 1 }, "crc32c": { "baseline": "1.1.1", @@ -1726,11 +1726,11 @@ }, "dlib": { "baseline": "19.21", - "port-version": 4 + "port-version": 5 }, "dmlc": { "baseline": "2019-08-12", - "port-version": 5 + "port-version": 6 }, "docopt": { "baseline": "2018-11-01", @@ -6538,7 +6538,7 @@ }, "vcpkg-cmake": { "baseline": "2021-06-25", - "port-version": 4 + "port-version": 5 }, "vcpkg-cmake-config": { "baseline": "2021-05-22", diff --git a/versions/c-/capstone.json b/versions/c-/capstone.json index a74ac9b9255393..bcd224fa77aa3d 100644 --- a/versions/c-/capstone.json +++ b/versions/c-/capstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "465e527988f09c855e156cff45b7ee6dfbe1d303", + "version": "4.0.2", + "port-version": 2 + }, { "git-tree": "7c919b056af0b624766a625f1de7847f97262d92", "version-string": "4.0.2", diff --git a/versions/c-/ceres.json b/versions/c-/ceres.json index c4607a3ae012be..b2284cd17c9e0e 100644 --- a/versions/c-/ceres.json +++ b/versions/c-/ceres.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07f2aa6906e97637ae7a4ed6dcfce6867eb1a049", + "version-semver": "2.0.0", + "port-version": 5 + }, { "git-tree": "ba834e4ef32213f516d2b0539240ba4cc4a9c90a", "version-semver": "2.0.0", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index 6f27b3aeccc590..ce6e700fc47994 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02c3a0b581425d69dc21787d87e14c53a07e33ee", + "version": "5.2.2", + "port-version": 1 + }, { "git-tree": "8ecf63852d98760d2b2bd0c75b70ab95a5e73aca", "version-string": "5.2.2", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index 669cb9a5696a7d..4a1f0f8274dc38 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca6f80fd431dc0a13daa1509308d598700fbd763", + "version": "1.13", + "port-version": 2 + }, { "git-tree": "c66a22f30f2b72f81ae2bb23cce2bfc512b6e983", "version-string": "1.13", diff --git a/versions/c-/cjson.json b/versions/c-/cjson.json index 60a5fdf30eb2b9..65804958af0dd7 100644 --- a/versions/c-/cjson.json +++ b/versions/c-/cjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8997bd75a1e40cf8ac7f7d77a942afd84f01d2e", + "version-date": "2019-11-30", + "port-version": 2 + }, { "git-tree": "2a1edb97563c7a8e4007f479bfdcb33122911e16", "version-string": "2019-11-30-1", diff --git a/versions/c-/clue.json b/versions/c-/clue.json index ae2eb1280ba21e..def781117f8b9a 100644 --- a/versions/c-/clue.json +++ b/versions/c-/clue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b58662a5b92d34be097810c33d6ec24400ae0b26", + "version-string": "1.0.0-alpha.7", + "port-version": 1 + }, { "git-tree": "f4b5156fc9604848b9aa627ef0bf7ab21e9ad5ac", "version-string": "1.0.0-alpha.7", diff --git a/versions/c-/cppzmq.json b/versions/c-/cppzmq.json index caaa7cfa80a1d0..bbf86ebf20665f 100644 --- a/versions/c-/cppzmq.json +++ b/versions/c-/cppzmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "142701d624e76cc4288ddce74c796501ba8cfa57", + "version": "4.7.1", + "port-version": 2 + }, { "git-tree": "8f196edc3e7a6d6d26e14162ed542848d1eee4c1", "version-string": "4.7.1", diff --git a/versions/c-/crashrpt.json b/versions/c-/crashrpt.json index 665df26dda7ed0..633efbaa4d5e66 100644 --- a/versions/c-/crashrpt.json +++ b/versions/c-/crashrpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad55102e0d167bb457349e5b2b4cec75efc45a91", + "version": "1.4.3", + "port-version": 1 + }, { "git-tree": "671b2d16a22bdaf8718e15fa13554c838b6e6ce7", "version-string": "1.4.3", diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index 1984302539f7de..9d7cd262cf8b8b 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58207e22ff2355358bee9fb607b03b6cab1030c6", + "version": "19.21", + "port-version": 5 + }, { "git-tree": "498121f386e722fbc511caac849425041206735b", "version-string": "19.21", diff --git a/versions/d-/dmlc.json b/versions/d-/dmlc.json index 9a0daad884339f..97a0362d2bdb11 100644 --- a/versions/d-/dmlc.json +++ b/versions/d-/dmlc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47d5b971d74b762c6c52e676d5c1c082ee462c0e", + "version-date": "2019-08-12", + "port-version": 6 + }, { "git-tree": "162f71aa6f31426d3e8cbbb2614c8bba689e7bbc", "version-string": "2019-08-12", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 96d5eb75da9fca..c632ab855e8929 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07c3e68ce9ae8f30bcc0b21def7a528dbb8ecb07", + "version-date": "2021-06-25", + "port-version": 5 + }, { "git-tree": "acc25ec22f8fd8887a865705580b1d6de041616d", "version-date": "2021-06-25", From a570683cbd2b68aa3bbdd81c3f0a863685afa491 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Tue, 20 Jul 2021 14:56:02 -0400 Subject: [PATCH 0140/1858] [angle] Update to chromium/4472 (#18432) * [angle] Update to chromium/4472 * Run x-add-version angle --- ports/angle/CMakeLists.txt | 392 +++++++++++++++---- ports/angle/CONTROL | 7 - ports/angle/{commit.h => angle_commit.h} | 0 ports/angle/portfile.cmake | 30 +- ports/angle/third-party-zlib-far-undef.patch | 13 + ports/angle/vcpkg.json | 14 + versions/a-/angle.json | 5 + versions/baseline.json | 4 +- 8 files changed, 381 insertions(+), 84 deletions(-) delete mode 100644 ports/angle/CONTROL rename ports/angle/{commit.h => angle_commit.h} (100%) create mode 100644 ports/angle/third-party-zlib-far-undef.patch create mode 100644 ports/angle/vcpkg.json diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 18db69e5fd0966..c00c3d0ea650fc 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -28,7 +28,7 @@ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}") set(CMAKE_STATIC_LIBRARY_PREFIX "") if (WINDOWS_STORE) - set(WINRT_DEFINES -DANGLE_ENABLE_WINDOWS_STORE) + set(WINRT_DEFINES -DANGLE_ENABLE_WINDOWS_UWP -DWINAPI_FAMILY=WINAPI_FAMILY_PC_APP) else() set(WINRT_DEFINES) endif() @@ -39,27 +39,42 @@ add_definitions( -D_HAS_EXCEPTIONS=0 -DNOMINMAX -DANGLE_STANDALONE_BUILD - -DANGLE_ENABLE_DEBUG_ANNOTATIONS ${WINRT_DEFINES} ) +add_compile_options("$<$:-DANGLE_ENABLE_DEBUG_ANNOTATIONS>") +if(WIN32) + add_definitions(-DANGLE_IS_WIN) +endif() +if(LINUX) + add_definitions(-DANGLE_IS_LINUX) +endif() +if(ANGLE_IS_64_BIT_CPU) + add_definitions(-DANGLE_IS_64_BIT_CPU) +elseif(ANGLE_IS_32_BIT_CPU) + add_definitions(-DANGLE_IS_32_BIT_CPU) +endif() -configure_file(commit.h include/id/commit.h COPYONLY) +configure_file(angle_commit.h include/id/commit.h COPYONLY) #include_directories(include src ${CMAKE_CURRENT_BINARY_DIR}/include) include_directories("$" "$" "$" "$") ########## # angle::common if(WINDOWS_DESKTOP) - set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix|_winuwp") + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_apple|_mac|_ios|_posix|_winuwp") elseif(WINDOWS_STORE) - set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_mac|_posix|_win32") + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_apple|_mac|_ios|_posix|_win32") elseif(LINUX) - set(ANGLE_COMMON_PLATFORM_FILTER "_win|_mac") + set(ANGLE_COMMON_PLATFORM_FILTER "_win|_apple|_mac|_ios") elseif(APPLE) - set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win") + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") # macOS + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_ios") + else() # other Apple platforms (iOS, etc) + set(ANGLE_COMMON_PLATFORM_FILTER "_linux|_win|_mac") + endif() endif() file(GLOB ANGLE_COMMON_SOURCES "src/common/*.h" - "src/common/*.inl" + "src/common/*.inc" "src/common/*.cpp" "src/common/third_party/base/anglebase/*.h" "src/common/third_party/base/anglebase/*.cc" @@ -75,9 +90,21 @@ add_library(angle_common OBJECT ${ANGLE_COMMON_SOURCES}) target_include_directories(angle_common PUBLIC "$") add_library(angle::common ALIAS angle_common) +########## +# angle::compression +file(GLOB ANGLE_COMPRESSION_UTILS_SOURCES "third_party/zlib/google/compression_utils_portable.*") +find_package(ZLIB REQUIRED) +add_library(angle_compression_utils OBJECT ${ANGLE_COMPRESSION_UTILS_SOURCES}) +target_link_libraries(angle_compression_utils PUBLIC ZLIB::ZLIB) +target_compile_definitions(angle_compression_utils PRIVATE + -DUSE_SYSTEM_ZLIB +) +target_include_directories(angle_compression_utils INTERFACE "$") +add_library(angle::compression ALIAS angle_compression_utils) + ########## # angle::image_util -file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inl" "src/image_util/*.cpp") +file(GLOB ANGLE_IMAGE_UTIL_SOURCES "src/image_util/*.h" "src/image_util/*.inc" "src/image_util/*.cpp") add_library(angle_image_util OBJECT ${ANGLE_IMAGE_UTIL_SOURCES}) target_link_libraries(angle_image_util PRIVATE angle::common) add_library(angle::image_util ALIAS angle_image_util) @@ -85,23 +112,207 @@ add_library(angle::image_util ALIAS angle_image_util) ########## # angle::translator file(GLOB TRANSLATOR_SOURCES - "src/compiler/translator/glslang.l" - "src/compiler/translator/glslang.y" - "src/compiler/translator/*.h" - "src/compiler/translator/*.cpp" - "src/compiler/translator/tree_ops/*.h" + "src/compiler/translator/BaseTypes.h" + "src/compiler/translator/BuiltInFunctionEmulator.cpp" + "src/compiler/translator/BuiltInFunctionEmulator.h" + "src/compiler/translator/CallDAG.cpp" + "src/compiler/translator/CallDAG.h" + "src/compiler/translator/CodeGen.cpp" + "src/compiler/translator/CollectVariables.cpp" + "src/compiler/translator/CollectVariables.h" + "src/compiler/translator/Common.h" + "src/compiler/translator/Compiler.cpp" + "src/compiler/translator/Compiler.h" + "src/compiler/translator/ConstantUnion.cpp" + "src/compiler/translator/ConstantUnion.h" + "src/compiler/translator/Declarator.cpp" + "src/compiler/translator/Declarator.h" + "src/compiler/translator/Diagnostics.cpp" + "src/compiler/translator/Diagnostics.h" + "src/compiler/translator/DirectiveHandler.cpp" + "src/compiler/translator/DirectiveHandler.h" + "src/compiler/translator/ExtensionBehavior.cpp" + "src/compiler/translator/ExtensionBehavior.h" + "src/compiler/translator/FlagStd140Structs.cpp" + "src/compiler/translator/FlagStd140Structs.h" + "src/compiler/translator/FunctionLookup.cpp" + "src/compiler/translator/FunctionLookup.h" + "src/compiler/translator/HashNames.cpp" + "src/compiler/translator/HashNames.h" + "src/compiler/translator/ImmutableString.h" + "src/compiler/translator/ImmutableStringBuilder.cpp" + "src/compiler/translator/ImmutableStringBuilder.h" + "src/compiler/translator/InfoSink.cpp" + "src/compiler/translator/InfoSink.h" + "src/compiler/translator/Initialize.cpp" + "src/compiler/translator/Initialize.h" + "src/compiler/translator/InitializeDll.cpp" + "src/compiler/translator/InitializeDll.h" + "src/compiler/translator/InitializeGlobals.h" + "src/compiler/translator/IntermNode.cpp" + "src/compiler/translator/IntermNode.h" + "src/compiler/translator/IsASTDepthBelowLimit.cpp" + "src/compiler/translator/IsASTDepthBelowLimit.h" + "src/compiler/translator/Operator.cpp" + "src/compiler/translator/Operator.h" + "src/compiler/translator/OutputTree.cpp" + "src/compiler/translator/OutputTree.h" + "src/compiler/translator/ParseContext.cpp" + "src/compiler/translator/ParseContext.h" + "src/compiler/translator/ParseContext_ESSL_autogen.h" + "src/compiler/translator/ParseContext_complete_autogen.h" + "src/compiler/translator/ParseContext_interm.h" + "src/compiler/translator/PoolAlloc.cpp" + "src/compiler/translator/PoolAlloc.h" + "src/compiler/translator/Pragma.h" + "src/compiler/translator/QualifierTypes.cpp" + "src/compiler/translator/QualifierTypes.h" + "src/compiler/translator/Severity.h" + "src/compiler/translator/ShaderLang.cpp" + "src/compiler/translator/ShaderVars.cpp" + "src/compiler/translator/StaticType.h" + "src/compiler/translator/Symbol.cpp" + "src/compiler/translator/Symbol.h" + "src/compiler/translator/SymbolTable.cpp" + "src/compiler/translator/SymbolTable.h" + "src/compiler/translator/SymbolTable_autogen.h" + "src/compiler/translator/SymbolUniqueId.cpp" + "src/compiler/translator/SymbolUniqueId.h" + "src/compiler/translator/TranslatorESSL.h" + "src/compiler/translator/TranslatorGLSL.h" + "src/compiler/translator/TranslatorHLSL.h" + "src/compiler/translator/TranslatorMetal.h" + "src/compiler/translator/TranslatorVulkan.h" + "src/compiler/translator/Types.cpp" + "src/compiler/translator/Types.h" + "src/compiler/translator/ValidateAST.cpp" + "src/compiler/translator/ValidateAST.h" + "src/compiler/translator/ValidateBarrierFunctionCall.cpp" + "src/compiler/translator/ValidateBarrierFunctionCall.h" + "src/compiler/translator/ValidateClipCullDistance.cpp" + "src/compiler/translator/ValidateClipCullDistance.h" + "src/compiler/translator/ValidateGlobalInitializer.cpp" + "src/compiler/translator/ValidateGlobalInitializer.h" + "src/compiler/translator/ValidateLimitations.cpp" + "src/compiler/translator/ValidateLimitations.h" + "src/compiler/translator/ValidateMaxParameters.cpp" + "src/compiler/translator/ValidateMaxParameters.h" + "src/compiler/translator/ValidateOutputs.cpp" + "src/compiler/translator/ValidateOutputs.h" + "src/compiler/translator/ValidateSwitch.cpp" + "src/compiler/translator/ValidateSwitch.h" + "src/compiler/translator/ValidateVaryingLocations.cpp" + "src/compiler/translator/ValidateVaryingLocations.h" + "src/compiler/translator/VariablePacker.cpp" + "src/compiler/translator/VariablePacker.h" + "src/compiler/translator/blocklayout.cpp" + "src/compiler/translator/glslang.h" + "src/compiler/translator/glslang_lex_autogen.cpp" + "src/compiler/translator/glslang_tab_autogen.cpp" + "src/compiler/translator/glslang_tab_autogen.h" + "src/compiler/translator/glslang_wrapper.h" + "src/compiler/translator/length_limits.h" "src/compiler/translator/tree_ops/*.cpp" + "src/compiler/translator/tree_ops/*.h" + "src/compiler/translator/tree_ops/gl/ClampFragDepth.h" + "src/compiler/translator/tree_ops/gl/RegenerateStructNames.h" + "src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.h" + "src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.h" + "src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.h" + "src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.h" + "src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.h" + "src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.h" + "src/compiler/translator/tree_ops/vulkan/EarlyFragmentTestsOptimization.h" "src/compiler/translator/tree_util/*.h" "src/compiler/translator/tree_util/*.cpp" + "src/compiler/translator/util.cpp" + "src/compiler/translator/util.h" "src/third_party/compiler/ArrayBoundsClamper.cpp" + "src/third_party/compiler/ArrayBoundsClamper.h" ) list(FILTER TRANSLATOR_SOURCES EXCLUDE REGEX "_unittest") -add_library(angle_translator OBJECT ${TRANSLATOR_SOURCES}) -target_compile_definitions(angle_translator PUBLIC - -DANGLE_ENABLE_ESSL - -DANGLE_ENABLE_GLSL - -DANGLE_ENABLE_HLSL +file(GLOB TRANSLATOR_GLSL_BASE_SOURCES + "src/compiler/translator/OutputGLSLBase.cpp" + "src/compiler/translator/OutputGLSLBase.h" ) +file(GLOB TRANSLATOR_GLSL_AND_VULKAN_BASE_SOURCES + "src/compiler/translator/BuiltinsWorkaroundGLSL.cpp" + "src/compiler/translator/BuiltinsWorkaroundGLSL.h" + "src/compiler/translator/OutputGLSL.cpp" + "src/compiler/translator/OutputGLSL.h" +) +file(GLOB TRANSLATOR_ESSL_SOURCES + "src/compiler/translator/OutputESSL.cpp" + "src/compiler/translator/OutputESSL.h" + "src/compiler/translator/TranslatorESSL.cpp" + "src/compiler/translator/tree_ops/gl/RecordConstantPrecision.cpp" + "src/compiler/translator/tree_ops/gl/RecordConstantPrecision.h" +) +file(GLOB TRANSLATOR_GLSL_SOURCES + "src/compiler/translator/BuiltInFunctionEmulatorGLSL.cpp" + "src/compiler/translator/BuiltInFunctionEmulatorGLSL.h" + "src/compiler/translator/ExtensionGLSL.cpp" + "src/compiler/translator/ExtensionGLSL.h" + "src/compiler/translator/TranslatorGLSL.cpp" + "src/compiler/translator/VersionGLSL.cpp" + "src/compiler/translator/VersionGLSL.h" + "src/compiler/translator/tree_ops/gl/ClampFragDepth.cpp" + "src/compiler/translator/tree_ops/gl/RegenerateStructNames.cpp" + "src/compiler/translator/tree_ops/gl/RewriteRepeatedAssignToSwizzled.cpp" + "src/compiler/translator/tree_ops/gl/UseInterfaceBlockFields.cpp" + "src/compiler/translator/tree_ops/gl/VectorizeVectorScalarArithmetic.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.h" + "src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.h" +) +file(GLOB TRANSLATOR_GLSL_MAC_SOURCES + "src/compiler/translator/tree_ops/gl/mac/AddAndTrueToLoopCondition.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteDoWhile.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteRowMajorMatrices.cpp" + "src/compiler/translator/tree_ops/gl/mac/RewriteUnaryMinusOperatorFloat.cpp" + "src/compiler/translator/tree_ops/gl/mac/UnfoldShortCircuitAST.cpp" +) +file(GLOB TRANSLATOR_HLSL_SOURCES + "src/compiler/translator/*HLSL.h" + "src/compiler/translator/*HLSL.cpp" + "src/compiler/translator/emulated_builtin_functions_hlsl_autogen.cpp" + "src/compiler/translator/tree_ops/d3d/*.cpp" + "src/compiler/translator/tree_ops/d3d/*.h" +) +if(ANDROID) + list(APPEND TRANSLATOR_SOURCES "src/compiler/translator/ImmutableString_ESSL_autogen.cpp" "src/compiler/translator/SymbolTable_ESSL_autogen.cpp") +else() + list(APPEND TRANSLATOR_SOURCES "src/compiler/translator/ImmutableString_autogen.cpp" "src/compiler/translator/SymbolTable_autogen.cpp") +endif() +set(ANGLE_ENABLE_ESSL TRUE) +set(ANGLE_ENABLE_GLSL TRUE) +set(ANGLE_ENABLE_HLSL TRUE) +set(_needs_glsl_base FALSE) +set(_needs_glsl_and_vulkan_base FALSE) +add_library(angle_translator OBJECT ${TRANSLATOR_SOURCES}) +if(ANGLE_ENABLE_ESSL) + set(_needs_glsl_base TRUE) + target_sources(angle_translator PRIVATE ${TRANSLATOR_ESSL_SOURCES}) + target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_ESSL) +endif() +if(ANGLE_ENABLE_GLSL) + set(_needs_glsl_base TRUE) + set(_needs_glsl_and_vulkan_base TRUE) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_SOURCES}) + if(APPLE) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_MAC_SOURCES}) + endif() + target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_GLSL) +endif() +if(ANGLE_ENABLE_HLSL) + target_sources(angle_translator PRIVATE ${TRANSLATOR_HLSL_SOURCES}) + target_compile_definitions(angle_translator PUBLIC -DANGLE_ENABLE_HLSL) +endif() +if(_needs_glsl_base) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_BASE_SOURCES}) +endif() +if(_needs_glsl_and_vulkan_base) + target_sources(angle_translator PRIVATE ${TRANSLATOR_GLSL_AND_VULKAN_BASE_SOURCES}) +endif() target_link_libraries(angle_translator PRIVATE angle::common) add_library(angle::translator ALIAS angle_translator) @@ -123,31 +334,27 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE) if(WINDOWS_DESKTOP) set(ANGLE_RENDERER_OPENGL_PLATFORM "src/libANGLE/renderer/gl/wgl/*.cpp" - "src/libANGLE/renderer/gl/wgl/*.inl" "src/libANGLE/renderer/gl/wgl/*.h" ) elseif(APPLE) set(ANGLE_RENDERER_OPENGL_PLATFORM "src/libANGLE/renderer/gl/cgl/*.mm" "src/libANGLE/renderer/gl/cgl/*.cpp" - "src/libANGLE/renderer/gl/cgl/*.inl" "src/libANGLE/renderer/gl/cgl/*.h" "gpu_info_util/SystemInfo_macos.mm" ) elseif(LINUX) set(ANGLE_RENDERER_OPENGL_PLATFORM "src/libANGLE/renderer/gl/glx/*.cpp" - "src/libANGLE/renderer/gl/glx/*.inl" "src/libANGLE/renderer/gl/glx/*.h" "src/libANGLE/renderer/gl/egl/*.cpp" - "src/libANGLE/renderer/gl/egl/*.inl" "src/libANGLE/renderer/gl/egl/*.h" ) endif() file(GLOB LIBANGLE_GL_SOURCES "src/libANGLE/renderer/gl/*.cpp" - "src/libANGLE/renderer/gl/*.inl" + "src/libANGLE/renderer/gl/*.inc" "src/libANGLE/renderer/gl/*.h" ${ANGLE_RENDERER_OPENGL_PLATFORM} @@ -164,7 +371,7 @@ if(WIN32) ## All D3D Sources file(GLOB_RECURSE LIBANGLE_D3D_SOURCES "src/libANGLE/renderer/d3d/*.cpp" - "src/libANGLE/renderer/d3d/*.inl" + "src/libANGLE/renderer/d3d/*.inc" "src/libANGLE/renderer/d3d/*.h" ) list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest") @@ -181,17 +388,17 @@ if(WIN32) ## Win32/d3d9 D3D Renderer if(WINDOWS_DESKTOP) set(LIBANGLE_D3D_DESKTOP_SOURCES ${LIBANGLE_D3D_SOURCES}) - list(FILTER LIBANGLE_D3D_DESKTOP_SOURCES INCLUDE REGEX "d3d9|win32|converged") + list(FILTER LIBANGLE_D3D_DESKTOP_SOURCES INCLUDE REGEX "d3d9|win32") find_library(D3D9_LIB NAMES d3d9) add_library(angle_renderer_win32 INTERFACE) target_sources(angle_renderer_win32 INTERFACE "$") target_compile_definitions(angle_renderer_win32 INTERFACE -DANGLE_ENABLE_D3D9) - target_link_libraries(angle_renderer_win32 INTERFACE ${D3D9_LIB}) + target_link_libraries(angle_renderer_win32 INTERFACE d3d9) add_library(angle::renderer::win32 ALIAS angle_renderer_win32) endif() ## D3D11 Base renderer - list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "winrt|d3d9|win32|converged") + list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "winrt|d3d9|win32") find_library(DXGUID_LIB NAMES dxguid) find_library(D3D11_LIB NAMES d3d11) add_library(angle_renderer_d3d INTERFACE) @@ -199,6 +406,7 @@ if(WIN32) target_compile_definitions(angle_renderer_d3d INTERFACE -DANGLE_ENABLE_D3D11 "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" + -DANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW ) target_link_libraries(angle_renderer_d3d INTERFACE d3d11 dxguid) add_library(angle::renderer::d3d ALIAS angle_renderer_d3d) @@ -215,7 +423,10 @@ if(WIN32) target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_win.cpp") target_link_libraries(angle_gpu_info_util PRIVATE setupapi.lib dxgi.lib) elseif(APPLE) - target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_macos.mm") + target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_apple.mm") + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") # macOS + target_sources(angle_gpu_info_util PRIVATE "src/gpu_info_util/SystemInfo_macos.mm") + endif() find_library(IOKit IOKit) find_library(CoreFoundation CoreFoundation) find_library(CoreGraphics CoreGraphics) @@ -232,9 +443,11 @@ add_library(angle::gpu_info_util ALIAS angle_gpu_info_util) ## Core libANGLE library if(WIN32) - set(LIBANGLE_SOURCES_PLATFORM - "src/third_party/systeminfo/SystemInfo.cpp" - ) + if(NOT WINDOWS_STORE) + set(LIBANGLE_SOURCES_PLATFORM + "src/third_party/systeminfo/SystemInfo.cpp" + ) + endif() elseif(APPLE) file(GLOB LIBANGLE_SOURCES_PLATFORM "src/libANGLE/renderer/*.mm" @@ -248,20 +461,47 @@ file(GLOB LIBANGLE_SOURCES "src/common/event_tracer.cpp" "src/libANGLE/*.cpp" - "src/libANGLE/*.inl" + "src/libANGLE/*.inc" "src/libANGLE/*.h" "src/libANGLE/renderer/*.cpp" - "src/libANGLE/renderer/*.inl" "src/libANGLE/renderer/*.h" "src/libANGLE/renderer/null/*.cpp" - "src/libANGLE/renderer/null/*.inl" "src/libANGLE/renderer/null/*.h" + # The frame capture headers are always visible to libANGLE. + "src/libANGLE/capture/*.h" + + # angle_frame_capture_disabled + "src/libANGLE/capture/FrameCapture_mock.cpp" + "src/libANGLE/capture/frame_capture_utils_mock.cpp" + + # angle_gl_enum_utils + "src/libANGLE/capture/gl_enum_utils.cpp" + "src/libANGLE/capture/gl_enum_utils_autogen.cpp" + ${LIBANGLE_SOURCES_PLATFORM} ) -list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest|glslang_wrapper|capture|FrameCapture\.cpp") +list(FILTER LIBANGLE_SOURCES EXCLUDE REGEX "_unittest|glslang_wrapper|dxgi_|d3d_format") +if(WIN32) + set(LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM) + if(NOT WINDOWS_STORE) + list(APPEND LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM + "src/libANGLE/renderer/d3d_format.cpp" + "src/libANGLE/renderer/d3d_format.h" + ) + endif() + file(GLOB LIBANGLE_D3D_FORMAT_TABLES_SOURCES + "src/libANGLE/renderer/dxgi_format_map.h" + "src/libANGLE/renderer/dxgi_format_map_autogen.cpp" + "src/libANGLE/renderer/dxgi_support_table.h" + "src/libANGLE/renderer/dxgi_support_table_autogen.cpp" + + ${LIBANGLE_D3D_FORMAT_TABLES_SOURCES_PLATFORM} + ) + list(APPEND LIBANGLE_SOURCES "${LIBANGLE_D3D_FORMAT_TABLES_SOURCES}") +endif() if(LINUX OR APPLE) set(LIBANGLE_RENDERER_PLATFORM @@ -297,6 +537,7 @@ endif() add_library(libANGLE STATIC ${LIBANGLE_SOURCES}) target_link_libraries(libANGLE PRIVATE angle::common + angle::compression angle::image_util angle::gpu_info_util angle::translator @@ -314,6 +555,7 @@ target_compile_definitions(libANGLE -DEGLAPI= -DGL_APICALL= -DGL_API= + -DANGLE_CAPTURE_ENABLED=0 ) add_library(angle::libANGLE ALIAS libANGLE) if(BUILD_SHARED_LIBS) @@ -326,34 +568,33 @@ endif() # libGLESv2 # Modified according to the file src/libGLESv2.gni list(APPEND LIBGLESV2_SOURCES - "src/common/angleutils.h" - "src/common/debug.h" - "src/libANGLE/entry_points_enum_autogen.h" - "src/libANGLE/entry_points_utils.h" - "src/libGLESv2/entry_points_egl.cpp" - "src/libGLESv2/entry_points_egl.h" - "src/libGLESv2/entry_points_egl_ext.cpp" - "src/libGLESv2/entry_points_egl_ext.h" - "src/libGLESv2/entry_points_gles_1_0_autogen.cpp" - "src/libGLESv2/entry_points_gles_1_0_autogen.h" - "src/libGLESv2/entry_points_gles_2_0_autogen.cpp" - "src/libGLESv2/entry_points_gles_2_0_autogen.h" - "src/libGLESv2/entry_points_gles_3_0_autogen.cpp" - "src/libGLESv2/entry_points_gles_3_0_autogen.h" - "src/libGLESv2/entry_points_gles_3_1_autogen.cpp" - "src/libGLESv2/entry_points_gles_3_1_autogen.h" - "src/libGLESv2/entry_points_gles_3_2_autogen.cpp" - "src/libGLESv2/entry_points_gles_3_2_autogen.h" - "src/libGLESv2/entry_points_gles_ext_autogen.cpp" - "src/libGLESv2/entry_points_gles_ext_autogen.h" - "src/libGLESv2/global_state.cpp" - "src/libGLESv2/global_state.h" - "src/libGLESv2/libGLESv2_autogen.cpp" - "src/libGLESv2/libGLESv2.rc" - "src/libGLESv2/proc_table_egl.h" - "src/libGLESv2/proc_table_egl_autogen.cpp" - "src/libGLESv2/resource.h" - "src/libGLESv2/libGLESv2_autogen.def" + "src/libGLESv2/egl_ext_stubs.cpp" + "src/libGLESv2/egl_ext_stubs_autogen.h" + "src/libGLESv2/egl_stubs.cpp" + "src/libGLESv2/egl_stubs_autogen.h" + "src/libGLESv2/entry_points_egl_autogen.cpp" + "src/libGLESv2/entry_points_egl_autogen.h" + "src/libGLESv2/entry_points_egl_ext_autogen.cpp" + "src/libGLESv2/entry_points_egl_ext_autogen.h" + "src/libGLESv2/entry_points_gles_1_0_autogen.cpp" + "src/libGLESv2/entry_points_gles_1_0_autogen.h" + "src/libGLESv2/entry_points_gles_2_0_autogen.cpp" + "src/libGLESv2/entry_points_gles_2_0_autogen.h" + "src/libGLESv2/entry_points_gles_3_0_autogen.cpp" + "src/libGLESv2/entry_points_gles_3_0_autogen.h" + "src/libGLESv2/entry_points_gles_3_1_autogen.cpp" + "src/libGLESv2/entry_points_gles_3_1_autogen.h" + "src/libGLESv2/entry_points_gles_3_2_autogen.cpp" + "src/libGLESv2/entry_points_gles_3_2_autogen.h" + "src/libGLESv2/entry_points_gles_ext_autogen.cpp" + "src/libGLESv2/entry_points_gles_ext_autogen.h" + "src/libGLESv2/global_state.cpp" + "src/libGLESv2/global_state.h" + "src/libGLESv2/libGLESv2_autogen.cpp" + "src/libGLESv2/proc_table_egl.h" + "src/libGLESv2/proc_table_egl_autogen.cpp" + "src/libGLESv2/resource.h" + "src/libGLESv2/libGLESv2_autogen.def" ) add_library(libGLESv2 ${LIBGLESV2_SOURCES}) target_link_libraries(libGLESv2 PRIVATE angle::common angle::libANGLE) @@ -386,18 +627,25 @@ target_include_directories(libGLESv2 PUBLIC "$") ########## # libEGL +if(WIN32) + set(libEGL_def + "src/libEGL/libEGL_autogen.def" + ) +endif() add_library(libEGL - "src/libEGL/libEGL.def" - "src/libEGL/libEGL.cpp" - "src/libEGL/libEGL.rc" - "src/libEGL/resource.h" - "src/libEGL/egl_loader_autogen.cpp" "src/libEGL/egl_loader_autogen.h" + "src/libEGL/libEGL_autogen.cpp" + "src/libEGL/resource.h" + "src/libGLESv2/entry_points_egl_autogen.h" + "src/libGLESv2/entry_points_egl_ext_autogen.h" + ${libEGL_def} ) + target_link_libraries(libEGL PRIVATE angle::common angle::libANGLE libGLESv2) target_include_directories(libEGL PUBLIC "$" "$") target_compile_definitions(libEGL - PRIVATE -DLIBGLESV2_IMPLEMENTATION + PRIVATE + "-DLIBEGL_IMPLEMENTATION" PUBLIC "-DGL_GLES_PROTOTYPES=1" "-DGL_GLEXT_PROTOTYPES" @@ -435,7 +683,7 @@ SET_TARGET_PROPERTIES(libANGLE PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(libGLESv2 PROPERTIES PREFIX "") SET_TARGET_PROPERTIES(libEGL PROPERTIES PREFIX "") -install(TARGETS libEGL libGLESv2 libANGLE angle_common angle_image_util angle_gpu_info_util angle_translator angle_preprocessor GL_VISIBILITY EXPORT ANGLEExport +install(TARGETS libEGL libGLESv2 libANGLE angle_common angle_compression_utils angle_image_util angle_gpu_info_util angle_translator angle_preprocessor GL_VISIBILITY EXPORT ANGLEExport RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib @@ -470,11 +718,13 @@ if(NOT DISABLE_INSTALL_HEADERS) FILES_MATCHING PATTERN "*.h" PATTERN "*.inc" + PATTERN "CL" EXCLUDE PATTERN "GLSLANG" EXCLUDE PATTERN "egl.h" EXCLUDE PATTERN "eglext.h" EXCLUDE PATTERN "eglplatform.h" EXCLUDE PATTERN "KHR" EXCLUDE + PATTERN "WGL" EXCLUDE PATTERN "export.h" EXCLUDE ) endif() diff --git a/ports/angle/CONTROL b/ports/angle/CONTROL deleted file mode 100644 index 512dd91f5407ea..00000000000000 --- a/ports/angle/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: angle -Version: 2020-05-15 -Port-Version: 2 -Homepage: https://github.com/google/angle -Description: A conformant OpenGL ES implementation for Windows, Mac and Linux. - The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support. -Build-Depends: egl-registry, opengl-registry diff --git a/ports/angle/commit.h b/ports/angle/angle_commit.h similarity index 100% rename from ports/angle/commit.h rename to ports/angle/angle_commit.h diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index 672e5173cb2edb..35c38074f824e4 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -18,8 +18,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/angle - REF d949154da428bb3e924e28a8eadfe2327631c8bb # chromium/4148 - SHA512 3ef1c94fccfca592057652e0ad305e3025184675e2323a714428ec934048496fbd242b5e1298bb5e3b3058b53d54f6889e446cbd81af7bea2cc6d5e13c7356bd + REF d15be77864e18f407c317be6f6bc06ee2b7d070a # chromium/4472 + SHA512 aad8563ee65458a7865ec7c668d1f90ac2891583c569a22dcd2c557263b72b26386f56b74a7294398be2cf5c548df513159e4be53f3f096f19819ca06227d9ac # On update check headers against opengl-registry PATCHES 001-fix-uwp.patch @@ -27,8 +27,30 @@ vcpkg_from_github( ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/commit.h DESTINATION ${SOURCE_PATH}/src/common) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/angle_commit.h DESTINATION ${SOURCE_PATH}/src/common) + +function(checkout_in_path_with_patches PATH URL REF PATCHES) + if(EXISTS "${PATH}") + return() + endif() + + vcpkg_from_git( + OUT_SOURCE_PATH DEP_SOURCE_PATH + URL "${URL}" + REF "${REF}" + PATCHES ${PATCHES} + ) + file(RENAME "${DEP_SOURCE_PATH}" "${PATH}") + file(REMOVE_RECURSE "${DEP_SOURCE_PATH}") +endfunction() + +checkout_in_path_with_patches( + "${SOURCE_PATH}/third_party/zlib" + "https://chromium.googlesource.com/chromium/src/third_party/zlib" + "09490503d0f201b81e03f5ca0ab8ba8ee76d4a8e" + "third-party-zlib-far-undef.patch" +) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/angle/third-party-zlib-far-undef.patch b/ports/angle/third-party-zlib-far-undef.patch new file mode 100644 index 00000000000000..c92b058d238eb4 --- /dev/null +++ b/ports/angle/third-party-zlib-far-undef.patch @@ -0,0 +1,13 @@ +diff --git a/google/compression_utils_portable.h b/google/compression_utils_portable.h +--- a/google/compression_utils_portable.h ++++ b/google/compression_utils_portable.h +@@ -13,6 +13,9 @@ + * zlib. + */ + #if defined(USE_SYSTEM_ZLIB) ++# if defined(WIN32) && defined(FAR) ++# undef FAR ++# endif + #include + /* AOSP build requires relative paths. */ + #else diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json new file mode 100644 index 00000000000000..0987e6c86636b7 --- /dev/null +++ b/ports/angle/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "angle", + "version-string": "chromium_4472", + "description": [ + "A conformant OpenGL ES implementation for Windows, Mac and Linux.", + "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." + ], + "homepage": "https://github.com/google/angle", + "dependencies": [ + "egl-registry", + "opengl-registry", + "zlib" + ] +} diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 6b9219471f3235..bbff894c6f55ef 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bd610babb6f0fb15119aa94644494c0dc2bcd2c", + "version-string": "chromium_4472", + "port-version": 0 + }, { "git-tree": "48342ccfb3565a61cc9ed878a2ff422e294b4e56", "version-string": "2020-05-15", diff --git a/versions/baseline.json b/versions/baseline.json index 92340f420ffb6e..4652e933959066 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -77,8 +77,8 @@ "port-version": 0 }, "angle": { - "baseline": "2020-05-15", - "port-version": 2 + "baseline": "chromium_4472", + "port-version": 0 }, "antlr4": { "baseline": "4.9.1", From 98e50496b6b7c2a4487430d4a4d62f9886728cfb Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Tue, 20 Jul 2021 16:24:38 -0700 Subject: [PATCH 0141/1858] [docs] More Getting Started fixes (#18970) * Use valid commmit ID for baseline * More doc fixes --- docs/examples/versioning.getting-started.md | 27 ++++++++++++--------- docs/users/versioning.md | 23 +++++++++--------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/docs/examples/versioning.getting-started.md b/docs/examples/versioning.getting-started.md index 450e2b05a0e09f..c55cf7c1c76539 100644 --- a/docs/examples/versioning.getting-started.md +++ b/docs/examples/versioning.getting-started.md @@ -20,11 +20,11 @@ Create a folder with the following files: "dependencies": [ { "name": "fmt", - "version>=": "7.1.3" + "version>=": "7.1.3#1" }, "zlib" ], - "builtin-baseline": "68a74950d0400f5a803026d0860f49853984bf11" + "builtin-baseline": "3426db05b996481ca31e95fff3734cf23e0f51bc" } ``` @@ -69,8 +69,10 @@ PS D:\versions-test\build> cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=D:/vcpkg/script -- Running vcpkg install Detecting compiler hash for triplet x86-windows... The following packages will be built and installed: - fmt[core]:x86-windows -> 7.1.3 -- D:\vcpkg\buildtrees\versioning\versions\fmt\dd8cf5e1a2dce2680189a0744102d4b0f1cfb8b6 - zlib[core]:x86-windows -> 1.2.11#9 -- D:\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 + fmt[core]:x64-windows -> 7.1.3#1 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\fmt\4f8427eb0bd40da1856d4e67bde39a4fda689d72 + vcpkg-cmake[core]:x64-windows -> 2021-02-26 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\vcpkg-cmake\51896aa8073adb5c8450daa423d03eedf0dfc61f + vcpkg-cmake-config[core]:x64-windows -> 2021-02-26 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\vcpkg-cmake-config\d255b3d566a8861dcc99a958240463e678528066 + zlib[core]:x64-windows -> 1.2.11#9 -- D:\Work\viromer\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 ... ``` @@ -90,7 +92,8 @@ zlib version is 1.2.11 Take a look at the output: ``` -fmt[core]:x86-windows -> 7.1.3 -- D:\vcpkg\buildtrees\versioning\versions\fmt\dd8cf5e1a2dce2680189a0744102d4b0f1cfb8b6 +fmt[core]:x86-windows -> 7.1.3#1 -- D:\vcpkg\buildtrees\versioning\versions\fmt\4f8427eb0bd40da1856d4e67bde39a4fda689d72 +... zlib[core]:x86-windows -> 1.2.11#9 -- D:\vcpkg\buildtrees\versioning\versions\zlib\827111046e37c98153d9d82bb6fa4183b6d728e4 ``` @@ -130,23 +133,23 @@ Version scheme | Description } ``` -This property is used to express minimum version constraints, it is allowed only as part of the `"dependencies"` declarations. In our example we set an explicit constraint on version `7.1.3` of `fmt`. +This property is used to express minimum version constraints, it is allowed only as part of the `"dependencies"` declarations. In our example we set an explicit constraint on version `7.1.3#1` of `fmt`. Vcpkg is allowed to upgrade this constraint if a transitive dependency requires a newer version. For example, if `zlib` were to declare a dependency on `fmt` version `7.1.4` then vcpkg would install `7.1.4` instead. -Vcpkg uses a minimum version approach, in our example, even if `fmt` version `8.0.0` were to be released, vcpkg would still install version `7.1.3` as that is the minimum version that satisfies the constraint. The advantages of this approach are that you don't get unexpected dependency upgrades when you update vcpkg and you get reproducible builds (in terms of version used) as long as you use the same manifest. +Vcpkg uses a minimum version approach, in our example, even if `fmt` version `8.0.0` were to be released, vcpkg would still install version `7.1.3#1` as that is the minimum version that satisfies the constraint. The advantages of this approach are that you don't get unexpected dependency upgrades when you update vcpkg and you get reproducible builds (in terms of version used) as long as you use the same manifest. If you want to upgrade your dependencies, you can bump the minimum version constraint or use a newer baseline. #### **`builtin-baseline`** ```json -{ "builtin-baseline": "68a74950d0400f5a803026d0860f49853984bf11" } +{ "builtin-baseline": "3426db05b996481ca31e95fff3734cf23e0f51bc" } ``` This field declares the versioning baseline for all ports. Setting a baseline is required to enable versioning, otherwise you will get the current versions on the ports directory. You can run 'git rev-parse HEAD' to get the current commit of vcpkg and set it as the builtin-baseline. See the [`builtin-baseline` documentation](../users/versioning.md#builtin-baseline) for more information. -In our example, you can notice that we do not declare a version constraint for `zlib`; instead, the version is taken from the baseline. Internally, vcpkg will look in commit `68a74950d0400f5a803026d0860f49853984bf11` to find out what version of `zlib` was the latest at that point in time (in our case it was `1.2.11#9`). +In our example, you can notice that we do not declare a version constraint for `zlib`; instead, the version is taken from the baseline. Internally, vcpkg will look in commit `3426db05b996481ca31e95fff3734cf23e0f51bc` to find out what version of `zlib` was the latest at that point in time (in our case it was `1.2.11#9`). During version resolution, baseline versions are treated as minimum version constraints. If you declare an explicit constraint that is lower than a baseline version, the explicit constraint will be upgraded to the baseline version. @@ -155,7 +158,7 @@ For example, if we modified our dependencies like this: { "dependencies": [ { "name": "fmt", - "version>=": "7.1.3" + "version>=": "7.1.3#1" }, { "name": "zlib", @@ -187,14 +190,14 @@ Let's modify our example once more, this time to force vcpkg to use version `6.0 "dependencies": [ { "name": "fmt", - "version>=": "7.1.3" + "version>=": "7.1.3#1" }, { "name": "zlib", "version>=": "1.2.11#7" } ], - "builtin-baseline": "68a74950d0400f5a803026d0860f49853984bf11", + "builtin-baseline": "3426db05b996481ca31e95fff3734cf23e0f51bc", "overrides": [ { "name": "fmt", diff --git a/docs/users/versioning.md b/docs/users/versioning.md index f7a6c9e6e43b05..bad49da0d7f8fc 100644 --- a/docs/users/versioning.md +++ b/docs/users/versioning.md @@ -31,7 +31,11 @@ Manifest property | Versioning scheme `version-date` | For dates in the format YYYY-MM-DD `version-string` | For arbitrary strings -A manifest must contain only one version declaration. +A manifest must contain only one version declaration. + +_NOTE: By design, vcpkg does not compare versions that use different schemes. For example, a package +that has a `version-string: 7.1.3` cannot be compared with the same package using `version: 7.1.4`, even if the +conversion seems obvious._ #### `version` Accepts version strings that follow a relaxed, dot-separated-, semver-like scheme. @@ -111,13 +115,10 @@ Example: You can get the current commit of your vcpkg instance either by adding an empty `"builtin-baseline"` field, installing, and examining the error message or by running `git rev-parse HEAD` in the root of the vcpkg instance. -When resolving version constraints for a package, vcpkg will look for a baseline version: -* First by looking at the baseline file in the given commit ID. -* If the given commit ID does not contain a baseline file, vcpkg will fallback to use the local baseline file instead. -* If there's no local baseline file, vcpkg will use the version currently available in the ports directory. - -_NOTE: If a baseline file is found, but it does not contain an entry for the package, the vcpkg invocation will fail._ - +When resolving version constraints for a package, vcpkg will look for a baseline version by looking +at the baseline file in the given commit ID. +If the given commit ID doesn't have a `versions/baseline.json` file or if the baseline file exists +but it does not declare a baseline version for the package the invocation will fail. ### `version>=` Expresses a minimum version requirement, `version>=` declarations put a lower boundary on the versions that can be used to satisfy a dependency. @@ -130,9 +131,9 @@ Example: "version-semver": "1.0.0", "dependencies": [ { "name": "zlib", "version>=": "1.2.11#9" }, - { "name": "fmt", "version>=": "7.1.3" } + { "name": "fmt", "version>=": "7.1.3#1" } ], - "builtin-baseline":"9fd3bd594f41afb8747e20f6ac9619f26f333cbe" + "builtin-baseline":"3426db05b996481ca31e95fff3734cf23e0f51bc" } ``` @@ -153,7 +154,7 @@ For an override to take effect, the overridden package must form part of the dep { "name": "zlib", "version>=": "1.2.11#9" }, "fmt" ], - "builtin-baseline":"9fd3bd594f41afb8747e20f6ac9619f26f333cbe", + "builtin-baseline":"3426db05b996481ca31e95fff3734cf23e0f51bc", "overrides": [ { "name": "fmt", "version": "6.0.0" } ] From f8a835281d45c0e1a5e2763f0a2f9b70e8004358 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 21 Jul 2021 14:31:51 -0700 Subject: [PATCH 0142/1858] [vcpkg] Bump version to 2021-07-21 (#19045) --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index e1858130a18ca9..aaaa704416362a 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-07-16/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-07-21/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index fdf57c9716d367..1b71c810f49bb3 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -278,8 +278,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-07-16" -vcpkgToolReleaseSha="e86a70ea63c79fd86099af271e7aff7d1436e703a2bcb56b5671d1ff49924d44e2fa0d8ab64684b20d50d0872d7b4eb2c7b0800899eedf19f51bf11bf3a4fb44" +vcpkgToolReleaseTag="2021-07-21" +vcpkgToolReleaseSha="9d1644c1c34bfd750cad36c47d7997698b0c5c4ff0673f9f39ff5f62f6e351ca32db7991043e7f154aa8ffe8b5180591d78131edf5dc533164d75a60764a8da8" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" From f01b984b0b84cacbd6f6247357b722b6078229d4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 22 Jul 2021 00:40:01 +0200 Subject: [PATCH 0143/1858] [libxml2] fix wrapper (#19033) --- ports/libxml2/vcpkg-cmake-wrapper.cmake | 6 +++--- ports/libxml2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libxml2.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 0e3ad69e6d75d4..6209ea464f773e 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -10,8 +10,8 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 find_package(LibLZMA) find_package(ZLIB) include(SelectLibraryConfigurations) - find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) - find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) + find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) + find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib) @@ -46,7 +46,7 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 if(ICONV_LIBRARIES) list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES}) if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES}) + target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES}) endif() endif() if(CHARSET_LIBRARIES) diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index b19b12779db9f7..bb9b73883870cd 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.12", + "port-version": 1, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 4652e933959066..39b7e720d33b68 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3734,7 +3734,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 0 + "port-version": 1 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 3b5409d25f684f..d88953a5a25cbf 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a68bece41619060ca2e212b916dcc60c65ca3603", + "version-semver": "2.9.12", + "port-version": 1 + }, { "git-tree": "c6fe9f85f9c0a1f9349de95425b786cf6462314c", "version-semver": "2.9.12", From 8bcdaad4fa41356923d1a2db0668643c6624716f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 22 Jul 2021 11:13:45 -0700 Subject: [PATCH 0144/1858] [azure-security-keyvault-keys-cpp] Update to 4.0.0-beta.4 (#19028) ## 4.0.0-beta.4 (2021-07-20) ### Features Added - Added `GetIv()` to `EncryptParameters` and `DecryptParameters`. - Added `BackupKeyResult` for `BackupKey()` return type. ### Breaking Changes - Removed `Azure::Security::KeyVault::Keys::ServiceVersion::V7_0` and `V7_1`. - Removed `Azure::Security::KeyVault::Keys::Cryptography::ServiceVersion::V7_0` and `V7_1`. - Removed `CryptographyClient::RemoteClient()` and `CryptographyClient::LocalOnly()`. - Removed the general constructor from `EncryptParameters` and `DecryptParameters`. - Removed access to `Iv` field member from `EncryptParameters` and `DecryptParameters`. - Removed `Encrypt(EncryptionAlgorithm, std::vector, context)`. - Removed `Decrypt(DecryptAlgorithm, std::vector, context)`. - Removed `JsonWebKey::HasPrivateKey()`. - Removed the `MaxPageResults` field from `GetPropertiesOfKeysOptions`, `GetPropertiesOfKeyVersionsOptions`, and `GetDeletedKeysOptions`. - Renamed header `list_keys_single_page_result.hpp` to `list_keys_responses.hpp`. - Updated `BackupKey()` API return type to `BackupKeyResult` model type. - Renamed `KeyPropertiesPageResult` to `KeyPropertiesPagedResponse`. - Renamed `DeletedKeyPageResult` to `DeletedKeyPagedResponse`. - Changed the container for `KeyOperations` from `std::list` to `std::vector` within `CreateKeyOptions` and `UpdateKeyProperties()`. - Changed the return type of `CrytographyClient` APIs like `Encrypt()` to return `Response` rather than the `T` directly. - Renamed high-level header from `key_vault_keys.hpp` to `keyvault_keys.hpp`. --- ports/azure-security-keyvault-keys-cpp/portfile.cmake | 4 ++-- ports/azure-security-keyvault-keys-cpp/vcpkg.json | 10 ++++++---- versions/a-/azure-security-keyvault-keys-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 43ad12797fcd83..86c3cc6ca5f8c1 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-keys_4.0.0-beta.3 - SHA512 af62b7cad9b01922e067c6b5b58b53388cbb436a9daee8b93c99c2a941eaac4696e3142e31807abc43e30e9f2550f7e541c580d667108c619b16147ea616d8dd + REF azure-security-keyvault-keys_4.0.0-beta.4 + SHA512 906287fce93f0f7720af6d4788ea4a8b35cf0cf675ecbae742bf7aa768e6241006012cb9ccebc3b4e9192cdb7b5bcec7606b72a5b2edde9ce194b4d6dd907412 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index 8d00cfde2b3cdf..90bb18eb9c28ea 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,16 +1,18 @@ { "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.0.0-beta.3", + "version-semver": "4.0.0-beta.4", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/keyvault/azure-security-keyvault-keys", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-keys", "license": "MIT", + "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { - "name": "azure-security-keyvault-common-cpp", - "default-features": false + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.1.0" }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 6295561f82ed1b..b87aed9c0a5b3c 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "beff44522cd72f08bddabfc35a520533b97d1819", + "version-semver": "4.0.0-beta.4", + "port-version": 0 + }, { "git-tree": "cb31e4f4d75f3e38568a324dc412f308bd463bfa", "version-semver": "4.0.0-beta.3", diff --git a/versions/baseline.json b/versions/baseline.json index 39b7e720d33b68..fd3faebe10ef89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -289,7 +289,7 @@ "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.0.0-beta.3", + "baseline": "4.0.0-beta.4", "port-version": 0 }, "azure-storage-blobs-cpp": { From d74c5062ec3dd17f0dda0503793cee1e1169d374 Mon Sep 17 00:00:00 2001 From: David <34756939+skaarj1989@users.noreply.github.com> Date: Thu, 22 Jul 2021 22:35:13 +0200 Subject: [PATCH 0145/1858] [entt] update to 3.8.0 (#19043) * update entt to 3.8.0 --- ports/entt/portfile.cmake | 4 ++-- ports/entt/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/entt.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index b5d22af68945dc..0e5197e4be090c 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skypjack/entt - REF 5d15a3d69f433a0e3fce266caaeb87c77c10453c #v3.7.1 - SHA512 dbfb141dd706e1552a81e01005a28e916b369f29c0adfff337799f8375a9676e60f620b7981633829d6d175297088ace58e3c16cc802ab9d71681efebb1caba6 + REF 2d5a3f24aa6dc38ed0c4eee9d4d625586d8e921e #v3.8.0 + SHA512 36b7be2550be5a919548e5c91db218ed9b062804d4f43073d6fc6b432fa2d358b5d36098490359ca2392370b2bf1b99d20e564504eaac619f5cd7f9612d91e2e HEAD_REF master ) diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index 40ef4c61ff64a4..eb925df7ceff23 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "entt", - "version": "3.7.1", + "version": "3.8.0", "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", "homepage": "https://github.com/skypjack/entt" } diff --git a/versions/baseline.json b/versions/baseline.json index fd3faebe10ef89..b666b364b9f4fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1881,7 +1881,7 @@ "port-version": 0 }, "entt": { - "baseline": "3.7.1", + "baseline": "3.8.0", "port-version": 0 }, "epsilon": { diff --git a/versions/e-/entt.json b/versions/e-/entt.json index b84bf6350a3984..7b7f6ea53cb367 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a35e25160e39304b6ac16c679fa98f2c926c2877", + "version": "3.8.0", + "port-version": 0 + }, { "git-tree": "54f6d005789aee16b4faecbedde51573c3114dbd", "version": "3.7.1", From 9a4cb8ee60d81f3444bcd7a194c5b208aad972fd Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 23 Jul 2021 04:36:21 +0800 Subject: [PATCH 0146/1858] [rxspencer] Update to latest release 3.9.0 and also support dynamic build (#19039) * [rxspencer] Update to latest release 3.9.0 * Update version files * Remove fail from ci.baseline.txt --- ports/rxspencer/CONTROL | 4 ---- ports/rxspencer/portfile.cmake | 25 ++++++++++++++----------- ports/rxspencer/vcpkg.json | 17 +++++++++++++++++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/r-/rxspencer.json | 5 +++++ 6 files changed, 37 insertions(+), 18 deletions(-) delete mode 100644 ports/rxspencer/CONTROL create mode 100644 ports/rxspencer/vcpkg.json diff --git a/ports/rxspencer/CONTROL b/ports/rxspencer/CONTROL deleted file mode 100644 index c310d2c890f7a7..00000000000000 --- a/ports/rxspencer/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: rxspencer -Version: 2020-01-12 -Homepage: https://garyhouston.github.io/regex/ -Description: Henry Spencer's BSD regular expression library. diff --git a/ports/rxspencer/portfile.cmake b/ports/rxspencer/portfile.cmake index fea3e68cb10332..92e4fd31f06530 100644 --- a/ports/rxspencer/portfile.cmake +++ b/ports/rxspencer/portfile.cmake @@ -3,26 +3,29 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO garyhouston/rxspencer - REF e42b6a667f1385aedf49b533b9fbba58e5a26934 - SHA512 2842e1c78c3ebbbd03d15fb85e55f861740bb446aa57157f3fc90876d931d9f865242f5eaefc94f31c8d78e0d531a008d4c579e9b4f9c7179f5c7a95a98359fd + REF 9f835b523f1af617ca54e06863a1924c23f6e56a #v3.9.0 + SHA512 fe7721bd4b4e4f7d31fd5a7e42d34d0c9735d062d8b146ee47a25f87c809eead7133265fc37fa958c37bc4ffeaf101d143202080508d98efd160b8fd0a278598 HEAD_REF master ) -vcpkg_configure_cmake( +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DCMAKE_CONFIG_DEST=share/rxspencer + OPTIONS + -DCMAKE_CONFIG_DEST=share/rxspencer + -Drxshared=${BUILD_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/rxspencer") +vcpkg_cmake_config_fixup(CONFIG_PATH "share/rxspencer") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/regex) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/regex") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/rxspencer/vcpkg.json b/ports/rxspencer/vcpkg.json new file mode 100644 index 00000000000000..a4fef35bebbabf --- /dev/null +++ b/ports/rxspencer/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "rxspencer", + "version": "3.9.0", + "description": "Henry Spencer's BSD regular expression library.", + "homepage": "https://garyhouston.github.io/regex/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 24f685e1c1e49e..69f62f543cb0cc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1384,8 +1384,6 @@ rtlsdr:x64-linux=fail rtlsdr:x64-osx=fail rttr:arm-uwp=fail rttr:x64-uwp=fail -rxspencer:x64-uwp=fail -rxspencer:arm-uwp=fail ryml:x64-osx=fail ryu:arm-uwp=fail ryu:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index b666b364b9f4fc..cc40c0d567461b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5617,7 +5617,7 @@ "port-version": 0 }, "rxspencer": { - "baseline": "2020-01-12", + "baseline": "3.9.0", "port-version": 0 }, "ryml": { diff --git a/versions/r-/rxspencer.json b/versions/r-/rxspencer.json index 161dc088327574..9a23c4747d5635 100644 --- a/versions/r-/rxspencer.json +++ b/versions/r-/rxspencer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3b5bac6d89f6ae425bfe95a4309e72146f944dd", + "version": "3.9.0", + "port-version": 0 + }, { "git-tree": "a58f09c2e2ebb27d9b40527922b98612dd7e2de1", "version-string": "2020-01-12", From f38143afbce390435f05b5cfbdb7cc859e0168bf Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 23 Jul 2021 04:37:49 +0800 Subject: [PATCH 0147/1858] [libgo] Add DISABLE_PARALLEL_CONFIGURE (#19037) * [libgo] Add DISABLE_PARALLEL_CONFIGURE * update version files * Update deprecated functions * Update versions/l-/libgo.json --- ports/libgo/CONTROL | 5 ----- ports/libgo/portfile.cmake | 30 +++++++++++++++--------------- ports/libgo/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 4 ++-- versions/l-/libgo.json | 5 +++++ 5 files changed, 36 insertions(+), 22 deletions(-) delete mode 100644 ports/libgo/CONTROL create mode 100644 ports/libgo/vcpkg.json diff --git a/ports/libgo/CONTROL b/ports/libgo/CONTROL deleted file mode 100644 index 92d6f9f5a3792b..00000000000000 --- a/ports/libgo/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libgo -Version: 3.1-1 -Homepage: https://github.com/yyzybb537/libgo -Description: The best stackful coroutine by c++11. -Supports: !(arm|uwp) diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index 26339fc43b9ad2..fdb028123f7e10 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -18,29 +18,29 @@ vcpkg_from_github( HEAD_REF master ) -file(REMOVE_RECURSE ${SOURCE_PATH}/third_party) -file(MAKE_DIRECTORY ${SOURCE_PATH}/third_party) -file(RENAME ${XHOOK_SOURCE_PATH} ${SOURCE_PATH}/third_party/xhook) +file(REMOVE_RECURSE "${SOURCE_PATH}/third_party") +file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party") +file(RENAME "${XHOOK_SOURCE_PATH}" "${SOURCE_PATH}/third_party/xhook") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook") if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix/static_hook) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/windows) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix/static_hook") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/windows") else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/libgo-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/libgo-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json new file mode 100644 index 00000000000000..b9d85cc606a357 --- /dev/null +++ b/ports/libgo/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libgo", + "version": "3.1", + "port-version": 2, + "description": "The best stackful coroutine by c++11.", + "homepage": "https://github.com/yyzybb537/libgo", + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index cc40c0d567461b..2945920815d02f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3197,8 +3197,8 @@ "port-version": 2 }, "libgo": { - "baseline": "3.1-1", - "port-version": 0 + "baseline": "3.1", + "port-version": 2 }, "libgpg-error": { "baseline": "1.42", diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json index da7c1405aeb972..976f87c31ed1eb 100644 --- a/versions/l-/libgo.json +++ b/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1158e6c06fa6cb413bf12c04065ff58b8930c474", + "version": "3.1", + "port-version": 2 + }, { "git-tree": "0f54bcfa9c4d0b052bddeb9d450564ee109c0e01", "version-string": "3.1-1", From b5bd18fbab5f1b41128437049559f2c1b4674e20 Mon Sep 17 00:00:00 2001 From: Long Huan <8551701+longhuan2018@users.noreply.github.com> Date: Fri, 23 Jul 2021 04:41:26 +0800 Subject: [PATCH 0148/1858] [libpq]fix windows build failure (#19031) * fix windows build failure fix Could not find debug or release binaries at libpq\x64-windows-rel\src\tools\msvc/Install.pm line 77. * Update libpq.json --- ports/libpq/patches/windows/install.patch | 19 +++++++++++++++++++ ports/libpq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ports/libpq/patches/windows/install.patch b/ports/libpq/patches/windows/install.patch index 206dd1da00e852..42713389bb6da8 100644 --- a/ports/libpq/patches/windows/install.patch +++ b/ports/libpq/patches/windows/install.patch @@ -2,6 +2,25 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index d109b2c90..75c7446e6 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm +@@ -63,8 +63,16 @@ sub Install + do "./config.pl" if (-f "config.pl"); + } + +- chdir("../../..") if (-f "../../../configure"); +- chdir("../../../..") if (-f "../../../../configure"); ++ # Move to the root path depending on the current location. ++ if (-f "../../../configure") ++ { ++ chdir("../../.."); ++ } ++ elsif (-f "../../../../configure") ++ { ++ chdir("../../../.."); ++ } ++ + my $conf = ""; + if (-d "debug") + { @@ -106,7 +106,7 @@ sub Install } }, diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index a96a1f8b5eb523..446b58b2dc31fd 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "12.2", - "port-version": 17, + "port-version": 18, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 2945920815d02f..510cbe8318d6b8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3478,7 +3478,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 17 + "port-version": 18 }, "libpqxx": { "baseline": "7.3.1", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index cc0946d6362ce8..4d05014195f890 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03c934a8004ec6c34842748d18c06a38e7a8aa3e", + "version": "12.2", + "port-version": 18 + }, { "git-tree": "01e2ad37b9df46e45826e52a6cddfb95ca137abd", "version": "12.2", From faa72a35e93f50f5012be2913dcb779a902e0b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?At=C4=B1lhan=20Emre=20Dursuno=C4=9Flu?= Date: Thu, 22 Jul 2021 23:42:53 +0300 Subject: [PATCH 0149/1858] [Pcg] update to latest commit (#19023) * [pcg] update to most recent version. * [pcg] update versioning. * [pcg] Add suggested changes. * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/pcg/CONTROL | 2 +- ports/pcg/portfile.cmake | 6 +++--- versions/baseline.json | 2 +- versions/p-/pcg.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/pcg/CONTROL b/ports/pcg/CONTROL index e0103507637cd4..781d8ef2842302 100644 --- a/ports/pcg/CONTROL +++ b/ports/pcg/CONTROL @@ -1,3 +1,3 @@ Source: pcg -Version: 0.98.1 +Version: 2021-04-06 Description: Permuted Congruential Generator diff --git a/ports/pcg/portfile.cmake b/ports/pcg/portfile.cmake index 738a31efa35ad2..f165692dcc570d 100644 --- a/ports/pcg/portfile.cmake +++ b/ports/pcg/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO imneme/pcg-cpp - REF v0.98.1 - SHA512 3625913eba3b5d3ff0763a00728535cd5273a335f0ce0a9ab8e0cd8183a52309cbf72ae50d089cfea89445201993466a5533469db1cb6e82b14c62564731fe70 + REF ffd522e7188bef30a00c74dc7eb9de5faff90092 + SHA512 e96e40bf63ddb29ebf8679ddaabbf5dc934173f38cb5ed97c5efe068a742a715daa05e38d9ae322a10fa538c8ec7a271622bfb6569256a471fe5e1c9a83f9e3f HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/include/pcg_extras.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL ${SOURCE_PATH}/include/pcg_random.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL ${SOURCE_PATH}/include/pcg_uint128.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/pcg RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE-MIT.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index 510cbe8318d6b8..43f4ad39be27a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4785,7 +4785,7 @@ "port-version": 4 }, "pcg": { - "baseline": "0.98.1", + "baseline": "2021-04-06", "port-version": 0 }, "pcl": { diff --git a/versions/p-/pcg.json b/versions/p-/pcg.json index 75e9a421f464e1..92f469ace8268e 100644 --- a/versions/p-/pcg.json +++ b/versions/p-/pcg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "489a8b4653947b7688ed2bbfd3c9d9bf663ee3a9", + "version-string": "2021-04-06", + "port-version": 0 + }, { "git-tree": "62fbb9c1c9a45c8fae6db35ac29c66a58176d722", "version-string": "0.98.1", From 6dbce9faed566659bff964732abe3f6815227210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 23 Jul 2021 04:45:35 +0800 Subject: [PATCH 0150/1858] [arrow] Re-fix dependencies (#19014) * [arrow] Re-fix dependencies * version --- ports/arrow/all.patch | 149 ---------------- ports/arrow/fix-dependencies.patch | 263 +++++++++++++++++++++++++++++ ports/arrow/portfile.cmake | 14 ++ ports/arrow/vcpkg.json | 1 + versions/a-/arrow.json | 5 + versions/baseline.json | 2 +- 6 files changed, 284 insertions(+), 150 deletions(-) create mode 100644 ports/arrow/fix-dependencies.patch diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index 8ff755ac5c75c1..180fafc58018a9 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -11,152 +11,3 @@ index 2fd897b5d..b6118ad4f 100644 set(LIB_NAME_STATIC ${LIB_NAME}_static) else() set(LIB_NAME_STATIC ${LIB_NAME}) -diff --git a/cpp/cmake_modules/FindBrotli.cmake b/cpp/cmake_modules/FindBrotli.cmake -index b46a0f1a0..3d87f5204 100644 ---- a/cpp/cmake_modules/FindBrotli.cmake -+++ b/cpp/cmake_modules/FindBrotli.cmake -@@ -69,9 +69,9 @@ if(BROTLI_ROOT) - PATH_SUFFIXES ${ARROW_INCLUDE_PATH_SUFFIXES} - NO_DEFAULT_PATH) - else() -- find_package(PkgConfig QUIET) -- pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec) -- if(BROTLI_PC_FOUND) -+ #find_package(PkgConfig QUIET) -+ #pkg_check_modules(BROTLI_PC libbrotlicommon libbrotlienc libbrotlidec) -+ if(BROTLI_PC_FOUND AND 0) # Find via pkg_check_modules disabled as incompatible with vcpkg - set(BROTLI_INCLUDE_DIR "${BROTLI_PC_libbrotlicommon_INCLUDEDIR}") - - # Some systems (e.g. Fedora) don't fill Brotli_LIBRARY_DIRS, so add the other dirs here. -diff --git a/cpp/cmake_modules/FindLz4.cmake b/cpp/cmake_modules/FindLz4.cmake -index 14b6d93b9..1905079ee 100644 ---- a/cpp/cmake_modules/FindLz4.cmake -+++ b/cpp/cmake_modules/FindLz4.cmake -@@ -15,10 +15,12 @@ - # specific language governing permissions and limitations - # under the License. - --if(MSVC_TOOLCHAIN AND NOT DEFINED LZ4_MSVC_LIB_PREFIX) -- set(LZ4_MSVC_LIB_PREFIX "lib") -+# Avoid the debug build linking to the release library by mistake. -+# In theory harmless if static linking at this point, but disastrous if done for a shared library. -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(LZ4_LIB_NAME_DEBUG_SUFFIX "d") - endif() --set(LZ4_LIB_NAME_BASE "${LZ4_MSVC_LIB_PREFIX}lz4") -+set(LZ4_LIB_NAME_BASE "lz4${LZ4_LIB_NAME_DEBUG_SUFFIX}") - - if(ARROW_LZ4_USE_SHARED) - set(LZ4_LIB_NAMES) -@@ -34,12 +36,8 @@ if(ARROW_LZ4_USE_SHARED) - LZ4_LIB_NAMES - "${CMAKE_SHARED_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX}") - else() -- if(MSVC AND NOT DEFINED LZ4_MSVC_STATIC_LIB_SUFFIX) -- set(LZ4_MSVC_STATIC_LIB_SUFFIX "_static") -- endif() -- set(LZ4_STATIC_LIB_SUFFIX "${LZ4_MSVC_STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") - set(LZ4_LIB_NAMES -- "${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${LZ4_STATIC_LIB_SUFFIX}") -+ "${CMAKE_STATIC_LIBRARY_PREFIX}${LZ4_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}") - endif() - - if(LZ4_ROOT) -@@ -56,8 +54,8 @@ if(LZ4_ROOT) - - else() - find_package(PkgConfig QUIET) -- pkg_check_modules(LZ4_PC liblz4) -- if(LZ4_PC_FOUND) -+ #pkg_check_modules(LZ4_PC liblz4) -+ if(0) # Do not use pkg_check_modules, doesn't seem to work correctly on some macOS versions (10.x in GitHub Actions) - set(LZ4_INCLUDE_DIR "${LZ4_PC_INCLUDEDIR}") - - list(APPEND LZ4_PC_LIBRARY_DIRS "${LZ4_PC_LIBDIR}") -diff --git a/cpp/cmake_modules/FindSnappy.cmake b/cpp/cmake_modules/FindSnappy.cmake -index 26cccb786..8bee097af 100644 ---- a/cpp/cmake_modules/FindSnappy.cmake -+++ b/cpp/cmake_modules/FindSnappy.cmake -@@ -15,23 +15,30 @@ - # specific language governing permissions and limitations - # under the License. - -+# Avoid the debug build linking to the release library by mistake. -+# In theory harmless if static linking at this point, but disastrous if done for a shared library. -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(SNAPPY_LIB_NAME_DEBUG_SUFFIX "d") -+endif() -+ -+set(SNAPPY_LIB_NAME_BASE "snappy${SNAPPY_LIB_NAME_DEBUG_SUFFIX}") -+ - if(ARROW_SNAPPY_USE_SHARED) - set(SNAPPY_LIB_NAMES) - if(CMAKE_IMPORT_LIBRARY_SUFFIX) - list(APPEND SNAPPY_LIB_NAMES -- "${CMAKE_IMPORT_LIBRARY_PREFIX}snappy${CMAKE_IMPORT_LIBRARY_SUFFIX}") -+ "${CMAKE_IMPORT_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_IMPORT_LIBRARY_SUFFIX}") - endif() - list(APPEND SNAPPY_LIB_NAMES -- "${CMAKE_SHARED_LIBRARY_PREFIX}snappy${CMAKE_SHARED_LIBRARY_SUFFIX}") -+ "${CMAKE_SHARED_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_SHARED_LIBRARY_SUFFIX}") - else() -- set(SNAPPY_STATIC_LIB_NAME_BASE "snappy") - if(MSVC) - set(SNAPPY_STATIC_LIB_NAME_BASE -- "${SNAPPY_STATIC_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") -+ "${SNAPPY_LIB_NAME_BASE}${SNAPPY_MSVC_STATIC_LIB_SUFFIX}") - endif() - set( - SNAPPY_LIB_NAMES -- "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_STATIC_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}" -+ "${CMAKE_STATIC_LIBRARY_PREFIX}${SNAPPY_LIB_NAME_BASE}${CMAKE_STATIC_LIBRARY_SUFFIX}" - ) - endif() - -diff --git a/cpp/cmake_modules/FindThrift.cmake b/cpp/cmake_modules/FindThrift.cmake -index 273d907ed..02a1e7fe1 100644 ---- a/cpp/cmake_modules/FindThrift.cmake -+++ b/cpp/cmake_modules/FindThrift.cmake -@@ -39,6 +39,12 @@ function(EXTRACT_THRIFT_VERSION) - endif() - endfunction(EXTRACT_THRIFT_VERSION) - -+# Avoid the debug build linking to the release library by mistake. -+# In theory harmless if static linking at this point, but disastrous if done for a shared library. -+if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -+ set(THRIFT_LIB_NAME_DEBUG_SUFFIX "d") -+endif() -+ - if(MSVC_TOOLCHAIN AND NOT DEFINED THRIFT_MSVC_LIB_SUFFIX) - if(NOT ARROW_THRIFT_USE_SHARED) - if(ARROW_USE_STATIC_CRT) -@@ -48,7 +54,7 @@ if(MSVC_TOOLCHAIN AND NOT DEFINED THRIFT_MSVC_LIB_SUFFIX) - endif() - endif() - endif() --set(THRIFT_LIB_NAME_BASE "thrift${THRIFT_MSVC_LIB_SUFFIX}") -+set(THRIFT_LIB_NAME_BASE "thrift${THRIFT_MSVC_LIB_SUFFIX}${THRIFT_LIB_NAME_DEBUG_SUFFIX}") - - if(ARROW_THRIFT_USE_SHARED) - set(THRIFT_LIB_NAMES thrift) -@@ -84,8 +90,8 @@ else() - # THRIFT-4760: The pkgconfig files are currently only installed when using autotools. - # Starting with 0.13, they are also installed for the CMake-based installations of Thrift. - find_package(PkgConfig QUIET) -- pkg_check_modules(THRIFT_PC thrift) -- if(THRIFT_PC_FOUND) -+ #pkg_check_modules(THRIFT_PC thrift) -+ if(0) # Do not use pkg_check_modules, as it finds the wrong location (an intermediate build dir). - set(THRIFT_INCLUDE_DIR "${THRIFT_PC_INCLUDEDIR}") - - list(APPEND THRIFT_PC_LIBRARY_DIRS "${THRIFT_PC_LIBDIR}") -@@ -101,8 +107,7 @@ else() - set(THRIFT_VERSION ${THRIFT_PC_VERSION}) - else() - find_library(THRIFT_LIB -- NAMES ${THRIFT_LIB_NAMES} -- PATH_SUFFIXES "lib/${CMAKE_LIBRARY_ARCHITECTURE}" "lib") -+ NAMES ${THRIFT_LIB_NAMES}) - find_path(THRIFT_INCLUDE_DIR thrift/Thrift.h PATH_SUFFIXES "include") - find_program(THRIFT_COMPILER thrift PATH_SUFFIXES "bin") - extract_thrift_version() diff --git a/ports/arrow/fix-dependencies.patch b/ports/arrow/fix-dependencies.patch new file mode 100644 index 00000000000000..65dcee3343b28f --- /dev/null +++ b/ports/arrow/fix-dependencies.patch @@ -0,0 +1,263 @@ +diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt +index b7a1dae..2669b15 100644 +--- a/cpp/CMakeLists.txt ++++ b/cpp/CMakeLists.txt +@@ -669,7 +669,7 @@ endif() + + if(ARROW_WITH_BROTLI) + # Order is important for static linking +- set(ARROW_BROTLI_LIBS Brotli::brotlienc Brotli::brotlidec Brotli::brotlicommon) ++ set(ARROW_BROTLI_LIBS unofficial::brotli::brotlienc unofficial::brotli::brotlidec unofficial::brotli::brotlicommon) + list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) + list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) + if(Brotli_SOURCE STREQUAL "SYSTEM") +@@ -685,9 +685,9 @@ if(ARROW_WITH_BZ2) + endif() + + if(ARROW_WITH_LZ4) +- list(APPEND ARROW_STATIC_LINK_LIBS LZ4::lz4) ++ list(APPEND ARROW_STATIC_LINK_LIBS lz4::lz4) + if(Lz4_SOURCE STREQUAL "SYSTEM") +- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS LZ4::lz4) ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS lz4::lz4) + endif() + endif() + +@@ -736,10 +736,10 @@ if(ARROW_S3) + endif() + + if(ARROW_WITH_UTF8PROC) +- list(APPEND ARROW_LINK_LIBS utf8proc::utf8proc) +- list(APPEND ARROW_STATIC_LINK_LIBS utf8proc::utf8proc) ++ list(APPEND ARROW_LINK_LIBS utf8proc) ++ list(APPEND ARROW_STATIC_LINK_LIBS utf8proc) + if(utf8proc_SOURCE STREQUAL "SYSTEM") +- list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc::utf8proc) ++ list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS utf8proc) + endif() + endif() + +diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake +index 83ea3aa..d592fc3 100644 +--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake ++++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake +@@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + AWSSDK + benchmark + Boost +- Brotli ++ unofficial-brotli + BZip2 + c-ares + gflags +@@ -61,14 +61,14 @@ set(ARROW_THIRDPARTY_DEPENDENCIES + gRPC + GTest + LLVM +- Lz4 ++ lz4 + ORC + re2 + Protobuf + RapidJSON + Snappy + Thrift +- utf8proc ++ unofficial-utf8proc + xsimd + ZLIB + zstd) +@@ -956,7 +956,7 @@ macro(build_snappy) + endmacro() + + if(ARROW_WITH_SNAPPY) +- resolve_dependency(Snappy) ++ resolve_dependency(Snappy USE_CONFIG TRUE) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(SNAPPY_INCLUDE_DIRS Snappy::snappy INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${SNAPPY_INCLUDE_DIRS}) +@@ -1021,10 +1021,16 @@ macro(build_brotli) + endmacro() + + if(ARROW_WITH_BROTLI) +- resolve_dependency(Brotli) ++ set(unofficial-brotli_SOURCE "SYSTEM") ++ resolve_dependency(unofficial-brotli USE_CONFIG TRUE) + # TODO: Don't use global includes but rather target_include_directories +- get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon +- INTERFACE_INCLUDE_DIRECTORIES) ++ if (BUILD_SHARED_LIBS) ++ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon ++ INTERFACE_INCLUDE_DIRECTORIES) ++ else() ++ get_target_property(BROTLI_INCLUDE_DIR unofficial::brotli::brotlicommon-static ++ INTERFACE_INCLUDE_DIRECTORIES) ++ endif() + include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) + endif() + +@@ -1141,7 +1147,7 @@ macro(build_glog) + endmacro() + + if(ARROW_USE_GLOG) +- resolve_dependency(GLOG) ++ resolve_dependency(glog USE_CONFIG TRUE) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) +@@ -1214,8 +1220,7 @@ endmacro() + if(ARROW_NEED_GFLAGS) + set(ARROW_GFLAGS_REQUIRED_VERSION "2.1.0") + resolve_dependency(gflags +- HAVE_ALT +- TRUE ++ USE_CONFIG TRUE + REQUIRED_VERSION + ${ARROW_GFLAGS_REQUIRED_VERSION} + IS_RUNTIME_DEPENDENCY +@@ -1316,7 +1321,7 @@ if(ARROW_WITH_THRIFT) + # to build Boost, so don't look again if already found. + if(NOT Thrift_FOUND AND NOT THRIFT_FOUND) + # Thrift c++ code generated by 0.13 requires 0.11 or greater +- resolve_dependency(Thrift REQUIRED_VERSION 0.11.0) ++ resolve_dependency(Thrift USE_CONFIG TRUE REQUIRED_VERSION 0.11.0) + endif() + # TODO: Don't use global includes but rather target_include_directories + include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) +@@ -1416,13 +1421,17 @@ if(ARROW_WITH_PROTOBUF) + else() + set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1") + endif() +- resolve_dependency(Protobuf REQUIRED_VERSION ${ARROW_PROTOBUF_REQUIRED_VERSION}) ++ resolve_dependency(Protobuf USE_CONFIG TRUE REQUIRED_VERSION ${ARROW_PROTOBUF_REQUIRED_VERSION}) + + if(ARROW_PROTOBUF_USE_SHARED AND MSVC_TOOLCHAIN) + add_definitions(-DPROTOBUF_USE_DLLS) + endif() + + # TODO: Don't use global includes but rather target_include_directories ++ if (TARGET protobuf::libprotobuf) ++ get_target_property(PROTOBUF_INCLUDE_DIR protobuf::libprotobuf ++ INTERFACE_INCLUDE_DIRECTORIES) ++ endif() + include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR}) + + if(TARGET arrow::protobuf::libprotobuf) +@@ -1471,12 +1480,18 @@ if(ARROW_WITH_PROTOBUF) + + # Log protobuf paths as we often see issues with mixed sources for + # the libraries and protoc. ++ if (NOT TARGET protobuf::protoc) + get_target_property(PROTOBUF_PROTOC_EXECUTABLE ${ARROW_PROTOBUF_PROTOC} + IMPORTED_LOCATION) ++ endif() + message(STATUS "Found protoc: ${PROTOBUF_PROTOC_EXECUTABLE}") + # Protobuf_PROTOC_LIBRARY is set by all versions of FindProtobuf.cmake + message(STATUS "Found libprotoc: ${Protobuf_PROTOC_LIBRARY}") ++ if (NOT TARGET protobuf::libprotobuf) + get_target_property(PROTOBUF_LIBRARY ${ARROW_PROTOBUF_LIBPROTOBUF} IMPORTED_LOCATION) ++ else() ++ set(PROTOBUF_LIBRARY protobuf::libprotobuf) ++ endif() + message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") + message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") + endif() +@@ -1904,7 +1919,7 @@ endmacro() + if(ARROW_WITH_RAPIDJSON) + set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") + resolve_dependency(RapidJSON +- HAVE_ALT ++ USE_CONFIG + TRUE + REQUIRED_VERSION + ${ARROW_RAPIDJSON_REQUIRED_VERSION} +@@ -2047,10 +2062,11 @@ macro(build_lz4) + endmacro() + + if(ARROW_WITH_LZ4) +- resolve_dependency(Lz4) ++ set(lz4_SOURCE "SYSTEM") ++ resolve_dependency(lz4 USE_CONFIG TRUE) + + # TODO: Don't use global includes but rather target_include_directories +- get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) ++ get_target_property(LZ4_INCLUDE_DIR lz4::lz4 INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) + endif() + +@@ -2111,7 +2127,7 @@ macro(build_zstd) + endmacro() + + if(ARROW_WITH_ZSTD) +- resolve_dependency(zstd) ++ resolve_dependency(zstd USE_CONFIG TRUE) + + if(TARGET zstd::libzstd) + set(ARROW_ZSTD_LIBZSTD zstd::libzstd) +@@ -2273,13 +2289,13 @@ macro(build_utf8proc) + endmacro() + + if(ARROW_WITH_UTF8PROC) +- resolve_dependency(utf8proc) ++ resolve_dependency(unofficial-utf8proc USE_CONFIG TRUE) + + add_definitions(-DARROW_WITH_UTF8PROC) + + # TODO: Don't use global definitions but rather + # target_compile_definitions or target_link_libraries +- get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc::utf8proc ++ get_target_property(UTF8PROC_COMPILER_DEFINITIONS utf8proc + INTERFACE_COMPILER_DEFINITIONS) + if(UTF8PROC_COMPILER_DEFINITIONS) + add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) +@@ -2287,7 +2303,7 @@ if(ARROW_WITH_UTF8PROC) + + # TODO: Don't use global includes but rather + # target_include_directories or target_link_libraries +- get_target_property(UTF8PROC_INCLUDE_DIR utf8proc::utf8proc ++ get_target_property(UTF8PROC_INCLUDE_DIR utf8proc + INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) + endif() +@@ -2342,7 +2358,7 @@ endmacro() + # Dependencies for Arrow Flight RPC + + macro(build_grpc) +- resolve_dependency(c-ares HAVE_ALT TRUE) ++ resolve_dependency(c-ares HAVE_ALT TRUE USE_CONFIG TRUE) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(c-ares_INCLUDE_DIR c-ares::cares INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${c-ares_INCLUDE_DIR}) +@@ -2614,7 +2630,7 @@ endmacro() + if(ARROW_WITH_GRPC) + set(ARROW_GRPC_REQUIRED_VERSION "1.17.0") + resolve_dependency(gRPC +- HAVE_ALT ++ USE_CONFIG + TRUE + REQUIRED_VERSION + ${ARROW_GRPC_REQUIRED_VERSION}) +@@ -2622,6 +2638,10 @@ if(ARROW_WITH_GRPC) + # TODO: Don't use global includes but rather target_include_directories + get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) + include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) ++ if (ABSL_USE_CXX17) ++ message(STATUS "Found absl uses CXX17, enable CXX17 feature.") ++ set(CMAKE_CXX_STANDARD 17) ++ endif() + + if(GRPC_VENDORED) + set(GRPCPP_PP_INCLUDE TRUE) +diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt +index 516196c..ebc4881 100644 +--- a/cpp/src/arrow/adapters/orc/CMakeLists.txt ++++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt +@@ -29,7 +29,7 @@ set(ORC_MIN_TEST_LIBS + GTest::gtest_main + GTest::gtest + Snappy::snappy +- LZ4::lz4 ++ lz4::lz4 + ZLIB::ZLIB) + + if(ARROW_BUILD_STATIC) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index fb9e05bc6963bb..bb7d857fb1ee44 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -8,6 +8,20 @@ vcpkg_from_github( HEAD_REF master PATCHES all.patch + fix-dependencies.patch +) + +file(REMOVE ${SOURCE_PATH}/cpp/cmake_modules/Findzstd.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindBrotli.cmake + ${SOURCE_PATH}/cpp/cmake_modules/Find-c-aresAlt.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindLz4.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindSnappy.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindThrift.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindGLOG.cmake + ${SOURCE_PATH}/cpp/cmake_modules/Findutf8proc.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindRapidJSONAlt.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindgRPCAlt.cmake + ${SOURCE_PATH}/cpp/cmake_modules/FindgflagsAlt.cmake ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 51755afd710b8e..c15f014505620f 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arrow", "version": "4.0.0", + "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "supports": "x64", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 503dbef98543d1..d4ea77e4aa122d 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09e65930903c5dad92250b8f3f351f06f77f8e30", + "version": "4.0.0", + "port-version": 1 + }, { "git-tree": "2066704ab2b0b5977bcd5677ea1378fac0b0555c", "version": "4.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 43f4ad39be27a8..951a3e7ea439d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -158,7 +158,7 @@ }, "arrow": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 1 }, "ashes": { "baseline": "2021-02-09", From 275d35f8979a89443a2e4b37cb16c383132ab811 Mon Sep 17 00:00:00 2001 From: Fei Chong Date: Fri, 23 Jul 2021 04:58:05 +0800 Subject: [PATCH 0151/1858] [osg-qt] Remove unnecessary dependency (#19000) * [osg-qt] Remove unnecessary dependency * [osg-qt] update version baseline Co-authored-by: Fei Chong --- ports/osg-qt/CONTROL | 3 ++- versions/baseline.json | 2 +- versions/o-/osg-qt.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/osg-qt/CONTROL b/ports/osg-qt/CONTROL index 7f8a193202c730..c3c9dc621c1c26 100644 --- a/ports/osg-qt/CONTROL +++ b/ports/osg-qt/CONTROL @@ -1,4 +1,5 @@ Source: osg-qt Version: Qt5 +Port-Version: 1 Description: osgQt - Qt project for making use of OpenSceneGraph(OSG) -Build-Depends: osg, protobuf, qt5-base[core] +Build-Depends: osg, qt5-base[core] diff --git a/versions/baseline.json b/versions/baseline.json index 951a3e7ea439d5..d71a64cb20b71d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4702,7 +4702,7 @@ }, "osg-qt": { "baseline": "Qt5", - "port-version": 0 + "port-version": 1 }, "osgearth": { "baseline": "3.1", diff --git a/versions/o-/osg-qt.json b/versions/o-/osg-qt.json index 81eae086b83797..293b592f040c38 100644 --- a/versions/o-/osg-qt.json +++ b/versions/o-/osg-qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a02ebd7a6494e03f4a70553af4a525e1b7e17643", + "version-string": "Qt5", + "port-version": 1 + }, { "git-tree": "912b87e36bf6db14319d83e11d91286b6921675f", "version-string": "Qt5", From bace593c4b3565fea45e793c4a8f659de2cd90e1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 22 Jul 2021 23:03:01 +0200 Subject: [PATCH 0152/1858] [libunistring] New port (#18997) * Add port libunistring * Mark Windows (non-mingw) unsupported * x-add-version --- ports/libunistring/copyright | 18 ++++++++++++++++ ports/libunistring/portfile.cmake | 36 +++++++++++++++++++++++++++++++ ports/libunistring/vcpkg.json | 10 +++++++++ versions/baseline.json | 4 ++++ versions/l-/libunistring.json | 9 ++++++++ 5 files changed, 77 insertions(+) create mode 100644 ports/libunistring/copyright create mode 100644 ports/libunistring/portfile.cmake create mode 100644 ports/libunistring/vcpkg.json create mode 100644 versions/l-/libunistring.json diff --git a/ports/libunistring/copyright b/ports/libunistring/copyright new file mode 100644 index 00000000000000..6bab2feda56f7c --- /dev/null +++ b/ports/libunistring/copyright @@ -0,0 +1,18 @@ +The libunistring library and its header files are dual-licensed under +"the GNU LGPLv3+ or the GNU GPLv2". This means, you can use it under either + - the terms of the GNU Lesser General Public License (LGPL) version 3 or + (at your option) any later version, or + - the terms of the GNU General Public License (GPL) version 2, or + - the same dual license "the GNU LGPLv3+ or the GNU GPLv2". + +You find the GNU LGPL version 3 in the file COPYING.LIB. This license is +based on the GNU GPL version 3, see file COPYING. + +You can find the GNU GPL version 2 at +. + +Note: This dual license makes it possible for the libunistring library +to be used by packages under GPLv2 or GPLv2+ licenses, in particular. See +the table in . + +The documentation is under another license; see in the documentation. diff --git a/ports/libunistring/portfile.cmake b/ports/libunistring/portfile.cmake new file mode 100644 index 00000000000000..a443ec9ccc88bc --- /dev/null +++ b/ports/libunistring/portfile.cmake @@ -0,0 +1,36 @@ +set(LIBUNISTRING_VERSION 0.9.10) +set(LIBUNISTRING_FILENAME libunistring-${LIBUNISTRING_VERSION}.tar.gz) + +if(NOT VCPKG_TARGET_IS_MINGW) + vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS + "https://ftp.gnu.org/gnu/libunistring/${LIBUNISTRING_FILENAME}" + "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libunistring/${LIBUNISTRING_FILENAME}" + FILENAME "${LIBUNISTRING_FILENAME}" + SHA512 690082732fbbd47ab4ffbd6f21d85afece0f8e2ded24982f949f4ae52bf0a981b75ea9bc14ab289e0954cde07f31a7a4c2bb65615a8eb5b2bfa65720310b6fc9 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${LIBUNISTRING_VERSION} +) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + COPY_SOURCE + OPTIONS + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" +) +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# copyright excerpt from README, to cover dual license under "LGPLv3+ or GPLv2". +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libunistring/vcpkg.json b/ports/libunistring/vcpkg.json new file mode 100644 index 00000000000000..b11bbb6fa9b116 --- /dev/null +++ b/ports/libunistring/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libunistring", + "version": "0.9.10", + "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", + "homepage": "https://www.gnu.org/software/libunistring/", + "supports": "!windows", + "dependencies": [ + "libiconv" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d71a64cb20b71d..f62849406282fa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3668,6 +3668,10 @@ "baseline": "4.3-0", "port-version": 0 }, + "libunistring": { + "baseline": "0.9.10", + "port-version": 0 + }, "liburing": { "baseline": "2.0", "port-version": 0 diff --git a/versions/l-/libunistring.json b/versions/l-/libunistring.json new file mode 100644 index 00000000000000..800afe50cc7179 --- /dev/null +++ b/versions/l-/libunistring.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "586bf47f6b9ee55aa3eb9ec7c7ff36363e39980b", + "version": "0.9.10", + "port-version": 0 + } + ] +} From 0fccfdae028a2c511ce414dc7809a5ba4496550d Mon Sep 17 00:00:00 2001 From: Jonathan Higgs Date: Thu, 22 Jul 2021 22:05:05 +0100 Subject: [PATCH 0153/1858] [imguizmo] new port (#18991) * [imguizmo] new port * [imguizmo] Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [imguizmo] fix formatting * [imguizmo] fix version-date * [imguizmo] apply suggestions from code review Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * [imguizmo] apply suggestions from code review Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * [imguizmo] add std version requirement * [imguizmo] remove debug lib rename * [imguizmo] update to use v1.83 tag * [imguizmo] fixed hash Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/imguizmo/CMakeLists.txt | 59 +++++++++++++++++++++++++++++++++++ ports/imguizmo/portfile.cmake | 24 ++++++++++++++ ports/imguizmo/vcpkg.json | 17 ++++++++++ versions/baseline.json | 4 +++ versions/i-/imguizmo.json | 9 ++++++ 5 files changed, 113 insertions(+) create mode 100644 ports/imguizmo/CMakeLists.txt create mode 100644 ports/imguizmo/portfile.cmake create mode 100644 ports/imguizmo/vcpkg.json create mode 100644 versions/i-/imguizmo.json diff --git a/ports/imguizmo/CMakeLists.txt b/ports/imguizmo/CMakeLists.txt new file mode 100644 index 00000000000000..1b552bae2d105d --- /dev/null +++ b/ports/imguizmo/CMakeLists.txt @@ -0,0 +1,59 @@ +cmake_minimum_required(VERSION 3.8) +project(imguizmo) + +find_package(imgui CONFIG REQUIRED) +get_target_property(IMGUI_INCLUDE_DIRS imgui::imgui + INTERFACE_INCLUDE_DIRECTORIES +) + +add_library(${PROJECT_NAME} "") +add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) + +target_compile_options(${PROJECT_NAME} PRIVATE "-std=c++11") + +target_include_directories( + ${PROJECT_NAME} + PUBLIC + $ + $ + PRIVATE + ${IMGUI_INCLUDE_DIRS} +) + +target_sources( + ${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.cpp +) + +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_target + ARCHIVE DESTINATION lib + ARCHIVE DESTINATION lib + RUNTIME DESTINATION bin +) + +if (NOT IMGUIZMO_SKIP_HEADERS) + install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/GraphEditor.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImCurveEdit.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImGradient.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImGuizmo.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImSequencer.h + ${CMAKE_CURRENT_SOURCE_DIR}/ImZoomSlider.h + DESTINATION include + ) +endif() + +install( + EXPORT ${PROJECT_NAME}_target + NAMESPACE ${PROJECT_NAME}:: + FILE ${PROJECT_NAME}-config.cmake + DESTINATION share/${PROJECT_NAME} +) \ No newline at end of file diff --git a/ports/imguizmo/portfile.cmake b/ports/imguizmo/portfile.cmake new file mode 100644 index 00000000000000..342001ea8d63a5 --- /dev/null +++ b/ports/imguizmo/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO CedricGuillemet/ImGuizmo + REF 1.83 + SHA512 23285398688b4cdf3128ecb918b70c9a52f06c8e911da57430442b838cecf653e233d8cdfefc6acd3e4da381869ffc6fb74bcaaafc8e33657d6060a645517363 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DIMGUIZMO_SKIP_HEADERS=ON +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/imguizmo/vcpkg.json b/ports/imguizmo/vcpkg.json new file mode 100644 index 00000000000000..09184a7230f7af --- /dev/null +++ b/ports/imguizmo/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "imguizmo", + "version": "1.83", + "description": "Immediate mode 3D gizmo for scene editing and other controls based on Dear ImGui", + "homepage": "https://github.com/CedricGuillemet/ImGuizmo", + "dependencies": [ + "imgui", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f62849406282fa..115d17d3c9b3b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2664,6 +2664,10 @@ "baseline": "2.1-2", "port-version": 0 }, + "imguizmo": { + "baseline": "1.83", + "port-version": 0 + }, "immer": { "baseline": "2019-06-07", "port-version": 0 diff --git a/versions/i-/imguizmo.json b/versions/i-/imguizmo.json new file mode 100644 index 00000000000000..096f3964102449 --- /dev/null +++ b/versions/i-/imguizmo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9611b5ef89fd20182ee8d6c84c505e986f3ea880", + "version": "1.83", + "port-version": 0 + } + ] +} From deed69496a461e44b045632994a4832b734492bf Mon Sep 17 00:00:00 2001 From: BullyWiiPlaza Date: Thu, 22 Jul 2021 23:23:14 +0200 Subject: [PATCH 0154/1858] [ADVobfuscator] Add new port (#18989) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [cli11] Update to 1.9.1 * Update version in CONTROL * Add new port ADVobfuscator * Format vcpkg.json * Add version * Update ports/advobfuscator/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update versions/a-/advobfuscator.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update versions/a-/advobfuscator.json * version stuff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY --- ports/advobfuscator/portfile.cmake | 14 ++++++++++++++ ports/advobfuscator/vcpkg.json | 8 ++++++++ versions/a-/advobfuscator.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 35 insertions(+) create mode 100644 ports/advobfuscator/portfile.cmake create mode 100644 ports/advobfuscator/vcpkg.json create mode 100644 versions/a-/advobfuscator.json diff --git a/ports/advobfuscator/portfile.cmake b/ports/advobfuscator/portfile.cmake new file mode 100644 index 00000000000000..883ac486520a04 --- /dev/null +++ b/ports/advobfuscator/portfile.cmake @@ -0,0 +1,14 @@ +# Download the code from GitHub +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO andrivet/ADVobfuscator + REF 1852a0eb75b03ab3139af7f938dfb617c292c600 + SHA512 1bca72b21a3cbf9d8db21fb21d112dd4ca83cac695abfb8fc3d8065245a0cc84cb9e41eb9ff81481e8e0a9d214ff6f5c9aec5d1ba8a9d4387b08dd895ecf1cd5 + HEAD_REF master +) + +# Install the header only source files to the right location +file(INSTALL ${SOURCE_PATH}/Lib DESTINATION ${CURRENT_PACKAGES_DIR}/include) + +# The README.md conains the LICENSE details +file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/advobfuscator/vcpkg.json b/ports/advobfuscator/vcpkg.json new file mode 100644 index 00000000000000..370f98a8539895 --- /dev/null +++ b/ports/advobfuscator/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "advobfuscator", + "version-date": "2020-06-26", + "description": "Obfuscation library based on C++11/14 and metaprogramming", + "dependencies": [ + "boost-msm" + ] +} diff --git a/versions/a-/advobfuscator.json b/versions/a-/advobfuscator.json new file mode 100644 index 00000000000000..09987baf538ff4 --- /dev/null +++ b/versions/a-/advobfuscator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c2b62f4dec8c15ff80008d187ca640ec844679cf", + "version-date": "2020-06-26", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 115d17d3c9b3b9..948aa00ef325ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -28,6 +28,10 @@ "baseline": "0.1.1f", "port-version": 1 }, + "advobfuscator": { + "baseline": "2020-06-26", + "port-version": 0 + }, "aixlog": { "baseline": "1.4.0", "port-version": 0 From d78b3d5fac4925f1ccaf297455009343c601b1a9 Mon Sep 17 00:00:00 2001 From: henriblMSFT <62611385+henriblMSFT@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:23:35 -0700 Subject: [PATCH 0155/1858] [YARA] update to 4.1.1 (#18977) * [YARA] update to 4.1.1 * Add baseline frrom .\vcpkg.exe x-add-version yara --- ports/yara/portfile.cmake | 6 +++--- ports/yara/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/y-/yara.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/yara/portfile.cmake b/ports/yara/portfile.cmake index 3b159f2e732897..b7ab617b77e6cf 100644 --- a/ports/yara/portfile.cmake +++ b/ports/yara/portfile.cmake @@ -3,9 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VirusTotal/yara - REF e1360f6cbe3d8daf350018661bc6772bd5b726f2 #v4.1.0 - SHA512 55f55ed41af1049e500f77f6d02fb6992dabd84efb906ff0b3ba746b3c5d890cb622845622692f230dad51a510c068c0a0195932c8931d3e56c71fc17d8769d5 - HEAD_REF dev + REF v4.1.1 + SHA512 e4474254249d5b3fbb7231fdec5f4e080be042098e1b2bc953aa93513ce0b4742e34acac2911687e75055ecd589d942f71b79c58ca47eee243626ab3ec8add71 + HEAD_REF master ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/yara/vcpkg.json b/ports/yara/vcpkg.json index 75b40876b7b7ab..22f217411e549e 100644 --- a/ports/yara/vcpkg.json +++ b/ports/yara/vcpkg.json @@ -1,6 +1,6 @@ { "name": "yara", - "version": "4.1.0", + "version": "4.1.1", "description": "The pattern matching swiss knife", "homepage": "https://github.com/VirusTotal/yara", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 948aa00ef325ea..2b21770880a2e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6817,7 +6817,7 @@ "port-version": 1 }, "yara": { - "baseline": "4.1.0", + "baseline": "4.1.1", "port-version": 0 }, "yas": { diff --git a/versions/y-/yara.json b/versions/y-/yara.json index b1a01fbc1fad41..4bbf6d7c230664 100644 --- a/versions/y-/yara.json +++ b/versions/y-/yara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "081abbbfc62033c4254ae833f61d48c5cea4151c", + "version": "4.1.1", + "port-version": 0 + }, { "git-tree": "9dfbd10f01283a8a8cf15ddb60db75e5635d3a69", "version": "4.1.0", From 0702653a637fddc45ab5307ecebe1f21b0f0b4db Mon Sep 17 00:00:00 2001 From: Christoph Neuhauser Date: Thu, 22 Jul 2021 23:25:45 +0200 Subject: [PATCH 0156/1858] [vulkan-headers, vulkan-hpp ,vulkan-memory-allocator] Update to the latestion version (#18976) * Updated vulkan-headers, vulkan-hpp and vulkan-memory-allocator to new versions. * Updated the port ashes to fix compilation errors with the new Vulkan headers. Added vk_video/ to the list of copied header files in the port vulkan-headers. * Apply suggestions from code review regarding version strings Update version strings in ports/ashes/vcpkg.json and ports/vulkan-headers/vcpkg.json. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Updated versioning information of modified ports. * Update version strings after changes in vcpkg.json files. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/ashes/fix-cast.patch | 39 ++++++++++++++++++++ ports/ashes/portfile.cmake | 6 ++- ports/ashes/vcpkg.json | 2 +- ports/vulkan-headers/portfile.cmake | 5 ++- ports/vulkan-headers/vcpkg.json | 2 +- ports/vulkan-hpp/CONTROL | 2 +- ports/vulkan-hpp/portfile.cmake | 4 +- ports/vulkan-memory-allocator/CONTROL | 2 +- ports/vulkan-memory-allocator/portfile.cmake | 6 +-- versions/a-/ashes.json | 5 +++ versions/baseline.json | 8 ++-- versions/v-/vulkan-headers.json | 5 +++ versions/v-/vulkan-hpp.json | 5 +++ versions/v-/vulkan-memory-allocator.json | 5 +++ 14 files changed, 79 insertions(+), 17 deletions(-) create mode 100644 ports/ashes/fix-cast.patch diff --git a/ports/ashes/fix-cast.patch b/ports/ashes/fix-cast.patch new file mode 100644 index 00000000000000..27db3d2eb8c7fd --- /dev/null +++ b/ports/ashes/fix-cast.patch @@ -0,0 +1,39 @@ +diff --git a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp +index fb9a195a..3a97e126 100644 +--- a/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp ++++ b/source/ashes/renderer/D3D11Renderer/ash_direct3d11.cpp +@@ -1688,7 +1688,7 @@ namespace ashes::d3d11 + VkPeerMemoryFeatureFlags * pPeerMemoryFeatures ) + { + reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); +- *pPeerMemoryFeatures = VK_NULL_HANDLE; ++ *pPeerMemoryFeatures = static_cast(0); + } + + void VKAPI_CALL vkCmdSetDeviceMask( +diff --git a/source/ashes/renderer/GlRenderer/ash_opengl.cpp b/source/ashes/renderer/GlRenderer/ash_opengl.cpp +index 45a17148..eec2419f 100644 +--- a/source/ashes/renderer/GlRenderer/ash_opengl.cpp ++++ b/source/ashes/renderer/GlRenderer/ash_opengl.cpp +@@ -1700,7 +1700,7 @@ namespace ashes::gl + VkPeerMemoryFeatureFlags* pPeerMemoryFeatures ) + { + reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); +- *pPeerMemoryFeatures = VK_NULL_HANDLE; ++ *pPeerMemoryFeatures = static_cast(0); + } + + void VKAPI_CALL vkCmdSetDeviceMask( +diff --git a/source/ashes/renderer/TestRenderer/ash_test.cpp b/source/ashes/renderer/TestRenderer/ash_test.cpp +index 741dd75c..b34647b8 100644 +--- a/source/ashes/renderer/TestRenderer/ash_test.cpp ++++ b/source/ashes/renderer/TestRenderer/ash_test.cpp +@@ -1735,7 +1735,7 @@ namespace ashes::test + VkPeerMemoryFeatureFlags* pPeerMemoryFeatures ) + { + reportUnsupported( device, "vkGetDeviceGroupPeerMemoryFeatures" ); +- *pPeerMemoryFeatures = VK_NULL_HANDLE; ++ *pPeerMemoryFeatures = static_cast(0); + } + + void VKAPI_CALL vkCmdSetDeviceMask( diff --git a/ports/ashes/portfile.cmake b/ports/ashes/portfile.cmake index d862a635f71f73..ef2fcf40fd31f2 100644 --- a/ports/ashes/portfile.cmake +++ b/ports/ashes/portfile.cmake @@ -5,8 +5,10 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DragonJoker/Ashes - REF 8331722d80fbd10d0bad87bd0a010c71a01a81c1 - SHA512 a14b2a46c033a5e539a73e875d7ea98af5585f30b45293243e5dde5dc00e1f293b1917d62eda427c69c852ad6e6437eb5a8dd5b2e1dedf3b8f2b5e2fc3c24152 + REF 0f4e6d0ea308eb60ae32274acc9a4d345a4977ff + SHA512 0ce74780786d018e7a447c4e49d3cd83ad53b238a79fc484025e2034cd49a64253363cd592d2da367befa7cd5443b90eb1c5dae54b22756f7b4a0cdecb93c588 + PATCHES + fix-cast.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/ashes/vcpkg.json b/ports/ashes/vcpkg.json index 8f13d5e3825f71..cc2567786f3c4a 100644 --- a/ports/ashes/vcpkg.json +++ b/ports/ashes/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ashes", - "version-string": "2021-02-09", + "version-date": "2021-06-18", "description": "Drop-in replacement to Vulkan's shared library, allowing the use of OpenGL or Direct3D11 in addition to Vulkan.", "homepage": "https://github.com/DragonJoker/Ashes", "supports": "!osx & !linux & !ios & !android & !uwp & !x86 & !arm & !static", diff --git a/ports/vulkan-headers/portfile.cmake b/ports/vulkan-headers/portfile.cmake index f375172746b59b..c6f59423e9eb7f 100644 --- a/ports/vulkan-headers/portfile.cmake +++ b/ports/vulkan-headers/portfile.cmake @@ -2,13 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Headers - REF v1.2.157 - SHA512 ab0051251ba7491b7d5720c78a187c0e75fc3056a2ad9718cbade56ea94a9ce6ac6b6d7bd8c3e998669c7f6ff5de0ea4d1b1d05df0dab6cf943c33a32d66b832 + REF v1.2.184 + SHA512 95ee241ca82ba4373dc53aefec36839b6a08478434742bd8de6750d875a7a5fcb2225afae5f6f400a7b302af87da7e226b725be5435236694e816e141a3b24ef HEAD_REF master ) # This must be vulkan as other vulkan packages expect it there. file(COPY "${SOURCE_PATH}/include/vulkan/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vulkan") +file(COPY "${SOURCE_PATH}/include/vk_video/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vk_video") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index 4a83259b40692e..8059e77b7d4e02 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,6 +1,6 @@ { "name": "vulkan-headers", - "version-string": "1.2.157", + "version-semver": "1.2.184", "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers" } diff --git a/ports/vulkan-hpp/CONTROL b/ports/vulkan-hpp/CONTROL index 2449918e3ee59b..05f88b6c224406 100644 --- a/ports/vulkan-hpp/CONTROL +++ b/ports/vulkan-hpp/CONTROL @@ -1,4 +1,4 @@ Source: vulkan-hpp -Version: 2019-05-11-1 +Version: 1.2.184 Description: Header only C++ bindings for the Vulkan C API Build-Depends: vulkan diff --git a/ports/vulkan-hpp/portfile.cmake b/ports/vulkan-hpp/portfile.cmake index ba249b6925b8ae..9e790f5f4be7ee 100644 --- a/ports/vulkan-hpp/portfile.cmake +++ b/ports/vulkan-hpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/Vulkan-Hpp - REF 5ce8ae7fd0d9c0543d02f33cfa8a66e6a43e2150 - SHA512 dc58332f5075f0b4d001abd4e78664be099509b8cee525a211aa33599f2351bf5e200fef37dccc84895d8f7a056f075ae3cf404f9aac7281970ff903e4a67a96 + REF v1.2.184 + SHA512 564bb5fd3b89fc8078e3c4d99c719f4d62166d78891bc529d6d07add1843137ec8f62a92dbdcfa9ffa8a9677fba41da1b591a033c61b27c43c70c25be32c3205 HEAD_REF master ) diff --git a/ports/vulkan-memory-allocator/CONTROL b/ports/vulkan-memory-allocator/CONTROL index 85976c09e3668c..97e2d9892e226b 100644 --- a/ports/vulkan-memory-allocator/CONTROL +++ b/ports/vulkan-memory-allocator/CONTROL @@ -1,3 +1,3 @@ Source: vulkan-memory-allocator -Version: 2.3.0 +Version: 2021-07-07 Description: Easy to integrate Vulkan memory allocation library from GPUOpen diff --git a/ports/vulkan-memory-allocator/portfile.cmake b/ports/vulkan-memory-allocator/portfile.cmake index 47b009592782a4..c0b27259ace19c 100644 --- a/ports/vulkan-memory-allocator/portfile.cmake +++ b/ports/vulkan-memory-allocator/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator - REF v2.3.0+vs2017 - SHA512 57113c52dcccc4df79ebf36f091f1232f68ee45c48934a5b91c2d87b5599d8c176ca7a47e285ddf146ec0b3c83db5808c2e6c3f6e1b453e20a8525f73211bf8d + REF 55868965ae1fa956c07695d4642e1add8c9450f7 + SHA512 433d8a961a1fa4c80894f014fdfbbcafeb94932a3eea2eced9c7109dcbf7350a60efb9fb1d8f3c621f2d72c118f47f82f8e9e6f4db75038fbad3a727b5896479 HEAD_REF master ) -file(COPY "${SOURCE_PATH}/src/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/include/vk_mem_alloc.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-vulkan-memory-allocator-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-vulkan-memory-allocator) diff --git a/versions/a-/ashes.json b/versions/a-/ashes.json index ac2e6389bcfb51..0d6724fc891999 100644 --- a/versions/a-/ashes.json +++ b/versions/a-/ashes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d20e63c5d3a016d41571baefa723a23113c13c3", + "version-date": "2021-06-18", + "port-version": 0 + }, { "git-tree": "5e0e57612b419c8cdb33f26195213626c59e7efd", "version-string": "2021-02-09", diff --git a/versions/baseline.json b/versions/baseline.json index 2b21770880a2e6..30db0d5fbb1871 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -165,7 +165,7 @@ "port-version": 1 }, "ashes": { - "baseline": "2021-02-09", + "baseline": "2021-06-18", "port-version": 0 }, "asio": { @@ -6605,15 +6605,15 @@ "port-version": 0 }, "vulkan-headers": { - "baseline": "1.2.157", + "baseline": "1.2.184", "port-version": 0 }, "vulkan-hpp": { - "baseline": "2019-05-11-1", + "baseline": "1.2.184", "port-version": 0 }, "vulkan-memory-allocator": { - "baseline": "2.3.0", + "baseline": "2021-07-07", "port-version": 0 }, "vxl": { diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index 8d1ded0558ef22..6e512adb3a5513 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67ab6950d3e363975e70de04b73c39a35db721b3", + "version-semver": "1.2.184", + "port-version": 0 + }, { "git-tree": "2bfc0cee813eec4db22084402370b7e40556027e", "version-string": "1.2.157", diff --git a/versions/v-/vulkan-hpp.json b/versions/v-/vulkan-hpp.json index 10e13b64492294..e0c53e7dde6374 100644 --- a/versions/v-/vulkan-hpp.json +++ b/versions/v-/vulkan-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4ca1555372a398629a4bd1728b6870efb93d674", + "version-string": "1.2.184", + "port-version": 0 + }, { "git-tree": "2480b7c83826a22adba9e5fbad769ab547285818", "version-string": "2019-05-11-1", diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index b91cbac4912f3e..59669879981969 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b1560d8d5ccc9a903ed8159fccecd2bd29e2125", + "version-string": "2021-07-07", + "port-version": 0 + }, { "git-tree": "dd2f676035a767641141490caae2ac057ed59e83", "version-string": "2.3.0", From 424c38f0370a97878824251baeec9c7b9084ba51 Mon Sep 17 00:00:00 2001 From: Luca Schlecker Date: Thu, 22 Jul 2021 23:43:35 +0200 Subject: [PATCH 0157/1858] [crow] update to 0.3.2 (v0.3+2) (#18974) Signed-off-by: Luca Schlecker --- ports/crow/portfile.cmake | 4 ++-- ports/crow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/crow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index fefc42cba15723..dd8f45f36e5d20 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF 6a1623b69c5f788b1ea248f0046634fa1e7b0e03 #0.3+1 - SHA512 6c3e1e89e0f0ea9dcbe9206071189ad692c34400b1a3e101002e9bd97729851db94a40ce45b8fc9aa747df409cfdbdbdf09af806361d1e7df6f515f4c50e7a80 + REF 7e47d4c7ee548c5fd954efd82cfeed330a7823ea #0.3+2 + SHA512 804bafe6085270470487ea304f9b1aa812f9ee29df67569fd7133ea70bc73b61dca23d6955c1fd9cf1fa7c8909d34b447437ff05844ac2ad5bb01318357dc2c0 HEAD_REF master ) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index 9bf62431d8ac29..0cf1b42f14a03c 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "crow", - "version": "0.3.1", + "version": "0.3.2", "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow" } diff --git a/versions/baseline.json b/versions/baseline.json index 30db0d5fbb1871..4c597ad5d58fe4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1525,7 +1525,7 @@ "port-version": 0 }, "crow": { - "baseline": "0.3.1", + "baseline": "0.3.2", "port-version": 0 }, "cryptopp": { diff --git a/versions/c-/crow.json b/versions/c-/crow.json index fcad8922338947..6bc84a2131d12c 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0d5207375bcbf798d3478eef7e00ae5206e4b04", + "version": "0.3.2", + "port-version": 0 + }, { "git-tree": "4c50547dfc3c5f5bf5a08887d6515e51a7203130", "version": "0.3.1", From 817acd30045c95cd32ea2baa134716e71d3ac1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 23 Jul 2021 05:52:17 +0800 Subject: [PATCH 0158/1858] [urho3d] Add features, fix usage (#18975) * [urho3d] Add features, fix usage * update version stuff * fix typo * Correct installation * fix installation * update version * Re-fix install * Fix tools install * typo * Update versions/u-/urho3d.json --- ports/urho3d/add_options.patch | 17 +++ ports/urho3d/fix-install.patch | 187 +++++++++++++++++++++++++++++++++ ports/urho3d/portfile.cmake | 102 ++++++++++++++---- ports/urho3d/vcpkg.json | 12 ++- versions/baseline.json | 2 +- versions/u-/urho3d.json | 5 + 6 files changed, 300 insertions(+), 25 deletions(-) create mode 100644 ports/urho3d/add_options.patch create mode 100644 ports/urho3d/fix-install.patch diff --git a/ports/urho3d/add_options.patch b/ports/urho3d/add_options.patch new file mode 100644 index 00000000000000..73a88cb4831ee7 --- /dev/null +++ b/ports/urho3d/add_options.patch @@ -0,0 +1,17 @@ +diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt +index 866fc22..ee02d2e 100644 +--- a/Source/CMakeLists.txt ++++ b/Source/CMakeLists.txt +@@ -147,8 +147,12 @@ endif () + + # In order to get clean module segregation, always exclude player/samples from AAR + if (NOT ANDROID) ++ if (URHO3D_BUILD_TOOLS) + add_subdirectory (Tools) ++ endif() ++ if (URHO3D_BUILD_SAMPLES) + add_subdirectory (Samples) ++ endif() + endif () + + if (URHO3D_EXTRAS) diff --git a/ports/urho3d/fix-install.patch b/ports/urho3d/fix-install.patch new file mode 100644 index 00000000000000..50934bfc4201f5 --- /dev/null +++ b/ports/urho3d/fix-install.patch @@ -0,0 +1,187 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8f54e9..1c23bbc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,7 +37,6 @@ set (PATH_SUFFIX Urho3D) + if (WIN32) + set (SCRIPT_EXT .bat) + if (CMAKE_HOST_WIN32) +- set (PATH_SUFFIX .) + if (URHO3D_64BIT AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + string (REPLACE " (x86)" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + endif () +@@ -45,7 +44,7 @@ if (WIN32) + else () + set (SCRIPT_EXT .sh) + endif () +-if (URHO3D_64BIT) ++if (0) + # Install to 'lib64' when one of these conditions is true + if ((MINGW AND CMAKE_CROSSCOMPILING) OR URHO3D_USE_LIB64_RPM OR (HAS_LIB64 AND NOT URHO3D_USE_LIB_DEB)) + set (LIB_SUFFIX 64) +@@ -59,7 +58,7 @@ set (DEST_LIBRARY_DIR lib${LIB_SUFFIX}/${PATH_SUFFIX}) + set (DEST_PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig) + # Install application launcher scripts + file (GLOB APP_SCRIPTS ${CMAKE_SOURCE_DIR}/bin/*${SCRIPT_EXT}) +-install (PROGRAMS ${APP_SCRIPTS} DESTINATION ${DEST_RUNTIME_DIR}) # DEST_RUNTIME_DIR variable is set by the set_output_directories() macro call in the UrhoCommon module ++install (PROGRAMS ${APP_SCRIPTS} DESTINATION ${DEST_SHARE_DIR}/script) # DEST_RUNTIME_DIR variable is set by the set_output_directories() macro call in the UrhoCommon module + # Install CMake modules and toolchains provided by and for Urho3D + install (DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/ DESTINATION ${DEST_SHARE_DIR}/cmake) # Note: the trailing slash is significant + # Install CMake build scripts and rakefile +diff --git a/Docs/CMakeLists.txt b/Docs/CMakeLists.txt +index 9993d07..9a58363 100644 +--- a/Docs/CMakeLists.txt ++++ b/Docs/CMakeLists.txt +@@ -99,7 +99,7 @@ if (DOXYGEN_FOUND) + execute_process (COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt.new) + file (GLOB_RECURSE API_PKG_FILES ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs/*.pkg) + add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox +- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -L ToDoxHook.lua -P -o ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt ++ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -L ToDoxHook.lua -P -o ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaScriptAPI.dox ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt + DEPENDS tolua++ ${API_PKG_FILES} ${CMAKE_CURRENT_BINARY_DIR}/generated/LuaPkgToDox.txt ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs/ToDoxHook.lua + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Source/Urho3D/LuaScript/pkgs + COMMENT "Dumping LuaScript API to LuaScriptAPI.dox") +diff --git a/Source/ThirdParty/LuaJIT/CMakeLists.txt b/Source/ThirdParty/LuaJIT/CMakeLists.txt +index f1ec925..c310fcc 100644 +--- a/Source/ThirdParty/LuaJIT/CMakeLists.txt ++++ b/Source/ThirdParty/LuaJIT/CMakeLists.txt +@@ -603,7 +603,7 @@ if (NOT CMAKE_PROJECT_NAME MATCHES ^Urho3D-ExternalProject-LuaJIT AND NOT IOS AN + + # Install dependency files required by luajit + if (DEST_RUNTIME_DIR) +- install (DIRECTORY ${LUAJIT_DEP_DIR} DESTINATION ${DEST_RUNTIME_DIR}) ++ install (DIRECTORY ${LUAJIT_DEP_DIR} DESTINATION share/Urho3D) + endif () + endif () + +diff --git a/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt b/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt +index 0cd69fc..e761ef6 100644 +--- a/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt ++++ b/Source/ThirdParty/toluapp/src/bin/CMakeLists.txt +@@ -52,7 +52,7 @@ if (URHO3D_UPDATE_SOURCE_TREE) + endif () + file (GLOB TOLUA lua/*.lua) + add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c +- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -o ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c -H ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.h -n tolua tolua_scons.pkg 2>${NULL_DEVICE} || ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/toluabind.c ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c ++ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -o ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c -H ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.h -n tolua tolua_scons.pkg 2>${NULL_DEVICE} || ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/toluabind.c ${CMAKE_CURRENT_BINARY_DIR}/generated/toluabind.c + ${UPDATE_COMMAND} + DEPENDS ${TOLUA} tolua_scons.pkg + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +diff --git a/Source/Tools/CMakeLists.txt b/Source/Tools/CMakeLists.txt +index 65b59d9..db8f5cd 100644 +--- a/Source/Tools/CMakeLists.txt ++++ b/Source/Tools/CMakeLists.txt +@@ -51,24 +51,24 @@ if (CMAKE_CROSSCOMPILING) + if (URHO3D_PACKAGING) + ExternalProject_Add (PackageTool + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Tools/PackageTool +- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${ALTERNATE_COMMAND}) + add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/PackageTool) + if (CMAKE_HOST_WIN32 AND NOT HAS_MKLINK) + add_dependencies (PackageTool Urho3D) # Ensure Urho3D headers are fresh when building PackageTool externally on Windows host system without MKLINK + endif () +- install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/PackageTool DESTINATION ${DEST_RUNTIME_DIR}/tool) ++ install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/PackageTool DESTINATION ${DEST_RUNTIME_DIR}) + endif () + if (URHO3D_GENERATEBINDINGS) + ExternalProject_Add (BindingGenerator + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Tools/BindingGenerator +- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D BAKED_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${ALTERNATE_COMMAND}) + add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator) + if (CMAKE_HOST_WIN32 AND NOT HAS_MKLINK) + add_dependencies (BindingGenerator Urho3D) + endif () +- install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator DESTINATION ${DEST_RUNTIME_DIR}/tool) ++ install (PROGRAMS ${CMAKE_BINARY_DIR}/bin/tool/BindingGenerator DESTINATION ${DEST_RUNTIME_DIR}) + endif () + endif () + +diff --git a/Source/Urho3D/CMakeLists.txt b/Source/Urho3D/CMakeLists.txt +index 7433020..8161011 100644 +--- a/Source/Urho3D/CMakeLists.txt ++++ b/Source/Urho3D/CMakeLists.txt +@@ -283,7 +283,7 @@ if (URHO3D_BINDINGS) + endif () + ExternalProject_Add (AutoBinder + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/Clang-Tools +- CMAKE_ARGS -D URHO3D_CLANG_TOOLS=AutoBinder -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool/clang -D DEST_INCLUDE_DIR=${DEST_INCLUDE_DIR} -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_CLANG_TOOLS=AutoBinder -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d/clang -D DEST_INCLUDE_DIR=${DEST_INCLUDE_DIR} -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${ALTERNATE_COMMAND}) + add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/clang/AutoBinder) + file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/generated/generated) +@@ -319,10 +319,10 @@ if (URHO3D_LUA) + set(CMAKE_DISABLE_SOURCE_CHANGES OFF) + ExternalProject_Add (tolua++ + SOURCE_DIR ${CMAKE_SOURCE_DIR}/Source/ThirdParty/toluapp/src/bin +- CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/bin/tool -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} ++ CMAKE_ARGS -D URHO3D_DEPLOYMENT_TARGET=generic -D DEST_RUNTIME_DIR=${CMAKE_BINARY_DIR}/tools/urho3d -D BAKED_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -D URHO3D_UPDATE_SOURCE_TREE=${URHO3D_UPDATE_SOURCE_TREE} -D CMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM} + ${TRAVIS_ANDROID_FIX} + ${ALTERNATE_COMMAND}) +- add_make_clean_files (${CMAKE_BINARY_DIR}/bin/tool/tolua++) ++ add_make_clean_files (${CMAKE_BINARY_DIR}/tools/urho3d/tolua++) + else () + # Otherwise, build it internally as per normal + add_subdirectory (../ThirdParty/toluapp/src/bin ../ThirdParty/toluapp/src/bin) +@@ -343,7 +343,7 @@ if (URHO3D_LUA) + list (APPEND LUA_GEN_CPP_FILES ${GEN_CPP_FILE}) + file (GLOB PKG_FILES LuaScript/pkgs/${DIR}/*.pkg) + add_custom_command (OUTPUT ${GEN_CPP_FILE} +- COMMAND ${CMAKE_BINARY_DIR}/bin/tool/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${GEN_CPP_FILE} ${NAME} ++ COMMAND ${CMAKE_BINARY_DIR}/tools/urho3d/tolua++ -E ${CMAKE_PROJECT_NAME} -L ToCppHook.lua -o ${GEN_CPP_FILE} ${NAME} + DEPENDS tolua++ ${API_PKG_FILE} ${PKG_FILES} LuaScript/pkgs/ToCppHook.lua + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/LuaScript/pkgs + COMMENT "Generating tolua++ API binding on the fly for ${DIR}") +diff --git a/cmake/Modules/UrhoCommon.cmake b/cmake/Modules/UrhoCommon.cmake +index cfac648..b196095 100644 +--- a/cmake/Modules/UrhoCommon.cmake ++++ b/cmake/Modules/UrhoCommon.cmake +@@ -1358,7 +1358,7 @@ macro (find_Urho3D_tool VAR NAME) + find_program (${VAR} ${NAME} HINTS ${ARG_HINTS} PATHS ${ARG_PATHS} PATH_SUFFIXES ${ARG_PATH_SUFFIXES} DOC ${ARG_DOC} NO_DEFAULT_PATH) + mark_as_advanced (${VAR}) # Hide it from cmake-gui in non-advanced mode + if (NOT ${VAR}) +- set (${VAR} ${CMAKE_BINARY_DIR}/bin/tool/${NAME}) ++ set (${VAR} ${CMAKE_BINARY_DIR}/tools/urho3d/${NAME}) + if (ARG_MSG_MODE AND NOT CMAKE_PROJECT_NAME STREQUAL Urho3D) + message (${ARG_MSG_MODE} + "Could not find ${VAR} tool in the Urho3D build tree or Urho3D SDK. Your project may not build successfully without this tool. " +@@ -1515,8 +1515,8 @@ macro (setup_executable) + if (ARG_TOOL) + list (APPEND TARGET_PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH YES) + if (NOT ARG_PRIVATE AND NOT DEST_RUNTIME_DIR MATCHES tool) +- set_output_directories (${CMAKE_BINARY_DIR}/bin/tool LOCAL RUNTIME PDB) +- set (RUNTIME_DIR ${CMAKE_BINARY_DIR}/bin/tool) ++ set_output_directories (${CMAKE_BINARY_DIR}/tools/urho3d LOCAL RUNTIME PDB) ++ set (RUNTIME_DIR ${CMAKE_BINARY_DIR}/tools/urho3d) + endif () + endif () + if (NOT ARG_NODEPS) +@@ -1570,7 +1570,6 @@ macro (setup_executable) + endif () + if (DIRECT3D_DLL AND NOT DIRECT3D_DLL_INSTALLED) + # Make a copy of the D3D DLL to the runtime directory in the installed location +- install (FILES ${DIRECT3D_DLL} DESTINATION ${DEST_RUNTIME_DIR}) + set (DIRECT3D_DLL_INSTALLED TRUE) + endif () + endif () +@@ -1692,7 +1691,7 @@ macro (setup_main_executable) + if (URHO3D_PACKAGING) + # Urho3D project builds the PackageTool as required; downstream project uses PackageTool found in the Urho3D build tree or Urho3D SDK + find_Urho3d_tool (PACKAGE_TOOL PackageTool +- HINTS ${CMAKE_BINARY_DIR}/bin/tool ${URHO3D_HOME}/bin/tool ++ HINTS ${CMAKE_BINARY_DIR}/tools/urho3d ${URHO3D_HOME}/bin/tool + DOC "Path to PackageTool" MSG_MODE WARNING) + if (CMAKE_PROJECT_NAME STREQUAL Urho3D) + set (PACKAGING_DEP DEPENDS PackageTool) +@@ -1741,7 +1740,7 @@ macro (setup_main_executable) + foreach (DIR ${RESOURCE_DIRS}) + list (FIND INSTALLED_RESOURCE_DIRS ${DIR} FOUND_INDEX) + if (FOUND_INDEX EQUAL -1) +- install (DIRECTORY ${DIR} DESTINATION ${DEST_SHARE_DIR}/resources) ++ install (DIRECTORY ${DIR} DESTINATION tools/urho3d) + list (APPEND INSTALLED_RESOURCE_DIRS ${DIR}) + endif () + # This cache variable is used to keep track of whether a resource directory has been instructed to be installed by CMake or not diff --git a/ports/urho3d/portfile.cmake b/ports/urho3d/portfile.cmake index 9e2246c7ee0575..dafdbe1afb8d66 100644 --- a/ports/urho3d/portfile.cmake +++ b/ports/urho3d/portfile.cmake @@ -9,6 +9,8 @@ vcpkg_from_github( macosx.patch shared_libs.patch externalproject.patch + add_options.patch + fix-install.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -17,46 +19,100 @@ else() set(URHO3D_LIB_TYPE "SHARED") endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools URHO3D_BUILD_TOOLS + examples URHO3D_BUILD_SAMPLES +) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS + ${FEATURE_OPTIONS} -DURHO3D_LIB_TYPE=${URHO3D_LIB_TYPE} -DURHO3D_C++11=ON -DURHO3D_PCH=OFF ) vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/Urho3D/CMake/Modules) +vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/Urho3D/CMake/Modules") vcpkg_cmake_config_fixup(CONFIG_PATH share/Urho3D/CMake/Modules) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/CMake/Modules) +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/CMake/Modules") vcpkg_cmake_config_fixup(CONFIG_PATH share/CMake/Modules) endif() -vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +# Handle tools +if ("tools" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID) + vcpkg_copy_tools(TOOL_NAMES AssetImporter OgreImporter PackageTool RampGenerator ScriptCompiler SpritePacker + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/urho3d" + AUTO_CLEAN + ) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/tool" "${CURRENT_PACKAGES_DIR}/debug/bin/tool") + + vcpkg_copy_tools(TOOL_NAMES Urho3DPlayer AUTO_CLEAN) + + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/Urho3DPlayer_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}") +endif() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +# Handle examples +if ("examples" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_ANDROID) + file(GLOB URHO3D_BINARIES "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + foreach(URHO3D_BINARY ${URHO3D_BINARIES}) + get_filename_component(BINARY_NAME ${URHO3D_BINARY} NAME_WE) + if (BINARY_NAME MATCHES "[0-9][0-9]\_.+") + list(APPEND URHO3D_TOOLS ${BINARY_NAME}) + endif() + endforeach() + vcpkg_copy_tools(TOOL_NAMES ${URHO3D_TOOLS} AUTO_CLEAN) + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + foreach(URHO3D_TOOL IN_LIST ${URHO3D_TOOLS}) + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${URHO3D_TOOL}_d${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + endforeach() + endif() +endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/Urho3D/Resources) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/Urho3D/Resources/Autoload ${CURRENT_PACKAGES_DIR}/tools/${PORT}/Autoload) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/Urho3D/Resources/CoreData ${CURRENT_PACKAGES_DIR}/tools/${PORT}/CoreData) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/Urho3D/Resources/Data ${CURRENT_PACKAGES_DIR}/tools/${PORT}/Data) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Urho3D/Resources) +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/luajit${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(APPEND LUA_EXES "luajit") +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/lua${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(APPEND LUA_EXES "lua") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/Resources) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/Resources/Autoload ${CURRENT_PACKAGES_DIR}/tools/${PORT}/Autoload) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/Resources/CoreData ${CURRENT_PACKAGES_DIR}/tools/${PORT}/CoreData) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/Resources/Data ${CURRENT_PACKAGES_DIR}/tools/${PORT}/Data) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Resources) +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/luac${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(APPEND LUA_EXES "luac") +endif() +vcpkg_copy_tools(TOOL_NAMES ${LUA_EXES} AUTO_CLEAN) + +# Cleanup +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/Urho3D/LuaScript/pkgs) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/Urho3D/ThirdParty/LuaJIT/jit) +# Fix includes +list(APPEND SDL_RELATED_HEADERS + "${CURRENT_PACKAGES_DIR}/include/Urho3D/Input/InputConstants.h" + "${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/NamedPipe.h" + "${CURRENT_PACKAGES_DIR}/include/Urho3D/IO/RWOpsWrapper.h" +) +foreach (SDL_RELATED_HEADER ${SDL_RELATED_HEADERS}) + vcpkg_replace_string("${SDL_RELATED_HEADER}" + "#include Date: Fri, 23 Jul 2021 00:52:56 +0300 Subject: [PATCH 0159/1858] [libavif] Update 0.9.1 to 0.9.2 (#18973) * [libavif] Update 0.9.1 -> 0.9.2 * [libavif] vcpkg x-add-version --all --- ports/libavif/always-install-configs.patch | 26 ---------------------- ports/libavif/fix-assigning-size_t.patch | 13 ----------- ports/libavif/portfile.cmake | 6 ++--- ports/libavif/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libavif.json | 5 +++++ 6 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 ports/libavif/always-install-configs.patch delete mode 100644 ports/libavif/fix-assigning-size_t.patch diff --git a/ports/libavif/always-install-configs.patch b/ports/libavif/always-install-configs.patch deleted file mode 100644 index 98291242199294..00000000000000 --- a/ports/libavif/always-install-configs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7d7fae33029d359423b26b60ea12174028ebcf3a Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshev -Date: Wed, 2 Jun 2021 21:01:59 +0300 -Subject: [PATCH] Enable CMake configs in VCPKG mode - ---- - CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d773025..dd80d22 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -564,7 +564,8 @@ if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ) - -- if (BUILD_SHARED_LIBS) -+ # Enable CMake configs in VCPKG mode -+ if (BUILD_SHARED_LIBS OR VCPKG_TARGET_TRIPLET) - install(EXPORT ${PROJECT_NAME}-config - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) - --- -2.22.0.windows.1 - diff --git a/ports/libavif/fix-assigning-size_t.patch b/ports/libavif/fix-assigning-size_t.patch deleted file mode 100644 index b555decc80e7f6..00000000000000 --- a/ports/libavif/fix-assigning-size_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/read.c b/src/read.c -index bea0150..1132610 100644 ---- a/src/read.c -+++ b/src/read.c -@@ -872,7 +872,7 @@ static avifResult avifDecoderItemRead(avifDecoderItem * item, avifIO * io, avifR - return AVIF_RESULT_BMFF_PARSE_FAILED; - } - offsetBuffer.data = idatBuffer->data + extent->offset; -- offsetBuffer.size = idatBuffer->size - extent->offset; -+ offsetBuffer.size = (size_t)(idatBuffer->size - extent->offset); - } else { - // construction_method: file(0) - diff --git a/ports/libavif/portfile.cmake b/ports/libavif/portfile.cmake index 6268cd7233fbd4..2d0a37bb77bf1f 100644 --- a/ports/libavif/portfile.cmake +++ b/ports/libavif/portfile.cmake @@ -4,13 +4,11 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AOMediaCodec/libavif - REF v0.9.1 - SHA512 15fa857ee40aeae2ee077d244c6e11a34193f2348e922b5dfa8579a91fa6ceff05c7146e85f9222ebaa6ef2d76e876ea050e8056990cad80850fb4d9581de9a5 + REF v0.9.2 + SHA512 04400ae76214d2f0361a14897d6ee97be675375865bb96c8d237e9a4a1152ac1a966db903c11df82da71b0bc68599a5857e038cc90d63c5d3bc77b13169a3e75 HEAD_REF master PATCHES disable-source-utf8.patch - fix-assigning-size_t.patch - always-install-configs.patch ) vcpkg_cmake_configure( diff --git a/ports/libavif/vcpkg.json b/ports/libavif/vcpkg.json index 6703aad3243d78..b6e3bce5222d9b 100644 --- a/ports/libavif/vcpkg.json +++ b/ports/libavif/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libavif", - "version-semver": "0.9.1", + "version-semver": "0.9.2", "description": "Library for encoding and decoding AVIF files", "homepage": "https://github.com/AOMediaCodec/libavif", "supports": "!uwp & !arm", diff --git a/versions/baseline.json b/versions/baseline.json index a20e9f409037e5..d9bdde72e19072 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3045,7 +3045,7 @@ "port-version": 1 }, "libavif": { - "baseline": "0.9.1", + "baseline": "0.9.2", "port-version": 0 }, "libb2": { diff --git a/versions/l-/libavif.json b/versions/l-/libavif.json index 8673befd228929..a9442d829b47c6 100644 --- a/versions/l-/libavif.json +++ b/versions/l-/libavif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e78225af6d76356499d029ed6cb0d55fa20629a", + "version-semver": "0.9.2", + "port-version": 0 + }, { "git-tree": "b2592851defcaf39a20d88d4edb670188254bade", "version-semver": "0.9.1", From 912d338335918fe459d224cd3563ed0131e9042e Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Fri, 23 Jul 2021 00:53:11 +0300 Subject: [PATCH 0160/1858] [cpp-httplib] Update library to 0.9.1 (#18972) * Bump cpp-httplib version to 0.9.1 * Run x-add-version --- ports/cpp-httplib/portfile.cmake | 4 ++-- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index f2bdee7242fadb..8448ef853eb446 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF v0.8.9 - SHA512 6a3b756235f8a18ef740d0d56b3b8c13959276886e4032a7100656170b2efbdb7897a55a8bce42d38ef62c9a6d8462a9ccffc848320df3abfff24e86d4e7909b + REF v0.9.1 + SHA512 164812075ad516a0a0ad587d7a479e0272fc5eecdbbf4522532dc3039a5282cc120b5b7d75eea3764d21acf203dc1bfccfb9e4f1dfe2515ca4ced546735c28fc HEAD_REF master ) diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index f04a1bf36f068b..6e83cc3f0f42ac 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.8.9", + "version": "0.9.1", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib" } diff --git a/versions/baseline.json b/versions/baseline.json index d9bdde72e19072..56d241c9666c55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1401,7 +1401,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.8.9", + "baseline": "0.9.1", "port-version": 0 }, "cpp-netlib": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index 1691ecb878d909..629750a5af0432 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9554bdd56e3c787d40e20b63582d3b5efbaf4f2f", + "version": "0.9.1", + "port-version": 0 + }, { "git-tree": "c89a8ff559756338dc330c1845a0b6b3ccd3a9e6", "version": "0.8.9", From 5e2b58043512fc13301bad61ab23ef58ab7b1e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 22 Jul 2021 23:53:23 +0200 Subject: [PATCH 0161/1858] [robin-hood-hashing] Update to 3.11.3 (#18917) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [robin-hood-hashing] Update to 3.11.3 * [robin-hood-hashing] Update version files Co-authored-by: Rémy Tassoux --- ports/robin-hood-hashing/portfile.cmake | 4 ++-- ports/robin-hood-hashing/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/robin-hood-hashing.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/robin-hood-hashing/portfile.cmake b/ports/robin-hood-hashing/portfile.cmake index e95e3fa0fcdaa7..c6dbf8fde0f109 100644 --- a/ports/robin-hood-hashing/portfile.cmake +++ b/ports/robin-hood-hashing/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinus/robin-hood-hashing - REF 3.11.2 - SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795 + REF 3.11.3 + SHA512 0a4bc04a7b474b80dc156492a12d29046a566272c7b5f2fbcbd27c68ec62fa5db753afe5eac521cd4bd6d6e5ce1b1dfd590ae0b64003a70e102c83a89045b1e6 HEAD_REF master ) diff --git a/ports/robin-hood-hashing/vcpkg.json b/ports/robin-hood-hashing/vcpkg.json index cb8079415eccf7..145bd2ba4c9db7 100644 --- a/ports/robin-hood-hashing/vcpkg.json +++ b/ports/robin-hood-hashing/vcpkg.json @@ -1,6 +1,6 @@ { "name": "robin-hood-hashing", - "version": "3.11.2", + "version": "3.11.3", "description": "Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20", "homepage": "https://github.com/martinus/robin-hood-hashing", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 56d241c9666c55..ebd7262c19e336 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5569,7 +5569,7 @@ "port-version": 0 }, "robin-hood-hashing": { - "baseline": "3.11.2", + "baseline": "3.11.3", "port-version": 0 }, "robin-map": { diff --git a/versions/r-/robin-hood-hashing.json b/versions/r-/robin-hood-hashing.json index be98347e6cf107..85b708e7733f30 100644 --- a/versions/r-/robin-hood-hashing.json +++ b/versions/r-/robin-hood-hashing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "312efe5364281f04a0401cf9e7752041972f6e10", + "version": "3.11.3", + "port-version": 0 + }, { "git-tree": "16f3329478557c2ae15d37388108000c2d4c002b", "version": "3.11.2", From 3cbf80ec86d61c76defc31ed30468d7202610265 Mon Sep 17 00:00:00 2001 From: Liu Chenxin Date: Fri, 23 Jul 2021 05:54:47 +0800 Subject: [PATCH 0162/1858] [nana]add MinGW subsystem support for nana (#18911) * add MinGW subsystem support for nana * update port version * [nana] update versions * format-manifest Co-authored-by: Billy Robert ONeal III Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/nana/CONTROL | 6 ------ ports/nana/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 2 +- versions/n-/nana.json | 5 +++++ 4 files changed, 25 insertions(+), 7 deletions(-) delete mode 100644 ports/nana/CONTROL create mode 100644 ports/nana/vcpkg.json diff --git a/ports/nana/CONTROL b/ports/nana/CONTROL deleted file mode 100644 index 608fb8747eeb8a..00000000000000 --- a/ports/nana/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: nana -Version: 1.7.4 -Port-Version: 1 -Homepage: https://github.com/cnjinhao/nana -Description: Cross-platform library for GUI programming in modern C++ style. -Build-Depends: libpng, libjpeg-turbo, freetype (!uwp&&!windows), fontconfig (!uwp&&!windows) diff --git a/ports/nana/vcpkg.json b/ports/nana/vcpkg.json new file mode 100644 index 00000000000000..c82984e8756654 --- /dev/null +++ b/ports/nana/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "nana", + "version-string": "1.7.4", + "port-version": 2, + "description": "Cross-platform library for GUI programming in modern C++ style.", + "homepage": "https://github.com/cnjinhao/nana", + "dependencies": [ + { + "name": "fontconfig", + "platform": "!uwp & !windows & !mingw" + }, + { + "name": "freetype", + "platform": "!uwp & !windows & !mingw" + }, + "libjpeg-turbo", + "libpng" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ebd7262c19e336..8fea072f3c73e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4262,7 +4262,7 @@ }, "nana": { "baseline": "1.7.4", - "port-version": 1 + "port-version": 2 }, "nano-signal-slot": { "baseline": "2.0.1", diff --git a/versions/n-/nana.json b/versions/n-/nana.json index e82764d4887068..0d3a44b77632fa 100644 --- a/versions/n-/nana.json +++ b/versions/n-/nana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51aa210032909eec832d81aaf347917e2fe1a70a", + "version-string": "1.7.4", + "port-version": 2 + }, { "git-tree": "b2e006f8f4b726f268b855f855ed896c2c99ba24", "version-string": "1.7.4", From 330c260f38d2522b38182d2e1dd0027bbea0f40a Mon Sep 17 00:00:00 2001 From: Akash Date: Thu, 22 Jul 2021 17:00:49 -0500 Subject: [PATCH 0163/1858] [ompl] Fix linking using ${OMPL_LIBRARIES} (#18908) * Fix _IMPORT_PREFIX * Export cmake targets file * Fix config * Make separate omplapp port * Run x-add-version for omplapp * Fix versions * Fix omplapp static builds * Run x-add-version * Update ports/omplapp/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/omplapp/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Put files in quotes * Run x-add-version Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/ccd/CONTROL | 1 + ports/ccd/fix-static.patch | 13 ++++ ports/ccd/portfile.cmake | 8 ++- ports/ompl/0001_Export_targets.patch | 27 ++++++++ ports/ompl/0002_Fix_config.patch | 39 ++++++++++++ ports/ompl/CONTROL | 6 +- ports/ompl/portfile.cmake | 36 +++-------- ports/omplapp/fix_boost_static_link.patch | 17 +++++ ports/{ompl => omplapp}/fix_dependency.patch | 0 ports/omplapp/portfile.cmake | 67 ++++++++++++++++++++ ports/omplapp/vcpkg.json | 11 ++++ versions/baseline.json | 6 +- versions/c-/ccd.json | 5 ++ versions/o-/ompl.json | 5 ++ versions/o-/omplapp.json | 9 +++ 15 files changed, 215 insertions(+), 35 deletions(-) create mode 100644 ports/ccd/fix-static.patch create mode 100644 ports/ompl/0001_Export_targets.patch create mode 100644 ports/ompl/0002_Fix_config.patch create mode 100644 ports/omplapp/fix_boost_static_link.patch rename ports/{ompl => omplapp}/fix_dependency.patch (100%) create mode 100644 ports/omplapp/portfile.cmake create mode 100644 ports/omplapp/vcpkg.json create mode 100644 versions/o-/omplapp.json diff --git a/ports/ccd/CONTROL b/ports/ccd/CONTROL index 5a5f59e28d82d3..6a7d5eeb099f06 100644 --- a/ports/ccd/CONTROL +++ b/ports/ccd/CONTROL @@ -1,4 +1,5 @@ Source: ccd Version: 2.1-4 +Port-Version: 1 Homepage: https://github.com/danfis/libccd Description: Library for collision detection between two convex shapes diff --git a/ports/ccd/fix-static.patch b/ports/ccd/fix-static.patch new file mode 100644 index 00000000000000..cfb4d388cfd4b6 --- /dev/null +++ b/ports/ccd/fix-static.patch @@ -0,0 +1,13 @@ +diff --git a/src/ccd/ccd_export.h b/src/ccd/ccd_export.h +index e898d41..c6aa5fb 100644 +--- a/src/ccd/ccd_export.h ++++ b/src/ccd/ccd_export.h +@@ -1,7 +1,7 @@ + #ifndef CCD_EXPORT_H + #define CCD_EXPORT_H + +-#ifdef CCD_STATIC_DEFINE ++#if 1 + # define CCD_EXPORT + #else + # ifdef _MSC_VER diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake index 29f0f9efa5e059..a465560caca020 100644 --- a/ports/ccd/portfile.cmake +++ b/ports/ccd/portfile.cmake @@ -1,3 +1,7 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_PATCH fix-static.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO danfis/libccd @@ -5,7 +9,9 @@ vcpkg_from_github( SHA512 ff037d9c4df50f09600cf9b3514b259b2850ff43f74817853f5665d22812891168f70bd3cc3969b2c9e3c706f6254991a65421476349607fbd04d894b217456d HEAD_REF master # Backport https://github.com/danfis/libccd/pull/70 to support Emscripten - PATCHES "support-emscripten.patch" + PATCHES + "support-emscripten.patch" + ${STATIC_PATCH} ) vcpkg_configure_cmake( diff --git a/ports/ompl/0001_Export_targets.patch b/ports/ompl/0001_Export_targets.patch new file mode 100644 index 00000000000000..6d599aec32ea0f --- /dev/null +++ b/ports/ompl/0001_Export_targets.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9bb05f..31fab8c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,6 +215,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omplConfig.cmake + ${CMAKE_CURRENT_BINARY_DIR}/omplConfigVersion.cmake + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ompl/cmake + COMPONENT ompl) ++install(EXPORT ompl ++ DESTINATION "share/ompl" ++ FILE ompl-targets.cmake ++) + + # script to install ompl on Ubuntu + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/install-ompl-ubuntu.sh.in" +diff --git a/src/ompl/CMakeLists.txt b/src/ompl/CMakeLists.txt +index 9ea130e..6dda4df 100644 +--- a/src/ompl/CMakeLists.txt ++++ b/src/ompl/CMakeLists.txt +@@ -83,6 +83,7 @@ endif (MSVC) + + # install the library + install(TARGETS ompl ++ EXPORT ompl + DESTINATION ${CMAKE_INSTALL_LIBDIR} + COMPONENT ompl) + if (NOT MSVC) diff --git a/ports/ompl/0002_Fix_config.patch b/ports/ompl/0002_Fix_config.patch new file mode 100644 index 00000000000000..974b1b6ad73de5 --- /dev/null +++ b/ports/ompl/0002_Fix_config.patch @@ -0,0 +1,39 @@ +diff --git a/omplConfig.cmake.in b/omplConfig.cmake.in +index 465de25..ad373fa 100644 +--- a/omplConfig.cmake.in ++++ b/omplConfig.cmake.in +@@ -18,8 +18,10 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@) + set(OMPL_MINOR_VERSION @PROJECT_VERSION_MINOR@) + set(OMPL_PATCH_VERSION @PROJECT_VERSION_PATCH@) + ++find_dependency(Boost 1.58 COMPONENTS serialization filesystem system program_options) ++find_dependency(Eigen3) + set_and_check(OMPL_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") +-set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};@Boost_INCLUDE_DIR@;@EIGEN3_INCLUDE_DIR@") ++set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIR};${Boost_INCLUDE_DIR};${EIGEN3_INCLUDE_DIR}") + foreach(_dir @FLANN_INCLUDE_DIRS@;@ODE_INCLUDE_DIRS@;@SPOT_INCLUDE_DIRS@;@TRIANGLE_INCLUDE_DIR@;@FCL_INCLUDE_DIRS@;@PQP_INCLUDE_DIR@;@ASSIMP_INCLUDE_DIRS@;@OPENGL_INCLUDE_DIR@) + if(_dir) + list(APPEND OMPL_INCLUDE_DIRS "${_dir}") +@@ -29,7 +31,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS) + set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIRS}" CACHE STRING "Include path for OMPL and its dependencies") + + set_and_check(OMPL_LIBRARY_DIR @PACKAGE_LIB_INSTALL_DIR@) +-set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};@Boost_LIBRARY_DIRS@") ++set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIR};${Boost_LIBRARY_DIRS}") + foreach(_dir @FLANN_LIBRARY_DIRS@;@ODE_LIBRARY_DIRS@;@SPOT_LIBRARY_DIRS@;@FCL_LIBRARY_DIRS@;@ASSIMP_LIBRARY_DIRS@) + if(_dir) + list(APPEND OMPL_LIBRARY_DIRS "${_dir}") +@@ -40,7 +42,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL + + find_library(OMPL_LIBRARIES NAMES ompl.${OMPL_VERSION} ompl + PATHS ${OMPL_LIBRARY_DIR} NO_DEFAULT_PATH) +-foreach(_lib @Boost_SERIALIZATION_LIBRARY@;@Boost_FILESYSTEM_LIBRARY@;@Boost_SYSTEM_LIBRARY@;@ODE_LIBRARIES@;@SPOT_LIBRARIES@) ++foreach(_lib ${Boost_SERIALIZATION_LIBRARY};${Boost_FILESYSTEM_LIBRARY};${Boost_SYSTEM_LIBRARY};@ODE_LIBRARIES@;@SPOT_LIBRARIES@) + if(_lib) + list(APPEND OMPL_LIBRARIES "${_lib}") + endif() +@@ -61,3 +63,4 @@ endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(ompl DEFAULT_MSG OMPL_INCLUDE_DIRS OMPL_LIBRARY_DIRS OMPL_LIBRARIES) ++include(${CMAKE_CURRENT_LIST_DIR}/ompl-targets.cmake) diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL index e608b16d820bab..259006c2c4a5ad 100644 --- a/ports/ompl/CONTROL +++ b/ports/ompl/CONTROL @@ -1,10 +1,6 @@ Source: ompl Version: 1.5.1 -Port-Version: 0 +Port-Version: 1 Homepage: https://ompl.kavrakilab.org/ Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms Build-Depends: boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3 - -Feature: app -Description: Add support for reading meshes and performing collision checking -Build-Depends: assimp, fcl diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index e15cb560d6c08f..ab02eba31a185d 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -2,28 +2,19 @@ vcpkg_buildpath_length_warning(37) set(OMPL_VERSION 1.5.1) -set(FEATURE_PATCHES) - -if("app" IN_LIST FEATURES) - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ompl/omplapp/releases/download/1.5.1/omplapp-1.5.1-Source.tar.gz" - FILENAME "omplapp-${OMPL_VERSION}.tar.gz" - SHA512 83b1b09d6be776f7e15a748402f0c2f072459921de61a92731daf5171bd1f91a829fbeb6e10a489b92fba0297f6272e7bb6b8f07830c387bb29ccdbc7b3731f3 - ) - list(APPEND FEATURE_PATCHES fix_dependency.patch) -else() - vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ompl/ompl/archive/1.5.1.tar.gz" - FILENAME "ompl-${OMPL_VERSION}.tar.gz" - SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570 - ) -endif() +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/ompl/ompl/archive/1.5.1.tar.gz" + FILENAME "ompl-${OMPL_VERSION}.tar.gz" + SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570 +) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${OMPL_VERSION} - PATCHES ${FEATURE_PATCHES} + PATCHES + 0001_Export_targets.patch + 0002_Fix_config.patch ) # Based on selected features different files get downloaded, so use the following command instead of patch. @@ -58,17 +49,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/ompl/ompl.conf ${CURRENT_PACKAGES_DIR}/share/ompl/plannerarena ) -if ("app" IN_LIST FEATURES) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/ompl) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/ompl_benchmark.exe ${CURRENT_PACKAGES_DIR}/tools/ompl/ompl_benchmark.exe) - file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/include/omplapp/CMakeFiles - ${CURRENT_PACKAGES_DIR}/share/ompl/resources - ${CURRENT_PACKAGES_DIR}/share/ompl/webapp - ) -endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/omplapp/fix_boost_static_link.patch b/ports/omplapp/fix_boost_static_link.patch new file mode 100644 index 00000000000000..fd74fb8a7b7cd3 --- /dev/null +++ b/ports/omplapp/fix_boost_static_link.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f5c3c88..3a4a7d4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,10 +36,10 @@ set(OMPL_DEMO_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/ompl/demos" + set(OMPL_CMAKE_UTIL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ompl/CMakeModules" + CACHE FILEPATH "Path to directory with auxiliary CMake scripts for OMPL") + +-if(MSVC) ++if(false) + add_definitions(-DBOOST_ALL_NO_LIB) + add_definitions(-DBOOST_PROGRAM_OPTIONS_DYN_LINK) +-endif(MSVC) ++endif(false) + # Ensure dynamic linking with boost unit_test_framework + add_definitions(-DBOOST_TEST_DYN_LINK) + # Avoid valgrind error due to overflow error, cf. https://bitbucket.org/ompl/ompl/issues/543 diff --git a/ports/ompl/fix_dependency.patch b/ports/omplapp/fix_dependency.patch similarity index 100% rename from ports/ompl/fix_dependency.patch rename to ports/omplapp/fix_dependency.patch diff --git a/ports/omplapp/portfile.cmake b/ports/omplapp/portfile.cmake new file mode 100644 index 00000000000000..02da44945fa692 --- /dev/null +++ b/ports/omplapp/portfile.cmake @@ -0,0 +1,67 @@ +vcpkg_buildpath_length_warning(37) + +set(OMPL_VERSION 1.5.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/ompl/omplapp/releases/download/1.5.1/omplapp-1.5.1-Source.tar.gz" + FILENAME "omplapp-${OMPL_VERSION}.tar.gz" + SHA512 83b1b09d6be776f7e15a748402f0c2f072459921de61a92731daf5171bd1f91a829fbeb6e10a489b92fba0297f6272e7bb6b8f07830c387bb29ccdbc7b3731f3 +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(STATIC_PATCH fix_boost_static_link.patch) +endif() + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${OMPL_VERSION} + PATCHES + fix_dependency.patch + ${STATIC_PATCH} +) + +# Based on selected features different files get downloaded, so use the following command instead of patch. +file(READ ${SOURCE_PATH}/CMakeLists.txt _contents) +string(REPLACE "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)" _contents "${_contents}") +string(REPLACE "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)" _contents "${_contents}") +file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${_contents}") + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DOMPL_VERSIONED_INSTALL=OFF + -DOMPL_REGISTRATION=OFF + -DOMPL_BUILD_DEMOS=OFF + -DOMPL_BUILD_TESTS=OFF + -DOMPL_BUILD_PYBINDINGS=OFF + -DOMPL_BUILD_PYTESTS=OFF +) + +vcpkg_install_cmake() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/ompl/cmake) + +# Remove debug distribution and other, move ompl_benchmark to tools/ dir +vcpkg_copy_tools(TOOL_NAMES ompl_benchmark AUTO_CLEAN) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/include/ompl" + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/include/omplapp/CMakeFiles" + "${CURRENT_PACKAGES_DIR}/lib/ompl.lib" + "${CURRENT_PACKAGES_DIR}/share/ompl" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/ompl.lib" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/omplapp/vcpkg.json b/ports/omplapp/vcpkg.json new file mode 100644 index 00000000000000..07ac2ba649acdc --- /dev/null +++ b/ports/omplapp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "omplapp", + "version-string": "1.5.1", + "description": "Use OMPL for reading meshes and performing collision checking", + "homepage": "https://ompl.kavrakilab.org/", + "dependencies": [ + "assimp", + "fcl", + "ompl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8fea072f3c73e5..39d17150a884b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1158,7 +1158,7 @@ }, "ccd": { "baseline": "2.1-4", - "port-version": 0 + "port-version": 1 }, "ccfits": { "baseline": "2.5", @@ -4513,6 +4513,10 @@ "port-version": 2 }, "ompl": { + "baseline": "1.5.1", + "port-version": 1 + }, + "omplapp": { "baseline": "1.5.1", "port-version": 0 }, diff --git a/versions/c-/ccd.json b/versions/c-/ccd.json index da47a0a54e4562..51d2ec8dd1995d 100644 --- a/versions/c-/ccd.json +++ b/versions/c-/ccd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a720cc123c190c6b68e57e356c4937685eeb2faa", + "version-string": "2.1-4", + "port-version": 1 + }, { "git-tree": "c5315a631ffcea9c2a158578e73c53d8455808de", "version-string": "2.1-4", diff --git a/versions/o-/ompl.json b/versions/o-/ompl.json index 485887ffe29d53..801fcdea68f274 100644 --- a/versions/o-/ompl.json +++ b/versions/o-/ompl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3812117c1ed1d4080155284f12908236dd797f5", + "version-string": "1.5.1", + "port-version": 1 + }, { "git-tree": "2dc123683ef75002bd7252b252cc220a7a643066", "version-string": "1.5.1", diff --git a/versions/o-/omplapp.json b/versions/o-/omplapp.json new file mode 100644 index 00000000000000..4b8de5c30ea046 --- /dev/null +++ b/versions/o-/omplapp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "590eb9956381e7ef47b780fbd9aee2c6e8da323c", + "version-string": "1.5.1", + "port-version": 0 + } + ] +} From 649da0d66d8ad00524bdd9f47e022e07dbad6def Mon Sep 17 00:00:00 2001 From: seladb Date: Thu, 22 Jul 2021 15:11:30 -0700 Subject: [PATCH 0164/1858] [pcapplusplus] New port (#18899) * Add PcapPlusPlus port * Fix non-windows installation * Run json formatting and x-add-version * Run x-add-version * Fix sha * Apply suggestions to `vcpkg.json` from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix versions * Fix sha for pcapplusplus.json * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Revert back from 'version' to 'version-string' * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix SHA in pcapplusplus.json * Remove the patches and copy the lib files from the `Dist` folder * Fix sha Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/pcapplusplus/portfile.cmake | 103 ++++++++++++++++++++++++++++++ ports/pcapplusplus/vcpkg.json | 20 ++++++ versions/baseline.json | 4 ++ versions/p-/pcapplusplus.json | 9 +++ 4 files changed, 136 insertions(+) create mode 100644 ports/pcapplusplus/portfile.cmake create mode 100644 ports/pcapplusplus/vcpkg.json create mode 100644 versions/p-/pcapplusplus.json diff --git a/ports/pcapplusplus/portfile.cmake b/ports/pcapplusplus/portfile.cmake new file mode 100644 index 00000000000000..2ec3eea70d34f3 --- /dev/null +++ b/ports/pcapplusplus/portfile.cmake @@ -0,0 +1,103 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO seladb/PcapPlusPlus + REF v21.05 + SHA512 35227707a48f0e41469247e0993c4aabef7f168a285354e19386b554e0e3d51dc6bf8b128658e16d50e0b6e6e0a029322dee1b4b241e84b8603e2cf73c7f3532 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_PLATFORM_TOOLSET STREQUAL "v140") + set(VS_VERSION "vs2015") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v141") + set(VS_VERSION "vs2017") + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v142") + set(VS_VERSION "vs2019") + else() + message(FATAL_ERROR "Unsupported visual studio version") + endif() + + vcpkg_execute_required_process( + COMMAND configure-windows-visual-studio.bat -v ${VS_VERSION} -w . -p . + WORKING_DIRECTORY ${SOURCE_PATH} + ) + + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "mk/${VS_VERSION}/Common++.vcxproj" + PLATFORM ${TRIPLET_SYSTEM_ARCH} + INCLUDES_SUBPATH Dist/header + ALLOW_ROOT_INCLUDES + USE_VCPKG_INTEGRATION + ) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "mk/${VS_VERSION}/Packet++.vcxproj" + PLATFORM ${TRIPLET_SYSTEM_ARCH} + INCLUDES_SUBPATH Dist/header + ALLOW_ROOT_INCLUDES + USE_VCPKG_INTEGRATION + ) + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}" + PROJECT_SUBPATH "mk/${VS_VERSION}/Pcap++.vcxproj" + PLATFORM ${TRIPLET_SYSTEM_ARCH} + USE_VCPKG_INTEGRATION + INCLUDES_SUBPATH Dist/header + ALLOW_ROOT_INCLUDES + LICENSE_SUBPATH LICENSE + ) + + # Lib + file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Release/*") + file( + INSTALL ${LIB_FILES_RELEASE} + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + ) + file(GLOB LIB_FILES_RELEASE "${SOURCE_PATH}/Dist/**/Debug/*") + file( + INSTALL ${LIB_FILES_RELEASE} + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + ) + + file( + REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/lib/LightPcapNg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/LightPcapNg.lib" + ) +else() + if(VCPKG_TARGET_IS_LINUX) + set(CONFIG_CMD "./configure-linux.sh") + elseif(VCPKG_TARGET_IS_OSX) + set(CONFIG_CMD "./configure-mac_os_x.sh") + else() + message(FATAL_ERROR "Unsupported platform") + endif() + + vcpkg_execute_required_process( + COMMAND ${SOURCE_PATH}/${CONFIG_CMD} --libpcap-include-dir ${CURRENT_INSTALLED_DIR}/include + WORKING_DIRECTORY ${SOURCE_PATH} + ) + + vcpkg_execute_build_process( + COMMAND make libs + WORKING_DIRECTORY ${SOURCE_PATH} + ) + + # Lib + file(GLOB LIB_FILES "${SOURCE_PATH}/Dist/*.a") + file( + INSTALL ${LIB_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/lib + ) + + # Include + file(GLOB HEADER_FILES "${SOURCE_PATH}/Dist/header/*.h") + file( + INSTALL ${HEADER_FILES} + DESTINATION ${CURRENT_PACKAGES_DIR}/include + ) + + # Copyright + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +endif() diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json new file mode 100644 index 00000000000000..40a35228f2593f --- /dev/null +++ b/ports/pcapplusplus/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "pcapplusplus", + "version-string": "21.05", + "description": "PcapPlusPlus is a multiplatform C++ library for capturing, parsing and crafting of network packets", + "homepage": "https://github.com/seladb/PcapPlusPlus", + "dependencies": [ + { + "name": "libpcap", + "platform": "!windows" + }, + { + "name": "pthreads", + "platform": "windows" + }, + { + "name": "winpcap", + "platform": "windows" + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 39d17150a884b4..dc4b1ac206c286 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4800,6 +4800,10 @@ "baseline": "0.5.14", "port-version": 4 }, + "pcapplusplus": { + "baseline": "21.05", + "port-version": 0 + }, "pcg": { "baseline": "2021-04-06", "port-version": 0 diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json new file mode 100644 index 00000000000000..35f3a210c0e090 --- /dev/null +++ b/versions/p-/pcapplusplus.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "946d7783c459b46253318626bee9040e4e07bc56", + "version-string": "21.05", + "port-version": 0 + } + ] +} From f86790e097c770de7c10b9359fe4a711489a24db Mon Sep 17 00:00:00 2001 From: Xing Ji <33065325+jixingcn@users.noreply.github.com> Date: Fri, 23 Jul 2021 06:31:44 +0800 Subject: [PATCH 0165/1858] [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 --- ports/flatbuffers/CONTROL | 3 +-- ports/flatbuffers/fix-issue-6036.patch | 23 ---------------- ports/flatbuffers/fix-uwp-build.patch | 4 +-- .../ignore_use_of_cmake_toolchain_file.patch | 4 +-- ports/flatbuffers/no-werror.patch | 6 ++--- ports/flatbuffers/portfile.cmake | 6 ++--- ports/mnn/portfile.cmake | 26 +++++++++++++++++-- ports/mnn/vcpkg.json | 7 ++++- versions/baseline.json | 6 ++--- versions/f-/flatbuffers.json | 5 ++++ versions/m-/mnn.json | 5 ++++ 11 files changed, 53 insertions(+), 42 deletions(-) delete mode 100644 ports/flatbuffers/fix-issue-6036.patch diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL index ced25eb94c3c45..da211dc0d93e67 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 872b73e6fd9717..00000000000000 --- 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 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 &a, const Offset &b) const { -- auto table_a = reinterpret_cast(buf_.data_at(a.o)); -- auto table_b = reinterpret_cast(buf_.data_at(b.o)); -+ auto table_a = reinterpret_cast(buf_->data_at(a.o)); -+ auto table_b = reinterpret_cast(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 5716f8a2f01f0d..44513b9e8ba6dc 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 38e1f12ec091bb..8bd99db36613e6 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 b354e229d6e93a..dcc5cde41181fb 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 794592d98379d2..5cf7ab6bbae9a1 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) diff --git a/ports/mnn/portfile.cmake b/ports/mnn/portfile.cmake index 1546d49cbd50a4..8147fddb1dba20 100644 --- a/ports/mnn/portfile.cmake +++ b/ports/mnn/portfile.cmake @@ -34,11 +34,32 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) # 'cuda' feature in Windows failes with Ninja because of parallel PDB access. Make it optional -set(NINJA_OPTION PREFER_NINJA) +set(NINJA_OPTION PREFER_NINJA) if("cuda" IN_LIST FEATURES) unset(NINJA_OPTION) endif() +set(FLATC_EXEC ${CURRENT_HOST_INSTALLED_DIR}/tools/flatbuffers/flatc${VCPKG_HOST_EXECUTABLE_SUFFIX}) +if (NOT EXISTS "${FLATC_EXEC}") + message(FATAL_ERROR "Expected ${FLATC_EXEC} to exist.") +endif() + +# regenerate some code files by schemes and flatbuffers +vcpkg_execute_build_process( + COMMAND "${FLATC_EXEC}" "-c" "-b" "--gen-object-api" "--reflect-names" + "../default/BasicOptimizer.fbs" + "../default/CaffeOp.fbs" + "../default/GpuLibrary.fbs" + "../default/MNN.fbs" + "../default/Tensor.fbs" + "../default/TensorflowOp.fbs" + "../default/TFQuantizeOp.fbs" + "../default/Type.fbs" + "../default/UserDefine.fbs" + WORKING_DIRECTORY "${SOURCE_PATH}/schema/current/" + LOGNAME flatc-${TARGET_TRIPLET} + ) + if(VCPKG_TARGET_IS_WINDOWS) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_RUNTIME_MT) list(APPEND PLATFORM_OPTIONS -DMNN_WIN_RUNTIME_MT=${USE_RUNTIME_MT}) @@ -61,10 +82,11 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_download_distfile(COPYRIGHT_PATH - URLS "https://apache.org/licenses/LICENSE-2.0.txt" + URLS "https://apache.org/licenses/LICENSE-2.0.txt" FILENAME 98f6b79b778f7b0a1541.txt SHA512 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 ) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(RENAME ${COPYRIGHT_PATH} ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/mnn/vcpkg.json b/ports/mnn/vcpkg.json index cb72880b5d8432..27676e8630fd49 100644 --- a/ports/mnn/vcpkg.json +++ b/ports/mnn/vcpkg.json @@ -1,12 +1,17 @@ { "name": "mnn", - "version-string": "1.1.0", + "version": "1.1.0", + "port-version": 1, "description": "MNN is a blazing fast, lightweight deep learning framework, battle-tested by business-critical use cases in Alibaba", "homepage": "https://www.mnn.zone/", "license": "Apache-2.0", "supports": "!(arm | uwp | ios | android)", "dependencies": [ "flatbuffers", + { + "name": "flatbuffers", + "host": true + }, "rapidjson", "stb" ], diff --git a/versions/baseline.json b/versions/baseline.json index dc4b1ac206c286..ccf09a9284075b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2033,8 +2033,8 @@ "port-version": 2 }, "flatbuffers": { - "baseline": "1.12.0", - "port-version": 2 + "baseline": "2.0.0", + "port-version": 0 }, "flint": { "baseline": "2.5.2-4", @@ -4110,7 +4110,7 @@ }, "mnn": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "modp-base64": { "baseline": "2020-09-26", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 106b1d8cadd09b..74e1d183f307a9 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15a2fc0a15331e81cd04a3aae0a8b1d70c002ee5", + "version-string": "2.0.0", + "port-version": 0 + }, { "git-tree": "195ffbf0b3c6abace9106115fd4ed081431a3997", "version-string": "1.12.0", diff --git a/versions/m-/mnn.json b/versions/m-/mnn.json index f124bfe287ce9c..fd88fd1d559b0b 100644 --- a/versions/m-/mnn.json +++ b/versions/m-/mnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10351b13b0daa0e66de483597da63e0d60e9777a", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "491764622aa21728db88d7dd574f430cae600af5", "version-string": "1.1.0", From e7238f24ca076abe9c6f45c909996499fb2f93ca Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 22 Jul 2021 23:35:12 +0100 Subject: [PATCH 0166/1858] [libmodplug] [ffmpeg] fix libmodplug .pc file for static windows build (#18867) * [libmodplug] fix pkg-config file for static builds on windows * [libmodplug] convert CONTROL to vcpkg.json * [libmodplug] bump port version * [ffmpeg] enable modplug feature on static windows builds * [ffmpeg] reformat manifest * [ffmpeg] bump port version * [ffmpeg] [libmodplug] x-add-version * [libmodplug] simplify copyright file install * [libmodplug] x-add-version * [ffmpeg] bump port version * [ffmpeg] x-add-version * [ffmpeg] fix post-merge * [ffmpeg] x-add-version --- ports/ffmpeg/portfile.cmake | 4 +-- ports/ffmpeg/vcpkg.json | 18 ++++++------ ports/libmodplug/004-export-pkgconfig.patch | 32 +++++++++++++++------ ports/libmodplug/CONTROL | 6 ---- ports/libmodplug/portfile.cmake | 5 ++-- ports/libmodplug/vcpkg.json | 8 ++++++ versions/baseline.json | 4 +-- versions/f-/ffmpeg.json | 5 ++++ versions/l-/libmodplug.json | 5 ++++ 9 files changed, 57 insertions(+), 30 deletions(-) delete mode 100644 ports/libmodplug/CONTROL create mode 100644 ports/libmodplug/vcpkg.json diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 541f1da0c84db7..654370f4541c16 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -50,8 +50,8 @@ if("ilbc" IN_LIST FEATURES) endif() if("modplug" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) - message(FATAL_ERROR "Feature 'modplug' does not support 'uwp | (windows & static)'") + if (VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'modplug' does not support 'uwp'") endif() endif() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 958d56964926c0..3dccdeb5dbda2b 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 9, + "port-version": 10, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -62,6 +62,14 @@ ], "platform": "!osx" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "modplug" + ], + "platform": "!uwp" + }, { "name": "ffmpeg", "default-features": false, @@ -134,14 +142,6 @@ ], "platform": "!(uwp | arm | x86 | osx)" }, - { - "name": "ffmpeg", - "default-features": false, - "features": [ - "modplug" - ], - "platform": "!(windows & static) & !uwp" - }, { "name": "ffmpeg", "default-features": false, diff --git a/ports/libmodplug/004-export-pkgconfig.patch b/ports/libmodplug/004-export-pkgconfig.patch index 28201a96183802..eb59ca111b1246 100644 --- a/ports/libmodplug/004-export-pkgconfig.patch +++ b/ports/libmodplug/004-export-pkgconfig.patch @@ -1,23 +1,37 @@ +From 6a3e539ea26eec1bfc2a6e722e923bd5221f8d26 Mon Sep 17 00:00:00 2001 +From: "Matthias C. M. Troffaes" +Date: Thu, 8 Jul 2021 10:47:30 +0100 +Subject: [PATCH] Fix Libs.private in .pc file. + +--- + CMakeLists.txt | 7 +++++-- + libmodplug.pc.in | 2 +- + 2 files changed, 6 insertions(+), 3 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 468f1a3..8e94458 100644 +index 468f1a3..3164fc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -142,6 +142,8 @@ if(HAVE_SINF) +@@ -141,7 +141,11 @@ if(HAVE_SINF) + add_definitions(-DHAVE_SINF) endif(HAVE_SINF) - if (NOT WIN32) -+ set(UNIXLIBS "-lstdc++ -lm") -+endif (NOT WIN32) +-if (NOT WIN32) ++if(WIN32) ++ set(LIBS_PRIVATE "-luser32") ++else(WIN32) ++ set(LIBS_PRIVATE "-lstdc++ -lm") ++endif(WIN32) set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "${CMAKE_INSTALL_PREFIX}") set(libdir "${CMAKE_INSTALL_PREFIX}/lib") -@@ -152,4 +154,3 @@ if (NOT WIN32) +@@ -152,4 +156,3 @@ if (NOT WIN32) install(FILES "${PROJECT_BINARY_DIR}/libmodplug.pc" DESTINATION lib/pkgconfig ) -endif (NOT WIN32) diff --git a/libmodplug.pc.in b/libmodplug.pc.in -index bbf05f9..1699d76 100644 +index bbf05f9..e4a43cc 100644 --- a/libmodplug.pc.in +++ b/libmodplug.pc.in @@ -8,5 +8,5 @@ Description: The ModPlug mod file playing library. @@ -25,6 +39,8 @@ index bbf05f9..1699d76 100644 Requires: Libs: -L${libdir} -lmodplug -Libs.private: -lstdc++ -lm -+Libs.private: @UNIXLIBS@ ++Libs.private: @LIBS_PRIVATE@ Cflags: -I${includedir} +-- +2.21.0.windows.1 diff --git a/ports/libmodplug/CONTROL b/ports/libmodplug/CONTROL deleted file mode 100644 index 2d05f206aaec8c..00000000000000 --- a/ports/libmodplug/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libmodplug -Version: 0.8.9.0 -Port-Version: 7 -Homepage: https://github.com/Konstanty/libmodplug -Description: The ModPlug mod file playing library. -Supports: !uwp diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 6ead190d83425d..5df935579492b4 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github(ARCHIVE ${STATIC_PATCH} 002-detect_sinf.patch 003-use-static-cast-for-ctype.patch - 004-export-pkgconfig.patch + 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 ) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) @@ -37,5 +37,4 @@ endif() vcpkg_fixup_pkgconfig() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmodplug) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmodplug/COPYING ${CURRENT_PACKAGES_DIR}/share/libmodplug/copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json new file mode 100644 index 00000000000000..854e034e1835ea --- /dev/null +++ b/ports/libmodplug/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libmodplug", + "version-string": "0.8.9.0", + "port-version": 8, + "description": "The ModPlug mod file playing library.", + "homepage": "https://github.com/Konstanty/libmodplug", + "supports": "!uwp" +} diff --git a/versions/baseline.json b/versions/baseline.json index ccf09a9284075b..936a9e382c15cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1994,7 +1994,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 9 + "port-version": 10 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -3370,7 +3370,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 7 + "port-version": 8 }, "libmorton": { "baseline": "0.2", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0c863b404447c4..95b846ba556753 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8eae79332e72736be5c6accacaf7bf9054df4b9", + "version": "4.4", + "port-version": 10 + }, { "git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4", "version": "4.4", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index f5cfdf03d17a1c..e32694d51a6f22 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6798791f0c306dcc5a5b9a445b618046dc7e097", + "version-string": "0.8.9.0", + "port-version": 8 + }, { "git-tree": "974a84bd910a82a86d2e27d2bb9416d0672390c4", "version-string": "0.8.9.0", From 6564b16fdb3e4880081f3de5b0ec1f4679ead853 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Thu, 22 Jul 2021 15:36:06 -0700 Subject: [PATCH 0167/1858] [apsi] Add new port (#18847) * Added a new port, apsi. * Updated versioning. * Added platform to a feature in apsi. * Updated versioning. Co-authored-by: Billy Robert ONeal III --- ports/apsi/portfile.cmake | 38 ++++++++++++++++++++++++++ ports/apsi/vcpkg.json | 57 +++++++++++++++++++++++++++++++++++++++ versions/a-/apsi.json | 9 +++++++ versions/baseline.json | 4 +++ 4 files changed, 108 insertions(+) create mode 100644 ports/apsi/portfile.cmake create mode 100644 ports/apsi/vcpkg.json create mode 100644 versions/a-/apsi.json diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake new file mode 100644 index 00000000000000..d13a9e38891854 --- /dev/null +++ b/ports/apsi/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +if("hexl" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO microsoft/APSI + REF 2eba8a245872755a76282c4f1b14aefd67b1a199 + SHA512 fd21e41b9a3241dc3454fadb54feb7843d9d4d4563da26d0f4a29b67ea22ead24ff6d89029050f5c54225cb95cb181f346f381b98873d3c55173444c0650d581 + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + log4cplus APSI_USE_LOG4CPLUS + zeromq APSI_USE_ZMQ +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE + OPTIONS + "-DAPSI_BUILD_TESTS=OFF" + "-DAPSI_BUILD_CLI=OFF" + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.2") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") + +vcpkg_copy_pdbs() diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json new file mode 100644 index 00000000000000..01926f583ed55c --- /dev/null +++ b/ports/apsi/vcpkg.json @@ -0,0 +1,57 @@ +{ + "name": "apsi", + "version-semver": "0.2.0", + "description": "APSI is a research library for asymmetric private set intersection.", + "homepage": "https://github.com/microsoft/APSI", + "supports": "static", + "dependencies": [ + "flatbuffers", + "jsoncpp", + "kuku", + { + "name": "seal", + "features": [ + "no-throw-tran" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "log4cplus", + "zeromq" + ], + "features": { + "hexl": { + "description": "Use Intel® HEXL to accelerate Microsoft SEAL.", + "dependencies": [ + { + "name": "seal", + "features": [ + "hexl", + "no-throw-tran" + ], + "platform": "x64" + } + ] + }, + "log4cplus": { + "description": "Use log4cplus for logging.", + "dependencies": [ + "log4cplus" + ] + }, + "zeromq": { + "description": "Use ZeroMQ for networking.", + "dependencies": [ + "cppzmq" + ] + } + } +} diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json new file mode 100644 index 00000000000000..30b4da13216533 --- /dev/null +++ b/versions/a-/apsi.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2de75d2b02f3a434d3b95f53ca60b71598d9f8b5", + "version-semver": "0.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 936a9e382c15cb..38b30fc8c567c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -112,6 +112,10 @@ "baseline": "1.6.1", "port-version": 3 }, + "apsi": { + "baseline": "0.2.0", + "port-version": 0 + }, "arb": { "baseline": "2.18.1", "port-version": 0 From fc61837099f6676ce000b25058aacd2c52f41ae0 Mon Sep 17 00:00:00 2001 From: Jimmy Lee Date: Fri, 23 Jul 2021 06:48:47 +0800 Subject: [PATCH 0168/1858] [liblzma] add install bundle for support build target for ios platform. (#18829) * [liblzma] add install bundle for support build target for ios platform. * Remove the deprecated functions * format vcpkg.json * Update the baseline version Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/liblzma/CONTROL | 5 ----- ports/liblzma/add_support_ios.patch | 23 +++++++++++++++++++++++ ports/liblzma/portfile.cmake | 18 +++++++++--------- ports/liblzma/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 2 +- versions/l-/liblzma.json | 5 +++++ 6 files changed, 55 insertions(+), 15 deletions(-) delete mode 100644 ports/liblzma/CONTROL create mode 100644 ports/liblzma/add_support_ios.patch create mode 100644 ports/liblzma/vcpkg.json diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL deleted file mode 100644 index da00befc3aca47..00000000000000 --- a/ports/liblzma/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: liblzma -Version: 5.2.5 -Port-Version: 2 -Homepage: https://github.com/xz-mirror/xz -Description: Compression library with an API similar to that of zlib. diff --git a/ports/liblzma/add_support_ios.patch b/ports/liblzma/add_support_ios.patch new file mode 100644 index 00000000000000..ac40c4e6dbe1f4 --- /dev/null +++ b/ports/liblzma/add_support_ios.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 52439b3..0b5e371 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -526,6 +526,7 @@ if(HAVE_GETOPT_LONG) + + install(TARGETS xzdec + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xzdec) + + if(UNIX) +@@ -653,6 +654,7 @@ if(NOT MSVC AND HAVE_GETOPT_LONG) + + install(TARGETS xz + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ++ BUNDLE DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT xz) + + install(FILES src/xz/xz.1 +-- +2.30.1 (Apple Git-130) + diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index e58a0e543cd52d..e653cbcce461a3 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -8,15 +8,15 @@ vcpkg_from_github( enable-uwp-builds.patch fix_config_include.patch win_output_name.patch # Fix output name on Windows. Autotool build does not generate lib prefixed libraries on windows. + add_support_ios.patch # add install bundle info for support ios ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() set(exec_prefix "\${prefix}") @@ -39,7 +39,7 @@ endif() vcpkg_fixup_pkgconfig() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblzma) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblzma) file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/liblzmaConfig.cmake\")") file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake" @@ -100,9 +100,9 @@ endif() file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzma.h "${_contents}") if (VCPKG_BUILD_TYPE STREQUAL debug) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/include") else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -113,7 +113,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) ) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") set(TOOLS xz xzdec) @@ -130,5 +130,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json new file mode 100644 index 00000000000000..fb6c4097e25a2e --- /dev/null +++ b/ports/liblzma/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "liblzma", + "version-semver": "5.2.5", + "port-version": 3, + "description": "Compression library with an API similar to that of zlib.", + "homepage": "hhttps://github.com/xz-mirror/xz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 38b30fc8c567c2..7e997b8ac61ab4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3330,7 +3330,7 @@ }, "liblzma": { "baseline": "5.2.5", - "port-version": 2 + "port-version": 3 }, "libmad": { "baseline": "0.15.1-8", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index 447217eb5870c9..9825016e361ff7 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c5f893c8d78d30c4641e9f4d0c7818386f8c8c9", + "version-semver": "5.2.5", + "port-version": 3 + }, { "git-tree": "5f491131f98307f42a98db7ad0b5455225481284", "version-string": "5.2.5", From 9024505df9afd313585423d2e1a244b7dd3a16de Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 23 Jul 2021 06:50:23 +0800 Subject: [PATCH 0169/1858] [vcpkg] Update vcpkg tools (#18817) * [perl/nuget] Update to latest release * Update nuget to 5.10.0 in vcpkgTools.xml * Update git aria2 scons go doxygen ruby bazel python3 * Update clang * Update meson to 5.8.1 * Update the baseline verison * Update vswhere to 2.8.4 * Update gsutil, add x86 nodejs on windows * Update git to 2.32.0.2 * Update the doc * Revert changes for adding nodejs Co-authored-by: Billy Robert ONeal III --- ports/tool-meson/vcpkg.json | 2 +- .../cmake/vcpkg_find_acquire_program.cmake | 77 ++++++++++--------- scripts/vcpkgTools.xml | 66 ++++++++-------- versions/baseline.json | 2 +- versions/t-/tool-meson.json | 5 ++ 5 files changed, 80 insertions(+), 72 deletions(-) diff --git a/ports/tool-meson/vcpkg.json b/ports/tool-meson/vcpkg.json index 4f69be22b123e0..936b5d6c54ab48 100644 --- a/ports/tool-meson/vcpkg.json +++ b/ports/tool-meson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tool-meson", - "version": "0.58.0", + "version": "0.58.1", "description": "Meson build system", "homepage": "https://github.com/mesonbuild/meson" } diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index e279073cad4714..436f6263fbab50 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -66,7 +66,7 @@ function(vcpkg_find_acquire_program VAR) if(VAR MATCHES "PERL") set(PROGNAME perl) - set(PERL_VERSION 5.30.0.1) + set(PERL_VERSION 5.32.1.1) set(SUBDIR ${PERL_VERSION}) set(PATHS ${DOWNLOADS}/tools/perl/${SUBDIR}/perl/bin) set(BREW_PACKAGE_NAME "perl") @@ -75,7 +75,7 @@ function(vcpkg_find_acquire_program VAR) "https://strawberryperl.com/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip" ) set(ARCHIVE "strawberry-perl-${PERL_VERSION}-32bit.zip") - set(HASH d353d3dc743ebdc6d1e9f6f2b7a6db3c387c1ce6c890bae8adc8ae5deae8404f4c5e3cf249d1e151e7256d4c5ee9cd317e6c41f3b6f244340de18a24b938e0c4) + set(HASH 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9) elseif(VAR MATCHES "NASM") set(PROGNAME nasm) set(NASM_VERSION 2.15.05) @@ -102,11 +102,12 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "GIT") set(PROGNAME git) if(CMAKE_HOST_WIN32) - set(GIT_VERSION 2.26.2) - set(SUBDIR "git-${GIT_VERSION}-1-windows") - set(URL "https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/PortableGit-${GIT_VERSION}-32-bit.7z.exe") + set(GIT_BASE_VERSION 2.32.0) + set(GIT_VERSION 2.32.0.2) + set(SUBDIR "git-${GIT_VERSION}-2-windows") + set(URL "https://github.com/git-for-windows/git/releases/download/v${GIT_BASE_VERSION}.windows.2/PortableGit-${GIT_VERSION}-32-bit.7z.exe") set(ARCHIVE "PortableGit-${GIT_VERSION}-32-bit.7z.exe") - set(HASH d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36) + set(HASH 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348) set(PATHS "${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin" "${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin") @@ -138,13 +139,13 @@ function(vcpkg_find_acquire_program VAR) set(ARCHIVE "gn-${GN_PLATFORM}.zip") elseif(VAR MATCHES "GO") set(PROGNAME go) - set(SUBDIR 1.13.1.windows-386) + set(SUBDIR 1.16.6.windows-386) set(PATHS ${DOWNLOADS}/tools/go/${SUBDIR}/go/bin) set(BREW_PACKAGE_NAME "go") set(APT_PACKAGE_NAME "golang-go") set(URL "https://dl.google.com/go/go${SUBDIR}.zip") set(ARCHIVE "go${SUBDIR}.zip") - set(HASH 2ab0f07e876ad98d592351a8808c2de42351ab387217e088bc4c5fa51d6a835694c501e2350802323b55a27dc0157f8b70045597f789f9e50f5ceae50dea3027) + set(HASH 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8) elseif(VAR MATCHES "PYTHON3") if(CMAKE_HOST_WIN32) set(PROGNAME python) @@ -193,10 +194,11 @@ function(vcpkg_find_acquire_program VAR) endif() elseif(VAR MATCHES "RUBY") set(PROGNAME "ruby") - set(PATHS ${DOWNLOADS}/tools/ruby/rubyinstaller-2.6.3-1-x86/bin) - set(URL https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.6.3-1/rubyinstaller-2.6.3-1-x86.7z) - set(ARCHIVE rubyinstaller-2.6.3-1-x86.7z) - set(HASH 4322317dd02ce13527bf09d6e6a7787ca3814ea04337107d28af1ac360bd272504b32e20ed3ea84eb5b21dae7b23bfe5eb0e529b6b0aa21a1a2bbb0a542d7aec) + set(RUBY_VERSION 2.7.4-1) + set(PATHS ${DOWNLOADS}/tools/ruby/rubyinstaller-${RUBY_VERSION}-x86/bin) + set(URL https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${RUBY_VERSION}/rubyinstaller-${RUBY_VERSION}-x86.7z) + set(ARCHIVE rubyinstaller-${RUBY_VERSION}-x86.7z) + set(HASH 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) elseif(VAR MATCHES "JOM") set(PROGNAME jom) set(SUBDIR "jom-1.1.3") @@ -241,29 +243,29 @@ function(vcpkg_find_acquire_program VAR) set(VERSION_CMD --version) elseif(VAR MATCHES "NUGET") set(PROGNAME nuget) - set(SUBDIR "5.5.1") + set(SUBDIR "5.10.0") set(PATHS "${DOWNLOADS}/tools/nuget-${SUBDIR}-windows") set(BREW_PACKAGE_NAME "nuget") - set(URL "https://dist.nuget.org/win-x86-commandline/v5.5.1/nuget.exe") + set(URL "https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe") set(_vfa_RENAME "nuget.exe") - set(ARCHIVE "nuget.5.5.1.exe") + set(ARCHIVE "nuget.5.10.0.exe") set(NOEXTRACT ON) - set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) + set(HASH c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e) elseif(VAR MATCHES "MESON") - set(MESON_VERSION 0.58.0) + set(MESON_VERSION 0.58.1) set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) set(APT_PACKAGE_NAME "meson") set(BREW_PACKAGE_NAME "meson") set(SCRIPTNAME meson meson.py) - set(REF 753954be868ed78b3e339e8811fd1d29eb2af237) + set(REF aeda7f249c4a5dbbecc52e44f382246a2377b5b0) set(PATHS ${DOWNLOADS}/tools/meson/meson-${REF}) set(URL "https://github.com/mesonbuild/meson/archive/${REF}.tar.gz") set(ARCHIVE "meson-${REF}.tar.gz") #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") - set(HASH 1e5b5ac216cb41af40b3e72240f3cb319772a02aaea39f672085aafb41c3c732c932c9d0c4e8deb5b4b1ec1112860e6a3ddad59898bebbd165ed7876c87728b3) + set(HASH 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) set(_vfa_SUPPORTED ON) set(VERSION_CMD --version) elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") @@ -298,7 +300,8 @@ function(vcpkg_find_acquire_program VAR) endif() elseif(VAR MATCHES "CLANG") set(PROGNAME clang) - set(SUBDIR "clang-10.0.0") + set(SUBDIR "clang-12.0.0") + set(LLVM_VERSION 12.0.0) if(CMAKE_HOST_WIN32) set(PATHS # Support LLVM in Visual Studio 2019 @@ -316,13 +319,13 @@ function(vcpkg_find_acquire_program VAR) endif() if(HOST_ARCH_ MATCHES "64") - set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win64.exe") - set(ARCHIVE "LLVM-10.0.0-win64.7z.exe") - set(HASH 3603a4be3548dabc7dda94f3ed4384daf8a94337e44ee62c0d54776c79f802b0cb98fc106e902409942e841c39bc672cc6d61153737ad1cc386b609ef25db71c) + set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-win64.exe") + set(ARCHIVE "LLVM-${LLVM_VERSION}-win64.7z.exe") + set(HASH 67a9b54abad5143fa5f79f0cfc184be1394c9fc894fa9cee709943cb6ccbde8f0ea6003d8fcc20eccf035631abe4009cc0f694ac84e7879331cebba8125e4c7f) else() - set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/LLVM-10.0.0-win32.exe") - set(ARCHIVE "LLVM-10.0.0-win32.7z.exe") - set(HASH 8494922b744ca0dc8d075a1d3a35a0db5a9287544afd5c4984fa328bc26f291209f6030175896b4895019126f5832045e06d8ad48072b549916df29a2228348b) + set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-win32.exe") + set(ARCHIVE "LLVM-${LLVM_VERSION}-win32.7z.exe") + set(HASH 92fa5252fd08c1414ee6d71e2544cd2c44872124c47225f8d98b3af711d20e699f2888bc30642dfd00e005013da1607a593674fb4878951cc434694f9a119199) endif() endif() set(BREW_PACKAGE_NAME "llvm") @@ -354,13 +357,13 @@ function(vcpkg_find_acquire_program VAR) set(HASH 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) elseif(VAR MATCHES "SCONS") set(PROGNAME scons) - set(SCONS_VERSION 3.0.1) + set(SCONS_VERSION 4.1.0) set(SUBDIR ${SCONS_VERSION}) set(REQUIRED_INTERPRETER PYTHON2) set(SCRIPTNAME "scons.py") set(URL "https://sourceforge.net/projects/scons/files/scons-local-${SCONS_VERSION}.zip/download") set(ARCHIVE "scons-local-${SCONS_VERSION}.zip") - set(HASH fe121b67b979a4e9580c7f62cfdbe0c243eba62a05b560d6d513ac7f35816d439b26d92fc2d7b7d7241c9ce2a49ea7949455a17587ef53c04a5f5125ac635727) + set(HASH b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) elseif(VAR MATCHES "SWIG") set(SWIG_VERSION 4.0.2) set(PROGNAME swig) @@ -381,19 +384,19 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "DOXYGEN") set(PROGNAME doxygen) - set(DOXYGEN_VERSION 1.8.17) + set(DOXYGEN_VERSION 1.9.1) set(SOURCEFORGE_ARGS REPO doxygen REF rel-${DOXYGEN_VERSION} FILENAME "doxygen-${DOXYGEN_VERSION}.windows.bin.zip" - SHA512 6bac47ec552486783a70cc73b44cf86b4ceda12aba6b52835c2221712bd0a6c845cecec178c9ddaa88237f5a781f797add528f47e4ed017c7888eb1dd2bc0b4b + SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b NO_REMOVE_ONE_LEVEL WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" ) - set(SUBDIR 6bac47ec55-25c819fd77) + set(SUBDIR c3eeb6b9fa-76d69c6db5) elseif(VAR MATCHES "BAZEL") set(PROGNAME bazel) - set(BAZEL_VERSION 3.7.0) + set(BAZEL_VERSION 4.1.0) set(_vfa_RENAME "bazel") if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") set(_vfa_SUPPORTED ON) @@ -401,27 +404,27 @@ function(vcpkg_find_acquire_program VAR) set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64") set(ARCHIVE "bazel-${SUBDIR}-x86_64") set(NOEXTRACT ON) - set(HASH 1118eb939627cc5570616f7bd41c72a90df9bb4a3c802eb8149b5b2eebf27090535c029590737557e270c5a8556267b8c1843eb0ff55dc9e4b82581a64e07ec1) + set(HASH 50aa0894dbeedb9189a56f17baa8cecfa55c5f9c1f93a61b9ab5e10984754a400884fc9802b4979f536778e15f813a72807396b4b47694e4c05eadb841361c69) elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") set(_vfa_SUPPORTED ON) set(SUBDIR ${BAZEL_VERSION}-darwin) set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64") set(ARCHIVE "bazel-${SUBDIR}-x86_64") set(NOEXTRACT ON) - set(HASH e2d792f0fc03a4a57a4c2c8345141d86a2dc25a09757f26cb18534426f73d10b4de021e2a3d439956a92d2a712aae9ad75357db24d02f9b0890cc643615a997c) + set(HASH 3500560c9d49d37a1ead2d2777d673c6f1874582883e141ecd5b3991005b1b6b8aab5f255c187133d771497c2a956f5c1e0dfad04dc453525634537e65b649af) else() set(SUBDIR ${BAZEL_VERSION}-windows) set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64.zip") set(ARCHIVE "bazel-${SUBDIR}-x86_64.zip") - set(HASH 410b6788f624b3b0b9f13f5b4d12c1b24447f133210a68e2f110aff8d95bb954e40ea1d863a8cc3473402d1c2f15c38042e6af0cb207056811e4cc7bd0b9ca00) + set(HASH 3954ab54b465d62eef397767dac7ce21d06ac8ea3e1571d0e7b1f0ea8b5c2cf44eea5d252b85a63a1e1a08dbe9a219783cc23c2888673c35e2df03edfdc9e5a7) endif() elseif(VAR MATCHES "ARIA2") set(PROGNAME aria2c) - set(ARIA2_VERSION 1.34.0) + set(ARIA2_VERSION 1.35.0) set(PATHS ${DOWNLOADS}/tools/aria2c/aria2-${ARIA2_VERSION}-win-32bit-build1) set(URL "https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}-win-32bit-build1.zip") set(ARCHIVE "aria2-${ARIA2_VERSION}-win-32bit-build1.zip") - set(HASH 2a5480d503ac6e8203040c7e516a3395028520da05d0ebf3a2d56d5d24ba5d17630e8f318dd4e3cc2094cc4668b90108fb58e8b986b1ffebd429995058063c27) + set(HASH 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) elseif(VAR MATCHES "PKGCONFIG") set(PROGNAME pkg-config) if(ENV{PKG_CONFIG}) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 785d1b8b4e3c60..f3e37ae26d562e 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -29,11 +29,11 @@ cmake-3.20.2-linux-x86_64.tar.gz - 2.26.2-1 + 2.32.0.2 mingw32\bin\git.exe - https://github.com/git-for-windows/git/releases/download/v2.26.2.windows.1/PortableGit-2.26.2-32-bit.7z.exe - d3cb60d62ca7b5d05ab7fbed0fa7567bec951984568a6c1646842a798c4aaff74bf534cf79414a6275c1927081a11b541d09931c017bf304579746e24fe57b36 - PortableGit-2.26.2-32-bit.7z.exe + https://github.com/git-for-windows/git/releases/download/v2.32.0.windows.2/PortableGit-2.32.0.2-32-bit.7z.exe + 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348 + PortableGit-2.32.0.2-32-bit.7z.exe 2.7.4 @@ -54,49 +54,49 @@ - 4.59 + 4.65 google-cloud-sdk\bin\gsutil.cmd - https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-343.0.0-windows-x86_64-bundled-python.zip - 349db6743e70c1940b3d0c8ffdf629608437b6fa4e5896143c610e9ce97b28b8a32cf35ee3c669eeec2158788d7ff2fe618ea6bc411f9ca8de6311eee0d36569 - google-cloud-sdk-343.0.0-windows-x86_64-bundled-python.zip + https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip + e2792e17b132aad77f7c0b9fd26faf415e9437923d9227a9e6d253554e6843d29a6ddad0a7fb5e9aea4a130fd4c521e6ece8844fd4a4f9e8d580348775425389 + google-cloud-sdk-347.0.0-windows-x86_64-bundled-python.zip - 4.59 + 4.65 gsutil/gsutil - https://storage.googleapis.com/pub/gsutil_4.59.tar.gz - c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48 - gsutil_4.59.tar.gz + https://storage.googleapis.com/pub/gsutil_4.65.tar.gz + 2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8 + gsutil_4.65.tar.gz - 4.59 + 4.65 gsutil/gsutil - https://storage.googleapis.com/pub/gsutil_4.59.tar.gz - c86b957a2630f3a80869e3105c0baa7bf1297b84698e756fed28b28adf36345cf1dd28d4216ec395de6bfee5b118dd70040ff964a2938f22d8af15a5c3485c48 - gsutil_4.59.tar.gz + https://storage.googleapis.com/pub/gsutil_4.65.tar.gz + 2c5c9dea48147f97180a491bbb9e24e8cbcd4f3452620e2f80338b781e4dfc90bb754e3bbfa05e1b990e44bff52d990d8c2dd51bc83d112339d8e6096a2f21c8 + gsutil_4.65.tar.gz - 2.4.1 + 2.8.4 vswhere.exe - https://github.com/Microsoft/vswhere/releases/download/2.4.1/vswhere.exe - f477842d0cebefcd6bf9c6d536ab8ea20ec5b0aa967ee963ab6a101aeff9df8742ca600d35f39e2e7158d76d8231f1ed2bef6104dce84d2bf8d6b07d17d706a1 + https://github.com/Microsoft/vswhere/releases/download/2.8.4/vswhere.exe + 1a98beebd1bb6929cbe98b86a3b77fb1ae4508b86cdcb64696b20c3a3336a2b5c8518e19a21092f1c98a46202c048dba819dc52bef122485ac34b888b77e59b2 - 5.9.1 + 5.10.0 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe - d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc + https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe + c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e - 5.9.1 + 5.10.0 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe - d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc + https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe + c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e - 5.9.1 + 5.10.0 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.9.1/nuget.exe - d7acca2b1271bfd3d6f7c7088bceee7a5a5e860d38c05a159f59b1f4bf935e963fde183a769db944df8f6dd44177bb91942578c86eef204cffa119d3d68e97fc + https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe + c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e 3.1.81 @@ -113,11 +113,11 @@ 7-zip.commandline.18.1.0.nupkg - 18.01.0 - aria2-1.34.0-win-32bit-build1\aria2c.exe - https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0-win-32bit-build1.zip - 2a5480d503ac6e8203040c7e516a3395028520da05d0ebf3a2d56d5d24ba5d17630e8f318dd4e3cc2094cc4668b90108fb58e8b986b1ffebd429995058063c27 - aria2-1.33.1-win-32bit-build1.zip + 1.35.0 + aria2-1.35.0-win-32bit-build1\aria2c.exe + https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-win-32bit-build1.zip + 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4 + aria2-1.35.0-win-32bit-build1.zip 1.10.2 diff --git a/versions/baseline.json b/versions/baseline.json index 7e997b8ac61ab4..e66f7f6e2b76af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6361,7 +6361,7 @@ "port-version": 0 }, "tool-meson": { - "baseline": "0.58.0", + "baseline": "0.58.1", "port-version": 0 }, "torch-th": { diff --git a/versions/t-/tool-meson.json b/versions/t-/tool-meson.json index d1ba120ae9a195..ec49d3f117a78f 100644 --- a/versions/t-/tool-meson.json +++ b/versions/t-/tool-meson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7faddc68a615d0902938f8dd18182586f9e2363a", + "version": "0.58.1", + "port-version": 0 + }, { "git-tree": "3abddc8b29ae6e5c0265237a8c3f3e8ec8348710", "version": "0.58.0", From b0f6874bcd31ebb915dd6532e6de87b72570bedb Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Fri, 23 Jul 2021 00:50:52 +0200 Subject: [PATCH 0170/1858] [llvm] improve cross compilation (#18770) --- ports/llvm/portfile.cmake | 30 ++++++++++++++++++++++++++++-- ports/llvm/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/llvm.json | 5 +++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index c242f99e489629..37c1c5f1900893 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -187,13 +187,13 @@ set(known_llvm_targets BPF Hexagon Lanai - Mips + Mips MSP430 NVPTX PowerPC RISCV Sparc - SystemZ + SystemZ WebAssembly X86 XCore @@ -211,11 +211,37 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY) vcpkg_add_to_path(${PYTHON3_DIR}) +if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "${VCPKG_DETECTED_CMAKE_SYSTEM_PROCESSOR}") + # TODO: support more targets and OS + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + if(VCPKG_TARGET_IS_OSX) + list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=arm64-apple-darwin20.3.0) + list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=arm64-apple-darwin20.3.0) + elseif(VCPKG_TARGET_IS_WINDOWS) + list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=arm64-pc-win32) + list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=arm64-pc-win32) + + # Remove if PR #16111 is merged + list(APPEND CROSS_OPTIONS -DCMAKE_CROSSCOMPILING=ON) + list(APPEND CROSS_OPTIONS -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64) + list(APPEND CROSS_OPTIONS -DCMAKE_SYSTEM_NAME:STRING=Windows) + endif() + list(APPEND CROSS_OPTIONS -DLLVM_TARGET_ARCH=AArch64) + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + if(VCPKG_TARGET_IS_OSX) + list(APPEND CROSS_OPTIONS -DLLVM_HOST_TRIPLE=x86_64-apple-darwin20.3.0) + list(APPEND CROSS_OPTIONS -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin20.3.0) + endif() + list(APPEND CROSS_OPTIONS -DLLVM_TARGET_ARCH=X86) + endif() +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/llvm PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} + ${CROSS_OPTIONS} -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_BUILD_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 06ef3712bba345..2c5061af650f8c 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "llvm", "version-string": "12.0.0", + "port-version": 1, "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index e66f7f6e2b76af..45bda6dc7bb637 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3818,7 +3818,7 @@ }, "llvm": { "baseline": "12.0.0", - "port-version": 0 + "port-version": 1 }, "lmdb": { "baseline": "0.9.24", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 843314d7c9c96e..7cb28d85e2051c 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d801bd12386ff6ab31ec0a27c3f45e23242a470", + "version-string": "12.0.0", + "port-version": 1 + }, { "git-tree": "6597ffba14111050d8e68af4852ea5766c81a78c", "version-string": "12.0.0", From 0790bde361392db94cdda86b415075fd5fcf6c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 23 Jul 2021 07:19:26 +0800 Subject: [PATCH 0171/1858] [libmariadb] Fix plugin installation, fix pkgconfig (#18769) * [libmariadb] Fix plugin installation, fix pkgconfig * fix installation * update version stuff Co-authored-by: Billy Robert ONeal III --- ports/libmariadb/export-cmake-targets.patch | 4 +- ports/libmariadb/fix-InstallPath.patch | 41 ++++++++++++++------- ports/libmariadb/portfile.cmake | 17 +++++---- ports/libmariadb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmariadb.json | 5 +++ 6 files changed, 46 insertions(+), 25 deletions(-) diff --git a/ports/libmariadb/export-cmake-targets.patch b/ports/libmariadb/export-cmake-targets.patch index a2581a4c475940..c841a1fe917a0b 100644 --- a/ports/libmariadb/export-cmake-targets.patch +++ b/ports/libmariadb/export-cmake-targets.patch @@ -1,5 +1,5 @@ diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 083a863..6c8d932 100644 +index c109a20..e1fa3f1 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt @@ -405,6 +405,7 @@ ELSE() @@ -10,7 +10,7 @@ index 083a863..6c8d932 100644 TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) -@@ -457,13 +458,25 @@ ENDIF() +@@ -453,13 +454,25 @@ ENDIF() INSTALL(TARGETS mariadbclient COMPONENT Development diff --git a/ports/libmariadb/fix-InstallPath.patch b/ports/libmariadb/fix-InstallPath.patch index 812e6c1a604fc1..bdf81788e3554a 100644 --- a/ports/libmariadb/fix-InstallPath.patch +++ b/ports/libmariadb/fix-InstallPath.patch @@ -1,18 +1,18 @@ -diff --git a/cmake/install_plugins.cmake b/cmake/install_plugins.cmake -index b8d15ba..7f59db7 100644 ---- a/cmake/install_plugins.cmake -+++ b/cmake/install_plugins.cmake -@@ -8,7 +8,7 @@ - # plugin installation +diff --git a/include/mariadb_version.h.in b/include/mariadb_version.h.in +index a82dbb7..e9005fa 100644 +--- a/include/mariadb_version.h.in ++++ b/include/mariadb_version.h.in +@@ -30,7 +30,7 @@ + #define MARIADB_PACKAGE_VERSION_ID @MARIADB_PACKAGE_VERSION_ID@ + #define MARIADB_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@" + #define MARIADB_MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@" +-#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" ++#define MARIADB_PLUGINDIR "../@INSTALL_PLUGINDIR@" - MACRO(INSTALL_PLUGIN name binary_dir) -- INSTALL(TARGETS ${name} COMPONENT ClientPlugins DESTINATION ${INSTALL_PLUGINDIR}) -+ INSTALL(TARGETS ${name} COMPONENT ClientPlugins DESTINATION ${INSTALL_PLUGINDIR}/../../../bin/plugin) - IF(MSVC) - INSTALL(FILES $ COMPONENT Debuginfo - DESTINATION symbols CONFIGURATIONS Debug RelWithDebInfo) + /* mysqld compile time options */ + #ifndef MYSQL_CHARSET diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt -index 14e34ab..083a863 100644 +index bcfd4de..c109a20 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt @@ -398,10 +398,10 @@ ADD_LIBRARY(mariadbclient STATIC ${MARIADB_OBJECTS} ${EMPTY_FILE}) @@ -28,7 +28,7 @@ index 14e34ab..083a863 100644 TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE mariadbclient) SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) ENDIF() -@@ -457,13 +457,15 @@ ENDIF() +@@ -453,13 +453,15 @@ ENDIF() INSTALL(TARGETS mariadbclient COMPONENT Development @@ -47,3 +47,16 @@ index 14e34ab..083a863 100644 # On Windows, install PDB INSTALL(FILES $ DESTINATION "${INSTALL_LIBDIR}" CONFIGURATIONS Debug RelWithDebInfo +diff --git a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in +index 5574943..fc1ca7c 100644 +--- a/mariadb_config/mariadb_config.c.in ++++ b/mariadb_config/mariadb_config.c.in +@@ -210,7 +210,7 @@ end: + } + if (!p || !p[0]) + { +- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); ++ strncpy(installation_dir, "../@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1); + return; + } + } diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 6a3c6e6905ea7e..6f8da25bea9370 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -25,9 +25,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) if("openssl" IN_LIST FEATURES) - set(WITH_SSL OPENSSL) + set(WITH_SSL OPENSSL) else() - set(WITH_SSL OFF) + set(WITH_SSL OFF) endif() vcpkg_configure_cmake( @@ -35,7 +35,8 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} - -DWITH_UNITTEST=OFF + -DINSTALL_PLUGINDIR=plugin/${PORT} + -DWITH_UNIT_TESTS=OFF -DWITH_CURL=OFF -DWITH_SSL=${WITH_SSL} ) @@ -44,15 +45,13 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libmariadb TARGET_PATH share/unofficial-libmariadb) +vcpkg_fixup_pkgconfig() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") # remove debug header file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - if(VCPKG_BUILD_TYPE STREQUAL "debug") # move headers file(RENAME @@ -60,6 +59,10 @@ if(VCPKG_BUILD_TYPE STREQUAL "debug") ${CURRENT_PACKAGES_DIR}/include) endif() +if (NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES mariadb_config AUTO_CLEAN) +endif() + # remove plugin folder file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mariadb diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json index 622fe62dc99d9f..5658ced391a47c 100644 --- a/ports/libmariadb/vcpkg.json +++ b/ports/libmariadb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmariadb", "version-semver": "3.1.12", - "port-version": 1, + "port-version": 2, "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 45bda6dc7bb637..0884ca8dc103ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3342,7 +3342,7 @@ }, "libmariadb": { "baseline": "3.1.12", - "port-version": 1 + "port-version": 2 }, "libmaxminddb": { "baseline": "1.4.3", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index ac03435597a049..ea10d0ad8f7689 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64479ab60db54486912b858f760af83dd2474f1c", + "version-semver": "3.1.12", + "port-version": 2 + }, { "git-tree": "98ab3766e520cc0e6804bdba42090eae12f9f24f", "version-semver": "3.1.12", From 05c42fa9b618c7a1b6cac45a01747c0ca3969b4b Mon Sep 17 00:00:00 2001 From: Erik Rigtorp Date: Thu, 22 Jul 2021 21:41:00 -0700 Subject: [PATCH 0172/1858] Update SPSCQueue to v1.1 (#19079) --- ports/spscqueue/CONTROL | 2 +- ports/spscqueue/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/s-/spscqueue.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/spscqueue/CONTROL b/ports/spscqueue/CONTROL index f29c84e46551f6..03bf717258c414 100644 --- a/ports/spscqueue/CONTROL +++ b/ports/spscqueue/CONTROL @@ -1,4 +1,4 @@ Source: spscqueue -Version: 1.0 +Version: 1.1 Description: A bounded single-producer single-consumer wait-free and lock-free queue written in C++11 Homepage: https://github.com/rigtorp/SPSCQueue diff --git a/ports/spscqueue/portfile.cmake b/ports/spscqueue/portfile.cmake index c0b9c48332497b..e1650e852a166e 100644 --- a/ports/spscqueue/portfile.cmake +++ b/ports/spscqueue/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rigtorp/SPSCQueue - REF v1.0 - SHA512 8776b49070d549b1df155b0a1ad876a4145d75e004269b3573e8f9963329ad05350d323d87bae229c793cbaf1f2421e35fa7e923e68cc4dcd9cfb6698e8cd80e + REF v1.1 + SHA512 148d60b3677f9d96603413577ff7062d8830bfec955cf3631bea66e5937ee0564d3ff51d05bf9417e5f964e761b7d7fbb8a871e5b6e0fe21112479b4830b0025 HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index 0884ca8dc103ab..220ff6b5dcc499 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6017,7 +6017,7 @@ "port-version": 0 }, "spscqueue": { - "baseline": "1.0", + "baseline": "1.1", "port-version": 0 }, "sqlcipher": { diff --git a/versions/s-/spscqueue.json b/versions/s-/spscqueue.json index 6dcddf8fc14626..eea5708f3860f2 100644 --- a/versions/s-/spscqueue.json +++ b/versions/s-/spscqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13f8976debabfeccc71905c77cc24e746dd9c5d5", + "version-string": "1.1", + "port-version": 0 + }, { "git-tree": "6b3bbf0099c235e22836e7df07d5bb10b6fac73c", "version-string": "1.0", From 3fe8e86570d57dabbbbe971983bdec7e33cb3718 Mon Sep 17 00:00:00 2001 From: bucurb Date: Fri, 23 Jul 2021 05:44:41 +0100 Subject: [PATCH 0173/1858] [libuuid] Added cmake config and targets (#18738) * added cmake config and targets * bumped version * updated sha * renamed targets to unofficial- * updated sha * Trigger builds * PR comments * updated sha * Update the baseline version * PR comments * sha Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III --- ports/libuuid/CMakeLists.txt | 28 +++++++++++++++++++ ports/libuuid/CONTROL | 5 ---- ports/libuuid/portfile.cmake | 3 ++ .../unofficial-libuuid-config.cmake.in | 3 ++ ports/libuuid/vcpkg.json | 8 ++++++ versions/baseline.json | 4 +-- versions/l-/libuuid.json | 5 ++++ 7 files changed, 49 insertions(+), 7 deletions(-) delete mode 100644 ports/libuuid/CONTROL create mode 100644 ports/libuuid/unofficial-libuuid-config.cmake.in create mode 100644 ports/libuuid/vcpkg.json diff --git a/ports/libuuid/CMakeLists.txt b/ports/libuuid/CMakeLists.txt index ff1edd0ef35253..9f4bb0605ce88a 100644 --- a/ports/libuuid/CMakeLists.txt +++ b/ports/libuuid/CMakeLists.txt @@ -29,7 +29,35 @@ endif() install( TARGETS uuid + EXPORT uuid_targets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) + +include(CMakePackageConfigHelpers) +set(PACKAGE_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libuuid-config.cmake") +set(INSTALL_CONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/unofficial-libuuid") + +configure_package_config_file(unofficial-libuuid-config.cmake.in + "${PACKAGE_CONFIG_FILE}" + INSTALL_DESTINATION "${INSTALL_CONFIG_DIR}" +) + +export(EXPORT uuid_targets + NAMESPACE unofficial::UUID:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libuuid-targets.cmake" +) + +install(EXPORT uuid_targets + NAMESPACE unofficial::UUID:: + FILE unofficial-libuuid-targets.cmake + DESTINATION "${INSTALL_CONFIG_DIR}" +) + +install( + FILES + "${PACKAGE_CONFIG_FILE}" + DESTINATION + "${INSTALL_CONFIG_DIR}" +) diff --git a/ports/libuuid/CONTROL b/ports/libuuid/CONTROL deleted file mode 100644 index 5c11b9cac4f773..00000000000000 --- a/ports/libuuid/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libuuid -Version: 1.0.3-7 -Homepage: https://sourceforge.net/projects/libuuid -Description: Universally unique id library -Supports: linux|osx \ No newline at end of file diff --git a/ports/libuuid/portfile.cmake b/ports/libuuid/portfile.cmake index bb03f31f35ebf1..3e29431f4b14fe 100644 --- a/ports/libuuid/portfile.cmake +++ b/ports/libuuid/portfile.cmake @@ -12,6 +12,7 @@ vcpkg_from_sourceforge( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/config.linux.h + ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-config.cmake.in DESTINATION ${SOURCE_PATH} ) @@ -29,6 +30,8 @@ set(includedir \$\{prefix\}/include) configure_file(${SOURCE_PATH}/uuid.pc.in ${SOURCE_PATH}/uuid.pc @ONLY) file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-libuuid TARGET_PATH share/unofficial-libuuid) vcpkg_fixup_pkgconfig() file(INSTALL diff --git a/ports/libuuid/unofficial-libuuid-config.cmake.in b/ports/libuuid/unofficial-libuuid-config.cmake.in new file mode 100644 index 00000000000000..ed4900ceaef5a1 --- /dev/null +++ b/ports/libuuid/unofficial-libuuid-config.cmake.in @@ -0,0 +1,3 @@ +@PACKAGE_INIT@ + +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-targets.cmake") diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json new file mode 100644 index 00000000000000..0f88cf666f9721 --- /dev/null +++ b/ports/libuuid/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libuuid", + "version": "1.0.3", + "port-version": 8, + "description": "Universally unique id library", + "homepage": "https://sourceforge.net/projects/libuuid", + "supports": "linux | osx" +} diff --git a/versions/baseline.json b/versions/baseline.json index 220ff6b5dcc499..3a10fed8eccbc9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3701,8 +3701,8 @@ "port-version": 0 }, "libuuid": { - "baseline": "1.0.3-7", - "port-version": 0 + "baseline": "1.0.3", + "port-version": 8 }, "libuv": { "baseline": "1.41.0", diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json index 66fb9c7faffdec..a927d01b3e0e65 100644 --- a/versions/l-/libuuid.json +++ b/versions/l-/libuuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4058a76786f399c80e1973a4101e8291032b3e9b", + "version": "1.0.3", + "port-version": 8 + }, { "git-tree": "1462e6294a414e76e18cd6b2679b5906254751bd", "version-string": "1.0.3-7", From f0f50987a76880ec55f27d41813a7f61d121f428 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 23 Jul 2021 00:56:14 -0400 Subject: [PATCH 0174/1858] vcpkg_configure_make: MacOS assume target arch is host arch (#18632) This is to guard against MacOS triplets that don't list VCPKG_OSX_ARCHITECTURES --- scripts/cmake/vcpkg_configure_make.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index d1b87d454a0848..599eaf5917c128 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -148,7 +148,9 @@ endmacro() macro(_vcpkg_determine_autotools_target_arch_mac out_var) list(LENGTH VCPKG_OSX_ARCHITECTURES _num_osx_archs) - if(_num_osx_archs GREATER_EQUAL 2) + if(_num_osx_archs EQUAL 0) + set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + elseif(_num_osx_archs GREATER_EQUAL 2) set(${out_var} "universal") else() # Better match the arch behavior of config.guess From 2df2cb3ffc7c18d31f657aa77b42950885de4b74 Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Fri, 23 Jul 2021 12:57:32 +0800 Subject: [PATCH 0175/1858] [azure-storage-cpp] Deprecate azure-storage-cpp package (#18618) * Add "legacy" to the description of azure-storage-cpp * vcpkg x-add-version azure-storage-cpp --overwrite-version * print a message * update version * update json file * Fix typo * Update version stuff * add new sdk * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/azure-storage-cpp/CONTROL | 3 ++- ports/azure-storage-cpp/portfile.cmake | 1 + versions/a-/azure-storage-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL index 08c09f0296399a..d8c772570932ab 100644 --- a/ports/azure-storage-cpp/CONTROL +++ b/ports/azure-storage-cpp/CONTROL @@ -1,7 +1,8 @@ Source: azure-storage-cpp Version: 7.5.0 +Port-Version: 1 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext (osx) -Description: Microsoft Azure Storage Client SDK for C++ +Description: [legacy] Microsoft Azure Storage Client SDK for C++ A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. Homepage: https://blogs.msdn.com/b/windowsazurestorage/ Supports: !uwp diff --git a/ports/azure-storage-cpp/portfile.cmake b/ports/azure-storage-cpp/portfile.cmake index 2b23123b26ebc7..c091b31c0c0942 100644 --- a/ports/azure-storage-cpp/portfile.cmake +++ b/ports/azure-storage-cpp/portfile.cmake @@ -1,3 +1,4 @@ +message(WARNING "azure-storage-cpp is no longer actively developed. Instead, users should migrate to the new sdk:azure-core-cpp") vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( diff --git a/versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json index d448c12603085e..e0e8ff684c7384 100644 --- a/versions/a-/azure-storage-cpp.json +++ b/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b3b868fab128f5e37adeffcde308124512d25e0", + "version-string": "7.5.0", + "port-version": 1 + }, { "git-tree": "2f95f8b92596e23af8db61cd1b4e11a06078015f", "version-string": "7.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index 3a10fed8eccbc9..132ff07983dfbb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -310,7 +310,7 @@ }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 0 + "port-version": 1 }, "azure-storage-files-datalake-cpp": { "baseline": "12.0.1", From f131ba344914fcfeab542a15644e7adc51d2bdbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20G=2E=20Barna?= Date: Fri, 23 Jul 2021 06:58:32 +0200 Subject: [PATCH 0176/1858] [laszip] Migrate LASzip to the new manifest format. (#18614) * Migrate LASzip to the new manifest format. - CONTROL -> vcpkg.json - vcpkg_configure_cmake -> vcpkg_cmake_configure - vcpkg_install_cmake -> vcpkg_cmake_install * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/laszip/CONTROL | 3 --- ports/laszip/portfile.cmake | 13 ++++++------- ports/laszip/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 2 +- versions/l-/laszip.json | 5 +++++ 5 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 ports/laszip/CONTROL create mode 100644 ports/laszip/vcpkg.json diff --git a/ports/laszip/CONTROL b/ports/laszip/CONTROL deleted file mode 100644 index 91d94fd1613490..00000000000000 --- a/ports/laszip/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: laszip -Version: 3.4.3 -Description: LASzip - free and lossless LiDAR compression diff --git a/ports/laszip/portfile.cmake b/ports/laszip/portfile.cmake index 0628411a8bfa08..de6508db06038b 100644 --- a/ports/laszip/portfile.cmake +++ b/ports/laszip/portfile.cmake @@ -8,19 +8,18 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LASZIP_BUILD_STATIC) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DLASZIP_BUILD_STATIC=${LASZIP_BUILD_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/laszip RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/laszip" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Remove laszip_api3 dll since it doesn't export functions properly during build. -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/laszip_api3.dll) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/laszip_api3.dll) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/laszip_api3.dll") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/laszip_api3.dll") diff --git a/ports/laszip/vcpkg.json b/ports/laszip/vcpkg.json new file mode 100644 index 00000000000000..40e5268176411a --- /dev/null +++ b/ports/laszip/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "laszip", + "version": "3.4.3", + "port-version": 1, + "description": "LASzip - free and lossless LiDAR compression", + "homepage": "https://laszip.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 132ff07983dfbb..807e2791028c29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2986,7 +2986,7 @@ }, "laszip": { "baseline": "3.4.3", - "port-version": 0 + "port-version": 1 }, "lazy-importer": { "baseline": "2019-08-10", diff --git a/versions/l-/laszip.json b/versions/l-/laszip.json index 439d021733cecb..17df9cf1fbe019 100644 --- a/versions/l-/laszip.json +++ b/versions/l-/laszip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81b6a105440d08f2c29b044da3f0661e46ddb0a8", + "version": "3.4.3", + "port-version": 1 + }, { "git-tree": "6b7b406aadbae2a288bde7f2b268a7c302bfdf67", "version-string": "3.4.3", From 563a4486e2e7a6790a8ca25bc8fa4d77b6e2d323 Mon Sep 17 00:00:00 2001 From: "Lucius Q. User" <31438459+Lucius-Q-User@users.noreply.github.com> Date: Fri, 23 Jul 2021 08:00:40 +0300 Subject: [PATCH 0177/1858] [icu] Fix x86-osx -> arm64-osx cross-compilation (#18608) --- ports/icu/portfile.cmake | 9 +++++---- ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 386982cd6d95dd..64ca15b9fc327b 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_download_distfile( ARCHIVE URLS "https://github.com/unicode-org/icu/releases/download/release-${VERSION3}/icu4c-${VERSION2}-src.tgz" FILENAME "icu4c-${VERSION2}-src.tgz" - SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 + SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH @@ -53,6 +53,7 @@ vcpkg_configure_make( OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} + DETERMINE_BUILD_TRIPLET ) if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")) @@ -76,7 +77,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF ) message(STATUS "setting rpath prefix for macOS dynamic libraries") - + # add ID_PREFIX to libicudata libicui18n libicuio libicutu libicuuc foreach(LIB_NAME libicudata libicui18n libicuio libicutu libicuuc) vcpkg_execute_build_process( @@ -86,7 +87,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" ) endforeach() - + # add ID_PREFIX to libicui18n libicuio libicutu dependencies foreach(LIB_NAME libicui18n libicuio) vcpkg_execute_build_process( @@ -131,7 +132,7 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" LOGNAME "make-install-${RELEASE_TRIPLET}") message(STATUS "Package ${RELEASE_TRIPLET} done") - + else() vcpkg_install_make() endif() diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 88e82a08dd3304..3396b0f9c44cc0 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 10, + "port-version": 11, "description": "Mature and widely used Unicode and localization library.", "homepage": "http://icu-project.org/apiref/icu4c/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 807e2791028c29..19455e998cf433 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2566,7 +2566,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 10 + "port-version": 11 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 7f106d54b9219f..41fe2dbb8287c7 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46d639d2e138f9ee3362fd8023f64463ae4e6afa", + "version": "69.1", + "port-version": 11 + }, { "git-tree": "07e8fca3896a13ac7b4196e104015174429a6c74", "version": "69.1", From af5d3c4332197a15d7c2e9173484b702de36bdfa Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Fri, 23 Jul 2021 13:03:51 +0800 Subject: [PATCH 0178/1858] [teemo] Update version to v2.2. (#18551) * [teemo] Update version to v2.3. * [teemo] Modify version to v2.2 * [teemo] Run `vcpkg x-add-version teemo` to add version info. * [teemo] Update Build-Depends. * Update versions/t-/teemo.json Co-authored-by: NancyLi1013 --- ports/teemo/CONTROL | 4 ++-- ports/teemo/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/t-/teemo.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/teemo/CONTROL b/ports/teemo/CONTROL index 843f68e834b1a2..223fd6e5adc335 100644 --- a/ports/teemo/CONTROL +++ b/ports/teemo/CONTROL @@ -1,5 +1,5 @@ Source: teemo -Version: 2.1 -Build-Depends: curl[non-http] +Version: 2.2 +Build-Depends: curl[core] Description: C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed. Homepage: https://github.com/winsoft666/teemo \ No newline at end of file diff --git a/ports/teemo/portfile.cmake b/ports/teemo/portfile.cmake index 55afaf490f1fef..94118a36d95c36 100644 --- a/ports/teemo/portfile.cmake +++ b/ports/teemo/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO winsoft666/teemo - REF 99b012f827ba126fe43986e6c9266f656120edd6 - SHA512 b6fcbba897b370154965a5e884a6dbd13aa1dab1ec25f404125b62f3857752b5c8e791a90014ef058e839c21f1deae8b88df2d9a8084a9e48f7f676561aa9dc9 + REF f8019d3ea75b20bbd0d05693ba9f12a1ed0cebce + SHA512 f9ce0273909d07485d04c09dd29e2336186b058f4bfe4809ada1b7e831431ecf96049fb18cda21c27f3e8a652eb1f4c50a4b957b7f69b3918d41ab7a777240fe HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index 19455e998cf433..591b749e1780b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6161,7 +6161,7 @@ "port-version": 0 }, "teemo": { - "baseline": "2.1", + "baseline": "2.2", "port-version": 0 }, "telnetpp": { diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json index 92279f6d595788..647de20f5ef91e 100644 --- a/versions/t-/teemo.json +++ b/versions/t-/teemo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ca1723ca09260ded55e97381d5ad169e775baa5", + "version-string": "2.2", + "port-version": 0 + }, { "git-tree": "d51932720b4cbcb753d076b0045d96153522e441", "version-string": "2.1", From 472b00ba78a89b7cf55b447c4b54ea3284eb0477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 23 Jul 2021 07:05:06 +0200 Subject: [PATCH 0179/1858] [openblas] Fix C/CXX flag customization in openblas (#18535) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix C/CXX flag customization in openblas * Update ports/openblas/portfile.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * Update versions * Update versions/o-/openblas.json * Fix merge conflict * Update versions/o-/openblas.json Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III --- ports/openblas/portfile.cmake | 4 ++-- ports/openblas/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openblas.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index df74c3e68219de..26210169228335 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -79,8 +79,8 @@ elseif(VCPKG_TARGET_IS_WINDOWS) ${COMMON_OPTIONS} ) else() - list(APPEND VCPKG_C_FLAGS "-DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ - list(APPEND VCPKG_CXX_FLAGS "-DNEEDBUNDERSCORE") + string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ + string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 657558ade14e30..8315910a3cfca6 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openblas", "version": "0.3.10", - "port-version": 2, + "port-version": 3, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 591b749e1780b0..c7e495c15ff4b6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4546,7 +4546,7 @@ }, "openblas": { "baseline": "0.3.10", - "port-version": 2 + "port-version": 3 }, "opencascade": { "baseline": "7.5.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index fcc607ec4f243d..5b2fde684a9493 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20d57360e6e7afa4e4f033a87e1ded91571ee462", + "version": "0.3.10", + "port-version": 3 + }, { "git-tree": "510adc011214327468768aa22c1f08a2d2d632ab", "version": "0.3.10", From 6dea058cba928512298610f61e3fb3e888f1fbb7 Mon Sep 17 00:00:00 2001 From: Andrey Nekrasov Date: Fri, 23 Jul 2021 08:08:12 +0300 Subject: [PATCH 0180/1858] [spdlog] Update to 1.9.0 (#18512) --- ports/spdlog/fix-mingw-build.patch | 6 +++--- ports/spdlog/portfile.cmake | 4 ++-- ports/spdlog/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/s-/spdlog.json | 5 +++++ 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ports/spdlog/fix-mingw-build.patch b/ports/spdlog/fix-mingw-build.patch index a82a9d10b8c0fe..1abfdd350b2def 100644 --- a/ports/spdlog/fix-mingw-build.patch +++ b/ports/spdlog/fix-mingw-build.patch @@ -2,12 +2,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index b969465..31e23cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -136,7 +136,7 @@ if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS) +@@ -142,7 +142,7 @@ if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS) endif() add_library(spdlog SHARED ${SPDLOG_SRCS} ${SPDLOG_ALL_HEADERS}) target_compile_definitions(spdlog PUBLIC SPDLOG_SHARED_LIB) - if(MSVC) + if(MSVC AND NOT MINGW) - target_compile_options(spdlog PUBLIC - $<$,$>>:/wd4251 /wd4275>) + target_compile_options(spdlog PUBLIC $<$,$>>:/wd4251 + /wd4275>) endif() diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 1943ad86d77cf7..89651a6c9e2f06 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.8.5 - SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c + REF v1.9.0 + SHA512 df023847e49b2ad8e5dc4cb681d31515bb7f87644a4baa946836cf3cb4114bb95ad603b746969e0e7f8220d3bfa453220c00dfde812f1e610801a5cc62e1f0f2 HEAD_REF v1.x PATCHES fix-mingw-build.patch ) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index ec5df5609a499c..b545e191d4caa6 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spdlog", - "version-semver": "1.8.5", - "port-version": 4, + "version-semver": "1.9.0", + "port-version": 1, "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index c7e495c15ff4b6..9f9872ce673979 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5981,8 +5981,8 @@ "port-version": 0 }, "spdlog": { - "baseline": "1.8.5", - "port-version": 4 + "baseline": "1.9.0", + "port-version": 1 }, "spectra": { "baseline": "0.9.0", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index 1c0c72dae5822e..e296b262aa0b7f 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "580c9da088d8545f17b4b5753b4216ddb2ea977f", + "version-semver": "1.9.0", + "port-version": 1 + }, { "git-tree": "ac601a8d86ea3edc831933ad7e12eee11ac6e6db", "version-semver": "1.8.5", From 0de904d5d97458cfc447dc1be47a6a870d27c15f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 23 Jul 2021 07:10:42 +0200 Subject: [PATCH 0181/1858] [tiff] Fix build on arm64-linux (#18511) * Fix FindCMath * x-add-version --- ports/tiff/FindCMath.patch | 13 +++++++++++++ ports/tiff/portfile.cmake | 1 + ports/tiff/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tiff.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/tiff/FindCMath.patch diff --git a/ports/tiff/FindCMath.patch b/ports/tiff/FindCMath.patch new file mode 100644 index 00000000000000..9158f6fcf816b9 --- /dev/null +++ b/ports/tiff/FindCMath.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindCMath.cmake b/cmake/FindCMath.cmake +index 2da3b7f..e6d5145 100644 +--- a/cmake/FindCMath.cmake ++++ b/cmake/FindCMath.cmake +@@ -32,7 +32,7 @@ include(CheckLibraryExists) + + check_symbol_exists(pow "math.h" CMath_HAVE_LIBC_POW) + if(NOT CMath_HAVE_LIBC_POW) +- find_library(CMath_LIBRARY NAMES m) ++ find_library(CMath_LIBRARY NAMES m PATHS ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}) + + set(CMAKE_REQUIRED_LIBRARIES_SAVE ${CMAKE_REQUIRED_LIBRARIES}) + set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMath_LIBRARY}) diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index 1e36968fe59445..57b7543b30367b 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex( PATCHES cmakelists.patch fix-pkgconfig.patch + FindCMath.patch ) set(EXTRA_OPTIONS "") diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index 494a349571ab11..f31b99cdce643e 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tiff", "version": "4.3.0", + "port-version": 1, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9f9872ce673979..01921d95c5a177 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6234,7 +6234,7 @@ }, "tiff": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 8a52bde57e632e..fb7ecc60db664c 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8d1b0803b30c4fd2ea762d62b8d43cd09ff40f0", + "version": "4.3.0", + "port-version": 1 + }, { "git-tree": "e6f91f4785acec97b685989a9c61fa96927cf707", "version": "4.3.0", From 737e76b845a7c022f04ef79e0dcbabb298c10098 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 23 Jul 2021 13:11:45 +0800 Subject: [PATCH 0182/1858] [openssl] Fix vcpkg-cmake-wrapper.cmake (#18475) * [openssl] Fix vcpkg-cmake-wrapper.cmake * Update baseline revision * Update the wrapper * Update the baseline * Update the wrapper * Update the baseline * Update the wrapper * Update the baseline * Update the wrapper * Update the baseline * Update the wrapper * Update the baseline * Update the wrapper * Update the baseline * Bump port-version. * Update the baseline version Co-authored-by: Billy Robert O'Neal III --- ports/openssl/portfile.cmake | 2 +- ports/openssl/unix/portfile.cmake | 4 - ports/openssl/unix/vcpkg-cmake-wrapper.cmake | 18 ----- ports/openssl/vcpkg-cmake-wrapper.cmake | 35 --------- ports/openssl/vcpkg-cmake-wrapper.cmake.in | 73 +++++++++++++++++++ ports/openssl/vcpkg.json | 2 +- ports/openssl/windows/portfile.cmake | 3 - .../openssl/windows/vcpkg-cmake-wrapper.cmake | 10 --- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 ++ 10 files changed, 81 insertions(+), 73 deletions(-) delete mode 100644 ports/openssl/unix/vcpkg-cmake-wrapper.cmake delete mode 100644 ports/openssl/vcpkg-cmake-wrapper.cmake create mode 100644 ports/openssl/vcpkg-cmake-wrapper.cmake.in delete mode 100644 ports/openssl/windows/vcpkg-cmake-wrapper.cmake diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index 445bce149dce82..c507c0f7e2562d 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -21,5 +21,5 @@ else() include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake") endif() -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake index 912234925079d8..f051fd63975f16 100644 --- a/ports/openssl/unix/portfile.cmake +++ b/ports/openssl/unix/portfile.cmake @@ -43,7 +43,3 @@ endforeach() file(INSTALL ${RESOLVED_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/openssl) file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl) -endif() diff --git a/ports/openssl/unix/vcpkg-cmake-wrapper.cmake b/ports/openssl/unix/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 43e84cb022a797..00000000000000 --- a/ports/openssl/unix/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,18 +0,0 @@ -_find_package(${ARGS}) -if(OPENSSL_FOUND) - find_library(OPENSSL_DL_LIBRARY NAMES dl) - if(OPENSSL_DL_LIBRARY) - list(APPEND OPENSSL_LIBRARIES "dl") - if(TARGET OpenSSL::Crypto) - set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl") - endif() - endif() - find_package(Threads REQUIRED) - list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) - if(TARGET OpenSSL::Crypto) - set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") - endif() - if(TARGET OpenSSL::SSL) - set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") - endif() -endif() diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 6ef468ee6c6c25..00000000000000 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,35 +0,0 @@ -set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR}) -get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) -get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) - -file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES) -set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)") -file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86) -set(CMAKE_SYSTEM_IGNORE_PATH - "${Z_VCPKG_PROGRAMFILES}/OpenSSL" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC/static" - "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC/static" - "C:/OpenSSL/" - "C:/OpenSSL-Win32/" - "C:/OpenSSL-Win64/" - "C:/OpenSSL-Win32/lib/VC" - "C:/OpenSSL-Win64/lib/VC" - "C:/OpenSSL-Win32/lib/VC/static" - "C:/OpenSSL-Win64/lib/VC/static" -) - -_find_package(${ARGS}) - -set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in new file mode 100644 index 00000000000000..f1c3176cf175ae --- /dev/null +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -0,0 +1,73 @@ +set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR}) +get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) +get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH) + +if(CMAKE_HOST_WIN32) + file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES) + set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)") + file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86) + set(CMAKE_SYSTEM_IGNORE_PATH + "${Z_VCPKG_PROGRAMFILES}/OpenSSL" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC/static" + "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC/static" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC/static" + "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC/static" + "C:/OpenSSL/" + "C:/OpenSSL-Win32/" + "C:/OpenSSL-Win64/" + "C:/OpenSSL-Win32/lib/VC" + "C:/OpenSSL-Win64/lib/VC" + "C:/OpenSSL-Win32/lib/VC/static" + "C:/OpenSSL-Win64/lib/VC/static" + ) +endif() + +_find_package(${ARGS}) + +set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) + +if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + if(WIN32) + list(APPEND OPENSSL_LIBRARIES Crypt32.lib ws2_32.lib) + if(TARGET OpenSSL::Crypto) + set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib") + endif() + if(TARGET OpenSSL::SSL) + set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib") + endif() + else() + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + find_library(OPENSSL_DL_LIBRARY NAMES dl) + if(OPENSSL_DL_LIBRARY) + list(APPEND OPENSSL_LIBRARIES "dl") + if(TARGET OpenSSL::Crypto) + set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl") + endif() + endif() + + if("REQUIRED" IN_LIST ARGS) + find_package(Threads REQUIRED) + else() + find_package(Threads) + endif() + list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + if(TARGET OpenSSL::Crypto) + set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") + endif() + if(TARGET OpenSSL::SSL) + set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads") + endif() + cmake_policy(POP) + endif() +endif() diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 6dc21f4930b45f..9c4ec7f1e1117e 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1k", - "port-version": 7, + "port-version": 8, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake index 3065abddc6f04f..4987e810760761 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -172,6 +172,3 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/openssl") -endif() diff --git a/ports/openssl/windows/vcpkg-cmake-wrapper.cmake b/ports/openssl/windows/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index 715448d25c170f..00000000000000 --- a/ports/openssl/windows/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,10 +0,0 @@ -_find_package(${ARGS}) -if(OPENSSL_FOUND) - list(APPEND OPENSSL_LIBRARIES Crypt32.lib ws2_32.lib) - if(TARGET OpenSSL::Crypto) - set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib") - endif() - if(TARGET OpenSSL::SSL) - set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib") - endif() -endif() diff --git a/versions/baseline.json b/versions/baseline.json index 01921d95c5a177..3b4114f17a9a3f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4654,7 +4654,7 @@ }, "openssl": { "baseline": "1.1.1k", - "port-version": 7 + "port-version": 8 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 474c91547d727b..d6807c92980b74 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80b86b6b857d1b7bbb2c24cfcded13c28a4c3e81", + "version-string": "1.1.1k", + "port-version": 8 + }, { "git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705", "version-string": "1.1.1k", From 11ee8bef5971f371e22ae6cb43a26d30115d27d9 Mon Sep 17 00:00:00 2001 From: Stijn Herfst Date: Fri, 23 Jul 2021 07:13:18 +0200 Subject: [PATCH 0183/1858] [soil2] Update version (#18453) * [soil2] Update version * update version files * Update ports/soil2/CONTROL * update control file * [soil2] Remove CMake version support * Remove CMake version copy * update version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Robert Schumacher --- ports/soil2/CMakeLists.txt | 50 +++++++++++-------------- ports/soil2/CONTROL | 3 -- ports/soil2/portfile.cmake | 5 +-- ports/soil2/soil2ConfigVersion.cmake.in | 11 ------ ports/soil2/vcpkg.json | 6 +++ versions/baseline.json | 2 +- versions/s-/soil2.json | 5 +++ 7 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 ports/soil2/CONTROL delete mode 100644 ports/soil2/soil2ConfigVersion.cmake.in create mode 100644 ports/soil2/vcpkg.json diff --git a/ports/soil2/CMakeLists.txt b/ports/soil2/CMakeLists.txt index 6b5368e47bb1ad..ca0b7ca6a0f53c 100644 --- a/ports/soil2/CMakeLists.txt +++ b/ports/soil2/CMakeLists.txt @@ -13,27 +13,27 @@ set(INSTALL_CMAKE_DIR share/soil2) # Set the source files to compile set(SOIL2_SRC - src/SOIL2/etc1_utils.c - src/SOIL2/image_DXT.c - src/SOIL2/image_helper.c - src/SOIL2/SOIL2.c -) - -# Set the soil2 headers -set(SOIL2_HEADERS - src/SOIL2/SOIL2.h - src/SOIL2/etc1_utils.h - src/SOIL2/image_DXT.h - src/SOIL2/image_helper.h - src/SOIL2/jo_jpeg.h - src/SOIL2/pkm_helper.h - src/SOIL2/pvr_helper.h - src/SOIL2/stb_image.h - src/SOIL2/stb_image_write.h - src/SOIL2/stbi_DDS.h - src/SOIL2/stbi_ext.h - src/SOIL2/stbi_pkm.h - src/SOIL2/stbi_pvr.h + "src/SOIL2/image_DXT.c" + "src/SOIL2/image_DXT.h" + "src/SOIL2/image_helper.c" + "src/SOIL2/image_helper.h" + "src/SOIL2/jo_jpeg.h" + "src/SOIL2/pkm_helper.h" + "src/SOIL2/pvr_helper.h" + "src/SOIL2/SOIL2.c" + "src/SOIL2/SOIL2.h" + "src/SOIL2/stbi_DDS.h" + "src/SOIL2/stbi_DDS_c.h" + "src/SOIL2/stbi_ext.h" + "src/SOIL2/stbi_ext_c.h" + "src/SOIL2/stbi_pkm.h" + "src/SOIL2/stbi_pkm_c.h" + "src/SOIL2/stbi_pvr.h" + "src/SOIL2/stbi_pvr_c.h" + "src/SOIL2/stb_image.h" + "src/SOIL2/stb_image_write.h" + "src/SOIL2/wfETC.c" + "src/SOIL2/wfETC.h" ) # Add the library as a static linkage @@ -58,11 +58,7 @@ if(INSTALL_HEADERS) ) # Install the headers - install(FILES ${SOIL2_HEADERS} - DESTINATION include/SOIL2/) - - # Prepare for install package files - set(SOIL2_VERSION "release-1.11") + install(FILES "src/SOIL2/SOIL2.h" DESTINATION include/SOIL2/) # Export the stuff export(TARGETS soil2 FILE "${PROJECT_BINARY_DIR}/soil2Targets.cmake") @@ -70,12 +66,10 @@ if(INSTALL_HEADERS) # Create the soil2Config.cmake and soil2ConfigVersion.cmake configure_file(soil2Config.cmake.in "${PROJECT_BINARY_DIR}/soil2Config.cmake" @ONLY) - configure_file(soil2ConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/soil2ConfigVersion.cmake" @ONLY) # Install the soil2Config.cmake and soil2ConfigVersion.cmake install(FILES "${PROJECT_BINARY_DIR}/soil2Config.cmake" - "${PROJECT_BINARY_DIR}/soil2ConfigVersion.cmake" DESTINATION "${INSTALL_CMAKE_DIR}" ) diff --git a/ports/soil2/CONTROL b/ports/soil2/CONTROL deleted file mode 100644 index 07cfde7fbcde0f..00000000000000 --- a/ports/soil2/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: soil2 -Version: release-1.11-1 -Description: Simple OpenGL Image Library 2 \ No newline at end of file diff --git a/ports/soil2/portfile.cmake b/ports/soil2/portfile.cmake index e468c07cb6c2f0..24f40a144d906b 100644 --- a/ports/soil2/portfile.cmake +++ b/ports/soil2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SpartanJ/soil2 - REF 7dc42acee2302780c1e100bf864aa2bdb2221a2b #release-1.11 - SHA512 13f1716a3766cb4fa8d5b90eae5f3795ed3c86fc4463ca1cd68f4fa6b7fd96c24ec5098673c1d7253c94bdd491854b9359f8ccb8bd5b5640eeff3605f52e17a5 + REF 51023d551d895fb4beb576d726d798ccfe358d34 + SHA512 5ce8b3f04eea674cdef7ee58778e81bcefa5df7afb1013ad28dcd2d502e26915529da8bf06b751b8c350165172866e4f99d4b1081bb6c7ba04ac83a78faba83c HEAD_REF master ) @@ -11,7 +11,6 @@ file( ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/LICENSE ${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in - ${CMAKE_CURRENT_LIST_DIR}/soil2ConfigVersion.cmake.in DESTINATION ${SOURCE_PATH} ) diff --git a/ports/soil2/soil2ConfigVersion.cmake.in b/ports/soil2/soil2ConfigVersion.cmake.in deleted file mode 100644 index a6ae96f3205821..00000000000000 --- a/ports/soil2/soil2ConfigVersion.cmake.in +++ /dev/null @@ -1,11 +0,0 @@ -set(PACKAGE_VERSION "@SOIL2_VERSION@") - -# Check whether the requested PACKAGE_FIND_VERSION is compatible -if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_COMPATIBLE FALSE) -else() - set(PACKAGE_VERSION_COMPATIBLE TRUE) - if("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}") - set(PACKAGE_VERSION_EXACT TRUE) - endif() -endif() diff --git a/ports/soil2/vcpkg.json b/ports/soil2/vcpkg.json new file mode 100644 index 00000000000000..4fe08daa32341a --- /dev/null +++ b/ports/soil2/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "soil2", + "version-date": "2021-05-01", + "description": "Simple OpenGL Image Library 2", + "homepage": "https://github.com/SpartanJ/SOIL2" +} diff --git a/versions/baseline.json b/versions/baseline.json index 3b4114f17a9a3f..c8f0e4c4509c82 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5909,7 +5909,7 @@ "port-version": 0 }, "soil2": { - "baseline": "release-1.11-1", + "baseline": "2021-05-01", "port-version": 0 }, "sokol": { diff --git a/versions/s-/soil2.json b/versions/s-/soil2.json index 42b85e330d9987..e85069310b8c5d 100644 --- a/versions/s-/soil2.json +++ b/versions/s-/soil2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e72741e77acc80b5d72a64ce396f6a713548e3a1", + "version-date": "2021-05-01", + "port-version": 0 + }, { "git-tree": "79c6e11f43a4805471a2644ae07ad6e593e68646", "version-string": "release-1.11-1", From c3eb7a44ba491abc36beaf96078f6f9f642a1271 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Fri, 23 Jul 2021 08:15:49 +0300 Subject: [PATCH 0184/1858] [SLikeNet] Update and fix building with x64-mingw-static (#18358) * SLikeNet now builds under MinGW Use vcpkg.json instead of CONTROL Fix Run x-add-version Fix deprecation warning Update ports/slikenet/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/slikenet/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Run vcpkg x-add-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III --- ports/slikenet/CONTROL | 6 ------ ports/slikenet/portfile.cmake | 13 ++++--------- ports/slikenet/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/s-/slikenet.json | 5 +++++ 5 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 ports/slikenet/CONTROL create mode 100644 ports/slikenet/vcpkg.json diff --git a/ports/slikenet/CONTROL b/ports/slikenet/CONTROL deleted file mode 100644 index 5753ce9aa354a4..00000000000000 --- a/ports/slikenet/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: slikenet -Version: 2019-10-22-2 -Homepage: https://github.com/SLikeSoft/SLikeNet -Description: SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development. -Build-Depends: openssl -Supports: !uwp diff --git a/ports/slikenet/portfile.cmake b/ports/slikenet/portfile.cmake index c321f653c5917e..ba5ef493feef65 100644 --- a/ports/slikenet/portfile.cmake +++ b/ports/slikenet/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SLikeSoft/SLikeNet - REF cca394f05e9e9e3e315a85539e648f267d3f2fcc - SHA512 410954bda5a7be309eb71c3078f8ea67ff21aae2ce923f01db77b09265969f1350afb45b90194118bfad274f0a36a2d3bbc38d86a15507fdfc4bc8edc4a0204c + REF 358462052fce7e585fc1cce0a17a7042ba724c08 + SHA512 2c932b0a7910ec36dd6a340dd841cefcf259fbdadadff220747d13752181ea14e3c5f05331beb36dea21c0de360edc270ff4c55375bbea23ee2149828f07e9ab HEAD_REF master PATCHES fix-install.patch @@ -12,13 +12,8 @@ vcpkg_from_github( #Uses an outdated OpenSSL version and is in an experimental namespace any way. As such we delete it here file(REMOVE_RECURSE "${SOURCE_PATH}/Source/src/crypto" "${SOURCE_PATH}/Source/include/slikenet/crypto") -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(SLIKENET_ENABLE_STATIC TRUE) - set(SLIKENET_ENABLE_DLL FALSE) -else() - set(SLIKENET_ENABLE_STATIC FALSE) - set(SLIKENET_ENABLE_DLL TRUE) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SLIKENET_ENABLE_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SLIKENET_ENABLE_DLL) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/slikenet/vcpkg.json b/ports/slikenet/vcpkg.json new file mode 100644 index 00000000000000..158a28c4851c81 --- /dev/null +++ b/ports/slikenet/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "slikenet", + "version-date": "2021-06-07", + "description": "SLikeNetT is an Open Source/Free Software cross-platform network engine written in C++ and specifially designed for games (and applications which have comparable requirements on a network engine like games) building upon the discontinued RakNet network engine which had more than 13 years of active development.", + "homepage": "https://github.com/SLikeSoft/SLikeNet", + "supports": "!uwp", + "dependencies": [ + "openssl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c8f0e4c4509c82..6bddefd817b374 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5857,7 +5857,7 @@ "port-version": 0 }, "slikenet": { - "baseline": "2019-10-22-2", + "baseline": "2021-06-07", "port-version": 0 }, "sltbench": { diff --git a/versions/s-/slikenet.json b/versions/s-/slikenet.json index 5bb738ff0f3c0e..ee83f0113e39ba 100644 --- a/versions/s-/slikenet.json +++ b/versions/s-/slikenet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac7b0f3e2e112489c1d66b390c22e050bd410783", + "version-date": "2021-06-07", + "port-version": 0 + }, { "git-tree": "fd99081ecbebc7fe7639cc9a61899ff6fb977d04", "version-string": "2019-10-22-2", From e5cf124e993e1817cfde719df6eb0884ce8628bd Mon Sep 17 00:00:00 2001 From: Anthony Calandra Date: Fri, 23 Jul 2021 01:38:59 -0400 Subject: [PATCH 0185/1858] Allow specifing the ODBC version for nanodbc. (#17974) --- ports/nanodbc/CONTROL | 4 ++-- ports/nanodbc/portfile.cmake | 7 ++++++- versions/baseline.json | 2 +- versions/n-/nanodbc.json | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL index 6903ada8534e9f..339e2125106100 100644 --- a/ports/nanodbc/CONTROL +++ b/ports/nanodbc/CONTROL @@ -1,6 +1,6 @@ Source: nanodbc Version: 2.13.0 -Port-Version: 2 -Homepage: https://github.com/lexicalunit/nanodbc +Port-Version: 3 +Homepage: https://github.com/nanodbc/nanodbc Description: A small C++ wrapper for the native C ODBC API. Build-Depends: unixodbc(!windows) diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index da2cba0cdcc575..94ffb08936bdcc 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -1,7 +1,7 @@ # Only static libraries are supported. # See https://github.com/nanodbc/nanodbc/issues/13 vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanodbc/nanodbc @@ -10,6 +10,10 @@ vcpkg_from_github( HEAD_REF master ) +if(DEFINED NANODBC_ODBC_VERSION) + set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION}) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -17,6 +21,7 @@ vcpkg_configure_cmake( -DNANODBC_DISABLE_EXAMPLES=ON -DNANODBC_DISABLE_TESTS=ON -DNANODBC_ENABLE_UNICODE=OFF + ${NANODBC_ODBC_VERSION} ) vcpkg_install_cmake() diff --git a/versions/baseline.json b/versions/baseline.json index 6bddefd817b374..a74e70abcd8642 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4278,7 +4278,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 2 + "port-version": 3 }, "nanoflann": { "baseline": "1.3.1", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index 5000badb16772c..d5a9e7b9dcacc8 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c22ba3957ee9a1a2c6d893c746b6a51bf38435c", + "version-string": "2.13.0", + "port-version": 3 + }, { "git-tree": "4610c5bd3b7d399b683bea63cb00fe277bbcb3f8", "version-string": "2.13.0", From 2e5339fd89fcf269bb37a14df33d14ac0e2df138 Mon Sep 17 00:00:00 2001 From: Angus Comrie Date: Fri, 23 Jul 2021 07:47:28 +0200 Subject: [PATCH 0186/1858] [starlink-ast] create new port (#17105) * initial test of AST (broken) * slight improvement to build * almost working... * added minpack cflags * use static linking * yaml and pthreads features added * debug and release cflags * versioning * formated vcpkg.json * updated version string * adjusted based on PR feedback * updated to 9.2.4 release to avoid source patching * removed comments * updated baseline version * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> * adds supports field to json * Update ports/starlink-ast/portfile.cmake adjust configure options Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> * removed --disabled-shared and MINPACK_NO_DLL * use DETERMINE_BUILD_TRIPLET to determine host * updates git-tree hash * quotemarks fix * git tree hash update Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> --- ports/starlink-ast/portfile.cmake | 44 +++++++++++++++++++++++++++++++ ports/starlink-ast/vcpkg.json | 21 +++++++++++++++ versions/baseline.json | 4 +++ versions/s-/starlink-ast.json | 9 +++++++ 4 files changed, 78 insertions(+) create mode 100644 ports/starlink-ast/portfile.cmake create mode 100644 ports/starlink-ast/vcpkg.json create mode 100644 versions/s-/starlink-ast.json diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake new file mode 100644 index 00000000000000..b49c1332041965 --- /dev/null +++ b/ports/starlink-ast/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_fail_port_install(ON_TARGET "Linux" "OSX") + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/Starlink/ast/releases/download/v9.2.4/ast-9.2.4.tar.gz" + FILENAME "ast-9.2.4.tar.gz" + SHA512 84e6f243e6d9d77328b73b97355feb3990307fb9c8f9b2f30344d71e2f5e63a849cdce0090ff5b7cc16028e12d68516c885b13d76db841072c9d1d06a7742a9e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +set(CONFIGURE_OPTIONS "--without-fortran star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no") + +if ("yaml" IN_LIST FEATURES) + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --with-yaml") +else() + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-yaml") +endif() + +if ("pthreads" IN_LIST FEATURES) + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --with-pthreads") +else() + set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-pthreads") +endif() + +vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16 perl) +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + USE_WRAPPERS + DETERMINE_BUILD_TRIPLET + OPTIONS ${CONFIGURE_OPTIONS} + OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} + OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} +) + +vcpkg_install_make() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json new file mode 100644 index 00000000000000..8bbc2238c41685 --- /dev/null +++ b/ports/starlink-ast/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "starlink-ast", + "version-semver": "9.2.4", + "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", + "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", + "supports": "windows", + "features": { + "pthreads": { + "description": "build with POSIX threads support", + "dependencies": [ + "pthreads" + ] + }, + "yaml": { + "description": "build with YAML support", + "dependencies": [ + "libyaml" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index a74e70abcd8642..4e7866e2039597 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6056,6 +6056,10 @@ "baseline": "0.6.4", "port-version": 0 }, + "starlink-ast": { + "baseline": "9.2.4", + "port-version": 0 + }, "status-code": { "baseline": "1.0.0-ab3cd821", "port-version": 0 diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json new file mode 100644 index 00000000000000..f357f55c5425ed --- /dev/null +++ b/versions/s-/starlink-ast.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "50f0b71ca66bd9e4ce6cb5a153e25878dd7a0600", + "version-semver": "9.2.4", + "port-version": 0 + } + ] +} From d3a5a77f6580a5d4f109a1098ad80fbaeb918555 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Fri, 23 Jul 2021 01:48:48 -0400 Subject: [PATCH 0187/1858] [physfs] Patches to fix behavior on macOS / Linux (#15962) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [physfs] Patches to fix behavior on macOS / Linux * Run x-add-version physfs * Update ports/physfs/portfile.cmake * Update ports/physfs/portfile.cmake * Update versions/p-/physfs.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ...ch => 001-fix-lzmasdk-arm64-windows.patch} | 0 ports/physfs/002-fix-posix-eintr.patch | 73 +++++++++++++++++++ ports/physfs/003-fix-posix-cloexec.patch | 34 +++++++++ ports/physfs/portfile.cmake | 4 +- ports/physfs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/physfs.json | 5 ++ 7 files changed, 117 insertions(+), 3 deletions(-) rename ports/physfs/{fix-lzmasdk-arm64-windows.patch => 001-fix-lzmasdk-arm64-windows.patch} (100%) create mode 100644 ports/physfs/002-fix-posix-eintr.patch create mode 100644 ports/physfs/003-fix-posix-cloexec.patch diff --git a/ports/physfs/fix-lzmasdk-arm64-windows.patch b/ports/physfs/001-fix-lzmasdk-arm64-windows.patch similarity index 100% rename from ports/physfs/fix-lzmasdk-arm64-windows.patch rename to ports/physfs/001-fix-lzmasdk-arm64-windows.patch diff --git a/ports/physfs/002-fix-posix-eintr.patch b/ports/physfs/002-fix-posix-eintr.patch new file mode 100644 index 00000000000000..08d314af1c142e --- /dev/null +++ b/ports/physfs/002-fix-posix-eintr.patch @@ -0,0 +1,73 @@ +diff --git a/src/physfs_platform_posix.c b/src/physfs_platform_posix.c +--- a/src/physfs_platform_posix.c ++++ b/src/physfs_platform_posix.c +@@ -6,8 +6,6 @@ + * This file written by Ryan C. Gordon. + */ + +-/* !!! FIXME: check for EINTR? */ +- + #define __PHYSICSFS_INTERNAL__ + #include "physfs_platforms.h" + +@@ -167,7 +165,9 @@ static void *doOpen(const char *filename, int mode) + /* O_APPEND doesn't actually behave as we'd like. */ + mode &= ~O_APPEND; + +- fd = open(filename, mode, S_IRUSR | S_IWUSR); ++ do { ++ fd = open(filename, mode, S_IRUSR | S_IWUSR); ++ } while ((fd < 0) && (errno == EINTR)); + BAIL_IF(fd < 0, errcodeFromErrno(), NULL); + + if (appending) +@@ -219,7 +219,9 @@ PHYSFS_sint64 __PHYSFS_platformRead(void *opaque, void *buffer, + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1); + +- rc = read(fd, buffer, (size_t) len); ++ do { ++ rc = read(fd, buffer, (size_t) len); ++ } while ((rc == -1) && (errno == EINTR)); + BAIL_IF(rc == -1, errcodeFromErrno(), -1); + assert(rc >= 0); + assert(rc <= len); +@@ -236,7 +238,9 @@ PHYSFS_sint64 __PHYSFS_platformWrite(void *opaque, const void *buffer, + if (!__PHYSFS_ui64FitsAddressSpace(len)) + BAIL(PHYSFS_ERR_INVALID_ARGUMENT, -1); + +- rc = write(fd, (void *) buffer, (size_t) len); ++ do { ++ rc = write(fd, (void *) buffer, (size_t) len); ++ } while ((rc == -1) && (errno == EINTR)); + BAIL_IF(rc == -1, errcodeFromErrno(), rc); + assert(rc >= 0); + assert(rc <= len); +@@ -275,8 +279,13 @@ PHYSFS_sint64 __PHYSFS_platformFileLength(void *opaque) + int __PHYSFS_platformFlush(void *opaque) + { + const int fd = *((int *) opaque); +- if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) +- BAIL_IF(fsync(fd) == -1, errcodeFromErrno(), 0); ++ int rc = -1; ++ if ((fcntl(fd, F_GETFL) & O_ACCMODE) != O_RDONLY) { ++ do { ++ rc = fsync(fd); ++ } while ((rc == -1) && (errno == EINTR)); ++ BAIL_IF(rc == -1, errcodeFromErrno(), 0); ++ } + return 1; + } /* __PHYSFS_platformFlush */ + +@@ -284,7 +293,10 @@ int __PHYSFS_platformFlush(void *opaque) + void __PHYSFS_platformClose(void *opaque) + { + const int fd = *((int *) opaque); +- (void) close(fd); /* we don't check this. You should have used flush! */ ++ int rc = -1; ++ do { ++ rc = close(fd); /* we don't check this. You should have used flush! */ ++ } while ((rc == -1) && (errno == EINTR)); + allocator.Free(opaque); + } /* __PHYSFS_platformClose */ + diff --git a/ports/physfs/003-fix-posix-cloexec.patch b/ports/physfs/003-fix-posix-cloexec.patch new file mode 100644 index 00000000000000..6ff2114a5e7529 --- /dev/null +++ b/ports/physfs/003-fix-posix-cloexec.patch @@ -0,0 +1,34 @@ +diff --git a/src/physfs_platform_posix.c b/src/physfs_platform_posix.c +--- a/src/physfs_platform_posix.c ++++ b/src/physfs_platform_posix.c +@@ -160,16 +160,30 @@ static void *doOpen(const char *filename, int mode) + const int appending = (mode & O_APPEND); + int fd; + int *retval; ++ int flags; ++ flags = -1; + errno = 0; + + /* O_APPEND doesn't actually behave as we'd like. */ + mode &= ~O_APPEND; ++ ++#ifdef O_CLOEXEC ++ /* Add O_CLOEXEC if defined */ ++ mode |= O_CLOEXEC; ++#endif + + do { + fd = open(filename, mode, S_IRUSR | S_IWUSR); + } while ((fd < 0) && (errno == EINTR)); + BAIL_IF(fd < 0, errcodeFromErrno(), NULL); + ++#if !defined(O_CLOEXEC) && defined(FD_CLOEXEC) ++ flags = fcntl(fd, F_GETFD); ++ if (flags != -1) { ++ fcntl(fd, F_SETFD, flags | FD_CLOEXEC); ++ } ++#endif ++ + if (appending) + { + if (lseek(fd, 0, SEEK_END) < 0) diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 2ce216e4d79f67..593c84293eeadf 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -12,7 +12,9 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} REF ${PHYSFS_VERSION} PATCHES - "fix-lzmasdk-arm64-windows.patch" + "001-fix-lzmasdk-arm64-windows.patch" + "002-fix-posix-eintr.patch" # Remove this patch in the next update + "003-fix-posix-cloexec.patch" # Remove this patch in the next update ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json index 0c0dfceb9d360e..a61a33881807a3 100644 --- a/ports/physfs/vcpkg.json +++ b/ports/physfs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "physfs", "version-string": "3.0.2", - "port-version": 4, + "port-version": 5, "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4e7866e2039597..781b50eb62cf0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4866,7 +4866,7 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 4 + "port-version": 5 }, "physx": { "baseline": "4.1.2", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index 3a3b9371c109c8..ba352ec8773abb 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5976d673e48ec47164efd0ea8ec86728f0e259be", + "version-string": "3.0.2", + "port-version": 5 + }, { "git-tree": "bef97b95b7c30545c4ec9d0a55f672c3a6e3325f", "version-string": "3.0.2", From d79e4b66d33f0f5d36f1ea77cc6bab37dc954d52 Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Fri, 23 Jul 2021 08:58:17 +0300 Subject: [PATCH 0188/1858] [ChakraCore] Add Linux support (#18476) * [ChakraCore] Add Linux support * Fix * x-add-version * Update ci.baseline.txt * Update portfile.cmake * Do not emit error if VCPKG_BUILD_TYPE is undefined * Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/chakracore/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Add missing space * Add quotes to variables * Update the baseline version * Fix Windows build * vcpkg x-add-version chakracore Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/chakracore/fix-debug-linux-build.patch | 13 ++ ports/chakracore/portfile.cmake | 222 +++++++++++++------ ports/chakracore/vcpkg.json | 5 +- scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 +- versions/c-/chakracore.json | 5 + 6 files changed, 173 insertions(+), 77 deletions(-) create mode 100644 ports/chakracore/fix-debug-linux-build.patch diff --git a/ports/chakracore/fix-debug-linux-build.patch b/ports/chakracore/fix-debug-linux-build.patch new file mode 100644 index 00000000000000..10c1ca5e7e947e --- /dev/null +++ b/ports/chakracore/fix-debug-linux-build.patch @@ -0,0 +1,13 @@ +diff --git a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp +index 0885df3fb..12bdfb96e 100644 +--- a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp ++++ b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp +@@ -58,7 +58,7 @@ void RecyclerObjectGraphDumper::BeginDumpObject(void * objectAddress) + { + Assert(false); + this->dumpObjectTypeInfo = nullptr; +- this->dumpObjectIsArray = nullptr; ++ this->dumpObjectIsArray = 0; + } + } + #endif diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 991e3a3de194d9..62277ecebe3f95 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -1,72 +1,150 @@ -vcpkg_fail_port_install(ON_TARGET osx linux uwp ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) - -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Microsoft/ChakraCore - REF 63c5099027ebb4547c802d62c2d2a6a39ee7eff6 # v1.11.22 - SHA512 5de915db48f5a125d4e0e112671ad7447212e6c0165d6c634a855a1d334f0bd2f7c015ba8c58d55225dd75d4c6687e6807987b8354b82405eb87944b46313062 - HEAD_REF master -) - -find_path(COR_H_PATH cor.h) -if(COR_H_PATH MATCHES "NOTFOUND") - message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") -endif() -get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) - -set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(REMOVE_RECURSE ${BUILDTREE_PATH}) -file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) - -set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage - -vcpkg_build_msbuild( - PROJECT_PATH ${BUILDTREE_PATH}/Build/Chakra.Core.sln - OPTIONS - "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" - "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" - "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" -) - -file(INSTALL - ${BUILDTREE_PATH}/lib/jsrt/ChakraCore.h - ${BUILDTREE_PATH}/lib/jsrt/ChakraCommon.h - ${BUILDTREE_PATH}/lib/jsrt/ChakraCommonWindows.h - ${BUILDTREE_PATH}/lib/jsrt/ChakraDebug.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include -) -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - ) -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - file(INSTALL - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe - ${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/chakracore) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/chakracore) -endif() - -vcpkg_copy_pdbs() -file(INSTALL - ${SOURCE_PATH}/LICENSE.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/ChakraCore RENAME copyright) +vcpkg_fail_port_install(ON_TARGET osx uwp) +if(WIN32) + vcpkg_fail_port_install(ON_CRT_LINKAGE static ON_LIBRARY_LINKAGE static) +endif() +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/ChakraCore + REF 385409ee4b634b860e090606a28acbc99f4d2567 + SHA512 ef47db988c4ddd77fa87f4c5e1ac91d9f6b31b35aa6934d8b2863ee1274776d90a2b85dbad51eef069c96777d3cd7729349b89f23eda8c61b4cb637150bead71 + HEAD_REF master + PATCHES + fix-debug-linux-build.patch +) + +if(WIN32) + find_path(COR_H_PATH cor.h) + if(COR_H_PATH MATCHES "NOTFOUND") + message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") + endif() + get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) +endif() + +set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +file(REMOVE_RECURSE ${BUILDTREE_PATH}) +file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) + +if(WIN32) + set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage + vcpkg_build_msbuild( + PROJECT_PATH "${BUILDTREE_PATH}/Build/Chakra.Core.sln" + OPTIONS + "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" + "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" + "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" + ) +else() + if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(CHAKRACORE_TARGET_ARCH amd64) + elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(CHAKRACORE_TARGET_ARCH x86) + endif() + + if (VCPKG_TARGET_IS_LINUX) + message(WARNING "${PORT} requires Clang from the system package manager, this can be installed on Ubuntu systems via sudo apt install clang") + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + list(APPEND configs "debug") + execute_process( + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" "--debug" + WORKING_DIRECTORY "${BUILDTREE_PATH}" + + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + list(APPEND configs "release") + execute_process( + COMMAND bash "build.sh" "--arch=${CHAKRACORE_TARGET_ARCH}" + WORKING_DIRECTORY "${BUILDTREE_PATH}" + OUTPUT_VARIABLE CHAKRA_BUILD_SH_OUT + ERROR_VARIABLE CHAKRA_BUILD_SH_ERR + RESULT_VARIABLE CHAKRA_BUILD_SH_RES + ECHO_OUTPUT_VARIABLE + ECHO_ERROR_VARIABLE + ) + endif() +endif() + +file(INSTALL + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCore.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommon.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraDebug.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) +if(WIN32) + file(INSTALL + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCommonWindows.h" + "${BUILDTREE_PATH}/lib/Jsrt/ChakraCoreWindows.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" + ) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" + ) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" + ) + file(INSTALL + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe" + "${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore" + ) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore") + endif() +else() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(out_file libChakraCore.so) + else() + set(out_file lib/libChakraCoreStatic.a) + endif() + + set(destination_dir_debug "${CURRENT_PACKAGES_DIR}/debug/bin") + set(destination_dir_release "${CURRENT_PACKAGES_DIR}/bin") + set(out_dir_debug "${BUILDTREE_PATH}/out/Debug") + set(out_dir_release "${BUILDTREE_PATH}/out/Release") + foreach(config ${configs}) + file(INSTALL + ${out_dir_${config}}/${out_file} + DESTINATION ${destination_dir_${config}} + ) + endforeach() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL + "${out_dir_release}/ch" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore" + ) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore") + endif() +endif() + +vcpkg_copy_pdbs() + +file(INSTALL + "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/chakracore" + RENAME copyright +) diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index 5c6426d7d57f1d..316fefa0a97c7b 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,8 +1,7 @@ { "name": "chakracore", - "version-string": "1.11.22", - "port-version": 1, + "version-string": "2021-04-22", "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", - "supports": "windows & !uwp & !static" + "supports": "!osx & !uwp & (linux | !static)" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 69f62f543cb0cc..bc25252561bf3a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -100,6 +100,7 @@ cfitsio:arm-uwp=fail cfitsio:x64-uwp=fail cgicc:arm-uwp=fail cgicc:x64-uwp=fail +chakracore:x64-linux=skip # DCMTK currently has a vendored copy of libcharls.a, which causes conflicts with charls (TODO: use charls' copy) charls:arm64-windows=skip charls:arm-uwp=skip diff --git a/versions/baseline.json b/versions/baseline.json index 781b50eb62cf0c..bf1dbe32af8fb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1221,8 +1221,8 @@ "port-version": 0 }, "chakracore": { - "baseline": "1.11.22", - "port-version": 1 + "baseline": "2021-04-22", + "port-version": 0 }, "charls": { "baseline": "2.2.0", diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index 889e61da0cac1a..66253a2e8381ac 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0aa775c085b114b0ec67ea23ee99ece252d9e498", + "version-string": "2021-04-22", + "port-version": 0 + }, { "git-tree": "89c6f3a1c86e3849e7f58941ab165af8da0b2f25", "version-string": "1.11.22", From 5ec3e959caf774a5a392940b4a3a139e6db4605e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 23 Jul 2021 18:02:46 +0200 Subject: [PATCH 0189/1858] [giflib] Update to 5.2.1 (#18836) * Update to 5.2.1 * Modernize portfile * Enable shared lib * Handle system reallocarray * x-add-version * Disable GifDrawBoxedText8x8 on windows * Update git-tree * Add separate patch for GifDrawBoxedText8x8 * Update git-tree --- ports/giflib/CMakeLists.txt | 31 ++++++++--- ports/giflib/CONTROL | 4 -- .../disable-GifDrawBoxedText8x8-win32.patch | 36 ++++++++++++ ports/giflib/exports.def | 55 +++++++++++++++++++ ports/giflib/fix-compile-error.patch | 31 +++++------ ports/giflib/msvc-guard-unistd-h.patch | 48 ++-------------- ports/giflib/portfile.cmake | 27 ++++----- ports/giflib/vcpkg.json | 12 ++++ versions/baseline.json | 2 +- versions/g-/giflib.json | 5 ++ 10 files changed, 165 insertions(+), 86 deletions(-) delete mode 100644 ports/giflib/CONTROL create mode 100644 ports/giflib/disable-GifDrawBoxedText8x8-win32.patch create mode 100644 ports/giflib/exports.def create mode 100644 ports/giflib/vcpkg.json diff --git a/ports/giflib/CMakeLists.txt b/ports/giflib/CMakeLists.txt index a5b084ffcc3934..a5c69381a45801 100644 --- a/ports/giflib/CMakeLists.txt +++ b/ports/giflib/CMakeLists.txt @@ -2,23 +2,36 @@ cmake_minimum_required(VERSION 3.4) project(giflib C) +set(GIFLIB_EXPORTS "NOTFOUND" CACHE FILEPATH "The path of the DEF file listing the DLL exports.") + set(GIFLIB_HEADERS - lib/gif_lib.h + gif_lib.h ) set(GIFLIB_SOURCES - lib/dgif_lib.c - lib/egif_lib.c - lib/gif_err.c - lib/gif_font.c - lib/gif_hash.c - lib/gifalloc.c - lib/openbsd-reallocarray.c - lib/quantize.c + dgif_lib.c + egif_lib.c + gifalloc.c + gif_err.c + gif_font.c + gif_hash.c + openbsd-reallocarray.c ) add_definitions(-D_CRT_SECURE_NO_WARNINGS) + +include(CheckSymbolExists) +check_symbol_exists(reallocarray "stdlib.h" HAVE_REALLOCARRAY) +if(HAVE_REALLOCARRAY) + add_definitions(-DHAVE_REALLOCARRAY) +endif() + add_library(gif ${GIFLIB_SOURCES}) +if(BUILD_SHARED_LIBS AND WIN32) + target_sources(gif PRIVATE "${GIFLIB_EXPORTS}") +else() + set(UNUSED "${GIFLIB_EXPORTS}") +endif() if (NOT GIFLIB_SKIP_HEADERS) install(FILES ${GIFLIB_HEADERS} DESTINATION include) diff --git a/ports/giflib/CONTROL b/ports/giflib/CONTROL deleted file mode 100644 index 5361fc185a7be5..00000000000000 --- a/ports/giflib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: giflib -Version: 5.1.4-6 -Homepage: https://sourceforge.net/projects/giflib/ -Description: A library for reading and writing gif images. diff --git a/ports/giflib/disable-GifDrawBoxedText8x8-win32.patch b/ports/giflib/disable-GifDrawBoxedText8x8-win32.patch new file mode 100644 index 00000000000000..095edb3cec7685 --- /dev/null +++ b/ports/giflib/disable-GifDrawBoxedText8x8-win32.patch @@ -0,0 +1,36 @@ +diff --git a/gif_font.c b/gif_font.c +index d90783c..b682c7a 100644 +--- a/gif_font.c ++++ b/gif_font.c +@@ -204,6 +204,7 @@ GifDrawRectangle(SavedImage *Image, + memset(bp + (i * Image->ImageDesc.Width), color, (size_t)w); + } + ++#if !defined(_WIN32) + void + GifDrawBoxedText8x8(SavedImage *Image, + const int x, const int y, +@@ -257,5 +258,6 @@ GifDrawBoxedText8x8(SavedImage *Image, + border + LineCount * GIF_FONT_HEIGHT + border, fg); + } + } ++#endif + + /* end */ +diff --git a/gif_lib.h b/gif_lib.h +index ebdbd3c..41bf7a2 100644 +--- a/gif_lib.h ++++ b/gif_lib.h +@@ -290,10 +290,12 @@ extern void GifDrawRectangle(SavedImage *Image, + const int x, const int y, + const int w, const int d, const int color); + ++#if !defined(_WIN32) + extern void GifDrawBoxedText8x8(SavedImage *Image, + const int x, const int y, + const char *legend, + const int border, const int bg, const int fg); ++#endif + + #ifdef __cplusplus + } diff --git a/ports/giflib/exports.def b/ports/giflib/exports.def new file mode 100644 index 00000000000000..d385493734fe42 --- /dev/null +++ b/ports/giflib/exports.def @@ -0,0 +1,55 @@ +EXPORTS + DGifCloseFile @1 + DGifExtensionToGCB @2 + DGifGetCode @3 + DGifGetCodeNext @4 + DGifGetExtension @5 + DGifGetExtensionNext @6 + DGifGetImageDesc @7 + DGifGetLZCodes @8 + DGifGetLine @9 + DGifGetPixel @10 + DGifGetRecordType @11 + DGifGetScreenDesc @12 + DGifOpen @13 + DGifOpenFileHandle @14 + DGifOpenFileName @15 + DGifSavedExtensionToGCB @16 + DGifSlurp @17 + EGifCloseFile @18 + EGifGCBToExtension @19 + EGifGCBToSavedExtension @20 + EGifGetGifVersion @21 + EGifOpen @22 + EGifOpenFileHandle @23 + EGifOpenFileName @24 + EGifPutCode @25 + EGifPutCodeNext @26 + EGifPutComment @27 + EGifPutExtension @28 + EGifPutExtensionBlock @29 + EGifPutExtensionLeader @30 + EGifPutExtensionTrailer @31 + EGifPutImageDesc @32 + EGifPutLine @33 + EGifPutPixel @34 + EGifPutScreenDesc @35 + EGifSetGifVersion @36 + EGifSpew @37 + FreeLastSavedImage @38 + GifAddExtensionBlock @39 + GifApplyTranslation @40 + GifAsciiTable8x8 @41 DATA + GifBitSize @42 + GifDrawBox @43 + ; needs strtok_r: GifDrawBoxedText8x8 @44 + GifDrawRectangle @45 + GifDrawText8x8 @46 + GifErrorString @47 + GifFreeExtensions @48 + GifFreeMapObject @49 + GifFreeSavedImages @50 + GifMakeMapObject @51 + GifMakeSavedImage @52 + GifUnionColorMap @53 + openbsd_reallocarray @54 diff --git a/ports/giflib/fix-compile-error.patch b/ports/giflib/fix-compile-error.patch index 93cf467ff2d45a..970b05576fbdf2 100644 --- a/ports/giflib/fix-compile-error.patch +++ b/ports/giflib/fix-compile-error.patch @@ -1,8 +1,8 @@ -diff --git a/lib/dgif_lib.c b/lib/dgif_lib.c -index fddc0d2..7a6ab9c 100644 ---- a/lib/dgif_lib.c -+++ b/lib/dgif_lib.c -@@ -54,7 +54,7 @@ DGifOpenFileName(const char *FileName, int *Error) +diff --git a/dgif_lib.c b/dgif_lib.c +index 82fc097..3bb302b 100644 +--- a/dgif_lib.c ++++ b/dgif_lib.c +@@ -58,7 +58,7 @@ DGifOpenFileName(const char *FileName, int *Error) int FileHandle; GifFileType *GifFile; @@ -11,7 +11,7 @@ index fddc0d2..7a6ab9c 100644 if (Error != NULL) *Error = D_GIF_ERR_OPEN_FAILED; return NULL; -@@ -81,7 +81,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) +@@ -85,7 +85,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) if (GifFile == NULL) { if (Error != NULL) *Error = D_GIF_ERR_NOT_ENOUGH_MEM; @@ -20,7 +20,7 @@ index fddc0d2..7a6ab9c 100644 return NULL; } -@@ -95,7 +95,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) +@@ -99,7 +99,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) if (Private == NULL) { if (Error != NULL) *Error = D_GIF_ERR_NOT_ENOUGH_MEM; @@ -29,7 +29,7 @@ index fddc0d2..7a6ab9c 100644 free((char *)GifFile); return NULL; } -@@ -106,7 +106,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) +@@ -110,7 +110,7 @@ DGifOpenFileHandle(int FileHandle, int *Error) _setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */ #endif /* _WIN32 */ @@ -38,11 +38,11 @@ index fddc0d2..7a6ab9c 100644 /*@-mustfreeonly@*/ GifFile->Private = (void *)Private; -diff --git a/lib/egif_lib.c b/lib/egif_lib.c -index f30b61b..18dc4a2 100644 ---- a/lib/egif_lib.c -+++ b/lib/egif_lib.c -@@ -60,10 +60,10 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error) +diff --git a/egif_lib.c b/egif_lib.c +index 6219af0..8ddda1b 100644 +--- a/egif_lib.c ++++ b/egif_lib.c +@@ -67,10 +67,10 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error) GifFileType *GifFile; if (TestExistence) @@ -55,7 +55,7 @@ index f30b61b..18dc4a2 100644 S_IREAD | S_IWRITE); if (FileHandle == -1) { -@@ -73,7 +73,7 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error) +@@ -80,7 +80,7 @@ EGifOpenFileName(const char *FileName, const bool TestExistence, int *Error) } GifFile = EGifOpenFileHandle(FileHandle, Error); if (GifFile == (GifFileType *) NULL) @@ -64,7 +64,7 @@ index f30b61b..18dc4a2 100644 return GifFile; } -@@ -118,7 +118,7 @@ EGifOpenFileHandle(const int FileHandle, int *Error) +@@ -125,7 +125,7 @@ EGifOpenFileHandle(const int FileHandle, int *Error) _setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */ #endif /* _WIN32 */ @@ -73,4 +73,3 @@ index f30b61b..18dc4a2 100644 GifFile->Private = (void *)Private; Private->FileHandle = FileHandle; - diff --git a/ports/giflib/msvc-guard-unistd-h.patch b/ports/giflib/msvc-guard-unistd-h.patch index 5140e6ee3eebb0..36cef449151791 100644 --- a/ports/giflib/msvc-guard-unistd-h.patch +++ b/ports/giflib/msvc-guard-unistd-h.patch @@ -1,46 +1,8 @@ -diff -Naur a/lib/dgif_lib.c b/lib/dgif_lib.c ---- a/lib/dgif_lib.c 2016-04-02 21:34:00.000000000 +0600 -+++ b/lib/dgif_lib.c 2017-04-21 07:06:48.781271400 +0700 -@@ -12,7 +12,9 @@ - #include - #include - #include -+#ifndef _MSC_VER - #include -+#endif - #include - #include - -diff -Naur a/lib/egif_lib.c b/lib/egif_lib.c ---- a/lib/egif_lib.c 2016-01-22 16:36:36.000000000 +0600 -+++ b/lib/egif_lib.c 2017-04-21 07:07:08.728159900 +0700 -@@ -8,7 +8,9 @@ - - *****************************************************************************/ - -+#ifndef _MSC_VER - #include -+#endif - #include - #include - #include -diff -Naur a/lib/gif_hash.c b/lib/gif_hash.c ---- a/lib/gif_hash.c 2014-05-16 17:46:53.000000000 +0700 -+++ b/lib/gif_hash.c 2017-04-21 07:07:17.718719500 +0700 -@@ -11,7 +11,9 @@ - - *****************************************************************************/ - -+#ifndef _MSC_VER - #include -+#endif - #include - #include - #include -diff -Naur a/lib/gif_hash.h b/lib/gif_hash.h ---- a/lib/gif_hash.h 2014-05-16 17:46:53.000000000 +0700 -+++ b/lib/gif_hash.h 2017-04-21 07:07:32.316346800 +0700 -@@ -7,7 +7,9 @@ +diff --git a/gif_hash.h b/gif_hash.h +index 6a1b585..e6712e8 100644 +--- a/gif_hash.h ++++ b/gif_hash.h +@@ -9,7 +9,9 @@ SPDX-License-Identifier: MIT #ifndef _GIF_HASH_H_ #define _GIF_HASH_H_ diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake index dfca62d512733d..8a58b690a18fce 100644 --- a/ports/giflib/portfile.cmake +++ b/ports/giflib/portfile.cmake @@ -1,31 +1,32 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -set(GIFLIB_VERSION 5.1.4) +set(GIFLIB_VERSION 5.2.1) +set(EXTRA_PATCHES "") if (VCPKG_TARGET_IS_WINDOWS) - set(ADDITIONAL_PATCH "fix-compile-error.patch") + list(APPEND EXTRA_PATCHES fix-compile-error.patch) endif() vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO "giflib" - FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2" - SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d + FILENAME "giflib-${GIFLIB_VERSION}.tar.gz" + SHA512 4550e53c21cb1191a4581e363fc9d0610da53f7898ca8320f0d3ef6711e76bdda2609c2df15dc94c45e28bff8de441f1227ec2da7ea827cb3c0405af4faa4736 PATCHES msvc-guard-unistd-h.patch - ${ADDITIONAL_PATCH} + disable-GifDrawBoxedText8x8-win32.patch # MSVC doesn't have strtok_r + ${EXTRA_PATCHES} ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DGIFLIB_EXPORTS=${CMAKE_CURRENT_LIST_DIR}/exports.def" OPTIONS_DEBUG -DGIFLIB_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/giflib RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/giflib/vcpkg.json b/ports/giflib/vcpkg.json new file mode 100644 index 00000000000000..965fa663bc77a1 --- /dev/null +++ b/ports/giflib/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "giflib", + "version": "5.2.1", + "description": "A library for reading and writing gif images.", + "homepage": "https://sourceforge.net/projects/giflib/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index bf1dbe32af8fb3..8d56c4d02b4b01 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2285,7 +2285,7 @@ "port-version": 0 }, "giflib": { - "baseline": "5.1.4-6", + "baseline": "5.2.1", "port-version": 0 }, "ginkgo": { diff --git a/versions/g-/giflib.json b/versions/g-/giflib.json index 31565c99eef919..8c2fdd37c994c0 100644 --- a/versions/g-/giflib.json +++ b/versions/g-/giflib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cfc37d67d8662dd5fa5bf698a61ebbd657060cc", + "version": "5.2.1", + "port-version": 0 + }, { "git-tree": "053e7dd7e20392f9168d982e026a7fd71afbefe3", "version-string": "5.1.4-6", From a50d467e31cc34f573a6792f4dc4faa568b97562 Mon Sep 17 00:00:00 2001 From: Christoph Neuhauser Date: Fri, 23 Jul 2021 18:04:43 +0200 Subject: [PATCH 0190/1858] [shaderc] Add fix for installing shaderc_util (#18979) * Added fix for installing shaderc_util in port shaderc. * Restricted install of shaderc_util to static build. --- ports/shaderc/fix-install-shaderc_util.patch | 18 ++++++++++++++++++ ports/shaderc/portfile.cmake | 1 + ports/shaderc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/shaderc.json | 5 +++++ 5 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 ports/shaderc/fix-install-shaderc_util.patch diff --git a/ports/shaderc/fix-install-shaderc_util.patch b/ports/shaderc/fix-install-shaderc_util.patch new file mode 100644 index 00000000000000..7601f3020d3a57 --- /dev/null +++ b/ports/shaderc/fix-install-shaderc_util.patch @@ -0,0 +1,18 @@ +diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt +index 99ce3c4..4926203 100644 +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -49,6 +49,13 @@ target_link_libraries(shaderc_util PRIVATE + glslang OSDependent OGLCompiler HLSL glslang SPIRV + SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + ++if(SHADERC_ENABLE_INSTALL AND NOT BUILD_SHARED_LIBS) ++ install(TARGETS shaderc_util ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++endif(SHADERC_ENABLE_INSTALL) ++ + shaderc_add_tests( + TEST_PREFIX shaderc_util + LINK_LIBS shaderc_util diff --git a/ports/shaderc/portfile.cmake b/ports/shaderc/portfile.cmake index 7d9596781ced99..be59aa5ba2a8c9 100644 --- a/ports/shaderc/portfile.cmake +++ b/ports/shaderc/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( PATCHES disable-update-version.patch fix-build-type.patch + fix-install-shaderc_util.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/build-version.inc DESTINATION ${SOURCE_PATH}/glslc/src) diff --git a/ports/shaderc/vcpkg.json b/ports/shaderc/vcpkg.json index 9d7b57a131ccc5..e7e490c008bfd3 100644 --- a/ports/shaderc/vcpkg.json +++ b/ports/shaderc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "shaderc", "version": "2021.1", + "port-version": 1, "description": "A collection of tools, libraries and tests for shader compilation.", "homepage": "https://github.com/google/shaderc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8d56c4d02b4b01..fbde6debeceeb8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5790,7 +5790,7 @@ }, "shaderc": { "baseline": "2021.1", - "port-version": 0 + "port-version": 1 }, "shaderwriter": { "baseline": "1.1.0", diff --git a/versions/s-/shaderc.json b/versions/s-/shaderc.json index 6a07dae4444c5e..8c608dcec57b5f 100644 --- a/versions/s-/shaderc.json +++ b/versions/s-/shaderc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8590ab232dd5ccd2331bb321127f00788b573a3", + "version": "2021.1", + "port-version": 1 + }, { "git-tree": "2bf34bbfc26bddfe440bb115157a3b5cd07e7e79", "version": "2021.1", From 7b7995db9524746f8a16569fe0a889285d584f85 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 23 Jul 2021 19:38:02 +0200 Subject: [PATCH 0191/1858] [gdal] Fix build for non-Windows targets (#17698) * Remove obsolete GDAL_VERSION_LIB * Build mingw with configure/make * Rearrange CONF_OPTS, expose tiff dependency * Revise linkage configuration * Rearrange GDAL_PATCHES * Put optional drivers into non-default feature * Fix gdal build * Update vcpkg.json * Re-enable netcdf support * Revise cmake wrapper * Final portfile cleanup * Remove curl osx system dependencies * Verify configuration results before building * Update and revise configure.ac patch * Fix dllexport for mingw-dynamic * Fix pc file * Add dependencies to cmake wrapper * Increment port-version * x-add-version * Fix typo * Update git-tree * strega-nil CRs Co-authored-by: nicole mazzuca --- ports/gdal/0005-Fix-configure.patch | 433 +++++++++++++--------- ports/gdal/0006-Fix-mingw-dllexport.patch | 13 + ports/gdal/portfile.cmake | 298 ++++++++++----- ports/gdal/vcpkg-cmake-wrapper.cmake | 100 ++++- ports/gdal/vcpkg.json | 7 + versions/baseline.json | 2 +- versions/g-/gdal.json | 5 + 7 files changed, 584 insertions(+), 274 deletions(-) create mode 100644 ports/gdal/0006-Fix-mingw-dllexport.patch diff --git a/ports/gdal/0005-Fix-configure.patch b/ports/gdal/0005-Fix-configure.patch index 3883ed96bd9370..c0f35523b3ba73 100644 --- a/ports/gdal/0005-Fix-configure.patch +++ b/ports/gdal/0005-Fix-configure.patch @@ -1,222 +1,303 @@ diff --git a/configure.ac b/configure.ac -index bd85e0616..c45b0f74a 100644 +index bd85e06..b88676a 100644 --- a/configure.ac +++ b/configure.ac -@@ -1275,10 +1275,10 @@ AC_MSG_CHECKING([for libtiff]) +@@ -45,6 +45,8 @@ dnl Compute the canonical host-system (the system we are building for) + dnl type variable $host + AC_CANONICAL_HOST + ++PKG_PROG_PKG_CONFIG([0.21]) ++ + dnl Enable as much warnings as possible + AX_CFLAGS_WARN_ALL(C_WFLAGS) + AX_CXXFLAGS_WARN_ALL(CXX_WFLAGS) +@@ -1274,12 +1276,15 @@ AC_MSG_CHECKING([for libtiff]) + if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then - dnl Only automatically pick up the external libtiff if it is >= 4.0. +- dnl Only automatically pick up the external libtiff if it is >= 4.0. - AC_CHECK_LIB(tiff,TIFFScanlineSize64,TIFF_SETTING=external HAVE_BIGTIFF=yes,TIFF_SETTING=internal HAVE_BIGTIFF=yes,) -+ AC_SEARCH_LIBS(TIFFScanlineSize64,[tiffd tiff],TIFF_SETTING=external HAVE_BIGTIFF=yes,TIFF_SETTING=internal HAVE_BIGTIFF=yes,-ljpeg) ++ PKG_CHECK_MODULES([TIFF],[libtiff-4 > 4.0], [TIFF_SETTING=external], [TIFF_SETTING=internal HAVE_BIGTIFF=yes]) if test "$TIFF_SETTING" = "external" ; then - LIBS="-ltiff $LIBS" -+ LIBS="-ljpeg $LIBS" AC_MSG_RESULT([using pre-installed libtiff.]) ++ EXTRA_INCLUDES="$TIFF_CFLAGS $EXTRA_INCLUDES" ++ SAVED_LIBS="$LIBS" ++ LIBS="$TIFF_LIBS" ++ AC_SEARCH_LIBS(TIFFScanlineSize64,[],HAVE_BIGTIFF=yes,HAVE_BIGTIFF=no,) ++ LIBS="$TIFF_LIBS $SAVED_LIBS" else AC_MSG_RESULT([using internal TIFF code.]) -@@ -1338,18 +1338,12 @@ if test "`basename xx/$with_curl`" = "curl-config" ; then + fi +@@ -1333,22 +1338,28 @@ AC_ARG_WITH(curl, + dnl Clear some cache variables + unset ac_cv_path_LIBCURL + ++LIBCURL_MODVERSION= + if test "`basename xx/$with_curl`" = "curl-config" ; then + LIBCURL_CONFIG="$with_curl" elif test "$with_curl" = "no" ; then LIBCURL_CONFIG=no ++elif test "$with_curl" = "yes" -o "$with_curl" = "" ; then ++ PKG_CHECK_EXISTS([libcurl], [LIBCURL_CONFIG="${PKG_CONFIG} libcurl"], [LIBCURL_CONFIG=false]) ++ LIBCURL_MODVERSION=`$LIBCURL_CONFIG --modversion` else -- AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no) -+ LIBCURL_CONFIG=yes + AC_PATH_PROG(LIBCURL_CONFIG, curl-config, no) fi if test "$LIBCURL_CONFIG" != "no" ; then - CURL_VERNUM=`$LIBCURL_CONFIG --vernum` - CURL_VER=`$LIBCURL_CONFIG --version | awk '{print $2}'` -- -- AC_MSG_RESULT([ found libcurl version $CURL_VER]) -- ++ CURL_VER="`$LIBCURL_CONFIG --version | awk '{print $2}'`$LIBCURL_MODVERSION" + + AC_MSG_RESULT([ found libcurl version $CURL_VER]) + - AC_CHECK_LIB(curl,curl_global_init,CURL_SETTING=yes,CURL_SETTING=no,`$LIBCURL_CONFIG --libs`) -- -+ AC_SEARCH_LIBS(curl_global_init,[curl-d curl],CURL_SETTING=yes,CURL_SETTING=no,) ++ SAVED_LIBS="$LIBS" ++ LIBS=`$LIBCURL_CONFIG --libs` ++ AC_SEARCH_LIBS(curl_global_init,[],CURL_SETTING=yes,CURL_SETTING=no,) ++ LIBS="$SAVED_LIBS" + fi - AC_SUBST(CURL_SETTING,$CURL_SETTING) -@@ -1512,12 +1506,12 @@ elif test "$with_spatialite" = "yes"; then - AC_CHECK_HEADERS(sqlite3.h) - if test "$ac_cv_header_sqlite3_h" = "yes"; then - AC_MSG_CHECKING([for spatialite.h in /usr/include or /usr/local/include]) -- if test -f "/usr/include/spatialite.h" -o -f "/usr/local/include/spatialite.h"; then -+ if test -f "$prefix/../include/spatialite.h" -o -f "$prefix/include/spatialite.h" -o -f "/usr/include/spatialite.h" -o -f "/usr/local/include/spatialite.h"; then - AC_MSG_RESULT(found) -- AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-lsqlite3) -+ AC_CHECK_LIB(spatialite,spatialite_init,SPATIALITE_INIT_FOUND=yes,SPATIALITE_INIT_FOUND=no,-lsqlite3 -lrttopo -lfreexl) - if test "$SPATIALITE_INIT_FOUND" = "yes"; then - HAVE_SPATIALITE=yes -- SPATIALITE_LIBS="-lspatialite -lsqlite3" -+ SPATIALITE_LIBS="-lspatialite -lsqlite3 -lrttopo -lfreexl" - LIBS="$LIBS $SPATIALITE_LIBS" - HAVE_SQLITE3=yes - fi -@@ -1570,11 +1564,15 @@ dnl --------------------------------------------------------------------------- +@@ -1362,7 +1373,9 @@ dnl Proj depends on it so it must appear before. + dnl --------------------------------------------------------------------------- + + SQLITE3_REQ_VERSION="3.0.0" +-AX_LIB_SQLITE3($SQLITE3_REQ_VERSION) ++AC_CHECK_LIB(sqlite3,sqlite3_open,HAVE_SQLITE3=yes,AC_MSG_ERROR([vcpkg sqlite3 not found]),) ++SQLITE3_CFLAGS= ++SQLITE3_LDFLAGS=-lsqlite3 + + if test "$HAVE_SQLITE3" = "yes"; then + LIBS="$SQLITE3_LDFLAGS $LIBS" +@@ -1570,6 +1583,19 @@ dnl --------------------------------------------------------------------------- AC_ARG_WITH(liblzma,[ --with-liblzma[=ARG] Include liblzma support (ARG=yes/no)],,) if test "$with_liblzma" = "yes" ; then -- AC_CHECK_LIB(lzma,lzma_code,LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) ++ PKG_CHECK_MODULES([LIBLZMA],[liblzma],[HAVE_LIBLZMA_PC=yes],[HAVE_LIBLZMA_PC=no]) + SAVED_LIBS="$LIBS" -+ LIBS="" -+ AC_SEARCH_LIBS(lzma_code,[lzmad lzma],LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) ++ LIBS="$LIBLZMA_LIBS" ++ AC_SEARCH_LIBS(lzma_code,[],LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) ++ if test "$LIBLZMA_SETTING" = "yes" ; then ++ LIBS="$LIBLZMA_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBLZMA_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg liblzma broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ ++elif false; then + AC_CHECK_LIB(lzma,lzma_code,LIBLZMA_SETTING=yes,LIBLZMA_SETTING=no,) AC_CHECK_HEADERS(lzma.h) -+ LZMA_LIBS="$LIBS" -+ LIBS="$SAVED_LIBS" - if test "$LIBLZMA_SETTING" = "yes" -a "$ac_cv_header_lzma_h" = "yes" ; then -- LIBS="-llzma $LIBS" -+ LIBS="$LZMA_LIBS $LIBS" - else - LIBLZMA_SETTING=no - fi -@@ -1592,11 +1590,9 @@ dnl --------------------------------------------------------------------------- +@@ -1592,6 +1618,19 @@ dnl --------------------------------------------------------------------------- AC_ARG_WITH(zstd,[ --with-zstd[=ARG] Include zstd support (ARG=yes/no/installation_prefix)],,) if test "$with_zstd" = "" -o "$with_zstd" = "yes" ; then -- AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,) -+ AC_SEARCH_LIBS(ZSTD_decompressStream,[zstdd zstd],ZSTD_SETTING=yes,ZSTD_SETTING=no,) - -- if test "$ZSTD_SETTING" = "yes" ; then -- LIBS="-lzstd $LIBS" -- else -+ if test "$ZSTD_SETTING" != "yes" ; then - if test "$with_zstd" = "yes" ; then - AC_MSG_ERROR([libzstd not found]) - else -@@ -1820,8 +1816,6 @@ fi - - if test "$CURL_SETTING" = "yes" ; then - -- CURL_INC=`$LIBCURL_CONFIG --cflags` -- CURL_LIB=`$LIBCURL_CONFIG --libs` - m4_foreach_w([frmt],CURL_FORMATS,[ - driver_enabled=m4_join([_],[$INTERNAL_FORMAT],frmt,[ENABLED]) - if test "x$driver_enabled" = "xyes"; then -@@ -1888,7 +1882,7 @@ else - PKG_CHECK_MODULES([PQ],[libpq > 9.1], [HAVE_PG=yes], [HAVE_PG=no]) - - if test "${HAVE_PG}" = "yes" ; then -- PG_LIB="${PQ_LIBS}" -+ PG_LIB="${PQ_LIBS} -lpgcommon -lpgport" - PG_INC="${PQ_CFLAGS}" ++ PKG_CHECK_MODULES([ZSTD],[libzstd],[HAVE_LIBZSTD_PC=yes],[HAVE_LIBZSTD_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$ZSTD_LIBS" ++ AC_SEARCH_LIBS(ZSTD_decompressStream,[],ZSTD_SETTING=yes,ZSTD_SETTING=no,) ++ if test "$ZSTD_SETTING" = "yes" ; then ++ LIBS="$ZSTD_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBZSTD_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg libzstd broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ ++elif false; then + AC_CHECK_LIB(zstd,ZSTD_decompressStream,ZSTD_SETTING=yes,ZSTD_SETTING=no,) + + if test "$ZSTD_SETTING" = "yes" ; then +@@ -1893,6 +1932,12 @@ else SAVED_LIBS="${LIBS}" LIBS="${PG_LIB}" -@@ -4287,13 +4281,13 @@ if test "x$with_xml2" = "xyes" -o "x$with_xml2" = "x" ; then + AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no) ++ if test "${HAVE_PG}" = "no" ; then ++ unset ac_cv_lib_pq_PQconnectdb ++ PG_LIB="${PG_LIB} -lpgcommon -lpgport" ++ LIBS="${PG_LIB} ${SAVED_LIBS}" ++ AC_CHECK_LIB(pq,PQconnectdb,HAVE_PG=yes,HAVE_PG=no,[-lpgcommon -lpgport]) ++ fi + LIBS="${SAVED_LIBS}" + if test "${HAVE_PG}" = "yes" ; then + LIBS="${PG_LIB} ${LIBS}" +@@ -2253,6 +2298,15 @@ AC_ARG_WITH(geotiff,[ --with-geotiff=ARG Libgeotiff library to use (ARG=inte + + if test "$with_geotiff" = "yes" -o "$with_geotiff" = "" ; then + ++ AC_CHECK_LIB(geotiff,GTIFAttachPROJContext,GEOTIFF_SETTING=external,GEOTIFF_SETTING=internal) ++ if test $GEOTIFF_SETTING = "external" ; then ++ LIBS="-lgeotiff $LIBS" ++ else ++ AC_MSG_ERROR([vcpkg geotiff broken]) ++ fi ++ ++elif false; then ++ + if test "$TIFF_SETTING" = "internal" ; then + GEOTIFF_SETTING=internal + else +@@ -3002,7 +3056,7 @@ elif test "$with_hdf5" = "yes" -o "$with_hdf5" = "" ; then + # Test that the package found is for the right architecture + saved_LIBS="$LIBS" + LIBS="$HDF5_LIBS" +- AC_CHECK_LIB(hdf5,H5Fopen, [HAVE_HDF5=yes], [HAVE_HDF5=no]) ++ AC_SEARCH_LIBS(H5Fopen,[],[HAVE_HDF5=yes],[HAVE_HDF5=no],) + LIBS="$saved_LIBS" + + if test "$HAVE_HDF5" = "yes"; then +@@ -3132,6 +3186,24 @@ if test "$with_netcdf" = "no" ; then + + echo "netCDF support disabled." + ++elif true ; then ++ ++ PKG_CHECK_MODULES([NETCDF],[netcdf],[HAVE_NETCDF_PC=yes],[HAVE_NETCDF_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$NETCDF_LIBS" ++ AC_SEARCH_LIBS(nc_open,[],NETCDF_SETTING=yes,NETCDF_SETTING=no,) ++ if test "$NETCDF_SETTING" = "yes" ; then ++ LIBS="$NETCDF_LIBS $SAVED_LIBS" ++ EXTRA_INCLUDES="$NETCDF_CFLAGS $EXTRA_INCLUDES" ++ PKG_CHECK_VAR([NETCDF_ROOT],[netcdf],[prefix],,) ++ PKG_CHECK_VAR([NETCDF_INCLUDEDIR],[netcdf],[includedir],,) ++ NETCDF_NCCONFIG= ++ elif test "$HAVE_NETCDF_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg netcdf-c broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ + else + + dnl find nc-config location +@@ -3352,6 +3424,21 @@ if test "$with_openjpeg" = "no" ; then + + AC_MSG_NOTICE([OpenJPEG (JPEG2000) support disabled.]) + ++elif true ; then ++ ++ PKG_CHECK_MODULES([OPENJPEG],[libopenjp2 >= 2.1.0],[HAVE_LIBOPENJP2_PC=yes],[HAVE_LIBOPENJP2_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$OPENJPEG_LIBS" ++ AC_SEARCH_LIBS(opj_setup_decoder,[],HAVE_OPENJPEG=yes,HAVE_OPENJPEG=no,) ++ if test "$HAVE_OPENJPEG" = "yes" ; then ++ EXTRA_INCLUDES="$OPENJPEG_CFLAGS $EXTRA_INCLUDES" ++ LIBS="$OPENJPEG_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBOPENJP2_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg libopenjpeg broken]) ++ else ++ LIBS="$SAVED_LIBS" ++ fi ++ + else + + PKG_PROG_PKG_CONFIG([0.21]) +@@ -4043,7 +4130,9 @@ dnl --------------------------------------------------------------------------- + + dnl Expat 1.95.0 released in 2000-09-28 + EXPAT_REQ_VERSION="1.95.0" +-AX_LIB_EXPAT($EXPAT_REQ_VERSION) ++AC_CHECK_LIB(expat,XML_ParserCreate,HAVE_EXPAT=yes,AC_MSG_ERROR([vcpkg expat not found])) ++EXPAT_LDFLAGS="-lexpat" ++EXPAT_INCLUDE="" + + if test "$HAVE_EXPAT" = "yes"; then + LIBS="$EXPAT_LDFLAGS $LIBS" +@@ -4066,7 +4155,13 @@ dnl Check for Google libkml support. + dnl --------------------------------------------------------------------------- + + LIBKML_REQ_VERSION="1.3.0" ++if test "x${with_libkml}" = "xno"; then ++ echo "libkml support disabled." ++ HAVE_LIBKML="no" ++ LIBKML_CFLAGS= ++else + AX_LIB_LIBKML($LIBKML_REQ_VERSION) ++fi + + if test "$HAVE_LIBKML" = "yes"; then + LIBS="$LIBKML_LDFLAGS $LIBS" +@@ -4244,8 +4339,8 @@ else + dnl Add curl to LIBS; it might be local to DODS or generally installed + if test -x $DODS_BIN/curl-config; then + LIBS="$LIBS `$DODS_BIN/curl-config --libs`" +- elif which curl-config > /dev/null 2>&1; then +- LIBS="$LIBS `curl-config --libs`" ++ elif test "$CURL_SETTING" = "yes"; then ++ LIBS="$LIBS $CURL_LIB" + else + AC_MSG_ERROR([You gave a dods root, but I can't find curl!]) + fi +@@ -4287,7 +4382,7 @@ if test "x$with_xml2" = "xyes" -o "x$with_xml2" = "x" ; then if test "${HAVE_LIBXML2}" = "yes"; then SAVED_LIBS="${LIBS}" LIBS="${LIBXML2_LIBS}" - AC_CHECK_LIB(xml2,xmlParseDoc,HAVE_LIBXML2=yes,HAVE_LIBXML2=no) -+ AC_CHECK_LIB(xml2,xmlParseDoc,HAVE_LIBXML2=yes,HAVE_LIBXML2=no,-lz -lm $LZMA_LIBS) ++ AC_SEARCH_LIBS(xmlParseDoc,[],HAVE_LIBXML2=yes,HAVE_LIBXML2=no,) LIBS="${SAVED_LIBS}" fi - if test "${HAVE_LIBXML2}" = "yes"; then - LIBXML2_INC="${LIBXML2_CFLAGS}" -- LIBXML2_LIB="${LIBXML2_LIBS}" -+ LIBXML2_LIB="${LIBXML2_LIBS} -lz -lm $LZMA_LIBS" - else - if test "x$with_xml2" = "xyes"; then - AC_MSG_ERROR([--with-xml2 was requested, but libxml2 is not available]) -@@ -4817,8 +4811,7 @@ if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjs +@@ -4536,6 +4631,22 @@ WEBP_SETTING=no + + if test "$with_webp" = "yes" -o "$with_webp" = "" ; then + ++ PKG_CHECK_MODULES([WEBP],[libwebp],[HAVE_LIBWEBP_PC=yes],[HAVE_LIBWEBP_PC=no]) ++ SAVED_LIBS="$LIBS" ++ LIBS="$WEBP_LIBS" ++ AC_SEARCH_LIBS(WebPDecodeRGB,[],WEBP_SETTING=yes,WEBP_SETTING=no,) ++ ++ if test "$WEBP_SETTING" = "yes" ; then ++ LIBS="$WEBP_LIBS $SAVED_LIBS" ++ elif test "$HAVE_LIBWEBP_PC" = "yes" ; then ++ AC_MSG_ERROR([vcpkg libwebp broken]) ++ else ++ echo "libwebp not found - WEBP support disabled" ++ LIBS="$SAVED_LIBS" ++ fi ++ ++elif false ; then ++ + AC_CHECK_LIB(webp,WebPDecodeRGB,WEBP_SETTING=yes,WEBP_SETTING=no,) + + if test "$WEBP_SETTING" = "yes" ; then +@@ -4567,7 +4678,7 @@ dnl --------------------------------------------------------------------------- + dnl Check if geos library is available. + dnl --------------------------------------------------------------------------- + +-GEOS_INIT(3.1.0) ++PKG_CHECK_MODULES(GEOS,geos >= 3.1.0,HAVE_GEOS=yes,AC_MSG_ERROR([vcpkg geos not found])) + HAVE_GEOS_RESULT="no" + if test "${HAVE_GEOS}" = "yes" ; then + +@@ -4812,6 +4923,16 @@ dnl --------------------------------------------------------------------------- + + AC_ARG_WITH(libjson-c,[ --with-libjson-c[=ARG] Include libjson-c support (ARG=internal or libjson-c directory)],,) + ++PKG_CHECK_MODULES([JSONC],[json-c],[HAVE_JSONC=yes],[HAVE_JSONC=no]) ++SAVED_LIBS="$LIBS" ++LIBS="$JSONC_LIBS" ++AC_SEARCH_LIBS(json_object_set_serializer,[],LIBJSONC_SETTING=external,LIBJSONC_SETTING=,) ++if test "$LIBJSONC_SETTING" = "external" ; then ++ LIBS="$JSONC_LIBS $SAVED_LIBS" ++ JSON_INCLUDE="$JSONC_CFLAGS" ++else ++ LIBS="$SAVED_LIBS" ++ + if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjson_c" = "yes" ; then + AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,) elif test "$with_libjson_c" = "internal" ; then - LIBJSONC_SETTING=internal - elif test "$with_libjson_c" != "no"; then -- LIBS="-L$with_libjson_c/lib $LIBS" -- AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,-L$with_libjson_c/lib) -+ AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,) - else - AC_MSG_ERROR([libjson-c (internal or external) is required]) +@@ -4840,6 +4961,8 @@ else + AC_MSG_RESULT([using internal libjson-c code]) fi - -diff --git a/m4/ax_lib_sqlite3.m4 b/m4/ax_lib_sqlite3.m4 -index e53a4a967..440e2c5ed 100644 ---- a/m4/ax_lib_sqlite3.m4 -+++ b/m4/ax_lib_sqlite3.m4 -@@ -76,23 +76,22 @@ AC_DEFUN([AX_LIB_SQLITE3], - - unset ac_cv_lib_sqlite3_sqlite3_open - saved_LIBS="$LIBS" -- LIBS="" - AC_CHECK_LIB(sqlite3,sqlite3_open,LIB_SQLITE3_FOUND=yes,LIB_SQLITE3_FOUND=no,-L$ac_sqlite3_path/lib) - LIBS="$saved_LIBS" - if test "$LIB_SQLITE3_FOUND" = "yes"; then - ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib" - fi - -+ ac_sqlite3_include_path="$ac_sqlite3_path/include" - ac_sqlite3_cppflags="-I$ac_sqlite3_path/include" - else -- for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do -- if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \ -- && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then -+ for ac_sqlite3_path_tmp in $prefix /usr /usr/local /opt; do -+ if (test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \ -+ && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header") || (test -f "$ac_sqlite3_path_tmp/../include/$ac_sqlite3_header" && test -r "$ac_sqlite3_path_tmp/../include/$ac_sqlite3_header"); then - ac_sqlite3_path=$ac_sqlite3_path_tmp - - unset ac_cv_lib_sqlite3_sqlite3_open - saved_LIBS="$LIBS" -- LIBS="" - AC_CHECK_LIB(sqlite3,sqlite3_open,LIB_SQLITE3_FOUND=yes,LIB_SQLITE3_FOUND=no,) - LIBS="$saved_LIBS" - if test "$LIB_SQLITE3_FOUND" = "yes"; then -@@ -100,7 +99,6 @@ AC_DEFUN([AX_LIB_SQLITE3], - else - unset ac_cv_lib_sqlite3_sqlite3_open - saved_LIBS="$LIBS" -- LIBS="" - AC_CHECK_LIB(sqlite3,sqlite3_open,LIB_SQLITE3_FOUND=yes,LIB_SQLITE3_FOUND=no,-L$ac_sqlite3_path_tmp/lib) - LIBS="$saved_LIBS" - if test "$LIB_SQLITE3_FOUND" = "yes"; then -@@ -108,7 +106,12 @@ AC_DEFUN([AX_LIB_SQLITE3], - fi - fi - -- ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include" -+ if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then -+ ac_sqlite3_include_path="$ac_sqlite3_path_tmp/include" -+ else -+ ac_sqlite3_include_path="$ac_sqlite3_path_tmp/../include" -+ fi -+ ac_sqlite3_cppflags="-I$ac_sqlite3_include_path" - break; - fi - done -@@ -122,7 +125,6 @@ AC_DEFUN([AX_LIB_SQLITE3], - AC_MSG_CHECKING([for SQLite3 library >= $sqlite3_version_req]) - - if test "x$WANT_SQLITE3" = "xyes"; then -- - ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3" - - saved_CPPFLAGS="$CPPFLAGS" -@@ -161,7 +163,7 @@ AC_DEFUN([AX_LIB_SQLITE3], - SQLITE3_CFLAGS="$ac_sqlite3_cppflags" - SQLITE3_LDFLAGS="$ac_sqlite3_ldflags" - -- ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header" -+ ac_sqlite3_header_path="$ac_sqlite3_include_path/$ac_sqlite3_header" - - dnl Retrieve SQLite release version - if test "x$ac_sqlite3_header_path" != "x"; then -@@ -184,5 +186,6 @@ AC_DEFUN([AX_LIB_SQLITE3], - else - AC_MSG_RESULT([disabled]) - fi -+ unset ac_sqlite3_include_path - ]) - - -diff --git a/m4/geos.m4 b/m4/geos.m4 -index a410673b4..c16e1f33a 100644 ---- a/m4/geos.m4 -+++ b/m4/geos.m4 -@@ -60,6 +60,7 @@ AC_DEFUN([GEOS_INIT],[ - - AC_PATH_PROG(GEOS_CONFIG, geos-config, no) - ac_geos_config_auto=yes -+ HAVE_GEOS="yes" - else ++fi # json-c.pc ++ + AC_SUBST(LIBJSONC_SETTING,$LIBJSONC_SETTING) + AC_SUBST(JSON_INCLUDE,$JSON_INCLUDE) diff --git a/ports/gdal/0006-Fix-mingw-dllexport.patch b/ports/gdal/0006-Fix-mingw-dllexport.patch new file mode 100644 index 00000000000000..7091f921ab58f5 --- /dev/null +++ b/ports/gdal/0006-Fix-mingw-dllexport.patch @@ -0,0 +1,13 @@ +diff --git a/port/cpl_port.h b/port/cpl_port.h +index 9e3ebbb..130af04 100644 +--- a/port/cpl_port.h ++++ b/port/cpl_port.h +@@ -343,7 +343,7 @@ typedef unsigned int GUIntptr_t; + #endif + + #ifndef CPL_DLL +-#if defined(_MSC_VER) && !defined(CPL_DISABLE_DLL) ++#if defined(WIN32) && !defined(CPL_DISABLE_DLL) + # ifdef GDAL_COMPILATION + # define CPL_DLL __declspec(dllexport) + # else diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index f2a102a20c2b88..fc46f224d9ad6b 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,12 +1,8 @@ -include(${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake) -#include(${CMAKE_CURRENT_LIST_DIR}/dependency_unix.cmake) - vcpkg_fail_port_install(ON_ARCH "arm") # NOTE: update the version and checksum for new GDAL release set(GDAL_VERSION_STR "3.2.2") set(GDAL_VERSION_PKG "322") -set(GDAL_VERSION_LIB "204") set(GDAL_PACKAGE_SUM "ce319e06c78bd076228b3710c127cdbd37c7d6fb23966b47df7287eaffe86a05d4ddcc78494c8bfcaf4db98a71f2ed50a01fb3ca2fe1c10cf0d2e812683c8e53") vcpkg_download_distfile(ARCHIVE @@ -15,51 +11,61 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${GDAL_PACKAGE_SUM} ) -set(GDAL_PATCHES 0001-Fix-debug-crt-flags.patch 0002-Fix-build.patch 0005-Fix-configure.patch) -if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") +set(GDAL_PATCHES + 0001-Fix-debug-crt-flags.patch + 0002-Fix-build.patch + 0004-Fix-cfitsio.patch + 0005-Fix-configure.patch +) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND GDAL_PATCHES 0003-Fix-static-build.patch) +else() + list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch) endif() -list(APPEND GDAL_PATCHES 0004-Fix-cfitsio.patch) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES ${GDAL_PATCHES} ) -if (VCPKG_TARGET_IS_WINDOWS) +if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") + include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") find_dependency_win() + set(NMAKE_OPTIONS "") + set(NMAKE_OPTIONS_REL "") + set(NMAKE_OPTIONS_DBG "") + if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}) - list(APPEND NMAKE_OPTIONS_REL MYSQL_LIB=${MYSQL_LIBRARY_REL}) - list(APPEND NMAKE_OPTIONS_DBG MYSQL_LIB=${MYSQL_LIBRARY_DBG}) + list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}") + list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${MYSQL_LIBRARY_REL}") + list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${MYSQL_LIBRARY_DBG}") endif() list(APPEND NMAKE_OPTIONS - # VERSION=${GDAL_VERSION_LIB} - DATADIR=${NATIVE_DATA_DIR} - HTMLDIR=${NATIVE_HTML_DIR} - GEOS_DIR=${GEOS_INCLUDE_DIR} + "DATADIR=${NATIVE_DATA_DIR}" + "HTMLDIR=${NATIVE_HTML_DIR}" + "GEOS_DIR=${GEOS_INCLUDE_DIR}" "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS" - PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR} - EXPAT_DIR=${EXPAT_INCLUDE_DIR} - EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR} - CURL_INC=-I${CURL_INCLUDE_DIR} + "PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}" + "EXPAT_DIR=${EXPAT_INCLUDE_DIR}" + "EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}" + "CURL_INC=-I${CURL_INCLUDE_DIR}" "SQLITE_INC=-I${SQLITE_INCLUDE_DIR} ${HAVE_SPATIALITE}" - PG_INC_DIR=${PGSQL_INCLUDE_DIR} + "PG_INC_DIR=${PGSQL_INCLUDE_DIR}" OPENJPEG_ENABLED=YES - OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR} + "OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}" OPENJPEG_VERSION=20100 WEBP_ENABLED=YES - WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR} - LIBXML2_INC=-I${XML2_INCLUDE_DIR} + "WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}" + "LIBXML2_INC=-I${XML2_INCLUDE_DIR}" PNG_EXTERNAL_LIB=1 - PNGDIR=${PNG_INCLUDE_DIR} - ZLIB_INC=-I${ZLIB_INCLUDE_DIR} + "PNGDIR=${PNG_INCLUDE_DIR}" + "ZLIB_INC=-I${ZLIB_INCLUDE_DIR}" ZLIB_EXTERNAL_LIB=1 ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 MSVC_VER=1900 @@ -69,7 +75,7 @@ if (VCPKG_TARGET_IS_WINDOWS) list(APPEND NMAKE_OPTIONS WIN64=YES) endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB) list(APPEND NMAKE_OPTIONS DLLBUILD=0) list(APPEND NMAKE_OPTIONS "PROJ_FLAGS=-DPROJ_STATIC -DPROJ_VERSION=5") @@ -79,7 +85,7 @@ if (VCPKG_TARGET_IS_WINDOWS) list(APPEND NMAKE_OPTIONS DLLBUILD=1) endif() - if (VCPKG_CRT_LINKAGE STREQUAL static) + if (VCPKG_CRT_LINKAGE STREQUAL "static") set(LINKAGE_FLAGS "/MT") else() set(LINKAGE_FLAGS "/MD") @@ -87,42 +93,42 @@ if (VCPKG_TARGET_IS_WINDOWS) list(APPEND NMAKE_OPTIONS_REL ${NMAKE_OPTIONS} - GDAL_HOME=${CURRENT_PACKAGES_DIR} - CXX_CRT_FLAGS=${LINKAGE_FLAGS} - PROJ_LIBRARY=${PROJ_LIBRARY_REL} - PNG_LIB=${PNG_LIBRARY_REL} + "GDAL_HOME=${CURRENT_PACKAGES_DIR}" + "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" + "PROJ_LIBRARY=${PROJ_LIBRARY_REL}" + "PNG_LIB=${PNG_LIBRARY_REL}" "GEOS_LIB=${GEOS_LIBRARY_REL}" - EXPAT_LIB=${EXPAT_LIBRARY_REL} + "EXPAT_LIB=${EXPAT_LIBRARY_REL}" "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib" "SQLITE_LIB=${SQLITE_LIBRARY_REL} ${SPATIALITE_LIBRARY_REL}" - OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL} - WEBP_LIBS=${WEBP_LIBRARY_REL} + "OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}" + "WEBP_LIBS=${WEBP_LIBRARY_REL}" "LIBXML2_LIB=${XML2_LIBRARY_REL} ${ICONV_LIBRARY_REL} ${LZMA_LIBRARY_REL}" - ZLIB_LIB=${ZLIB_LIBRARY_REL} + "ZLIB_LIB=${ZLIB_LIBRARY_REL}" "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_REL}" ) list(APPEND NMAKE_OPTIONS_DBG ${NMAKE_OPTIONS} - GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug - CXX_CRT_FLAGS="${LINKAGE_FLAGS}d" - PROJ_LIBRARY=${PROJ_LIBRARY_DBG} - PNG_LIB=${PNG_LIBRARY_DBG} + "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" + "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" + "PROJ_LIBRARY=${PROJ_LIBRARY_DBG}" + "PNG_LIB=${PNG_LIBRARY_DBG}" "GEOS_LIB=${GEOS_LIBRARY_DBG}" - EXPAT_LIB=${EXPAT_LIBRARY_DBG} + "EXPAT_LIB=${EXPAT_LIBRARY_DBG}" "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib" "SQLITE_LIB=${SQLITE_LIBRARY_DBG} ${SPATIALITE_LIBRARY_DBG}" - OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG} - WEBP_LIBS=${WEBP_LIBRARY_DBG} + "OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}" + "WEBP_LIBS=${WEBP_LIBRARY_DBG}" "LIBXML2_LIB=${XML2_LIBRARY_DBG} ${ICONV_LIBRARY_DBG} ${LZMA_LIBRARY_DBG}" - ZLIB_LIB=${ZLIB_LIBRARY_DBG} + "ZLIB_LIB=${ZLIB_LIBRARY_DBG}" "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_DBG}" DEBUG=1 ) # Begin build process vcpkg_install_nmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" TARGET devinstall OPTIONS_RELEASE "${NMAKE_OPTIONS_REL}" @@ -131,11 +137,11 @@ if (VCPKG_TARGET_IS_WINDOWS) ) if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/gdal/html) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/gdal/html") endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - list(APPEND GDAL_EXES + if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(GDAL_EXES gdal_contour gdal_create gdal_grid @@ -166,81 +172,193 @@ if (VCPKG_TARGET_IS_WINDOWS) ) vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/share/gdal/html) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/share/gdal/html") vcpkg_copy_pdbs() if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb") endif() else() # See https://github.com/microsoft/vcpkg/issues/16990 - vcpkg_execute_required_process( - COMMAND touch config.rpath - WORKING_DIRECTORY ${SOURCE_PATH} - LOGNAME touch-${TARGET_TRIPLET} - ) + file(TOUCH "${SOURCE_PATH}/config.rpath") - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(BUILD_DYNAMIC yes) - set(BUILD_STATIC no) - else() - set(BUILD_DYNAMIC no) - set(BUILD_STATIC yes) + set(CONF_OPTS + --with-hide-internal-symbols=yes + --with-perl=no + --with-python=no + --with-java=no + ) + set(CONF_CHECKS "") + function(add_config option check) + list(APPEND CONF_OPTS "${option}") + set(CONF_OPTS "${CONF_OPTS}" PARENT_SCOPE) + list(APPEND CONF_CHECKS "${check}") + set(CONF_CHECKS "${CONF_CHECKS}" PARENT_SCOPE) + endfunction() + # parameters in the same order as the dependencies in vcpkg.json + add_config("--with-cfitsio=yes" "CFITSIO support: external") + add_config("--with-curl=yes" "cURL support .wms/wcs/....:yes") + add_config("--with-expat=yes" "Expat support: yes") + add_config("--with-geos=yes" "GEOS support: yes") + add_config("--with-gif=yes" "LIBGIF support: external") + add_config("--with-hdf5=yes" "HDF5 support: yes") + add_config("--with-libjson=yes" "checking for JSONC... yes") + add_config("--with-geotiff=yes" "LIBGEOTIFF support: external") + add_config("--with-jpeg=yes" "LIBJPEG support: external") + add_config("--with-liblzma=yes" "LIBLZMA support: yes") + add_config("--with-png=yes" "LIBPNG support: external") + add_config("--with-pg=yes" "PostgreSQL support: yes") + add_config("--with-webp=yes" "WebP support: yes") + add_config("--with-xml2=yes" "libxml2 support: yes") + add_config("--with-netcdf=yes" "NetCDF support: yes") + add_config("--with-openjpeg=yes" "OpenJPEG support: yes") + add_config("--with-proj=yes" "PROJ >= 6: yes") + add_config("--with-sqlite3=yes" "SQLite support: yes") + add_config("--with-libtiff=yes" "LIBTIFF support: external") + add_config("--with-libz=yes" "LIBZ support: external") + add_config("--with-zstd=yes" "ZSTD support: yes") + + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND CONF_OPTS --without-libtool --without-ld-shared) endif() - set(CONF_OPTS --enable-shared=${BUILD_DYNAMIC} --enable-static=${BUILD_STATIC}) - list(APPEND CONF_OPTS --with-proj=yes --with-libjson-c=${CURRENT_INSTALLED_DIR}) - list(APPEND CONF_OPTS --with-libtiff=yes --with-geotiff=yes) - list(APPEND CONF_OPTS --with-pg=yes --with-liblzma=yes) + if("system-libraries" IN_LIST FEATURES) + set(DISABLE_SYSTEM_LIBRARIES OFF) + else() + set(DISABLE_SYSTEM_LIBRARIES ON) + endif() if ("libspatialite" IN_LIST FEATURES) - list(APPEND CONF_OPTS --with-spatialite=yes) - else() - list(APPEND CONF_OPTS --with-spatialite=no) + add_config("--with-spatialite=yes" "SpatiaLite support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-spatialite=no" "SpatiaLite support: no") endif() - if(VCPKG_TARGET_IS_LINUX) - set(DEPENDLIBS "-lstdc++") - else() - set(DEPENDLIBS "-lc++ -liconv -llber -lldap -framework CoreFoundation -framework Security") + if ("mysql-libmariadb" IN_LIST FEATURES) + add_config("--with-mysql=yes" "MySQL support: yes") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-mysql=no" "MySQL support: no") endif() - list(APPEND OPTIONS_RELEASE - "LIBS=-pthread ${DEPENDLIBS} -lssl -lcrypto -lgeos_c -lgeos -llzma -lszip" - ) - list(APPEND OPTIONS_DEBUG - "LIBS=-pthread ${DEPENDLIBS} -lssl -lcrypto -lgeos_cd -lgeosd -llzmad -lszip_debug" - ) + if(DISABLE_SYSTEM_LIBRARIES) + list(APPEND CONF_OPTS + # Too much: --disable-all-optional-drivers + # alphabetical order + --with-armadillo=no + --with-charls=no + --with-crypto=no + --with-cryptopp=no + --with-dds=no + --with-dods-root=no + --with-ecw=no + --with-epsilon=no + --with-exr=no + --with-fgdb=no + --with-fme=no + --with-freexl=no + --with-grass=no + --with-gta=no + --with-hdf4=no + --with-hdfs=no + --with-heif=no + --with-idb=no + --with-ingres=no + --with-jasper=no + --with-jp2lura=no + --with-kakadu=no + --with-kea=no + --with-libdeflate=no + --with-libgrass=no + --with-libkml=no + --with-mdb=no + --with-mrsid=no + --with-mrsid_lidar=no + --with-msg=no + --with-mongocxx=no + --with-mongocxxv3=no + --with-oci=no + --with-odbc=no + --with-ogdi=no + --with-opencl=no + --with-pcidsk=no + --with-pcraster=no + --with-pcre=no + --with-pdfium=no + --with-podofo=no + --with-poppler=no + --with-qhull=no + --with-rasdaman=no + --with-rasterlite2=no + --with-rdb=no + --with-sfcgal=no + --with-sosi=no + --with-teigha=no + --with-tiledb=no + --with-xerces=no + ) + endif() + + # proj needs a C++ runtime library + if(VCPKG_TARGET_IS_OSX) + list(APPEND CONF_OPTS "--with-proj-extra-lib-for-test=-lc++") + else() + list(APPEND CONF_OPTS "--with-proj-extra-lib-for-test=-lstdc++") + endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG COPY_SOURCE OPTIONS ${CONF_OPTS} - "GEOS_VERSION=3.9.0" - OPTIONS_RELEASE - ${OPTIONS_RELEASE} OPTIONS_DEBUG --enable-debug - ${OPTIONS_DEBUG} ) + # Verify configuration results (tightly coupled to vcpkg_configure_make) + function(check_config logfile) + set(failed_checks "") + file(READ "${logfile}" log) + foreach(check IN LISTS CONF_CHECKS) + if(NOT log MATCHES "${check}") + string(APPEND failed_checks "\n ${check}") + endif() + endforeach() + if(failed_checks) + get_filename_component(file "${logfile}" NAME_WE) + message(FATAL_ERROR "${file}: Configuration failed for ${failed_checks}") + endif() + endfunction() + foreach(suffix IN ITEMS rel dbg) + set(log "${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-${suffix}-out.log") + if(EXISTS "${log}") + check_config("${log}") + endif() + endforeach() + vcpkg_install_make(MAKEFILE GNUmakefile) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib/gdalplugins - ${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/lib/gdalplugins" + "${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins" + "${CURRENT_PACKAGES_DIR}/debug/share" ) + + vcpkg_fixup_pkgconfig() + set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdal.pc") + if(EXISTS "${pc_file_debug}") + vcpkg_replace_string("${pc_file_debug}" "${prefix}/../../include" "${prefix}/../include") + vcpkg_replace_string("${pc_file_debug}" "${exec_prefix}/include" "${prefix}/../include") + endif() + endif() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 30c3b5a6675254..1448956d1dbaba 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -1,12 +1,98 @@ -include(FindPackageHandleStandardArgs) include(SelectLibraryConfigurations) -find_path(GDAL_INCLUDE_DIR NAMES gdal.h HINTS ${CURRENT_INSTALLED_DIR}) +find_path(GDAL_INCLUDE_DIR + NAMES gdal.h + PATHS "${CMAKE_CURRENT_LIST_DIR}/../../include" + NO_DEFAULT_PATH +) +find_library(GDAL_LIBRARY_DEBUG + NAMES gdal_d gdal_i_d gdal + NAMES_PER_DIR + PATHS "${CMAKE_CURRENT_LIST_DIR}/../../debug/lib" + NO_DEFAULT_PATH +) +find_library(GDAL_LIBRARY_RELEASE + NAMES gdal_i gdal + NAMES_PER_DIR + PATHS "${CMAKE_CURRENT_LIST_DIR}/../../lib" + NO_DEFAULT_PATH +) +select_library_configurations(GDAL) -find_library(GDAL_LIBRARY_DEBUG NAMES gdal_d gdal_i_d gdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(GDAL_LIBRARY_RELEASE NAMES gdal_i gdal NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +if(NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY) + message(FATAL_ERROR "Installation of vcpkg port gdal is broken.") +endif() -select_library_configurations(GDAL) +set(FindGDAL_SKIP_GDAL_CONFIG TRUE) + +_find_package(${ARGS}) -set(GDAL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR}) -set(GDAL_LIBRARIES ${GDAL_LIBRARY}) +set(_gdal_dep_find_args "") +if(";${ARGS};" MATCHES ";REQUIRED;") + list(APPEND _gdal_dep_find_args "REQUIRED") +endif() +function(_gdal_add_dependency target package) + find_package(${package} ${ARGN} ${_gdal_dep_find_args}) + if(${package}_FOUND) + foreach(suffix IN ITEMS "" "-shared" "_shared" "-static" "_static" "-NOTFOUND") + set(dependency "${target}${suffix}") + if(TARGET ${dependency}) + break() + endif() + endforeach() + if(NOT TARGET ${dependency}) + string(TOUPPER ${package} _gdal_deps_package) + if(DEFINED ${_gdal_deps_package}_LIBRARIES) + set(dependency ${${_gdal_deps_package}_LIBRARIES}) + elseif(DEFINED ${package}_LIBRARIES) + set(dependency ${${package}_LIBRARIES}) + elseif(DEFINED ${_gdal_deps_package}_LIBRARY) + set(dependency ${${_gdal_deps_package}_LIBRARY}) + elseif(DEFINED ${package}_LIBRARY) + set(dependency ${${package}_LIBRARY}) + endif() + endif() + if(dependency) + if(TARGET GDAL::GDAL) # CMake 3.14 + target_link_libraries(GDAL::GDAL INTERFACE ${dependency}) + endif() + if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") + set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${dependency}" PARENT_SCOPE) + endif() + else() + message(WARNING "Did not find which libraries are exported by ${package}") + set(GDAL_FOUND false PARENT_SCOPE) + endif() + else() + set(GDAL_FOUND false PARENT_SCOPE) + endif() +endfunction() +if(GDAL_FOUND) + _gdal_add_dependency(cfitsio unofficial-cfitsio CONFIG) + _gdal_add_dependency(CURL::libcurl CURL CONFIG) + _gdal_add_dependency(expat::expat expat CONFIG) + _gdal_add_dependency(GEOS::geos_c geos CONFIG) + _gdal_add_dependency(GIF::GIF GIF) + _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) + if(NOT WIN32) + _gdal_add_dependency(json-c::json-c json-c CONFIG) + endif() + _gdal_add_dependency(geotiff_library geotiff CONFIG) + _gdal_add_dependency(JPEG::JPEG JPEG) + _gdal_add_dependency(liblzma::liblzma liblzma CONFIG) + _gdal_add_dependency(png libpng CONFIG) + _gdal_add_dependency(PostgreSQL::PostgreSQL PostgreSQL) + _gdal_add_dependency(WebP::webp WebP CONFIG) + _gdal_add_dependency(LibXml2::LibXml2 LibXml2) + _gdal_add_dependency(netCDF::netcdf netCDF CONFIG) + _gdal_add_dependency(openjp2 OpenJPEG CONFIG) + _gdal_add_dependency(PROJ::proj PROJ4 CONFIG) + _gdal_add_dependency(unofficial::sqlite3::sqlite3 unofficial-sqlite3 CONFIG) + _gdal_add_dependency(TIFF::TIFF TIFF) + _gdal_add_dependency(ZLIB::ZLIB ZLIB) + _gdal_add_dependency(zstd::libzstd zstd CONFIG) + list(FIND ARGS "REQUIRED" required) + if(NOT required EQUAL "-1") + message(FATAL_ERROR "Failed to find dependencies of GDAL") + endif() +endif() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 971e9b205f3b74..7bc8db99dcd565 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", @@ -16,6 +17,7 @@ "platform": "!windows" }, "libgeotiff", + "libjpeg-turbo", "liblzma", "libpng", "libpq", @@ -25,6 +27,7 @@ "openjpeg", "proj4", "sqlite3", + "tiff", "zlib", "zstd" ], @@ -40,6 +43,10 @@ "dependencies": [ "libmariadb" ] + }, + "system-libraries": { + "$supports": "!windows", + "description": "Include drivers which need additional libraries" } } } diff --git a/versions/baseline.json b/versions/baseline.json index fbde6debeceeb8..049fab1bc7ae39 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2218,7 +2218,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 09828f5022f661..649654b4b59c61 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f95d14f55c0bbc629a07da68147324ab4fd0bd58", + "version-semver": "3.2.2", + "port-version": 1 + }, { "git-tree": "bb182d21db781421272dccf7c43273c746480c05", "version-semver": "3.2.2", From b5733691c03e8ca5779663130a5c53cf82f6e1b7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 23 Jul 2021 22:34:02 +0200 Subject: [PATCH 0192/1858] [gdal] Repair gdal wrapper (#19105) * Repair gdal wrapper * x-add-version --- ports/gdal/vcpkg-cmake-wrapper.cmake | 2 +- ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 1448956d1dbaba..8614c35e3ee9c2 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -92,7 +92,7 @@ if(GDAL_FOUND) _gdal_add_dependency(ZLIB::ZLIB ZLIB) _gdal_add_dependency(zstd::libzstd zstd CONFIG) list(FIND ARGS "REQUIRED" required) - if(NOT required EQUAL "-1") + if(NOT GDAL_FOUND AND NOT required EQUAL "-1") message(FATAL_ERROR "Failed to find dependencies of GDAL") endif() endif() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 7bc8db99dcd565..71e7cbf110d894 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 1, + "port-version": 2, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index 049fab1bc7ae39..b35f9fc19635de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2218,7 +2218,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 649654b4b59c61..9d20106b81d71a 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cee8a26ec45230cb4b11e18582b41291b264d82e", + "version-semver": "3.2.2", + "port-version": 2 + }, { "git-tree": "f95d14f55c0bbc629a07da68147324ab4fd0bd58", "version-semver": "3.2.2", From 82c3e5b35a278b1136460dd926b273d7687d74d4 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Fri, 23 Jul 2021 16:35:23 -0400 Subject: [PATCH 0193/1858] [docs] Describe nugettimeout option in binarycaching (#19084) --- docs/users/binarycaching.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index 0e2ea19cb54a49..b058a6bf63c21f 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -52,6 +52,7 @@ By default, zip-based archives will be cached at the first valid location of: | `files,[,]` | Adds a custom file-based location | `nuget,[,]` | Adds a NuGet-based source; equivalent to the `-Source` parameter of the NuGet CLI | `nugetconfig,[,]` | Adds a NuGet-config-file-based source; equivalent to the `-Config` parameter of the NuGet CLI. This config should specify `defaultPushSource` for uploads. +| `nugettimeout,` | Specifies a timeout for NuGet network operations; equivalent to the `-Timeout` parameter of the NuGet CLI. | `x-azblob,,[,]` | **Experimental: will change or be removed without warning**
Adds an Azure Blob Storage source. Uses Shared Access Signature validation. URL should include the container path. | `interactive` | Enables interactive credential management for NuGet (for debugging; requires `--debug` on the command line) From 214759a3487b334b9a309839a9ba19e6230a8429 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Fri, 23 Jul 2021 21:05:45 -0700 Subject: [PATCH 0194/1858] [boost] Fix `boost-modular-build.cmake` with VS 2022 17.0 Preview 2 (#19086) * Fix boost-modular-build.cmake with VS 2022 17.0 Preview 2. * Update another version list, noticed by @CaseyCarter. * Update port-version to 1. * Run `vcpkg.exe x-add-version --all`. --- ports/boost-modular-build-helper/boost-modular-build.cmake | 6 +++++- ports/boost-modular-build-helper/vcpkg.json | 1 + versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index fecb98651c1348..f8a35a207af4f5 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -300,7 +300,10 @@ function(boost_modular_build) endif() set(MSVC_VERSION) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") + if(VCPKG_PLATFORM_TOOLSET MATCHES "v143") + list(APPEND _bm_OPTIONS toolset=msvc) + set(MSVC_VERSION 14.3) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142") list(APPEND _bm_OPTIONS toolset=msvc) set(MSVC_VERSION 14.2) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") @@ -410,6 +413,7 @@ function(boost_modular_build) string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries string(REPLACE "-vc142-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2019 and VS2015 binaries + string(REPLACE "-vc143-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 and VS2015 binaries string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index d7460d8dbe38ee..192b420666ce5d 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.76.0", + "port-version": 1, "dependencies": [ "boost-build", "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 7ba71e16edd113..95199b6d3023cf 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9cf6243049bf0abf8526fba57702a2122665549", + "version-string": "1.76.0", + "port-version": 1 + }, { "git-tree": "e0f858222eaf2c58a7270d10d649bc88e2e149b6", "version-string": "1.76.0", diff --git a/versions/baseline.json b/versions/baseline.json index b35f9fc19635de..5692866e843f33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -746,7 +746,7 @@ }, "boost-modular-build-helper": { "baseline": "1.76.0", - "port-version": 0 + "port-version": 1 }, "boost-move": { "baseline": "1.76.0", From e2419e2bfdf9910bd926b06013bc074206aaebe7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 24 Jul 2021 22:10:41 +0200 Subject: [PATCH 0195/1858] [gettext] Add gettext cmake wrapper (#18159) * Add gettext cmake wrapper * x-add-version * Make kf5i18n use gettext[tools]:host * x-add-version * Revise wrapper source names * Update git-tree * Provide host tools via port config, not wrapper * Enable tools on linux * Fix linux libintl.h hint * Update git-tree * Update git-tree * Revise vcpkg port config * Revise linux libintl.h message * Revise cmake style * Build only release variant of tools * Cache configuration for faster build * Update git-tree * Fix typo * Revise options * Add top-level Makefile for tools * Remove non-libintl libs and includes * Update git-tree * Update port-version * x-add-version * [gettext] Address PR comments Co-authored-by: Robert Schumacher --- ports/gettext/Makefile | 65 ++++++++++ ports/gettext/portfile.cmake | 163 ++++++++++++++++++-------- ports/gettext/vcpkg-port-config.cmake | 6 + ports/gettext/vcpkg.json | 2 +- ports/kf5i18n/portfile.cmake | 21 ---- ports/kf5i18n/vcpkg.json | 9 +- versions/baseline.json | 4 +- versions/g-/gettext.json | 5 + versions/k-/kf5i18n.json | 5 + 9 files changed, 205 insertions(+), 75 deletions(-) create mode 100644 ports/gettext/Makefile create mode 100644 ports/gettext/vcpkg-port-config.cmake diff --git a/ports/gettext/Makefile b/ports/gettext/Makefile new file mode 100644 index 00000000000000..1c9a294c218c1b --- /dev/null +++ b/ports/gettext/Makefile @@ -0,0 +1,65 @@ +all: build-gettext-runtime-intl build-gettext-runtime-po build-gettext-runtime-src +all: build-gettext-tools build-gettext-tools-gnulib build-gettext-tools-its build-gettext-tools-m4 build-gettext-tools-misc build-gettext-tools-po build-gettext-tools-projects build-gettext-tools-styles +all: build-libtextstyle + +install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext-runtime-src +install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles +install: install-libtextstyle + +build-gettext-runtime-gnulib: build-gettext-runtime-intl + $(MAKE) -C gettext-runtime/gnulib-lib all +build-gettext-runtime-intl: + $(MAKE) -C gettext-runtime/intl all +build-gettext-runtime-po: + $(MAKE) -C gettext-runtime/po all +build-gettext-runtime-src: build-gettext-runtime-intl build-gettext-runtime-gnulib + $(MAKE) -C gettext-runtime/src all +build-gettext-tools: build-gettext-runtime-intl build-libtextstyle build-gettext-tools-gnulib build-gettext-tools-intl build-gettext-tools-libgrep build-gnulib-local + $(MAKE) -C gettext-tools/src all +build-gettext-tools-gnulib: build-gettext-tools-intl + $(MAKE) -C gettext-tools/gnulib-lib all +build-gettext-tools-libgrep: build-gettext-tools-gnulib + $(MAKE) -C gettext-tools/libgrep all +build-gettext-tools-intl: + $(MAKE) -C gettext-tools/intl all +build-gettext-tools-its: + $(MAKE) -C gettext-tools/its all +build-gettext-tools-m4: + $(MAKE) -C gettext-tools/m4 all +build-gettext-tools-misc: + $(MAKE) -C gettext-tools/misc all +build-gettext-tools-po: + $(MAKE) -C gettext-tools/po all +build-gettext-tools-projects: + $(MAKE) -C gettext-tools/projects all +build-gettext-tools-styles: + $(MAKE) -C gettext-tools/styles all +build-gnulib-local: + $(MAKE) -C gnulib-local all +build-libtextstyle: + $(MAKE) -C libtextstyle/lib all + +install-gettext-runtime-intl: + $(MAKE) -C gettext-runtime/intl install +install-gettext-runtime-po: + $(MAKE) -C gettext-runtime/po install +install-gettext-runtime-src: + $(MAKE) -C gettext-runtime/src install +install-gettext-tools: + $(MAKE) -C gettext-tools/src install +install-gettext-tools-gnulib: + $(MAKE) -C gettext-tools/gnulib-lib install +install-gettext-tools-its: + $(MAKE) -C gettext-tools/its install +install-gettext-tools-m4: + $(MAKE) -C gettext-tools/m4 install +install-gettext-tools-misc: + $(MAKE) -C gettext-tools/misc install +install-gettext-tools-po: + $(MAKE) -C gettext-tools/po install +install-gettext-tools-projects: + $(MAKE) -C gettext-tools/projects install +install-gettext-tools-styles: + $(MAKE) -C gettext-tools/styles install +install-libtextstyle: + $(MAKE) -C libtextstyle/lib install diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index a595a6d275ed71..8bfceae8f1a484 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -1,13 +1,17 @@ if(VCPKG_TARGET_IS_LINUX) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) if (NOT EXISTS "/usr/include/libintl.h") - message(FATAL_ERROR "Please use command \"sudo apt-get install gettext\" to install gettext on linux.") + message(FATAL_ERROR "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " + "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." + ) + endif() + if(NOT "tools" IN_LIST FEATURES) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + return() endif() - return() -else() - set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) endif() +set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) + #Based on https://github.com/winlibs/gettext set(GETTEXT_VERSION 0.21) @@ -17,13 +21,14 @@ vcpkg_download_distfile(ARCHIVE FILENAME "gettext-${GETTEXT_VERSION}.tar.gz" SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1 ) +set(PATCHES "") if(VCPKG_TARGET_IS_UWP) set(PATCHES uwp_remove_localcharset.patch) endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${GETTEXT_VERSION} + ARCHIVE "${ARCHIVE}" + REF "${GETTEXT_VERSION}" PATCHES 0002-Fix-uwp-build.patch 0003-Fix-win-unicode-paths.patch @@ -32,59 +37,117 @@ vcpkg_extract_source_archive_ex( ${PATCHES} ) vcpkg_find_acquire_program(BISON) -get_filename_component(BISON_PATH ${BISON} DIRECTORY) -vcpkg_add_to_path(${BISON_PATH}) +get_filename_component(BISON_PATH "${BISON}" DIRECTORY) +vcpkg_add_to_path("${BISON_PATH}") +set(OPTIONS + --enable-relocatable #symbol duplication with glib-init.c? + --enable-c++ + --disable-acl + --disable-csharp + --disable-curses + --disable-java + --disable-openmp +) if(VCPKG_TARGET_IS_WINDOWS) - # This is required. For some reason these do not get correctly identified for release builds. - list(APPEND OPTIONS ac_cv_func_wcslen=yes - ac_cv_func_memmove=yes - #The following are required for a full gettext built. - # Left here for future reference. - gl_cv_func_printf_directive_n=no #segfaults otherwise with popup window - ac_cv_func_memset=yes #not detected in release builds - ac_cv_header_pthread_h=no - ac_cv_header_dirent_h=no - ) + list(APPEND OPTIONS + # Avoid unnecessary test. + --with-included-glib + # This is required. For some reason these do not get correctly identified for release builds. + ac_cv_func_wcslen=yes + ac_cv_func_memmove=yes + # The following are required for a full gettext built (libintl and tools). + gl_cv_func_printf_directive_n=no # segfaults otherwise with popup window + ac_cv_func_memset=yes # not detected in release builds + ac_cv_header_pthread_h=no + ac_cv_header_dirent_h=no + ) endif() -set(ADDITIONAL_CONFIGURE_OPTIONS) -set(ADDITIONAL_INSTALL_OPTIONS) + +# These functions scope any changes to VCPKG_BUILD_TYPE +function(build_libintl_and_tools) + cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) + if(DEFINED arg_BUILD_TYPE) + set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") + endif() + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + ADD_BIN_TO_PATH # So configure can check for working iconv + ADDITIONAL_MSYS_PACKAGES gzip + OPTIONS + ${OPTIONS} + ) + vcpkg_install_make(MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile") +endfunction() + +function(build_libintl_only) + cmake_parse_arguments(arg "" "BUILD_TYPE" "" ${ARGN}) + if(DEFINED arg_BUILD_TYPE) + set(VCPKG_BUILD_TYPE "${arg_BUILD_TYPE}") + endif() + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime" + DETERMINE_BUILD_TRIPLET + USE_WRAPPERS + ADD_BIN_TO_PATH # So configure can check for working iconv + OPTIONS + ${OPTIONS} + ) + vcpkg_install_make(SUBPATH "/intl") +endfunction() + if("tools" IN_LIST FEATURES) - set(BUILD_SOURCE_PATH ${SOURCE_PATH}) - set(ADDITIONAL_CONFIGURE_OPTIONS ADDITIONAL_MSYS_PACKAGES gzip) + # Minimization of gettext tools build time by: + # - building tools only for release configuration + # - custom top-level Makefile + # - configuration cache + list(APPEND OPTIONS "--cache-file=../config.cache-${TARGET_TRIPLET}") + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}") + build_libintl_and_tools(BUILD_TYPE "release") + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(GLOB tool_libs + LIST_DIRECTORIES false + "${CURRENT_PACKAGES_DIR}/bin/*" + "${CURRENT_PACKAGES_DIR}/lib/*" + ) + list(FILTER tool_libs EXCLUDE REGEX "intl[^/\\\\]*$") + file(REMOVE ${tool_libs}) + file(GLOB tool_includes + LIST_DIRECTORIES true + "${CURRENT_PACKAGES_DIR}/include/*" + ) + list(FILTER tool_includes EXCLUDE REGEX "intl[^/\\\\]*$") + file(REMOVE_RECURSE ${tool_includes}) + if(VCPKG_TARGET_IS_LINUX) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + elseif(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}.release") + file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}.release") + file(READ "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" config_cache) + string(REGEX REPLACE "\nac_cv_env[^\n]*" "" config_cache "${config_cache}") # Eliminate build type flags + file(WRITE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}" "${config_cache}") + build_libintl_only(BUILD_TYPE "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}.release/debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}") + file(RENAME "${CURRENT_PACKAGES_DIR}.release" "${CURRENT_PACKAGES_DIR}") + endif() else() - set(BUILD_SOURCE_PATH ${SOURCE_PATH}/gettext-runtime) # Could be its own port - set(ADDITIONAL_INSTALL_OPTIONS SUBPATH "/intl") + list(APPEND OPTIONS "--config-cache") + build_libintl_only() endif() -vcpkg_configure_make(SOURCE_PATH ${BUILD_SOURCE_PATH} - DETERMINE_BUILD_TRIPLET - USE_WRAPPERS - ADD_BIN_TO_PATH # So configure can check for working iconv - OPTIONS --enable-relocatable #symbol duplication with glib-init.c? - --enable-c++ - --disable-java - ${OPTIONS} - ${ADDITIONAL_CONFIGURE_OPTIONS} - ) -vcpkg_install_make(${ADDITIONAL_INSTALL_OPTIONS}) # Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gettext) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/gettext/COPYING ${CURRENT_PACKAGES_DIR}/share/gettext/copyright) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/gettext/copyright" COPYONLY) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -set(GNU_DLL_PATHS lib/ debug/lib/) -set(GNU_DLL_NAME GNU.Gettext.dll) #C# dll? -foreach(DLL_PATH IN LISTS GNU_DLL_PATHS) - if(EXISTS "${CURRENT_PACKAGES_DIR}/${DLL_PATH}${GNU_DLL_NAME}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/${DLL_PATH}${GNU_DLL_NAME}") - endif() -endforeach() - vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/intl) +if(NOT VCPKG_TARGET_IS_LINUX) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/intl") +endif() +if("tools" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext") +endif() diff --git a/ports/gettext/vcpkg-port-config.cmake b/ports/gettext/vcpkg-port-config.cmake new file mode 100644 index 00000000000000..67a636bd3f4eee --- /dev/null +++ b/ports/gettext/vcpkg-port-config.cmake @@ -0,0 +1,6 @@ +get_filename_component(gettext_tools_dir "${CMAKE_CURRENT_LIST_DIR}/../../tools/gettext/bin" ABSOLUTE) +if(CMAKE_HOST_WIN32) + set(ENV{PATH} "$ENV{PATH};${gettext_tools_dir}") +else() + set(ENV{PATH} "$ENV{PATH}:${gettext_tools_dir}") +endif() diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index 57cb5439a9f2a2..7b166e22f2df24 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21", - "port-version": 3, + "port-version": 4, "description": "The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index a5809fd64a52f6..17f590d3ecef9c 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -10,27 +10,6 @@ vcpkg_from_github( PATCHES ${PATCHES} ) -if(CMAKE_HOST_WIN32) - vcpkg_acquire_msys(MSYS_ROOT NO_DEFAULT_PACKAGES DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gettext-0.19.8.1-9-any.pkg.tar.zst" - c632877544183def8b19659421c5511b87f8339596e1606bd47608277a0bf427d370aba1732915c2832c91f6d525261623401f145b951ff3015f79ac54179c19 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-1-any.pkg.tar.xz" - ba236e1efc990cb91d459f938be6ca6fc2211be95e888d73f8de301bce55d586f9d2b6be55dacb975ec1afa7952b510906284eff70210238919e341dffbdbeb8 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-libs-10.2.0-1-any.pkg.tar.zst" - 113d8b3b155ea537be8b99688d454f781d70c67c810c2643bc02b83b332d99bfbf3a7fcada6b927fda67ef02cf968d4fdf930466c5909c4338bda64f1f3f483e - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-git-8.0.0.5906.c9a21571-1-any.pkg.tar.zst" - 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpc-1.1.0-1-any.pkg.tar.xz" - d236b815ec3cf569d24d96a386eca9f69a2b1e8af18e96c3f1e5a4d68a3598d32768c7fb3c92207ecffe531259822c1a421350949f2ffabd8ee813654f1af864 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-mpfr-4.1.0-2-any.pkg.tar.zst" - caac5cb73395082b479597a73c7398bf83009dbc0051755ef15157dc34996e156d4ed7881ef703f9e92861cfcad000888c4c32e4bf38b2596c415a19aafcf893 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gmp-6.2.0-1-any.pkg.tar.xz" - 37747f3f373ebff1a493f5dec099f8cd6d5abdc2254d9cd68a103ad7ba44a81a9a97ccaba76eaee427b4d67b2becb655ee2c379c2e563c8051b6708431e3c588 - ) - set(GETTEXT_PATH ${MSYS_ROOT}/mingw32/bin) - vcpkg_add_to_path(${GETTEXT_PATH}) -endif() - vcpkg_find_acquire_program(PYTHON3) vcpkg_configure_cmake( diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 9ee9b1a0156f14..dcdac9826e63bf 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,12 +1,19 @@ { "name": "kf5i18n", "version": "5.81.0", - "port-version": 1, + "port-version": 2, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ "ecm", "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, "qt5-declarative", "qt5-tools" ] diff --git a/versions/baseline.json b/versions/baseline.json index 5692866e843f33..c8598a63626ad3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2266,7 +2266,7 @@ }, "gettext": { "baseline": "0.21", - "port-version": 3 + "port-version": 4 }, "gettimeofday": { "baseline": "2017-10-14-3", @@ -2902,7 +2902,7 @@ }, "kf5i18n": { "baseline": "5.81.0", - "port-version": 1 + "port-version": 2 }, "kf5itemmodels": { "baseline": "5.81.0", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index 06a70ef68cfc3e..d64ca34ee522dd 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6cde01ab4095a258993eaf85eb31c1e845c64a6", + "version": "0.21", + "port-version": 4 + }, { "git-tree": "33c7af8451faeef94c8a06cb41b71dce144d6fba", "version": "0.21", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index a95b23d7800148..87cac4e5895940 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98407edcc42c1bb91f4a1fe218f30c3a2757a530", + "version": "5.81.0", + "port-version": 2 + }, { "git-tree": "a749b5eb069f5e7a8c84a65746ca7579d2e85af5", "version": "5.81.0", From 711bded98363723d07b0bf4ab0ae87d0d6f5d176 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Mon, 26 Jul 2021 04:48:56 +0900 Subject: [PATCH 0196/1858] [ms-quic] create a new port (#18225) * [ms-quic] create a new port * rewrite to fix garbled history of #18225 * [ms-quic] update port/version SHA * [ms-quic] disable windows-static triplet * Update ports/ms-quic/vcpkg.json Co-authored-by: Robert Schumacher * Update ports/ms-quic/vcpkg.json Co-authored-by: Robert Schumacher * [ms-quic] update patch files * [ms-quic] make quictls only * reduce feature list for future updates * update version SHA Co-authored-by: Robert Schumacher --- ports/ms-quic/fix-install.patch | 67 ++++++++++++++++++++++++++ ports/ms-quic/fix-platform.patch | 56 ++++++++++++++++++++++ ports/ms-quic/fix-warnings.patch | 22 +++++++++ ports/ms-quic/portfile.cmake | 80 ++++++++++++++++++++++++++++++++ ports/ms-quic/vcpkg.json | 23 +++++++++ versions/baseline.json | 4 ++ versions/m-/ms-quic.json | 9 ++++ 7 files changed, 261 insertions(+) create mode 100644 ports/ms-quic/fix-install.patch create mode 100644 ports/ms-quic/fix-platform.patch create mode 100644 ports/ms-quic/fix-warnings.patch create mode 100644 ports/ms-quic/portfile.cmake create mode 100644 ports/ms-quic/vcpkg.json create mode 100644 versions/m-/ms-quic.json diff --git a/ports/ms-quic/fix-install.patch b/ports/ms-quic/fix-install.patch new file mode 100644 index 00000000000000..4df691077096ac --- /dev/null +++ b/ports/ms-quic/fix-install.patch @@ -0,0 +1,67 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96ea265..87eaed5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -647,6 +647,8 @@ if(QUIC_CODE_CHECK) + endif() + endif() + ++include(GNUInstallDirs) ++ + add_subdirectory(src/inc) + + # Product code +@@ -657,6 +659,8 @@ add_subdirectory(src/bin) + # Tool code + if(QUIC_BUILD_TOOLS) + add_subdirectory(src/tools) ++ install(TARGETS quicattack quicinterop quicinteropserver quicipclient quicipserver ++ quicpcp quicping quicpost quicreach quicsample spinquic) + endif() + + # Performance code +diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt +index 4dda469..2797670 100644 +--- a/src/bin/CMakeLists.txt ++++ b/src/bin/CMakeLists.txt +@@ -29,7 +29,7 @@ endif() + + target_include_directories(msquic PUBLIC + $ +- $) ++ $) + + set(PUBLIC_HEADERS + ../inc/msquic.h +@@ -37,14 +37,17 @@ set(PUBLIC_HEADERS + ../inc/msquic_posix.h + ../inc/quic_sal_stub.h) + +-install(TARGETS msquic EXPORT msquic DESTINATION "${main_lib_dest}") +-install(FILES ${PUBLIC_HEADERS} DESTINATION "${include_dest}") ++install(TARGETS msquic EXPORT msquic-targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + configure_file(msquic-config.cmake.in ${CMAKE_BINARY_DIR}/msquic-config.cmake) + +-install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${msquic_dest}) ++install(FILES ${CMAKE_BINARY_DIR}/msquic-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/msquic) + +-install(EXPORT msquic DESTINATION ${msquic_dest}) ++install(EXPORT msquic-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/msquic) + + if(WIN32) + add_library(msquic.lttng INTERFACE) +diff --git a/src/bin/msquic-config.cmake.in b/src/bin/msquic-config.cmake.in +index dd67624..c561361 100644 +--- a/src/bin/msquic-config.cmake.in ++++ b/src/bin/msquic-config.cmake.in +@@ -1,4 +1,4 @@ + include(CMakeFindDependencyMacro) + @FILENAME_DEP_REPLACE@ + +-include(${SELF_DIR}/msquic.cmake) ++include(${SELF_DIR}/msquic-targets.cmake) diff --git a/ports/ms-quic/fix-platform.patch b/ports/ms-quic/fix-platform.patch new file mode 100644 index 00000000000000..7041c30d0e3594 --- /dev/null +++ b/ports/ms-quic/fix-platform.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b670cf..f94f4c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -309,7 +309,7 @@ if(WIN32) + endif() + else() + # Just doing a normal build. Use the PGD file if present. +- if(EXISTS "${QUIC_PGO_FILE}") ++ if(FALSE) + message(STATUS "Using profile-guided optimization") + configure_file("${QUIC_PGO_FILE}" "${QUIC_OUTPUT_DIR}/msquic.pgd" COPYONLY) + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /USEPROFILE:PGD=${QUIC_OUTPUT_DIR}/msquic.pgd") +@@ -387,21 +387,29 @@ endif() + if(QUIC_TLS STREQUAL "openssl") + if (WIN32) + if (QUIC_UWP_BUILD) +- message(FATAL_ERROR "UWP is not supported with OpenSSL") +- endif() +- +- if (${CMAKE_GENERATOR_PLATFORM} STREQUAL "arm64") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") +- elseif (${CMAKE_GENERATOR_PLATFORM} STREQUAL "arm") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") +- elseif (${CMAKE_GENERATOR_PLATFORM} STREQUAL "Win32") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32") +- elseif (${CMAKE_GENERATOR_PLATFORM} STREQUAL "x64") +- set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A") ++ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ONECORE") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A-ONECORE") ++ endif() + else() +- message(FATAL_ERROR "Unknown Generator Platform ${CMAKE_GENERATOR_PLATFORM}") ++ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32-ARM") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN32") ++ elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") ++ set(QUIC_OPENSSL_WIN_ARCH "VC-WIN64A") ++ endif() ++ endif() ++ if(NOT DEFINED QUIC_OPENSSL_WIN_ARCH) ++ message(FATAL_ERROR "Unknown Platform ${VCPKG_TARGET_ARCHITECTURE}") + endif() +- + set(OPENSSL_DIR ${QUIC_BUILD_DIR}/openssl) + + add_library(OpenSSL_Crypto STATIC IMPORTED) diff --git a/ports/ms-quic/fix-warnings.patch b/ports/ms-quic/fix-warnings.patch new file mode 100644 index 00000000000000..bf99b886386882 --- /dev/null +++ b/ports/ms-quic/fix-warnings.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0f5abcb..aeae310 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -184,7 +184,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${QUIC_OUTPUT_DIR}) + set(QUIC_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/inc) + + if (WIN32) +- set(QUIC_WARNING_FLAGS /WX /W4 /sdl CACHE INTERNAL "") ++ set(QUIC_WARNING_FLAGS /W4 /sdl CACHE INTERNAL "") + set(QUIC_COMMON_FLAGS "") + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + list(APPEND QUIC_COMMON_FLAGS /MP) +@@ -193,7 +193,7 @@ if (WIN32) + else() + set(QUIC_COMMON_FLAGS "") + set(QUIC_COMMON_DEFINES _GNU_SOURCE) +- set(QUIC_WARNING_FLAGS -Werror -Wall -Wextra -Wformat=2 -Wno-type-limits ++ set(QUIC_WARNING_FLAGS -Wall -Wextra -Wformat=2 -Wno-type-limits + -Wno-unknown-pragmas -Wno-multichar -Wno-missing-field-initializers + CACHE INTERNAL "") + if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) diff --git a/ports/ms-quic/portfile.cmake b/ports/ms-quic/portfile.cmake new file mode 100644 index 00000000000000..e4e44d6733f7b3 --- /dev/null +++ b/ports/ms-quic/portfile.cmake @@ -0,0 +1,80 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH QUIC_SOURCE_PATH + REPO microsoft/msquic + REF v1.2.0 + SHA512 6f63d42d950cbba88764332b31818a8627e7d3ecf7393cdef77daedd35a7bb04ac39c642991afb7cca502a346999233023e3b36011916c67e348179838aa7042 + HEAD_REF master + PATCHES + fix-warnings.patch # Remove /WX, -Werror + fix-platform.patch # Make OpenSSL build use VCPKG_TARGET_ARCHITECTURE + fix-install.patch # Adjust install path of build outputs +) + +vcpkg_from_github( + OUT_SOURCE_PATH OPENSSL_SOURCE_PATH + REPO quictls/openssl + REF a6e9d76db343605dae9b59d71d2811b195ae7434 + SHA512 23510a11203b96476c194a1987c7d4e758375adef0f6dfe319cd8ec4b8dd9b12ea64c4099cf3ba35722b992dad75afb1cfc5126489a5fa59f5ee4d46bdfbeaf6 + HEAD_REF OpenSSL_1_1_1k+quic +) +file(REMOVE_RECURSE ${QUIC_SOURCE_PATH}/submodules) +file(MAKE_DIRECTORY ${QUIC_SOURCE_PATH}/submodules) +file(RENAME ${OPENSSL_SOURCE_PATH} ${QUIC_SOURCE_PATH}/submodules/openssl) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_EXE_PATH}) + +if(NOT VCPKG_HOST_IS_WINDOWS) + find_program(MAKE make) + get_filename_component(MAKE_EXE_PATH ${MAKE} DIRECTORY) + vcpkg_add_to_path(PREPEND ${MAKE_EXE_PATH}) +endif() + + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_find_acquire_program(NASM) + get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) + vcpkg_add_to_path(PREPEND ${NASM_EXE_PATH}) + endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools QUIC_BUILD_TOOLS +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH ${QUIC_SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} + -DQUIC_SOURCE_LINK=OFF + -DQUIC_TLS=openssl + -DQUIC_TLS_SECRETS_SUPPORT=ON + -DQUIC_USE_SYSTEM_LIBCRYPTO=OFF + -DQUIC_BUILD_PERF=OFF + -DQUIC_BUILD_TEST=OFF + -DQUIC_STATIC_LINK_CRT=${STATIC_CRT} + -DQUIC_UWP_BUILD=${VCPKG_TARGET_IS_UWP} +) + +vcpkg_cmake_build(TARGET OpenSSL_Build) # separate build log for quictls/openssl +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME msquic CONFIG_PATH lib/cmake/msquic) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES quicattack quicinterop quicinteropserver quicipclient quicipserver + quicpcp quicping quicpost quicreach quicsample spinquic + AUTO_CLEAN + ) +endif() + +file(INSTALL ${QUIC_SOURCE_PATH}/LICENSE + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/include +) diff --git a/ports/ms-quic/vcpkg.json b/ports/ms-quic/vcpkg.json new file mode 100644 index 00000000000000..d337a8452e35df --- /dev/null +++ b/ports/ms-quic/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "ms-quic", + "version": "1.2.0", + "description": "Cross-platform, C implementation of the IETF QUIC protocol", + "homepage": "https://github.com/microsoft/msquic", + "license": "MIT", + "supports": "!(static & staticcrt)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Install the tools after build" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index c8598a63626ad3..4fd7cb80f3b046 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4212,6 +4212,10 @@ "baseline": "3.1.0", "port-version": 0 }, + "ms-quic": { + "baseline": "1.2.0", + "port-version": 0 + }, "msdfgen": { "baseline": "1.8", "port-version": 0 diff --git a/versions/m-/ms-quic.json b/versions/m-/ms-quic.json new file mode 100644 index 00000000000000..cc440ecc45b479 --- /dev/null +++ b/versions/m-/ms-quic.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3188e024233a7d1772922bc11d29d912c6427e25", + "version": "1.2.0", + "port-version": 0 + } + ] +} From 2d02028bc36cd269f65349feb82b10f9b0239369 Mon Sep 17 00:00:00 2001 From: terens <37905314+TerensTare@users.noreply.github.com> Date: Sun, 25 Jul 2021 21:49:48 +0200 Subject: [PATCH 0197/1858] [entt] add `experimental` feature (#18626) * Update `entt/portfile.cmake` to support the new `experimental` feature. * Added the `experimental` feature on `entt/vcpkg.json`. * Small fix on `entt/vcpkg.json`. * Update vcpkg.json * New branch * Fixup * (Hopefully) fixed entt version * Require specifying `--head` for the feature * update version * update version * [entt] add experimental feature * update version * update vcpkg.json * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/entt/portfile.cmake | 22 +++++++++++++++------- ports/entt/vcpkg.json | 8 +++++++- versions/baseline.json | 2 +- versions/e-/entt.json | 5 +++++ 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/ports/entt/portfile.cmake b/ports/entt/portfile.cmake index 0e5197e4be090c..f683c1a096f7f8 100644 --- a/ports/entt/portfile.cmake +++ b/ports/entt/portfile.cmake @@ -1,10 +1,18 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO skypjack/entt - REF 2d5a3f24aa6dc38ed0c4eee9d4d625586d8e921e #v3.8.0 - SHA512 36b7be2550be5a919548e5c91db218ed9b062804d4f43073d6fc6b432fa2d358b5d36098490359ca2392370b2bf1b99d20e564504eaac619f5cd7f9612d91e2e - HEAD_REF master -) +if ("experimental" IN_LIST FEATURES) + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skypjack/entt + HEAD_REF experimental + ) +else() + vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO skypjack/entt + REF 2d5a3f24aa6dc38ed0c4eee9d4d625586d8e921e #v3.8.0 + SHA512 36b7be2550be5a919548e5c91db218ed9b062804d4f43073d6fc6b432fa2d358b5d36098490359ca2392370b2bf1b99d20e564504eaac619f5cd7f9612d91e2e + HEAD_REF master + ) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/entt/vcpkg.json b/ports/entt/vcpkg.json index eb925df7ceff23..43beae304f298c 100644 --- a/ports/entt/vcpkg.json +++ b/ports/entt/vcpkg.json @@ -1,6 +1,12 @@ { "name": "entt", "version": "3.8.0", + "port-version": 1, "description": "Gaming meets modern C++ - a fast and reliable entity-component system and much more", - "homepage": "https://github.com/skypjack/entt" + "homepage": "https://github.com/skypjack/entt", + "features": { + "experimental": { + "description": "Use experimental features right away" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 4fd7cb80f3b046..a6c414174aa07a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1890,7 +1890,7 @@ }, "entt": { "baseline": "3.8.0", - "port-version": 0 + "port-version": 1 }, "epsilon": { "baseline": "0.9.2-4", diff --git a/versions/e-/entt.json b/versions/e-/entt.json index 7b7f6ea53cb367..629e3aef7e83e4 100644 --- a/versions/e-/entt.json +++ b/versions/e-/entt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1b20a18637e66b31dcda3a46341bf10548b78e8", + "version": "3.8.0", + "port-version": 1 + }, { "git-tree": "a35e25160e39304b6ac16c679fa98f2c926c2877", "version": "3.8.0", From 989609d67b59b68dabeee827ce733f35fc4bcc0c Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Mon, 26 Jul 2021 02:26:55 +0200 Subject: [PATCH 0198/1858] [openblas] update to 0.3.15 version and add dynamic arch feature (#15238) * [openblas] dynamic arch feature * remove debug output * Update ports/openblas/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * update version to 0.3.13 * osx build * fix CONTROL, add FEATURES keyword to vcpkg_check_features * x-add-version * bump openblas version to 0.3.14 * ./vcpkg x-add-version openblas * apply format.diff from ci * ./vcpkg x-add-version openblas --overwrite-version * Update versions/o-/openblas.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * update port to version 0.3.15 * ./vcpkg x-add-version openblas * vcpkg_check_linkage * ./vcpkg x-add-version openblas --overwrite-version * ./vcpkg x-add-version openblas --overwrite-version * Update versions/o-/openblas.json Co-authored-by: Ilya Arzhannikov Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III Co-authored-by: NancyLi1013 --- ports/openblas/fix-pkg-config.patch | 19 ------------------- ports/openblas/portfile.cmake | 20 ++++++++++++++++---- ports/openblas/vcpkg.json | 13 +++++++++---- versions/baseline.json | 4 ++-- versions/o-/openblas.json | 5 +++++ 5 files changed, 32 insertions(+), 29 deletions(-) delete mode 100644 ports/openblas/fix-pkg-config.patch diff --git a/ports/openblas/fix-pkg-config.patch b/ports/openblas/fix-pkg-config.patch deleted file mode 100644 index 9ed84d1bb7a514..00000000000000 --- a/ports/openblas/fix-pkg-config.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c324e224..4b82d767 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -389,11 +389,9 @@ if(NOT NO_LAPACKE) - install (FILES ${CMAKE_BINARY_DIR}/lapacke_mangling.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openblas${SUFFIX64}) - endif() - --include(FindPkgConfig QUIET) --if(PKG_CONFIG_FOUND) -- configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY) -- install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/) --endif() -+# Install pkg-config files -+configure_file(${PROJECT_SOURCE_DIR}/cmake/openblas.pc.in ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc @ONLY) -+install (FILES ${PROJECT_BINARY_DIR}/openblas${SUFFIX64}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/) - - - # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share". diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index 26210169228335..cec9cf2a98c99e 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xianyi/OpenBLAS - REF 63b03efc2af332c88b86d4fd8079d00f4b439adf # v0.3.10 - SHA512 269852348e042fe32d0d400d5e6f4cf758024389d3966a9b1bc217061d4a03b3a7003a399212130ec4e783f1e1e5b423eb531e6e0948485b5d5ac9fdc58982cb + REF 904f9a267dddb30e9f187e57231ed160ab2f2704 # v0.3.15 + SHA512 ddb1eba7b0def08483d7610675335648017eff41de3cbe24357bd15c6938c7997f12c449f32d8225abbb5ef8f7a2e7501320ec05e970e8ddf8e4c25fd81e8002 HEAD_REF develop PATCHES uwp.patch fix-space-path.patch fix-redefinition-function.patch - fix-pkg-config.patch fix-uwp-build.patch fix-marco-conflict.patch ) @@ -34,6 +33,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "dynamic-arch" DYNAMIC_ARCH +) + +if(VCPKG_TARGET_IS_OSX) + if("dynamic-arch" IN_LIST FEATURES) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + message(STATUS "Openblas with \"dynamic-arch\" option for OSX supports only dynamic linkage. It's not a bag of openblas but bug of combination cmake+ninja+osx. See: https://gitlab.kitware.com/cmake/cmake/-/issues/16731") + endif() +endif() + # for UWP version, must build non uwp first for helper # binaries. if(VCPKG_TARGET_IS_UWP) @@ -77,6 +88,7 @@ elseif(VCPKG_TARGET_IS_WINDOWS) SOURCE_PATH ${SOURCE_PATH} OPTIONS ${COMMON_OPTIONS} + ${FEATURE_OPTIONS} ) else() string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ @@ -85,7 +97,7 @@ else() SOURCE_PATH ${SOURCE_PATH} OPTIONS ${COMMON_OPTIONS} - -DCMAKE_SYSTEM_PROCESSOR=AMD64 + ${FEATURE_OPTIONS} -DNOFORTRAN=ON -DBU=_ #required for all blas functions to append extra _ using NAME ) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index 8315910a3cfca6..e0206c35c26925 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,13 +1,18 @@ { "name": "openblas", - "version": "0.3.10", - "port-version": 3, + "version": "0.3.15", "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", - "default-features": [ - "threads" + "dependencies": [ + { + "name": "pthread", + "platform": "!windows & !uwp" + } ], "features": { + "dynamic-arch": { + "description": "Support for multiple targets in a single library" + }, "simplethread": { "description": "Use simple thread", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a6c414174aa07a..4268212cbdd121 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4549,8 +4549,8 @@ "port-version": 0 }, "openblas": { - "baseline": "0.3.10", - "port-version": 3 + "baseline": "0.3.15", + "port-version": 0 }, "opencascade": { "baseline": "7.5.0", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index 5b2fde684a9493..b7a541443a7f5e 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a214e1bac47c70d932caef7d74771c8658b1f7a", + "version": "0.3.15", + "port-version": 0 + }, { "git-tree": "20d57360e6e7afa4e4f033a87e1ded91571ee462", "version": "0.3.10", From 5e4a8104ccbde2c60556df635bd5248169d9c376 Mon Sep 17 00:00:00 2001 From: sandro97git <30286744+sandro97git@users.noreply.github.com> Date: Mon, 26 Jul 2021 02:27:31 +0200 Subject: [PATCH 0199/1858] [restc-cpp] make using boost-log an optional feature (#18683) * [restc-cpp] make using boost-log an optional feature * Update versions/r-/restc-cpp.json * Remove boost-log from dependencies * Update versions/r-/restc-cpp.json * [restc-cpp] Add boost-asio dependency * update version SHA Co-authored-by: Sandro Scherer Co-authored-by: NancyLi1013 Co-authored-by: Victor Romero --- ports/restc-cpp/portfile.cmake | 8 +++++--- ports/restc-cpp/vcpkg.json | 9 ++++++++- versions/baseline.json | 2 +- versions/r-/restc-cpp.json | 5 +++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ports/restc-cpp/portfile.cmake b/ports/restc-cpp/portfile.cmake index 764f39cfaebc75..c7eacd2b377fde 100644 --- a/ports/restc-cpp/portfile.cmake +++ b/ports/restc-cpp/portfile.cmake @@ -11,9 +11,11 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - openssl RESTC_CPP_WITH_TLS - zlib RESTC_CPP_WITH_ZLIB - threaded-ctx RESTC_CPP_THREADED_CTX + FEATURES + openssl RESTC_CPP_WITH_TLS + zlib RESTC_CPP_WITH_ZLIB + threaded-ctx RESTC_CPP_THREADED_CTX + boost-log RESTC_CPP_LOG_WITH_BOOST_LOG ) vcpkg_configure_cmake( diff --git a/ports/restc-cpp/vcpkg.json b/ports/restc-cpp/vcpkg.json index c50d95e0f435f1..b06c5faa823d03 100644 --- a/ports/restc-cpp/vcpkg.json +++ b/ports/restc-cpp/vcpkg.json @@ -1,16 +1,17 @@ { "name": "restc-cpp", "version-semver": "0.10.0", + "port-version": 1, "description": "Modern C++ REST Client library", "homepage": "https://github.com/jgaa/restc-cpp", "license": "MIT", "dependencies": [ + "boost-asio", "boost-chrono", "boost-context", "boost-coroutine", "boost-date-time", "boost-filesystem", - "boost-log", "boost-program-options", "boost-system", "boost-uuid", @@ -21,6 +22,12 @@ "zlib" ], "features": { + "boost-log": { + "description": "Use boost-log for logging.", + "dependencies": [ + "boost-log" + ] + }, "openssl": { "description": "OpenSSL support.", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4268212cbdd121..67f1ae99e2f294 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5554,7 +5554,7 @@ }, "restc-cpp": { "baseline": "0.10.0", - "port-version": 0 + "port-version": 1 }, "restclient-cpp": { "baseline": "0.5.2", diff --git a/versions/r-/restc-cpp.json b/versions/r-/restc-cpp.json index 5cd8c3ee7b1ba6..bf4a8ac5a3626d 100644 --- a/versions/r-/restc-cpp.json +++ b/versions/r-/restc-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98f2e4aed1e4c9a84df72116c4036a59a3d59436", + "version-semver": "0.10.0", + "port-version": 1 + }, { "git-tree": "5b6f1ef4d2f26a9053f956fe044300e3d0bed2cd", "version-semver": "0.10.0", From 4d41db06793fb329cad3927594472315d17b2b97 Mon Sep 17 00:00:00 2001 From: huangqinjin Date: Tue, 27 Jul 2021 01:53:47 +0800 Subject: [PATCH 0200/1858] [vcpkg/scripts/make] avoid versioning for android (#17089) --- scripts/cmake/vcpkg_configure_make.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 599eaf5917c128..65d66daac9e7d6 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -772,6 +772,14 @@ function(vcpkg_configure_make) set(ENV{CXXFLAGS} "${CXXFLAGS_${_buildtype}}") set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${_buildtype}}") set(ENV{LDFLAGS} "${LDFLAGS_${_buildtype}}") + + # https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html + # -avoid-version is handled specially by libtool link mode, this flag is not forwarded to linker, + # and libtool tries to avoid versioning for shared libraries and no symbolic links are created. + if(VCPKG_TARGET_IS_ANDROID) + set(ENV{LDFLAGS} "-avoid-version $ENV{LDFLAGS}") + endif() + if(LINK_ENV_${_VAR_SUFFIX}) set(_LINK_CONFIG_BACKUP "$ENV{_LINK_}") set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}") From 1d426aba05eb8f5db3327f7ce0df17a4d434fba0 Mon Sep 17 00:00:00 2001 From: Greisberger Christophe Date: Mon, 26 Jul 2021 19:54:38 +0200 Subject: [PATCH 0201/1858] [drogon] Added database support features (#18711) * [drogon] Added database access features * Replaced CONTROL with vcpkg.json manifest file * Patched finding brotli libraries for static triplets (brotlicommon-static.lib and co.) * Added features for database access, disabled by default. * [drogon] Fixed vcpkg.json version * update vcpkg.json format * update version * Added new feature redis * update vcpkg.json format * update version * delete redis dependence * update version * fix request feature * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/drogon/CONTROL | 9 ---- ports/drogon/portfile.cmake | 9 +++- ports/drogon/static-brotli.patch | 17 +++++++ ports/drogon/vcpkg.json | 84 ++++++++++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/d-/drogon.json | 5 ++ 6 files changed, 115 insertions(+), 11 deletions(-) delete mode 100644 ports/drogon/CONTROL create mode 100644 ports/drogon/static-brotli.patch create mode 100644 ports/drogon/vcpkg.json diff --git a/ports/drogon/CONTROL b/ports/drogon/CONTROL deleted file mode 100644 index fc00ee3ad3b79a..00000000000000 --- a/ports/drogon/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: drogon -Version: 1.7.1 -Homepage: https://github.com/an-tao/drogon -Description:Drogon: A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows -Build-Depends: trantor, zlib, jsoncpp, libmariadb (!osx), libmariadb[iconv] (osx), libpq, sqlite3, brotli, libuuid (!windows) -Default-Features: ctl - -Feature: ctl -Description: Build drogon_ctl tool. \ No newline at end of file diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 0171af1d511968..101f143e9351f8 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -8,12 +8,19 @@ vcpkg_from_github( vcpkg.patch resolv.patch drogon_config.patch + static-brotli.patch ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - ctl BUILD_CTL + ctl BUILD_CTL + mysql BUILD_MYSQL + orm BUILD_ORM + postgres BUILD_POSTGRESQL + postgres LIBPQ_BATCH_MODE + redis BUILD_REDIS + sqlite3 BUILD_SQLITE ) vcpkg_configure_cmake( diff --git a/ports/drogon/static-brotli.patch b/ports/drogon/static-brotli.patch new file mode 100644 index 00000000000000..a44a40cc59ebd9 --- /dev/null +++ b/ports/drogon/static-brotli.patch @@ -0,0 +1,17 @@ +diff --git a/cmake_modules/FindBrotli.cmake b/cmake_modules/FindBrotli.cmake +index da5b6d2..6b631ab 100755 +--- a/cmake_modules/FindBrotli.cmake ++++ b/cmake_modules/FindBrotli.cmake +@@ -23,9 +23,9 @@ include(FindPackageHandleStandardArgs) + + find_path(BROTLI_INCLUDE_DIR "brotli/decode.h") + +-find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon) +-find_library(BROTLIDEC_LIBRARY NAMES brotlidec) +-find_library(BROTLIENC_LIBRARY NAMES brotlienc) ++find_library(BROTLICOMMON_LIBRARY NAMES brotlicommon brotlicommon-static) ++find_library(BROTLIDEC_LIBRARY NAMES brotlidec brotlidec-static) ++find_library(BROTLIENC_LIBRARY NAMES brotlienc brotlienc-static) + + find_package_handle_standard_args(Brotli + REQUIRED_VARS diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json new file mode 100644 index 00000000000000..3aa7f4da7e616e --- /dev/null +++ b/ports/drogon/vcpkg.json @@ -0,0 +1,84 @@ +{ + "name": "drogon", + "version-semver": "1.7.1", + "port-version": 1, + "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", + "homepage": "https://github.com/an-tao/drogon", + "documentation": "https://drogon.docsforge.com/master/overview/", + "license": "MIT", + "dependencies": [ + "brotli", + "jsoncpp", + { + "name": "libuuid", + "platform": "!windows" + }, + "trantor", + "zlib" + ], + "features": { + "ctl": { + "description": "Build drogon_ctl tool." + }, + "mysql": { + "description": "Support reading and writing from/to MySQL databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + }, + { + "name": "libmariadb", + "features": [ + "iconv" + ], + "platform": "osx" + }, + { + "name": "libmariadb", + "platform": "!osx" + } + ] + }, + "orm": { + "description": "Build with Object-relational mapping support." + }, + "postgres": { + "description": "Support reading and writing from/to Postgres databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + }, + "libpq" + ] + }, + "redis": { + "description": "Support reading and writing from/to Redis databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + } + ] + }, + "sqlite3": { + "description": "Support reading and writing from/to Sqlite databases.", + "dependencies": [ + { + "name": "drogon", + "features": [ + "orm" + ] + }, + "sqlite3" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 67f1ae99e2f294..331d75d4c0a2b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1766,7 +1766,7 @@ }, "drogon": { "baseline": "1.7.1", - "port-version": 0 + "port-version": 1 }, "dtl": { "baseline": "1.19", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 309d7689d78652..9073dfa7ed31e4 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6293f8fcc884c9ed56a4a3138722401451ff445d", + "version-semver": "1.7.1", + "port-version": 1 + }, { "git-tree": "a325c34025250341e3f721353d5d3dfa66017e2b", "version-string": "1.7.1", From 242f61d588750a40ef17ee7ce5f8ce2e6d487237 Mon Sep 17 00:00:00 2001 From: Maxime GIMENO Date: Mon, 26 Jul 2021 19:55:23 +0200 Subject: [PATCH 0202/1858] [CGAL] Upgrade to 5.3 (#18392) * Not tested yet * Fix SHA and version name * reset port version to 0 * Upgrade to 5.3 * CGAL: Add FEATURES and run add-version * update version * [cgal] Convert to vcpkg.json * Cancel modifications to versions/c-/cgal.json * update version file Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Robert Schumacher Co-authored-by: Billy Robert ONeal III --- ports/cgal/portfile.cmake | 4 ++-- ports/cgal/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/cgal.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/cgal/portfile.cmake b/ports/cgal/portfile.cmake index 729ece8953d8b0..fcbbeb12c1f1c1 100644 --- a/ports/cgal/portfile.cmake +++ b/ports/cgal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGAL/cgal - REF v5.2.2 - SHA512 48c6f44f41d6cf4fead878d9e5d62325ec90fc1f744d547b2f5683e41e48b25d19db2606804ac302c24520600d1f5b37a1649c19891cd9e87e227480ef410dbc + REF v5.3 + SHA512 b4093b5f1b4802cffe5dd6a47a7382a59ed83d30bb8cafa5f3fa8daef4579c9f3caf208bc2a58b7a41cf61ed825d0e549c7c442e9f5977bd82f553b2dfe8748f HEAD_REF master ) diff --git a/ports/cgal/vcpkg.json b/ports/cgal/vcpkg.json index 1ac7f45ffb0165..7883bf7c6ded50 100644 --- a/ports/cgal/vcpkg.json +++ b/ports/cgal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cgal", - "version": "5.2.2", - "port-version": 1, + "version": "5.3", "description": "The Computational Geometry Algorithms Library (CGAL) is a C++ library that aims to provide easy access to efficient and reliable algorithms in computational geometry.", "homepage": "https://github.com/CGAL/cgal", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 331d75d4c0a2b7..31e4c607480fb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1197,8 +1197,8 @@ "port-version": 1 }, "cgal": { - "baseline": "5.2.2", - "port-version": 1 + "baseline": "5.3", + "port-version": 0 }, "cgicc": { "baseline": "3.2.19-4", diff --git a/versions/c-/cgal.json b/versions/c-/cgal.json index ce6e700fc47994..f434901701ed53 100644 --- a/versions/c-/cgal.json +++ b/versions/c-/cgal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c46ed672d5f8a2791349c1af1b44ed7dfcb6dd6", + "version": "5.3", + "port-version": 0 + }, { "git-tree": "02c3a0b581425d69dc21787d87e14c53a07e33ee", "version": "5.2.2", From 9424bed3a11e67e9d984a439d03eef46c568ace8 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Mon, 26 Jul 2021 20:57:24 +0300 Subject: [PATCH 0203/1858] [sail] Update to 0.9.0-pre14 (#19101) * [sail] Update to v0.9.0-pre14 * [sail] vcpkg x-add-version --all * [sail] Remove PREFER_NINJA Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [sail] Add quotes Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [sail] Add quotes Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [sail] Add quotes Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [sail] Add quotes Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [sail] vcpkg x-add-version --all Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/sail/portfile.cmake | 47 +++++++++++++++------------------------ ports/sail/usage.unix | 16 ------------- ports/sail/vcpkg.json | 13 +++++++++-- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 5 files changed, 35 insertions(+), 48 deletions(-) delete mode 100644 ports/sail/usage.unix diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index e12f36e088de5b..c17b9d1066d6cd 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -3,16 +3,16 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO smoked-herring/sail - REF v0.9.0-pre13 - SHA512 cce4e4f3316c9cc65f2026d0734e1f962079febfcf51c59a673899dace60b71604440c647652769db97e9b253d1eb9667921da2c76ff8c2d453e768eb49585fb + REF v0.9.0-pre14 + SHA512 a1b50893a9d4112f2bf2ca73e763d705615d0b110a41a1dbe8c32566b7706c054cb44d9c169163ef4f9d125242b39b55e123021fb2dad8d2f5a4d216c1a202b4 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SAIL_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DSAIL_STATIC=${SAIL_STATIC} -DSAIL_COMBINE_CODECS=ON @@ -20,7 +20,7 @@ vcpkg_configure_cmake( -DSAIL_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -29,33 +29,22 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) # Move cmake configs -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sail) +vcpkg_cmake_config_fixup(PACKAGE_NAME sail CONFIG_PATH lib/cmake/sail DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailcodecs CONFIG_PATH lib/cmake/sailcodecs DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailcommon CONFIG_PATH lib/cmake/sailcommon DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailc++ CONFIG_PATH lib/cmake/sailc++ DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME sailmanip CONFIG_PATH lib/cmake/sailmanip DO_NOT_DELETE_PARENT_CONFIG_PATH) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") + # Fix pkg-config files vcpkg_fixup_pkgconfig() # Handle usage -if (UNIX AND NOT APPLE) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage.unix DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage.unix ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage) -else() - file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -endif() - -# Move C++ configs -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}c++) -file(GLOB SAIL_CPP_CONFIGS "${CURRENT_PACKAGES_DIR}/share/${PORT}/SailC++*") -foreach(SAIL_CPP_CONFIG IN LISTS SAIL_CPP_CONFIGS) - get_filename_component(SAIL_CPP_CONFIG_NAME "${SAIL_CPP_CONFIG}" NAME) - file(RENAME ${SAIL_CPP_CONFIG} ${CURRENT_PACKAGES_DIR}/share/${PORT}c++/${SAIL_CPP_CONFIG_NAME}) -endforeach() - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}manip) -file(GLOB SAIL_MANIP_CONFIGS "${CURRENT_PACKAGES_DIR}/share/${PORT}/SailManip*") -foreach(SAIL_MANIP_CONFIG IN LISTS SAIL_MANIP_CONFIGS) - get_filename_component(SAIL_MANIP_CONFIG_NAME "${SAIL_MANIP_CONFIG}" NAME) - file(RENAME ${SAIL_MANIP_CONFIG} ${CURRENT_PACKAGES_DIR}/share/${PORT}manip/${SAIL_MANIP_CONFIG_NAME}) -endforeach() +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sail/usage.unix b/ports/sail/usage.unix deleted file mode 100644 index 6f06da874fbbb1..00000000000000 --- a/ports/sail/usage.unix +++ /dev/null @@ -1,16 +0,0 @@ -The package sail provides CMake targets: - -C libraries: - - find_package(Sail CONFIG REQUIRED) - target_link_libraries(main PRIVATE SAIL::sail) - -C++ bindings: - - find_package(Sail CONFIG REQUIRED) - target_link_libraries(main PRIVATE SAIL::sail-c++) - -Note for static builds on Unix-like platforms: the client application -must be built with -rdynamic or an equivalent to enable dlopen and dlsym -on the same binary. If you use CMake, this could be achieved by setting -CMAKE_ENABLE_EXPORTS to ON. diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index f1693365e113f2..4b77bfb6df005a 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,13 +1,22 @@ { "name": "sail", - "version-semver": "0.9.0-pre13", + "version-semver": "0.9.0-pre14", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/smoked-herring/sail", "supports": "!uwp", "dependencies": [ "giflib", + "libavif", "libjpeg-turbo", "libpng", - "tiff" + "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 31e4c607480fb3..14cddecf3cc371 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5661,7 +5661,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre13", + "baseline": "0.9.0-pre14", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index c8a5acb4b96a5e..c8ad05b4316a63 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0878a59a5c61e19c3c83c3ad8cfb4b611bfe3c54", + "version-semver": "0.9.0-pre14", + "port-version": 0 + }, { "git-tree": "27feb53acf390b5f3a6a5cd4cc194c29591d4a6a", "version-semver": "0.9.0-pre13", From b8460871de2a65026f788188d86cb6d08b2a04f2 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 27 Jul 2021 01:59:27 +0800 Subject: [PATCH 0204/1858] [libsigcpp] Fix usage in static build (#18944) * [libsigcpp] Fix usage in static build * Update version files * Apply review suggestions * Update versions/l-/libsigcpp.json Co-authored-by: Billy Robert ONeal III --- .../libsigcpp/fix-usage-in-static-build.patch | 29 +++++++++++++++++++ ports/libsigcpp/portfile.cmake | 7 ++++- ports/libsigcpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libsigcpp.json | 5 ++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 ports/libsigcpp/fix-usage-in-static-build.patch diff --git a/ports/libsigcpp/fix-usage-in-static-build.patch b/ports/libsigcpp/fix-usage-in-static-build.patch new file mode 100644 index 00000000000000..378f1f96a3cdd1 --- /dev/null +++ b/ports/libsigcpp/fix-usage-in-static-build.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f54e830..972d0dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,6 +53,10 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") + include_directories (${sigc++_SOURCE_DIR}) + include_directories (${sigc++_BINARY_DIR}) + ++if(BUILD_SHARED_LIBS) ++ add_compile_options(-DBUILD_SHARED) ++endif() ++ + configure_file (sigc++config.h.cmake sigc++config.h) + + set (prefix ${CMAKE_INSTALL_PREFIX}) +diff --git a/sigc++config.h.cmake b/sigc++config.h.cmake +index 74d348a..43a99c5 100644 +--- a/sigc++config.h.cmake ++++ b/sigc++config.h.cmake +@@ -16,7 +16,9 @@ + # if defined(_MSC_VER) + # define SIGC_MSC 1 + # define SIGC_WIN32 1 ++# ifdef BUILD_SHARED + # define SIGC_DLL 1 ++# endif + # elif defined(__CYGWIN__) + # define SIGC_CONFIGURE 1 + # elif defined(__MINGW32__) diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index 7dceaa2f4550e8..2328d35626c319 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES disable_tests_enable_static_build.patch version.patch + fix-usage-in-static-build.patch ) vcpkg_configure_cmake( @@ -17,5 +18,9 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sigc++-3 TARGET_PATH share/sigc++-3) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/sigc++-3.0/include/sigc++config.h" "ifdef BUILD_SHARED" "if 1") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index bf94085c59ab16..780711131ee00d 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsigcpp", "version": "3.0.3", + "port-version": 1, "description": "Typesafe callback framework for C++", "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" } diff --git a/versions/baseline.json b/versions/baseline.json index 14cddecf3cc371..f98b67ca2a22a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3566,7 +3566,7 @@ }, "libsigcpp": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libsigcpp-3": { "baseline": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index 52173cb9034c9e..bf0f60e47e98ff 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "462e27cfc4abccd4d3157b2ae8b22c4bb6b82c67", + "version": "3.0.3", + "port-version": 1 + }, { "git-tree": "398cf35cc5235b326dda845e568295841aecc461", "version": "3.0.3", From 62e247b0988fa22ceb150074f52bd00ee2ade1bc Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 26 Jul 2021 20:02:24 +0200 Subject: [PATCH 0205/1858] [libidn2] Fixes for mingw and minor issues (#19002) * Fix port's cmake buildsystem for mingw * Install pc file for windows * Modernize portfile * Increment port-version * x-add-version * Use libunistring for non-windows * CR and doc changes * Update git-tree --- ports/libidn2/CMakeLists.txt | 16 +++++++++++ ports/libidn2/portfile.cmake | 54 +++++++++++++++++++----------------- ports/libidn2/string.h | 4 +++ ports/libidn2/vcpkg.json | 13 +++++++-- versions/baseline.json | 2 +- versions/l-/libidn2.json | 5 ++++ 6 files changed, 65 insertions(+), 29 deletions(-) diff --git a/ports/libidn2/CMakeLists.txt b/ports/libidn2/CMakeLists.txt index cd87848f38816b..f8e0908f418f1a 100644 --- a/ports/libidn2/CMakeLists.txt +++ b/ports/libidn2/CMakeLists.txt @@ -89,6 +89,12 @@ set(GL_SRC gl/rawmemchr.c ) add_library(libidn2 ${LIB_SRC} ${UNISTR_SRC} ${GL_SRC}) +set_target_properties(libidn2 + PROPERTIES + OUTPUT_NAME idn2 + PREFIX lib + IMPORT_PREFIX lib +) target_include_directories(libidn2 PRIVATE . ./unistring ./gl) target_link_libraries(libidn2 PRIVATE Iconv::Iconv) @@ -99,3 +105,13 @@ install(TARGETS libidn2 ARCHIVE DESTINATION lib) install(FILES lib/idn2.h DESTINATION include) + +# Install pc file +set(prefix "\${pcfiledir}/../..") +set(exec_prefix "\${prefix}") +set(includedir "\${prefix}/include") +set(libdir "\${prefix}/lib") +set(LTLIBICONV "") +set(LTLIBUNISTRING "") +configure_file("libidn2.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libidn2.pc" DESTINATION "lib/pkgconfig") diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 55946fcc9581c3..f9ffcae787c32e 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -9,62 +9,64 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" REF ${IDN2_VERSION} ) if (VCPKG_TARGET_IS_WINDOWS) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/string.h DESTINATION ${SOURCE_PATH}/gl) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + file(COPY "${CMAKE_CURRENT_LIST_DIR}/string.h" DESTINATION "${SOURCE_PATH}/gl") - configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h ${SOURCE_PATH}) + set(HAVE_ALLOCA_H 0) + + configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h" "${SOURCE_PATH}") function(simple_copy_template_header FILE_PATH BASE_NAME) - if(NOT EXISTS ${FILE_PATH}/${BASE_NAME}.h) - if(EXISTS ${FILE_PATH}/${BASE_NAME}.in.h) - configure_file(${FILE_PATH}/${BASE_NAME}.in.h ${FILE_PATH}/${BASE_NAME}.h) - endif() + if(NOT EXISTS "${FILE_PATH}/${BASE_NAME}.h" AND EXISTS "${FILE_PATH}/${BASE_NAME}.in.h") + configure_file("${FILE_PATH}/${BASE_NAME}.in.h" "${FILE_PATH}/${BASE_NAME}.h") endif() endfunction() # There seems to be no difference between source and destination files after 'configure' # apart from auto-generated notification at the top. So why not just do a simple copy. - simple_copy_template_header(${SOURCE_PATH}/unistring uniconv) - simple_copy_template_header(${SOURCE_PATH}/unistring unictype) - simple_copy_template_header(${SOURCE_PATH}/unistring uninorm) - simple_copy_template_header(${SOURCE_PATH}/unistring unistr) - simple_copy_template_header(${SOURCE_PATH}/unistring unitypes) - simple_copy_template_header(${SOURCE_PATH}/unistring alloca) + simple_copy_template_header("${SOURCE_PATH}/unistring" uniconv) + simple_copy_template_header("${SOURCE_PATH}/unistring" unictype) + simple_copy_template_header("${SOURCE_PATH}/unistring" uninorm) + simple_copy_template_header("${SOURCE_PATH}/unistring" unistr) + simple_copy_template_header("${SOURCE_PATH}/unistring" unitypes) + simple_copy_template_header("${SOURCE_PATH}/unistring" alloca) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DPACKAGE_VERSION=${IDN2_VERSION}" ) - vcpkg_install_cmake() + vcpkg_cmake_install() vcpkg_copy_pdbs() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") else() set(ENV{GTKDOCIZE} true) vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG COPY_SOURCE OPTIONS - --with-libiconv-prefix=${CURRENT_INSTALLED_DIR} + "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}" --disable-gtk-doc + --disable-doc ) vcpkg_install_make() - vcpkg_fixup_pkgconfig() - - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() +vcpkg_fixup_pkgconfig() + # License and man -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libidn2 RENAME copyright) -file(INSTALL ${SOURCE_PATH}/doc/libidn2.pdf DESTINATION ${CURRENT_PACKAGES_DIR}/share/libidn2) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libidn2" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/doc/libidn2.pdf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libidn2") diff --git a/ports/libidn2/string.h b/ports/libidn2/string.h index 7ed5f5fdc1f088..0147d8357fd45b 100644 --- a/ports/libidn2/string.h +++ b/ports/libidn2/string.h @@ -5,6 +5,10 @@ char * strchrnul (const char *s, int c_in); int strverscmp (const char *s1, const char *s2); void * rawmemchr (const void *s, int c_in); +#if defined(__MINGW32__) +#include <../include/string.h> +#elif defined(_WIN32) #include <../ucrt/string.h> +#endif #endif /* _GL_STRING_H */ diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json index b39058a5d9f03b..9c00c1b155fd14 100644 --- a/ports/libidn2/vcpkg.json +++ b/ports/libidn2/vcpkg.json @@ -1,10 +1,19 @@ { "name": "libidn2", "version": "2.3.0", - "port-version": 3, + "port-version": 4, "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", "dependencies": [ - "libiconv" + "libiconv", + { + "name": "libunistring", + "platform": "!(windows | mingw)" + }, + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows | mingw" + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index f98b67ca2a22a8..2282ac6cf27bfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3270,7 +3270,7 @@ }, "libidn2": { "baseline": "2.3.0", - "port-version": 3 + "port-version": 4 }, "libigl": { "baseline": "2.2.0", diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index 8c85492c96929a..47fb7c9c677a87 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a73dca27190e239f6ff09db7124b885a23d732e4", + "version": "2.3.0", + "port-version": 4 + }, { "git-tree": "cad738e7d2fff6e1ac7c8a2bec14160aa127336f", "version": "2.3.0", From 7582edc1091c933b32a4c9b7d1e603cad35cebff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 27 Jul 2021 02:07:10 +0800 Subject: [PATCH 0206/1858] [zeromq] Fix arm build, fix feature websockets-sha1 (#19074) * [zeromq] Fix arm build, fix feature websockets-sha1 * update baseline * version stuff * Fix rename * Update versions/z-/zeromq.json --- ports/zeromq/CONTROL | 15 ----------- ports/zeromq/fix-arm.patch | 51 +++++++++++++++++++++++++++++++++++++ ports/zeromq/portfile.cmake | 30 +++++++++++----------- ports/zeromq/vcpkg.json | 32 +++++++++++++++++++++++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/z-/zeromq.json | 5 ++++ 7 files changed, 104 insertions(+), 33 deletions(-) delete mode 100644 ports/zeromq/CONTROL create mode 100644 ports/zeromq/fix-arm.patch create mode 100644 ports/zeromq/vcpkg.json diff --git a/ports/zeromq/CONTROL b/ports/zeromq/CONTROL deleted file mode 100644 index 4cf6d33c454d4d..00000000000000 --- a/ports/zeromq/CONTROL +++ /dev/null @@ -1,15 +0,0 @@ -Source: zeromq -Version: 4.3.4 -Port-Version: 0 -Homepage: https://github.com/zeromq/libzmq -Description: The ZeroMQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products - -Feature: sodium -Description: Using libsodium for CURVE security -Build-Depends: libsodium - -Feature: websockets-sha1 -Description: Enable WebSocket transport through builtin sha1 (libzmq#3676) - -Feature: draft -Description: Build and install draft APIs diff --git a/ports/zeromq/fix-arm.patch b/ports/zeromq/fix-arm.patch new file mode 100644 index 00000000000000..3f6c6486b459dd --- /dev/null +++ b/ports/zeromq/fix-arm.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dd3d8eb..c08cad9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -551,6 +551,8 @@ if(ZMQ_HAVE_WINDOWS) + set(CMAKE_REQUIRED_LIBRARIES "") + # TODO: This not the symbol we're looking for. What is the symbol? + check_library_exists(ws2 fopen "" HAVE_WS2) ++ ++ check_cxx_symbol_exists(CryptAcquireContext "windows.h;wincrypt.h" HAVE_ADVAPI32) + else() + check_cxx_symbol_exists(if_nametoindex net/if.h HAVE_IF_NAMETOINDEX) + check_cxx_symbol_exists(SO_PEERCRED sys/socket.h ZMQ_HAVE_SO_PEERCRED) +@@ -1452,6 +1454,10 @@ if(BUILD_SHARED) + elseif(HAVE_WS2) + target_link_libraries(libzmq ws2) + endif() ++ ++ if (HAVE_ADVAPI32) ++ target_link_libraries(libzmq advapi32) ++ endif() + + if(HAVE_RPCRT4) + target_link_libraries(libzmq rpcrt4) +@@ -1497,6 +1503,10 @@ if(BUILD_STATIC) + elseif(HAVE_WS2) + target_link_libraries(libzmq-static ws2) + endif() ++ ++ if (HAVE_ADVAPI32) ++ target_link_libraries(libzmq-static advapi32) ++ endif() + + if(HAVE_RPCRT4) + target_link_libraries(libzmq-static rpcrt4) +diff --git a/src/clock.cpp b/src/clock.cpp +index 79522ad..0667c59 100644 +--- a/src/clock.cpp ++++ b/src/clock.cpp +@@ -41,8 +41,10 @@ + #include + #else + #include +-#if defined(_M_ARM) || defined(_M_ARM64) ++#if defined(_M_ARM) + #include ++#elif defined(_M_ARM64) ++#include + #endif + #endif + #endif diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 650e7baad6fe1e..01c5aa49cd6426 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -1,8 +1,11 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/libzmq REF v4.3.4 SHA512 ad828b1ab5a87983285a6b44b08240816ed1c4e2c73306ab1a851bf80df1892b5e2f92064a49fbadc1f4c75043625ace77dd25b64d5d1c2a7d1d61cc916fba0b + PATCHES fix-arm.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) @@ -13,8 +16,7 @@ vcpkg_check_features( FEATURES sodium WITH_LIBSODIUM draft ENABLE_DRAFTS - INVERTED_FEATURES - websockets-sha1 DISABLE_WS + websockets-sha1 ENABLE_WS ) set(PLATFORM_OPTIONS) @@ -22,9 +24,8 @@ if(VCPKG_TARGET_IS_MINGW) set(PLATFORM_OPTIONS "-DCMAKE_SYSTEM_VERSION=6.0") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DZMQ_BUILD_TESTS=OFF -DBUILD_STATIC=${BUILD_STATIC} @@ -39,27 +40,26 @@ vcpkg_configure_cmake( "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ZeroMQ) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ZeroMQ) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +else() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ZeroMQ) endif() file(COPY - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/zmq) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/zmq") diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json new file mode 100644 index 00000000000000..631f9cf784659d --- /dev/null +++ b/ports/zeromq/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "zeromq", + "version": "4.3.4", + "port-version": 1, + "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", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "draft": { + "description": "Build and install draft APIs" + }, + "sodium": { + "description": "Using libsodium for CURVE security", + "dependencies": [ + "libsodium" + ] + }, + "websockets-sha1": { + "description": "Enable WebSocket transport through builtin sha1 (libzmq#3676)" + } + } +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bc25252561bf3a..9fd0dd71c12db3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1686,8 +1686,6 @@ yato:arm-uwp=fail yato:x64-uwp=fail z3:arm-uwp=fail z3:x64-uwp=fail -zeromq:arm-uwp=fail -zeromq:x64-uwp=fail zkpp:x86-windows=fail zkpp:x64-windows=fail zkpp:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2282ac6cf27bfa..c0e9a327e8a2d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6882,7 +6882,7 @@ }, "zeromq": { "baseline": "4.3.4", - "port-version": 0 + "port-version": 1 }, "zfp": { "baseline": "0.5.5-2", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 28696a10dbcec9..7c15ff356bbcc3 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43f1c320c2710a2f0efa61b54608a33da707bd43", + "version": "4.3.4", + "port-version": 1 + }, { "git-tree": "baf0f8a38476e24bbe2b3f4cac31ed02fff29bc4", "version-string": "4.3.4", From 7aca37323917d1fba4d3d7757a91b8f1e4a66ad4 Mon Sep 17 00:00:00 2001 From: Levin Li Date: Tue, 27 Jul 2021 02:07:56 +0800 Subject: [PATCH 0207/1858] [libiconv] Fix 'DLL Initialization Failed' in UWP applications (#19108) * Fix for libiconv * Update port version --- ports/libiconv/0004-ModuleFileName.patch | 13 +++++++++++++ ports/libiconv/CONTROL | 2 +- ports/libiconv/portfile.cmake | 1 + versions/baseline.json | 2 +- versions/l-/libiconv.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/libiconv/0004-ModuleFileName.patch diff --git a/ports/libiconv/0004-ModuleFileName.patch b/ports/libiconv/0004-ModuleFileName.patch new file mode 100644 index 00000000000000..15ceb2a4115fc9 --- /dev/null +++ b/ports/libiconv/0004-ModuleFileName.patch @@ -0,0 +1,13 @@ +diff --git a/lib/relocatable.c b/lib/relocatable.c +index 89b6c27..1561894 100644 +--- a/lib/relocatable.c ++++ b/lib/relocatable.c +@@ -329,7 +329,7 @@ DllMain (HINSTANCE module_handle, DWORD event, LPVOID reserved) + /* The DLL is being loaded into an application's address range. */ + static char location[MAX_PATH]; + +- if (!GetModuleFileName (module_handle, location, sizeof (location))) ++ if (!GetModuleFileNameA (module_handle, location, sizeof (location))) + /* Shouldn't happen. */ + return FALSE; + diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index f7414b81996681..6eed4fee330808 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 8 +Port-Version: 9 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index a5d2d70e8875bc..9d8ff25aa030b1 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -19,6 +19,7 @@ vcpkg_extract_source_archive_ex( PATCHES 0002-Config-for-MSVC.patch 0003-Add-export.patch + 0004-ModuleFileName.patch ) if (NOT VCPKG_TARGET_IS_ANDROID) diff --git a/versions/baseline.json b/versions/baseline.json index c0e9a327e8a2d5..db7bc7632afa84 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3258,7 +3258,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 8 + "port-version": 9 }, "libics": { "baseline": "1.6.4", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index f198b53463160e..8569e1f65afcfd 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1350957315a151eb58fa91c61c3fa754126135a1", + "version-string": "1.16", + "port-version": 9 + }, { "git-tree": "1190548d712c0ed8699e3b82e16f6b070a5154c9", "version-string": "1.16", From bfd2bc34960afe90cd61bcd96fb72ee20d3b5241 Mon Sep 17 00:00:00 2001 From: Levin Li Date: Tue, 27 Jul 2021 02:08:55 +0800 Subject: [PATCH 0208/1858] [cspice] Support building in UWP (#19109) * Make cspice work on UWP * Bump cspice port version --- ports/cspice/CMakeLists.txt | 4 ++-- ports/cspice/CONTROL | 3 +-- ports/cspice/portfile.cmake | 7 +++++-- versions/baseline.json | 2 +- versions/c-/cspice.json | 5 +++++ 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ports/cspice/CMakeLists.txt b/ports/cspice/CMakeLists.txt index 0ccfcfab604a4b..899a94033bb727 100644 --- a/ports/cspice/CMakeLists.txt +++ b/ports/cspice/CMakeLists.txt @@ -15,7 +15,7 @@ endif() target_include_directories(cspice PUBLIC "${INCLUDE_PATH}") if (WIN32) - target_compile_definitions(cspice PUBLIC "_COMPLEX_DEFINED;MSDOS;OMIT_BLANK_CC;NON_ANSI_STDIO") + target_compile_definitions(cspice PUBLIC "_COMPLEX_DEFINED;MSDOS;OMIT_BLANK_CC;NON_ANSI_STDIO;_CRT_SECURE_NO_WARNINGS") set_target_properties(cspice PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE) elseif (UNIX) target_compile_definitions(cspice PUBLIC "NON_UNIX_STDIO") @@ -29,7 +29,7 @@ endif () if (NOT _SKIP_HEADERS) file(GLOB SPICE_HEADERS ${INCLUDE_PATH}/*.h) - install(FILES ${SPICE_HEADERS} DESTINATION include/cspice) + install(FILES ${SPICE_HEADERS} DESTINATION include) endif() set_target_properties( diff --git a/ports/cspice/CONTROL b/ports/cspice/CONTROL index 310fbe48b3c11a..00c2943a399d75 100644 --- a/ports/cspice/CONTROL +++ b/ports/cspice/CONTROL @@ -1,6 +1,5 @@ Source: cspice Version: 66 -Port-Version: 3 +Port-Version: 4 Homepage: https://naif.jpl.nasa.gov/naif/toolkit_C.html Description: NASA C SPICE toolkit -Supports: !uwp diff --git a/ports/cspice/portfile.cmake b/ports/cspice/portfile.cmake index 554c7b9d3c651c..667785cac5a019 100644 --- a/ports/cspice/portfile.cmake +++ b/ports/cspice/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "uwp") - if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") if (VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE @@ -60,6 +58,11 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(_STATIC_BUILD ON) endif() +if (VCPKG_TARGET_IS_UWP) + set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") + set(VCPKG_CXX_FLAGS "/sdl- ${VCPKG_CXX_FLAGS}") +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA diff --git a/versions/baseline.json b/versions/baseline.json index db7bc7632afa84..1a7ac3680b53a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1538,7 +1538,7 @@ }, "cspice": { "baseline": "66", - "port-version": 3 + "port-version": 4 }, "ctbignum": { "baseline": "2019-08-02", diff --git a/versions/c-/cspice.json b/versions/c-/cspice.json index 59a41ecb21a126..23ae3688c03574 100644 --- a/versions/c-/cspice.json +++ b/versions/c-/cspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de8a1c53f62f307ac805ace26e3b9c9ece91829a", + "version-string": "66", + "port-version": 4 + }, { "git-tree": "743b26ef365d681a5252d2d72a58aa8c2e76d80b", "version-string": "66", From d215585c9417fb9aabacafdabd69e93d09416507 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 26 Jul 2021 20:10:39 +0200 Subject: [PATCH 0209/1858] [libgeotiff] fix build on ios (#19113) * libgeotiff on ios * x-add-version --- ports/libgeotiff/CONTROL | 2 +- ports/libgeotiff/portfile.cmake | 1 + versions/baseline.json | 2 +- versions/l-/libgeotiff.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index 54e9022b86db43..03fc37b621ca8c 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,6 +1,6 @@ Source: libgeotiff Version: 1.6.0 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/OSGeo/libgeotiff Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags. Build-Depends: tiff, proj4, zlib, libjpeg-turbo diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index 967c7cd787d4ee..deba3b12b04fe1 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_configure_cmake( -DWITH_ZLIB=1 -DWITH_JPEG=1 -DWITH_UTILITIES=1 + -DCMAKE_MACOSX_BUNDLE=0 ) vcpkg_install_cmake() diff --git a/versions/baseline.json b/versions/baseline.json index 1a7ac3680b53a4..14a280d9c0d653 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3198,7 +3198,7 @@ }, "libgeotiff": { "baseline": "1.6.0", - "port-version": 2 + "port-version": 3 }, "libgit2": { "baseline": "1.1.0", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index 7e6867b16166cb..2f03e9f4954293 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2776355ea4b59dd06ec5b231c5080cd9b2157a16", + "version-string": "1.6.0", + "port-version": 3 + }, { "git-tree": "7cd5cd08571c3a463ea30e6b47a6e407301199fe", "version-string": "1.6.0", From f53fd27e4ddc771446a3015051baec933dce309c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 26 Jul 2021 20:11:05 +0200 Subject: [PATCH 0210/1858] [gdal] Fix GDAL_LIBRARY passing by cache variable (#19119) * Fix GDAL_LIBRARY passing by cache variable * x-add-version --- ports/gdal/vcpkg-cmake-wrapper.cmake | 2 ++ ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 8614c35e3ee9c2..f6241e25939f20 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -23,6 +23,8 @@ if(NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY) message(FATAL_ERROR "Installation of vcpkg port gdal is broken.") endif() +set(GDAL_LIBRARY "${GDAL_LIBRARY}" CACHE STRING "") + set(FindGDAL_SKIP_GDAL_CONFIG TRUE) _find_package(${ARGS}) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 71e7cbf110d894..8ef4de49b4de55 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 2, + "port-version": 3, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index 14a280d9c0d653..ff4f8eb60eec56 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2218,7 +2218,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 2 + "port-version": 3 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 9d20106b81d71a..d6da35027c5dc3 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bb72450f69322e39e09bea191e5c947833e698d", + "version-semver": "3.2.2", + "port-version": 3 + }, { "git-tree": "cee8a26ec45230cb4b11e18582b41291b264d82e", "version-semver": "3.2.2", From e59fbccbcc85ee663786b058eae4f6ec6a73aaf1 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 26 Jul 2021 14:26:28 -0700 Subject: [PATCH 0211/1858] [vcpkg-ci] Add GitHub Actions precheck and reporting (#19115) --- .github/workflows/trustedPR.yml | 58 ++++++++++++++++++ .github/workflows/untrustedPR.yml | 98 +++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 .github/workflows/trustedPR.yml create mode 100644 .github/workflows/untrustedPR.yml diff --git a/.github/workflows/trustedPR.yml b/.github/workflows/trustedPR.yml new file mode 100644 index 00000000000000..d45bfeb11c86bf --- /dev/null +++ b/.github/workflows/trustedPR.yml @@ -0,0 +1,58 @@ +# Modelled after https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ + +name: Post PR Suggestions + +on: + workflow_run: + workflows: ["PR Suggestions"] + types: + - completed + +jobs: + comment: + runs-on: ubuntu-latest + if: > + ${{ github.event.workflow_run.event == 'pull_request' && + github.event.workflow_run.conclusion == 'success' }} + + steps: + - name: 'Download artifact' + uses: actions/github-script@v3.1.0 + with: + script: | + var artifacts = await github.actions.listWorkflowRunArtifacts({ + owner: context.repo.owner, + repo: context.repo.repo, + run_id: ${{github.event.workflow_run.id }}, + }); + var matchArtifact = artifacts.data.artifacts.filter((artifact) => { + return artifact.name == "pr" + })[0]; + var download = await github.actions.downloadArtifact({ + owner: context.repo.owner, + repo: context.repo.repo, + artifact_id: matchArtifact.id, + archive_format: 'zip', + }); + var fs = require('fs'); + fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data)); + - run: unzip pr.zip + + - uses: actions/github-script@v4 + with: + script: | + const { promises: fs } = require('fs') + const event = (await fs.readFile('event', 'utf8')).trim() + const body = (await fs.readFile('body', 'utf8')).trim() + const issue_number = Number(await fs.readFile('./NR')); + + var req = { + owner: context.repo.owner, + pull_number: issue_number, + repo: context.repo.repo, + event: event + }; + if (body !== "") { + req.body = body; + } + await github.pulls.createReview(req); diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml new file mode 100644 index 00000000000000..77e7df1eb433bc --- /dev/null +++ b/.github/workflows/untrustedPR.yml @@ -0,0 +1,98 @@ +# Modelled after https://securitylab.github.com/research/github-actions-preventing-pwn-requests/ + +# These "checks" are also performed as part of our critical-path azure-pipelines review, +# however here they are better able to post back to the original PR +name: PR Suggestions + +on: + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + # fetch-depth 2 ensures we capture both parents of the merge commit + fetch-depth: 2 + + - uses: actions/cache@v2 + id: cache + with: + path: | + ./vcpkg + key: ${{ runner.os }}-${{ hashFiles('scripts/bootstrap*') }} + + - name: bootstrap + if: steps.cache.outputs.cache-hit != 'true' + run: ./bootstrap-vcpkg.sh + + - name: Save PR number + run: | + mkdir -p ./pr + echo ${{ github.event.number }} > ./pr/NR + + - name: Formatting + run: | + git config user.email github-actions + git config user.name github-actions@github.com + + ./vcpkg format-manifest ports/*/vcpkg.json + git diff > .github-pr.format-manifest + git add -u + git commit -m "tmp" --allow-empty + # HEAD^^ refers to the "main" commit that was merged into + git checkout HEAD^^ -- versions + git restore --staged versions + ./vcpkg x-add-version --all --skip-formatting-check > .github-pr.x-add-version.out + git diff > .github-pr.x-add-version.diff + git reset HEAD~ --mixed + + - uses: actions/github-script@v4 + with: + script: | + const { promises: fs } = require('fs') + const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim() + const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim() + const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim() + + var output = '' + if (format !== "") { + output += "
All manifest files must be formatted\n\n" + output += "`./vcpkg format-manifest ports/*/vcpkg.json`\n" + output += "
Diff\n\n" + output += "```diff\n" + format + "\n```\n" + output += "
\n\n" + } + if (add_version_out !== "") { + output += "
PRs must add only one version and must not modify any published versions\n\n" + output += "When making any changes to a library, the version or port-version in `vcpkg.json` or `CONTROL` must be modified.\n" + output += "```\n" + add_version_out + "\n```\n
\n" + } + if (add_version !== "") { + output += "
After committing all other changes, the version database must be updated\n\n" + output += "```sh\n" + output += "git add -u && git commit\n" + output += "git checkout ${{ github.event.pull_request.base.sha }} -- versions\n" + output += "./vcpkg x-add-version --all\n" + output += "```\n" + output += "
Diff\n\n" + output += "```diff\n" + add_version + "\n```\n" + output += "
\n\n" + } + + if (output === "") { + await fs.writeFile("pr/event", "APPROVE") + } else { + output = "_This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!_\n\n" + output + await fs.writeFile("pr/event", "REQUEST_CHANGES") + } + await fs.writeFile("pr/body", output) + + console.log(output); + + - uses: actions/upload-artifact@v2 + with: + name: pr + path: pr/ From 8cc1f2bd01e71d2ab3f54972e5075340ddca8cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B4=8B=E9=98=B3?= Date: Tue, 27 Jul 2021 07:42:48 +0800 Subject: [PATCH 0212/1858] [duilib] Enable unicode define (#17745) * duilib enable unicode define * duilib version modify git-tree * update duilib version files * update duilib control and version files * modify duilib cmake tab to space * duilib remove unnecessary space char * duilib update version file * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/duilib/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/d-/duilib.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * fix duilib version file Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/duilib/CONTROL | 4 +++- ports/duilib/enable-unicode-for-vcpkg.patch | 15 +++++++++++++++ ports/duilib/portfile.cmake | 7 ++++--- versions/baseline.json | 4 ++-- versions/d-/duilib.json | 5 +++++ 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 ports/duilib/enable-unicode-for-vcpkg.patch diff --git a/ports/duilib/CONTROL b/ports/duilib/CONTROL index cb4c7ed3fadcfb..be7173359fe551 100644 --- a/ports/duilib/CONTROL +++ b/ports/duilib/CONTROL @@ -1,3 +1,5 @@ Source: duilib -Version: 2019-4-28-2 +Version: 2019-4-28 +Port-Version: 3 Description: Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines. +Homepage: https://github.com/duilib/duilib diff --git a/ports/duilib/enable-unicode-for-vcpkg.patch b/ports/duilib/enable-unicode-for-vcpkg.patch new file mode 100644 index 00000000000000..1d0aa02da604d3 --- /dev/null +++ b/ports/duilib/enable-unicode-for-vcpkg.patch @@ -0,0 +1,15 @@ +diff --git a/DuiLib/CMakeLists.txt b/DuiLib/CMakeLists.txt +index 835d430..b178984 100644 +--- a/DuiLib/CMakeLists.txt ++++ b/DuiLib/CMakeLists.txt +@@ -2,6 +2,9 @@ + #Author Qi Gao(monkgau@gmail.com) + #Created: 2012/09/16 + ++#if use vcpkg to build, need to add extra unicode definitions ++add_definitions(-DUNICODE -D_UNICODE) ++ + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} Root_src) + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Control Control_src) + aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Core Core_src) + diff --git a/ports/duilib/portfile.cmake b/ports/duilib/portfile.cmake index e4153b133273e7..272691914c7bc0 100644 --- a/ports/duilib/portfile.cmake +++ b/ports/duilib/portfile.cmake @@ -1,14 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO duilib/duilib - REF d7f3a331a0fc6ba48429cd9e5c427570cc73bc35 - SHA512 6381cac467d42e4811859411a5fa620e52075622e8fbec38a6ab320c33bc7d6fdddc809c150d6a10cc40c55a651345bda9387432898d24957b6ab0f5c4b5391c + REF d7f3a331a0fc6ba48429cd9e5c427570cc73bc35 + SHA512 6381cac467d42e4811859411a5fa620e52075622e8fbec38a6ab320c33bc7d6fdddc809c150d6a10cc40c55a651345bda9387432898d24957b6ab0f5c4b5391c HEAD_REF master PATCHES "fix-post-build-errors.patch" "fix-arm-build.patch" "fix-encoding.patch" "enable-static.patch" + "enable-unicode-for-vcpkg.patch" ) vcpkg_configure_cmake( @@ -33,4 +34,4 @@ else() file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib/duilib.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duilib RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index ff4f8eb60eec56..559b59b85ee8e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1777,8 +1777,8 @@ "port-version": 0 }, "duilib": { - "baseline": "2019-4-28-2", - "port-version": 0 + "baseline": "2019-4-28", + "port-version": 3 }, "duktape": { "baseline": "2.5.0", diff --git a/versions/d-/duilib.json b/versions/d-/duilib.json index ca3a95a0211efe..9faceb99097b8d 100644 --- a/versions/d-/duilib.json +++ b/versions/d-/duilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58b8c9eb93832387ea6efc1ae1071395cd4a22d2", + "version-string": "2019-4-28", + "port-version": 3 + }, { "git-tree": "d1a36d9e38313306f28b94d238e120deabfec9ea", "version-string": "2019-4-28-2", From 00bb46e232923615d4c994c86571114527aeaa49 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 27 Jul 2021 01:54:30 +0200 Subject: [PATCH 0213/1858] [zlib] Add cmake wrapper (#18914) * Format manifest * Add cmake wrapper * x-add-version * Always use vcpkg zlib for sentry native * x-add-version * Fix and simplify wrapper * Update git-tree --- ports/sentry-native/portfile.cmake | 2 ++ ports/sentry-native/use-zlib-target.patch | 12 ++++++++++++ ports/sentry-native/vcpkg.json | 4 +++- ports/zlib/CONTROL | 5 ----- ports/zlib/portfile.cmake | 1 + ports/zlib/vcpkg-cmake-wrapper.cmake | 13 +++++++++++++ ports/zlib/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++-- versions/s-/sentry-native.json | 5 +++++ versions/z-/zlib.json | 5 +++++ 10 files changed, 50 insertions(+), 8 deletions(-) create mode 100644 ports/sentry-native/use-zlib-target.patch delete mode 100644 ports/zlib/CONTROL create mode 100644 ports/zlib/vcpkg-cmake-wrapper.cmake create mode 100644 ports/zlib/vcpkg.json diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 7fac38cf575ae0..80f745bb61d8fc 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_extract_source_archive_ex( fix-warningC5105.patch fix-config-cmake.patch fix-libcurl.patch + use-zlib-target.patch ) if (NOT DEFINED SENTRY_BACKEND) @@ -37,6 +38,7 @@ vcpkg_configure_cmake( -DSENTRY_BUILD_TESTS=OFF -DSENTRY_BUILD_EXAMPLES=OFF -DSENTRY_BACKEND=${SENTRY_BACKEND} + -DCRASHPAD_ZLIB_SYSTEM=ON ) vcpkg_install_cmake() diff --git a/ports/sentry-native/use-zlib-target.patch b/ports/sentry-native/use-zlib-target.patch new file mode 100644 index 00000000000000..d4b3dfca33359b --- /dev/null +++ b/ports/sentry-native/use-zlib-target.patch @@ -0,0 +1,12 @@ +diff --git a/external/crashpad/CMakeLists.txt b/external/crashpad/CMakeLists.txt +index abb0697..a57ff04 100644 +--- a/external/crashpad/CMakeLists.txt ++++ b/external/crashpad/CMakeLists.txt +@@ -22,6 +22,7 @@ option(CRASHPAD_ZLIB_SYSTEM "Use system zlib library" "${CRASHPAD_ZLIB_SYSTEM_DE + + if(CRASHPAD_ZLIB_SYSTEM) + find_package(ZLIB REQUIRED) ++ set(ZLIB_LIBRARIES ZLIB::ZLIB) + endif() + + if(LINUX OR ANDROID) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index afbe40dc8f3dc1..b60162f8c78a12 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sentry-native", "version-semver": "0.4.11", + "port-version": 1, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", @@ -8,6 +9,7 @@ { "name": "curl", "platform": "!windows" - } + }, + "zlib" ] } diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL deleted file mode 100644 index a4c1a55d693248..00000000000000 --- a/ports/zlib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: zlib -Version: 1.2.11 -Port-Version: 10 -Homepage: https://www.zlib.net/ -Description: A compression library diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 429d85440d3eeb..572eb09072153e 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -31,6 +31,7 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) # Install the pkgconfig file if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") diff --git a/ports/zlib/vcpkg-cmake-wrapper.cmake b/ports/zlib/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..5060c550257696 --- /dev/null +++ b/ports/zlib/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,13 @@ +set(ZLIB_ROOT "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}") +find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${ZLIB_ROOT}/include" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${ZLIB_ROOT}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${ZLIB_ROOT}/debug/lib" NO_DEFAULT_PATH) +if(NOT ZLIB_INCLUDE_DIR OR NOT ZLIB_LIBRARY_RELEASE OR (NOT ZLIB_LIBRARY_DEBUG AND EXISTS "${ZLIB_ROOT}/debug/lib")) + message("Broken installation of vcpkg port zlib") +endif() +if(CMAKE_VERSION VERSION_LESS 3.4) + include(SelectLibraryConfigurations) + select_library_configurations(ZLIB) + unset(ZLIB_FOUND) +endif() +_find_package(${ARGS}) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json new file mode 100644 index 00000000000000..39457efec8cabf --- /dev/null +++ b/ports/zlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zlib", + "version-string": "1.2.11", + "port-version": 11, + "description": "A compression library", + "homepage": "https://www.zlib.net/" +} diff --git a/versions/baseline.json b/versions/baseline.json index 559b59b85ee8e7..2b77f92ecbdb86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5762,7 +5762,7 @@ }, "sentry-native": { "baseline": "0.4.11", - "port-version": 0 + "port-version": 1 }, "septag-sx": { "baseline": "2019-05-07-2", @@ -6894,7 +6894,7 @@ }, "zlib": { "baseline": "1.2.11", - "port-version": 10 + "port-version": 11 }, "zlib-ng": { "baseline": "2.0.3", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 1d4503503aa30f..b30921c3438620 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2864f84fc6ef423bcc641b64b75cc574df99b85", + "version-semver": "0.4.11", + "port-version": 1 + }, { "git-tree": "8343307e093e40faaf7e894be6aed4f60cb327d0", "version-semver": "0.4.11", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 8b80a1711ac57d..050e1de28b39b7 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad5b59cd3722af26f09921297562dfc76c83dbf8", + "version-string": "1.2.11", + "port-version": 11 + }, { "git-tree": "53a4615c8bb9b98a3864b834a6bbe51cc6c849ef", "version-string": "1.2.11", From 8e95a9d8a0e1aca778361f1691d95eeae3ad2c57 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 27 Jul 2021 15:29:44 -0700 Subject: [PATCH 0214/1858] [grpc] fix generated pkg-config file (#19174) gRPC uses `upb`, but normally it vendors-in the dependency. The vendored-in version uses a single library artifact, and the generated pkg-config file simply adds `-lupb`. In `vcpkg` we use the `upb` package. This has more libraries, and thus more `-lupb_*` options are needed. Ideally we would use a `upb.pc` file, but that does not exist. --- ports/grpc/00014-pkgconfig-upbdefs.patch | 13 +++++++++++++ ports/grpc/portfile.cmake | 1 + ports/grpc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 ports/grpc/00014-pkgconfig-upbdefs.patch diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch new file mode 100644 index 00000000000000..fd5a8356396a12 --- /dev/null +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3808016..059a16b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15516,7 +15516,7 @@ generate_pkgconfig( + "high performance general RPC framework" + "${gRPC_CORE_VERSION}" + "gpr openssl" +- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" ++ "-lgrpc -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" + "" + "grpc.pc") + diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 3ec41fb2f0409f..39aa2c5a95de81 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_from_github( snprintf.patch 00012-fix-use-cxx17.patch 00013-build-upbdefs.patch + 00014-pkgconfig-upbdefs.patch ) if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET) diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 118c58d184fe94..1b7dfac45b0fc0 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "grpc", "version-semver": "1.37.0", - "port-version": 2, + "port-version": 3, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2b77f92ecbdb86..e9f6f6ec4dce7a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2418,7 +2418,7 @@ }, "grpc": { "baseline": "1.37.0", - "port-version": 2 + "port-version": 3 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 2b050b8602ebd5..4d56acdef73262 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38a2b1bc9dd5fca170489b616d33efae6dd43158", + "version-semver": "1.37.0", + "port-version": 3 + }, { "git-tree": "9bcee29de46cc5f1edbe016d192f243f65e64a5f", "version-semver": "1.37.0", From 378403290a654288554018f19ba3fa940afd51ba Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 27 Jul 2021 15:42:43 -0700 Subject: [PATCH 0215/1858] Don't emit stderr on successful bootstrap. (#19175) Co-authored-by: Robert Schumacher --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1b71c810f49bb3..3f5bd85aa0ceb9 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -119,7 +119,7 @@ vcpkgDownloadFile() url=$1; downloadPath=$2 sha512=$3 vcpkgCheckRepoTool "curl" rm -rf "$downloadPath.part" - curl -L $url --tlsv1.2 --create-dirs --retry 3 --output "$downloadPath.part" || exit 1 + curl -L $url --tlsv1.2 --create-dirs --retry 3 --output "$downloadPath.part" --silent --show-error --fail || exit 1 vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512 mv "$downloadPath.part" "$downloadPath" From 37aa20a7eae64d5470855c39447595b8b4c46492 Mon Sep 17 00:00:00 2001 From: Alexandre Bique Date: Wed, 28 Jul 2021 00:48:31 +0200 Subject: [PATCH 0216/1858] [ffmpeg] fix cross compilation on mac arm64 to x86_64 (#18737) * [ffmpeg] fix cross compilation on mac arm64 to x86_64 * Bump port-version * Bump port-version again. Co-authored-by: Billy Robert ONeal III --- ports/ffmpeg/portfile.cmake | 3 +++ ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 654370f4541c16..0ec2789d0e0b92 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -585,6 +585,9 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQU endif() endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + if(VCPKG_TARGET_IS_OSX) + set(OPTIONS_CROSS " --enable-cross-compile --target-os=darwin --arch=x86_64 --extra-ldflags=-arch --extra-ldflags=x86_64 --extra-cflags=-arch --extra-cflags=x86_64 --extra-cxxflags=-arch --extra-cxxflags=x86_64") + endif() elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") else() message(FATAL_ERROR "Unsupported architecture") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 3dccdeb5dbda2b..5a001e06964e6b 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 10, + "port-version": 11, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index e9f6f6ec4dce7a..5ccb76584b6098 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1998,7 +1998,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 10 + "port-version": 11 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 95b846ba556753..0897dd09b603cb 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e44538ad578a511886a010a5485fbe9ab514bf1", + "version": "4.4", + "port-version": 11 + }, { "git-tree": "d8eae79332e72736be5c6accacaf7bf9054df4b9", "version": "4.4", From 61ebb5a89e1a3a655d6408f84fae657ab80d587e Mon Sep 17 00:00:00 2001 From: DanielDelaporus <62656340+DanielDelaporus@users.noreply.github.com> Date: Wed, 28 Jul 2021 00:50:29 +0200 Subject: [PATCH 0217/1858] [alembic] Enable release only and debug only build on alembic port (#18963) * [alembic] Enable release only and debug only build on alembic port * Fix version database. Co-authored-by: Billy Robert O'Neal III --- ports/alembic/CONTROL | 6 ------ ports/alembic/portfile.cmake | 42 +++++++++++++++++++++--------------- ports/alembic/vcpkg.json | 12 +++++++++++ versions/a-/alembic.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 43 insertions(+), 24 deletions(-) delete mode 100644 ports/alembic/CONTROL create mode 100644 ports/alembic/vcpkg.json diff --git a/ports/alembic/CONTROL b/ports/alembic/CONTROL deleted file mode 100644 index 333445866e94bd..00000000000000 --- a/ports/alembic/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: alembic -Version: 1.7.16 -Build-Depends: ilmbase, hdf5 -Description: Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications. -Homepage: https://alembic.io/ -Supports: windows & !arm & !uwp & !static diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index 60199e30ca85e8..dd8a3100e5a993 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -45,23 +45,31 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) if(VCPKG_TARGET_IS_WINDOWS) - file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${EXE}) - file(REMOVE ${DEBUG_EXE}) - - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/bin/Alembic.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/Alembic.dll) - - file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake DEBUG_CONFIG) - string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/Alembic.dll" - "\${_IMPORT_PREFIX}/debug/bin/Alembic.dll" DEBUG_CONFIG "${DEBUG_CONFIG}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake "${DEBUG_CONFIG}") - - file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake RELEASE_CONFIG) - string(REPLACE "\${_IMPORT_PREFIX}/lib/Alembic.dll" - "\${_IMPORT_PREFIX}/bin/Alembic.dll" RELEASE_CONFIG "${RELEASE_CONFIG}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake "${RELEASE_CONFIG}") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + + file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) + file(REMOVE ${EXE}) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/bin/Alembic.dll) + file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake RELEASE_CONFIG) + string(REPLACE "\${_IMPORT_PREFIX}/lib/Alembic.dll" + "\${_IMPORT_PREFIX}/bin/Alembic.dll" RELEASE_CONFIG "${RELEASE_CONFIG}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake "${RELEASE_CONFIG}") + + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + + file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(REMOVE ${DEBUG_EXE}) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/Alembic.dll) + file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake DEBUG_CONFIG) + string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/Alembic.dll" + "\${_IMPORT_PREFIX}/debug/bin/Alembic.dll" DEBUG_CONFIG "${DEBUG_CONFIG}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake "${DEBUG_CONFIG}") + + endif() + else() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json new file mode 100644 index 00000000000000..ca8d213bae4a32 --- /dev/null +++ b/ports/alembic/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "alembic", + "version": "1.7.16", + "port-version": 1, + "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", + "homepage": "https://alembic.io/", + "supports": "windows & !arm & !uwp & !static", + "dependencies": [ + "hdf5", + "ilmbase" + ] +} diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index c35cbf3e85e648..3528cffd29a91e 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "058a9ce893dbaf6ad6d2743b47a9c633eff3798a", + "version": "1.7.16", + "port-version": 1 + }, { "git-tree": "41cf27d8f6792056c456e4640f20f13a016db205", "version-string": "1.7.16", diff --git a/versions/baseline.json b/versions/baseline.json index 5ccb76584b6098..183d12ab0ab79f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -50,7 +50,7 @@ }, "alembic": { "baseline": "1.7.16", - "port-version": 0 + "port-version": 1 }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", From ef6019732f905d26807290dcc6b8c6819c8c0cc1 Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Tue, 27 Jul 2021 16:20:45 -0700 Subject: [PATCH 0218/1858] [vcpkg] Optionally limit the number of cores during vcpkg bootstrap (#19010) * limit the number of cores during vcpkg bootstrap * Switch to VCPKG_MAX_CONCURRENCY --- scripts/bootstrap.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 3f5bd85aa0ceb9..1a17bbfbbeca86 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -299,8 +299,13 @@ echo "Building vcpkg-tool..." rm -rf "$baseBuildDir" mkdir -p "$buildDir" vcpkgExtractArchive "$tarballPath" "$srcBaseDir" +cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DCMAKE_MAKE_PROGRAM='$ninjaExe'" -(cd "$buildDir" && CXX="$CXX" "$cmakeExe" "$srcDir" -DCMAKE_BUILD_TYPE=Release -G "Ninja" "-DCMAKE_MAKE_PROGRAM=$ninjaExe" "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then + cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' " +fi + +(cd "$buildDir" && eval CXX="$CXX" "$cmakeExe" "$srcDir" $cmakeConfigOptions "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" From 3e716d68eb7004abd4144aaf6e5316351e8ce907 Mon Sep 17 00:00:00 2001 From: Rodrigo Hernandez Cordoba Date: Tue, 27 Jul 2021 17:24:50 -0600 Subject: [PATCH 0219/1858] [v8] Update to version 9.1.269.39 (#18998) --- ports/v8/build.patch | 44 +++++++++---------- ports/v8/portfile.cmake | 6 +-- ports/v8/v8.patch | 97 ++++++++++++++++++----------------------- ports/v8/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/v-/v8.json | 5 +++ 6 files changed, 75 insertions(+), 84 deletions(-) diff --git a/ports/v8/build.patch b/ports/v8/build.patch index 286f3c9358f73c..15fede3fe87c31 100644 --- a/ports/v8/build.patch +++ b/ports/v8/build.patch @@ -1,16 +1,16 @@ diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn -index 0c8743726..e6a5ae0b4 100644 +index 1904a2559..e66586c88 100644 --- a/config/compiler/BUILD.gn +++ b/config/compiler/BUILD.gn -@@ -1545,6 +1545,7 @@ config("default_warnings") { +@@ -1571,6 +1571,7 @@ config("default_warnings") { # Disables. "-Wno-missing-field-initializers", # "struct foo f = {0};" "-Wno-unused-parameter", # Unused function parameters. + "-Wno-invalid-offsetof", # Use of "conditionally-supported" offsetof in c++17 ] } - -@@ -1969,8 +1970,17 @@ config("no_incompatible_pointer_warnings") { + +@@ -1987,8 +1988,17 @@ config("no_incompatible_pointer_warnings") { # Shared settings for both "optimize" and "optimize_max" configs. # IMPORTANT: On Windows "/O1" and "/O2" must go before the common flags. if (is_win) { @@ -31,7 +31,7 @@ index 0c8743726..e6a5ae0b4 100644 "/Zc:inline", # Remove unreferenced COMDAT (faster links). ] diff --git a/config/linux/pkg-config.py b/config/linux/pkg-config.py -index 5adf70cc3..dab159f98 100644 +index 5adf70cc3..dab159f98 100755 --- a/config/linux/pkg-config.py +++ b/config/linux/pkg-config.py @@ -41,6 +41,11 @@ from optparse import OptionParser @@ -43,13 +43,13 @@ index 5adf70cc3..dab159f98 100644 +# of the PKG_CONFIG_LIBDIR environment library. +# +# --full-path-libs causes lib names to include their full path. - - + + def SetConfigPath(options): @@ -105,11 +110,32 @@ def RewritePath(path, strip_prefix, sysroot): return path - - + + +flag_regex = re.compile("(-.)(.+)") + + @@ -79,7 +79,7 @@ index 5adf70cc3..dab159f98 100644 + if "linux" not in sys.platform and 'win32' not in sys.platform: print("[[],[],[],[],[]]") return 0 - + @@ -128,6 +154,9 @@ def main(): parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir') parser.add_option('--version-as-components', action='store_true', @@ -88,12 +88,12 @@ index 5adf70cc3..dab159f98 100644 + type='string') + parser.add_option('--full-path-libs', action='store_true', dest='full_path_libs') (options, args) = parser.parse_args() - + # Make a list of regular expressions to strip out. @@ -144,6 +173,10 @@ def main(): else: prefix = '' - + + # Override PKG_CONFIG_LIBDIR + if options.pkg_config_libdir: + os.environ['PKG_CONFIG_LIBDIR'] = options.pkg_config_libdir @@ -107,12 +107,12 @@ index 5adf70cc3..dab159f98 100644 # to happen in practice. - all_flags = flag_string.strip().split(' ') + all_flags = ConvertGCCToMSVC(flag_string.strip().split(' ')) - - + + sysroot = options.sysroot @@ -220,7 +253,10 @@ def main(): continue; - + if flag[:2] == '-l': - libs.append(RewritePath(flag[2:], prefix, sysroot)) + library = RewritePath(flag[2:], prefix, sysroot) @@ -125,7 +125,7 @@ index 5adf70cc3..dab159f98 100644 @@ -237,6 +273,14 @@ def main(): else: cflags.append(flag) - + + if options.full_path_libs: + full_path_libs = [] + for lib_dir in lib_dirs: @@ -149,12 +149,12 @@ index 428e44ac0..a0d2175ee 100644 + # Allow directly overriding the PKG_CONFIG_LIBDIR enviroment variable + pkg_config_libdir = "" } - + pkg_config_script = "//build/config/linux/pkg-config.py" @@ -87,6 +90,17 @@ if (host_pkg_config != "") { host_pkg_config_args = pkg_config_args } - + +if (pkg_config_libdir != "") { + pkg_config_args += [ + "--pkg_config_libdir", @@ -170,10 +170,10 @@ index 428e44ac0..a0d2175ee 100644 assert(defined(invoker.packages), "Variable |packages| must be defined to be a list in pkg_config.") diff --git a/util/lastchange.py b/util/lastchange.py -index 874870ad5..a4fc0be8d 100644 +index 02a36642b..78934f1b0 100755 --- a/util/lastchange.py +++ b/util/lastchange.py -@@ -191,7 +191,10 @@ def GetGitTopDirectory(source_dir): +@@ -192,7 +192,10 @@ def GetGitTopDirectory(source_dir): Returns: The output of "git rev-parse --show-toplevel" as a string """ @@ -182,6 +182,6 @@ index 874870ad5..a4fc0be8d 100644 + if "GCC" in sys.version and sys.platform=='win32': + return subprocess.check_output(["cygpath", "-w", directory]).strip(b"\n").decode() + return directory - - + + def WriteIfChanged(file_name, contents): diff --git a/ports/v8/portfile.cmake b/ports/v8/portfile.cmake index 42dc0fb9cf15db..bbf42562308728 100644 --- a/ports/v8/portfile.cmake +++ b/ports/v8/portfile.cmake @@ -1,5 +1,5 @@ -set(pkgver "9.0.257.17") +set(pkgver "9.1.269.39") set(ENV{DEPOT_TOOLS_WIN_TOOLCHAIN} 0) @@ -71,7 +71,7 @@ endfunction() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://chromium.googlesource.com/v8/v8.git - REF 462fc27a2892702a4d42ffd647789c58ffcee747 + REF 7d3d62c91f69a702e5aa54c6b4dbbaa883683717 PATCHES ${CURRENT_PORT_DIR}/v8.patch ) @@ -79,7 +79,7 @@ message(STATUS "Fetching submodules") v8_fetch( DESTINATION build URL https://chromium.googlesource.com/chromium/src/build.git - REF acacc4cc0668cb4dc7f44a3f4430635f438d7478 + REF fd86d60f33cbc794537c4da2ef7e298d7f81138e SOURCE ${SOURCE_PATH} PATCHES ${CURRENT_PORT_DIR}/build.patch) v8_fetch( diff --git a/ports/v8/v8.patch b/ports/v8/v8.patch index 617162ed8d2479..7b41c8d3e6c47c 100644 --- a/ports/v8/v8.patch +++ b/ports/v8/v8.patch @@ -1,20 +1,20 @@ diff --git a/BUILD.gn b/BUILD.gn -index a9ab6783fa..bc8455ce64 100644 +index d2bfb6129d..c5ab18ee44 100644 --- a/BUILD.gn +++ b/BUILD.gn -@@ -5202,6 +5202,7 @@ if (is_component_build) { - +@@ -5366,6 +5366,7 @@ if (is_component_build) { + public_deps = [ ":v8_base", + ":v8_initializers", ":v8_snapshot", ] - + diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h -index 03af2cc5e2..bb19092c54 100644 +index 72b8fbc8a8..3ebfc23f1f 100644 --- a/src/codegen/code-stub-assembler.h +++ b/src/codegen/code-stub-assembler.h -@@ -301,7 +301,7 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol }; +@@ -303,7 +303,7 @@ enum class PrimitiveType { kBoolean, kNumber, kString, kSymbol }; // it's possible to add JavaScript-specific useful CodeAssembler "macros" // without modifying files in the compiler directory (and requiring a review // from a compiler directory OWNER). @@ -24,10 +24,10 @@ index 03af2cc5e2..bb19092c54 100644 public TorqueGeneratedExportedMacrosAssembler { public: diff --git a/src/common/globals.h b/src/common/globals.h -index d9d502aa51..7495c898fc 100644 +index f51c3210f8..5291285337 100644 --- a/src/common/globals.h +++ b/src/common/globals.h -@@ -1348,7 +1348,7 @@ class BinaryOperationFeedback { +@@ -1364,7 +1364,7 @@ class BinaryOperationFeedback { // This is distinct from BinaryOperationFeedback on purpose, because the // feedback that matters differs greatly as well as the way it is consumed. class CompareOperationFeedback { @@ -36,14 +36,14 @@ index d9d502aa51..7495c898fc 100644 kSignedSmallFlag = 1 << 0, kOtherNumberFlag = 1 << 1, kBooleanFlag = 1 << 2, -@@ -1362,7 +1362,7 @@ class CompareOperationFeedback { +@@ -1378,7 +1378,7 @@ class CompareOperationFeedback { }; - + public: - enum Type { + enum Type : uint32_t { kNone = 0, - + kBoolean = kBooleanFlag, diff --git a/src/compiler/node-cache.h b/src/compiler/node-cache.h index 8e1d3d4eae..c55d8329de 100644 @@ -65,14 +65,14 @@ index e135e30efc..0c055247bc 100644 @@ -19,7 +19,7 @@ namespace internal { // ----------------------------------------------------------------------------- // PagedSpaceObjectIterator - + -HeapObject PagedSpaceObjectIterator::Next() { +inline HeapObject PagedSpaceObjectIterator::Next() { do { HeapObject next_obj = FromCurrentPage(); if (!next_obj.is_null()) return next_obj; diff --git a/src/heap/paged-spaces.h b/src/heap/paged-spaces.h -index 5168f0f053..ae5c22d1f3 100644 +index 621d92aa89..a8592a5b4d 100644 --- a/src/heap/paged-spaces.h +++ b/src/heap/paged-spaces.h @@ -45,7 +45,7 @@ class V8_EXPORT_PRIVATE PagedSpaceObjectIterator : public ObjectIterator { @@ -81,7 +81,7 @@ index 5168f0f053..ae5c22d1f3 100644 // Returns nullptr when the iteration has ended. - inline HeapObject Next() override; + HeapObject Next() override; - + private: // Fast (inlined) path of next(). diff --git a/src/objects/feedback-vector.cc b/src/objects/feedback-vector.cc @@ -91,74 +91,61 @@ index a77ea5d265..0cddb92a02 100644 @@ -114,9 +114,9 @@ Handle FeedbackMetadata::New(LocalIsolate* isolate, return metadata; } - + -template Handle FeedbackMetadata::New( +template V8_EXPORT Handle FeedbackMetadata::New( Isolate* isolate, const FeedbackVectorSpec* spec); -template Handle FeedbackMetadata::New( +template V8_EXPORT Handle FeedbackMetadata::New( LocalIsolate* isolate, const FeedbackVectorSpec* spec); - + bool FeedbackMetadata::SpecDiffersFrom( diff --git a/src/objects/fixed-array-inl.h b/src/objects/fixed-array-inl.h -index a91f89784f..5ecf7e3372 100644 +index cca6d40070..d6d36ff59f 100644 --- a/src/objects/fixed-array-inl.h +++ b/src/objects/fixed-array-inl.h @@ -88,7 +88,7 @@ bool FixedArray::is_the_hole(Isolate* isolate, int index) { return get(isolate, index).IsTheHole(isolate); } - + -void FixedArray::set(int index, Smi value) { +inline V8_EXPORT_PRIVATE void FixedArray::set(int index, Smi value) { DCHECK_NE(map(), GetReadOnlyRoots().fixed_cow_array_map()); DCHECK_LT(static_cast(index), static_cast(length())); DCHECK(Object(value).IsSmi()); diff --git a/src/objects/fixed-array.h b/src/objects/fixed-array.h -index 53b4cbb22b..8dd24df399 100644 +index 98c5d8d5b5..bd5303e44c 100644 --- a/src/objects/fixed-array.h +++ b/src/objects/fixed-array.h -@@ -130,7 +130,7 @@ class FixedArray +@@ -132,7 +132,7 @@ class FixedArray inline bool is_the_hole(Isolate* isolate, int index); - + // Setter that doesn't need write barrier. - inline void set(int index, Smi value); + inline V8_EXPORT_PRIVATE void set(int index, Smi value); // Setter with explicit barrier mode. inline void set(int index, Object value, WriteBarrierMode mode); - -diff --git a/src/runtime/runtime-wasm.cc b/src/runtime/runtime-wasm.cc -index 9ba26c23ad..5857bf4c39 100644 ---- a/src/runtime/runtime-wasm.cc -+++ b/src/runtime/runtime-wasm.cc -@@ -570,7 +570,7 @@ RUNTIME_FUNCTION(Runtime_WasmDebugBreak) { - DebugScope debug_scope(isolate->debug()); - - // Check for instrumentation breakpoint. -- DCHECK_EQ(script->break_on_entry(), instance->break_on_entry()); -+ DCHECK_EQ(script->break_on_entry(), static_cast(instance->break_on_entry())); - if (script->break_on_entry()) { - MaybeHandle maybe_on_entry_breakpoints = - WasmScript::CheckBreakPoints( + diff --git a/src/snapshot/snapshot-utils.cc b/src/snapshot/snapshot-utils.cc index eb2372372c..7defadb4b1 100644 --- a/src/snapshot/snapshot-utils.cc +++ b/src/snapshot/snapshot-utils.cc @@ -5,7 +5,7 @@ #include "src/snapshot/snapshot-utils.h" - + #include "src/sanitizer/msan.h" -#include "third_party/zlib/zlib.h" +#include "zlib.h" - + namespace v8 { namespace internal { diff --git a/src/wasm/function-body-decoder-impl.h b/src/wasm/function-body-decoder-impl.h -index 6c9700b100..e3be3c31f5 100644 +index d37f718681..3a409e1d76 100644 --- a/src/wasm/function-body-decoder-impl.h +++ b/src/wasm/function-body-decoder-impl.h -@@ -2006,7 +2006,7 @@ class WasmDecoder : public Decoder { +@@ -2013,7 +2013,7 @@ class WasmDecoder : public Decoder { } - + // TODO(clemensb): This is only used by the interpreter; move there. - V8_EXPORT_PRIVATE std::pair StackEffect(const byte* pc) { + std::pair StackEffect(const byte* pc) { @@ -166,48 +153,48 @@ index 6c9700b100..e3be3c31f5 100644 // Handle "simple" opcodes with a fixed signature first. const FunctionSig* sig = WasmOpcodes::Signature(opcode); diff --git a/test/cctest/BUILD.gn b/test/cctest/BUILD.gn -index e63fe5ed35..ec48403c42 100644 +index ffa4e3a136..a279faee9b 100644 --- a/test/cctest/BUILD.gn +++ b/test/cctest/BUILD.gn -@@ -480,6 +480,10 @@ v8_source_set("cctest_sources") { +@@ -493,6 +493,10 @@ v8_source_set("cctest_sources") { # C4309: 'static_cast': truncation of constant value cflags += [ "/wd4309" ] - + + if(!is_clang) { + cflags += [ "/wd4789" ] + } + # MSVS wants this for gay-{precision,shortest}.cc. cflags += [ "/bigobj" ] - + diff --git a/tools/debug_helper/BUILD.gn b/tools/debug_helper/BUILD.gn -index 54cd3b7a4c..9c6666871d 100644 +index 2256df1f55..29e27c6af9 100644 --- a/tools/debug_helper/BUILD.gn +++ b/tools/debug_helper/BUILD.gn -@@ -99,10 +99,12 @@ v8_component("v8_debug_helper") { +@@ -100,10 +100,12 @@ v8_component("v8_debug_helper") { "../..:v8_libbase", "../..:v8_shared_internal_headers", "../..:v8_tracing", + "../..:v8", ] - + configs = [ ":internal_config" ] if (v8_enable_i18n_support) { + public_deps = [ "//third_party/icu" ] configs += [ "//third_party/icu:icu_config" ] } - + diff --git a/tools/v8windbg/BUILD.gn b/tools/v8windbg/BUILD.gn -index 10d06a127f..d0deb7adca 100644 +index 5618d2d945..71568f1670 100644 --- a/tools/v8windbg/BUILD.gn +++ b/tools/v8windbg/BUILD.gn @@ -6,7 +6,7 @@ import("../../gni/v8.gni") - + config("v8windbg_config") { # Required for successful compilation of SDK header file DbgModel.h. - cflags_cc = [ "/Zc:twoPhase-" ] + cflags_cc = [ "/Zc:twoPhase-", "/std:c++latest" ] - + include_dirs = [ "../.." ] } diff --git a/tools/v8windbg/base/dbgext.h b/tools/v8windbg/base/dbgext.h @@ -217,7 +204,7 @@ index 8b36a8f361..f8d9f0d64e 100644 @@ -9,6 +9,7 @@ #error Unicode not defined #endif - + +#include #include #include @@ -229,13 +216,13 @@ index f7d78c5dd3..1c70e54e7a 100644 @@ -5,10 +5,11 @@ #ifndef V8_TOOLS_V8WINDBG_SRC_V8_DEBUG_HELPER_INTEROP_H_ #define V8_TOOLS_V8WINDBG_SRC_V8_DEBUG_HELPER_INTEROP_H_ - + -#include - +#include +#include #include - + +#include #include #include @@ -247,7 +234,7 @@ index 8855d6ffbc..ed2b0f62e9 100644 @@ -9,6 +9,7 @@ #error Unicode not defined #endif - + +#include #include #include diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json index 54a25d578610da..2478ba4f9e1e57 100644 --- a/ports/v8/vcpkg.json +++ b/ports/v8/vcpkg.json @@ -1,7 +1,6 @@ { "name": "v8", - "version-string": "9.0.257.17", - "port-version": 1, + "version-string": "9.1.269.39", "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", "supports": "!(arm | arm64 | uwp | osx)", diff --git a/versions/baseline.json b/versions/baseline.json index 183d12ab0ab79f..ae1e0c71db8ebd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6541,8 +6541,8 @@ "port-version": 1 }, "v8": { - "baseline": "9.0.257.17", - "port-version": 1 + "baseline": "9.1.269.39", + "port-version": 0 }, "valijson": { "baseline": "2018-11-17-1", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index 06644fc6763b11..c89d116cf05a51 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1cd6a72ff77695151205fb2d2e55ed93d2f4193d", + "version-string": "9.1.269.39", + "port-version": 0 + }, { "git-tree": "4c95acd67f1f8b99aada4af754b4608c9ee80661", "version-string": "9.0.257.17", From c0c7a75403fa029d4e508d7063c79a9a9ea797dc Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 28 Jul 2021 07:25:52 +0800 Subject: [PATCH 0220/1858] [qwt] update to 6.2.0 (#19075) * [qwt] update to 6.2.0 * update version * fix request changes * update version * update portfile.cmake * update vsersion * fix CI error * update version --- ports/qwt/CONTROL | 5 ----- ports/qwt/portfile.cmake | 14 +++++++------- ports/qwt/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 2 +- versions/q-/qwt.json | 5 +++++ 5 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 ports/qwt/CONTROL create mode 100644 ports/qwt/vcpkg.json diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL deleted file mode 100644 index 22e6ed9c250568..00000000000000 --- a/ports/qwt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qwt -Version: 6.1.5 -Homepage: https://sourceforge.net/projects/qwt -Description: Qt widgets library for technical applications -Build-Depends: qt5-base[core], qt5-svg, qt5-tools diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake index 1752a25264c5a0..4383d3bd1b5ffc 100644 --- a/ports/qwt/portfile.cmake +++ b/ports/qwt/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO qwt/qwt - REF 6.1.5 - FILENAME "qwt-6.1.5.zip" - SHA512 249634d2032ccc8083e26f1d151b301d6ccfcc3140a2c2c469d77d3d8973bc296872a1cff96e002944c40fa558a9896ca2a0f1a0531169c3c8d0fe2240610266 + REF 6.2.0 + FILENAME "qwt-6.2.0.zip" + SHA512 a3946c6e23481b5a2193819a1c1298db5a069d514ca60de54accb3a249403f5acd778172ae6fae24fae252767b1e58deba524de6225462f1bafd7c947996aae9 ) vcpkg_configure_qmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS CONFIG+=${VCPKG_LIBRARY_LINKAGE} ) @@ -29,8 +29,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() #Install the header files -file(GLOB HEADER_FILES ${SOURCE_PATH}/src/*.h) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(GLOB HEADER_FILES "${SOURCE_PATH}/src/*.h") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qwt/vcpkg.json b/ports/qwt/vcpkg.json new file mode 100644 index 00000000000000..f837b6adbc0627 --- /dev/null +++ b/ports/qwt/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qwt", + "version-semver": "6.2.0", + "description": "qt widgets library for technical applications", + "homepage": "https://sourceforge.net/projects/qwt", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-svg", + "qt5-tools" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ae1e0c71db8ebd..38fa0e26d94bca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5437,7 +5437,7 @@ "port-version": 2 }, "qwt": { - "baseline": "6.1.5", + "baseline": "6.2.0", "port-version": 0 }, "qwtw": { diff --git a/versions/q-/qwt.json b/versions/q-/qwt.json index 91b6d09cd8f7d1..21451b536427ff 100644 --- a/versions/q-/qwt.json +++ b/versions/q-/qwt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7204097fda082c43e704e356702fd77aa3c9a52", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "6d80586d91e987e488367b16a11aa8d8d07205d3", "version-string": "6.1.5", From 550c3698bfa547ffaaeb8d348c3713a8a2a61b70 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 27 Jul 2021 16:58:43 -0700 Subject: [PATCH 0221/1858] [vcpkg] Update tool to 2021-07-26 (#19159) --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index aaaa704416362a..0c006380483a04 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-07-21/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-07-26/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1a17bbfbbeca86..7da7a2021910b0 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -278,8 +278,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-07-21" -vcpkgToolReleaseSha="9d1644c1c34bfd750cad36c47d7997698b0c5c4ff0673f9f39ff5f62f6e351ca32db7991043e7f154aa8ffe8b5180591d78131edf5dc533164d75a60764a8da8" +vcpkgToolReleaseTag="2021-07-26" +vcpkgToolReleaseSha="e5252df535a75e1b776e057811a2913b0508d0a387a781815e353c23d0a33ec8bf8982a121adc6b711243bf0981843a435a0e53facf274ac7c38c3f571c26766" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" From 7376ad6f0f320e68d1cb80389f2d48d4f5ce28c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 28 Jul 2021 02:02:50 +0200 Subject: [PATCH 0222/1858] [many ports] Update KF5 frameworks to 5.84 (#19168) * [kf5*] Update KDE Frameworks to 5.84 * [kf5*] Update versions --- ports/ecm/portfile.cmake | 4 +- ports/ecm/vcpkg.json | 2 +- ports/kf5archive/portfile.cmake | 4 +- ports/kf5archive/vcpkg.json | 2 +- ports/kf5auth/portfile.cmake | 12 ++-- ports/kf5auth/vcpkg.json | 2 +- ports/kf5codecs/portfile.cmake | 7 ++- ports/kf5codecs/vcpkg.json | 2 +- ports/kf5completion/portfile.cmake | 9 +-- ports/kf5completion/vcpkg.json | 3 +- ports/kf5config/portfile.cmake | 9 +-- ports/kf5config/vcpkg.json | 3 +- ports/kf5coreaddons/portfile.cmake | 4 +- ports/kf5coreaddons/vcpkg.json | 3 +- ports/kf5crash/portfile.cmake | 4 +- ports/kf5crash/vcpkg.json | 3 +- ports/kf5dbusaddons/portfile.cmake | 7 ++- ports/kf5dbusaddons/vcpkg.json | 2 +- ports/kf5guiaddons/portfile.cmake | 11 ++-- ports/kf5guiaddons/vcpkg.json | 2 +- ports/kf5holidays/portfile.cmake | 7 ++- ports/kf5holidays/vcpkg.json | 3 +- ports/kf5i18n/portfile.cmake | 16 ++---- ...cmake-failing-with-variable-notfound.patch | 33 ----------- ports/kf5i18n/vcpkg.json | 3 +- ports/kf5itemmodels/portfile.cmake | 9 +-- ports/kf5itemmodels/vcpkg.json | 3 +- ports/kf5itemviews/portfile.cmake | 9 +-- ports/kf5itemviews/vcpkg.json | 3 +- ports/kf5plotting/portfile.cmake | 14 +++-- ports/kf5plotting/vcpkg.json | 3 +- ports/kf5syntaxhighlighting/portfile.cmake | 7 ++- ports/kf5syntaxhighlighting/vcpkg.json | 2 +- ports/kf5widgetsaddons/portfile.cmake | 9 +-- ports/kf5widgetsaddons/vcpkg.json | 3 +- ports/kf5windowsystem/portfile.cmake | 9 +-- ports/kf5windowsystem/vcpkg.json | 2 +- versions/baseline.json | 56 +++++++++---------- versions/e-/ecm.json | 5 ++ versions/k-/kf5archive.json | 5 ++ versions/k-/kf5auth.json | 5 ++ versions/k-/kf5codecs.json | 5 ++ versions/k-/kf5completion.json | 5 ++ versions/k-/kf5config.json | 5 ++ versions/k-/kf5coreaddons.json | 5 ++ versions/k-/kf5crash.json | 5 ++ versions/k-/kf5dbusaddons.json | 5 ++ versions/k-/kf5guiaddons.json | 5 ++ versions/k-/kf5holidays.json | 5 ++ versions/k-/kf5i18n.json | 5 ++ versions/k-/kf5itemmodels.json | 5 ++ versions/k-/kf5itemviews.json | 5 ++ versions/k-/kf5plotting.json | 5 ++ versions/k-/kf5syntaxhighlighting.json | 5 ++ versions/k-/kf5widgetsaddons.json | 5 ++ versions/k-/kf5windowsystem.json | 5 ++ 56 files changed, 217 insertions(+), 159 deletions(-) delete mode 100644 ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 44552bb1604d83..5d07071eba9378 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF v5.81.0 - SHA512 562e99f3368ec5c834dbcbfb055c06da3e3302ac8e03d5d71be9f2fc682bbb02836c009c41777a7f90e4d6d3a4b13412aea29fdba985588b7d59e2dc59c9beb2 + REF v5.84.0 + SHA512 d49397bcf0d49a95c86c9d9a4e653015ee8b3ef1261b2842439bba7ff3363ac06351fa2df4035c2cb36397d2fc64375a14966ada29f231df51ba26d8e196d6ef HEAD_REF master ) diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json index ffa6b3f9a75e46..3f081e37a894ec 100644 --- a/ports/ecm/vcpkg.json +++ b/ports/ecm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ecm", - "version": "5.81.0", + "version": "5.84.0", "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", "homepage": "https://github.com/KDE/extra-cmake-modules" } diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index b9b1177522821c..c9a8e499dcb800 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/karchive - REF v5.81.0 - SHA512 f0dee63016f67e385f538ee82679fe7a5ca2c876cfb71d83a808107df8c1ec58ceceb8eb8d7422b0b0a08359dc7a00474b6a7b18be9d33c557c102d8492d1d57 + REF v5.84.0 + SHA512 82926f62424446df0f4fc300f57ae9bd5baf8e13da2ce4135ac56c0c52a0307bffb06f84ac7e8e658e96ace2ae3d530f27e232061284ac87271404f218e9fdd4 HEAD_REF master ) diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index e12c4c5a79fda8..9cc00aa03d0561 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5archive", - "version": "5.81.0", + "version": "5.84.0", "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "dependencies": [ diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 7dc326825885f4..439a6364b032f0 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kauth - REF v5.81.0 - SHA512 bad803867dadc9ff89531e80793bbe6018afb83309f91890f38b40908cea3c886f33f67ddf64e6f42c34df952ab33369d968eda774cece66012a9d66b3fd88a8 + REF v5.84.0 + SHA512 9f08f5e7de240c100e7ea6fcd6c71947cacfafbf0631f7e441a64ef36b0d51fa097b8ccc164c7b20441524a7211d84f9fc62d9a2bc62342e26938c133faf0940 HEAD_REF master ) @@ -10,12 +10,14 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_DATAROOTDIR=data + MAYBE_UNUSED_VARIABLES + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + ) vcpkg_cmake_install() diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index f6d987188de60f..bbe7707b60430b 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5auth", - "version": "5.81.0", + "version": "5.84.0", "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 5a64fd077289bb..8090f7f3a62cd1 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcodecs - REF v5.81.0 - SHA512 65db534f32b81b8b10840233981e8a790a8fe17ddb9e64304f2ea8b817b4125ae737574a7235aa20b8b3766bd4c59bb8fb49dafa19a8a89160ab1e06d7d333b5 + REF v5.84.0 + SHA512 77f27883f588e9f4bd5458e4e4a596c494ff4fc0a7230ac757926db13d69f010a72f84d828ae83f48e5019ea96da58251c190dd6d38408f64089ac42501b7439 HEAD_REF master ) @@ -14,10 +14,11 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS + -DBUILD_TESTING=OFF + MAYBE_UNUSED_VARIABLES -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index 8b6aa288b64bd6..cf86de687368a4 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5codecs", - "version": "5.81.0", + "version": "5.84.0", "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index e00132253416db..281778d95a66e3 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcompletion - REF v5.81.0 - SHA512 eedb843ffc29bd35ef758d47ea7650d4485c33552916e09ca6d0e62b35f96bf29c0e903bd318e6703b8a14d045e9e36ee60ac6d505340cf7bfefaa8f1e8f7b05 + REF v5.84.0 + SHA512 1aee65de9e8aa83274d772afcce764ab800e94cffb8ab203c53ffdb944c53e46115afe4148dadf777c0a1afc815b9382e4e319ba09e266b4487405307d838322 HEAD_REF master ) @@ -11,11 +11,12 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF + MAYBE_UNUSED_VARIABLES -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF - -DBUILD_DESIGNERPLUGIN=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index 34f601960c474b..b94ab097b6c210 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5completion", - "version": "5.81.0", - "port-version": 1, + "version": "5.84.0", "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 0d6853b855155a..2eac560f062000 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kconfig - REF v5.81.0 - SHA512 148bdca3f3548b892abacf25f82d2bb4a3eb7a3dc559b30722e7e12a8fdcb240ff86d5e56396efd17d65d40a7b7dd9568a8d204ac48c073b132fe3e93a903c98 + REF v5.84.0 + SHA512 54d28ce5dae8c3b40c338d7aa848296b0aa4f56f94ca32d123df182e34e50c9969bdc1672c28e5412f7df7d94ff4305377dbf42c05c69965c023af762cfc29bf HEAD_REF master ) @@ -11,10 +11,11 @@ vcpkg_configure_cmake( PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS + -DBUILD_TESTING=OFF + MAYBE_UNUSED_VARIABLES -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF + -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 734d45abadf768..8e653e013f9e3a 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5config", - "version": "5.81.0", - "port-version": 1, + "version": "5.84.0", "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 9e52b86be3669e..09c9baf8419b88 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcoreaddons - REF v5.81.0 - SHA512 438b2a6fbb040e9442bdfd7f29388165ed8df3bbb676d93efd86ccaa2106c9b5d3b9561eecb10fb14f54d46dac8f0c969c424ec9e351e18ee2c742de418596b9 + REF v5.84.0 + SHA512 58a802d03bea135c192265651540f9f87066b20ee4af620a94a874ec3992c5e734d1ab1e4ccb082de97389fa3479fd3672ec586c3dd36c9b4a5422c7be98d119 ) vcpkg_configure_cmake( diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index ed61f11e1aeee3..7308ce9949d20d 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5coreaddons", - "version": "5.81.0", - "port-version": 1, + "version": "5.84.0", "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 4f2588c4d07010..96837708e635c6 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcrash - REF v5.81.0 - SHA512 29ab36a46f4dbbe104c2c8d1ce0d4f2f43399c7fb3cbc34210d52e51c8b6ef6261890ebc36d9010c2aea9b90867a07732a4736176fa008c85a009ebd6582dd32 + REF v5.84.0 + SHA512 db37a481e0d34e0024cabd77c22680171fa383ea300c56c73f807380fd818263d27f36fb012fc6604b462dbf9374db39bab94c4dc2c3bff488ac9812d01eb2dd HEAD_REF master ) diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 88afb5166c9e06..3e60efd0de7b73 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5crash", - "version": "5.81.0", - "port-version": 1, + "version": "5.84.0", "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "supports": "linux", diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index 92aab59d782358..3f29ad5a301ba2 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kdbusaddons - REF v5.81.0 - SHA512 fce5b646199ee895f2c8ed17382cb4b7f0265a87558ba3b7bb094cbfa92327b8fb910e4af95f1d3793c1908151eefd59783b31fe43c0743ea872632bb78d98f0 + REF v5.84.0 + SHA512 cef640da611ead5fc002f365a9918db1bebe494d7dc456dca8a239873b7f53c1aee81d122cbc15d88cb1deeae1ab7db8c2a79a2847deb87f29c5f1c19a46ab46 HEAD_REF master ) @@ -10,10 +10,11 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS + -DBUILD_TESTING=OFF + MAYBE_UNUSED_VARIABLES -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index 38c4476d842acd..e2739f505b10b4 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5dbusaddons", - "version": "5.81.0", + "version": "5.84.0", "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index 16cc5b0e7fa0ae..fea154b3e2c9c0 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kguiaddons - REF v5.81.0 - SHA512 67e909f4d1fab700e087d6e5dad8ac8652ff2a42b64cf9f65be87be9ffb30324c074477af7c762689f5725d3f661e09c2f06d22eacd6870a543fb6d1e21ee9b6 + REF v5.84.0 + SHA512 e5905c0aa5343ce3d4cd3765cb81390fc89fb78aec3c8de8b31d1dada8074d04f549ff785f3988498d2e274d7cb08a35a83ba031d18562049e6ca41d18ea52ee HEAD_REF master ) @@ -20,12 +20,13 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 6058cd96e5fc3f..6e976e621aad91 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5guiaddons", - "version": "5.81.0", + "version": "5.84.0", "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 891b2aea165ce8..332fff5d6f4684 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kholidays - REF v5.81.0 - SHA512 cb8c82b239ce3736ec8554fb201506bef40116c2ddcc2efcbdb718aaad8b283e4f7d6b005770d8e2a3640efdfef5a4065365e974062b53a7206c5f08723c5626 + REF v5.84.0 + SHA512 2e4813b3ca36694e1231b41372baf9a29f80ba44f28525863cedda97ebb766a5d04dbb65422186d97ec753768bd772081fbaf1a91a33ab4556acbea6eb2510f5 HEAD_REF master ) @@ -11,10 +11,11 @@ vcpkg_configure_cmake( PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS + -DBUILD_TESTING=OFF + MAYBE_UNUSED_VARIABLES -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index d0582f1a69fe70..8102c2a2746d21 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5holidays", - "version": "5.81.0", - "port-version": 1, + "version": "5.84.0", "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 17f590d3ecef9c..5b4b0a6015fdd0 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -1,13 +1,8 @@ -if(NOT VCPKG_TARGET_IS_WINDOWS) - list(APPEND PATCHES "prevent-cmake-failing-with-variable-notfound.patch") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ki18n - REF v5.81.0 - SHA512 8e14c429671a51b9b231f2a965f2368b019592a29a04a9e192da25a8a963042fe7478323508c097f73e2c328fd4742f8808fe68ea439e00e6667414d7f75be3e - PATCHES ${PATCHES} + REF v5.84.0 + SHA512 611481b0d5f387b6e1201c1d38e050bd6c956607d059679c68f39d8560cdde666709f5aa1ae770e200fb81e902da85160eb3eeaf5c0bdb02c0ff13782df1d907 ) vcpkg_find_acquire_program(PYTHON3) @@ -17,12 +12,13 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DPYTHON_EXECUTABLE=${PYTHON3} + MAYBE_UNUSED_VARIABLES + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch b/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch deleted file mode 100644 index 35741800d715cc..00000000000000 --- a/ports/kf5i18n/prevent-cmake-failing-with-variable-notfound.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6195ac786afd3fb8d74df4db86fdddd966661ec9 Mon Sep 17 00:00:00 2001 -From: Dawid Wrobel -Date: Mon, 1 Mar 2021 20:41:12 +0000 -Subject: [PATCH] Prevent CMake failing with "variable NOTFOUND" - -Since the LibIntl_LIBRARIES has value only on some platforms, CMake can -throw an error complaining about using a NOTFOUND variable. ---- - src/CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 92bfabf..46d2c76 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -41,8 +41,12 @@ target_include_directories(KF5I18n INTERFACE "$ Date: Wed, 28 Jul 2021 03:04:22 +0300 Subject: [PATCH 0223/1858] [vcpkg] Pass AUTHORIZATION_TOKEN to the vcpkg_download_distfile() command which retrieves VCPKG_HEAD_VERSION (#19077) --- scripts/cmake/vcpkg_from_github.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index a9373baf592591..68c4e23700cef5 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -153,6 +153,7 @@ function(vcpkg_from_github) vcpkg_download_distfile(archive_version URLS "${github_api_url}/repos/${org_name}/${repo_name}/git/refs/heads/${arg_HEAD_REF}" FILENAME "${downloaded_file_name}.version" + ${headers_param} SKIP_SHA512 ALWAYS_REDOWNLOAD ) From fd3270f76575b9aaa1a9cf6ce564ef49e527089c Mon Sep 17 00:00:00 2001 From: pradeep Date: Thu, 29 Jul 2021 00:36:21 +0530 Subject: [PATCH 0224/1858] [forge] port release update to v1.0.8 (#19166) * Update forge port to v1.0.8 fix release * Update baseline version for forge port --- ports/forge/cmake_config.patch | 36 ++-------------------------------- ports/forge/portfile.cmake | 4 ++-- ports/forge/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/forge.json | 5 +++++ 5 files changed, 11 insertions(+), 38 deletions(-) diff --git a/ports/forge/cmake_config.patch b/ports/forge/cmake_config.patch index eb77265a0e70fc..4775ec0d156d0e 100644 --- a/ports/forge/cmake_config.patch +++ b/ports/forge/cmake_config.patch @@ -1,40 +1,8 @@ diff --git a/CMakeModules/ForgeConfig.cmake.in b/CMakeModules/ForgeConfig.cmake.in -index e4c7737..5a3b000 100644 +index 6fb18ac..5a3b000 100644 --- a/CMakeModules/ForgeConfig.cmake.in +++ b/CMakeModules/ForgeConfig.cmake.in -@@ -57,16 +57,24 @@ if (NOT TARGET Forge::forge AND - endif () - - if (TARGET Forge::forge) -- get_property(config TARGET Forge::forge PROPERTY IMPORTED_CONFIGURATIONS) -- if(NOT config) -- set(config "NOCONFIG") -+ get_property(configs TARGET Forge::forge PROPERTY IMPORTED_CONFIGURATIONS) -+ if(NOT configs) -+ set(configs "NOCONFIG") - endif() -- get_property(loc TARGET Forge::forge PROPERTY IMPORTED_LOCATION_${config}) -+ foreach(config IN LISTS configs) -+ get_property(loc TARGET Forge::forge PROPERTY IMPORTED_LOCATION_${config}) -+ -+ # break if any of the imported configurations exist. All configs write to the same -+ # location so they are not working as CMake intended. Its fine for single config -+ # installers like ours. -+ if(EXISTS ${loc}) -+ set(Forge_BINARY_EXISTS TRUE) -+ break() -+ endif() -+ endforeach() - endif () - --if ((TARGET Forge::forge AND EXISTS ${loc}) -- OR -- TARGET forge) -+if ((TARGET Forge::forge AND Forge_BINARY_EXISTS) OR TARGET forge) - set(Forge_FOUND ON) - if (TARGET forge AND NOT TARGET Forge::forge) - add_library(Forge::forge ALIAS forge) -@@ -75,3 +83,22 @@ if ((TARGET Forge::forge AND EXISTS ${loc}) +@@ -83,3 +83,22 @@ if ((TARGET Forge::forge AND Forge_BINARY_EXISTS) OR TARGET forge) else () set(Forge_FOUND OFF) endif () diff --git a/ports/forge/portfile.cmake b/ports/forge/portfile.cmake index bdbd5ee8067905..956de3d37472e4 100644 --- a/ports/forge/portfile.cmake +++ b/ports/forge/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arrayfire/forge - REF v1.0.7 - SHA512 d341d5c6bdccf7d2f085162d1d8209b0b28d73b8a9f3173546b26f06bf8e422b3fdf1cfbaa7d122ea75cee5cf5f6bb6dbd2bffc10d8e0c336b5b8695c39f7b54 + REF v1.0.8 + SHA512 08e5eb89d80f7fa3310f0eb37481492b5c1dfff00b33c308169862d8b25cf93ad1d9c0db78667c0207a7f6f8ca4046c196bd3a987af839ea1864b49c738ee8e3 HEAD_REF master PATCHES cmake_config.patch ) diff --git a/ports/forge/vcpkg.json b/ports/forge/vcpkg.json index 52d62400b15828..afd8df8d39098f 100644 --- a/ports/forge/vcpkg.json +++ b/ports/forge/vcpkg.json @@ -1,6 +1,6 @@ { "name": "forge", - "version-semver": "1.0.7", + "version-semver": "1.0.8", "description": "An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.", "homepage": "https://github.com/arrayfire/forge", "supports": "x64", diff --git a/versions/baseline.json b/versions/baseline.json index a5bfbc3b0d6c39..73dffedbc9450e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2093,7 +2093,7 @@ "port-version": 0 }, "forge": { - "baseline": "1.0.7", + "baseline": "1.0.8", "port-version": 0 }, "fp16": { diff --git a/versions/f-/forge.json b/versions/f-/forge.json index a74daa624e93ad..dc16eafae943d2 100644 --- a/versions/f-/forge.json +++ b/versions/f-/forge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d67247c4d974ea6d75d0918865db0c7842a5ec66", + "version-semver": "1.0.8", + "port-version": 0 + }, { "git-tree": "ca5513200ad2efb90936120fdfc7ea8bb6730f9d", "version-semver": "1.0.7", From 27c8d137367796af22b87e35ebece347f862f5f7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 28 Jul 2021 21:15:10 +0200 Subject: [PATCH 0225/1858] Add AZP logging markup for versioning errors (#19104) --- .../windows/azure-pipelines.yml | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index ed5a0a405040bf..9b52378b501028 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -47,7 +47,35 @@ jobs: inputs: targetType: inline script: | - ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose + ./vcpkg.exe --feature-flags=versions x-ci-verify-versions --verbose | + ForEach-Object -Begin { + $long_error = '' + } -Process { + if ($long_error -ne '' -and $_ -match '^$|^ ') { + # Extend multi-line message + $long_error = -join($long_error, "%0D%0A", $_ -replace '^ ','' ` + -replace '(git add) [^ ]*\\ports\\([^ ]*)', '$1 ports/$2' ) + } else { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + $long_error = '' + } + if ($_ -match '^Error: ') { + # Start multi-line message + $long_error = $_ -replace '^Error: ', '##vso[task.logissue type=error]' ` + -replace '(^##vso[^\]]*)](.*) [^ ]*\\versions\\(.-)\\(.*.json)(.*)', '$1;sourcepath=versions/$3/$4;linenumber=2]$2 version/$3/$4$5' + } else { + # Normal line + $_ + } + } + } -End { + if ($long_error -ne '') { + # Flush multi-line message + $long_error + } + } pwsh: true - task: PowerShell@2 displayName: 'Report on Disk Space After Build' From deac65a1f085d6c5d12d8af4e4957b3af8609638 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 28 Jul 2021 21:25:26 +0200 Subject: [PATCH 0226/1858] [nghttp2] Update and fixes (#19163) * Format manifest * Update to v1.44.0 * Modernize and fix portfile * Fix usage in static windows triplets * x-add-version --- ports/nghttp2/CONTROL | 4 --- ports/nghttp2/portfile.cmake | 57 ++++++++++++++++++------------------ ports/nghttp2/vcpkg.json | 12 ++++++++ versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 ++++ 5 files changed, 46 insertions(+), 34 deletions(-) delete mode 100644 ports/nghttp2/CONTROL create mode 100644 ports/nghttp2/vcpkg.json diff --git a/ports/nghttp2/CONTROL b/ports/nghttp2/CONTROL deleted file mode 100644 index 7f0bf107d6f8df..00000000000000 --- a/ports/nghttp2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nghttp2 -Version: 1.42.0 -Homepage: https://github.com/nghttp2/nghttp2 -Description: Implementation of the Hypertext Transfer Protocol version 2 in C diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 9ed523648d0bf7..a13769280369e0 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,46 +1,45 @@ -set(LIB_NAME nghttp2) -set(LIB_VERSION 1.42.0) - -set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF v${LIB_VERSION} - SHA512 717494c9aa4eda64414535752df947d62311e7aed5cc6c4936400fcb2c9fc2818923668bcabc3e1bc61154d660f6765dad120e5a113d9eee3e934d66ee63a406 + REF b799b063f882cc97f8484e95b41d0326260d9b93 # v1.44.0 + SHA512 8e4a5d0b146606d1150b43c539244f615540bc25eab30bf67c673cccecdb3d4a02d99fb0136d81dc7ad4a579d9b38e62d91b1431884a8891c0d325c036cc4073 HEAD_REF master ) -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(ENABLE_STATIC_LIB ON) - set(ENABLE_SHARED_LIB OFF) -else() - set(ENABLE_STATIC_LIB OFF) - set(ENABLE_SHARED_LIB ON) -endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" ENABLE_STATIC_CRT) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIB) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_LIB_ONLY=ON -DENABLE_ASIO_LIB=OFF - -DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB} - -DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB} + "-DENABLE_STATIC_CRT=${ENABLE_STATIC_CRT}" + "-DENABLE_STATIC_LIB=${ENABLE_STATIC_LIB}" + "-DENABLE_SHARED_LIB=${ENABLE_SHARED_LIB}" ) - -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/doc" +) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(APPEND "${CURRENT_PACKAGES_DIR}/include/nghttp2/nghttp2ver.h" [[ +#ifndef NGHTTP2_STATICLIB +# define NGHTTP2_STATICLIB +#endif +]]) endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json new file mode 100644 index 00000000000000..6528683f293d74 --- /dev/null +++ b/ports/nghttp2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "nghttp2", + "version": "1.44.0", + "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", + "homepage": "https://github.com/nghttp2/nghttp2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 73dffedbc9450e..6ff02a525710b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4357,7 +4357,7 @@ "port-version": 1 }, "nghttp2": { - "baseline": "1.42.0", + "baseline": "1.44.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 06c7f4ee39aa0f..4cd034bb3dae0f 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d98b71b7948db8173a563483081700e706268b0", + "version": "1.44.0", + "port-version": 0 + }, { "git-tree": "c962462a3cfe855132c4b1d565bc4e3c4a67797d", "version-string": "1.42.0", From e9092a270297b56d531fbe49f1fa9e1d15b2cedf Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 28 Jul 2021 13:18:41 -0700 Subject: [PATCH 0227/1858] [inja] Update to 3.3.0. (#19208) * [inja] Update to 3.3.0. * Fix version. --- ports/inja/CONTROL | 5 ----- ports/inja/portfile.cmake | 4 ++-- ports/inja/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/i-/inja.json | 5 +++++ 5 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 ports/inja/CONTROL create mode 100644 ports/inja/vcpkg.json diff --git a/ports/inja/CONTROL b/ports/inja/CONTROL deleted file mode 100644 index 3a7dacbefb0e0b..00000000000000 --- a/ports/inja/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: inja -Version: 3.2.0 -Homepage: https://github.com/pantor/inja -Description: Inja - A Template Engine for Modern C++ -Build-Depends: nlohmann-json diff --git a/ports/inja/portfile.cmake b/ports/inja/portfile.cmake index e3e660d7a4e150..7b613808c1025d 100644 --- a/ports/inja/portfile.cmake +++ b/ports/inja/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pantor/inja - REF 15b0b7f5e33e9fb1471d35218d2f66511f1ec4b7 # v3.2.0 - SHA512 3eb6c0583b8fe84269649dadc5f3651b571af773a30e4292e56f36e979a70eea2391eb226a48c5eeae70a6e3933a663c74e94128c80e5e14c153dd6fc37c45b8 + REF 2d515078c647457436556763aca8d4bf7d11d5e8 # v3.3.0 + SHA512 4e2f63297eede016772e4915cacfec57b49633f2a5fb80862bbd091d274f688ea1fbe958f97699e930fdee9f390ce0637513f4265190c171104d9eae9b12a59d HEAD_REF master ) diff --git a/ports/inja/vcpkg.json b/ports/inja/vcpkg.json new file mode 100644 index 00000000000000..55c71f18d32166 --- /dev/null +++ b/ports/inja/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "inja", + "version": "3.3.0", + "description": "Inja - A Template Engine for Modern C++", + "homepage": "https://github.com/pantor/inja", + "dependencies": [ + "nlohmann-json" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6ff02a525710b0..2c9ffc9422f588 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2705,7 +2705,7 @@ "port-version": 0 }, "inja": { - "baseline": "3.2.0", + "baseline": "3.3.0", "port-version": 0 }, "intel-ipsec": { diff --git a/versions/i-/inja.json b/versions/i-/inja.json index 21e623e578fa5a..451bc040565539 100644 --- a/versions/i-/inja.json +++ b/versions/i-/inja.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9435743a06369f745532f07b596e04481a4758a7", + "version": "3.3.0", + "port-version": 0 + }, { "git-tree": "9cd8994caab379ca93bdd59e7fc652414900ee72", "version-string": "3.2.0", From 1a18a1c676799607004e2301b71e2346478bb201 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 28 Jul 2021 15:28:30 -0500 Subject: [PATCH 0228/1858] [pistache] fix install (#19206) * [pistache] fix install * fix ci.baseline.txt, versions Co-authored-by: nicole mazzuca --- ports/pistache/disable-warnings.patch | 12 --------- ports/pistache/fix-debug-empty.patch | 36 --------------------------- ports/pistache/portfile.cmake | 13 ++-------- ports/pistache/vcpkg.json | 7 ++++-- scripts/ci.baseline.txt | 8 ------ versions/baseline.json | 2 +- versions/p-/pistache.json | 5 ++++ 7 files changed, 13 insertions(+), 70 deletions(-) delete mode 100644 ports/pistache/disable-warnings.patch delete mode 100644 ports/pistache/fix-debug-empty.patch diff --git a/ports/pistache/disable-warnings.patch b/ports/pistache/disable-warnings.patch deleted file mode 100644 index 717937ff8bd980..00000000000000 --- a/ports/pistache/disable-warnings.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e051efa..9d65174 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,7 +13,6 @@ project (pistache - - include(GNUInstallDirs) - --add_compile_options(-Wall -Wconversion -pedantic -Wextra -Wno-missing-field-initializers) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) - - include(CheckAtomic) diff --git a/ports/pistache/fix-debug-empty.patch b/ports/pistache/fix-debug-empty.patch deleted file mode 100644 index f6a7b97a0cbd8d..00000000000000 --- a/ports/pistache/fix-debug-empty.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9aeed1e..7316732 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -48,12 +48,12 @@ if (BUILD_SHARED_LIBS) - add_library(pistache_shared SHARED $) - target_link_libraries(pistache_shared PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) - target_include_directories(pistache_shared INTERFACE ${PISTACHE_INCLUDE}) --endif () -+else () - - add_library(pistache_static STATIC $) - target_link_libraries(pistache_static PRIVATE Threads::Threads ${CMAKE_REQUIRED_LIBRARIES}) - target_include_directories(pistache_static INTERFACE ${PISTACHE_INCLUDE}) -- -+endif() - if (PISTACHE_USE_SSL) - target_compile_definitions(pistache PUBLIC PISTACHE_USE_SSL) - target_compile_definitions(pistache_static PUBLIC PISTACHE_USE_SSL) -@@ -72,8 +72,15 @@ if (BUILD_SHARED_LIBS) - OUTPUT_NAME ${Pistache_OUTPUT_NAME}-${VERSION} - SOVERSION ${SONAME_VERSION_MAJOR}.${SONAME_VERSION_MINOR} - ) --endif () -+else () - - set_target_properties(pistache_static PROPERTIES - OUTPUT_NAME ${Pistache_OUTPUT_NAME} - ) -+endif() -+install( -+ TARGETS pistache -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) diff --git a/ports/pistache/portfile.cmake b/ports/pistache/portfile.cmake index 9c50d2f00d60be..089814ed37db80 100644 --- a/ports/pistache/portfile.cmake +++ b/ports/pistache/portfile.cmake @@ -8,23 +8,14 @@ vcpkg_from_github( REF 9dc080b9ebbe6fc1726b45e9db1550305938313e #2021-03-31 SHA512 b55c395fb98af85317590ed2502564af5e92e30a35618132568c6ab589a6d0971570ad20ddbd1f49d9dd8cf54692866c69cfc1350c6fdccf9efb039aacf153b4 HEAD_REF master - PATCHES - fix-debug-empty.patch - disable-warnings.patch ) -vcpkg_configure_cmake( +vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) +vcpkg_install_meson() -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/RapidJSON) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pistache/vcpkg.json b/ports/pistache/vcpkg.json index 0cac84c446f3ea..d627fc301cadaf 100644 --- a/ports/pistache/vcpkg.json +++ b/ports/pistache/vcpkg.json @@ -1,8 +1,11 @@ { "name": "pistache", "version-date": "2021-03-31", - "port-version": 1, + "port-version": 2, "description": "Pistache is a modern and elegant HTTP and REST framework for C++. It is entirely written in pure-C++11 and provides a clear and pleasant API", "homepage": "https://github.com/oktal/pistache", - "supports": "linux" + "supports": "linux", + "dependencies": [ + "rapidjson" + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9fd0dd71c12db3..fc573d8a379968 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1214,14 +1214,6 @@ pfring:x64-osx=fail pfring:x64-linux=fail physx:arm64-windows=fail piex:x64-osx=fail -pistache:arm64-windows=fail -pistache:arm-uwp=fail -pistache:x64-osx=fail -pistache:x64-uwp=fail -pistache:x64-windows=fail -pistache:x64-windows-static=fail -pistache:x64-windows-static-md=fail -pistache:x86-windows=fail pixel:x64-uwp=fail pixel:x64-windows=fail pixel:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2c9ffc9422f588..ac6056a8207b7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4890,7 +4890,7 @@ }, "pistache": { "baseline": "2021-03-31", - "port-version": 1 + "port-version": 2 }, "pixel": { "baseline": "0.3-1", diff --git a/versions/p-/pistache.json b/versions/p-/pistache.json index bfdcc2db1e05c2..e7538a69397a27 100644 --- a/versions/p-/pistache.json +++ b/versions/p-/pistache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8c089b0eec0784be71fb4347dbd583c4aaeb0d8", + "version-date": "2021-03-31", + "port-version": 2 + }, { "git-tree": "c6b15d3a79abbfb78408d1f49e8b976bcb9003f2", "version-date": "2021-03-31", From 36a604fff4be6740e21e2e424d52240c467fdea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 29 Jul 2021 12:51:34 +0800 Subject: [PATCH 0229/1858] [vcpkg baseline][easyhook] Remove mismatch prebuild library after build (#19216) * [easyhook] Remove mismatch prebuild library after build * version * update baseline * Update ports/easyhook/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/easyhook/vcpkg.json * Update versions/e-/easyhook.json * Update versions/e-/easyhook.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/easyhook/CONTROL | 5 ---- ports/easyhook/portfile.cmake | 48 ++++++++++++++++++++++++++--------- ports/easyhook/vcpkg.json | 8 ++++++ scripts/ci.baseline.txt | 7 ----- versions/baseline.json | 2 +- versions/e-/easyhook.json | 5 ++++ 6 files changed, 50 insertions(+), 25 deletions(-) delete mode 100644 ports/easyhook/CONTROL create mode 100644 ports/easyhook/vcpkg.json diff --git a/ports/easyhook/CONTROL b/ports/easyhook/CONTROL deleted file mode 100644 index 077a5fb530610b..00000000000000 --- a/ports/easyhook/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: easyhook -Version: 2.7.6789.0 -Homepage: https://github.com/EasyHook/EasyHook -Description: This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10. -Supports: windows \ No newline at end of file diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index 2b142cd39eec0a..983c4a5099b251 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -1,12 +1,6 @@ -if (NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "easyhook only support windows.") -endif() - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "easyhook can only be built as dynamic library.") -endif() +vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP" ON_ARCH "arm" ON_LIBRARY_LINKAGE "static") -message(".Net framework 4.0 is required, please install it before install easyhook.") +message(WARNING ".Net framework 4.0 is required, please install it before install easyhook.") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -17,20 +11,50 @@ vcpkg_from_github( PATCHES fix-build.patch ) +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(BUILD_ARCH "Win32") +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(BUILD_ARCH "x64") +else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") +endif() + vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH EasyHook.sln TARGET EasyHookDll RELEASE_CONFIGURATION "netfx4-Release" DEBUG_CONFIGURATION "netfx4-Debug" + PLATFORM ${BUILD_ARCH} ) +# Remove the mismatch rebuild library +if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x64.LIB") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x64.LIB") + endif() +elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/AUX_ULIB_x86.LIB") + endif() + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/AUX_ULIB_x86.LIB") + endif() +endif() + # These libraries are useless, so remove. -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/EasyHook.dll ${CURRENT_PACKAGES_DIR}/bin/EasyHook.pdb) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.dll ${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.pdb) +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/bin/EasyHook.pdb") +endif() +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/EasyHook.pdb") +endif() # Install includes -file(INSTALL ${SOURCE_PATH}/Public/easyhook.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/easyhook) +file(INSTALL "${SOURCE_PATH}/Public/easyhook.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/easyhook") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/easyhook RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json new file mode 100644 index 00000000000000..bac2a88d414412 --- /dev/null +++ b/ports/easyhook/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "easyhook", + "version": "2.7.6789.0", + "port-version": 1, + "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", + "homepage": "https://github.com/EasyHook/EasyHook", + "supports": "windows & !(static | arm | uwp)" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fc573d8a379968..5dd02bbb33a4e7 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -247,13 +247,6 @@ duilib:x64-uwp=fail duktape:x64-osx=skip eastl:arm-uwp=fail -easyhook:arm64-windows=fail -easyhook:arm-uwp=fail -easyhook:x64-linux=fail -easyhook:x64-osx=fail -easyhook:x64-uwp=fail -easyhook:x64-windows-static=fail -easyhook:x64-windows-static-md=fail easyloggingpp:arm-uwp=fail easyloggingpp:x64-uwp=fail eathread:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index ac6056a8207b7e..08d017fad43eea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1810,7 +1810,7 @@ }, "easyhook": { "baseline": "2.7.6789.0", - "port-version": 0 + "port-version": 1 }, "easyloggingpp": { "baseline": "9.96.7-1", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index 044a1539e7a0b4..70e323a8570bdf 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e427f42cec56130de81333fda405afabc88c9e82", + "version": "2.7.6789.0", + "port-version": 1 + }, { "git-tree": "cf87554bbdd4736b3b64210e7662d6bbe3d72b2a", "version-string": "2.7.6789.0", From 7b5676a5154bca372028fc478e4b0e24e3d97038 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Thu, 29 Jul 2021 11:47:35 -0500 Subject: [PATCH 0230/1858] [rollup] 2021-07-26 (#19157) * [rollup:2021-07-26 1/6] PR #18783 (@strega-nil) [scripts-audit] vcpkg_copy_tools and friends * [rollup:2021-07-26 2/6] PR #18898 (@dg0yt) [vcpkg] Fix toolchain compatibility with cmake < 3.15 * [rollup:2021-07-26 3/6] PR #18980 (@strega-nil) [cmake-guidelines] Minor update, for `if()` * [rollup:2021-07-26 4/6] PR #18981 (@strega-nil) [scripts-audit] vcpkg_check_linkage * [rollup:2021-07-26 5/6] PR #19158 (@Hoikas) [vcpkg.cmake] Fix variable case. * [rollup:2021-07-26 6/6] PR #18839 [scripts-audit] z_vcpkg_get_cmake_vars Co-authored-by: nicole mazzuca --- docs/maintainers/cmake-guidelines.md | 81 +++++++--- .../internal/vcpkg_internal_get_cmake_vars.md | 31 ---- .../internal/z_vcpkg_get_cmake_vars.md | 36 +++++ docs/maintainers/portfile-functions.md | 3 +- .../ports/vcpkg-cmake/vcpkg_cmake_get_vars.md | 31 ++++ docs/regenerate.ps1 | 2 +- ports/ffmpeg/portfile.cmake | 5 +- ports/ffmpeg/vcpkg.json | 6 +- .../vcpkg-cmake/cmake_get_vars/CMakeLists.txt | 148 ++++++++++++++++++ ports/vcpkg-cmake/portfile.cmake | 2 + ports/vcpkg-cmake/vcpkg-port-config.cmake | 1 + ports/vcpkg-cmake/vcpkg.json | 3 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 37 +++-- ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake | 61 ++++++++ scripts/buildsystems/vcpkg.cmake | 51 +++--- scripts/cmake/vcpkg_build_make.cmake | 7 +- scripts/cmake/vcpkg_check_linkage.cmake | 32 ++-- .../vcpkg_clean_executables_in_bin.cmake | 53 +++---- scripts/cmake/vcpkg_configure_cmake.cmake | 27 ++-- scripts/cmake/vcpkg_configure_make.cmake | 7 +- scripts/cmake/vcpkg_configure_meson.cmake | 7 +- scripts/cmake/vcpkg_copy_pdbs.cmake | 24 +-- .../cmake/vcpkg_copy_tool_dependencies.cmake | 46 +++--- scripts/cmake/vcpkg_copy_tools.cmake | 40 ++--- .../cmake/vcpkg_internal_get_cmake_vars.cmake | 68 -------- scripts/cmake/z_vcpkg_get_cmake_vars.cmake | 65 ++++++++ scripts/ports.cmake | 2 +- versions/baseline.json | 6 +- versions/f-/ffmpeg.json | 5 + versions/v-/vcpkg-cmake.json | 5 + 30 files changed, 603 insertions(+), 289 deletions(-) delete mode 100644 docs/maintainers/internal/vcpkg_internal_get_cmake_vars.md create mode 100644 docs/maintainers/internal/z_vcpkg_get_cmake_vars.md create mode 100644 docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md create mode 100644 ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt create mode 100644 ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake delete mode 100644 scripts/cmake/vcpkg_internal_get_cmake_vars.cmake create mode 100644 scripts/cmake/z_vcpkg_get_cmake_vars.cmake diff --git a/docs/maintainers/cmake-guidelines.md b/docs/maintainers/cmake-guidelines.md index 77cdf737204148..c0bd5b6a081ff8 100644 --- a/docs/maintainers/cmake-guidelines.md +++ b/docs/maintainers/cmake-guidelines.md @@ -35,7 +35,7 @@ We hope that they will make both forwards and backwards compatibility easier. Always check for `ARGN` or `arg_UNPARSED_ARGUMENTS`. `FATAL_ERROR` when possible, `WARNING` if necessary for backwards compatibility. - All `cmake_parse_arguments` must use `PARSE_ARGV`. -- All `foreach` loops must use `IN LISTS` and `IN ITEMS`. +- All `foreach` loops must use `IN LISTS`, `IN ITEMS`, or `RANGE`. - The variables `${ARGV}` and `${ARGN}` are unreferenced, except in helpful messages to the user. - (i.e., `message(FATAL_ERROR "blah was passed extra arguments: ${ARGN}")`) @@ -45,27 +45,68 @@ We hope that they will make both forwards and backwards compatibility easier. - Exception: `vcpkg.cmake`'s `find_package`. - Scripts in the scripts tree should not be expected to need observable changes as part of normal operation. - - Example violation: `vcpkg_acquire_msys()` has hard-coded packages and versions that need updating over time due to the MSYS project dropping old packages. - - Example exception: `vcpkg_from_sourceforge()` has a list of mirrors which needs maintenance but does not have an observable behavior impact on the callers. -- All variable expansions are in quotes `""`, - except those which are intended to be passed as multiple arguments. - - Example: - ```cmake - set(working_directory "") - if(DEFINED arg_WORKING_DIRECTORY) - set(working_directory "WORKING_DIRECTORY" "${arg_WORKING_DIRECTORY}") - endif() - # calls do_the_thing() if NOT DEFINED arg_WORKING_DIRECTORY, - # else calls do_the_thing(WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}") - do_the_thing(${working_directory}) - ``` + - Example violation: `vcpkg_acquire_msys()` has hard-coded packages and versions + that need updating over time due to the MSYS project dropping old packages. + - Example exception: `vcpkg_from_sourceforge()` has a list of mirrors which + needs maintenance, but does not have an observable behavior impact on the callers. +- Rules for quoting: there are three kinds of arguments in CMake - + unquoted (`foo(BAR)`), quoted (`foo("BAR")`), and bracketed (`foo([[BAR]])`). + Follow these rules to quote correctly: + - If an argument contains a variable expansion `${...}`, + it must be quoted. + - Exception: a "splat" variable expansion, when one variable will be + passed to a function as multiple arguments. In this case, the argument + should simply be `${foo}`: + ```cmake + vcpkg_list(SET working_directory) + if(DEFINED "arg_WORKING_DIRECTORY") + vcpkg_list(SET working_directory WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}") + endif() + # calls do_the_thing() if NOT DEFINED arg_WORKING_DIRECTORY, + # else calls do_the_thing(WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}") + do_the_thing(${working_directory}) + ``` + - Otherwise, if the argument contains any escape sequences that are not + `\\`, `\"`, or `\$`, that argument must be a quoted argument. + - For example: `"foo\nbar"` must be quoted. + - Otherwise, if the argument contains a `\`, a `"`, or a `$`, + that argument should be bracketed. + - Example: + ```cmake + set(x [[foo\bar]]) + set(y [=[foo([[bar\baz]])]=]) + ``` + - Otherwise, if the argument contains characters that are + not alphanumeric or `_`, that argument should be quoted. + - Otherwise, the argument should be unquoted. + - Exception: arguments to `if()` of type `` should always be quoted: + - Both arguments to the comparison operators - + `EQUAL`, `STREQUAL`, `VERSION_LESS`, etc. + - The first argument to `MATCHES` and `IN_LIST` + - Example: + ```cmake + if("${FOO}" STREQUAL "BAR") # ... + if("${BAZ}" EQUAL "0") # ... + if("FOO" IN_LIST list_variable) # ... + if("${bar}" MATCHES [[a[bcd]+\.[bcd]+]]) # ... + ``` + - For single expressions and for other types of predicates that do not + take ``, use the normal rules. - There are no "pointer" or "in-out" parameters (where a user passes a variable name rather than the contents), except for simple out-parameters. - Variables are not assumed to be empty. If the variable is intended to be used locally, - it must be explicitly initialized to empty with `set(foo "")`. -- All variables expected to be inherited from the parent scope across an API boundary (i.e. not a file-local function) should be documented. Note that all variables mentioned in triplets.md are considered documented. + it must be explicitly initialized to empty with `set(foo "")` if it is a string variable, + and `vcpkg_list(SET foo)` if it is a list variable. +- `set(var)` should not be used. Use `unset(var)` to unset a variable, + `set(var "")` to set it to the empty string, + and `vcpkg_list(SET var)` to set it to the empty list. + _Note: the empty string and the empty list are the same value;_ + _this is a notational difference rather than a difference in result_ +- All variables expected to be inherited from the parent scope across an API boundary + (i.e. not a file-local function) should be documented. + Note that all variables mentioned in triplets.md are considered documented. - Out parameters are only set in `PARENT_SCOPE` and are never read. See also the helper `z_vcpkg_forward_output_variable()` to forward out parameters through a function scope. - `CACHE` variables are used only for global variables which are shared internally among strongly coupled @@ -80,16 +121,14 @@ We hope that they will make both forwards and backwards compatibility easier. and `` _must always be_ less than or equal to ``. - This must be checked by something like: ```cmake - if(start LESS_EQUAL end) - foreach(RANGE start end) + if("${start}" LESS_EQUAL "${end}") + foreach(RANGE "${start}" "${end}") ... endforeach() endif() ``` - All port-based scripts must use `include_guard(GLOBAL)` to avoid being included multiple times. -- `set(var)` should not be used. Use `unset(var)` to unset a variable, - and `set(var "")` to set it to the empty value. _Note: this works for use as a list and as a string_ ### CMake Versions to Require diff --git a/docs/maintainers/internal/vcpkg_internal_get_cmake_vars.md b/docs/maintainers/internal/vcpkg_internal_get_cmake_vars.md deleted file mode 100644 index 63218102f7c56f..00000000000000 --- a/docs/maintainers/internal/vcpkg_internal_get_cmake_vars.md +++ /dev/null @@ -1,31 +0,0 @@ -# vcpkg_internal_get_cmake_vars - -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). - -**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** -Runs a cmake configure with a dummy project to extract certain cmake variables - -## Usage -```cmake -vcpkg_internal_get_cmake_vars( - [OUTPUT_FILE ] - [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -) -``` - -## Parameters -### OPTIONS -Additional options to pass to the test configure call - -### OUTPUT_FILE -Variable to return the path to the generated cmake file with the detected `CMAKE_` variables set as `VCKPG_DETECTED_` - -## Notes -If possible avoid usage in portfiles. - -## Examples - -* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) - -## Source -[scripts/cmake/vcpkg\_internal\_get\_cmake\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake) diff --git a/docs/maintainers/internal/z_vcpkg_get_cmake_vars.md b/docs/maintainers/internal/z_vcpkg_get_cmake_vars.md new file mode 100644 index 00000000000000..2dcf2a8e7e989e --- /dev/null +++ b/docs/maintainers/internal/z_vcpkg_get_cmake_vars.md @@ -0,0 +1,36 @@ +# z_vcpkg_get_cmake_vars + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/). + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +z_vcpkg_get_cmake_vars() +``` + +`z_vcpkg_get_cmake_vars(cmake_vars_file)` sets `` to +a path to a generated CMake file, with the detected `CMAKE_*` variables +re-exported as `VCPKG_DETECTED_*`. + +## Notes +Avoid usage in portfiles. + +All calls to `z_vcpkg_get_cmake_vars` will result in the same output file; +the output file is not generated multiple times. + +## Examples + +* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) + +### Basic Usage + +```cmake +z_vcpkg_get_cmake_vars(cmake_vars_file) +include("${cmake_vars_file}") +message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CXX_FLAGS}") +``` + +## Source +[scripts/cmake/z\_vcpkg\_get\_cmake\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/z_vcpkg_get_cmake_vars.cmake) diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 0ba3533e2c6fed..45aa4589bc481b 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -57,10 +57,10 @@ ## Internal Functions -- [vcpkg\_internal\_get\_cmake\_vars](internal/vcpkg_internal_get_cmake_vars.md) - [z\_vcpkg\_apply\_patches](internal/z_vcpkg_apply_patches.md) - [z\_vcpkg\_forward\_output\_variable](internal/z_vcpkg_forward_output_variable.md) - [z\_vcpkg\_function\_arguments](internal/z_vcpkg_function_arguments.md) +- [z\_vcpkg\_get\_cmake\_vars](internal/z_vcpkg_get_cmake_vars.md) - [z\_vcpkg\_prettify\_command\_line](internal/z_vcpkg_prettify_command_line.md) ## Scripts from Ports @@ -69,6 +69,7 @@ - [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md) - [vcpkg\_cmake\_configure](ports/vcpkg-cmake/vcpkg_cmake_configure.md) +- [vcpkg\_cmake\_get\_vars](ports/vcpkg-cmake/vcpkg_cmake_get_vars.md) - [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md) ### [vcpkg-cmake-config](ports/vcpkg-cmake-config.md) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md new file mode 100644 index 00000000000000..68e51333c42b23 --- /dev/null +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md @@ -0,0 +1,31 @@ +# vcpkg_cmake_get_vars + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_get_vars.md). + +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +vcpkg_cmake_get_vars() +``` + +`vcpkg_cmake_get_vars()` sets `` to +a path to a generated CMake file, with the detected `CMAKE_*` variables +re-exported as `VCPKG_DETECTED_CMAKE_*`. + +## Notes +Avoid usage in portfiles. + +All calls to `vcpkg_cmake_get_vars` will result in the same output file; +the output file is not generated multiple times. + +### Basic Usage + +```cmake +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") +message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CMAKE_CXX_FLAGS}") +``` + +## Source +[ports/vcpkg-cmake/vcpkg\_cmake\_get\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake) diff --git a/docs/regenerate.ps1 b/docs/regenerate.ps1 index 7844055efedfcf..f2f888a770046a 100755 --- a/docs/regenerate.ps1 +++ b/docs/regenerate.ps1 @@ -222,7 +222,7 @@ function ParseCmakeDocComment Get-ChildItem "$VcpkgRoot/scripts/cmake" -Filter '*.cmake' | ForEach-Object { $docs = ParseCmakeDocComment $_ - [Bool]$isInternalFunction = $_.Name.StartsWith("vcpkg_internal") -or $_.Name.StartsWith("z_vcpkg") + [Bool]$isInternalFunction = $_.Name.StartsWith("z_vcpkg") if ($docs.IsDeprecated -and $null -eq $docs.ActualDocumentation) { diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 0ec2789d0e0b92..d4451b4029f44a 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -544,9 +544,8 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() -set(CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/vars.cmake") -vcpkg_internal_get_cmake_vars(OUTPUT_FILE CMAKE_VARS_FILE) -include("${CMAKE_VARS_FILE}") +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") if (VCPKG_TARGET_IS_OSX) # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 5a001e06964e6b..854bcaf1ab33dd 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,13 +1,17 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 11, + "port-version": 12, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." ], "homepage": "https://ffmpeg.org", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "vcpkg-pkgconfig-get-modules", "host": true diff --git a/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt new file mode 100644 index 00000000000000..084042fb116ab2 --- /dev/null +++ b/ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt @@ -0,0 +1,148 @@ +cmake_minimum_required(VERSION 3.20) + +set(VCPKG_LANGUAGES "C;CXX" CACHE STRING "Languages to enables for this project") + +set(OUTPUT_STRING) +# Build default checklists +list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_CROSSCOMPILING + CMAKE_SYSTEM_NAME + CMAKE_HOST_SYSTEM_NAME + CMAKE_SYSTEM_PROCESSOR + CMAKE_HOST_SYSTEM_PROCESSOR) +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_OSX_DEPLOYMENT_TARGET + CMAKE_OSX_SYSROOT) +endif() +# Programs to check +set(PROGLIST AR RANLIB STRIP NM OBJDUMP DLLTOOL MT LINKER) +foreach(prog IN LISTS PROGLIST) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}) +endforeach() +set(COMPILERS ${VCPKG_LANGUAGES} RC) +foreach(prog IN LISTS COMPILERS) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER) +endforeach() +# Variables to check +foreach(_lang IN LISTS VCPKG_LANGUAGES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD_INCLUDE_DIRECTORIES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD_LIBRARIES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILE_FEATURES) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_EXTENSION) + # Probably never required since implicit. + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES) + #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_LIBRARIES) +endforeach() +list(REMOVE_DUPLICATES VCPKG_DEFAULT_VARS_TO_CHECK) + +# Environment variables to check. +list(APPEND VCPKG_DEFAULT_ENV_VARS_TO_CHECK PATH INCLUDE C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) +list(REMOVE_DUPLICATES VCPKG_DEFAULT_ENV_VARS_TO_CHECK) + +#Flags to check. Flags are a bit special since they are configuration aware. +set(FLAGS ${VCPKG_LANGUAGES} RC SHARED_LINKER STATIC_LINKER EXE_LINKER) +foreach(flag IN LISTS FLAGS) + list(APPEND VCPKG_DEFAULT_FLAGS_TO_CHECK CMAKE_${flag}_FLAGS) +endforeach() +list(REMOVE_DUPLICATES VCPKG_DEFAULT_FLAGS_TO_CHECK) + +#Language-specific flags. +foreach(_lang IN LISTS VCPKG_LANGUAGES) + list(APPEND VCPKG_LANG_FLAGS CMAKE_${_lang}_FLAGS) +endforeach() +list(REMOVE_DUPLICATES VCPKG_LANG_FLAGS) + +# TODO if ever necessary: Properties to check + +set(VCPKG_VAR_PREFIX "VCPKG_DETECTED" CACHE STRING "Variable prefix to use for detected flags") +set(VCPKG_VARS_TO_CHECK "${VCPKG_DEFAULT_VARS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") +set(VCPKG_FLAGS_TO_CHECK "${VCPKG_DEFAULT_FLAGS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") +set(VCPKG_ENV_VARS_TO_CHECK "${VCPKG_DEFAULT_ENV_VARS_TO_CHECK}" CACHE STRING "Variables to check. If not given there is a list of defaults") + +if(NOT VCPKG_OUTPUT_FILE) + message(FATAL_ERROR "VCPKG_OUTPUT_FILE is required to be defined") +endif() + +if(NOT CMAKE_BUILD_TYPE) + message(FATAL_ERROR "CMAKE_BUILD_TYPE is required to be defined") +else() + string(TOUPPER "${CMAKE_BUILD_TYPE}" VCPKG_CONFIGS) +endif() + + +project(get_cmake_vars LANGUAGES ${VCPKG_LANGUAGES}) + +foreach(VAR IN LISTS VCPKG_VARS_TO_CHECK) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${VAR} \"${${VAR}}\")\n") +endforeach() + +foreach(_env IN LISTS VCPKG_ENV_VARS_TO_CHECK) + if(CMAKE_HOST_WIN32) + string(REPLACE "\\" "/" ENV_${_env} "$ENV{${_env}}") + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_ENV_${_env} \"${ENV_${_env}}\")\n") + else() + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_ENV_${_env} \"$ENV{${_env}}\")\n") + endif() +endforeach() + +macro(_vcpkg_adjust_flags flag_var) + if(MSVC) # Transform MSVC /flags to -flags due to bash scripts intepreting /flag as a path. + string(REGEX REPLACE "(^| )/" "\\1-" ${flag_var} "${${flag_var}}") + endif() + if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + if("${flag_var}" IN_LIST VCPKG_LANG_FLAGS) + # macOS - append arch and isysroot if cross-compiling + if(NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}") + + foreach(arch IN LISTS CMAKE_OSX_ARCHITECTURES) + string(APPEND ${flag_var} " -arch ${arch}") + endforeach() + string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}") + endif() + endif() + endif() +endmacro() + +foreach(flag IN LISTS VCPKG_FLAGS_TO_CHECK) + string(STRIP "${${flag}}" ${flag}) # Strip leading and trailing whitespaces + _vcpkg_adjust_flags(${flag}) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag} \" ${${flag}}\")\n") + foreach(config IN LISTS VCPKG_CONFIGS) + string(STRIP "${${flag}_${config}}" ${flag}_${config}) + _vcpkg_adjust_flags(${flag}_${config}) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_RAW_${flag}_${config} \"${CMAKE_${flag}_FLAGS_${config}}\")\n") + set(COMBINED_${flag}_${config} "${${flag}} ${${flag}_${config}}") + string(STRIP "${COMBINED_${flag}_${config}}" COMBINED_${flag}_${config}) + string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_${flag}_${config} \"${COMBINED_${flag}_${config}}\")\n") + endforeach() +endforeach() + + +file(WRITE "${VCPKG_OUTPUT_FILE}" "${OUTPUT_STRING}") + +# Programs: +# CMAKE_AR +# CMAKE__COMPILER_AR (Wrapper) +# CMAKE_RANLIB +# CMAKE__COMPILER_RANLIB +# CMAKE_STRIP +# CMAKE_NM +# CMAKE_OBJDUMP +# CMAKE_DLLTOOL +# CMAKE_MT +# CMAKE_LINKER +# CMAKE_C_COMPILER +# CMAKE_CXX_COMPILER +# CMAKE_RC_COMPILER + +# Flags: +# CMAKE__FLAGS +# CMAKE__FLAGS_ +# CMAKE_RC_FLAGS +# CMAKE_SHARED_LINKER_FLAGS +# CMAKE_STATIC_LINKER_FLAGS +# CMAKE_STATIC_LINKER_FLAGS_ +# CMAKE_EXE_LINKER_FLAGS +# CMAKE_EXE_LINKER_FLAGS_ diff --git a/ports/vcpkg-cmake/portfile.cmake b/ports/vcpkg-cmake/portfile.cmake index 70b1ed128c32ca..afc1ffbb47c81f 100644 --- a/ports/vcpkg-cmake/portfile.cmake +++ b/ports/vcpkg-cmake/portfile.cmake @@ -7,6 +7,8 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake" "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake" + "${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake" + "${CMAKE_CURRENT_LIST_DIR}/cmake_get_vars" "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/vcpkg-cmake/vcpkg-port-config.cmake b/ports/vcpkg-cmake/vcpkg-port-config.cmake index f2a973d4ebcba6..2eb9f372339010 100644 --- a/ports/vcpkg-cmake/vcpkg-port-config.cmake +++ b/ports/vcpkg-cmake/vcpkg-port-config.cmake @@ -1,3 +1,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_configure.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_build.cmake") include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_install.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_cmake_get_vars.cmake") diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 88ee459ff35111..f7d28a5665c8b0 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,5 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-06-25", - "port-version": 5 + "version-date": "2021-07-26" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index aa99a81ce282d1..889fa8c09626fb 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -93,12 +93,12 @@ endmacro() function(vcpkg_cmake_configure) cmake_parse_arguments(PARSE_ARGV 0 "arg" - "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;WINDOWS_USE_MSBUILD;NO_CHARSET_FLAG" + "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;WINDOWS_USE_MSBUILD;NO_CHARSET_FLAG;Z_CMAKE_GET_VARS_USAGE" "SOURCE_PATH;GENERATOR;LOGFILE_BASE" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES" ) - if(DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR}) + if(NOT arg_Z_CMAKE_GET_VARS_USAGE AND DEFINED CACHE{Z_VCPKG_CMAKE_GENERATOR}) message(WARNING "vcpkg_cmake_configure already called; this function should only be called once.") endif() @@ -113,14 +113,21 @@ function(vcpkg_cmake_configure) endif() set(manually_specified_variables "") - foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) - if(option MATCHES "^-D([^:=]*)[:=]") - list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") - endif() - endforeach() - list(REMOVE_DUPLICATES manually_specified_variables) - list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) - debug_message("manually specified variables: ${manually_specified_variables}") + + if(arg_Z_CMAKE_GET_VARS_USAGE) + set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}") + else() + set(configuring_message "Configuring ${TARGET_TRIPLET}") + + foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) + if(option MATCHES "^-D([^:=]*)[:=]") + list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + endif() + endforeach() + list(REMOVE_DUPLICATES manually_specified_variables) + list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) + debug_message("manually specified variables: ${manually_specified_variables}") + endif() if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) @@ -377,7 +384,7 @@ function(vcpkg_cmake_configure) file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure") file(WRITE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja" "${parallel_configure_contents}") - message(STATUS "Configuring ${TARGET_TRIPLET}") + message(STATUS "${configuring_message}") vcpkg_execute_required_process( COMMAND ninja -v WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" @@ -388,7 +395,7 @@ function(vcpkg_cmake_configure) "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_BASE}-err.log") else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + message(STATUS "${configuring_message}-dbg") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND @@ -407,7 +414,7 @@ function(vcpkg_cmake_configure) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + message(STATUS "${configuring_message}-rel") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND @@ -458,5 +465,7 @@ Please recheck them and remove the unnecessary options from the `vcpkg_cmake_con If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.") endif() - set(Z_VCPKG_CMAKE_GENERATOR "${generator}" CACHE INTERNAL "The generator which was used to configure CMake.") + if(NOT arg_Z_CMAKE_GET_VARS_USAGE) + set(Z_VCPKG_CMAKE_GENERATOR "${generator}" CACHE INTERNAL "The generator which was used to configure CMake.") + endif() endfunction() diff --git a/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake b/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake new file mode 100644 index 00000000000000..ec1a9980901c98 --- /dev/null +++ b/ports/vcpkg-cmake/vcpkg_cmake_get_vars.cmake @@ -0,0 +1,61 @@ +#[===[.md: +# vcpkg_cmake_get_vars + +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +vcpkg_cmake_get_vars() +``` + +`vcpkg_cmake_get_vars()` sets `` to +a path to a generated CMake file, with the detected `CMAKE_*` variables +re-exported as `VCPKG_DETECTED_CMAKE_*`. + +## Notes +Avoid usage in portfiles. + +All calls to `vcpkg_cmake_get_vars` will result in the same output file; +the output file is not generated multiple times. + +### Basic Usage + +```cmake +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") +message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CMAKE_CXX_FLAGS}") +``` +#]===] + +set(Z_VCPKG_CMAKE_GET_VARS_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_DIR}") + +function(vcpkg_cmake_get_vars out_file) + cmake_parse_arguments(PARSE_ARGV 1 arg "" "" "") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED CACHE{Z_VCPKG_CMAKE_GET_VARS_FILE}) + set(Z_VCPKG_CMAKE_GET_VARS_FILE "${CURRENT_BUILDTREES_DIR}/cmake-get-vars-${TARGET_TRIPLET}.cmake.log" + CACHE PATH "The file to include to access the CMake variables from a generated project.") + vcpkg_cmake_configure( + SOURCE_PATH "${Z_VCPKG_CMAKE_GET_VARS_CURRENT_LIST_DIR}/cmake_get_vars" + OPTIONS_DEBUG "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-get-vars-${TARGET_TRIPLET}-dbg.cmake.log" + OPTIONS_RELEASE "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-get-vars-${TARGET_TRIPLET}-rel.cmake.log" + LOGFILE_BASE cmake-get-vars-${TARGET_TRIPLET} + Z_CMAKE_GET_VARS_USAGE # be quiet, don't set variables... + ) + + set(include_string "") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-get-vars-${TARGET_TRIPLET}-rel.cmake.log\")\n") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-get-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") + endif() + file(WRITE "${Z_VCPKG_CMAKE_GET_VARS_FILE}" "${include_string}") + endif() + + set("${out_file}" "${Z_VCPKG_CMAKE_GET_VARS_FILE}" PARENT_SCOPE) +endfunction() diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ff0873457eff28..e59779e4ed04e9 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -385,39 +385,24 @@ set(_VCPKG_INSTALLED_DIR "${VCPKG_INSTALLED_DIR}" CACHE PATH "The directory which contains the installed libraries for each triplet" FORCE) -if(VCPKG_PREFER_SYSTEM_LIBS) - set(Z_VCPKG_PATH_LIST_OP APPEND) -else() - set(Z_VCPKG_PATH_LIST_OP PREPEND) -endif() - -if(CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. - list(${Z_VCPKG_PATH_LIST_OP} CMAKE_PREFIX_PATH - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" - ) - list(${Z_VCPKG_PATH_LIST_OP} CMAKE_LIBRARY_PATH - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link" - ) - list(${Z_VCPKG_PATH_LIST_OP} CMAKE_FIND_ROOT_PATH - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" - ) -else() #Release build: Put Release paths before Debug paths. Debug Paths are required so that CMake generates correct info in autogenerated target files. - list(${Z_VCPKG_PATH_LIST_OP} CMAKE_PREFIX_PATH - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" - ) - list(${Z_VCPKG_PATH_LIST_OP} CMAKE_LIBRARY_PATH - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link" +function(z_vcpkg_add_vcpkg_to_cmake_path list suffix) + set(vcpkg_paths + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}${suffix}" + "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug${suffix}" ) - list(${Z_VCPKG_PATH_LIST_OP} CMAKE_FIND_ROOT_PATH - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" - "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" - ) -endif() + if(NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$") + list(REVERSE vcpkg_paths) # Debug build: Put Debug paths before Release paths. + endif() + if(VCPKG_PREFER_SYSTEM_LIBS) + list(APPEND "${list}" "${vcpkg_paths}") + else() + list(INSERT "${list}" 0 "${vcpkg_paths}") # CMake 3.15 is required for list(PREPEND ...). + endif() + set("${list}" "${${list}}" PARENT_SCOPE) +endfunction() +z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_PREFIX_PATH "") +z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_LIBRARY_PATH "/lib/manual-link") +z_vcpkg_add_vcpkg_to_cmake_path(CMAKE_FIND_ROOT_PATH "") # If one CMAKE_FIND_ROOT_PATH_MODE_* variables is set to ONLY, to make sure that ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} # and ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug are searched, it is not sufficient to just add them to CMAKE_FIND_ROOT_PATH, @@ -692,7 +677,7 @@ if(X_VCPKG_APPLOCAL_DEPS_INSTALL) list(APPEND parsed_targets "${arg}") endif() - if(last_command STREQUAL "DESTINATION" AND (MODIFIER STREQUAL "" OR MODIFIER STREQUAL "RUNTIME")) + if(last_command STREQUAL "DESTINATION" AND (modifier STREQUAL "" OR modifier STREQUAL "RUNTIME")) set(destination "${arg}") endif() if(last_command STREQUAL "COMPONENT") diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index dd845bde45d522..6bd84c5ad16c11 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -51,11 +51,8 @@ You can use the alias [`vcpkg_install_make()`](vcpkg_install_make.md) function i #]===] function(vcpkg_build_make) - if(NOT _VCPKG_CMAKE_VARS_FILE) - # vcpkg_build_make called without using vcpkg_configure_make before - vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE) - endif() - include("${_VCPKG_CMAKE_VARS_FILE}") + z_vcpkg_get_cmake_vars(cmake_vars_file) + include("${cmake_vars_file}") # parse parameters such that semicolons in options arguments to COMMAND don't get erased cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET" "") diff --git a/scripts/cmake/vcpkg_check_linkage.cmake b/scripts/cmake/vcpkg_check_linkage.cmake index 97e29bad7fff37..f2e9fe10aabcf0 100644 --- a/scripts/cmake/vcpkg_check_linkage.cmake +++ b/scripts/cmake/vcpkg_check_linkage.cmake @@ -35,24 +35,38 @@ This command will either alter the settings for `VCPKG_LIBRARY_LINKAGE` or fail, #]===] function(vcpkg_check_linkage) - cmake_parse_arguments(_csc "ONLY_STATIC_LIBRARY;ONLY_DYNAMIC_LIBRARY;ONLY_DYNAMIC_CRT;ONLY_STATIC_CRT" "" "" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 0 arg + "ONLY_STATIC_LIBRARY;ONLY_DYNAMIC_LIBRARY;ONLY_DYNAMIC_CRT;ONLY_STATIC_CRT" + "" + "" + ) - if(_csc_ONLY_STATIC_LIBRARY AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(arg_ONLY_STATIC_LIBRARY AND arg_ONLY_DYNAMIC_LIBRARY) + message(FATAL_ERROR "Requesting both ONLY_STATIC_LIBRARY and ONLY_DYNAMIC_LIBRARY; this is an error.") + endif() + if(arg_ONLY_STATIC_CRT AND arg_ONLY_DYNAMIC_CRT) + message(FATAL_ERROR "Requesting both ONLY_STATIC_CRT and ONLY_DYNAMIC_CRT; this is an error.") + endif() + + if(arg_ONLY_STATIC_LIBRARY AND "${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") message(STATUS "Note: ${PORT} only supports static library linkage. Building static library.") set(VCPKG_LIBRARY_LINKAGE static PARENT_SCOPE) - endif() - if(_csc_ONLY_DYNAMIC_LIBRARY AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + elseif(arg_ONLY_DYNAMIC_LIBRARY AND "${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") message(STATUS "Note: ${PORT} only supports dynamic library linkage. Building dynamic library.") - if(VCPKG_CRT_LINKAGE STREQUAL "static") - message(FATAL_ERROR "Refusing to build unexpected dynamic library against the static CRT. If this is desired, please configure your triplet to directly request this configuration.") + if("${VCPKG_CRT_LINKAGE}" STREQUAL "static") + message(FATAL_ERROR "Refusing to build unexpected dynamic library against the static CRT. + If this is desired, please configure your triplet to directly request this configuration.") endif() set(VCPKG_LIBRARY_LINKAGE dynamic PARENT_SCOPE) endif() - if(_csc_ONLY_DYNAMIC_CRT AND VCPKG_CRT_LINKAGE STREQUAL "static") + if(arg_ONLY_DYNAMIC_CRT AND "${VCPKG_CRT_LINKAGE}" STREQUAL "static") message(FATAL_ERROR "${PORT} only supports dynamic crt linkage") - endif() - if(_csc_ONLY_STATIC_CRT AND VCPKG_CRT_LINKAGE STREQUAL "dynamic") + elseif(arg_ONLY_STATIC_CRT AND "${VCPKG_CRT_LINKAGE}" STREQUAL "dynamic") message(FATAL_ERROR "${PORT} only supports static crt linkage") endif() endfunction() diff --git a/scripts/cmake/vcpkg_clean_executables_in_bin.cmake b/scripts/cmake/vcpkg_clean_executables_in_bin.cmake index 077e23cc3f71f0..e1cea3a958af05 100644 --- a/scripts/cmake/vcpkg_clean_executables_in_bin.cmake +++ b/scripts/cmake/vcpkg_clean_executables_in_bin.cmake @@ -21,15 +21,35 @@ Generally, there is no need to call this function manually. Instead, pass an ext * [czmq](https://github.com/microsoft/vcpkg/blob/master/ports/czmq/portfile.cmake) #]===] +function(z_vcpkg_clean_executables_in_bin_remove_directory_if_empty directory) + if(NOT EXISTS "${directory}") + return() + endif() + + if(NOT IS_DIRECTORY "${directory}") + message(FATAL_ERROR "${directory} must be a directory") + endif() + + file(GLOB items "${directory}/*") + if("${items}" STREQUAL "") + file(REMOVE_RECURSE "${directory}") + endif() +endfunction() + + function(vcpkg_clean_executables_in_bin) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vct "" "" "FILE_NAMES") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "FILE_NAMES") - if(NOT DEFINED _vct_FILE_NAMES) + if(NOT DEFINED arg_FILE_NAMES) message(FATAL_ERROR "FILE_NAMES must be specified.") endif() - foreach(file_name IN LISTS _vct_FILE_NAMES) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + + foreach(file_name IN LISTS arg_FILE_NAMES) file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${file_name}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/${file_name}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" @@ -38,27 +58,6 @@ function(vcpkg_clean_executables_in_bin) ) endforeach() - function(try_remove_empty_directory directory) - if(NOT EXISTS "${directory}") - return() - endif() - - if(NOT IS_DIRECTORY "${directory}") - message(FATAL_ERROR "${directory} is supposed to be an existing directory.") - endif() - - # TODO: - # For an empty directory, - # file(GLOB items "${directory}" "${directory}/*") - # will return a list with one item. - file(GLOB items "${directory}/" "${directory}/*") - list(LENGTH items items_count) - - if(${items_count} EQUAL 0) - file(REMOVE_RECURSE "${directory}") - endif() - endfunction() - - try_remove_empty_directory("${CURRENT_PACKAGES_DIR}/bin") - try_remove_empty_directory("${CURRENT_PACKAGES_DIR}/debug/bin") + z_vcpkg_clean_executables_in_bin_remove_directory_if_empty("${CURRENT_PACKAGES_DIR}/bin") + z_vcpkg_clean_executables_in_bin_remove_directory_if_empty("${CURRENT_PACKAGES_DIR}/debug/bin") endfunction() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index bce3f6af583629..56bf9bd57661af 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -72,16 +72,16 @@ This command supplies many common arguments to CMake. To see the full list, exam #]===] function(vcpkg_configure_cmake) - if(Z_VCPKG_CMAKE_CONFIGURE_GUARD) - message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_configure_cmake in the same port is unsupported.") - endif() - cmake_parse_arguments(PARSE_ARGV 0 arg - "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_VCPKG_IGNORE_UNUSED_VARIABLES" + "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_GET_CMAKE_VARS_USAGE" "SOURCE_PATH;GENERATOR;LOGNAME" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;MAYBE_UNUSED_VARIABLES" ) + if(NOT arg_Z_GET_CMAKE_VARS_USAGE AND Z_VCPKG_CMAKE_CONFIGURE_GUARD) + message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_configure_cmake in the same port is unsupported.") + endif() + if(NOT VCPKG_PLATFORM_TOOLSET) message(FATAL_ERROR "Vcpkg has been updated with VS2017 support; " "however, vcpkg.exe must be rebuilt by re-running bootstrap-vcpkg.bat\n") @@ -92,7 +92,12 @@ function(vcpkg_configure_cmake) endif() set(manually_specified_variables "") - if(NOT arg_Z_VCPKG_IGNORE_UNUSED_VARIABLES) + + if(arg_Z_GET_CMAKE_VARS_USAGE) + set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}") + else() + set(configuring_message "Configuring ${TARGET_TRIPLET}") + foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) if(option MATCHES "^-D([^:=]*)[:=]") list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") @@ -336,7 +341,7 @@ function(vcpkg_configure_cmake) file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure) file(WRITE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja "${_contents}") - message(STATUS "Configuring ${TARGET_TRIPLET}") + message(STATUS "${configuring_message}") vcpkg_execute_required_process( COMMAND ninja -v WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure @@ -348,7 +353,7 @@ function(vcpkg_configure_cmake) "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") + message(STATUS "${configuring_message}-dbg") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) vcpkg_execute_required_process( COMMAND ${dbg_command} @@ -361,7 +366,7 @@ function(vcpkg_configure_cmake) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - message(STATUS "Configuring ${TARGET_TRIPLET}-rel") + message(STATUS "${configuring_message}-rel") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) vcpkg_execute_required_process( COMMAND ${rel_command} @@ -408,5 +413,7 @@ Please recheck them and remove the unnecessary options from the `vcpkg_configure If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument.") endif() - set(Z_VCPKG_CMAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) + if(NOT arg_Z_GET_CMAKE_VARS_USAGE) + set(Z_VCPKG_CMAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) + endif() endfunction() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 65d66daac9e7d6..f9a04266090027 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -236,10 +236,9 @@ function(vcpkg_configure_make) "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES" ) - vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE) - set(_VCPKG_CMAKE_VARS_FILE "${_VCPKG_CMAKE_VARS_FILE}" PARENT_SCOPE) - debug_message("Including cmake vars from: ${_VCPKG_CMAKE_VARS_FILE}") - include("${_VCPKG_CMAKE_VARS_FILE}") + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") if(DEFINED VCPKG_MAKE_BUILD_TRIPLET) set(_csc_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling endif() diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 2ee8266b9b3755..5bb34089c18dee 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -356,10 +356,9 @@ function(vcpkg_configure_meson) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE) - set(_VCPKG_CMAKE_VARS_FILE "${_VCPKG_CMAKE_VARS_FILE}" PARENT_SCOPE) - debug_message("Including cmake vars from: ${_VCPKG_CMAKE_VARS_FILE}") - include("${_VCPKG_CMAKE_VARS_FILE}") + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) diff --git a/scripts/cmake/vcpkg_copy_pdbs.cmake b/scripts/cmake/vcpkg_copy_pdbs.cmake index dd489db0219ca0..60335255a1ae95 100644 --- a/scripts/cmake/vcpkg_copy_pdbs.cmake +++ b/scripts/cmake/vcpkg_copy_pdbs.cmake @@ -27,15 +27,18 @@ This command should always be called by portfiles after they have finished rearr function(vcpkg_copy_pdbs) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "" "BUILD_PATHS") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + if(NOT DEFINED arg_BUILD_PATHS) - set( - arg_BUILD_PATHS + set(arg_BUILD_PATHS "${CURRENT_PACKAGES_DIR}/bin/*.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" ) endif() - set(dlls_without_matching_pdbs) + set(dlls_without_matching_pdbs "") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(GLOB_RECURSE dlls ${arg_BUILD_PATHS}) @@ -44,17 +47,16 @@ function(vcpkg_copy_pdbs) set(ENV{VSLANG} 1033) foreach(dll IN LISTS dlls) - execute_process(COMMAND dumpbin /PDBPATH ${dll} + execute_process(COMMAND dumpbin /PDBPATH "${dll}" COMMAND findstr PDB OUTPUT_VARIABLE pdb_line ERROR_QUIET RESULT_VARIABLE error_code ) - if(NOT error_code AND pdb_line MATCHES "PDB file found at") - string(REGEX MATCH [['.*']] pdb_path "${pdb_line}") # Extract the path which is in single quotes - string(REPLACE "'" "" pdb_path "${pdb_path}") # Remove single quotes - get_filename_component(dll_dir "${dll}" DIRECTORY) + if(error_code EQUAL "0" AND pdb_line MATCHES "PDB file found at.*'(.*)'") + set(pdb_path "${CMAKE_MATCH_1}") + cmake_path(GET dll PARENT_PATH dll_dir) file(COPY "${pdb_path}" DESTINATION "${dll_dir}") else() list(APPEND dlls_without_matching_pdbs "${dll}") @@ -63,10 +65,10 @@ function(vcpkg_copy_pdbs) set(ENV{VSLANG} "${vslang_backup}") - list(LENGTH dlls_without_matching_pdbs unmatched_dlls_length) - if(unmatched_dlls_length GREATER 0) + if(NOT unmatched_dlls_length STREQUAL "") list(JOIN dlls_without_matching_pdbs "\n " message) - message(WARNING "Could not find a matching pdb file for:${message}\n") + message(WARNING "Could not find a matching pdb file for: + ${message}\n") endif() endif() diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 0cb0bbcefbf48d..856a2d7fe25e94 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -19,29 +19,31 @@ This command should always be called by portfiles after they have finished rearr * [fltk](https://github.com/Microsoft/vcpkg/blob/master/ports/fltk/portfile.cmake) #]===] -function(vcpkg_copy_tool_dependencies TOOL_DIR) - if (VCPKG_TARGET_IS_WINDOWS) - find_program(PWSH_EXE pwsh) - if (NOT PWSH_EXE) - if(UNIX AND NOT CYGWIN) - message(FATAL_ERROR "Could not find PowerShell Core; install PowerShell Core as described here: https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-core-on-linux") - endif() +function(z_vcpkg_copy_tool_dependencies_search tool_dir path_to_search) + file(GLOB tools "${tool_dir}/*.exe" "${tool_dir}/*.dll" "${tool_dir}/*.pyd") + foreach(tool IN LISTS tools) + vcpkg_execute_required_process( + COMMAND "${Z_VCPKG_POWERSHELL_CORE}" -noprofile -executionpolicy Bypass -nologo + -file "${SCRIPTS}/buildsystems/msbuild/applocal.ps1" + -targetBinary "${tool}" + -installedDir "${path_to_search}" + WORKING_DIRECTORY "${VCPKG_ROOT_DIR}" + LOGNAME copy-tool-dependencies + ) + endforeach() +endfunction() + +function(vcpkg_copy_tool_dependencies tool_dir) + if(ARGC GREATER 1) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${ARGN}") + endif() + + if(VCPKG_TARGET_IS_WINDOWS) + find_program(Z_VCPKG_POWERSHELL_CORE pwsh) + if (NOT Z_VCPKG_POWERSHELL_CORE) message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.") endif() - macro(search_for_dependencies PATH_TO_SEARCH) - file(GLOB TOOLS "${TOOL_DIR}/*.exe" "${TOOL_DIR}/*.dll" "${TOOL_DIR}/*.pyd") - foreach(TOOL IN LISTS TOOLS) - vcpkg_execute_required_process( - COMMAND "${PWSH_EXE}" -noprofile -executionpolicy Bypass -nologo - -file "${SCRIPTS}/buildsystems/msbuild/applocal.ps1" - -targetBinary "${TOOL}" - -installedDir "${PATH_TO_SEARCH}" - WORKING_DIRECTORY "${VCPKG_ROOT_DIR}" - LOGNAME copy-tool-dependencies - ) - endforeach() - endmacro() - search_for_dependencies("${CURRENT_PACKAGES_DIR}/bin") - search_for_dependencies("${CURRENT_INSTALLED_DIR}/bin") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_PACKAGES_DIR}/bin") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_INSTALLED_DIR}/bin") endif() endfunction() diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake index 18ddc3715d9a61..ef3259840ccf02 100644 --- a/scripts/cmake/vcpkg_copy_tools.cmake +++ b/scripts/cmake/vcpkg_copy_tools.cmake @@ -33,39 +33,43 @@ Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_ #]===] function(vcpkg_copy_tools) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vct "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES") + cmake_parse_arguments(PARSE_ARGV 0 arg "AUTO_CLEAN" "SEARCH_DIR;DESTINATION" "TOOL_NAMES") - if(NOT DEFINED _vct_TOOL_NAMES) + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED arg_TOOL_NAMES) message(FATAL_ERROR "TOOL_NAMES must be specified.") endif() - if(NOT DEFINED _vct_DESTINATION) - set(_vct_DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + if(NOT DEFINED arg_DESTINATION) + set(arg_DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() - if(NOT DEFINED _vct_SEARCH_DIR) - set(_vct_SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin") - elseif(NOT IS_DIRECTORY ${_vct_SEARCH_DIR}) - message(FATAL_ERROR "SEARCH_DIR ${_vct_SEARCH_DIR} is supposed to be a directory.") + if(NOT DEFINED arg_SEARCH_DIR) + set(arg_SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin") + elseif(NOT IS_DIRECTORY "${arg_SEARCH_DIR}") + message(FATAL_ERROR "SEARCH_DIR (${arg_SEARCH_DIR}) must be a directory") endif() - foreach(tool_name IN LISTS _vct_TOOL_NAMES) - set(tool_path "${_vct_SEARCH_DIR}/${tool_name}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - set(tool_pdb "${_vct_SEARCH_DIR}/${tool_name}.pdb") + foreach(tool_name IN LISTS arg_TOOL_NAMES) + set(tool_path "${arg_SEARCH_DIR}/${tool_name}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + set(tool_pdb "${arg_SEARCH_DIR}/${tool_name}.pdb") if(EXISTS "${tool_path}") - file(COPY "${tool_path}" DESTINATION "${_vct_DESTINATION}") + file(COPY "${tool_path}" DESTINATION "${arg_DESTINATION}") else() - message(FATAL_ERROR "Couldn't find this tool: ${tool_path}.") + message(FATAL_ERROR "Couldn't find tool \"${tool_name}\": + \"${tool_path}\" does not exist") endif() if(EXISTS "${tool_pdb}") - file(COPY "${tool_pdb}" DESTINATION "${_vct_DESTINATION}") + file(COPY "${tool_pdb}" DESTINATION "${arg_DESTINATION}") endif() endforeach() - if(_vct_AUTO_CLEAN) - vcpkg_clean_executables_in_bin(FILE_NAMES ${_vct_TOOL_NAMES}) + if(arg_AUTO_CLEAN) + vcpkg_clean_executables_in_bin(FILE_NAMES ${arg_TOOL_NAMES}) endif() - vcpkg_copy_tool_dependencies("${_vct_DESTINATION}") + vcpkg_copy_tool_dependencies("${arg_DESTINATION}") endfunction() diff --git a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake b/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake deleted file mode 100644 index 030d74120d88f5..00000000000000 --- a/scripts/cmake/vcpkg_internal_get_cmake_vars.cmake +++ /dev/null @@ -1,68 +0,0 @@ -#[===[.md: -# vcpkg_internal_get_cmake_vars - -**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** -Runs a cmake configure with a dummy project to extract certain cmake variables - -## Usage -```cmake -vcpkg_internal_get_cmake_vars( - [OUTPUT_FILE ] - [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] -) -``` - -## Parameters -### OPTIONS -Additional options to pass to the test configure call - -### OUTPUT_FILE -Variable to return the path to the generated cmake file with the detected `CMAKE_` variables set as `VCKPG_DETECTED_` - -## Notes -If possible avoid usage in portfiles. - -## Examples - -* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) -#]===] - -function(vcpkg_internal_get_cmake_vars) - cmake_parse_arguments(PARSE_ARGV 0 _gcv "" "OUTPUT_FILE" "OPTIONS") - - if(_gcv_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed unparsed arguments: '${_gcv_UNPARSED_ARGUMENTS}'") - endif() - - if(NOT _gcv_OUTPUT_FILE) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter OUTPUT_FILE!") - endif() - - if(${_gcv_OUTPUT_FILE}) - debug_message("OUTPUT_FILE ${${_gcv_OUTPUT_FILE}}") - else() - set(DEFAULT_OUT "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}.cmake.log") # So that the file gets included in CI artifacts. - set(${_gcv_OUTPUT_FILE} "${DEFAULT_OUT}" PARENT_SCOPE) - set(${_gcv_OUTPUT_FILE} "${DEFAULT_OUT}") - endif() - - vcpkg_configure_cmake( - SOURCE_PATH "${SCRIPTS}/get_cmake_vars" - OPTIONS ${_gcv_OPTIONS} "-DVCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE}" - OPTIONS_DEBUG "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log" - OPTIONS_RELEASE "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log" - PREFER_NINJA - LOGNAME get-cmake-vars-${TARGET_TRIPLET} - Z_VCPKG_IGNORE_UNUSED_VARIABLES - ) - - set(_include_string) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - string(APPEND _include_string "include(\"${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log\")\n") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - string(APPEND _include_string "include(\"${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") - endif() - file(WRITE "${${_gcv_OUTPUT_FILE}}" "${_include_string}") - -endfunction() diff --git a/scripts/cmake/z_vcpkg_get_cmake_vars.cmake b/scripts/cmake/z_vcpkg_get_cmake_vars.cmake new file mode 100644 index 00000000000000..f50b1db26fe1c4 --- /dev/null +++ b/scripts/cmake/z_vcpkg_get_cmake_vars.cmake @@ -0,0 +1,65 @@ +#[===[.md: +# z_vcpkg_get_cmake_vars + +**Only for internal use in vcpkg helpers. Behavior and arguments will change without notice.** +Runs a cmake configure with a dummy project to extract certain cmake variables + +## Usage +```cmake +z_vcpkg_get_cmake_vars() +``` + +`z_vcpkg_get_cmake_vars(cmake_vars_file)` sets `` to +a path to a generated CMake file, with the detected `CMAKE_*` variables +re-exported as `VCPKG_DETECTED_*`. + +## Notes +Avoid usage in portfiles. + +All calls to `z_vcpkg_get_cmake_vars` will result in the same output file; +the output file is not generated multiple times. + +## Examples + +* [vcpkg_configure_make](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_make.cmake) + +### Basic Usage + +```cmake +z_vcpkg_get_cmake_vars(cmake_vars_file) +include("${cmake_vars_file}") +message(STATUS "detected CXX flags: ${VCPKG_DETECTED_CXX_FLAGS}") +``` +#]===] + +function(z_vcpkg_get_cmake_vars out_file) + cmake_parse_arguments(PARSE_ARGV 1 arg "" "" "") + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + if(NOT DEFINED CACHE{Z_VCPKG_GET_CMAKE_VARS_FILE}) + set(Z_VCPKG_GET_CMAKE_VARS_FILE "${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}.cmake.log" + CACHE PATH "The file to include to access the CMake variables from a generated project.") + vcpkg_configure_cmake( + SOURCE_PATH "${SCRIPTS}/get_cmake_vars" + OPTIONS_DEBUG "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log" + OPTIONS_RELEASE "-DVCPKG_OUTPUT_FILE:PATH=${CURRENT_BUILDTREES_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log" + PREFER_NINJA + LOGNAME get-cmake-vars-${TARGET_TRIPLET} + Z_GET_CMAKE_VARS_USAGE # ignore vcpkg_cmake_configure, be quiet, don't set variables... + ) + + set(include_string "") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-vars-${TARGET_TRIPLET}-rel.cmake.log\")\n") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + string(APPEND include_string "include(\"\${CMAKE_CURRENT_LIST_DIR}/cmake-vars-${TARGET_TRIPLET}-dbg.cmake.log\")\n") + endif() + file(WRITE "${Z_VCPKG_GET_CMAKE_VARS_FILE}" "${include_string}") + endif() + + set("${out_file}" "${Z_VCPKG_GET_CMAKE_VARS_FILE}" PARENT_SCOPE) +endfunction() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 98a6e23520a9b0..c444634110235d 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -129,13 +129,13 @@ if(CMD MATCHES "^BUILD$") include("${SCRIPTS}/cmake/vcpkg_install_msbuild.cmake") include("${SCRIPTS}/cmake/vcpkg_install_nmake.cmake") include("${SCRIPTS}/cmake/vcpkg_install_qmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_internal_get_cmake_vars.cmake") include("${SCRIPTS}/cmake/vcpkg_list.cmake") include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake") include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake") include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake") include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake") + include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake") include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake") include("${CURRENT_PORT_DIR}/portfile.cmake") diff --git a/versions/baseline.json b/versions/baseline.json index 08d017fad43eea..e441a4e1595465 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1998,7 +1998,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 11 + "port-version": 12 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -6569,8 +6569,8 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-06-25", - "port-version": 5 + "baseline": "2021-07-26", + "port-version": 0 }, "vcpkg-cmake-config": { "baseline": "2021-05-22", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0897dd09b603cb..df25f3a8269941 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d910207840ec65730eb972e472dab548fb8b5d2", + "version": "4.4", + "port-version": 12 + }, { "git-tree": "6e44538ad578a511886a010a5485fbe9ab514bf1", "version": "4.4", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index c632ab855e8929..02a8816c1ab2cb 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae2178d81ee39baf4c7e9fd6ed3f011b01a93635", + "version-date": "2021-07-26", + "port-version": 0 + }, { "git-tree": "07c3e68ce9ae8f30bcc0b21def7a528dbb8ecb07", "version-date": "2021-06-25", From 5ffacff9744a869048df10825e707e4c01c54725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 29 Jul 2021 20:09:33 +0200 Subject: [PATCH 0231/1858] [kf5sonnet] new port (#19199) * Add kf5sonnet port * [kf5sonnet] remove binaries * Fixed kf5sonnet for windows * [kf5sonnet] fix windows build * [kf5sonnet] update to 5.75.0 * [kf5sonnet] update to 5.84.0 * [kf5sonnet] update versions * [kf5sonnet] use semver Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * [kf5sonnet] replace deprecated functions Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * [kf5sonnet] update versions * [kf5sonnet] DISABLE_PARALLEL_CONFIGURE * [kf5sonnet] update versions * [kf5sonnet] fix MAYBE_UNUSED_VARIABLES usage * [kf5sonnet] update versions Co-authored-by: Kuntal Majumder Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/kf5sonnet/portfile.cmake | 52 ++++++++++++++++++++++++++++++++++ ports/kf5sonnet/vcpkg.json | 19 +++++++++++++ versions/baseline.json | 4 +++ versions/k-/kf5sonnet.json | 9 ++++++ 4 files changed, 84 insertions(+) create mode 100644 ports/kf5sonnet/portfile.cmake create mode 100644 ports/kf5sonnet/vcpkg.json create mode 100644 versions/k-/kf5sonnet.json diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake new file mode 100644 index 00000000000000..5710d63b7a5baf --- /dev/null +++ b/ports/kf5sonnet/portfile.cmake @@ -0,0 +1,52 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/sonnet + REF v5.84.0 + SHA512 9e7d121f447e3320c27c3708f5d1d4cc735e775749cded268502b593a0b1f6ea703e68ce1d2d4f1806e0adb73aafaedf660586f8ee740f4a9a834e23cb9880e4 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_DATAROOTDIR=data + -DKDE_INSTALL_QTPLUGINDIR=plugins + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + MAYBE_UNUSED_VARIABLES + BUILD_HTML_DOCS + BUILD_MAN_DOCS + BUILD_QTHELP_DOCS +) + +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") +vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") + +vcpkg_cmake_install() + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Sonnet) + +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") + +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json new file mode 100644 index 00000000000000..8f4b783ce3c483 --- /dev/null +++ b/ports/kf5sonnet/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5sonnet", + "version-semver": "5.84.0", + "description": "Multi-language spell checker", + "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e441a4e1595465..ca3a138fee15a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2916,6 +2916,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5sonnet": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5syntaxhighlighting": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json new file mode 100644 index 00000000000000..78e3c649f27d9b --- /dev/null +++ b/versions/k-/kf5sonnet.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7f6d9ebeec45c6354fd96f1ee04b9e34063e33b0", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From 09bc2dd82f7199fa7aadc5451031ed953189718a Mon Sep 17 00:00:00 2001 From: zhongzf Date: Fri, 30 Jul 2021 02:10:52 +0800 Subject: [PATCH 0232/1858] [FreeRDP] update to 2.3.2 (#18242) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: [FreeRDP] update to 2.3.2 * fix: vcpkg_fixup_pkgconfig * fix: the error for pkgconfig checking. * fix: ./vcpkg x-add-version --overwrite-version freerdp * [freerdp] Minimizing patching by hooking install * feat: just add space to let it compile again to have a try. * feat: rollback to compiled version. * feat: x-add-version * fix: remove the useless code. * Update versions/f-/freerdp.json Co-authored-by: Robert Schumacher Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/freerdp/fix-libusb.patch | 15 ++++++++------- ports/freerdp/install-dirs.patch | 13 +++++++++++++ ports/freerdp/portfile.cmake | 7 +++++-- ports/freerdp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/freerdp.json | 5 +++++ 6 files changed, 34 insertions(+), 13 deletions(-) create mode 100644 ports/freerdp/install-dirs.patch diff --git a/ports/freerdp/fix-libusb.patch b/ports/freerdp/fix-libusb.patch index c6da6eb9289661..51f98b4719c443 100644 --- a/ports/freerdp/fix-libusb.patch +++ b/ports/freerdp/fix-libusb.patch @@ -1,8 +1,8 @@ diff --git a/channels/urbdrc/client/libusb/libusb_udevice.c b/channels/urbdrc/client/libusb/libusb_udevice.c -index 214cb7a..56c986c 100644 +index 814540756..56809fe45 100644 --- a/channels/urbdrc/client/libusb/libusb_udevice.c +++ b/channels/urbdrc/client/libusb/libusb_udevice.c -@@ -184,7 +184,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data) +@@ -232,7 +232,7 @@ static void async_transfer_user_data_free(ASYNC_TRANSFER_USER_DATA* user_data) } } @@ -10,8 +10,8 @@ index 214cb7a..56c986c 100644 +static void LIBUSB_CALL func_iso_callback(struct libusb_transfer* transfer) { ASYNC_TRANSFER_USER_DATA* user_data = (ASYNC_TRANSFER_USER_DATA*)transfer->user_data; - #if defined(HAVE_STREAM_ID_API) -@@ -285,7 +285,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT + const UINT32 streamID = stream_id_from_buffer(transfer); +@@ -331,7 +331,7 @@ static const LIBUSB_ENDPOINT_DESCEIPTOR* func_get_ep_desc(LIBUSB_CONFIG_DESCRIPT return NULL; } @@ -21,10 +21,10 @@ index 214cb7a..56c986c 100644 ASYNC_TRANSFER_USER_DATA* user_data; uint32_t streamID; diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c -index 2eebc1a..399ecbb 100644 +index 1638b8c13..b1440f300 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c -@@ -550,7 +550,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, +@@ -580,7 +580,7 @@ static BOOL device_is_filtered(struct libusb_device* dev, return filtered; } @@ -33,7 +33,7 @@ index 2eebc1a..399ecbb 100644 libusb_hotplug_event event, void* user_data) { VID_PID_PAIR pair; -@@ -828,7 +828,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman) +@@ -859,7 +859,7 @@ static BOOL poll_libusb_events(UDEVMAN* udevman) return rc > 0; } @@ -42,3 +42,4 @@ index 2eebc1a..399ecbb 100644 { libusb_hotplug_callback_handle handle; UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter; + \ No newline at end of file diff --git a/ports/freerdp/install-dirs.patch b/ports/freerdp/install-dirs.patch new file mode 100644 index 00000000000000..175be0ecf7525a --- /dev/null +++ b/ports/freerdp/install-dirs.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5e67ef9..4ef3e8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.11) + + project(FreeRDP C CXX) + \ No newline at end of file diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 3fb58548c26415..32e2b5594ddb91 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP - REF d2ba84a6885f57674098fe8e76c5f99d880e580d #2.2.0 - SHA512 3f166213039358dc0cab09b8895e6cff8a7a9c7e7711ea5652604fc6070b1524aba9fec3b860f4deb1f54ea1f17709ab25ffb108116e2914800e892efb9fb9ae + REF c3df0be63953ed98525d9b736ba878ad733de059 #2.3.2 + SHA512 622d2a1f90f5ef2212dd345a0e51b57a16c69a2972acefdc1cb1d062100ad559932330cca5883e9711a96c032ae56f6f7a084ad48760d763fc38f86cf0fa3bce HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch @@ -31,6 +31,7 @@ file(WRITE "${SOURCE_PATH}/.source_version" "${SOURCE_VERSION}-vcpkg") file(REMOVE ${SOURCE_PATH}/cmake/FindOpenSSL.cmake) # Remove outdated Module vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES urbdrc CHANNEL_URBDRC ) @@ -89,6 +90,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP-Client2_temp/FreeRDP-Cli vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/FreeRDP2_temp/FreeRDP2 TARGET_PATH share/FreeRDP) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/WinPR2_temp/WinPR2 TARGET_PATH share/WinPR) +vcpkg_fixup_pkgconfig(SKIP_CHECK) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/WinPR/WinPRTargets-debug.cmake "debug/lib/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" "debug/bin/winpr2${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 0c6a5bfb88516e..63d6f79595149c 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freerdp", - "version-semver": "2.2.0", - "port-version": 1, + "version-semver": "2.3.2", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index ca3a138fee15a7..ae0396a56267b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2121,8 +2121,8 @@ "port-version": 0 }, "freerdp": { - "baseline": "2.2.0", - "port-version": 1 + "baseline": "2.3.2", + "port-version": 0 }, "freetds": { "baseline": "1.2.11", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 71e405befb026d..9e63e71d989c2a 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50c37de4c7ad0b1cfec9f285c83b231f2225ff7c", + "version-semver": "2.3.2", + "port-version": 0 + }, { "git-tree": "9691eb7a176a1bbe9da26f853d59403f00aef9a0", "version-semver": "2.2.0", From 2dbd865354c1900ab36501a7f13b9acdbed1e8a8 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Fri, 30 Jul 2021 12:57:07 -0700 Subject: [PATCH 0233/1858] [vcpkg_minimum_required] fix, add unit tests (#19257) * fix vcpkg_minimum_required drive-by scripts audit * initial unit tests * finish unit tests --- scripts/cmake/vcpkg_minimum_required.cmake | 23 ++++----- .../test_ports/unit-test-cmake/portfile.cmake | 30 ++++++++---- .../test-vcpkg_minimum_required.cmake | 49 +++++++++++++++++++ scripts/test_ports/unit-test-cmake/vcpkg.json | 6 ++- 4 files changed, 86 insertions(+), 22 deletions(-) create mode 100644 scripts/test_ports/unit-test-cmake/test-vcpkg_minimum_required.cmake diff --git a/scripts/cmake/vcpkg_minimum_required.cmake b/scripts/cmake/vcpkg_minimum_required.cmake index 44777875e1a1e1..a8f3a1265e26e1 100644 --- a/scripts/cmake/vcpkg_minimum_required.cmake +++ b/scripts/cmake/vcpkg_minimum_required.cmake @@ -15,31 +15,32 @@ The date-version to check against. function(vcpkg_minimum_required) cmake_parse_arguments(PARSE_ARGV 0 arg "" "VERSION" "") - if (NOT DEFINED VCPKG_BASE_VERSION) - message(FATAL_ERROR - "Your vcpkg executable is outdated and is not compatible with the current CMake scripts. " - "Please re-acquire vcpkg by running bootstrap-vcpkg." + if(NOT DEFINED VCPKG_BASE_VERSION) + message(FATAL_ERROR "Your vcpkg executable is outdated and is not compatible with the current CMake scripts. + Please re-acquire vcpkg by running bootstrap-vcpkg." ) endif() + if(NOT DEFINED arg_VERSION) + message(FATAL_ERROR "VERSION must be specified") + endif() set(vcpkg_date_regex "^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]$") - if (NOT VCPKG_BASE_VERSION MATCHES "${vcpkg_date_regex}") + if(NOT "${VCPKG_BASE_VERSION}" MATCHES "${vcpkg_date_regex}") message(FATAL_ERROR "vcpkg internal failure; VCPKG_BASE_VERSION (${VCPKG_BASE_VERSION}) was not a valid date." - ) + ) endif() - if (NOT arg_VERSION MATCHES "${vcpkg_date_regex}") + if(NOT "${arg_VERSION}" MATCHES "${vcpkg_date_regex}") message(FATAL_ERROR - "VERSION parameter to vcpkg_minimum_required was not a valid date. " - "Comparing with vcpkg tool version ${VCPKG_BASE_VERSION}" - ) + "VERSION (${arg_VERSION}) was not a valid date - expected something of the form 'YYYY-MM-DD'" + ) endif() string(REPLACE "-" "." VCPKG_BASE_VERSION_as_dotted "${VCPKG_BASE_VERSION}") string(REPLACE "-" "." arg_VERSION_as_dotted "${arg_VERSION}") - if (VCPKG_BASE_VERSION_as_dotted VERSION_LESS vcpkg_VERSION_as_dotted) + if("${VCPKG_BASE_VERSION_as_dotted}" VERSION_LESS "${arg_VERSION_as_dotted}") message(FATAL_ERROR "Your vcpkg executable is from ${VCPKG_BASE_VERSION} which is older than required by the caller " "of vcpkg_minimum_required(VERSION ${arg_VERSION}). " diff --git a/scripts/test_ports/unit-test-cmake/portfile.cmake b/scripts/test_ports/unit-test-cmake/portfile.cmake index 638b15974c2e40..a567c11dec0f76 100644 --- a/scripts/test_ports/unit-test-cmake/portfile.cmake +++ b/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -1,10 +1,9 @@ -function(set_fatal_error) - if(ARGC EQUAL 0) - set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "OFF" CACHE BOOL "" FORCE) - else() - set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "ON" CACHE BOOL "" FORCE) - set(Z_VCPKG_UNIT_TEST_FATAL_ERROR "${ARGV0}" CACHE STRING "" FORCE) - endif() +function(set_fatal_error err) + set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "ON" CACHE BOOL "" FORCE) + set(Z_VCPKG_UNIT_TEST_FATAL_ERROR "${err}" CACHE STRING "" FORCE) +endfunction() +function(unset_fatal_error) + set(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR "OFF" CACHE BOOL "" FORCE) endfunction() function(set_has_error) set(Z_VCPKG_UNIT_TEST_HAS_ERROR ON CACHE BOOL "" FORCE) @@ -22,12 +21,12 @@ macro(message level msg) endmacro() set(Z_VCPKG_UNIT_TEST_HAS_ERROR OFF CACHE BOOL "" FORCE) -set_fatal_error() +unset_fatal_error() function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) cmake_language(EVAL CODE "${utcve_test}") if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) - set_fatal_error() + unset_fatal_error() set_has_error() message(STATUS "${utcve_test} had an unexpected FATAL_ERROR; expected: \"${utcve_value}\"") @@ -50,17 +49,28 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) endif() endfunction() +function(unit_test_ensure_success utcve_test) + cmake_language(EVAL CODE "${utcve_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + set_has_error() + message(STATUS "${utcve_test} was expected to be successful.") + endif() + unset_fatal_error() +endfunction() function(unit_test_ensure_fatal_error utcve_test) cmake_language(EVAL CODE "${utcve_test}") if(NOT Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) set_has_error() message(STATUS "${utcve_test} was expected to be a FATAL_ERROR.") endif() - set_fatal_error() + unset_fatal_error() endfunction() set(VCPKG_POLICY_EMPTY_PACKAGE enabled) +if("minimum-required" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_minimum_required.cmake") +endif() if("list" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_list.cmake") endif() diff --git a/scripts/test_ports/unit-test-cmake/test-vcpkg_minimum_required.cmake b/scripts/test_ports/unit-test-cmake/test-vcpkg_minimum_required.cmake new file mode 100644 index 00000000000000..93bfbcfaad8780 --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/test-vcpkg_minimum_required.cmake @@ -0,0 +1,49 @@ +# -- error cases -- +# VCPKG_BASE_VERSION not set - vcpkg version is too old +set(VCPKG_BASE_VERSION_backup "${VCPKG_BASE_VERSION}") +unset(VCPKG_BASE_VERSION) +unset(VCPKG_BASE_VERSION CACHE) +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-01-01)]]) +unit_test_ensure_fatal_error([[vcpkg_minimum_required()]]) +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "")]]) +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "2021.01.01")]]) + +set(VCPKG_BASE_VERSION 2021-02-02) + +# VERSION not passed +unit_test_ensure_fatal_error([[vcpkg_minimum_required()]]) +# VERSION weird - empty +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "")]]) +# VERSION weird - dotted +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021.01.01)]]) +# VERSION weird - not a valid year +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 3000-01-01)]]) +# VERSION weird - list +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION "2021-01-01;2021-01-02")]]) +# VERSION weird - small year +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 21-01-01)]]) +# VERSION weird - small month +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-1-01)]]) +# VERSION weird - small day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-01-1)]]) +# VERSION too-new - later year, earlier month, earlier day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2022-01-01)]]) +# VERSION too-new - same year, later month, earlier day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-03-01)]]) +# VERSION too-new - same year, same month, later day +unit_test_ensure_fatal_error([[vcpkg_minimum_required(VERSION 2021-02-03)]]) + +# -- successes -- +# same date +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2021-02-02)]]) + +# VERSION old - earlier year, later month, later day +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2020-03-03)]]) +# VERSION old - same year, earlier month, later day +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2021-01-03)]]) +# VERSION old - same year, same month, earlier day +unit_test_ensure_success([[vcpkg_minimum_required(VERSION 2021-02-01)]]) + +# reset to backup +unset(VCPKG_BASE_VERSION) +set(VCPKG_BASE_VERSION "${VCPKG_BASE_VERSION_backup}" CACHE STRING "") diff --git a/scripts/test_ports/unit-test-cmake/vcpkg.json b/scripts/test_ports/unit-test-cmake/vcpkg.json index 5079f9e739b5fc..c20cf2c6cb8f41 100644 --- a/scripts/test_ports/unit-test-cmake/vcpkg.json +++ b/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -5,7 +5,8 @@ "supports": "x64", "default-features": [ "function-arguments", - "list" + "list", + "minimum-required" ], "features": { "function-arguments": { @@ -13,6 +14,9 @@ }, "list": { "description": "Test the vcpkg_list function" + }, + "minimum-required": { + "description": "Test the vcpkg_minimum_required function" } } } From c8b09641312a259eb044575c08933629cd6c698d Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 30 Jul 2021 13:01:31 -0700 Subject: [PATCH 0234/1858] [tensorflow] Update the max version of the supported bazel (#19165) * [tensorflow] Update the max version of the supported bazel * Update json file --- .../Update-bazel-max-version.patch | 13 +++++++++++++ ports/tensorflow-common/portfile.cmake | 1 + ports/tensorflow-common/tensorflow-common.cmake | 1 + ports/tensorflow-common/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tensorflow-common.json | 5 +++++ 6 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 ports/tensorflow-common/Update-bazel-max-version.patch diff --git a/ports/tensorflow-common/Update-bazel-max-version.patch b/ports/tensorflow-common/Update-bazel-max-version.patch new file mode 100644 index 00000000000000..9dffd884b0206b --- /dev/null +++ b/ports/tensorflow-common/Update-bazel-max-version.patch @@ -0,0 +1,13 @@ +diff --git a/configure.py b/configure.py +index e5428a6..9324d7b 100644 +--- a/configure.py ++++ b/configure.py +@@ -47,7 +47,7 @@ _TF_WORKSPACE_ROOT = '' + _TF_BAZELRC = '' + _TF_CURRENT_BAZEL_VERSION = None + _TF_MIN_BAZEL_VERSION = '3.1.0' +-_TF_MAX_BAZEL_VERSION = '3.99.0' ++_TF_MAX_BAZEL_VERSION = '4.1.0' + + NCCL_LIB_PATHS = [ + 'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', '' diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake index 7aacbbc206f912..e505c4430ed748 100644 --- a/ports/tensorflow-common/portfile.cmake +++ b/ports/tensorflow-common/portfile.cmake @@ -18,6 +18,7 @@ set(TENSORFLOW_FILES "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in" "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in" "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in" + "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch" ) file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 90cba9197e0498..776cb9c0069829 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -138,6 +138,7 @@ foreach(BUILD_TYPE dbg rel) HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error + "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch" ${STATIC_ONLY_PATCHES} ${WINDOWS_ONLY_PATCHES} ${LINUX_ONLY_PATCHES} diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index 35d2fdb2675271..d97e2c228c5518 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow-common", "version-semver": "2.4.1", - "port-version": 2, + "port-version": 3, "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } diff --git a/versions/baseline.json b/versions/baseline.json index ae0396a56267b4..7e64191461249c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6190,7 +6190,7 @@ }, "tensorflow-common": { "baseline": "2.4.1", - "port-version": 2 + "port-version": 3 }, "tensorpipe": { "baseline": "2021-04-26", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index 3ac6d830ed38e4..cbe798a9e67d36 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd652b405ef53658c13af438e8414110f2977520", + "version-semver": "2.4.1", + "port-version": 3 + }, { "git-tree": "84ba326c66ab77faaf3e59d8eb3f04ffa155a4bb", "version-semver": "2.4.1", From 0e04ff1a45ad2a6e5da79c1e118d74fb9cec75a6 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 2 Aug 2021 14:15:48 -0700 Subject: [PATCH 0235/1858] Clean the downloads directory every CI run. (#19311) Now that vcpkg has artifact caching, meaning downloading artifacts usually doesn't have to leave the datacenter, there's no need to potentially dirty different runs with leftover downloads from each other. This resulted in some "impossible" results in https://github.com/microsoft/vcpkg/pull/18687 where a previous PR run accidentially downloaded the Windows version of nodejs to /mnt/vcpkg-ci/downloads/node-v14.17.4-linux-x64.tar.xz --- scripts/azure-pipelines/linux/azure-pipelines.yml | 3 ++- scripts/azure-pipelines/osx/azure-pipelines.yml | 1 + scripts/azure-pipelines/windows/azure-pipelines.yml | 7 ++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 0c126d886c65b2..e76ebc5b66cab6 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -28,10 +28,11 @@ jobs: displayName: 'Create /home/agent' # Note: /mnt is the Azure machines' temporary disk. - bash: | + sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }} sudo mkdir ${{ variables.WORKING_ROOT }} -m=777 sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} -m=777 exit 0 - displayName: 'Create ${{ variables.VCPKG_DOWNLOADS }}' + displayName: 'Create ${{ variables.WORKING_ROOT }} and ${{ variables.VCPKG_DOWNLOADS }}' - task: Bash@3 displayName: 'Bootstrap vcpkg' inputs: diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 2e9f05d6379dcd..38eb7fa7b34879 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -25,6 +25,7 @@ jobs: - bash: df -h displayName: 'Report on Disk Space' - bash: | + sudo rm -rf ${{ variables.VCPKG_DOWNLOADS }} || 0 sudo mkdir ${{ variables.VCPKG_DOWNLOADS }} || 0 sudo chmod 777 ${{ variables.VCPKG_DOWNLOADS }} || 0 exit 0 diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 9b52378b501028..c70eab86b6f717 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -29,11 +29,8 @@ jobs: - script: .\bootstrap-vcpkg.bat displayName: 'Bootstrap vcpkg' - script: | - dir ${{ variables.VCPKG_DOWNLOADS }} 2>&1 || (call ) - dir ${{ variables.VCPKG_DOWNLOADS }}\tools 2>&1 || (call ) - dir ${{ variables.VCPKG_DOWNLOADS }}\tools\msys2 2>&1 || (call ) - rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }}\tools\msys2 2>&1 || (call ) - displayName: 'Clean msys2 downloads' + rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1 + displayName: 'Clean downloads' - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: From 7471979c3f048823c310ba02c6ebf13598550d23 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 2 Aug 2021 15:16:08 -0700 Subject: [PATCH 0236/1858] Avoid rmdir the downloads directory is nonexistent. (#19314) --- scripts/azure-pipelines/windows/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index c70eab86b6f717..7bd1cab0fa9ab1 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -29,7 +29,7 @@ jobs: - script: .\bootstrap-vcpkg.bat displayName: 'Bootstrap vcpkg' - script: | - rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1 + if exist ${{ variables.VCPKG_DOWNLOADS }} rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1 displayName: 'Clean downloads' - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' From 631702a2d8946257f2a993896d8a9eb66d0c3a40 Mon Sep 17 00:00:00 2001 From: pradeep Date: Tue, 3 Aug 2021 05:00:57 +0530 Subject: [PATCH 0237/1858] [intel-mkl] Lookup oneapi installation for mkl headers (#19296) * [intel-mkl] Lookup oneapi installation for mkl headers * [intel-mkl] Increment port version for oneMKL related change * [intel-mkl] Update version --- ports/intel-mkl/CONTROL | 3 ++- ports/intel-mkl/portfile.cmake | 12 ++++++++++-- versions/baseline.json | 2 +- versions/i-/intel-mkl.json | 5 +++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ports/intel-mkl/CONTROL b/ports/intel-mkl/CONTROL index 0286f25def9c10..a54d24e5047d5d 100644 --- a/ports/intel-mkl/CONTROL +++ b/ports/intel-mkl/CONTROL @@ -1,3 +1,4 @@ Source: intel-mkl Version: 2020.0.0 -Description: Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors. \ No newline at end of file +Port-Version: 1 +Description: Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors. diff --git a/ports/intel-mkl/portfile.cmake b/ports/intel-mkl/portfile.cmake index 4e656948ea961d..a885e8dcbcda81 100644 --- a/ports/intel-mkl/portfile.cmake +++ b/ports/intel-mkl/portfile.cmake @@ -8,8 +8,16 @@ set(MKL_REQUIRED_VERSION "20200000") set(ProgramFilesx86 "ProgramFiles(x86)") set(INTEL_ROOT $ENV{${ProgramFilesx86}}/IntelSWTools/compilers_and_libraries/windows) - -find_path(MKL_ROOT include/mkl.h PATHS $ENV{MKLROOT} ${INTEL_ROOT}/mkl DOC "Folder contains MKL") +set(ONEMKL_ROOT $ENV{${ProgramFilesx86}}/Intel/oneAPI/mkl/latest) + +find_path(MKL_ROOT include/mkl.h + PATHS + $ENV{MKLROOT} + ${INTEL_ROOT}/mkl + $ENV{ONEAPI_ROOT}/mkl/latest + ${ONEMKL_ROOT} + DOC + "Folder contains MKL") if (MKL_ROOT STREQUAL "MKL_ROOT-NOTFOUND") message(FATAL_ERROR "Could not find MKL. Before continuing, please download and install MKL (${MKL_REQUIRED_VERSION} or higher) from:" diff --git a/versions/baseline.json b/versions/baseline.json index 7e64191461249c..6e204ecc7e583e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2714,7 +2714,7 @@ }, "intel-mkl": { "baseline": "2020.0.0", - "port-version": 0 + "port-version": 1 }, "intelrdfpmathlib": { "baseline": "20U2-1", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index 36b7db4f226abf..e5e3bf186ad900 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f91c30839fe3222faa4c81d978ae4f52f61a1df", + "version-string": "2020.0.0", + "port-version": 1 + }, { "git-tree": "27543f95c3c01ee6993990c80b06217a1e2dd9fe", "version-string": "2020.0.0", From 826b2585f5a07609ac4e712b03dc11b267a87a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 3 Aug 2021 07:31:29 +0800 Subject: [PATCH 0238/1858] [vcpkg baseline][tinyfiledialogs] Change repo to sourceforge (#19287) * [tinyfiledialogs] Change repo to sourceforge * version * Export INTERFACE_INCLUDE_DIRECTORIES * Update versions/t-/tinyfiledialogs.json --- ports/tinyfiledialogs/CMakeLists.txt | 2 ++ ports/tinyfiledialogs/CONTROL | 5 ----- ports/tinyfiledialogs/portfile.cmake | 18 +++++++++++------- ports/tinyfiledialogs/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 2 +- versions/t-/tinyfiledialogs.json | 5 +++++ 6 files changed, 37 insertions(+), 13 deletions(-) delete mode 100644 ports/tinyfiledialogs/CONTROL create mode 100644 ports/tinyfiledialogs/vcpkg.json diff --git a/ports/tinyfiledialogs/CMakeLists.txt b/ports/tinyfiledialogs/CMakeLists.txt index 34940b79d21f4d..cb48742a18e2be 100644 --- a/ports/tinyfiledialogs/CMakeLists.txt +++ b/ports/tinyfiledialogs/CMakeLists.txt @@ -3,6 +3,8 @@ project(tinyfiledialogs C) add_library(tinyfiledialogs tinyfiledialogs.c) +target_include_directories(tinyfiledialogs INTERFACE $) + install( TARGETS tinyfiledialogs EXPORT tinyfiledialogsConfig diff --git a/ports/tinyfiledialogs/CONTROL b/ports/tinyfiledialogs/CONTROL deleted file mode 100644 index c17db719450551..00000000000000 --- a/ports/tinyfiledialogs/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: tinyfiledialogs -Version: 3.8.8 -Description: Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more -Homepage: https://sourceforge.net/projects/tinyfiledialogs/ -Supports: !uwp diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index afeb1c2d70eb5d..27e5209599518b 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -2,26 +2,30 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_git( +vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH - URL "https://git.code.sf.net/p/tinyfiledialogs/code" - REF "8e966d92d0e772b5e34ffc3d8ec1559731a07ccb" + REPO tinyfiledialogs + SHA512 d63d6dd847d6bbd1f252c8fbd228086381af7189ac71afc97bd57e06badd1d3f4d90c6aab6207191ae7253d5a71fc44636cf8e33714089d5b478dd2714f59376 + FILENAME "tinyfiledialogs-current.zip" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets() file(READ "${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs/tinyfiledialogs.h" _contents) # reads between the line "- License -" and a closing "*/" if (NOT _contents MATCHES [[- License -(([^*]|\*[^/])*)\*/]]) message(FATAL_ERROR "Failed to parse license from tinyfiledialogs.h") endif() file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${CMAKE_MATCH_1}") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/tinyfiledialogs/vcpkg.json b/ports/tinyfiledialogs/vcpkg.json new file mode 100644 index 00000000000000..48819cab3afaa4 --- /dev/null +++ b/ports/tinyfiledialogs/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "tinyfiledialogs", + "version-semver": "3.8.8", + "port-version": 1, + "description": "Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more", + "homepage": "https://sourceforge.net/projects/tinyfiledialogs/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6e204ecc7e583e..89becb65a2c8fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6294,7 +6294,7 @@ }, "tinyfiledialogs": { "baseline": "3.8.8", - "port-version": 0 + "port-version": 1 }, "tinygltf": { "baseline": "2020-07-28", diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json index d918fbdefcafda..d7b0b5fcdf6986 100644 --- a/versions/t-/tinyfiledialogs.json +++ b/versions/t-/tinyfiledialogs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3959a47c7d93ca7db6e2022553b1d3427970cecf", + "version-semver": "3.8.8", + "port-version": 1 + }, { "git-tree": "1a5b599e8303e1b62bca446461bd7114ec97caba", "version-string": "3.8.8", From 9ddacb04df415ce1f768a3604377bf7eda6e7c45 Mon Sep 17 00:00:00 2001 From: Richard Yu Date: Tue, 3 Aug 2021 07:32:40 +0800 Subject: [PATCH 0239/1858] [c4core, ryml] Update to latest version and add features (#19282) --- ports/c4core/portfile.cmake | 8 ++++---- ports/c4core/vcpkg.json | 2 +- ports/ryml/portfile.cmake | 16 ++++++++++++---- ports/ryml/vcpkg.json | 15 +++++++++++++-- versions/baseline.json | 4 ++-- versions/c-/c4core.json | 5 +++++ versions/r-/ryml.json | 5 +++++ 7 files changed, 42 insertions(+), 13 deletions(-) diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake index 59a4efec0cf187..0e4ff81c2183fa 100644 --- a/ports/c4core/portfile.cmake +++ b/ports/c4core/portfile.cmake @@ -8,18 +8,18 @@ vcpkg_fail_port_install( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/c4core - REF 75f879f21e75e7ee42cbbce5d6d7ce75fd315433 - SHA512 d995e7529269a3968871c48bfe4b60dac52fb863f22250674d7fa3aa45b10c9f2851db12e97799c97f1c88123863034d0545c7e68a81441292c6530806a28cd3 + REF 636f507c33f0c79dce491aec066455ff384d49dc + SHA512 3282876be5883b047e8d25ee392f62d2e9ae79af8fdd65c11b1e36d2fdb0648230fe6c7fb57472a4cbced166979351f12494215aa664977a113b74c26bb6f19b HEAD_REF master ) -set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2) +set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e) # Get cmake scripts for c4core vcpkg_download_distfile(CMAKE_ARCHIVE URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" FILENAME "cmake-${CM_COMMIT_HASH}.zip" - SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3 + SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237 ) vcpkg_extract_source_archive_ex( diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json index aa29f86f27313a..7fdc6487b57189 100644 --- a/ports/c4core/vcpkg.json +++ b/ports/c4core/vcpkg.json @@ -1,6 +1,6 @@ { "name": "c4core", - "version-date": "2021-06-26", + "version-date": "2021-07-18", "description": "Library of low-level C++ utilities", "homepage": "https://github.com/biojppm/c4core", "supports": "!osx" diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake index 639ac1bd90752d..f3e2bf5c29dc91 100644 --- a/ports/ryml/portfile.cmake +++ b/ports/ryml/portfile.cmake @@ -8,19 +8,19 @@ vcpkg_fail_port_install( vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO biojppm/rapidyaml - REF a1d5ed7c8ace0ab14340ba19dfed60f280eddac0 - SHA512 27a7b7a3ee2f6bb63600907fbc2307b7da13a13b88605c0e7b628fe26878b120d0df9bc221d7d495c5212543db00f0b570f351e7e3e3bebb0c785a676a4d2469 + REF affafd5db67208eb85413327595507314c068525 + SHA512 31d827ead680828b3c0ad879290b17d4729d412e30a20459aea4b92a8f4f3b8397f82b09c27d918ab4b955289560b17697d5f15eaa4d24661ff46f5dbbc50fa8 HEAD_REF master PATCHES cmake-fix.patch ) -set(CM_COMMIT_HASH c6de791cd37ea3dc6bcb967819cb74b4f054a8f2) +set(CM_COMMIT_HASH fe41e86552046c3df9ba73a40bf3d755df028c1e) # Get cmake scripts for rapidyaml vcpkg_download_distfile(CMAKE_ARCHIVE URLS "https://github.com/biojppm/cmake/archive/${CM_COMMIT_HASH}.zip" FILENAME "cmake-${CM_COMMIT_HASH}.zip" - SHA512 2d3f2d8d207f7d9c583b1f0bb35a1f4e0ed571ecdf7d5e745467f4f39cd82b860fc84d220c48a2d01e0ab805ce750133b73006b2f19920c95b1f85c7431459e3 + SHA512 7292f9856d9c41581f2731e73fdf08880e0f4353b757da38a13ec89b62c5c8cb52b9efc1a9ff77336efa0b6809727c17649e607d8ecacc965a9b2a7a49925237 ) vcpkg_extract_source_archive_ex( @@ -32,9 +32,17 @@ vcpkg_extract_source_archive_ex( file(REMOVE_RECURSE "${SOURCE_PATH}/ext/c4core/cmake") file(RENAME ${SOURCE_PATH_CMAKE} "${SOURCE_PATH}/ext/c4core/cmake") +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + def-callbacks RYML_DEFAULT_CALLBACKS + dbg RYML_DBG +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json index 5b992fb5766fc8..01ec79dea3f659 100644 --- a/ports/ryml/vcpkg.json +++ b/ports/ryml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ryml", - "version-date": "2021-06-29", + "version-date": "2021-07-24", "description": "Rapid YAML library", "homepage": "https://github.com/biojppm/rapidyaml", "supports": "!osx", @@ -9,5 +9,16 @@ "name": "c4core", "default-features": false } - ] + ], + "default-features": [ + "def-callbacks" + ], + "features": { + "dbg": { + "description": "Enable (very verbose) ryml debug prints." + }, + "def-callbacks": { + "description": "Enable ryml's default implementation of callbacks: allocate(), free(), error()" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 89becb65a2c8fe..ed798fdf639eaa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1105,7 +1105,7 @@ "port-version": 1 }, "c4core": { - "baseline": "2021-06-26", + "baseline": "2021-07-18", "port-version": 0 }, "caf": { @@ -5653,7 +5653,7 @@ "port-version": 0 }, "ryml": { - "baseline": "2021-06-29", + "baseline": "2021-07-24", "port-version": 0 }, "ryu": { diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json index 6afe37b39522c8..8d4429fc4a21f8 100644 --- a/versions/c-/c4core.json +++ b/versions/c-/c4core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eae79eece3a7383d94cc686275624cb49ee6a68e", + "version-date": "2021-07-18", + "port-version": 0 + }, { "git-tree": "9b07f8a38bbc4d13f8411921e6734753e15f8d50", "version-date": "2021-06-26", diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json index d24417ed86f2e9..f977ffb5c7f8f1 100644 --- a/versions/r-/ryml.json +++ b/versions/r-/ryml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d97344132c58ae2aafb8c0ed1f23acde843404b5", + "version-date": "2021-07-24", + "port-version": 0 + }, { "git-tree": "f0ae9d06c774834182bdb333b0a5c96aa8c36b52", "version-date": "2021-06-29", From 67897f3b232af4fa66eea83c7fcb088d809f8787 Mon Sep 17 00:00:00 2001 From: zhongzf Date: Tue, 3 Aug 2021 07:39:36 +0800 Subject: [PATCH 0240/1858] [FreeRDP] update to 2.4.0 (#19264) * feat: v2.4.0 * feat: x-add-version --- ports/freerdp/portfile.cmake | 4 ++-- ports/freerdp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/freerdp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 32e2b5594ddb91..3bce91d81f570a 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FreeRDP/FreeRDP - REF c3df0be63953ed98525d9b736ba878ad733de059 #2.3.2 - SHA512 622d2a1f90f5ef2212dd345a0e51b57a16c69a2972acefdc1cb1d062100ad559932330cca5883e9711a96c032ae56f6f7a084ad48760d763fc38f86cf0fa3bce + REF 647a48dfa7b19ef6bbfa68a69b5d87717541ef21 #2.4.0 + SHA512 c72072df6f2b3ebc1b632f2e3b40bdcc732e25e7c4ef97b93bc5c5351566b553f682b615e6383ac7c5a1b5ecf8ed0fa9a305ea8c904031d4c78d7c3179323032 HEAD_REF master PATCHES DontInstallSystemRuntimeLibs.patch diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 63d6f79595149c..7186615cda4255 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "freerdp", - "version-semver": "2.3.2", + "version-semver": "2.4.0", "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index ed798fdf639eaa..ba5baae9e4656b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2121,7 +2121,7 @@ "port-version": 0 }, "freerdp": { - "baseline": "2.3.2", + "baseline": "2.4.0", "port-version": 0 }, "freetds": { diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 9e63e71d989c2a..641369100c387d 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "504bdd8f860f4e4b091de21a76999261bff207da", + "version-semver": "2.4.0", + "port-version": 0 + }, { "git-tree": "50c37de4c7ad0b1cfec9f285c83b231f2225ff7c", "version-semver": "2.3.2", From 9d40e4e54717147627106dcc23f861e51782f194 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 3 Aug 2021 07:44:53 +0800 Subject: [PATCH 0241/1858] [libxml2] Fix build error on uwp (#19221) * [libxml2] Fix build error on uwp * Update versions --- ports/libxml2/fix-uwp.patch | 12 ++++++++++++ ports/libxml2/portfile.cmake | 10 +++++----- ports/libxml2/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/l-/libxml2.json | 5 +++++ 5 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 ports/libxml2/fix-uwp.patch diff --git a/ports/libxml2/fix-uwp.patch b/ports/libxml2/fix-uwp.patch new file mode 100644 index 00000000000000..ce57a9ed1237c4 --- /dev/null +++ b/ports/libxml2/fix-uwp.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b45d62..ba8bfec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -129,6 +129,7 @@ endif() + + if(MSVC) + configure_file(include/win32config.h config.h COPYONLY) ++ add_compile_options(/wd4996) + else() + check_c_source_compiles(" + void __attribute__((destructor)) diff --git a/ports/libxml2/portfile.cmake b/ports/libxml2/portfile.cmake index a176d6871d6c68..931dc7756d9f8c 100644 --- a/ports/libxml2/portfile.cmake +++ b/ports/libxml2/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_gitlab( HEAD_REF master PATCHES fix_cmakelist.patch + fix-uwp.patch ) if (VCPKG_TARGET_IS_UWP) @@ -18,11 +19,10 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "tools" LIBXML2_WITH_PROGRAMS + "tools" LIBXML2_WITH_PROGRAMS ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DLIBXML2_WITH_TESTS=OFF @@ -61,9 +61,9 @@ vcpkg_configure_cmake( -DLIBXML2_WITH_XPTR=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libxml2) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libxml2) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index bb9b73883870cd..0483b7f92820bc 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,13 +1,20 @@ { "name": "libxml2", "version-semver": "2.9.12", - "port-version": 1, + "port-version": 2, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", - "supports": "!uwp", "dependencies": [ "libiconv", "liblzma", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index ba5baae9e4656b..30a4f3834886f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3754,7 +3754,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 1 + "port-version": 2 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index d88953a5a25cbf..ea8950c96acbcf 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f86cd2ab2c75dcd8e97ee18191b343f0b31bfb7c", + "version-semver": "2.9.12", + "port-version": 2 + }, { "git-tree": "a68bece41619060ca2e212b916dcc60c65ca3603", "version-semver": "2.9.12", From b424b700d6dd0dc2e05fb5d40268f70c7052d81b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 3 Aug 2021 01:49:35 +0200 Subject: [PATCH 0242/1858] [kf5solid] new port (#19201) * Add kf5solid port * Fixed kf5solid for windows * [kf5solid] update to 5.75.0 * [kf5solid] update to 5.84.0 * [kf5solid] update versions * [kf5solid] replace outdated functions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5solid] use semver Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5solid] update versions * [kf5solid] DISABLE_PARALLEL_CONFIGURE * [kf5solid] update versions * [kf5solid] fix MAYBE_UNUSED_VARIABLES usage * [kf5solid] update versions * [kf5solid] remove extraneous options * [kf5solid] update versions Co-authored-by: Kuntal Majumder Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kf5solid/portfile.cmake | 59 +++++++++++++++++++++++++++++++++++ ports/kf5solid/vcpkg.json | 19 +++++++++++ versions/baseline.json | 4 +++ versions/k-/kf5solid.json | 9 ++++++ 4 files changed, 91 insertions(+) create mode 100644 ports/kf5solid/portfile.cmake create mode 100644 ports/kf5solid/vcpkg.json create mode 100644 versions/k-/kf5solid.json diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake new file mode 100644 index 00000000000000..36602f6aad8333 --- /dev/null +++ b/ports/kf5solid/portfile.cmake @@ -0,0 +1,59 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/solid + REF v5.84.0 + SHA512 b6452e56c6029289450850c1fcfff96da0005f8dfa03f1817754910945e3ccadd8502e330a4484a5c5e9a8d5525838c8090268bb083639062dfca7176852c159 + HEAD_REF master +) + +if(VCPKG_TARGET_IS_OSX) + # In Darwin platform, there can be an old version of `bison`, + # Which can't be used for `gst-build`. It requires 2.4+ + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 2 AND BISON_MINOR GREATER_EQUAL 4)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() +endif() + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) + +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# solid-hardware and solid-power are a non-dev tools allowing to list hardware and power managament status of one's system. No need to keep them. +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}") +file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json new file mode 100644 index 00000000000000..e0177169476f42 --- /dev/null +++ b/ports/kf5solid/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5solid", + "version-semver": "5.84.0", + "description": "Desktop hardware abstraction", + "homepage": "https://api.kde.org/frameworks/solid/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 30a4f3834886f5..0ad42b323d805a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2916,6 +2916,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5solid": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5sonnet": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json new file mode 100644 index 00000000000000..a47818aa808c51 --- /dev/null +++ b/versions/k-/kf5solid.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4ddc168b71ca68e8c765edca7a018753871b84e6", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From 1c50e2437f6413010df8a52419f29ce110df2c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 3 Aug 2021 01:50:31 +0200 Subject: [PATCH 0243/1858] [kf5jobwidgets] new port (#19200) * Add kf5jobwidgets port * [kf5jobwidgets] update to 5.75.0 * [kf5jobwidgets] update to 5.84.0 * [kf5jobwidgets] update versions * [kf5jobwidgets] fix static build * [kf5jobwidgets] update versions * [kf5jobwidgets] replace deprecated functions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5jobwidgets] update versions * [kf5jobwidgets] use semVer Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5jobwidgets] update versions * [kf5jobwidgets] DISABLE_PARALLEL_CONFIGURE * [kf5jobwidgets] update versions * [kf5jobwidgets] fix MAYBE_UNUSED_VARIABLES usage * [kf5jobwidgets] update versions * [kf5jobwidgets] remove extraneous options * [kf5jobwidgets] update versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kf5jobwidgets/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/kf5jobwidgets/vcpkg.json | 24 ++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5jobwidgets.json | 9 +++++++++ 4 files changed, 66 insertions(+) create mode 100644 ports/kf5jobwidgets/portfile.cmake create mode 100644 ports/kf5jobwidgets/vcpkg.json create mode 100644 versions/k-/kf5jobwidgets.json diff --git a/ports/kf5jobwidgets/portfile.cmake b/ports/kf5jobwidgets/portfile.cmake new file mode 100644 index 00000000000000..92caa0db710960 --- /dev/null +++ b/ports/kf5jobwidgets/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kjobwidgets + REF v5.84.0 + SHA512 57aa8d5756e1c9ce955975bfb5dc33ed78aaa984420effbb3b79984f9fd46794f3da092185bbcefe0464228d8f504349f7efd3a0ae79406954dc9ea84b3553f8 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5JobWidgets) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json new file mode 100644 index 00000000000000..9e4e82e6f64791 --- /dev/null +++ b/ports/kf5jobwidgets/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "kf5jobwidgets", + "version-semver": "5.84.0", + "description": "Widgets for showing progress of asynchronous jobs", + "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", + "dependencies": [ + "ecm", + "kf5coreaddons", + "kf5widgetsaddons", + "qt5-base", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0ad42b323d805a..eaf6389912af1b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2912,6 +2912,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5jobwidgets": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5plotting": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5jobwidgets.json b/versions/k-/kf5jobwidgets.json new file mode 100644 index 00000000000000..15adaa10d4284a --- /dev/null +++ b/versions/k-/kf5jobwidgets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7405290b40e00636f2db4aa51f0ebfa24bfe0589", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From dcd366b413f0378005d8f62e3662a6f50a3e4cf7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 3 Aug 2021 01:51:02 +0200 Subject: [PATCH 0244/1858] Always use msys make on win32 host (#19164) --- scripts/cmake/vcpkg_build_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 6bd84c5ad16c11..30b073c5032853 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -88,7 +88,7 @@ function(vcpkg_build_make) set(PATH_GLOBAL "$ENV{PATH}") vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper") vcpkg_acquire_msys(MSYS_ROOT) - find_program(MAKE make REQUIRED) + find_program(MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) set(MAKE_COMMAND "${MAKE}") set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) From be2d07594acaa862442749fb39f10d44f99c469f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 3 Aug 2021 01:55:47 +0200 Subject: [PATCH 0245/1858] Fix c-ares compilation under Linux with dynamic linkage (#19126) * Fix c-ares compilation under Linux with shared linkage * Update version * Update version file Co-authored-by: Victor Romero --- ports/c-ares/portfile.cmake | 3 ++- ports/c-ares/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/c-ares.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 0ec1740da16800..a0e43f50e60b11 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -32,10 +32,11 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ares.h "#ifdef CARES_STATICLIB" "#if 1" ) +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL static OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Empty folders endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index a8833ac42574d2..996666f75c7019 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,7 +1,7 @@ { "name": "c-ares", "version": "1.17.1", - "port-version": 1, + "port-version": 2, "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index eaf6389912af1b..4aec399c0f0b0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1102,7 +1102,7 @@ }, "c-ares": { "baseline": "1.17.1", - "port-version": 1 + "port-version": 2 }, "c4core": { "baseline": "2021-07-18", diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 39bbc667cc43e3..60934c10ba591d 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d48aae0b9e4a0e201eab417117bab9491665193", + "version": "1.17.1", + "port-version": 2 + }, { "git-tree": "1e8d84e28abdb8437a2665651b4359da40a3333f", "version": "1.17.1", From 2e3456755ce133a2b877aef6e55d00b0ad7cc7c8 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 3 Aug 2021 07:57:14 +0800 Subject: [PATCH 0246/1858] [Poco] update to 1.11.0 (#19040) * [Poco] update to 1.11.0 * update version * fix ci error * update version * Modernizes the port * update poco * update portfile.cmake * update version --- ports/poco/arm64_pcre.patch | 22 +++++++++--------- ports/poco/fix-error-c3861.patch | 12 ++++++++++ ports/poco/fix_dependency.patch | 33 +++++++++++++------------- ports/poco/portfile.cmake | 40 +++++++++++++++++--------------- ports/poco/vcpkg.json | 11 +++++++-- versions/baseline.json | 4 ++-- versions/p-/poco.json | 5 ++++ 7 files changed, 77 insertions(+), 50 deletions(-) create mode 100644 ports/poco/fix-error-c3861.patch diff --git a/ports/poco/arm64_pcre.patch b/ports/poco/arm64_pcre.patch index faf8ce99c4c50b..75151dc34f2d39 100644 --- a/ports/poco/arm64_pcre.patch +++ b/ports/poco/arm64_pcre.patch @@ -1,8 +1,8 @@ diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h -index 3f26008..d0bbd31 100644 +index 9a945f3..f5a9a7f 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h -@@ -193,7 +193,7 @@ +@@ -191,7 +191,7 @@ #else #define POCO_ARCH_LITTLE_ENDIAN 1 #endif @@ -12,7 +12,7 @@ index 3f26008..d0bbd31 100644 #if defined(__ARMEB__) #define POCO_ARCH_BIG_ENDIAN 1 diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp -index 4d655da..26567c8 100644 +index 1f51296..c67b71b 100644 --- a/Foundation/src/EventLogChannel.cpp +++ b/Foundation/src/EventLogChannel.cpp @@ -11,6 +11,7 @@ @@ -24,20 +24,20 @@ index 4d655da..26567c8 100644 #include "Poco/EventLogChannel.h" #include "Poco/Message.h" diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h -index e2b6a06..1b045c1 100644 +index 4328344..5eeafcd 100644 --- a/Foundation/src/utils.h +++ b/Foundation/src/utils.h -@@ -54,7 +54,7 @@ - // disabled.) - // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) +@@ -91,7 +91,7 @@ int main(int argc, char** argv) { + // + // If it prints "correct" then the architecture should be here, in the "correct" section. #if defined(_M_X64) || defined(__x86_64__) || \ -- defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || \ +- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ + defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \ - defined(__avr32__) || \ defined(__hppa__) || defined(__ia64__) || \ defined(__mips__) || \ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp -index e81b4b5..36ae436 100644 +index 1a75379..b4081fd 100644 --- a/Net/src/Net.cpp +++ b/Net/src/Net.cpp @@ -11,6 +11,7 @@ @@ -49,7 +49,7 @@ index e81b4b5..36ae436 100644 #include "Poco/Net/Net.h" diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp -index 4c2ad7d..cf1de17 100644 +index 7fd1a28..a07c5d2 100644 --- a/Util/src/WinRegistryKey.cpp +++ b/Util/src/WinRegistryKey.cpp @@ -11,6 +11,7 @@ diff --git a/ports/poco/fix-error-c3861.patch b/ports/poco/fix-error-c3861.patch new file mode 100644 index 00000000000000..85891622c75979 --- /dev/null +++ b/ports/poco/fix-error-c3861.patch @@ -0,0 +1,12 @@ +diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h +index e0c8455..363654c 100644 +--- a/XML/include/Poco/XML/ParserEngine.h ++++ b/XML/include/Poco/XML/ParserEngine.h +@@ -19,6 +19,7 @@ + + #include "Poco/XML/XML.h" + #if defined(POCO_UNBUNDLED) ++#include + #include + #else + #include "Poco/XML/expat.h" diff --git a/ports/poco/fix_dependency.patch b/ports/poco/fix_dependency.patch index 8cb6ed4832f1a4..2fd917affa77de 100644 --- a/ports/poco/fix_dependency.patch +++ b/ports/poco/fix_dependency.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b664afd..aafbf4a 100644 +index 4e05272..44dd7cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,8 +82,6 @@ option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF) @@ -44,7 +44,7 @@ index b664afd..aafbf4a 100644 endif() if(PostgreSQL_FOUND) -@@ -200,6 +193,9 @@ include(DefinePlatformSpecifc) +@@ -207,6 +200,9 @@ include(DefinePlatformSpecifc) # Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file set(Poco_COMPONENTS "") @@ -54,7 +54,7 @@ index b664afd..aafbf4a 100644 if(ENABLE_TESTS) add_subdirectory(CppUnit) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) -@@ -327,8 +323,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) +@@ -339,8 +335,11 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) list(APPEND Poco_COMPONENTS "Redis") endif() @@ -68,7 +68,7 @@ index b664afd..aafbf4a 100644 list(APPEND Poco_COMPONENTS "PDF") endif() -@@ -457,15 +456,6 @@ install( +@@ -478,15 +477,6 @@ install( Devel ) @@ -110,6 +110,19 @@ index f71b145..7034974 100644 target_include_directories(DataMySQL PUBLIC $ +diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +index 6ddcd39..9e50803 100644 +--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h ++++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h +@@ -57,8 +57,6 @@ + #endif + #if defined(LIBMARIADB) + #pragma comment(lib, "libmariadb") +- #else +- #pragma comment(lib, "libmysql") + #endif + #endif + diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt index b52e2c5..0dcfae2 100644 --- a/Data/SQLite/CMakeLists.txt @@ -229,15 +242,3 @@ index 173eacd..936edf4 100644 foreach(module ${Poco_FIND_COMPONENTS}) find_package(Poco${module} -diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h -index b533c9f..e2bb2d3 100644 ---- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h -+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h -@@ -54,7 +54,6 @@ - #if !defined(MySQL_EXPORTS) - #pragma comment(lib, "PocoDataMySQL" POCO_LIB_SUFFIX) - #endif -- #pragma comment(lib, "libmysql") - #endif - - diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake index 97a732ffb430da..4ac9a949df8436 100644 --- a/ports/poco/portfile.cmake +++ b/ports/poco/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pocoproject/poco - REF 3fc3e5f5b8462f7666952b43381383a79b8b5d92 # poco-1.10.1-release - SHA512 4c53a24a2ab9c57f4bf94e233da65cbb144c101b7d8d422d7e687d6c90ce0b53cb7bcfae63205ff30cade0fd07319e44a32035c1b15637ea2958986efc4ad5df + REF f81a38057f1d240fe7b7a069612776f788bc88ea # poco-1.11.0-release + SHA512 c5f39aca8b5464959b9337b0cbd8ee86d81f195f5a5ba864692c71b2bdbffdecef0537b6e6a2d9f41829bcd58f78825b10565d0c4ee7b3c856a4886a9e328118 HEAD_REF master PATCHES # Fix embedded copy of pcre in static linking mode @@ -13,12 +13,14 @@ vcpkg_from_github( arm64_pcre.patch fix_dependency.patch fix-feature-sqlite3.patch + fix-error-c3861.patch ) file(REMOVE "${SOURCE_PATH}/Foundation/src/pcre.h") file(REMOVE "${SOURCE_PATH}/cmake/V39/FindEXPAT.cmake") file(REMOVE "${SOURCE_PATH}/cmake/V313/FindSQLite3.cmake") file(REMOVE "${SOURCE_PATH}/cmake/FindPCRE.cmake") +file(REMOVE "${SOURCE_PATH}/XML/src/expat_config.h") file(REMOVE "${SOURCE_PATH}/cmake/FindMySQL.cmake") # define Poco linkage type @@ -26,12 +28,13 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" POCO_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" POCO_MT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - pdf ENABLE_PDF - netssl ENABLE_NETSSL - netssl ENABLE_NETSSL_WIN - netssl ENABLE_CRYPTO - sqlite3 ENABLE_DATA_SQLITE - postgresql ENABLE_DATA_POSTGRESQL + FEATURES + pdf ENABLE_PDF + netssl ENABLE_NETSSL + netssl ENABLE_NETSSL_WIN + netssl ENABLE_CRYPTO + sqlite3 ENABLE_DATA_SQLITE + postgresql ENABLE_DATA_POSTGRESQL ) if ("mysql" IN_LIST FEATURES OR "mariadb" IN_LIST FEATURES) @@ -40,9 +43,8 @@ else() set(POCO_USE_MYSQL OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} # force to use dependencies as external -DPOCO_UNBUNDLED=ON @@ -50,7 +52,6 @@ vcpkg_configure_cmake( -DPOCO_STATIC=${POCO_STATIC} -DPOCO_MT=${POCO_MT} -DENABLE_TESTS=OFF - -DENABLE_SAMPLES=OFF # Allow enabling and disabling components # POCO_ENABLE_SQL_ODBC, POCO_ENABLE_SQL_MYSQL and POCO_ENABLE_SQL_POSTGRESQL are # defined on the fly if the required librairies are present @@ -74,12 +75,12 @@ vcpkg_configure_cmake( -DENABLE_DATA_MYSQL=${POCO_USE_MYSQL} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Move apps to the tools folder -vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES cpspc f2cpsp PocoDoc tec arc AUTO_CLEAN) # Copy additional include files not part of any libraries if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL") @@ -100,11 +101,12 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/include/Poco/SQL/SQLite") endif() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Poco) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Poco) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index e310417a2f4456..0f6f37ab5ac9cf 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,13 +1,20 @@ { "name": "poco", - "version-semver": "1.10.1", - "port-version": 5, + "version-semver": "1.11.0", "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "supports": "!uwp", "dependencies": [ "expat", "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 4aec399c0f0b0c..ebf4271719738d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4969,8 +4969,8 @@ "port-version": 0 }, "poco": { - "baseline": "1.10.1", - "port-version": 5 + "baseline": "1.11.0", + "port-version": 0 }, "podofo": { "baseline": "0.9.7", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index d5cc773d188c97..c66b34c0a4778f 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8f4d5c1548d23526e05b069ee626d7d7f9a4399", + "version-semver": "1.11.0", + "port-version": 0 + }, { "git-tree": "e9c709300900158cdfcad75965e85b04413c8d5b", "version-semver": "1.10.1", From df4cb3d6e70e5ac6e8be907a9df67c714f4c8d81 Mon Sep 17 00:00:00 2001 From: Liu Chenxin Date: Tue, 3 Aug 2021 07:59:18 +0800 Subject: [PATCH 0247/1858] [protobuf] add support for mingw subsystem (#19054) * [protobuf] add support for mingw subsystem * [protobuf] support for mingw * Update the port version * Update the baseline version Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/protobuf/portfile.cmake | 2 +- ports/protobuf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/protobuf.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index 8f7c3b119de57b..a645866c94aba2 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -76,7 +76,7 @@ endif() protobuf_try_remove_recurse_wait(${CURRENT_PACKAGES_DIR}/debug/share) if(protobuf_BUILD_PROTOC_BINARIES) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + if(VCPKG_TARGET_IS_WINDOWS) vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) else() vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.15.8.0 AUTO_CLEAN) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 0e85e376c0ca9e..40b557dd3c30b7 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "protobuf", "version-semver": "3.15.8", - "port-version": 3, + "port-version": 4, "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ebf4271719738d..23329bde0bdad6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5054,7 +5054,7 @@ }, "protobuf": { "baseline": "3.15.8", - "port-version": 3 + "port-version": 4 }, "protobuf-c": { "baseline": "1.3.2-2", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index 547ba83f2e6606..bc2dcdeadbe6c9 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6204194eaf9d8ff0fe78d498f77fee57cd19ce59", + "version-semver": "3.15.8", + "port-version": 4 + }, { "git-tree": "88066eeef097b56edc3bff316ce292d57c132d12", "version-semver": "3.15.8", From 8a3c989cea6e5a7d2c4b63c79a9dcbbe8a3e78c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 4 Aug 2021 01:42:34 +0800 Subject: [PATCH 0248/1858] [vcpkg-cmake] Fix docs and usage of option MAYBE_UNUSED_VARIABLES (#19245) * Remove unused cmake options and MAYBE_UNUSED_VARIABLES values * Update MAYBE_UNUSED_VARIABLES docs * update version * version stuff * version stuff * update docs --- .../vcpkg-cmake/vcpkg_cmake_configure.md | 14 ++++++-- docs/maintainers/vcpkg_configure_cmake.md | 13 +++++++- ports/kf5auth/portfile.cmake | 4 --- ports/kf5auth/vcpkg.json | 1 + ports/kf5codecs/portfile.cmake | 4 --- ports/kf5codecs/vcpkg.json | 1 + ports/kf5completion/portfile.cmake | 4 --- ports/kf5completion/vcpkg.json | 1 + ports/kf5config/portfile.cmake | 4 --- ports/kf5config/vcpkg.json | 1 + ports/kf5dbusaddons/portfile.cmake | 4 --- ports/kf5dbusaddons/vcpkg.json | 1 + ports/kf5guiaddons/portfile.cmake | 4 --- ports/kf5guiaddons/vcpkg.json | 1 + ports/kf5holidays/portfile.cmake | 4 --- ports/kf5holidays/vcpkg.json | 1 + ports/kf5i18n/portfile.cmake | 4 --- ports/kf5i18n/vcpkg.json | 1 + ports/kf5itemmodels/portfile.cmake | 4 --- ports/kf5itemmodels/vcpkg.json | 1 + ports/kf5itemviews/portfile.cmake | 4 --- ports/kf5itemviews/vcpkg.json | 1 + ports/kf5plotting/portfile.cmake | 4 --- ports/kf5plotting/vcpkg.json | 1 + ports/kf5sonnet/portfile.cmake | 7 ---- ports/kf5sonnet/vcpkg.json | 1 + ports/kf5syntaxhighlighting/portfile.cmake | 4 --- ports/kf5syntaxhighlighting/vcpkg.json | 1 + ports/kf5widgetsaddons/portfile.cmake | 4 --- ports/kf5widgetsaddons/vcpkg.json | 1 + ports/kf5windowsystem/portfile.cmake | 4 --- ports/kf5windowsystem/vcpkg.json | 1 + ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 14 ++++++-- scripts/cmake/vcpkg_configure_cmake.cmake | 13 +++++++- versions/baseline.json | 32 +++++++++---------- versions/k-/kf5auth.json | 5 +++ versions/k-/kf5codecs.json | 5 +++ versions/k-/kf5completion.json | 5 +++ versions/k-/kf5config.json | 5 +++ versions/k-/kf5dbusaddons.json | 5 +++ versions/k-/kf5guiaddons.json | 5 +++ versions/k-/kf5holidays.json | 5 +++ versions/k-/kf5i18n.json | 5 +++ versions/k-/kf5itemmodels.json | 5 +++ versions/k-/kf5itemviews.json | 5 +++ versions/k-/kf5plotting.json | 5 +++ versions/k-/kf5sonnet.json | 5 +++ versions/k-/kf5syntaxhighlighting.json | 5 +++ versions/k-/kf5widgetsaddons.json | 5 +++ versions/k-/kf5windowsystem.json | 5 +++ versions/v-/vcpkg-cmake.json | 5 +++ 52 files changed, 160 insertions(+), 86 deletions(-) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md index 3745df08058fec..6053b363c69728 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md @@ -19,7 +19,7 @@ vcpkg_cmake_configure( [OPTIONS_DEBUG ...] [MAYBE_UNUSED_VARIABLES - ...] + ...] ) ``` @@ -61,7 +61,17 @@ If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. This function makes certain that all options passed in are used by the underlying CMake build system. If there are options that might be unused, perhaps on certain platforms, pass those variable names to -`MAYBE_UNUSED_VARIABLES`. +`MAYBE_UNUSED_VARIABLES`. For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `config`, and thus the logfiles end up being something like diff --git a/docs/maintainers/vcpkg_configure_cmake.md b/docs/maintainers/vcpkg_configure_cmake.md index fd6ce13187bb7a..8a1eb3284a4485 100644 --- a/docs/maintainers/vcpkg_configure_cmake.md +++ b/docs/maintainers/vcpkg_configure_cmake.md @@ -17,7 +17,7 @@ vcpkg_configure_cmake( [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] - [MAYBE_UNUSED_VARIABLES ...] + [MAYBE_UNUSED_VARIABLES ...] ) ``` @@ -58,6 +58,17 @@ Additional options passed to CMake during the Debug configuration. These are in ### MAYBE_UNUSED_VARIABLES Any CMake variables which are explicitly passed in, but which may not be used on all platforms. +For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` ### LOGNAME Name of the log to write the output of the configure call to. diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 439a6364b032f0..da48a9c9d46c67 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -13,10 +13,6 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_DATAROOTDIR=data - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index bbe7707b60430b..3b15b73bd52af3 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5auth", "version": "5.84.0", + "port-version": 1, "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 8090f7f3a62cd1..9690c58f252b99 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -15,10 +15,6 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_cmake_install() diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index cf86de687368a4..de0042d38218f2 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5codecs", "version": "5.84.0", + "port-version": 1, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 281778d95a66e3..4bb886a3677e8f 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -13,10 +13,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index b94ab097b6c210..2849f7867f8a3c 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5completion", "version": "5.84.0", + "port-version": 1, "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 2eac560f062000..3e831a2b98b1cc 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 8e653e013f9e3a..a2e0f26a14d4d1 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5config", "version": "5.84.0", + "port-version": 1, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index 3f29ad5a301ba2..372773c44d6284 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -11,10 +11,6 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_cmake_install() diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index e2739f505b10b4..c545dc94a4acfe 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5dbusaddons", "version": "5.84.0", + "port-version": 1, "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index fea154b3e2c9c0..fbe95894160a6d 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -23,10 +23,6 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 6e976e621aad91..871117156ce056 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5guiaddons", "version": "5.84.0", + "port-version": 1, "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 332fff5d6f4684..765d752300d0ac 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 8102c2a2746d21..1d79a711193015 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5holidays", "version": "5.84.0", + "port-version": 1, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 5b4b0a6015fdd0..21851c16393152 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -15,10 +15,6 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DPYTHON_EXECUTABLE=${PYTHON3} - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 80a2eefe6e5f4e..fb1c47e8a3cb7b 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.84.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 8b21d00a2313fd..a45b13bbba4291 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=qml - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index 452486d6391d20..5022b2142c9391 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemmodels", "version": "5.84.0", + "port-version": 1, "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index e7b986624675a9..51707dd62caeed 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index 7dcfa823fe82aa..f7e41014927681 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemviews", "version": "5.84.0", + "port-version": 1, "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index eb3b58f3518fa6..9897fb89b79cc4 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index cd7824cea119a2..7a99dc14549110 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.84.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index 5710d63b7a5baf..2cdff734d2aad1 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -14,13 +14,6 @@ vcpkg_cmake_configure( -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_DATAROOTDIR=data -DKDE_INSTALL_QTPLUGINDIR=plugins - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF - MAYBE_UNUSED_VARIABLES - BUILD_HTML_DOCS - BUILD_MAN_DOCS - BUILD_QTHELP_DOCS ) vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json index 8f4b783ce3c483..d9d0f1173a98bc 100644 --- a/ports/kf5sonnet/vcpkg.json +++ b/ports/kf5sonnet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5sonnet", "version-semver": "5.84.0", + "port-version": 1, "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index a91422b9e6b8b8..1453c26d8c4b29 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -16,10 +16,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake(ADD_BIN_TO_PATH) diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index 441e3e7f5919cd..5c4cb98a72b04d 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5syntaxhighlighting", "version": "5.84.0", + "port-version": 1, "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 3802aedd48f538..453397dadf7676 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -13,10 +13,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index b73d659ed57794..23429f98328508 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5widgetsaddons", "version": "5.84.0", + "port-version": 1, "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 7873721cbb1b9e..1c15090b2d56f0 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -16,10 +16,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index 34a21787a003af..40ea4209d561ee 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5windowsystem", "version": "5.84.0", + "port-version": 1, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index f7d28a5665c8b0..96134a85035daa 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-07-26" + "version-date": "2021-07-30" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 889fa8c09626fb..801db016640505 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -18,7 +18,7 @@ vcpkg_cmake_configure( [OPTIONS_DEBUG ...] [MAYBE_UNUSED_VARIABLES - ...] + ...] ) ``` @@ -60,7 +60,17 @@ If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. This function makes certain that all options passed in are used by the underlying CMake build system. If there are options that might be unused, perhaps on certain platforms, pass those variable names to -`MAYBE_UNUSED_VARIABLES`. +`MAYBE_UNUSED_VARIABLES`. For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `config`, and thus the logfiles end up being something like diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 56bf9bd57661af..0377ae5dd8c56b 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -15,7 +15,7 @@ vcpkg_configure_cmake( [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] - [MAYBE_UNUSED_VARIABLES ...] + [MAYBE_UNUSED_VARIABLES ...] ) ``` @@ -56,6 +56,17 @@ Additional options passed to CMake during the Debug configuration. These are in ### MAYBE_UNUSED_VARIABLES Any CMake variables which are explicitly passed in, but which may not be used on all platforms. +For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` ### LOGNAME Name of the log to write the output of the configure call to. diff --git a/versions/baseline.json b/versions/baseline.json index 23329bde0bdad6..2327eb7dab4548 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2866,19 +2866,19 @@ }, "kf5auth": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5codecs": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5completion": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5config": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5coreaddons": { "baseline": "5.84.0", @@ -2890,27 +2890,27 @@ }, "kf5dbusaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5guiaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5holidays": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5i18n": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5itemmodels": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5itemviews": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5jobwidgets": { "baseline": "5.84.0", @@ -2918,7 +2918,7 @@ }, "kf5plotting": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5solid": { "baseline": "5.84.0", @@ -2926,19 +2926,19 @@ }, "kf5sonnet": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5syntaxhighlighting": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5widgetsaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5windowsystem": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kfr": { "baseline": "2020-06-15", @@ -6581,7 +6581,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-07-26", + "baseline": "2021-07-30", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index 21cfce4e5b263d..acaa00c199a4f6 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f1399e14100a7c100bc55f8d436224c680a7f52", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "09194a3548898b6548ab3e61e45a9f6a4388aa6e", "version": "5.84.0", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index c6c6664cf207c4..544d164b30cc02 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc839f57cba8b67ed071d5dc3a472b605033cd7a", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "b0b56e3e645427bfc9efe47c4050ba295e5e261e", "version": "5.84.0", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index 34ae35a18834b2..6192590e9f46f3 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b32643e981f1d9bab04fd3526e9c6c4499d35d1f", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "0ffa13221ac2980b44af52cae6392718f80f5d3f", "version": "5.84.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 58c153aee653e5..69d611da1f990c 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67fa669df81328489ba66231cef84fc17ae4f434", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "57c0ad579f0582463fe73a7ca64f1af6eadcea16", "version": "5.84.0", diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json index 8121d563f326a9..1c4e812e83f781 100644 --- a/versions/k-/kf5dbusaddons.json +++ b/versions/k-/kf5dbusaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "417fdf58b130c7e24794cf4d1d29336cb946f9fa", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "d7d33a4c88aa692230617ecc58693dbaa3290ba7", "version": "5.84.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 4446fe71372f1a..723eed3676376b 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7413c9e8bfa4e7db669271b3c13fe5cf7c52567a", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "13acc7a53a47646048061054946bcce0f8acbf7b", "version": "5.84.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 0fa15a94be16ba..b2fca6bd61108f 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b969d43d406c095970b4e98cc3b19c27567b557c", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "a43e4fcc0dedd0d8f6722386a97a688c001fa508", "version": "5.84.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 8b467a806c7320..b880dc638d13f1 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d01fec0fb56e9c2d95b743b0b13e544d5428a7", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "08dd3d175400c8e6f91fc3d7f6cbc7eff8a3e976", "version": "5.84.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index 6be47b0b0f102a..b498ce49793dc7 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b222a404755239053edfac06ee63bf3710719fe9", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "2efa93694b3389e09de76095a6fa35ce41b30f2d", "version": "5.84.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index fc2b3fa77130a2..3e9fe71355712a 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "164cc5f1d9ccfdf89ef60c4b718b8f6777162ea5", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "257c4740f00dab4e0c650543f7cec08b395bcceb", "version": "5.84.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 688441bb9ee0c6..7a594e4f98edd3 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39f28709c5b4d6e1c706c7e15617b7c052830122", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "b105a7f2a86040a1a7b5622371d7c0d5cd65fd16", "version": "5.84.0", diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json index 78e3c649f27d9b..c5cd6b7ebd0409 100644 --- a/versions/k-/kf5sonnet.json +++ b/versions/k-/kf5sonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de4fdcac67da4df0962414b4b1f71d98753d4c4e", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "7f6d9ebeec45c6354fd96f1ee04b9e34063e33b0", "version-semver": "5.84.0", diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index 56edfa52c1f5cb..706ca85fb99369 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bec703b0c5345b456bdbddf6e043d1c31dd2906", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "6033609633223323ffc8762d0e2a6ab24c323de7", "version": "5.84.0", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index 088d33ee00b868..77880f2902c8b9 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de99d19b892fe1551e87c6dd3a1c2d353bfc3f76", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "f27e6f9ba66090bf93b9db1bbf3973d472bd9627", "version": "5.84.0", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 536c431dad20b1..091e5c1e5ee820 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "719b81cebad63502bbb619781290844c586acef9", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "178fa49af1a113118be6d61a68c31930aa276e17", "version": "5.84.0", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 02a8816c1ab2cb..086edd0208cb20 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6df7e0faeda9e783175746c7c440c9bc2bdb111", + "version-date": "2021-07-30", + "port-version": 0 + }, { "git-tree": "ae2178d81ee39baf4c7e9fd6ed3f011b01a93635", "version-date": "2021-07-26", From 714dc8d189099bc8488b680403a05d1a1399359c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 3 Aug 2021 13:56:45 -0700 Subject: [PATCH 0249/1858] Fix title capitalization from https://github.com/vcpkg/vcpkg.github.io/pull/54 (#19345) --- docs/about/privacy.md | 2 +- docs/examples/packaging-zipfiles.md | 2 +- docs/users/selecting-library-features.md | 2 +- docs/users/triplets.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/about/privacy.md b/docs/about/privacy.md index 3d19e060d1e81f..d2ba7552e15046 100644 --- a/docs/about/privacy.md +++ b/docs/about/privacy.md @@ -1,4 +1,4 @@ -# Vcpkg telemetry and privacy +# Vcpkg Telemetry and Privacy vcpkg collects telemetry data to understand usage issues, such as failing packages, and to guide tool improvements. The collected data is anonymous. For more information about how Microsoft protects your privacy, see https://privacy.microsoft.com/en-US/privacystatement#mainenterprisedeveloperproductsmodule diff --git a/docs/examples/packaging-zipfiles.md b/docs/examples/packaging-zipfiles.md index 334316403d3dfc..979cc29b45db47 100644 --- a/docs/examples/packaging-zipfiles.md +++ b/docs/examples/packaging-zipfiles.md @@ -1,4 +1,4 @@ -## Packaging Zipfiles Example: zlib +## Packaging `.zip` Files Example: zlib ### Bootstrap with `create` First, locate a globally accessible archive of the library's sources. Zip, gzip, and bzip are all supported. Strongly prefer official sources or mirrors over unofficial mirrors. diff --git a/docs/users/selecting-library-features.md b/docs/users/selecting-library-features.md index 65cab45dce66e0..a780d640370cdb 100644 --- a/docs/users/selecting-library-features.md +++ b/docs/users/selecting-library-features.md @@ -1,4 +1,4 @@ -# Selecting library features +# Selecting Library Features **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/selecting-library-features.md).** diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 794c14b486d423..e1098a39a819b0 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -1,4 +1,4 @@ -# Triplet files +# Triplet Files **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/triplets.md).** From aeaa5ef9ee5fa5125c6f20daa7218daf3962168f Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 4 Aug 2021 08:06:29 +0800 Subject: [PATCH 0250/1858] [Azure-*] Remove version constraint (#19299) * [Azure-*] Remove version constraint * Update the baseline version * Remove builtin-baseline * format manifest file * Update baseline version --- ports/azure-security-keyvault-keys-cpp/vcpkg.json | 5 ++--- ports/azure-storage-blobs-cpp/vcpkg.json | 5 ++--- ports/azure-storage-common-cpp/vcpkg.json | 5 ++--- ports/azure-storage-files-datalake-cpp/vcpkg.json | 5 ++--- ports/azure-storage-files-shares-cpp/vcpkg.json | 5 ++--- versions/a-/azure-security-keyvault-keys-cpp.json | 5 +++++ versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ versions/a-/azure-storage-files-datalake-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 10 +++++----- 11 files changed, 40 insertions(+), 20 deletions(-) diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index 90bb18eb9c28ea..a5563598d4fc81 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,18 +1,17 @@ { "name": "azure-security-keyvault-keys-cpp", "version-semver": "4.0.0-beta.4", + "port-version": 1, "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." ], "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-keys", "license": "MIT", - "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-core-cpp", - "default-features": false, - "version>=": "1.1.0" + "default-features": false }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 62eb9e91e53b27..d58789ac2df927 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,18 +1,17 @@ { "name": "azure-storage-blobs-cpp", "version-semver": "12.0.1", + "port-version": 1, "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." ], "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs", "license": "MIT", - "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false, - "version>=": "12.0.0" + "default-features": false }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index fa955270ce04fe..3e6864f77d35a2 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,18 +1,17 @@ { "name": "azure-storage-common-cpp", "version-semver": "12.0.1", + "port-version": 1, "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." ], "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-common", "license": "MIT", - "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-core-cpp", - "default-features": false, - "version>=": "1.0.0" + "default-features": false }, "libxml2", { diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index 79a8a8b80301ef..63dde71174212a 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,18 +1,17 @@ { "name": "azure-storage-files-datalake-cpp", "version-semver": "12.0.1", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." ], "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake", "license": "MIT", - "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-blobs-cpp", - "default-features": false, - "version>=": "12.0.0" + "default-features": false }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 73a2d9c82817b8..400ca6901f6e1c 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,18 +1,17 @@ { "name": "azure-storage-files-shares-cpp", "version-semver": "12.0.1", + "port-version": 1, "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." ], "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares", "license": "MIT", - "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false, - "version>=": "12.0.0" + "default-features": false }, { "name": "vcpkg-cmake", diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index b87aed9c0a5b3c..68ac66819d9751 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a62e90cc13ab362ba09462fa444512aee671482", + "version-semver": "4.0.0-beta.4", + "port-version": 1 + }, { "git-tree": "beff44522cd72f08bddabfc35a520533b97d1819", "version-semver": "4.0.0-beta.4", diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 9360d7da82ac53..bc5ac374fc1a62 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4927a9eacb27a8088d82005fbae2851755d09ce1", + "version-semver": "12.0.1", + "port-version": 1 + }, { "git-tree": "07131431279c91d81edd9ec56005ee8628c3efdb", "version-semver": "12.0.1", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index fba5190b1da0b0..858d26eb42a136 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f18fbd3b20bfc22766b8767ab8b668be4ea18f58", + "version-semver": "12.0.1", + "port-version": 1 + }, { "git-tree": "d4ce9c53796add134d3ce8f29a9be4e33eba6c2a", "version-semver": "12.0.1", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index d677d463b89563..6ded729267312b 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "649b055538511bad19442d11dd356688cac46370", + "version-semver": "12.0.1", + "port-version": 1 + }, { "git-tree": "305658dfe1b6b28abc8be014794e6b21e8ba5722", "version-semver": "12.0.1", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index e574f13dd00e6c..adbde50819116c 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eccf58c6719e0f859f90420dffb5deb2cccac731", + "version-semver": "12.0.1", + "port-version": 1 + }, { "git-tree": "70c68c7920b221b2b571ba85d48ba215c0e9cb58", "version-semver": "12.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 2327eb7dab4548..dc606ae45d6949 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -298,15 +298,15 @@ }, "azure-security-keyvault-keys-cpp": { "baseline": "4.0.0-beta.4", - "port-version": 0 + "port-version": 1 }, "azure-storage-blobs-cpp": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "azure-storage-common-cpp": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "azure-storage-cpp": { "baseline": "7.5.0", @@ -314,11 +314,11 @@ }, "azure-storage-files-datalake-cpp": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "azure-storage-files-shares-cpp": { "baseline": "12.0.1", - "port-version": 0 + "port-version": 1 }, "azure-uamqp-c": { "baseline": "2020-12-09", From 3b28531ac4634c5ca391294cad5365b781bd95e3 Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Tue, 3 Aug 2021 20:10:17 -0400 Subject: [PATCH 0251/1858] [daw-json-link] New port (#18411) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [json-link] package exists * [vcpkg-tools] update nuget to 5.9.1 (#18447) * [vcpkg_download_distfile] Add condition for padding the SHA (#18459) * [open6254] Enable uwp support (#18390) * open62541: Enable uwp support * Update versions for open62541 * [aubio] Add ws2_32 to linkage (#18385) * [aubio] Add ws2_32 to linkage * Update version files * [devil] Fix ilut header (#18384) * [devil Fix ilut header * Update baseline * [libpq] Add Secur32.lib and openssl to libpq cmake wrapper (#18377) * [libpq] add secur32.lib to wrapper * version stuff * add openssl fix. * fix version stuff * [ryml] [c4core] Update RapidYaml (ryml) to newer version (#18230) * remove old port version * fix versions yet again Co-authored-by: Michael Goulding * [yyjson] Update to v0.3.0 (#18359) * [yyjson] Update to 0.3.0 * [yyjson] vcpkg x-add-version yyjson * [raylib] Fix MinGW build (#18362) . * [arrow] Update to 4.0.0 (#17975) * Update arrow to 4.0.0 * Format * Try fix thrift * Update versions/ files * Do not set ZSTD_ROOT * Remove double quotes causing Windows problems * Apply patches * Remove LIB_DIR_OPTIONS * Tweak zstd flags * Update version hash * Format * Fail early on x86 * Update hash * Fail early on arm, arm64 * Update hash * Add expected failures to to scripts/ci.baseline.txt * Exclude mallocs from default features * Update hash * Set default-features to false for aws-sdk-cpp Co-authored-by: Robert Schumacher * Specify only x64 support in manifest Co-authored-by: Robert Schumacher * Remove unneeded ci.baseline.txt entries Co-authored-by: Robert Schumacher * Remove dataset from default-features Co-authored-by: Robert Schumacher * Update hash * Remove zstd path args * Update hash Co-authored-by: Tanguy Fautre Co-authored-by: Robert Schumacher * [minizip] Fix usage, fix minizipConfig.cmake (#18472) * [minizip] Fix usage, fix minizipConfig.cmake * update version record * [windres-rc] Fix wrapper output (#17045) * [ffmpeg] Warn/fail when selecting unsupported features. (#17153) * [ffmpeg] Warn/fail when selecting unsupported features. * Update ffmpeg.json * Bump port-version * Update ffmpeg.json * [ffmpeg] Check for gpl/nonfree aswell as all option. * avisynth now support static linking * fixup typo * Update ffmpeg.json * Revert to fatal error on even when all is selected * Update ffmpeg.json * [ffmpeg] Disable openh264 on uwp * update * Update versions/f-/ffmpeg.json * update * Update ffmpeg.json * update * update * Update Co-authored-by: Billy Robert ONeal III Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [uwebsockets] update to 19.2.0 (#18525) * [uwebsockets] update to * update version * [libass] fix fontconfig dependency in .pc file (#18516) * [libass] fix fontconfig dependency in .pc file on x64-linux * [libass] bump port version * [libass] x-add-version * [libgpg-error] Remove COPYING.LIB from lib folder (#18492) * [libgpg-error] Remove COPYING.LIB from lib folder * Update version files * [flashlight-cuda] Fix installation (#18489) * [flashlight-cuda] Fix installation * Update version files * [function2] Update to version 4.2.0 (#18487) * [infoware] update to latest commit (#18486) * update infoware to latest commit * update deprecated functions * remove redundant file cleanup * add versioning * [nameof] Update to 0.10.1 (#18574) * [OpenCV] update to 4.5.2 (#18572) * [OpenCV] update to 4.5.2 * update version refs * [OpenCV4] fix qt integration * fix refs * [qt5-*] Make QT and dependents build on arm macos (#18567) * [qt5-*] Make it build on ARM64 macos * [qt5-base] update port version * [pcre2] Update to 10.37 (#18547) - New upstream version 10.37 - Drop patches (fixed upstream): pcre2-10.35_add_check_for_Intel_CET.patch pcre2-10.35_fix_postfix_for_debug_Windows_builds.patch pcre2-10.35_fix-space.patch - Switch from CONTROL to vcpkg.json .\vcpkg format-manifest .\ports\pcre2\CONTROL * [openblas] Fix the macro collision with Windows 10 SDK (#18530) * [openblas] Fix the macro collision with Windows 10 SDK * Update version files * Update feature thread as threads in vcpkg.json * Update versions/o-/openblas.json * [pthreads] Fix debug dll look-up path (#18528) * [gtest] Update to 1.11.0 (#18509) * [gtest] Update to release version 1.11.0 * x-add-version * Update ports/gtest/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * renewal of x-add-version. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [librttopo] Allow building for Android (#18451) * [librttopo] Allow building for android * x-add-version * Update versions/l-/librttopo.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * [Qt6] Update to 6.1.1 (#18320) * [qt6] Update to 6.1.1 * version stuff * fix empty dir * update version * fix casing in qtbase * [libpq] add secure32.lib on windows * add clang-cl fix * version stuff * fix flag removal by adding a space * version stuff * make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q * fix libpq wrapper opensll linkage on linux * use policy to fix dependent ports * version stuff * use upstream patch * version stuff * fix source location for clang-cl * version stuff * remove ws change * version stuff * [libspatialite] Fix building for android (#18452) * [libspatialite] Fix building for android * x-add-version * Update versions/l-/libspatialite.json * Update libspatialite.json * [seal]Updated to version 3.6.6. Replaced CONTROL with manifest file. (#18457) * Updated seal to version 3.6.6. Replaced CONTROL with manifest file. * Changed version-string to version-semver. * Updated versions/s-/seal.json. * Added a missing CMake arguement. * Updated versioning. * Fixed hexl config file. * Updated versioning. * Fixed hexl not finding dependency. * Updated versioning. * [libcopp] Update to 1.4.1 (#18425) * [dxut, fx11, directxmath] ports updated (#18431) * [dxut] port updated for latest servicing * update baseline * Update to use latest DirectXMath * Fix baseline * fx11 metadata update * Updated baseline * Converted directxmath CONTROL to vcpkg.json * Update baseline * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Code review feedback * Update baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [uvatlas, spectra] ports updated (#18404) * [uvatlas, spectra] ports updated * Update versions * Minor code review * Update version * Code review feedback * Update baseline * [jsoncons] Update to 0.165.0 (#18284) * [jsoncons] Update to 0.165.0 * [jsoncons] Update to 0.165.0, update baseline * [jsoncons] Added vcpkg_fixup_pkgconfig() to portfolio.cmake * update version Co-authored-by: Jonliu1993 <13720414433@163.com> * [cpr] Update to 1.6.2 (#18386) * [cpr] Update to 1.6.2 * Update version files * Update patch * Update verison files * Update ports/cpr/portfile.cmake * Update versions/c-/cpr.json * Fix build error on uwp * Update versions/c-/cpr.json * Add condition for uwp patch * Update versions/c-/cpr.json * Update ports/cpr/portfile.cmake * Update versions/c-/cpr.json * [ CGAL] Update version to 5.2.2 (#18387) * Update to CGAL 5.2.2 * x-add-version * Reset port version to 0 * x-add-version * Update versions/c-/cgal.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * [nanopb] update to 0.4.5 and add generator (#18241) * [nanopb] update to 0.4.5 and add generator * add versions * fix python install? * update version * fix python? again * version * test python * add version * fix portfile * version * Update ports/nanopb/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/nanopb/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * update version Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update VMs and pick up VS2019 16.10 (#18233) * Cherry-pick https://github.com/microsoft/vcpkg/pull/15598 * Hook deploy-inteloneapi into create-vmss.ps1. * Add script to resolve https://github.com/microsoft/vcpkg/issues/17521 * Move tls settings deployment to the front and respond to script triggering a reboot. * Go back to provisioning an extra disk to workaround https://github.com/microsoft/vcpkg/issues/18379 * Disallow public access to blob storage and require TLS 1.2. * Update Pools. * Update tool to 2021-06-19 * [simage] Skip simage on uwp platforms as it appears broken by 16.10. * [tensorflow-cc] Skip because changes in our MacOS hardware broke the port. * [vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH (#17336) * [vcpkg.cmake] PREPEND CMAKE_FIND_ROOT_PATH * [vcpkg.cmake] make PREPEND optional (default off, option VCPKG_PREFER_VCPKG_LIBS) * Apply suggestions from code review Co-authored-by: nicole mazzuca * Update scripts/buildsystems/vcpkg.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca * [vcpkg-unstable] Update agent pool name * [boringssl] update to newer commit (#18604) * [boringssl] update to newer commit * update version * [vcpkg baseline][kf5* librsvg] Add DISABLE_PARALLEL_CONFIGURE (#18600) * [kf5*] Add DISABLE_PARALLEL_CONFIGURE * Update version files * [librsvg] Add DISABLE_PARALLEL_CONFIGURE * Update version files * [benchmark] Update to 1.5.5 (#18595) * update benchmark * version stuff * [nuspell] Update to version 5.0.0 (#18590) * [nuspell] Update to version 5.0.0 * x-add-version nuspell * [matplotplusplus] Fix usage (#18583) * [matplotplusplus] Fix usage * update version record * Remove rename code * update version * [vcpkg baseline][ncurses] Fix gnu download link (#18579) * [ncurses] Fix gnu download link * update version record * [magic-enum] Update to v0.7.3 (#18575) * [magic-enum] Update to v0.7.3 * fix * [libsmb2] New port (#18471) * added libsmb2 port * added version file * updated baseline * Ran command ./vcpkg x-add-version --all and then ./vcpkg format-manifest ports/libsmb2/vcpkg.json * updated SHA based on result of "./vcpkg x-add-version libsmb2" and also added osx=fail to CI file in order to pass CI * suggested changes made * sha * Update scripts/ci.baseline.txt Co-authored-by: Robert Schumacher * Update ports/libsmb2/vcpkg.json Co-authored-by: Robert Schumacher * Update ports/libsmb2/portfile.cmake Co-authored-by: Robert Schumacher * sha * added missing "vcpkg_check_linkage(ONLY_STATIC_LIBRARY)" * sha * vcpkg_fixup_pkgconfig() * sha Co-authored-by: Tim Co-authored-by: Robert Schumacher * [fluidsynth] update to 2.2.1 (#18524) * [fluidsynth] update to 2.2.1 * update version * delete vcpkg_fixup_pkgconfig * update version * [trantor] Update to 1.5.0 (#18534) * [trantor] Update to 1.5.0 * Add vcpkg_fixup_pkgconfig() * [libogg] Upgrade to 1.3.5 (#18546) * [libogg] Upgrade to 1.3.5 * Upgrade to 1.3.5. * Convert CONTROL to vcpkg.json * Change homepage to https://www.xiph.org/ogg (as in README.md) * Download from the main repo https://gitlab.xiph.org/xiph/ogg * [libogg] Use version instead of version-string in manifest * [libogg] Update libogg.json * [fdk-aac] Update to version 2.0.2. (#18549) * [fdkaac] Update to version 2.0.2. * [fdk-aac] Remove unused files. * Update fdk-aac.json * Update ports/fdk-aac/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * test uwp|arm compilation. * Update fdk-aac.json * Convert to json. * Update vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [pcre] Update to 8.45 (#18550) - New upstream version 8.45 This is the final release of PCRE1 - Update patches: export-cmake-targets.patch pcre-8.45_suppress_cmake_and_compiler_warnings-errors.patch - Add patch: pcre-8.45_fix_postfix_for_debug_Windows_builds.patch - Remove deprecated SYSTEM_LIBRARIES from vcpkg_fixup_pkgconfig() - Switch from CONTROL to vcpkg.json .\vcpkg format-manifest .\ports\pcre\CONTROL * [gstreamer] create a new port (#17394) * [gstreamer] create port with meson * initial build config * nodownload in vcpkg_configure_meson needs be removed * [gstreamer] remove duplicated GL headers * 1st check for deps in windows * mac: fix regex for bison * [gstreamer] more detailed options * remove glib usage Will use WIP changes in microsoft/vcpkg * [gstreamer] build with glib port * [gstreamer] extract plugins to features * fix some config errors in windows * fails to find z.lib. this should be zlib.lib * [gstreamer] create patches to search 'zlib' * update tool list * [vcpkg meson] add path of GIT * use append for LINKER_FLAGS Allow injection of LINKER_FLAGS to vcpkg_configure_meson * [gstreamer] update baseline and port SHA * [gstreamer] zlib is required for Windows * Revert "[vcpkg meson] add path of GIT" This reverts commit 8a67fbd1d287fa769cf516b834981ea175463492. * [gstreamer] make git visible in meson * [gstreamer] fix platform expression * [gstreamer] revert change of vcpkg_configure_meson * [gstreamer] modify build.ninja after configure * [gstreamer] drop unknown flag with vcpkg_replace_string * [gstreamer] disable 'devtools' option * [gstreamer] remove dylib * [gstreamer] move dll,pdb after install * [gstreamer] remove 'nls' feature Co-authored-by: Billy Robert ONeal III * [python3] Fix python3:x64-linux builds (#18405) * Fix build * Update vcpkg.json * Fix build Co-authored-by: Ankur Verma Co-authored-by: Ankur Verma * CI Fixes from 2021-06-26 (#18664) * CI Fixes from 2021-06-26 https://dev.azure.com/vcpkg/public/_build/results?buildId=55364&view=logs&j=0a61404f-5c45-5632-e83c-408b7fcca1d6&t=59cc5a87-398a-597b-cb3d-5842723775f1 PASSING, REMOVE FROM FAIL LIST: aubio:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: aubio:x64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: aubio:x86-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: caf:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: chartdir:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: coolprop:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fdk-aac:arm-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fdk-aac:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fdk-aac:x64-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: fontconfig:x64-windows-static-md (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: google-cloud-cpp:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: gtkmm:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: libmagic:x64-windows-static (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: libmagic:x64-windows-static-md (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: libopusenc:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: lua:arm-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: lua:x64-uwp (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: matio:x64-linux (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: offscale-libetcd-cpp:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: proj4:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: z3:arm64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: zeromq:arm64-windows (.\scripts\ci.baseline.txt) :) REGRESSION: clipp:x86-windows. If expected, add clipp:x86-windows=fail to .\scripts\ci.baseline.txt. >[DEBUG] Downloading https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/4645fafe85a8099ea97b85e939747a12e9b3b92213b5b8207a9c277537377b77b5daebd88a4c090ea89cfff2937a9fc155da6e8b5558574d7129227c28826e1c?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D >[DEBUG] Downloading https://github.com/muellan/clipp/archive/2c32b2f1f7cc530b1ec1f62c92f698643bb368db.tar.gz >Error: Failed to download from mirror set: >https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/4645fafe85a8099ea97b85e939747a12e9b3b92213b5b8207a9c277537377b77b5daebd88a4c090ea89cfff2937a9fc155da6e8b5558574d7129227c28826e1c?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D: failed: status code 403 >https://github.com/muellan/clipp/archive/2c32b2f1f7cc530b1ec1f62c92f698643bb368db.tar.gz: failed: status code 502 >[DEBUG] C:\A\1\14\s\src\vcpkg\base\downloads.cpp(652) Looks like a transient download failure. Might be something funky with artifact caching. REGRESSION: liblas:arm64-windows. If expected, add liblas:arm64-windows=fail to .\scripts\ci.baseline.txt. >fatal error C1189: #error: The file liblas/detail/endian.hpp needs to be set up for your CPU type. Probably was blocked by one of the many "passing" libs on arm64-windows. Skipped. REGRESSION: libsbml:x64-windows-static. If expected, add libsbml:x64-windows-static=fail to .\scripts\ci.baseline.txt. >[DEBUG] Downloading https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/49dedaa2fcd2077e7389a8f940adf931d80aa7a8f9d57330328372d2ac8ebcaeb03a20524df2fe0f1c6933587904613754585076c46e6cb5d6f7a001f427185b?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D >[DEBUG] Downloading https://sourceforge.net/projects/sbml/files/libsbml/5.18.0/stable/libSBML-5.18.0-core-plus-packages-src.tar.gz/download >Error: Failed to download from mirror set: >https://vcpkgteststorage.blob.core.windows.net/osxpr20201017/49dedaa2fcd2077e7389a8f940adf931d80aa7a8f9d57330328372d2ac8ebcaeb03a20524df2fe0f1c6933587904613754585076c46e6cb5d6f7a001f427185b?sv=2019-12-12&ss=b&srt=sco&sp=rwlac&se=2021-06-01T19:00:00Z&st=2021-02-02T21:14:48Z&spr=https&sig=5OqlHLAKxxH9%2F2G%2BwO4ngXiG%2Bd0ASB81PklNDOIAUUk%3D: failed: status code 403 >https://sourceforge.net/projects/sbml/files/libsbml/5.18.0/stable/libSBML-5.18.0-core-plus-packages-src.tar.gz/download: WinHttpReceiveResponse() failed: 12175 > >[DEBUG] C:\A\1\14\s\src\vcpkg\base\downloads.cpp(652) >[DEBUG] Exiting after 548953 us (542540 us) Looks like a transient download failure. But 403 forbidden looks like artifact caching failure... REGRESSION: luafilesystem:arm-uwp. If expected, add luafilesystem:arm-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: luafilesystem:x64-uwp. If expected, add luafilesystem:x64-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: luasocket:arm-uwp. If expected, add luasocket:arm-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: luasocket:x64-uwp. If expected, add luasocket:x64-uwp=fail to .\scripts\ci.baseline.txt. Were previously blocked by lua, marked as 'fail'. REGRESSION: vcpkg-find-acquire-program:arm-uwp. If expected, add vcpkg-find-acquire-program:arm-uwp=fail to .\scripts\ci.baseline.txt. REGRESSION: vcpkg-find-acquire-program:x64-windows-static. If expected, add vcpkg-find-acquire-program:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: vcpkg-find-acquire-program:x64-windows. If expected, add vcpkg-find-acquire-program:x64-windows=fail to .\scripts\ci.baseline.txt. These are almost certainly the same artifact caching transient. * Aubio typo. * [netcdf-c] Fix pc files; use features (#18120) * Format manifest * New port-version * Quote filepath expressions * Port to vcpkg-cmake ports * Remove invalid nc-config file * Fix pc files * Use features * Add feature 'tools' * x-add-version * Fix build with msys2 mingw * Update git-tree * [portaudio] Switch to vcpkg_from_github, minor format improvements (#18065) * Add portaudio:: namespace * Switch from vcpkg_from_git to vcpkg_from_github * Convert portfile to unix line-endings * Increase port-version of portaudio * Update version hash of portaudio * Remove namespace patch Signed-off-by: Hendrik * Update version hash of portaudio * Fix indent issue * Update the baseline version * Fix the port version * Fix baseline version * Remove redundant tag in portfile * Update version hash of portaudio Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> * [sleef] create a new port (#18075) * [sleef] create a new port * [sleef] update baseline * [sleef] update supports * add more supported architectures to sleef * [sleef] update ci.baseline.txt * Revert "[sleef] update ci.baseline.txt" This reverts commit 39685ae755048ebc4702ddfb659026f910ce885a. * [sleef] disable (arm & windows) The project's CI doesn't check it. Disable in support field. * Update ports/sleef/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [sleef] update git-tree SHA Co-authored-by: nicole mazzuca Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update vcpkg tool to resolve leak of the asset cache token (#18720) * [llvm] update to 12.0.0, enable zlib and libxml2 (#17302) * [llvm] update to 12.0.0, enable zlib and libxml2 * [llvm] disable libxml2 by default, arm64-windows should be supported * [llvm] try to fix build with ffi on Windows #17663 * [llvm] re-enable libxml2 * [llvm] fix formatting * [llvm] overwrite version * [mesa] update to v21.1.0 * [llvm] update ci.baseline * [halide] update to the latest master commit * [llvm] disable libxml2 port until complete PR #15390 * update versions * [llvm] fix disabling of external libraries * update version * update ci.baseline * update ci.baseline * fix typo * [llvm] fix libxml2 (depends on #17945) * revert "[halide] update to the latest master commit" * update versions * [halide] fix zlib dependency for tools * update versions * [halide] update to official release v12.0.0 * update versions * [halide] update to v12.0.1 * update version * [mesa] remove llvm from defaults * update version * update ci.baseline * [mesa] update to v21.1.2 and fix build with LLVM on Windows * [llvm] allow to build libunwind project on Windows * update versions * [mesa] update ci.baseline.txt to disable x64-windows-static-md, may be fixed in the PR #18495 * [vcpkg internal] Update compiler test scripts to use asset caching. * [mpg123] Upgrade to 1.28.0 (#18403) * [mpg123] Upgrade to 1.28.0 * [libopenmpt] Upgrade to 2017-01-28-cf2390140-2 * [mpg123] Disable UWP port * Fix libmpg123 UWP build * Fix libout123 UWP build * Fix libsyn123 UWP build * Update ports/libopenmpt/CMakeLists.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/libopenmpt/CMakeLists.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [libopenmpt] Update libopenmpt.json * [mpg123] Separate UWP patches Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher * [vcpkg_configure_make] Fix mingw (cross) build issues (#18554) * Set ENV{WINDRES} for mingw * Fix passing of '${prefix}' for mingw cross builds * [vcpkg] Add static triplet for arm-windows (#18300) * [scripts] Add vcpkg_completions.zsh (#18274) * Add vcpkg_completions.zsh * Update scripts/vcpkg_completion.zsh * [vcpkg baseline][simage] Update to 1.8.1 (#18645) * [simage] Update to 1.8.1 * Format manifest and update version files * Revert the changes for arm and uwp in ci.baseline.txt * Update versions/s-/simage.json * Update ports/simage/portfile.cmake * Update ports/simage/portfile.cmake * Update ports/simage/portfile.cmake * Update versions/s-/simage.json * Add options to packages * Update versions/s-/simage.json * Update portfile.cmake * Update versions/s-/simage.json * Update portfile.cmake * Update versions/s-/simage.json * [simage] Reorganize all features, add features * Install tool simage-config on non-Windows * fix typo * Add supports field and update ci.baseline.txt * Update versions/s-/simage.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY * [curl] Fix linker flags in curl-config and libcurl.pc for osx (#17790) * Fix exported framework linker flags for osx * x-add-version * Remove cmake version check * Update git-tree * [halide] Fix several issues with the Halide port after v12 (#18747) * Fix several issues with the Halide port after v12 1. Use vcpkg-cmake and vcpkg-cmake-config ports 2. Fix usage file to point to relevant documentation 3. Remove OpenGL feature (Halide 12 dropped support) 4. Drop VCPKG_POLICY_EMPTY_PACKAGE 5. Set new Halide packaging variables for better vcpkg compliance. * update versions * [nettle] Remove from ci.baseline.txt (#18745) * [nettle] Test on x64 windows * Revert the changes for nettle * [tbb] Remove ability to disable exception support in TBB runtime (#18740) * After filing an issue with TBB (https://github.com/oneapi-src/oneTBB/issues/414), I found out that building the library with exceptions explicitly disabled as I had added support for had gone from not officially supported to more explicitly disallowed * update tbb port-version * run x-add-version * [libressl] update to 3.3.3 (#18729) Resolves #18682 * [asio] update to 1.18.2 (#18728) * [asio] update to 1.18.2 * update versions * [json-dto] Update to 0.2.13 (#18710) * json_dto updated to 0.2.13. * x-add-version for json-dto. * [README_ko_KR.md] Fix typo for korean doc (#18673) ì›ë„ìš° -> 윈ë„ìš° * [geographiclib] Update to version 1.52 (#18694) * [geographiclib] Update to version 1.52 * run ./vcpkg x-add-version geographiclib * ports/geographiclib/vcpkg.json: version-string -> version * Another iteration with x-add-version * [spdlog] Do not build examples (#18639) * Don't build spdlog examples * Update port version * [drogon] Update to 1.7.1 (#18643) * [socket-io-client] update to 3.0.0 (#18646) * [socket-io-client] update to 3.0.0 * update version * update patch file * update version * [morton-nd] Update to v4.0.0. (#18652) * Update morton-nd to v4.0.0. * Update baselines. * [libdatachannel] Fix usage (#18621) * [libdatachannel] Fix usage * Update version files * [fmt] Fix an easily avoidable compilation warning (#18622) * Fix an unconditional #pragma warning breaking other compilers. * Increase fmt version * re-ran vcpkg x-add-version --all --overwrite-version, this time it produced a different result for some reason * [sentry-native] Update to 0.4.10 (#18627) Signed-off-by: Vitalii Koshura * [Vc] Update to 1.4.2 (#18601) * [seal] Fixed cannot find SEAL. (#18596) * Fixed cannot find seal. * Updated versioning. * [mongo-c-driver] Fix for custom VCPKG_BUILD_TYPE (#18569) * Fix mongo-c-driver for custom VCPKG_BUILD_TYPE * Update version * Update ports/mongo-c-driver/portfile.cmake * Update versions/m-/mongo-c-driver.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert ONeal III * [protobuf] Fixed protoc path (#18741) * fixed protoc path * bumped version * [recast] Export unofficial target (#18671) * [recast] Export unofficial target * update version record * Export INTERFACE_INCLUDE_DIRECTORIES * Export more include dirs. * Update versions/r-/recast.json * [vcpkg] Expand Architecture list with escape chars (#18156) * Expand Architecture list with escape chars This expands the architecture lists with escape characters. When building FAT binaries for macos using multiple architectures in the values they need to be escaped otherwise they are passed on to CMake incorrectly #14932 * Adding the architecture fix to vcpkg-cmake port updating port vcpkg-cmake version * updated version in baseline * [ffmpeg] multi arch support (#18635) * Expand Architecture list with escape chars This expands the architecture lists with escape characters. When building FAT binaries for macos using multiple architectures in the values they need to be escaped otherwise they are passed on to CMake incorrectly #14932 * Adding the architecture fix to vcpkg-cmake port updating port vcpkg-cmake version * updated version in baseline * Allow building ffmpeg for multiple architectures on macOS Since ffmpeg does _not_ support multi-arch builds due to their use of autotools and config.h which then includes the wrong platform-dependent functions, we must perform two separate builds and join them using lipo * fixup! Allow building ffmpeg for multiple architectures on macOS * fixup! Allow building ffmpeg for multiple architectures on macOS Co-authored-by: Sander Cox Co-authored-by: Martijn Otto * [libxml2] Fix target (#18714) * fix LibXml2 target dependencies * updated version files * [bzip2] Update repository (#18705) * [bzip2] Update repository * Update version files * [tgui] Fix feature tool dependency (#18724) * [tgui] Fix feature tool dependency * update version record * [OpenSSL] support for "no-autoload-config" config option (#18389) * [OpenSSL]: support for "no-autoload-config" config option OpenSSL has "no-autoload-config" config option, which disables automatic config loading: https://github.com/openssl/openssl/pull/5959 This patch allows to set above option via variable in custom triplet: # build-openssl-no-autoload-config.cmake set(OPENSSL_NO_AUTOLOAD_CONFIG ON) and use it like: vcpkg install --overlay-triplets= \ openssl:build-openssl-no-autoload-config Signed-off-by: Lev Stipakov * [OpenSSL] bump version Signed-off-by: Lev Stipakov * [rmlui] Add Rmlui library (#18409) * Add RmlUi port * Update versions * Fix uwp build * Update versions * Add maintainers to manifest * Update version * Update ports/rmlui/portfile.cmake Co-authored-by: Noam Chitayat * - Update to RmlUi 4.1, fixes some issues with missing dependencies. - Add robin-hood-hashing as dependency, replacing built-in copy. - Only need FreeType core. - Static library definition now replaced in-source. * Fix config name * Change source in current packages directory * Use robin_hood.h included from vcpkg * Move source modifications to robin_hood patch * Fix path in patch Co-authored-by: Noam Chitayat * [cnl] Update to version 1.1.7 (#18439) * [cnl] update to version 1.1.7 * Update baseline.json * Update ports/cnl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/cnl/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update HEAD_REF to point to main * Bump port-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Run vcpkg x-add-version cnl * Update versions/c-/cnl.json Co-authored-by: Robert Schumacher * Update ports/cnl/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/baseline.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions/c-/cnl.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update git tree with vcpkg x-add-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher * [vcpkg.cmake] fix X_VCPKG_APPLOCAL_DEPS_INSTALL (#18607) * [vcpkg.cmake] fix X_VCPKG_APPLOCAL_DEPS_INSTALL * Billy CR * [klein] create a new port (#18279) * [klein] new port * [klein] Replace version-string by version * [klein] Add call to vcpkg_fixup_pkgconfig() * [klein] Replace klein by ${PORT} * [klein] Add patch to avoid using FetchContent * [klein] Change version to version-date * update version * Apply suggestions from code review Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update git-tree version Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * [vcpkg baseline][cnl] Disable tests (#18767) * [hdf5] Fix linking order in pc file (#18825) * Fix link order in pc file * x-add-version * [catch2] Fix linux build in NTFS fs (#18814) file(RENAME Camel lower) works fine when running vcpkg in Windows Powershell with triplet x64-windows in NTFS fs. file(RENAME Camel lower) does not work fine when running vcpkg in WSL with triplet x64-linux in NTFS. * [binarycaching.md] Improve Azure DevOps example (#18807) Add a missing, but required task for Azure DevOps Pipelines, to automatically authenticate against the Artifacts registry. This should help any vcpkg newcomer to integrate easily. * [sdl2-mixer] Add fluidsynth feature (#18826) * [sdl2-mixer] Add fluidsynth feature * [sdl2-mixer] Add fluidsynth feature * [sdl2-mixer] Add fluidsynth feature * Updated versions & fixed style * Fixed version hash * [paho-mqtt] update to 1.3.9 (#18765) * [paho-mqtt] update to 1.3.9 * update version * revert patch format * update version * [Qt6] Update to 6.1.2 (#18787) * update qt to 6.1.2 * version stuff * [ffmpeg] fix LGPL build, disable avisynthplus on static builds (#18803) * [ffmpeg] do not pull in postproc for LGPL build * [ffmpeg] disable avisynthplus on static builds (as it is not functional) * [ffmpeg] bump port version * [ffmpeg] x-add-version * [google-cloud-cpp] update to latest release (v1.29.0) (#18759) * [exiv2] update to 0.27.4 (#18750) * [exiv2] update to 0.27.4 * update version * [crow] update to v0.3+1 (#18706) Signed-off-by: Luca Schlecker * [irrlicht] Add OSX support (#18725) * Fix Irrlicht compilation on OSX * Update port description * Update portfile instructions * Update version * Fix patch files * Add missing cmake dependencies * Remove obsolete comment * Update version * Remove OBJCXX language from project definition to prevent Windows builds from failing * Update versions * Code review tweaks * Update version * Update versions/i-/irrlicht.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fix qt5-3d build failure on OSX * Update qt5-3d version * Update port-version for qt5-3d * Update version for qt5-3d * [qt5-3d] Revert modification to previous version entry Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher * [mapbox-wagyu] add new port (#18771) * add wagyu * add versions * update hash * update versions * [ftxui] Add new port (fix #16327) (#18360) * [ftxui] Add new port (fix #16327) * [ftxui] x-add-version ftxui * [ftxui] Drop UWP support * [ftxui] Update to 2021-06-16 * [ftxui] Overwrite version * [ftxui] Try to fix linux and macOS build * [ftxui] Overwrite version * [ftxui] Fail fast on UWP * [ftxui] Clean version file * [ftxui] Overwrite version * [ftxui] Update to 2021-06-17 * [ftxui] Overwrite version * [ftxui] Remove debug/share * [ftxui] Overwrite version * [ftxui] Quote paths * [ftxui] Overwrite version * [xlsxio] new port (#18438) * add port: xlsxio * vcpkg x-add-version xlsxio * fix deps * add vcpkg_fixup_pkgconfig() * Apply suggestions from code review To be consistent, `OUT_FEATURE_OPTIONS FEATURE_OPTIONS` in a new line, as in `vcpkg_from_git`. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/xlsxio/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * format * use date as version string * vcpkg format-manifest * Update ports/xlsxio/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * patch for dependency * fix typo * vcpkg x-add-version * remove feature wide * Update ports/xlsxio/vcpkg.json deprecate libzip that's an alternative and imperfect Co-authored-by: Robert Schumacher * Update ports/xlsxio/vcpkg.json Co-authored-by: Robert Schumacher * Update versions/x-/xlsxio.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Remove x64-windows-cpp17 community triplet Co-authored-by: abc Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher * [boost-modular-build-helper] Fix boost build toolchain options not being used (#18529) * Fix boost build toolchain options not being used The issue was due to the options only being set for the gcc toolchain, and then only for a specific version. On platforms defaulting to a different toolchain (e.g. macOS) this didn't work at all. Additionally, some missing flags were not propagated, in particular the CMAKE_OSX_DEPLOYMENT_TARGET, CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES * [boost-modular-build-helper] Apply CR comments Co-authored-by: Martijn Otto Co-authored-by: Robert Schumacher * [libzippp] Update to 4.1-1.8.0 (#18553) Co-authored-by: Cédric Tabin * [proxywrapper] Remove proxywrapper package (#18692) * Remove proxywrapper package * [proxywrapper] Remove from baseline since there is no longer a tested version of the port Co-authored-by: Robert Schumacher * [glew] Improve messages for system opengl dependency (#18672) * [glew] Fix the dependency * Update baseline version * Adress the review suggestions * Update the baseline revision * [socket-io-client]fix socket-io-client use (#18768) * update patch file * update version * [boost] update to 1.76.0 (#17335) * [boost] update generator script for boost 1.76 * [boost] update ports to 1.76.0 (run generator) * [boost] fix windows build? * [quantlib] update and fix mac build * [symengine] update and fix build * [avro-cpp] update to latest master and fix windows build * [folly] update to 2021.05.31.00 * [fbthrift, fizz, wangle] update to v2021.05.31.00 and fix build * [proxygen] update to version 2021.05.31.00 * [fizz, proxygen, fbthrift] fix sodium target * [proxygen] also works on macOS * [quantlib] use fix from upstream to fix mac build * [symengine] minimize patch file and fix deprecation warning * [folly,proxygen,wangle,fizz,fbthrift] update to 2021.06.14.00 * [fbthrift] remove unnecessary dependency rsocket I couldn't find any information that this dependency exists. The term is used in the code, but not in the context of a dependency * [fizz,fbthrift] fix zlib dependency * [fbthrift] pass required flex executable to cmake configure * add version files * [boost] generate-ports.ps1: Apply code review * [boost] changes from new version of generate-ports script * update version files * [boost] generate-ports.ps1: Apply code review * [cctag] Add new port (#16719) * [cctag] add port * [cctag] using version-semver * [cctag] fix for multithreaded compilation * [cctag] update ci.baseline * [cctag] fix format json * [cctag] fix version with semver * [cctag] update version sha * [cctag] v1.0.0-rc2 * [cctag] v1.0.0-rc3 with vcpkg_copy_tools(), much simpler * [cctag] update port file * [cctag] v1.0.0-rc4 * [cctag] update version file * [cctag] v1.0.0 * [cctag] update version file v1.0.0 * [sleepy-discord] Add new port (#17604) * New port sleepy-discord * Add versions for Sleepy Discord * SleepyDiscord: use website as homepage * SleepyDiscord: Remove No newline at end git diff * SleepyDiscord: format manifest * SleepyDiscord: rerun x-add-version * SleepyDiscord: add compression feature * SleepyDiscord: Update version string * SleepyDiscord: rerun x-add-version again * SleepyDiscord: set version-date * SleepyDiscord: rerun add-version * SleepyDiscord: Add requested changes * SleepyDiscord: run add version * SleepyDiscord: update library * SleepyDiscord: rerun x-add-version * SleepyDiscord: copy config file to share folder * SleepyDiscord: run add-version * SleepyDiscord: Fix issue with parallel configuring * SleepyDiscord: x-add-version * SleepyDiscord: replace deprecated functions * SleepyDiscord: x-add-version * SleepyDiscord: Install config during configure * SleepyDiscord: x-add-version * [sleepy-discord] update: add Select Menus * [sleepy-discord] run add-version * [sleepy-discord] rerun add-verion * Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used (#18858) Alternative resolution of https://github.com/microsoft/vcpkg/pull/18846/ * [azure-core-cpp] Update to 1.1.0 (#18779) * [azure-core-cpp] Update to 1.1.0 ## 1.1.0 (2021-07-02) ### Bugs Fixed - Fixed a memory leak issue in `Base64Encode()`. (A community contribution, courtesy of _[jorgen](https://github.com/jorgen)_) ### Other Changes - Made internal-only changes to support the Azure Key Vault client library. ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - Jorgen Lind _([GitHub](https://github.com/jorgen))_ * [azure-storage-common-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a memory leak issue while parsing XML. * [azure-storage-blobs-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob. * [azure-storage-files-datalake-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) ### Bug Fixes - Fixed a bug where transactional MD5 hash was treated as blob MD5 hash when downloading partial blob. * [azure-storage-files-shares-cpp] Update to 12.0.1 ## 12.0.1 (2021-07-07) No API changes since `12.0.0`. * Remove curl version from vcpkg manifest * Update version files Co-authored-by: Anton Kolesnyk * [protopuf] Update to 2.1.0 (#18757) * [protopuf] update to 2.1.0 * [protopuf] add version info * [utf8proc] Export cmake targets (#18860) * [utf8proc] Export cmake targets * Update the baseline version * [gli] upgrade the gli to latest (#18715) * upgrade the gli to latest * update the version of gli * update the version of gli * [gli] Revert patch, use date scheme Co-authored-by: Robert Schumacher * [protozero] update to 1.7.0 (#18842) * update protozero to 1.7.0 * update versions * apply suggestions * version * [sentry-native] Update to 0.4.11 (#18856) Signed-off-by: Vitalii Koshura * [ avcpp ] Update version (#18436) * remove avcpp patch that was accepted upstream. revert port version * update versions * [daw-json-link daw-utf-range daw-header-libraries] new port * [daw-header-libraries daw-utf-range daw-json-link]: vcpkg_cmake_configure, vcpkg_cmake_install, vcpkg_cmake_config_fixup * [daw-json-link daw-utf-range daw-header-libraries] vcpkg x-add-version * Remove useless version file * [daw-header-libraries daw-utf-8 daw-json-link] newest source * [daw-header-libraries daw-utf-range daw-json-link] vcpkg x-add-version * [daw-header-libraries daw-json-link daw-utf-range] doc: comment as header-only in portfile.cmake * [daw-header-libraries daw-json-link daw-utf-range] --overwrite-version x-add-version * Update versions/d-/daw-header-libraries.json * Update versions/d-/daw-json-link.json * Update versions/d-/daw-utf-range.json Co-authored-by: Michael Heyman Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Silvio Traversaro Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Michael Goulding Co-authored-by: Michael Goulding Co-authored-by: myd7349 Co-authored-by: Leonid Pospelov Co-authored-by: Ian Cook Co-authored-by: Tanguy Fautre Co-authored-by: Robert Schumacher Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Kai Pastor Co-authored-by: Matthew Oliver Co-authored-by: Billy Robert ONeal III Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Matthias C. M. Troffaes Co-authored-by: Gregor Jasny Co-authored-by: Ryan Co-authored-by: Daniil Goncharov Co-authored-by: Stefano Sinigardi Co-authored-by: Lucius Q. User <31438459+Lucius-Q-User@users.noreply.github.com> Co-authored-by: Wolfgang Stöggl Co-authored-by: Daniel Schürmann Co-authored-by: SvenPStarFinanz Co-authored-by: Matthias Kuhn Co-authored-by: Wei Dai Co-authored-by: WenTao Ou Co-authored-by: Chuck Walbourn Co-authored-by: Daniel Parker Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Maxime GIMENO Co-authored-by: Mathis Logemann Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> Co-authored-by: nicole mazzuca Co-authored-by: Dimitrij Mijoski Co-authored-by: timmeh87 <31858838+timmeh87@users.noreply.github.com> Co-authored-by: Tim Co-authored-by: An Tao Co-authored-by: evpobr Co-authored-by: Park DongHa Co-authored-by: Ankur Verma <31362771+ankurverma85@users.noreply.github.com> Co-authored-by: Ankur Verma Co-authored-by: Ankur Verma Co-authored-by: Hendrik Co-authored-by: Yury Bura Co-authored-by: Richard Yu Co-authored-by: JackBoosY Co-authored-by: Alex Reinking Co-authored-by: aggieNick02 Co-authored-by: Yuriy O'Donnell Co-authored-by: eao197 Co-authored-by: goyarn <59996142+goyarn@users.noreply.github.com> Co-authored-by: Charles Karney Co-authored-by: Daumantas Kavolis <12998363+dkavolis@users.noreply.github.com> Co-authored-by: Kevin Hartman Co-authored-by: Matt Haynie Co-authored-by: Vitalii Koshura Co-authored-by: Bernhard Manfred Gruber Co-authored-by: Johannes Schönberger Co-authored-by: bucurb Co-authored-by: Sander Cox Co-authored-by: omartijn <44672243+omartijn@users.noreply.github.com> Co-authored-by: Martijn Otto Co-authored-by: Lev Stipakov Co-authored-by: Michael R. P. Ragazzon Co-authored-by: Noam Chitayat Co-authored-by: mathijs727 Co-authored-by: João Maia Co-authored-by: LE GARREC Vincent Co-authored-by: Julian Xhokaxhiu Co-authored-by: JackMacWindows Co-authored-by: Carlos O'Ryan Co-authored-by: Luca Schlecker Co-authored-by: Artem Shubovych Co-authored-by: Robert Schumacher Co-authored-by: Ronald <3665590+playgithub@users.noreply.github.com> Co-authored-by: abc Co-authored-by: Martijn Otto Co-authored-by: Cédric Tabin Co-authored-by: Cédric Tabin Co-authored-by: shishirb-MSFT <50385517+shishirb-MSFT@users.noreply.github.com> Co-authored-by: Simone Gasparini Co-authored-by: Sleepy Flower Girl Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Co-authored-by: Anton Kolesnyk Co-authored-by: Twice Co-authored-by: Xing Ji <33065325+jixingcn@users.noreply.github.com> Co-authored-by: Charlie Barto Co-authored-by: mheyman --- ports/daw-header-libraries/portfile.cmake | 18 ++++++++++ ports/daw-header-libraries/vcpkg.json | 16 +++++++++ ports/daw-json-link/portfile.cmake | 40 +++++++++++++++++++++++ ports/daw-json-link/vcpkg.json | 17 ++++++++++ ports/daw-utf-range/portfile.cmake | 23 +++++++++++++ ports/daw-utf-range/vcpkg.json | 17 ++++++++++ versions/baseline.json | 12 +++++++ versions/d-/daw-header-libraries.json | 9 +++++ versions/d-/daw-json-link.json | 9 +++++ versions/d-/daw-utf-range.json | 9 +++++ 10 files changed, 170 insertions(+) create mode 100644 ports/daw-header-libraries/portfile.cmake create mode 100644 ports/daw-header-libraries/vcpkg.json create mode 100644 ports/daw-json-link/portfile.cmake create mode 100644 ports/daw-json-link/vcpkg.json create mode 100644 ports/daw-utf-range/portfile.cmake create mode 100644 ports/daw-utf-range/vcpkg.json create mode 100644 versions/d-/daw-header-libraries.json create mode 100644 versions/d-/daw-json-link.json create mode 100644 versions/d-/daw-utf-range.json diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake new file mode 100644 index 00000000000000..06753efd930d86 --- /dev/null +++ b/ports/daw-header-libraries/portfile.cmake @@ -0,0 +1,18 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/header_libraries + REF b44178fed16111944d1338999d88b129797608ce + SHA512 0b13bec450ba68e2b2ac2e76c9c529fa84a95df092b104660c88e9cfda91df9e5b70f0f7f6bcbb4f7ea05c1a5613734ceff8d84929b37b115c2bc86c232d9261 + HEAD_REF master +) + +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# remove empty lib and debug/lib directories (and duplicate files from debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json new file mode 100644 index 00000000000000..25c09477650138 --- /dev/null +++ b/ports/daw-header-libraries/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "daw-header-libraries", + "version-semver": "1.21.1", + "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", + "homepage": "https://github.com/beached/header_libraries", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake new file mode 100644 index 00000000000000..97ec4b5e3fec65 --- /dev/null +++ b/ports/daw-json-link/portfile.cmake @@ -0,0 +1,40 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/daw_json_link + REF d8cb3a25a545b27b6ab5e68f4480b92ad0dc78fe + SHA512 19f486c6782f6134db0f7c8a1a4031b69aeae7f64846f186bccfa37927c8a688545fe5825de841e5ec5408267922b0334db3727d00fcb96b1a36eee81a05eae9 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DDAW_USE_PACKAGE_MANAGEMENT=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) + +# remove empty lib and debug/lib directories (and duplicate files from debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +# Append the json-link and dragonbox license information into a single +# copyright file (they are both Boost v1.0 but it is good to be clear). +file(APPEND ${SOURCE_PATH}/copyright [=[+----------------------------------------------------------------------------+ +| json-link copywrite | ++----------------------------------------------------------------------------+ +]=]) +file(READ ${SOURCE_PATH}/LICENSE json_link_copywrite) +file(APPEND ${SOURCE_PATH}/copyright ${json_link_copywrite}) +file(APPEND ${SOURCE_PATH}/copyright [=[ + + ++----------------------------------------------------------------------------+ +| dragonbox copywrite | ++----------------------------------------------------------------------------+ +]=]) + +file(READ ${SOURCE_PATH}/LICENSE_Dragonbox dragonbox_copywrite) +file(APPEND ${SOURCE_PATH}/copyright ${dragonbox_copywrite}) +file(INSTALL ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json new file mode 100644 index 00000000000000..84ccbe00a3c7fe --- /dev/null +++ b/ports/daw-json-link/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "daw-json-link", + "version-semver": "2.9.11", + "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", + "homepage": "https://github.com/beached/daw_json_link", + "dependencies": [ + "daw-utf-range", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake new file mode 100644 index 00000000000000..e3b8e10c892ce3 --- /dev/null +++ b/ports/daw-utf-range/portfile.cmake @@ -0,0 +1,23 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO beached/utf_range + REF b20d4037db30f69ef73daa4428a631f95e0bbb10 + SHA512 4f9d4b4831c4bd6dc560830077965ae5b3351dc7695d0523262bc6229c8d7623e03338be772337f89084038d7039b4a0b41ef8de2ef98eb880f85ca5e01d5838 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH + ${SOURCE_PATH} + OPTIONS + -DDAW_USE_PACKAGE_MANAGEMENT=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +# remove empty lib and debug/lib directories (and duplicate files from debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/daw-utf-range/vcpkg.json b/ports/daw-utf-range/vcpkg.json new file mode 100644 index 00000000000000..468da7e7c44b18 --- /dev/null +++ b/ports/daw-utf-range/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "daw-utf-range", + "version-semver": "2.1.0", + "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", + "homepage": "https://github.com/beached/header_libraries", + "dependencies": [ + "daw-header-libraries", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index dc606ae45d6949..8cadbc5a6cc5ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1632,6 +1632,18 @@ "baseline": "0.8.2", "port-version": 1 }, + "daw-header-libraries": { + "baseline": "1.21.1", + "port-version": 0 + }, + "daw-json-link": { + "baseline": "2.9.11", + "port-version": 0 + }, + "daw-utf-range": { + "baseline": "2.1.0", + "port-version": 0 + }, "dbg-macro": { "baseline": "2019-07-11", "port-version": 0 diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json new file mode 100644 index 00000000000000..7abb51e03b8d8a --- /dev/null +++ b/versions/d-/daw-header-libraries.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6687948f2f2f4c3ba578a8ac41624c58a541f1a2", + "version-semver": "1.21.1", + "port-version": 0 + } + ] +} diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json new file mode 100644 index 00000000000000..7f49b0d5743026 --- /dev/null +++ b/versions/d-/daw-json-link.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "04d0df53fc3b69309aa10f53cc92f0933e8139b8", + "version-semver": "2.9.11", + "port-version": 0 + } + ] +} diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json new file mode 100644 index 00000000000000..dec5553b5c7070 --- /dev/null +++ b/versions/d-/daw-utf-range.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e1c08fdf12013384e9a86e5233245321fea58793", + "version-semver": "2.1.0", + "port-version": 0 + } + ] +} From 4b42e57fc04e66fa8d765bedbef041be11c7a718 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 4 Aug 2021 13:27:40 -0700 Subject: [PATCH 0252/1858] [macos ci] update 2021-07-27 (#19207) * update 2021-07-27 macOS -> 11.5.1, XCode -> 12.5.1 * update azure-pipelines * update sha of macfuse * change how macos-ci-base works * fix build errors * fix itpp:linux * more fixes * remove tab * allow version changes in all the remove/rename-version patches * fix libunistring for real * robert CR --- ports/azure-iot-sdk-c/portfile.cmake | 2 ++ ports/azure-iot-sdk-c/remove-werror.patch | 18 ++++++++++ ports/azure-iot-sdk-c/vcpkg.json | 2 +- ports/coroutine/add-noexcept-to-frame.patch | 13 +++++++ ports/coroutine/portfile.cmake | 4 ++- ports/coroutine/vcpkg.json | 2 +- ports/itpp/portfile.cmake | 8 +++-- ports/itpp/rename-version.patch | 12 +++++++ ports/itpp/vcpkg.json | 2 +- ports/libodb-boost/CONTROL | 3 +- ports/libodb-boost/portfile.cmake | 1 + ports/libodb-mysql/portfile.cmake | 1 + ports/libodb-mysql/vcpkg.json | 2 +- ports/libodb-pgsql/CONTROL | 3 +- ports/libodb-pgsql/portfile.cmake | 1 + ports/libodb-sqlite/CONTROL | 2 +- ports/libodb-sqlite/portfile.cmake | 3 +- ports/libodb/portfile.cmake | 1 + ports/libodb/vcpkg.json | 2 +- .../fix-for-automake-1.16.4.patch | 13 +++++++ ports/libunistring/portfile.cmake | 1 + ports/libunistring/vcpkg.json | 1 + ports/nanodbc/CONTROL | 6 ---- ports/nanodbc/portfile.cmake | 2 ++ ports/nanodbc/rename-version.patch | 13 +++++++ ports/nanodbc/vcpkg.json | 13 +++++++ ports/plplot/CONTROL | 9 ----- ports/plplot/portfile.cmake | 5 +-- ports/plplot/vcpkg.json | 20 +++++++++++ ports/selene/portfile.cmake | 1 + ports/selene/trivial-pixel.patch | 23 +++++++++++++ ports/selene/vcpkg.json | 2 +- ports/sentencepiece/CONTROL | 3 -- ports/sentencepiece/portfile.cmake | 4 ++- ports/sentencepiece/rename-version.patch | 8 +++++ ports/sentencepiece/vcpkg.json | 6 ++++ ports/xlnt/CONTROL | 5 --- ports/xlnt/portfile.cmake | 1 + ports/xlnt/vcpkg.json | 7 ++++ scripts/azure-pipelines/azure-pipelines.yml | 2 +- scripts/azure-pipelines/osx/README.md | 13 ++++--- scripts/azure-pipelines/osx/Utilities.psm1 | 2 +- .../azure-pipelines/osx/azure-pipelines.yml | 4 +-- .../osx/configuration/Vagrantfile-box.rb | 3 +- .../osx/configuration/installables.json | 14 ++++---- versions/a-/azure-iot-sdk-c.json | 5 +++ versions/baseline.json | 34 +++++++++---------- versions/c-/coroutine.json | 5 +++ versions/i-/itpp.json | 5 +++ versions/l-/libodb-boost.json | 5 +++ versions/l-/libodb-mysql.json | 5 +++ versions/l-/libodb-pgsql.json | 5 +++ versions/l-/libodb-sqlite.json | 5 +++ versions/l-/libodb.json | 5 +++ versions/l-/libunistring.json | 5 +++ versions/n-/nanodbc.json | 5 +++ versions/p-/plplot.json | 5 +++ versions/s-/selene.json | 5 +++ versions/s-/sentencepiece.json | 5 +++ versions/x-/xlnt.json | 5 +++ 60 files changed, 292 insertions(+), 75 deletions(-) create mode 100644 ports/azure-iot-sdk-c/remove-werror.patch create mode 100644 ports/coroutine/add-noexcept-to-frame.patch create mode 100644 ports/itpp/rename-version.patch create mode 100644 ports/libunistring/fix-for-automake-1.16.4.patch delete mode 100644 ports/nanodbc/CONTROL create mode 100644 ports/nanodbc/rename-version.patch create mode 100644 ports/nanodbc/vcpkg.json delete mode 100644 ports/plplot/CONTROL create mode 100644 ports/plplot/vcpkg.json create mode 100644 ports/selene/trivial-pixel.patch delete mode 100644 ports/sentencepiece/CONTROL create mode 100644 ports/sentencepiece/rename-version.patch create mode 100644 ports/sentencepiece/vcpkg.json delete mode 100644 ports/xlnt/CONTROL create mode 100644 ports/xlnt/vcpkg.json diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index dafefb6500c501..79a0639075f610 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -10,6 +10,7 @@ if("public-preview" IN_LIST FEATURES) PATCHES improve-external-deps.patch fix-cmake.patch + remove-werror.patch ) else() vcpkg_from_github( @@ -21,6 +22,7 @@ else() PATCHES improve-external-deps.patch fix-cmake.patch + remove-werror.patch ) endif() diff --git a/ports/azure-iot-sdk-c/remove-werror.patch b/ports/azure-iot-sdk-c/remove-werror.patch new file mode 100644 index 00000000000000..694ae7929e89af --- /dev/null +++ b/ports/azure-iot-sdk-c/remove-werror.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,14 +34,11 @@ + if (MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4232") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4232") + # Make warning as error +- add_definitions(/WX) + else() + # Make warning as error +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + endif() + + IF(WIN32) + # windows needs this define + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index 78a74e518218aa..a574edf84f5f05 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-iot-sdk-c", "version-date": "2020-12-09", - "port-version": 1, + "port-version": 2, "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", "dependencies": [ diff --git a/ports/coroutine/add-noexcept-to-frame.patch b/ports/coroutine/add-noexcept-to-frame.patch new file mode 100644 index 00000000000000..fe5c6c6d34997b --- /dev/null +++ b/ports/coroutine/add-noexcept-to-frame.patch @@ -0,0 +1,13 @@ +--- a/interface/coroutine/frame.h ++++ a/interface/coroutine/frame.h +@@ -119,8 +119,8 @@ + return *this; + } + // 17.12.3.2, export/import +- static /*constexpr*/ coroutine_handle from_address(void* _Addr) { ++ static /*constexpr*/ coroutine_handle from_address(void* _Addr) noexcept { + coroutine_handle _Result{}; + _Result._Ptr = reinterpret_cast(_Addr); + return _Result; + } + diff --git a/ports/coroutine/portfile.cmake b/ports/coroutine/portfile.cmake index 3c5f27b72caaab..1326b5a7dd5993 100644 --- a/ports/coroutine/portfile.cmake +++ b/ports/coroutine/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_from_github( REF 1.5.0 SHA512 61b91fdc641b6905b884e99c5bf193ec2cf6962144ab3baafdb9432115757d96f3797f116b30356f0d21417b23082bc908f75042721caeab3329c4910b654594 HEAD_REF master - PATCHES fix-errorC7651.patch + PATCHES + fix-errorC7651.patch + add-noexcept-to-frame.patch ) vcpkg_configure_cmake( diff --git a/ports/coroutine/vcpkg.json b/ports/coroutine/vcpkg.json index 4e71341284ef76..8c557f6fa91578 100644 --- a/ports/coroutine/vcpkg.json +++ b/ports/coroutine/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coroutine", "version-string": "1.5.0", - "port-version": 1, + "port-version": 2, "description": "C++ 20 Coroutines helper/example library", "homepage": "https://github.com/luncliff/coroutine", "supports": "!uwp", diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake index 52e8b05f5bed00..a87cedcb7db359 100644 --- a/ports/itpp/portfile.cmake +++ b/ports/itpp/portfile.cmake @@ -7,10 +7,12 @@ vcpkg_from_sourceforge( FILENAME "itpp-${ITPP_VERSION}.tar.bz2" SHA512 b46d048fa7f33e80d2291a5e38e205c159791ea200f92c70d69e8ad8447ac2f0c847fece566a99af739853a1643cb16e226b4200c8bf115417f324e6d38c66bd PATCHES - msvc2013.patch - fix-uwp.patch - fix-linux.patch + msvc2013.patch + fix-uwp.patch + fix-linux.patch + rename-version.patch ) +file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/itpp/rename-version.patch b/ports/itpp/rename-version.patch new file mode 100644 index 00000000000000..0750ed4cebe6e7 --- /dev/null +++ b/ports/itpp/rename-version.patch @@ -0,0 +1,12 @@ +--- a/autogen.sh ++++ b/autogen.sh +@@ -25,6 +25,6 @@ + +-PV=$(cat VERSION | cut -d' ' -f1) +-LV=$(cat VERSION | cut -d' ' -f2) +-if test "x$(cat VERSION | cut -d' ' -f3)" = "xsvn"; then ++PV=$(cat VERSION.txt | cut -d' ' -f1) ++LV=$(cat VERSION.txt | cut -d' ' -f2) ++if test "x$(cat VERSION.txt | cut -d' ' -f3)" = "xsvn"; then + if test -d ".git/svn"; then + REV=$(LC_ALL=C git svn find-rev HEAD) diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json index 130cda581cc962..00ac96b67f2f3f 100644 --- a/ports/itpp/vcpkg.json +++ b/ports/itpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itpp", "version-semver": "4.3.1", - "port-version": 6, + "port-version": 7, "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", "homepage": "http://itpp.sourceforge.net" } diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL index 3dec8410355757..23e3d913fbde95 100644 --- a/ports/libodb-boost/CONTROL +++ b/ports/libodb-boost/CONTROL @@ -1,4 +1,5 @@ Source: libodb-boost -Version: 2.4.0-3 +Version: 2.4.0 +Port-Version: 4 Description: Description: Boost support for the ODB ORM library Build-Depends: libodb diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake index 08689fb1316bb4..adf571bea7e891 100644 --- a/ports/libodb-boost/portfile.cmake +++ b/ports/libodb-boost/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} ) +file(REMOVE "${SOURCE_PATH}/version") file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index cc0d7c58ccbf58..ac78846ddd39f0 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_extract_source_archive_ex( adapter_mysql_8.0.patch fix-redefinttion.patch ) +file(REMOVE "${SOURCE_PATH}/version") file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt diff --git a/ports/libodb-mysql/vcpkg.json b/ports/libodb-mysql/vcpkg.json index 8d6ca1fd79accc..c0fa1b01d07d7c 100644 --- a/ports/libodb-mysql/vcpkg.json +++ b/ports/libodb-mysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb-mysql", "version": "2.4.0", - "port-version": 8, + "port-version": 9, "description": "MySQL support for the ODB ORM library", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ diff --git a/ports/libodb-pgsql/CONTROL b/ports/libodb-pgsql/CONTROL index a6988eeb0c5a7a..5268b44dc86acf 100644 --- a/ports/libodb-pgsql/CONTROL +++ b/ports/libodb-pgsql/CONTROL @@ -1,5 +1,6 @@ Source: libodb-pgsql -Version: 2.4.0-3 +Version: 2.4.0 +Port-Version: 4 Homepage: https://www.codesynthesis.com/products/odb/ Description: Description: PostgreSQL support for the ODB ORM library Build-Depends: libodb, libpq diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake index 29e58fd13c334a..cf84b650aadf91 100644 --- a/ports/libodb-pgsql/portfile.cmake +++ b/ports/libodb-pgsql/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} ) +file(REMOVE "${SOURCE_PATH}/version") file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL index ae35fc37219ab1..99b38824e3f090 100644 --- a/ports/libodb-sqlite/CONTROL +++ b/ports/libodb-sqlite/CONTROL @@ -1,6 +1,6 @@ Source: libodb-sqlite Version: 2.4.0 -Port-Version: 7 +Port-Version: 8 Homepage: https://www.codesynthesis.com/products/odb/ Description: Sqlite support for the ODB ORM library Build-Depends: libodb, sqlite3 diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index d99001a09fbcd9..58fbb3a377c2ee 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} ) +file(REMOVE "${SOURCE_PATH}/version") file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt @@ -30,4 +31,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index e790ef554044bf..c7046bc8210dc8 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} ) +file(REMOVE "${SOURCE_PATH}/version") file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt diff --git a/ports/libodb/vcpkg.json b/ports/libodb/vcpkg.json index e45b478d48276b..5c3fe94c21c7a1 100644 --- a/ports/libodb/vcpkg.json +++ b/ports/libodb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libodb", "version": "2.4.0", - "port-version": 7, + "port-version": 8, "description": "ODB library, base runtime for the ODB ORM solution", "homepage": "https://www.codesynthesis.com/products/odb/" } diff --git a/ports/libunistring/fix-for-automake-1.16.4.patch b/ports/libunistring/fix-for-automake-1.16.4.patch new file mode 100644 index 00000000000000..2e9a2ebda0962b --- /dev/null +++ b/ports/libunistring/fix-for-automake-1.16.4.patch @@ -0,0 +1,13 @@ +--- a/m4/init-package-version.m4 ++++ b/m4/init-package-version.m4 +@@ -82,9 +82,9 @@ + [AC_SUBST([PACKAGE], [$1]) + AC_SUBST([VERSION], [$2]) + ]) + m4_define([AM_INIT_AUTOMAKE], + m4_defn([gl_RPL_INIT_AUTOMAKE])) + ]) +-m4_define([gl_INIT_DUMMY], []) ++m4_define([gl_INIT_DUMMY], [dummy]) + AC_DEFUN([gl_RPL_INIT_AUTOMAKE], [ + m4_ifval([$2], diff --git a/ports/libunistring/portfile.cmake b/ports/libunistring/portfile.cmake index a443ec9ccc88bc..e9eef0641d09a9 100644 --- a/ports/libunistring/portfile.cmake +++ b/ports/libunistring/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" REF ${LIBUNISTRING_VERSION} + PATCHES fix-for-automake-1.16.4.patch # automake 1.16.4 uses m4_ifset instead of m4_ifdef ) vcpkg_configure_make( diff --git a/ports/libunistring/vcpkg.json b/ports/libunistring/vcpkg.json index b11bbb6fa9b116..585ddca79423ac 100644 --- a/ports/libunistring/vcpkg.json +++ b/ports/libunistring/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libunistring", "version": "0.9.10", + "port-version": 1, "description": "GNU libunistring provides functions for manipulating Unicode strings and for manipulating C strings according to the Unicode standard.", "homepage": "https://www.gnu.org/software/libunistring/", "supports": "!windows", diff --git a/ports/nanodbc/CONTROL b/ports/nanodbc/CONTROL deleted file mode 100644 index 339e2125106100..00000000000000 --- a/ports/nanodbc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: nanodbc -Version: 2.13.0 -Port-Version: 3 -Homepage: https://github.com/nanodbc/nanodbc -Description: A small C++ wrapper for the native C ODBC API. -Build-Depends: unixodbc(!windows) diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index 94ffb08936bdcc..dfdba7caa9ff2e 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF 7404a4dd7697e188df5724ab95a7553d2fc404eb # v2.13.0 SHA512 35ca098e783d771f3df611bce84e9b8207a6a5b72c492d2f3909977bc91a7c22bb262c34768b0d97ebfbdf12eeda0214064a8ea171e7bdda7b759f93ff346f45 HEAD_REF master + PATCHES rename-version.patch ) +file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") if(DEFINED NANODBC_ODBC_VERSION) set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION}) diff --git a/ports/nanodbc/rename-version.patch b/ports/nanodbc/rename-version.patch new file mode 100644 index 00000000000000..a236cf896172b5 --- /dev/null +++ b/ports/nanodbc/rename-version.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,8 +20,8 @@ + ######################################## + ## nanodbc version + ######################################## +-file(STRINGS VERSION NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+") ++file(STRINGS "VERSION.txt" NANODBC_VERSION REGEX "[0-9]+\\.[0-9]+\\.[0-9]+") + string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" NANODBC_VERSION_MAJOR "${NANODBC_VERSION}") + string(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" NANODBC_VERSION_MINOR "${NANODBC_VERSION}") + string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" NANODBC_VERSION_PATCH "${NANODBC_VERSION}") + message(STATUS "nanodbc version: ${NANODBC_VERSION}") + diff --git a/ports/nanodbc/vcpkg.json b/ports/nanodbc/vcpkg.json new file mode 100644 index 00000000000000..d577f7e8afd38a --- /dev/null +++ b/ports/nanodbc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nanodbc", + "version": "2.13.0", + "port-version": 4, + "description": "A small C++ wrapper for the native C ODBC API.", + "homepage": "https://github.com/nanodbc/nanodbc", + "dependencies": [ + { + "name": "unixodbc", + "platform": "!windows" + } + ] +} diff --git a/ports/plplot/CONTROL b/ports/plplot/CONTROL deleted file mode 100644 index 67a70e365b2668..00000000000000 --- a/ports/plplot/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: plplot -Version: 5.13.0 -Port-Version: 9 -Build-Depends: freetype, zlib, libpng, bzip2 -Description: PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer. - -Feature: wxwidgets -Build-Depends: wxwidgets -Description: plplot wxwidgets module \ No newline at end of file diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index 4e7a55799f4483..eb20f613c5c33e 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -25,10 +25,11 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DENABLE_tcl=OFF - -DPL_HAVE_QHULL=OFF + -DENABLE_d=OFF -DENABLE_qt=OFF - -DPLPLOT_USE_QT5=OFF -DENABLE_ocaml=OFF + -DPL_HAVE_QHULL=OFF + -DPLPLOT_USE_QT5=OFF -DPL_DOUBLE=ON -DPLD_wxwidgets=${BUILD_with_wxwidgets} -DENABLE_DYNDRIVERS=OFF diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json new file mode 100644 index 00000000000000..a4d0cf1cfe287c --- /dev/null +++ b/ports/plplot/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "plplot", + "version-string": "5.13.0", + "port-version": 10, + "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", + "dependencies": [ + "bzip2", + "freetype", + "libpng", + "zlib" + ], + "features": { + "wxwidgets": { + "description": "plplot wxwidgets module", + "dependencies": [ + "wxwidgets" + ] + } + } +} diff --git a/ports/selene/portfile.cmake b/ports/selene/portfile.cmake index a7216be1b8e552..d300f5f839cb26 100644 --- a/ports/selene/portfile.cmake +++ b/ports/selene/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES disable_x86_intrinsics_on_arm.patch tiff-deprecated-typedefs.patch + trivial-pixel.patch ) vcpkg_check_features( diff --git a/ports/selene/trivial-pixel.patch b/ports/selene/trivial-pixel.patch new file mode 100644 index 00000000000000..9aeb7e44e17eae --- /dev/null +++ b/ports/selene/trivial-pixel.patch @@ -0,0 +1,23 @@ +--- a/selene/img/pixel/Pixel.hpp ++++ b/selene/img/pixel/Pixel.hpp +@@ -45,6 +45,6 @@ + constexpr Pixel() noexcept = default; ///< Default constructor. Pixel values are uninitialized. + +- template > +- constexpr Pixel(Args... args) noexcept; ++ template > ++ constexpr Pixel(Arg1 arg1, Args... args) noexcept; + + constexpr explicit Pixel(const std::array& arr) noexcept; +@@ -216,8 +216,8 @@ + template +-template +-constexpr Pixel::Pixel(Args... args) noexcept +- : data_{{static_cast(args)...}} ++template ++constexpr Pixel::Pixel(Arg1 arg1, Args... args) noexcept ++ : data_{{static_cast(arg1), static_cast(args)...}} + { + static_assert(std::is_trivial>::value, "Pixel type is not trivial"); + static_assert(std::is_standard_layout>::value, + "Pixel type is not standard layout"); diff --git a/ports/selene/vcpkg.json b/ports/selene/vcpkg.json index 0d70c7c403b250..71bcb2514063d6 100644 --- a/ports/selene/vcpkg.json +++ b/ports/selene/vcpkg.json @@ -1,7 +1,7 @@ { "name": "selene", "version": "0.3.1", - "port-version": 4, + "port-version": 5, "description": "A C++17 image representation, processing and I/O library.", "homepage": "https://github.com/kmhofmann/selene", "dependencies": [ diff --git a/ports/sentencepiece/CONTROL b/ports/sentencepiece/CONTROL deleted file mode 100644 index 41db3d5ff384dc..00000000000000 --- a/ports/sentencepiece/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: sentencepiece -Version: v0.1.82 -Description: SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training \ No newline at end of file diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake index 138d7181edd578..e554a0d5a23716 100644 --- a/ports/sentencepiece/portfile.cmake +++ b/ports/sentencepiece/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF v0.1.82 SHA512 669d6a1e86c44587d725b1e93f11b707e510a180dec08afb79268158f5de009cb20ffccc72c501c84f032360e52e53ae227504f3538f59978629433e0d6fcf65 HEAD_REF master + PATCHES rename-version.patch ) +file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -29,4 +31,4 @@ endif() configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/sentencepiece/rename-version.patch b/ports/sentencepiece/rename-version.patch new file mode 100644 index 00000000000000..823a1b9b0206c4 --- /dev/null +++ b/ports/sentencepiece/rename-version.patch @@ -0,0 +1,8 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,4 +15,4 @@ + cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +-file(STRINGS "VERSION" SPM_VERSION) ++file(STRINGS "VERSION.txt" SPM_VERSION) + message(STATUS "VERSION: ${SPM_VERSION}") + project(sentencepiece VERSION ${SPM_VERSION} LANGUAGES CXX) diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json new file mode 100644 index 00000000000000..cdd93888585c4a --- /dev/null +++ b/ports/sentencepiece/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sentencepiece", + "version": "0.1.82", + "port-version": 1, + "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training" +} diff --git a/ports/xlnt/CONTROL b/ports/xlnt/CONTROL deleted file mode 100644 index 88ebdddf61f106..00000000000000 --- a/ports/xlnt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: xlnt -Version: 1.5.0 -Port-Version: 1 -Homepage: https://github.com/tfussell/xlnt -Description: Cross-platform user-friendly xlsx library for C++14 diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake index eb4147f8edfbfa..29101c2010724d 100644 --- a/ports/xlnt/portfile.cmake +++ b/ports/xlnt/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( "fix-not-found-include.patch" ${win_patch} ) +file(REMOVE "${SOURCE_PATH}/third-party/libstudxml/version") if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(STATIC OFF) diff --git a/ports/xlnt/vcpkg.json b/ports/xlnt/vcpkg.json new file mode 100644 index 00000000000000..df61b6066421f2 --- /dev/null +++ b/ports/xlnt/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "xlnt", + "version": "1.5.0", + "port-version": 2, + "description": "Cross-platform user-friendly xlsx library for C++14", + "homepage": "https://github.com/tfussell/xlnt" +} diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 3d89b3793927c7..9b509ea1f88e4f 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -4,7 +4,7 @@ variables: windows-pool: 'PrWin-2021-07-14' linux-pool: 'PrLin-2021-07-14' - osx-pool: 'PrOsx-2021-04-16' + osx-pool: 'PrOsx-2021-07-27' stages: - stage: FormatChecks diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md index 9f253a06c27334..9d6fb40b74a4a9 100644 --- a/scripts/azure-pipelines/osx/README.md +++ b/scripts/azure-pipelines/osx/README.md @@ -155,18 +155,18 @@ Run the following commands: ```sh $ cd ~/Parallels $ echo '{ "provider": "parallels" }' >metadata.json -$ tar zgvf .box ./metadata.json ./.pvm +$ tar zcvf .box ./metadata.json ./.pvm ``` This will create a box file which contains all the necessary data. You can delete the `metadata.json` file after. Once you've done that, you can upload it to the fileshare, -under `share/boxes/vcpkg-ci-base`, add it to `share/boxes/vcpkg-ci-base.json`, +under `share/boxes/macos-base`, add it to `share/boxes/macos-base.json`, and finally add it to vagrant: ```sh -$ vagrant box add ~/vagrant/share/boxes/vcpkg-ci-base.json +$ vagrant box add ~/vagrant/share/boxes/macos-base.json ``` Then, we'll create the final box, @@ -184,9 +184,9 @@ $ vagrant package This will create a `package.box`, which is the box file for the base VM. Once you've created this box, if you're making it the new box for the CI, -upload it to the fileshare, under `share/boxes/vcpkg-ci`. +upload it to the fileshare, under `share/boxes/macos-ci`. Then, add the metadata about the box (the name and version) to -`share/boxes/vcpkg-ci.json`. +`share/boxes/macos-ci.json`. Once you've done that, add the software versions under [VM Software Versions](#vm-software-versions). [base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html @@ -199,6 +199,9 @@ Once you've done that, add the software versions under [VM Software Versions](#v * 2021-04-16: * macOS: 11.2.3 * Xcode CLTs: 12.4 +* 2021-07-27: + * macOS: 11.5.1 + * Xcode CLTs: 12.5.1 ### (Internal) Accessing the macOS fileshare diff --git a/scripts/azure-pipelines/osx/Utilities.psm1 b/scripts/azure-pipelines/osx/Utilities.psm1 index 1b70d61f7a2652..620ec7f4b06eac 100644 --- a/scripts/azure-pipelines/osx/Utilities.psm1 +++ b/scripts/azure-pipelines/osx/Utilities.psm1 @@ -79,7 +79,7 @@ function Get-RemoteFile if ($actualHash.Hash -ne $Sha256) { throw @" Invalid hash for file $OutFile; - expected: $Hash + expected: $Sha256 found: $($actualHash.Hash) Please make sure that the hash in the powershell file is correct. "@ diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 38eb7fa7b34879..154247da47481b 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -14,9 +14,9 @@ jobs: value: /Users/vagrant/Data - name: VCPKG_DOWNLOADS value: /Users/vagrant/Data/downloads - - group: osx-2021-04-16 + - group: osx-binary-caching-credentials - name: BINARY_SOURCE_STUB - value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)" + value: "x-azblob,$(root-url),$(sas)" - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES value: "x-azurl,$(root-url),$(sas),readwrite" diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb b/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb index 90ad6c4c558a21..cbe76a72076ff5 100644 --- a/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb +++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb @@ -3,8 +3,7 @@ configuration = JSON.parse(File.read("#{__dir__}/vagrant-box-configuration.json")) Vagrant.configure('2') do |config| - config.vm.box = 'vcpkg/macos-ci-base' - config.vm.box_version = configuration['box_version'] + config.vm.box = 'vcpkg/macos-base' config.vm.synced_folder '.', '/Users/vagrant/shared' config.vm.provision 'shell', diff --git a/scripts/azure-pipelines/osx/configuration/installables.json b/scripts/azure-pipelines/osx/configuration/installables.json index 1b2c2d015b40fc..179b03f15ea197 100644 --- a/scripts/azure-pipelines/osx/configuration/installables.json +++ b/scripts/azure-pipelines/osx/configuration/installables.json @@ -6,18 +6,18 @@ "Name": "vagrant", "VersionCommand": [ "vagrant", "-v" ], "VersionRegex": "Vagrant (.*)", - "Version": "2.2.15", - "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.dmg", - "Sha256": "5C2B290C4FA2371E255C56B1E96DED3D0C838D54CB7F0E8E6CF154E9F206A20E", + "Version": "2.2.18", + "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.18/vagrant_2.2.18_x86_64.dmg", + "Sha256": "B4E8103AABDF29F18F592CD6DE4FA03BF182FBC192A0757B5E18156CB18FA672", "InstallerPath": "vagrant.pkg" }, { "Name": "osxfuse", "VersionCommand": [ "cat", "/Library/Filesystems/macfuse.fs/Contents/version.plist" ], "VersionRegex": "CFBundleVersion[\\n\\t ]*([0-9.]+)", - "Version": "4.1.0", - "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.0/macfuse-4.1.0.dmg", - "Sha256": "3CB6A49406FD036C50EF1B4AD717A377F4DCF182811BDE172D69F1C289791085", + "Version": "4.1.2", + "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.2/macfuse-4.1.2.dmg", + "Sha256": "9FF344DE38BAD5AC5ECA5194DA00A2BA35DD6AFDB9039133B5446168F8EDAFDB", "InstallerPath": "Install macFUSE.pkg" }, { @@ -34,7 +34,7 @@ "VagrantPlugins": [ { "Name": "vagrant-parallels", - "Version": "2.2.1" + "Version": "2.2.3" } ] } diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index f70e69627c4baf..21dd2f34a4d5d5 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07dbca4b72d51fb97f55b032e1b412add4054973", + "version-date": "2020-12-09", + "port-version": 2 + }, { "git-tree": "5dadcecafd0c3ffdfcf438c1f5f8b106002e14d0", "version-date": "2020-12-09", diff --git a/versions/baseline.json b/versions/baseline.json index 8cadbc5a6cc5ee..e0d2c770fa1dc5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -282,7 +282,7 @@ }, "azure-iot-sdk-c": { "baseline": "2020-12-09", - "port-version": 1 + "port-version": 2 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", @@ -1394,7 +1394,7 @@ }, "coroutine": { "baseline": "1.5.0", - "port-version": 1 + "port-version": 2 }, "corrade": { "baseline": "2020.06", @@ -2758,7 +2758,7 @@ }, "itpp": { "baseline": "4.3.1", - "port-version": 6 + "port-version": 7 }, "ixwebsocket": { "baseline": "11.2.6", @@ -3438,23 +3438,23 @@ }, "libodb": { "baseline": "2.4.0", - "port-version": 7 + "port-version": 8 }, "libodb-boost": { - "baseline": "2.4.0-3", - "port-version": 0 + "baseline": "2.4.0", + "port-version": 4 }, "libodb-mysql": { "baseline": "2.4.0", - "port-version": 8 + "port-version": 9 }, "libodb-pgsql": { - "baseline": "2.4.0-3", - "port-version": 0 + "baseline": "2.4.0", + "port-version": 4 }, "libodb-sqlite": { "baseline": "2.4.0", - "port-version": 7 + "port-version": 8 }, "libogg": { "baseline": "1.3.5", @@ -3706,7 +3706,7 @@ }, "libunistring": { "baseline": "0.9.10", - "port-version": 0 + "port-version": 1 }, "liburing": { "baseline": "2.0", @@ -4306,7 +4306,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 3 + "port-version": 4 }, "nanoflann": { "baseline": "1.3.1", @@ -4962,7 +4962,7 @@ }, "plplot": { "baseline": "5.13.0", - "port-version": 9 + "port-version": 10 }, "plustache": { "baseline": "0.4.0-1", @@ -5778,11 +5778,11 @@ }, "selene": { "baseline": "0.3.1", - "port-version": 4 + "port-version": 5 }, "sentencepiece": { - "baseline": "v0.1.82", - "port-version": 0 + "baseline": "0.1.82", + "port-version": 1 }, "sentry-native": { "baseline": "0.4.11", @@ -6798,7 +6798,7 @@ }, "xlnt": { "baseline": "1.5.0", - "port-version": 1 + "port-version": 2 }, "xlsxio": { "baseline": "2021-03-24", diff --git a/versions/c-/coroutine.json b/versions/c-/coroutine.json index 96c52d448b58fe..3bb9ab69b7c838 100644 --- a/versions/c-/coroutine.json +++ b/versions/c-/coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14f8ad97489e980329f98d4c95146dafb32cedb9", + "version-string": "1.5.0", + "port-version": 2 + }, { "git-tree": "da458b763cbbbbba0acf20b1895ddd4ee4ff8d0b", "version-string": "1.5.0", diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json index 6c3a4abd91b11a..488d58ee064a9c 100644 --- a/versions/i-/itpp.json +++ b/versions/i-/itpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e10390b026b73c352e32bdf11ea58230a7e51d53", + "version-semver": "4.3.1", + "port-version": 7 + }, { "git-tree": "ef6b3ce5f6b2522df8dc27959244a73581a44b6d", "version-semver": "4.3.1", diff --git a/versions/l-/libodb-boost.json b/versions/l-/libodb-boost.json index 9370253dd48a0a..3bc2015e2d5ccc 100644 --- a/versions/l-/libodb-boost.json +++ b/versions/l-/libodb-boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "facc25e5e4f72028b75da7be4b88208615b172cb", + "version-string": "2.4.0", + "port-version": 4 + }, { "git-tree": "70c909cead2fcecc32b1be6da761fd8aaf74a95a", "version-string": "2.4.0-3", diff --git a/versions/l-/libodb-mysql.json b/versions/l-/libodb-mysql.json index 6806250f6b4c62..4333d95364ec7f 100644 --- a/versions/l-/libodb-mysql.json +++ b/versions/l-/libodb-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf081744ced44cfa3da6d34d959a63fdaacaf69f", + "version": "2.4.0", + "port-version": 9 + }, { "git-tree": "208d05d2a1a41329632318e2950c1300cf75eb51", "version": "2.4.0", diff --git a/versions/l-/libodb-pgsql.json b/versions/l-/libodb-pgsql.json index e6638b0b7dd0e6..0647a39493aade 100644 --- a/versions/l-/libodb-pgsql.json +++ b/versions/l-/libodb-pgsql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfe9698df72847f118144c93dbcc25e2f0e0b16d", + "version-string": "2.4.0", + "port-version": 4 + }, { "git-tree": "a16d0a534195ac98f6f44b21a42f626cbb5c9a6e", "version-string": "2.4.0-3", diff --git a/versions/l-/libodb-sqlite.json b/versions/l-/libodb-sqlite.json index a40556d2001d20..10f0bb1b5d0860 100644 --- a/versions/l-/libodb-sqlite.json +++ b/versions/l-/libodb-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d24a8283229f618903b2d446e7e22e4a0cf3f69f", + "version-string": "2.4.0", + "port-version": 8 + }, { "git-tree": "6c3f8c74462e65898e335eef5ab9fabc0a3b222f", "version-string": "2.4.0", diff --git a/versions/l-/libodb.json b/versions/l-/libodb.json index 5254d3af86ec4e..4bd5b20282bbc0 100644 --- a/versions/l-/libodb.json +++ b/versions/l-/libodb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8296035980f67a96a49e7277dc91149172555750", + "version": "2.4.0", + "port-version": 8 + }, { "git-tree": "6be9a8547e11c2b30077c90504c6dc714f854076", "version": "2.4.0", diff --git a/versions/l-/libunistring.json b/versions/l-/libunistring.json index 800afe50cc7179..3651b41cfc3cb9 100644 --- a/versions/l-/libunistring.json +++ b/versions/l-/libunistring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e74b9d781041b3a5c09b72f77b8e79ea6add168", + "version": "0.9.10", + "port-version": 1 + }, { "git-tree": "586bf47f6b9ee55aa3eb9ec7c7ff36363e39980b", "version": "0.9.10", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index d5a9e7b9dcacc8..28b825696bbe19 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3549b9a15615f77ec718e9071309482707ad3779", + "version": "2.13.0", + "port-version": 4 + }, { "git-tree": "2c22ba3957ee9a1a2c6d893c746b6a51bf38435c", "version-string": "2.13.0", diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json index ca18d910ce0dc9..cce975d7432edf 100644 --- a/versions/p-/plplot.json +++ b/versions/p-/plplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3b92bbff064890556b4d4f759d2cea20041e79d", + "version-string": "5.13.0", + "port-version": 10 + }, { "git-tree": "3a66c489f5aa8d94b9b171561bfe15b65fb71396", "version-string": "5.13.0", diff --git a/versions/s-/selene.json b/versions/s-/selene.json index 443e010d0ab37c..c1635f9df68277 100644 --- a/versions/s-/selene.json +++ b/versions/s-/selene.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7e77d03f1d4e5a4d24e10c3ffc1ac326df1791e", + "version": "0.3.1", + "port-version": 5 + }, { "git-tree": "414a898c6d7a263608c56e4bdddfc69936a6b9d7", "version": "0.3.1", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index 08fc471893e362..fe93e69d264075 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80fecc6a62e7e634b59ec58f737202c0773fa73e", + "version": "0.1.82", + "port-version": 1 + }, { "git-tree": "90b2ef495290ecbf5894d437a1d03d3735d9bf4d", "version-string": "v0.1.82", diff --git a/versions/x-/xlnt.json b/versions/x-/xlnt.json index e078174a4fb35f..c12760bf18991e 100644 --- a/versions/x-/xlnt.json +++ b/versions/x-/xlnt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6bb2b46d0e6bf4e603c93c974bd2eb704e3a520", + "version": "1.5.0", + "port-version": 2 + }, { "git-tree": "1e9127d56c2d772d64454b5aef80f93689f70242", "version-string": "1.5.0", From 090b1542f4c0b5c5db6c7a2a977595533e4cdbbf Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Wed, 4 Aug 2021 14:20:23 -0700 Subject: [PATCH 0253/1858] [vcpkg-tool] Update to 2021-08-03 (#19347) --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 ++-- scripts/tls12-download.exe | Bin 18296 -> 19848 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 0c006380483a04..364a4e19e5efc8 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-07-26/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-08-03/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7da7a2021910b0..a4189351c4602a 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -278,8 +278,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-07-26" -vcpkgToolReleaseSha="e5252df535a75e1b776e057811a2913b0508d0a387a781815e353c23d0a33ec8bf8982a121adc6b711243bf0981843a435a0e53facf274ac7c38c3f571c26766" +vcpkgToolReleaseTag="2021-08-03" +vcpkgToolReleaseSha="d4c25be83a7685bc268254909796b9ef8e1549454a45b1154ab1d64f9846c91ce48c8a1cf00a864afb9a6dd878d82ceaea5981d53e57968196a9b6e90934fdef" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" diff --git a/scripts/tls12-download.exe b/scripts/tls12-download.exe index 4e49627220d45d014605ee79c6977fecd611c5f8..f1f640efd551ea454199c1b70b272d1791a2fa96 100755 GIT binary patch delta 6468 zcmc&&d014(vhOnt2nfs|3?S1A+jS1DBwU42twS5!>Ztf1U#;Z zQSll#NL+BixC8}_K`@Al#x0mfl5t0)7{NHV`hbZy_xs-W-uverzUr>7s{U1Vb#L2E}EAB3vifsICp$$)+WLb3I(4xB__lp`i1Ef=9CP>c&G%3NFoqI4EC z*cY3+PB>e*nFGrOvH-HCj2NDT8x_Ft^yb0%tw#y40fm{l`SV5{f@8!4n$WzQv6NWN zG}I(=l}KB{V`~T0$W@6FbnC_-q%Yz*Cg?r_P8~%H%Ycnf&(eReEsh#>JJu(=Xn4ssVV4f}m>{91+cD8ISC6I212|^7_Qi+7^HI=+gAWG2r zfGp>^o+AQt?e7(OJ*)D(Awm$XU9_GP3{vO{pwm>fvMTq3s-lEv$1L(zbKP(fDDY6x zZrp-5FID>yjVkQaxd3cgJNDWZqfKPSY1PK@+5$868a$~cg=bfj%j4A)@w{|10U#zp z_YQP%2|5*Y>Q)+A0xV=w03A->+)7?kDJbA{GSbHWqL3baR(UkS!RkYjPcO1#C;ylb_Rh?&2eTMcLwE-gVwg&4t zN}Q8x6~mAdF4RH}0dejHrlQ>}2b*fetcRIudcQ7V-}g2tEhq1;cPF40FtCG%B7Fk{=wMGXXqsVL2+iEd3SrCh(M? zV?*qqP$uY%{#wv5b{Xh}UAEil57N;3USKdN&1|3geUODotq>2uel;Oj-Z|X-K?-5G{&^5njItqQ$31ZG{jQrYs(va*F{a z2DNw&)U3*CXw|I{LW1rwU}>lFxU~m)`#>seg*9eD!S8}W)px}?KLV5k6nEAzs2r_ZMnZ& z8(0nKaj?NfJd$p$^}Xsu51fR{fC%dz$$pHUGZic=euqll4^zPvmzB^8m8TL8f+HoQ zS;>ZYK%%Y%|Is)=oKiTdQ=@bAa8eVqSXL@t8r_yaJEDh)DI&0gUJV{`p9>CfUohG) zru#}>C5V++RmrP^?!7a6FpJNHs;k=)SX`qYokp$SYDNynjMHl$>DJ=S)L~c*53&9k z8ib`=1lp>H#pB}OWHP}IoXnOMSpR(&btg{4N$gwK0WI7u;j{s}r4KZ4A>j87WC(JD zAUC5M40W#NYX00{?b-VXF104O$L7qQl?oS|8&u=y#imxd<4m7;sn@G3Y4!kSJ85<& zW(R0?6K3t`(yYgLPIwI)yDFyS!}~rV4-N(Sq+z|Lnc1NHLA~qOYEfx(*olR z(7{1Tp_Z7s5Yf~|Q`a}5H0rcz{XbF&yaA4FdJlYk>OF8V>pk!_qxZmvNbi9!QN0Jg zQS=^lbc^o`y$8Mm^d9&w)q8BGwvP1F!O)Q*!GPvAvQ0B94?3ZPsdKOh?*CeR?*{RDIY=o)+=>VSrTtYPd1BnFBF$^tU-hqn{-bwHbd zb^(12gr6yZg`Yf_8|#B)s1ld~Z-lM`bpnOJ*b4&#F@W&XGTP(FF||TX^f@)}8RtU? zV^Ah4LXjvN=5Yc9N<=kdneC!iU}?e{2ZiC*{-CvGVGjY#;9W25hEmZV$_UH za|Saen7^6`6H&M{B|U}8wiCwVkAC_G0B=DaJ(&x?3V;d7&PXpx=LKR}6UdCQj3nn} z%?ErK;C4jMTe@^<#$13w z_$N#>#u@P?02Y}+5#e=@%7j?P1=(9M;gr$E7EjfWpE!L3Xx}_dP-=_02(`Z@>j2qy zkYSWJkK7M9E@ba5SsKU+xb?0!|KF#|^M81%s2%oCT|Pkx*?IAqh1pq4Vhf8G79o@{ zd3x;3xR}_0jNDvAt#?Qba5Id_EQ-v|&77Qqq%Fh{sactq$R@)Ze1Qc;X3UG$acq^L)v6Lkk(4SW*F5SxhEVq399tP;-< zCyO)11>$Am72*~sAczrcsR_0V4hRkoP7Y2F zt_=Po*g#?;VM#a=2Z^i1Q{pcXN+gm{NrdDb$-9yS$!y6yNwy?kQY={}DU+;})JiDH zM#&b*7m`NFe#sHZ_mbO^UnS2Zrc#x3nlw(jP1-0uEIlFZmfn{3OYcbsq=V8|QUjT( z%u;42bCFGuY5Zk@GKDNc_O2{hmMY7X<;#}HYGfN_yJZJty|RAUJ=uV4Q1(j3kekTa za$C8x+(Ygs7s_SwaQQp(c=;@Oy8JzPvAkMdEB`{?EI%s$Mt(+qUVc%2P5z_&7x_c^ zGx@Nbp)gg9Q`jp!6g~=4Ays537AihdY*Xx=r8uNGrZ}beR?(%nqPbTv`kw|21|rMdi;YZtRz$6MVNQ%;Y%O=s0?}N`g*TJ? z;U6m_ru?vG&w?z?k;dCM`a=(G-^Mzy?Mc_znm>X*{curpJ+Io_a6VbinMXMbUT|-2 zOgras)30$(1hd2EjoIUKPhm%w$bWQs_$jDAAL=3-!snF-n!6gHD+>2TkpvmqSnf_9V`2v3mTWC zejZa)dTdeYo*S*cM^!-|7lwCA9|gp&cYW48cxJxb@wR*W@wC@J-H{u11%x;`+J7{( zdia9%ne8=aeX{oN^VK}Rwu(*l>~BETHA9In$^3$@W8sm7_nU$joQSILTYWvJujj|t zeuuTwb5ADt^fV;Sp18;BqfbK4d0u_BGI?G1-7OEfDR%j)uKkvO@RgFDcULUWJCvNg zt!*Xi_hPTeN7KgdZkC2V-B{IP9Tb#1IIAIj)=vA0E6}>ZIdzZBwy5W>D{d$s_k=7T z_t41H*N9*ebIwX+hC0zMf`3I&2dk`x5+g9DREW+{Vswzcf?_Ogp)*#+u}ERIU{^!1oP z@{A1Pm}9M+V%6!nnG3nGF)`eTnCViXAWY>SAyftW3&W_PKtFdCSy-aZ7QE~^OuPWj^l5Q829VwF+JXeUAHbi z3|~KYmCcK}xpzhSDHqSo$Q&NzFFBbRCsL_2#}~Ty&%V3t7kyFMRqr)*7 z^xUK2TOkQGzokvwn3UIJ{dpBh2e9 zwD)Iz^*msUH^YEH#6Qak2dD*G(g`-q$%1Lav_9WH#WHP5_z`JIpL6_L>Vvx1KJPWN zC1!-if6|w24IenndSQzu+>CRLTvp8($b4XHy>dojT5DWrV9)gTk2-P!^QUj#yDsCg zb6%61#8bsCn&UssQ2I&Rf`EIEFFo+SsaJ4k?B4Rcu6B3_=6ml z==J9T7U6rF;~L7V$(rkv;^)1CI{IX2VJ zT(P~)2#;qt?=WWcPil6QEjF_5AV4I6$|>AR)BJn^>1N0J^EC2Fp@^US zr$7XU6br~jq+;~qs7x|t68wpzKWWM^MEwB3AQ12bVleD}U=Vt849#0AMhp%`KEwv% zx27}rUgQMQ3?$UvaFNDKdP6hD=wflb?Jr+G+SyssxvXN0Ver1qyE(i5$hdCwvrF6J zuiQ=t&RWx!T7T3)#$0Z(E9$`Xg>mAgskt-P_L=&5dN*r!4ViqkY|V}9@;y!g>)}F(=V@w5P*@icpQ7QbJ zd(w@`ZR$CD1@UUnS&sD=d{Y}JKewU!y$|0v&$v-?Ll^Edyq-#rw9@Pen>KCDGIiT{ zeOR*WSjGV(`|g{y>~HuYOx4GA5{aA6;yzy7&=mtwV z-`_l|JFQzVZ=b6!bWl=K5|*U#`T6m8+*N&7>vlW~NEQTbVJGL29glNLuf$z1=X-Xy z4$NG7?VA+7Zeozvir5JjyZYxnQ9rBve20F+{&(ct&t@;aGtN;yb$eY{*MgU;jBh#J z7F9Y&4e2bmH}2(C|9H1s?9suyofFxbbj!YI_u>8aFFbB~{`%|Hq?b1aM3>?mOe*mI Ht?=_NW>Rz) delta 5662 zcmc&%d03N2x1TozMA^a;0c8o2u*mj?B!q0T3lxMXn@|J=!GJBIpi;N6sbIv4uWQ}F z-PRS{z@;c?t;M~fXg?LJHWaW*QT*KA?@Yjce!chpb?@`sd7d+K=69Ak=giETNySFu z^$KF8oVZr42vOVjx#=aZ8LRwAqK@G4=`a^{gpHpFBJbQ-&cFP3WVR`Ku;>#2z9BVMLhPAyYss2GAxJj4VVAA>0{V!zo|F#jD8` zA)TKay9M~l7D}99MLatqswi`H=zY_*KfK5!&reH*=L#_f_*5Xzb$~DYI zxk#Cd5>*pHLbE4>8>I@_f*Up$_{B|yX5i2;NxM;JW7y?Jv+=U3e5XJ)O42;nmJPUn z2g#`}>fF!NsoJPob+gO?!z7w52Rm&G=%uH%ww{P6CXn{k5QJ)(WFQi>RF-o?0ZP&q z0harcW_yCV=5-lOo0VsR5kzaHq}e2(FsNWqFK#j`j|5TK0u!43ouyIM+wJ_k)m2=~Z)gYvyQ>w~Ag=PyOCMcM{Y9F>ZqlXasA(U&k31(IM zxT(bmX(xiY=DadV8;d;;lq*!{(x%I9pt6dez|L&(G%y$RoWV&za8|iU1@aB@%*Dsx@HCkK)U#L3XNRPo?DNlU>D1ZsJbwi4LEJQe|~ z5xL=2T5LcZO1D8Dq3Z+bw!z~t5o^H_1^=F~OW>P}3?X`^GB-YvzJ61H2{d~F2(g29 zod|&ZLExqizyaayf<%!LCOB;pwgz7hl_gwGuqYg~*asFR3j(<|7eQ`TUIM);pNmT~ zp8@Gbb2(Lo+=+rFNH81XRxbW=Hv0q#S^&pjB&LgJ<`_zyG3Ke=!D6sB4#1YRum-P6 zE`w%Igask5R2U#67F^9@-AzbULNv<(#R(0AXf&cgn5~5UW5HgI%|%rZ#CV*?WMv%P zhSi?I`dID(NkRy$*>|x^^?&d4I4F13X+*2RYl3bIJ$1bm-3Dhb6i^kDhZCL-i$j_p zV}_IWNz8(#E(A9)9xh$lq|ejg7G8$!AH0RCccZ|8T07z`O{?V2*qIq-7wA|fW@~ip zKi>d*QO7>R>~kIaD`stUMZbgD2pxMFv)6R&Ii0SKJ&xH{yqtC)uv%Bhu63ZTGUD<- ziMY9}+wS8BDU@qd+XR_b#dEF9So(*6#dXWBZJ`p3MiUpQVj~W*nW{C)H;e}v>=UAF zjU9UP z>)u&LnzPBPHK>xw?QQnLzekHv*KgED(~%=T$$e6Df~LEqn+sc%YfZDGsq3a4gcVh9 z=1fFWx6O_Lzk+40`gecw&b+`;$yzWh(PdBrVW&ZvF2Fn ze4o%Qd&%RR?BZX`jx*Gp^$0We`b63KqcU~N!g2V&od`AK24Vz1)G$jYzrQd3i62QA zYh+XZok`6a6Rag@D)}dA7l_Q(G&NJTj94{iG&~bL5K09K2J!?N4)hN2Q$V|bRs$^o zTJMg~9-u~`pMf3$y#iu@j0Ln7+r#J&^cheZ&@3R_?hcMZ(2oI{3gqC9JkUNjgbZQQ z2je54Ye0=axZy}K;b#wNSKnwgny9xMzK5u9wXPtBhN2lL4`m^5>V>W4_>WH~2H5!n zMYsUjU@z#eXBB>|SOFD-toUy-{P6LFW4{_?t3h@O$|Gar-};XY*AKTH)ZP(GohHPE z##QE3HWqSD#co;jq+@4M?^G~HA=1>KRDLSom&zI`NW||c@4~F2LhhG&I%5tzwt(@@ z!S5)p2xFT7GsGB4W@b+V|1igqdQZ#FnOcC*A(*d(SINh>SD*{^Y@{=Rdk2cN)1L?t z7s1j4a_+o&^QLBi8-!nma_nbdEni^KJHT)S1~CD~SWxXxViIBu?}`CcW#=O;9^4Cz zE{A=}=L}fjIc}|ZV>uAPCwk8TQ*o-DhW~#bFYEu|cu^PZd#O7PY4zET!x(j=m`vgh zrSIaZ&f#nL)%i<`wiim!@qiSLO!#J`Dq#D9waDW=8x{`UT!{v!Wi|B3#q{5Se<_wVz6?{6qE zlZ=v(55{ya zFr{u%KdD?AERB%HNaLlSOEaW7(tPP$=_2W3X_a)1bhC7ibicG-dRqE}^se-Qv|p+( zGm@FhtY!8xXW3{OU*<0hkd2j%lf}zYWm9Ee$mYrx$Vz3)WyfUaWj(S!86h7cH<4S) zZRL(~o;*e#C(n`RspT5^O8FM~9(ldIMgF7wvHXSnmE2t6pm0`%DB=_o71@e>#eBur zidw~9#lX44*LV|ILt2S!MEgW1L`@<$KY;$D>HY^X7>F!&Rv8Q(y(D5uzX>sfQB&%i z3{V1tAoymaiNR3HZFD5(k!5py!3nloxY@!H2Um<$OP^)K56K;#laDa6d-*Dh`s&dY zCi*F4DLavJ@bBkDZ*^W;ndNf-M^$X#RTpFC?W-^D>7N?%`<5H82$u`q5tK-hq)zC+ zU$pe;%$1|q#no*MhXvE3OkUjWxxL_v;O)ng#g_Dl`t~=CV_$3P7zN+%$=rML&s|Hq zk4q1Gk7cdx*p!?b<3HkDk{e4_v&DJ;uXm%S>)RFI+GTLGuOlR(fy4Z8GaiXcQjaRc zvkrQ$9ywu8mE%&E>)wlkZ(02;_grSrEmda~C32kWuFRd`=DPc>$L#RP8$IVUZKrLU zBN8Wf<}y;IU#{9xril87<{#TDp1hK*2;DSYZ$baUb{3IwYDfE-OUoae?-LYGX$YCO z^@e#!OY1i=q4gn7b=1}12Bj6hlRdTk?$a{n66+A3SyR}3DPxG|p^J{NyRHX~{U|8`zV{OCpFYJthPG z9h0Sm(!gkN`-ZXzW=$y(z$_(XAP`gC(os=63$&7^@!kEL-K>=xj|qh?(>K5VBS3vf zBQZOf>O1l%!(ejd4=w4FZ7h6AUp^@!MSMQ#Cy;oPekmlgm_hW_lw8|Ua+xf-L>&%K zaN&{826_ohBTKt+IhnI&6wJsjr zek7SJZjcy$66@aSdlj~yXE8tp5^xWS391j+uC~S_4=HtJ1@Gh-MP-I zQ@&_hesB2tnz24R48O4)Io8U?E8dq}c5}^shUrPFXN-*%vDRTXb6DDMu4{sc;yzaR z{p>dj>TLsz33V*<@uB{|>c@;C_dcv#n2#fan%QDqtmKRKS*|Yn}y12E8 z$5LF@%`-YMe^=YZP2*AyJ&0U>*Ds)HRrve56JH7ou6*cuws1kQU5ow{8-~NdlWn=c&1@#k%1^kr1 z06+c!K+Yuy;S~ZtIYoXwJ?tg z;`!do(xlWx^cQ-m*7mSFN8z&5Uy3+&j1PQ&N1f){+5%Iz7Bu& z&@m{lt$fq2hHvA>R{n&4BL_dfgpodiPcO>qvG{V<$*Vy}^Z{JS09kp9M=4xbJ zVr|HQ3n3Sd1drKd>Y3}+V1E3?-Hnp0Wfp&I{%$VXxphiT)=#a~w#}VKidE((%O+S4 zJG4%j{_pTjPzWx|AAkbn|l)=~`E-+HNOKUjFMUTGHhk)Np!p z$Qr|EU9rl~9cD%^tNj^W3$f+5-!$v2h?dLlXkuJ$OxIpIYDxtpx#cEaxHNU!m9P`< py+@c%s+wilmON#{`+0YNY2V8)v@;3li#=bpV`+QhdM5sq{|o7eiQ)hN From 90e11b72e47f57874d9d3f270e80849267a580a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 5 Aug 2021 11:05:18 +0800 Subject: [PATCH 0254/1858] [vcpkg baseline][hunspell] Fix usage when building static (#19323) --- ports/hunspell/portfile.cmake | 13 +++++++++++++ ports/hunspell/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hunspell.json | 5 +++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ports/hunspell/portfile.cmake b/ports/hunspell/portfile.cmake index bf48b9c2eaf0aa..053d1dda4f70c4 100644 --- a/ports/hunspell/portfile.cmake +++ b/ports/hunspell/portfile.cmake @@ -77,6 +77,19 @@ else() endif() vcpkg_copy_pdbs() +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if (VCPKG_TARGET_IS_WINDOWS) + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunvisapi.h") + else() + set(HUNSPELL_EXPORT_HDR "${CURRENT_PACKAGES_DIR}/include/hunspell/hunvisapi.h") + endif() + vcpkg_replace_string( + ${HUNSPELL_EXPORT_HDR} + "#if defined(HUNSPELL_STATIC)" + "#if 1" + ) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/hunspell/vcpkg.json b/ports/hunspell/vcpkg.json index 372bac8dcee9e1..c89c4ca94ac102 100644 --- a/ports/hunspell/vcpkg.json +++ b/ports/hunspell/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hunspell", "version": "1.7.0", - "port-version": 4, + "port-version": 5, "description": "The most popular spellchecking library.", "homepage": "https://github.com/hunspell/hunspell", "supports": "!((arm | uwp) & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index e0d2c770fa1dc5..c6742dd55aa77f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2558,7 +2558,7 @@ }, "hunspell": { "baseline": "1.7.0", - "port-version": 4 + "port-version": 5 }, "hwloc": { "baseline": "2.2.0", diff --git a/versions/h-/hunspell.json b/versions/h-/hunspell.json index 0c6d4ad37f94c6..af5756c9447935 100644 --- a/versions/h-/hunspell.json +++ b/versions/h-/hunspell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a0514dd8b3893b6d3a502fbf55156e9e971d6f7", + "version": "1.7.0", + "port-version": 5 + }, { "git-tree": "1441675cd83b048c9fe45d9230ab99c06421b121", "version": "1.7.0", From e376fc41827c96a2b66325ccf243d8b3bafc0d1e Mon Sep 17 00:00:00 2001 From: Ian Cook Date: Thu, 5 Aug 2021 06:01:46 -0400 Subject: [PATCH 0255/1858] [arrow] Update to 5.0.0 (#19229) * Bump version to 5.0.0 * Update version files * Update patches * Update version files * Fix patch * Update version files * Add newline at end of all.patch * Update version files * Unpin utf8proc * Update version files * Expect tensorflow-cc build fail * Remove tensorflow-cc baseline failure --- ports/arrow/all.patch | 4 +- ports/arrow/fix-dependencies.patch | 126 +++++++++++++++-------------- ports/arrow/portfile.cmake | 4 +- ports/arrow/vcpkg.json | 3 +- versions/a-/arrow.json | 5 ++ versions/baseline.json | 4 +- 6 files changed, 77 insertions(+), 69 deletions(-) diff --git a/ports/arrow/all.patch b/ports/arrow/all.patch index 180fafc58018a9..a9b3a26280cabe 100644 --- a/ports/arrow/all.patch +++ b/ports/arrow/all.patch @@ -1,8 +1,8 @@ diff --git a/cpp/cmake_modules/BuildUtils.cmake b/cpp/cmake_modules/BuildUtils.cmake -index 2fd897b5d..b6118ad4f 100644 +index cd8290d1b..12c52c184 100644 --- a/cpp/cmake_modules/BuildUtils.cmake +++ b/cpp/cmake_modules/BuildUtils.cmake -@@ -440,7 +440,7 @@ function(ADD_ARROW_LIB LIB_NAME) +@@ -427,7 +427,7 @@ function(ADD_ARROW_LIB LIB_NAME) target_include_directories(${LIB_NAME}_static PRIVATE ${ARG_PRIVATE_INCLUDES}) endif() diff --git a/ports/arrow/fix-dependencies.patch b/ports/arrow/fix-dependencies.patch index 65dcee3343b28f..3e22d18019e74b 100644 --- a/ports/arrow/fix-dependencies.patch +++ b/ports/arrow/fix-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index b7a1dae..2669b15 100644 +index b5a39bf33..af1e16a9b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt -@@ -669,7 +669,7 @@ endif() +@@ -668,7 +668,7 @@ endif() if(ARROW_WITH_BROTLI) # Order is important for static linking @@ -11,7 +11,7 @@ index b7a1dae..2669b15 100644 list(APPEND ARROW_LINK_LIBS ${ARROW_BROTLI_LIBS}) list(APPEND ARROW_STATIC_LINK_LIBS ${ARROW_BROTLI_LIBS}) if(Brotli_SOURCE STREQUAL "SYSTEM") -@@ -685,9 +685,9 @@ if(ARROW_WITH_BZ2) +@@ -684,9 +684,9 @@ if(ARROW_WITH_BZ2) endif() if(ARROW_WITH_LZ4) @@ -23,7 +23,7 @@ index b7a1dae..2669b15 100644 endif() endif() -@@ -736,10 +736,10 @@ if(ARROW_S3) +@@ -735,10 +735,10 @@ if(ARROW_S3) endif() if(ARROW_WITH_UTF8PROC) @@ -38,7 +38,7 @@ index b7a1dae..2669b15 100644 endif() diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake -index 83ea3aa..d592fc3 100644 +index e6852d9c2..fc0973ffa 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -53,7 +53,7 @@ set(ARROW_THIRDPARTY_DEPENDENCIES @@ -67,22 +67,22 @@ index 83ea3aa..d592fc3 100644 xsimd ZLIB zstd) -@@ -956,7 +956,7 @@ macro(build_snappy) +@@ -945,7 +945,7 @@ macro(build_snappy) endmacro() if(ARROW_WITH_SNAPPY) -- resolve_dependency(Snappy) -+ resolve_dependency(Snappy USE_CONFIG TRUE) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(SNAPPY_INCLUDE_DIRS Snappy::snappy INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${SNAPPY_INCLUDE_DIRS}) -@@ -1021,10 +1021,16 @@ macro(build_brotli) +- resolve_dependency(Snappy PC_PACKAGE_NAMES snappy) ++ resolve_dependency(Snappy USE_CONFIG TRUE PC_PACKAGE_NAMES snappy) + if(${Snappy_SOURCE} STREQUAL "SYSTEM" AND NOT snappy_PC_FOUND) + get_target_property(SNAPPY_LIB Snappy::snappy IMPORTED_LOCATION) + string(APPEND ARROW_PC_LIBS_PRIVATE " ${SNAPPY_LIB}") +@@ -1014,10 +1014,16 @@ macro(build_brotli) endmacro() if(ARROW_WITH_BROTLI) -- resolve_dependency(Brotli) +- resolve_dependency(Brotli PC_PACKAGE_NAMES libbrotlidec libbrotlienc) + set(unofficial-brotli_SOURCE "SYSTEM") -+ resolve_dependency(unofficial-brotli USE_CONFIG TRUE) ++ resolve_dependency(unofficial-brotli USE_CONFIG TRUE PC_PACKAGE_NAMES libbrotlidec libbrotlienc) # TODO: Don't use global includes but rather target_include_directories - get_target_property(BROTLI_INCLUDE_DIR Brotli::brotlicommon - INTERFACE_INCLUDE_DIRECTORIES) @@ -96,16 +96,16 @@ index 83ea3aa..d592fc3 100644 include_directories(SYSTEM ${BROTLI_INCLUDE_DIR}) endif() -@@ -1141,7 +1147,7 @@ macro(build_glog) +@@ -1133,7 +1139,7 @@ macro(build_glog) endmacro() if(ARROW_USE_GLOG) -- resolve_dependency(GLOG) -+ resolve_dependency(glog USE_CONFIG TRUE) +- resolve_dependency(GLOG PC_PACKAGE_NAMES libglog) ++ resolve_dependency(glog USE_CONFIG TRUE PC_PACKAGE_NAMES libglog) # TODO: Don't use global includes but rather target_include_directories get_target_property(GLOG_INCLUDE_DIR glog::glog INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${GLOG_INCLUDE_DIR}) -@@ -1214,8 +1220,7 @@ endmacro() +@@ -1206,8 +1212,7 @@ endmacro() if(ARROW_NEED_GFLAGS) set(ARROW_GFLAGS_REQUIRED_VERSION "2.1.0") resolve_dependency(gflags @@ -115,24 +115,23 @@ index 83ea3aa..d592fc3 100644 REQUIRED_VERSION ${ARROW_GFLAGS_REQUIRED_VERSION} IS_RUNTIME_DEPENDENCY -@@ -1316,7 +1321,7 @@ if(ARROW_WITH_THRIFT) - # to build Boost, so don't look again if already found. +@@ -1309,6 +1314,7 @@ if(ARROW_WITH_THRIFT) if(NOT Thrift_FOUND AND NOT THRIFT_FOUND) # Thrift c++ code generated by 0.13 requires 0.11 or greater -- resolve_dependency(Thrift REQUIRED_VERSION 0.11.0) -+ resolve_dependency(Thrift USE_CONFIG TRUE REQUIRED_VERSION 0.11.0) - endif() - # TODO: Don't use global includes but rather target_include_directories - include_directories(SYSTEM ${THRIFT_INCLUDE_DIR}) -@@ -1416,13 +1421,17 @@ if(ARROW_WITH_PROTOBUF) - else() + resolve_dependency(Thrift ++ USE_CONFIG TRUE + REQUIRED_VERSION + 0.11.0 + PC_PACKAGE_NAMES +@@ -1413,6 +1419,7 @@ if(ARROW_WITH_PROTOBUF) set(ARROW_PROTOBUF_REQUIRED_VERSION "2.6.1") endif() -- resolve_dependency(Protobuf REQUIRED_VERSION ${ARROW_PROTOBUF_REQUIRED_VERSION}) -+ resolve_dependency(Protobuf USE_CONFIG TRUE REQUIRED_VERSION ${ARROW_PROTOBUF_REQUIRED_VERSION}) - - if(ARROW_PROTOBUF_USE_SHARED AND MSVC_TOOLCHAIN) - add_definitions(-DPROTOBUF_USE_DLLS) + resolve_dependency(Protobuf ++ USE_CONFIG TRUE + REQUIRED_VERSION + ${ARROW_PROTOBUF_REQUIRED_VERSION} + PC_PACKAGE_NAMES +@@ -1423,6 +1430,10 @@ if(ARROW_WITH_PROTOBUF) endif() # TODO: Don't use global includes but rather target_include_directories @@ -143,7 +142,7 @@ index 83ea3aa..d592fc3 100644 include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR}) if(TARGET arrow::protobuf::libprotobuf) -@@ -1471,12 +1480,18 @@ if(ARROW_WITH_PROTOBUF) +@@ -1471,12 +1482,18 @@ if(ARROW_WITH_PROTOBUF) # Log protobuf paths as we often see issues with mixed sources for # the libraries and protoc. @@ -162,7 +161,7 @@ index 83ea3aa..d592fc3 100644 message(STATUS "Found libprotobuf: ${PROTOBUF_LIBRARY}") message(STATUS "Found protobuf headers: ${PROTOBUF_INCLUDE_DIR}") endif() -@@ -1904,7 +1919,7 @@ endmacro() +@@ -1889,7 +1906,7 @@ endmacro() if(ARROW_WITH_RAPIDJSON) set(ARROW_RAPIDJSON_REQUIRED_VERSION "1.1.0") resolve_dependency(RapidJSON @@ -171,13 +170,13 @@ index 83ea3aa..d592fc3 100644 TRUE REQUIRED_VERSION ${ARROW_RAPIDJSON_REQUIRED_VERSION} -@@ -2047,10 +2062,11 @@ macro(build_lz4) +@@ -2024,10 +2041,11 @@ macro(build_lz4) endmacro() if(ARROW_WITH_LZ4) -- resolve_dependency(Lz4) +- resolve_dependency(Lz4 PC_PACKAGE_NAMES liblz4) + set(lz4_SOURCE "SYSTEM") -+ resolve_dependency(lz4 USE_CONFIG TRUE) ++ resolve_dependency(lz4 USE_CONFIG TRUE PC_PACKAGE_NAMES liblz4) # TODO: Don't use global includes but rather target_include_directories - get_target_property(LZ4_INCLUDE_DIR LZ4::lz4 INTERFACE_INCLUDE_DIRECTORIES) @@ -185,23 +184,28 @@ index 83ea3aa..d592fc3 100644 include_directories(SYSTEM ${LZ4_INCLUDE_DIR}) endif() -@@ -2111,7 +2127,7 @@ macro(build_zstd) - endmacro() - +@@ -2090,7 +2108,7 @@ endmacro() if(ARROW_WITH_ZSTD) -- resolve_dependency(zstd) -+ resolve_dependency(zstd USE_CONFIG TRUE) - - if(TARGET zstd::libzstd) - set(ARROW_ZSTD_LIBZSTD zstd::libzstd) -@@ -2273,13 +2289,13 @@ macro(build_utf8proc) + # ARROW-13384: ZSTD_minCLevel was added in v1.4.0, required by ARROW-13091 + resolve_dependency(zstd +- PC_PACKAGE_NAMES ++ USE_CONFIG TRUE PC_PACKAGE_NAMES + libzstd + REQUIRED_VERSION + 1.4.0) +@@ -2262,9 +2280,8 @@ macro(build_utf8proc) endmacro() if(ARROW_WITH_UTF8PROC) -- resolve_dependency(utf8proc) -+ resolve_dependency(unofficial-utf8proc USE_CONFIG TRUE) +- resolve_dependency(utf8proc +- REQUIRED_VERSION +- "2.2.0" ++ resolve_dependency(unofficial-utf8proc ++ USE_CONFIG TRUE + PC_PACKAGE_NAMES + libutf8proc) - add_definitions(-DARROW_WITH_UTF8PROC) +@@ -2272,7 +2289,7 @@ if(ARROW_WITH_UTF8PROC) # TODO: Don't use global definitions but rather # target_compile_definitions or target_link_libraries @@ -210,7 +214,7 @@ index 83ea3aa..d592fc3 100644 INTERFACE_COMPILER_DEFINITIONS) if(UTF8PROC_COMPILER_DEFINITIONS) add_definitions(-D${UTF8PROC_COMPILER_DEFINITIONS}) -@@ -2287,7 +2303,7 @@ if(ARROW_WITH_UTF8PROC) +@@ -2280,7 +2297,7 @@ if(ARROW_WITH_UTF8PROC) # TODO: Don't use global includes but rather # target_include_directories or target_link_libraries @@ -219,16 +223,16 @@ index 83ea3aa..d592fc3 100644 INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${UTF8PROC_INCLUDE_DIR}) endif() -@@ -2342,7 +2358,7 @@ endmacro() - # Dependencies for Arrow Flight RPC +@@ -2335,7 +2352,7 @@ endmacro() macro(build_grpc) -- resolve_dependency(c-ares HAVE_ALT TRUE) -+ resolve_dependency(c-ares HAVE_ALT TRUE USE_CONFIG TRUE) - # TODO: Don't use global includes but rather target_include_directories - get_target_property(c-ares_INCLUDE_DIR c-ares::cares INTERFACE_INCLUDE_DIRECTORIES) - include_directories(SYSTEM ${c-ares_INCLUDE_DIR}) -@@ -2614,7 +2630,7 @@ endmacro() + resolve_dependency(c-ares +- HAVE_ALT ++ USE_CONFIG + TRUE + PC_PACKAGE_NAMES + libcares) +@@ -2600,7 +2617,7 @@ endmacro() if(ARROW_WITH_GRPC) set(ARROW_GRPC_REQUIRED_VERSION "1.17.0") resolve_dependency(gRPC @@ -236,8 +240,8 @@ index 83ea3aa..d592fc3 100644 + USE_CONFIG TRUE REQUIRED_VERSION - ${ARROW_GRPC_REQUIRED_VERSION}) -@@ -2622,6 +2638,10 @@ if(ARROW_WITH_GRPC) + ${ARROW_GRPC_REQUIRED_VERSION} +@@ -2610,6 +2627,10 @@ if(ARROW_WITH_GRPC) # TODO: Don't use global includes but rather target_include_directories get_target_property(GRPC_INCLUDE_DIR gRPC::grpc++ INTERFACE_INCLUDE_DIRECTORIES) include_directories(SYSTEM ${GRPC_INCLUDE_DIR}) @@ -249,7 +253,7 @@ index 83ea3aa..d592fc3 100644 if(GRPC_VENDORED) set(GRPCPP_PP_INCLUDE TRUE) diff --git a/cpp/src/arrow/adapters/orc/CMakeLists.txt b/cpp/src/arrow/adapters/orc/CMakeLists.txt -index 516196c..ebc4881 100644 +index ca901b07d..4512a175f 100644 --- a/cpp/src/arrow/adapters/orc/CMakeLists.txt +++ b/cpp/src/arrow/adapters/orc/CMakeLists.txt @@ -29,7 +29,7 @@ set(ORC_MIN_TEST_LIBS diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index bb7d857fb1ee44..221b3e0d9cdb89 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow - REF apache-arrow-4.0.0 - SHA512 4697a32004d02a519b8a8e899ed3cd981ae3485e6d34071436051080d6c84e25ad0bc568b3e52effe0a9204756da3d6e560a2037df06d2730dccd19c6b4c8027 + REF apache-arrow-5.0.0 + SHA512 68f4377f654423e7ea47c8c0170ddb030d0b020b936ec435854e216392e6515d870287f410d0acd48b36dcfec61be4c4a95794857f1d91c66745f3c6ed748034 HEAD_REF master PATCHES all.patch diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index c15f014505620f..98b76849430e8e 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "arrow", - "version": "4.0.0", - "port-version": 1, + "version": "5.0.0", "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "supports": "x64", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index d4ea77e4aa122d..904f3430ca5f31 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf5c2b42bb8c4efa09d69a4ce6e75ae3ace45f02", + "version": "5.0.0", + "port-version": 0 + }, { "git-tree": "09e65930903c5dad92250b8f3f351f06f77f8e30", "version": "4.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index c6742dd55aa77f..4539f110482485 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -165,8 +165,8 @@ "port-version": 3 }, "arrow": { - "baseline": "4.0.0", - "port-version": 1 + "baseline": "5.0.0", + "port-version": 0 }, "ashes": { "baseline": "2021-06-18", From fa2082cc177cfc52dfa35be5b83b91d066fb648e Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 5 Aug 2021 03:02:21 -0700 Subject: [PATCH 0256/1858] [google-cloud-cpp] update to latest version (v1.30.0) (#19336) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 101f01a83c2550..41673b2bb7099b 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.29.0 - SHA512 1dda15eaece6d574ba49eb3756e8a72eac6c9b508acf30ed1de0a0234e1e36a352f11494411a84533f8412779040da3e3ffc98d33d43a99b3626c15627513f20 + REF v1.30.0 + SHA512 4609bd1240ed88d7f4d7b1685f96fdbfffa0f8a296f24fa69984d14351671bfa7c283975978b1c41b816ed5cb181da0166bc5f9377d362331e2de42b66f1d1ae HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index c402577ae895f9..21cb89cafc6778 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.29.0", + "version": "1.30.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4539f110482485..4d11c627fa0c1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2377,7 +2377,7 @@ "port-version": 6 }, "google-cloud-cpp": { - "baseline": "1.29.0", + "baseline": "1.30.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index e4907ec96a499d..50db2196ffb3e8 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cc90bac3e6db351ea0daa3de00a32947c3b2050", + "version": "1.30.0", + "port-version": 0 + }, { "git-tree": "47a4d6d3258efe94ffe95b10abd1f0a19c48aab2", "version": "1.29.0", From 6d515090e5289d928b686fa9c2111cb6d98f2ecb Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 5 Aug 2021 18:02:40 +0800 Subject: [PATCH 0257/1858] [openal-soft] Add pkgconfig (#19318) * [openal-soft] Add pkgconfig * Update version files --- ports/openal-soft/portfile.cmake | 31 +++++++++++++++++++++++-------- ports/openal-soft/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 31 insertions(+), 10 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index d5717f0a79ddfa..09090babaf41d5 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -31,13 +31,12 @@ if(VCPKG_TARGET_IS_OSX) endif() vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLIBTYPE=${OPENAL_LIBTYPE} -DALSOFT_UTILS=OFF -DALSOFT_NO_CONFIG_UTIL=ON -DALSOFT_EXAMPLES=OFF - -DALSOFT_TESTS=OFF -DALSOFT_CONFIG=OFF -DALSOFT_HRTF_DEFS=OFF -DALSOFT_AMBDEC_PRESETS=OFF @@ -45,7 +44,6 @@ vcpkg_configure_cmake( -DALSOFT_BACKEND_OSS=OFF -DALSOFT_BACKEND_SOLARIS=OFF -DALSOFT_BACKEND_SNDIO=OFF - -DALSOFT_BACKEND_QSA=OFF -DALSOFT_BACKEND_PORTAUDIO=OFF -DALSOFT_BACKEND_PULSEAUDIO=OFF -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_OSX} @@ -57,24 +55,41 @@ vcpkg_configure_cmake( -DALSOFT_REQUIRE_WASAPI=${ALSOFT_REQUIRE_WINDOWS} -DALSOFT_CPUEXT_NEON=OFF -DCMAKE_DISABLE_FIND_PACKAGE_WindowsSDK=ON + MAYBE_UNUSED_VARIABLES + ALSOFT_AMBDEC_PRESETS + ALSOFT_BACKEND_ALSA + ALSOFT_BACKEND_COREAUDIO + ALSOFT_BACKEND_JACK + ALSOFT_BACKEND_OPENSL + ALSOFT_BACKEND_OSS + ALSOFT_BACKEND_PORTAUDIO + ALSOFT_BACKEND_PULSEAUDIO + ALSOFT_BACKEND_SNDIO + ALSOFT_BACKEND_SOLARIS + ALSOFT_CONFIG + ALSOFT_CPUEXT_NEON + ALSOFT_HRTF_DEFS + CMAKE_DISABLE_FIND_PACKAGE_WindowsSDK ) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenAL) +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenAL") foreach(HEADER al.h alc.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/AL/${HEADER} AL_H) + file(READ "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" AL_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined(AL_LIBTYPE_STATIC)" "1" AL_H "${AL_H}") else() string(REPLACE "defined(AL_LIBTYPE_STATIC)" "0" AL_H "${AL_H}") endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/AL/${HEADER} "${AL_H}") + file(WRITE "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" "${AL_H}") endforeach() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_copy_pdbs() diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 29378666b14ea4..6783a1bed171ec 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openal-soft", - "version-string": "1.21.1", + "version-semver": "1.21.1", + "port-version": 1, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 4d11c627fa0c1f..3290c6225edf55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4570,7 +4570,7 @@ }, "openal-soft": { "baseline": "1.21.1", - "port-version": 0 + "port-version": 1 }, "openblas": { "baseline": "0.3.15", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index c89e17c0166f2f..0b2d40ef9ba925 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb266fe5f02b9d2b5cb38343d25083359062bd07", + "version-semver": "1.21.1", + "port-version": 1 + }, { "git-tree": "735740a45f65f166bd693795a7bed3d2ef079baf", "version-string": "1.21.1", From 6a34753ef39691dc0fb6f0dbc54da3017f3a80c8 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 5 Aug 2021 12:03:11 +0200 Subject: [PATCH 0258/1858] [sentry-native] Update to 0.4.12 (#19339) Signed-off-by: Vitalii Koshura --- ports/sentry-native/fix-libcurl.patch | 19 ------------------- ports/sentry-native/portfile.cmake | 7 +++---- ports/sentry-native/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sentry-native.json | 5 +++++ 5 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 ports/sentry-native/fix-libcurl.patch diff --git a/ports/sentry-native/fix-libcurl.patch b/ports/sentry-native/fix-libcurl.patch deleted file mode 100644 index 4ecba9666f5d43..00000000000000 --- a/ports/sentry-native/fix-libcurl.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8a74a93..30c131c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -249,13 +249,7 @@ target_compile_definitions(sentry PRIVATE SIZEOF_LONG=${CMAKE_SIZEOF_LONG}) - - if(SENTRY_TRANSPORT_CURL) - find_package(CURL REQUIRED) -- target_include_directories(sentry PRIVATE ${CURL_INCLUDE_DIR}) -- # The exported sentry target must not contain any path of the build machine, therefore use generator expressions -- # FIXME: cmake 3.12 introduced the target CURL::libcurl -- string(REPLACE ";" "$" GENEX_CURL_LIBRARIES "${CURL_LIBRARIES}") -- string(REPLACE ";" "$" GENEX_CURL_COMPILE_DEFINITIONS "${CURL_COMPILE_DEFINITIONS}") -- target_link_libraries(sentry PRIVATE $) -- target_compile_definitions(sentry PRIVATE $) -+ target_link_libraries(sentry PRIVATE CURL::libcurl) - endif() - - set_property(TARGET sentry PROPERTY C_VISIBILITY_PRESET hidden) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index 80f745bb61d8fc..e538c122227dbb 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -3,9 +3,9 @@ if(NOT VCPKG_TARGET_IS_OSX) endif() vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.11/sentry-native.zip" - FILENAME "sentry-native-0.4.11.zip" - SHA512 3d66295526c0cd068a0b7c2180dbeae7594775b3eb3199a74da7efe634cbc19cff6eba8d44b1479037c43c6eb58a9ba4fdaf8da6995767f27c585a0d42582c37 + URLS "https://github.com/getsentry/sentry-native/releases/download/0.4.12/sentry-native.zip" + FILENAME "sentry-native-0.4.12.zip" + SHA512 15da4407ed5e2c8d5e56e497ccc6006b29235aef6b3a81e034c93443e20a7cfdf95d55e31b88e552c55e824eb15d6f7fafe988c453a5a6f36fe45136d7268b19 ) vcpkg_extract_source_archive_ex( @@ -15,7 +15,6 @@ vcpkg_extract_source_archive_ex( PATCHES fix-warningC5105.patch fix-config-cmake.patch - fix-libcurl.patch use-zlib-target.patch ) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index b60162f8c78a12..84840940e50f45 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sentry-native", - "version-semver": "0.4.11", - "port-version": 1, + "version-semver": "0.4.12", "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 3290c6225edf55..27389aaafa0108 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5785,8 +5785,8 @@ "port-version": 1 }, "sentry-native": { - "baseline": "0.4.11", - "port-version": 1 + "baseline": "0.4.12", + "port-version": 0 }, "septag-sx": { "baseline": "2019-05-07-2", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index b30921c3438620..8db9ae5506bb01 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85e3e8c19428a75c746ff7389f86746f1a7ef93f", + "version-semver": "0.4.12", + "port-version": 0 + }, { "git-tree": "a2864f84fc6ef423bcc641b64b75cc574df99b85", "version-semver": "0.4.11", From ff1681e5a0d776c39d503de32938e49c52350ada Mon Sep 17 00:00:00 2001 From: Duncan Horn <40036384+dunhor@users.noreply.github.com> Date: Thu, 5 Aug 2021 03:03:51 -0700 Subject: [PATCH 0259/1858] [wil] Update wil to the latest commit (#19343) * Update WIL port * Running new command I previously didn't know about --- ports/wil/CONTROL | 2 +- ports/wil/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/w-/wil.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL index 04acb2d1f4b299..09540d3b896c55 100644 --- a/ports/wil/CONTROL +++ b/ports/wil/CONTROL @@ -1,4 +1,4 @@ Source: wil -Version: 2021-02-04 +Version: 2021-08-03 Homepage: https://github.com/microsoft/wil Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns. diff --git a/ports/wil/portfile.cmake b/ports/wil/portfile.cmake index 79011e711bc684..d6b3bcbb194347 100644 --- a/ports/wil/portfile.cmake +++ b/ports/wil/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/wil - REF 86353933d5fba0caf61503c8b09e10e182dccdfb - SHA512 07694a3754c179aa629b8e3e8fc2a5554779601925131bffef311dee937b03db0d1be891eaee364b7a265b7268f39ad356d8302c02b05acf4fa8c7b2d4d51629 + REF 5a21cac10640f54b7ef886031f4d9ed427bef4c5 + SHA512 b1a6703dd75eee66f81c54bb5c01bc9acc7354c113fd556afb2dd95361db7e9f94c9e958d9a0b897359084c9c08cb725bbe214fdaccf2e662c1ca4aa73c3345a HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index 27389aaafa0108..685d9d4ed9f950 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6693,7 +6693,7 @@ "port-version": 0 }, "wil": { - "baseline": "2021-02-04", + "baseline": "2021-08-03", "port-version": 0 }, "wildmidi": { diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 012bcfe15f3d1f..76362041b5a815 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb04005b6c8503a0da843fc8f356748e0a0d3994", + "version-string": "2021-08-03", + "port-version": 0 + }, { "git-tree": "1085a9ee690f6718715b28396f5250ad67d6f828", "version-string": "2021-02-04", From a746da9eb5ffd92a12c8c1f445d07558480a1254 Mon Sep 17 00:00:00 2001 From: dengjunplusplus <65080805+dengjunplusplus@users.noreply.github.com> Date: Thu, 5 Aug 2021 18:04:35 +0800 Subject: [PATCH 0260/1858] [workflow] Update version to 0.9.6 (#19280) * update the port workflow version to 0.9.6 * remote port-version * add version * Revert "add version" This reverts commit 487548aecfe767affd37727f14d483b62b377aa6. * add version once * update REF for windows * Update version database --- ports/workflow/portfile.cmake | 8 ++++---- ports/workflow/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/workflow.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/workflow/portfile.cmake b/ports/workflow/portfile.cmake index 71de3720a5ea31..7dfa7e906f8d87 100644 --- a/ports/workflow/portfile.cmake +++ b/ports/workflow/portfile.cmake @@ -2,16 +2,16 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sogou/workflow - REF 268c873d20b5cddedcf1d36fe9c2af8338353a98 - SHA512 07b61657e34c1bce1f0fb8314e9d531e43dd9bf6004d6c67aaad9fcafa2073e05b835b85e87c82c26ca828edca08e9960a25578830657b9909b28bfa75cac6cc + REF v0.9.6-win + SHA512 ecbc641d9d7bae707387248060af91375cd0c80d50eee2ae1dd24f0f61eda0d3faf0ea835bf6a03a7d25b5708771c3e432b8ad135ae5d1620e705a1ef93bb84e HEAD_REF windows ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sogou/workflow - REF v0.9.5 - SHA512 3ce11817a7e7f5c168bfd8d4918d641e51c478b6e4137080530c6163c5c405b02edcf5fb675d6f582ae71450601a7c6e295d9664a69635d6925b0cf4c2283a16 + REF v0.9.6 + SHA512 a9078223b3437bd73a3988310490ad867796707ccc25483120bca1249197a12abe07d09647df16f6efc63ba52b808d2bee8e2f2a10dd3e62335409fa06089621 HEAD_REF master ) endif() diff --git a/ports/workflow/vcpkg.json b/ports/workflow/vcpkg.json index 32e650852a040d..ba7f8f7baa7691 100644 --- a/ports/workflow/vcpkg.json +++ b/ports/workflow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "workflow", - "version": "0.9.5", - "port-version": 1, + "version": "0.9.6", "description": "About C++ Parallel Computing and Asynchronous Networking Engine", "homepage": "https://github.com/sogou/workflow", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 685d9d4ed9f950..f1214dbb21c4c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6733,8 +6733,8 @@ "port-version": 0 }, "workflow": { - "baseline": "0.9.5", - "port-version": 1 + "baseline": "0.9.6", + "port-version": 0 }, "wpilib": { "baseline": "2020.3.2", diff --git a/versions/w-/workflow.json b/versions/w-/workflow.json index 95ff54ff9a8c29..c6214010dc2ae5 100644 --- a/versions/w-/workflow.json +++ b/versions/w-/workflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab1da719c3684f213ddd140aa6e09994c73580ee", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "3771249036075b8138d0e34de9799ca4571b1867", "version": "0.9.5", From 6a2958869e06618d950693dbf8540e2e1c380e15 Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Thu, 5 Aug 2021 11:05:30 +0100 Subject: [PATCH 0261/1858] qhull - fix missing symbols (#19276) Co-authored-by: Francisco Facioni --- ports/qhull/CONTROL | 1 + ports/qhull/fix-missing-symbols.patch | 29 +++++++++++++++++++++++++++ ports/qhull/portfile.cmake | 4 +++- versions/baseline.json | 2 +- versions/q-/qhull.json | 5 +++++ 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 ports/qhull/fix-missing-symbols.patch diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL index 4390afeace014e..32752143eaf71a 100644 --- a/ports/qhull/CONTROL +++ b/ports/qhull/CONTROL @@ -1,4 +1,5 @@ Source: qhull Version: 8.0.2 +Port-Version: 1 Homepage: https://github.com/qhull/qhull Description: computes the convex hull, Delaunay triangulation, Voronoi diagram diff --git a/ports/qhull/fix-missing-symbols.patch b/ports/qhull/fix-missing-symbols.patch new file mode 100644 index 00000000000000..a1e0b6ecfe5fc2 --- /dev/null +++ b/ports/qhull/fix-missing-symbols.patch @@ -0,0 +1,29 @@ +From 02ba907908ccf5ed0d40a2251272b67cb05c23ea Mon Sep 17 00:00:00 2001 +From: Francisco Facioni +Date: Sat, 31 Jul 2021 22:30:45 +0100 +Subject: [PATCH] Missing symbols in the export + +--- + src/libqhull_r/qhull_r-exports.def | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libqhull_r/qhull_r-exports.def b/src/libqhull_r/qhull_r-exports.def +index 4c5e17c..b789673 100644 +--- a/src/libqhull_r/qhull_r-exports.def ++++ b/src/libqhull_r/qhull_r-exports.def +@@ -183,6 +183,7 @@ qh_maxouter + qh_maxsimplex + qh_maydropneighbor + qh_memalloc ++qh_memcheck + qh_memfree + qh_memfreeshort + qh_meminit +@@ -351,6 +352,7 @@ qh_setdelnth + qh_setdelnthsorted + qh_setdelsorted + qh_setduplicate ++qh_setendpointer + qh_setequal + qh_setequal_except + qh_setequal_skip diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake index bf0230b399d64d..5584c7b1926e04 100644 --- a/ports/qhull/portfile.cmake +++ b/ports/qhull/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF 613debeaea72ee66626dace9ba1a2eff11b5d37d SHA512 5b8ff9665ba73621a9859a6e86717b980b67f8d79d6c78cbf5672bce66aed671f7d64fcbec457bca79eef2e17e105f136017afdf442bb430b9f4a059d7cb93c3 HEAD_REF master - PATCHES include-qhullcpp-shared.patch + PATCHES + include-qhullcpp-shared.patch + fix-missing-symbols.patch # upstream https://github.com/qhull/qhull/pull/93 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) diff --git a/versions/baseline.json b/versions/baseline.json index f1214dbb21c4c3..b5592ba2225e18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5134,7 +5134,7 @@ }, "qhull": { "baseline": "8.0.2", - "port-version": 0 + "port-version": 1 }, "qnnpack": { "baseline": "2021-02-26", diff --git a/versions/q-/qhull.json b/versions/q-/qhull.json index 79540e865bae2b..17746dbad06246 100644 --- a/versions/q-/qhull.json +++ b/versions/q-/qhull.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "248e6da5d026e3d25975912d727d35612b32f5c1", + "version-string": "8.0.2", + "port-version": 1 + }, { "git-tree": "a126a4ddc8a30d5e50f27579acf06af3436ef6ed", "version-string": "8.0.2", From 9ed5a9b90f0cf673c6e7c5302eaea5b90ddd27ca Mon Sep 17 00:00:00 2001 From: Kuntal Majumder <12135951+hellozee@users.noreply.github.com> Date: Thu, 5 Aug 2021 15:37:52 +0530 Subject: [PATCH 0262/1858] [ libsnoretoast ] new port (#19281) * Add libsnoretoast port * Skip the ci check for libsnoretoast on osx and linux * Add the version baseline * replace deprecated cmake commands * Update version database * make uwp as unsupported * Update version database * use copy_tools and add quotes * Update version database * removed explicit defaults, made fail on uwp and updated the description * Update version database --- ports/libsnoretoast/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/libsnoretoast/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libsnoretoast.json | 9 +++++++++ 4 files changed, 58 insertions(+) create mode 100644 ports/libsnoretoast/portfile.cmake create mode 100644 ports/libsnoretoast/vcpkg.json create mode 100644 versions/l-/libsnoretoast.json diff --git a/ports/libsnoretoast/portfile.cmake b/ports/libsnoretoast/portfile.cmake new file mode 100644 index 00000000000000..a9159e3c3ae02d --- /dev/null +++ b/ports/libsnoretoast/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_fail_port_install(ON_TARGET "osx" "linux" "uwp") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/snoretoast + REF v0.8.0 + SHA512 233751b6cc3f8099c742e4412a3c9ba8707a2f3c69b57bab93dd83b028aa0c0656cade8de1ece563843ace576fd0d8e5f3a29c254a07ed939d0a69cd2d4f6c2a + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_STATIC_RUNTIME=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libsnoretoast") +vcpkg_copy_tools( + TOOL_NAMES "snoretoast" + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/COPYING.LGPL-3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsnoretoast/vcpkg.json b/ports/libsnoretoast/vcpkg.json new file mode 100644 index 00000000000000..bfc244ad545526 --- /dev/null +++ b/ports/libsnoretoast/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libsnoretoast", + "version-semver": "0.8.0", + "description": "A tool to create Windows Toast notifications and parse them on Windows 8 or later.", + "homepage": "https://invent.kde.org/libraries/snoretoast", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b5592ba2225e18..39e52b6a196773 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3604,6 +3604,10 @@ "baseline": "1.0.31", "port-version": 0 }, + "libsnoretoast": { + "baseline": "0.8.0", + "port-version": 0 + }, "libsodium": { "baseline": "1.0.18", "port-version": 5 diff --git a/versions/l-/libsnoretoast.json b/versions/l-/libsnoretoast.json new file mode 100644 index 00000000000000..609c6e70e5aafe --- /dev/null +++ b/versions/l-/libsnoretoast.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7ddd1b84089de293b4a9d74af6b7593d089084a9", + "version-semver": "0.8.0", + "port-version": 0 + } + ] +} From 850691961afab7024663c5cf9eea5421a19b434d Mon Sep 17 00:00:00 2001 From: Nemirtingas <9432037+Nemirtingas@users.noreply.github.com> Date: Thu, 5 Aug 2021 12:09:16 +0200 Subject: [PATCH 0263/1858] [libdatachannel][libjuice] Update libdatachannel to 0.14.1 and libjuice to 0.8.4. (#19305) * Update libjuice and libdatachannel * Update libjuice * Update baseline * Update libdatachannel to 0.14.1 Fixes *-uwp. * Update baseline. * Fix nettle discovery * Fix usrsctp library path. * Fix libdatachannel not being built SHARED. * Update baseline. Co-authored-by: Nemirtingas --- ...ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch | 25 ---- ports/libdatachannel/fix-for-vcpkg.patch | 107 +++++++----------- ports/libdatachannel/portfile.cmake | 7 +- ports/libdatachannel/vcpkg.json | 3 +- ports/libjuice/fix-for-vcpkg.patch | 55 ++------- ports/libjuice/portfile.cmake | 4 +- ports/libjuice/vcpkg.json | 2 +- versions/baseline.json | 6 +- versions/l-/libdatachannel.json | 5 + versions/l-/libjuice.json | 5 + 10 files changed, 68 insertions(+), 151 deletions(-) delete mode 100644 ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch diff --git a/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch b/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch deleted file mode 100644 index f41945c28af2ba..00000000000000 --- a/ports/libdatachannel/CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/include/rtc/utils.hpp b/include/rtc/utils.hpp -index f1a82acb..e882042c 100644 ---- a/include/rtc/utils.hpp -+++ b/include/rtc/utils.hpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - namespace rtc { - -@@ -34,11 +35,10 @@ template overloaded(Ts...) -> overloaded; - // weak_ptr bind helper - template auto weak_bind(F &&f, T *t, Args &&..._args) { - return [bound = std::bind(f, t, _args...), weak_this = t->weak_from_this()](auto &&...args) { -- using result_type = typename decltype(bound)::result_type; - if (auto shared_this = weak_this.lock()) - return bound(args...); - else -- return static_cast(false); -+ return static_cast(false); - }; - } - diff --git a/ports/libdatachannel/fix-for-vcpkg.patch b/ports/libdatachannel/fix-for-vcpkg.patch index c86fef2329afb3..075b7baf2e7aa7 100644 --- a/ports/libdatachannel/fix-for-vcpkg.patch +++ b/ports/libdatachannel/fix-for-vcpkg.patch @@ -1,15 +1,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 14c1ecc..1a46b84 100644 +index beb5000..d6c26cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -181,21 +181,10 @@ set(THREADS_PREFER_PTHREAD_FLAG TRUE) - find_package(Threads REQUIRED) +@@ -30,5 +30,4 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) +-set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static - set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) --add_subdirectory(deps/plog) -+find_library(USRSCTP_LIBRARY usrsctp REQUIRED) -+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") + if(WIN32) +@@ -196,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + set(THREADS_PREFER_PTHREAD_FLAG TRUE) + find_package(Threads REQUIRED) +-set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) +-add_subdirectory(deps/plog EXCLUDE_FROM_ALL) +- -option(sctp_build_programs 0) -option(sctp_build_shared_lib 0) -set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) @@ -21,82 +26,46 @@ index 14c1ecc..1a46b84 100644 - target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) -endif() -add_library(Usrsctp::Usrsctp ALIAS usrsctp) -- ++find_library(USRSCTP_LIBRARY usrsctp REQUIRED) ++find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") + -add_library(datachannel SHARED +add_library(datachannel ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -213,17 +202,17 @@ set_target_properties(datachannel-static PROPERTIES - VERSION ${PROJECT_VERSION} - CXX_STANDARD 17) - --target_include_directories(datachannel PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -+target_include_directories(datachannel PUBLIC $ $) +@@ -232,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES + target_include_directories(datachannel PUBLIC $) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) --target_link_libraries(datachannel PUBLIC Threads::Threads plog::plog) --target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp) +target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) -+target_link_libraries(datachannel PUBLIC Threads::Threads ${USRSCTP_LIBRARY}) + target_link_libraries(datachannel PUBLIC Threads::Threads) +-target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) --target_link_libraries(datachannel-static PUBLIC Threads::Threads plog::plog) --target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp) -+target_include_directories(datachannel-static PRIVATE ${PLOG_INCLUDE_DIRS}) -+target_link_libraries(datachannel-static PUBLIC Threads::Threads ${USRSCTP_LIBRARY}) ++target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) + target_link_libraries(datachannel-static PUBLIC Threads::Threads) +-target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) ++target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -@@ -295,11 +284,11 @@ if (USE_NICE) - target_link_libraries(datachannel PRIVATE LibNice::LibNice) - target_link_libraries(datachannel-static PRIVATE LibNice::LibNice) - else() -- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) -+ find_package(libjuice CONFIG REQUIRED) - target_compile_definitions(datachannel PRIVATE USE_NICE=0) - target_compile_definitions(datachannel-static PRIVATE USE_NICE=0) -- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) -- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) -+ target_link_libraries(datachannel PRIVATE LibJuice::juice) -+ target_link_libraries(datachannel-static PRIVATE LibJuice::juice) +@@ -334,11 +324,11 @@ else() + target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) + target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) + else() +- add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) ++ find_package(libjuice CONFIG REQUIRED) + target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) + target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) +- target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) +- target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuiceStatic) ++ target_link_libraries(datachannel PRIVATE LibJuice::juice) ++ target_link_libraries(datachannel-static PRIVATE LibJuice::juice) + endif() endif() - if(CAPI_STDCALL) -@@ -310,7 +299,11 @@ endif() - add_library(LibDataChannel::LibDataChannel ALIAS datachannel) - add_library(LibDataChannel::LibDataChannelStatic ALIAS datachannel-static) - --install(TARGETS datachannel LIBRARY DESTINATION lib) -+install(TARGETS datachannel EXPORT libdatachannel-config -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) - install(FILES ${LIBDATACHANNEL_HEADERS} DESTINATION include/rtc) - - if(NOT MSVC) -@@ -374,3 +367,8 @@ endif() - add_subdirectory(examples/copy-paste-capi) - endif() - -+install( -+ EXPORT libdatachannel-config -+ NAMESPACE LibDatachannel:: -+ DESTINATION share/cmake/libdatachannel -+) -diff --git a/src/impl/tcptransport.hpp b/src/impl/tcptransport.hpp -index f091fa2..8bcfbe7 100644 ---- a/src/impl/tcptransport.hpp -+++ b/src/impl/tcptransport.hpp -@@ -29,7 +29,7 @@ - #include - - // Use the socket defines from libjuice --#include "../deps/libjuice/src/socket.h" -+#include - - namespace rtc::impl { - + diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 4104d890a6bf88..902220a90d486d 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF 655175d21e58281031c940a94042d5d1fd46efb3 # v 0.12.2 - SHA512 e1e228bf720ef57130fbb9cc33310cebbdbd16c001455cd56e8746b6ee41bac56da5e5a90235e0a826b52711dc3c95b9d9f56d9e406999f9fd384aee2892578d + REF v0.14.1 + SHA512 a0eb834eacdb5aef644fc4456b5087742aab37ac58e2871daa7ba2ac25cab4ddb530bd0a12cf5f4754c28749a2f59fc2fb3e2ae945b867cec8aaad22f4ac71c6 HEAD_REF master PATCHES fix-for-vcpkg.patch - CXX17_ADAPTOR_TYPEDEFS_DEPRECATION_WARNING.patch # submitted upstream as https://github.com/paullouisageneau/libdatachannel/pull/413 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -42,4 +41,4 @@ find_dependency(OpenSSL) find_dependency(libjuice) ${DATACHANNEL_CONFIG}") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 903b994033788d..d657a384112d70 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.12.2", - "port-version": 1, + "version-semver": "0.14.1", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ diff --git a/ports/libjuice/fix-for-vcpkg.patch b/ports/libjuice/fix-for-vcpkg.patch index 72ef83d0bc454f..75ab492a06990d 100644 --- a/ports/libjuice/fix-for-vcpkg.patch +++ b/ports/libjuice/fix-for-vcpkg.patch @@ -1,68 +1,33 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6142f91..cfdfa40 100644 +index aedb557..89c701b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -53,6 +53,9 @@ set(LIBJUICE_SOURCES - set(LIBJUICE_HEADERS - ${CMAKE_CURRENT_SOURCE_DIR}/include/juice/juice.h - ) -+set(LIBJUICE_PRIVATE_HEADERS -+ ${CMAKE_CURRENT_SOURCE_DIR}/src/socket.h -+) - - set(TESTS_SOURCES - ${CMAKE_CURRENT_SOURCE_DIR}/test/main.c -@@ -70,10 +73,10 @@ set(TESTS_SOURCES +@@ -72,7 +72,7 @@ set(TESTS_SOURCES set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -add_library(juice SHARED ${LIBJUICE_SOURCES}) +add_library(juice ${LIBJUICE_SOURCES}) set_target_properties(juice PROPERTIES VERSION ${PROJECT_VERSION}) + target_compile_definitions(juice PRIVATE $<$:RELEASE=1>) --target_include_directories(juice PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -+target_include_directories(juice PUBLIC $ $) - target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/juice) - target_include_directories(juice PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) - target_link_libraries(juice PUBLIC Threads::Threads) -@@ -97,10 +100,14 @@ endif() +@@ -100,11 +100,15 @@ if(WIN32) + endif() if (USE_NETTLE) - find_package(Nettle REQUIRED) +- find_package(Nettle REQUIRED) + find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED) ++ find_library(NETTLE_LIBRARY_PATH NAMES nettle libnettle REQUIRED) + target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH}) + target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH}) + target_compile_definitions(juice PRIVATE USE_NETTLE=1) - target_link_libraries(juice PRIVATE Nettle::Nettle) -+ target_link_libraries(juice PRIVATE nettle) ++ target_link_libraries(juice PRIVATE ${NETTLE_LIBRARY_PATH}) target_compile_definitions(juice-static PRIVATE USE_NETTLE=1) - target_link_libraries(juice-static PRIVATE Nettle::Nettle) -+ target_link_libraries(juice-static PRIVATE nettle) ++ target_link_libraries(juice-static PRIVATE ${NETTLE_LIBRARY_PATH}) else() target_compile_definitions(juice PRIVATE USE_NETTLE=0) target_compile_definitions(juice-static PRIVATE USE_NETTLE=0) -@@ -125,8 +132,13 @@ endif() - add_library(LibJuice::LibJuice ALIAS juice) - add_library(LibJuice::LibJuiceStatic ALIAS juice-static) - --install(TARGETS juice LIBRARY DESTINATION lib) -+install(TARGETS juice EXPORT libjuice-config -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) - install(FILES ${LIBJUICE_HEADERS} DESTINATION include/juice) -+install(FILES ${LIBJUICE_PRIVATE_HEADERS} DESTINATION include/juice/src) - - if(NOT MSVC) - target_compile_options(juice PRIVATE -Wall -Wextra) -@@ -161,3 +173,8 @@ if(NOT NO_TESTS) - target_link_libraries(juice-tests juice) - endif() - -+install( -+ EXPORT libjuice-config -+ NAMESPACE LibJuice:: -+ DESTINATION share/cmake/libjuice -+) + diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index 16c83d1895bf71..bbe0d1db25d8dc 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF v0.7.1 - SHA512 4a8a8705d8ee5f6d242e4463e13fbd45ec86145bf17f9c4f755e60922166b3cb12773296fac34f02cbe4ac79f91d73f2bc6406445cfe9520bf09e10d1606bc7e + REF v0.8.4 + SHA512 c33fc237ff0acb6b9cb37143d1f5a22f20670c8e32200d79c45c8473e1b0e1174926706876a1c37a51ba9ec6ec935337fd87512211eaaf8652f73d4934038834 HEAD_REF master PATCHES fix-for-vcpkg.patch diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index 7aa06acb5a39db..6ba94b4cc7a5b9 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjuice", - "version": "0.7.1", + "version": "0.8.4", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 39e52b6a196773..e02e21b7b3c1dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3129,8 +3129,8 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.12.2", - "port-version": 1 + "baseline": "0.14.1", + "port-version": 0 }, "libdatrie": { "baseline": "0.2.10-3", @@ -3317,7 +3317,7 @@ "port-version": 0 }, "libjuice": { - "baseline": "0.7.1", + "baseline": "0.8.4", "port-version": 0 }, "libkeyfinder": { diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index ea8a70416a8504..7592d11615b49a 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a58c126e0f1be88bc997210e63fe2e07cf64d1e5", + "version-semver": "0.14.1", + "port-version": 0 + }, { "git-tree": "a13526e9cfc5bfca3aa00e95afa184b498890f69", "version-semver": "0.12.2", diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index 04ae9e972c206a..acff7a4748cc11 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "077151e85bf11cabc11d0f1c46b778b5a21829dd", + "version": "0.8.4", + "port-version": 0 + }, { "git-tree": "42cecee2b8da92c2c8c120c09bd663b20f2c947a", "version": "0.7.1", From 8985a143ffcc2bb72a8c7cd1c9b4692774457adf Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 5 Aug 2021 12:12:31 +0200 Subject: [PATCH 0264/1858] [c4core] builds on mac (#19269) * [c4core] supports osx * add version files --- ports/c4core/portfile.cmake | 4 ---- ports/c4core/vcpkg.json | 4 ++-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/c-/c4core.json | 5 +++++ 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ports/c4core/portfile.cmake b/ports/c4core/portfile.cmake index 0e4ff81c2183fa..a2108192392237 100644 --- a/ports/c4core/portfile.cmake +++ b/ports/c4core/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install( - ON_TARGET "OSX" -) - # Get c4core src vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/c4core/vcpkg.json b/ports/c4core/vcpkg.json index 7fdc6487b57189..e59d53476c3c8c 100644 --- a/ports/c4core/vcpkg.json +++ b/ports/c4core/vcpkg.json @@ -1,7 +1,7 @@ { "name": "c4core", "version-date": "2021-07-18", + "port-version": 1, "description": "Library of low-level C++ utilities", - "homepage": "https://github.com/biojppm/c4core", - "supports": "!osx" + "homepage": "https://github.com/biojppm/c4core" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5dd02bbb33a4e7..f7d11a695f4ebd 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1678,7 +1678,6 @@ zkpp:x64-windows-static-md=fail zkpp:arm64-windows=fail zkpp:x64-uwp=fail zkpp:arm-uwp=fail -c4core:x64-osx=fail # Official downloading server of CTP library is only guaranteed to be available during trading hours of China futures market # Skip CI to avoid random failures diff --git a/versions/baseline.json b/versions/baseline.json index e02e21b7b3c1dc..60a476e6041570 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1106,7 +1106,7 @@ }, "c4core": { "baseline": "2021-07-18", - "port-version": 0 + "port-version": 1 }, "caf": { "baseline": "0.17.6", diff --git a/versions/c-/c4core.json b/versions/c-/c4core.json index 8d4429fc4a21f8..4fcef7c1dc072e 100644 --- a/versions/c-/c4core.json +++ b/versions/c-/c4core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1ef064ec4033e2fca5504b4eb44338453050f7f", + "version-date": "2021-07-18", + "port-version": 1 + }, { "git-tree": "eae79eece3a7383d94cc686275624cb49ee6a68e", "version-date": "2021-07-18", From 720e1155e6698f6240066ee358f8243237f2ee6b Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 5 Aug 2021 03:23:41 -0700 Subject: [PATCH 0265/1858] [jack2] update to 1.9.19; install pkgconfig file; fix library name (#19270) Also: * allow dynamic linking by adding jack.def file * replace deprecated vcpkg functions * replace legacy CONTROL file with vcpkg.json --- ports/jack2/CMakeLists.txt | 35 ++++++++++---- ports/jack2/CONTROL | 6 --- ports/jack2/jack.def | 96 ++++++++++++++++++++++++++++++++++++++ ports/jack2/portfile.cmake | 26 ++++++----- ports/jack2/vcpkg.json | 17 +++++++ versions/baseline.json | 2 +- versions/j-/jack2.json | 5 ++ 7 files changed, 160 insertions(+), 27 deletions(-) delete mode 100644 ports/jack2/CONTROL create mode 100644 ports/jack2/jack.def create mode 100644 ports/jack2/vcpkg.json diff --git a/ports/jack2/CMakeLists.txt b/ports/jack2/CMakeLists.txt index 2fb25edb8ef0a6..6c46d8d91d4531 100644 --- a/ports/jack2/CMakeLists.txt +++ b/ports/jack2/CMakeLists.txt @@ -1,14 +1,33 @@ -cmake_minimum_required(VERSION 3.8) -project(jack2 C) +cmake_minimum_required(VERSION 3.1) +project(jack VERSION 1.9 LANGUAGES C) include_directories(common) -add_library(jack2 STATIC common/JackWeakAPI.c) +add_library(jack common/JackWeakAPI.c) +if(WIN32 AND BUILD_SHARED_LIBS) + target_sources(jack PRIVATE jack.def) +endif() +target_link_libraries(jack PRIVATE ${CMAKE_DL_LIBS}) -install(TARGETS jack2 - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib +include(GNUInstallDirs) +install(TARGETS jack + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ) -install(DIRECTORY common/jack DESTINATION include) +set(PREFIX "${CMAKE_INSTALL_PREFIX}") +set(LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}") +set(INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +set(JACK_VERSION "${CMAKE_PROJECT_VERSION}") +# JackWeak dynamically loads the real JACK library which requires linking CMAKE_DL_LIBS +if(CMAKE_DL_LIBS) + set(CLIENTLIB "jack -l${CMAKE_DL_LIBS}") +else() + set(CLIENTLIB "jack") +endif() +# NOTE: the server_libs variable will be broken but this port does not build the server anyway +configure_file(jack.pc.in "${CMAKE_CURRENT_BINARY_DIR}/jack.pc" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/jack.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + +install(DIRECTORY "common/jack" DESTINATION "include") diff --git a/ports/jack2/CONTROL b/ports/jack2/CONTROL deleted file mode 100644 index 3337ea212a36d2..00000000000000 --- a/ports/jack2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: jack2 -Version: 1.9.14 -Homepage: https://github.com/jackaudio/jack2 -Description: Cross-platform API that enables device sharing and inter-application audio routing -Supports: !uwp - diff --git a/ports/jack2/jack.def b/ports/jack2/jack.def new file mode 100644 index 00000000000000..c542e5337f851b --- /dev/null +++ b/ports/jack2/jack.def @@ -0,0 +1,96 @@ +LIBRARY JACK + +EXPORTS + +;FIXME these are unimplemented +;jack_port_uuid +;jack_get_cycle_times + +jack_get_version +jack_get_version_string +jack_client_open +jack_client_new +jack_client_close +jack_client_name_size +jack_get_client_name +jack_get_uuid_for_client_name +jack_get_client_name_by_uuid +jack_internal_client_new +jack_internal_client_close +jack_activate +jack_deactivate +jack_client_thread_id +jack_is_realtime +jack_thread_wait +jack_cycle_wait +jack_cycle_signal +jack_set_process_thread +jack_set_thread_init_callback +jack_on_shutdown +jack_on_info_shutdown +jack_set_process_callback +jack_set_freewheel_callback +jack_set_buffer_size_callback +jack_set_sample_rate_callback +jack_set_client_registration_callback +jack_set_port_registration_callback +jack_set_port_connect_callback +jack_set_port_rename_callback +jack_set_graph_order_callback +jack_set_xrun_callback +jack_set_latency_callback +jack_set_freewheel +jack_set_buffer_size +jack_get_sample_rate +jack_get_buffer_size +jack_engine_takeover_timebase +jack_cpu_load +jack_port_register +jack_port_unregister +jack_port_get_buffer +jack_port_name +jack_port_short_name +jack_port_flags +jack_port_type +jack_port_type_id +jack_port_is_mine +jack_port_connected +jack_port_connected_to +jack_port_get_connections +jack_port_get_all_connections +jack_port_tie +jack_port_untie +jack_port_set_name +jack_port_rename +jack_port_set_alias +jack_port_unset_alias +jack_port_get_aliases +jack_port_request_monitor +jack_port_request_monitor_by_name +jack_port_ensure_monitor +jack_port_monitoring_input +jack_connect +jack_disconnect +jack_port_disconnect +jack_port_name_size +jack_port_type_size +jack_port_type_get_buffer_size +jack_port_set_latency +jack_port_get_latency_range +jack_port_set_latency_range +jack_recompute_total_latencies +jack_port_get_latency +jack_port_get_total_latency +jack_recompute_total_latency +jack_get_ports +jack_port_by_name +jack_port_by_id +jack_frames_since_cycle_start +jack_frame_time +jack_last_frame_time +jack_frames_to_time +jack_time_to_frames +jack_get_time +jack_set_error_function +jack_set_info_function +jack_free diff --git a/ports/jack2/portfile.cmake b/ports/jack2/portfile.cmake index 1c65a216744071..f7319a2bfc886c 100644 --- a/ports/jack2/portfile.cmake +++ b/ports/jack2/portfile.cmake @@ -1,25 +1,27 @@ vcpkg_fail_port_install(ON_TARGET "uwp") -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jackaudio/jack2 - REF b54a09bf7ef760d81fdb8544ad10e45575394624 # v1.9.14 - SHA512 a5f920ed1df71d9f5e3c4889ea2aa4d9ed9082d0b9070437a068e24a2caa5dffaa71b19352e9da056e9f23e930edab56816235ceb9293cc33d8870265f392c1d + REF v1.9.19 + SHA512 d8d5fe17e2984959546af3c53f044aa4648860e19ff8ffd54452e87fa6cdfd111f825c57e3df17cb8ed95de8392b6f354b12ded41e3e021a37f07b99a89ba18d HEAD_REF master ) -# Install headers and a statically built JackWeakAPI.c -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +# Install headers and a shim library with JackWeakAPI.c +file(COPY + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/jack.def" + DESTINATION "${SOURCE_PATH}" +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/README.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jack2/vcpkg.json b/ports/jack2/vcpkg.json new file mode 100644 index 00000000000000..d10c200dd9847c --- /dev/null +++ b/ports/jack2/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "jack2", + "version-semver": "1.9.19", + "description": "Cross-platform API that enables device sharing and inter-application audio routing", + "homepage": "https://jackaudio.org/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 60a476e6041570..cf5bb06121d137 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2765,7 +2765,7 @@ "port-version": 0 }, "jack2": { - "baseline": "1.9.14", + "baseline": "1.9.19", "port-version": 0 }, "jaeger-client-cpp": { diff --git a/versions/j-/jack2.json b/versions/j-/jack2.json index 9be1fdd14b0f62..4d9d856947cd08 100644 --- a/versions/j-/jack2.json +++ b/versions/j-/jack2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "408805b50757c6f3e5585ca5fddf17df005dfb58", + "version-semver": "1.9.19", + "port-version": 0 + }, { "git-tree": "a97592cbcb8260d6cae738bf5542f5895195c91b", "version-string": "1.9.14", From 9449904bb9aa3f25e73b2983e1823d7621c45bd1 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 5 Aug 2021 15:44:18 -0700 Subject: [PATCH 0266/1858] [vcpkg] add support to bootstrap.sh for CXX vars with ccache (#19386) Co-authored-by: Scott Hart --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a4189351c4602a..488ba5d9355813 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -305,7 +305,7 @@ if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' " fi -(cd "$buildDir" && eval CXX="$CXX" "$cmakeExe" "$srcDir" $cmakeConfigOptions "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 +(cd "$buildDir" && CXX="$CXX" eval "$cmakeExe" "$srcDir" $cmakeConfigOptions "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 (cd "$buildDir" && "$cmakeExe" --build .) || exit 1 rm -rf "$vcpkgRootDir/vcpkg" From 8e63fa93d3807b62cb77e30ed2e6fcb772426a9d Mon Sep 17 00:00:00 2001 From: Brennan Date: Thu, 5 Aug 2021 16:25:07 -0700 Subject: [PATCH 0267/1858] [signalrclient]Update homepage URL (#19256) * Fix incorrect homepage URL https://github.com/aspnet/SignalR-Client-Cpp is for the newer microsoft-signalr package. * update version * add Port-Version * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/signalrclient/CONTROL | 3 ++- versions/baseline.json | 2 +- versions/s-/signalrclient.json | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ports/signalrclient/CONTROL b/ports/signalrclient/CONTROL index 7b9d0bc12cbefb..3d3e85f806cab3 100644 --- a/ports/signalrclient/CONTROL +++ b/ports/signalrclient/CONTROL @@ -1,5 +1,6 @@ Source: signalrclient Version: 1.0.0-beta1-9 +Port-Version: 1 Build-Depends: cpprestsdk[default-features,websockets], openssl -Homepage: https://github.com/aspnet/SignalR-Client-Cpp +Homepage: https://github.com/SignalR/SignalR-Client-Cpp Description: C++ client for SignalR. diff --git a/versions/baseline.json b/versions/baseline.json index cf5bb06121d137..072feac14f8846 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5846,7 +5846,7 @@ }, "signalrclient": { "baseline": "1.0.0-beta1-9", - "port-version": 0 + "port-version": 1 }, "sigslot": { "baseline": "1.0.0-3", diff --git a/versions/s-/signalrclient.json b/versions/s-/signalrclient.json index fadf04de6ab4bb..3d00387669a7da 100644 --- a/versions/s-/signalrclient.json +++ b/versions/s-/signalrclient.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "dbe638f959b879da354861fb39b3d4dbb179ea7d", + "git-tree": "a1cf11834f81f78f10ff18bcec0d7f1c42309f62", "version-string": "1.0.0-beta1-9", - "port-version": 0 + "port-version": 1 }, { "git-tree": "134ed01f4047d9dcb077f5f0bf06d07b374fe7b1", From 6fd77b403666ddad6e2c783a376e5294a450dc89 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 5 Aug 2021 16:25:37 -0700 Subject: [PATCH 0268/1858] [7zip] Upgrade vcpkgTools 7zip to 19.00 msi (#19365) --- scripts/vcpkgTools.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index f3e37ae26d562e..ccd7ec208eeb65 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -106,11 +106,11 @@ QtInstallerFramework-win-x86.zip - 18.1.0 - 7-Zip.CommandLine.18.1.0\tools\7za.exe - https://www.nuget.org/api/v2/package/7-Zip.CommandLine/18.1.0 - 8c75314102e68d2b2347d592f8e3eb05812e1ebb525decbac472231633753f1d4ca31c8e6881a36144a8da26b2571305b3ae3f4e2b85fc4a290aeda63d1a13b8 - 7-zip.commandline.18.1.0.nupkg + 19.00 + Files\7-Zip\7z.exe + https://www.7-zip.org/a/7z1900-x64.msi + 7837a8677a01eed9c3309923f7084bc864063ba214ee169882c5b04a7a8b198ed052c15e981860d9d7952c98f459a4fab87a72fd78e7d0303004dcb86f4324c8 + 7z1900-x64.msi 1.35.0 From 0e4914ae85e260634933c4e345854216b2d77e7a Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 5 Aug 2021 16:26:28 -0700 Subject: [PATCH 0269/1858] [portsmf] add new port with version 236 (#18982) --- ports/portsmf/portfile.cmake | 19 +++++++++++++++++++ ports/portsmf/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/p-/portsmf.json | 9 +++++++++ 4 files changed, 50 insertions(+) create mode 100644 ports/portsmf/portfile.cmake create mode 100644 ports/portsmf/vcpkg.json create mode 100644 versions/p-/portsmf.json diff --git a/ports/portsmf/portfile.cmake b/ports/portsmf/portfile.cmake new file mode 100644 index 00000000000000..f16dd9eed1d5dc --- /dev/null +++ b/ports/portsmf/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO tenacityteam/portsmf + REF 236 + SHA512 ede5ca770cab37822eebda7876c4fce7e786a11e15b3e173704863de97ea621b284439ebe7a14fdeadd0dc315f963c8da467ebbb7c246ebf80f5b120c35aa027 + HEAD_REF main +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/PortSMF) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/portsmf/vcpkg.json b/ports/portsmf/vcpkg.json new file mode 100644 index 00000000000000..3da8c402dcc5b1 --- /dev/null +++ b/ports/portsmf/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "portsmf", + "version": "0.236", + "description": "Portsmf is 'Port Standard MIDI File', a cross-platform, C++ library for reading and writing Standard MIDI Files.", + "homepage": "https://github.com/tenacityteam/portsmf", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 072feac14f8846..43a09d52dcf5a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5036,6 +5036,10 @@ "baseline": "0.234", "port-version": 0 }, + "portsmf": { + "baseline": "0.236", + "port-version": 0 + }, "ppconsul": { "baseline": "0.5-1", "port-version": 0 diff --git a/versions/p-/portsmf.json b/versions/p-/portsmf.json new file mode 100644 index 00000000000000..a42e04f3a8f233 --- /dev/null +++ b/versions/p-/portsmf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4d9de0a9782866958a9aafdfa6cde176c0867dfc", + "version": "0.236", + "port-version": 0 + } + ] +} From 05a089a3b68b224fcc2558e7bcfc2c236f93cc73 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Fri, 6 Aug 2021 01:29:04 +0200 Subject: [PATCH 0270/1858] [rbdl-orb] Adding RBDL-ORB to vcpkg (#18883) * add rbdl-orb port * update commit hash * added rbdl-orb port * moved to vcpkg.json and use vcpkg_cmake_configure/install functions * update to newest commit of rbdl-orb version v3.0.0 * only use vcpkg_from_github for source download * formatting vcpkg.json * update port version specs * use correct submodule path for urdfparser dependency * execute vcpkg x-add-version * fix linux vcpkg build * run vcpkg x-add-version * fix macosx rbdl-orb build * fix uwp build * update version --- ports/rbdl-orb/portfile.cmake | 40 +++++++++++++++++++++++++++++++++++ ports/rbdl-orb/vcpkg.json | 19 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/r-/rbdl-orb.json | 9 ++++++++ 4 files changed, 72 insertions(+) create mode 100644 ports/rbdl-orb/portfile.cmake create mode 100644 ports/rbdl-orb/vcpkg.json create mode 100644 versions/r-/rbdl-orb.json diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake new file mode 100644 index 00000000000000..ac829c62ce5986 --- /dev/null +++ b/ports/rbdl-orb/portfile.cmake @@ -0,0 +1,40 @@ +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ORB-HD/rbdl-orb + REF b22abab856a90dbc62e6b2e79f148bd383b5ce43 + SHA512 744a60145243454a9d148971d998ae7a3cc5b9d66131b5d6f3c7be80d6c9ef8b8bf4390b9d1b90b14be6c619c2e1d14c7c6104b3ca6e606e22e3581b548e4f9d + HEAD_REF master +) + +vcpkg_from_github( + OUT_SOURCE_PATH PARSER_SOURCE_PATH + REPO ORB-HD/URDF_Parser + REF 0f3310d766c658b72d54560833012c8fe63ce9d7 + SHA512 6cd8e300cc47b5a5370efb5a4cd843a1621e2832b790daedc1e260ba5bbcaaabdbcddce239f93c3900258093d483d332110ba7e9f0b4b6cda64ce51b6cf2365d +) +if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") + file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") + file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DRBDL_BUILD_STATIC=${RBDL_STATIC} + -DRBDL_BUILD_ADDON_LUAMODEL=ON + -DRBDL_BUILD_ADDON_GEOMETRY=ON + -DRBDL_BUILD_ADDON_URDFREADER=ON + -DRBDL_BUILD_EXECUTABLES=OFF +) + +vcpkg_cmake_install() + +# # Handle copyright +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# # Remove duplicated include directory +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_copy_pdbs() diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json new file mode 100644 index 00000000000000..2a1cd6beb9b13e --- /dev/null +++ b/ports/rbdl-orb/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "rbdl-orb", + "version": "3.0.0", + "description": "Rigid Body Dynamics Library - ORB", + "homepage": "https://github.com/orb-hd/rbdl-orb", + "dependencies": [ + "boost", + "eigen3", + "lua", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 43a09d52dcf5a6..7995aa87da2f23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5528,6 +5528,10 @@ "baseline": "2.6.0", "port-version": 0 }, + "rbdl-orb": { + "baseline": "3.0.0", + "port-version": 0 + }, "re2": { "baseline": "2020-10-01", "port-version": 0 diff --git a/versions/r-/rbdl-orb.json b/versions/r-/rbdl-orb.json new file mode 100644 index 00000000000000..0b2c7b6ae0bf9c --- /dev/null +++ b/versions/r-/rbdl-orb.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d475aade9be86281a6db741ee68e30a23d0f16d3", + "version": "3.0.0", + "port-version": 0 + } + ] +} From 76469a4dccbfd76bfabece8675b14a26426d0f8a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 6 Aug 2021 07:30:33 +0800 Subject: [PATCH 0271/1858] update find_fortran.cmake (#18876) --- scripts/cmake/vcpkg_find_fortran.cmake | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake index fd359d0eeb3f3e..9ec5ced9384a14 100644 --- a/scripts/cmake/vcpkg_find_fortran.cmake +++ b/scripts/cmake/vcpkg_find_fortran.cmake @@ -53,11 +53,11 @@ function(vcpkg_find_fortran additional_cmake_args_out) 120c943ce173719e48400fa18299f3458bc9db4cf18bb5a4dda8a91cc3f816510b337a92f7388077c65b50bbbeae9078793891ceaad631d780b10fde19ad3649 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" dbb9f8258da306a3441f9882faa472c3665a67b2ea68657f3e8a1402dcfacf9787a886a3daf0eefe4946f04557bc166eb15b21c1093ad85c909002daadba1923 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-1-any.pkg.tar.xz" + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-2-any.pkg.tar.zst" ba236e1efc990cb91d459f938be6ca6fc2211be95e888d73f8de301bce55d586f9d2b6be55dacb975ec1afa7952b510906284eff70210238919e341dffbdbeb8 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz" 5b99abc55eaa74cf85ca64a9c91542554cb5c1098bc71effba9bd36242694cfd348503fcd3507fb9ba97486108c092c925e2f38cd744493386b3dc9ab28bc526 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-7-any.pkg.tar.xz" + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-8-any.pkg.tar.zst" 459850a8c42b1d497268736629ef713beee70cd0d3161d02c7a9fad08aca4560f4e17ba02d5cabda8a19d7c614f7e0ef5a6ec13afd91dd3004057139a5469c8f "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.4.5-1-any.pkg.tar.zst" 68f431073717b59549ab0fd26be8df8afcb43f3dd85be2ffcbc7d1a629999eed924656a7fc3f50937b2e6605a5067542d016181106b7bc3408b89b268ced5d23 @@ -91,12 +91,12 @@ function(vcpkg_find_fortran additional_cmake_args_out) 0142e4a44c59d17380a4fc7b101a2152486781621d5f9f930045b8f9c4bb2c93ea88211e7d8f8f233e0ae09595c6c8bc948ae80b9673f231e715b0d04c8a1e54 "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-headers-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" b547091a45ea7df8182b627edc9a7c91a23f01c0d4e02634a590c02f24311741cad92ceb67b7e4432ffbe4266f135a5289eb3560cc90ffa5c57612c8537a1588 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-1-any.pkg.tar.xz" - c8e2fda532c753e0b1004596bf737c3669355f32af9b45d96c23fcef14994ba21ddf4f75138bdecc94cbf8a8c449eff530d24b74a0da47793e24ce92d154f411 + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libiconv-1.16-2-any.pkg.tar.zst" + 542ed5d898a57a79d3523458f8f3409669b411f87d0852bb566d66f75c96422433f70628314338993461bcb19d4bfac4dadd9d21390cb4d95ef0445669288658 "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-windows-default-manifest-6.4-3-any.pkg.tar.xz" 77d02121416e42ff32a702e21266ce9031b4d8fc9ecdb5dc049d92570b658b3099b65d167ca156367d17a76e53e172ca52d468e440c2cdfd14701da210ffea37 - "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-7-any.pkg.tar.xz" - bbd4a549efc2a5f4b1e9f1be00331e8726d80401a9c6117afa9d5dd92f4ac42a06cf2ce491a988e5c6ed7a6e536f8f1746081f4944bc6d473ccd16390fea27fe + "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zlib-1.2.11-8-any.pkg.tar.zst" + f40dde3216185e945baf51c29bbf8d1947220593901f982c711a663bb5a303efe434a4f6cf0c885817812fdc81183bcc1a240b96c29abb24a4c83202fd15016e "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-zstd-1.4.5-1-any.pkg.tar.zst" dc2c7289fb206966829c98f6bf4389b423784415532ca3d627a22ae9d756a4fe2faf9844994b3093d814d129d20b2b79897e702aa9569978f58431ea66b55feb ) From 6904061a3d5a4ef0f082a49f1b4042503490301c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 7 Aug 2021 16:48:44 +0200 Subject: [PATCH 0272/1858] [vcpkg baseline][vcpkg_configure_make] Pass make tool to `vcpkg_build_make` (#19361) * Pass 'make' between vcpkg scripts * Restore original BSD gmake lookup * [starlink-ast] Add ADDITIONAL_MSYS_PACKAGES to vcpkg_configure_make * [starlink-ast] x-add-version Co-authored-by: JackBoosY --- ports/starlink-ast/portfile.cmake | 2 +- ports/starlink-ast/vcpkg.json | 1 + scripts/cmake/vcpkg_build_make.cmake | 17 ++++++++--------- scripts/cmake/vcpkg_configure_make.cmake | 9 +++++++++ versions/baseline.json | 2 +- versions/s-/starlink-ast.json | 5 +++++ 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index b49c1332041965..054da29008f1e2 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -25,11 +25,11 @@ else() set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-pthreads") endif() -vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16 perl) vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" USE_WRAPPERS DETERMINE_BUILD_TRIPLET + ADDITIONAL_MSYS_PACKAGES perl OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 8bbc2238c41685..3248e265940b14 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "starlink-ast", "version-semver": "9.2.4", + "port-version": 1, "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", "supports": "windows", diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 30b073c5032853..18f857fcede233 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -81,15 +81,16 @@ function(vcpkg_build_make) string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") endif() - set(MAKE ) set(MAKE_OPTS ) set(INSTALL_OPTS ) if (CMAKE_HOST_WIN32) set(PATH_GLOBAL "$ENV{PATH}") vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper") - vcpkg_acquire_msys(MSYS_ROOT) - find_program(MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) - set(MAKE_COMMAND "${MAKE}") + if(NOT DEFINED Z_VCPKG_MAKE) + vcpkg_acquire_msys(MSYS_ROOT) + find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) + endif() + set(MAKE_COMMAND "${Z_VCPKG_MAKE}") set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) @@ -98,14 +99,12 @@ function(vcpkg_build_make) set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${_VCPKG_PACKAGE_PREFIX}) #TODO: optimize for install-data (release) and install-exec (release/debug) else() - # Compiler requriements if(VCPKG_HOST_IS_OPENBSD) - find_program(MAKE gmake REQUIRED) + find_program(Z_VCPKG_MAKE gmake REQUIRED) else() - find_program(MAKE make REQUIRED) + find_program(Z_VCPKG_MAKE make REQUIRED) endif() - set(MAKE_COMMAND "${MAKE}") - # Set make command and install command + set(MAKE_COMMAND "${Z_VCPKG_MAKE}") set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index f9a04266090027..067bf4da011f8c 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -861,6 +861,15 @@ function(vcpkg_configure_make) endforeach() endforeach() + # Export matching make program for vcpkg_build_make (cache variable) + if(CMAKE_HOST_WIN32 AND MSYS_ROOT) + find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) + elseif(VCPKG_HOST_IS_OPENBSD) + find_program(Z_VCPKG_MAKE gmake REQUIRED) + else() + find_program(Z_VCPKG_MAKE make REQUIRED) + endif() + # Restore environment _vcpkg_restore_env_variables(${_cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) diff --git a/versions/baseline.json b/versions/baseline.json index 7995aa87da2f23..19650fadcb7400 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6098,7 +6098,7 @@ }, "starlink-ast": { "baseline": "9.2.4", - "port-version": 0 + "port-version": 1 }, "status-code": { "baseline": "1.0.0-ab3cd821", diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json index f357f55c5425ed..a724950005c830 100644 --- a/versions/s-/starlink-ast.json +++ b/versions/s-/starlink-ast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fecd468269d73b6e8f29a297c4f7db771ea37c4", + "version-semver": "9.2.4", + "port-version": 1 + }, { "git-tree": "50f0b71ca66bd9e4ce6cb5a153e25878dd7a0600", "version-semver": "9.2.4", From c141abe65b128677b449cc0aaaf3abd6dd9e4468 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Mon, 9 Aug 2021 23:56:04 +0800 Subject: [PATCH 0273/1858] [librsvg] Remove debug postfix (#19460) * [librsvg] Remove debug postfix * Update the baseline version --- ports/librsvg/CMakeLists.txt | 6 ++---- ports/librsvg/portfile.cmake | 18 ++++++++---------- ports/librsvg/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/l-/librsvg.json | 5 +++++ 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/ports/librsvg/CMakeLists.txt b/ports/librsvg/CMakeLists.txt index 67cfced8c26267..13c3194863d78c 100644 --- a/ports/librsvg/CMakeLists.txt +++ b/ports/librsvg/CMakeLists.txt @@ -86,8 +86,6 @@ else() list(APPEND LIBRSVG_SOURCES rsvg.symbols) endif() -set(CMAKE_DEBUG_POSTFIX "d") - add_library(rsvg-2.40 ${LIBRSVG_SOURCES}) add_library(pixbufloader-svg ${PIXBUFLOADERSVG_SOURCES}) @@ -130,8 +128,8 @@ install( ) install(FILES - rsvg.h - rsvg-cairo.h + rsvg.h + rsvg-cairo.h librsvg-features.h librsvg-enum-types.h DESTINATION include/librsvg diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index f87ed15b9e6908..8e47fada4ce22f 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -11,25 +11,23 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.linux ${SOURCE_PATH}/config.h.linux COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +configure_file("${CMAKE_CURRENT_LIST_DIR}/config.h.linux" "${SOURCE_PATH}/config.h.linux" COPYONLY) vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-librsvg TARGET_PATH share/unofficial-librsvg) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-librsvg CONFIG_PATH share/unofficial-librsvg) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/librsvg/vcpkg.json b/ports/librsvg/vcpkg.json index 49114f48249196..eea2a5efde40ec 100644 --- a/ports/librsvg/vcpkg.json +++ b/ports/librsvg/vcpkg.json @@ -1,13 +1,21 @@ { "name": "librsvg", "version": "2.40.20", - "port-version": 4, + "port-version": 5, "description": "A small library to render Scalable Vector Graphics (SVG)", "homepage": "https://gitlab.gnome.org/GNOME/librsvg", "dependencies": [ "cairo", "gdk-pixbuf", "libcroco", - "pango" + "pango", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 19650fadcb7400..271dc491d1ff70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3562,7 +3562,7 @@ }, "librsvg": { "baseline": "2.40.20", - "port-version": 4 + "port-version": 5 }, "librsync": { "baseline": "2020-09-16", diff --git a/versions/l-/librsvg.json b/versions/l-/librsvg.json index 82d5bb16c71aa3..735241c8a43dd6 100644 --- a/versions/l-/librsvg.json +++ b/versions/l-/librsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1c471322f23a090a973337e83f0d9743adc549d", + "version": "2.40.20", + "port-version": 5 + }, { "git-tree": "0a02c4941810ea725b6686e203ae81deb257e24c", "version": "2.40.20", From d19c4f374cf5ac2da1f9cece633cb056c30323e4 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 9 Aug 2021 08:56:48 -0700 Subject: [PATCH 0274/1858] [rtmidi] Fix fatal error C1083: Cannot open include file: jack/jack.h (#19458) * [rtmidi] Fix fatal error C1083: Cannot open include file:jack/jack.h * Update json file * Modify the format of portfile.cmake * Update json --- ports/rtmidi/CONTROL | 6 ------ ports/rtmidi/portfile.cmake | 13 +++++++------ ports/rtmidi/vcpkg.json | 8 ++++++++ versions/baseline.json | 2 +- versions/r-/rtmidi.json | 5 +++++ 5 files changed, 21 insertions(+), 13 deletions(-) delete mode 100644 ports/rtmidi/CONTROL create mode 100644 ports/rtmidi/vcpkg.json diff --git a/ports/rtmidi/CONTROL b/ports/rtmidi/CONTROL deleted file mode 100644 index 7c2c39f2ad8f29..00000000000000 --- a/ports/rtmidi/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: rtmidi -Version: 4.0.0 -Port-Version: 2 -Homepage: https://github.com/thestk/rtmidi -Description: A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia) -Supports: !uwp diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index 4a9fccbcc078fb..8d1316ff68cc12 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -15,15 +15,16 @@ vcpkg_from_github( ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON - OPTIONS -DRTMIDI_API_ALSA=OFF + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DRTMIDI_API_ALSA=OFF + -DRTMIDI_API_JACK=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json new file mode 100644 index 00000000000000..82d6c482c962b6 --- /dev/null +++ b/ports/rtmidi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "rtmidi", + "version-semver": "4.0.0", + "port-version": 3, + "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", + "homepage": "https://github.com/thestk/rtmidi", + "supports": "!uwp" +} diff --git a/versions/baseline.json b/versions/baseline.json index 271dc491d1ff70..0b72c00936947e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5666,7 +5666,7 @@ }, "rtmidi": { "baseline": "4.0.0", - "port-version": 2 + "port-version": 3 }, "rttr": { "baseline": "0.9.6-2", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index 49e3bb2309b28d..07e63c77adaeff 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c13583da321fa3efa7a075032d0ed880dd15e48", + "version-semver": "4.0.0", + "port-version": 3 + }, { "git-tree": "65614f322a89cff92478b3f6736d287653085a34", "version-string": "4.0.0", From fe9995c97b71b861993537066ec6861bd3365434 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Mon, 9 Aug 2021 23:59:40 +0800 Subject: [PATCH 0275/1858] [value-ptr-lite] Fix usage (#19457) * [value-ptr-lite] Fix usage * Add port-version * Update version files --- ports/value-ptr-lite/CONTROL | 7 ------- ports/value-ptr-lite/portfile.cmake | 22 ++++++++++------------ ports/value-ptr-lite/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 2 +- versions/v-/value-ptr-lite.json | 5 +++++ 5 files changed, 38 insertions(+), 20 deletions(-) delete mode 100644 ports/value-ptr-lite/CONTROL create mode 100644 ports/value-ptr-lite/vcpkg.json diff --git a/ports/value-ptr-lite/CONTROL b/ports/value-ptr-lite/CONTROL deleted file mode 100644 index 0891d31fdd5acc..00000000000000 --- a/ports/value-ptr-lite/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: value-ptr-lite -Version: 0.2.1 -Homepage: https://github.com/martinmoene/value-ptr-lite -Description: A C++ smart-pointer with value semantics for C++98, C++11 and later in a single-file header-only library. - -Feature: test -Description: Build with test \ No newline at end of file diff --git a/ports/value-ptr-lite/portfile.cmake b/ports/value-ptr-lite/portfile.cmake index f148954682da10..b272643d6509b5 100644 --- a/ports/value-ptr-lite/portfile.cmake +++ b/ports/value-ptr-lite/portfile.cmake @@ -7,24 +7,22 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test BUILD_TESTS + FEATURES + test VALUE_PTR_LITE_OPT_BUILD_TESTS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DVALUE_PTR_LITE_OPT_BUILD_TESTS=${BUILD_TESTS} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DVALUE_PTR_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/value_ptr-lite) +vcpkg_cmake_config_fixup(PACKAGE_NAME value_ptr-lite CONFIG_PATH lib/cmake/value_ptr-lite) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/value-ptr-lite/vcpkg.json b/ports/value-ptr-lite/vcpkg.json new file mode 100644 index 00000000000000..3615f49716f70c --- /dev/null +++ b/ports/value-ptr-lite/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "value-ptr-lite", + "version-semver": "0.2.1", + "port-version": 1, + "description": "A C++ smart-pointer with value semantics for C++98, C++11 and later in a single-file header-only library.", + "homepage": "https://github.com/martinmoene/value-ptr-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "test": { + "description": "Build and perform value_ptr-lite tests." + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 0b72c00936947e..20d1f4ba2bb664 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6586,7 +6586,7 @@ }, "value-ptr-lite": { "baseline": "0.2.1", - "port-version": 0 + "port-version": 1 }, "vamp-sdk": { "baseline": "2.9", diff --git a/versions/v-/value-ptr-lite.json b/versions/v-/value-ptr-lite.json index 75cbf942d04ed9..c4efc83e509727 100644 --- a/versions/v-/value-ptr-lite.json +++ b/versions/v-/value-ptr-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69db499989a256cd9ce0397cb16814c6444b4877", + "version-semver": "0.2.1", + "port-version": 1 + }, { "git-tree": "c678a31c0e75e1cf5b53dc2f6ed0eecc156d9133", "version-string": "0.2.1", From 5550c1b85e2079564d47880a0d8b77b532abfc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 9 Aug 2021 16:00:57 +0000 Subject: [PATCH 0276/1858] [kf5attica] new port (#19446) * Add KF5Attica * [kf5attica] bump to 5.73 * [kf5attica] use PORT variable where applicable * [kf5attica] update to 5.75.0 * [kf5attica] port CONTROL to JSON * [kf5attica] update to 5.84.0 * [kf5attica] remove unused options * [kf5attica] only remove what's required * [kf5attica] grammar in description * [kf5attica] update deprecated functions * [kf5attica] wrap paths in quotes * [kf5attica] update versions * [kf5attica] fix static builds * [kf5attica] update versions Co-authored-by: Kuntal Majumder --- ports/kf5attica/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/kf5attica/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5attica.json | 9 +++++++++ 4 files changed, 59 insertions(+) create mode 100644 ports/kf5attica/portfile.cmake create mode 100644 ports/kf5attica/vcpkg.json create mode 100644 versions/k-/kf5attica.json diff --git a/ports/kf5attica/portfile.cmake b/ports/kf5attica/portfile.cmake new file mode 100644 index 00000000000000..30b4b281a59dbe --- /dev/null +++ b/ports/kf5attica/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/attica + REF v5.84.0 + SHA512 dedaac49d85c791027a567f82909953f06337734c9302ab4147341eb5ebdb14e2a1ffcfdf49d9e0c97e17e065498392f9a1a900557fe8937fa0e680cda2235ea + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Attica) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5attica/vcpkg.json b/ports/kf5attica/vcpkg.json new file mode 100644 index 00000000000000..83ab52cd285892 --- /dev/null +++ b/ports/kf5attica/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5attica", + "version-semver": "5.84.0", + "description": "A Qt library that implements the Open Collaboration Services API", + "homepage": "https://api.kde.org/frameworks/attica/html/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 20d1f4ba2bb664..612049c2e545f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2876,6 +2876,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5attica": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5auth": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5attica.json b/versions/k-/kf5attica.json new file mode 100644 index 00000000000000..d37e925f6f83f6 --- /dev/null +++ b/versions/k-/kf5attica.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "196f1ae93b85efd88bb9fa4a245ed9e8cf044a4a", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From de561655fbd75ebd1fe76d78254a54e4ce6a486d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 9 Aug 2021 18:04:09 +0200 Subject: [PATCH 0277/1858] [harfbuzz] Set CMP0057 to New to make this port usable in old CMake projects (#19444) --- ports/harfbuzz/harfbuzzConfig.cmake.in | 3 +++ ports/harfbuzz/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index b1cd6b6f5b0f29..a142735cf2a927 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -1,3 +1,6 @@ +# For old projects where the minimum CMake version is lower than 3.3. +cmake_policy(SET CMP0057 NEW) + if(TARGET harfbuzz) return() endif() diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index b612063268ea7f..6d5007235641b4 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "harfbuzz", "version": "2.8.1", + "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 612049c2e545f2..5dfc6d9ee8bff1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2498,7 +2498,7 @@ }, "harfbuzz": { "baseline": "2.8.1", - "port-version": 0 + "port-version": 1 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 66f3d1ecc21fbb..698b0ded440a34 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0af28da9fe1d9f70c2f0b572c8e9eee085eb7c3b", + "version": "2.8.1", + "port-version": 1 + }, { "git-tree": "32e5438e1f8c76646b657f14fbe0dac7646d80f6", "version": "2.8.1", From de216e15cb6150eb9fa87dcda0285fc2ec00eae0 Mon Sep 17 00:00:00 2001 From: Neel Raiyani Date: Mon, 9 Aug 2021 12:04:38 -0400 Subject: [PATCH 0278/1858] [cppitertools] update to version 2.1 (#19437) * update to version 2.1 * Update baseline.json * versioning update to baseline * update baseline and cppitertools json --- ports/cppitertools/CONTROL | 2 +- ports/cppitertools/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/c-/cppitertools.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cppitertools/CONTROL b/ports/cppitertools/CONTROL index f74188303ca936..84897b20c393a8 100644 --- a/ports/cppitertools/CONTROL +++ b/ports/cppitertools/CONTROL @@ -1,5 +1,5 @@ Source: cppitertools -Version: 2.0 +Version: 2.1 Homepage: https://github.com/ryanhaining/cppitertools Description: Range-based for loop add-ons inspired by the Python builtins and itertools library Build-Depends: boost-optional diff --git a/ports/cppitertools/portfile.cmake b/ports/cppitertools/portfile.cmake index 81ba94742ed6e8..8d92a0f2292dea 100644 --- a/ports/cppitertools/portfile.cmake +++ b/ports/cppitertools/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ryanhaining/cppitertools - REF d716cf6c8281ab6383d1fbecb456e0b9d808694c - SHA512 47bc490d798b445e965169a754dc977d5add217f133130671301dee6294744fa4b3f7a3b146cbd002c31325e5bc7c2206d57560a6db58693ca13ca972ca09d39 + REF 539a5be8359c4330b3f88ed1821f32bb5c89f5f6 + SHA512 cab0cb8a6b711824c13ca013b3349b9decb84f2dab6305bfb1bdd013f7426d5b199c127dadabeaaafc2e7ff6ad442222dd0fffee9aaacfa27d3aeb82c344ae4f HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index 5dfc6d9ee8bff1..b055b1c012cb3b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1449,7 +1449,7 @@ "port-version": 0 }, "cppitertools": { - "baseline": "2.0", + "baseline": "2.1", "port-version": 0 }, "cppkafka": { diff --git a/versions/c-/cppitertools.json b/versions/c-/cppitertools.json index cb19009476d90d..1aaf44107e0604 100644 --- a/versions/c-/cppitertools.json +++ b/versions/c-/cppitertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b4908a6183e914b33014a6b2f640df56e99d9f0", + "version-string": "2.1", + "port-version": 0 + }, { "git-tree": "6f5ac65e92858f04e97468de01d59b60c0eac058", "version-string": "2.0", From 864afc030f7886cacf3bb35262a08e7628905866 Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Mon, 9 Aug 2021 12:05:05 -0400 Subject: [PATCH 0279/1858] [readerwriterqueue] Update version to 1.0.5 (#19434) * [readerwriterqueue] version -> 1.0.5 * [readerwriterqueue] version -> 1.0.5 * [readerwriterqueue] version database update Co-authored-by: mheyman --- ports/readerwriterqueue/CONTROL | 4 ---- ports/readerwriterqueue/portfile.cmake | 6 +++--- ports/readerwriterqueue/vcpkg.json | 6 ++++++ versions/baseline.json | 2 +- versions/r-/readerwriterqueue.json | 5 +++++ 5 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 ports/readerwriterqueue/CONTROL create mode 100644 ports/readerwriterqueue/vcpkg.json diff --git a/ports/readerwriterqueue/CONTROL b/ports/readerwriterqueue/CONTROL deleted file mode 100644 index d4e7b7a527bc11..00000000000000 --- a/ports/readerwriterqueue/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: readerwriterqueue -Version: 1.0.3 -Homepage: https://github.com/cameron314/readerwriterqueue -Description: A single-producer, single-consumer lock-free queue diff --git a/ports/readerwriterqueue/portfile.cmake b/ports/readerwriterqueue/portfile.cmake index bf61bdb32fa09a..859425cf5fb12e 100644 --- a/ports/readerwriterqueue/portfile.cmake +++ b/ports/readerwriterqueue/portfile.cmake @@ -2,11 +2,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cameron314/readerwriterqueue - REF 435e36540e306cac40fcfeab8cc0a22d48464509 # v1.0.3 - SHA512 2946c0574ff2fa3eb2e09ab2729935bdd2d737a85ae66d669e80b48ac32ed9160b5d31e9b7e15fe21b2d33e42c052d81e1c92f5465af8a0e450027eb0f4af943 + REF 09732844aff873e8ec489e9005c775b6b1c58fa2 # v1.0.5 + SHA512 81a8e95766cfdb8828c9c311898bec17400f8f508cb398f3f2f367a470b42f9dcebf7ee327267d3dc35f98d0ad22732f0c3fca16074840fb032dfc576348c802 HEAD_REF master ) file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -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/readerwriterqueue/vcpkg.json b/ports/readerwriterqueue/vcpkg.json new file mode 100644 index 00000000000000..4b525aca78b2f3 --- /dev/null +++ b/ports/readerwriterqueue/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "readerwriterqueue", + "version-semver": "1.0.5", + "description": "A single-producer, single-consumer lock-free queue", + "homepage": "https://github.com/cameron314/readerwriterqueue" +} diff --git a/versions/baseline.json b/versions/baseline.json index b055b1c012cb3b..2769193a0ff4db 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5541,7 +5541,7 @@ "port-version": 0 }, "readerwriterqueue": { - "baseline": "1.0.3", + "baseline": "1.0.5", "port-version": 0 }, "readline": { diff --git a/versions/r-/readerwriterqueue.json b/versions/r-/readerwriterqueue.json index 919d3763e3e4c0..6b29e95fa40795 100644 --- a/versions/r-/readerwriterqueue.json +++ b/versions/r-/readerwriterqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbbab7a7ad42a964d56b72742980ce41d111e2e4", + "version-semver": "1.0.5", + "port-version": 0 + }, { "git-tree": "067260ce5553b99cc95abbd297271e51b4db138d", "version-string": "1.0.3", From daf93d9891b9b9264be370b24034048ac5b06b94 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 10 Aug 2021 00:07:37 +0800 Subject: [PATCH 0280/1858] [vcpkg baseline][rbdl-orb/rbdl/ptex] file conflicts, skip rbdl-orb in CI testing (#19453) * [vcpkg baseline][rbdl-orb/rbdl] file conflicts, skip rbdl-orb in Ci testing * [ptex] Add DISABLE_PARALLEL_CONFIGURE * Update the baseline version * Add missing quotes * Update the baseline version --- ports/ptex/CONTROL | 7 ------- ports/ptex/portfile.cmake | 20 ++++++++++---------- ports/ptex/vcpkg.json | 19 +++++++++++++++++++ ports/rbdl-orb/portfile.cmake | 20 +++++++++++--------- ports/rbdl-orb/vcpkg.json | 5 +---- ports/rbdl/CONTROL | 6 ------ ports/rbdl/portfile.cmake | 21 +++++++++------------ ports/rbdl/vcpkg.json | 14 ++++++++++++++ scripts/ci.baseline.txt | 10 ++++++++++ versions/baseline.json | 6 +++--- versions/p-/ptex.json | 5 +++++ versions/r-/rbdl-orb.json | 5 +++++ versions/r-/rbdl.json | 5 +++++ 13 files changed, 92 insertions(+), 51 deletions(-) delete mode 100644 ports/ptex/CONTROL create mode 100644 ports/ptex/vcpkg.json delete mode 100644 ports/rbdl/CONTROL create mode 100644 ports/rbdl/vcpkg.json diff --git a/ports/ptex/CONTROL b/ports/ptex/CONTROL deleted file mode 100644 index c00a1a0b818fd7..00000000000000 --- a/ports/ptex/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: ptex -Version: 2.3.2 -Port-Version: 2 -Homepage: https://github.com/wdas/ptex -Description: Per-Face Texture Mapping for Production Rendering. -Build-Depends: zlib -Supports: !uwp \ No newline at end of file diff --git a/ports/ptex/portfile.cmake b/ports/ptex/portfile.cmake index f065e4426f9527..6fe24666be5fa9 100644 --- a/ports/ptex/portfile.cmake +++ b/ports/ptex/portfile.cmake @@ -21,29 +21,29 @@ else() set(BUILD_STATIC_LIB ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DPTEX_VER=v${PTEX_VER} -DPTEX_BUILD_SHARED_LIBS=${BUILD_SHARED_LIB} -DPTEX_BUILD_STATIC_LIBS=${BUILD_STATIC_LIB} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Ptex) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Ptex) vcpkg_copy_pdbs() foreach(HEADER PtexHalf.h Ptexture.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/${HEADER} PTEX_HEADER) + file(READ "${CURRENT_PACKAGES_DIR}/include/${HEADER}" PTEX_HEADER) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) string(REPLACE "ifndef PTEX_STATIC" "if 1" PTEX_HEADER "${PTEX_HEADER}") else() string(REPLACE "ifndef PTEX_STATIC" "if 0" PTEX_HEADER "${PTEX_HEADER}") endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/${HEADER} "${PTEX_HEADER}") + file(WRITE "${CURRENT_PACKAGES_DIR}/include/${HEADER}" "${PTEX_HEADER}") endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/src/doc/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/src/doc/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ptex/vcpkg.json b/ports/ptex/vcpkg.json new file mode 100644 index 00000000000000..355a40596ce1f7 --- /dev/null +++ b/ports/ptex/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "ptex", + "version": "2.3.2", + "port-version": 3, + "description": "Per-Face Texture Mapping for Production Rendering.", + "homepage": "https://github.com/wdas/ptex", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake index ac829c62ce5986..02da8be0784ad8 100644 --- a/ports/rbdl-orb/portfile.cmake +++ b/ports/rbdl-orb/portfile.cmake @@ -1,12 +1,16 @@ -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) - +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl/copyright") + message(FATAL_ERROR "${PORT} conflict with rbdl, please remove rbdl before install ${PORT}.") +endif() + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ORB-HD/rbdl-orb REF b22abab856a90dbc62e6b2e79f148bd383b5ce43 SHA512 744a60145243454a9d148971d998ae7a3cc5b9d66131b5d6f3c7be80d6c9ef8b8bf4390b9d1b90b14be6c619c2e1d14c7c6104b3ca6e606e22e3581b548e4f9d HEAD_REF master -) +) vcpkg_from_github( OUT_SOURCE_PATH PARSER_SOURCE_PATH @@ -17,10 +21,10 @@ vcpkg_from_github( if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") file(RENAME "${PARSER_SOURCE_PATH}" "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") -endif() +endif() vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRBDL_BUILD_STATIC=${RBDL_STATIC} -DRBDL_BUILD_ADDON_LUAMODEL=ON @@ -31,10 +35,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -# # Remove duplicated include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json index 2a1cd6beb9b13e..8b460557a64d70 100644 --- a/ports/rbdl-orb/vcpkg.json +++ b/ports/rbdl-orb/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rbdl-orb", "version": "3.0.0", + "port-version": 1, "description": "Rigid Body Dynamics Library - ORB", "homepage": "https://github.com/orb-hd/rbdl-orb", "dependencies": [ @@ -10,10 +11,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/ports/rbdl/CONTROL b/ports/rbdl/CONTROL deleted file mode 100644 index 1a674323c51547..00000000000000 --- a/ports/rbdl/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: rbdl -Version: 2.6.0 -Port-Version: 0 -Homepage: https://github.com/rbdl/rbdl -Description: Rigid Body Dynamics Library -Build-Depends: eigen3 diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index adf580e6dc54ee..362bb19bdd5de6 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -1,9 +1,9 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(RBDL_STATIC ON) -else() - set(RBDL_STATIC OFF) +if (EXISTS "${CURRENT_INSTALLED_DIR}/share/rbdl-orb/copyright") + message(FATAL_ERROR "${PORT} conflict with rbdl-orb, please remove rbdl-orb before install ${PORT}.") endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) + vcpkg_from_github(ARCHIVE OUT_SOURCE_PATH SOURCE_PATH REPO rbdl/rbdl @@ -14,19 +14,16 @@ vcpkg_from_github(ARCHIVE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRBDL_BUILD_STATIC=${RBDL_STATIC} ) -vcpkg_install_cmake() - -# # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() -# # Remove duplicated include directory file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json new file mode 100644 index 00000000000000..ee07f6de7664e3 --- /dev/null +++ b/ports/rbdl/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "rbdl", + "version": "2.6.0", + "port-version": 1, + "description": "Rigid Body Dynamics Library", + "homepage": "https://github.com/rbdl/rbdl", + "dependencies": [ + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f7d11a695f4ebd..7f53972bc521e1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1325,6 +1325,16 @@ rapidstring:x86-windows=fail raylib:arm64-windows=fail raylib:arm-uwp=fail raylib:x64-uwp=fail +# file conflicts with rbdl +rbdl-orb:x86-windows=skip +rbdl-orb:x64-windows=skip +rbdl-orb:x64-windows-static=skip +rbdl-orb:x64-windows-static-md=skip +rbdl-orb:x64-uwp=skip +rbdl-orb:arm-uwp=skip +rbdl-orb:arm64-windows=skip +rbdl-orb:x64-linux=skip +rbdl-orb:x64-osx=skip readline:arm-uwp=fail readline:x64-uwp=fail readline-win32:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2769193a0ff4db..5897e401d8aac0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5102,7 +5102,7 @@ }, "ptex": { "baseline": "2.3.2", - "port-version": 2 + "port-version": 3 }, "pthread": { "baseline": "3.0.0", @@ -5530,11 +5530,11 @@ }, "rbdl": { "baseline": "2.6.0", - "port-version": 0 + "port-version": 1 }, "rbdl-orb": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "re2": { "baseline": "2020-10-01", diff --git a/versions/p-/ptex.json b/versions/p-/ptex.json index 3a7baab15fa27c..47f9c2dcaba574 100644 --- a/versions/p-/ptex.json +++ b/versions/p-/ptex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c524a2ab1940315d3481e9fbf745425caf5b7c15", + "version": "2.3.2", + "port-version": 3 + }, { "git-tree": "e4ee03f1ba1d9c807b8baee1bd3b1089e71476ca", "version-string": "2.3.2", diff --git a/versions/r-/rbdl-orb.json b/versions/r-/rbdl-orb.json index 0b2c7b6ae0bf9c..f2ec0ef61c950e 100644 --- a/versions/r-/rbdl-orb.json +++ b/versions/r-/rbdl-orb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5850c6901f4123803184bfe9b6e587af9350331a", + "version": "3.0.0", + "port-version": 1 + }, { "git-tree": "d475aade9be86281a6db741ee68e30a23d0f16d3", "version": "3.0.0", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index 2091d05bbe0a1e..832ea5af49ba5c 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44606d1a4e33112ca45274e823041ad877e62623", + "version": "2.6.0", + "port-version": 1 + }, { "git-tree": "c2823f8341acd1e564485661989fb3780a6b4a2a", "version-string": "2.6.0", From 81993ee36831119b6bfd4d3a1e691e6ce3713d6c Mon Sep 17 00:00:00 2001 From: Brennan Date: Mon, 9 Aug 2021 09:08:38 -0700 Subject: [PATCH 0281/1858] [microsoft-signalr] Update port (#19420) * Update microsoft-signalr port * x-add-version --- ports/microsoft-signalr/CONTROL | 8 ++++++-- ports/microsoft-signalr/portfile.cmake | 5 +++-- versions/baseline.json | 2 +- versions/m-/microsoft-signalr.json | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 794ff2af27977d..51b35417b53b07 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -1,5 +1,5 @@ Source: microsoft-signalr -Version: 0.1.0-alpha2 +Version: 0.1.0-alpha3 Port-Version: 0 Description: C++ Client for ASP.NET Core SignalR. Default-Features: default-features @@ -11,4 +11,8 @@ Description: Features installed by default Feature: cpprestsdk Description: Add default Http and WebSocket implementations using CppRestSDK -Build-Depends: cpprestsdk[default-features,websockets] \ No newline at end of file +Build-Depends: cpprestsdk[default-features,websockets] + +Feature: messagepack +Description: Add support for the messagepack hub protocol, must enable in code still +Build-Depends: msgpack \ No newline at end of file diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index d4b2dac1a74865..d5b8266ef3bc54 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aspnet/SignalR-Client-Cpp - REF v0.1.0-alpha2 - SHA512 5a25bdf1f4587c7c008b743c0e97c5b293839b4a63bad89b3c37a1affccfa26df12b20f69a822e8d0eddb4491b3f0e513f017c39528a39990527aac44b3d6f5b + REF v0.1.0-alpha3 + SHA512 7dbd75748535c7b7fef36afe246b132b243b8b4932c218a63aa18c7a44d6691c002144c6d2f5603ad63c03d018907436ad259fdfcc0d7749917931bdebef670b HEAD_REF main ) @@ -10,6 +10,7 @@ vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES cpprestsdk USE_CPPRESTSDK + messagepack USE_MSGPACK ) if("cpprestsdk" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) diff --git a/versions/baseline.json b/versions/baseline.json index 5897e401d8aac0..86170b5cff6b1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4069,7 +4069,7 @@ "port-version": 0 }, "microsoft-signalr": { - "baseline": "0.1.0-alpha2", + "baseline": "0.1.0-alpha3", "port-version": 0 }, "mikktspace": { diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index 66a7d8afc467e9..dfe7643059fd8a 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d840951b02dde36c320872fb7e64c1e89e7aa7d", + "version-string": "0.1.0-alpha3", + "port-version": 0 + }, { "git-tree": "6035b3729564e1a85d60cc322d5dda0ea16d858d", "version-string": "0.1.0-alpha2", From 2dae28ebfd7f638bf07bc54f2f25b14ad72a43b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Tabin?= Date: Mon, 9 Aug 2021 18:09:22 +0200 Subject: [PATCH 0282/1858] [libzippp] update to 5.0-1.8.0 (#19433) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cédric Tabin --- ports/libzippp/CONTROL | 2 +- ports/libzippp/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/l-/libzippp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libzippp/CONTROL b/ports/libzippp/CONTROL index 93964ad5f7402a..830675d365d565 100644 --- a/ports/libzippp/CONTROL +++ b/ports/libzippp/CONTROL @@ -1,5 +1,5 @@ Source: libzippp -Version: 4.1-1.8.0 +Version: 5.0-1.8.0 Homepage: https://github.com/ctabin/libzippp Description: Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling Build-Depends: zlib, libzip[core,bzip2] diff --git a/ports/libzippp/portfile.cmake b/ports/libzippp/portfile.cmake index 9a011f8014e2cf..7bf26dd6ba2c77 100644 --- a/ports/libzippp/portfile.cmake +++ b/ports/libzippp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ctabin/libzippp - REF 8299422194ce3c5be0677550ce3d6d4e15d40dd8 #v4.1-1.8.0 with CXX std version c++11 - SHA512 091c744377707899456b027a35059e048e1552e013330c68920f88f94a42904cf1a6afc7f853cf34cc9bbb3956c3c16907f089520e808520a671c59646d5e351 + REF 0e907d7ef8de46822602cb7633a5bc6fc0cc36de #v5.0-1.8.0 with CXX std version c++11 + SHA512 f91724b0225bddcaf705e7e1493ad415b534096cfe3636d50995245982984e7420148206f4e24d72e596d75eac570d7b512c5aa836eaf4a8951e27737bcee9eb HEAD_REF master PATCHES fix-find-lzma.patch ) diff --git a/versions/baseline.json b/versions/baseline.json index 86170b5cff6b1d..9f3e2039b02dc6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3817,7 +3817,7 @@ "port-version": 2 }, "libzippp": { - "baseline": "4.1-1.8.0", + "baseline": "5.0-1.8.0", "port-version": 0 }, "licensepp": { diff --git a/versions/l-/libzippp.json b/versions/l-/libzippp.json index 25607575ce671d..04df66c4b79bae 100644 --- a/versions/l-/libzippp.json +++ b/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "841560e4b583cbf85a4aca0839aa881c4cda7258", + "version-string": "5.0-1.8.0", + "port-version": 0 + }, { "git-tree": "c6ab6d33444f3671ea875f4c98bc2937b2d32ee9", "version-string": "4.1-1.8.0", From 2d473fd0f052187df37aa74ccfedc94d7fa53092 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 9 Aug 2021 17:28:50 -0700 Subject: [PATCH 0283/1858] [azure-core-cpp] Update to 1.2.0 (#19393) ## 1.2.0 (2021-08-05) ### Features Added - Added `Azure::Core::IO::ProgressBodyStream` type that wraps an existing BodyStream based type stream and reports progress via callback when the stream position is updated. ### Bugs Fixed - [2647](https://github.com/Azure/azure-sdk-for-cpp/issues/2647) Make the curl transport adapter to check the connection close header. - [2474](https://github.com/Azure/azure-sdk-for-cpp/issues/2474) Fix compiling with MSVC and `/analyze`. - Make WinHTTP transport adapter to NOT use SSL/TLS for unsecured HTTP connections. ### Other Changes - Updated source code to build with Clang 11. (A community contribution, courtesy of _[davidchisnall](https://github.com/davidchisnall)_) ### Acknowledgments Thank you to our developer community members who helped to make Azure Core better with their contributions to this release: - David Chisnall _([GitHub](https://github.com/davidchisnall))_ --- ports/azure-core-cpp/portfile.cmake | 5 ++--- ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 4f83c7daa23b37..b94807690bc4cf 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.1.0 - SHA512 83d8ba283179531fbd5b1e81b468b5fdb1d3aa846b2b9edd579a4e56a44f412986ad3558c98009a274e8c8fda301a5a434caf62dd990e3d9e8b07993d5218520 + REF azure-core_1.2.0 + SHA512 03297bcb54156730a35467bfd1591d07c0ef131c6183ac97f98ab845f32103cd930bb99e0fee2f334f64dceece866ec0c5e9c4ad91c96299c6fb08537a863983 ) vcpkg_check_features( @@ -14,7 +14,6 @@ vcpkg_check_features( vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core/ - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DWARNINGS_AS_ERRORS=OFF diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 496f70b0e46fe0..732480c8376ed5 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.1.0", + "version-semver": "1.2.0", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index f0d6d6571ae52e..2dd5f7e20c4d00 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68831f9976e41448ebf74ead081d41ce09042c38", + "version-semver": "1.2.0", + "port-version": 0 + }, { "git-tree": "b330962cc2223833ef92e2be4e8d7e825dd3e141", "version-semver": "1.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9f3e2039b02dc6..6fcde02b800844 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -273,7 +273,7 @@ "port-version": 1 }, "azure-core-cpp": { - "baseline": "1.1.0", + "baseline": "1.2.0", "port-version": 0 }, "azure-identity-cpp": { From d996e68ab892fcbb0c9f99804a43aa24d1e716fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 10 Aug 2021 08:30:02 +0800 Subject: [PATCH 0284/1858] [proj4] Add usage, fixup target PROJ::proj (#19298) * [proj4] Export target both proj and proj4 * version * fix the generated cmake file name * Fix config.cmake * version * update * Update ports/proj4/usage * Update versions/p-/proj4.json --- ports/proj4/portfile.cmake | 33 +++++++++++++++++++-------------- ports/proj4/usage | 4 ++++ ports/proj4/vcpkg.json | 10 +++++++++- versions/baseline.json | 2 +- versions/p-/proj4.json | 5 +++++ 5 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 ports/proj4/usage diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index e0880683a5c265..feff73e4fcbce9 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -22,14 +22,15 @@ else() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - database BUILD_PROJ_DATABASE - tools BUILD_CCT - tools BUILD_CS2CS - tools BUILD_GEOD - tools BUILD_GIE - tools BUILD_PROJ - tools BUILD_PROJINFO - ${EXTRA_FEATURES} + FEATURES + database BUILD_PROJ_DATABASE + tools BUILD_CCT + tools BUILD_CS2CS + tools BUILD_GEOD + tools BUILD_GIE + tools BUILD_PROJ + tools BUILD_PROJINFO + ${EXTRA_FEATURES} ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -41,7 +42,7 @@ if ("database" IN_LIST FEATURES) set(EXE_SQLITE3 ${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} @@ -52,15 +53,19 @@ vcpkg_configure_cmake( -DEXE_SQLITE3=${EXE_SQLITE3} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ CONFIG_PATH lib/cmake/proj DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME PROJ4 CONFIG_PATH lib/cmake/proj4) + if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif () -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/proj4/usage b/ports/proj4/usage new file mode 100644 index 00000000000000..a2297ca02b2729 --- /dev/null +++ b/ports/proj4/usage @@ -0,0 +1,4 @@ +The package ${PORT}:${TARGET_TRIPLET} provides CMake targets: + + find_package(PROJ CONFIG REQUIRED) + target_link_libraries(main PRIVATE PROJ::proj) diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index a6c8f8b4349d49..234f924946256d 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,13 +1,21 @@ { "name": "proj4", "version-string": "7.2.1", - "port-version": 2, + "port-version": 3, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ { "name": "sqlite3", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6fcde02b800844..17cb988edf00f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5070,7 +5070,7 @@ }, "proj4": { "baseline": "7.2.1", - "port-version": 2 + "port-version": 3 }, "prometheus-cpp": { "baseline": "0.12.3", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index 703424c68f5fbb..d5bbf1d9afb6a4 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fc1b6bdde08a3b1f131df5a4f042885dcc7a58d", + "version-string": "7.2.1", + "port-version": 3 + }, { "git-tree": "e692e884172877640f3de4009d810061382714b7", "version-string": "7.2.1", From 7eaf85fd0dcab6ca8b1b22a4170509bcd2e33423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Tue, 10 Aug 2021 09:57:48 +0200 Subject: [PATCH 0285/1858] [libarchive] Restore pkgconfig file (#19428) So far, generating libarchive.pc has been disabled by the fix-buildsystem.patch, whereas INCLUDE(CreatePkgConfigFile) has been removed from CMakeLists.txt - Update fix-buildsystem.patch and allow creating the pkgconfig file - Add vcpkg_fixup_pkgconfig() to portfile - Add `FEATURES` keyword to vcpkg_check_features() to avoid deprecation warning --- ports/libarchive/fix-buildsystem.patch | 16 +++------- ports/libarchive/portfile.cmake | 43 ++++++++++++++------------ ports/libarchive/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libarchive.json | 5 +++ 5 files changed, 35 insertions(+), 33 deletions(-) diff --git a/ports/libarchive/fix-buildsystem.patch b/ports/libarchive/fix-buildsystem.patch index 9ed57f6f1041bf..4aa19738a86d53 100644 --- a/ports/libarchive/fix-buildsystem.patch +++ b/ports/libarchive/fix-buildsystem.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index b2634da..6a1dc1f 100644 +index b2634da6..0d846877 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,10 +148,6 @@ IF (CMAKE_C_COMPILER_ID MATCHES "^XL$") @@ -34,7 +34,7 @@ index b2634da..6a1dc1f 100644 - RUNS - "#include \nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }" - ZLIB_WINAPI) -+ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box ++ SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box IF(ZLIB_WINAPI) ADD_DEFINITIONS(-DZLIB_WINAPI) ELSE(ZLIB_WINAPI) @@ -106,13 +106,7 @@ index b2634da..6a1dc1f 100644 IF(HAVE_STRERROR_R) SET(HAVE_DECL_STRERROR_R 1) -@@ -2012,13 +2001,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake/config.h.in - INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - ADD_DEFINITIONS(-DHAVE_CONFIG_H) - --# Handle generation of the libarchive.pc file for pkg-config --INCLUDE(CreatePkgConfigFile) -- +@@ -2018,7 +2007,7 @@ INCLUDE(CreatePkgConfigFile) # # Register installation of PDF documents. # @@ -122,7 +116,7 @@ index b2634da..6a1dc1f 100644 # On Windows platform, It's better that we install PDF documents # on one's computer. diff --git a/libarchive/CMakeLists.txt b/libarchive/CMakeLists.txt -index 9389bbc..0793d96 100644 +index 9389bbc9..c34a42b2 100644 --- a/libarchive/CMakeLists.txt +++ b/libarchive/CMakeLists.txt @@ -236,28 +236,22 @@ ELSEIF(ARCHIVE_ACL_SUNOS) @@ -153,7 +147,7 @@ index 9389bbc..0793d96 100644 IF(ENABLE_INSTALL) # How to install the libraries - INSTALL(TARGETS archive archive_static -+ INSTALL(TARGETS archive ++ INSTALL(TARGETS archive RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 918761fa527313..02c44a603bee25 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -14,26 +14,27 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - bzip2 ENABLE_BZip2 - libxml2 ENABLE_LIBXML2 - lz4 ENABLE_LZ4 - lzma ENABLE_LZMA - lzo ENABLE_LZO - openssl ENABLE_OPENSSL - zstd ENABLE_ZSTD - # The below features should be added to CONTROL - #pcre ENABLE_PCREPOSIX - #nettle ENABLE_NETTLE - #expat ENABLE_EXPAT - #libgcc ENABLE_LibGCC - #cng ENABLE_CNG - #tar ENABLE_TAR # Tool build option? - #cpio ENABLE_CPIO # Tool build option? - #cat ENABLE_CAT # Tool build option? - #xattr ENABLE_XATTR # Tool support option? - #acl ENABLE_ACL # Tool support option? - #iconv ENABLE_ICONV # iconv support option? - #libb2 ENABLE_LIBB2 + FEATURES + bzip2 ENABLE_BZip2 + libxml2 ENABLE_LIBXML2 + lz4 ENABLE_LZ4 + lzma ENABLE_LZMA + lzo ENABLE_LZO + openssl ENABLE_OPENSSL + zstd ENABLE_ZSTD + # The below features should be added to CONTROL + #pcre ENABLE_PCREPOSIX + #nettle ENABLE_NETTLE + #expat ENABLE_EXPAT + #libgcc ENABLE_LibGCC + #cng ENABLE_CNG + #tar ENABLE_TAR # Tool build option? + #cpio ENABLE_CPIO # Tool build option? + #cat ENABLE_CAT # Tool build option? + #xattr ENABLE_XATTR # Tool support option? + #acl ENABLE_ACL # Tool support option? + #iconv ENABLE_ICONV # iconv support option? + #libb2 ENABLE_LIBB2 ) if(FEATURES MATCHES "pcre") @@ -68,6 +69,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + vcpkg_copy_pdbs() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 1e1ad9f9284b0f..3d95284a4887d8 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libarchive", "version-semver": "3.4.3", - "port-version": 6, + "port-version": 7, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 17cb988edf00f6..ad89b93206b33f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3066,7 +3066,7 @@ }, "libarchive": { "baseline": "3.4.3", - "port-version": 6 + "port-version": 7 }, "libass": { "baseline": "0.15.1", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index a586104d326086..97dcae3bdf0569 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c9f2bae07e5615f25bfc8326b1b85686953e918", + "version-semver": "3.4.3", + "port-version": 7 + }, { "git-tree": "8990b8db984f4a3652bb644608efd7dcd1573bf3", "version-semver": "3.4.3", From b2717f612aa2fab886104181dccb0ab9ea8bd75a Mon Sep 17 00:00:00 2001 From: Be Date: Tue, 10 Aug 2021 00:58:05 -0700 Subject: [PATCH 0286/1858] [portsmf] update to 238 (#19423) This fixes a missing #include in one of the library's headers (allegro.h). Also the header files are installed to the lowercase "portsmf" directory to match the old build system. --- ports/portsmf/portfile.cmake | 4 ++-- ports/portsmf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/portsmf.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/portsmf/portfile.cmake b/ports/portsmf/portfile.cmake index f16dd9eed1d5dc..158094ee76c020 100644 --- a/ports/portsmf/portfile.cmake +++ b/ports/portsmf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tenacityteam/portsmf - REF 236 - SHA512 ede5ca770cab37822eebda7876c4fce7e786a11e15b3e173704863de97ea621b284439ebe7a14fdeadd0dc315f963c8da467ebbb7c246ebf80f5b120c35aa027 + REF 238 + SHA512 af619d1b0a656361af8f8b8b65d7f98047613ac8e9ea51354031629c1732ad02755f84d63ac7c4ed24cdf0ad3db46381061bf32d9afe29b7be3226dc814ef552 HEAD_REF main ) diff --git a/ports/portsmf/vcpkg.json b/ports/portsmf/vcpkg.json index 3da8c402dcc5b1..c97b7711de8e7b 100644 --- a/ports/portsmf/vcpkg.json +++ b/ports/portsmf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "portsmf", - "version": "0.236", + "version": "0.238", "description": "Portsmf is 'Port Standard MIDI File', a cross-platform, C++ library for reading and writing Standard MIDI Files.", "homepage": "https://github.com/tenacityteam/portsmf", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index ad89b93206b33f..28a7a3eb085489 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5041,7 +5041,7 @@ "port-version": 0 }, "portsmf": { - "baseline": "0.236", + "baseline": "0.238", "port-version": 0 }, "ppconsul": { diff --git a/versions/p-/portsmf.json b/versions/p-/portsmf.json index a42e04f3a8f233..c5124438cea45c 100644 --- a/versions/p-/portsmf.json +++ b/versions/p-/portsmf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6edc5e2a3d90cd44a65b5d0f28207b5eb3c2dec5", + "version": "0.238", + "port-version": 0 + }, { "git-tree": "4d9de0a9782866958a9aafdfa6cde176c0867dfc", "version": "0.236", From 352afaadd52af1927cd020c1e565314197cf1e02 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 10 Aug 2021 15:59:01 +0800 Subject: [PATCH 0287/1858] [catch2] Support static build (#19396) * [catch2] Update to 1.13.7 and support static build * Update version files * Revert the new version update changes * Update version files * Update versions/c-/catch2.json * Fix install path for lib and pkgconfig * Update versions/c-/catch2.json --- ports/catch2/fix-install-path.patch | 22 ++++++++++++++++++++++ ports/catch2/portfile.cmake | 16 +++++++++++----- ports/catch2/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 5 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 ports/catch2/fix-install-path.patch diff --git a/ports/catch2/fix-install-path.patch b/ports/catch2/fix-install-path.patch new file mode 100644 index 00000000000000..c60e74b93d9937 --- /dev/null +++ b/ports/catch2/fix-install-path.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0370ea3..7cef01a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ if (NOT_SUBPROJECT) + EXPORT + Catch2Targets + DESTINATION +- ${CMAKE_INSTALL_LIBDIR} ++ ${CMAKE_INSTALL_LIBDIR}/manual-link + ) + + +@@ -226,7 +226,7 @@ if (NOT_SUBPROJECT) + + ## Provide some pkg-config integration + set(PKGCONFIG_INSTALL_DIR +- "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig" ++ "${CMAKE_INSTALL_LIBDIR}/pkgconfig" + CACHE PATH "Path where catch2.pc is installed" + ) + configure_file( diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index 0b2c4c0e752208..fcc6ab942273d1 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -4,26 +4,32 @@ vcpkg_from_github( REF 5c88067bd339465513af4aec606bd2292f1b594a # v2.13.6 SHA512 62ab120ef9cbbcf7320a96654bda60c766dbbcc0d9cbb2b0b36dd04e828315b627caf51e390dcea915efa266655fe0f28058b972c0d6e0e3e457c565d26e1fd3 HEAD_REF master + PATCHES fix-install-path.patch ) -vcpkg_configure_cmake( +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF -DCATCH_BUILD_EXAMPLES=OFF + -DCATCH_BUILD_STATIC_LIBRARY=${BUILD_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/share/catch2") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Catch2) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2) + +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/catch2/catch.hpp") message(FATAL_ERROR "Main includes have moved. Please update the forwarder.") diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index e0199bffa190c2..0b81964b47a40d 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,7 +1,17 @@ { "name": "catch2", "version-semver": "2.13.6", - "port-version": 1, + "port-version": 2, "description": "A modern, header-only test framework for unit testing.", - "homepage": "https://github.com/catchorg/Catch2" + "homepage": "https://github.com/catchorg/Catch2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 28a7a3eb085489..b9977c279d0eeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1154,7 +1154,7 @@ }, "catch2": { "baseline": "2.13.6", - "port-version": 1 + "port-version": 2 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index cca4c3a0064f3d..646d520aaf9e84 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25", + "version-semver": "2.13.6", + "port-version": 2 + }, { "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c", "version-semver": "2.13.6", From 6a002cc7ce82ce49eddd19d221f6b7cdede33799 Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Tue, 10 Aug 2021 09:59:47 +0200 Subject: [PATCH 0288/1858] [libpqxx] Upgrade up to 7.6.0 (#19381) * Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * upgrade libpq up to 7.6.0 * upgrade libpq up to 7.6.0 * upgrade libpq up to 7.6.0 * upgrade libpq up to 7.6.0 * upgrade libpq up to 7.6.0 * Update ports/libpqxx/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/libpqxx/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix remarks * update version files * fix Co-authored-by: Alexander Smyslov Co-authored-by: Smyslov Alexander Nikolayevich Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/libpqxx/CONTROL | 6 - ports/libpqxx/fix-build-with-vs2017.patch | 275 ---------------------- ports/libpqxx/portfile.cmake | 8 +- ports/libpqxx/vcpkg.json | 9 + versions/baseline.json | 4 +- versions/l-/libpqxx.json | 5 + 6 files changed, 20 insertions(+), 287 deletions(-) delete mode 100644 ports/libpqxx/CONTROL delete mode 100644 ports/libpqxx/fix-build-with-vs2017.patch create mode 100644 ports/libpqxx/vcpkg.json diff --git a/ports/libpqxx/CONTROL b/ports/libpqxx/CONTROL deleted file mode 100644 index 5b62fe37ca7747..00000000000000 --- a/ports/libpqxx/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libpqxx -Version: 7.3.1 -Port-Version: 1 -Homepage: https://github.com/jtv/libpqxx -Description: The official C++ client API for PostgreSQL -Build-Depends: libpq[core] diff --git a/ports/libpqxx/fix-build-with-vs2017.patch b/ports/libpqxx/fix-build-with-vs2017.patch deleted file mode 100644 index 2a35197520dd65..00000000000000 --- a/ports/libpqxx/fix-build-with-vs2017.patch +++ /dev/null @@ -1,275 +0,0 @@ -diff --git a/include/pqxx/binarystring.hxx b/include/pqxx/binarystring.hxx -index 780cd6e..50865d3 100644 ---- a/include/pqxx/binarystring.hxx -+++ b/include/pqxx/binarystring.hxx -@@ -65,31 +65,31 @@ public: - using const_iterator = const_pointer; - using const_reverse_iterator = std::reverse_iterator; - -- [[deprecated("Use std::byte for binary data.")]] binarystring( -- binarystring const &) = default; -+ PQXX_DEPRECATED("Use std::byte for binary data.") -+ binarystring(binarystring const &) = default; - - /// Read and unescape bytea field. - /** The field will be zero-terminated, even if the original bytea field - * isn't. - * @param F the field to read; must be a bytea field - */ -- [[deprecated("Use std::byte for binary data.")]] explicit binarystring( -- field const &); -+ PQXX_DEPRECATED("Use std::byte for binary data.") -+ explicit binarystring(field const &); - - /// Copy binary data from std::string_view on binary data. - /** This is inefficient in that it copies the data to a buffer allocated on - * the heap. - */ -- [[deprecated("Use std::byte for binary data.")]] explicit binarystring( -- std::string_view); -+ PQXX_DEPRECATED("Use std::byte for binary data.") -+ explicit binarystring(std::string_view); - - /// Copy binary data of given length straight out of memory. -- [[deprecated("Use std::byte for binary data.")]] binarystring( -- void const *, std::size_t); -+ PQXX_DEPRECATED("Use std::byte for binary data.") -+ binarystring(void const *, std::size_t); - - /// Efficiently wrap a buffer of binary data in a @c binarystring. -- [[deprecated("Use std::byte for binary data.")]] binarystring( -- std::shared_ptr ptr, size_type size) : -+ PQXX_DEPRECATED("Use std::byte for binary data.") -+ binarystring(std::shared_ptr ptr, size_type size) : - m_buf{std::move(ptr)}, m_size{size} - {} - -diff --git a/include/pqxx/compiler-public.hxx b/include/pqxx/compiler-public.hxx -index 08d7ac9..8f01755 100644 ---- a/include/pqxx/compiler-public.hxx -+++ b/include/pqxx/compiler-public.hxx -@@ -43,6 +43,11 @@ - // Workarounds for Microsoft Visual C++ - # ifdef _MSC_VER - -+// Workarounds for deprecated attribute syntax error in Visual Studio 2017. -+# if _MSC_VER < 1920 -+# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated(# MESSAGE)) -+# endif -+ - // Suppress vtables on abstract classes. - # define PQXX_NOVTABLE __declspec(novtable) - -@@ -112,4 +117,8 @@ - # define PQXX_NOVTABLE - #endif - -+#ifndef PQXX_DEPRECATED -+# define PQXX_DEPRECATED(MESSAGE) [[deprecated(# MESSAGE)]] -+#endif -+ - #endif -diff --git a/include/pqxx/largeobject.hxx b/include/pqxx/largeobject.hxx -index 072a490..40ab51b 100644 ---- a/include/pqxx/largeobject.hxx -+++ b/include/pqxx/largeobject.hxx -@@ -36,20 +36,20 @@ public: - - /// Refer to a nonexistent large object (similar to what a null pointer - /// does). -- [[deprecated("Use blob instead.")]] largeobject() noexcept = default; -+ PQXX_DEPRECATED("Use blob instead.") largeobject() noexcept = default; - - /// Create new large object. - /** @param t Backend transaction in which the object is to be created. - */ -- [[deprecated("Use blob instead.")]] explicit largeobject(dbtransaction &t); -+ PQXX_DEPRECATED("Use blob instead.") explicit largeobject(dbtransaction &t); - - /// Wrap object with given oid. - /** Convert combination of a transaction and object identifier into a - * large object identity. Does not affect the database. - * @param o Object identifier for the given object. - */ -- [[deprecated("Use blob instead.")]] explicit largeobject(oid o) noexcept : -- m_id{o} -+ PQXX_DEPRECATED("Use blob instead.") -+ explicit largeobject(oid o) noexcept : m_id{o} - {} - - /// Import large object from a local file. -@@ -57,16 +57,16 @@ public: - * @param t Backend transaction in which the large object is to be created. - * @param file A filename on the client program's filesystem. - */ -- [[deprecated("Use blob instead.")]] largeobject( -- dbtransaction &t, std::string_view file); -+ PQXX_DEPRECATED("Use blob instead.") -+ largeobject(dbtransaction &t, std::string_view file); - - /// Take identity of an opened large object. - /** Copy identity of already opened large object. Note that this may be done - * as an implicit conversion. - * @param o Already opened large object to copy identity from. - */ -- [[deprecated("Use blob instead.")]] largeobject( -- largeobjectaccess const &o) noexcept; -+ PQXX_DEPRECATED("Use blob instead.") -+ largeobject(largeobjectaccess const &o) noexcept; - - /// Object identifier. - /** The number returned by this function identifies the large object in the -@@ -179,8 +179,8 @@ public: - * @param mode Access mode, defaults to ios_base::in | ios_base::out | - * ios_base::binary. - */ -- [[deprecated("Use blob instead.")]] explicit largeobjectaccess( -- dbtransaction &t, openmode mode = default_mode); -+ PQXX_DEPRECATED("Use blob instead.") -+ explicit largeobjectaccess(dbtransaction &t, openmode mode = default_mode); - - /// Open large object with given oid. - /** Convert combination of a transaction and object identifier into a -@@ -190,8 +190,8 @@ public: - * @param mode Access mode, defaults to ios_base::in | ios_base::out | - * ios_base::binary. - */ -- [[deprecated("Use blob instead.")]] largeobjectaccess( -- dbtransaction &t, oid o, openmode mode = default_mode); -+ PQXX_DEPRECATED("Use blob instead.") -+ largeobjectaccess(dbtransaction &t, oid o, openmode mode = default_mode); - - /// Open given large object. - /** Open a large object with the given identity for reading and/or writing. -@@ -200,7 +200,8 @@ public: - * @param mode Access mode, defaults to ios_base::in | ios_base::out | - * ios_base::binary. - */ -- [[deprecated("Use blob instead.")]] largeobjectaccess( -+ PQXX_DEPRECATED("Use blob instead.") -+ largeobjectaccess( - dbtransaction &t, largeobject o, openmode mode = default_mode); - - /// Import large object from a local file and open it. -@@ -209,7 +210,8 @@ public: - * @param file A filename on the client program's filesystem. - * @param mode Access mode, defaults to ios_base::in | ios_base::out. - */ -- [[deprecated("Use blob instead.")]] largeobjectaccess( -+ PQXX_DEPRECATED("Use blob instead.") -+ largeobjectaccess( - dbtransaction &t, std::string_view file, openmode mode = default_mode); - - ~largeobjectaccess() noexcept { close(); } -@@ -386,7 +388,8 @@ public: - static constexpr auto default_mode{ - std::ios::in | std::ios::out | std::ios::binary}; - -- [[deprecated("Use blob instead.")]] largeobject_streambuf( -+ PQXX_DEPRECATED("Use blob instead.") -+ largeobject_streambuf( - dbtransaction &t, largeobject o, openmode mode = default_mode, - size_type buf_size = 512) : - m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr} -@@ -394,7 +397,8 @@ public: - initialize(mode); - } - -- [[deprecated("Use blob instead.")]] largeobject_streambuf( -+ PQXX_DEPRECATED("Use blob instead.") -+ largeobject_streambuf( - dbtransaction &t, oid o, openmode mode = default_mode, - size_type buf_size = 512) : - m_bufsize{buf_size}, m_obj{t, o, mode}, m_g{nullptr}, m_p{nullptr} -@@ -556,7 +560,8 @@ public: - * @param o Large object to access. - * @param buf_size Size of buffer to use internally (optional). - */ -- [[deprecated("Use blob instead.")]] basic_ilostream( -+ PQXX_DEPRECATED("Use blob instead.") -+ basic_ilostream( - dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) : - super{nullptr}, - m_buf{t, o, std::ios::in | std::ios::binary, buf_size} -@@ -570,7 +575,8 @@ public: - * @param o Identifier of a large object to access. - * @param buf_size Size of buffer to use internally (optional). - */ -- [[deprecated("Use blob instead.")]] basic_ilostream( -+ PQXX_DEPRECATED("Use blob instead.") -+ basic_ilostream( - dbtransaction &t, oid o, largeobject::size_type buf_size = 512) : - super{nullptr}, - m_buf{t, o, std::ios::in | std::ios::binary, buf_size} -@@ -612,7 +618,8 @@ public: - * @param o a large object to access. - * @param buf_size size of buffer to use internally (optional). - */ -- [[deprecated("Use blob instead.")]] basic_olostream( -+ PQXX_DEPRECATED("Use blob instead.") -+ basic_olostream( - dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) : - super{nullptr}, - m_buf{t, o, std::ios::out | std::ios::binary, buf_size} -@@ -626,7 +633,8 @@ public: - * @param o a large object to access. - * @param buf_size size of buffer to use internally (optional). - */ -- [[deprecated("Use blob instead.")]] basic_olostream( -+ PQXX_DEPRECATED("Use blob instead.") -+ basic_olostream( - dbtransaction &t, oid o, largeobject::size_type buf_size = 512) : - super{nullptr}, - m_buf{t, o, std::ios::out | std::ios::binary, buf_size} -@@ -682,7 +690,8 @@ public: - * @param o Large object to access. - * @param buf_size Size of buffer to use internally (optional). - */ -- [[deprecated("Use blob instead.")]] basic_lostream( -+ PQXX_DEPRECATED("Use blob instead.") -+ basic_lostream( - dbtransaction &t, largeobject o, largeobject::size_type buf_size = 512) : - super{nullptr}, - m_buf{ -@@ -697,7 +706,8 @@ public: - * @param o Large object to access. - * @param buf_size Size of buffer to use internally (optional). - */ -- [[deprecated("Use blob instead.")]] basic_lostream( -+ PQXX_DEPRECATED("Use blob instead.") -+ basic_lostream( - dbtransaction &t, oid o, largeobject::size_type buf_size = 512) : - super{nullptr}, - m_buf{ -diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx -index 7d05966..2e484bb 100644 ---- a/include/pqxx/stream_from.hxx -+++ b/include/pqxx/stream_from.hxx -@@ -128,21 +128,23 @@ public: - Columns const &columns); - - /// @deprecated Use the @c from_table_t overload instead. -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -- transaction_base &tx, std::string_view table) : -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") -+ stream_from(transaction_base &tx, std::string_view table) : - stream_from{tx, from_table, table} - {} - - /// @deprecated Use the @c from_table_t overload instead. - template -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") -+ stream_from( - transaction_base &tx, std::string_view table, Columns const &columns) : - stream_from{tx, from_table, table, columns} - {} - - /// @deprecated Use the @c from_table_t overload instead. - template -- [[deprecated("Use the from_table_t overload instead.")]] stream_from( -+ PQXX_DEPRECATED("Use the from_table_t overload instead.") -+ stream_from( - transaction_base &, std::string_view table, Iter columns_begin, - Iter columns_end); - //@} diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index 9d078c191bbfbc..e2610bb8821f5e 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jtv/libpqxx - REF 9e55cea0116febb5c536ed18ede9a7b2c647e631 # 7.3.1 - SHA512 22da46c1c4ef798e7aa2db4f5094f8d4c3a965d755ae72a1cfae6282264c0d974317849f8db0bf34ff6aebd1ede5e5086cf74bff8bc3c6a21b3149a94d30c04f + REF 221ddc8be329bafb376a3d83b9cd257fd52fc7b7 # 7.6.0 + SHA512 32a673bbae2f26fbc41bdcba007d9a5ded29680cb49ba434d1913cd5007bc1c1443bf38c88d9c5a6abe0a3ee519c0f691464c8d2b144cd3f16652447d644e400 HEAD_REF master - PATCHES - fix-build-with-vs2017.patch #https://github.com/jtv/libpqxx/pull/406 + #PATCHES + # fix-build-with-vs2017.patch #https://github.com/jtv/libpqxx/pull/406 ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in DESTINATION ${SOURCE_PATH}) diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json new file mode 100644 index 00000000000000..7ba550d5037f5c --- /dev/null +++ b/ports/libpqxx/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libpqxx", + "version-semver": "7.6.0", + "description": "The official C++ client API for PostgreSQL", + "homepage": "https://www.postgresql.org/", + "dependencies": [ + "libpq" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b9977c279d0eeb..7d63b0a5fc2d6f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3521,8 +3521,8 @@ "port-version": 18 }, "libpqxx": { - "baseline": "7.3.1", - "port-version": 1 + "baseline": "7.6.0", + "port-version": 0 }, "libprotobuf-mutator": { "baseline": "1.0", diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index 38376e0dc3aeb5..e58233f97c4517 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbbc587d55d5d1ee059e417b045dfc82ca4897c2", + "version-semver": "7.6.0", + "port-version": 0 + }, { "git-tree": "ac2255ecfdb7a6d5b6307413f181117d005a4989", "version-string": "7.3.1", From 2205ae6c3e373185a9751596ab793f4d3471c39b Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 10 Aug 2021 01:00:44 -0700 Subject: [PATCH 0289/1858] [pybind11] Update to 2.7.1 (#19375) * update to 2.7.1 * use `semver` version field * fixup deprecated commands * apply cmake guidelines for quoting arguments * set `Python_EXECUTABLE` instead pybind11 uses the `FindPython` module instead of `FindPython3` * update baseline * skip passing python executable on command line * update baseline * remove extraneous quotes * remove unused function call * update baseline --- ports/pybind11/portfile.cmake | 20 ++++++++------------ ports/pybind11/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/p-/pybind11.json | 5 +++++ 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 3d2e133986b539..14e4d5a9a60804 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -1,30 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF 8de7772cc72daca8e947b79b83fea46214931604 # v2.6.2 - SHA512 9bb688209791bd5f294fa316ab9a8007f559673a733b796e76e223fe8653d048d3f01eb045b78aa1843f7eacf97f6e2ee090ac68fed2b43856eb0c4813583204 + REF v2.7.1 + SHA512 f09f46622b394d3990ab82aa7ea15a06e298df109cd2df263ba9d6ac7fb248217df7450e1954a9679a8360335d5bbf662926a34c8b7c61b6e4c396bbdfd88305 HEAD_REF master ) -vcpkg_find_acquire_program(PYTHON3) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPYBIND11_TEST=OFF -DPYBIND11_FINDPYTHON=ON - -DPython3_EXECUTABLE=${PYTHON3} OPTIONS_RELEASE -DPYTHON_IS_DEBUG=OFF OPTIONS_DEBUG -DPYTHON_IS_DEBUG=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/pybind11) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/pybind11") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/") # copy license -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index a760e31e801c64..cf79d75138670e 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,9 +1,17 @@ { "name": "pybind11", - "version": "2.6.2", + "version-semver": "2.7.1", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "dependencies": [ - "python3" + "python3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7d63b0a5fc2d6f..dbb585b8aacff2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5121,7 +5121,7 @@ "port-version": 0 }, "pybind11": { - "baseline": "2.6.2", + "baseline": "2.7.1", "port-version": 0 }, "pystring": { diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index b3c3b90b2ec37f..2a54f4b5a54139 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8d7e31e74a9d73e4956e70efbcc0c3490968883", + "version-semver": "2.7.1", + "port-version": 0 + }, { "git-tree": "e24d24b2afa6506e1dbea1bb922be82d0f4ffafb", "version": "2.6.2", From dbf7f04c16e54c04fcc31ae4ba3e8d71c45a4e97 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 10 Aug 2021 16:03:05 +0800 Subject: [PATCH 0290/1858] [simdjson] Update to 0.9.7 (#19370) * [simdjson] Update to 0.9.7 * [simdjson] Bump version --- ports/simdjson/portfile.cmake | 4 ++-- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index ffc1ba2fd528a2..eb7f85c902dbcb 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF e9b893ff1b13c6a70135827c62b3f3d65938d135 # v0.9.6 + REF 33d926bd4448e2e087511f34e49461230691a503 # v0.9.7 HEAD_REF master - SHA512 977b92ffae7219680f3d8567b1911b0d17ac1143a2ba58d7a4007cdcbf42dca6362853fcf3c3caf4af2029bc5f6a3cb8fab6139050a9d8539e8e4c7df646837d + SHA512 1c492ed4c19019abbe6743c8ad60f0a03f9171f5ece6a3b2ec6429eec610d3b0750eceba81cda11791fe6fd34881af1810ee18f1ba486f9147e188c955546cad ) vcpkg_check_features( diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 13f89c1a7c590e..3f77cc510e39c4 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version": "0.9.6", + "version": "0.9.7", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index dbb585b8aacff2..6c05a7f410ac2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5873,7 +5873,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "0.9.6", + "baseline": "0.9.7", "port-version": 0 }, "simple-fft": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 8570d578b415bf..e3fb5db0a39b33 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f3cbe33b4ec739d22f7549f1b73846067f78d84", + "version": "0.9.7", + "port-version": 0 + }, { "git-tree": "b913c5ecbf889a46c809032952c348605a78a391", "version": "0.9.6", From 186aff83d88c5c043746e2d5602206979d952be9 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 10 Aug 2021 10:05:55 +0200 Subject: [PATCH 0291/1858] [ace] Upgrade to 7.0.3 (#19354) * Make sure C++11 is enabled on macosx * ports/ace/portfile.cmake: * [ace] Upgrade to 7.0.3 * No need to force C++11 anymore for MacOSX * ports/ace/portfile.cmake: * Add ACE 7.0.3 version --- ports/ace/CONTROL | 2 +- ports/ace/portfile.cmake | 10 +++++----- versions/a-/ace.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL index c465a2914930cb..a1d97bc527bbae 100644 --- a/ports/ace/CONTROL +++ b/ports/ace/CONTROL @@ -1,5 +1,5 @@ Source: ace -Version: 7.0.2 +Version: 7.0.3 Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html Description: The ADAPTIVE Communication Environment Port-Version: 0 diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 743a8498aa0716..239cc279aab484 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,7 +1,7 @@ # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -set(ACE_VERSION 7.0.2) +set(ACE_VERSION 7.0.3) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) @@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" FILENAME ACE-TAO-${ACE_VERSION}.zip - SHA512 dd10db547e76716d8021e9f0faf9467cc86a9990eb03c60988979eb4a54c3b617a500c6afc53ea16a4b63ada903eaaf98df7456c8fd96b6adadfe459eaea86b9 + SHA512 714d2c25bd4be44a03d350b2457b613b5d2d079fc294f287d10968ed02af5c9c82a2a0c10937acf46a4babfd4582cdc5fa23d6080dadd5cbc4f7f694037033f9 ) else() # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" FILENAME ACE-TAO-${ACE_VERSION}.tar.gz - SHA512 43d7e37ef26169f4ad1a9a6a7f5e0aabd03019f44386dad54cda0f2d61ca52cb34e5da3e62a4b9d06a30caec43732a2043b07f9de59f796b8d552b36c40fcff9 + SHA512 e48df1c63bfd02f3a14d049efbcb9a2f476597deaa2b9259d4d852ddfea2319af14e6a1071139b091bff856619e11c650771bfe92c3220d198ec6e931cdd35de ) endif() else() @@ -26,14 +26,14 @@ else() vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" FILENAME ACE-src-${ACE_VERSION}.zip - SHA512 4cde539074587c26c317581dbeaa0d057bf0d641db27dee84bb262af4859744158d91dc072b70c351e7be59c70345ea138511cbb3297ff090f7b9c71f5166610 + SHA512 3232ea5437b5fa4a36f4b9d5586c1435a5e2f2dcb34770919a1d1dfe6ebe12e33b316f3c0a1275cdc40c12135800f8cb000ac12b4775f9c31d3ddc48b41bd375 ) else(VCPKG_TARGET_IS_WINDOWS) # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" FILENAME ACE-src-${ACE_VERSION}.tar.gz - SHA512 8b2b1988a7cdda4a0ff5064def3cd750bf4fbcad074efbb41eedfa2f5e970874568610de2f8495679f1eeb2f7403be91e10392ca9aa6016d1cf8c051e595d6cb + SHA512 019ec5c9f23c103d659ec57f6c7bfda3d6d12fc4ca77373353d6232c5fa24c03ffba222af45bd4afe997f02a81f834546cfbcb0e667000857b6e12f2ca3effaa ) endif() endif() diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 5d0d36227c66fe..44ad58124e6795 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "321d63a1abf3c6c213c8870bb658ee842a70ede7", + "version-string": "7.0.3", + "port-version": 0 + }, { "git-tree": "f29d3acc8eb434569566d4300239ab584b32a3c5", "version-string": "7.0.2", diff --git a/versions/baseline.json b/versions/baseline.json index 6c05a7f410ac2a..f4b9cb33acbb45 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -17,7 +17,7 @@ "port-version": 0 }, "ace": { - "baseline": "7.0.2", + "baseline": "7.0.3", "port-version": 0 }, "activemq-cpp": { From 51a4174faf0a71800ed899d5e1cdb48669181053 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 10 Aug 2021 10:11:41 +0200 Subject: [PATCH 0292/1858] [yaml-cpp] update to 0.7.0 (#19272) * [yaml-cpp] update to 0.7.0 * [opencolorio] update to 2.0.1 * [openimageio] Update to 2.2.17.0 * [pystring] move header to pystring subfolder * add version files --- .../0001-lcms-dependency-search.patch | 40 ------ .../0002-msvc-cpluscplus.patch | 84 ------------ .../0003-osx-self-assign-field.patch | 13 -- .../0004-yaml-dependency-search.patch | 108 ---------------- .../0005-tinyxml-dependency-search.patch | 18 --- .../0006-oiio-dependency-search.patch | 14 -- ports/opencolorio-tools/CONTROL | 5 - ports/opencolorio-tools/portfile.cmake | 68 ---------- .../0001-lcms-dependency-search.patch | 40 ------ ports/opencolorio/0002-msvc-cpluscplus.patch | 84 ------------ .../0003-osx-self-assign-field.patch | 13 -- .../0004-yaml-dependency-search.patch | 108 ---------------- .../0005-tinyxml-dependency-search.patch | 18 --- .../0006-oiio-dependency-search.patch | 14 -- ports/opencolorio/fix-pystring-name.patch | 13 ++ ports/opencolorio/portfile.cmake | 71 ++++------ ports/opencolorio/use-find-openxer.patch | 13 ++ ports/opencolorio/vcpkg.json | 36 +++--- ports/openimageio/fix-dependency.patch | 122 ------------------ ports/openimageio/portfile.cmake | 11 +- ports/openimageio/vcpkg.json | 3 +- ports/pystring/CMakeLists.txt | 2 +- ports/pystring/CONTROL | 4 - ports/pystring/vcpkg.json | 7 + ports/yaml-cpp/CONTROL | 5 - ports/yaml-cpp/fix-include-path.patch | 13 -- ports/yaml-cpp/portfile.cmake | 30 ++--- ports/yaml-cpp/vcpkg.json | 17 +++ versions/baseline.json | 16 +-- versions/o-/opencolorio.json | 5 + versions/o-/openimageio.json | 5 + versions/p-/pystring.json | 5 + versions/y-/yaml-cpp.json | 5 + 33 files changed, 137 insertions(+), 873 deletions(-) delete mode 100644 ports/opencolorio-tools/0001-lcms-dependency-search.patch delete mode 100644 ports/opencolorio-tools/0002-msvc-cpluscplus.patch delete mode 100644 ports/opencolorio-tools/0003-osx-self-assign-field.patch delete mode 100644 ports/opencolorio-tools/0004-yaml-dependency-search.patch delete mode 100644 ports/opencolorio-tools/0005-tinyxml-dependency-search.patch delete mode 100644 ports/opencolorio-tools/0006-oiio-dependency-search.patch delete mode 100644 ports/opencolorio-tools/CONTROL delete mode 100644 ports/opencolorio-tools/portfile.cmake delete mode 100644 ports/opencolorio/0001-lcms-dependency-search.patch delete mode 100644 ports/opencolorio/0002-msvc-cpluscplus.patch delete mode 100644 ports/opencolorio/0003-osx-self-assign-field.patch delete mode 100644 ports/opencolorio/0004-yaml-dependency-search.patch delete mode 100644 ports/opencolorio/0005-tinyxml-dependency-search.patch delete mode 100644 ports/opencolorio/0006-oiio-dependency-search.patch create mode 100644 ports/opencolorio/fix-pystring-name.patch create mode 100644 ports/opencolorio/use-find-openxer.patch delete mode 100644 ports/openimageio/fix-dependency.patch delete mode 100644 ports/pystring/CONTROL create mode 100644 ports/pystring/vcpkg.json delete mode 100644 ports/yaml-cpp/CONTROL delete mode 100644 ports/yaml-cpp/fix-include-path.patch create mode 100644 ports/yaml-cpp/vcpkg.json diff --git a/ports/opencolorio-tools/0001-lcms-dependency-search.patch b/ports/opencolorio-tools/0001-lcms-dependency-search.patch deleted file mode 100644 index 353a8061501cbb..00000000000000 --- a/ports/opencolorio-tools/0001-lcms-dependency-search.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/apps/ociobakelut/CMakeLists.txt b/src/apps/ociobakelut/CMakeLists.txt -index d31b4e3..2b57d1c 100644 ---- a/src/apps/ociobakelut/CMakeLists.txt -+++ b/src/apps/ociobakelut/CMakeLists.txt -@@ -5,6 +5,35 @@ if(LCMS_FOUND AND (LCMS_VERSION VERSION_EQUAL 2.1 OR LCMS_VERSION VERSION_GREATE - FIND_PACKAGE_MESSAGE(LCMS "Found lcms: ${LCMS_LIBRARIES}" - "${LCMS_INCLUDE_DIR}") - else() -+ find_path(LCMS_INCLUDE_DIRS -+ NAMES -+ lcms2.h -+ lcms2_plugin.h -+ HINTS -+ ${LCMS_INCLUDEDIR} -+ ${LCMS_INCLUDE_DIRS} -+ ) -+ -+ find_library(LCMS_LIBRARIES -+ LIBRARY_NAMES -+ lcms -+ lcms2 -+ HINTS -+ ${LCMS_LIBRARY_DIRS} -+ ) -+ -+ get_filename_component(LCMS_LIBRARY_DIRS ${LCMS_LIBRARIES} DIRECTORY) -+ -+ find_package_handle_standard_args(LCMS -+ REQUIRED_VARS -+ LCMS_LIBRARIES -+ LCMS_LIBRARY_DIRS -+ LCMS_INCLUDE_DIRS -+ ) -+ mark_as_advanced(LCMS_LIBRARIES LCMS_INCLUDE_DIRS LCMS_LIBRARY_DIRS LCMS_FOUND) -+endif() -+ -+if(NOT LCMS_FOUND) - find_package(Git) - if(NOT GIT_EXECUTABLE) - message("Git not found, could not build external LCMS as we cannot apply patch") diff --git a/ports/opencolorio-tools/0002-msvc-cpluscplus.patch b/ports/opencolorio-tools/0002-msvc-cpluscplus.patch deleted file mode 100644 index c4349ea1276bb8..00000000000000 --- a/ports/opencolorio-tools/0002-msvc-cpluscplus.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt -index 82b0792..7d16bdf 100644 ---- a/src/apps/ocioconvert/CMakeLists.txt -+++ b/src/apps/ocioconvert/CMakeLists.txt -@@ -6,16 +6,23 @@ if (OIIO_FOUND) - ${OIIO_INCLUDES} - ${ILMBASE_INCLUDES} - ) -- -+ - file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp") -- -+ - add_executable(ocioconvert ${share_src_files} main.cpp) -- -+ -+ target_compile_options(ocioconvert -+ PRIVATE -+ $<$: -+ /Zc:__cplusplus # Enable updated __cplusplus macro -+ > -+ ) -+ - set_target_properties(ocioconvert PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) - - target_link_libraries(ocioconvert ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS}) -- -+ - target_link_OCIO(ocioconvert) -- -+ - install(TARGETS ocioconvert EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin) - endif() -diff --git a/src/apps/ociodisplay/CMakeLists.txt b/src/apps/ociodisplay/CMakeLists.txt -index d11b9e1..0f27d86 100644 ---- a/src/apps/ociodisplay/CMakeLists.txt -+++ b/src/apps/ociodisplay/CMakeLists.txt -@@ -11,6 +11,13 @@ if (OIIO_FOUND) - - add_executable(ociodisplay main.cpp) - -+ target_compile_options(ociodisplay -+ PRIVATE -+ $<$: -+ /Zc:__cplusplus # Enable updated __cplusplus macro -+ > -+ ) -+ - # set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} ) - set_target_properties(ociodisplay PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) - target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES}) -diff --git a/src/apps/ociolutimage/CMakeLists.txt b/src/apps/ociolutimage/CMakeLists.txt -index 528333f..821155d 100644 ---- a/src/apps/ociolutimage/CMakeLists.txt -+++ b/src/apps/ociolutimage/CMakeLists.txt -@@ -6,16 +6,23 @@ if (OIIO_FOUND) - ${OIIO_INCLUDES} - ${ILMBASE_INCLUDES} - ) -- -+ - file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp") -- -+ - add_executable(ociolutimage ${share_src_files} main.cpp) -- -+ -+ target_compile_options(ociolutimage -+ PRIVATE -+ $<$: -+ /Zc:__cplusplus # Enable updated __cplusplus macro -+ > -+ ) -+ - set_target_properties(ociolutimage PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) - - target_link_libraries(ociolutimage ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS}) -- -+ - target_link_OCIO(ociolutimage) -- -+ - install(TARGETS ociolutimage EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin) - endif() diff --git a/ports/opencolorio-tools/0003-osx-self-assign-field.patch b/ports/opencolorio-tools/0003-osx-self-assign-field.patch deleted file mode 100644 index 18947bbbdeed1e..00000000000000 --- a/ports/opencolorio-tools/0003-osx-self-assign-field.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/Config.cpp b/src/core/Config.cpp -index f5cb379..5ea178e 100644 ---- a/src/core/Config.cpp -+++ b/src/core/Config.cpp -@@ -330,7 +330,7 @@ OCIO_NAMESPACE_ENTER - sanitytext_ = rhs.sanitytext_; - - cacheids_ = rhs.cacheids_; -- cacheidnocontext_ = cacheidnocontext_; -+ cacheidnocontext_ = rhs.cacheidnocontext_; - } - return *this; - } diff --git a/ports/opencolorio-tools/0004-yaml-dependency-search.patch b/ports/opencolorio-tools/0004-yaml-dependency-search.patch deleted file mode 100644 index 30c01d41a83239..00000000000000 --- a/ports/opencolorio-tools/0004-yaml-dependency-search.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4f3119..5cfa601 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,34 +244,49 @@ else(USE_EXTERNAL_TINYXML) - endif() - set_target_properties(TINYXML_LIB PROPERTIES FOLDER External) - endif(USE_EXTERNAL_TINYXML) -- -+ - ############################################################################### - ### YAML ### - - if(USE_EXTERNAL_YAML) -- # Set minimum yaml version for non-patched sources. -- set(YAML_VERSION_MIN "0.3.0") -- include(FindPkgConfig) -- pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp) -- find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h -- HINTS ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} ) -- find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp -- HINTS ${PC_YAML_CPP_LIBRARY_DIRS} ) -- set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY}) -- set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) -- set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION}) -- -- if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN}) -- message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.") -- endif() -+ find_package(yaml-cpp 0.3.0) -+ if(yaml-cpp_FOUND) -+ include(FindPackageMessage) -+ -+ set(YAML_CPP_FOUND ${yaml-cpp_FOUND}) -+ set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) -+ set(YAML_CPP_VERSION ${yaml-cpp_VERSION}) -+ set(YAML_CPP_LIBRARIES yaml-cpp) -+ -+ find_package_message(yaml-cpp -+ "Found yaml ${YAML_CPP_VERSION}: ${YAML_CPP_INCLUDE_DIRS}" -+ "${YAML_CPP_INCLUDE_DIRS}:${YAML_CPP_LIBRARIES}" -+ ) -+ else() -+ # Set minimum yaml version for non-patched sources. -+ set(YAML_VERSION_MIN "0.3.0") -+ include(FindPkgConfig) -+ pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp) -+ find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h -+ HINTS ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} ) -+ find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp -+ HINTS ${PC_YAML_CPP_LIBRARY_DIRS} ) -+ set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY}) -+ set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) -+ set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION}) -+ -+ if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN}) -+ message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.") -+ endif() - -- find_package_handle_standard_args(yaml-cpp -- REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS ) -- set(YAML_CPP_FOUND ${YAML-CPP_FOUND}) -- mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) -+ find_package_handle_standard_args(yaml-cpp -+ REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS ) -+ set(YAML_CPP_FOUND ${YAML-CPP_FOUND}) -+ mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) -+ endif() - - if(YAML_CPP_FOUND) -- if(YAML_CPP_VERSION VERSION_GREATER "0.5.0") -+ if(YAML_CPP_VERSION VERSION_GREATER "0.5.0" AND YAML_CPP_VERSION VERSION_LESS "0.6.0") - # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them. - # Don't bother doing this step if we are already including the boost headers for shared_ptr - if(NOT OCIO_USE_BOOST_PTR) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 4b931ef..12a1dbf 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -77,7 +77,14 @@ endif() - if(OCIO_BUILD_STATIC) - list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp) - add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files}) -- add_dependencies(OpenColorIO_STATIC TINYXML_LIB YAML_CPP_LIB) -+ add_dependencies(OpenColorIO_STATIC TINYXML_LIB) -+ -+ if(USE_EXTERNAL_YAML) -+ target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES}) -+ else(USE_EXTERNAL_YAML) -+ add_dependencies(OpenColorIO_STATIC YAML_CPP_LIB) -+ endif() -+ - if(EXTERNAL_LIBRARIES) - target_link_libraries(OpenColorIO_STATIC ${EXTERNAL_LIBRARIES}) - endif() -diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp -index aeee4d1..f1c662d 100644 ---- a/src/core/OCIOYaml.cpp -+++ b/src/core/OCIOYaml.cpp -@@ -69,7 +69,7 @@ namespace YAML { - - #ifdef WIN32 - #pragma warning( push ) --#pragma warning( disable: 4146 ) -+#pragma warning( disable: 4146 4251 ) - #endif - - #include diff --git a/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch b/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch deleted file mode 100644 index 319f88b733fdf0..00000000000000 --- a/ports/opencolorio-tools/0005-tinyxml-dependency-search.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 45e55f9..f4b687d 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -77,7 +77,12 @@ endif() - if(OCIO_BUILD_STATIC) - list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp) - add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files}) -- add_dependencies(OpenColorIO_STATIC TINYXML_LIB) -+ -+ if(USE_EXTERNAL_TINYXML) -+ target_link_libraries(OpenColorIO_STATIC ${TINYXML_LIBRARIES}) -+ else(USE_EXTERNAL_TINYXML) -+ add_dependencies(OpenColorIO_STATIC TINYXML_LIB) -+ endif(USE_EXTERNAL_TINYXML) - - if(USE_EXTERNAL_YAML) - target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES}) diff --git a/ports/opencolorio-tools/0006-oiio-dependency-search.patch b/ports/opencolorio-tools/0006-oiio-dependency-search.patch deleted file mode 100644 index 09624e55c70740..00000000000000 --- a/ports/opencolorio-tools/0006-oiio-dependency-search.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cfa601..f79807c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -475,7 +475,8 @@ endif() - if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) ) - - # Try to find OpenImageIO (OIIO) and OpenGL stuff -- OCIOFindOpenImageIO() -+ find_package(OpenImageIO CONFIG REQUIRED) -+ set(OIIO_LIBRARIES OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util) - - if(OIIO_FOUND) - add_subdirectory(src/apps/ocioconvert) diff --git a/ports/opencolorio-tools/CONTROL b/ports/opencolorio-tools/CONTROL deleted file mode 100644 index 679933a250eb60..00000000000000 --- a/ports/opencolorio-tools/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: opencolorio-tools -Version: 1.1.1 -Homepage: https://opencolorio.org/ -Description: OpenColorIO applications, same source with port OpenColorIO. -Build-Depends: openimageio[opencolorio] diff --git a/ports/opencolorio-tools/portfile.cmake b/ports/opencolorio-tools/portfile.cmake deleted file mode 100644 index f08786a325c3d0..00000000000000 --- a/ports/opencolorio-tools/portfile.cmake +++ /dev/null @@ -1,68 +0,0 @@ -# Note: Should be maintained simultaneously with opencolorio! -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(_BUILD_SHARED OFF) - set(_BUILD_STATIC ON) -else() - set(_BUILD_SHARED ON) - set(_BUILD_STATIC OFF) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO imageworks/OpenColorIO - REF v1.1.1 - SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33 - HEAD_REF master - PATCHES - 0001-lcms-dependency-search.patch - 0002-msvc-cpluscplus.patch - 0003-osx-self-assign-field.patch - 0004-yaml-dependency-search.patch - 0005-tinyxml-dependency-search.patch - 0006-oiio-dependency-search.patch -) - -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path(PREPEND ${PYTHON3_PATH}) - -# TODO(theblackunknown) build additional targets based on feature - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DOCIO_BUILD_APPS=ON - -DOCIO_BUILD_SHARED:BOOL=${_BUILD_SHARED} - -DOCIO_BUILD_STATIC:BOOL=${_BUILD_STATIC} - -DOCIO_BUILD_TRUELIGHT:BOOL=OFF - -DOCIO_BUILD_NUKE:BOOL=OFF - -DOCIO_BUILD_DOCS:BOOL=OFF - -DOCIO_BUILD_TESTS:BOOL=OFF - -DOCIO_BUILD_PYGLUE:BOOL=OFF - -DOCIO_BUILD_JNIGLUE:BOOL=OFF - -DOCIO_STATIC_JNIGLUE:BOOL=OFF - -DUSE_EXTERNAL_TINYXML:BOOL=ON - -DUSE_EXTERNAL_YAML:BOOL=ON -) - -vcpkg_install_cmake() - -vcpkg_copy_pdbs() - -vcpkg_copy_tools(TOOL_NAMES ociobakelut ociocheck) - -# Clean redundant files -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/include - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/cmake - ${CURRENT_PACKAGES_DIR}/share) - -file(REMOVE ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake) - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/opencolorio/0001-lcms-dependency-search.patch b/ports/opencolorio/0001-lcms-dependency-search.patch deleted file mode 100644 index 353a8061501cbb..00000000000000 --- a/ports/opencolorio/0001-lcms-dependency-search.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/apps/ociobakelut/CMakeLists.txt b/src/apps/ociobakelut/CMakeLists.txt -index d31b4e3..2b57d1c 100644 ---- a/src/apps/ociobakelut/CMakeLists.txt -+++ b/src/apps/ociobakelut/CMakeLists.txt -@@ -5,6 +5,35 @@ if(LCMS_FOUND AND (LCMS_VERSION VERSION_EQUAL 2.1 OR LCMS_VERSION VERSION_GREATE - FIND_PACKAGE_MESSAGE(LCMS "Found lcms: ${LCMS_LIBRARIES}" - "${LCMS_INCLUDE_DIR}") - else() -+ find_path(LCMS_INCLUDE_DIRS -+ NAMES -+ lcms2.h -+ lcms2_plugin.h -+ HINTS -+ ${LCMS_INCLUDEDIR} -+ ${LCMS_INCLUDE_DIRS} -+ ) -+ -+ find_library(LCMS_LIBRARIES -+ LIBRARY_NAMES -+ lcms -+ lcms2 -+ HINTS -+ ${LCMS_LIBRARY_DIRS} -+ ) -+ -+ get_filename_component(LCMS_LIBRARY_DIRS ${LCMS_LIBRARIES} DIRECTORY) -+ -+ find_package_handle_standard_args(LCMS -+ REQUIRED_VARS -+ LCMS_LIBRARIES -+ LCMS_LIBRARY_DIRS -+ LCMS_INCLUDE_DIRS -+ ) -+ mark_as_advanced(LCMS_LIBRARIES LCMS_INCLUDE_DIRS LCMS_LIBRARY_DIRS LCMS_FOUND) -+endif() -+ -+if(NOT LCMS_FOUND) - find_package(Git) - if(NOT GIT_EXECUTABLE) - message("Git not found, could not build external LCMS as we cannot apply patch") diff --git a/ports/opencolorio/0002-msvc-cpluscplus.patch b/ports/opencolorio/0002-msvc-cpluscplus.patch deleted file mode 100644 index c4349ea1276bb8..00000000000000 --- a/ports/opencolorio/0002-msvc-cpluscplus.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt -index 82b0792..7d16bdf 100644 ---- a/src/apps/ocioconvert/CMakeLists.txt -+++ b/src/apps/ocioconvert/CMakeLists.txt -@@ -6,16 +6,23 @@ if (OIIO_FOUND) - ${OIIO_INCLUDES} - ${ILMBASE_INCLUDES} - ) -- -+ - file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp") -- -+ - add_executable(ocioconvert ${share_src_files} main.cpp) -- -+ -+ target_compile_options(ocioconvert -+ PRIVATE -+ $<$: -+ /Zc:__cplusplus # Enable updated __cplusplus macro -+ > -+ ) -+ - set_target_properties(ocioconvert PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) - - target_link_libraries(ocioconvert ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS}) -- -+ - target_link_OCIO(ocioconvert) -- -+ - install(TARGETS ocioconvert EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin) - endif() -diff --git a/src/apps/ociodisplay/CMakeLists.txt b/src/apps/ociodisplay/CMakeLists.txt -index d11b9e1..0f27d86 100644 ---- a/src/apps/ociodisplay/CMakeLists.txt -+++ b/src/apps/ociodisplay/CMakeLists.txt -@@ -11,6 +11,13 @@ if (OIIO_FOUND) - - add_executable(ociodisplay main.cpp) - -+ target_compile_options(ociodisplay -+ PRIVATE -+ $<$: -+ /Zc:__cplusplus # Enable updated __cplusplus macro -+ > -+ ) -+ - # set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} ) - set_target_properties(ociodisplay PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) - target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES}) -diff --git a/src/apps/ociolutimage/CMakeLists.txt b/src/apps/ociolutimage/CMakeLists.txt -index 528333f..821155d 100644 ---- a/src/apps/ociolutimage/CMakeLists.txt -+++ b/src/apps/ociolutimage/CMakeLists.txt -@@ -6,16 +6,23 @@ if (OIIO_FOUND) - ${OIIO_INCLUDES} - ${ILMBASE_INCLUDES} - ) -- -+ - file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp") -- -+ - add_executable(ociolutimage ${share_src_files} main.cpp) -- -+ -+ target_compile_options(ociolutimage -+ PRIVATE -+ $<$: -+ /Zc:__cplusplus # Enable updated __cplusplus macro -+ > -+ ) -+ - set_target_properties(ociolutimage PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) - - target_link_libraries(ociolutimage ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS}) -- -+ - target_link_OCIO(ociolutimage) -- -+ - install(TARGETS ociolutimage EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin) - endif() diff --git a/ports/opencolorio/0003-osx-self-assign-field.patch b/ports/opencolorio/0003-osx-self-assign-field.patch deleted file mode 100644 index 18947bbbdeed1e..00000000000000 --- a/ports/opencolorio/0003-osx-self-assign-field.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/core/Config.cpp b/src/core/Config.cpp -index f5cb379..5ea178e 100644 ---- a/src/core/Config.cpp -+++ b/src/core/Config.cpp -@@ -330,7 +330,7 @@ OCIO_NAMESPACE_ENTER - sanitytext_ = rhs.sanitytext_; - - cacheids_ = rhs.cacheids_; -- cacheidnocontext_ = cacheidnocontext_; -+ cacheidnocontext_ = rhs.cacheidnocontext_; - } - return *this; - } diff --git a/ports/opencolorio/0004-yaml-dependency-search.patch b/ports/opencolorio/0004-yaml-dependency-search.patch deleted file mode 100644 index 30c01d41a83239..00000000000000 --- a/ports/opencolorio/0004-yaml-dependency-search.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e4f3119..5cfa601 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,34 +244,49 @@ else(USE_EXTERNAL_TINYXML) - endif() - set_target_properties(TINYXML_LIB PROPERTIES FOLDER External) - endif(USE_EXTERNAL_TINYXML) -- -+ - ############################################################################### - ### YAML ### - - if(USE_EXTERNAL_YAML) -- # Set minimum yaml version for non-patched sources. -- set(YAML_VERSION_MIN "0.3.0") -- include(FindPkgConfig) -- pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp) -- find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h -- HINTS ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} ) -- find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp -- HINTS ${PC_YAML_CPP_LIBRARY_DIRS} ) -- set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY}) -- set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) -- set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION}) -- -- if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN}) -- message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.") -- endif() -+ find_package(yaml-cpp 0.3.0) -+ if(yaml-cpp_FOUND) -+ include(FindPackageMessage) -+ -+ set(YAML_CPP_FOUND ${yaml-cpp_FOUND}) -+ set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) -+ set(YAML_CPP_VERSION ${yaml-cpp_VERSION}) -+ set(YAML_CPP_LIBRARIES yaml-cpp) -+ -+ find_package_message(yaml-cpp -+ "Found yaml ${YAML_CPP_VERSION}: ${YAML_CPP_INCLUDE_DIRS}" -+ "${YAML_CPP_INCLUDE_DIRS}:${YAML_CPP_LIBRARIES}" -+ ) -+ else() -+ # Set minimum yaml version for non-patched sources. -+ set(YAML_VERSION_MIN "0.3.0") -+ include(FindPkgConfig) -+ pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp) -+ find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h -+ HINTS ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} ) -+ find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp -+ HINTS ${PC_YAML_CPP_LIBRARY_DIRS} ) -+ set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY}) -+ set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR}) -+ set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION}) -+ -+ if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN}) -+ message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.") -+ endif() - -- find_package_handle_standard_args(yaml-cpp -- REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS ) -- set(YAML_CPP_FOUND ${YAML-CPP_FOUND}) -- mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) -+ find_package_handle_standard_args(yaml-cpp -+ REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS ) -+ set(YAML_CPP_FOUND ${YAML-CPP_FOUND}) -+ mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND) -+ endif() - - if(YAML_CPP_FOUND) -- if(YAML_CPP_VERSION VERSION_GREATER "0.5.0") -+ if(YAML_CPP_VERSION VERSION_GREATER "0.5.0" AND YAML_CPP_VERSION VERSION_LESS "0.6.0") - # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them. - # Don't bother doing this step if we are already including the boost headers for shared_ptr - if(NOT OCIO_USE_BOOST_PTR) -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 4b931ef..12a1dbf 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -77,7 +77,14 @@ endif() - if(OCIO_BUILD_STATIC) - list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp) - add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files}) -- add_dependencies(OpenColorIO_STATIC TINYXML_LIB YAML_CPP_LIB) -+ add_dependencies(OpenColorIO_STATIC TINYXML_LIB) -+ -+ if(USE_EXTERNAL_YAML) -+ target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES}) -+ else(USE_EXTERNAL_YAML) -+ add_dependencies(OpenColorIO_STATIC YAML_CPP_LIB) -+ endif() -+ - if(EXTERNAL_LIBRARIES) - target_link_libraries(OpenColorIO_STATIC ${EXTERNAL_LIBRARIES}) - endif() -diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp -index aeee4d1..f1c662d 100644 ---- a/src/core/OCIOYaml.cpp -+++ b/src/core/OCIOYaml.cpp -@@ -69,7 +69,7 @@ namespace YAML { - - #ifdef WIN32 - #pragma warning( push ) --#pragma warning( disable: 4146 ) -+#pragma warning( disable: 4146 4251 ) - #endif - - #include diff --git a/ports/opencolorio/0005-tinyxml-dependency-search.patch b/ports/opencolorio/0005-tinyxml-dependency-search.patch deleted file mode 100644 index 319f88b733fdf0..00000000000000 --- a/ports/opencolorio/0005-tinyxml-dependency-search.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 45e55f9..f4b687d 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -77,7 +77,12 @@ endif() - if(OCIO_BUILD_STATIC) - list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp) - add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files}) -- add_dependencies(OpenColorIO_STATIC TINYXML_LIB) -+ -+ if(USE_EXTERNAL_TINYXML) -+ target_link_libraries(OpenColorIO_STATIC ${TINYXML_LIBRARIES}) -+ else(USE_EXTERNAL_TINYXML) -+ add_dependencies(OpenColorIO_STATIC TINYXML_LIB) -+ endif(USE_EXTERNAL_TINYXML) - - if(USE_EXTERNAL_YAML) - target_link_libraries(OpenColorIO_STATIC ${YAML_CPP_LIBRARIES}) diff --git a/ports/opencolorio/0006-oiio-dependency-search.patch b/ports/opencolorio/0006-oiio-dependency-search.patch deleted file mode 100644 index 09624e55c70740..00000000000000 --- a/ports/opencolorio/0006-oiio-dependency-search.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5cfa601..f79807c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -475,7 +475,8 @@ endif() - if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) ) - - # Try to find OpenImageIO (OIIO) and OpenGL stuff -- OCIOFindOpenImageIO() -+ find_package(OpenImageIO CONFIG REQUIRED) -+ set(OIIO_LIBRARIES OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util) - - if(OIIO_FOUND) - add_subdirectory(src/apps/ocioconvert) diff --git a/ports/opencolorio/fix-pystring-name.patch b/ports/opencolorio/fix-pystring-name.patch new file mode 100644 index 00000000000000..50a4ef5b7d197b --- /dev/null +++ b/ports/opencolorio/fix-pystring-name.patch @@ -0,0 +1,13 @@ +diff --git a/share/cmake/modules/Findpystring.cmake b/share/cmake/modules/Findpystring.cmake +index a3e396de..4022ddf5 100644 +--- a/share/cmake/modules/Findpystring.cmake ++++ b/share/cmake/modules/Findpystring.cmake +@@ -50,7 +50,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL) + # Find library + find_library(pystring_LIBRARY + NAMES +- ${_pystring_STATIC} pystring ++ ${_pystring_STATIC} pystring libpystring + HINTS + ${_pystring_SEARCH_DIRS} + PATH_SUFFIXES diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index dcbac39b20f5a1..27f21fda434960 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -1,73 +1,48 @@ -# Note: Should be maintained simultaneously with opencolorio-tools! -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(_BUILD_SHARED OFF) - set(_BUILD_STATIC ON) -else() - set(_BUILD_SHARED ON) - set(_BUILD_STATIC OFF) -endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO - REF ebdec4111f449bea995d01ecd9693b7e704498fe # v1.1.1 - SHA512 b93796541f8b086f137eaebeef102e29a4aabac6dba5b1696c9ab23d62af39b233ca52ce97b04ea432d85ae0a1fe186939c52aab0cd2c4cd5d2775ac5c021eef + REF 0645fdd6b5279ab94851af0c56919ff9800e0c38 # v2.0.1 + SHA512 51568e21eaf863747f67fbcffa7f42ba32f5892e8295dac6c9deb0f6205f57c231ea34ce028d84915e4be2f2773e362b74eaf057c2e4cf3ad4b60bf13a0b73db HEAD_REF master PATCHES - 0001-lcms-dependency-search.patch - 0002-msvc-cpluscplus.patch - 0003-osx-self-assign-field.patch - 0004-yaml-dependency-search.patch - 0005-tinyxml-dependency-search.patch + fix-pystring-name.patch + use-find-openxer.patch ) -vcpkg_find_acquire_program(PYTHON3) -get_filename_component(PYTHON3_PATH "${PYTHON3}" DIRECTORY) -vcpkg_add_to_path(PREPEND ${PYTHON3_PATH}) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools OCIO_BUILD_APPS +) -# TODO(theblackunknown) build additional targets based on feature -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DOCIO_BUILD_APPS=OFF - -DOCIO_BUILD_SHARED:BOOL=${_BUILD_SHARED} - -DOCIO_BUILD_STATIC:BOOL=${_BUILD_STATIC} - -DOCIO_BUILD_TRUELIGHT:BOOL=OFF -DOCIO_BUILD_NUKE:BOOL=OFF -DOCIO_BUILD_DOCS:BOOL=OFF -DOCIO_BUILD_TESTS:BOOL=OFF - -DOCIO_BUILD_PYGLUE:BOOL=OFF - -DOCIO_BUILD_JNIGLUE:BOOL=OFF - -DOCIO_STATIC_JNIGLUE:BOOL=OFF - -DUSE_EXTERNAL_TINYXML:BOOL=ON - -DUSE_EXTERNAL_YAML:BOOL=ON + -DOCIO_BUILD_GPU_TESTS:BOOL=OFF + -DOCIO_BUILD_PYTHON:BOOL=OFF + -DOCIO_INSTALL_EXT_PACKAGES=NONE + -DCMAKE_DISABLE_FIND_PACKAGE_OpenImageIO=On + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH "cmake") +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(READ "${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake" _contents) -string(REPLACE - [=[get_filename_component(OpenColorIO_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)]=] - [=[get_filename_component(OpenColorIO_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(OpenColorIO_DIR "${OpenColorIO_DIR}" PATH) -get_filename_component(OpenColorIO_DIR "${OpenColorIO_DIR}" PATH)]=] - _contents - "${_contents}") -string(REPLACE "/cmake/OpenColorIO.cmake" "/share/opencolorio/OpenColorIO.cmake" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencolorio/OpenColorIOConfig.cmake" "${_contents}") - # Clean redundant files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake - ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake ) +if (OCIO_BUILD_APPS) + vcpkg_copy_tools( + TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut + AUTO_CLEAN + ) +endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/opencolorio/use-find-openxer.patch b/ports/opencolorio/use-find-openxer.patch new file mode 100644 index 00000000000000..24f05e5a3fd8cc --- /dev/null +++ b/ports/opencolorio/use-find-openxer.patch @@ -0,0 +1,13 @@ +diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake +index 8d9bfdd7..cce2fde2 100644 +--- a/share/cmake/modules/FindExtPackages.cmake ++++ b/share/cmake/modules/FindExtPackages.cmake +@@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED) + + # Half (OpenEXR/IlmBase) + # https://github.com/openexr/openexr +-find_package(Half 2.4.0 REQUIRED) ++find_package(OpenEXR 2.4.0 CONFIG REQUIRED) + + # pystring + # https://github.com/imageworks/pystring diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index e942e139e6c883..13d79cd8601323 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,29 +1,25 @@ { "name": "opencolorio", - "version-semver": "1.1.1", - "port-version": 5, + "version-semver": "2.0.1", "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", "dependencies": [ + "expat", + "openexr", + "pystring", { - "name": "freeglut", - "default-features": false + "name": "vcpkg-cmake", + "host": true }, - { - "name": "glew", - "default-features": false - }, - { - "name": "lcms", - "default-features": false - }, - { - "name": "tinyxml", - "default-features": false - }, - { - "name": "yaml-cpp", - "default-features": false + "yaml-cpp" + ], + "features": { + "tools": { + "description": "Installs tools", + "dependencies": [ + "glew", + "lcms" + ] } - ] + } } diff --git a/ports/openimageio/fix-dependency.patch b/ports/openimageio/fix-dependency.patch deleted file mode 100644 index d594570f271b9f..00000000000000 --- a/ports/openimageio/fix-dependency.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index e7261af3..195f46cb 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -102,7 +102,6 @@ if (MSVC AND NOT LINKSTATIC) - add_definitions (-DOPENEXR_DLL) # Is this needed for new versions? - endif () - -- - # JPEG -- prefer Turbo-JPEG to regular libjpeg - checked_find_package (JPEGTurbo - DEFINITIONS -DUSE_JPEG_TURBO=1 -@@ -145,7 +144,7 @@ checked_find_package (HDF5 - ISDEPOF Field3D) - checked_find_package (OpenColorIO - DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1) --checked_find_package (OpenCV -+checked_find_package (OpenCV CONFIG - DEFINITIONS -DUSE_OPENCV=1) - - # Intel TBB -@@ -155,7 +154,7 @@ checked_find_package (TBB 2017 - ISDEPOF OpenVDB) - - checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images --checked_find_package (FFmpeg VERSION_MIN 2.6) -+checked_find_package (FFMPEG) - checked_find_package (Field3D - DEPS HDF5 - DEFINITIONS -DUSE_FIELD3D=1) -@@ -163,18 +162,25 @@ checked_find_package (GIF - VERSION_MIN 4 - RECOMMEND_MIN 5.0 - RECOMMEND_MIN_REASON "for stability and thread safety") --checked_find_package (Libheif VERSION_MIN 1.3) # For HEIF/HEIC format --checked_find_package (LibRaw -+checked_find_package (libheif CONFIG) # For HEIF/HEIC format -+checked_find_package (LibRaw CONFIG - RECOMMEND_MIN 0.18 - RECOMMEND_MIN_REASON "for ACES support and better camera metadata" -- PRINT LibRaw_r_LIBRARIES ) --checked_find_package (OpenJpeg VERSION_MIN 2.0) -+ PRINT LibRaw_LIBRARIES ) -+checked_find_package (OpenJPEG CONFIG) - checked_find_package (OpenVDB - VERSION_MIN 5.0 - DEPS TBB - DEFINITIONS -DUSE_OPENVDB=1) --checked_find_package (PTex) --checked_find_package (WebP) -+checked_find_package (ptex CONFIG) -+set(PTEX_FOUND ${ptex_FOUND}) -+set(PTEX_LIBRARIES Ptex::Ptex) -+checked_find_package (WebP CONFIG) -+if(WebP_FOUND) -+ set(WEBP_FOUND TRUE) -+ add_library(WebP::WebP ALIAS WebP::webp) -+ add_library(WebP::WebPDemux ALIAS WebP::webpdemux) -+endif() - - option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF) - checked_find_package (R3DSDK) # RED camera -@@ -287,5 +293,7 @@ macro (find_or_download_fmt) - checked_find_package (fmt REQUIRED) - endmacro() - --find_or_download_fmt() -+find_package(fmt CONFIG REQUIRED) -+get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES) -+checked_find_package (fmt CONFIG REQUIRED) - include_directories (${FMT_INCLUDES}) -diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt -index 6cf07636..8e77b1ed 100644 ---- a/src/ffmpeg.imageio/CMakeLists.txt -+++ b/src/ffmpeg.imageio/CMakeLists.txt -@@ -11,7 +11,7 @@ if (NOT MSVC) - PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations") - endif() - --if (FFmpeg_FOUND) -+if (FFMPEG_FOUND) - add_oiio_plugin (ffmpeginput.cpp - INCLUDE_DIRS ${FFMPEG_INCLUDES} - LINK_LIBRARIES ${FFMPEG_LIBRARIES} -diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt -index a9e54e3f..00fac073 100644 ---- a/src/field3d.imageio/CMakeLists.txt -+++ b/src/field3d.imageio/CMakeLists.txt -@@ -10,6 +10,6 @@ if (Field3D_FOUND) - add_oiio_plugin (field3dinput.cpp field3doutput.cpp - INCLUDE_DIRS ${FIELD3D_INCLUDES} - LINK_LIBRARIES Field3D::Field3D -- # ${HDF5_LIBRARIES} -+ ${HDF5_LIBRARIES} - ${SZIP_LIBRARY}) - endif() -diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt -index fed80015..884d1312 100644 ---- a/src/heif.imageio/CMakeLists.txt -+++ b/src/heif.imageio/CMakeLists.txt -@@ -4,7 +4,7 @@ - - if (Libheif_FOUND) - add_oiio_plugin (heifinput.cpp heifoutput.cpp -- LINK_LIBRARIES Libheif::Libheif -+ LINK_LIBRARIES heif - DEFINITIONS "-DUSE_HEIF=1") - else () - message (WARNING "heif plugin will not be built") -diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt -index 81a0ff54..23326a0a 100644 ---- a/src/raw.imageio/CMakeLists.txt -+++ b/src/raw.imageio/CMakeLists.txt -@@ -5,7 +5,7 @@ - if (LIBRAW_FOUND) - add_oiio_plugin (rawinput.cpp - INCLUDE_DIRS ${LibRaw_INCLUDE_DIR} -- LINK_LIBRARIES ${LibRaw_r_LIBRARIES} -+ LINK_LIBRARIES ${LibRaw_LIBRARIES} - DEFINITIONS "-DUSE_LIBRAW=1") - else () - message (WARNING "Raw plugin will not be built") diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 66d29e8c867023..ab0e6d37286e61 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -8,12 +8,11 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF 5167b11277fffcd9fe18fe4dc35b3eb2669d8c44 # 2.2.10 - SHA512 d5812cf93bbaf8a384e8ee9f443db95a92320b4c35959a528dff40eac405355d1dec924a975bef7f367d3a2179ded0a15b4be9737d37521719739958bb7f3123 + REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0 + SHA512 1b6a5e41607bd68590a19672ca777c953b92b347425c9fe8ca7d096959bece789d043a0fae1f7bf00a88dcb11815dd3501414c9ad979e1fe9dd1613bb9e04b0b HEAD_REF master PATCHES fix-config-cmake.patch - fix-dependency.patch fix_static_build.patch ) @@ -22,8 +21,7 @@ file(REMOVE_RECURSE "${SOURCE_PATH}/ext") file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindWebp.cmake") + "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake") file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") @@ -36,7 +34,7 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES libraw USE_LIBRAW - opencolorio USE_OCIO + opencolorio USE_OPENCOLORIO ffmpeg USE_FFMPEG field3d USE_FIELD3D freetype USE_FREETYPE @@ -57,7 +55,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DOIIO_BUILD_TESTS=OFF - -DHIDE_SYMBOLS=ON -DUSE_DCMTK=OFF -DUSE_NUKE=OFF -DUSE_QT=OFF diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index b3aff1639f0133..8ec421738f6b4a 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openimageio", - "version": "2.2.10.0", - "port-version": 1, + "version": "2.2.17.0", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ diff --git a/ports/pystring/CMakeLists.txt b/ports/pystring/CMakeLists.txt index ecfdaa4fb11ec7..ca410d6dc3eccc 100644 --- a/ports/pystring/CMakeLists.txt +++ b/ports/pystring/CMakeLists.txt @@ -15,5 +15,5 @@ install( ) if(NOT DISABLE_INSTALL_HEADERS) - install(FILES pystring.h DESTINATION include) + install(FILES pystring.h DESTINATION include/pystring) endif() diff --git a/ports/pystring/CONTROL b/ports/pystring/CONTROL deleted file mode 100644 index 698e0466dea16d..00000000000000 --- a/ports/pystring/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pystring -Version: 1.1.3-2 -Homepage: https://github.com/imageworks/pystring -Description: Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string diff --git a/ports/pystring/vcpkg.json b/ports/pystring/vcpkg.json new file mode 100644 index 00000000000000..f9b0dcaff44346 --- /dev/null +++ b/ports/pystring/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pystring", + "version-semver": "1.1.3", + "port-version": 3, + "description": "Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string", + "homepage": "https://github.com/imageworks/pystring" +} diff --git a/ports/yaml-cpp/CONTROL b/ports/yaml-cpp/CONTROL deleted file mode 100644 index 54a1c8dc083cab..00000000000000 --- a/ports/yaml-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: yaml-cpp -Version: 0.6.3 -Port-Version: 1 -Homepage: https://github.com/jbeder/yaml-cpp -Description: yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec. diff --git a/ports/yaml-cpp/fix-include-path.patch b/ports/yaml-cpp/fix-include-path.patch deleted file mode 100644 index 9a7e9ff42da91e..00000000000000 --- a/ports/yaml-cpp/fix-include-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4732a45..3de71cc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -324,7 +324,7 @@ else() - endif() - - --file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_ROOT_DIR}") -+set(REL_INCLUDE_DIR "../../include") - set(CONFIG_INCLUDE_DIRS "\${YAML_CPP_CMAKE_DIR}/${REL_INCLUDE_DIR}") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in - "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yaml-cpp-config.cmake" @ONLY) diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake index d6ca086ef9296b..33208b0ea3dab7 100644 --- a/ports/yaml-cpp/portfile.cmake +++ b/ports/yaml-cpp/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jbeder/yaml-cpp - REF 9a3624205e8774953ef18f57067b3426c1c5ada6 #v0.6.3 - SHA512 9bd0f05b882beed748eddb5d615bf356b7d1f31c4e3a4bbf80a6bdeb30b33fa1e0ccf596161a489169e6a111a3112e371d8d00514a0bfd02e6a6a11513904bed + REF 0579ae3d976091d7d664aa9d2527e0d0cff25763 # yaml-cpp-0.7.0 + SHA512 930f13737c23faf06be3fa9821492d6c677359e532212ced495173367a8aec45f87fbf3a5da47d4d1b61a95c25e0101bc7f8d175752434c63b25e097186e1745 HEAD_REF master - PATCHES - fix-include-path.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -14,34 +12,34 @@ else() set(YAML_BUILD_SHARED_LIBS OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DYAML_CPP_BUILD_TOOLS=OFF -DYAML_CPP_BUILD_TESTS=OFF -DYAML_BUILD_SHARED_LIBS=${YAML_BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/yaml-cpp) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/yaml-cpp) endif() # Remove debug include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(READ ${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h DLL_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" DLL_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) string(REPLACE "#ifdef YAML_CPP_DLL" "#if 1" DLL_H "${DLL_H}") else() string(REPLACE "#ifdef YAML_CPP_DLL" "#if 0" DLL_H "${DLL_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h "${DLL_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "${DLL_H}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yaml-cpp/vcpkg.json b/ports/yaml-cpp/vcpkg.json new file mode 100644 index 00000000000000..afdbabbf715a0f --- /dev/null +++ b/ports/yaml-cpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "yaml-cpp", + "version-semver": "0.7.0", + "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.", + "homepage": "https://github.com/jbeder/yaml-cpp", + "documentation": "https://codedocs.xyz/jbeder/yaml-cpp/index.html", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f4b9cb33acbb45..ecae6d2b7358e8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4601,8 +4601,8 @@ "port-version": 7 }, "opencolorio": { - "baseline": "1.1.1", - "port-version": 5 + "baseline": "2.0.1", + "port-version": 0 }, "opencolorio-tools": { "baseline": "1.1.1", @@ -4653,8 +4653,8 @@ "port-version": 1 }, "openimageio": { - "baseline": "2.2.10.0", - "port-version": 1 + "baseline": "2.2.17.0", + "port-version": 0 }, "openjpeg": { "baseline": "2.3.1", @@ -5125,8 +5125,8 @@ "port-version": 0 }, "pystring": { - "baseline": "1.1.3-2", - "port-version": 0 + "baseline": "1.1.3", + "port-version": 3 }, "python2": { "baseline": "2.7.18", @@ -6873,8 +6873,8 @@ "port-version": 0 }, "yaml-cpp": { - "baseline": "0.6.3", - "port-version": 1 + "baseline": "0.7.0", + "port-version": 0 }, "yara": { "baseline": "4.1.1", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index f4d3afa7d92236..2326e6b1b2e5f2 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f0f60f376d80012eb0c3bd17ce51e3788070fe4", + "version-semver": "2.0.1", + "port-version": 0 + }, { "git-tree": "c011ef89b247b0bc54a08016fe23793defd398a5", "version-semver": "1.1.1", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 02f7e643697dec..6c38b7238ddddd 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "886169206344e33a401999f301de01fe1e4fed01", + "version": "2.2.17.0", + "port-version": 0 + }, { "git-tree": "2c57516ef37256b8b87a41801732e11b3ae1380c", "version": "2.2.10.0", diff --git a/versions/p-/pystring.json b/versions/p-/pystring.json index b29d9d27d67be7..d89279e5ad2031 100644 --- a/versions/p-/pystring.json +++ b/versions/p-/pystring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f79bc19acdfb0e0d9445191d54f89234c27db843", + "version-semver": "1.1.3", + "port-version": 3 + }, { "git-tree": "33c038a18b859b695f9e1f7d4618278c9ef14e4a", "version-string": "1.1.3-2", diff --git a/versions/y-/yaml-cpp.json b/versions/y-/yaml-cpp.json index 3e5888040c035b..6b39e7fe0beb68 100644 --- a/versions/y-/yaml-cpp.json +++ b/versions/y-/yaml-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a71932a4f18c3cc6e0bd2bdce57fbf744e0efe2b", + "version-semver": "0.7.0", + "port-version": 0 + }, { "git-tree": "045045b2d5b8cb6166b6d0d548effc0764623341", "version-string": "0.6.3", From 8a2b5c58c44eab8617f86c2ffb4baa0a8461c0e2 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 11 Aug 2021 01:00:29 +0800 Subject: [PATCH 0293/1858] [vcpkg-cmake] Fix vcpkg_copy_pdbs false alarm (#19369) --- scripts/cmake/vcpkg_copy_pdbs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_copy_pdbs.cmake b/scripts/cmake/vcpkg_copy_pdbs.cmake index 60335255a1ae95..7e5c81e6d73b96 100644 --- a/scripts/cmake/vcpkg_copy_pdbs.cmake +++ b/scripts/cmake/vcpkg_copy_pdbs.cmake @@ -65,7 +65,7 @@ function(vcpkg_copy_pdbs) set(ENV{VSLANG} "${vslang_backup}") - if(NOT unmatched_dlls_length STREQUAL "") + if(NOT dlls_without_matching_pdbs STREQUAL "") list(JOIN dlls_without_matching_pdbs "\n " message) message(WARNING "Could not find a matching pdb file for: ${message}\n") From e2812b6fd47318886d9c5002979529e4fed99d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 12 Aug 2021 08:06:39 +0800 Subject: [PATCH 0294/1858] [cmake] Update to 3.21.1 (#18955) --- .../cmake/vcpkg_find_acquire_program.cmake | 1 + scripts/ports.cmake | 4 +-- scripts/vcpkgTools.xml | 30 +++++++++---------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 436f6263fbab50..7740f5dec3f363 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -478,6 +478,7 @@ function(vcpkg_find_acquire_program VAR) #TODO: REGEX MATCH case for more complex cases! if(NOT ${VAR}_VERSION_OUTPUT VERSION_GREATER_EQUAL ${VAR}_VERSION) message(STATUS "Found ${PROGNAME}('${${VAR}_VERSION_OUTPUT}') but at least version ${${VAR}_VERSION} is required! Trying to use internal version if possible!") + unset(${VAR}) set(${VAR} "${VAR}-NOTFOUND" CACHE INTERNAL "") else() message(STATUS "Found external ${PROGNAME}('${${VAR}_VERSION_OUTPUT}').") diff --git a/scripts/ports.cmake b/scripts/ports.cmake index c444634110235d..03547edff90e07 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -1,5 +1,5 @@ # rebuild: 1 -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.21) set(SCRIPTS "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location to stored scripts") include("${SCRIPTS}/cmake/z_vcpkg_function_arguments.cmake") @@ -26,7 +26,7 @@ endif() list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake") include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake") -vcpkg_minimum_required(VERSION 2021-05-05) +vcpkg_minimum_required(VERSION 2021-07-16) file(TO_CMAKE_PATH "${BUILDTREES_DIR}" BUILDTREES_DIR) file(TO_CMAKE_PATH "${PACKAGES_DIR}" PACKAGES_DIR) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index ccd7ec208eeb65..07f975d9349274 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -8,25 +8,25 @@ python-3.9.6-embed-win32.zip - 3.20.2 - cmake-3.20.2-windows-i386\bin\cmake.exe - https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-windows-i386.zip - 5fb46e737eedf71ea70f1b9f392d3e39ec12c0a9d1e630d4ddda4622bb28d92b9d965a11b1a3af5ffeed4d193a06312df9dae5ca567513e98f8ed770ea3be0c4 - cmake-3.20.2-windows-i386.zip + 3.21.1 + cmake-3.21.1-windows-i386\bin\cmake.exe + https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-windows-i386.zip + 3aa0e9c904bf8abfc9441c1f0fd571e613ade7bc12f36211cd9006b4a2226552815ec8b00c8ef43583769d9d90996e75d2e832b3718ac3b85d3f9fb4db1cd60a + cmake-3.21.1-windows-i386.zip - 3.20.2 - cmake-3.20.2-macos-universal/CMake.app/Contents/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-macos-universal.tar.gz - 50b96c9d8c35a8f5d9573f3c741b43c041cfa7ad939fcd60ce56c98a373cc87fa410c61cad6cfb0f86f03c8d3d527297b2b3eed7043aaf19de260dec49c57cf3 - cmake-3.20.2-macos-universal.tar.gz + 3.21.1 + cmake-3.21.1-macos-universal/CMake.app/Contents/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-macos-universal.tar.gz + 0e5d3781101d6f54d916066719a0ff27d052b40e999dfd8e1f53d8d22d99e45cad22fc28b5d2a9e810b0cc8237e640d7747aff2a2c0896571c8a69ecdd0a9e41 + cmake-3.21.1-macos-universal.tar.gz - 3.20.2 - cmake-3.20.2-linux-x86_64/bin/cmake - https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-Linux-x86_64.tar.gz - 1e81c37d3b144cfb81478140e7921f314134845d2f0e0f941109ef57d510e7bd37dda6cc292ec00782472e7f1671349b857be9aac1c3f974423c8d1875a46302 - cmake-3.20.2-linux-x86_64.tar.gz + 3.21.1 + cmake-3.21.1-linux-x86_64/bin/cmake + https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-Linux-x86_64.tar.gz + deb24087315bcf01d2969846246564a352b6f77521df6b235f9ef525450db9c89b32dca4ad78f93a356dd5ab7b587374d49fc1a892354760715a5ef1f88e925f + cmake-3.21.1-linux-x86_64.tar.gz 2.32.0.2 From b3ec421935cf4b72b8c12d37905cb72f75e9c9fe Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 11 Aug 2021 17:07:21 -0700 Subject: [PATCH 0295/1858] [azure-identity-cpp] Update to 1.1.0 (#19485) --- ports/azure-identity-cpp/portfile.cmake | 5 ++--- ports/azure-identity-cpp/vcpkg.json | 4 ++-- versions/a-/azure-identity-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake index d831da1a0553c4..417698981c134a 100644 --- a/ports/azure-identity-cpp/portfile.cmake +++ b/ports/azure-identity-cpp/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-identity_1.0.0 - SHA512 de2de96c3ddce8b289328282c5ad89a4e96ee8b4c7398964a874ddddb7afd232005213b0f25e343ac6b08ecec9636006d395a61fd0dcf67db09ab7e7ec2d7201 + REF azure-identity_1.1.0 + SHA512 83893ae2bc5edf7d63615e6017ea0474e9c620171e9320dabbe41d40b5659dca4f6d8a10599ec02054b2d3265eebfbd419ceab43669ba5ba0e04e72a38297a07 ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/identity/azure-identity/ - PREFER_NINJA OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json index 382a9befaa60b4..ec0ea4dbb02bee 100644 --- a/ports/azure-identity-cpp/vcpkg.json +++ b/ports/azure-identity-cpp/vcpkg.json @@ -1,11 +1,11 @@ { "name": "azure-identity-cpp", - "version-semver": "1.0.0", + "version-semver": "1.1.0", "description": [ "Microsoft Azure Identity SDK for C++", "This library provides common authentication-related abstractions for Azure SDK." ], - "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/master/sdk/identity/azure-identity", + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/identity/azure-identity", "license": "MIT", "dependencies": [ { diff --git a/versions/a-/azure-identity-cpp.json b/versions/a-/azure-identity-cpp.json index 6c3b6d8a28668a..6fb04a828e6ce5 100644 --- a/versions/a-/azure-identity-cpp.json +++ b/versions/a-/azure-identity-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2742c6a31a2a3238ea97663c2b40be998c18006d", + "version-semver": "1.1.0", + "port-version": 0 + }, { "git-tree": "adfe9dad7c61ced7b66ba0cb6220f8341c4be5e2", "version-semver": "1.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index ecae6d2b7358e8..89541215c9979f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -277,7 +277,7 @@ "port-version": 0 }, "azure-identity-cpp": { - "baseline": "1.0.0", + "baseline": "1.1.0", "port-version": 0 }, "azure-iot-sdk-c": { From 7204eac3ef3791f306e07574ab8a7af29d3b26dc Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 11 Aug 2021 17:07:39 -0700 Subject: [PATCH 0296/1858] [Azure SDK Key Vault Keys] update version to 4.0.0 GA (#19487) --- ports/azure-security-keyvault-keys-cpp/portfile.cmake | 5 ++--- ports/azure-security-keyvault-keys-cpp/vcpkg.json | 3 +-- versions/a-/azure-security-keyvault-keys-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 86c3cc6ca5f8c1..11488482cffc36 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-keys_4.0.0-beta.4 - SHA512 906287fce93f0f7720af6d4788ea4a8b35cf0cf675ecbae742bf7aa768e6241006012cb9ccebc3b4e9192cdb7b5bcec7606b72a5b2edde9ce194b4d6dd907412 + REF azure-security-keyvault-keys_4.0.0 + SHA512 4f99bdc5a60e6ea1263812f47f6c61313b29adb241fb1372f5f601908d85291eb75e554a56722f43b6b2b38f03ecc113aa5f48304470add3b8d3416d141c5292 ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-keys/ - PREFER_NINJA OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index a5563598d4fc81..6abacf3fc80194 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.0.0-beta.4", - "port-version": 1, + "version-semver": "4.0.0", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 68ac66819d9751..2505c7ec7c0a4c 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b710e9d89ef00e649c793f46ce7c67af63fa3611", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "6a62e90cc13ab362ba09462fa444512aee671482", "version-semver": "4.0.0-beta.4", diff --git a/versions/baseline.json b/versions/baseline.json index 89541215c9979f..6a4a3340aeff6b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -297,8 +297,8 @@ "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.0.0-beta.4", - "port-version": 1 + "baseline": "4.0.0", + "port-version": 0 }, "azure-storage-blobs-cpp": { "baseline": "12.0.1", From e20dda68f4fa4b59bfefab818eab82d410dd3faa Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 11 Aug 2021 17:08:02 -0700 Subject: [PATCH 0297/1858] [Azure SDK Storage] Update to 12.1.0 (#19488) --- ports/azure-storage-blobs-cpp/portfile.cmake | 5 ++--- ports/azure-storage-blobs-cpp/vcpkg.json | 3 +-- ports/azure-storage-common-cpp/portfile.cmake | 5 ++--- ports/azure-storage-common-cpp/vcpkg.json | 3 +-- .../portfile.cmake | 5 ++--- .../azure-storage-files-datalake-cpp/vcpkg.json | 3 +-- .../portfile.cmake | 5 ++--- ports/azure-storage-files-shares-cpp/vcpkg.json | 3 +-- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-common-cpp.json | 5 +++++ .../a-/azure-storage-files-datalake-cpp.json | 5 +++++ versions/a-/azure-storage-files-shares-cpp.json | 5 +++++ versions/baseline.json | 16 ++++++++-------- 13 files changed, 40 insertions(+), 28 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index e046137a5e59d5..e17b3484b62e5b 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.0.1 - SHA512 401905e0c593a34a5985e73ef529989bd42a268c52c9b0623965e062d47667e37be3648ee7df3bdfe5f965534796c6aab87eaeb0fec261a263c036bc0ee53d23 + REF azure-storage-blobs_12.1.0 + SHA512 4559d57f65dcd0e710e0240fcc33fb8e8ff2a516e405afb2c7768bbb91b8e253a906f3562249c29f8f9a674473fc17427566d6657a53c8cf8803703e1c989db6 ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-blobs/ - PREFER_NINJA OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index d58789ac2df927..6de1f50ed81617 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.0.1", - "port-version": 1, + "version-semver": "12.1.0", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index 79a3ceda75bdfc..ab556b364776d3 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.0.1 - SHA512 72f345fb128888f40485112a4d8a95837f93bdd6667c532cab17c35a471c7081d7a0c72625b3853cd51ec8c06357af6235434e8876eb7850fd5f5f532b8a6fbd + REF azure-storage-common_12.1.0 + SHA512 6f44ae7f6572810d550821a51af1e8c1f266ae356f70eddc7e6a3777f69ec5d06f9750fcbe2d021bd9154e5952ba2a73d13abdfa44ef3a1c7a5d3750dbeefbca ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-common/ - PREFER_NINJA OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index 3e6864f77d35a2..e547cafa95b0e3 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.0.1", - "port-version": 1, + "version-semver": "12.1.0", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index 0107feffb06e44..c0fee9b8ce817d 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.0.1 - SHA512 2f952f7b300b90ff1ade6165ccd9e0441a5155797334a3c327c47dd35c5e9e54fc16ee737d6dceb68f5d898358325fed9cbccecbbe2b032b791929a2ececce3c + REF azure-storage-files-datalake_12.1.0 + SHA512 fa0482b6862219787ba40adf7baa86779681d5a47da22056a4043a6f8765e5418bfaca1cfe4e451297fa56cdde9a30cbfb6fb66dc473fa57fc66eeda9e728cf5 ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-datalake/ - PREFER_NINJA OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index 63dde71174212a..0014b1ea066d78 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.0.1", - "port-version": 1, + "version-semver": "12.1.0", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 612afb3ffb007f..9a8f4b86498e53 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.0.1 - SHA512 d38dcf6bca6047b15972199c2bce2ca463b9ce83106703ac5395c3b91ebc3b3ec8e4dabc63703a7fc9700102eaf222dc476625c762bd78747dfca93bd287ce3f + REF azure-storage-files-shares_12.1.0 + SHA512 8d3fa6e13f731627e4644b79eb9761071539875b0b3988cd871721e68d7d3c5b7a0a067a890d6a8c2df53ba7c6ef97a86a8b02086f74682cccf6a5f919392573 ) vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-files-shares/ - PREFER_NINJA OPTIONS -DWARNINGS_AS_ERRORS=OFF ) diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 400ca6901f6e1c..8d2be437d35718 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.0.1", - "port-version": 1, + "version-semver": "12.1.0", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index bc5ac374fc1a62..033835e24bf5b1 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eed3fb43fd0ab43bf99c91a084111c9d1e14f213", + "version-semver": "12.1.0", + "port-version": 0 + }, { "git-tree": "4927a9eacb27a8088d82005fbae2851755d09ce1", "version-semver": "12.0.1", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 858d26eb42a136..9fa26071ef2c47 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb0e01a17ffaab119d6a67748a54d8b849fb569b", + "version-semver": "12.1.0", + "port-version": 0 + }, { "git-tree": "f18fbd3b20bfc22766b8767ab8b668be4ea18f58", "version-semver": "12.0.1", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index 6ded729267312b..06b2c6daf27019 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c8e48a165197468833b76c0825621ea408efb0a", + "version-semver": "12.1.0", + "port-version": 0 + }, { "git-tree": "649b055538511bad19442d11dd356688cac46370", "version-semver": "12.0.1", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index adbde50819116c..af031d87aefdac 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a7e7cf14be62755ee6a51fc0f8e88edd3a13d18", + "version-semver": "12.1.0", + "port-version": 0 + }, { "git-tree": "eccf58c6719e0f859f90420dffb5deb2cccac731", "version-semver": "12.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index 6a4a3340aeff6b..4affd95e1f81c9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -301,24 +301,24 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.0.1", - "port-version": 1 + "baseline": "12.1.0", + "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.0.1", - "port-version": 1 + "baseline": "12.1.0", + "port-version": 0 }, "azure-storage-cpp": { "baseline": "7.5.0", "port-version": 1 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.0.1", - "port-version": 1 + "baseline": "12.1.0", + "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.0.1", - "port-version": 1 + "baseline": "12.1.0", + "port-version": 0 }, "azure-uamqp-c": { "baseline": "2020-12-09", From 5194d9fbaf6fc9d583c19129da7462bdc3283a13 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 12 Aug 2021 08:18:20 +0800 Subject: [PATCH 0298/1858] [keystone] Fix static build with dynamic CRT on Windows (#19491) * [keystone] Fix static build with dynamic CRT on Windows * Add port-version * Update version files * Add double quotes for the path * Update versions/k-/keystone.json * Add comments for kstool * Update versions/k-/keystone.json --- ports/keystone/CONTROL | 3 --- ports/keystone/portfile.cmake | 40 ++++++++++++++++------------------- ports/keystone/vcpkg.json | 14 ++++++++++++ scripts/ci.baseline.txt | 3 --- versions/baseline.json | 2 +- versions/k-/keystone.json | 5 +++++ 6 files changed, 38 insertions(+), 29 deletions(-) delete mode 100644 ports/keystone/CONTROL create mode 100644 ports/keystone/vcpkg.json diff --git a/ports/keystone/CONTROL b/ports/keystone/CONTROL deleted file mode 100644 index cc2c01c2f928a8..00000000000000 --- a/ports/keystone/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: keystone -Version: 0.9.2 -Description: Lightweight multi-platform, multi-architecture assembler framework diff --git a/ports/keystone/portfile.cmake b/ports/keystone/portfile.cmake index f75cfeeea220e3..6a6e25690e9f06 100644 --- a/ports/keystone/portfile.cmake +++ b/ports/keystone/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO keystone-engine/keystone @@ -8,43 +10,37 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON2) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KEYSTONE_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" KEYSTONE_BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" KEYSTONE_BUILD_STATIC_RUNTIME) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DKEYSTONE_BUILD_STATIC=${KEYSTONE_BUILD_STATIC} - -DKEYSTONE_BUILD_SHARED=${KEYSTONE_BUILD_SHARED} + -DKEYSTONE_BUILD_STATIC_RUNTIME=${KEYSTONE_BUILD_STATIC_RUNTIME} -DPYTHON_EXECUTABLE=${PYTHON2} # Add support for only a subset of architectures #-DLLVM_TARGETS_TO_BUILD="AArch64;X86" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(EXES) - file(REMOVE ${EXES}) -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + #For windows, do not build kstool if building DLL https://github.com/keystone-engine/keystone/blob/master/CMakeLists.txt#L74 + vcpkg_copy_tools(TOOL_NAMES kstool AUTO_CLEAN) else() # Move DLLs - file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE ${DLLS}) - file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE ${DLLS}) endif() +vcpkg_fixup_pkgconfig() + # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/keystone - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/keystone/vcpkg.json b/ports/keystone/vcpkg.json new file mode 100644 index 00000000000000..62827d58e690d2 --- /dev/null +++ b/ports/keystone/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "keystone", + "version-semver": "0.9.2", + "port-version": 1, + "description": "A Lightweight multi-platform, multi-architecture assembler framework.", + "homepage": "https://github.com/keystone-engine/keystone", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7f53972bc521e1..a1e9fabebb2245 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -497,8 +497,6 @@ jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail jinja2cpplight:arm-uwp=fail jinja2cpplight:x64-uwp=fail -keystone:arm-uwp=fail -keystone:x64-uwp=fail kfr:arm64-windows=fail kfr:arm-uwp=fail kfr:x64-linux=fail @@ -1723,7 +1721,6 @@ clockutils:x64-windows-static-md=fail fastcgi:x64-windows-static-md=fail gmp:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail -keystone:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libgo:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 4affd95e1f81c9..90d0f9d4e00f34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2870,7 +2870,7 @@ }, "keystone": { "baseline": "0.9.2", - "port-version": 0 + "port-version": 1 }, "kf5archive": { "baseline": "5.84.0", diff --git a/versions/k-/keystone.json b/versions/k-/keystone.json index c8918172178fed..7f8c71f6fbf6e0 100644 --- a/versions/k-/keystone.json +++ b/versions/k-/keystone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34865a7cf3fbcf4f104e8b136862aa8acc1a7ca7", + "version-semver": "0.9.2", + "port-version": 1 + }, { "git-tree": "779d3f65bc01be0cfb50208ec50673612154023f", "version-string": "0.9.2", From e1c61c84419905bb408f9f3e66e77572b2d4dcd6 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 12 Aug 2021 08:19:54 +0800 Subject: [PATCH 0299/1858] [intel-mkl] Update description field (#19461) * [intel-mkl] Update description field * Update version files * Update ports/intel-mkl/vcpkg.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update versions/i-/intel-mkl.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/intel-mkl/CONTROL | 4 ---- ports/intel-mkl/vcpkg.json | 6 ++++++ versions/baseline.json | 2 +- versions/i-/intel-mkl.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 ports/intel-mkl/CONTROL create mode 100644 ports/intel-mkl/vcpkg.json diff --git a/ports/intel-mkl/CONTROL b/ports/intel-mkl/CONTROL deleted file mode 100644 index a54d24e5047d5d..00000000000000 --- a/ports/intel-mkl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: intel-mkl -Version: 2020.0.0 -Port-Version: 1 -Description: Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors. diff --git a/ports/intel-mkl/vcpkg.json b/ports/intel-mkl/vcpkg.json new file mode 100644 index 00000000000000..b767ee113559e8 --- /dev/null +++ b/ports/intel-mkl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "intel-mkl", + "version": "2020.0.0", + "port-version": 2, + "description": "Intel® Math Kernel Library (Intel® MKL) accelerates math processing routines, increases application performance, and reduces development time on Intel® processors. Due to the complexity involved, this package doesn't install MKL. It instead verifies that MKL is installed. Please download and install MKL from https://registrationcenter.intel.com/en/products/download/3178/ manually before using it in vcpkg." +} diff --git a/versions/baseline.json b/versions/baseline.json index 90d0f9d4e00f34..984486a35d7484 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2726,7 +2726,7 @@ }, "intel-mkl": { "baseline": "2020.0.0", - "port-version": 1 + "port-version": 2 }, "intelrdfpmathlib": { "baseline": "20U2-1", diff --git a/versions/i-/intel-mkl.json b/versions/i-/intel-mkl.json index e5e3bf186ad900..1c5ffb0efe056e 100644 --- a/versions/i-/intel-mkl.json +++ b/versions/i-/intel-mkl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2d5b828df130d8b1106aa0c076eb9cb79e50ea9", + "version": "2020.0.0", + "port-version": 2 + }, { "git-tree": "1f91c30839fe3222faa4c81d978ae4f52f61a1df", "version-string": "2020.0.0", From c29f39435fdab7695273094cf0351aa092e2a1a4 Mon Sep 17 00:00:00 2001 From: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com> Date: Thu, 12 Aug 2021 02:24:04 +0200 Subject: [PATCH 0300/1858] [tensorflow-cc] on x64 Windows with dynamic linkage misses C++ symbols in DLL (#19364) --- ports/tensorflow-cc/portfile.cmake | 4 ++++ ports/tensorflow-cc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/t-/tensorflow-cc.json | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake index f905397ebd3376..2c1cfc2db2da9b 100644 --- a/ports/tensorflow-cc/portfile.cmake +++ b/ports/tensorflow-cc/portfile.cmake @@ -1,5 +1,9 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + set(TF_LIB_SUFFIX "_cc") set(TF_PORT_SUFFIX "-cc") set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include/tensorflow-external ${CURRENT_INSTALLED_DIR}/include/tensorflow-external/src") diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json index fe5503d3bb5c98..d67e50c93e6ab8 100644 --- a/ports/tensorflow-cc/vcpkg.json +++ b/ports/tensorflow-cc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "tensorflow-cc", "version-semver": "2.4.1", + "port-version": 1, "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)", "homepage": "https://github.com/tensorflow/tensorflow", "supports": "!(x86 | arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 984486a35d7484..0339d5c72b0da3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6222,7 +6222,7 @@ }, "tensorflow-cc": { "baseline": "2.4.1", - "port-version": 0 + "port-version": 1 }, "tensorflow-common": { "baseline": "2.4.1", diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json index 1711cad05a2b4a..b43b8b239ec974 100644 --- a/versions/t-/tensorflow-cc.json +++ b/versions/t-/tensorflow-cc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77875da04a151fb36abe52cce80491a9a7f16c55", + "version-semver": "2.4.1", + "port-version": 1 + }, { "git-tree": "868e7ae57409669692df84ddb446f4a235e0b220", "version-semver": "2.4.1", From b3a934566675619b647c2d490918d4f6c64fdc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 12 Aug 2021 08:27:43 +0800 Subject: [PATCH 0301/1858] [lua] Export cmake targets, rewrite CMakeLists and delete usage (#15921) --- ports/lua/CMakeLists.txt | 36 ++++++++++++++++++++++--- ports/lua/portfile.cmake | 37 +++++++++++++------------- ports/lua/usage | 6 +---- ports/lua/vcpkg-cmake-wrapper.cmake.in | 25 ++++++++++++++--- ports/lua/vcpkg.json | 4 +-- versions/baseline.json | 2 +- versions/l-/lua.json | 5 ++++ 7 files changed, 80 insertions(+), 35 deletions(-) diff --git a/ports/lua/CMakeLists.txt b/ports/lua/CMakeLists.txt index ff16ff78c80b07..8e93eb1ab7c6a4 100644 --- a/ports/lua/CMakeLists.txt +++ b/ports/lua/CMakeLists.txt @@ -53,9 +53,6 @@ ENDIF () #DLL ADD_LIBRARY ( lua ${SRC_LIBLUA} ) SET_PROPERTY (TARGET lua PROPERTY POSITION_INDEPENDENT_CODE ON) -IF (COMPILE_AS_CPP) - SET_TARGET_PROPERTIES(lua PROPERTIES OUTPUT_NAME "lua-c++") -ENDIF() IF (BUILD_SHARED_LIBS AND WIN32) TARGET_COMPILE_DEFINITIONS (lua PUBLIC -DLUA_BUILD_AS_DLL ) @@ -74,11 +71,42 @@ IF (UNIX) ENDIF () INSTALL ( TARGETS lua + EXPORT unofficial-lua-config RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib ) +install(EXPORT unofficial-lua-config DESTINATION share/unofficial-lua) + +IF (COMPILE_AS_CPP) + ADD_LIBRARY ( lua-cpp ${SRC_LIBLUA} ) + SET_TARGET_PROPERTIES(lua-cpp PROPERTIES OUTPUT_NAME "lua-c++") + IF (BUILD_SHARED_LIBS AND WIN32) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_BUILD_AS_DLL ) + ENDIF () + IF (UNIX) + IF (APPLE) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) + ELSE () + FIND_LIBRARY (LIB_DLOPEN NAMES dl) + IF (LIB_DLOPEN) + TARGET_COMPILE_DEFINITIONS (lua-cpp PUBLIC -DLUA_USE_DLOPEN) + TARGET_LINK_LIBRARIES (lua-cpp ${LIB_DLOPEN}) + ENDIF () + ENDIF () + ENDIF () + + INSTALL ( TARGETS lua-cpp + EXPORT unofficial-lua-cpp-config + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib + ) + + install(EXPORT unofficial-lua-cpp-config DESTINATION share/unofficial-lua-cpp) +ENDIF() + IF (INSTALL_TOOLS) ADD_EXECUTABLE ( luac src/luac.c ${SRC_LIBLUA} ) # compiler uses non-exported APIs, so must include sources directly. ADD_EXECUTABLE ( luai src/lua.c ) # interpreter @@ -102,7 +130,7 @@ IF (INSTALL_TOOLS) INSTALL ( TARGETS luai luac RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/tools/lua ) ENDIF () -IF (NOT DEFINED SKIP_INSTALL_HEADERS) +IF (NOT SKIP_INSTALL_HEADERS) INSTALL( FILES src/lualib.h diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 11eeac875a23bd..89097096c14a00 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -13,43 +13,42 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +# Used in cmake wrapper +set(ENABLE_LUA_CPP 0) +if ("cpp" IN_LIST FEATURES) + set(ENABLE_LUA_CPP 1) +endif() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + cpp COMPILE_AS_CPP tools INSTALL_TOOLS ) if(VCPKG_TARGET_IS_IOS AND "tools" IN_LIST FEATURES) message(FATAL_ERROR "lua[tools] is not supported for iOS platform build") endif() -set(ENABLE_LUA_CPP 0) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS_RELEASE - ${FEATURE_OPTIONS} OPTIONS - -DCOMPILE_AS_CPP=OFF + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) vcpkg_install_cmake() -if("cpp" IN_LIST FEATURES) # lua[cpp] will create lua-c++, which uses C++ name mangling. - set(ENABLE_LUA_CPP 1) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - ${FEATURE_OPTIONS} - -DCOMPILE_AS_CPP=ON - OPTIONS_DEBUG - -DSKIP_INSTALL_HEADERS=ON - ) - vcpkg_install_cmake() +vcpkg_copy_pdbs() + +vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-lua TARGET_PATH share/unofficial-lua) + +if("cpp" IN_LIST FEATURES) + vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-lua-cpp TARGET_PATH share/unofficial-lua-cpp) endif() -vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/lua) +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES lua luac SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS) @@ -59,7 +58,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endif() endif() -# Handle post-build CMake instructions +# Suitable for old version configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/lua/usage b/ports/lua/usage index e27f6392d2be53..01aa81ed34aac0 100644 --- a/ports/lua/usage +++ b/ports/lua/usage @@ -1,9 +1,5 @@ Use this package via the module FindLua that comes with CMake. To use in your CMakeLists.txt: - include(FindLua) find_package(Lua REQUIRED) - target_link_libraries(main PRIVATE ${LUA_LIBRARIES}) target_include_directories(main PRIVATE ${LUA_INCLUDE_DIR}) - -For more information about the variables set by this module, please see: - https://cmake.org/cmake/help/latest/module/FindLua.html \ No newline at end of file + target_link_libraries(main PRIVATE ${LUA_LIBRARIES}) diff --git a/ports/lua/vcpkg-cmake-wrapper.cmake.in b/ports/lua/vcpkg-cmake-wrapper.cmake.in index 3b974043a4e082..74973eca35126b 100644 --- a/ports/lua/vcpkg-cmake-wrapper.cmake.in +++ b/ports/lua/vcpkg-cmake-wrapper.cmake.in @@ -1,6 +1,23 @@ -_find_package(${ARGS}) +set(REQUIRES ) +foreach(ARG IN_LISTS ${ARGS}) + if (ARG STREQUAL "REQUIRED") + set(REQUIRES "REQUIRED") + endif() +endforeach() + +_find_package(unofficial-lua CONFIG ${REQUIRES}) if (@ENABLE_LUA_CPP@) - find_library(lua_cpp NAMES lua-c++ liblua-c++ REQUIRED) - set(LUA_LIBRARIES ${LUA_LIBRARIES} ${lua_cpp}) -endif() \ No newline at end of file + _find_package(unofficial-lua-cpp CONFIG ${REQUIRES}) +endif() + +get_filename_component(LUA_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}" PATH) +get_filename_component(LUA_INCLUDE_DIR "${LUA_INCLUDE_DIR}" PATH) +set(LUA_INCLUDE_DIR ${LUA_INCLUDE_DIR}/include) + +list(APPEND LUA_LIBRARIES lua) +if (TARGET lua-cpp) + list(APPEND LUA_LIBRARIES lua-cpp) +endif() + +set(LUA_FOUND 1) diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index 36dd26376c6a4c..02dc73117bc62f 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lua", - "version-string": "5.4.3", - "port-version": 1, + "version-semver": "5.4.3", + "port-version": 2, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 0339d5c72b0da3..965e934d8fd399 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3886,7 +3886,7 @@ }, "lua": { "baseline": "5.4.3", - "port-version": 1 + "port-version": 2 }, "luabridge": { "baseline": "2.6", diff --git a/versions/l-/lua.json b/versions/l-/lua.json index fd0f4da290428f..930b811579a830 100644 --- a/versions/l-/lua.json +++ b/versions/l-/lua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3be47dc8a0f0e6497caac10e26e2eaf8866b2990", + "version-semver": "5.4.3", + "port-version": 2 + }, { "git-tree": "0e8966273a1a18cf591cf78046d345c74941a37d", "version-string": "5.4.3", From e6c82a9ef7cc1dc5f4d5fae155ab052f0f8dfe43 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 11 Aug 2021 19:03:07 -0700 Subject: [PATCH 0302/1858] [c-ares] Update to 1.17.2. (#19482) Version 1.17.2 fixes CVE-2021-3672. Details can be found in the security advisory at https://c-ares.haxx.se/adv_20210810.html --- ports/c-ares/portfile.cmake | 4 ++-- ports/c-ares/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/c-ares.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index a0e43f50e60b11..8f54a176d22887 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO c-ares/c-ares - REF cares-1_17_1 - SHA512 e2a2a40118b128755571274d0cfe7cc822bc18392616378c6dd5f73f210571d7e5005a40ba0763658bdae7f2c7aadb324b2888ad8b4dcb54ad47dfaf97c2ebfc + REF cares-1_17_2 + SHA512 1111f1e7eeb0e5d9e70d1a7c8566145d0a5e6e71b020f3fcaa02ecdf1931553ddeff83fdc152a1f9c5a780078e8afe3670164b631df56eecd2b638210cc59bb3 HEAD_REF master ) diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index 996666f75c7019..331ca600f7fa2a 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,7 +1,6 @@ { "name": "c-ares", - "version": "1.17.1", - "port-version": 2, + "version": "1.17.2", "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 965e934d8fd399..732de601afd139 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1101,8 +1101,8 @@ "port-version": 2 }, "c-ares": { - "baseline": "1.17.1", - "port-version": 2 + "baseline": "1.17.2", + "port-version": 0 }, "c4core": { "baseline": "2021-07-18", diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 60934c10ba591d..4f9dfb16ec0e5d 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a8a471e681a33c8dde0a209900ac24a2e8e7f72", + "version": "1.17.2", + "port-version": 0 + }, { "git-tree": "5d48aae0b9e4a0e201eab417117bab9491665193", "version": "1.17.1", From d32579076a2ec9d9dad07c156831cb01d6192428 Mon Sep 17 00:00:00 2001 From: David Chisnall Date: Thu, 12 Aug 2021 03:25:56 +0100 Subject: [PATCH 0303/1858] The FreeBSD spelling of x86-64 is amd64. (#19456) CMAKE_HOST_SYSTEM_PROCESSOR is set to amd64 on x86-64 FreeBSD systems. CMake's STREQUAL gives a case-sensitive comparison so this case was missed during bootstrapping when using vcpkg as a submodule. --- scripts/buildsystems/vcpkg.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index e59779e4ed04e9..b385476395b5be 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -311,7 +311,9 @@ else() cmake_policy(POP) return() endif() - elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64") + elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "x86_64" OR + CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64" OR + CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "s390x") set(Z_VCPKG_TARGET_TRIPLET_ARCH s390x) From ae10fb00396d80696f7b70e23c1218aea5acebbb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 12 Aug 2021 04:38:08 +0200 Subject: [PATCH 0304/1858] [curl] Update (#18971) * Modernize portfile * Don't export implicit link libraries * Revise osx framework handling * Fix exported per-config location of dependencies * Move curl-config to tools, incl. debug variant * Update to 7.77.0 * Add WinIDN support and default IDN selection * Use pkgconfig for libidn2 configuration * Update to 0.78.0 * Remove obsolete nghttp2 staticlib patch * Fix libs duplication in pc file * Resolve transitive deps for pc file/curl-config * x-add-version * Fix winssl dependencies * Add winldap feature, not default * Update git-tree Co-authored-by: past-due <30942300+past-due@users.noreply.github.com> --- ports/curl/0002_fix_uwp.patch | 12 -- ports/curl/0004_nghttp2_staticlib.patch | 14 --- ports/curl/0005_remove_imp_suffix.patch | 5 +- ports/curl/0012-fix-dependency-idn2.patch | 55 ++------ ports/curl/0020-fix-pc-file.patch | 55 +++++++- ports/curl/0021-normaliz.patch | 13 ++ ports/curl/0022-deduplicate-libs.patch | 25 ++++ ports/curl/portfile.cmake | 145 +++++++++++----------- ports/curl/vcpkg.json | 56 ++++++++- versions/baseline.json | 4 +- versions/c-/curl.json | 5 + 11 files changed, 228 insertions(+), 161 deletions(-) delete mode 100644 ports/curl/0004_nghttp2_staticlib.patch create mode 100644 ports/curl/0021-normaliz.patch create mode 100644 ports/curl/0022-deduplicate-libs.patch diff --git a/ports/curl/0002_fix_uwp.patch b/ports/curl/0002_fix_uwp.patch index 5aa451bf401d91..c1572624a3775f 100644 --- a/ports/curl/0002_fix_uwp.patch +++ b/ports/curl/0002_fix_uwp.patch @@ -13,16 +13,4 @@ index 62b7b33..8a4bd71 100644 if(WIN32) add_definitions(-D_USRDLL) endif() -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9e47967..7694f04 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -505,7 +505,7 @@ if(USE_QUICHE) - cmake_pop_check_state() - endif() - --if(WIN32) -+if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(USE_WIN32_CRYPTO ON) - endif() diff --git a/ports/curl/0004_nghttp2_staticlib.patch b/ports/curl/0004_nghttp2_staticlib.patch deleted file mode 100644 index 4bd6e4afdd77f0..00000000000000 --- a/ports/curl/0004_nghttp2_staticlib.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a13333..2dd274c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -431,6 +431,9 @@ if(USE_NGHTTP2) - find_package(NGHTTP2 REQUIRED) - include_directories(${NGHTTP2_INCLUDE_DIRS}) - list(APPEND CURL_LIBS ${NGHTTP2_LIBRARIES}) -+ if(NOT BUILD_SHARED_LIBS) -+ add_definitions(-DNGHTTP2_STATICLIB) -+ endif() - endif() - - function(CheckQuicSupportInOpenSSL) diff --git a/ports/curl/0005_remove_imp_suffix.patch b/ports/curl/0005_remove_imp_suffix.patch index c83a196520a56c..83ec1051336796 100644 --- a/ports/curl/0005_remove_imp_suffix.patch +++ b/ports/curl/0005_remove_imp_suffix.patch @@ -9,5 +9,6 @@ index 1d71e14..62b7b33 100644 -if(WIN32) +if(WIN32 AND 0) if(BUILD_SHARED_LIBS) - # Add "_imp" as a suffix before the extension to avoid conflicting with the statically linked "libcurl.lib" - set_target_properties(${LIB_NAME} PROPERTIES IMPORT_SUFFIX "_imp.lib") + if(MSVC) + # Add "_imp" as a suffix before the extension to avoid conflicting with + # the statically linked "libcurl.lib" diff --git a/ports/curl/0012-fix-dependency-idn2.patch b/ports/curl/0012-fix-dependency-idn2.patch index 19d5b12307d36f..9388f91a0b2497 100644 --- a/ports/curl/0012-fix-dependency-idn2.patch +++ b/ports/curl/0012-fix-dependency-idn2.patch @@ -1,51 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc7223b..a661cb8 100644 +index 9f6de81..6702845 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -620,9 +620,6 @@ if(NOT CURL_DISABLE_LDAPS) - check_include_file_concat("ldapssl.h" HAVE_LDAPSSL_H) +@@ -632,6 +632,9 @@ endif() + option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) + set(HAVE_LIBIDN2 OFF) + if(USE_LIBIDN2) ++ set(HAVE_LIBIDN2 TRUE) ++ list(APPEND CURL_LIBS ${LIBIDN2_LIBRARIES}) ++elseif(0) + check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) endif() --# Check for idn --check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) -- - # Check for symbol dlopen (same as HAVE_LIBDL) - check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN) - -@@ -870,6 +867,20 @@ if(CURL_CA_PATH_SET AND NOT USE_OPENSSL AND NOT USE_MBEDTLS) - "Set CURL_CA_PATH=none or enable one of those TLS backends.") - endif() - -+if (CMAKE_USE_IDN2) -+ include(FindPackageHandleStandardArgs) -+ include(SelectLibraryConfigurations) -+ -+ find_path(LIBIDN2_INCLUDE_DIRS idn2.h) -+ find_library(LIBIDN2_LIBRARY_DEBUG NAMES libidn2 idn2 PATHS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib NO_DEFAULT_PATH Release RelWithDebInfo MinSizeRel) -+ find_library(LIBIDN2_LIBRARY_RELEASE NAMES libidn2 idn2 PATHS ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib NO_DEFAULT_PATH Debug) -+ select_library_configurations(LIBIDN2) -+ -+ add_definitions(-DHAVE_IDN2_H -DHAVE_LIBIDN2) -+ include_directories(${LIBIDN2_INCLUDE_DIRS}) -+ link_libraries(${LIBIDN2_LIBRARY}) -+endif() -+ - # Check for header files - if(NOT UNIX) - check_include_file_concat("windows.h" HAVE_WINDOWS_H) -@@ -906,7 +917,6 @@ check_include_file_concat("crypto.h" HAVE_CRYPTO_H) - check_include_file_concat("err.h" HAVE_ERR_H) - check_include_file_concat("errno.h" HAVE_ERRNO_H) - check_include_file_concat("fcntl.h" HAVE_FCNTL_H) --check_include_file_concat("idn2.h" HAVE_IDN2_H) - check_include_file_concat("ifaddrs.h" HAVE_IFADDRS_H) - check_include_file_concat("io.h" HAVE_IO_H) - check_include_file_concat("krb.h" HAVE_KRB_H) -@@ -1362,7 +1372,6 @@ _add_if("libz" HAVE_LIBZ) - _add_if("brotli" HAVE_BROTLI) - _add_if("zstd" HAVE_ZSTD) - _add_if("AsynchDNS" USE_ARES OR USE_THREADS_POSIX OR USE_THREADS_WIN32) --_add_if("IDN" HAVE_LIBIDN2) - _add_if("Largefile" (CURL_SIZEOF_CURL_OFF_T GREATER 4) AND - ((SIZEOF_OFF_T GREATER 4) OR USE_WIN32_LARGE_FILES)) - # TODO SSP1 (Schannel) check is missing diff --git a/ports/curl/0020-fix-pc-file.patch b/ports/curl/0020-fix-pc-file.patch index cd79597821941e..c9967ac2c22c92 100644 --- a/ports/curl/0020-fix-pc-file.patch +++ b/ports/curl/0020-fix-pc-file.patch @@ -1,16 +1,59 @@ -diff -urw a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2021-05-10 20:46:52.204346972 +0200 -+++ b/CMakeLists.txt 2021-05-11 19:39:00.065235266 +0200 -@@ -1482,6 +1482,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b2e428..ea430f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1462,7 +1462,26 @@ set(includedir "\${prefix}/include") + set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + set(LIBCURL_LIBS "") + set(libdir "${CMAKE_INSTALL_PREFIX}/lib") +-foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) ++function(flatten input output) ++ set(output_libs "${${output}}") ++ set(input_libs "${${input}}") ++ while(input_libs) ++ list(POP_BACK input_libs lib) ++ if(NOT "${lib}" IN_LIST output_libs) ++ if(TARGET "${lib}") ++ get_target_property(link_libs "${lib}" INTERFACE_LINK_LIBRARIES) ++ if(link_libs) ++ flatten(link_libs output_libs) ++ endif() ++ endif() ++ list(PREPEND output_libs "${lib}") ++ endif() ++ endwhile() ++ set("${output}" "${output_libs}" PARENT_SCOPE) ++endfunction() ++set(CURL_LIBS_FLAT "") ++flatten(CURL_LIBS CURL_LIBS_FLAT) ++foreach(_lib ${CURL_LIBS_FLAT}) + if(TARGET "${_lib}") + set(_libname "${_lib}") + get_target_property(_libtype "${_libname}" TYPE) +@@ -1473,12 +1492,26 @@ foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) + # this information in the .pc file. + continue() + endif() ++ set(_lib NOTFOUND) ++ if(DEFINED CMAKE_BUILD_TYPE) ++ string(TOUPPER "${CMAKE_BUILD_TYPE}" config) ++ get_target_property(_lib "${_libname}" IMPORTED_LOCATION_${config}) ++ endif() ++ if(NOT _lib) + get_target_property(_lib "${_libname}" LOCATION) ++ endif() + if(NOT _lib) message(WARNING "Bad lib in library list: ${_libname}") continue() endif() -+ elseif(_lib MATCHES "^(.*)/([^/]*)[.]framework$") + endif() ++ if(_lib MATCHES "^(.*)/([^/]*)[.]framework$") + if(CMAKE_MATCH_1 IN_LIST CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + set(_lib "-framework ${CMAKE_MATCH_2}") + else() + set(_lib "-framework ${_lib}") + endif() - endif() ++ endif() if(_lib MATCHES ".*/.*" OR _lib MATCHES "^-") set(LIBCURL_LIBS "${LIBCURL_LIBS} ${_lib}") + else() diff --git a/ports/curl/0021-normaliz.patch b/ports/curl/0021-normaliz.patch new file mode 100644 index 00000000000000..ca331cf9afdfac --- /dev/null +++ b/ports/curl/0021-normaliz.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d209be..9f6de81 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -638,7 +638,7 @@ endif() + if(WIN32) + option(USE_WIN32_IDN "Use WinIDN for IDN support" OFF) + if(USE_WIN32_IDN) +- list(APPEND CURL_LIBS "Normaliz") ++ list(APPEND CURL_LIBS "normaliz") + set(WANT_IDN_PROTOTYPES ON) + endif() + endif() diff --git a/ports/curl/0022-deduplicate-libs.patch b/ports/curl/0022-deduplicate-libs.patch new file mode 100644 index 00000000000000..bd027d4cb41442 --- /dev/null +++ b/ports/curl/0022-deduplicate-libs.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 09d82f1..f0d99e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1507,6 +1507,7 @@ else() + set(ENABLE_SHARED "no") + set(ENABLE_STATIC "yes") + set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") ++ set(LIBCURL_LIBS "") + endif() + # "a" (Linux) or "lib" (Windows) + string(REPLACE "." "" libext "${CMAKE_STATIC_LIBRARY_SUFFIX}") +diff --git a/curl-config.in b/curl-config.in +index 8b4a29a..e756ae8 100644 +--- a/curl-config.in ++++ b/curl-config.in +@@ -172,7 +172,7 @@ while test $# -gt 0; do + + --static-libs) + if test "X@ENABLE_STATIC@" != "Xno" ; then +- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ ++ echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_NO_SHARED@ + else + echo "curl was built with static libraries disabled" >&2 + exit 1 diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 6d410fb58b9231..8080bda06effb9 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF e052859759b34d0e05ce0f17244873e5cd7b457b #curl-7_74_0 - SHA512 3dbbab00dda4f0e7d012fab358d2dd1362ff0c0f59c81f638fb547acba6f74a61c306906892447af3b18e8b0ebb93ebb8e0ac77e92247864bfa3a9c4ce7ea1d0 + REF bfbde883af33397943df68a3ae01847a634d33bf #curl-7_78_0 + SHA512 72c2d0daedbd1e0610f507f637c5725cb0769befe5205f613260217b692e27ec135711974f85660f863a49b415c1457d2d29960158758e232caa89f972f7045e HEAD_REF master PATCHES 0002_fix_uwp.patch - 0004_nghttp2_staticlib.patch 0005_remove_imp_suffix.patch 0006_fix_tool_depends.patch 0007_disable_tool_export_curl_target.patch @@ -14,12 +13,14 @@ vcpkg_from_github( 0011_fix_static_build.patch 0012-fix-dependency-idn2.patch 0020-fix-pc-file.patch + 0021-normaliz.patch # for mingw on case-sensitive file system + 0022-deduplicate-libs.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CURL_STATICLIB) # schannel will enable sspi, but sspi do not support uwp -foreach(feature "schannel" "sspi" "tool") +foreach(feature IN ITEMS "schannel" "sspi" "tool" "winldap") if(feature IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) message(FATAL_ERROR "Feature ${feature} is not supported on UWP.") endif() @@ -29,48 +30,61 @@ if("sectransp" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX) message(FATAL_ERROR "sectransp is not supported on non-Apple platforms") endif() +foreach(feature IN ITEMS "winldap" "winidn") + if(feature IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature ${feature} is not supported on non-Windows platforms.") + endif() +endforeach() + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - # Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. - http2 USE_NGHTTP2 - openssl CMAKE_USE_OPENSSL - mbedtls CMAKE_USE_MBEDTLS - ssh CMAKE_USE_LIBSSH2 - tool BUILD_CURL_EXE - c-ares ENABLE_ARES - sspi CURL_WINDOWS_SSPI - brotli CURL_BROTLI - schannel CMAKE_USE_SCHANNEL - sectransp CMAKE_USE_SECTRANSP - idn2 CMAKE_USE_IDN2 - + # Support HTTP2 TLS Download https://curl.haxx.se/ca/cacert.pem rename to curl-ca-bundle.crt, copy it to libcurl.dll location. + http2 USE_NGHTTP2 + openssl CMAKE_USE_OPENSSL + mbedtls CMAKE_USE_MBEDTLS + ssh CMAKE_USE_LIBSSH2 + tool BUILD_CURL_EXE + c-ares ENABLE_ARES + sspi CURL_WINDOWS_SSPI + brotli CURL_BROTLI + schannel CMAKE_USE_SCHANNEL + sectransp CMAKE_USE_SECTRANSP + idn2 USE_LIBIDN2 + winidn USE_WIN32_IDN + winldap USE_WIN32_LDAP INVERTED_FEATURES - non-http HTTP_ONLY + non-http HTTP_ONLY + winldap CURL_DISABLE_LDAP # Only WinLDAP support ATM ) -set(SECTRANSP_OPTIONS) +set(OPTIONS_RELEASE "") +set(OPTIONS_DEBUG "") +if("idn2" IN_LIST FEATURES) + x_vcpkg_pkgconfig_get_modules(PREFIX libidn2 MODULES libidn2 LIBS) + list(APPEND OPTIONS_RELEASE "-DLIBIDN2_LIBRARIES=${libidn2_LIBS_RELEASE}") + list(APPEND OPTIONS_DEBUG "-DLIBIDN2_LIBRARIES=${libidn2_LIBS_DEBUG}") +endif() + +set(SECTRANSP_OPTIONS "") if("sectransp" IN_LIST FEATURES) set(SECTRANSP_OPTIONS -DCURL_CA_PATH=none) endif() # UWP targets -set(UWP_OPTIONS) +set(UWP_OPTIONS "") if(VCPKG_TARGET_IS_UWP) set(UWP_OPTIONS - -DUSE_WIN32_LDAP=OFF -DCURL_DISABLE_TELNET=ON -DENABLE_IPV6=OFF -DENABLE_UNIX_SOCKETS=OFF ) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ${UWP_OPTIONS} - ${ADDITIONAL_SCRIPTS} - ${EXTRA_ARGS} ${SECTRANSP_OPTIONS} -DBUILD_TESTING=OFF -DENABLE_MANUAL=OFF @@ -78,73 +92,54 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON -DENABLE_DEBUG=ON -DCURL_CA_FALLBACK=ON + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} ) - -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() if ("tool" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES curl AUTO_CLEAN) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CURL) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CURL) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") #Fix install path -file(READ ${CURRENT_PACKAGES_DIR}/bin/curl-config CURL_CONFIG) -string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" CURL_CONFIG "${CURL_CONFIG}") -string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" CURL_CONFIG "${CURL_CONFIG}") -string(REPLACE "\nprefix=\${prefix}" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../.. && pwd -P)]=] CURL_CONFIG "${CURL_CONFIG}") -file(WRITE ${CURRENT_PACKAGES_DIR}/bin/curl-config "${CURL_CONFIG}") -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/curl-config ${CURRENT_PACKAGES_DIR}/share/${PORT}/curl-config) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/curl-config) - -file(GLOB FILES ${CURRENT_PACKAGES_DIR}/bin/*) -if(NOT FILES) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curl-config" "\nprefix=\${prefix}" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../.. && pwd -P)]=]) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/curl-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/curl-config") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_PACKAGES_DIR}" "\${prefix}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_INSTALLED_DIR}" "\${prefix}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "\nprefix=\${prefix}/debug" [=[prefix=$(CDPATH= cd -- "$(dirname -- "$0")"/../../../.. && pwd -P)]=]) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "-lcurl" "-lcurl-d") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "curl." "curl-d.") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/curl-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/curl-config") endif() -file(GLOB FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*) -if(NOT FILES) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/curl/curl.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/curl/curl.h" "#ifdef CURL_STATICLIB" "#if 1" ) -else() - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/curl/curl.h - "#ifdef CURL_STATICLIB" - "#if 0" - ) -endif() - - -# Fix the pkgconfig file for debug -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(READ ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libcurl.pc _contents) - string(REPLACE " -lcurl" " -lcurl-d" _contents "${_contents}") - string(REPLACE " -loptimized " " " _contents "${_contents}") - string(REPLACE " -ldebug " " " _contents "${_contents}") - string(REPLACE " ${CURRENT_INSTALLED_DIR}/lib/pthreadVC3.lib" "" _contents "${_contents}") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) - file(WRITE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libcurl.pc "${_contents}") -endif() - -# Fix the pkgconfig file for release -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(READ ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libcurl.pc _contents) - string(REPLACE " -loptimized " " " _contents "${_contents}") - string(REPLACE " -ldebug " " " _contents "${_contents}") - string(REPLACE " ${CURRENT_INSTALLED_DIR}/debug/lib/pthreadVC3d.lib" "" _contents "${_contents}") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) - file(WRITE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libcurl.pc "${_contents}") endif() vcpkg_fixup_pkgconfig() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libcurl.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libcurl.pc" " -lcurl" " -lcurl-d") +endif() file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 7059f6d4749868..281d77f4fba904 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,10 +1,17 @@ { "name": "curl", - "version": "7.74.0", - "port-version": 8, + "version": "7.78.0", "description": "A library for transferring data with URLs", "homepage": "https://github.com/curl/curl", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ @@ -37,10 +44,35 @@ "nghttp2" ] }, + "idn": { + "description": "Default IDN support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "winidn" + ], + "platform": "windows" + }, + { + "name": "curl", + "default-features": false, + "features": [ + "idn2" + ], + "platform": "!windows" + } + ] + }, "idn2": { "description": "idn2 support (libidn2)", "dependencies": [ - "libidn2" + "libidn2", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } ] }, "mbedtls": { @@ -108,7 +140,7 @@ "name": "curl", "default-features": false, "features": [ - "winssl" + "schannel" ], "platform": "(windows & !uwp) | mingw" }, @@ -128,11 +160,27 @@ "tool": { "description": "Builds curl executable" }, + "winidn": { + "description": "WinIDN support" + }, + "winldap": { + "description": "LDAP support (WinLDAP). This feature does not include LDAPS support.", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "non-http" + ] + } + ] + }, "winssl": { "description": "Legacy name for schannel", "dependencies": [ { "name": "curl", + "default-features": false, "features": [ "schannel" ] diff --git a/versions/baseline.json b/versions/baseline.json index 732de601afd139..c1e63b2b8423ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1573,8 +1573,8 @@ "port-version": 0 }, "curl": { - "baseline": "7.74.0", - "port-version": 8 + "baseline": "7.78.0", + "port-version": 0 }, "curlpp": { "baseline": "2018-06-15-3", diff --git a/versions/c-/curl.json b/versions/c-/curl.json index e0b511bb645e8b..7c9b97571943f5 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0be4cff4d8e1d37a9ddf9ab264682771c69c0d72", + "version": "7.78.0", + "port-version": 0 + }, { "git-tree": "cd05855cc1cd2d0f221664f0bfbe639b685fa028", "version": "7.74.0", From 931e7009e96c01764149ac32dc2296f9f1dab7b5 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 12 Aug 2021 10:39:38 +0800 Subject: [PATCH 0305/1858] [mesa] Update to 21.1.6 (#18495) * [mesa] Update to 21.1.2 * Update to 21.1.5 * Update to 21.1.6 * Update the baseline version --- ports/mesa/dual-osmesa-part2b.patch | 13 ------------- ports/mesa/portfile.cmake | 4 ++-- ports/mesa/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mesa.json | 5 +++++ 5 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 ports/mesa/dual-osmesa-part2b.patch diff --git a/ports/mesa/dual-osmesa-part2b.patch b/ports/mesa/dual-osmesa-part2b.patch deleted file mode 100644 index 6d39786d755c25..00000000000000 --- a/ports/mesa/dual-osmesa-part2b.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gallium/meson.build b/src/gallium/meson.build -index 1f81fcf1fd5..5a5a8d2f0a6 100644 ---- a/src/gallium/meson.build -+++ b/src/gallium/meson.build -@@ -175,7 +175,7 @@ if with_dri - subdir('frontends/dri') - subdir('targets/dri') - endif --if with_osmesa == 'gallium' -+if with_osmesa.contains('gallium') - subdir('frontends/osmesa') - subdir('targets/osmesa') - endif diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 0409a61d825f91..62d02a75d23800 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -16,8 +16,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF mesa-21.1.2 - SHA512 746ef292dd93ddd23ab34e18e87196db63302defd99357f31ac24876003c75b32cfa8ed38d0292271cd9142a056f6a6549ffcd0f086d0c69c4ff83ac7195188c + REF mesa-21.1.6 + SHA512 93a44c6a83c03fcf3bbcc650430f8f88f5e4ec001ac982f5359b70c840ed43980ae9734db2ad77ef9bb958187948364f32e601d5a5f0087c7adb990073c33339 HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 60db1d7a724c59..19167072bf6ed7 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mesa", - "version": "21.1.2", + "version": "21.1.6", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "supports": "!(windows & arm)", diff --git a/versions/baseline.json b/versions/baseline.json index c1e63b2b8423ff..f083492c0e46c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4037,7 +4037,7 @@ "port-version": 0 }, "mesa": { - "baseline": "21.1.2", + "baseline": "21.1.6", "port-version": 0 }, "meschach": { diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index aeb14f4b6cb1fd..ee1f3234ac8b67 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "315d3fe5a64b2a34efeb9caee72c7922bc48c148", + "version": "21.1.6", + "port-version": 0 + }, { "git-tree": "58f52d4a0724c6d4d393b48e232ca323d8670df6", "version": "21.1.2", From 18512e3fb3e7b2526616ec94dce86b4066ecee0c Mon Sep 17 00:00:00 2001 From: Matthieu Penant Date: Wed, 11 Aug 2021 22:42:01 -0400 Subject: [PATCH 0306/1858] [bshoshany-thread-pool] add a new port (1.9) (#19470) * [bshoshany-thread-pool] new port * formatting vcpkg.json * update version file * baseline update based on bot comments * Update ports/bshoshany-thread-pool/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bshoshany-thread-pool/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update bshoshany-thread-pool.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/bshoshany-thread-pool/portfile.cmake | 19 +++++++++++++++++++ ports/bshoshany-thread-pool/vcpkg.json | 6 ++++++ versions/b-/bshoshany-thread-pool.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 38 insertions(+) create mode 100644 ports/bshoshany-thread-pool/portfile.cmake create mode 100644 ports/bshoshany-thread-pool/vcpkg.json create mode 100644 versions/b-/bshoshany-thread-pool.json diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake new file mode 100644 index 00000000000000..4c45e8f9ccfd78 --- /dev/null +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -0,0 +1,19 @@ +#header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO bshoshany/thread-pool + REF v1.9 + SHA512 d87c67218a5373181332caa53aa611b79345df56fe2ba1452dbd552ef43fdeecbf2f6347f86c4730423c1545b4dc45524a4737949359cdda5ff911ce647eb8f4 + HEAD_REF master +) + +# Install headers (header-only): +file(GLOB HEADER_FILES LIST_DIRECTORIES false "${SOURCE_PATH}/*.hpp") +file(INSTALL + "${HEADER_FILES}" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" + +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json new file mode 100644 index 00000000000000..4982a910c83ab2 --- /dev/null +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "bshoshany-thread-pool", + "version": "1.9", + "description": "A C++17 Thread Pool for High-Performance Scientific Computing", + "homepage": "https://github.com/bshoshany/thread-pool" +} diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json new file mode 100644 index 00000000000000..6c5ef150c46ba1 --- /dev/null +++ b/versions/b-/bshoshany-thread-pool.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4ec35ab1086df444d30b05ff49cf2a66c21ebd52", + "version": "1.9", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f083492c0e46c1..02fa424c766602 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1076,6 +1076,10 @@ "baseline": "1.11.0", "port-version": 0 }, + "bshoshany-thread-pool": { + "baseline": "1.9", + "port-version": 0 + }, "bsio": { "baseline": "1.0.0", "port-version": 0 From e94c88893812487477dacacb1fa1ef86e9148ee8 Mon Sep 17 00:00:00 2001 From: Edoardo Lolletti Date: Thu, 12 Aug 2021 04:42:28 +0200 Subject: [PATCH 0307/1858] [openal-soft] enable coreaudio backend for ios (#19464) * [openal-soft] enable coreaudio backend for ios * update port version * Merge cmake checks * Rename outdated cmake variable * Update version files --- ports/openal-soft/portfile.cmake | 8 ++++---- ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 09090babaf41d5..79ea4a0c7cc51f 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -18,7 +18,7 @@ endif() set(ALSOFT_REQUIRE_LINUX OFF) set(ALSOFT_REQUIRE_WINDOWS OFF) -set(ALSOFT_REQUIRE_OSX OFF) +set(ALSOFT_REQUIRE_APPLE OFF) if(VCPKG_TARGET_IS_LINUX) set(ALSOFT_REQUIRE_LINUX ON) @@ -26,8 +26,8 @@ endif() if(VCPKG_TARGET_IS_WINDOWS) set(ALSOFT_REQUIRE_WINDOWS ON) endif() -if(VCPKG_TARGET_IS_OSX) - set(ALSOFT_REQUIRE_OSX ON) +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) + set(ALSOFT_REQUIRE_APPLE ON) endif() vcpkg_configure_cmake( @@ -46,7 +46,7 @@ vcpkg_configure_cmake( -DALSOFT_BACKEND_SNDIO=OFF -DALSOFT_BACKEND_PORTAUDIO=OFF -DALSOFT_BACKEND_PULSEAUDIO=OFF - -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_OSX} + -DALSOFT_BACKEND_COREAUDIO=${ALSOFT_REQUIRE_APPLE} -DALSOFT_BACKEND_JACK=OFF -DALSOFT_BACKEND_OPENSL=OFF -DALSOFT_BACKEND_WAVE=ON diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index 6783a1bed171ec..c96c68a3c6ea18 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.21.1", - "port-version": 1, + "port-version": 2, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 02fa424c766602..b52840b021d60a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4582,7 +4582,7 @@ }, "openal-soft": { "baseline": "1.21.1", - "port-version": 1 + "port-version": 2 }, "openblas": { "baseline": "0.3.15", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 0b2d40ef9ba925..9a6e6a3edd9317 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b1e7ccf10631bcb24825e8742bf18de9c561e71", + "version-semver": "1.21.1", + "port-version": 2 + }, { "git-tree": "cb266fe5f02b9d2b5cb38343d25083359062bd07", "version-semver": "1.21.1", From 961de1da7712d2722bcd99675287864a667248b0 Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 12 Aug 2021 15:56:51 -0700 Subject: [PATCH 0308/1858] [fdk-aac] make patent-encumbered HE-AAC optional (#16007) * [fdk-aac] make patent-encumbered HE-AAC optional By default, use a fork of fdk-aac (which was originally written by Fraunhofer for the Android Open Source Project) which has support for the patent-encumbered HE-AAC, HE-AACv2, and xHE-AAC profiles removed. This fork is used by Fedora and Arch Linux to provide support for most AAC use cases without patent licensing fees and to permit combining it with GPL software. The upstream fdk-aac with support for all AAC profiles can be built with the new 'he-aac' option for this port. Fedora Legal's opinion, from https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112 : The Fedora Project is aware that the Free Software Foundation has stated that the Fraunhofer FDK AAC license is GPL incompatible, specifically, because of Clause 3. We believe that the fdk-aac software codec implementation that we wish to include in Fedora is no longer encumbered by AAC patents. This fact means that Clause 3 in the FDK AAC license is a "no op", or to put it plainly, if no patents are in play, there are no patent licenses to disclaim. For this (and only this) specific implementation of fdk-aac, we believe that the FDK AAC license is GPL compatible. Also: * remove restriction on dynamic linking. Upstream has a .def file which is used by CMake. * replace deprecated vcpkg functions * [ffmpeg] use fdk-aac[he-aac] for fdk-aac feature There is no point to this feature without HE-AAC because FFmpeg has its own AAC codec that does not support HE-AAC. --- ports/fdk-aac/portfile.cmake | 41 ++++++++++++++++++++++++------------ ports/fdk-aac/vcpkg.json | 20 ++++++++++++++++-- ports/ffmpeg/vcpkg.json | 12 ++++++++--- versions/baseline.json | 4 ++-- versions/f-/fdk-aac.json | 5 +++++ versions/f-/ffmpeg.json | 5 +++++ 6 files changed, 66 insertions(+), 21 deletions(-) diff --git a/ports/fdk-aac/portfile.cmake b/ports/fdk-aac/portfile.cmake index 5a6119724e390b..4b44fb0626885b 100644 --- a/ports/fdk-aac/portfile.cmake +++ b/ports/fdk-aac/portfile.cmake @@ -1,23 +1,36 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mstorsjo/fdk-aac - REF v2.0.2 - SHA512 616207e85035d1659a2b7808ca6ec02ef53c1c4b39eb280fe861f82a4cf548e5db2ac381c496bad37dfc2b8c6677fe704d9fd8449e43d1f93d3e636239e0191b - HEAD_REF master +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + FEATURES + he-aac HE_AAC ) -vcpkg_configure_cmake( +if(HE_AAC) + vcpkg_from_github( + REPO mstorsjo/fdk-aac + REF v2.0.2 + SHA512 616207e85035d1659a2b7808ca6ec02ef53c1c4b39eb280fe861f82a4cf548e5db2ac381c496bad37dfc2b8c6677fe704d9fd8449e43d1f93d3e636239e0191b + HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + ) +else() + vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org/ + REPO wtaymans/fdk-aac-stripped + REF 585981a49f2186b0d2e47c64bf6b5abf539395f8 # corresponds to v2.0.2 tag in mstorsjo/fdk-aac GitHub repository + HEAD_REF stripped4 + SHA512 e0e56396ed0be427302ed4b54fc6e8dc522a172c288b7c1ec40cc3a9ceb13518ca7bbb874bc71b88b2a91e0bbbe4ad0bab6910efa1db63d91e6370976641bac4 + OUT_SOURCE_PATH SOURCE_PATH + ) +endif() + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS_RELEASE -DBUILD_PROGRAMS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(INSTALL ${SOURCE_PATH}/NOTICE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +file(INSTALL "${SOURCE_PATH}/NOTICE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fdk-aac/vcpkg.json b/ports/fdk-aac/vcpkg.json index 4f3cbf7233637e..046d06500152d3 100644 --- a/ports/fdk-aac/vcpkg.json +++ b/ports/fdk-aac/vcpkg.json @@ -1,6 +1,22 @@ { "name": "fdk-aac", "version-semver": "2.0.2", - "description": "A standalone library of the Fraunhofer FDK AAC code", - "homepage": "https://github.com/mstorsjo/fdk-aac" + "port-version": 1, + "description": "A standalone Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android. Uses a fork without HE-AAC, HE-AACv2, or xHE-AAC support to avoid patent licensing and GPL compatibility issues when built without the he-aac option.", + "homepage": "https://gitlab.freedesktop.org/wtaymans/fdk-aac-stripped", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "he-aac": { + "description": "Support patent-encumbered HE-AAC, HE-AACv2, and xHE-AAC codec profiles. Do not distribute binaries with this option without the relevant patent licenses if you are in a jurisdiction that recognizes software patents. Might not be compatible with the GPL depending on legal interpretation. Refer to https://bugzilla.redhat.com/show_bug.cgi?id=1501522#c112" + } + } } diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 854bcaf1ab33dd..db07eba9bf53a3 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 12, + "port-version": 13, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -299,9 +299,15 @@ ] }, "fdk-aac": { - "description": "AAC de/encoding via libfdk-aac", + "description": "AAC de/encoding via libfdk-aac, **including GPL-incompatible patent-encumbered HE-AAC**. If you do not require HE-AAC, use the built-in FFmpeg AAC codec.", "dependencies": [ - "fdk-aac", + { + "name": "fdk-aac", + "default-features": false, + "features": [ + "he-aac" + ] + }, { "name": "ffmpeg", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index b52840b021d60a..1f34323f21d642 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2006,7 +2006,7 @@ }, "fdk-aac": { "baseline": "2.0.2", - "port-version": 0 + "port-version": 1 }, "fdlibm": { "baseline": "5.3-4", @@ -2014,7 +2014,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 12 + "port-version": 13 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/fdk-aac.json b/versions/f-/fdk-aac.json index 7af5ccc08feced..31c4b7a24ff37c 100644 --- a/versions/f-/fdk-aac.json +++ b/versions/f-/fdk-aac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56f6b0699ef8d63059cd4ecb1bdc7613104d7cf8", + "version-semver": "2.0.2", + "port-version": 1 + }, { "git-tree": "01ec3a3ac30a2128fb45b82c526e9fcf4d87de9a", "version-semver": "2.0.2", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index df25f3a8269941..d8746e3a67aefb 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26e3d87d6b3049b45355f36a34402b938d5b486d", + "version": "4.4", + "port-version": 13 + }, { "git-tree": "4d910207840ec65730eb972e472dab548fb8b5d2", "version": "4.4", From 40186d6a846ccfb713e978feabf38e7f3104236b Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 12 Aug 2021 19:26:09 -0700 Subject: [PATCH 0309/1858] [rtaudio] Fix hidden dependencies on Linux (#19516) --- ports/rtaudio/LICENSE | 26 -------------------------- ports/rtaudio/portfile.cmake | 17 ++++++++++------- ports/rtaudio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rtaudio.json | 5 +++++ 5 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 ports/rtaudio/LICENSE diff --git a/ports/rtaudio/LICENSE b/ports/rtaudio/LICENSE deleted file mode 100644 index 4a6357c2b02c80..00000000000000 --- a/ports/rtaudio/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -RtAudio: a set of realtime audio i/o C++ classes -Copyright (c) 2001-2019 Gary P. Scavone - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -Any person wishing to distribute modifications to the Software is -asked to send the modifications to the original developer so that -they can be incorporated into the canonical version. This is, -however, not a binding provision of this license. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake index 2a10e34e93b6b6..bd01993ae6d248 100644 --- a/ports/rtaudio/portfile.cmake +++ b/ports/rtaudio/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( HEAD_REF master ) +if(VCPKG_HOST_IS_LINUX) + message(WARNING "rtaudio requires ALSA on Linux; this is available on ubuntu via apt install libasound2-dev") +endif() + if(VCPKG_CRT_LINKAGE STREQUAL static) set(RTAUDIO_STATIC_MSVCRT ON) else() @@ -22,7 +26,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DRTAUDIO_STATIC_MSVCRT=${RTAUDIO_STATIC_MSVCRT} ${FEATURE_OPTIONS} + OPTIONS + -DRTAUDIO_STATIC_MSVCRT=${RTAUDIO_STATIC_MSVCRT} + -DRTAUDIO_API_JACK=OFF + -DRTAUDIO_API_PULSE=OFF + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -31,9 +39,4 @@ vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -# Version 5.1.0 has the license text embedded in the README.md, so we are including it as a standalone file in the vcpkg port -# Current master version of rtaudio has a LICENSE file which should be used instead for ports of future releases -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json index 7ad1c148d70488..1dc3e1df8fcfa6 100644 --- a/ports/rtaudio/vcpkg.json +++ b/ports/rtaudio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtaudio", "version-date": "2021-05-18", + "port-version": 1, "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", "homepage": "https://github.com/thestk/rtaudio", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 1f34323f21d642..e135641ae6da09 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5666,7 +5666,7 @@ }, "rtaudio": { "baseline": "2021-05-18", - "port-version": 0 + "port-version": 1 }, "rtlsdr": { "baseline": "2020-04-16-1", diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json index caf165f36fcb5f..5978c80e68fe45 100644 --- a/versions/r-/rtaudio.json +++ b/versions/r-/rtaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73b803ac8a870dd48165b34aecc29f2155b5b172", + "version-date": "2021-05-18", + "port-version": 1 + }, { "git-tree": "0c7518511b154ea4ca636e2f6c43248b59cb47ed", "version-date": "2021-05-18", From 28dd02f604065a91eb3f51963f8c675260c55fe3 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 12 Aug 2021 20:49:50 -0700 Subject: [PATCH 0310/1858] [vcpkg] Update tool to 2021-08-12. (#19543) Resolves #17897 --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index 364a4e19e5efc8..e7835b32752637 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-08-03/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-08-12/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 488ba5d9355813..1a3253ec9e2818 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -278,8 +278,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-08-03" -vcpkgToolReleaseSha="d4c25be83a7685bc268254909796b9ef8e1549454a45b1154ab1d64f9846c91ce48c8a1cf00a864afb9a6dd878d82ceaea5981d53e57968196a9b6e90934fdef" +vcpkgToolReleaseTag="2021-08-12" +vcpkgToolReleaseSha="a8b64125fb065129f7db48b299d8868a0394aa8a5c45e7c6076773d4bab9ca4b4d6cc4459df0df3399a7241fa0d168cdd2ab6169e4d8b7e6f708a52f003265b1" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" From d52a1816b796b2ee75feb85b1cc0eb7c7a1382bd Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 12 Aug 2021 23:37:35 -0700 Subject: [PATCH 0311/1858] [catch2] Update to version 2.13.7 (#19376) * update version to 2.13.7 * fixup deprecated functions * apply cmake quoting guidelines * update baseline * remove unneeded quotes * update baseline * update baseline * restore versions from master * add new versions --- ports/catch2/portfile.cmake | 11 +++++------ ports/catch2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/catch2.json | 5 +++++ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index fcc6ab942273d1..b157b48cdcf4c4 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO catchorg/Catch2 - REF 5c88067bd339465513af4aec606bd2292f1b594a # v2.13.6 - SHA512 62ab120ef9cbbcf7320a96654bda60c766dbbcc0d9cbb2b0b36dd04e828315b627caf51e390dcea915efa266655fe0f28058b972c0d6e0e3e457c565d26e1fd3 + REF v2.13.7 + SHA512 1c3cbdecc6a3b59360a97789c4784d79d027e1b63bdc42b0e152c3272f7bad647fcd1490aa5caf67f968a6311dc9624b5a70d5eb3fbc1d5179d520e09b76c9ed HEAD_REF master PATCHES fix-install-path.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DCATCH_BUILD_EXAMPLES=OFF @@ -24,8 +24,7 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/sha file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Catch2) - +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Catch2") vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index 0b81964b47a40d..dc2af5075b1af4 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "catch2", - "version-semver": "2.13.6", - "port-version": 2, + "version-semver": "2.13.7", "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e135641ae6da09..95076c3d761f42 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1157,8 +1157,8 @@ "port-version": 0 }, "catch2": { - "baseline": "2.13.6", - "port-version": 2 + "baseline": "2.13.7", + "port-version": 0 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 646d520aaf9e84..5986f9ef0d828f 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff", + "version-semver": "2.13.7", + "port-version": 0 + }, { "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25", "version-semver": "2.13.6", From 7fc6c8fd9a523168be32bc2ca1119cb88b10b53a Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 13 Aug 2021 23:46:11 +0800 Subject: [PATCH 0312/1858] [ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature (#19358) * [ffmpeg/opencv4] Update opencv4 feature dependency and remove ffmpeg feature 'postproc' from default feature * Update the baseline version * [opencv3] Update the feature dependency * Update the baseline * [opencv2] Update the feature dependency * Update the baseline version * Fix uwp build failures * Update the baseline version * Fix opencv2 version * update the baseline version * update the baseline version * Un-edit git-tree. * Update cuda feature * Update the baseline Co-authored-by: Billy Robert O'Neal III --- ports/ffmpeg/vcpkg.json | 3 +- ports/opencv2/CONTROL | 49 --------- ports/opencv2/portfile.cmake | 26 ++--- ports/opencv2/vcpkg.json | 101 ++++++++++++++++++ .../opencv3/0010-fix-uwp-tiff-imgcodecs.patch | 15 +++ ports/opencv3/portfile.cmake | 30 +++--- ports/opencv3/vcpkg.json | 21 +++- .../opencv4/0010-fix-uwp-tiff-imgcodecs.patch | 15 +++ ports/opencv4/portfile.cmake | 36 +++---- ports/opencv4/vcpkg.json | 20 +++- versions/baseline.json | 8 +- versions/f-/ffmpeg.json | 5 + versions/o-/opencv2.json | 5 + versions/o-/opencv3.json | 5 + versions/o-/opencv4.json | 5 + 15 files changed, 240 insertions(+), 104 deletions(-) delete mode 100644 ports/opencv2/CONTROL create mode 100644 ports/opencv2/vcpkg.json create mode 100644 ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch create mode 100644 ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index db07eba9bf53a3..29870bdc9e0b65 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 13, + "port-version": 14, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -22,7 +22,6 @@ "avdevice", "avfilter", "avformat", - "postproc", "swresample", "swscale" ], diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL deleted file mode 100644 index 266a77f40e9854..00000000000000 --- a/ports/opencv2/CONTROL +++ /dev/null @@ -1,49 +0,0 @@ -Source: opencv2 -Version: 2.4.13.7 -Port-Version: 5 -Build-Depends: zlib -Description: computer vision library, version 2 -Default-Features: eigen, jpeg, png, tiff - -Feature: cuda -Build-Depends: cuda -Description: CUDA support for opencv - -Feature: eigen -Build-Depends: eigen3 -Description: Eigen support for opencv - -Feature: ffmpeg -Build-Depends: ffmpeg -Description: ffmpeg support for opencv - -Feature: jasper -Build-Depends: jasper -Description: JPEG 2000 support for opencv - -Feature: jpeg -Build-Depends: libjpeg-turbo -Description: JPEG support for opencv - -Feature: openexr -Build-Depends: openexr -Description: OpenEXR support for opencv - -Feature: opengl -Build-Depends: opengl -Description: opengl support for opencv - -Feature: png -Build-Depends: libpng -Description: PNG support for opencv - -Feature: qt -Build-Depends: qt5-base[core] -Description: Qt GUI support for opencv - -Feature: tiff -Build-Depends: tiff -Description: TIFF support for opencv - -Feature: world -Description: Compile to a single package support for opencv diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 6cd8b48a7b9f93..bc6805f48ac63e 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -32,6 +32,7 @@ file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake") file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/FindCUDA") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES "cuda" WITH_CUDA "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG @@ -57,9 +58,8 @@ if("ffmpeg" IN_LIST FEATURES) endif() endif() -vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ###### ocv_options -DCMAKE_DEBUG_POSTFIX=d @@ -95,12 +95,12 @@ vcpkg_configure_cmake( -DWITH_CUBLAS=OFF # newer libcublas cannot be found by the old cuda cmake script in opencv2, requires a fix ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/opencv" TARGET_PATH "share/opencv") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" "set(CMAKE_IMPORT_FILE_VERSION 1) find_package(CUDA QUIET) @@ -113,14 +113,14 @@ set(CMAKE_AUTOUIC ON) find_package(Qt5 COMPONENTS OpenGL Concurrent Test QUIET) find_package(TIFF QUIET)" OPENCV_MODULES "${OPENCV_MODULES}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json new file mode 100644 index 00000000000000..db74a35649dbe3 --- /dev/null +++ b/ports/opencv2/vcpkg.json @@ -0,0 +1,101 @@ +{ + "name": "opencv2", + "version": "2.4.13.7", + "port-version": 6, + "description": "computer vision library", + "homepage": "https://github.com/opencv/opencv", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "eigen", + "jpeg", + "png", + "tiff" + ], + "features": { + "cuda": { + "description": "CUDA support for opencv", + "dependencies": [ + "cuda" + ] + }, + "eigen": { + "description": "Eigen support for opencv", + "dependencies": [ + "eigen3" + ] + }, + "ffmpeg": { + "description": "ffmpeg support for opencv", + "dependencies": [ + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat", + "swresample", + "swscale" + ] + } + ] + }, + "jasper": { + "description": "JPEG 2000 support for opencv", + "dependencies": [ + "jasper" + ] + }, + "jpeg": { + "description": "JPEG support for opencv", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "openexr": { + "description": "OpenEXR support for opencv", + "dependencies": [ + "openexr" + ] + }, + "opengl": { + "description": "opengl support for opencv", + "dependencies": [ + "opengl" + ] + }, + "png": { + "description": "PNG support for opencv", + "dependencies": [ + "libpng" + ] + }, + "qt": { + "description": "Qt GUI support for opencv", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] + }, + "tiff": { + "description": "TIFF support for opencv", + "dependencies": [ + "tiff" + ] + }, + "world": { + "description": "Compile to a single package support for opencv" + } + } +} diff --git a/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch b/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch new file mode 100644 index 00000000000000..02fbaedd5484cc --- /dev/null +++ b/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch @@ -0,0 +1,15 @@ +diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt +index 24f89e6..435deb6 100644 +--- a/modules/imgcodecs/CMakeLists.txt ++++ b/modules/imgcodecs/CMakeLists.txt +@@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python) + + ocv_clear_vars(GRFMT_LIBS) + ++if(MSVC) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++endif() ++ + if(HAVE_WINRT_CX AND NOT WINRT) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") + endif() diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 5e298acbc1f200..741570731c59cb 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( 0005-fix-vtk9.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch + 0010-fix-uwp-tiff-imgcodecs.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -252,9 +253,8 @@ if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm") set(BUILD_opencv_bgsegm OFF) endif() -vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ###### opencv cpu recognition is broken, always using host and not target: here we bypass that -DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE @@ -344,12 +344,12 @@ vcpkg_configure_cmake( ${ADDITIONAL_BUILD_FLAGS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/opencv" TARGET_PATH "share/opencv") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) find_dependency(protobuf CONFIG) if(protobuf_FOUND) @@ -437,20 +437,20 @@ find_dependency(Qt5 COMPONENTS OpenGL Concurrent Test)") "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") if(VCPKG_TARGET_IS_ANDROID) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/README.android) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/README.android) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 50d927750ac693..5bf690492155a9 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,10 +1,18 @@ { "name": "opencv3", "version": "3.4.14", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ @@ -68,7 +76,16 @@ "ffmpeg": { "description": "ffmpeg support for opencv", "dependencies": [ - "ffmpeg" + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat", + "swresample", + "swscale" + ] + } ] }, "flann": { diff --git a/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch b/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch new file mode 100644 index 00000000000000..02fbaedd5484cc --- /dev/null +++ b/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch @@ -0,0 +1,15 @@ +diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt +index 24f89e6..435deb6 100644 +--- a/modules/imgcodecs/CMakeLists.txt ++++ b/modules/imgcodecs/CMakeLists.txt +@@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python) + + ocv_clear_vars(GRFMT_LIBS) + ++if(MSVC) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996") ++endif() ++ + if(HAVE_WINRT_CX AND NOT WINRT) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW") + endif() diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index e21711d1d916fd..5e7b0037025a7c 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_from_github( 0006-fix-uwp.patch 0008-devendor-quirc.patch 0009-fix-qt-integration.patch + 0010-fix-uwp-tiff-imgcodecs.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -118,9 +119,9 @@ endif() if("cuda" IN_LIST FEATURES) vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/79c6cee80a2df9a196f20afd6b598a9810964c32.zip" - FILENAME "opencv-cache/nvidia_optical_flow/ca5acedee6cb45d0ec610a6732de5c15-79c6cee80a2df9a196f20afd6b598a9810964c32.zip" - SHA512 d80cdedec588dafaad4ebb8615349f842ecdc64d3ca9480fee7086d606e6f2362606a9a2ce273c5cf507be2840ec24bbcbe32c2962672c3bcfb72d31428ef73d + URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + FILENAME "opencv-cache/nvidia_optical_flow/a73cd48b18dcc0cc8933b30796074191-edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + SHA512 12d655ac9fcfc6df0186daa62f7185dadd489f0eeea25567d78c2b47a9840dcce2bd03a3e9b3b42f125dbaf3150f52590ea7597dc1dc8acee852dc0aed56651e ) endif() @@ -309,9 +310,8 @@ if("qt" IN_LIST FEATURES) list(APPEND ADDITIONAL_BUILD_FLAGS "-DCMAKE_AUTOMOC=ON") endif() -vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ###### opencv cpu recognition is broken, always using host and not target: here we bypass that -DOPENCV_SKIP_SYSTEM_PROCESSOR_DETECTION=TRUE @@ -404,12 +404,12 @@ vcpkg_configure_cmake( ${ADDITIONAL_BUILD_FLAGS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/opencv" TARGET_PATH "share/opencv") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME opencv CONFIG_PATH "share/opencv") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES) + file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) find_dependency(protobuf CONFIG) if(protobuf_FOUND) @@ -497,20 +497,20 @@ find_dependency(Qt5 COMPONENTS OpenGL Concurrent Test)") "OgreGLSupport" OPENCV_MODULES "${OPENCV_MODULES}") endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" "${OPENCV_MODULES}") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") if(VCPKG_TARGET_IS_ANDROID) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/README.android) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/README.android) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.android") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.android") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 7d01aec4e93bce..2e4209af165164 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,9 +1,18 @@ { "name": "opencv4", "version": "4.5.2", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ @@ -63,7 +72,16 @@ "ffmpeg": { "description": "ffmpeg support for opencv", "dependencies": [ - "ffmpeg" + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "avcodec", + "avformat", + "swresample", + "swscale" + ] + } ] }, "gdcm": { diff --git a/versions/baseline.json b/versions/baseline.json index 95076c3d761f42..dcfb6a37776224 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2014,7 +2014,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 13 + "port-version": 14 }, "ffnvcodec": { "baseline": "10.0.26.0", @@ -4622,15 +4622,15 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 5 + "port-version": 6 }, "opencv3": { "baseline": "3.4.14", - "port-version": 1 + "port-version": 2 }, "opencv4": { "baseline": "4.5.2", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index d8746e3a67aefb..4fb6cbd411c06a 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d893a1c421f553fbdd9c1f79530a6a84bd0eb76", + "version": "4.4", + "port-version": 14 + }, { "git-tree": "26e3d87d6b3049b45355f36a34402b938d5b486d", "version": "4.4", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index 11fd9d437cbf5a..d983d361d982bf 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e85a45aa17a47da9f965b93cb0c6fc8273a7ca04", + "version": "2.4.13.7", + "port-version": 6 + }, { "git-tree": "50a5602ecab15fd1c36f0619a5fdbd4792eb1b23", "version-string": "2.4.13.7", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 2294e2eb7d528f..7410ce9634142c 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c91b306c8fc5cbdffa178a247051d306240c55ad", + "version": "3.4.14", + "port-version": 2 + }, { "git-tree": "850be938a178de206c52be71229048d501bd61e8", "version": "3.4.14", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index fa8a26c8599343..e3d7ac5a1cf6ec 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e659d7d78204aee895e5f222f7cf9beb90df8a31", + "version": "4.5.2", + "port-version": 1 + }, { "git-tree": "ac5c96fd5709b302c81b76814a3ccfd99dcdecdc", "version": "4.5.2", From c6743da93cbd51789939b7087bbd3f50e7004219 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 13 Aug 2021 13:39:28 -0700 Subject: [PATCH 0313/1858] Skip embree2 in CI for static triplets due to conflicts. Common name problem reported upstream as https://github.com/embree/embree/issues/331 (#19553) ``` Starting package 3/3: embree3:x64-windows-static Building package embree3[avx,avx2,core,sse2,sse42]:x64-windows-static... -- Using C:/Dev/vcpkg/downloads/embree-embree-v3.12.2.tar.gz -- Extracting source C:/Dev/vcpkg/downloads/embree-embree-v3.12.2.tar.gz -- Applying patch fix-path.patch -- Applying patch fix-static-usage.patch -- Applying patch cmake_policy.patch -- Applying patch fix-targets-file-not-found.patch -- Using source at C:/Dev/vcpkg/buildtrees/embree3/src/v3.12.2-cbae4ce8b1.clean -- Found external ninja('1.10.2'). -- Configuring x64-windows-static-dbg -- Configuring x64-windows-static-rel -- Building x64-windows-static-dbg -- Building x64-windows-static-rel -- Installing: C:/Dev/vcpkg/packages/embree3_x64-windows-static/share/embree3/copyright -- Performing post-build validation -- Performing post-build validation done Building package embree3[avx,avx2,core,sse2,sse42]:x64-windows-static... done Installing package embree3[avx,avx2,core,sse2,sse42]:x64-windows-static... The following files are already installed in C:/Dev/vcpkg/installed/x64-windows-static and are in conflict with embree3:x64-windows-static Installed by embree2:x64-windows-static debug/lib/embree_avx.lib debug/lib/embree_avx2.lib debug/lib/embree_sse42.lib debug/lib/lexers.lib debug/lib/math.lib debug/lib/simd.lib debug/lib/sys.lib debug/lib/tasking.lib lib/embree_avx.lib lib/embree_avx2.lib lib/embree_sse42.lib lib/lexers.lib lib/math.lib lib/simd.lib lib/sys.lib lib/tasking.lib Please ensure you're using the latest portfiles with `.\vcpkg update`, then submit an issue at https://github.com/Microsoft/vcpkg/issues including: Package: embree3:x64-windows-static Vcpkg version: 2021-08-12-85ab112d5ee102bc6eac8cdbbfdd173a71374e04 Additionally, attach any relevant sections from the log files above. ``` --- scripts/ci.baseline.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a1e9fabebb2245..ee3dec09cbf17a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -262,6 +262,10 @@ ecsutil:x64-osx=fail ecsutil:x64-uwp=fail # Checks for gnu extension so only works with gcc. elfutils:x64-osx=fail +# embree creates common conflicting static library names when built in static mode, reported upstream: +# https://github.com/embree/embree/issues/331 +embree2:x64-windows-static=skip +embree2:x64-windows-static-md=skip enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail From 09aa63226374a115028b69000bb4aaf64e9de759 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 14 Aug 2021 04:40:07 +0800 Subject: [PATCH 0314/1858] [openimageio] Fix broken hash (#19541) * [openimageio] Fix broken hash * Update the baseline --- ports/openimageio/portfile.cmake | 32 ++++++++++++++------------------ ports/openimageio/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index ab0e6d37286e61..86c2899d8fd779 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0 - SHA512 1b6a5e41607bd68590a19672ca777c953b92b347425c9fe8ca7d096959bece789d043a0fae1f7bf00a88dcb11815dd3501414c9ad979e1fe9dd1613bb9e04b0b + SHA512 36e3aef52e082fcff64a16d10ad372a6335b3562c3d6e62aac88173476ae6c3694ac565084d50551724f47be83a7a8182e608c81c7a787392e576d9c401f65f5 HEAD_REF master PATCHES fix-config-cmake.patch @@ -25,11 +25,7 @@ file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" file(MAKE_DIRECTORY "${SOURCE_PATH}/ext/robin-map/tsl") -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(LINKSTATIC ON) -else() - set(LINKSTATIC OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LINKSTATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -50,10 +46,10 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} -DOIIO_BUILD_TESTS=OFF -DUSE_DCMTK=OFF -DUSE_NUKE=OFF @@ -67,11 +63,11 @@ vcpkg_configure_cmake( -DVERBOSE=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/OpenImageIO TARGET_PATH share/OpenImageIO) +vcpkg_cmake_config_fixup(PACKAGE_NAME OpenImageIO CONFIG_PATH lib/cmake/OpenImageIO) if("tools" IN_LIST FEATURES) vcpkg_copy_tools( @@ -81,13 +77,13 @@ if("tools" IN_LIST FEATURES) endif() # Clean -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc - ${CURRENT_PACKAGES_DIR}/debug/doc - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" + "${CURRENT_PACKAGES_DIR}/debug/doc" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY ${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/OpenImageIO) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/OpenImageIO) +file(COPY "${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 8ec421738f6b4a..c89d105d69b09e 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openimageio", "version": "2.2.17.0", + "port-version": 1, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ @@ -24,6 +25,14 @@ "openexr", "robin-map", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index dcfb6a37776224..9b230c1d0b332b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4658,7 +4658,7 @@ }, "openimageio": { "baseline": "2.2.17.0", - "port-version": 0 + "port-version": 1 }, "openjpeg": { "baseline": "2.3.1", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 6c38b7238ddddd..97fa6210a7a997 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1567eaa1f67e0996635f0d4213b55e9b97882acf", + "version": "2.2.17.0", + "port-version": 1 + }, { "git-tree": "886169206344e33a401999f301de01fe1e4fed01", "version": "2.2.17.0", From ce893433543486a52af2834730d4e6c344296aaa Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 13 Aug 2021 13:40:21 -0700 Subject: [PATCH 0315/1858] [google-cloud-cpp] update to latest release (v1.30.1) (#19507) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 41673b2bb7099b..6fb513e504e0c6 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.30.0 - SHA512 4609bd1240ed88d7f4d7b1685f96fdbfffa0f8a296f24fa69984d14351671bfa7c283975978b1c41b816ed5cb181da0166bc5f9377d362331e2de42b66f1d1ae + REF v1.30.1 + SHA512 2a49c92eae39e2389bb8c765c2aa9374ae38a64f8f19a7744887d2176dc846017d8bc78c0391c55654765aaeff11bb1f3ea7e904d1e7b16580941ab74585e8bc HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 21cb89cafc6778..f744436ff4527d 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.30.0", + "version": "1.30.1", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9b230c1d0b332b..cb50c1f406373e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2381,7 +2381,7 @@ "port-version": 6 }, "google-cloud-cpp": { - "baseline": "1.30.0", + "baseline": "1.30.1", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 50db2196ffb3e8..8431af02c4e74f 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "254b48f7254b7ab5b4ac6676ccd3149274f154f0", + "version": "1.30.1", + "port-version": 0 + }, { "git-tree": "4cc90bac3e6db351ea0daa3de00a32947c3b2050", "version": "1.30.0", From 3bdd7c1ad062a8810080e9459721ab29e5c1cff4 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 14 Aug 2021 04:41:32 +0800 Subject: [PATCH 0316/1858] [proj4] Fix the usage (#19474) * [proj4] Fix the usage * Update the baseline * Small changes * Update the baseline version * Remove PREFER_NINJA * Update the baseline revision * Update the version scheme * Update the baseline version * Avoid configure_file to fill out proj4. Co-authored-by: Billy Robert O'Neal III --- ports/proj4/portfile.cmake | 7 +++---- ports/proj4/usage | 2 +- ports/proj4/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/p-/proj4.json | 5 +++++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index feff73e4fcbce9..c19e07b076dfa2 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -44,7 +44,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DPROJ_LIB_SUBDIR=lib -DPROJ_INCLUDE_SUBDIR=include @@ -65,7 +64,7 @@ endif () file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - vcpkg_copy_pdbs() + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/proj4/usage b/ports/proj4/usage index a2297ca02b2729..ebf9f6c8d5aae1 100644 --- a/ports/proj4/usage +++ b/ports/proj4/usage @@ -1,4 +1,4 @@ -The package ${PORT}:${TARGET_TRIPLET} provides CMake targets: +The package proj4 provides CMake targets: find_package(PROJ CONFIG REQUIRED) target_link_libraries(main PRIVATE PROJ::proj) diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 234f924946256d..770896f9c5f12c 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proj4", - "version-string": "7.2.1", - "port-version": 3, + "version-semver": "7.2.1", + "port-version": 4, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cb50c1f406373e..93c21df746b2e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5074,7 +5074,7 @@ }, "proj4": { "baseline": "7.2.1", - "port-version": 3 + "port-version": 4 }, "prometheus-cpp": { "baseline": "0.12.3", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index d5bbf1d9afb6a4..077e213aa2445a 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dee626b6811eafe58cf40fbceeb3cc28dfaf678c", + "version-semver": "7.2.1", + "port-version": 4 + }, { "git-tree": "8fc1b6bdde08a3b1f131df5a4f042885dcc7a58d", "version-string": "7.2.1", From 4b2a2a2033af529203cb2317561cacc564d56357 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Fri, 13 Aug 2021 23:41:51 +0300 Subject: [PATCH 0317/1858] [aom] Update to 3.1.2 (#19505) * [aom] Update aom 3.1.0 -> 3.1.2 * [aom] vcpkg x-add-version --all --- ports/aom/portfile.cmake | 4 ++-- ports/aom/vcpkg.json | 2 +- versions/a-/aom.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index 65193664274b98..a3f84e8b295545 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -13,8 +13,8 @@ vcpkg_add_to_path(${PERL_PATH}) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" - REF 33aff8586e35ffe385637f6aa2c991858c0fb58e - TAG v3.1.0 + REF 8f85bb1d686647d0f7dc1e7220f94f55193d2c89 + TAG v3.1.2 PATCHES aom-rename-static.diff # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index d3743ba17b17a9..39edcf982d16ae 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aom", - "version-semver": "3.1.0", + "version-semver": "3.1.2", "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "supports": "!uwp & !arm", diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 075bb35c32be87..2bf33521699e89 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d55b62e714b84f2c3f2df02299f4a708a705c21f", + "version-semver": "3.1.2", + "port-version": 0 + }, { "git-tree": "b465c1a32eeac8dfe55239134d800c309b16b33f", "version-semver": "3.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index 93c21df746b2e7..48e9a0a6961a2c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -97,7 +97,7 @@ "port-version": 2 }, "aom": { - "baseline": "3.1.0", + "baseline": "3.1.2", "port-version": 0 }, "approval-tests-cpp": { From dc21a108e0c45f6c423039a0903eba9e30dddfa3 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 13 Aug 2021 22:57:28 +0200 Subject: [PATCH 0318/1858] [OpenCV] update to v4.5.3 and to v3.4.15 (#18827) * [OpenCV] update to v4.5.3 and to v3.4.15 * [OpenCV] update refs * [libxml2] add missing find_dependency(Iconv) [libiconv] update cmake wrapper * [libiconv] fix hints * [opencv4] do not require cudnn if cuda enabled * [opencv] update refs * [OpenCV] increase CI coverage even more * [vcpkg-ci-opencv] trying to restore x64-uwp ci tests * restore previous patches to avoid unnecessary modifications * [OpenCV] fix refs * [OpenCV] fix CMake Warning related to protobuf dependency * [OpenCV] fix refs * [libxml2] fix references * [libxml2] restore previous cmake wrapper, new one is broken * [libxml2] fix references * bump versions * update refs * [libxml2] Update the format for vcpkg-cmake-wrapper.cmake * Update versions/l-/libxml2.json * [libxml2] update port version * [libxml2] update refs * [OpenCV] fix refs Co-authored-by: NancyLi1013 --- ports/libiconv/CONTROL | 2 +- ports/libiconv/vcpkg-cmake-wrapper.cmake | 14 +++++--- ports/libxml2/vcpkg-cmake-wrapper.cmake | 29 +++++----------- ports/libxml2/vcpkg.json | 2 +- ports/opencv/vcpkg.json | 14 +++++++- ports/opencv3/0002-install-options.patch | 6 ++-- ports/opencv3/0006-fix-uwp.patch | 4 +-- ports/opencv3/portfile.cmake | 8 ++--- ports/opencv3/vcpkg.json | 3 +- ports/opencv4/0002-install-options.patch | 10 +++--- ports/opencv4/0004-fix-policy-CMP0057.patch | 4 +-- ports/opencv4/0006-fix-uwp.patch | 4 +-- ports/opencv4/0008-devendor-quirc.patch | 4 +-- ports/opencv4/0009-fix-qt-integration.patch | 37 --------------------- ports/opencv4/portfile.cmake | 16 ++++----- ports/opencv4/vcpkg.json | 17 ++++++++-- scripts/test_ports/vcpkg-ci-opencv/CONTROL | 4 +-- versions/baseline.json | 14 ++++---- versions/l-/libiconv.json | 5 +++ versions/l-/libxml2.json | 5 +++ versions/o-/opencv.json | 5 +++ versions/o-/opencv3.json | 5 +++ versions/o-/opencv4.json | 5 +++ 23 files changed, 110 insertions(+), 107 deletions(-) delete mode 100644 ports/opencv4/0009-fix-qt-integration.patch diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL index 6eed4fee330808..2e69c031b37ea7 100644 --- a/ports/libiconv/CONTROL +++ b/ports/libiconv/CONTROL @@ -1,5 +1,5 @@ Source: libiconv Version: 1.16 -Port-Version: 9 +Port-Version: 10 Homepage: https://www.gnu.org/software/libiconv/ Description: GNU Unicode text conversion diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake index db39413da1f899..8e25449ae2d4d5 100644 --- a/ports/libiconv/vcpkg-cmake-wrapper.cmake +++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake @@ -2,14 +2,20 @@ include(SelectLibraryConfigurations) _find_package(${ARGS}) if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) - find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib) + find_path(CHARSET_INCLUDE_DIR NAMES "libcharset.h" HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include") + find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug") + find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib HINTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}") select_library_configurations(CHARSET) + if(NOT TARGET Iconv::Charset) + add_library(Iconv::Charset INTERFACE IMPORTED) + set_target_properties(Iconv::Charset PROPERTIES + INTERFACE_LINK_LIBRARIES "\$<\$>:${CHARSET_LIBRARY_RELEASE}>;\$<\$:${CHARSET_LIBRARY_DEBUG}>" + INTERFACE_INCLUDE_DIRECTORIES "${CHARSET_INCLUDE_DIRS}") + endif() if(CHARSET_LIBRARIES) list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES}) if(TARGET Iconv::Iconv) - target_link_libraries(Iconv::Iconv INTERFACE ${CHARSET_LIBRARIES}) + set_property(TARGET Iconv::Iconv APPEND PROPERTY INTERFACE_LINK_LIBRARIES Iconv::Charset) endif() endif() endif() diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 6209ea464f773e..9287c37e630bce 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -9,21 +9,17 @@ endif() if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0}_CONFIG) find_package(LibLZMA) find_package(ZLIB) + find_package(Iconv) include(SelectLibraryConfigurations) find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) - find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib) - find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) - find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib) unset(LIBXML2_LIBRARIES) unset(LIBXML2_LIBRARY CACHE) select_library_configurations(LIBXML2) - select_library_configurations(ICONV) - select_library_configurations(CHARSET) list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) + if(Iconv_LIBRARIES) + list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) + endif() if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_RELEASE) set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBXML2_LIBRARY_RELEASE}") endif() @@ -43,20 +39,11 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 target_link_libraries(LibXml2::LibXml2 INTERFACE "ws2_32") endif() endif() - if(ICONV_LIBRARIES) - list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES}) - if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES}) - endif() - endif() - if(CHARSET_LIBRARIES) - list(APPEND LIBXML2_LIBRARIES ${CHARSET_LIBRARIES}) - if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${CHARSET_LIBRARIES}) - endif() - endif() if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES}) + target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB") + if(TARGET Iconv::Iconv) + target_link_libraries(LibXml2::LibXml2 INTERFACE "Iconv::Iconv") + endif() endif() cmake_policy(POP) endif() diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 0483b7f92820bc..228b43572206ce 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.12", - "port-version": 2, + "port-version": 3, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 5327c1ce6ac962..23374c7cc4943a 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.5.2", + "version": "4.5.3", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -54,6 +54,18 @@ } ] }, + "cudnn": { + "description": "cuDNN support for opencv", + "dependencies": [ + { + "name": "opencv4", + "default-features": false, + "features": [ + "cudnn" + ] + } + ] + }, "dnn": { "description": "Enable dnn module", "dependencies": [ diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 665ec01e62364b..481f17651e451a 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -12,17 +12,17 @@ index f6a2da5..10aa531 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 3cb10a1..fc81377 100644 +index 303d4f4..b727937 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -276,7 +276,6 @@ if(MSVC) +@@ -284,7 +284,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") - endif() + set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake index c7f9fc2..a1f657b 100644 --- a/cmake/OpenCVGenConfig.cmake diff --git a/ports/opencv3/0006-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch index 013c8adebb2799..13048d030750c3 100644 --- a/ports/opencv3/0006-fix-uwp.patch +++ b/ports/opencv3/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index bcbca83..872f05f 100644 +index 5501b99..578b00e 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1186,7 +1186,7 @@ function(ocv_add_perf_tests) +@@ -1188,7 +1188,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 741570731c59cb..618f2f17013222 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -6,13 +6,13 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -set(OPENCV_VERSION "3.4.14") +set(OPENCV_VERSION "3.4.15") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 b8373ead40549e3d487227947c6bd00f6eba368e48bb9356d41cb0f3bfabfb0b10b6e64712febc11ab1e5a1901b1db8b83b63ba492f4e3816c15fa7ddaaf7e69 + SHA512 775149e56f0aa94d53eb024404866380d97ce423ef1c8343ee8f12c1377e454ae182b2528e86949b5f7250e551d464bd1a5de2e2d9f0d0e1dd3dc188a1db790d HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -116,7 +116,7 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 30f4f25e40908a9d823304197c475dc0f1ae2b24ec5b1ce0484b39959b88897d1291b5b0e12530db24af96d664e90137582e4b03e4dca7fde1319044bdec9b77 + SHA512 639f5f869d68014fcc5041f5fe890c98635610d8b26c9964721e2fbe74ce8a12aef8f305364ff024fe0086bf2e7252c4fdd00a5de08854fdcd285c0f4916125a HEAD_REF master PATCHES 0007-fix-hdf5.patch @@ -351,7 +351,7 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(protobuf CONFIG) +find_dependency(Protobuf CONFIG) if(protobuf_FOUND) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 5bf690492155a9..6c88ac069601ee 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv3", - "version": "3.4.14", - "port-version": 2, + "version": "3.4.15", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index ed32c5d31e6c9c..b681c066c1c6fc 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a0c62e..118b318 100644 +index 49abe01..b51bcde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -610,7 +610,7 @@ endif() +@@ -616,7 +616,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,17 +12,17 @@ index 5a0c62e..118b318 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 40a058d..04f50fb 100644 +index 6e56a2e..11034db 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -278,7 +278,6 @@ if(MSVC) +@@ -286,7 +286,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") - endif() + set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake index 838852c..04906b3 100644 --- a/cmake/OpenCVGenConfig.cmake diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch index 5ec18320fd3760..bc7b21de56d9e7 100644 --- a/ports/opencv4/0004-fix-policy-CMP0057.patch +++ b/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -1,9 +1,9 @@ diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt -index 3a79631..b8ac4d5 100644 +index 534fcf0..a02460c 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -1,3 +1,4 @@ +cmake_minimum_required(VERSION 3.3) set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer, mfx, msmf or special value 'all')") - set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building videoio plugin support") + set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building and using of videoio plugins") mark_as_advanced(VIDEOIO_PLUGIN_LIST VIDEOIO_ENABLE_PLUGINS) diff --git a/ports/opencv4/0006-fix-uwp.patch b/ports/opencv4/0006-fix-uwp.patch index 983170e60abcc9..02589858331b12 100644 --- a/ports/opencv4/0006-fix-uwp.patch +++ b/ports/opencv4/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 224953a..3b3a3b2 100644 +index 7c48aad..0d261b0 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1200,7 +1200,7 @@ function(ocv_add_perf_tests) +@@ -1205,7 +1205,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv4/0008-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch index ead184c4077906..d5a3f624cace47 100644 --- a/ports/opencv4/0008-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 118b318..b6e661d 100644 +index b51bcde..15edc92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -795,7 +795,7 @@ if(WITH_OPENVX) +@@ -803,7 +803,7 @@ if(WITH_OPENVX) endif() if(WITH_QUIRC) diff --git a/ports/opencv4/0009-fix-qt-integration.patch b/ports/opencv4/0009-fix-qt-integration.patch deleted file mode 100644 index 4496c5f275a9f2..00000000000000 --- a/ports/opencv4/0009-fix-qt-integration.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f479935cda5eb38a4a4a9e909b6f4f82a0c7533d Mon Sep 17 00:00:00 2001 -From: Christoph Rackwitz -Date: Thu, 8 Apr 2021 12:59:06 +0200 -Subject: [PATCH] fix for #19870 - -HAVE_QT and HAVE_WIN32UI can both be true at the same time -if HAVE_QT, window_w32.cpp is not included in the build, see CMakeLists.txt ---- - modules/highgui/src/window.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp -index 406871b7e8f8..d2cf1e1e4826 100644 ---- a/modules/highgui/src/window.cpp -+++ b/modules/highgui/src/window.cpp -@@ -93,7 +93,9 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu - break; - - case cv::WND_PROP_VSYNC: -- #if defined (HAVE_WIN32UI) -+ #if defined (HAVE_QT) -+ // nothing -+ #elif defined (HAVE_WIN32UI) - cvSetPropVsync_W32(name, (prop_value != 0)); - #else - // not implemented yet for other toolkits -@@ -191,7 +193,9 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id) - break; - - case cv::WND_PROP_VSYNC: -- #if defined (HAVE_WIN32UI) -+ #if defined (HAVE_QT) -+ return -1; -+ #elif defined (HAVE_WIN32UI) - return cvGetPropVsync_W32(name); - #else - return -1; diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 5e7b0037025a7c..72d389d52e4425 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,13 +6,13 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.5.2") +set(OPENCV_VERSION "4.5.3") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec + SHA512 efd2214f29b1eb2e1ae55280f9fc2f64af7c2e91154264c43d0d4186dd5b8f81e86942dff612d08cd9eaa834421457fe765760181160168cd4c52839a0739758 HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -22,7 +22,6 @@ vcpkg_from_github( 0005-fix-eigen.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch - 0009-fix-qt-integration.patch 0010-fix-uwp-tiff-imgcodecs.patch ) @@ -48,6 +47,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "contrib" WITH_CONTRIB "cuda" WITH_CUBLAS "cuda" WITH_CUDA + "cudnn" WITH_CUDNN "eigen" WITH_EIGEN "ffmpeg" WITH_FFMPEG "gdcm" WITH_GDCM @@ -119,9 +119,9 @@ endif() if("cuda" IN_LIST FEATURES) vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.zip" - FILENAME "opencv-cache/nvidia_optical_flow/a73cd48b18dcc0cc8933b30796074191-edb50da3cf849840d680249aa6dbef248ebce2ca.zip" - SHA512 12d655ac9fcfc6df0186daa62f7185dadd489f0eeea25567d78c2b47a9840dcce2bd03a3e9b3b42f125dbaf3150f52590ea7597dc1dc8acee852dc0aed56651e + URLS "https://github.com/NVIDIA/NVIDIAOpticalFlowSDK/archive/edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + FILENAME "opencv-cache/nvidia_optical_flow/a73cd48b18dcc0cc8933b30796074191-edb50da3cf849840d680249aa6dbef248ebce2ca.zip" + SHA512 12d655ac9fcfc6df0186daa62f7185dadd489f0eeea25567d78c2b47a9840dcce2bd03a3e9b3b42f125dbaf3150f52590ea7597dc1dc8acee852dc0aed56651e ) endif() @@ -141,7 +141,7 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b + SHA512 5b48e2aedcf8c64fcfe80fad243c455c1bb9bfd10741c5ba03679ef26b28f61767fec632a9a9828a87a90542488354ebbbe8c65845bf2ae55b15a721c147a30a HEAD_REF master PATCHES 0007-fix-hdf5.patch @@ -411,7 +411,7 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(protobuf CONFIG) +find_dependency(Protobuf CONFIG) if(protobuf_FOUND) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 2e4209af165164..7edc329f4801cc 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.5.2", - "port-version": 1, + "version": "4.5.3", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -47,7 +46,6 @@ "description": "CUDA support for opencv", "dependencies": [ "cuda", - "cudnn", { "name": "opencv4", "default-features": false, @@ -57,6 +55,19 @@ } ] }, + "cudnn": { + "description": "cuDNN support for opencv", + "dependencies": [ + "cudnn", + { + "name": "opencv4", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + }, "dnn": { "description": "Enable dnn module", "dependencies": [ diff --git a/scripts/test_ports/vcpkg-ci-opencv/CONTROL b/scripts/test_ports/vcpkg-ci-opencv/CONTROL index 46e451828aad6e..bdf5f4251f3b2f 100644 --- a/scripts/test_ports/vcpkg-ci-opencv/CONTROL +++ b/scripts/test_ports/vcpkg-ci-opencv/CONTROL @@ -1,6 +1,6 @@ Source: vcpkg-ci-opencv Version: 1 -Port-Version: 2 +Port-Version: 3 Homepage: https://github.com/microsoft/vcpkg Description: Port to force features of certain ports within CI -Build-Depends: opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,gdcm,ipp,jasper,jpeg,lapack,openexr,opengl,openmp,png,qt,sfm,tiff,vtk,webp](!uwp&!(windows&(arm|arm64))), opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,jpeg,png,tiff,webp](uwp|(windows&(arm|arm64))) +Build-Depends: opencv[cuda,cudnn,halide,ovis,tbb](windows&x64&!static&!uwp), opencv[gdcm,ipp,jasper,lapack,openexr,opengl,openmp,qt,sfm,vtk](!uwp&!(windows&(arm|arm64))), opencv[core,nonfree,ade,contrib,dnn,eigen,ffmpeg,jpeg,png,quirc,tiff,webp] diff --git a/versions/baseline.json b/versions/baseline.json index 48e9a0a6961a2c..94f34acba5d7a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3290,7 +3290,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 9 + "port-version": 10 }, "libics": { "baseline": "1.6.4", @@ -3786,7 +3786,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 2 + "port-version": 3 }, "libxmlmm": { "baseline": "0.6.0", @@ -4617,7 +4617,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.2", + "baseline": "4.5.3", "port-version": 0 }, "opencv2": { @@ -4625,12 +4625,12 @@ "port-version": 6 }, "opencv3": { - "baseline": "3.4.14", - "port-version": 2 + "baseline": "3.4.15", + "port-version": 0 }, "opencv4": { - "baseline": "4.5.2", - "port-version": 1 + "baseline": "4.5.3", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 8569e1f65afcfd..63631614f331b5 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "59948ca7f6b4427c2ea93be7a1558843cdd8cde3", + "version-string": "1.16", + "port-version": 10 + }, { "git-tree": "1350957315a151eb58fa91c61c3fa754126135a1", "version-string": "1.16", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index ea8950c96acbcf..455ba947736e3c 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "091644d055f6ab14ab96001c90418be9f5c4d6e3", + "version-semver": "2.9.12", + "port-version": 3 + }, { "git-tree": "f86cd2ab2c75dcd8e97ee18191b343f0b31bfb7c", "version-semver": "2.9.12", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index d12fa045f16ccf..c648300620d9ec 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b13218917e1efe74e37b28a13cfc8cc7572241e", + "version": "4.5.3", + "port-version": 0 + }, { "git-tree": "d3815d0156fdd054436e6abc00d13129cb1bc347", "version": "4.5.2", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 7410ce9634142c..69366e64d78559 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb4ed9774da974697dde70c75cbf9639e9209673", + "version": "3.4.15", + "port-version": 0 + }, { "git-tree": "c91b306c8fc5cbdffa178a247051d306240c55ad", "version": "3.4.14", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index e3d7ac5a1cf6ec..befb61c69fe7b8 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7110f51e74414c1111a6403d1979f7786c5f2ad", + "version": "4.5.3", + "port-version": 0 + }, { "git-tree": "e659d7d78204aee895e5f222f7cf9beb90df8a31", "version": "4.5.2", From 6108943051a8d0c14ec44710e42c5394d1d2c7cb Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 13 Aug 2021 16:12:24 -0700 Subject: [PATCH 0319/1858] Update VMs for Patch Tuesday, 2021-08-11 (#19508) * Deploy SDKs with full features first to ensure we get Debugging Tools for Windows. * Update VMs for Patch Tuesday, 2021-08-11 --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- .../azure-pipelines/windows/create-vmss.ps1 | 4 ++-- ...indows-wdk.ps1 => deploy-windows-sdks.ps1} | 20 ++++++++++--------- .../windows/provision-entire-image.ps1 | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) rename scripts/azure-pipelines/windows/{deploy-windows-wdk.ps1 => deploy-windows-sdks.ps1} (56%) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 9b509ea1f88e4f..474dbd254ee1b3 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-07-14' - linux-pool: 'PrLin-2021-07-14' + windows-pool: 'PrWin-2021-08-12' + linux-pool: 'PrLin-2021-08-11' osx-pool: 'PrOsx-2021-07-27' stages: diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 index 7e93dded48eb24..c9f29922504546 100644 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -362,11 +362,11 @@ function Invoke-ScriptWithPrefix { } } -Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw +Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName #################################################################################################### -Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-wdk.ps1' -AddAdminPw +Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName #################################################################################################### diff --git a/scripts/azure-pipelines/windows/deploy-windows-wdk.ps1 b/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 similarity index 56% rename from scripts/azure-pipelines/windows/deploy-windows-wdk.ps1 rename to scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 index d145f79d71a8ec..9c6ca0a5d110b2 100644 --- a/scripts/azure-pipelines/windows/deploy-windows-wdk.ps1 +++ b/scripts/azure-pipelines/windows/deploy-windows-sdks.ps1 @@ -5,29 +5,27 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$WindowsWDKUrl = 'https://go.microsoft.com/fwlink/?linkid=2128854' - <# .SYNOPSIS -Installs Windows WDK version 2004 +Installs Windows PSDK/WDK .DESCRIPTION -Downloads the Windows WDK installer located at $Url, and installs it with the +Downloads the Windows PSDK/DDK installer located at $Url, and installs it with the correct flags. .PARAMETER Url The URL of the installer. #> -Function InstallWindowsWDK { +Function InstallWindowsDK { Param( [String]$Url ) try { - Write-Host 'Downloading Windows WDK...' + Write-Host "Downloading Windows PSDK or DDK $Url..." [string]$installerPath = Get-TempFilePath -Extension 'exe' curl.exe -L -o $installerPath -s -S $Url - Write-Host 'Installing Windows WDK...' + Write-Host 'Installing...' $proc = Start-Process -FilePath $installerPath -ArgumentList @('/features', '+', '/q') -Wait -PassThru $exitCode = $proc.ExitCode if ($exitCode -eq 0) { @@ -39,9 +37,13 @@ Function InstallWindowsWDK { } } catch { - Write-Error "Failed to install Windows WDK! $($_.Exception.Message)" + Write-Error "Failed to install Windows PSDK or DDK! $($_.Exception.Message)" throw } } -InstallWindowsWDK -Url $WindowsWDKUrl +# Windows 10 SDK, version 2004 (10.0.19041.0) +InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2120843' + +# Windows 10 WDK, version 2004 +InstallWindowsDK 'https://go.microsoft.com/fwlink/?linkid=2128854' diff --git a/scripts/azure-pipelines/windows/provision-entire-image.ps1 b/scripts/azure-pipelines/windows/provision-entire-image.ps1 index 9e1c1b268c065d..00c2d28cac0068 100644 --- a/scripts/azure-pipelines/windows/provision-entire-image.ps1 +++ b/scripts/azure-pipelines/windows/provision-entire-image.ps1 @@ -4,8 +4,8 @@ . "$PSScriptRoot\utility-prefix.ps1" . "$PSScriptRoot\deploy-tlssettings.ps1" -RebootIfRequired 0 +. "$PSScriptRoot\deploy-windows-sdks.ps1" . "$PSScriptRoot\deploy-visual-studio.ps1" -. "$PSScriptRoot\deploy-windows-wdk.ps1" . "$PSScriptRoot\deploy-mpi.ps1" . "$PSScriptRoot\deploy-cuda.ps1" . "$PSScriptRoot\deploy-inteloneapi.ps1" From 40391d90625e8901dd33d1f16c498ec9f5dceae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 14 Aug 2021 13:37:08 +0800 Subject: [PATCH 0320/1858] [vcpkg_find_fortran] Update libiconv and zlib hash (#19545) * [vcpkg_find_fortran] Update libiconv hash * Fix more hash --- scripts/cmake/vcpkg_find_fortran.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake index 9ec5ced9384a14..ad790abb86e9a4 100644 --- a/scripts/cmake/vcpkg_find_fortran.cmake +++ b/scripts/cmake/vcpkg_find_fortran.cmake @@ -54,11 +54,11 @@ function(vcpkg_find_fortran additional_cmake_args_out) "https://repo.msys2.org/mingw/i686/mingw-w64-i686-headers-git-8.0.0.5966.f5da805f-1-any.pkg.tar.zst" dbb9f8258da306a3441f9882faa472c3665a67b2ea68657f3e8a1402dcfacf9787a886a3daf0eefe4946f04557bc166eb15b21c1093ad85c909002daadba1923 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libiconv-1.16-2-any.pkg.tar.zst" - ba236e1efc990cb91d459f938be6ca6fc2211be95e888d73f8de301bce55d586f9d2b6be55dacb975ec1afa7952b510906284eff70210238919e341dffbdbeb8 + fe48d0d3c582fee1edb178425c6daf619d86362442c729047b3c356be26491164f92be1d87950429d2faca4ed3cf76cb4aafef1af3c87b780eee85ee85a4b4c5 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-windows-default-manifest-6.4-3-any.pkg.tar.xz" 5b99abc55eaa74cf85ca64a9c91542554cb5c1098bc71effba9bd36242694cfd348503fcd3507fb9ba97486108c092c925e2f38cd744493386b3dc9ab28bc526 "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zlib-1.2.11-8-any.pkg.tar.zst" - 459850a8c42b1d497268736629ef713beee70cd0d3161d02c7a9fad08aca4560f4e17ba02d5cabda8a19d7c614f7e0ef5a6ec13afd91dd3004057139a5469c8f + 46bbf0f28d9faf047221def19e6f94b9556fc6c951cad9c4fb657fde9d15303b9cb64aad11eaa57892cde49eafb43fbe2ec6da6b612449a20ae49dc8233e945b "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.4.5-1-any.pkg.tar.zst" 68f431073717b59549ab0fd26be8df8afcb43f3dd85be2ffcbc7d1a629999eed924656a7fc3f50937b2e6605a5067542d016181106b7bc3408b89b268ced5d23 ) From cab35af9d9e89079189ad3cc83d46fefc4b45f14 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Mon, 16 Aug 2021 13:42:31 -0700 Subject: [PATCH 0321/1858] [rollup:2021-08-09] Rollup PR (#19469) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [rollup:2021-08-09] PR #16706 (@JackBoosY) [vcpkg_fixup_cmake_targets] Fix up OSX system development path * [rollup:2021-08-09] PR #19238 (@strega-nil) [scripts-audit] vcpkg_download_distfile * [rollup:2021-08-09] PR #19239 (@strega-nil) [scripts-audit] vcpkg_find_fortran * [rollup:2021-08-09] PR #19338 (@strega-nil) [tinyfiledialogs] Fix for good * [rollup:2021-08-09] PR #19348 (@strega-nil) [scripts-audit] vcpkg_fixup_pkgconfig * fix ports.cmake with newer vcpkg_download_distfile * fix vcpkg create * move vcpkg_common_definitions down so that it's not incorrect * fix vcpkg_internal_get_cmake_vars Co-authored-by: nicole mazzuca Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- docs/maintainers/vcpkg_find_fortran.md | 12 +- docs/maintainers/vcpkg_from_git.md | 5 + ports/tinyfiledialogs/portfile.cmake | 11 +- ports/tinyfiledialogs/vcpkg.json | 4 +- ports/vcpkg-cmake-config/vcpkg.json | 3 +- .../vcpkg_cmake_config_fixup.cmake | 40 +- scripts/cmake/vcpkg_download_distfile.cmake | 381 +++++++++--------- scripts/cmake/vcpkg_find_fortran.cmake | 62 +-- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 40 +- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 213 +++++----- scripts/cmake/vcpkg_from_git.cmake | 98 +++-- scripts/get_cmake_vars/CMakeLists.txt | 2 + scripts/ports.cmake | 130 +++--- versions/baseline.json | 6 +- versions/t-/tinyfiledialogs.json | 5 + versions/v-/vcpkg-cmake-config.json | 5 + 16 files changed, 594 insertions(+), 423 deletions(-) diff --git a/docs/maintainers/vcpkg_find_fortran.md b/docs/maintainers/vcpkg_find_fortran.md index ccd37ec86262f4..227c1c8372a2a3 100644 --- a/docs/maintainers/vcpkg_find_fortran.md +++ b/docs/maintainers/vcpkg_find_fortran.md @@ -8,7 +8,17 @@ Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran ## Usage ```cmake -vcpkg_find_fortran() +vcpkg_find_fortran() +``` + +## Example +```cmake +vcpkg_find_fortran(fortran_args) +# ... +vcpkg_configure_cmake(... + OPTIONS + ${fortran_args} +) ``` ## Source diff --git a/docs/maintainers/vcpkg_from_git.md b/docs/maintainers/vcpkg_from_git.md index 85bb3f90929bb5..de56c605459801 100644 --- a/docs/maintainers/vcpkg_from_git.md +++ b/docs/maintainers/vcpkg_from_git.md @@ -27,6 +27,11 @@ The url of the git repository. ### REF The git sha of the commit to download. +### FETCH_REF +The git branch to fetch in non-HEAD mode. After this is fetched, +then `REF` is checked out. This is useful in cases where the git server +does not allow checking out non-advertised objects. + ### HEAD_REF The git branch to use when the package is requested to be built from the latest sources. diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index 27e5209599518b..2bc52913a975ee 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -2,11 +2,12 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_from_sourceforge( +vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - REPO tinyfiledialogs - SHA512 d63d6dd847d6bbd1f252c8fbd228086381af7189ac71afc97bd57e06badd1d3f4d90c6aab6207191ae7253d5a71fc44636cf8e33714089d5b478dd2714f59376 - FILENAME "tinyfiledialogs-current.zip" + FETCH_REF master + HEAD_REF master + URL https://git.code.sf.net/p/tinyfiledialogs/code + REF e11f94cd7887b101d64f74892d769f0139b5e166 ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") @@ -26,6 +27,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(READ "${CURRENT_PACKAGES_DIR}/include/tinyfiledialogs/tinyfiledialogs.h" _contents) # reads between the line "- License -" and a closing "*/" if (NOT _contents MATCHES [[- License -(([^*]|\*[^/])*)\*/]]) - message(FATAL_ERROR "Failed to parse license from tinyfiledialogs.h") + message(FATAL_ERROR "Failed to parse license from tinyfiledialogs.h") endif() file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "${CMAKE_MATCH_1}") diff --git a/ports/tinyfiledialogs/vcpkg.json b/ports/tinyfiledialogs/vcpkg.json index 48819cab3afaa4..1695d500790680 100644 --- a/ports/tinyfiledialogs/vcpkg.json +++ b/ports/tinyfiledialogs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyfiledialogs", - "version-semver": "3.8.8", - "port-version": 1, + "version": "3.8.8", + "port-version": 2, "description": "Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more", "homepage": "https://sourceforge.net/projects/tinyfiledialogs/", "supports": "!uwp", diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 49faaf4d402b37..71d81f250c405a 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,5 +1,4 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-05-22", - "port-version": 1 + "version-date": "2021-08-11" } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index a145d324a91d8c..3cb60fe6bedd99 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -221,6 +221,44 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(WRITE "${main_cmake}" "${contents}") endforeach() + if (VCPKG_TARGET_IS_OSX) + # see #16259 for details why this replacement is necessary. + file(GLOB targets_files "${release_share}/*[Tt]argets.cmake") + if (targets_files STREQUAL "") + file(GLOB targets_files "${release_share}/*[Cc]onfig.cmake") + endif() + foreach(targets_file IN LISTS targets_files) + file(READ "${targets_file}" targets_content) + string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*\n" library_contents "${targets_content}") + foreach(line IN LISTS library_contents) + set(fixed_line "${line}") + string(REGEX MATCHALL [[/[^ ;"]+/[^ ;"/]+\.framework]] frameworks "${line}") + foreach(framework IN LISTS frameworks) + if(NOT framework MATCHES [[^(.+)/(.+)\.framework$]]) + continue() + endif() + set(path "${CMAKE_MATCH_1}") + set(name "${CMAKE_MATCH_2}") + if(NOT DEFINED VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + set(_saved_buildtrees_dir "${CURRENT_BUILDTREES_DIR}") + set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/get-cmake-vars") + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") + set(VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES}" PARENT_SCOPE) + set(CURRENT_BUILDTREES_DIR "${_saved_buildtrees_dir}") + endif() + list(FIND VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${path}" index) + if(NOT index EQUAL -1) + string(REPLACE "${framework}" "-framework ${name}" fixed_line "${fixed_line}") + endif() + endforeach() + string(REPLACE "${line}" "${fixed_line}" targets_content "${targets_content}") + endforeach() + file(WRITE "${targets_file}" "${targets_content}") + endforeach() + endif() + # Remove /debug// if it's empty. file(GLOB_RECURSE remaining_files "${debug_share}/*") if(remaining_files STREQUAL "") @@ -233,5 +271,3 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() endfunction() - - diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 557024351ee204..8bbe9e3b574de1 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -58,221 +58,222 @@ The helper [`vcpkg_from_github`](vcpkg_from_github.md) should be used for downlo * [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) #]===] -include(vcpkg_execute_in_download_mode) +function(z_vcpkg_download_distfile_test_hash path kind error_advice sha512 skip_sha512) + if(_VCPKG_INTERNAL_NO_HASH_CHECK) + # When using the internal hash skip, do not output an explicit message. + return() + endif() + if(skip_sha512) + message(STATUS "Skipping hash check for ${file_path}.") + return() + endif() + + file(SHA512 "${path}" file_hash) + if(NOT "${file_hash}" STREQUAL "${sha512}") + message(FATAL_ERROR + "\nFile does not have expected hash:\n" + " File path: [ ${file_path} ]\n" + " Expected hash: [ ${sha512} ]\n" + " Actual hash: [ ${file_hash} ]\n" + "${CUSTOM_ERROR_ADVICE}\n") + endif() +endfunction() + +function(z_vcpkg_download_distfile_show_proxy_and_fail error_code) + message(FATAL_ERROR + " \n" + " Failed to download file with error: ${error_code}\n" + " If you use a proxy, please check your proxy setting. Possible causes are:\n" + " \n" + " 1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable\n" + " to `https://address:port`. This is not correct, because `https://` prefix\n" + " claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr\n" + " , etc..) is an HTTP proxy. Try setting `http://address:port` to both\n" + " HTTP_PROXY and HTTPS_PROXY instead.\n" + " \n" + " 2. You are using Fiddler. Currently a bug (https://github.com/microsoft/vcpkg/issues/17752)\n" + " will set HTTPS_PROXY to `https://fiddler_address:port` which lead to problem 1 above.\n" + " Workaround is open Windows 10 Settings App, and search for Proxy Configuration page,\n" + " Change `http=address:port;https=address:port` to `address`, and fill the port number.\n" + " \n" + " 3. You proxy's remote server is out of service.\n" + " \n" + " In future vcpkg releases, if you are using Windows, you no longer need to set\n" + " HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy\n" + " Settings set by your proxy software. See (https://github.com/microsoft/vcpkg-tool/pull/49)\n" + " and (https://github.com/microsoft/vcpkg-tool/pull/77)\n" + " \n" + " Otherwise, please submit an issue at https://github.com/Microsoft/vcpkg/issues\n") +endfunction() + +function(z_vcpkg_download_distfile_via_aria filename urls headers sha512 skip_sha512) + vcpkg_find_acquire_program(ARIA2) + message(STATUS "Downloading ${filename}...") + + vcpkg_list(SET headers_param) + foreach(header IN LISTS headers) + vcpkg_list(APPEND headers_param "--header=${header}") + endforeach() + + vcpkg_execute_in_download_mode( + COMMAND ${ARIA2} ${urls} + -o temp/${filename} + -l download-${filename}-detailed.log + ${headers_param} + OUTPUT_FILE download-${filename}-out.log + ERROR_FILE download-${filename}-err.log + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${DOWNLOADS}" + ) + if (NOT "${error_code}" STREQUAL "0") + message(STATUS + "Downloading ${filename}... Failed.\n" + " Exit Code: ${error_code}\n" + " See logs for more information:\n" + " ${DOWNLOADS}/download-${filename}-out.log\n" + " ${DOWNLOADS}/download-${filename}-err.log\n" + " ${DOWNLOADS}/download-${filename}-detailed.log\n" + ) + z_vcpkg_download_distfile_show_proxy_and_fail() + else() + z_vcpkg_download_distfile_test_hash( + "${DOWNLOADS}/temp/${filename}" + "downloaded file" + "The file may have been corrupted in transit." + ) + file(REMOVE + ${DOWNLOADS}/download-${filename}-out.log + ${DOWNLOADS}/download-${filename}-err.log + ${DOWNLOADS}/download-${filename}-detailed.log + ) + get_filename_component(downloaded_file_dir "${downloaded_file_path}" DIRECTORY) + file(MAKE_DIRECTORY "${downloaded_file_dir}") + file(RENAME "${DOWNLOADS}/temp/${filename}" "${downloaded_file_path}") + endif() +endfunction() -function(vcpkg_download_distfile VAR) - set(options SKIP_SHA512 SILENT_EXIT QUIET ALWAYS_REDOWNLOAD) - set(oneValueArgs FILENAME SHA512) - set(multipleValuesArgs URLS HEADERS) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 1 vcpkg_download_distfile "${options}" "${oneValueArgs}" "${multipleValuesArgs}") +function(vcpkg_download_distfile out_var) + cmake_parse_arguments(PARSE_ARGV 1 arg + "SKIP_SHA512;SILENT_EXIT;QUIET;ALWAYS_REDOWNLOAD" + "FILENAME;SHA512" + "URLS;HEADERS" + ) - if(NOT DEFINED vcpkg_download_distfile_URLS) + if(NOT DEFINED arg_URLS) message(FATAL_ERROR "vcpkg_download_distfile requires a URLS argument.") endif() - if(NOT DEFINED vcpkg_download_distfile_FILENAME) + if(NOT DEFINED arg_FILENAME) message(FATAL_ERROR "vcpkg_download_distfile requires a FILENAME argument.") endif() - if(vcpkg_download_distfile_SILENT_EXIT) + if(arg_SILENT_EXIT) message(WARNING "SILENT_EXIT has been deprecated as an argument to vcpkg_download_distfile -- remove the argument to resolve this warning") endif() - if(vcpkg_download_distfile_ALWAYS_REDOWNLOAD AND NOT vcpkg_download_distfile_SKIP_SHA512) + if(arg_ALWAYS_REDOWNLOAD AND NOT arg_SKIP_SHA512) message(FATAL_ERROR "ALWAYS_REDOWNLOAD option requires SKIP_SHA512 as well") endif() + + if(NOT arg_SKIP_SHA512 AND NOT DEFINED arg_SHA512) + message(FATAL_ERROR "vcpkg_download_distfile requires a SHA512 argument. +If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") + elseif(arg_SKIP_SHA512 AND DEFINED arg_SHA512) + message(FATAL_ERROR "vcpkg_download_distfile must not be passed both SHA512 and SKIP_SHA512.") + endif() + if(_VCPKG_INTERNAL_NO_HASH_CHECK) - set(vcpkg_download_distfile_SKIP_SHA512 1) - else() - if(NOT vcpkg_download_distfile_SKIP_SHA512 AND NOT DEFINED vcpkg_download_distfile_SHA512) - message(FATAL_ERROR "vcpkg_download_distfile requires a SHA512 argument. If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") - endif() - if(vcpkg_download_distfile_SKIP_SHA512 AND DEFINED vcpkg_download_distfile_SHA512) - message(FATAL_ERROR "vcpkg_download_distfile must not be passed both SHA512 and SKIP_SHA512.") - endif() + set(arg_SKIP_SHA512 1) endif() - if(NOT vcpkg_download_distfile_SKIP_SHA512) - if(vcpkg_download_distfile_SHA512 STREQUAL "0") - string(REPEAT "0" 128 vcpkg_download_distfile_SHA512) - endif() - string(LENGTH "${vcpkg_download_distfile_SHA512}" vcpkg_download_distfile_SHA512_length) - if(NOT vcpkg_download_distfile_SHA512_length EQUAL "128") - message(FATAL_ERROR "Invalid SHA512: ${vcpkg_download_distfile_SHA512}. If you do not know the file's SHA512, set this to \"0\".") + + if(NOT arg_SKIP_SHA512) + if("${arg_SHA512}" STREQUAL "0") + string(REPEAT 0 128 arg_SHA512) + else() + string(LENGTH "${arg_SHA512}" arg_SHA512_length) + if(NOT "${arg_SHA512_length}" EQUAL "128" OR NOT "${arg_SHA512}" MATCHES "^[a-zA-Z0-9]*$") + message(FATAL_ERROR "Invalid SHA512: ${arg_SHA512}. + If you do not know the file's SHA512, set this to \"0\".") + endif() endif() endif() - set(downloaded_file_path ${DOWNLOADS}/${vcpkg_download_distfile_FILENAME}) - set(download_file_path_part "${DOWNLOADS}/temp/${vcpkg_download_distfile_FILENAME}") + set(downloaded_file_path "${DOWNLOADS}/${arg_FILENAME}") + set(download_file_path_part "${DOWNLOADS}/temp/${arg_FILENAME}") # Works around issue #3399 - if(IS_DIRECTORY "${DOWNLOADS}/temp") - # Delete "temp0" directory created by the old version of vcpkg - file(REMOVE_RECURSE "${DOWNLOADS}/temp0") - - file(GLOB temp_files "${DOWNLOADS}/temp") - file(REMOVE_RECURSE ${temp_files}) - else() - file(MAKE_DIRECTORY "${DOWNLOADS}/temp") - endif() - - function(test_hash FILE_PATH FILE_KIND CUSTOM_ERROR_ADVICE) - if(_VCPKG_INTERNAL_NO_HASH_CHECK) - # When using the internal hash skip, do not output an explicit message. - return() - endif() - if(vcpkg_download_distfile_SKIP_SHA512) - message(STATUS "Skipping hash check for ${FILE_PATH}.") - return() - endif() - - file(SHA512 ${FILE_PATH} FILE_HASH) - if(NOT FILE_HASH STREQUAL vcpkg_download_distfile_SHA512) - message(FATAL_ERROR - "\nFile does not have expected hash:\n" - " File path: [ ${FILE_PATH} ]\n" - " Expected hash: [ ${vcpkg_download_distfile_SHA512} ]\n" - " Actual hash: [ ${FILE_HASH} ]\n" - "${CUSTOM_ERROR_ADVICE}\n") - endif() - endfunction() + # Delete "temp0" directory created by the old version of vcpkg + file(REMOVE_RECURSE "${DOWNLOADS}/temp0") + file(REMOVE_RECURSE "${DOWNLOADS}/temp") + file(MAKE_DIRECTORY "${DOWNLOADS}/temp") # vcpkg_download_distfile_ALWAYS_REDOWNLOAD only triggers when NOT _VCPKG_NO_DOWNLOADS # this could be de-morgan'd out but it's more clear this way - if(EXISTS "${downloaded_file_path}" AND NOT (vcpkg_download_distfile_ALWAYS_REDOWNLOAD AND NOT _VCPKG_NO_DOWNLOADS)) - if(NOT vcpkg_download_distfile_QUIET) + if(_VCPKG_NO_DOWNLOADS) + if(NOT EXISTS "${downloaded_file_path}") + message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.") + endif() + if(NOT arg_QUIET) message(STATUS "Using ${downloaded_file_path}") endif() - test_hash("${downloaded_file_path}" "cached file" "Please delete the file and retry if this file should be downloaded again.") + + z_vcpkg_download_distfile_test_hash( + "${downloaded_file_path}" + "cached file" + "Please delete the file and retry if this file should be downloaded again." + ) + set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE) + return() + endif() + + if(_VCPKG_DOWNLOAD_TOOL STREQUAL "ARIA2" AND NOT EXISTS "${downloaded_file_path}") + z_vcpkg_download_distfile_via_aria( + "${arg_FILENAME}" + "${arg_URLS}" + "${arg_HEADERS}" + "${arg_SHA512}" + "${arg_skip_sha512}" + ) + set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE) + return() + endif() + + vcpkg_list(SET urls_param) + foreach(url IN LISTS arg_URLS) + vcpkg_list(APPEND urls_param "--url=${url}") + endforeach() + if(NOT vcpkg_download_distfile_QUIET) + message(STATUS "Downloading ${arg_URLS} -> ${arg_FILENAME}...") + endif() + + vcpkg_list(SET headers_param) + foreach(header IN LISTS arg_HEADERS) + list(APPEND headers_param "--header=${header}") + endforeach() + + if(arg_SKIP_SHA512) + vcpkg_list(SET sha512_param "--skip-sha512") else() - if(_VCPKG_NO_DOWNLOADS) - message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.") - endif() + vcpkg_list(SET sha512_param "--sha512=${arg_SHA512}") + endif() - # Tries to download the file. - list(GET vcpkg_download_distfile_URLS 0 SAMPLE_URL) - if(_VCPKG_DOWNLOAD_TOOL STREQUAL "ARIA2" AND NOT SAMPLE_URL MATCHES "aria2") - vcpkg_find_acquire_program("ARIA2") - message(STATUS "Downloading ${vcpkg_download_distfile_FILENAME}...") - if(vcpkg_download_distfile_HEADERS) - foreach(header IN LISTS vcpkg_download_distfile_HEADERS) - list(APPEND request_headers "--header=${header}") - endforeach() - endif() - vcpkg_execute_in_download_mode( - COMMAND ${ARIA2} ${vcpkg_download_distfile_URLS} - -o temp/${vcpkg_download_distfile_FILENAME} - -l download-${vcpkg_download_distfile_FILENAME}-detailed.log - ${request_headers} - OUTPUT_FILE download-${vcpkg_download_distfile_FILENAME}-out.log - ERROR_FILE download-${vcpkg_download_distfile_FILENAME}-err.log - RESULT_VARIABLE error_code - WORKING_DIRECTORY "${DOWNLOADS}" - ) - if (NOT "${error_code}" STREQUAL "0") - message(STATUS - "Downloading ${vcpkg_download_distfile_FILENAME}... Failed.\n" - " Exit Code: ${error_code}\n" - " See logs for more information:\n" - " ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-out.log\n" - " ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-err.log\n" - " ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-detailed.log\n" - ) - set(download_success 0) - else() - test_hash("${DOWNLOADS}/temp/${vcpkg_download_distfile_FILENAME}" "downloaded file" "The file may have been corrupted in transit.") - file(REMOVE - ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-out.log - ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-err.log - ${DOWNLOADS}/download-${vcpkg_download_distfile_FILENAME}-detailed.log - ) - get_filename_component(downloaded_file_dir "${downloaded_file_path}" DIRECTORY) - file(MAKE_DIRECTORY "${downloaded_file_dir}") - file(RENAME "${DOWNLOADS}/temp/${vcpkg_download_distfile_FILENAME}" "${downloaded_file_path}") - set(download_success 1) - endif() - elseif(vcpkg_download_distfile_SKIP_SHA512 OR vcpkg_download_distfile_HEADERS) - # This is a workaround until the vcpkg tool supports downloading files without SHA512 and with headers - set(download_success 0) - set(request_headers) - if(vcpkg_download_distfile_HEADERS) - foreach(header IN LISTS vcpkg_download_distfile_HEADERS) - list(APPEND request_headers HTTPHEADER ${header}) - endforeach() - endif() - foreach(url IN LISTS vcpkg_download_distfile_URLS) - message(STATUS "Downloading ${url} -> ${vcpkg_download_distfile_FILENAME}...") - file(DOWNLOAD "${url}" "${download_file_path_part}" STATUS download_status ${request_headers}) - list(GET download_status 0 status_code) - if (NOT "${status_code}" STREQUAL "0") - message(STATUS "Downloading ${url}... Failed. Status: ${download_status}") - else() - test_hash("${download_file_path_part}" "downloaded file" "The file may have been corrupted in transit. This can be caused by proxies. If you use a proxy, please set the HTTPS_PROXY and HTTP_PROXY environment variables to \"https://user:password@your-proxy-ip-address:port/\".\n") - get_filename_component(downloaded_file_dir "${downloaded_file_path}" DIRECTORY) - file(MAKE_DIRECTORY "${downloaded_file_dir}") - file(RENAME ${download_file_path_part} ${downloaded_file_path}) - set(download_success 1) - break() - endif() - endforeach(url) - else() - set(urls) - foreach(url IN LISTS vcpkg_download_distfile_URLS) - list(APPEND urls "--url=${url}") - endforeach() - if(NOT vcpkg_download_distfile_QUIET) - message(STATUS "Downloading ${vcpkg_download_distfile_URLS} -> ${vcpkg_download_distfile_FILENAME}...") - endif() - set(request_headers) - if(vcpkg_download_distfile_HEADERS) - foreach(header IN LISTS vcpkg_download_distfile_HEADERS) - list(APPEND request_headers "--header=${header}") - endforeach() - endif() - vcpkg_execute_in_download_mode( - COMMAND "$ENV{VCPKG_COMMAND}" x-download - "${downloaded_file_path}" - "${vcpkg_download_distfile_SHA512}" - ${urls} - ${request_headers} - --debug - --feature-flags=-manifests # there's a bug in vcpkg x-download when it finds a manifest-root - OUTPUT_VARIABLE output - ERROR_VARIABLE output - RESULT_VARIABLE failure - WORKING_DIRECTORY "${DOWNLOADS}" - ) - if(failure) - message("${output}") - set(download_success 0) - else() - set(download_success 1) - endif() - endif() + if(NOT EXISTS "${downloaded_file_path}" OR arg_ALWAYS_REDOWNLOAD) + vcpkg_execute_in_download_mode( + COMMAND "$ENV{VCPKG_COMMAND}" x-download + "${downloaded_file_path}" + ${sha512_param} + ${urls_param} + ${headers_param} + --debug + --feature-flags=-manifests # there's a bug in vcpkg x-download when it finds a manifest-root + OUTPUT_VARIABLE output + ERROR_VARIABLE output + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${DOWNLOADS}" + ) - if(NOT download_success) - message(FATAL_ERROR - " \n" - " Failed to download file.\n" - " If you use a proxy, please check your proxy setting. Possible causes are:\n" - " \n" - " 1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable\n" - " to `https://address:port`. This is not correct, because `https://` prefix\n" - " claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr\n" - " , etc..) is an HTTP proxy. Try setting `http://address:port` to both\n" - " HTTP_PROXY and HTTPS_PROXY instead.\n" - " \n" - " 2. You are using Fiddler. Currently a bug (https://github.com/microsoft/vcpkg/issues/17752)\n" - " will set HTTPS_PROXY to `https://fiddler_address:port` which lead to problem 1 above.\n" - " Workaround is open Windows 10 Settings App, and search for Proxy Configuration page,\n" - " Change `http=address:port;https=address:port` to `address`, and fill the port number.\n" - " \n" - " 3. You proxy's remote server is out of service.\n" - " \n" - " In future vcpkg releases, if you are using Windows, you no longer need to set\n" - " HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy\n" - " Settings set by your proxy software. See (https://github.com/microsoft/vcpkg-tool/pull/49)\n" - " and (https://github.com/microsoft/vcpkg-tool/pull/77)\n" - " \n" - " Otherwise, please submit an issue at https://github.com/Microsoft/vcpkg/issues\n") + if(NOT "${error_code}" EQUAL "0") + message("${output}") + z_vcpkg_download_distfile_show_proxy_and_fail("${error_code}") endif() endif() - set(${VAR} ${downloaded_file_path} PARENT_SCOPE) + + set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_find_fortran.cmake b/scripts/cmake/vcpkg_find_fortran.cmake index ad790abb86e9a4..c50497629277a9 100644 --- a/scripts/cmake/vcpkg_find_fortran.cmake +++ b/scripts/cmake/vcpkg_find_fortran.cmake @@ -7,27 +7,41 @@ Windows(x86/x64) Only: If not it will switch/enable MinGW gfortran ## Usage ```cmake -vcpkg_find_fortran() +vcpkg_find_fortran() +``` + +## Example +```cmake +vcpkg_find_fortran(fortran_args) +# ... +vcpkg_configure_cmake(... + OPTIONS + ${fortran_args} +) ``` #]===] -function(vcpkg_find_fortran additional_cmake_args_out) - set(ARGS_OUT) +function(vcpkg_find_fortran out_var) + if("${ARGC}" GREATER "1") + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra args: ${ARGN}") + endif() + + vcpkg_list(SET additional_cmake_args) + set(CMAKE_BINARY_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_BINARY_DIR}") set(CMAKE_PLATFORM_INFO_DIR "${CMAKE_BINARY_DIR}/Platform") include(CMakeDetermineFortranCompiler) - if(NOT CMAKE_Fortran_COMPILER AND NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - # This intentionally breaks users with a custom toolchain which do not have a Fortran compiler setup - # because they either need to use a port-overlay (for e.g. lapack), remove the toolchain for the port using fortran - # or setup fortran in their VCPKG_CHAINLOAD_TOOLCHAIN_FILE themselfs! + + if(NOT CMAKE_Fortran_COMPILER AND "${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" STREQUAL "") + # If a user uses their own VCPKG_CHAINLOAD_TOOLCHAIN_FILE, they _must_ figure out fortran on their own. if(WIN32) message(STATUS "No Fortran compiler found on the PATH. Using MinGW gfortran!") # If no Fortran compiler is on the path we switch to use gfortan from MinGW within vcpkg - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") - set(MINGW_PATH mingw32) - set(MACHINE_FLAG -m32) - vcpkg_acquire_msys(MSYS_ROOT + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") + set(mingw_path mingw32) + set(machine_flag -m32) + vcpkg_acquire_msys(msys_root DIRECT_PACKAGES "https://repo.msys2.org/mingw/i686/mingw-w64-i686-gcc-fortran-10.2.0-1-any.pkg.tar.zst" ddbdaf9ea865181e16a0931b2ec88c2dcef8add34628e479c7b9de4fa2ccb22e09c7239442e58702e0acd3adabc920565e976984f2bcd90a3668bf7f48a245f1 @@ -62,10 +76,10 @@ function(vcpkg_find_fortran additional_cmake_args_out) "https://repo.msys2.org/mingw/i686/mingw-w64-i686-zstd-1.4.5-1-any.pkg.tar.zst" 68f431073717b59549ab0fd26be8df8afcb43f3dd85be2ffcbc7d1a629999eed924656a7fc3f50937b2e6605a5067542d016181106b7bc3408b89b268ced5d23 ) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(MINGW_PATH mingw64) - set(MACHINE_FLAG -m64) - vcpkg_acquire_msys(MSYS_ROOT + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") + set(mingw_path mingw64) + set(machine_flag -m64) + vcpkg_acquire_msys(msys_root DIRECT_PACKAGES "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-gcc-fortran-10.2.0-1-any.pkg.tar.zst" 0de02db791e978ae21577e675ee9676f741336c9a5ceb5614dbdfc793e2c1c4749b394f41362af7b069e970302fddf8c6772ebd8445fe1c360861606b1784b4d @@ -104,14 +118,16 @@ function(vcpkg_find_fortran additional_cmake_args_out) message(FATAL_ERROR "Unknown architecture '${VCPKG_TARGET_ARCHITECTURE}' for MinGW Fortran build!") endif() - set(MINGW_BIN "${MSYS_ROOT}/${MINGW_PATH}/bin") - vcpkg_add_to_path(PREPEND "${MINGW_BIN}") - list(APPEND ARGS_OUT -DCMAKE_GNUtoMS=ON - "-DCMAKE_Fortran_COMPILER=${MINGW_BIN}/gfortran.exe" - "-DCMAKE_C_COMPILER=${MINGW_BIN}/gcc.exe" - "-DCMAKE_Fortran_FLAGS_INIT:STRING= -mabi=ms ${MACHINE_FLAG} ${VCPKG_Fortran_FLAGS}") + set(mingw_bin "${msys_root}/${mingw_path}/bin") + vcpkg_add_to_path(PREPEND "${mingw_bin}") + vcpkg_list(APPEND additional_cmake_args + -DCMAKE_GNUtoMS=ON + "-DCMAKE_Fortran_COMPILER=${mingw_bin}/gfortran.exe" + "-DCMAKE_C_COMPILER=${mingw_bin}/gcc.exe" + "-DCMAKE_Fortran_FLAGS_INIT:STRING= -mabi=ms ${machine_flag} ${VCPKG_Fortran_FLAGS}") + # This is for private use by vcpkg-gfortran - set(vcpkg_find_fortran_MSYS_ROOT "${MSYS_ROOT}" PARENT_SCOPE) + set(vcpkg_find_fortran_MSYS_ROOT "${msys_root}" PARENT_SCOPE) set(VCPKG_USE_INTERNAL_Fortran TRUE PARENT_SCOPE) set(VCPKG_POLICY_SKIP_DUMPBIN_CHECKS enabled PARENT_SCOPE) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/mingw.cmake" PARENT_SCOPE) # Switching to MinGW toolchain for Fortran @@ -127,5 +143,5 @@ function(vcpkg_find_fortran additional_cmake_args_out) message(FATAL_ERROR "Unable to find a Fortran compiler using 'CMakeDetermineFortranCompiler'. Please install one (e.g. gfortran) and make it available on the PATH!") endif() endif() - set(${additional_cmake_args_out} ${ARGS_OUT} PARENT_SCOPE) + set("${out_var}" "${additional_cmake_args}" PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index e6fbe785b5844e..0641aa22404178 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -220,6 +220,44 @@ function(vcpkg_fixup_cmake_targets) file(WRITE ${MAIN_CMAKE} "${_contents}") endforeach() + if (VCPKG_TARGET_IS_OSX) + # see #16259 for details why this replacement is necessary. + file(GLOB targets_files "${RELEASE_SHARE}/*[Tt]argets.cmake") + if (targets_files STREQUAL "") + file(GLOB targets_files "${RELEASE_SHARE}/*[Cc]onfig.cmake") + endif() + foreach(targets_file IN LISTS targets_files) + file(READ "${targets_file}" targets_content) + string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*\n" library_contents "${targets_content}") + foreach(line IN LISTS library_contents) + set(fixed_line "${line}") + string(REGEX MATCHALL [[/[^ ;"]+/[^ ;"/]+\.framework]] frameworks "${line}") + foreach(framework IN LISTS frameworks) + if(NOT framework MATCHES [[^(.+)/(.+)\.framework$]]) + continue() + endif() + set(path "${CMAKE_MATCH_1}") + set(name "${CMAKE_MATCH_2}") + if(NOT DEFINED VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + set(_saved_buildtrees_dir "${CURRENT_BUILDTREES_DIR}") + set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/get-cmake-vars") + z_vcpkg_get_cmake_vars(cmake_vars_file) + debug_message("Including cmake vars from: ${cmake_vars_file}") + include("${cmake_vars_file}") + set(VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES}" PARENT_SCOPE) + set(CURRENT_BUILDTREES_DIR "${_saved_buildtrees_dir}") + endif() + list(FIND VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${path}" index) + if(NOT index EQUAL -1) + string(REPLACE "${framework}" "-framework ${name}" fixed_line "${fixed_line}") + endif() + endforeach() + string(REPLACE "${line}" "${fixed_line}" targets_content "${targets_content}") + endforeach() + file(WRITE "${targets_file}" "${targets_content}") + endforeach() + endif() + # Remove /debug// if it's empty. file(GLOB_RECURSE REMAINING_FILES "${DEBUG_SHARE}/*") if(NOT REMAINING_FILES) @@ -241,5 +279,3 @@ function(vcpkg_fixup_cmake_targets) file(WRITE ${CMAKE_FILE} "${_contents}") endforeach() endfunction() - - diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 3f37099a71c3df..a9b9723e002d5a 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -45,115 +45,122 @@ Still work in progress. If there are more cases which can be handled here feel f * [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake) #]===] -function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config) - set(PATH_SUFFIX_DEBUG /debug) - set(PATH_SUFFIX_RELEASE) - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_INSTALLED_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig") - set(PKGCONFIG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_PACKAGES_SHARE_DIR "${CURRENT_PACKAGES_DIR}/share/pkgconfig") +function(z_vcpkg_fixup_pkgconfig_check_files file config) + set(path_suffix_debug /debug) + set(path_suffix_release "") if(DEFINED ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") + set(backup_env_pkg_config_path "$ENV{PKG_CONFIG_PATH}") else() - unset(BACKUP_ENV_PKG_CONFIG_PATH) + unset(backup_env_pkg_config_path) endif() + + vcpkg_list(SET pkg_config_path + "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig" + "${CURRENT_INSTALLED_DIR}/share/pkgconfig" + "${CURRENT_PACKAGES_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/share/pkgconfig" + ) if(DEFINED ENV{PKG_CONFIG_PATH} AND NOT ENV{PKG_CONFIG_PATH} STREQUAL "") - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") - else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") + vcpkg_list(APPEND pkg_config_path "$ENV{PKG_CONFIG_PATH}") endif() + vcpkg_list(JOIN pkg_config_path "${VCPKG_PATH_SEPARATOR}" pkg_config_path) + set(ENV{PKG_CONFIG_PATH} "${pkg_config_path}") # First make sure everything is ok with the package and its deps - get_filename_component(_package_name "${_file}" NAME_WLE) - debug_message("Checking package (${_config}): ${_package_name}") - execute_process(COMMAND "${pkg_cfg_cmd}" --print-errors --exists ${_package_name} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" - RESULT_VARIABLE _pkg_error_var - OUTPUT_VARIABLE _pkg_output - ERROR_VARIABLE _pkg_error_out - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if(NOT _pkg_error_var EQUAL 0) - message(STATUS "pkg_cfg_cmd call with:${pkg_cfg_cmd} --exists ${_package_name} failed") - message(STATUS "ENV{PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}") - message(STATUS "pkg-config call failed with error code:${_pkg_error_var}") - message(STATUS "pkg-config output:${_pkg_output}") - message(FATAL_ERROR "pkg-config error output:${_pkg_error_out}") + cmake_path(GET file STEM package_name) + debug_message("Checking package (${config}): ${package_name}") + execute_process( + COMMAND "${PKGCONFIG}" --print-errors --exists "${package_name}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + RESULT_VARIABLE error_var + OUTPUT_VARIABLE output + ERROR_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE + ) + if(NOT "${error_var}" EQUAL "0") + message(FATAL_ERROR "${PKGCONFIG} --exists ${package_name} failed with error code: ${error_var} + ENV{PKG_CONFIG_PATH}: \"$ENV{PKG_CONFIG_PATH}\" + output: ${output}" + ) else() - debug_message("pkg-config returned:${_pkg_error_var}") - debug_message("pkg-config output:${_pkg_output}") - debug_message("pkg-config error output:${_pkg_error_out}") + debug_message("pkg-config --exists ${package_name} output: ${output}") endif() - if(DEFINED BACKUP_ENV_PKG_CONFIG_PATH) - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") + if(DEFINED backup_env_pkg_config_path) + set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path}") else() unset(ENV{PKG_CONFIG_PATH}) endif() endfunction() function(vcpkg_fixup_pkgconfig) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vfpkg "SKIP_CHECK" "" "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS") - - if(_vfpkg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_fixup_pkgconfig() was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") + cmake_parse_arguments(PARSE_ARGV 0 arg + "SKIP_CHECK" + "" + "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if((DEFINED _vfpkg_RELEASE_FILES AND NOT DEFINED _vfpkg_DEBUG_FILES) OR (NOT DEFINED _vfpkg_RELEASE_FILES AND DEFINED _vfpkg_DEBUG_FILES)) - message(FATAL_ERROR "vcpkg_fixup_pkgconfig() requires both or neither of DEBUG_FILES and RELEASE_FILES") + if(DEFINED arg_RELEASE_FILES AND NOT DEFINED arg_DEBUG_FILES) + message(FATAL_ERROR "DEBUG_FILES must be specified if RELEASE_FILES was specified.") + endif() + if(NOT DEFINED arg_RELEASE_FILES AND DEFINED arg_DEBUG_FILES) + message(FATAL_ERROR "RELEASE_FILES must be specified if DEBUG_FILES was specified.") endif() - if(NOT DEFINED _vfpkg_RELEASE_FILES) - file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") - file(GLOB_RECURSE _vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") - if(_vfpkg_DEBUG_FILES) - list(REMOVE_ITEM _vfpkg_RELEASE_FILES ${_vfpkg_DEBUG_FILES}) - endif() + if(NOT DEFINED arg_RELEASE_FILES) + file(GLOB_RECURSE arg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") + file(GLOB_RECURSE arg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") + foreach(debug_file IN LISTS arg_DEBUG_FILES) + vcpkg_list(REMOVE_ITEM arg_RELEASE_FILES "${debug_file}") + endforeach() endif() vcpkg_find_acquire_program(PKGCONFIG) debug_message("Using pkg-config from: ${PKGCONFIG}") - #Absolute Unix like paths - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") + string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_packages_dir "${CURRENT_PACKAGES_DIR}") + string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_installed_dir "${CURRENT_INSTALLED_DIR}") - foreach(CONFIG RELEASE DEBUG) - debug_message("${CONFIG} Files: ${_vfpkg_${CONFIG}_FILES}") - if(VCPKG_BUILD_TYPE STREQUAL "debug" AND CONFIG STREQUAL "RELEASE") + foreach(config IN ITEMS RELEASE DEBUG) + debug_message("${config} Files: ${arg_${config}_FILES}") + if("${VCPKG_BUILD_TYPE}" STREQUAL "debug" AND "${config}" STREQUAL "RELEASE") continue() endif() - if(VCPKG_BUILD_TYPE STREQUAL "release" AND CONFIG STREQUAL "DEBUG") + if("${VCPKG_BUILD_TYPE}" STREQUAL "release" AND "${config}" STREQUAL "DEBUG") continue() endif() - foreach(_file ${_vfpkg_${CONFIG}_FILES}) - message(STATUS "Fixing pkgconfig file: ${_file}") - get_filename_component(PKG_LIB_SEARCH_PATH "${_file}" DIRECTORY) - if(CONFIG STREQUAL "DEBUG") - file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}/debug/") + foreach(file IN LISTS "arg_${config}_FILES") + message(STATUS "Fixing pkgconfig file: ${file}") + cmake_path(GET file PARENT_PATH pkg_lib_search_path) + if("${config}" STREQUAL "DEBUG") + set(relative_pc_path "${CURRENT_PACKAGES_DIR}/debug") + cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") else() - file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}") + set(relative_pc_path "${CURRENT_PACKAGES_DIR}") + cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") endif() - # strip trailing slash - string(REGEX REPLACE "/$" "" RELATIVE_PC_PATH "${RELATIVE_PC_PATH}") #Correct *.pc file - file(READ "${_file}" _contents) - string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" _contents "${_contents}") - if(CONFIG STREQUAL "DEBUG") - string(REPLACE "}/debug" "}" _contents "${_contents}") - # Prefix points at the debug subfolder - string(REPLACE "\${prefix}/include" "\${prefix}/../include" _contents "${_contents}") - string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") + file(READ "${file}" contents) + + string(REPLACE "${CURRENT_PACKAGES_DIR}" [[${prefix}]] contents "${contents}") + string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${prefix}]] contents "${contents}") + string(REPLACE "${unix_packages_dir}" [[${prefix}]] contents "${contents}") + string(REPLACE "${unix_installed_dir}" [[${prefix}]] contents "${contents}") + + string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" contents "${contents}") + if("${config}" STREQUAL "DEBUG") + # prefix points at the debug subfolder + string(REPLACE [[${prefix}/debug]] [[${prefix}]] contents "${contents}") + string(REPLACE [[${prefix}/include]] [[${prefix}/../include]] contents "${contents}") + string(REPLACE [[${prefix}/share]] [[${prefix}/../share]] contents "${contents}") endif() - string(REGEX REPLACE " -L(\\\${[^}]*}[^ \n\t]*)" " -L\"\\1\"" _contents "${_contents}") - string(REGEX REPLACE " -I(\\\${[^}]*}[^ \n\t]*)" " -I\"\\1\"" _contents "${_contents}") - string(REGEX REPLACE " -l(\\\${[^}]*}[^ \n\t]*)" " -l\"\\1\"" _contents "${_contents}") + # quote -L, -I, and -l paths starting with `${blah}` + string(REGEX REPLACE " -([LIl])(\\\${[^}]*}[^ \n\t]*)" [[ -\1"\2"]] contents "${contents}") # This section fuses XYZ.private and XYZ according to VCPKG_LIBRARY_LINKAGE # # Pkgconfig searches Requires.private transitively for Cflags in the dynamic case, @@ -161,33 +168,51 @@ function(vcpkg_fixup_pkgconfig) # # Once this transformation is complete, users of vcpkg should never need to pass # --static. - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # Libs comes before Libs.private - string(REGEX REPLACE "(^|\n)(Libs: *[^\n]*)(.*)\nLibs.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") - # Libs.private comes before Libs - string(REGEX REPLACE "(^|\n)Libs.private:( *[^\n]*)(.*\nLibs: *[^\n]*)" "\\3\\2" _contents "${_contents}") - # Only Libs.private - string(REGEX REPLACE "(^|\n)Libs.private: *" "\\1Libs: " _contents "${_contents}") - # Requires comes before Requires.private - string(REGEX REPLACE "(^|\n)(Requires: *[^\n]*)(.*)\nRequires.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") - # Requires.private comes before Requires - string(REGEX REPLACE "(^|\n)Requires.private:( *[^\n]*)(.*\nRequires: *[^\n]*)" "\\3\\2" _contents "${_contents}") - # Only Requires.private - string(REGEX REPLACE "(^|\n)Requires.private: *" "\\1Requires: " _contents "${_contents}") + if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + # how this works: + # we want to transform: + # Libs: $1 + # Libs.private: $2 + # into + # Libs: $1 $2 + # and the same thing for Requires and Requires.private + + set(libs_line "") + set(requires_line "") + if("${contents}" MATCHES "Libs: *([^\n]*)") + string(APPEND libs_line " ${CMAKE_MATCH_1}") + endif() + if("${contents}" MATCHES "Libs.private: *([^\n]*)") + string(APPEND libs_line " ${CMAKE_MATCH_1}") + endif() + if("${contents}" MATCHES "Requires: *([^\n]*)") + string(APPEND requires_line " ${CMAKE_MATCH_1}") + endif() + if("${contents}" MATCHES "Requires.private: *([^\n]*)") + string(APPEND requires_line " ${CMAKE_MATCH_1}") + endif() + + string(REGEX REPLACE "(^|\n)(Requires|Libs)(\\.private)?:[^\n]*\n" [[\1]] contents "${contents}") + + if(NOT "${libs_line}" STREQUAL "") + string(APPEND contents "Libs:${libs_line}\n") + endif() + if(NOT "${requires_line}" STREQUAL "") + string(APPEND contents "Requires:${requires_line}\n") + endif() endif() - file(WRITE "${_file}" "prefix=\${pcfiledir}/${RELATIVE_PC_PATH}\n${_contents}") - unset(PKG_LIB_SEARCH_PATH) + file(WRITE "${file}" "prefix=\${pcfiledir}/${relative_pc_path}\n${contents}") endforeach() - if(NOT _vfpkg_SKIP_CHECK) # The check can only run after all files have been corrected! - foreach(_file ${_vfpkg_${CONFIG}_FILES}) - vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${_file}" "${CONFIG}") + if(NOT arg_SKIP_CHECK) # The check can only run after all files have been corrected! + foreach(file IN LISTS "arg_${config}_FILES") + z_vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${file}" "${config}") endforeach() endif() endforeach() debug_message("Fixing pkgconfig --- finished") - set(VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) + set(Z_VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) # Variable to check if this function has been called! # Theoreotically vcpkg could look for *.pc files and automatically call this function # or check if this function has been called if *.pc files are detected. diff --git a/scripts/cmake/vcpkg_from_git.cmake b/scripts/cmake/vcpkg_from_git.cmake index ac46e32cc194a2..0a5fdb622593b1 100644 --- a/scripts/cmake/vcpkg_from_git.cmake +++ b/scripts/cmake/vcpkg_from_git.cmake @@ -26,6 +26,11 @@ The url of the git repository. ### REF The git sha of the commit to download. +### FETCH_REF +The git branch to fetch in non-HEAD mode. After this is fetched, +then `REF` is checked out. This is useful in cases where the git server +does not allow checking out non-advertised objects. + ### HEAD_REF The git branch to use when the package is requested to be built from the latest sources. @@ -44,12 +49,10 @@ Relative paths are based on the port directory. * [fdlibm](https://github.com/Microsoft/vcpkg/blob/master/ports/fdlibm/portfile.cmake) #]===] -include(vcpkg_execute_in_download_mode) - function(vcpkg_from_git) cmake_parse_arguments(PARSE_ARGV 0 "arg" "" - "OUT_SOURCE_PATH;URL;REF;HEAD_REF;TAG" + "OUT_SOURCE_PATH;URL;REF;FETCH_REF;HEAD_REF;TAG" "PATCHES" ) @@ -62,26 +65,41 @@ function(vcpkg_from_git) if(NOT DEFINED arg_OUT_SOURCE_PATH) - message(FATAL_ERROR "OUT_SOURCE_PATH must be specified.") + message(FATAL_ERROR "OUT_SOURCE_PATH must be specified") endif() if(NOT DEFINED arg_URL) - message(FATAL_ERROR "The git url must be specified") + message(FATAL_ERROR "URL must be specified") endif() if(NOT DEFINED arg_REF AND NOT DEFINED arg_HEAD_REF) - message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified.") + message(FATAL_ERROR "At least one of REF or HEAD_REF must be specified") + endif() + if(DEFINED arg_FETCH_REF AND NOT DEFINED arg_REF) + message(FATAL_ERROR "REF must be specified if FETCH_REF is specified") endif() - set(working_directory_param "") - set(ref_to_use "${arg_REF}") + vcpkg_list(SET git_fetch_shallow_param --depth 1) + vcpkg_list(SET extract_working_directory_param) + set(git_working_directory "${DOWNLOADS}/git-tmp") if(VCPKG_USE_HEAD_VERSION) if(DEFINED arg_HEAD_REF) - set(working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET working_directory_param "WORKING_DIRECTORY" "${CURRENT_BUILDTREES_DIR}/src/head") + vcpkg_list(SET git_fetch_shallow_param --depth 1) set(ref_to_use "${arg_HEAD_REF}") + set(git_working_directory "${CURRENT_BUILDTREES_DIR}/src/git-tmp") else() message(STATUS "Package does not specify HEAD_REF. Falling back to non-HEAD version.") endif() - elseif(NOT DEFINED arg_REF) - message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + else() + if(NOT DEFINED arg_REF) + message(FATAL_ERROR "Package does not specify REF. It must be built using --head.") + endif() + + if(DEFINED arg_FETCH_REF) + set(ref_to_use "${arg_FETCH_REF}") + vcpkg_list(SET git_fetch_shallow_param) + else() + set(ref_to_use "${arg_REF}") + endif() endif() string(REPLACE "/" "_-" sanitized_ref "${ref_to_use}") @@ -98,40 +116,54 @@ function(vcpkg_from_git) # Note: git init is safe to run multiple times vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${GIT}" init git-tmp - WORKING_DIRECTORY "${DOWNLOADS}" + COMMAND "${GIT}" init "${git_working_directory}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" LOGNAME "git-init-${TARGET_TRIPLET}" ) vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_use}" --depth 1 -n - WORKING_DIRECTORY "${DOWNLOADS}/git-tmp" + COMMAND "${GIT}" fetch "${arg_URL}" "${ref_to_use}" ${git_fetch_shallow_param} -n + WORKING_DIRECTORY "${git_working_directory}" LOGNAME "git-fetch-${TARGET_TRIPLET}" ) - vcpkg_execute_in_download_mode( - COMMAND "${GIT}" rev-parse FETCH_HEAD - OUTPUT_VARIABLE rev_parse_head - ERROR_VARIABLE rev_parse_head - RESULT_VARIABLE error_code - WORKING_DIRECTORY "${DOWNLOADS}/git-tmp" - ) - if(error_code) - message(FATAL_ERROR "unable to determine FETCH_HEAD after fetching git repository") - endif() - string(STRIP "${rev_parse_head}" rev_parse_head) + if(VCPKG_USE_HEAD_VERSION) - set(VCPKG_HEAD_VERSION "${rev_parse_head}" PARENT_SCOPE) - elseif(NOT rev_parse_head STREQUAL arg_REF) - message(FATAL_ERROR "REF (${arg_REF}) does not match FETCH_HEAD (${rev_parse_head}) - [Expected : ( ${arg_REF} )]) - [ Actual : ( ${rev_parse_head} )]" + vcpkg_execute_in_download_mode( + COMMAND "${GIT}" rev-parse FETCH_HEAD + OUTPUT_VARIABLE rev_parse_ref + ERROR_VARIABLE rev_parse_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_working_directory}" + ) + if(error_code) + message(FATAL_ERROR "unable to determine FETCH_HEAD after fetching git repository") + endif() + string(STRIP "${rev_parse_ref}" rev_parse_ref) + set(VCPKG_HEAD_VERSION "${rev_parse_ref}" PARENT_SCOPE) + else() + vcpkg_execute_in_download_mode( + COMMAND "${GIT}" rev-parse "${arg_REF}" + OUTPUT_VARIABLE rev_parse_ref + ERROR_VARIABLE rev_parse_ref + RESULT_VARIABLE error_code + WORKING_DIRECTORY "${git_working_directory}" ) + if(error_code) + message(FATAL_ERROR "unable to rev-parse ${arg_REF} after fetching git repository") + endif() + string(STRIP "${rev_parse_ref}" rev_parse_ref) + if(NOT "${rev_parse_ref}" STREQUAL "${arg_REF}") + message(FATAL_ERROR "REF (${arg_REF}) does not match rev-parse'd reference (${rev_parse_ref}) + [Expected : ( ${arg_REF} )]) + [ Actual : ( ${rev_parse_ref} )]" + ) + endif() endif() file(MAKE_DIRECTORY "${DOWNLOADS}/temp") vcpkg_execute_required_process( ALLOW_IN_DOWNLOAD_MODE - COMMAND "${GIT}" archive "${rev_parse_head}" -o "${temp_archive}" + COMMAND "${GIT}" archive "${rev_parse_ref}" -o "${temp_archive}" WORKING_DIRECTORY "${DOWNLOADS}/git-tmp" LOGNAME git-archive ) @@ -146,7 +178,7 @@ function(vcpkg_from_git) REF "${sanitized_ref}" PATCHES ${arg_PATCHES} NO_REMOVE_ONE_LEVEL - ${working_directory_param} + ${extract_working_directory_param} ) set("${arg_OUT_SOURCE_PATH}" "${SOURCE_PATH}" PARENT_SCOPE) diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index 084042fb116ab2..1b2e1e561fb145 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -29,6 +29,8 @@ foreach(_lang IN LISTS VCPKG_LANGUAGES) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_STANDARD) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_COMPILE_FEATURES) list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_EXTENSION) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) + # Probably never required since implicit. #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) #list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${_lang}_IMPLICIT_INCLUDE_DIRECTORIES) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 03547edff90e07..e33fa58657ea7a 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -1,8 +1,64 @@ -# rebuild: 1 cmake_minimum_required(VERSION 3.21) set(SCRIPTS "${CMAKE_CURRENT_LIST_DIR}" CACHE PATH "Location to stored scripts") +list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake") +include("${SCRIPTS}/cmake/execute_process.cmake") +include("${SCRIPTS}/cmake/vcpkg_acquire_msys.cmake") +include("${SCRIPTS}/cmake/vcpkg_add_to_path.cmake") +include("${SCRIPTS}/cmake/vcpkg_apply_patches.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_make.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_msbuild.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_ninja.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_nmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_build_qmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_buildpath_length_warning.cmake") +include("${SCRIPTS}/cmake/vcpkg_check_features.cmake") +include("${SCRIPTS}/cmake/vcpkg_check_linkage.cmake") +include("${SCRIPTS}/cmake/vcpkg_clean_executables_in_bin.cmake") +include("${SCRIPTS}/cmake/vcpkg_clean_msbuild.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_gn.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_make.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_meson.cmake") +include("${SCRIPTS}/cmake/vcpkg_configure_qmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_copy_pdbs.cmake") +include("${SCRIPTS}/cmake/vcpkg_copy_tool_dependencies.cmake") +include("${SCRIPTS}/cmake/vcpkg_copy_tools.cmake") +include("${SCRIPTS}/cmake/vcpkg_download_distfile.cmake") +include("${SCRIPTS}/cmake/vcpkg_execute_build_process.cmake") +include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake") +include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake") +include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake") +include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake") +include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake") +include("${SCRIPTS}/cmake/vcpkg_find_acquire_program.cmake") +include("${SCRIPTS}/cmake/vcpkg_fixup_cmake_targets.cmake") +include("${SCRIPTS}/cmake/vcpkg_fixup_pkgconfig.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_bitbucket.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_git.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_github.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_gitlab.cmake") +include("${SCRIPTS}/cmake/vcpkg_from_sourceforge.cmake") +include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake") +include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_make.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_msbuild.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_nmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_install_qmake.cmake") +include("${SCRIPTS}/cmake/vcpkg_list.cmake") +include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake") +include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake") +include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake") + +include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake") include("${SCRIPTS}/cmake/z_vcpkg_function_arguments.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake") +include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake") function(debug_message) if(PORT_DEBUG) @@ -24,9 +80,7 @@ else() set(Z_VCPKG_BACKCOMPAT_MESSAGE_LEVEL "WARNING") endif() -list(APPEND CMAKE_MODULE_PATH "${SCRIPTS}/cmake") -include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake") -vcpkg_minimum_required(VERSION 2021-07-16) +vcpkg_minimum_required(VERSION 2021-08-03) file(TO_CMAKE_PATH "${BUILDTREES_DIR}" BUILDTREES_DIR) file(TO_CMAKE_PATH "${PACKAGES_DIR}" PACKAGES_DIR) @@ -82,61 +136,6 @@ if(CMD MATCHES "^BUILD$") set(TRIPLET_SYSTEM_ARCH "${VCPKG_TARGET_ARCHITECTURE}") include("${SCRIPTS}/cmake/vcpkg_common_definitions.cmake") - include("${SCRIPTS}/cmake/execute_process.cmake") - include("${SCRIPTS}/cmake/vcpkg_acquire_msys.cmake") - include("${SCRIPTS}/cmake/vcpkg_add_to_path.cmake") - include("${SCRIPTS}/cmake/vcpkg_apply_patches.cmake") - include("${SCRIPTS}/cmake/vcpkg_build_cmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_build_make.cmake") - include("${SCRIPTS}/cmake/vcpkg_build_msbuild.cmake") - include("${SCRIPTS}/cmake/vcpkg_build_ninja.cmake") - include("${SCRIPTS}/cmake/vcpkg_build_nmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_build_qmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_buildpath_length_warning.cmake") - include("${SCRIPTS}/cmake/vcpkg_check_features.cmake") - include("${SCRIPTS}/cmake/vcpkg_check_linkage.cmake") - include("${SCRIPTS}/cmake/vcpkg_clean_executables_in_bin.cmake") - include("${SCRIPTS}/cmake/vcpkg_clean_msbuild.cmake") - include("${SCRIPTS}/cmake/vcpkg_configure_cmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_configure_gn.cmake") - include("${SCRIPTS}/cmake/vcpkg_configure_make.cmake") - include("${SCRIPTS}/cmake/vcpkg_configure_meson.cmake") - include("${SCRIPTS}/cmake/vcpkg_configure_qmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_copy_pdbs.cmake") - include("${SCRIPTS}/cmake/vcpkg_copy_tool_dependencies.cmake") - include("${SCRIPTS}/cmake/vcpkg_copy_tools.cmake") - include("${SCRIPTS}/cmake/vcpkg_download_distfile.cmake") - include("${SCRIPTS}/cmake/vcpkg_execute_build_process.cmake") - include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake") - include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake") - include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake") - include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake") - include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake") - include("${SCRIPTS}/cmake/vcpkg_find_acquire_program.cmake") - include("${SCRIPTS}/cmake/vcpkg_fixup_cmake_targets.cmake") - include("${SCRIPTS}/cmake/vcpkg_fixup_pkgconfig.cmake") - include("${SCRIPTS}/cmake/vcpkg_from_bitbucket.cmake") - include("${SCRIPTS}/cmake/vcpkg_from_git.cmake") - include("${SCRIPTS}/cmake/vcpkg_from_github.cmake") - include("${SCRIPTS}/cmake/vcpkg_from_gitlab.cmake") - include("${SCRIPTS}/cmake/vcpkg_from_sourceforge.cmake") - include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake") - include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake") - include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake") - include("${SCRIPTS}/cmake/vcpkg_install_make.cmake") - include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake") - include("${SCRIPTS}/cmake/vcpkg_install_msbuild.cmake") - include("${SCRIPTS}/cmake/vcpkg_install_nmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_install_qmake.cmake") - include("${SCRIPTS}/cmake/vcpkg_list.cmake") - include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake") - include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake") - - include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake") - include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake") - include("${SCRIPTS}/cmake/z_vcpkg_get_cmake_vars.cmake") - include("${SCRIPTS}/cmake/z_vcpkg_prettify_command_line.cmake") include("${CURRENT_PORT_DIR}/portfile.cmake") if(DEFINED PORT) @@ -169,13 +168,12 @@ elseif(CMD MATCHES "^CREATE$") message(STATUS "Using pre-downloaded: ${NATIVE_DOWNLOAD_PATH}") message(STATUS "If this is not desired, delete the file and ${NATIVE_PORT_PATH}") else() - include(vcpkg_download_distfile) - set(_VCPKG_INTERNAL_NO_HASH_CHECK ON) - vcpkg_download_distfile(ARCHIVE - URLS "${URL}" - FILENAME "${FILENAME}" - ) - set(_VCPKG_INTERNAL_NO_HASH_CHECK OFF) + message(STATUS "Downloading ${URL} -> ${FILENAME}...") + file(DOWNLOAD "${URL}" "${DOWNLOAD_PATH}" STATUS download_status) + list(GET download_status 0 status_code) + if(NOT "${download_status}" EQUAL "0") + message(FATAL_ERROR "Downloading ${URL}... Failed. Status: ${download_status}") + endif() endif() file(SHA512 "${DOWNLOAD_PATH}" SHA512) diff --git a/versions/baseline.json b/versions/baseline.json index 94f34acba5d7a8..28551738f9eb5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6334,7 +6334,7 @@ }, "tinyfiledialogs": { "baseline": "3.8.8", - "port-version": 1 + "port-version": 2 }, "tinygltf": { "baseline": "2020-07-28", @@ -6617,8 +6617,8 @@ "port-version": 0 }, "vcpkg-cmake-config": { - "baseline": "2021-05-22", - "port-version": 1 + "baseline": "2021-08-11", + "port-version": 0 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json index d7b0b5fcdf6986..31ef037fba887e 100644 --- a/versions/t-/tinyfiledialogs.json +++ b/versions/t-/tinyfiledialogs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abb5795ae7f012d210a4d98e4f072dea1b94c97a", + "version": "3.8.8", + "port-version": 2 + }, { "git-tree": "3959a47c7d93ca7db6e2022553b1d3427970cecf", "version-semver": "3.8.8", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index 1a528ef23c9aeb..affac6bbe95ddc 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee", + "version-date": "2021-08-11", + "port-version": 0 + }, { "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5", "version-date": "2021-05-22", From 406f0a51fc85fcd93295fa5b468a2920372e88d0 Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Mon, 16 Aug 2021 23:00:01 -0700 Subject: [PATCH 0322/1858] [vcpkg_fixup_pkgconfig] HOTFIX -- revert #19469 (#19607) Co-authored-by: Robert Schumacher --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 213 ++++++++++------------ 1 file changed, 94 insertions(+), 119 deletions(-) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index a9b9723e002d5a..3f37099a71c3df 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -45,122 +45,115 @@ Still work in progress. If there are more cases which can be handled here feel f * [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake) #]===] -function(z_vcpkg_fixup_pkgconfig_check_files file config) - set(path_suffix_debug /debug) - set(path_suffix_release "") +function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config) + set(PATH_SUFFIX_DEBUG /debug) + set(PATH_SUFFIX_RELEASE) + set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") + set(PKGCONFIG_INSTALLED_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig") + set(PKGCONFIG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") + set(PKGCONFIG_PACKAGES_SHARE_DIR "${CURRENT_PACKAGES_DIR}/share/pkgconfig") if(DEFINED ENV{PKG_CONFIG_PATH}) - set(backup_env_pkg_config_path "$ENV{PKG_CONFIG_PATH}") + set(BACKUP_ENV_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") else() - unset(backup_env_pkg_config_path) + unset(BACKUP_ENV_PKG_CONFIG_PATH) endif() - - vcpkg_list(SET pkg_config_path - "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig" - "${CURRENT_INSTALLED_DIR}/share/pkgconfig" - "${CURRENT_PACKAGES_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig" - "${CURRENT_PACKAGES_DIR}/share/pkgconfig" - ) if(DEFINED ENV{PKG_CONFIG_PATH} AND NOT ENV{PKG_CONFIG_PATH} STREQUAL "") - vcpkg_list(APPEND pkg_config_path "$ENV{PKG_CONFIG_PATH}") + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") + else() + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") endif() - vcpkg_list(JOIN pkg_config_path "${VCPKG_PATH_SEPARATOR}" pkg_config_path) - set(ENV{PKG_CONFIG_PATH} "${pkg_config_path}") # First make sure everything is ok with the package and its deps - cmake_path(GET file STEM package_name) - debug_message("Checking package (${config}): ${package_name}") - execute_process( - COMMAND "${PKGCONFIG}" --print-errors --exists "${package_name}" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" - RESULT_VARIABLE error_var - OUTPUT_VARIABLE output - ERROR_VARIABLE output - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if(NOT "${error_var}" EQUAL "0") - message(FATAL_ERROR "${PKGCONFIG} --exists ${package_name} failed with error code: ${error_var} - ENV{PKG_CONFIG_PATH}: \"$ENV{PKG_CONFIG_PATH}\" - output: ${output}" - ) + get_filename_component(_package_name "${_file}" NAME_WLE) + debug_message("Checking package (${_config}): ${_package_name}") + execute_process(COMMAND "${pkg_cfg_cmd}" --print-errors --exists ${_package_name} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + RESULT_VARIABLE _pkg_error_var + OUTPUT_VARIABLE _pkg_output + ERROR_VARIABLE _pkg_error_out + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE + ) + if(NOT _pkg_error_var EQUAL 0) + message(STATUS "pkg_cfg_cmd call with:${pkg_cfg_cmd} --exists ${_package_name} failed") + message(STATUS "ENV{PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}") + message(STATUS "pkg-config call failed with error code:${_pkg_error_var}") + message(STATUS "pkg-config output:${_pkg_output}") + message(FATAL_ERROR "pkg-config error output:${_pkg_error_out}") else() - debug_message("pkg-config --exists ${package_name} output: ${output}") + debug_message("pkg-config returned:${_pkg_error_var}") + debug_message("pkg-config output:${_pkg_output}") + debug_message("pkg-config error output:${_pkg_error_out}") endif() - if(DEFINED backup_env_pkg_config_path) - set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path}") + if(DEFINED BACKUP_ENV_PKG_CONFIG_PATH) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") else() unset(ENV{PKG_CONFIG_PATH}) endif() endfunction() function(vcpkg_fixup_pkgconfig) - cmake_parse_arguments(PARSE_ARGV 0 arg - "SKIP_CHECK" - "" - "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS" - ) - - if(DEFINED arg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") - endif() + # parse parameters such that semicolons in options arguments to COMMAND don't get erased + cmake_parse_arguments(PARSE_ARGV 0 _vfpkg "SKIP_CHECK" "" "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS") - if(DEFINED arg_RELEASE_FILES AND NOT DEFINED arg_DEBUG_FILES) - message(FATAL_ERROR "DEBUG_FILES must be specified if RELEASE_FILES was specified.") + if(_vfpkg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "vcpkg_fixup_pkgconfig() was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") endif() - if(NOT DEFINED arg_RELEASE_FILES AND DEFINED arg_DEBUG_FILES) - message(FATAL_ERROR "RELEASE_FILES must be specified if DEBUG_FILES was specified.") + + if((DEFINED _vfpkg_RELEASE_FILES AND NOT DEFINED _vfpkg_DEBUG_FILES) OR (NOT DEFINED _vfpkg_RELEASE_FILES AND DEFINED _vfpkg_DEBUG_FILES)) + message(FATAL_ERROR "vcpkg_fixup_pkgconfig() requires both or neither of DEBUG_FILES and RELEASE_FILES") endif() - if(NOT DEFINED arg_RELEASE_FILES) - file(GLOB_RECURSE arg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") - file(GLOB_RECURSE arg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") - foreach(debug_file IN LISTS arg_DEBUG_FILES) - vcpkg_list(REMOVE_ITEM arg_RELEASE_FILES "${debug_file}") - endforeach() + if(NOT DEFINED _vfpkg_RELEASE_FILES) + file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") + file(GLOB_RECURSE _vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") + if(_vfpkg_DEBUG_FILES) + list(REMOVE_ITEM _vfpkg_RELEASE_FILES ${_vfpkg_DEBUG_FILES}) + endif() endif() vcpkg_find_acquire_program(PKGCONFIG) debug_message("Using pkg-config from: ${PKGCONFIG}") - string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_packages_dir "${CURRENT_PACKAGES_DIR}") - string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_installed_dir "${CURRENT_INSTALLED_DIR}") + #Absolute Unix like paths + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") - foreach(config IN ITEMS RELEASE DEBUG) - debug_message("${config} Files: ${arg_${config}_FILES}") - if("${VCPKG_BUILD_TYPE}" STREQUAL "debug" AND "${config}" STREQUAL "RELEASE") + foreach(CONFIG RELEASE DEBUG) + debug_message("${CONFIG} Files: ${_vfpkg_${CONFIG}_FILES}") + if(VCPKG_BUILD_TYPE STREQUAL "debug" AND CONFIG STREQUAL "RELEASE") continue() endif() - if("${VCPKG_BUILD_TYPE}" STREQUAL "release" AND "${config}" STREQUAL "DEBUG") + if(VCPKG_BUILD_TYPE STREQUAL "release" AND CONFIG STREQUAL "DEBUG") continue() endif() - foreach(file IN LISTS "arg_${config}_FILES") - message(STATUS "Fixing pkgconfig file: ${file}") - cmake_path(GET file PARENT_PATH pkg_lib_search_path) - if("${config}" STREQUAL "DEBUG") - set(relative_pc_path "${CURRENT_PACKAGES_DIR}/debug") - cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") + foreach(_file ${_vfpkg_${CONFIG}_FILES}) + message(STATUS "Fixing pkgconfig file: ${_file}") + get_filename_component(PKG_LIB_SEARCH_PATH "${_file}" DIRECTORY) + if(CONFIG STREQUAL "DEBUG") + file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}/debug/") else() - set(relative_pc_path "${CURRENT_PACKAGES_DIR}") - cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") + file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}") endif() + # strip trailing slash + string(REGEX REPLACE "/$" "" RELATIVE_PC_PATH "${RELATIVE_PC_PATH}") #Correct *.pc file - file(READ "${file}" contents) - - string(REPLACE "${CURRENT_PACKAGES_DIR}" [[${prefix}]] contents "${contents}") - string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${prefix}]] contents "${contents}") - string(REPLACE "${unix_packages_dir}" [[${prefix}]] contents "${contents}") - string(REPLACE "${unix_installed_dir}" [[${prefix}]] contents "${contents}") - - string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" contents "${contents}") - if("${config}" STREQUAL "DEBUG") - # prefix points at the debug subfolder - string(REPLACE [[${prefix}/debug]] [[${prefix}]] contents "${contents}") - string(REPLACE [[${prefix}/include]] [[${prefix}/../include]] contents "${contents}") - string(REPLACE [[${prefix}/share]] [[${prefix}/../share]] contents "${contents}") + file(READ "${_file}" _contents) + string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${_VCPKG_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") + string(REPLACE "${_VCPKG_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") + string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" _contents "${_contents}") + if(CONFIG STREQUAL "DEBUG") + string(REPLACE "}/debug" "}" _contents "${_contents}") + # Prefix points at the debug subfolder + string(REPLACE "\${prefix}/include" "\${prefix}/../include" _contents "${_contents}") + string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") endif() - # quote -L, -I, and -l paths starting with `${blah}` - string(REGEX REPLACE " -([LIl])(\\\${[^}]*}[^ \n\t]*)" [[ -\1"\2"]] contents "${contents}") + string(REGEX REPLACE " -L(\\\${[^}]*}[^ \n\t]*)" " -L\"\\1\"" _contents "${_contents}") + string(REGEX REPLACE " -I(\\\${[^}]*}[^ \n\t]*)" " -I\"\\1\"" _contents "${_contents}") + string(REGEX REPLACE " -l(\\\${[^}]*}[^ \n\t]*)" " -l\"\\1\"" _contents "${_contents}") # This section fuses XYZ.private and XYZ according to VCPKG_LIBRARY_LINKAGE # # Pkgconfig searches Requires.private transitively for Cflags in the dynamic case, @@ -168,51 +161,33 @@ function(vcpkg_fixup_pkgconfig) # # Once this transformation is complete, users of vcpkg should never need to pass # --static. - if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") - # how this works: - # we want to transform: - # Libs: $1 - # Libs.private: $2 - # into - # Libs: $1 $2 - # and the same thing for Requires and Requires.private - - set(libs_line "") - set(requires_line "") - if("${contents}" MATCHES "Libs: *([^\n]*)") - string(APPEND libs_line " ${CMAKE_MATCH_1}") - endif() - if("${contents}" MATCHES "Libs.private: *([^\n]*)") - string(APPEND libs_line " ${CMAKE_MATCH_1}") - endif() - if("${contents}" MATCHES "Requires: *([^\n]*)") - string(APPEND requires_line " ${CMAKE_MATCH_1}") - endif() - if("${contents}" MATCHES "Requires.private: *([^\n]*)") - string(APPEND requires_line " ${CMAKE_MATCH_1}") - endif() - - string(REGEX REPLACE "(^|\n)(Requires|Libs)(\\.private)?:[^\n]*\n" [[\1]] contents "${contents}") - - if(NOT "${libs_line}" STREQUAL "") - string(APPEND contents "Libs:${libs_line}\n") - endif() - if(NOT "${requires_line}" STREQUAL "") - string(APPEND contents "Requires:${requires_line}\n") - endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + # Libs comes before Libs.private + string(REGEX REPLACE "(^|\n)(Libs: *[^\n]*)(.*)\nLibs.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") + # Libs.private comes before Libs + string(REGEX REPLACE "(^|\n)Libs.private:( *[^\n]*)(.*\nLibs: *[^\n]*)" "\\3\\2" _contents "${_contents}") + # Only Libs.private + string(REGEX REPLACE "(^|\n)Libs.private: *" "\\1Libs: " _contents "${_contents}") + # Requires comes before Requires.private + string(REGEX REPLACE "(^|\n)(Requires: *[^\n]*)(.*)\nRequires.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") + # Requires.private comes before Requires + string(REGEX REPLACE "(^|\n)Requires.private:( *[^\n]*)(.*\nRequires: *[^\n]*)" "\\3\\2" _contents "${_contents}") + # Only Requires.private + string(REGEX REPLACE "(^|\n)Requires.private: *" "\\1Requires: " _contents "${_contents}") endif() - file(WRITE "${file}" "prefix=\${pcfiledir}/${relative_pc_path}\n${contents}") + file(WRITE "${_file}" "prefix=\${pcfiledir}/${RELATIVE_PC_PATH}\n${_contents}") + unset(PKG_LIB_SEARCH_PATH) endforeach() - if(NOT arg_SKIP_CHECK) # The check can only run after all files have been corrected! - foreach(file IN LISTS "arg_${config}_FILES") - z_vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${file}" "${config}") + if(NOT _vfpkg_SKIP_CHECK) # The check can only run after all files have been corrected! + foreach(_file ${_vfpkg_${CONFIG}_FILES}) + vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${_file}" "${CONFIG}") endforeach() endif() endforeach() debug_message("Fixing pkgconfig --- finished") - set(Z_VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) + set(VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) # Variable to check if this function has been called! # Theoreotically vcpkg could look for *.pc files and automatically call this function # or check if this function has been called if *.pc files are detected. From d45a38dd50a6a84264c914f263a81baf5b85921c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 18 Aug 2021 02:33:44 +0200 Subject: [PATCH 0323/1858] [docs] Improve assetcaching.md (#19625) * Improve asset caching readme * Update assetcaching.md Co-authored-by: Robert Schumacher --- docs/README.md | 1 + docs/users/assetcaching.md | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 7ef5c0d0659269..f5994445a50c9e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -19,6 +19,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Configuration and Environment](users/config-environment.md) - [Manifest Mode](users/manifests.md) - [Binary Caching](users/binarycaching.md) +- [Asset Caching](users/assetcaching.md) - [Versioning](users/versioning.md) - [Usage with Android](users/android.md) - [Usage with Mingw-w64](users/mingw.md) diff --git a/docs/users/assetcaching.md b/docs/users/assetcaching.md index 425e1158fd7c42..1328bb2fe95b4e 100644 --- a/docs/users/assetcaching.md +++ b/docs/users/assetcaching.md @@ -31,7 +31,22 @@ Syntax: `x-azurl,[,[,]]` Adds an Azure Blob Storage source, optionally using Shared Access Signature validation. URL should include the container path and be terminated with a trailing `/`. SAS, if defined, should be prefixed with a `?`. Non-Azure servers will also -work if they respond to GET and PUT requests of the form: ``. +work if they respond to GET and PUT requests of the form: ``. As an example, if you set +`X_VCPKG_ASSET_SOURCES` to `x-azurl,https://mydomain.com/vcpkg/,token=abc123,readwrite` your server should respond to +`GET` and `PUT` requests of the form `https://mydomain.com/vcpkg/?token=abc123`. + +You can also use the filesystem (e.g. a network drive) via `file://` as asset cache. For example you then set +`X_VCPKG_ASSET_SOURCES` to `x-azurl,file:///Z:/vcpkg/assetcache/,,readwrite` when you have a network folder mounted at +`Z:/`. + +The workflow of this asset source is: + +1. Attemp to read from the mirror +2. (If step 1 failed) Read from the original url +3. (If step 2 succeeded) Write back to the mirror + +You can enable/disable steps 1 and 3 via the [``](#valid-source-strings) specifier and you can disable step 2 via +`x-block-origin` below. See also the [binary caching documentation for Azure Blob Storage](binarycaching.md#azure-blob-storage-experimental) for more information on how to set up an `x-azurl` source. From bb76ba550bdacfdcbbdea595f73d95d724c53b38 Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Wed, 18 Aug 2021 19:07:51 -0500 Subject: [PATCH 0324/1858] Adapting for HPX V1.7.1 (#19585) --- ports/hpx/hpx-1.7.0-format-from-string.patch | 12 ------------ ports/hpx/portfile.cmake | 6 ++---- ports/hpx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hpx.json | 5 +++++ 5 files changed, 9 insertions(+), 18 deletions(-) delete mode 100644 ports/hpx/hpx-1.7.0-format-from-string.patch diff --git a/ports/hpx/hpx-1.7.0-format-from-string.patch b/ports/hpx/hpx-1.7.0-format-from-string.patch deleted file mode 100644 index 2aa2d3eb4c154c..00000000000000 --- a/ports/hpx/hpx-1.7.0-format-from-string.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libs/core/format/include/hpx/util/from_string.hpp b/libs/core/format/include/hpx/util/from_string.hpp -index 07eb9b68dfb..c3d0d857143 100644 ---- a/libs/core/format/include/hpx/util/from_string.hpp -+++ b/libs/core/format/include/hpx/util/from_string.hpp -@@ -10,6 +10,7 @@ - #include - - #include -+#include - #include - #include - #include diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index aee67742ec3540..e8bbd3a569f20d 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.7.0 - SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518 + REF 1.7.1 + SHA512 6bdb294da393a198abf81d5f63799a066334755eed0fda40bbfc4e9a774b6e19a3e5ad7ab45c989d31f3797e7b547bb552c29f51b552d9a79d166f86aee375a3 HEAD_REF stable - PATCHES - hpx-1.7.0-format-from-string.patch ) vcpkg_configure_cmake( diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index fdb0c630612dd5..f628a848af6644 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hpx", - "version-string": "1.7.0", + "version-semver": "1.7.1", "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." diff --git a/versions/baseline.json b/versions/baseline.json index 28551738f9eb5a..68735689f2e4d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2549,7 +2549,7 @@ "port-version": 1 }, "hpx": { - "baseline": "1.7.0", + "baseline": "1.7.1", "port-version": 0 }, "http-parser": { diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index fc9d09da7f7899..84c8a4d9fa54d5 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d55f05944b91ea48152696beb48444cad53ba8e1", + "version-semver": "1.7.1", + "port-version": 0 + }, { "git-tree": "6abaf9002afc0d46fd8700438776403d63959ebf", "version-string": "1.7.0", From 013255ccfdaf1677eb450951a8a6d0766817ca04 Mon Sep 17 00:00:00 2001 From: Mohammed Alyousef Date: Thu, 19 Aug 2021 03:08:19 +0300 Subject: [PATCH 0325/1858] [fltk] Update fltk to version 1.3.7 (#19584) * update fltk port to versin 1.3.7 * update versions file * use vcpkg_from_github * update version database --- ports/fltk/fltk_version.dat | 2 +- ports/fltk/portfile.cmake | 5 ++--- ports/fltk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fltk.json | 5 +++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/fltk/fltk_version.dat b/ports/fltk/fltk_version.dat index 6f96ed0815ab3f..8ed486ab78b528 100644 --- a/ports/fltk/fltk_version.dat +++ b/ports/fltk/fltk_version.dat @@ -1 +1 @@ -1.3.6 \ No newline at end of file +1.3.7 \ No newline at end of file diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index e1da45fcbadd87..9a32c019e3c0df 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -6,9 +6,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fltk/fltk - REF 46604ef40bde400c0c33fb5790b023629d1bd445 #1.3.6 rc1 - SHA512 692996be22b289a473be9371dbf558a940d7dda72ce655141610d55de5f7e6a331010a8d999fe4e3feaa01fff7797a4403173b3b804329579d08fbc77ba7958e - HEAD_REF master + REF release-1.3.7 + SHA512 aad131027e88fac3fe73d7e0abfc2602cdc195388f14b29b58d654cb49b780e6ff2ef4270935730b45cd3d366f9e8c8fa3c27a4f17b1f6e8c8fd1f9a0a73c308 PATCHES findlibsfix.patch config-path.patch diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index 6221cda9fe3acb..0dcc3f21e4f099 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fltk", - "version": "1.3.6", + "version": "1.3.7", "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 68735689f2e4d2..87938e2491c600 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2061,7 +2061,7 @@ "port-version": 0 }, "fltk": { - "baseline": "1.3.6", + "baseline": "1.3.7", "port-version": 0 }, "fluidlite": { diff --git a/versions/f-/fltk.json b/versions/f-/fltk.json index d34c3d3659092d..4786b8b8c35d27 100644 --- a/versions/f-/fltk.json +++ b/versions/f-/fltk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fff1ed0fe94c6d45ad15d6cb6f575537880f1f6", + "version": "1.3.7", + "port-version": 0 + }, { "git-tree": "f242495c4ab5a13a640e506c0b02d052b0ea7b80", "version": "1.3.6", From f6c5f2b41aafae347aa71befcbcabc86ddedd68f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 19 Aug 2021 02:09:24 +0200 Subject: [PATCH 0326/1858] [rtaudio] update (#19583) * [rtaudio] update to new version * add version files --- ports/rtaudio/portfile.cmake | 10 +++++----- ports/rtaudio/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/r-/rtaudio.json | 5 +++++ 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake index bd01993ae6d248..2d069486caf28e 100644 --- a/ports/rtaudio/portfile.cmake +++ b/ports/rtaudio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtaudio - REF c9bf99d414cf81d19ef0ddd00212a4a58ccd99c6 - SHA512 6dc0025288cbf09f21862be6093ad77b950e6af03ea7e5aea3a9f6c322d957897c0d6206636225bd439c05b5a13d53df3ef9a9f1a9ea5d3012bee06c1a62c9f0 + REF bc7ad66581947f810ff4460396bbbd1846b1e7c8 + SHA512 ef5a41df15a8486550fb791ac21fcee4ecbf726fe9e91a56fcdd437cd554ea242f08c1061a9c6d5c261d721d86fbbcb32ce64db030976150862ed42a40137fc7 HEAD_REF master ) @@ -23,7 +23,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS asio RTAUDIO_API_ASIO ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS @@ -33,9 +33,9 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json index 1dc3e1df8fcfa6..6c24da39165273 100644 --- a/ports/rtaudio/vcpkg.json +++ b/ports/rtaudio/vcpkg.json @@ -1,10 +1,19 @@ { "name": "rtaudio", - "version-date": "2021-05-18", - "port-version": 1, + "version-date": "2021-08-15", "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", "homepage": "https://github.com/thestk/rtaudio", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "asio": { "description": "Build with ASIO backend" diff --git a/versions/baseline.json b/versions/baseline.json index 87938e2491c600..d21046480c7634 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5665,8 +5665,8 @@ "port-version": 1 }, "rtaudio": { - "baseline": "2021-05-18", - "port-version": 1 + "baseline": "2021-08-15", + "port-version": 0 }, "rtlsdr": { "baseline": "2020-04-16-1", diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json index 5978c80e68fe45..9f3a61f0033ee0 100644 --- a/versions/r-/rtaudio.json +++ b/versions/r-/rtaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "551c1a7847652aa574e0af5af18d00b6e55fd034", + "version-date": "2021-08-15", + "port-version": 0 + }, { "git-tree": "73b803ac8a870dd48165b34aecc29f2155b5b172", "version-date": "2021-05-18", From 4a61603ff5f675996d24e67f10a819640d4b4fbc Mon Sep 17 00:00:00 2001 From: Barak Shoshany Date: Wed, 18 Aug 2021 20:09:48 -0400 Subject: [PATCH 0327/1858] [bshoshany-thread-pool] Updated to v2.0.0 (#19582) * Updated bshoshany-thread-pool to v2.0.0 * Updated versions database --- ports/bshoshany-thread-pool/portfile.cmake | 4 ++-- ports/bshoshany-thread-pool/vcpkg.json | 2 +- versions/b-/bshoshany-thread-pool.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bshoshany-thread-pool/portfile.cmake b/ports/bshoshany-thread-pool/portfile.cmake index 4c45e8f9ccfd78..b958693499299b 100644 --- a/ports/bshoshany-thread-pool/portfile.cmake +++ b/ports/bshoshany-thread-pool/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bshoshany/thread-pool - REF v1.9 - SHA512 d87c67218a5373181332caa53aa611b79345df56fe2ba1452dbd552ef43fdeecbf2f6347f86c4730423c1545b4dc45524a4737949359cdda5ff911ce647eb8f4 + REF v2.0.0 + SHA512 eac1674ea999d25d8d0b8f1b24714830330ba4d345e3f730e49359bae89d9259e429d48357a45f7b4355cbbe1a63f04e7fe2c4e0be08b3bbea51018c62721fcc HEAD_REF master ) diff --git a/ports/bshoshany-thread-pool/vcpkg.json b/ports/bshoshany-thread-pool/vcpkg.json index 4982a910c83ab2..86058533b0954c 100644 --- a/ports/bshoshany-thread-pool/vcpkg.json +++ b/ports/bshoshany-thread-pool/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bshoshany-thread-pool", - "version": "1.9", + "version": "2.0.0", "description": "A C++17 Thread Pool for High-Performance Scientific Computing", "homepage": "https://github.com/bshoshany/thread-pool" } diff --git a/versions/b-/bshoshany-thread-pool.json b/versions/b-/bshoshany-thread-pool.json index 6c5ef150c46ba1..15c2ec3e2fca26 100644 --- a/versions/b-/bshoshany-thread-pool.json +++ b/versions/b-/bshoshany-thread-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ce890350a3e619b459eac4f676aa3e0858316b4", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "4ec35ab1086df444d30b05ff49cf2a66c21ebd52", "version": "1.9", diff --git a/versions/baseline.json b/versions/baseline.json index d21046480c7634..c76ee729c55053 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1077,7 +1077,7 @@ "port-version": 0 }, "bshoshany-thread-pool": { - "baseline": "1.9", + "baseline": "2.0.0", "port-version": 0 }, "bsio": { From c76b4d92c867bbb54b439fd8ec7f42e32cc6c5c1 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 18 Aug 2021 17:10:35 -0700 Subject: [PATCH 0328/1858] [vamp-sdk] update to 2.10; switch download URL to GitHub; fix path of installed headers (#19572) * [vamp-sdk] update to 2.10; switch download URL to GitHub This works around a bad SSL certificate on https://code.soundsoftware.ac.uk : Error: Failed to download from mirror set: https://code.soundsoftware.ac.uk/attachments/download/2589/vamp-plugin-sdk-2.9.0.zip: % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (60) SSL certificate problem: unable to get local issuer certificate More details here: https://curl.se/docs/sslcerts.html curl failed to verify the legitimacy of the server and therefore could not establish a secure connection to it. To learn more about this situation and how to fix it, please visit the web page mentioned above. * [vamp-sdk] fix path of installed headers These are the paths installed by the vamp-plugin-sdk-devel Fedora package: /usr/include/vamp /usr/include/vamp-hostsdk /usr/include/vamp-hostsdk/Plugin.h /usr/include/vamp-hostsdk/PluginBase.h /usr/include/vamp-hostsdk/PluginBufferingAdapter.h /usr/include/vamp-hostsdk/PluginChannelAdapter.h /usr/include/vamp-hostsdk/PluginHostAdapter.h /usr/include/vamp-hostsdk/PluginInputDomainAdapter.h /usr/include/vamp-hostsdk/PluginLoader.h /usr/include/vamp-hostsdk/PluginSummarisingAdapter.h /usr/include/vamp-hostsdk/PluginWrapper.h /usr/include/vamp-hostsdk/RealTime.h /usr/include/vamp-hostsdk/host-c.h /usr/include/vamp-hostsdk/hostguard.h /usr/include/vamp-hostsdk/vamp-hostsdk.h /usr/include/vamp-sdk /usr/include/vamp-sdk/FFT.h /usr/include/vamp-sdk/Plugin.h /usr/include/vamp-sdk/PluginAdapter.h /usr/include/vamp-sdk/PluginBase.h /usr/include/vamp-sdk/RealTime.h /usr/include/vamp-sdk/plugguard.h /usr/include/vamp-sdk/vamp-sdk.h /usr/include/vamp/vamp.h --- ports/vamp-sdk/CMakeLists.txt | 6 +++--- ports/vamp-sdk/portfile.cmake | 12 ++++-------- ports/vamp-sdk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vamp-sdk.json | 5 +++++ 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ports/vamp-sdk/CMakeLists.txt b/ports/vamp-sdk/CMakeLists.txt index d6b2c7bd0dbf2d..d24851b31785f2 100644 --- a/ports/vamp-sdk/CMakeLists.txt +++ b/ports/vamp-sdk/CMakeLists.txt @@ -85,21 +85,21 @@ install( if(NOT DISABLE_INSTALL_HEADERS) install( DIRECTORY vamp-hostsdk/ - DESTINATION include/vamp-sdk/vamp-hostsdk + DESTINATION include/vamp-hostsdk FILES_MATCHING PATTERN "*.h" PATTERN "*_priv.h" EXCLUDE PATTERN "config.h" EXCLUDE) install( DIRECTORY vamp-sdk/ - DESTINATION include/vamp-sdk/vamp-sdk + DESTINATION include/vamp-sdk FILES_MATCHING PATTERN "*.h" PATTERN "*_priv.h" EXCLUDE PATTERN "config.h" EXCLUDE) install( DIRECTORY vamp/ - DESTINATION include/vamp-sdk/vamp + DESTINATION include/vamp FILES_MATCHING PATTERN "*.h" PATTERN "*_priv.h" EXCLUDE diff --git a/ports/vamp-sdk/portfile.cmake b/ports/vamp-sdk/portfile.cmake index bb9f800fcef5f2..890f68e4a7ed8b 100644 --- a/ports/vamp-sdk/portfile.cmake +++ b/ports/vamp-sdk/portfile.cmake @@ -1,12 +1,8 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://code.soundsoftware.ac.uk/attachments/download/2589/vamp-plugin-sdk-2.9.0.zip" - FILENAME "vamp-plugin-sdk-2.9.0.zip" - SHA512 38222f074c17ba420fcc1ad6639048c8f282b892a4baf4257481d7f65f2b5a62685d8bc8e9cbbb5b77063a92f33dc3d2f138ea9b21c475ae1c456146056720ed -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( + REPO c4dm/vamp-plugin-sdk + REF vamp-plugin-sdk-v2.10 + SHA512 67a71e5396eab5ce9503e9111b4cfc16fc9755cf6ae2d8dfc99ed29fd91e75eaf0de9a9c55ce8f7751f04c235eb86430856eff18f02adde54f1850a87c917ef0 OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/vamp-sdk/vcpkg.json b/ports/vamp-sdk/vcpkg.json index 735a1d06ccc0fc..c4bc939e25791a 100644 --- a/ports/vamp-sdk/vcpkg.json +++ b/ports/vamp-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", - "version": "2.9", + "version": "2.10", "description": "Library for VAMP plugins", "homepage": "https://www.vamp-plugins.org/develop.html", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index c76ee729c55053..7c493d08a233a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6597,7 +6597,7 @@ "port-version": 1 }, "vamp-sdk": { - "baseline": "2.9", + "baseline": "2.10", "port-version": 0 }, "variant-lite": { diff --git a/versions/v-/vamp-sdk.json b/versions/v-/vamp-sdk.json index 33fa8da308c020..ecc1e3b2176cd8 100644 --- a/versions/v-/vamp-sdk.json +++ b/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da7ad3424d8266657eec1b28b16a8d389e50b67c", + "version": "2.10", + "port-version": 0 + }, { "git-tree": "f98530b4731d88b3ddda90a25ad998076da19425", "version": "2.9", From 84d4bf8672ad9cbbc1ff5ee5b0d129cff0f472af Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 Aug 2021 09:14:24 +0900 Subject: [PATCH 0329/1858] [zug] Add port (#19539) * add zug port * run `vcpkg x-add-version --all` * add missing docs feature to zug * run `vcpkg x-add-version --all --overwrite-version` * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * format vcpkg.json * update version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/zug/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/zug/vcpkg.json | 21 +++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/z-/zug.json | 9 +++++++++ 4 files changed, 61 insertions(+) create mode 100644 ports/zug/portfile.cmake create mode 100644 ports/zug/vcpkg.json create mode 100644 versions/z-/zug.json diff --git a/ports/zug/portfile.cmake b/ports/zug/portfile.cmake new file mode 100644 index 00000000000000..d222436fe24f8e --- /dev/null +++ b/ports/zug/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arximboldi/zug + REF 033dadbed463ff3430b7ebc36df8a46f4f0f5078 + SHA512 a8067a90f7a427775872f8198419aa791b647e273ed148b93c189d3b81a4564a19b9321b4bb8cd5681627d8ab13e40be09ed1d75c7b65d74078f21daddaef929 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + docs zug_BUILD_DOCS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dzug_BUILD_EXAMPLES=OFF + -Dzug_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) + + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Zug) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zug/vcpkg.json b/ports/zug/vcpkg.json new file mode 100644 index 00000000000000..ac59f865eb87f5 --- /dev/null +++ b/ports/zug/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "zug", + "version-date": "2021-04-23", + "description": "Transducers for C++", + "homepage": "https://sinusoid.es/zug/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "docs": { + "description": "Build documentation" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 7c493d08a233a5..6aeb14c616d4c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6964,6 +6964,10 @@ "baseline": "1.0.4", "port-version": 0 }, + "zug": { + "baseline": "2021-04-23", + "port-version": 0 + }, "zxing-cpp": { "baseline": "2020-12-2", "port-version": 0 diff --git a/versions/z-/zug.json b/versions/z-/zug.json new file mode 100644 index 00000000000000..687ab2d8f77370 --- /dev/null +++ b/versions/z-/zug.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "2213b3d809f8a99994484b626896f6cf6e3858c3", + "version-date": "2021-04-23", + "port-version": 0 + } + ] +} From 0c6e1e17cac5e9a181fd77655e51ac750d5ad7a8 Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Thu, 19 Aug 2021 03:14:57 +0300 Subject: [PATCH 0330/1858] [opentelemetry-cpp] New port (#19536) * add openteletry-cpp * update vcpkg * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update version * check etw for linux/osx * Remove otlp feature Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/opentelemetry-cpp/portfile.cmake | 42 +++++++++++++++++++++++ ports/opentelemetry-cpp/vcpkg.json | 46 ++++++++++++++++++++++++++ versions/baseline.json | 4 +++ versions/o-/opentelemetry-cpp.json | 9 +++++ 4 files changed, 101 insertions(+) create mode 100644 ports/opentelemetry-cpp/portfile.cmake create mode 100644 ports/opentelemetry-cpp/vcpkg.json create mode 100644 versions/o-/opentelemetry-cpp.json diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake new file mode 100644 index 00000000000000..63ccb500bf07bd --- /dev/null +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -0,0 +1,42 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +if ("etw" IN_LIST FEATURES) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "linux" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "OSX") + message(FATAL_ERROR "Feature 'ewt' does not support 'linux & osx'") + endif() +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO open-telemetry/opentelemetry-cpp + REF v1.0.0-rc4 + SHA512 93de3e61b6bd0a9237cf81dedbcdb078fb92c1dc562975c82134d791ad911d4d3c0e717f390a0a993fbeda5d5c90206c0e7a0c7085e58d9cfefbc9fd4ff209d2 + HEAD_REF main +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + etw WITH_ETW + zipkin WITH_ZIPKIN + prometheus WITH_PROMETHEUS + elasticsearch WITH_ELASTICSEARCH + jaeger WITH_JAEGER +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DWITH_EXAMPLES=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json new file mode 100644 index 00000000000000..d8d6a0dd3507d6 --- /dev/null +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -0,0 +1,46 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "opentelemetry-cpp", + "version-semver": "1.0.0-rc4", + "description": [ + "OpenTelemetry is a collection of tools, APIs, and SDKs.", + "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." + ], + "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", + "supports": "!(windows & !static)", + "dependencies": [ + "curl", + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "elasticsearch": { + "description": "Whether to include the Elasticsearch Client in the SDK" + }, + "etw": { + "description": "Whether to include the ETW Exporter in the SDK" + }, + "jaeger": { + "description": "Whether to include the Jaeger exporter", + "dependencies": [ + "thrift" + ] + }, + "prometheus": { + "description": "Whether to include the Prometheus Client in the SDK", + "dependencies": [ + "prometheus-cpp" + ] + }, + "zipkin": { + "description": "Whether to include the Zipkin exporter in the SDK" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 6aeb14c616d4c2..c2c74e2af230b2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4712,6 +4712,10 @@ "baseline": "3.4.3", "port-version": 2 }, + "opentelemetry-cpp": { + "baseline": "1.0.0-rc4", + "port-version": 0 + }, "opentracing": { "baseline": "1.6.0", "port-version": 1 diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json new file mode 100644 index 00000000000000..daf0f0edffd513 --- /dev/null +++ b/versions/o-/opentelemetry-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "987820e81233d904abda334100303e2d11469499", + "version-semver": "1.0.0-rc4", + "port-version": 0 + } + ] +} From 7001190d7a20db5d0427386fa5543dd1551939ea Mon Sep 17 00:00:00 2001 From: eli Date: Thu, 19 Aug 2021 09:17:34 +0900 Subject: [PATCH 0331/1858] [immer] update port (#19521) * update immer port * run `vcpkg x-add-version --all` * Update ports/immer/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/immer/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/immer/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/immer/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/immer/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/immer/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update verison * delete versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/immer/CONTROL | 3 --- ports/immer/portfile.cmake | 27 +++++++++++++++++---------- ports/immer/vcpkg.json | 21 +++++++++++++++++++++ versions/baseline.json | 2 +- versions/i-/immer.json | 5 +++++ 5 files changed, 44 insertions(+), 14 deletions(-) delete mode 100644 ports/immer/CONTROL create mode 100644 ports/immer/vcpkg.json diff --git a/ports/immer/CONTROL b/ports/immer/CONTROL deleted file mode 100644 index f6f736b59a655f..00000000000000 --- a/ports/immer/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: immer -Version: 2019-06-07 -Description: Postmodern immutable and persistent data structures for C++ diff --git a/ports/immer/portfile.cmake b/ports/immer/portfile.cmake index 10c1e607337def..c6c2a0bb0c93bb 100644 --- a/ports/immer/portfile.cmake +++ b/ports/immer/portfile.cmake @@ -3,25 +3,32 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arximboldi/immer - REF fe1d5151f8e62a97a953664f8de39b05ac0d2031 - SHA512 2f78c2d85a24b2bcb69bbbf8b038c8bacb5a841e0f0ce7e4e521d369423c7d44f803a1c766a77d0955246a1b22476de15fa708a3786f05c41a3b705a574bbb71 + REF a11df7243cb516a1aeffc83c31366d7259c79e82 + SHA512 7aefa894d57167e8606ffd20c78490731885da610da084ffdc4ee677e40c7a3b4edcd0fbf74e354fc68866d09ec7a35a7c549f78ce91f2f1a84bb6ccc605e135 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "docs" immer_BUILD_DOCS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_PYTHON=OFF -DENABLE_GUILE=OFF -DENABLE_BOOST_COROUTINE=OFF + -Dimmer_BUILD_TESTS=OFF + -Dimmer_BUILD_EXAMPLES=OFF + -Dimmer_BUILD_EXTRAS=OFF + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Immer) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Immer) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/immer/vcpkg.json b/ports/immer/vcpkg.json new file mode 100644 index 00000000000000..c52c0f02cf550e --- /dev/null +++ b/ports/immer/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "immer", + "version-date": "2021-05-03", + "description": "Postmodern immutable and persistent data structures for C++", + "homepage": "https://sinusoid.es/immer/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "docs": { + "description": "Build documentation" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index c2c74e2af230b2..dfa6f21d0f7e35 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2693,7 +2693,7 @@ "port-version": 0 }, "immer": { - "baseline": "2019-06-07", + "baseline": "2021-05-03", "port-version": 0 }, "implot": { diff --git a/versions/i-/immer.json b/versions/i-/immer.json index 5aa14d0562878b..0ab115f21b67a5 100644 --- a/versions/i-/immer.json +++ b/versions/i-/immer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ee78459721140ead0ace0a031bbb9d28039b19e", + "version-date": "2021-05-03", + "port-version": 0 + }, { "git-tree": "515103042c70e0f9cf8d1518816d09fc6110a669", "version-string": "2019-06-07", From 493fec34f6c53f2d7f69be9641e4b60e72f35d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 19 Aug 2021 08:18:05 +0800 Subject: [PATCH 0332/1858] [lua] Add error message to feature `cpp` when building uwp (#19510) * [lua] Add error message to the cpp selection feature when building uwp. * version --- ports/lua/portfile.cmake | 3 +++ ports/lua/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/lua.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/lua/portfile.cmake b/ports/lua/portfile.cmake index 89097096c14a00..1a7fac53caa838 100644 --- a/ports/lua/portfile.cmake +++ b/ports/lua/portfile.cmake @@ -16,6 +16,9 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) # Used in cmake wrapper set(ENABLE_LUA_CPP 0) if ("cpp" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature cpp does not support uwp.") + endif() set(ENABLE_LUA_CPP 1) endif() diff --git a/ports/lua/vcpkg.json b/ports/lua/vcpkg.json index 02dc73117bc62f..e381a077ead1d0 100644 --- a/ports/lua/vcpkg.json +++ b/ports/lua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lua", "version-semver": "5.4.3", - "port-version": 2, + "port-version": 3, "description": "A powerful, fast, lightweight, embeddable scripting language", "homepage": "https://www.lua.org", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index dfa6f21d0f7e35..01181049e1f1ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3890,7 +3890,7 @@ }, "lua": { "baseline": "5.4.3", - "port-version": 2 + "port-version": 3 }, "luabridge": { "baseline": "2.6", diff --git a/versions/l-/lua.json b/versions/l-/lua.json index 930b811579a830..b5478630869b88 100644 --- a/versions/l-/lua.json +++ b/versions/l-/lua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a9a787a9369019f1dd867cc1c1d6c10296441d9", + "version-semver": "5.4.3", + "port-version": 3 + }, { "git-tree": "3be47dc8a0f0e6497caac10e26e2eaf8866b2990", "version-semver": "5.4.3", From 124aa932756d3f1efe7abf98a76b8aced770d2ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Thu, 19 Aug 2021 02:19:15 +0200 Subject: [PATCH 0333/1858] [sdl2] Update to 2.0.16 (#19509) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [sdl2] Update to 2.0.16 * [sdl2] Update version files * [sdl2] Fix uwp builds * [sdl2] Update version files * [sdl2] Change version-semver to version * [sdl2] Fix uwp pkgconfig file creation * [sdl2] Add alias on static build * [sdl2] Remove cmake wrapper * [sdl2] Update version files * [sdl2] Disable SDL2::SDL2main target search on uwp * [sdl2] Update version files Co-authored-by: Rémy Tassoux Co-authored-by: Billy Robert O'Neal III --- ...-creation-of-pkg-cfg-file-on-windows.patch | 25 +++++++++----- ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch | 4 +-- ...disable-sdlmain-target-search-on-uwp.patch | 34 +++++++++++++++++++ ports/sdl2/0003-sdl2-fix-uwp-build.patch | 25 -------------- .../0004-sdl2-alias-on-static-build.patch | 17 ++++++++++ ...0004-sdl2-macos-thread-detection-fix.patch | 12 ------- ports/sdl2/portfile.cmake | 22 +++++------- ports/sdl2/vcpkg-cmake-wrapper.cmake | 8 ----- ports/sdl2/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/s-/sdl2.json | 5 +++ 11 files changed, 86 insertions(+), 73 deletions(-) create mode 100644 ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch delete mode 100644 ports/sdl2/0003-sdl2-fix-uwp-build.patch create mode 100644 ports/sdl2/0004-sdl2-alias-on-static-build.patch delete mode 100644 ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch delete mode 100644 ports/sdl2/vcpkg-cmake-wrapper.cmake diff --git a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch index 5aaf4db3307d63..e69568b2323d76 100644 --- a/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch +++ b/ports/sdl2/0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch @@ -1,22 +1,31 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2086,7 +2086,6 @@ +@@ -2348,7 +2348,6 @@ execute_process(COMMAND sh ${SDL2_SOURCE_DIR}/build-scripts/updaterev.sh WORKING_DIRECTORY ${SDL2_BINARY_DIR}) endif() --if(NOT WINDOWS OR CYGWIN) +-if(NOT WINDOWS OR CYGWIN OR MINGW) + set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\${prefix}") - set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}") -@@ -2129,7 +2129,6 @@ + +@@ -2375,7 +2375,7 @@ + set(SDL_STATIC_LIBS ${_SDL_STATIC_LIBS}) + listtostrrev(SDL_LIBS _SDL_LIBS) + set(SDL_LIBS ${_SDL_LIBS}) +- else() ++ elseif(NOT WINDOWS_STORE) + listtostr(EXTRA_LIBS _EXTRA_LIBS "-l") + set(SDL_STATIC_LIBS ${SDL_LIBS} ${EXTRA_LDFLAGS} ${_EXTRA_LIBS}) + list(REMOVE_DUPLICATES SDL_STATIC_LIBS) +@@ -2403,7 +2403,6 @@ "${SDL2_BINARY_DIR}/sdl2-config" @ONLY) configure_file("${SDL2_SOURCE_DIR}/SDL2.spec.in" "${SDL2_BINARY_DIR}/SDL2.spec" @ONLY) -endif() - ##### Info output ##### - message(STATUS "") -@@ -2376,6 +2376,7 @@ + macro(check_add_debug_flag FLAG SUFFIX) + check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX}) +@@ -2728,6 +2728,7 @@ # TODO: what about the .spec file? Is it only needed for RPM creation? install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal") endif() diff --git a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch index bef8315562150d..b23212fa031ab6 100644 --- a/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch +++ b/ports/sdl2/0002-sdl2-skip-ibus-on-linux.patch @@ -1,8 +1,6 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06aa026..81d7645 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1240,12 +1240,6 @@ elseif(UNIX AND NOT APPLE AND NOT ANDROID AND NOT RISCOS) +@@ -1295,12 +1295,6 @@ set(HAVE_FCITX TRUE) endif() diff --git a/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch b/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch new file mode 100644 index 00000000000000..e5ab214675c804 --- /dev/null +++ b/ports/sdl2/0003-sdl2-disable-sdlmain-target-search-on-uwp.patch @@ -0,0 +1,34 @@ +--- a/SDL2Config.cmake ++++ b/SDL2Config.cmake +@@ -32,6 +2,7 @@ + endif() + endforeach() + ++if(NOT WINDOWS_STORE) + foreach(prop ${relprops}) + get_target_property(sdl2mainimplib SDL2::SDL2main ${prop}) + if(sdl2mainimplib) +@@ -37,6 +37,7 @@ + break() + endif() + endforeach() ++endif() + + foreach(prop ${dbgprops}) + get_target_property(sdl2implibdbg SDL2::SDL2 ${prop}) +@@ -47,6 +47,7 @@ + endif() + endforeach() + ++if(NOT WINDOWS_STORE) + foreach(prop ${dbgprops}) + get_target_property(sdl2mainimplibdbg SDL2::SDL2main ${prop}) + if(sdl2mainimplibdbg) +@@ -55,6 +55,7 @@ + break() + endif() + endforeach() ++endif() + + if( sdl2implib AND sdl2mainimplib AND sdl2implibdbg AND sdl2mainimplibdbg ) + # we have both release and debug builds of SDL2 and SDL2main, so use this ugly diff --git a/ports/sdl2/0003-sdl2-fix-uwp-build.patch b/ports/sdl2/0003-sdl2-fix-uwp-build.patch deleted file mode 100644 index 5175343ce04833..00000000000000 --- a/ports/sdl2/0003-sdl2-fix-uwp-build.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1395,8 +1395,13 @@ - endif() - endif() - -+ if(WINDOWS_STORE) -+ file(GLOB WINRT_MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/winrt/*.cpp) -+ set(SOURCE_FILES ${SOURCE_FILES} ${WINRT_MISC_SOURCES}) -+ else() - file(GLOB MISC_SOURCES ${SDL2_SOURCE_DIR}/src/misc/windows/*.c) - set(SOURCE_FILES ${SOURCE_FILES} ${MISC_SOURCES}) -+ endif() - set(HAVE_SDL_MISC TRUE) - - # Check for DirectX -@@ -1522,7 +1522,7 @@ - set(HAVE_SDL_THREADS TRUE) - endif() - -- if(SDL_SENSOR AND HAVE_SENSORSAPI_H) -+ if(SDL_SENSOR AND HAVE_SENSORSAPI_H AND NOT WINDOWS_STORE) - set(SDL_SENSOR_WINDOWS 1) - set(HAVE_SDL_SENSORS TRUE) - file(GLOB WINDOWS_SENSOR_SOURCES ${SDL2_SOURCE_DIR}/src/sensor/windows/*.c) diff --git a/ports/sdl2/0004-sdl2-alias-on-static-build.patch b/ports/sdl2/0004-sdl2-alias-on-static-build.patch new file mode 100644 index 00000000000000..4fffb18027ee17 --- /dev/null +++ b/ports/sdl2/0004-sdl2-alias-on-static-build.patch @@ -0,0 +1,17 @@ +--- a/SDL2Config.cmake ++++ b/SDL2Config.cmake +@@ -2,5 +2,14 @@ + include("${CMAKE_CURRENT_LIST_DIR}/SDL2Targets.cmake") + ++# on static-only builds create an alias ++if(NOT TARGET SDL2::SDL2 AND TARGET SDL2::SDL2-static) ++ if(CMAKE_VERSION VERSION_LESS "3.18") ++ # Aliasing local targets is not supported on CMake < 3.18, so make it global. ++ set_target_properties(SDL2::SDL2-static PROPERTIES IMPORTED_GLOBAL TRUE) ++ endif() ++ add_library(SDL2::SDL2 ALIAS SDL2::SDL2-static) ++endif() ++ + # provide ${SDL2_LIBRARIES}, ${SDL2_INCLUDE_DIRS} etc, like sdl2-config.cmake does, + # for compatibility between SDL2 built with autotools and SDL2 built with CMake + diff --git a/ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch b/ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch deleted file mode 100644 index 4db047a5ff8d20..00000000000000 --- a/ports/sdl2/0004-sdl2-macos-thread-detection-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake ---- a/cmake/sdlchecks.cmake -+++ b/cmake/sdlchecks.cmake -@@ -847,7 +847,7 @@ macro(CheckPTHREAD) - # Run some tests - set(ORIG_CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS}") - set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${PTHREAD_CFLAGS} ${PTHREAD_LDFLAGS}") -- if(CMAKE_CROSSCOMPILING) -+ if(CMAKE_CROSSCOMPILING OR DARWIN) - set(HAVE_PTHREADS 1) - else() - check_c_source_runs(" diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 84e57a89d9f11a..391ea4f762624c 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -1,18 +1,15 @@ -set(SDL2_VERSION 2.0.14) -vcpkg_download_distfile(ARCHIVE - URLS "https://www.libsdl.org/release/SDL2-${SDL2_VERSION}.tar.gz" - FILENAME "SDL2-${SDL2_VERSION}.tar.gz" - SHA512 ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee -) - -vcpkg_extract_source_archive_ex( +set(SDL2_VERSION 2.0.16) +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + REPO libsdl-org/SDL + REF release-2.0.16 + SHA512 45ce71f77b01f5fd886f92e5b3d96f1f72c7e0f70c09e615384a900533b941cad65bf6b54a125a9eeb8499e2056e9a8e54d4e654bccfca9730584792a2b18fbc + HEAD_REF master PATCHES 0001-sdl2-Enable-creation-of-pkg-cfg-file-on-windows.patch 0002-sdl2-skip-ibus-on-linux.patch - 0003-sdl2-fix-uwp-build.patch - 0004-sdl2-macos-thread-detection-fix.patch + 0003-sdl2-disable-sdlmain-target-search-on-uwp.patch + 0004-sdl2-alias-on-static-build.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SDL_STATIC) @@ -77,8 +74,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME) endforeach() endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() set(DYLIB_COMPATIBILITY_VERSION_REGEX "set\\(DYLIB_COMPATIBILITY_VERSION (.+)\\)") diff --git a/ports/sdl2/vcpkg-cmake-wrapper.cmake b/ports/sdl2/vcpkg-cmake-wrapper.cmake deleted file mode 100644 index c99178db1a1a61..00000000000000 --- a/ports/sdl2/vcpkg-cmake-wrapper.cmake +++ /dev/null @@ -1,8 +0,0 @@ -_find_package(${ARGS}) -if(TARGET SDL2::SDL2 AND NOT TARGET SDL2::SDL2-static) - add_library( SDL2::SDL2-static INTERFACE IMPORTED) - set_target_properties(SDL2::SDL2-static PROPERTIES INTERFACE_LINK_LIBRARIES "SDL2::SDL2") -elseif(TARGET SDL2::SDL2-static AND NOT TARGET SDL2::SDL2) - add_library( SDL2::SDL2 INTERFACE IMPORTED) - set_target_properties(SDL2::SDL2 PROPERTIES INTERFACE_LINK_LIBRARIES "SDL2::SDL2-static") -endif() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index f4e9e9c8dc86ec..56e6aa57ed94b4 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sdl2", - "version-string": "2.0.14", - "port-version": 4, + "version": "2.0.16", "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 01181049e1f1ac..3230e72a9754ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5765,8 +5765,8 @@ "port-version": 0 }, "sdl2": { - "baseline": "2.0.14", - "port-version": 4 + "baseline": "2.0.16", + "port-version": 0 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index a0ba355567961e..59df83a08ad262 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66a51e068567b3b76ebb844ba7b4336abc7c35ce", + "version": "2.0.16", + "port-version": 0 + }, { "git-tree": "44061d4f51d8cba5625da7b41ef712976d9416e8", "version-string": "2.0.14", From c7e1f6cd07ff13f173d5bb8f0064212f80692fbe Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 19 Aug 2021 02:21:04 +0200 Subject: [PATCH 0334/1858] [angle] Fix mingw build (#19307) * Fix import lib prefixes * Fix mingw build * x-add-version --- ports/angle/003-fix-mingw.patch | 22 ++++++++++++++++++++++ ports/angle/CMakeLists.txt | 17 ++++++++++++----- ports/angle/portfile.cmake | 1 + ports/angle/vcpkg.json | 1 + versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 6 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 ports/angle/003-fix-mingw.patch diff --git a/ports/angle/003-fix-mingw.patch b/ports/angle/003-fix-mingw.patch new file mode 100644 index 00000000000000..304d822ec58a86 --- /dev/null +++ b/ports/angle/003-fix-mingw.patch @@ -0,0 +1,22 @@ +diff --git a/src/common/mathutil.h b/src/common/mathutil.h +index 1d73bbf..c5b9cc8 100644 +--- a/src/common/mathutil.h ++++ b/src/common/mathutil.h +@@ -1073,7 +1073,7 @@ inline int BitCount(uint64_t bits) + # endif // defined(_M_IX86) || defined(_M_X64) + #endif // defined(_MSC_VER) && !defined(__clang__) + +-#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) ++#if defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__) + inline int BitCount(uint32_t bits) + { + return __builtin_popcount(bits); +@@ -1083,7 +1083,7 @@ inline int BitCount(uint64_t bits) + { + return __builtin_popcountll(bits); + } +-#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) ++#endif // defined(ANGLE_PLATFORM_POSIX) || defined(__clang__) || defined(__MINGW32__) + + inline int BitCount(uint8_t bits) + { diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index c00c3d0ea650fc..24ab01d863aa9b 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -375,6 +375,9 @@ if(WIN32) "src/libANGLE/renderer/d3d/*.h" ) list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "_unittest") + if(MINGW) + list(FILTER LIBANGLE_D3D_SOURCES EXCLUDE REGEX "CompositorNativeWindow11") + endif() ## WinRT D3D Renderer if(WINDOWS_STORE) @@ -406,8 +409,12 @@ if(WIN32) target_compile_definitions(angle_renderer_d3d INTERFACE -DANGLE_ENABLE_D3D11 "-DANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ \"d3dcompiler_47.dll\", \"d3dcompiler_46.dll\", \"d3dcompiler_43.dll\" }" - -DANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW - ) + ) + if(NOT MINGW) + target_compile_definitions(angle_renderer_d3d INTERFACE + -DANGLE_ENABLE_D3D11_COMPOSITOR_NATIVE_WINDOW + ) + endif() target_link_libraries(angle_renderer_d3d INTERFACE d3d11 dxguid) add_library(angle::renderer::d3d ALIAS angle_renderer_d3d) endif() @@ -679,9 +686,9 @@ if(NOT BUILD_SHARED_LIBS) add_definitions("-DANGLE_EXPORT=" "-DANGLE_UTIL_EXPORT=" "-DEGLAPI=" "-DGL_APICALL=" "-DGL_API=") endif() -SET_TARGET_PROPERTIES(libANGLE PROPERTIES PREFIX "") -SET_TARGET_PROPERTIES(libGLESv2 PROPERTIES PREFIX "") -SET_TARGET_PROPERTIES(libEGL PROPERTIES PREFIX "") +set_target_properties(libANGLE PROPERTIES PREFIX "") +set_target_properties(libGLESv2 PROPERTIES PREFIX "" IMPORT_PREFIX "") +set_target_properties(libEGL PROPERTIES PREFIX "" IMPORT_PREFIX "") install(TARGETS libEGL libGLESv2 libANGLE angle_common angle_compression_utils angle_image_util angle_gpu_info_util angle_translator angle_preprocessor GL_VISIBILITY EXPORT ANGLEExport RUNTIME DESTINATION bin diff --git a/ports/angle/portfile.cmake b/ports/angle/portfile.cmake index 35c38074f824e4..ed604ecb420eb4 100644 --- a/ports/angle/portfile.cmake +++ b/ports/angle/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_from_github( PATCHES 001-fix-uwp.patch 002-fix-builder-error.patch + 003-fix-mingw.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 0987e6c86636b7..3dc8b17df8ea60 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,6 +1,7 @@ { "name": "angle", "version-string": "chromium_4472", + "port-version": 1, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index bbff894c6f55ef..74633bb496d3ac 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d59efcadc61eb7a7be987e4dcc03540490af89b8", + "version-string": "chromium_4472", + "port-version": 1 + }, { "git-tree": "5bd610babb6f0fb15119aa94644494c0dc2bcd2c", "version-string": "chromium_4472", diff --git a/versions/baseline.json b/versions/baseline.json index 3230e72a9754ed..121613327e55a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -82,7 +82,7 @@ }, "angle": { "baseline": "chromium_4472", - "port-version": 0 + "port-version": 1 }, "antlr4": { "baseline": "4.9.1", From a0f885051b9a5d3d0b9e305ec68e6c991a0adb4b Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Thu, 19 Aug 2021 03:22:30 +0300 Subject: [PATCH 0335/1858] [abseil] Upgrade to 20210324.2 (#19357) * Update vcpkg_from_github.cmake * Update abseil to 20210324.2 * Use version-date instead of version-string * Update abseil.json * Remove port-version from ports/abseil/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update version-date * Update abseil.json * Update vcpkg.json * Update version * Update abseil.json * Add port-version back * Update ports/abseil/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [abseil] Upgrade to 20210324.2 * update version * update vcpkg.json * update version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/abseil/portfile.cmake | 4 ++-- ports/abseil/vcpkg.json | 3 +-- versions/a-/abseil.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index bcb93b928a9185..b8e71ada0f9cf3 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO abseil/abseil-cpp - REF 997aaf3a28308eba1b9156aa35ab7bca9688e9f6 #LTS 20210324 - SHA512 bdd80a2278eef121e8837791fdebca06e87bfff4adc438c123e0ce11efc42a8bd461edcbbe18c0eee05be2cd6100f9acf8eab3db58ac73322b5852e6ffe7c85b + REF 278e0a071885a22dcd2fd1b5576cc44757299343 #LTS 20210324, Patch 2 + SHA512 a9e8e9169ebcfb8bc2eca28152ad2f655f48e6281ea932eb712333f3d0aa0b6fa1a9b184f3e2ddd75d932a54b501cc5c7bb29a1c9de5d2146f82fc5754653895 HEAD_REF master PATCHES # in C++17 mode, use std::any, std::optional, std::string_view, std::variant diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 8000413e75df73..83f27d1d9f7896 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,7 +1,6 @@ { "name": "abseil", - "version-date": "2021-03-24", - "port-version": 1, + "version-string": "20210324.2", "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 20e992ddde430d..7dcb532c3c69da 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "231cc80bbfb1e54466799ddb6a94dc6d15e7d39b", + "version-string": "20210324.2", + "port-version": 0 + }, { "git-tree": "bae9c59114a4a2dc396452fb9e988a9da881b4f4", "version-date": "2021-03-24", diff --git a/versions/baseline.json b/versions/baseline.json index 121613327e55a0..fce5a4ab187ad8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -9,8 +9,8 @@ "port-version": 2 }, "abseil": { - "baseline": "2021-03-24", - "port-version": 1 + "baseline": "20210324.2", + "port-version": 0 }, "absent": { "baseline": "0.3.1", From d7c692f8b633f920d5cdb8c6ac72eac65ea9caa9 Mon Sep 17 00:00:00 2001 From: James Athey Date: Wed, 18 Aug 2021 20:24:14 -0400 Subject: [PATCH 0336/1858] [libconfig] fix compilation errors on macos (#19374) * remove "find_path(STDINT_H stdint.h)". On clang/macos, this picks up the kernel headers version of stdint.h, instead of the C standard library, breaking compilation * only define YY_NO_UNISTD_H and YY_USE_CONST on Windows, like the upstream CMakeLists.txt * set the C standard to C99, like the upstream CMakeLists.txt * update to 1.7.3 * remove the "fail" line from ci.baseline.txt * run ./vcpkg x-add-version --all to update metadata files * reset port-version --- ports/libconfig/CMakeLists.txt | 6 ++---- ports/libconfig/CONTROL | 4 ++-- ports/libconfig/portfile.cmake | 4 ++-- scripts/ci.baseline.txt | 1 - versions/baseline.json | 4 ++-- versions/l-/libconfig.json | 5 +++++ 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ports/libconfig/CMakeLists.txt b/ports/libconfig/CMakeLists.txt index 53ca6f4e0d09ac..ab6711ad9c8a74 100644 --- a/ports/libconfig/CMakeLists.txt +++ b/ports/libconfig/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5.1) project(libconfig C CXX) if(MSVC) - add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) + add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DYY_NO_UNISTD_H -DYY_USE_CONST) endif() set(C_SOURCES @@ -20,12 +20,10 @@ set(CPP_SOURCES lib/libconfigcpp.cc ) -find_path(STDINT_H stdint.h) +set(CMAKE_C_STANDARD 99) include_directories(lib ${STDINT_H}) -add_definitions(-DYY_NO_UNISTD_H -DYY_USE_CONST) - add_library(libconfig ${C_SOURCES}) add_library(libconfig++ ${CPP_SOURCES}) diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL index 5a8555e106069d..a13a2c83d6316f 100644 --- a/ports/libconfig/CONTROL +++ b/ports/libconfig/CONTROL @@ -1,5 +1,5 @@ Source: libconfig -Version: 1.7.2 -Port-Version: 4 +Version: 1.7.3 +Port-Version: 0 Homepage: https://github.com/hyperrealm/libconfig Description: C/C++ library for processing configuration files diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index eb6d305bfedc9a..06b4626775866a 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hyperrealm/libconfig - REF v1.7.2 - SHA512 9df57355c2d08381b4a0a6366f0db3633fbe8f73c2bb8c370c040b0bae96ce89ee4ac6c17a5a247fed855d890fa383e5b70cb5573fc9cfc62194d5b94e161cee + REF v1.7.3 + SHA512 3749bf9eb29bab0f6b14f4fc759f0c419ed27a843842aaabed1ec1fbe0faa8c93322ff875ca1291d69cb28a39ece86d512aec42c2140d566c38c56dc616734f4 HEAD_REF master ) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ee3dec09cbf17a..1129af095404d0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -542,7 +542,6 @@ libbson:x64-uwp=fail libcds:arm64-windows=fail libcds:arm-uwp=fail libcds:x64-uwp=fail -libconfig:x64-osx=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail libcrafter:x86-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index fce5a4ab187ad8..1bfc674bc2ac51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3113,8 +3113,8 @@ "port-version": 0 }, "libconfig": { - "baseline": "1.7.2", - "port-version": 4 + "baseline": "1.7.3", + "port-version": 0 }, "libconfuse": { "baseline": "2019-07-14", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 6d7eeafa11e440..3a906d6881912e 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ef471f5497ea4d07f8282487141bcbe3ea9f319", + "version-string": "1.7.3", + "port-version": 0 + }, { "git-tree": "079c1b8cc62fe544a3277a949422bd68c57e0c45", "version-string": "1.7.2", From 743c6e18c0c74c86d2129da48d0ec84d1cd66569 Mon Sep 17 00:00:00 2001 From: Be Date: Thu, 19 Aug 2021 08:59:43 -0700 Subject: [PATCH 0337/1858] [wxwidgets] make wxUSE_STL an optional triplet feature (#19274) wxUSE_STL defaults to OFF so that is how it is in Linux distribution packages. Downstream projects developed with wxUSE_STL=ON are not necessarily compatible with wxUSE_STL=OFF without modification. So, by default, go with wxWidgets' default for compatibility with downstream codebases. vcpkg users who need wxUSE_STL=ON can still do so by simply opting into the new 'stl' feature of this port. https://forums.wxwidgets.org/viewtopic.php?p=165208 Signed-off-by: Be --- ports/wxwidgets/portfile.cmake | 9 ++++++++- ports/wxwidgets/vcpkg.json | 7 +++++-- versions/baseline.json | 2 +- versions/w-/wxwidgets.json | 5 +++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 8b2050e2d54d6a..5b5ecd730724d9 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -23,6 +23,13 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 OR VCPKG_TARGET_ARCHITECTURE STREQUA ) endif() +# This may be set to ON by users in a custom triplet. +# wxUSE_STL=ON and wxUSE_STL=OFF are not API compatible which is why this must be set +# in a custom triplet rather than a port feature. +if(NOT DEFINED WXWIDGETS_USE_STL) + set(WXWIDGETS_USE_STL OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -33,8 +40,8 @@ vcpkg_configure_cmake( -DwxUSE_LIBJPEG=sys -DwxUSE_LIBPNG=sys -DwxUSE_LIBTIFF=sys - -DwxUSE_STL=ON -DwxBUILD_DISABLE_PLATFORM_LIB_DIR=ON + -DwxUSE_STL=${WXWIDGETS_USE_STL} ${OPTIONS} ) diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index c7464fe1435e19..540e2147fc7923 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,8 +1,11 @@ { "name": "wxwidgets", "version-semver": "3.1.5", - "port-version": 2, - "description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.", + "port-version": 3, + "description": [ + "Widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications. ", + "Set WXWIDGETS_USE_STL in a custom triplet to build with the wxUSE_STL build option." + ], "homepage": "https://github.com/wxWidgets/wxWidgets", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1bfc674bc2ac51..739bdd00967223 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6782,7 +6782,7 @@ }, "wxwidgets": { "baseline": "3.1.5", - "port-version": 2 + "port-version": 3 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 72eaf1357d744d..d674192ce108db 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcd0a52fd041f8c7b658a01ec1141f36d77220c6", + "version-semver": "3.1.5", + "port-version": 3 + }, { "git-tree": "6fa230bffdee1e7d700570c31e6f08367460c0c9", "version-semver": "3.1.5", From 5b706db8fc532fbd8126a7fd090247060d111d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 20 Aug 2021 00:49:06 +0200 Subject: [PATCH 0338/1858] [kf5windowsystem] fix cmake.in for static usage; extra fixes (#19440) * [kf5windowsystem] fix cmake.in for static usage; extra fixes - apply https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/27 patch - fix MAYBE_UNUSED_VARIABLES usage - use semVer - update deprecated functions - wrap paths in quotes - don't overzealously remove folders * [kf5windowsystem] update versions * [kf5windowsystem] fix cmake.in for static usage on Linux * [kf5windowsystem] update versions --- ports/kf5windowsystem/27.patch | 31 ++++++++++++++++++++++++++++ ports/kf5windowsystem/28.patch | 27 ++++++++++++++++++++++++ ports/kf5windowsystem/portfile.cmake | 21 ++++++++----------- ports/kf5windowsystem/vcpkg.json | 12 +++++++++-- versions/baseline.json | 2 +- versions/k-/kf5windowsystem.json | 5 +++++ 6 files changed, 83 insertions(+), 15 deletions(-) create mode 100644 ports/kf5windowsystem/27.patch create mode 100644 ports/kf5windowsystem/28.patch diff --git a/ports/kf5windowsystem/27.patch b/ports/kf5windowsystem/27.patch new file mode 100644 index 00000000000000..6ad39176795ce9 --- /dev/null +++ b/ports/kf5windowsystem/27.patch @@ -0,0 +1,31 @@ +From 2ee7179c17fd9bd6d8e883ea304cc050cb197834 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Thu, 29 Jul 2021 13:47:28 +0200 +Subject: [PATCH] Support static builds + +--- + KF5WindowSystemConfig.cmake.in | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in +index 6c1b4c0..bcb7128 100644 +--- a/KF5WindowSystemConfig.cmake.in ++++ b/KF5WindowSystemConfig.cmake.in +@@ -4,7 +4,13 @@ include(CMakeFindDependencyMacro) + find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) + + if(NOT @KWINDOWSYSTEM_NO_WIDGETS@) +-find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) ++ find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) ++endif() ++ ++if(NOT @BUILD_SHARED_LIBS@) ++ if(@WIN32@) ++ find_dependency(Qt5WinExtras @REQUIRED_QT_VERSION@) ++ endif() + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") +-- +GitLab + diff --git a/ports/kf5windowsystem/28.patch b/ports/kf5windowsystem/28.patch new file mode 100644 index 00000000000000..9cf88c96cff54b --- /dev/null +++ b/ports/kf5windowsystem/28.patch @@ -0,0 +1,27 @@ +From b4bf29e297dd75eb2f4af6ed143839e223833b4b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Mon, 9 Aug 2021 22:45:50 +0000 +Subject: [PATCH] Support static builds on Linux as well + +--- + KF5WindowSystemConfig.cmake.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in +index bcb7128..62580e9 100644 +--- a/KF5WindowSystemConfig.cmake.in ++++ b/KF5WindowSystemConfig.cmake.in +@@ -11,6 +11,10 @@ if(NOT @BUILD_SHARED_LIBS@) + if(@WIN32@) + find_dependency(Qt5WinExtras @REQUIRED_QT_VERSION@) + endif() ++ ++ if(@X11_FOUND@) ++ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) ++ endif() + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") +-- +GitLab + diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 1c15090b2d56f0..59244479cd0519 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -3,35 +3,32 @@ vcpkg_from_github( REPO KDE/kwindowsystem REF v5.84.0 SHA512 53491f8576db8ebb48627e098fd8c3d4029c024bb9048d97daa1a8f5c39e594ca05dcd80ecb18ac591af7455457a0f14459c24cf44487727a26e34f977c5b81a + PATCHES + 27.patch # https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/27 + 28.patch # https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/28 ) if (VCPKG_TARGET_IS_LINUX) message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5WindowSystem) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5WindowSystem) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index 40ea4209d561ee..18f247e644e46f 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5windowsystem", - "version": "5.84.0", - "port-version": 1, + "version-semver": "5.84.0", + "port-version": 2, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ @@ -14,6 +14,14 @@ { "name": "qt5-x11extras", "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 739bdd00967223..52e6abb4e428c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2958,7 +2958,7 @@ }, "kf5windowsystem": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kfr": { "baseline": "2020-06-15", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 091e5c1e5ee820..df764af21925c0 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8ec0d393c0ccf286aab3bbe310dd5c09eaecf88", + "version-semver": "5.84.0", + "port-version": 2 + }, { "git-tree": "719b81cebad63502bbb619781290844c586acef9", "version": "5.84.0", From e109fba49029ddb419acacc6aa925eca048588e8 Mon Sep 17 00:00:00 2001 From: InfRandomness <43730933+InfRandomness@users.noreply.github.com> Date: Fri, 20 Aug 2021 23:32:58 +0200 Subject: [PATCH 0339/1858] [freebds] Fix vcpkg-tool compilation issue (#19641) Adds an xml entry to cmake 3.20.4 for freebsd 13 --- scripts/vcpkgTools.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 07f975d9349274..92bb7a7a373a84 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -28,6 +28,13 @@ deb24087315bcf01d2969846246564a352b6f77521df6b235f9ef525450db9c89b32dca4ad78f93a356dd5ab7b587374d49fc1a892354760715a5ef1f88e925f cmake-3.21.1-linux-x86_64.tar.gz + + 3.20.4 + usr/local/bin/cmake + https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz + de4bab225e12261dc00b03cf88e6b601b0da1c13e82acfb4c6e8c9f99b932ac77aad0471c11dce4612ae9297e243e5d3958be7776fb149e2ba96e7359d31f12d + cmake-3.20.4.txz + 2.32.0.2 mingw32\bin\git.exe From 7e8bfe6269241ab0541dc36bad9f4876eaadf641 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 21 Aug 2021 05:46:02 +0800 Subject: [PATCH 0340/1858] [vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert #19469 (#19633) * [vcpkg_cmake_config_fixup] Revert #19469 * Update the version date * actually just revert * move stuff around in vcpkg-cmake-config.json file Co-authored-by: nicole mazzuca --- ports/vcpkg-cmake-config/vcpkg.json | 3 +- .../vcpkg_cmake_config_fixup.cmake | 40 +------------------ scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 40 +------------------ versions/baseline.json | 4 +- versions/v-/vcpkg-cmake-config.json | 10 ++--- 5 files changed, 13 insertions(+), 84 deletions(-) diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 71d81f250c405a..49faaf4d402b37 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,4 +1,5 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-08-11" + "version-date": "2021-05-22", + "port-version": 1 } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index 3cb60fe6bedd99..a145d324a91d8c 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -221,44 +221,6 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(WRITE "${main_cmake}" "${contents}") endforeach() - if (VCPKG_TARGET_IS_OSX) - # see #16259 for details why this replacement is necessary. - file(GLOB targets_files "${release_share}/*[Tt]argets.cmake") - if (targets_files STREQUAL "") - file(GLOB targets_files "${release_share}/*[Cc]onfig.cmake") - endif() - foreach(targets_file IN LISTS targets_files) - file(READ "${targets_file}" targets_content) - string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*\n" library_contents "${targets_content}") - foreach(line IN LISTS library_contents) - set(fixed_line "${line}") - string(REGEX MATCHALL [[/[^ ;"]+/[^ ;"/]+\.framework]] frameworks "${line}") - foreach(framework IN LISTS frameworks) - if(NOT framework MATCHES [[^(.+)/(.+)\.framework$]]) - continue() - endif() - set(path "${CMAKE_MATCH_1}") - set(name "${CMAKE_MATCH_2}") - if(NOT DEFINED VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) - set(_saved_buildtrees_dir "${CURRENT_BUILDTREES_DIR}") - set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/get-cmake-vars") - z_vcpkg_get_cmake_vars(cmake_vars_file) - debug_message("Including cmake vars from: ${cmake_vars_file}") - include("${cmake_vars_file}") - set(VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES}" PARENT_SCOPE) - set(CURRENT_BUILDTREES_DIR "${_saved_buildtrees_dir}") - endif() - list(FIND VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${path}" index) - if(NOT index EQUAL -1) - string(REPLACE "${framework}" "-framework ${name}" fixed_line "${fixed_line}") - endif() - endforeach() - string(REPLACE "${line}" "${fixed_line}" targets_content "${targets_content}") - endforeach() - file(WRITE "${targets_file}" "${targets_content}") - endforeach() - endif() - # Remove /debug// if it's empty. file(GLOB_RECURSE remaining_files "${debug_share}/*") if(remaining_files STREQUAL "") @@ -271,3 +233,5 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() endfunction() + + diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index 0641aa22404178..e6fbe785b5844e 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -220,44 +220,6 @@ function(vcpkg_fixup_cmake_targets) file(WRITE ${MAIN_CMAKE} "${_contents}") endforeach() - if (VCPKG_TARGET_IS_OSX) - # see #16259 for details why this replacement is necessary. - file(GLOB targets_files "${RELEASE_SHARE}/*[Tt]argets.cmake") - if (targets_files STREQUAL "") - file(GLOB targets_files "${RELEASE_SHARE}/*[Cc]onfig.cmake") - endif() - foreach(targets_file IN LISTS targets_files) - file(READ "${targets_file}" targets_content) - string(REGEX MATCHALL "INTERFACE_LINK_LIBRARIES[^\n]*\n" library_contents "${targets_content}") - foreach(line IN LISTS library_contents) - set(fixed_line "${line}") - string(REGEX MATCHALL [[/[^ ;"]+/[^ ;"/]+\.framework]] frameworks "${line}") - foreach(framework IN LISTS frameworks) - if(NOT framework MATCHES [[^(.+)/(.+)\.framework$]]) - continue() - endif() - set(path "${CMAKE_MATCH_1}") - set(name "${CMAKE_MATCH_2}") - if(NOT DEFINED VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES) - set(_saved_buildtrees_dir "${CURRENT_BUILDTREES_DIR}") - set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/get-cmake-vars") - z_vcpkg_get_cmake_vars(cmake_vars_file) - debug_message("Including cmake vars from: ${cmake_vars_file}") - include("${cmake_vars_file}") - set(VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES}" PARENT_SCOPE) - set(CURRENT_BUILDTREES_DIR "${_saved_buildtrees_dir}") - endif() - list(FIND VCPKG_DETECTED_CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "${path}" index) - if(NOT index EQUAL -1) - string(REPLACE "${framework}" "-framework ${name}" fixed_line "${fixed_line}") - endif() - endforeach() - string(REPLACE "${line}" "${fixed_line}" targets_content "${targets_content}") - endforeach() - file(WRITE "${targets_file}" "${targets_content}") - endforeach() - endif() - # Remove /debug// if it's empty. file(GLOB_RECURSE REMAINING_FILES "${DEBUG_SHARE}/*") if(NOT REMAINING_FILES) @@ -279,3 +241,5 @@ function(vcpkg_fixup_cmake_targets) file(WRITE ${CMAKE_FILE} "${_contents}") endforeach() endfunction() + + diff --git a/versions/baseline.json b/versions/baseline.json index 52e6abb4e428c1..a4cd4e99dae634 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6621,8 +6621,8 @@ "port-version": 0 }, "vcpkg-cmake-config": { - "baseline": "2021-08-11", - "port-version": 0 + "baseline": "2021-05-22", + "port-version": 1 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index affac6bbe95ddc..2561cfa3f2176a 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,15 +1,15 @@ { "versions": [ - { - "git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee", - "version-date": "2021-08-11", - "port-version": 0 - }, { "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5", "version-date": "2021-05-22", "port-version": 1 }, + { + "git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee", + "version-date": "2021-08-11", + "port-version": 0 + }, { "git-tree": "2d4f997a32b8e8bfe98d12beb2bfe6be713c7086", "version-date": "2021-05-22", From cf0c150815674b0b185c308460aab66b5d96b33c Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Wed, 25 Aug 2021 00:49:58 +0300 Subject: [PATCH 0341/1858] [sail] Update to 0.9.0-pre15 (#19724) * [sail] Update to v0.9.0-pre15 * [sail] vcpkg x-add-version --all --- ports/sail/portfile.cmake | 4 ++-- ports/sail/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index c17b9d1066d6cd..0365adc900e864 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO smoked-herring/sail - REF v0.9.0-pre14 - SHA512 a1b50893a9d4112f2bf2ca73e763d705615d0b110a41a1dbe8c32566b7706c054cb44d9c169163ef4f9d125242b39b55e123021fb2dad8d2f5a4d216c1a202b4 + REF v0.9.0-pre15 + SHA512 7f587a3cc05dbcee2327953438e5605beab6622b0511eb2c8d4d433a0586c6589ea6cad8ab8b02726be613502c9cfd53dfa263a4878bde9f0138ff076aa24d61 HEAD_REF master ) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index 4b77bfb6df005a..aaa084e456e5e4 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0-pre14", + "version-semver": "0.9.0-pre15", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/smoked-herring/sail", "supports": "!uwp", @@ -9,6 +9,7 @@ "libavif", "libjpeg-turbo", "libpng", + "libwebp", "tiff", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index a4cd4e99dae634..3ab5cc7e99ef08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5709,7 +5709,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre14", + "baseline": "0.9.0-pre15", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index c8ad05b4316a63..ec475a198fc193 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14ddeb70c44c70b4ca633ba9627b99ffd78686c7", + "version-semver": "0.9.0-pre15", + "port-version": 0 + }, { "git-tree": "0878a59a5c61e19c3c83c3ad8cfb4b611bfe3c54", "version-semver": "0.9.0-pre14", From 63ec48ef8ed3a59ab4247ba26f6fd33dbdbe5fd8 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 25 Aug 2021 05:50:54 +0800 Subject: [PATCH 0342/1858] [tinyfiledialogs] Fix usage (#19723) * [tinyfiledialogs] Fix usage * Update version files --- ports/tinyfiledialogs/CMakeLists.txt | 2 +- ports/tinyfiledialogs/portfile.cmake | 1 - ports/tinyfiledialogs/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/t-/tinyfiledialogs.json | 5 +++++ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/tinyfiledialogs/CMakeLists.txt b/ports/tinyfiledialogs/CMakeLists.txt index cb48742a18e2be..c4bbfd23bceafb 100644 --- a/ports/tinyfiledialogs/CMakeLists.txt +++ b/ports/tinyfiledialogs/CMakeLists.txt @@ -25,5 +25,5 @@ export( install( EXPORT tinyfiledialogsConfig NAMESPACE tinyfiledialogs:: - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/tinyfiledialogs" + DESTINATION share/tinyfiledialogs ) diff --git a/ports/tinyfiledialogs/portfile.cmake b/ports/tinyfiledialogs/portfile.cmake index 2bc52913a975ee..10929dec1d0501 100644 --- a/ports/tinyfiledialogs/portfile.cmake +++ b/ports/tinyfiledialogs/portfile.cmake @@ -14,7 +14,6 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH} vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) vcpkg_cmake_install() diff --git a/ports/tinyfiledialogs/vcpkg.json b/ports/tinyfiledialogs/vcpkg.json index 1695d500790680..6bc220ee0eac32 100644 --- a/ports/tinyfiledialogs/vcpkg.json +++ b/ports/tinyfiledialogs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyfiledialogs", "version": "3.8.8", - "port-version": 2, + "port-version": 3, "description": "Highly portable and cross-platform dialogs for native inputbox, passwordbox, colorpicker and more", "homepage": "https://sourceforge.net/projects/tinyfiledialogs/", "supports": "!uwp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1129af095404d0..6943e87adb2917 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1539,8 +1539,6 @@ tinkerforge:arm-uwp=fail tinkerforge:x64-uwp=fail tinyexif:arm-uwp=fail tinyexif:x64-uwp=fail -tinyfiledialogs:arm-uwp=fail -tinyfiledialogs:x64-uwp=fail tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail tmxlite:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3ab5cc7e99ef08..acc43183f30e17 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6338,7 +6338,7 @@ }, "tinyfiledialogs": { "baseline": "3.8.8", - "port-version": 2 + "port-version": 3 }, "tinygltf": { "baseline": "2020-07-28", diff --git a/versions/t-/tinyfiledialogs.json b/versions/t-/tinyfiledialogs.json index 31ef037fba887e..7096611582475a 100644 --- a/versions/t-/tinyfiledialogs.json +++ b/versions/t-/tinyfiledialogs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57a86420c47979e0b30dfb1e77482aad2836b07b", + "version": "3.8.8", + "port-version": 3 + }, { "git-tree": "abb5795ae7f012d210a4d98e4f072dea1b94c97a", "version": "3.8.8", From ce5d5f5d4124368ed27faa1ecccfc12b732ec08f Mon Sep 17 00:00:00 2001 From: q1000treadz <42095596+q1000treadz@users.noreply.github.com> Date: Wed, 25 Aug 2021 01:46:24 +0300 Subject: [PATCH 0343/1858] [KWSys] add new port (#19712) * add kwsys port * ./vcpkg x-add-version --all * unsupport uwp * ./vcpkg x-add-version --all * Fix versions for port * Update version database * corrections * corrections2 * corrections3 * update hash --- ports/kwsys/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/kwsys/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kwsys.json | 9 +++++++++ 4 files changed, 58 insertions(+) create mode 100644 ports/kwsys/portfile.cmake create mode 100644 ports/kwsys/vcpkg.json create mode 100644 versions/k-/kwsys.json diff --git a/ports/kwsys/portfile.cmake b/ports/kwsys/portfile.cmake new file mode 100644 index 00000000000000..b676a4a13d53e0 --- /dev/null +++ b/ports/kwsys/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.kitware.com + OUT_SOURCE_PATH SOURCE_PATH + REPO utils/kwsys + REF dbc94f37f9821899aad441bcab525ad96a3f30dc #2021-08-06 + SHA512 98441866fd51f2d4d3974d3c37d4456ce9e50c6f6c2ab0691e55b268907611ef061562fc30b1baa42aa195caf2281aa0e1e0799abc545fe6dae70efe2050ea50 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKWSYS_INSTALL_INCLUDE_DIR=${CURRENT_PACKAGES_DIR}/include + OPTIONS_RELEASE + -DKWSYS_INSTALL_BIN_DIR=${CURRENT_PACKAGES_DIR}/bin + -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/lib + OPTIONS_DEBUG + -DKWSYS_INSTALL_BIN_DIR=${CURRENT_PACKAGES_DIR}/debug/bin + -DKWSYS_INSTALL_LIB_DIR=${CURRENT_PACKAGES_DIR}/debug/lib +) + +vcpkg_cmake_install() + + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kwsys/vcpkg.json b/ports/kwsys/vcpkg.json new file mode 100644 index 00000000000000..b45350d738d937 --- /dev/null +++ b/ports/kwsys/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "kwsys", + "version-date": "2021-08-06", + "description": "Provides platform-independent APIs to many common system features", + "homepage": "https://gitlab.kitware.com/utils/kwsys", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index acc43183f30e17..3568f7f13c3997 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3004,6 +3004,10 @@ "baseline": "2019-08-06", "port-version": 0 }, + "kwsys": { + "baseline": "2021-08-06", + "port-version": 0 + }, "lapack": { "baseline": "3", "port-version": 1 diff --git a/versions/k-/kwsys.json b/versions/k-/kwsys.json new file mode 100644 index 00000000000000..fd3fb9fa7a6304 --- /dev/null +++ b/versions/k-/kwsys.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "376ae3a199ad4fdaad235b6e01b92ed217388550", + "version-date": "2021-08-06", + "port-version": 0 + } + ] +} From ce24617ac6fb5ef7d8535ccdd56b42903d0e898d Mon Sep 17 00:00:00 2001 From: "Michael R. P. Ragazzon" Date: Wed, 25 Aug 2021 00:47:00 +0200 Subject: [PATCH 0344/1858] [rmlui] Update to 4.2 (#19719) --- ports/rmlui/portfile.cmake | 4 ++-- ports/rmlui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rmlui.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/rmlui/portfile.cmake b/ports/rmlui/portfile.cmake index cf9ec6f057002d..059c6325d13950 100644 --- a/ports/rmlui/portfile.cmake +++ b/ports/rmlui/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mikke89/RmlUi - REF 4.1 - SHA512 f79bd30104c42469142e4c79a81f120c61f5bd3ae918df9847fa42d05fcda372d3adb5f6884c81c8517a440a81235e70ffcdde8d98751a14d2e4265fc2051a01 + REF 4.2 + SHA512 848515d554d6a56bc5ba962c8a3db27801491236f17092ea6c658b35d6cb8b3330dff197d71fc65aaa061476a383a467fcc481571cdf3777f06024819bf9267c HEAD_REF master PATCHES add-robin-hood.patch diff --git a/ports/rmlui/vcpkg.json b/ports/rmlui/vcpkg.json index 9b42867c63570c..389bf88d45e88d 100644 --- a/ports/rmlui/vcpkg.json +++ b/ports/rmlui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rmlui", - "version": "4.1", + "version": "4.2", "maintainers": "Michael R. P. Ragazzon ", "description": "RmlUi is the C++ user interface library based on the HTML and CSS standards, designed as a complete solution for any project's interface needs.", "homepage": "https://github.com/mikke89/RmlUi", diff --git a/versions/baseline.json b/versions/baseline.json index 3568f7f13c3997..0a54c99f54c7a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5629,7 +5629,7 @@ "port-version": 0 }, "rmlui": { - "baseline": "4.1", + "baseline": "4.2", "port-version": 0 }, "roaring": { diff --git a/versions/r-/rmlui.json b/versions/r-/rmlui.json index f3c15b656f8e82..73fad0f96b7704 100644 --- a/versions/r-/rmlui.json +++ b/versions/r-/rmlui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67865d8852b0c90297adca30ee2640e469eb91d7", + "version": "4.2", + "port-version": 0 + }, { "git-tree": "83f463f3ebcc4e415d6903bea260fb1601a14dd2", "version": "4.1", From d012f9c6e694dc13e699e5f5226d43c91483eae0 Mon Sep 17 00:00:00 2001 From: InfRandomness <43730933+InfRandomness@users.noreply.github.com> Date: Wed, 25 Aug 2021 01:13:30 +0200 Subject: [PATCH 0345/1858] [vcpkgTools.xml] Update cmake 3.20.4 hash for freebsd (#19697) --- scripts/vcpkgTools.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 92bb7a7a373a84..3691de2980b907 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -32,7 +32,7 @@ 3.20.4 usr/local/bin/cmake https://pkg.freebsd.org/FreeBSD:13:amd64/quarterly/All/cmake-3.20.4.txz - de4bab225e12261dc00b03cf88e6b601b0da1c13e82acfb4c6e8c9f99b932ac77aad0471c11dce4612ae9297e243e5d3958be7776fb149e2ba96e7359d31f12d + 3e5b675d7ff924f92996d912e2365582e687375109ef99c9073fb8196bb329243a406b218cf1358d7cc518988b311ce9e5bf87de4d64f2e6377b7c2bc8894475 cmake-3.20.4.txz From 5702c6708c4cccc8af92810af520b3f55074db6c Mon Sep 17 00:00:00 2001 From: Mathis Date: Wed, 25 Aug 2021 01:25:53 +0200 Subject: [PATCH 0346/1858] [frugually-deep] update to v0.15.10 p0 (#19691) * update * version --- ports/frugally-deep/portfile.cmake | 4 ++-- ports/frugally-deep/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/frugally-deep.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/frugally-deep/portfile.cmake b/ports/frugally-deep/portfile.cmake index 725e384cb64c39..1350a728cfe785 100644 --- a/ports/frugally-deep/portfile.cmake +++ b/ports/frugally-deep/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Dobiasd/frugally-deep - REF v0.15.2-p0 - SHA512 2237c139c217cc9e338c854505009e85cea6658888e0d97c0c7957b58e0e53e2add555b81fa276c2ec9f794d5356bdb267c1e0b05090c83627916d954d2a11ba + REF v0.15.10-p0 + SHA512 e665df59c83fea5fc0a89158639c83f9c72cba1fc8c61086032db60c395606dab4e9085f1380714e4f8a82c1f2b143aa22ff6212d9180c368283e1965e6dea87 HEAD_REF master ) diff --git a/ports/frugally-deep/vcpkg.json b/ports/frugally-deep/vcpkg.json index 80ff2ebec7bf8f..8dfe3eca9a2615 100644 --- a/ports/frugally-deep/vcpkg.json +++ b/ports/frugally-deep/vcpkg.json @@ -1,6 +1,6 @@ { "name": "frugally-deep", - "version-semver": "0.15.2-p0", + "version-semver": "0.15.10-p0", "description": "Header-only library for using Keras models in C++.", "homepage": "https://github.com/Dobiasd/frugally-deep", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0a54c99f54c7a1..affb5ee3ba7566 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2165,7 +2165,7 @@ "port-version": 0 }, "frugally-deep": { - "baseline": "0.15.2-p0", + "baseline": "0.15.10-p0", "port-version": 0 }, "fruit": { diff --git a/versions/f-/frugally-deep.json b/versions/f-/frugally-deep.json index ac3a7cf7f0d41f..7f4eff05f4ff13 100644 --- a/versions/f-/frugally-deep.json +++ b/versions/f-/frugally-deep.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "360c45aa18328060b37ba37ac541fef843d07e29", + "version-semver": "0.15.10-p0", + "port-version": 0 + }, { "git-tree": "b53df71f90baedbb8e1d9c05ad4d437756c289d3", "version-semver": "0.15.2-p0", From ef965e7b210b2aa4bd4896fa3d9184adba6adbc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 25 Aug 2021 01:28:54 +0200 Subject: [PATCH 0347/1858] [imgui] Update to 1.84.1 (#19677) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [imgui] Update to 1.84.1 * [imgui] Update version files Co-authored-by: Rémy Tassoux --- ports/imgui/CMakeLists.txt | 32 +++++++++---------------------- ports/imgui/imgui-config.cmake.in | 16 ---------------- ports/imgui/portfile.cmake | 15 +++++++-------- ports/imgui/vcpkg.json | 27 +++----------------------- versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 6 files changed, 25 insertions(+), 72 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 7cb41284226a85..b049fdd43de6b6 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -65,27 +65,7 @@ if(IMGUI_BUILD_OPENGL2_BINDING) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.cpp) endif() -if(IMGUI_BUILD_OPENGL3_GLEW_BINDING) - find_package(GLEW REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC GLEW::GLEW) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) -endif() - -if(IMGUI_BUILD_OPENGL3_GLAD_BINDING) - find_package(glad CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC glad::glad) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) -endif() - -if(IMGUI_BUILD_OPENGL3_GL3W_BINDING) - find_package(gl3w CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC unofficial::gl3w::gl3w) - target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) -endif() - -if(IMGUI_BUILD_OPENGL3_GLBINDING_BINDING) - find_package(glbinding CONFIG REQUIRED) - target_link_libraries(${PROJECT_NAME} PUBLIC glbinding::glbinding) +if(IMGUI_BUILD_OPENGL3_BINDING) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.cpp) endif() @@ -193,8 +173,14 @@ if(NOT IMGUI_SKIP_HEADERS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl2.h DESTINATION include) endif() - if(IMGUI_BUILD_OPENGL3_GLEW_BINDING OR IMGUI_BUILD_OPENGL3_GLAD_BINDING OR IMGUI_BUILD_OPENGL3_GL3W_BINDING OR IMGUI_BUILD_OPENGL3_GLBINDING_BINDING) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h DESTINATION include) + if(IMGUI_BUILD_OPENGL3_BINDING) + install( + FILES + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3.h + ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_opengl3_loader.h + DESTINATION + include + ) endif() if(IMGUI_BUILD_OSX_BINDING) diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index 7f34ec9c4150db..d2bdfbdaa21eb7 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -8,26 +8,10 @@ if (@IMGUI_BUILD_GLFW_BINDING@) find_dependency(glfw3 CONFIG) endif() -if (@IMGUI_BUILD_OPENGL3_GLEW_BINDING@) - find_dependency(GLEW) -endif() - -if (@IMGUI_BUILD_OPENGL3_GLAD_BINDING@) - find_dependency(glad CONFIG) -endif() - -if (@IMGUI_BUILD_OPENGL3_GL3W_BINDING@) - find_dependency(gl3w CONFIG) -endif() - if (@IMGUI_BUILD_GLUT_BINDING@) find_dependency(GLUT) endif() -if (@IMGUI_BUILD_OPENGL3_GLBINDING_BINDING@) - find_dependency(glbinding CONFIG) -endif() - if (@IMGUI_BUILD_SDL2_BINDING@) find_dependency(SDL2 CONFIG) endif() diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 181b813d781c60..2f964b450f0bda 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF 1b435ae3e07ca813eb3ef40aaabe7053f5570fae - SHA512 bbdbcb4e8544810a51f1d8824a248ddbe19eed4978db7a059bd9c85bb997b1f98ad3997626fd2e9ea67d0e50f1ba1e11338858ebb2cc41c116bd6fd208aac684 + REF 47fb332fb20921658732107e115aa397e9b08cbe + SHA512 92bfb20c9734dc37381d24325156c149f110b53dfabaf294e4bb2b0bccd618ab421aa347fa3c7fcaa1929b5bec8885246e7f49dc5fb6e81f1a8e80ff2d980f28 HEAD_REF docking ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.83 - SHA512 2150e7101f384b1c749b2e89876b2085a7ff43435f04e88602d0e5e00db7a41c1ace5176bdb0963326845d1c8303b5092a7ca1c9c8e70c522ba96f899ed5bb9c + REF v1.84.1 + SHA512 054beebda9a17758a9a6b9edf075279800a314b0e255e528bb9ac248b4911fd8fd2b5160079896d116b58fe6d993281ba9082780a31197faefd9f7adf32aec51 HEAD_REF master ) endif() @@ -37,10 +37,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS marmalade-binding IMGUI_COPY_MARMALADE_BINDING metal-binding IMGUI_BUILD_METAL_BINDING opengl2-binding IMGUI_BUILD_OPENGL2_BINDING - opengl3-glew-binding IMGUI_BUILD_OPENGL3_GLEW_BINDING - opengl3-glad-binding IMGUI_BUILD_OPENGL3_GLAD_BINDING - opengl3-gl3w-binding IMGUI_BUILD_OPENGL3_GL3W_BINDING - opengl3-glbinding-binding IMGUI_BUILD_OPENGL3_GLBINDING_BINDING + opengl3-binding IMGUI_BUILD_OPENGL3_BINDING osx-binding IMGUI_BUILD_OSX_BINDING sdl2-binding IMGUI_BUILD_SDL2_BINDING vulkan-binding IMGUI_BUILD_VULKAN_BINDING @@ -69,6 +66,8 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} OPTIONS_DEBUG -DIMGUI_SKIP_HEADERS=ON + MAYBE_UNUSED_VARIABLES + IMGUI_COPY_MARMALADE_BINDING ) vcpkg_install_cmake() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index d7772a780acc18..5d7b96f735814d 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui", - "version": "1.83", + "version": "1.84.1", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "features": { @@ -55,29 +55,8 @@ "opengl2-binding": { "description": "Make available OpenGL (legacy) binding" }, - "opengl3-gl3w-binding": { - "description": "Make available OpenGL3/ES/ES2 (modern) binding with gl3w", - "dependencies": [ - "gl3w" - ] - }, - "opengl3-glad-binding": { - "description": "Make available OpenGL3/ES/ES2 (modern) binding with glad", - "dependencies": [ - "glad" - ] - }, - "opengl3-glbinding-binding": { - "description": "Make available OpenGL3/ES/ES2 (modern) binding glbinding", - "dependencies": [ - "glbinding" - ] - }, - "opengl3-glew-binding": { - "description": "Make available OpenGL3/ES/ES2 (modern) binding with GLEW", - "dependencies": [ - "glew" - ] + "opengl3-binding": { + "description": "Make available OpenGL3/ES/ES2 (modern) binding" }, "osx-binding": { "description": "Make available OSX binding" diff --git a/versions/baseline.json b/versions/baseline.json index affb5ee3ba7566..b214f85cf9caed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2681,7 +2681,7 @@ "port-version": 0 }, "imgui": { - "baseline": "1.83", + "baseline": "1.84.1", "port-version": 0 }, "imgui-sfml": { diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 2afddaacda215d..8def6cd7e0e009 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1be902aeef127530aa2817829ff44f29b1eb6e52", + "version": "1.84.1", + "port-version": 0 + }, { "git-tree": "07ff738266906a6d9faf3957e828acb87d48b782", "version": "1.83", From dc1f3d674a961f0b956712b200bf28b4ab73471d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 26 Aug 2021 04:38:37 +0200 Subject: [PATCH 0348/1858] [openssl] Update to 1.1.1l (#19739) --- ports/openssl/portfile.cmake | 4 ++-- ports/openssl/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/openssl.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index c507c0f7e2562d..be6029c71054fb 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -2,11 +2,11 @@ if(EXISTS "${CURRENT_INSTALLED_DIR}/include/openssl/ssl.h") message(FATAL_ERROR "Can't build openssl if libressl/boringssl is installed. Please remove libressl/boringssl, and try install openssl again if you need it.") endif() -set(OPENSSL_VERSION 1.1.1k) +set(OPENSSL_VERSION 1.1.1l) vcpkg_download_distfile(ARCHIVE URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz" FILENAME "openssl-${OPENSSL_VERSION}.tar.gz" - SHA512 73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121 + SHA512 d9611f393e37577cca05004531388d3e0ebbf714894cab9f95f4903909cd4f45c214faab664c0cbc3ad3cca309d500b9e6d0ecbf9a0a0588d1677dc6b047f9e0 ) vcpkg_find_acquire_program(PERL) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 9c4ec7f1e1117e..96397867bf301f 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openssl", - "version-string": "1.1.1k", - "port-version": 8, + "version-string": "1.1.1l", "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/versions/baseline.json b/versions/baseline.json index b214f85cf9caed..90f62ad7303b9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4697,8 +4697,8 @@ "port-version": 0 }, "openssl": { - "baseline": "1.1.1k", - "port-version": 8 + "baseline": "1.1.1l", + "port-version": 0 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index d6807c92980b74..9ad872e51b6123 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1916410d0a836cb70be2341fa3ec3cce74d25267", + "version-string": "1.1.1l", + "port-version": 0 + }, { "git-tree": "80b86b6b857d1b7bbb2c24cfcded13c28a4c3e81", "version-string": "1.1.1k", From 964dbc0796f0bc415104fd0e0310d2cf89523287 Mon Sep 17 00:00:00 2001 From: 9cvele3 <9cvele3@gmail.com> Date: Thu, 26 Aug 2021 05:33:40 +0200 Subject: [PATCH 0349/1858] [Libb64] Add new port (#19447) --- ports/b64/CMakeLists.txt | 35 +++++++++ ports/b64/b64_dynamic_config.h | 14 ++++ ports/b64/b64_static_config.h | 6 ++ ports/b64/portfile.cmake | 28 +++++++ ports/b64/vcpkg.json | 16 ++++ ports/b64/windows-fix.patch | 130 +++++++++++++++++++++++++++++++++ versions/b-/b64.json | 9 +++ versions/baseline.json | 4 + 8 files changed, 242 insertions(+) create mode 100644 ports/b64/CMakeLists.txt create mode 100644 ports/b64/b64_dynamic_config.h create mode 100644 ports/b64/b64_static_config.h create mode 100644 ports/b64/portfile.cmake create mode 100644 ports/b64/vcpkg.json create mode 100644 ports/b64/windows-fix.patch create mode 100644 versions/b-/b64.json diff --git a/ports/b64/CMakeLists.txt b/ports/b64/CMakeLists.txt new file mode 100644 index 00000000000000..274fc0788b3048 --- /dev/null +++ b/ports/b64/CMakeLists.txt @@ -0,0 +1,35 @@ +cmake_minimum_required(VERSION 3.20) +project(b64) + +if (BUILD_SHARED_LIBS) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/b64_dynamic_config.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h) +else() + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/b64_static_config.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h) +endif() + +set(SRC_DIR src) +set(INC_DIR include/b64) +set(SOURCE_FILES ${SRC_DIR}/cdecode.c ${SRC_DIR}/cencode.c) +set(HEADER_FILES ${INC_DIR}/cdecode.h ${INC_DIR}/cencode.h ${INC_DIR}/decode.h ${INC_DIR}/encode.h ${INC_DIR}/ccommon.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h) + +add_library(b64 ${SOURCE_FILES} ${HEADER_FILES}) + +if (BUILD_SHARED_LIBS) + target_compile_definitions(b64 PRIVATE LIBB64_EXPORTS=1) +endif() + +target_include_directories(b64 PRIVATE include ${CMAKE_CURRENT_BINARY_DIR}) + +set_property(TARGET b64 + PROPERTY PUBLIC_HEADER ${HEADER_FILES}) + +install(TARGETS b64 + EXPORT b64-targets + LIBRARY DESTINATION lib + PUBLIC_HEADER DESTINATION include/b64 +) + +install(EXPORT b64-targets + FILE b64-targets.cmake + DESTINATION lib/cmake/b64) + diff --git a/ports/b64/b64_dynamic_config.h b/ports/b64/b64_dynamic_config.h new file mode 100644 index 00000000000000..b836ca2a5b7593 --- /dev/null +++ b/ports/b64/b64_dynamic_config.h @@ -0,0 +1,14 @@ +#ifndef B64_CONFIG_H +#define B64_CONFIG_H + +#ifdef _WIN32 + #ifdef LIBB64_EXPORTS + #define LIBB64 __declspec(dllexport) + #else + #define LIBB64 __declspec(dllimport) + #endif +#else +#define LIBB64 +#endif + +#endif diff --git a/ports/b64/b64_static_config.h b/ports/b64/b64_static_config.h new file mode 100644 index 00000000000000..f261c7cf219b02 --- /dev/null +++ b/ports/b64/b64_static_config.h @@ -0,0 +1,6 @@ +#ifndef B64_CONFIG_H +#define B64_CONFIG_H + +#define LIBB64 + +#endif diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake new file mode 100644 index 00000000000000..dbe41a9372cf20 --- /dev/null +++ b/ports/b64/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libb64/libb64 + REF v2.0.0.1 + SHA512 72c2fd4c81575b505f4851cd3820b6a2d8e78cd031a1ed138ffe5667ca711558f43b515428971966f7a73ace7c9951f1f0b39c362a59fe4691958875775cce23 + HEAD_REF master + PATCHES "windows-fix.patch" +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/b64_dynamic_config.h" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/b64_static_config.h" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + + +# handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/b64/vcpkg.json b/ports/b64/vcpkg.json new file mode 100644 index 00000000000000..ba4dba7a21fd0d --- /dev/null +++ b/ports/b64/vcpkg.json @@ -0,0 +1,16 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "b64", + "version": "2.0.0.1", + "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/b64/windows-fix.patch b/ports/b64/windows-fix.patch new file mode 100644 index 00000000000000..ccabfad2e173c7 --- /dev/null +++ b/ports/b64/windows-fix.patch @@ -0,0 +1,130 @@ +diff --git a/include/b64/ccommon.h b/include/b64/ccommon.h +index 2b614df..0e46141 100644 +--- a/include/b64/ccommon.h ++++ b/include/b64/ccommon.h +@@ -10,11 +10,12 @@ For details, see http://sourceforge.net/projects/libb64 + + #define BASE64_VER_MAJOR 2 + #define BASE64_VER_MINOR 0 ++#include "b64_config.h" + + #ifndef HAVE_SIZE_T + #ifdef _WIN32 + #include +- #elseif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) ++ #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__)) + #include + #else + typedef unsigned long size_t; +diff --git a/include/b64/cdecode.h b/include/b64/cdecode.h +index d6ff24c..4553efc 100644 +--- a/include/b64/cdecode.h ++++ b/include/b64/cdecode.h +@@ -24,11 +24,11 @@ typedef struct + char plainchar; + } base64_decodestate; + +-extern void base64_init_decodestate(base64_decodestate* state_in); ++extern LIBB64 void base64_init_decodestate(base64_decodestate* state_in); + +-extern size_t base64_decode_maxlength(size_t encode_len); ++extern LIBB64 size_t base64_decode_maxlength(size_t encode_len); + +-extern int base64_decode_value(signed char value_in); +-extern size_t base64_decode_block(const char* code_in, const size_t length_in, void* plaintext_out, base64_decodestate* state_in); ++extern LIBB64 int base64_decode_value(signed char value_in); ++extern LIBB64 size_t base64_decode_block(const char* code_in, const size_t length_in, void* plaintext_out, base64_decodestate* state_in); + + #endif /* BASE64_CDECODE_H */ +diff --git a/include/b64/cencode.h b/include/b64/cencode.h +index 96b0cdb..1feb695 100644 +--- a/include/b64/cencode.h ++++ b/include/b64/cencode.h +@@ -31,12 +31,12 @@ typedef struct + char result; + } base64_encodestate; + +-extern void base64_init_encodestate(base64_encodestate* state_in); ++extern LIBB64 void base64_init_encodestate(base64_encodestate* state_in); + +-extern size_t base64_encode_length(size_t plain_len, base64_encodestate* state_in); ++extern LIBB64 size_t base64_encode_length(size_t plain_len, base64_encodestate* state_in); + +-extern char base64_encode_value(signed char value_in); +-extern size_t base64_encode_block(const void* plaintext_in, const size_t length_in, char* code_out, base64_encodestate* state_in); +-extern size_t base64_encode_blockend(char* code_out, base64_encodestate* state_in); ++extern LIBB64 char base64_encode_value(signed char value_in); ++extern LIBB64 size_t base64_encode_block(const void* plaintext_in, const size_t length_in, char* code_out, base64_encodestate* state_in); ++extern LIBB64 size_t base64_encode_blockend(char* code_out, base64_encodestate* state_in); + + #endif /* BASE64_CENCODE_H */ +diff --git a/include/b64/decode.h b/include/b64/decode.h +index b2362e5..dd772d4 100644 +--- a/include/b64/decode.h ++++ b/include/b64/decode.h +@@ -22,23 +22,23 @@ namespace base64 + base64_decodestate _state; + int _buffersize; + +- decoder(int buffersize_in = BUFFERSIZE) ++ LIBB64 decoder(int buffersize_in = BUFFERSIZE) + : _buffersize(buffersize_in) + { + base64_init_decodestate(&_state); + } + +- int decode(char value_in) ++ LIBB64 int decode(char value_in) + { + return base64_decode_value(value_in); + } + +- std::streamsize decode(const char* code_in, const std::streamsize length_in, char* plaintext_out) ++ LIBB64 std::streamsize decode(const char* code_in, const std::streamsize length_in, char* plaintext_out) + { + return base64_decode_block(code_in, static_cast(length_in), plaintext_out, &_state); + } + +- void decode(std::istream& istream_in, std::ostream& ostream_in) ++ LIBB64 void decode(std::istream& istream_in, std::ostream& ostream_in) + { + base64_init_decodestate(&_state); + // +diff --git a/include/b64/encode.h b/include/b64/encode.h +index c1a5f88..ff2c9b4 100644 +--- a/include/b64/encode.h ++++ b/include/b64/encode.h +@@ -22,28 +22,28 @@ namespace base64 + base64_encodestate _state; + int _buffersize; + +- encoder(int buffersize_in = BUFFERSIZE) ++ LIBB64 encoder(int buffersize_in = BUFFERSIZE) + : _buffersize(buffersize_in) + { + base64_init_encodestate(&_state); + } + +- int encode(char value_in) ++ LIBB64 int encode(char value_in) + { + return base64_encode_value(value_in); + } + +- std::streamsize encode(const char* code_in, const std::streamsize length_in, char* plaintext_out) ++ LIBB64 std::streamsize encode(const char* code_in, const std::streamsize length_in, char* plaintext_out) + { + return base64_encode_block(code_in, static_cast(length_in), plaintext_out, &_state); + } + +- int encode_end(char* plaintext_out) ++ LIBB64 int encode_end(char* plaintext_out) + { + return base64_encode_blockend(plaintext_out, &_state); + } + +- void encode(std::istream& istream_in, std::ostream& ostream_in) ++ LIBB64 void encode(std::istream& istream_in, std::ostream& ostream_in) + { + base64_init_encodestate(&_state); + // diff --git a/versions/b-/b64.json b/versions/b-/b64.json new file mode 100644 index 00000000000000..36e172140ed18c --- /dev/null +++ b/versions/b-/b64.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9f1b6b36747fb6349483bf78531123d4b1ec5d7d", + "version": "2.0.0.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 90f62ad7303b9b..c689c7ae07be0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -332,6 +332,10 @@ "baseline": "2020-12-09", "port-version": 0 }, + "b64": { + "baseline": "2.0.0.1", + "port-version": 0 + }, "basisu": { "baseline": "1.11-4", "port-version": 0 From 94d13c9414ade6069ffe1e4f90d49b9ed623aa84 Mon Sep 17 00:00:00 2001 From: Kevin Lalumiere Date: Wed, 25 Aug 2021 23:36:28 -0400 Subject: [PATCH 0350/1858] [vcpkg] Add triplet option VCPKG_NO_COMPILER_TRACKING (#17526) --- docs/users/triplets.md | 4 ++++ scripts/vcpkg_get_tags.cmake | 1 + 2 files changed, 5 insertions(+) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index e1098a39a819b0..efc55ac2c0aaea 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -118,6 +118,10 @@ See the [`"supports"`](../maintainers/manifest-files.md#supports) manifest file > Implementers' Note: this list is extracted via the `vcpkg_get_dep_info` mechanism. +### VCPKG_DISABLE_COMPILER_TRACKING + +When this option is set to (true|1|on), the compiler is ignored in the abi tracking. + ## Windows Variables ### VCPKG_ENV_PASSTHROUGH diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake index 09d938bbd9a281..6a948d129eb597 100644 --- a/scripts/vcpkg_get_tags.cmake +++ b/scripts/vcpkg_get_tags.cmake @@ -13,6 +13,7 @@ VCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE} VCPKG_BUILD_TYPE=${VCPKG_BUILD_TYPE} VCPKG_LIBRARY_LINKAGE=${VCPKG_LIBRARY_LINKAGE} VCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE} +VCPKG_DISABLE_COMPILER_TRACKING=${VCPKG_DISABLE_COMPILER_TRACKING} e1e74b5c-18cb-4474-a6bd-5c1c8bc81f3f") # Just to enforce the user didn't set it in the triplet file From 6341fb257b040ad5829a98a5a588db52fae45db7 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 26 Aug 2021 12:08:51 +0800 Subject: [PATCH 0351/1858] [zstd] update to 1.5.0 (#18915) --- ports/zstd/fix-c4703-error.patch | 15 ++++++++++++ ports/zstd/install_pkgpc.patch | 7 +++--- ports/zstd/portfile.cmake | 39 +++++++++++++------------------- ports/zstd/vcpkg.json | 14 ++++++++++-- versions/baseline.json | 2 +- versions/z-/zstd.json | 5 ++++ 6 files changed, 52 insertions(+), 30 deletions(-) create mode 100644 ports/zstd/fix-c4703-error.patch diff --git a/ports/zstd/fix-c4703-error.patch b/ports/zstd/fix-c4703-error.patch new file mode 100644 index 00000000000000..9af18d74125df3 --- /dev/null +++ b/ports/zstd/fix-c4703-error.patch @@ -0,0 +1,15 @@ +diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c +index 3d523e8..3dd1426 100644 +--- a/lib/compress/zstd_lazy.c ++++ b/lib/compress/zstd_lazy.c +@@ -1296,8 +1296,8 @@ size_t ZSTD_RowFindBestMatch_generic ( + size_t ddsIdx; + U32 ddsExtraAttempts; /* cctx hash tables are limited in searches, but allow extra searches into DDS */ + U32 dmsTag; +- U32* dmsRow; +- BYTE* dmsTagRow; ++ U32* dmsRow = NULL; ++ BYTE* dmsTagRow = NULL; + + if (dictMode == ZSTD_dedicatedDictSearch) { + const U32 ddsHashLog = dms->cParams.hashLog - ZSTD_LAZY_DDSS_BUCKET_LOG; diff --git a/ports/zstd/install_pkgpc.patch b/ports/zstd/install_pkgpc.patch index 61c8a956a5e371..a0582d98b21cc3 100644 --- a/ports/zstd/install_pkgpc.patch +++ b/ports/zstd/install_pkgpc.patch @@ -1,14 +1,13 @@ diff --git a/build/cmake/lib/CMakeLists.txt b/build/cmake/lib/CMakeLists.txt -index 179c9762..f86efdbc 100644 +index 5f75665..dabc9d5 100644 --- a/build/cmake/lib/CMakeLists.txt +++ b/build/cmake/lib/CMakeLists.txt -@@ -134,7 +134,7 @@ if (ZSTD_BUILD_STATIC) +@@ -130,7 +130,7 @@ if (ZSTD_BUILD_STATIC) OUTPUT_NAME ${STATIC_LIBRARY_BASE_NAME}) endif () - + -if (UNIX OR MINGW) +if (1) # pkg-config set(PREFIX "${CMAKE_INSTALL_PREFIX}") set(EXEC_PREFIX "\${prefix}") - \ No newline at end of file diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index 656ee5714a7657..f15e717100fab9 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -1,20 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/zstd - REF v1.4.9 - SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133 + REF a488ba114ec17ea1054b9057c26a046fc122b3b6 #v1.5.0 + SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae HEAD_REF dev PATCHES install_pkgpc.patch + fix-c4703-error.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(ZSTD_STATIC 1) - set(ZSTD_SHARED 0) -else() - set(ZSTD_STATIC 0) - set(ZSTD_SHARED 1) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZSTD_BUILD_SHARED) if(VCPKG_TARGET_IS_WINDOWS) # Enable multithreaded mode. CMake build doesn't provide a multithreaded @@ -23,12 +19,11 @@ if(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS}") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/build/cmake - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/build/cmake" OPTIONS - -DZSTD_BUILD_SHARED=${ZSTD_SHARED} - -DZSTD_BUILD_STATIC=${ZSTD_STATIC} + -DZSTD_BUILD_SHARED=${ZSTD_BUILD_SHARED} + -DZSTD_BUILD_STATIC=${ZSTD_BUILD_STATIC} -DZSTD_LEGACY_SUPPORT=1 -DZSTD_BUILD_PROGRAMS=0 -DZSTD_BUILD_TESTS=0 @@ -37,9 +32,9 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d) # this is against the maintainer guidelines. # Removing it probably requires a vcpkg-cmake-wrapper.cmake to correct downstreams FindZSTD.cmake -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/zstd) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd) # This enables find_package(ZSTD) and find_package(zstd) to find zstd on Linux(case sensitive filesystems) file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config.cmake") @@ -59,18 +54,16 @@ endif() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") foreach(HEADER zdict.h zstd.h zstd_errors.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/${HEADER} HEADER_CONTENTS) - string(REPLACE "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/${HEADER} "${HEADER_CONTENTS}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${HEADER}" "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" ) endforeach() endif() -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "ZSTD is dual licensed - see LICENSE and COPYING files\n") +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed - see LICENSE and COPYING files\n") diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index 6ac7d4b521b5e0..b0f5e21a8c55fb 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -1,6 +1,16 @@ { "name": "zstd", - "version": "1.4.9", + "version-semver": "1.5.0", "description": "Zstandard - Fast real-time compression algorithm", - "homepage": "https://facebook.github.io/zstd/" + "homepage": "https://facebook.github.io/zstd/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index c689c7ae07be0f..6364739fc0e4f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6969,7 +6969,7 @@ "port-version": 0 }, "zstd": { - "baseline": "1.4.9", + "baseline": "1.5.0", "port-version": 0 }, "zstr": { diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index 8e7a2ef0f65768..112ca03bd132df 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b605e1bf30a124c99845c16733aac48289ae6a87", + "version-semver": "1.5.0", + "port-version": 0 + }, { "git-tree": "3a0ffa2a8fe8246a3937d9f6a77d577e351dd445", "version": "1.4.9", From 67fd24fba1f3aa44207c646f5cf1b9ee17773535 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Thu, 26 Aug 2021 18:34:31 +0200 Subject: [PATCH 0352/1858] [ginkgo] Update to 1.4.0 (#19731) * [ginkgo] add release 1.4.0 * [ginkgo] x-add-version * Update ports/ginkgo/usage * [ginkgo] download large patch on demand * [ginkgo] x-add-version --- ports/ginkgo/cmake-fixes.patch | 86 -------------------- ports/ginkgo/portfile.cmake | 16 +++- ports/ginkgo/usage | 4 + ports/ginkgo/vcpkg.json | 4 +- ports/ginkgo/windows-iterator.patch | 117 ---------------------------- versions/baseline.json | 2 +- versions/g-/ginkgo.json | 5 ++ 7 files changed, 24 insertions(+), 210 deletions(-) delete mode 100644 ports/ginkgo/cmake-fixes.patch create mode 100644 ports/ginkgo/usage delete mode 100644 ports/ginkgo/windows-iterator.patch diff --git a/ports/ginkgo/cmake-fixes.patch b/ports/ginkgo/cmake-fixes.patch deleted file mode 100644 index dde1c46675e099..00000000000000 --- a/ports/ginkgo/cmake-fixes.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e75f7d6..63685f2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,6 +20,12 @@ include(cmake/hip_path.cmake) - include(cmake/autodetect_executors.cmake) - include(cmake/build_type_helpers.cmake) - -+if (MSVC) -+ add_compile_options(/bigobj) -+elseif (MINGW OR CYGWIN) -+ add_compile_options("-Wa,-mbig-obj") -+endif() -+ - # Ginkgo configuration options - option(GINKGO_DEVEL_TOOLS "Add development tools to the build system" OFF) - option(GINKGO_BUILD_TESTS "Generate build files for unit tests" ON) -diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in -index 0348f95..3b8be0f 100644 ---- a/cmake/GinkgoConfig.cmake.in -+++ b/cmake/GinkgoConfig.cmake.in -@@ -129,8 +129,6 @@ set(GINKGO_OPENMP_LIBRARIES @OpenMP_CXX_LIBRARIES@) - set(GINKGO_OPENMP_FLAGS "@OpenMP_CXX_FLAGS@") - - # Provide useful HIP helper functions --include(${CMAKE_CURRENT_LIST_DIR}/hip_helpers.cmake) --include(${CMAKE_CURRENT_LIST_DIR}/windows_helpers.cmake) - - # NOTE: we do not export benchmarks, examples, tests or devel tools - # so `third_party` libraries are currently unneeded. -diff --git a/cmake/install_helpers.cmake b/cmake/install_helpers.cmake -index ba7ea3f..7cc3ba8 100644 ---- a/cmake/install_helpers.cmake -+++ b/cmake/install_helpers.cmake -@@ -14,16 +14,11 @@ function(ginkgo_install_library name subdir) - # dll is considered as runtime - install(TARGETS "${name}" - EXPORT Ginkgo -- LIBRARY DESTINATION ${GINKGO_INSTALL_LIBRARY_DIR} -- ARCHIVE DESTINATION ${GINKGO_INSTALL_LIBRARY_DIR} -- RUNTIME DESTINATION ${GINKGO_INSTALL_LIBRARY_DIR} - ) - else () - # install .so and .a files - install(TARGETS "${name}" - EXPORT Ginkgo -- LIBRARY DESTINATION ${GINKGO_INSTALL_LIBRARY_DIR} -- ARCHIVE DESTINATION ${GINKGO_INSTALL_LIBRARY_DIR} - ) - endif () - endfunction() -@@ -37,9 +32,8 @@ function(ginkgo_install) - DESTINATION "${GINKGO_INSTALL_INCLUDE_DIR}" - FILES_MATCHING PATTERN "*.hpp" - ) -- install(DIRECTORY "${Ginkgo_BINARY_DIR}/include/" -- DESTINATION "${GINKGO_INSTALL_INCLUDE_DIR}" -- FILES_MATCHING PATTERN "*.hpp" -+ install(FILES "${Ginkgo_BINARY_DIR}/include/ginkgo/config.hpp" -+ DESTINATION "${GINKGO_INSTALL_INCLUDE_DIR}/ginkgo" - ) - if (GINKGO_HAVE_PAPI_SDE) - install(FILES "${Ginkgo_SOURCE_DIR}/third_party/papi_sde/papi_sde_interface.h" -@@ -70,8 +64,6 @@ function(ginkgo_install) - install(FILES - "${Ginkgo_BINARY_DIR}/GinkgoConfig.cmake" - "${Ginkgo_BINARY_DIR}/GinkgoConfigVersion.cmake" -- "${Ginkgo_SOURCE_DIR}/cmake/hip_helpers.cmake" -- "${Ginkgo_SOURCE_DIR}/cmake/windows_helpers.cmake" - DESTINATION "${GINKGO_INSTALL_CONFIG_DIR}" - ) - install(EXPORT Ginkgo -diff --git a/cmake/windows_helpers.cmake b/cmake/windows_helpers.cmake -index 5f517a5..46d31ba 100644 ---- a/cmake/windows_helpers.cmake -+++ b/cmake/windows_helpers.cmake -@@ -14,9 +14,7 @@ function(ginkgo_switch_windows_link lang from to) - endfunction() - - macro(ginkgo_switch_to_windows_static lang) -- ginkgo_switch_windows_link(${lang} "MD" "MT") - endmacro() - - macro(ginkgo_switch_to_windows_dynamic lang) -- ginkgo_switch_windows_link(${lang} "MT" "MD") - endmacro() diff --git a/ports/ginkgo/portfile.cmake b/ports/ginkgo/portfile.cmake index 8cd722f5a738b7..b2926fa9aec741 100644 --- a/ports/ginkgo/portfile.cmake +++ b/ports/ginkgo/portfile.cmake @@ -1,12 +1,17 @@ +vcpkg_download_distfile(WINDOWS_SYMBOLS_PATCH + URLS https://github.com/ginkgo-project/ginkgo/commit/7481b2fffb51d73492ef9017045450b29b820f81.diff + FILENAME 7481b2fffb51d73492ef9017045450b29b820f81.diff + SHA512 f81c57aacc30680383ccfb21ca08987d8ea19a23c0c7bbc5ae590c3c7eca4eed72cea84410357e080e5bb35f08f6b57834b3cdace6d91cc3fde0a1930aa4270a +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ginkgo-project/ginkgo - REF v1.3.0 - SHA512 40db39666730a2120d0c5e197518f784aab71655781c037fb83302a346f6bf717e5c58491e9b29b9adacb492328e11bc60960f99323c220d53505ecab6489871 + REF v1.4.0 + SHA512 9bfcb2c415c7a1a70cf8e49f20adf62d02cab83bb23b6fcecfeaeeb322b2d4e1ad8d8fa6582735073753f9a05eac8688b9bd1ff1d4203957c1a80702d117e807 HEAD_REF master PATCHES - cmake-fixes.patch - windows-iterator.patch + ${WINDOWS_SYMBOLS_PATCH} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -23,6 +28,8 @@ vcpkg_cmake_configure( -DGINKGO_BUILD_TESTS=OFF -DGINKGO_BUILD_EXAMPLES=OFF -DGINKGO_BUILD_HIP=OFF + -DGINKGO_BUILD_DPCPP=OFF + -DGINKGO_BUILD_HWLOC=OFF -DGINKGO_BUILD_BENCHMARKS=OFF -DGINKGO_DEVEL_TOOLS=OFF -DGINKGO_SKIP_DEPENDENCY_UPDATE=ON @@ -36,5 +43,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Ginkgo) vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ginkgo") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/ginkgo/usage b/ports/ginkgo/usage new file mode 100644 index 00000000000000..5dfe203f7c2098 --- /dev/null +++ b/ports/ginkgo/usage @@ -0,0 +1,4 @@ +The package ginkgo provides CMake targets: + + find_package(Ginkgo CONFIG REQUIRED) + target_link_libraries(main PRIVATE Ginkgo::ginkgo) diff --git a/ports/ginkgo/vcpkg.json b/ports/ginkgo/vcpkg.json index 68d62e51854bc5..c7db13df5531a5 100644 --- a/ports/ginkgo/vcpkg.json +++ b/ports/ginkgo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ginkgo", - "version-semver": "1.3.0", - "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows, and the CUDA feature on Windows requires the CUDACXX environment variable to point to the CUDA nvcc.exe compiler with VCPKG_KEEP_ENV_VARS set to CUDACXX to pass its value through to the vcpkg environment.", + "version-semver": "1.4.0", + "description": "Ginkgo is a high-performance linear algebra library for manycore systems, with a focus on sparse solution of linear systems. Note that the OpenMP feature is not available on Windows.", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/ginkgo/windows-iterator.patch b/ports/ginkgo/windows-iterator.patch deleted file mode 100644 index be6645f37db393..00000000000000 --- a/ports/ginkgo/windows-iterator.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/core/base/iterator_factory.hpp b/core/base/iterator_factory.hpp -index b7efd21dfe..5e4bddeb17 100644 ---- a/core/base/iterator_factory.hpp -+++ b/core/base/iterator_factory.hpp -@@ -110,7 +110,7 @@ class IteratorFactory { - - ~Reference() {} - -- Reference(IteratorFactory &parent, array_index_type array_index) -+ Reference(IteratorFactory *parent, array_index_type array_index) - : parent_(parent), arr_index_(array_index) - {} - -@@ -143,10 +143,10 @@ class IteratorFactory { - { - // In C++11, it is legal for a nested class to access private - // members of the parent class. -- parent_.dominant_values_[arr_index_] = -- std::move(other.parent_.dominant_values_[other.arr_index_]); -- parent_.secondary_values_[arr_index_] = -- std::move(other.parent_.secondary_values_[other.arr_index_]); -+ parent_->dominant_values_[arr_index_] = -+ std::move(other.parent_->dominant_values_[other.arr_index_]); -+ parent_->secondary_values_[arr_index_] = -+ std::move(other.parent_->secondary_values_[other.arr_index_]); - return *this; - } - -@@ -174,25 +174,25 @@ class IteratorFactory { - return left.dominant < right.dominant(); - } - -- ToSortType &dominant() { return parent_.dominant_values_[arr_index_]; } -+ ToSortType &dominant() { return parent_->dominant_values_[arr_index_]; } - - const ToSortType &dominant() const - { -- return parent_.dominant_values_[arr_index_]; -+ return parent_->dominant_values_[arr_index_]; - } - - SecondaryType &secondary() - { -- return parent_.secondary_values_[arr_index_]; -+ return parent_->secondary_values_[arr_index_]; - } - - const SecondaryType &secondary() const - { -- return parent_.secondary_values_[arr_index_]; -+ return parent_->secondary_values_[arr_index_]; - } - - private: -- IteratorFactory &parent_; -+ IteratorFactory *parent_; - array_index_type arr_index_; - }; - -@@ -214,9 +214,11 @@ class IteratorFactory { - using reference = Reference; - using iterator_category = std::random_access_iterator_tag; - -+ Iterator() = default; -+ - ~Iterator() {} - -- Iterator(IteratorFactory &parent, difference_type array_index) -+ Iterator(IteratorFactory *parent, difference_type array_index) - : parent_(parent), arr_index_(array_index) - {} - -@@ -298,12 +300,12 @@ class IteratorFactory { - } - - // Comparable operators -- bool operator==(const Iterator &other) -+ bool operator==(const Iterator &other) const - { - return arr_index_ == other.arr_index_; - } - -- bool operator!=(const Iterator &other) -+ bool operator!=(const Iterator &other) const - { - return arr_index_ != other.arr_index_; - } -@@ -329,8 +331,8 @@ class IteratorFactory { - } - - private: -- IteratorFactory &parent_; -- difference_type arr_index_; -+ IteratorFactory *parent_{}; -+ difference_type arr_index_{}; - }; - - public: -@@ -363,7 +365,7 @@ class IteratorFactory { - * Creates an iterator pointing to the beginning of both arrays - * @returns an iterator pointing to the beginning of both arrays - */ -- Iterator begin() { return {*this, 0}; } -+ Iterator begin() { return {this, 0}; } - - /** - * Creates an iterator pointing to the (excluding) end of both arrays -@@ -371,7 +373,7 @@ class IteratorFactory { - */ - Iterator end() - { -- return {*this, static_cast(size_)}; -+ return {this, static_cast(size_)}; - } - - private: - diff --git a/versions/baseline.json b/versions/baseline.json index 6364739fc0e4f2..fd99f64072c8fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2309,7 +2309,7 @@ "port-version": 0 }, "ginkgo": { - "baseline": "1.3.0", + "baseline": "1.4.0", "port-version": 0 }, "gl2ps": { diff --git a/versions/g-/ginkgo.json b/versions/g-/ginkgo.json index c65080a751e9f0..d4eb05b73693a4 100644 --- a/versions/g-/ginkgo.json +++ b/versions/g-/ginkgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da56f7ca349bebb4061a04d4d3b3d9b8fde9a1c8", + "version-semver": "1.4.0", + "port-version": 0 + }, { "git-tree": "b204eef5f779c05c2160e28cc07f411258ddcbfc", "version-semver": "1.3.0", From 7cef0548523a6d5c8af8a8a7e814a3ba797f77fd Mon Sep 17 00:00:00 2001 From: Johan Pauwels Date: Thu, 26 Aug 2021 18:07:38 +0100 Subject: [PATCH 0353/1858] [vtk] Fix OpenGL feature (#19735) * [vtk] Fix typo that breaks OpenGL feature Missspelled "VTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2" * [vtk] Bump version --- ports/vtk/CONTROL | 4 ++-- ports/vtk/portfile.cmake | 7 ++++--- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index cd76b37bb0e0b3..64ca10961d653c 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,6 +1,6 @@ Source: vtk Version: 9.0.1 -Port-Version: 6 +Port-Version: 7 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2 @@ -47,4 +47,4 @@ Build-Depends: vtk[core] Feature: all Description: Build all vtk modules -Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc, utf8] (windows) \ No newline at end of file +Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc, utf8] (windows) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 596731a33a578b..79dec0b4749d75 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -80,7 +80,7 @@ endif() if("opengl" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_DomainsChemestryOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2=YES -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2=YES @@ -114,8 +114,9 @@ if("all" IN_LIST FEATURES) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "cuda" VTK_USE_CUDA - "all" VTK_BUILD_ALL_MODULES + FEATURES + "cuda" VTK_USE_CUDA + "all" VTK_BUILD_ALL_MODULES ) diff --git a/versions/baseline.json b/versions/baseline.json index fd99f64072c8fb..40c921882a5eaf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6666,7 +6666,7 @@ }, "vtk": { "baseline": "9.0.1", - "port-version": 6 + "port-version": 7 }, "vtk-dicom": { "baseline": "0.8.12-1", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index df66e2cb688cf0..092bac4625837d 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a64bbb016d5ecf20be3df3bf850748f9f885502", + "version-string": "9.0.1", + "port-version": 7 + }, { "git-tree": "78be7ee36f34395e4d5511fd61457c4f7178a438", "version-string": "9.0.1", From 660f92b8675dab00dc67718beba46193c995bfcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 27 Aug 2021 01:09:08 +0800 Subject: [PATCH 0354/1858] [many ports] Add vcpkg_fixup_pkgconfig (#19721) * [many ports]Add vcpkg_fixup_pkgconfig * version * Update ports/libepoxy/vcpkg.json Co-authored-by: Robert Schumacher * Update versions/l-/libepoxy.json * Update versions/l-/libepoxy.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/c-ares/portfile.cmake | 13 +++++++------ ports/c-ares/vcpkg.json | 15 +++++++++++++-- ports/libepoxy/CONTROL | 5 ----- ports/libepoxy/portfile.cmake | 12 ++++++++---- ports/libepoxy/vcpkg.json | 10 ++++++++++ ports/physfs/portfile.cmake | 11 ++++++----- ports/physfs/vcpkg.json | 8 ++++++-- versions/baseline.json | 6 +++--- versions/c-/c-ares.json | 5 +++++ versions/l-/libepoxy.json | 5 +++++ versions/p-/physfs.json | 5 +++++ 11 files changed, 68 insertions(+), 27 deletions(-) delete mode 100644 ports/libepoxy/CONTROL create mode 100644 ports/libepoxy/vcpkg.json diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 8f54a176d22887..4e9ee82663d265 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -11,9 +11,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCARES_STATIC=${BUILD_STATIC} -DCARES_SHARED=${BUILD_SHARED} @@ -22,14 +21,16 @@ vcpkg_configure_cmake( -DCARES_BUILD_CONTAINER_TESTS=OFF ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c-ares) +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c-ares) +vcpkg_fixup_pkgconfig() + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ares.h + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/ares.h" "#ifdef CARES_STATICLIB" "#if 1" ) endif() diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index 331ca600f7fa2a..da731a90c76ef3 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,7 +1,18 @@ { "name": "c-ares", - "version": "1.17.2", + "version-semver": "1.17.2", + "port-version": 1, "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL deleted file mode 100644 index 7e6b7e53256b1a..00000000000000 --- a/ports/libepoxy/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libepoxy -Version: 1.5.5 -Homepage: https://github.com/anholt/libepoxy -Description: Epoxy is a library for handling OpenGL function pointer management for you -Build-Depends: tool-meson diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 90290b5a083fdb..83a32bb74d8767 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -25,12 +25,16 @@ endif() vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${OPTIONS} -Dtests=false + OPTIONS + ${OPTIONS} + -Dtests=false ) vcpkg_install_meson() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig) +vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libepoxy/vcpkg.json b/ports/libepoxy/vcpkg.json new file mode 100644 index 00000000000000..d5f7b4259c3013 --- /dev/null +++ b/ports/libepoxy/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libepoxy", + "version-semver": "1.5.5", + "port-version": 1, + "description": "Epoxy is a library for handling OpenGL function pointer management for you", + "homepage": "https://github.com/anholt/libepoxy", + "dependencies": [ + "tool-meson" + ] +} diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 593c84293eeadf..879a2b0e0f14a7 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -20,18 +20,19 @@ vcpkg_extract_source_archive_ex( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC} -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED} -DPHYSFS_BUILD_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json index a61a33881807a3..b740565cafc632 100644 --- a/ports/physfs/vcpkg.json +++ b/ports/physfs/vcpkg.json @@ -1,10 +1,14 @@ { "name": "physfs", - "version-string": "3.0.2", - "port-version": 5, + "version-semver": "3.0.2", + "port-version": 6, "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 40c921882a5eaf..6dea4286ca9f41 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1110,7 +1110,7 @@ }, "c-ares": { "baseline": "1.17.2", - "port-version": 0 + "port-version": 1 }, "c4core": { "baseline": "2021-07-18", @@ -3182,7 +3182,7 @@ }, "libepoxy": { "baseline": "1.5.5", - "port-version": 0 + "port-version": 1 }, "libevent": { "baseline": "2.1.12", @@ -4918,7 +4918,7 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 5 + "port-version": 6 }, "physx": { "baseline": "4.1.2", diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 4f9dfb16ec0e5d..59b8c1d2d54c24 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d434c999ea00b87bfbee3d79ddc6fc1b6f12d7fe", + "version-semver": "1.17.2", + "port-version": 1 + }, { "git-tree": "4a8a471e681a33c8dde0a209900ac24a2e8e7f72", "version": "1.17.2", diff --git a/versions/l-/libepoxy.json b/versions/l-/libepoxy.json index 4093cd2c2cfc68..71194cc67a05b6 100644 --- a/versions/l-/libepoxy.json +++ b/versions/l-/libepoxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66e28966117a23b6e9ac6cba7e71ecad8a2803ea", + "version-semver": "1.5.5", + "port-version": 1 + }, { "git-tree": "5a4765be1ed914881477e17b993d7e8df3ef67f0", "version-string": "1.5.5", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index ba352ec8773abb..7e719741c5465f 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", + "version-semver": "3.0.2", + "port-version": 6 + }, { "git-tree": "5976d673e48ec47164efd0ea8ec86728f0e259be", "version-string": "3.0.2", From 1dd499537112c684469b6a0f04150e573fe57335 Mon Sep 17 00:00:00 2001 From: Xing Ji <33065325+jixingcn@users.noreply.github.com> Date: Fri, 27 Aug 2021 01:10:12 +0800 Subject: [PATCH 0355/1858] [OpenColorIO] Fix OpenColorIO v2.0.1 can't be find_package (#19725) * fix that opencolorio v2.0.1 can't be `find_package`, reference the master branch of opencolorio to generate `OpenColorIOTargets` * run `vcpkg x-add-version --all` * fix the `OpenColorIO` for linux * vcpkg x-add-version --all * patch for `OpenColorIOConfig.cmake` by https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1397 * vcpkg x-add-version --all --- ports/opencolorio/portfile.cmake | 13 ++++++++++++- ...se-find-openxer.patch => use-find-openexr.patch} | 0 ports/opencolorio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/opencolorio.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) rename ports/opencolorio/{use-find-openxer.patch => use-find-openexr.patch} (100%) diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index 27f21fda434960..5967543b01bf71 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -1,4 +1,10 @@ +vcpkg_download_distfile(config_patch_path + URLS https://patch-diff.githubusercontent.com/raw/AcademySoftwareFoundation/OpenColorIO/pull/1397.diff + FILENAME AcademySoftwareFoundation-OpenColorIO-b8e18214b.diff + SHA512 34a1afb79521e43138b8a695817a9eaf6c0de8cc1d85b4640967d0ad531287a4beb41660d461067cb67103fb3ee90e11bc50e1426a0d1ae6050f3ca434dd2f3d +) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO @@ -6,8 +12,9 @@ vcpkg_from_github( SHA512 51568e21eaf863747f67fbcffa7f42ba32f5892e8295dac6c9deb0f6205f57c231ea34ce028d84915e4be2f2773e362b74eaf057c2e4cf3ad4b60bf13a0b73db HEAD_REF master PATCHES + ${config_patch_path} fix-pystring-name.patch - use-find-openxer.patch + use-find-openexr.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -31,12 +38,16 @@ vcpkg_cmake_configure( vcpkg_cmake_install() +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/OpenColorIO") + vcpkg_copy_pdbs() # Clean redundant files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake + ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake ) if (OCIO_BUILD_APPS) vcpkg_copy_tools( diff --git a/ports/opencolorio/use-find-openxer.patch b/ports/opencolorio/use-find-openexr.patch similarity index 100% rename from ports/opencolorio/use-find-openxer.patch rename to ports/opencolorio/use-find-openexr.patch diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index 13d79cd8601323..f7be1eae537d04 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencolorio", "version-semver": "2.0.1", + "port-version": 1, "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6dea4286ca9f41..123b7a95074fe6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4614,7 +4614,7 @@ }, "opencolorio": { "baseline": "2.0.1", - "port-version": 0 + "port-version": 1 }, "opencolorio-tools": { "baseline": "1.1.1", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 2326e6b1b2e5f2..af8a543682291c 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1cb605cb4249c89ebab09079982d8f2b4b249716", + "version-semver": "2.0.1", + "port-version": 1 + }, { "git-tree": "3f0f60f376d80012eb0c3bd17ce51e3788070fe4", "version-semver": "2.0.1", From 2027b02367bf7d24238063f6e1a5bf9d68fa0a8b Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Thu, 26 Aug 2021 10:54:11 -0700 Subject: [PATCH 0356/1858] [openxr-loader] Update to 1.0.18 (#19574) --- ports/openxr-loader/001-fix-array-decl.patch | 26 --------------- ports/openxr-loader/002-fix-hpp-gen.patch | 16 +++++++++ ports/openxr-loader/CONTROL | 2 +- ports/openxr-loader/portfile.cmake | 35 ++++++++++---------- versions/baseline.json | 2 +- versions/o-/openxr-loader.json | 5 +++ 6 files changed, 40 insertions(+), 46 deletions(-) delete mode 100644 ports/openxr-loader/001-fix-array-decl.patch create mode 100644 ports/openxr-loader/002-fix-hpp-gen.patch diff --git a/ports/openxr-loader/001-fix-array-decl.patch b/ports/openxr-loader/001-fix-array-decl.patch deleted file mode 100644 index 9bd25eb319cf92..00000000000000 --- a/ports/openxr-loader/001-fix-array-decl.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- openxr.hpp 2020-08-16 14:42:30.845279600 -0700 -+++ openxr.hpp 2020-08-16 14:45:19.707229200 -0700 -@@ -18249,9 +18249,9 @@ - public: - // ctor - SpatialGraphNodeSpaceCreateInfoMSFT ( -- const SpatialGraphNodeTypeMSFT& nodeType_ = {}, -- uint8_t nodeId[16]_ = 0, -- const Posef& pose_ = {} -+ const SpatialGraphNodeTypeMSFT& nodeType_, -+ uint8_t nodeId_[16], -+ const Posef& pose_ - ) - : - -@@ -18259,9 +18259,9 @@ - ) , - - nodeType {nodeType_} , -- nodeId {nodeId_} , - pose {pose_} - { -+ memcpy(nodeId, nodeId_, 16); - } - operator const XrSpatialGraphNodeSpaceCreateInfoMSFT&() const { return *reinterpret_cast(this); } - operator XrSpatialGraphNodeSpaceCreateInfoMSFT &() { diff --git a/ports/openxr-loader/002-fix-hpp-gen.patch b/ports/openxr-loader/002-fix-hpp-gen.patch new file mode 100644 index 00000000000000..9f58f76268495e --- /dev/null +++ b/ports/openxr-loader/002-fix-hpp-gen.patch @@ -0,0 +1,16 @@ +diff --git a/scripts/hpp_genxr.py b/scripts/hpp_genxr.py +index 6b95fe4..3a19058 100755 +--- a/scripts/hpp_genxr.py ++++ b/scripts/hpp_genxr.py +@@ -80,6 +80,11 @@ def genTarget(args): + "XR_MSFT_controller_model", + # Projection of static string fails + "XR_MSFT_spatial_graph_bridge", ++ "XR_MSFT_spatial_anchor_persistence", ++ "XR_MSFT_holographic_window_attachment", ++ # Projection of UuidMSFT fails ++ "XR_MSFT_scene_understanding", ++ "XR_MSFT_scene_understanding_serialization", + )) + + # Turn lists of names/patterns into matching regular expressions diff --git a/ports/openxr-loader/CONTROL b/ports/openxr-loader/CONTROL index 06e6273c7134b2..12cfd6a2c9af82 100644 --- a/ports/openxr-loader/CONTROL +++ b/ports/openxr-loader/CONTROL @@ -1,5 +1,5 @@ Source: openxr-loader -Version: 1.0.11 +Version: 1.0.18 Port-Version: 1 Description: Khronos API for abstracting VR/MR/AR hardware Build-Depends: jsoncpp diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake index f68094d18ee9bc..c3046fdf9c7083 100644 --- a/ports/openxr-loader/portfile.cmake +++ b/ports/openxr-loader/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/OpenXR-SDK - REF e3a4e41d61544d8e2eba73f00da99b6818ec472b - SHA512 26c6b547aa30d89895efcc835dddc3b58ab57f0e450a4ae82655a990a816dd57c70e43267a10da75b1c2bd160189942e443c8e27367d6648417d1c9c134e7694 + REF 960c4a6aa8cc9f47e357c696b5377d817550bf88 + SHA512 515494520a31491587418ab6cb1b28333481e0a20cb25d3f9bc875ac211faf1636641afdfee2ecdf816ea1222305ea52565992953b3bab68fffe40fa25e23145 HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch @@ -13,8 +13,8 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH SDK_SOURCE_PATH REPO KhronosGroup/OpenXR-SDK-Source - REF 6dee6e228f47857adf5d7673eb90c64f04d33c60 - SHA512 0c522eef95b4d8bdc8e4f1ca852cd9798ff2bca9ef8511446d9cdf80bc314b0da454ab5c203658bbe43d3e7ff3d757b9427c3f75829b2a022a25041d1a2d2b12 + REF 09cbbc9d3bc540a53d5f2d76b8074ddc0b96e933 + SHA512 1fc777d7aaea585dd8e9f9ac60a71a7eb55017183f33e51f987b94af6bba8d7808771abf9fc377c6e2b613f282db08a095595b4bc6899d4eaa6eabb45405dc1b HEAD_REF master PATCHES fix-openxr-sdk-jsoncpp.patch @@ -23,9 +23,11 @@ vcpkg_from_github( vcpkg_from_github( OUT_SOURCE_PATH HPP_SOURCE_PATH REPO KhronosGroup/OpenXR-hpp - REF 097a7535563fc84bb7648ea9c5a4531a1e909458 - SHA512 fe953405724e9c4a8218cd269a23317ebc8164330a519eb82de75e832bc05e2c51d24bca24e4ce13724bf275c33b26f6646e25f29eeffe6840ffc552f3351ad0 + REF 6fcea9e472622c9c7f4df0b5f0bfe7ff5d8553f7 + SHA512 04d1f9db6fd0a01cdf3274089ab17bf17974ff799b4690561c16067e83710e1422a2aefd070b26023ff832eb58e6a3365297a818c9546ea4c531328bd1fb2de4 HEAD_REF master + PATCHES + 002-fix-hpp-gen.patch ) # Weird behavior inside the OpenXR loader. On Windows they force shared libraries to use static crt, and @@ -56,19 +58,16 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +# Generate the OpenXR C++ bindings set(ENV{OPENXR_REPO} ${SDK_SOURCE_PATH}) - -vcpkg_execute_required_process( - COMMAND ${PYTHON3} ${HPP_SOURCE_PATH}/scripts/hpp_genxr.py -registry ${SDK_SOURCE_PATH}/specification/registry/xr.xml -o ${CURRENT_PACKAGES_DIR}/include/openxr openxr.hpp - WORKING_DIRECTORY ${HPP_SOURCE_PATH} - LOGFILE openxrhpp -) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include/openxr - PATCHES - 001-fix-array-decl.patch -) +file(STRINGS ${HPP_SOURCE_PATH}/headers.txt HEADER_LIST REGEX "^openxr.*") +foreach(HEADER ${HEADER_LIST}) + vcpkg_execute_required_process( + COMMAND ${PYTHON3} ${HPP_SOURCE_PATH}/scripts/hpp_genxr.py -registry ${SDK_SOURCE_PATH}/specification/registry/xr.xml -o ${CURRENT_PACKAGES_DIR}/include/openxr ${HEADER} + WORKING_DIRECTORY ${HPP_SOURCE_PATH} + LOGNAME openxrhpp + ) +endforeach() if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/OpenXR) diff --git a/versions/baseline.json b/versions/baseline.json index 123b7a95074fe6..c443aaa5ce85c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4741,7 +4741,7 @@ "port-version": 0 }, "openxr-loader": { - "baseline": "1.0.11", + "baseline": "1.0.18", "port-version": 1 }, "optional-bare": { diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json index 633b808254cab3..66251650cfd6f8 100644 --- a/versions/o-/openxr-loader.json +++ b/versions/o-/openxr-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6674369c2498960b44d097881c3573857a7da92e", + "version-string": "1.0.18", + "port-version": 1 + }, { "git-tree": "0ba3ab397dde99a678c135d6fd91e42966bf8d88", "version-string": "1.0.11", From e0d1c8383267203b194aaf564d95946b1ef926fb Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 26 Aug 2021 15:37:42 -0700 Subject: [PATCH 0357/1858] [directxtk, directxtk12, directxtex] ports updated for August 2021 release (#19320) * DirectXTex port updated * DirectX Tool Kit updated for August 2021 release * Update baseline * Remove build of MakeSpriteFont * Update baseline * Added 4.7.2 .NET TargetingPack * Back out adding .NET targeting pack, forked out as https://github.com/microsoft/vcpkg/pull/19764 Co-authored-by: Billy Robert O'Neal III --- ports/directxtex/portfile.cmake | 28 ++++++++++++++-------------- ports/directxtex/vcpkg.json | 4 ++-- ports/directxtk/portfile.cmake | 26 ++++++++++---------------- ports/directxtk/vcpkg.json | 4 ++-- ports/directxtk12/portfile.cmake | 20 ++++++++++---------- ports/directxtk12/vcpkg.json | 4 ++-- versions/baseline.json | 6 +++--- versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ 10 files changed, 58 insertions(+), 49 deletions(-) diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index eb991da0b2a508..e3efa28f1314a9 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF jun2021 - SHA512 aa67e814248b3e6163eb8670a8740831bc449b0cc1d83ba0e83d022cc3a8b78c92bc79dee15a089ef1d20566e22c4236ae871906b467bab688c223b32900ec60 + REF aug2021 + SHA512 72b688848ad7645e018bb7dc3a3179ea3857e8349185ad53ad583b17aca555554ce44773a4b900ad163b2fd8551c28c3503b88333d8cff8f8d3ee03017bad35d HEAD_REF master ) @@ -65,23 +65,23 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/jun2021/texassemble.exe" - FILENAME "texassemble-jun2021.exe" - SHA512 98fbd891b36c1f0c400670e4ad7943929a278995d1c1d99fe6c4d490abfabe001885eeafad3f913962c560a0ddd960126c979c60d89edcdf0dd002be919048d8 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/aug2021/texassemble.exe" + FILENAME "texassemble-aug2021.exe" + SHA512 11b07da257d7ea394fa789210b2985656bf28a0b6117d5380d9639ffc0a460a0e6c4bdbb24256dcf3b4d75088b4b5386951a7de856fecb99e73dfe326b4bfe45 ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/jun2021/texconv.exe" - FILENAME "texconv-jun2021.exe" - SHA512 47719cca9a2eaf7b28da6b68f87c54ed89507e864d93a35ce7dc417dd0f40cbef23e54039c27c4addfbda79f2f94b1224172e6c8cf2b9ed1e784e60661900102 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/aug2021/texconv.exe" + FILENAME "texconv-aug2021.exe" + SHA512 c11bc77a36d5989189519793f3a44c15f1e01b3e0a6254bffca4ee6f96c933a6add34ffc7e409f3c3f97d862816006d3ca440876a4af200f035353d096902c5b ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/jun2021/texdiag.exe" - FILENAME "texdiag-jun2021.exe" - SHA512 484f582c01a001ad97dedecf9ac4be6602a82f52a4e22750dd8ee2c4fa09a776d74aa77b3e50339248dd547f832d293d6d789fabeafe9593271100085e838a86 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/aug2021/texdiag.exe" + FILENAME "texdiag-aug2021.exe" + SHA512 73ae5fbc20ff7d970891d8e4029f1400f5d16675912cc4af97f9ef0e563dc77fa89690989e80eec5fd033975cf67d350be5a547d08fc5fecbabd4577603eef80 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -92,9 +92,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtex/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index b9195d59113d89..441c18d442bc07 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,8 +1,8 @@ { "name": "directxtex", - "version-string": "jun2021", + "version-string": "aug2021", "description": "DirectXTex texture processing library", - "homepage": "http://go.microsoft.com/fwlink/?LinkId=248926", + "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", "license": "MIT", "supports": "windows | linux", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 466a4d37e42980..2698b9b2dcccba 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF jun2021 - SHA512 df15d20c3ab586e4f08b92a30d82f277e966aaa2555fa6161a6fb2308e65d79fdb3c65518f150fb08c31902d929aa01369dc8a852d2be31d30ecdf9253898fe0 + REF aug2021 + SHA512 ed4ff5c8a1f12e2489a4ddb653a0d8097da4a901498852ada5595959f6e6275531e11ca20d8ce16da19f3ac37193b23edf7c9c1b6d6a78a8810e8f0d399ca4b8 HEAD_REF master ) @@ -36,16 +36,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/jun2021/MakeSpriteFont.exe" - FILENAME "makespritefont-jun2021.exe" - SHA512 4618090f65332c64cb5601a7095c60c87a3a41e9c030d7422d36f14b04dcd80c7aa26438733b892f91daf19fadd44591a814b77c3ca04590ad6c61ecbe909a65 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/aug2021/MakeSpriteFont.exe" + FILENAME "makespritefont-aug2021.exe" + SHA512 a84786f57f7f26c4ab0cd446136d79c19a74296f5074396854c81ad67aedfccfe76e15025ba9bcfcabb993f0bb7247ca536d55b4574192efb3e7c2069abf70d7 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/jun2021/XWBTool.exe" - FILENAME "xwbtool-jun2021.exe" - SHA512 dc74081b9569a9ca736984d8da1a5b2dc852f85d07a629d6e0ef7f2b4313987ec82d2ff1e0cfa19a89c7387182644869ac2a8f842d30609d88ccae7c01ce3f80 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/aug2021/XWBTool.exe" + FILENAME "xwbtool-aug2021.exe" + SHA512 3dd1ebd04db21517f74453727512783141b997d33efc1a47236c9ff343310da17b4add4c4ba6e138ad35095fb77f4207e7458a9e51ee3f4872fc0e0cf62be5b5 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -55,8 +55,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) elseif(NOT VCPKG_TARGET_IS_UWP) @@ -65,12 +65,6 @@ elseif(NOT VCPKG_TARGET_IS_UWP) SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake ) - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH MakeSpriteFont/MakeSpriteFont.csproj - PLATFORM AnyCPU - ) - endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index 2a484ac3f3ead1..f8b042df669569 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,8 +1,8 @@ { "name": "directxtk", - "version-string": "jun2021", + "version-string": "aug2021", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", - "homepage": "http://go.microsoft.com/fwlink/?LinkId=248929", + "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", "license": "MIT", "supports": "windows", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index f1a1edff0c2382..3eabb68b622fd8 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF jun2021 - SHA512 8d33232a5422283a0a69850a7913b88ccbf9720e5172fe82171d38a0f42b487ba5cca4f356eeaee975bcbb931a5e7ddbce1c335c3c93f01e79f85d65613e5387 + REF aug2021 + SHA512 9d0234d7f8d631fa7cb434487bb1fbb4a52760550962f8ebd5a8c09b33cc2b328651b0c0355057e9b172b7445c86b083f33967ee7918a5eeaf19b3e4915dfe00 HEAD_REF master ) @@ -22,16 +22,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jun2021/MakeSpriteFont.exe" - FILENAME "makespritefont-jun2021.exe" - SHA512 4618090f65332c64cb5601a7095c60c87a3a41e9c030d7422d36f14b04dcd80c7aa26438733b892f91daf19fadd44591a814b77c3ca04590ad6c61ecbe909a65 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/aug2021/MakeSpriteFont.exe" + FILENAME "makespritefont-aug2021.exe" + SHA512 a84786f57f7f26c4ab0cd446136d79c19a74296f5074396854c81ad67aedfccfe76e15025ba9bcfcabb993f0bb7247ca536d55b4574192efb3e7c2069abf70d7 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jun2021/XWBTool.exe" - FILENAME "xwbtool-jun2021.exe" - SHA512 dc74081b9569a9ca736984d8da1a5b2dc852f85d07a629d6e0ef7f2b4313987ec82d2ff1e0cfa19a89c7387182644869ac2a8f842d30609d88ccae7c01ce3f80 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/aug2021/XWBTool.exe" + FILENAME "xwbtool-aug2021.exe" + SHA512 3dd1ebd04db21517f74453727512783141b997d33efc1a47236c9ff343310da17b4add4c4ba6e138ad35095fb77f4207e7458a9e51ee3f4872fc0e0cf62be5b5 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -41,8 +41,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index b3d46b05447710..9a701bea536573 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,8 +1,8 @@ { "name": "directxtk12", - "version-string": "jun2021", + "version-string": "aug2021", "description": "A collection of helper classes for writing DirectX 12 code in C++.", - "homepage": "http://go.microsoft.com/fwlink/?LinkID=615561", + "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", "license": "MIT", "supports": "windows", diff --git a/versions/baseline.json b/versions/baseline.json index c443aaa5ce85c2..6e63125ec336f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1713,15 +1713,15 @@ "port-version": 2 }, "directxtex": { - "baseline": "jun2021", + "baseline": "aug2021", "port-version": 0 }, "directxtk": { - "baseline": "jun2021", + "baseline": "aug2021", "port-version": 0 }, "directxtk12": { - "baseline": "jun2021", + "baseline": "aug2021", "port-version": 0 }, "dirent": { diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 6e7bac2e2b4a2d..d90ed735e0bf4d 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa15773926896a6f0b1f9eb47a5aed34f65175e4", + "version-string": "aug2021", + "port-version": 0 + }, { "git-tree": "a98fe1cd0beed414488e36e18d5e2f5a54f2d6b6", "version-string": "jun2021", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 0872ba43f2ca23..2a80e73170b5a7 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7f8c6f80d18f82e3e5a6ab621f4e43d6a110b2b", + "version-string": "aug2021", + "port-version": 0 + }, { "git-tree": "d7cafe13a0edb883e2d15c917d5a042d4b599c1c", "version-string": "jun2021", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index d53b7318e26793..f043aff3a6df88 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49693bbdb6a484add7a33c52cb54059beca228b9", + "version-string": "aug2021", + "port-version": 0 + }, { "git-tree": "eba43932b7f93d4dedbd866542362f12933e3a74", "version-string": "jun2021", From 86ca2b2d29fbcb62bb9817c9ff1220af9eb5aa21 Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Sat, 28 Aug 2021 03:50:41 +0800 Subject: [PATCH 0358/1858] [srpc] add port of sogou/srpc (#16295) --- ports/srpc/portfile.cmake | 24 ++++++++++++++++++++++++ ports/srpc/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/srpc.json | 9 +++++++++ 4 files changed, 59 insertions(+) create mode 100644 ports/srpc/portfile.cmake create mode 100644 ports/srpc/vcpkg.json create mode 100644 versions/s-/srpc.json diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake new file mode 100644 index 00000000000000..5b5dbc81a8eb5d --- /dev/null +++ b/ports/srpc/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sogou/srpc + REF v0.9.3 + SHA512 e64cfec279f833ad24b1942ef2b572fc4bd3bfc5f9d623cd5d25b3c869d2ff9b35250cc814e8aaeb919ebed0929c44407eb9abb2e6793cfdc967708210f5f7e3 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/srpc) +vcpkg_copy_pdbs() +vcpkg_copy_tools( + TOOL_NAMES srpc_generator + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/srpc/vcpkg.json b/ports/srpc/vcpkg.json new file mode 100644 index 00000000000000..3b95d8da00f2f8 --- /dev/null +++ b/ports/srpc/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "srpc", + "version-semver": "0.9.3", + "description": "RPC based on Sogou C++ Workflow", + "homepage": "https://github.com/sogou/srpc", + "dependencies": [ + "lz4", + "openssl", + "protobuf", + "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "workflow", + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6e63125ec336f0..7cb6be8cd7c279 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6116,6 +6116,10 @@ "baseline": "0.6.4", "port-version": 0 }, + "srpc": { + "baseline": "0.9.3", + "port-version": 0 + }, "starlink-ast": { "baseline": "9.2.4", "port-version": 1 diff --git a/versions/s-/srpc.json b/versions/s-/srpc.json new file mode 100644 index 00000000000000..01f29288d85606 --- /dev/null +++ b/versions/s-/srpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7f8e905bb42ba10b9076c4fca512933f4e3171e5", + "version-semver": "0.9.3", + "port-version": 0 + } + ] +} From 2887340e0d3ae868ed2e2a34e970e2fd58c366dd Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Sat, 28 Aug 2021 06:20:15 +0900 Subject: [PATCH 0359/1858] [onnx] create a new port (#18073) --- ports/onnx/fix-cmakelists.patch | 68 +++++++++++++++++++ ports/onnx/portfile.cmake | 98 +++++++++++++++++++++++++++ ports/onnx/vcpkg.json | 34 ++++++++++ ports/onnx/wrap-onnxifi-targets.patch | 44 ++++++++++++ versions/baseline.json | 4 ++ versions/o-/onnx.json | 9 +++ 6 files changed, 257 insertions(+) create mode 100644 ports/onnx/fix-cmakelists.patch create mode 100644 ports/onnx/portfile.cmake create mode 100644 ports/onnx/vcpkg.json create mode 100644 ports/onnx/wrap-onnxifi-targets.patch create mode 100644 versions/o-/onnx.json diff --git a/ports/onnx/fix-cmakelists.patch b/ports/onnx/fix-cmakelists.patch new file mode 100644 index 00000000000000..e6c68370b27992 --- /dev/null +++ b/ports/onnx/fix-cmakelists.patch @@ -0,0 +1,68 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 628dcaa..300e4ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -111,8 +111,8 @@ endif() + # find_package Python has replaced PythonInterp and PythonLibs since cmake 3.12 + # Use the following command in the future; now this is only compatible with the latest pybind11 + # find_package(Python ${PY_VERSION} COMPONENTS Interpreter Development REQUIRED) +-find_package(PythonInterp ${PY_VERSION} REQUIRED) +-find_package(PythonLibs ${PY_VERSION}) ++find_package(Python3 ${PY_VERSION} COMPONENTS Interpreter REQUIRED) ++set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) + + if(CMAKE_SYSTEM_NAME STREQUAL "AIX") + set(CMAKE_NO_SYSTEM_FROM_IMPORTED 1) +@@ -422,6 +422,7 @@ target_link_libraries(onnx PUBLIC onnx_proto) + add_onnx_global_defines(onnx) + + if(BUILD_ONNX_PYTHON) ++ find_package(Python3 ${PY_VERSION} COMPONENTS Development REQUIRED) + if("${PY_EXT_SUFFIX}" STREQUAL "") + if(MSVC) + set(PY_EXT_SUFFIX ".pyd") +@@ -441,10 +442,13 @@ if(BUILD_ONNX_PYTHON) + $ + $ + $ +- ${PYTHON_INCLUDE_DIR}) +- ++ ${Python3_INCLUDE_DIRS}) ++ target_link_directories(onnx_cpp2py_export PRIVATE ++ ${Python3_LIBRARY_DIRS}) ++ target_link_libraries(onnx_cpp2py_export PRIVATE ++ ${Python3_LIBRARIES}) + # pybind11 is a header only lib +- find_package(pybind11 2.2) ++ find_package(pybind11 2.2 CONFIG REQUIRED) + if(pybind11_FOUND) + target_include_directories(onnx_cpp2py_export PUBLIC + ${pybind11_INCLUDE_DIRS}) +@@ -687,6 +691,27 @@ endif() + + include(GNUInstallDirs) + ++# install protobuf files ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-data.proto ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-data.proto3 ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-ml.proto ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-ml.proto3 ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-operators-ml.proto ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx-operators-ml.proto3 ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnx ++) ++# install python files ++if(BUILD_ONNX_PYTHON) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_data_pb.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_data_pb2.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_ml_pb2.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_operators_ml_pb2.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_operators_pb.py ++ ${CMAKE_CURRENT_BINARY_DIR}/onnx/onnx_pb.py ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/onnx ++ ) ++endif() ++ + install(DIRECTORY ${ONNX_ROOT}/onnx + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake new file mode 100644 index 00000000000000..1c565ab0d5f302 --- /dev/null +++ b/ports/onnx/portfile.cmake @@ -0,0 +1,98 @@ +# uwp: LOAD_LIBRARY_SEARCH_DEFAULT_DIRS undefined identifier +vcpkg_fail_port_install(ON_TARGET "uwp") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO onnx/onnx + REF v1.9.0 + SHA512 a3eecc74ce4f22524603fb86367d21c87a143ba27eef93ef4bd2e2868c2cadeb724b84df58a429286e7824adebdeba7fa059095b7ab29df8dcea8777bd7f4101 + PATCHES + fix-cmakelists.patch + wrap-onnxifi-targets.patch +) + +if(VCPKG_TARGET_IS_WINDOWS) + string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) + list(APPEND PLATFORM_OPTIONS + -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME} + ) +endif() + +# ONNX_USE_PROTOBUF_SHARED_LIBS: find the library and check its file extension +find_library(PROTOBUF_LIBPATH NAMES protobuf PATHS ${CURRENT_INSTALLED_DIR}/bin ${CURRENT_INSTALLED_DIR}/lib REQUIRED) +get_filename_component(PROTOBUF_LIBNAME ${PROTOBUF_LIBPATH} NAME) +if(PROTOBUF_LIBNAME MATCHES ${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(USE_PROTOBUF_SHARED ON) +else() + set(USE_PROTOBUF_SHARED OFF) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pybind11 BUILD_ONNX_PYTHON +) + +# Like protoc, python is required for codegen. +vcpkg_find_acquire_program(PYTHON3) + +# PATH for .bat scripts can find 'python' +get_filename_component(PYTHON_DIR ${PYTHON3} PATH) +vcpkg_add_to_path(PREPEND ${PYTHON_DIR}) + +if("pybind11" IN_LIST FEATURES) + # When BUILD_ONNX_PYTHON, we need Development component. Give a hint for FindPython3 + list(APPEND FEATURE_OPTIONS + -DPython3_ROOT_DIR=${CURRENT_INSTALLED_DIR} + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} ${PLATFORM_OPTIONS} + -DPython3_EXECUTABLE=${PYTHON3} + -DONNX_ML=ON + -DONNX_GEN_PB_TYPE_STUBS=ON + -DONNX_USE_PROTOBUF_SHARED_LIBS=${USE_PROTOBUF_SHARED} + -DONNX_USE_LITE_PROTO=OFF + -DONNXIFI_ENABLE_EXT=OFF + -DONNX_BUILD_TESTS=OFF + -DONNX_BUILD_BENCHMARKS=OFF +) + +if("pybind11" IN_LIST FEATURES) + # This target is not in install/export + vcpkg_cmake_build(TARGET onnx_cpp2py_export) +endif() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ONNX) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + # the others are empty + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_ml" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_data" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_operators_ml" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_cpp2py_export" + "${CURRENT_PACKAGES_DIR}/include/onnx/backend" + "${CURRENT_PACKAGES_DIR}/include/onnx/tools" + "${CURRENT_PACKAGES_DIR}/include/onnx/test" + "${CURRENT_PACKAGES_DIR}/include/onnx/bin" + "${CURRENT_PACKAGES_DIR}/include/onnx/examples" + "${CURRENT_PACKAGES_DIR}/include/onnx/frontend" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/math" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/object_detection" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/quantization" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/training" +) diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json new file mode 100644 index 00000000000000..6f9ee73238067e --- /dev/null +++ b/ports/onnx/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "onnx", + "version-semver": "1.9.0", + "description": "Open standard for machine learning interoperability", + "homepage": "https://onnx.ai", + "supports": "!uwp", + "dependencies": [ + "protobuf", + { + "name": "protobuf", + "host": true + }, + { + "name": "python3", + "host": true + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "pybind11": { + "description": "Build Python binaries", + "dependencies": [ + "pybind11" + ] + } + } +} diff --git a/ports/onnx/wrap-onnxifi-targets.patch b/ports/onnx/wrap-onnxifi-targets.patch new file mode 100644 index 00000000000000..598edf6030b079 --- /dev/null +++ b/ports/onnx/wrap-onnxifi-targets.patch @@ -0,0 +1,44 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 300e4ea..155dd0d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -614,6 +614,7 @@ if(APPLE) + set_target_properties(onnx PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") + endif() + ++if(ONNXIFI_ENABLE_EXT) + # ---[ ONNX Interface for Framework Integratin (ONNXIFI) + add_library(onnxifi INTERFACE) + target_include_directories(onnxifi INTERFACE +@@ -688,6 +689,7 @@ if(MSVC) + # lists from 'identifier2' + ) + endif() ++endif() # ONNXIFI_ENABLE_EXT + + include(GNUInstallDirs) + +@@ -737,8 +739,14 @@ install(FILES + install(EXPORT ONNXTargets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ONNX") + install(TARGETS + onnx onnx_proto +- onnxifi onnxifi_dummy onnxifi_loader + EXPORT ONNXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++if(ONNXIFI_ENABLE_EXT) ++ install(TARGETS ++ onnxifi onnxifi_dummy onnxifi_loader ++ EXPORT ONNXTargets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + if(NOT ANDROID AND NOT IOS) + install(TARGETS onnxifi_wrapper +@@ -748,6 +756,7 @@ endif() + if(ONNXIFI_DUMMY_BACKEND) + add_definitions(-DONNXIFI_DUMMY_BACKEND=1) + endif() ++endif() # ONNXIFI_ENABLE_EXT + + if(ONNX_BUILD_TESTS) + include(${ONNX_ROOT}/cmake/unittest.cmake) diff --git a/versions/baseline.json b/versions/baseline.json index 7cb6be8cd7c279..9358be0b642304 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4580,6 +4580,10 @@ "baseline": "6.9.4", "port-version": 0 }, + "onnx": { + "baseline": "1.9.0", + "port-version": 0 + }, "onnxruntime-gpu": { "baseline": "1.5.1", "port-version": 0 diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json new file mode 100644 index 00000000000000..5f4fc6e16a5846 --- /dev/null +++ b/versions/o-/onnx.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b53c9c9e969928def925c57ea5ddcdfb09293693", + "version-semver": "1.9.0", + "port-version": 0 + } + ] +} From 8e04b6b00572225d5fded654e768476c3b521592 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 27 Aug 2021 23:24:56 +0200 Subject: [PATCH 0360/1858] [gettext] Add "autopoint" tool to gettext[core] (#17317) --- ports/gettext/install-autopoint.cmake | 49 +++++++++++++++++++++++++++ ports/gettext/portfile.cmake | 25 +++++++------- ports/gettext/vcpkg.json | 4 +-- versions/baseline.json | 2 +- versions/g-/gettext.json | 5 +++ 5 files changed, 70 insertions(+), 15 deletions(-) create mode 100644 ports/gettext/install-autopoint.cmake diff --git a/ports/gettext/install-autopoint.cmake b/ports/gettext/install-autopoint.cmake new file mode 100644 index 00000000000000..45f806b4a7b712 --- /dev/null +++ b/ports/gettext/install-autopoint.cmake @@ -0,0 +1,49 @@ +function(install_autopoint) + # variables for configuring autopoint.in + set(PACKAGE "gettext-tools") + set(VERSION "${GETTEXT_VERSION}") + set(ARCHIVE_VERSION "${GETTEXT_VERSION}") + set(ARCHIVE_FORMAT "dirgz") + set(bindir [[${prefix}/tools/gettext/bin]]) + set(datadir [[${datarootdir}]]) + set(exec_prefix [[${prefix}]]) + set(PATH_SEPARATOR ":") + set(RELOCATABLE "yes") + + file(STRINGS "${SOURCE_PATH}/gettext-tools/configure" + VERSIONS_FROM_CONFIGURE + REGEX "^ *(ARCHIVE_VERSION|VERSION)=.*$" + ) + foreach(LINE IN LISTS VERSIONS_FROM_CONFIGURE) + if(LINE MATCHES "^ *(ARCHIVE_VERSION|VERSION)='?([0-9.]+)'?$") + set(${CMAKE_MATCH_1} "${CMAKE_MATCH_2}") + endif() + endforeach() + + set(WORKING_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") + file(MAKE_DIRECTORY "${WORKING_DIR}") + + # autopoint script + configure_file("${SOURCE_PATH}/gettext-tools/misc/autopoint.in" "${WORKING_DIR}/autopoint" @ONLY) + + # data tarball + if(WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES gzip) + vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + endif() + file(COPY "${SOURCE_PATH}/gettext-tools/misc/archive.dir.tar" DESTINATION "${WORKING_DIR}") + vcpkg_execute_required_process( + COMMAND gzip -f archive.dir.tar + WORKING_DIRECTORY "${WORKING_DIR}" + LOGNAME gzip-${TARGET_TRIPLET} + ) + + # installation + file(INSTALL "${WORKING_DIR}/autopoint" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + FILE_PERMISSIONS + OWNER_WRITE OWNER_READ OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + file(INSTALL "${WORKING_DIR}/archive.dir.tar.gz" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext/gettext") +endfunction() diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 8bfceae8f1a484..b4f7f845fd3126 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -1,13 +1,7 @@ -if(VCPKG_TARGET_IS_LINUX) - if (NOT EXISTS "/usr/include/libintl.h") - message(FATAL_ERROR "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " - "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." - ) - endif() - if(NOT "tools" IN_LIST FEATURES) - set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - return() - endif() +if(VCPKG_TARGET_IS_LINUX AND NOT EXISTS "/usr/include/libintl.h") + message(FATAL_ERROR "When targeting Linux, `libintl.h` is expected to come from the C Runtime Library (glibc). " + "Please use \"sudo apt-get install libc-dev\" or the equivalent to install development files." + ) endif() set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled) @@ -134,8 +128,15 @@ if("tools" IN_LIST FEATURES) file(RENAME "${CURRENT_PACKAGES_DIR}.release" "${CURRENT_PACKAGES_DIR}") endif() else() - list(APPEND OPTIONS "--config-cache") - build_libintl_only() + if(VCPKG_TARGET_IS_LINUX) + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + else() + list(APPEND OPTIONS "--config-cache") + build_libintl_only() + endif() + # A fast installation of the autopoint tool and data, needed for autotools + include("${CMAKE_CURRENT_LIST_DIR}/install-autopoint.cmake") + install_autopoint() endif() # Handle copyright diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index 7b166e22f2df24..dc1cefc4eabcc1 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,8 +1,8 @@ { "name": "gettext", "version": "0.21", - "port-version": 4, - "description": "The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.", + "port-version": 5, + "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ "libiconv" diff --git a/versions/baseline.json b/versions/baseline.json index 9358be0b642304..e372c7d6ff668c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2286,7 +2286,7 @@ }, "gettext": { "baseline": "0.21", - "port-version": 4 + "port-version": 5 }, "gettimeofday": { "baseline": "2017-10-14-3", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index d64ca34ee522dd..afcf5f51359e0a 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1089dfcf335a94ca47c5b918c56a7ab6fc0ae92", + "version": "0.21", + "port-version": 5 + }, { "git-tree": "b6cde01ab4095a258993eaf85eb31c1e845c64a6", "version": "0.21", From e6dd0312828ba678d60aeb355bee3125f800b995 Mon Sep 17 00:00:00 2001 From: bucurb Date: Sat, 28 Aug 2021 00:43:13 +0100 Subject: [PATCH 0361/1858] [glog] Fixed gflags dependency (#18739) --- ports/gflags/CONTROL | 3 ++- ports/gflags/portfile.cmake | 5 ++++- ports/gflags/usage | 4 ++++ ports/gflags/vcpkg-cmake-wrapper.cmake | 9 +++++++++ versions/baseline.json | 4 ++-- versions/g-/gflags.json | 5 +++++ 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 ports/gflags/usage create mode 100644 ports/gflags/vcpkg-cmake-wrapper.cmake diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL index f2b9307789644a..fec8eeb0ff7662 100644 --- a/ports/gflags/CONTROL +++ b/ports/gflags/CONTROL @@ -1,5 +1,6 @@ Source: gflags -Version: 2.2.2-1 +Version: 2.2.2 +Port-Version: 2 Homepage: https://github.com/gflags/gflags Description: A C++ library that implements commandline flags processing Supports: !uwp \ No newline at end of file diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index 82f651351f8a37..e0d9e1dab01d2d 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_configure_cmake( -DGFLAGS_REGISTER_BUILD_DIR:BOOL=OFF -DGFLAGS_REGISTER_INSTALL_PREFIX:BOOL=OFF -DBUILD_gflags_nothreads_LIB:BOOL=OFF + -DGFLAGS_USE_TARGET_NAMESPACE:BOOL=ON -DCMAKE_DEBUG_POSTFIX=d ) @@ -33,6 +34,8 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gflags RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/gflags/usage b/ports/gflags/usage new file mode 100644 index 00000000000000..67fb74789b6786 --- /dev/null +++ b/ports/gflags/usage @@ -0,0 +1,4 @@ +The package gflags provides CMake targets: + + find_package(gflags CONFIG REQUIRED) + target_link_libraries(main PRIVATE gflags::gflags) diff --git a/ports/gflags/vcpkg-cmake-wrapper.cmake b/ports/gflags/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..f401356da39bfb --- /dev/null +++ b/ports/gflags/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,9 @@ +set(GFLAGS_USE_TARGET_NAMESPACE ON) + +_find_package(${ARGS}) + +foreach(tgt gflags gflags_shared gflags_static) + if (NOT TARGET ${tgt} AND TARGET "gflags::${tgt}") + add_library(${tgt} ALIAS "gflags::${tgt}") + endif() +endforeach(tgt) diff --git a/versions/baseline.json b/versions/baseline.json index e372c7d6ff668c..50aab092ca0644 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2293,8 +2293,8 @@ "port-version": 0 }, "gflags": { - "baseline": "2.2.2-1", - "port-version": 0 + "baseline": "2.2.2", + "port-version": 2 }, "ghc-filesystem": { "baseline": "1.5.4", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 93fbb9bf9d0e18..aa9065db094e7d 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e2bb870b1e3592591d62f396378e25b2678d80c", + "version-string": "2.2.2", + "port-version": 2 + }, { "git-tree": "7dd635d5295af145f4601ba13219aa0d84630f27", "version-string": "2.2.2-1", From 5ea6c17c56a58335de9f71fa7759503adaee0a71 Mon Sep 17 00:00:00 2001 From: Luca Schlecker Date: Sat, 28 Aug 2021 01:55:40 +0200 Subject: [PATCH 0362/1858] [crow] fix sha-512 sum (#19637) Signed-off-by: Luca Schlecker --- ports/crow/portfile.cmake | 7 ++++--- ports/crow/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/crow.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index dd8f45f36e5d20..ea9d0f80b71994 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -2,9 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow REF 7e47d4c7ee548c5fd954efd82cfeed330a7823ea #0.3+2 - SHA512 804bafe6085270470487ea304f9b1aa812f9ee29df67569fd7133ea70bc73b61dca23d6955c1fd9cf1fa7c8909d34b447437ff05844ac2ad5bb01318357dc2c0 + SHA512 47822ccdfb259a65bde8fed0c29bb8e58bc2f29896ff186c03098eb897985307e7477aa03808a42db01df245054411f05f95c6d9ae6477d75dd94399af3bb130 + FILE_DISAMBIGUATOR 1 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index 0cf1b42f14a03c..0e75a7943ecf29 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "crow", "version": "0.3.2", + "port-version": 1, "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow" } diff --git a/versions/baseline.json b/versions/baseline.json index 50aab092ca0644..69c5da02e6854d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1538,7 +1538,7 @@ }, "crow": { "baseline": "0.3.2", - "port-version": 0 + "port-version": 1 }, "cryptopp": { "baseline": "8.5.0", diff --git a/versions/c-/crow.json b/versions/c-/crow.json index 6bc84a2131d12c..1a27e804d6998e 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2719e110ecca722270c61d66f274dee1a1eb1e4", + "version": "0.3.2", + "port-version": 1 + }, { "git-tree": "c0d5207375bcbf798d3478eef7e00ae5206e4b04", "version": "0.3.2", From d61333437e46c7a8002070e785e52fb3d438d073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 28 Aug 2021 08:02:02 +0800 Subject: [PATCH 0363/1858] [vcpkg baseline][lapack-reference] Fix copy openblas's pkgconfig file (#19628) * [lapack-reference] Fix copy openblas's pkgconfig file * version * Use vcpkg-cmake and vcpkg-cmake-config instead * version stuff * Restore the changes about vcpkg-cmake-configure / vcpkg-cmake-install * update version keyword * version --- ports/lapack-reference/CONTROL | 17 ----------- ports/lapack-reference/portfile.cmake | 20 ++++++------ ports/lapack-reference/vcpkg.json | 44 +++++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/l-/lapack-reference.json | 5 +++ 5 files changed, 61 insertions(+), 27 deletions(-) delete mode 100644 ports/lapack-reference/CONTROL create mode 100644 ports/lapack-reference/vcpkg.json diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL deleted file mode 100644 index 3e18ebd2b3db1c..00000000000000 --- a/ports/lapack-reference/CONTROL +++ /dev/null @@ -1,17 +0,0 @@ -Source: lapack-reference -Version: 3.8.0 -Port-Version: 5 -Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/ -Default-Features: blas-select -Build-Depends: vcpkg-gfortran (windows) - -Feature: cblas -Description: Builds CBLAS - -Feature: noblas -Build-Depends: blas -Description: Use external optimized BLAS - -Feature: blas-select -Build-Depends: lapack-reference[core, noblas](!windows|!static) -Description: Use external optimized BLAS diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake index 70e6059fff383b..4fb353fdd5343e 100644 --- a/ports/lapack-reference/portfile.cmake +++ b/ports/lapack-reference/portfile.cmake @@ -60,17 +60,19 @@ if(VCPKG_USE_INTERNAL_Fortran) else() set(USE_OPTIMIZED_BLAS ON) endif() + vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" - "-DCBLAS=${CBLAS}" - ${FORTRAN_CMAKE} - ) + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}" + "-DCBLAS=${CBLAS}" + ${FORTRAN_CMAKE} +) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? + +vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference? set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc") if(EXISTS "${pcfile}") @@ -84,7 +86,7 @@ if(EXISTS "${pcfile}") set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}") file(WRITE "${pcfile}" "${_contents}") endif() -if(NOT USE_OPTIMIZED_BLAS) +if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")) set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc") if(EXISTS "${pcfile}") file(READ "${pcfile}" _contents) diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json new file mode 100644 index 00000000000000..c3f20e0323cf89 --- /dev/null +++ b/ports/lapack-reference/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "lapack-reference", + "version-semver": "3.8.0", + "port-version": 6, + "description": "LAPACK — Linear Algebra PACKage", + "homepage": "http://www.netlib.org/lapack/", + "dependencies": [ + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "vcpkg-gfortran", + "platform": "windows" + } + ], + "default-features": [ + "blas-select" + ], + "features": { + "blas-select": { + "description": "Use external optimized BLAS", + "dependencies": [ + { + "name": "lapack-reference", + "default-features": false, + "features": [ + "noblas" + ], + "platform": "!windows | !static" + } + ] + }, + "cblas": { + "description": "Builds CBLAS" + }, + "noblas": { + "description": "Use external optimized BLAS", + "dependencies": [ + "blas" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 69c5da02e6854d..b201245f7fe93e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3018,7 +3018,7 @@ }, "lapack-reference": { "baseline": "3.8.0", - "port-version": 5 + "port-version": 6 }, "lastools": { "baseline": "2020-05-09", diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json index 96db87c743a626..99d6f8a7cf3d92 100644 --- a/versions/l-/lapack-reference.json +++ b/versions/l-/lapack-reference.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7", + "version-semver": "3.8.0", + "port-version": 6 + }, { "git-tree": "1887fc1fcb0c96df1ea24fffc9b045330426e3b6", "version-string": "3.8.0", From 2312ff2c1952a6f9195340868ce9c57f7dc5e0c9 Mon Sep 17 00:00:00 2001 From: Anichitei Ionel-Cristinel <49393881+ianichitei@users.noreply.github.com> Date: Sat, 28 Aug 2021 03:03:20 +0300 Subject: [PATCH 0364/1858] [bddisasm] Update to 1.34.2 (#19761) --- ports/bddisasm/portfile.cmake | 4 ++-- ports/bddisasm/vcpkg.json | 2 +- versions/b-/bddisasm.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 8ce6176b6cb91e..78cb08023b8a24 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bitdefender/bddisasm - REF v1.33.0 - SHA512 d9085187026c1c362a53fcd9de1aa8872fc93d2cf6492a6f9b081396b28a8098121c62fd7aed5b1e07f0a42fbc74e781f0bc5f041363cd19ee25ac1c30ee0554 + REF v1.34.2 + SHA512 4ddcae67721f6f1c5f0073aca3996325d4fbb148365a63b03e295fc2b00b1f4c73439a1fe6aab60ab9778e182b7acf2807df7c40079a1ca7916fbb5393245717 HEAD_REF master ) diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index a4979a22e85564..c48346811fe744 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bddisasm", - "version": "1.33.0", + "version": "1.34.2", "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index 53f84baadc8f6b..5707d0c4bf6bad 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6ba1aba5922829f7eb5d8197dbffe5aa8f9722b", + "version": "1.34.2", + "port-version": 0 + }, { "git-tree": "bbd28192161e817afeb6526098f105788225816f", "version": "1.33.0", diff --git a/versions/baseline.json b/versions/baseline.json index b201245f7fe93e..fd7c59b10f71de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -345,7 +345,7 @@ "port-version": 0 }, "bddisasm": { - "baseline": "1.33.0", + "baseline": "1.34.2", "port-version": 0 }, "bde": { From 236f201e2d55e79b52039d8b6beba5bcd9856abb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sat, 28 Aug 2021 02:05:04 +0200 Subject: [PATCH 0365/1858] [llvm] update to 12.0.1 (#19741) --- ports/llvm/portfile.cmake | 4 ++-- ports/llvm/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/llvm.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake index 37c1c5f1900893..1b2dcf6939360f 100644 --- a/ports/llvm/portfile.cmake +++ b/ports/llvm/portfile.cmake @@ -1,4 +1,4 @@ -set(LLVM_VERSION "12.0.0") +set(LLVM_VERSION "12.0.1") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO llvm/llvm-project REF llvmorg-${LLVM_VERSION} - SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26 + SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 HEAD_REF master PATCHES 0002-fix-install-paths.patch # This patch fixes paths in ClangConfig.cmake, LLVMConfig.cmake, LLDConfig.cmake etc. diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json index 2c5061af650f8c..afa41a8abe7ebd 100644 --- a/ports/llvm/vcpkg.json +++ b/ports/llvm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llvm", - "version-string": "12.0.0", - "port-version": 1, + "version-string": "12.0.1", "description": "The LLVM Compiler Infrastructure.", "homepage": "https://llvm.org", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index fd7c59b10f71de..2aaa893b232170 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3861,8 +3861,8 @@ "port-version": 1 }, "llvm": { - "baseline": "12.0.0", - "port-version": 1 + "baseline": "12.0.1", + "port-version": 0 }, "lmdb": { "baseline": "0.9.24", diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json index 7cb28d85e2051c..6874e9e106f292 100644 --- a/versions/l-/llvm.json +++ b/versions/l-/llvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3726ade4edd3bd8e47f0cddbfac1e67803e7adea", + "version-string": "12.0.1", + "port-version": 0 + }, { "git-tree": "3d801bd12386ff6ab31ec0a27c3f45e23242a470", "version-string": "12.0.0", From a175e332a8d72d4a5cfca4bce764d4994e55e47c Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Sat, 28 Aug 2021 00:06:39 +0000 Subject: [PATCH 0366/1858] [pango] Fix libthai splelling (microsoft#19758) (#19760) --- ports/pango/portfile.cmake | 2 +- ports/pango/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/pango.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/pango/portfile.cmake b/ports/pango/portfile.cmake index ffbefb02f1e257..db31f6f15e8a6c 100644 --- a/ports/pango/portfile.cmake +++ b/ports/pango/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_configure_meson( -Dintrospection=disabled # Build the GObject introspection data for Pango -Dfontconfig=enabled # Build with FontConfig support. -Dsysprof=disabled # include tracing support for sysprof - -Dlibtahi=disabled # Build with libthai support + -Dlibthai=disabled # Build with libthai support -Dcairo=enabled # Build with cairo support -Dxft=disabled # Build with xft support -Dfreetype=enabled # Build with freetype support diff --git a/ports/pango/vcpkg.json b/ports/pango/vcpkg.json index 5b4858add0db14..f0741023681754 100644 --- a/ports/pango/vcpkg.json +++ b/ports/pango/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pango", "version": "1.48.4", + "port-version": 1, "description": "Text and font handling library.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pango/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2aaa893b232170..2028c11594360a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4822,7 +4822,7 @@ }, "pango": { "baseline": "1.48.4", - "port-version": 0 + "port-version": 1 }, "pangolin": { "baseline": "0.5", diff --git a/versions/p-/pango.json b/versions/p-/pango.json index cac5e657e0def3..0f14a351ccfc9f 100644 --- a/versions/p-/pango.json +++ b/versions/p-/pango.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a130f1c74d2e337d2f9405fbb57f3b1fe46f173a", + "version": "1.48.4", + "port-version": 1 + }, { "git-tree": "271c6de990817cce14e8299ac3add736bdce57f5", "version": "1.48.4", From a3b1dfd361f1e2d64b1585cd00ae7243b32be207 Mon Sep 17 00:00:00 2001 From: Llewellyn Falco Date: Mon, 30 Aug 2021 12:32:03 +0000 Subject: [PATCH 0367/1858] [approval-tests-cpp] Update to 10.10.0 (#19621) * [approval-tests-cpp] Update to 10.10.0 * add version files --- ports/approval-tests-cpp/portfile.cmake | 10 +++++----- ports/approval-tests-cpp/vcpkg.json | 2 +- versions/a-/approval-tests-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/approval-tests-cpp/portfile.cmake b/ports/approval-tests-cpp/portfile.cmake index 25db40e57a3b00..f5c60a96ecfdc4 100644 --- a/ports/approval-tests-cpp/portfile.cmake +++ b/ports/approval-tests-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_download_distfile(single_header - URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.9.1/ApprovalTests.v.10.9.1.hpp - FILENAME ApprovalTests.v.10.9.1.hpp - SHA512 520901982b8d217ce18f8729ca13e3d4c52ac87aa6a2f40089a49e7b85a4c3910ae3ca3a9fff1520c516dc726fad2ce70f122b8f061e606459af4e57de5fa2d6 + URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.10.0/ApprovalTests.v.10.10.0.hpp + FILENAME ApprovalTests.v.10.10.0.hpp + SHA512 909302175fcaa23aea9839a8276a1c20b654e8544600bfb05d6bb76bc6a635f51ef6efe437ac07e01391724b2dc0e31cbf16bcb688fbec1ef3e378b027a6eb64 ) vcpkg_download_distfile(license_file - URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.9.1/LICENSE - FILENAME ApprovalTestsLicense.v.10.9.1 + URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.10.0/LICENSE + FILENAME ApprovalTestsLicense.v.10.10.0 SHA512 dc6b68d13b8cf959644b935f1192b02c71aa7a5cf653bd43b4480fa89eec8d4d3f16a2278ec8c3b40ab1fdb233b3173a78fd83590d6f739e0c9e8ff56c282557 ) diff --git a/ports/approval-tests-cpp/vcpkg.json b/ports/approval-tests-cpp/vcpkg.json index 0386dc767347e7..f4e2d3e40641af 100644 --- a/ports/approval-tests-cpp/vcpkg.json +++ b/ports/approval-tests-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "approval-tests-cpp", - "version": "10.9.1", + "version": "10.10.0", "description": "Approval Tests allow you to verify a chunk of output (such as a file) in one operation as opposed to writing test assertions for each element.", "homepage": "https://github.com/approvals/ApprovalTests.cpp" } diff --git a/versions/a-/approval-tests-cpp.json b/versions/a-/approval-tests-cpp.json index 08e8611203a4a3..bcda7b3fb2eb94 100644 --- a/versions/a-/approval-tests-cpp.json +++ b/versions/a-/approval-tests-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1134cf4c5199fef643ff13362b568948df8cc55", + "version": "10.10.0", + "port-version": 0 + }, { "git-tree": "757640a4ad0e49a5fd4d77e9ce8adb9b1464cf25", "version": "10.9.1", diff --git a/versions/baseline.json b/versions/baseline.json index 2028c11594360a..8c910d0064440c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -101,7 +101,7 @@ "port-version": 0 }, "approval-tests-cpp": { - "baseline": "10.9.1", + "baseline": "10.10.0", "port-version": 0 }, "apr": { From cae48a74c2674dca0379ca4cde2c0e0c615d097b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:50:49 +0200 Subject: [PATCH 0368/1858] bootstrap.sh: fails if there is no entry for a tool os combination (#19640) --- scripts/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 1a3253ec9e2818..a20fcb39214419 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -165,8 +165,8 @@ fetchTool() xmlFileAsString=`cat "$vcpkgRootDir/scripts/vcpkgTools.xml"` toolRegexStart="" toolData="$(extractStringBetweenDelimiters "$xmlFileAsString" "$toolRegexStart" "")" - if [ "$toolData" = "" ]; then - echo "Unknown tool: $tool" + if [ "$toolData" = "" ] || [[ "$toolData" == " Date: Tue, 31 Aug 2021 01:51:19 +0900 Subject: [PATCH 0369/1858] [libunifex] create a new port (#19279) * [libunifex] create a new port * [libunifex] update version/baseline * [libunifex] fix wrong support expression * update version SHA * [libunifex] more warning comments * [libunifex] use `unofficial::` namespace * [libunifex] allow warnings in build * simplify the patch file * Update ports/libunifex/vcpkg.json Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [libunifex] update patch files * [libunifex] replace INCLUDEDIR to include Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- ports/libunifex/allow-warnings.patch | 15 +++++++++++ ports/libunifex/fix-install.patch | 33 +++++++++++++++++++++++ ports/libunifex/portfile.cmake | 40 ++++++++++++++++++++++++++++ ports/libunifex/vcpkg.json | 29 ++++++++++++++++++++ versions/baseline.json | 4 +++ versions/l-/libunifex.json | 9 +++++++ 6 files changed, 130 insertions(+) create mode 100644 ports/libunifex/allow-warnings.patch create mode 100644 ports/libunifex/fix-install.patch create mode 100644 ports/libunifex/portfile.cmake create mode 100644 ports/libunifex/vcpkg.json create mode 100644 versions/l-/libunifex.json diff --git a/ports/libunifex/allow-warnings.patch b/ports/libunifex/allow-warnings.patch new file mode 100644 index 00000000000000..272624f0667c16 --- /dev/null +++ b/ports/libunifex/allow-warnings.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake +index cb99ae4..9825532 100644 +--- a/cmake/unifex_env.cmake ++++ b/cmake/unifex_env.cmake +@@ -21,8 +21,8 @@ endif() + + if (MSVC) + # warning level 3 and all warnings as errors +- add_compile_options(/W3 /WX) ++ add_compile_options(/W3) + else() + # lots of warnings and all warnings as errors +- add_compile_options(-Wall -Wextra -pedantic -Werror) ++ add_compile_options(-Wall -Wextra -pedantic) + endif() diff --git a/ports/libunifex/fix-install.patch b/ports/libunifex/fix-install.patch new file mode 100644 index 00000000000000..2b454c49c19a6c --- /dev/null +++ b/ports/libunifex/fix-install.patch @@ -0,0 +1,33 @@ +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +index 3f25517..3c34a54 100644 +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -67,10 +67,27 @@ configure_file( + target_include_directories(unifex + PUBLIC + $ +- "${PROJECT_BINARY_DIR}/include") ++ $ ++ $) + + target_compile_features(unifex PUBLIC cxx_std_17) + + if(CXX_COROUTINES_HAVE_COROUTINES) + target_link_libraries(unifex PUBLIC std::coroutines) + endif() ++ ++install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/unifex ++ DESTINATION include ++) ++install(FILES ${PROJECT_BINARY_DIR}/include/unifex/config.hpp ++ DESTINATION include/unifex ++) ++ ++install(TARGETS unifex ++ EXPORT unifex-config ++ DESTINATION lib ++) ++install(EXPORT unifex-config ++ NAMESPACE unofficial:: ++ DESTINATION lib/cmake/unifex ++) diff --git a/ports/libunifex/portfile.cmake b/ports/libunifex/portfile.cmake new file mode 100644 index 00000000000000..f7379fc20c4d18 --- /dev/null +++ b/ports/libunifex/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO facebookexperimental/libunifex + REF e36b43834329acc75f99910316d3ecec15c0f665 + SHA512 58f738b49d18982fd3916500c78e8090a266738ec4a8ba416b004fa2c7db718db5ce0e27f5e4e22eaddcc27c8d1618bcb2bc080eee1a31d98543e2595ccc1135 + HEAD_REF master + PATCHES + fix-install.patch + allow-warnings.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTING + test UNIFEX_BUILD_EXAMPLES +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unifex CONFIG_PATH lib/cmake/unifex) +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/unifex/config.hpp.in" +) +if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/unifex/linux") +elseif(VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/unifex/win32") +endif() diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json new file mode 100644 index 00000000000000..c42782e1c0bff9 --- /dev/null +++ b/ports/libunifex/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libunifex", + "version-date": "2021-08-01", + "description": "Unified Executors", + "homepage": "https://github.com/facebookexperimental/libunifex", + "supports": "!osx", + "dependencies": [ + { + "name": "liburing", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "test": { + "description": "Build test/example programs", + "dependencies": [ + "gtest" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 8c910d0064440c..9a0efc8c4d5c6a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3724,6 +3724,10 @@ "baseline": "4.3-0", "port-version": 0 }, + "libunifex": { + "baseline": "2021-08-01", + "port-version": 0 + }, "libunistring": { "baseline": "0.9.10", "port-version": 1 diff --git a/versions/l-/libunifex.json b/versions/l-/libunifex.json new file mode 100644 index 00000000000000..621c7b834c04e6 --- /dev/null +++ b/versions/l-/libunifex.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "150573588108677bf5bbcb832d1249bd73f76e36", + "version-date": "2021-08-01", + "port-version": 0 + } + ] +} From 2f4892cd52048b4d317725d3f1aebaa92bdb5435 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:03:01 +0200 Subject: [PATCH 0370/1858] [CGNS|VTK-M|VTK|ParaView] Update ports (#18248) * [cgns] update to 4.2.0 * [vtk-m] update to 1.6.0 * [vtk] Update to 9.0.1-pv5.9.1 - VTK update to match release version of ParaView * [ParaView] Update to 5.9.1 * version stuff * fix automatic svg linkage in static builds * update qt5-svg * revisit vtk - fix build with vtk-m 1.6 - remove unused patches - remove comments * bump version * remove two commented lines * version stuff * remove old PR version Co-authored-by: Billy Robert O'Neal III --- ports/cgns/CONTROL | 32 - ports/cgns/defines.patch | 16 - ports/cgns/hdf5.patch | 124 ++- ports/cgns/portfile.cmake | 9 +- ports/cgns/vcpkg.json | 64 ++ ports/cgns/zlib_szip_mpi.patch | 35 - ports/paraview/CONTROL | 29 - ports/paraview/VisIt_Build.patch | 107 --- ports/paraview/catalyst_install.patch | 24 + ports/paraview/external_vtk.patch | 150 ++++ ports/paraview/paraview_build.patch | 745 ------------------ ports/paraview/portfile.cmake | 33 +- ports/paraview/remove_duplicates.patch | 14 - ports/paraview/vcpkg.json | 90 +++ ports/qt5-svg/CONTROL | 1 + ports/qt5-svg/portfile.cmake | 2 +- ports/qt5-svg/static_svg_link_fix.patch | 24 + ports/vtk-m/CONTROL | 24 - ports/vtk-m/portfile.cmake | 11 +- ports/vtk-m/vcpkg.json | 33 + ...-QT_NO_KEYWORDS-builds-by-VTK-itself.patch | 33 - ports/vtk/156fb524.patch | 393 +++++++++ ports/vtk/1f00a0c9.patch | 185 +++++ ports/vtk/6811.patch | 26 - ports/vtk/CONTROL | 50 -- ports/vtk/FindPostgreSQL.cmake | 269 ------- ports/vtk/d107698a.patch | 291 +++++++ ports/vtk/fix-freetype.patch | 26 - ports/vtk/module-name-mangling.patch | 18 - ports/vtk/portfile.cmake | 110 +-- ports/vtk/vcpkg.json | 174 ++++ ports/vtk/vtkm.patch | 147 ++-- versions/baseline.json | 16 +- versions/c-/cgns.json | 5 + versions/p-/paraview.json | 5 + versions/q-/qt5-svg.json | 5 + versions/v-/vtk-m.json | 5 + versions/v-/vtk.json | 5 + 38 files changed, 1667 insertions(+), 1663 deletions(-) delete mode 100644 ports/cgns/CONTROL delete mode 100644 ports/cgns/defines.patch create mode 100644 ports/cgns/vcpkg.json delete mode 100644 ports/cgns/zlib_szip_mpi.patch delete mode 100644 ports/paraview/CONTROL delete mode 100644 ports/paraview/VisIt_Build.patch create mode 100644 ports/paraview/catalyst_install.patch create mode 100644 ports/paraview/external_vtk.patch delete mode 100644 ports/paraview/paraview_build.patch delete mode 100644 ports/paraview/remove_duplicates.patch create mode 100644 ports/paraview/vcpkg.json create mode 100644 ports/qt5-svg/static_svg_link_fix.patch delete mode 100644 ports/vtk-m/CONTROL create mode 100644 ports/vtk-m/vcpkg.json delete mode 100644 ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch create mode 100644 ports/vtk/156fb524.patch create mode 100644 ports/vtk/1f00a0c9.patch delete mode 100644 ports/vtk/6811.patch delete mode 100644 ports/vtk/CONTROL delete mode 100644 ports/vtk/FindPostgreSQL.cmake create mode 100644 ports/vtk/d107698a.patch delete mode 100644 ports/vtk/fix-freetype.patch delete mode 100644 ports/vtk/module-name-mangling.patch create mode 100644 ports/vtk/vcpkg.json diff --git a/ports/cgns/CONTROL b/ports/cgns/CONTROL deleted file mode 100644 index 3398bad14fdf49..00000000000000 --- a/ports/cgns/CONTROL +++ /dev/null @@ -1,32 +0,0 @@ -Source: cgns -Version: 3.4.0-1 -Homepage: http://cgns.org/ -Description: The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations. -Default-Features: hdf5, lfsselector - -Feature: mpi -Description: Compile with support for the message passage interface (MPI) -Build-Depends: hdf5[core,parallel] - -Feature: fortran -Description: Enable fortran support (not yet implemented) - -Feature: tests -Description: Build tests - -Feature: tools -Description: Build tools - -Feature: hdf5 -Description: Enable hdf5 support -Build-Depends: hdf5[core,tools] - -Feature: lfsselector -Description: Selector for LFS -Build-Depends: cgns[core,lfs] (!osx) - -Feature: lfs -Description: Enable LFS support - -Feature: legacy -Description: Enable legacy support diff --git a/ports/cgns/defines.patch b/ports/cgns/defines.patch deleted file mode 100644 index e17d488287a6a6..00000000000000 --- a/ports/cgns/defines.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/cgnstypes.h.in b/src/cgnstypes.h.in -index 98c4e7fdc..8c6bcea62 100644 ---- a/src/cgnstypes.h.in -+++ b/src/cgnstypes.h.in -@@ -29,6 +29,11 @@ - #ifndef CGNSTYPES_H - #define CGNSTYPES_H - -+#define CG_BUILD_HDF5 @BUILDHDF5@ -+#define CG_BUILD_FORTRAN @BUILDFORTRAN@ -+#define CG_BUILD_PARALLEL @BUILDPARALLEL@ -+#define CG_BUILD_BASESCOPE @BUILDBASESCOPE@ -+ - #define CG_BUILD_LEGACY @BUILDLEGACY@ - #define CG_BUILD_64BIT @BUILD64BIT@ - #define CG_BUILD_SCOPE @BUILDSCOPE@ diff --git a/ports/cgns/hdf5.patch b/ports/cgns/hdf5.patch index 4de9ee35ba031a..67d08fa2d88b2d 100644 --- a/ports/cgns/hdf5.patch +++ b/ports/cgns/hdf5.patch @@ -1,25 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 58f078fe7..46446da8a 100644 +index d871a9dc8..d2c631023 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -194,71 +194,17 @@ endif (CGNS_ENABLE_FORTRAN AND HAS_FORTRAN) - option(CGNS_ENABLE_HDF5 "Enable or disable HDF5 interface" "OFF") - if (CGNS_ENABLE_HDF5) +@@ -232,46 +232,12 @@ if (CGNS_ENABLE_HDF5) + cmake_policy(SET CMP0074 NEW) + endif() -- if (CGNS_BUILD_SHARED) -- set (FIND_HDF_COMPONENTS C shared) -- else (CGNS_BUILD_SHARED) -- set (FIND_HDF_COMPONENTS C static) -- endif (CGNS_BUILD_SHARED) -- message (STATUS "HDF5 find comps: ${FIND_HDF_COMPONENTS}") -- -- #set (SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) -- set (SEARCH_PACKAGE_NAME "hdf5") -- - find_package (HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS ${FIND_HDF_COMPONENTS}) - message (STATUS "HDF5 C libs:${HDF5_FOUND} static:${HDF5_static_C_FOUND} and shared:${HDF5_shared_C_FOUND}") - if (HDF5_FOUND) -- add_executable (h5dump IMPORTED) - if (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) - set (FIND_HDF_COMPONENTS C) - @@ -31,40 +20,22 @@ index 58f078fe7..46446da8a 100644 - else (HDF5_BUILD_SHARED_LIBS) - add_definitions (-DH5_BUILT_AS_STATIC_LIB) - endif (HDF5_BUILD_SHARED_LIBS) -- if (BUILD_SHARED_LIBS AND WIN32) -- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dumpdll") -- else (BUILD_SHARED_LIBS AND WIN32) -- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") -- endif (BUILD_SHARED_LIBS AND WIN32) - else (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) -- if (BUILD_SHARED_LIBS AND HDF5_shared_C_FOUND) +- if (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) - set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_SHARED_LIBRARY}) -- else (HDF5_static_C_FOUND) +- else (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) - set (LINK_LIBS ${LINK_LIBS} ${HDF5_C_STATIC_LIBRARY}) -- endif (BUILD_SHARED_LIBS AND HDF5_shared_C_FOUND) -- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") +- endif (CGNS_BUILD_SHARED AND HDF5_shared_C_FOUND) - endif (NOT HDF5_static_C_FOUND AND NOT HDF5_shared_C_FOUND) -+ find_package(HDF5 CONFIG REQUIRED) -+ if(TARGET hdf5::hdf5-shared) -+ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared) -+ #add_executable(h5dump ALIAS hdf5::h5dump-shared) -+ set (HDF5_DUMP_EXECUTABLE $) -+ else() -+ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static) -+ #add_executable(h5dump ALIAS hdf5::h5dump) - set (HDF5_DUMP_EXECUTABLE $) - -- set (HDF5_HAVE_H5PUBCONF_H 1) -- set (HDF5_HAVE_HDF5 1) -- set (HDF5_HDF5_HEADER "h5pubconf.h") -- set (HDF5_INCLUDE_DIR_GEN ${HDF5_INCLUDE_DIR}) -- message (STATUS "HDF5-${HDF5_VERSION_STRING} found: INC=${HDF5_INCLUDE_DIR} TOOLS=${HDF5_TOOLS_DIR}") - else (HDF5_FOUND) - find_package (HDF5) # Legacy find --#Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here -- set(HDF5_TOOLS_DIR ${HDF5_LIBRARY_DIRS}/../bin) --#Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here -- if (CGNS_BUILD_SHARED AND EXISTS "${HDF5_LIBRARY_DIRS}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") +- +- #Legacy find_package does not set HDF5_TOOLS_DIR, so we set it here +- set(HDF5_TOOLS_DIR ${HDF5_LIBRARY}/../bin) +- +- #Legacy find_package does not set HDF5_BUILD_SHARED_LIBS, so we set it here +- if (CGNS_BUILD_SHARED AND EXISTS "${HDF5_LIBRARY}/libhdf5${CMAKE_SHARED_LIBRARY_SUFFIX}") - set (HDF5_BUILD_SHARED_LIBS 1) - add_definitions (-DH5_BUILT_AS_DYNAMIC_LIB) - else () @@ -73,36 +44,45 @@ index 58f078fe7..46446da8a 100644 - endif () - set (LINK_LIBS ${LINK_LIBS} ${HDF5_LIBRARIES}) - -- add_executable (h5dump IMPORTED) -- set_property (TARGET h5dump PROPERTY IMPORTED_LOCATION "${HDF5_TOOLS_DIR}/h5dump") -- set (HDF5_DUMP_EXECUTABLE $) - endif (HDF5_FOUND) - set (HDF5_PACKAGE_NAME ${SEARCH_PACKAGE_NAME}) -- -+ endif() -+ ++ find_package (HDF5 CONFIG REQUIRED) ++ if (TARGET hdf5::hdf5-shared) ++ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-shared) ++ else () ++ set (LINK_LIBS ${LINK_LIBS} hdf5::hdf5-static) ++ endif () + if (HDF5_FOUND) - set (HDF5_HAVE_H5PUBCONF_H 1) - set (HDF5_HAVE_HDF5 1) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 66b547ed1..4051f07d4 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -12,13 +12,14 @@ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}) - if (CGNS_ENABLE_HDF5) - add_definitions(-DBUILD_HDF5) - if (WIN32) -- if (HDF5_LIBRARY) -+ add_definitions(-DWIN32) -+ if (HDF5_BUILD_SHARED_LIBS) - # file(STRINGS ${HDF5_LIBRARY} HDF5isDLL REGEX "__imp__H5close") - # if (HDF5isDLL) - # this is only needed when using hdf5 dll libs -- add_definitions(-DWIN32 -D_HDF5USEDLL_) -+ add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB) - # endif (HDF5isDLL) -- endif (HDF5_LIBRARY) -+ endif (HDF5_BUILD_SHARED_LIBS) - endif (WIN32) - if(HDF5_NEED_MPI AND MPI_INC) - include_directories(${MPI_INC}) + if (NOT DEFINED HDF5_INCLUDE_DIRS) +@@ -289,20 +255,10 @@ if (CGNS_ENABLE_HDF5) + endif (HDF5_FOUND) + + set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") +- if(HDF5_NEED_ZLIB) +- find_library(ZLIB_LIBRARY z) +- mark_as_advanced(CLEAR ZLIB_LIBRARY) +- else (HDF5_NEED_ZLIB) +- mark_as_advanced(FORCE ZLIB_LIBRARY) +- endif(HDF5_NEED_ZLIB) ++ set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE) + + set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to szip?") +- if (HDF5_NEED_SZIP) +- find_library(SZIP_LIBRARY szip) +- mark_as_advanced(CLEAR SZIP_LIBRARY) +- else (HDF5_NEED_SZIP) +- mark_as_advanced(FORCE SZIP_LIBRARY) +- endif (HDF5_NEED_SZIP) ++ set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE) + + # Check if HDF5 version is 1.8 or greater + if (HDF5_VERSION VERSION_LESS "1.8.0") +@@ -310,6 +266,7 @@ if (CGNS_ENABLE_HDF5) + endif (HDF5_VERSION VERSION_LESS "1.8.0") + + set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)") ++ set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE) + set(MPI_INC) + set(MPI_LIBS) + if (HDF5_NEED_MPI) diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index 89544674496be3..bb75a9485ceae7 100644 --- a/ports/cgns/portfile.cmake +++ b/ports/cgns/portfile.cmake @@ -2,19 +2,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CGNS/CGNS - REF 3420e23febf0eb38c1b05af3c157d614d8476557 # v3.4.0 - SHA512 3fec1c32f1514cd9bc327f12f3f9db6a229df05f514193bd9e913d06b8ae6465664410a3c77a30b0c29f3e999e5efcb1ebed3a8b80e14be92035940c10b1d6d7 + REF 86b686bce292eef7782cfb56b6acdb5123c96f49 # v4.2.0 + SHA512 88df741acc1b650724bcbeb82ab0f7e593bf01e0a30c04b14b9915f4ea4331725cc24b87715dd08d93d5a3708660ca7f7874bc0a9c5505b76471802cf033e35d HEAD_REF develop PATCHES hdf5.patch linux_lfs.patch - zlib_szip_mpi.patch - defines.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - mpi HDF5_NEEDS_MPI fortran CGNS_ENABLE_FORTRAN tests CGNS_ENABLE_TESTS hdf5 CGNS_ENABLE_HDF5 @@ -45,7 +42,7 @@ vcpkg_install_cmake() file(INSTALL ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(REMOVE ${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs ${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h) -file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # we patched the config and the include is all that is needed +file(INSTALL ${CURRENT_PORT_DIR}/cgnsconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) # the include is all that is needed set(TOOLS cgnscheck cgnscompress cgnsconvert cgnsdiff cgnslist cgnsnames) diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json new file mode 100644 index 00000000000000..c738b9a3b6d904 --- /dev/null +++ b/ports/cgns/vcpkg.json @@ -0,0 +1,64 @@ +{ + "name": "cgns", + "version-semver": "4.2.0", + "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.", + "homepage": "http://cgns.org/", + "default-features": [ + "hdf5", + "lfsselector" + ], + "features": { + "fortran": { + "description": "Enable fortran support (not yet implemented)" + }, + "hdf5": { + "description": "Enable hdf5 support", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "tools" + ] + } + ] + }, + "legacy": { + "description": "Enable legacy support" + }, + "lfs": { + "description": "Enable LFS support" + }, + "lfsselector": { + "description": "Selector for LFS", + "dependencies": [ + { + "name": "cgns", + "default-features": false, + "features": [ + "lfs" + ], + "platform": "!osx" + } + ] + }, + "mpi": { + "description": "Enable MPI support", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + } + ] + }, + "tests": { + "description": "Build tests" + }, + "tools": { + "description": "Build tools" + } + } +} diff --git a/ports/cgns/zlib_szip_mpi.patch b/ports/cgns/zlib_szip_mpi.patch deleted file mode 100644 index 4f6608cf4d1641..00000000000000 --- a/ports/cgns/zlib_szip_mpi.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 46446da8a..cd05cf51a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -219,20 +221,10 @@ if (CGNS_ENABLE_HDF5) - endif (HDF5_FOUND) - - set(HDF5_NEED_ZLIB "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") -- if(HDF5_NEED_ZLIB) -- find_library(ZLIB_LIBRARY z) -- mark_as_advanced(CLEAR ZLIB_LIBRARY) -- else (HDF5_NEED_ZLIB) -- mark_as_advanced(FORCE ZLIB_LIBRARY) -- endif(HDF5_NEED_ZLIB) -+ set(HDF5_NEED_ZLIB ${HDF5_ENABLE_Z_LIB_SUPPORT} CACHE INTERNAL "" FORCE) - - set(HDF5_NEED_SZIP "OFF" CACHE BOOL "Does the HDF5 library require linking to zlib?") -- if (HDF5_NEED_SZIP) -- find_library(SZIP_LIBRARY szip) -- mark_as_advanced(CLEAR SZIP_LIBRARY) -- else (HDF5_NEED_SZIP) -- mark_as_advanced(FORCE SZIP_LIBRARY) -- endif (HDF5_NEED_SZIP) -+ set(HDF5_NEED_SZIP ${HDF5_ENABLE_SZIP_SUPPORT} CACHE INTERNAL "" FORCE) - - # Check if HDF5 version is 1.8 or greater - if (HDF5_VERSION VERSION_LESS "1.8.0") -@@ -240,6 +231,7 @@ if (CGNS_ENABLE_HDF5) - endif (HDF5_VERSION VERSION_LESS "1.8.0") - - set(HDF5_NEED_MPI "OFF" CACHE BOOL "Does the HDF5 library require linking to mpi? (Only true if using parallel HDF5)") -+ set(HDF5_NEED_MPI ${HDF5_ENABLE_PARALLEL} CACHE INTERNAL "" FORCE) - set(MPI_INC) - set(MPI_LIBS) - if (HDF5_NEED_MPI) diff --git a/ports/paraview/CONTROL b/ports/paraview/CONTROL deleted file mode 100644 index d40b55adc6282a..00000000000000 --- a/ports/paraview/CONTROL +++ /dev/null @@ -1,29 +0,0 @@ -Source: paraview -Version: 5.8.0 -Port-Version: 3 -Homepage: https://www.paraview.org/ -Description: VTK-based Data Analysis and Visualization Application -Build-Depends: vtk[core,paraview], protobuf, cgns, boost-core, boost-format, boost-algorithm - -Feature: vtkm -Description: enables vtkm for the build of paraview -Build-Depends: vtk[core,vtkm] - -Feature: python -Description: enables the build of python wrappers -Build-Depends: vtk[core,python] - -Feature: cuda -Description: enables cuda within paraview -Build-Depends: cuda, vtk[core, cuda] - -Feature: mpi -Description: enables cuda within paraview -Build-Depends: hdf5[core,parallel], vtk[core, mpi] - -Feature: tools -Description: Build paraview tools - -Feature: all_modules -Description: enables the build of all paraview modules -Build-Depends: gdal, pdal, ffmpeg, laszip diff --git a/ports/paraview/VisIt_Build.patch b/ports/paraview/VisIt_Build.patch deleted file mode 100644 index fb676a737b7699..00000000000000 --- a/ports/paraview/VisIt_Build.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git a/databases/readers/CEAucd/vtkCEAucdReader.C b/databases/readers/CEAucd/vtkCEAucdReader.C -index 0ad9a828a..cf37beb86 100644 ---- a/databases/readers/CEAucd/vtkCEAucdReader.C -+++ b/databases/readers/CEAucd/vtkCEAucdReader.C -@@ -172,7 +172,7 @@ const char *vtkCEAucdReader::GetByteOrderAsString() - } - } - --void vtkCEAucdReader::SetFileStream( ifstream* istr ) -+void vtkCEAucdReader::SetFileStream( std::ifstream* istr ) - { - if( istr == this->FileStream ) return; - -@@ -311,9 +311,9 @@ int vtkCEAucdReader::RequestInformation( - { - vtkDebugMacro(<<"Open file "<FileName<<"\n"); - #ifdef _WIN32 -- this->FileStream = new ifstream(this->FileName, ios::in | ios::binary); -+ this->FileStream = new std::ifstream(this->FileName, std::ios::in | std::ios::binary); - #else -- this->FileStream = new ifstream(this->FileName, ios::in); -+ this->FileStream = new std::ifstream(this->FileName, std::ios::in); - #endif - } - -@@ -340,7 +340,7 @@ int vtkCEAucdReader::RequestInformation( - vtkDebugMacro(<<"Re-open file "<FileName<<" in ASCII mode"); - delete this->FileStream; // close file to reopen it later - this->FileStream = NULL; -- this->FileStream = new ifstream(this->FileName, ios::in); -+ this->FileStream = new std::ifstream(this->FileName, std::ios::in); - } - - char c='\0', buf[100]; -diff --git a/databases/readers/CEAucd/vtkCEAucdReader.h b/databases/readers/CEAucd/vtkCEAucdReader.h -index c3a86c16b..434556488 100644 ---- a/databases/readers/CEAucd/vtkCEAucdReader.h -+++ b/databases/readers/CEAucd/vtkCEAucdReader.h -@@ -49,7 +49,7 @@ class vtkCEAucdReader : public vtkUnstructuredGridAlgorithm - public: - static vtkCEAucdReader *New(); - vtkTypeMacro(vtkCEAucdReader,vtkUnstructuredGridAlgorithm); -- void PrintSelf(ostream& os, vtkIndent indent) override; -+ void PrintSelf(std::ostream& os, vtkIndent indent) override; - - // Description: - // Specify file name of CEA UCD datafile to read -@@ -120,7 +120,7 @@ class vtkCEAucdReader : public vtkUnstructuredGridAlgorithm - vtkSetStringMacro(ActivePointArray); - vtkGetStringMacro(ActivePointArray); - -- void SetFileStream( ifstream* istr ); -+ void SetFileStream( std::ifstream* istr ); - - // Description: - // The following methods allow selective reading of solutions fields. by -@@ -173,7 +173,7 @@ class vtkCEAucdReader : public vtkUnstructuredGridAlgorithm - vtkIdType * PointsInMaterial; - vtkIdType * CellIndexInMaterial; - -- ifstream *FileStream; -+ std::ifstream *FileStream; - long GlobalOffset; - long FileSize; - bool OwnStream; -diff --git a/databases/readers/Image/vtkStimulateReader.C b/databases/readers/Image/vtkStimulateReader.C -index be91dc91e..aeec88891 100644 ---- a/databases/readers/Image/vtkStimulateReader.C -+++ b/databases/readers/Image/vtkStimulateReader.C -@@ -104,7 +104,6 @@ int vtkStimulateReader::OpenFile(void) - // Close file from any previous image - if (this->File) - { -- this->File->close(); - delete this->File; - this->File = NULL; - } -@@ -122,9 +121,9 @@ int vtkStimulateReader::OpenFile(void) - if ( !FileFunctions::VisItStat( sdt_name, &fs) ) - { - #ifdef _WIN32 -- this->File = new ifstream(sdt_name, ios::in | ios::binary); -+ this->File = new std::ifstream(sdt_name, std::ios::in | std::ios::binary); - #else -- this->File = new ifstream(sdt_name, ios::in); -+ this->File = new std::ifstream(sdt_name, std::ios::in); - #endif - } - if (! this->File || this->File->fail()) -@@ -246,7 +245,7 @@ int vtkStimulateReader::CanReadFile(const char* fname) - return 0; - } - -- ifstream sdt_file(sdt_name); -+ std::ifstream sdt_file(sdt_name); - if (sdt_file.fail()) - { - vtkErrorMacro(<<"Cannot read file: invalid sdt_file " << sdt_name); -@@ -266,7 +265,7 @@ bool vtkStimulateReader::ReadSPRFile(const char *spr_name) - haveReadSPRFile = true; - validSPRFile = false; - -- ifstream spr_file(spr_name); -+ std::ifstream spr_file(spr_name); - if (spr_file.fail()) - { - vtkErrorMacro(<<"Unable to read SPR file " << spr_name << ": file " diff --git a/ports/paraview/catalyst_install.patch b/ports/paraview/catalyst_install.patch new file mode 100644 index 00000000000000..e52802fbef3338 --- /dev/null +++ b/ports/paraview/catalyst_install.patch @@ -0,0 +1,24 @@ +diff --git a/Clients/InSitu/CMakeLists.txt b/Clients/InSitu/CMakeLists.txt +index 159aa8ffc..f9bfc7dfe 100644 +--- a/Clients/InSitu/CMakeLists.txt ++++ b/Clients/InSitu/CMakeLists.txt +@@ -86,5 +86,5 @@ _vtk_module_apply_properties(catalyst) + # Update install locations + catalyst_library( + TARGET catalyst +- LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}" ++ #LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}" + INSTALL_EXPORT_DEFAULT) +diff --git a/Remoting/Views/vtkGeometryRepresentationInternal.h b/Remoting/Views/vtkGeometryRepresentationInternal.h +index 86eb383af..cc204fba2 100644 +--- a/Remoting/Views/vtkGeometryRepresentationInternal.h ++++ b/Remoting/Views/vtkGeometryRepresentationInternal.h +@@ -22,7 +22,7 @@ + // serial backend. + #ifndef __VTK_WRAP__ + #if VTK_MODULE_ENABLE_VTK_vtkm +-#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB ++//#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB + #endif + + #if defined(VTKM_ENABLE_TBB) && VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters diff --git a/ports/paraview/external_vtk.patch b/ports/paraview/external_vtk.patch new file mode 100644 index 00000000000000..0df160d6acb46f --- /dev/null +++ b/ports/paraview/external_vtk.patch @@ -0,0 +1,150 @@ +diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake +index b0dea2b32..b035a9dc3 100644 +--- a/CMake/ParaViewClient.cmake ++++ b/CMake/ParaViewClient.cmake +@@ -516,6 +516,7 @@ function (paraview_client_documentation) + NAMES xmlpatterns-qt5 xmlpatterns + HINTS "${Qt5_DIR}/../../../bin" + "${Qt5_DIR}/../../../libexec/qt5/bin" ++ "${Qt5_DIR}/../../../tools/qt5/bin" + DOC "Path to xmlpatterns") + mark_as_advanced(qt_xmlpatterns_executable) + +diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake +index f544a7c06..c51278931 100644 +--- a/CMake/ParaViewOptions.cmake ++++ b/CMake/ParaViewOptions.cmake +@@ -88,7 +88,7 @@ endif() + #======================================================================== + + # XXX(VTK): External VTK is not yet actually supported. +-if (FALSE) ++if (TRUE) + option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) + mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) + else () +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1af77d164..bebcb83ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -72,7 +72,8 @@ if (NOT CMAKE_INSTALL_LICENSEDIR) + endif () + + set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") +-set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") ++set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk") ++message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}") + if (NOT IS_DIRECTORY "${vtk_cmake_dir}") + message(FATAL_ERROR + "Failed to find the VTK CMake directory. Did you forget to initialize the " +@@ -383,9 +384,73 @@ endif () + + if (PARAVIEW_USE_EXTERNAL_VTK) + if (paraview_required_modules OR paraview_unrecognized_modules) +- message(FATAL_ERROR +- "The following modules were requested or required, but not found: " +- "${paraview_required_modules};${paraview_unrecognized_modules}.") ++ message(STATUS "REQUIRED:${paraview_required_modules}") ++ foreach(mod ${paraview_required_modules}) ++ if(NOT TARGET ${mod}) ++ message(STATUS "REQUIRED TARGET not defined: ${mod}") ++ list(APPEND modules_notarget ${mod}) ++ endif() ++ if(${mod} MATCHES "VTK::") # For better debugging ++ message(STATUS "VTK TARGET found: ${mod}") ++ list(APPEND vtk_modules ${mod}) ++ endif() ++ endforeach() ++ foreach(mod ${paraview_unrecognized_modules}) ++ if(NOT TARGET ${mod}) ++ message(STATUS "UNREC TARGET not defined: ${mod}") ++ list(FIND paraview_rejected_modules ${mod} _found_mod) ++ if(_found_mod GREATER_EQUAL 0) ++ message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized") ++ list(APPEND _to_remove ${mod}) ++ endif() ++ else() ++ list(APPEND _to_remove ${mod}) ++ #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper ++ endif() ++ endforeach() ++ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") ++ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove}) ++ message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}") ++ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}") ++ message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}") ++ set(_unnecessary_moduls ${paraview_modules}) ++ list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules}) ++ message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}") ++ if(modules_notarget) ++ message(FATAL_ERROR ++ "The following modules were requested or required, but not found: " ++ "${modules_notarget}") ++ endif() ++ list(REMOVE_DUPLICATES vtk_modules) ++ macro(search_dependent_targets) ++ set(vtk_mod_dep_list) ++ foreach(vtk_targ ${ARGN}) ++ get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends") ++ if(vtk_mod_dep) ++ list(APPEND vtk_mod_dep_list ${vtk_mod_dep}) ++ endif() ++ get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends") ++ if(vtk_mod_pdep) ++ list(APPEND vtk_mod_dep_list ${vtk_mod_pdep}) ++ endif() ++ get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends") ++ if(vtk_mod_odep) ++ list(APPEND vtk_mod_dep_list ${vtk_mod_odep}) ++ endif() ++ if(vtk_mod_dep_list) ++ message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}") ++ list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules}) ++ if(vtk_mod_dep_list) ++ message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}") ++ list(APPEND vtk_modules ${vtk_mod_dep_list}) ++ search_dependent_targets(${vtk_mod_dep_list}) ++ else() ++ message(STATUS "No new modules discovered!") ++ endif() ++ endif() ++ endforeach() ++ endmacro() ++ search_dependent_targets(${vtk_modules}) + endif () + + if (PARAVIEW_USE_PYTHON) +@@ -459,7 +524,7 @@ else () + endif() + + # Set up these variables now so that modules may acess them +- if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES) ++ if (PARAVIEW_INSTALL_DEVELOPMENT_FILES) + set(vtk_cmake_dir + "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") + set(vtk_cmake_destination +@@ -558,6 +623,9 @@ set(_paraview_add_tests_default_data_directory + set(_paraview_add_tests_default_test_data_target + "ParaViewData") + ++list(REMOVE_DUPLICATES vtk_modules) # Missed this somewhere ++list(REMOVE_DUPLICATES paraview_modules) # probably not needed ++ + vtk_module_build( + MODULES ${paraview_modules} + KITS ${paraview_kits} +@@ -596,9 +664,11 @@ vtk_module_build( + TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") + + include(vtkModuleJson) +-vtk_module_json( +- MODULES ${vtk_modules} +- OUTPUT "vtk-modules.json") ++if(NOT PARAVIEW_USE_EXTERNAL_VTK) ++ vtk_module_json( ++ MODULES ${vtk_modules} ++ OUTPUT "vtk-modules.json") ++endif() + vtk_module_json( + MODULES ${paraview_modules} + OUTPUT "paraview-modules.json") diff --git a/ports/paraview/paraview_build.patch b/ports/paraview/paraview_build.patch deleted file mode 100644 index 042bbe6b591a0c..00000000000000 --- a/ports/paraview/paraview_build.patch +++ /dev/null @@ -1,745 +0,0 @@ -diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake -index 7dadad937..dd271739d 100644 ---- a/CMake/ParaViewClient.cmake -+++ b/CMake/ParaViewClient.cmake -@@ -516,6 +516,7 @@ function (paraview_client_documentation) - NAMES xmlpatterns-qt5 xmlpatterns - HINTS "${Qt5_DIR}/../../../bin" - "${Qt5_DIR}/../../../libexec/qt5/bin" -+ "${Qt5_DIR}/../../../tools/qt5/bin" - DOC "Path to xmlpatterns") - mark_as_advanced(qt_xmlpatterns_executable) - -diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake -index 5e402e9fc..ccb553e8f 100644 ---- a/CMake/ParaViewOptions.cmake -+++ b/CMake/ParaViewOptions.cmake -@@ -88,7 +88,7 @@ endif() - #======================================================================== - - # XXX(VTK): External VTK is not yet actually supported. --if (FALSE) -+if (TRUE) - option(PARAVIEW_USE_EXTERNAL_VTK "Use an external VTK." OFF) - mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK) - else () -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d7e8f1dfe..8b0e7a8c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,7 +73,9 @@ if (NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) - endif () - - set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake") --set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") -+set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk") -+string(REPLACE "/debug" "" vtk_cmake_dir "${vtk_cmake_dir}") -+message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}") - list(APPEND CMAKE_MODULE_PATH - "${paraview_cmake_dir}" - "${vtk_cmake_dir}") -@@ -214,6 +216,7 @@ if (NOT WIN32) - endif () - endif () - -+message(STATUS "PARAVIEW_USE_EXTERNAL_VTK:${PARAVIEW_USE_EXTERNAL_VTK}") - if (PARAVIEW_USE_EXTERNAL_VTK) - find_package(VTK REQUIRED) - else () -@@ -369,9 +372,73 @@ endif () - - if (PARAVIEW_USE_EXTERNAL_VTK) - if (paraview_required_modules OR paraview_unrecognized_modules) -- message(FATAL_ERROR -- "The following modules were requested or required, but not found: " -- "${paraview_required_modules};${paraview_unrecognized_modules}.") -+ message(STATUS "REQUIRED:${paraview_required_modules}") -+ foreach(mod ${paraview_required_modules}) -+ if(NOT TARGET ${mod}) -+ message(STATUS "REQUIRED TARGET not defined: ${mod}") -+ list(APPEND modules_notarget ${mod}) -+ endif() -+ if(${mod} MATCHES "VTK::") # For better debugging -+ message(STATUS "VTK TARGET found: ${mod}") -+ list(APPEND vtk_modules ${mod}) -+ endif() -+ endforeach() -+ foreach(mod ${paraview_unrecognized_modules}) -+ if(NOT TARGET ${mod}) -+ message(STATUS "UNREC TARGET not defined: ${mod}") -+ list(FIND paraview_rejected_modules ${mod} _found_mod) -+ if(_found_mod GREATER_EQUAL 0) -+ message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized") -+ list(APPEND _to_remove ${mod}) -+ endif() -+ else() -+ list(APPEND _to_remove ${mod}) -+ #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper -+ endif() -+ endforeach() -+ message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}") -+ list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove}) -+ message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}") -+ message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}") -+ message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}") -+ set(_unnecessary_moduls ${paraview_modules}) -+ list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules}) -+ message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}") -+ if(modules_notarget) -+ message(FATAL_ERROR -+ "The following modules were requested or required, but not found: " -+ "${modules_notarget}") -+ endif() -+ list(REMOVE_DUPLICATES vtk_modules) -+ macro(search_dependent_targets) -+ set(vtk_mod_dep_list) -+ foreach(vtk_targ ${ARGN}) -+ get_target_property(vtk_mod_dep ${vtk_targ} "INTERFACE_vtk_module_depends") -+ if(vtk_mod_dep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_dep}) -+ endif() -+ get_target_property(vtk_mod_pdep ${vtk_targ} "INTERFACE_vtk_module_private_depends") -+ if(vtk_mod_pdep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_pdep}) -+ endif() -+ get_target_property(vtk_mod_odep ${vtk_targ} "INTERFACE_vtk_module_opional_depends") -+ if(vtk_mod_odep) -+ list(APPEND vtk_mod_dep_list ${vtk_mod_odep}) -+ endif() -+ if(vtk_mod_dep_list) -+ message(STATUS "Target ${vtk_targ} depends on ${vtk_mod_dep_list}") -+ list(REMOVE_ITEM vtk_mod_dep_list ${vtk_modules}) -+ if(vtk_mod_dep_list) -+ message(STATUS "Newly discovered modules: ${vtk_mod_dep_list}") -+ list(APPEND vtk_modules ${vtk_mod_dep_list}) -+ search_dependent_targets(${vtk_mod_dep_list}) -+ else() -+ message(STATUS "No new modules discovered!") -+ endif() -+ endif() -+ endforeach() -+ endmacro() -+ search_dependent_targets(${vtk_modules}) - endif () - - if (PARAVIEW_USE_PYTHON) -@@ -498,7 +565,7 @@ else () - TEST_INPUT_DATA_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/VTK/Testing" - TEST_OUTPUT_DATA_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/ExternalData/VTK/Testing") - -- if (NOT PARAVIEW_USE_EXTERNAL_VTK AND PARAVIEW_INSTALL_DEVELOPMENT_FILES) -+ if (PARAVIEW_INSTALL_DEVELOPMENT_FILES) - set(vtk_cmake_dir - "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake") - set(vtk_cmake_destination -@@ -543,9 +610,11 @@ vtk_module_build( - TEST_OUTPUT_DATA_DIRECTORY "${paraview_test_data_directory_output}") - - include(vtkModuleJson) --vtk_module_json( -- MODULES "${vtk_modules}" -- OUTPUT "vtk-modules.json") -+if(NOT PARAVIEW_USE_EXTERNAL_VTK) -+ vtk_module_json( -+ MODULES "${vtk_modules}" -+ OUTPUT "vtk-modules.json") -+endif() - vtk_module_json( - MODULES "${paraview_modules}" - OUTPUT "paraview-modules.json") -diff --git a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx -index be318d6d4..80187dd69 100644 ---- a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx -+++ b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkAnalyzeReader.cxx -@@ -1381,8 +1381,8 @@ int vtkAnalyzeReader::CanReadFile(const char* fname) - return false; - } - -- ifstream local_InputStream; -- local_InputStream.open(HeaderFileName.c_str(), ios::in | ios::binary); -+ std::ifstream local_InputStream; -+ local_InputStream.open(HeaderFileName.c_str(), std::ios::in | std::ios::binary); - if (local_InputStream.fail()) - { - return false; -diff --git a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx -index e7df3dacc..1bae5ae22 100644 ---- a/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx -+++ b/Plugins/AnalyzeNIfTIReaderWriter/NIfTIIO/vtkNIfTIReader.cxx -@@ -1277,8 +1277,8 @@ int vtkNIfTIReader::CanReadFile(const char* fname) - return false; - } - -- ifstream local_InputStream; -- local_InputStream.open(HeaderFileName.c_str(), ios::in | ios::binary); -+ std::ifstream local_InputStream; -+ local_InputStream.open(HeaderFileName.c_str(), std::ios::in | std::ios::binary); - if (local_InputStream.fail()) - { - return false; -diff --git a/Qt/Components/pqCustomFilterManager.cxx b/Qt/Components/pqCustomFilterManager.cxx -index 4c6911ac8..b04828168 100644 ---- a/Qt/Components/pqCustomFilterManager.cxx -+++ b/Qt/Components/pqCustomFilterManager.cxx -@@ -214,7 +214,7 @@ void pqCustomFilterManager::exportSelected(const QStringList& files) - QStringList::ConstIterator jter = files.begin(); - for (; jter != files.end(); ++jter) - { -- ofstream os((*jter).toLocal8Bit().data(), ios::out); -+ std::ofstream os((*jter).toLocal8Bit().data(), std::ios::out); - root->PrintXML(os, vtkIndent()); - } - -diff --git a/Qt/Components/pqPresetDialog.cxx b/Qt/Components/pqPresetDialog.cxx -index 411480e3e..af0195763 100644 ---- a/Qt/Components/pqPresetDialog.cxx -+++ b/Qt/Components/pqPresetDialog.cxx -@@ -952,7 +952,7 @@ void pqPresetDialog::exportPresets() - } - assert(presetCollection.size() > 0); - -- ofstream outfs; -+ std::ofstream outfs; - outfs.open(filename.toStdString().c_str()); - if (!outfs.is_open()) - { -diff --git a/Qt/Core/pqCoreTestUtility.cxx b/Qt/Core/pqCoreTestUtility.cxx -index 95c7df5b6..00f61e2f8 100644 ---- a/Qt/Core/pqCoreTestUtility.cxx -+++ b/Qt/Core/pqCoreTestUtility.cxx -@@ -45,7 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include "QtTestingConfigure.h" - - #include "QVTKOpenGLNativeWidget.h" --#include "QVTKOpenGLWidget.h" -+#include "QVTKOpenGLStereoWidget.h" - #include "pqApplicationCore.h" - #include "pqCollaborationEventPlayer.h" - #include "pqColorButtonEventPlayer.h" -@@ -309,13 +309,13 @@ bool pqCoreTestUtility::CompareImage(QWidget* widget, const QString& referenceIm - } - - // try to recover the render window directly -- QVTKOpenGLWidget* glWidget = qobject_cast(widget); -+ QVTKOpenGLStereoWidget* glWidget = qobject_cast(widget); - if (glWidget) - { - vtkRenderWindow* rw = glWidget->renderWindow(); - if (rw) - { -- cout << "Using QVTKOpenGLWidget RenderWindow API for capture" << endl; -+ cout << "Using QVTKOpenGLStereoWidget RenderWindow API for capture" << endl; - return pqCoreTestUtility::CompareImage( - rw, referenceImage, threshold, std::cerr, tempDirectory, size); - } -diff --git a/Qt/Core/pqQVTKWidgetBase.h b/Qt/Core/pqQVTKWidgetBase.h -index 5f11871de..c6b7dbcbb 100644 ---- a/Qt/Core/pqQVTKWidgetBase.h -+++ b/Qt/Core/pqQVTKWidgetBase.h -@@ -43,8 +43,8 @@ using pqQVTKWidgetBase = QVTKOpenGLNativeWidget; - #define PARAVIEW_USING_QVTKOPENGLNATIVEWIDGET 1 - #define PARAVIEW_USING_QVTKOPENGLWIDGET 0 - #else --#include "QVTKOpenGLWidget.h" --using pqQVTKWidgetBase = QVTKOpenGLWidget; -+#include "QVTKOpenGLStereoWidget.h" -+using pqQVTKWidgetBase = QVTKOpenGLStereoWidget; - #define PARAVIEW_USING_QVTKOPENGLNATIVEWIDGET 0 - #define PARAVIEW_USING_QVTKOPENGLWIDGET 1 - #endif -diff --git a/Qt/Core/pqQVTKWidgetEventPlayer.cxx b/Qt/Core/pqQVTKWidgetEventPlayer.cxx -index 105796d8a..63c0bde5f 100644 ---- a/Qt/Core/pqQVTKWidgetEventPlayer.cxx -+++ b/Qt/Core/pqQVTKWidgetEventPlayer.cxx -@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - - #include "QVTKOpenGLNativeWidget.h" --#include "QVTKOpenGLWidget.h" -+#include "QVTKOpenGLStereoWidget.h" - #include "QVTKOpenGLWindow.h" - #include "pqEventDispatcher.h" - -@@ -49,7 +49,7 @@ pqQVTKWidgetEventPlayer::pqQVTKWidgetEventPlayer(QObject* p) - bool pqQVTKWidgetEventPlayer::playEvent( - QObject* Object, const QString& Command, const QString& Arguments, bool& Error) - { -- QVTKOpenGLWidget* qvtkWidget = qobject_cast(Object); -+ QVTKOpenGLStereoWidget* qvtkWidget = qobject_cast(Object); - QVTKOpenGLNativeWidget* qvtkNativeWidget = qobject_cast(Object); - if (qvtkWidget || qvtkNativeWidget) - { -@@ -92,7 +92,7 @@ bool pqQVTKWidgetEventPlayer::playEvent( - - if (qvtkWidget != nullptr) - { -- // Due to QTBUG-61836 (see QVTKOpenGLWidget::testingEvent()), events should -+ // Due to QTBUG-61836 (see QVTKOpenGLStereoWidget::testingEvent()), events should - // be propagated back to the internal QVTKOpenGLWindow when being fired - // explicitly on the widget instance. We have to use a custom event - // callback in this case to ensure that events are passed to the window. -diff --git a/Qt/Core/pqQVTKWidgetEventTranslator.cxx b/Qt/Core/pqQVTKWidgetEventTranslator.cxx -index f79d5c4e5..77950a0d1 100644 ---- a/Qt/Core/pqQVTKWidgetEventTranslator.cxx -+++ b/Qt/Core/pqQVTKWidgetEventTranslator.cxx -@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - - #include "QVTKOpenGLNativeWidget.h" --#include "QVTKOpenGLWidget.h" -+#include "QVTKOpenGLStereoWidget.h" - #include "QVTKOpenGLWindow.h" - - pqQVTKWidgetEventTranslator::pqQVTKWidgetEventTranslator(QObject* p) -@@ -70,7 +70,7 @@ bool pqQVTKWidgetEventTranslator::translateEvent( - // Look for a render window in the possible widget types. - vtkRenderWindow* rw = nullptr; - -- if (QVTKOpenGLWidget* const qvtkWidget = qobject_cast(Object)) -+ if (QVTKOpenGLStereoWidget* const qvtkWidget = qobject_cast(Object)) - { - rw = qvtkWidget->embeddedOpenGLWindow() ? qvtkWidget->renderWindow() : nullptr; - } -diff --git a/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx b/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx -index 487b5ad60..c6c24d81d 100644 ---- a/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx -+++ b/Remoting/ClientServerStream/vtkClientServerInterpreter.cxx -@@ -184,7 +184,7 @@ void vtkClientServerInterpreter::SetLogFile(const char* name) - // If a non-empty name was given, open a new log file. - if (name && name[0]) - { -- this->LogFileStream = new ofstream(name); -+ this->LogFileStream = new std::ofstream(name); - if (this->LogFileStream && *this->LogFileStream) - { - this->LogStream = this->LogFileStream; -diff --git a/Remoting/ClientServerStream/vtkClientServerInterpreter.h b/Remoting/ClientServerStream/vtkClientServerInterpreter.h -index 1eafb27f3..1371ef727 100644 ---- a/Remoting/ClientServerStream/vtkClientServerInterpreter.h -+++ b/Remoting/ClientServerStream/vtkClientServerInterpreter.h -@@ -195,8 +195,8 @@ protected: - ~vtkClientServerInterpreter() override; - - // A stream to which a log is written. -- ostream* LogStream; -- ofstream* LogFileStream; -+ std::ostream* LogStream; -+ std::ofstream* LogFileStream; - - // Internal message processing functions. - int ProcessCommandNew(const vtkClientServerStream& css, int midx); -diff --git a/Remoting/Core/vtkPVPluginLoader.cxx b/Remoting/Core/vtkPVPluginLoader.cxx -index 5b04b2f00..447d9d63a 100644 ---- a/Remoting/Core/vtkPVPluginLoader.cxx -+++ b/Remoting/Core/vtkPVPluginLoader.cxx -@@ -73,12 +73,12 @@ public: - vtkPVXMLOnlyPlugin* instance = new vtkPVXMLOnlyPlugin(); - instance->PluginName = vtksys::SystemTools::GetFilenameWithoutExtension(xmlfile); - -- ifstream is; -- is.open(xmlfile, ios::binary); -+ std::ifstream is; -+ is.open(xmlfile, std::ios::binary); - // get length of file: -- is.seekg(0, ios::end); -+ is.seekg(0, std::ios::end); - size_t length = is.tellg(); -- is.seekg(0, ios::beg); -+ is.seekg(0, std::ios::beg); - - // allocate memory: - char* buffer = new char[length + 1]; -diff --git a/Remoting/ServerManager/vtkPVSessionCore.cxx b/Remoting/ServerManager/vtkPVSessionCore.cxx -index 8d36fad37..6ff043967 100644 ---- a/Remoting/ServerManager/vtkPVSessionCore.cxx -+++ b/Remoting/ServerManager/vtkPVSessionCore.cxx -@@ -293,7 +293,7 @@ vtkPVSessionCore::vtkPVSessionCore() - { - filename << this->ParallelController->GetLocalProcessId(); - } -- this->LogStream = new ofstream(filename.str().c_str()); -+ this->LogStream = new std::ofstream(filename.str().c_str()); - LOG("Log for " << options->GetArgv0() << " (" << this->ParallelController->GetLocalProcessId() - << ")"); - } -diff --git a/Remoting/ServerManager/vtkSMSessionProxyManager.cxx b/Remoting/ServerManager/vtkSMSessionProxyManager.cxx -index 8525457e5..05bdfd723 100644 ---- a/Remoting/ServerManager/vtkSMSessionProxyManager.cxx -+++ b/Remoting/ServerManager/vtkSMSessionProxyManager.cxx -@@ -1261,7 +1261,7 @@ void vtkSMSessionProxyManager::LoadXMLState( - bool vtkSMSessionProxyManager::SaveXMLState(const char* filename) - { - vtkPVXMLElement* rootElement = this->SaveXMLState(); -- ofstream os(filename, ios::out); -+ std::ofstream os(filename, std::ios::out); - if (!os.is_open()) - { - return false; -diff --git a/Remoting/Views/vtkPVRenderView.cxx b/Remoting/Views/vtkPVRenderView.cxx -index de9c50ab3..d7f739192 100644 ---- a/Remoting/Views/vtkPVRenderView.cxx -+++ b/Remoting/Views/vtkPVRenderView.cxx -@@ -2514,11 +2514,11 @@ void vtkPVRenderView::UpdateSkybox() - this->CubeMap->SetInputTexture(vtkOpenGLTexture::SafeDownCast(texture)); - this->CubeMap->InterpolateOn(); - this->GetRenderer()->AddActor(this->Skybox); -- this->GetRenderer()->SetEnvironmentCubeMap(this->CubeMap, true); -+ this->GetRenderer()->SetEnvironmentTexture(this->CubeMap, true); - } - else - { -- this->GetRenderer()->SetEnvironmentCubeMap(nullptr); -+ this->GetRenderer()->SetEnvironmentTexture(nullptr); - } - } - -diff --git a/Remoting/Views/vtkSMTransferFunctionPresets.cxx b/Remoting/Views/vtkSMTransferFunctionPresets.cxx -index 1151ce58f..21e5a28b7 100644 ---- a/Remoting/Views/vtkSMTransferFunctionPresets.cxx -+++ b/Remoting/Views/vtkSMTransferFunctionPresets.cxx -@@ -142,7 +142,7 @@ public: - Json::CharReaderBuilder builder; - builder["collectComments"] = false; - Json::Value root; -- ifstream file; -+ std::ifstream file; - file.open(filename); - if (!file) - { -@@ -456,7 +456,7 @@ bool vtkSMTransferFunctionPresets::ImportPresets(const char* filename) - if (vtksys::SystemTools::LowerCase(vtksys::SystemTools::GetFilenameLastExtension(filename)) == - ".xml") - { -- ifstream in(filename); -+ std::ifstream in(filename); - if (in) - { - std::ostringstream contents; -diff --git a/Remoting/Views/vtkSMTransferFunctionProxy.cxx b/Remoting/Views/vtkSMTransferFunctionProxy.cxx -index efa8e9341..2023ca41b 100644 ---- a/Remoting/Views/vtkSMTransferFunctionProxy.cxx -+++ b/Remoting/Views/vtkSMTransferFunctionProxy.cxx -@@ -273,7 +273,7 @@ bool vtkSMTransferFunctionProxy::ExportTransferFunction( - - exportCollection.append(transferFunction); - -- ofstream outfs; -+ std::ofstream outfs; - outfs.open(filename); - if (!outfs.is_open()) - { -@@ -1370,7 +1370,7 @@ bool vtkSMTransferFunctionProxy::ConvertLegacyColorMapsToJSON( - return false; - } - -- ofstream file; -+ std::ofstream file; - file.open(outjsonfile); - if (file) - { -diff --git a/ThirdParty/protobuf/CMakeLists.txt b/ThirdParty/protobuf/CMakeLists.txt -index 0502ca2d9..25b2e778f 100644 ---- a/ThirdParty/protobuf/CMakeLists.txt -+++ b/ThirdParty/protobuf/CMakeLists.txt -@@ -42,7 +42,8 @@ vtk_module_third_party( - PACKAGE Protobuf - VERSION "3.4" - TARGETS protobuf::libprotobuf -- STANDARD_INCLUDE_DIRS) -+ STANDARD_INCLUDE_DIRS -+ CONFIG_MODE) - - if (VTK_MODULE_USE_EXTERNAL_ParaView_protobuf) - # promote protobuf::protoc to GLOBAL to allow to call protobuf_generate from other directories -diff --git a/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx b/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx -index 66a7d6972..9d314b8ce 100644 ---- a/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx -+++ b/VTKExtensions/CGNSReader/vtkFileSeriesHelper.cxx -@@ -211,7 +211,7 @@ bool vtkFileSeriesHelper::ReadMetaFile(const char* metafilename) - } - - // Open the metafile. -- ifstream metafile(metafilename); -+ std::ifstream metafile(metafilename); - if (metafile.bad()) - { - // vtkErrorMacro("Failed to open meta-file: " << metafilename); -diff --git a/VTKExtensions/IOCore/vtkCSVWriter.cxx b/VTKExtensions/IOCore/vtkCSVWriter.cxx -index 11f777c1a..a1773600c 100644 ---- a/VTKExtensions/IOCore/vtkCSVWriter.cxx -+++ b/VTKExtensions/IOCore/vtkCSVWriter.cxx -@@ -97,7 +97,7 @@ namespace - //----------------------------------------------------------------------------- - template - void vtkCSVWriterGetDataString( -- iterT* iter, vtkIdType tupleIndex, ofstream& stream, vtkCSVWriter* writer, bool* first) -+ iterT* iter, vtkIdType tupleIndex, std::ofstream& stream, vtkCSVWriter* writer, bool* first) - { - int numComps = iter->GetNumberOfComponents(); - vtkIdType index = tupleIndex * numComps; -@@ -118,7 +118,7 @@ void vtkCSVWriterGetDataString( - //----------------------------------------------------------------------------- - template <> - void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate* iter, vtkIdType tupleIndex, -- ofstream& stream, vtkCSVWriter* writer, bool* first) -+ std::ofstream& stream, vtkCSVWriter* writer, bool* first) - { - int numComps = iter->GetNumberOfComponents(); - vtkIdType index = tupleIndex * numComps; -@@ -139,7 +139,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate* iter, vtk - //----------------------------------------------------------------------------- - template <> - void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate* iter, vtkIdType tupleIndex, -- ofstream& stream, vtkCSVWriter* writer, bool* first) -+ std::ofstream& stream, vtkCSVWriter* writer, bool* first) - { - int numComps = iter->GetNumberOfComponents(); - vtkIdType index = tupleIndex * numComps; -@@ -160,7 +160,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate* iter, vtkIdType t - //----------------------------------------------------------------------------- - template <> - void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate* iter, vtkIdType tupleIndex, -- ofstream& stream, vtkCSVWriter* writer, bool* first) -+ std::ofstream& stream, vtkCSVWriter* writer, bool* first) - { - int numComps = iter->GetNumberOfComponents(); - vtkIdType index = tupleIndex * numComps; -@@ -190,7 +190,7 @@ void vtkCSVWriterGetDataString(vtkArrayIteratorTemplate* iter, vt - - class vtkCSVWriter::CSVFile - { -- ofstream Stream; -+ std::ofstream Stream; - std::vector > ColumnInfo; - double Time = vtkMath::Nan(); - -diff --git a/VTKExtensions/IOCore/vtkFileSeriesReader.cxx b/VTKExtensions/IOCore/vtkFileSeriesReader.cxx -index f2448f2b8..7d84bc1ab 100644 ---- a/VTKExtensions/IOCore/vtkFileSeriesReader.cxx -+++ b/VTKExtensions/IOCore/vtkFileSeriesReader.cxx -@@ -783,7 +783,7 @@ int vtkFileSeriesReader::ReadMetaDataFile(const char* metafilename, vtkStringArr - std::vector& timeValues, int maxFilesToRead /*= VTK_INT_MAX*/) - { - // Open the metafile. -- ifstream metafile(metafilename); -+ std::ifstream metafile(metafilename); - if (metafile.bad()) - { - return 0; -diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx -index 8370e21e3..ff90a0421 100644 ---- a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx -+++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.cxx -@@ -50,7 +50,6 @@ vtkPEnSightGoldBinaryReader::~vtkPEnSightGoldBinaryReader() - { - if (this->IFile) - { -- this->IFile->close(); - delete this->IFile; - this->IFile = NULL; - } -@@ -72,7 +71,6 @@ int vtkPEnSightGoldBinaryReader::OpenFile(const char* filename) - // Close file from any previous image - if (this->IFile) - { -- this->IFile->close(); - delete this->IFile; - this->IFile = NULL; - } -@@ -86,9 +84,9 @@ int vtkPEnSightGoldBinaryReader::OpenFile(const char* filename) - this->FileSize = (long)(fs.st_size); - - #ifdef _WIN32 -- this->IFile = new ifstream(filename, ios::in | ios::binary); -+ this->IFile = new std::ifstream(filename, std::ios::in | std::ios::binary); - #else -- this->IFile = new ifstream(filename, ios::in); -+ this->IFile = new std::ifstream(filename, std::ios::in); - #endif - } - else -diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h -index c5a5551d5..9c871e4a1 100644 ---- a/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h -+++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldBinaryReader.h -@@ -204,7 +204,7 @@ protected: - int ElementIdsListed; - int Fortran; - -- ifstream* IFile; -+ std::ifstream* IFile; - // The size of the file could be used to choose byte order. - long FileSize; - -diff --git a/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx -index b433bc57a..b5cdc2672 100644 ---- a/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx -+++ b/VTKExtensions/IOEnSight/vtkPEnSightGoldReader.cxx -@@ -91,7 +91,7 @@ int vtkPEnSightGoldReader::ReadGeometryFile( - - // Opening the text file as binary. If not, the reader fails to read - // files with Unix line endings on Windows machines. -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -@@ -291,7 +291,7 @@ int vtkPEnSightGoldReader::ReadMeasuredGeometryFile( - sfilename = fileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -@@ -455,7 +455,7 @@ int vtkPEnSightGoldReader::ReadScalarsPerNode(const char* fileName, const char* - sfilename = fileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -@@ -675,7 +675,7 @@ int vtkPEnSightGoldReader::ReadVectorsPerNode(const char* fileName, const char* - sfilename = fileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -@@ -854,7 +854,7 @@ int vtkPEnSightGoldReader::ReadTensorsPerNode(const char* fileName, const char* - sfilename = fileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -@@ -980,7 +980,7 @@ int vtkPEnSightGoldReader::ReadScalarsPerElement(const char* fileName, const cha - sfilename = fileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -@@ -1187,7 +1187,7 @@ int vtkPEnSightGoldReader::ReadVectorsPerElement(const char* fileName, const cha - sfilename = fileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | std::ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -@@ -1356,7 +1356,7 @@ int vtkPEnSightGoldReader::ReadTensorsPerElement(const char* fileName, const cha - sfilename = fileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in | ios::binary); -+ this->IS = new std::ifstream(sfilename.c_str(), std::ios::in | ios::binary); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -diff --git a/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx b/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx -index 4f4840f5c..dd515e5ca 100644 ---- a/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx -+++ b/VTKExtensions/IOEnSight/vtkPEnSightReader.cxx -@@ -1319,7 +1319,7 @@ int vtkPEnSightReader::ReadCaseFile() - sfilename = this->CaseFileName; - } - -- this->IS = new ifstream(sfilename.c_str(), ios::in); -+ this->IS = new std::ifstream(sfilename.c_str(), ios::in); - if (this->IS->fail()) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -diff --git a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx -index 5768eb32f..8bbc582ae 100644 ---- a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx -+++ b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader.cxx -@@ -429,7 +429,7 @@ int vtkPVEnSightMasterServerReader::ParseMasterServerFile() - } - - // Open the file for reading. -- ifstream fin(sfilename.c_str(), ios::in); -+ std::ifstream fin(sfilename.c_str(), std::ios::in); - if (!fin) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -diff --git a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx -index e7701d458..a358b9df0 100644 ---- a/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx -+++ b/VTKExtensions/IOEnSight/vtkPVEnSightMasterServerReader2.cxx -@@ -512,7 +512,7 @@ int vtkPVEnSightMasterServerReader2::ParseMasterServerFile() - } - - // Open the file for reading. -- ifstream fin(sfilename.c_str(), ios::in); -+ std::ifstream fin(sfilename.c_str(), std::ios::in); - if (!fin) - { - vtkErrorMacro("Unable to open file: " << sfilename.c_str()); -diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx -index 1af09a68e..4aba88655 100644 ---- a/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx -+++ b/VTKExtensions/IOSPCTH/vtkSpyPlotReader.cxx -@@ -1289,7 +1289,7 @@ int vtkSpyPlotReader::MergeVectors(vtkDataSetAttributes* da, vtkDataArray* a1, v - //----------------------------------------------------------------------------- - int vtkSpyPlotReader::CanReadFile(const char* fname) - { -- ifstream ifs(fname, ios::binary | ios::in); -+ std::ifstream ifs(fname, std::ios::binary | std::ios::in); - if (!ifs) - { - return 0; -diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx -index c7e1bac87..157768255 100644 ---- a/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx -+++ b/VTKExtensions/IOSPCTH/vtkSpyPlotReaderMap.cxx -@@ -83,7 +83,7 @@ bool vtkSpyPlotReaderMap::Initialize(const char* filename) - { - this->Clean(NULL); - -- ifstream ifs(filename); -+ std::ifstream ifs(filename); - if (!ifs) - { - vtkGenericWarningMacro("Error opening file " << filename); -@@ -238,7 +238,7 @@ bool vtkSpyPlotReaderMap::InitializeFromSpyFile(const char* filename) - bool vtkSpyPlotReaderMap::InitializeFromCaseFile(const char* filename) - { - // Setup the filemap and spcth structures -- ifstream ifs(filename); -+ std::ifstream ifs(filename); - if (!ifs) - { - vtkGenericWarningMacro("Error opening file " << filename); -diff --git a/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx b/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx -index 7dfe451c9..f4ea91928 100644 ---- a/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx -+++ b/VTKExtensions/IOSPCTH/vtkSpyPlotUniReader.cxx -@@ -212,7 +212,7 @@ int vtkSpyPlotUniReader::MakeCurrent() - } - - std::vector arrayBuffer; -- ifstream ifs(this->FileName, ios::binary | ios::in); -+ std::ifstream ifs(this->FileName, std::ios::binary | std::ios::in); - vtkSpyPlotIStream spis; - spis.SetStream(&ifs); - int dump; -@@ -1358,7 +1358,7 @@ int vtkSpyPlotUniReader::ReadInformation() - vtkErrorMacro("FileName not specified"); - return 0; - } -- ifstream ifs(this->FileName, ios::binary | ios::in); -+ std::ifstream ifs(this->FileName, std::ios::binary | std::ios::in); - if (!ifs) - { - vtkErrorMacro("Cannot open file: " << this->FileName); diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index ab64ef34af2c8f..784efa6be443ea 100644 --- a/ports/paraview/portfile.cmake +++ b/ports/paraview/portfile.cmake @@ -1,4 +1,6 @@ -set(VERSION 5.8) +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _vcpkg_json) +string(JSON _ver_string GET "${_vcpkg_json}" "version-semver") +string(REGEX MATCH "^[0-9]+\.[0-9]+" VERSION "${_ver_string}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "cuda" PARAVIEW_USE_CUDA #untested; probably only affects internal VTK build so it does nothing here @@ -12,16 +14,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/ParaView - REF 56631fdd9a31f4acdfe5fce2c3be3c4fb6e6800f # v5.8.0 - SHA512 1cdf4065428debc301c98422233524cdafc843495c54569b0854bf53f6ffeba1e83acf60497450779d493e56051557cd377902325d6ece89ad1b98ae6ba831be + REF aad4b6f1e92154879209102edfab8367f1e7d191 # v5.9.1 + SHA512 330fcb8525bdee9b02e06f05d4e91cc4d631d03df99c30f82bb97da5e06b5a2a6ff4ecee807b6f6c7110d2f53db1c17e4670d6078ae1cc89cfd7089b67d05bdb HEAD_REF master PATCHES - paraview_build.patch - remove_duplicates.patch # Missed something in the above patch + external_vtk.patch cgns.patch python_include.patch python_wrapper.patch add-tools-option.patch + catalyst_install.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -36,11 +38,9 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH VISITIT_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/visitbridge - REF c2605b5c3115bc4869c76a0d8bfdd8939b59f283 - SHA512 6d2c1d6e1cd345547926938451755e7a8be5dabd89e18a2ceb419db16c5b29f354554a5130eb365b7e522d655370fd4766953813ff530c06e4851fe26104ce58 + REF 42fce8ad6863ca2c1308741955cca1d0cf570d22 + SHA512 03a6254989d3e286a462683af92caba1e90decbdcfb2e729f2d7e1116b04d63a05c28d02c4615d780fdd0d33e2719f96617233d6e0602410cc6d894f92fe6ee3 PATCHES - VisIt_Build.patch - #removeunusedsymbols.patch # These also get remove in master of ParaView ${VisItPatches} ) #Get QtTesting Plugin @@ -48,12 +48,23 @@ vcpkg_from_gitlab( OUT_SOURCE_PATH QTTESTING_SOURCE_PATH GITLAB_URL https://gitlab.kitware.com/ REPO paraview/qttesting - REF f2429588feb839e0d8f9f3ee73bfa8a032a3f178 - SHA512 752b13ff79095a14faa2edc134a64497ff0426da3aa6b1a5951624816fb4f113a26fbe559cedf495ebb775d782c9a1851421a88dd299a79f27cbebb730ea227e + REF 72290689c7c55622d729bf95c97e7627026a234e + SHA512 fb18c6745b784b294f01d5391ba4cdcaa109443a193eb35fbf1553fdb3a4f7217f784fd4893fab72784cec5bd3fc821bf1e766e943d0f562c5917788800599b0 ) +#Get Catalyst +vcpkg_from_gitlab( + OUT_SOURCE_PATH CATALYST_SOURCE_PATH + GITLAB_URL https://gitlab.kitware.com/ + REPO paraview/catalyst + REF e36e4a5f3c67011c97c335cce23d2bc3abc0d086 + SHA512 9926c272ab8785997f9c98cfaf696943081b0ddb0e9e343602722671b6f3eaef5b8de5dd049ca783b6844c7e328a96e1b09c8b24c16f001eeeed2d154d290480 +) + + file(COPY ${VISITIT_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/Utilities/VisItBridge) file(COPY ${QTTESTING_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting) +file(COPY ${CATALYST_SOURCE_PATH}/ DESTINATION ${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst) if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/paraview/remove_duplicates.patch b/ports/paraview/remove_duplicates.patch deleted file mode 100644 index 4ea223e3f8bd07..00000000000000 --- a/ports/paraview/remove_duplicates.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b7101666c..ebac50016 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -592,6 +592,9 @@ set(_paraview_add_tests_default_data_directory - set(_paraview_add_tests_default_test_data_target - "ParaViewData") - -+list(REMOVE_DUPLICATES vtk_modules) # Missed this somewhere -+list(REMOVE_DUPLICATES paraview_modules) # probably not needed -+ - vtk_module_build( - MODULES ${paraview_modules} - KITS ${paraview_kits} diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json new file mode 100644 index 00000000000000..85570e754d082a --- /dev/null +++ b/ports/paraview/vcpkg.json @@ -0,0 +1,90 @@ +{ + "name": "paraview", + "version-semver": "5.9.1", + "description": "VTK-based Data Analysis and Visualization Application", + "homepage": "https://www.paraview.org/", + "dependencies": [ + "boost-algorithm", + "boost-core", + "boost-format", + "cgns", + "protobuf", + { + "name": "vtk", + "default-features": false, + "features": [ + "paraview" + ] + } + ], + "features": { + "all-modules": { + "description": "enables the build of all paraview modules", + "dependencies": [ + "ffmpeg", + "gdal", + "laszip", + "pdal" + ] + }, + "cuda": { + "description": "enables cuda within paraview", + "dependencies": [ + "cuda", + { + "name": "vtk", + "default-features": false, + "features": [ + "cuda" + ] + } + ] + }, + "mpi": { + "description": "enables cuda within paraview", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "mpi" + ] + } + ] + }, + "python": { + "description": "enables the build of python wrappers", + "dependencies": [ + { + "name": "vtk", + "default-features": false, + "features": [ + "python" + ] + } + ] + }, + "tools": { + "description": "Build paraview tools" + }, + "vtkm": { + "description": "enables vtkm for the build of paraview", + "dependencies": [ + { + "name": "vtk", + "default-features": false, + "features": [ + "vtkm" + ] + } + ] + } + } +} diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL index 4e9fa8fcc3f5ba..1b182ea1893c9d 100644 --- a/ports/qt5-svg/CONTROL +++ b/ports/qt5-svg/CONTROL @@ -1,4 +1,5 @@ Source: qt5-svg Version: 5.15.2 +Port-Version: 1 Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files Build-Depends: qt5-base[core] diff --git a/ports/qt5-svg/portfile.cmake b/ports/qt5-svg/portfile.cmake index 214726759f3cf1..ca67a6846fa234 100644 --- a/ports/qt5-svg/portfile.cmake +++ b/ports/qt5-svg/portfile.cmake @@ -1,2 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation(PATCHES "static_svg_link_fix.patch") \ No newline at end of file diff --git a/ports/qt5-svg/static_svg_link_fix.patch b/ports/qt5-svg/static_svg_link_fix.patch new file mode 100644 index 00000000000000..c6d21e83affd34 --- /dev/null +++ b/ports/qt5-svg/static_svg_link_fix.patch @@ -0,0 +1,24 @@ +diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro +index bfc739fa8..c0df08194 100644 +--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro ++++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro +@@ -8,6 +8,6 @@ OTHER_FILES += qsvgiconengine-nocompress.json + QT += svg core-private gui-private + + PLUGIN_TYPE = iconengines +-PLUGIN_EXTENDS = svg ++PLUGIN_EXTENDS = gui + PLUGIN_CLASS_NAME = QSvgIconPlugin + load(qt_plugin) +diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro +index 9db6a9ab0..dcfc4b555 100644 +--- a/src/plugins/imageformats/svg/svg.pro ++++ b/src/plugins/imageformats/svg/svg.pro +@@ -6,6 +6,6 @@ SOURCES += main.cpp \ + QT += svg + + PLUGIN_TYPE = imageformats +-PLUGIN_EXTENDS = svg ++PLUGIN_EXTENDS = gui + PLUGIN_CLASS_NAME = QSvgPlugin + load(qt_plugin) diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL deleted file mode 100644 index e221eeccecd23c..00000000000000 --- a/ports/vtk-m/CONTROL +++ /dev/null @@ -1,24 +0,0 @@ -Source: vtk-m -Version: 1.5.0 -Port-Version: 1 -Homepage: https://gitlab.kitware.com/vtk/vtk-m/ -Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures. -Supports: x64 & !uwp - -Feature: cuda -Description: Use the NVIDIA CUDA device adapter. -Build-Depends: cuda - -Feature: omp -Description: Use the OpenMP device adapter. - -Feature: tbb -Description: Use the Intel TBB device adapter. -Build-Depends: tbb - -Feature: mpi -Description: Use the MPI controller. -Build-Depends: mpi - -Feature: double -Description: Use double precision in floating point calculations diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake index c33eb065fdca9a..b8e90bc9840635 100644 --- a/ports/vtk-m/portfile.cmake +++ b/ports/vtk-m/portfile.cmake @@ -40,20 +40,17 @@ list(APPEND OPTIONS -DBUILD_TESTING=OFF) vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" OUT_SOURCE_PATH SOURCE_PATH REPO vtk/vtk-m - REF f2aa6ad5be1a97e3fb41ef4680ee2c76c3434ac0 # v1.5.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build - SHA512 35e8a2c0ad6cd3c1f02a71a50d781c89f93909ad27030b406fd69f4fea5c1862c48a6e541fd07562947322c3a69bdfdb54206ae51bb86ef7a710f9e9898e9638 + REF 13a117e0e8935eef3f320b5a1cd71d9911ad9853 # v1.6.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build + SHA512 54f7f52ab4ee7954b6a303ffd3b8bcb18105b5d2fd8ed54b4e487fce2ebfbc51507e632189f775c79eea22ad24bd56bca401ddd679fc03d787342dd33d2ba18b FILE_DISAMBIGUATOR 1) - # For people only wanting vtk-m and not VTK - #REF 74ffad9bd0679d061bc87e544a728f1c3c926269 # v1.5.1 - #SHA512 c9e1c18432b6c11ae086445255acf9477fe4c888122a2b2a9713dc63a40d2e4c2375742157526b5f0869f14c62a4ad66d81ee58d6cc75a1d53a1d615525a03c9) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${OPTIONS}) vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.5 TARGET_PATH share/vtkm) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.6 TARGET_PATH share/vtkm) file(READ ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake _contents) -string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.5")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents}) +string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.6")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents}) file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake ${_contents}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json new file mode 100644 index 00000000000000..0b5c4fcc64d5f0 --- /dev/null +++ b/ports/vtk-m/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "vtk-m", + "version-semver": "1.6.0", + "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.", + "homepage": "https://gitlab.kitware.com/vtk/vtk-m/", + "supports": "x64 & !uwp", + "features": { + "cuda": { + "description": "Use the NVIDIA CUDA device adapter.", + "dependencies": [ + "cuda" + ] + }, + "double": { + "description": "Use double precision in floating point calculations" + }, + "mpi": { + "description": "Use the MPI controller.", + "dependencies": [ + "mpi" + ] + }, + "omp": { + "description": "Use the OpenMP device adapter." + }, + "tbb": { + "description": "Use the Intel TBB device adapter.", + "dependencies": [ + "tbb" + ] + } + } +} diff --git a/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch b/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch deleted file mode 100644 index 56472dbff3bfb2..00000000000000 --- a/ports/vtk/0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 20dd0370d7ad685b7fbdb1625ffec60c940980f3 Mon Sep 17 00:00:00 2001 -From: Ben Boeckel -Date: Fri, 17 Apr 2020 15:02:15 -0400 -Subject: [PATCH 2/2] Qt: enforce QT_NO_KEYWORDS builds by VTK itself - ---- - GUISupport/Qt/CMakeLists.txt | 1 + - Views/Qt/CMakeLists.txt | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/GUISupport/Qt/CMakeLists.txt b/GUISupport/Qt/CMakeLists.txt -index bfa63a94f1..3fc6fe4bd9 100644 ---- a/GUISupport/Qt/CMakeLists.txt -+++ b/GUISupport/Qt/CMakeLists.txt -@@ -47,4 +47,5 @@ vtk_module_add_module(VTK::GUISupportQt - HEADERS ${headers} - PRIVATE_HEADERS ${private_headers}) - -+vtk_module_definitions(VTK::GUISupportQt PRIVATE QT_NO_KEYWORDS) - vtk_module_link(VTK::GUISupportQt PUBLIC Qt5::Widgets) -diff --git a/Views/Qt/CMakeLists.txt b/Views/Qt/CMakeLists.txt -index 7684118e40..b697571dd2 100644 ---- a/Views/Qt/CMakeLists.txt -+++ b/Views/Qt/CMakeLists.txt -@@ -17,4 +17,5 @@ set(CMAKE_AUTOMOC 1) - vtk_module_add_module(VTK::ViewsQt - CLASSES ${classes}) - -+vtk_module_definitions(VTK::ViewsQt PRIVATE QT_NO_KEYWORDS) - vtk_module_link(VTK::ViewsQt PRIVATE Qt5::Widgets) --- -2.30.0.windows.1 - diff --git a/ports/vtk/156fb524.patch b/ports/vtk/156fb524.patch new file mode 100644 index 00000000000000..716fd5c7e3e2f6 --- /dev/null +++ b/ports/vtk/156fb524.patch @@ -0,0 +1,393 @@ +diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt +index 14e84f1dd6e8b9da275045fe5d80868b2e52ad5a..3a41bc4d2bffca8c3df79da218443b90f8ceb7d3 100644 +--- a/Accelerators/Vtkm/Filters/CMakeLists.txt ++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt +@@ -46,6 +46,10 @@ foreach (class IN LISTS impl_classes) + list(APPEND headers "${class}.h") + endforeach () + ++list(APPEND sources ++ "vtkmClipInstantiationsWithField.cxx" ++ "vtkmClipInstantiationsWithImplicitFunction.cxx") ++ + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/vtkmConfigFilters.h.in" + "${CMAKE_CURRENT_BINARY_DIR}/vtkmConfigFilters.h" +diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx +index 0b1dc86d3bedd425d4846f524818a68ada052ce9..65fec3110ebb6522900cbc965c5298031921e1e4 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClip.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx +@@ -14,6 +14,7 @@ + =========================================================================*/ + + #include "vtkmClip.h" ++#include "vtkmClipInternals.h" + + #include "vtkCellIterator.h" + #include "vtkDataArray.h" +@@ -36,11 +37,9 @@ + + #include "vtkmFilterPolicy.h" + ++#include + #include + +-#include +-#include +- + #include + + vtkStandardNewMacro(vtkmClip); +@@ -50,19 +49,17 @@ void vtkmClip::PrintSelf(std::ostream& os, vtkIndent indent) + { + this->Superclass::PrintSelf(os, indent); + +- os << indent << "ClipValue: " << this->ClipValue << "\n"; ++ os << indent << "ClipValue: " << this->GetClipValue() << "\n"; + os << indent << "ClipFunction: \n"; +- this->ClipFunction->PrintSelf(os, indent.GetNextIndent()); +- os << indent << "ComputeScalars: " << this->ComputeScalars << "\n"; ++ this->GetClipFunction()->PrintSelf(os, indent.GetNextIndent()); ++ os << indent << "ComputeScalars: " << this->GetComputeScalars() << "\n"; + } + + //------------------------------------------------------------------------------ + vtkmClip::vtkmClip() +- : ClipValue(0.) +- , ComputeScalars(true) +- , ClipFunction(nullptr) +- , ClipFunctionConverter(new tovtkm::ImplicitFunctionConverter) ++ : Internals(new vtkmClip::internals) + { ++ this->Internals->ClipFunctionConverter.reset(new tovtkm::ImplicitFunctionConverter()); + // Clip active point scalars by default + this->SetInputArrayToProcess( + 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, vtkDataSetAttributes::SCALARS); +@@ -75,24 +72,54 @@ vtkmClip::~vtkmClip() = default; + vtkMTimeType vtkmClip::GetMTime() + { + vtkMTimeType mTime = this->Superclass::GetMTime(); +- if (this->ClipFunction) ++ if (this->GetClipFunction()) + { +- mTime = std::max(mTime, this->ClipFunction->GetMTime()); ++ mTime = std::max(mTime, this->GetClipFunction()->GetMTime()); + } + return mTime; + } + ++//------------------------------------------------------------------------------ ++double vtkmClip::GetClipValue() ++{ ++ return this->Internals->ClipValue; ++} ++ ++//------------------------------------------------------------------------------ ++void vtkmClip::SetClipValue(double val) ++{ ++ this->Internals->ClipValue = val; ++} ++ ++//------------------------------------------------------------------------------ ++bool vtkmClip::GetComputeScalars() ++{ ++ return this->Internals->ComputeScalars; ++} ++ ++//------------------------------------------------------------------------------ ++void vtkmClip::SetComputeScalars(bool val) ++{ ++ this->Internals->ComputeScalars = val; ++} ++ + //------------------------------------------------------------------------------ + void vtkmClip::SetClipFunction(vtkImplicitFunction* clipFunction) + { +- if (this->ClipFunction != clipFunction) ++ if (this->GetClipFunction() != clipFunction) + { +- this->ClipFunction = clipFunction; +- this->ClipFunctionConverter->Set(clipFunction); ++ this->Internals->ClipFunction = clipFunction; ++ this->Internals->ClipFunctionConverter->Set(clipFunction); + this->Modified(); + } + } + ++//------------------------------------------------------------------------------ ++vtkImplicitFunction* vtkmClip::GetClipFunction() ++{ ++ return this->Internals->ClipFunction; ++} ++ + //------------------------------------------------------------------------------ + int vtkmClip::RequestData( + vtkInformation*, vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec) +@@ -111,7 +138,7 @@ int vtkmClip::RequestData( + // Find the scalar array: + int assoc = this->GetInputArrayAssociation(0, inInfoVec); + vtkDataArray* scalars = this->GetInputArrayToProcess(0, inInfoVec); +- if (!this->ClipFunction && ++ if (!this->GetClipFunction() && + (assoc != vtkDataObject::FIELD_ASSOCIATION_POINTS || scalars == nullptr || + scalars->GetName() == nullptr || scalars->GetName()[0] == '\0')) + { +@@ -129,37 +156,18 @@ int vtkmClip::RequestData( + { + // Convert inputs to vtkm objects: + auto fieldsFlag = +- this->ComputeScalars ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None; ++ this->GetComputeScalars() ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None; + auto in = tovtkm::Convert(input, fieldsFlag); + + // Run filter: + vtkm::cont::DataSet result; +- if (this->ClipFunction) ++ if (this->GetClipFunction()) + { +- vtkm::filter::ClipWithImplicitFunction functionFilter; +- auto function = this->ClipFunctionConverter->Get(); +- if (function.GetValid()) +- { +- functionFilter.SetImplicitFunction(function); +- result = functionFilter.Execute(in); +- } ++ result = this->Internals->ExecuteClipWithImplicitFunction(in); + } + else + { +- vtkm::filter::ClipWithField fieldFilter; +- if (!this->ComputeScalars) +- { +- // explicitly convert just the field we need +- auto inField = tovtkm::Convert(scalars, assoc); +- in.AddField(inField); +- // don't pass this field +- fieldFilter.SetFieldsToPass( +- vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); +- } +- +- fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS); +- fieldFilter.SetClipValue(this->ClipValue); +- result = fieldFilter.Execute(in); ++ result = this->Internals->ExecuteClipWithField(in, scalars, assoc); + } + + // Convert result to output: +@@ -169,7 +177,7 @@ int vtkmClip::RequestData( + return 0; + } + +- if (!this->ClipFunction && this->ComputeScalars) ++ if (!this->GetClipFunction() && this->GetComputeScalars()) + { + output->GetPointData()->SetActiveScalars(scalars->GetName()); + } +@@ -189,8 +197,8 @@ int vtkmClip::RequestData( + << "Falling back to serial implementation."); + + vtkNew filter; +- filter->SetClipFunction(this->ClipFunction); +- filter->SetValue(this->ClipValue); ++ filter->SetClipFunction(this->GetClipFunction()); ++ filter->SetValue(this->GetClipValue()); + filter->SetInputData(input); + filter->Update(); + output->ShallowCopy(filter->GetOutput()); +diff --git a/Accelerators/Vtkm/Filters/vtkmClip.h b/Accelerators/Vtkm/Filters/vtkmClip.h +index edb3cebfadc9ebeddf3c5030716ba532c0e149fe..6f33d36460d72de340eb81bb321ee868d70e6b5b 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClip.h ++++ b/Accelerators/Vtkm/Filters/vtkmClip.h +@@ -32,13 +32,6 @@ + + class vtkImplicitFunction; + +-namespace tovtkm +-{ +- +-class ImplicitFunctionConverter; +- +-} // namespace tovtkm +- + class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm + { + public: +@@ -50,15 +43,15 @@ public: + * The scalar value to use when clipping the dataset. Values greater than + * ClipValue are preserved in the output dataset. Default is 0. + */ +- vtkGetMacro(ClipValue, double); +- vtkSetMacro(ClipValue, double); ++ double GetClipValue(); ++ void SetClipValue(double); + + /** + * If true, all input point data arrays will be mapped onto the output + * dataset. Default is true. + */ +- vtkGetMacro(ComputeScalars, bool); +- vtkSetMacro(ComputeScalars, bool); ++ bool GetComputeScalars(); ++ void SetComputeScalars(bool); + + /** + * Set the implicit function with which to perform the clipping. If set, +@@ -66,7 +59,7 @@ public: + * function. + */ + void SetClipFunction(vtkImplicitFunction*); +- vtkGetObjectMacro(ClipFunction, vtkImplicitFunction); ++ vtkImplicitFunction* GetClipFunction(); + + vtkMTimeType GetMTime() override; + +@@ -87,17 +80,13 @@ protected: + ~vtkmClip() override; + + int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; +- + int FillInputPortInformation(int port, vtkInformation* info) override; + +- double ClipValue; +- bool ComputeScalars; +- +- vtkImplicitFunction* ClipFunction; +- std::unique_ptr ClipFunctionConverter; +- + vtkTypeBool ForceVTKm = false; + ++ struct internals; ++ std::unique_ptr Internals; ++ + private: + vtkmClip(const vtkmClip&) = delete; + void operator=(const vtkmClip&) = delete; +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx +new file mode 100644 +index 0000000000000000000000000000000000000000..e81b5cdab62a436ef09afac33ffa0599cb9dd2a8 +--- /dev/null ++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx +@@ -0,0 +1,39 @@ ++/*========================================================================= ++ ++ Program: Visualization Toolkit ++ Module: vtkmClipInstantiationsWithField.cxx ++ ++ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen ++ All rights reserved. ++ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ++ ++ This software is distributed WITHOUT ANY WARRANTY; without even ++ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ PURPOSE. See the above copyright notice for more information. ++ ++=========================================================================*/ ++ ++#include "vtkmClipInternals.h" ++#include "vtkmlib/DataSetConverters.h" ++ ++#include ++ ++//------------------------------------------------------------------------------ ++vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField( ++ vtkm::cont::DataSet& in, vtkDataArray* scalars, int assoc) ++{ ++ vtkm::filter::ClipWithField fieldFilter; ++ if (!this->ComputeScalars) ++ { ++ // explicitly convert just the field we need ++ auto inField = tovtkm::Convert(scalars, assoc); ++ in.AddField(inField); ++ // don't pass this field ++ fieldFilter.SetFieldsToPass( ++ vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); ++ } ++ ++ fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS); ++ fieldFilter.SetClipValue(this->ClipValue); ++ return fieldFilter.Execute(in); ++} +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +new file mode 100644 +index 0000000000000000000000000000000000000000..04a637a92d487b019742bbf81884750c48ba105d +--- /dev/null ++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +@@ -0,0 +1,35 @@ ++/*========================================================================= ++ ++ Program: Visualization Toolkit ++ Module: vtkmClipInstantiationsWithImplicitFunction.cxx ++ ++ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen ++ All rights reserved. ++ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ++ ++ This software is distributed WITHOUT ANY WARRANTY; without even ++ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ PURPOSE. See the above copyright notice for more information. ++ ++=========================================================================*/ ++ ++#include "vtkmClipInternals.h" ++#include "vtkmlib/DataSetConverters.h" ++ ++#include ++ ++//------------------------------------------------------------------------------ ++vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::cont::DataSet& in) ++{ ++ auto function = this->ClipFunctionConverter->Get(); ++ ++ vtkm::cont::DataSet result; ++ if (function.GetValid()) ++ { ++ vtkm::filter::ClipWithImplicitFunction functionFilter; ++ functionFilter.SetImplicitFunction(function); ++ result = functionFilter.Execute(in); ++ } ++ ++ return result; ++} +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInternals.h b/Accelerators/Vtkm/Filters/vtkmClipInternals.h +new file mode 100644 +index 0000000000000000000000000000000000000000..5384347bf9d48f04f5d2847753c92b64fc82346e +--- /dev/null ++++ b/Accelerators/Vtkm/Filters/vtkmClipInternals.h +@@ -0,0 +1,37 @@ ++/*========================================================================= ++ ++ Program: Visualization Toolkit ++ Module: vtkmClipInternals.h ++ ++ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen ++ All rights reserved. ++ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. ++ ++ This software is distributed WITHOUT ANY WARRANTY; without even ++ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR ++ PURPOSE. See the above copyright notice for more information. ++ ++=========================================================================*/ ++ ++#ifndef vtkmClipInternals_h ++#define vtkmClipInternals_h ++ ++#include "vtkDataArray.h" ++#include "vtkmClip.h" ++#include "vtkmlib/ImplicitFunctionConverter.h" ++ ++#include ++ ++struct vtkmClip::internals ++{ ++ double ClipValue = .0; ++ bool ComputeScalars = true; ++ ++ vtkImplicitFunction* ClipFunction = nullptr; ++ std::unique_ptr ClipFunctionConverter; ++ ++ vtkm::cont::DataSet ExecuteClipWithImplicitFunction(vtkm::cont::DataSet&); ++ vtkm::cont::DataSet ExecuteClipWithField(vtkm::cont::DataSet&, vtkDataArray*, int); ++}; ++ ++#endif diff --git a/ports/vtk/1f00a0c9.patch b/ports/vtk/1f00a0c9.patch new file mode 100644 index 00000000000000..4cd8f196354c26 --- /dev/null +++ b/ports/vtk/1f00a0c9.patch @@ -0,0 +1,185 @@ +diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +index da8f2e6498c2a08165500fc458eb3c9c7dc0b7e6..147c3c6e175dbd342095805750bfc4fee81735dc 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +@@ -265,7 +265,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3]) + std::lock_guard lock(locator.lock); + if (locator.buildTime < this->GetMTime()) + { +- locator.control.reset(new vtkm::cont::PointLocatorUniformGrid); ++ locator.control.reset(new vtkm::cont::PointLocatorSparseGrid); + locator.control->SetCoordinates(this->Internals->Coordinates); + locator.control->Update(); + locator.buildTime = this->GetMTime(); +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx +index f311f90e17814a05d082a0df67108f242018bb69..7ecfa50e4aa9922987fd33f7b29eb1bf4be3577a 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx +@@ -240,11 +240,11 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkRectilinearGrid* output, vtk + auto coordsArray = vtkm::cont::Cast(vtkmOut.GetCoordinateSystem().GetData()); + + vtkSmartPointer xArray = +- Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetStorage().GetFirstArray())); ++ Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetFirstArray())); + vtkSmartPointer yArray = +- Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetStorage().GetSecondArray())); ++ Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetSecondArray())); + vtkSmartPointer zArray = +- Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetStorage().GetThirdArray())); ++ Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetThirdArray())); + + if (!xArray || !yArray || !zArray) + { +diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx +index 334ec1219dd269e323ae11e61a5a68e9e6e3d2e7..ed9d58fe91713a12e7b2588471275e694f71f618 100644 +--- a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx +@@ -27,7 +27,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmAverageToCells); + +diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx +index 1003f88c4d4e1dcf0be24b7f9f4e6d58e4e735f0..00c722f3162ebb042fb3973bb28a3c1c2fb48c45 100644 +--- a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx +@@ -28,7 +28,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmAverageToPoints); + +diff --git a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx +index 98f0fdb70a296a8dd97df56f706f11e0aca20f32..0cfde7e99f8f07289b08310675ee16f438bc61be 100644 +--- a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx +@@ -30,7 +30,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmCleanGrid); + +diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx +index 2649b2da024310f58159574758d278318e23f4b9..0b1dc86d3bedd425d4846f524818a68ada052ce9 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClip.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx +@@ -39,9 +39,7 @@ + #include + + #include +-#include + #include +-#include + + #include + +diff --git a/Accelerators/Vtkm/Filters/vtkmContour.cxx b/Accelerators/Vtkm/Filters/vtkmContour.cxx +index c9d35a544641a629ee4fb4f54c4d8245be8e6fd5..eae3a03398ffeef8b0f8ec449f89163f8c275122 100644 +--- a/Accelerators/Vtkm/Filters/vtkmContour.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmContour.cxx +@@ -33,7 +33,6 @@ + + #include + #include +-#include + + vtkStandardNewMacro(vtkmContour); + +diff --git a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx +index 58969b5707aab56e6fcd6300ca650c9b2d88e32f..3661060164d738eb9055316fd6c0b023b09ef72f 100644 +--- a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx +@@ -33,7 +33,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmExternalFaces); + +diff --git a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx +index 3606f28de2229436afbcb8b0cf3ed61430055b8e..32bf94f630931a0d052cf5880d950df4588046cb 100644 +--- a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx +@@ -27,7 +27,6 @@ + #include "vtkmFilterPolicy.h" + + #include "vtkm/filter/ExtractStructured.h" +-#include "vtkm/filter/ExtractStructured.hxx" + + vtkStandardNewMacro(vtkmExtractVOI); + +diff --git a/Accelerators/Vtkm/Filters/vtkmGradient.cxx b/Accelerators/Vtkm/Filters/vtkmGradient.cxx +index 9b79c9e5a5e434ae810df73b51bc6bf52cefa829..6aa284878c88e2fcaf243f6721477536891f002f 100644 +--- a/Accelerators/Vtkm/Filters/vtkmGradient.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmGradient.cxx +@@ -31,7 +31,6 @@ + + #include + #include +-#include + + vtkStandardNewMacro(vtkmGradient); + +diff --git a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx +index ed09a73d938997fe0dab1ae7eb4338f4914bad15..c13fd742477686e2dd51e95c4757628630788a77 100644 +--- a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx +@@ -32,7 +32,6 @@ + #include "vtkSmartPointer.h" + + #include "vtkmFilterPolicy.h" +-#include + #include + + vtkStandardNewMacro(vtkmHistogram); +diff --git a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx +index 04ccdce35f14b708c111302c759b5d328225cdef..db8d3f64b5e9b96f9b3e491f044056b14ae1bcdd 100644 +--- a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx +@@ -33,7 +33,6 @@ + #include + // To handle computing custom coordinate sets bounds we need to include + // the following +-#include + + vtkStandardNewMacro(vtkmLevelOfDetail); + +diff --git a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx +index 9906573f18312cb803e5ab2bce30218e4f95772c..685fb618764fc62969b5373cd922aaea7d1311e3 100644 +--- a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx +@@ -33,7 +33,6 @@ + + #include "vtkm/cont/Error.h" + #include "vtkm/filter/PointTransform.h" +-#include "vtkm/filter/PointTransform.hxx" + + #include "vtkmFilterPolicy.h" + +diff --git a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx +index 7604acd333978a72b1e34584d14640e097b34292..647514050c42771cda57b439280d238de72911e2 100644 +--- a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx +@@ -31,7 +31,6 @@ + #include "vtkmFilterPolicy.h" + + #include +-#include + + vtkStandardNewMacro(vtkmThreshold); + +diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m b/ThirdParty/vtkm/vtkvtkm/vtk-m +index 0457427ed7b4d21e1a8e33e96713414ca11a42fc..ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7 160000 +--- a/ThirdParty/vtkm/vtkvtkm/vtk-m ++++ b/ThirdParty/vtkm/vtkvtkm/vtk-m +@@ -1 +1 @@ +-Subproject commit 0457427ed7b4d21e1a8e33e96713414ca11a42fc ++Subproject commit ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7 diff --git a/ports/vtk/6811.patch b/ports/vtk/6811.patch deleted file mode 100644 index 86dca7ea0ca298..00000000000000 --- a/ports/vtk/6811.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 34b9d59acb1688f4a9f38908760d5756a0e05ee4 Mon Sep 17 00:00:00 2001 -From: Julien Schueller -Date: Fri, 24 Apr 2020 08:28:23 -0400 -Subject: [PATCH] vtk_hdf5: Stick to 1.10.x API - -Closes #17866 ---- - ThirdParty/hdf5/vtk_hdf5.h.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ThirdParty/hdf5/vtk_hdf5.h.in b/ThirdParty/hdf5/vtk_hdf5.h.in -index 1d802937ba..c4738b2cbf 100644 ---- a/ThirdParty/hdf5/vtk_hdf5.h.in -+++ b/ThirdParty/hdf5/vtk_hdf5.h.in -@@ -18,6 +18,8 @@ - /* Use the hdf5 library configured for VTK. */ - #cmakedefine01 VTK_MODULE_USE_EXTERNAL_vtkhdf5 - -+#define H5_USE_110_API -+ - #if VTK_MODULE_USE_EXTERNAL_vtkhdf5 - #cmakedefine01 vtkhdf5_is_parallel - #if vtkhdf5_is_parallel --- -GitLab - diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL deleted file mode 100644 index 64ca10961d653c..00000000000000 --- a/ports/vtk/CONTROL +++ /dev/null @@ -1,50 +0,0 @@ -Source: vtk -Version: 9.0.1 -Port-Version: 7 -Description: Software system for 3D computer graphics, image processing, and visualization -Homepage: https://github.com/Kitware/VTK -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2 - -Feature: vtkm -Description: Build with vtk-m accelerator and module. -Build-Depends: vtk-m[core] - -Feature: openvr -Description: OpenVR functionality for VTK -Build-Depends: sdl2, openvr - -Feature: qt -Description: Qt functionality for VTK -Build-Depends: qt5-xmlpatterns, qt5-tools, qt5-imageformats, qt5-x11extras (linux) - -Feature: mpi -Description: MPI functionality for VTK -Build-Depends: mpi, hdf5[core, parallel], vtk-m[core,mpi] - -Feature: python -Description: Python functionality for VTK -Build-Depends: python3 - -Feature: atlmfc -Description: Mfc functionality for vtk on Windows -Build-Depends: atlmfc (windows) - -Feature: paraview -Description: Build vtk modules required by paraview -Build-Depends: vtk[core, qt], vtk[core, atlmfc] (windows) - -Feature: cuda -Description: Support CUDA compilation -Build-Depends: cuda - -Feature: opengl -Description: All opengl related modules -Build-Depends: vtk[core] - -Feature: utf8 -Description: Enables vtk reader/writer with utf-8 path support -Build-Depends: vtk[core] - -Feature: all -Description: Build all vtk modules -Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc, utf8] (windows) diff --git a/ports/vtk/FindPostgreSQL.cmake b/ports/vtk/FindPostgreSQL.cmake deleted file mode 100644 index 913c8b9ae2653b..00000000000000 --- a/ports/vtk/FindPostgreSQL.cmake +++ /dev/null @@ -1,269 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. - -#[=======================================================================[.rst: -FindPostgreSQL --------------- - -Find the PostgreSQL installation. - -IMPORTED Targets -^^^^^^^^^^^^^^^^ - -This module defines :prop_tgt:`IMPORTED` target ``PostgreSQL::PostgreSQL`` -if PostgreSQL has been found. - -Result Variables -^^^^^^^^^^^^^^^^ - -This module will set the following variables in your project: - -``PostgreSQL_FOUND`` - True if PostgreSQL is found. -``PostgreSQL_LIBRARIES`` - the PostgreSQL libraries needed for linking -``PostgreSQL_INCLUDE_DIRS`` - the directories of the PostgreSQL headers -``PostgreSQL_LIBRARY_DIRS`` - the link directories for PostgreSQL libraries -``PostgreSQL_VERSION_STRING`` - the version of PostgreSQL found -#]=======================================================================] - -# ---------------------------------------------------------------------------- -# History: -# This module is derived from the module originally found in the VTK source tree. -# -# ---------------------------------------------------------------------------- -# Note: -# PostgreSQL_ADDITIONAL_VERSIONS is a variable that can be used to set the -# version number of the implementation of PostgreSQL. -# In Windows the default installation of PostgreSQL uses that as part of the path. -# E.g C:\Program Files\PostgreSQL\8.4. -# Currently, the following version numbers are known to this module: -# "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0" -# -# To use this variable just do something like this: -# set(PostgreSQL_ADDITIONAL_VERSIONS "9.2" "8.4.4") -# before calling find_package(PostgreSQL) in your CMakeLists.txt file. -# This will mean that the versions you set here will be found first in the order -# specified before the default ones are searched. -# -# ---------------------------------------------------------------------------- -# You may need to manually set: -# PostgreSQL_INCLUDE_DIR - the path to where the PostgreSQL include files are. -# PostgreSQL_LIBRARY_DIR - The path to where the PostgreSQL library files are. -# If FindPostgreSQL.cmake cannot find the include files or the library files. -# -# ---------------------------------------------------------------------------- -# The following variables are set if PostgreSQL is found: -# PostgreSQL_FOUND - Set to true when PostgreSQL is found. -# PostgreSQL_INCLUDE_DIRS - Include directories for PostgreSQL -# PostgreSQL_LIBRARY_DIRS - Link directories for PostgreSQL libraries -# PostgreSQL_LIBRARIES - The PostgreSQL libraries. -# -# The ``PostgreSQL::PostgreSQL`` imported target is also created. -# -# ---------------------------------------------------------------------------- -# If you have installed PostgreSQL in a non-standard location. -# (Please note that in the following comments, it is assumed that -# points to the root directory of the include directory of PostgreSQL.) -# Then you have three options. -# 1) After CMake runs, set PostgreSQL_INCLUDE_DIR to /include and -# PostgreSQL_LIBRARY_DIR to wherever the library pq (or libpq in windows) is -# 2) Use CMAKE_INCLUDE_PATH to set a path to /PostgreSQL<-version>. This will allow find_path() -# to locate PostgreSQL_INCLUDE_DIR by utilizing the PATH_SUFFIXES option. e.g. In your CMakeLists.txt file -# set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH} "/include") -# 3) Set an environment variable called ${PostgreSQL_ROOT} that points to the root of where you have -# installed PostgreSQL, e.g. . -# -# ---------------------------------------------------------------------------- - -set(PostgreSQL_INCLUDE_PATH_DESCRIPTION "top-level directory containing the PostgreSQL include directories. E.g /usr/local/include/PostgreSQL/8.4 or C:/Program Files/PostgreSQL/8.4/include") -set(PostgreSQL_INCLUDE_DIR_MESSAGE "Set the PostgreSQL_INCLUDE_DIR cmake cache entry to the ${PostgreSQL_INCLUDE_PATH_DESCRIPTION}") -set(PostgreSQL_LIBRARY_PATH_DESCRIPTION "top-level directory containing the PostgreSQL libraries.") -set(PostgreSQL_LIBRARY_DIR_MESSAGE "Set the PostgreSQL_LIBRARY_DIR cmake cache entry to the ${PostgreSQL_LIBRARY_PATH_DESCRIPTION}") -set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to where PostgreSQL is found on the machine E.g C:/Program Files/PostgreSQL/8.4") - - -set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} - "11" "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") - -# Define additional search paths for root directories. -set( PostgreSQL_ROOT_DIRECTORIES - ENV PostgreSQL_ROOT - ${PostgreSQL_ROOT} -) -foreach(suffix ${PostgreSQL_KNOWN_VERSIONS}) - if(WIN32) - list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES - "PostgreSQL/${suffix}/lib") - list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES - "PostgreSQL/${suffix}/include") - list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES - "PostgreSQL/${suffix}/include/server") - endif() - if(UNIX) - list(APPEND PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES - "pgsql-${suffix}/lib") - list(APPEND PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES - "pgsql-${suffix}/include") - list(APPEND PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES - "postgresql/${suffix}/server" - "pgsql-${suffix}/include/server") - endif() -endforeach() - -# -# Look for an installation. -# -find_path(PostgreSQL_INCLUDE_DIR - NAMES libpq-fe.h - PATHS - # Look in other places. - ${PostgreSQL_ROOT_DIRECTORIES} - PATH_SUFFIXES - pgsql - postgresql - include - ${PostgreSQL_INCLUDE_ADDITIONAL_SEARCH_SUFFIXES} - # Help the user find it if we cannot. - DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" -) - -find_path(PostgreSQL_TYPE_INCLUDE_DIR - NAMES catalog/pg_type.h - PATHS - # Look in other places. - ${PostgreSQL_ROOT_DIRECTORIES} - PATH_SUFFIXES - postgresql - pgsql/server - postgresql/server - include/server - ${PostgreSQL_TYPE_ADDITIONAL_SEARCH_SUFFIXES} - # Help the user find it if we cannot. - DOC "The ${PostgreSQL_INCLUDE_DIR_MESSAGE}" -) - -# The PostgreSQL library. -set (PostgreSQL_LIBRARY_TO_FIND pq) -# Setting some more prefixes for the library -set (PostgreSQL_LIB_PREFIX "") -if ( WIN32 ) - set (PostgreSQL_LIB_PREFIX ${PostgreSQL_LIB_PREFIX} "lib") - set (PostgreSQL_LIBRARY_TO_FIND ${PostgreSQL_LIB_PREFIX}${PostgreSQL_LIBRARY_TO_FIND}) -endif() - -function(__postgresql_find_library _name) - find_library(${_name} - NAMES ${ARGN} - PATHS - ${PostgreSQL_ROOT_DIRECTORIES} - PATH_SUFFIXES - lib - ${PostgreSQL_LIBRARY_ADDITIONAL_SEARCH_SUFFIXES} - # Help the user find it if we cannot. - DOC "The ${PostgreSQL_LIBRARY_DIR_MESSAGE}" - ) -endfunction() - -# For compatibility with versions prior to this multi-config search, honor -# any PostgreSQL_LIBRARY that is already specified and skip the search. -if(PostgreSQL_LIBRARY) - set(PostgreSQL_LIBRARIES "${PostgreSQL_LIBRARY}") - get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY}" PATH) -else() - __postgresql_find_library(PostgreSQL_LIBRARY_RELEASE ${PostgreSQL_LIBRARY_TO_FIND}) - __postgresql_find_library(PostgreSQL_LIBRARY_DEBUG ${PostgreSQL_LIBRARY_TO_FIND}d) - include(SelectLibraryConfigurations) - select_library_configurations(PostgreSQL) - mark_as_advanced(PostgreSQL_LIBRARY_RELEASE PostgreSQL_LIBRARY_DEBUG) - if(PostgreSQL_LIBRARY_RELEASE) - get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY_RELEASE}" PATH) - elseif(PostgreSQL_LIBRARY_DEBUG) - get_filename_component(PostgreSQL_LIBRARY_DIR "${PostgreSQL_LIBRARY_DEBUG}" PATH) - else() - set(PostgreSQL_LIBRARY_DIR "") - endif() -endif() - -if (PostgreSQL_INCLUDE_DIR) - # Some platforms include multiple pg_config.hs for multi-lib configurations - # This is a temporary workaround. A better solution would be to compile - # a dummy c file and extract the value of the symbol. - file(GLOB _PG_CONFIG_HEADERS "${PostgreSQL_INCLUDE_DIR}/pg_config*.h") - foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS}) - if(EXISTS "${_PG_CONFIG_HEADER}") - file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str - REGEX "^#define[\t ]+PG_VERSION_NUM[\t ]+.*") - if(pgsql_version_str) - string(REGEX REPLACE "^#define[\t ]+PG_VERSION_NUM[\t ]+([0-9]*).*" - "\\1" _PostgreSQL_VERSION_NUM "${pgsql_version_str}") - break() - endif() - endif() - endforeach() - if (_PostgreSQL_VERSION_NUM) - math(EXPR _PostgreSQL_major_version "${_PostgreSQL_VERSION_NUM} / 10000") - math(EXPR _PostgreSQL_minor_version "${_PostgreSQL_VERSION_NUM} % 10000") - set(PostgreSQL_VERSION_STRING "${_PostgreSQL_major_version}.${_PostgreSQL_minor_version}") - unset(_PostgreSQL_major_version) - unset(_PostgreSQL_minor_version) - else () - foreach(_PG_CONFIG_HEADER ${_PG_CONFIG_HEADERS}) - if(EXISTS "${_PG_CONFIG_HEADER}") - file(STRINGS "${_PG_CONFIG_HEADER}" pgsql_version_str - REGEX "^#define[\t ]+PG_VERSION[\t ]+\".*\"") - if(pgsql_version_str) - string(REGEX REPLACE "^#define[\t ]+PG_VERSION[\t ]+\"([^\"]*)\".*" - "\\1" PostgreSQL_VERSION_STRING "${pgsql_version_str}") - break() - endif() - endif() - endforeach() - endif () - unset(_PostgreSQL_VERSION_NUM) - unset(pgsql_version_str) -endif() - -# Did we find anything? -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(PostgreSQL - REQUIRED_VARS PostgreSQL_LIBRARY PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR - VERSION_VAR PostgreSQL_VERSION_STRING) -set(PostgreSQL_FOUND ${POSTGRESQL_FOUND}) - -function(__postgresql_import_library _target _var _config) - if(_config) - set(_config_suffix "_${_config}") - else() - set(_config_suffix "") - endif() - - set(_lib "${${_var}${_config_suffix}}") - if(EXISTS "${_lib}") - if(_config) - set_property(TARGET ${_target} APPEND PROPERTY - IMPORTED_CONFIGURATIONS ${_config}) - endif() - set_target_properties(${_target} PROPERTIES - IMPORTED_LOCATION${_config_suffix} "${_lib}") - endif() -endfunction() - -# Now try to get the include and library path. -if(PostgreSQL_FOUND) - if (NOT TARGET PostgreSQL::PostgreSQL) - add_library(PostgreSQL::PostgreSQL UNKNOWN IMPORTED) - set_target_properties(PostgreSQL::PostgreSQL PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${PostgreSQL_INCLUDE_DIR};${PostgreSQL_TYPE_INCLUDE_DIR}") - __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "") - __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "RELEASE") - __postgresql_import_library(PostgreSQL::PostgreSQL PostgreSQL_LIBRARY "DEBUG") - endif () - set(PostgreSQL_INCLUDE_DIRS ${PostgreSQL_INCLUDE_DIR} ${PostgreSQL_TYPE_INCLUDE_DIR} ) - set(PostgreSQL_LIBRARY_DIRS ${PostgreSQL_LIBRARY_DIR} ) -endif() - -mark_as_advanced(PostgreSQL_INCLUDE_DIR PostgreSQL_TYPE_INCLUDE_DIR) diff --git a/ports/vtk/d107698a.patch b/ports/vtk/d107698a.patch new file mode 100644 index 00000000000000..1a7ac087789cd3 --- /dev/null +++ b/ports/vtk/d107698a.patch @@ -0,0 +1,291 @@ +diff --git a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h +index 0b3f1a963063cdf5f1685dbde55deaaea7a77d2f..24198dada846d6d81fb9f1c155e5a6612e1e7055 100644 +--- a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h ++++ b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + #include // for std::underlying_type + +diff --git a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx +index ec41b18b60db354a8c4a1532eb5cedfd70ce7534..2493ae5b03cf29c5dfc90614489a8049fc623715 100644 +--- a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx ++++ b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx +@@ -274,18 +274,19 @@ vtkm::cont::testing::MakeTestDataSet Maker; + void TestUniformDataSet() + { + auto dataset = Maker.Make3DUniformDataSet0(); +- auto coords = +- dataset.GetCoordinateSystem().GetData().Cast(); ++ auto coords = dataset.GetCoordinateSystem() ++ .GetData() ++ .AsArrayHandle(); + auto portal = coords.ReadPortal(); + auto dims = portal.GetDimensions(); + auto origin = portal.GetOrigin(); + auto spacing = portal.GetSpacing(); + + vtkNew pointField, cellField; +- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), ++ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), + "pointvar", pointField); +- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", +- cellField); ++ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), ++ "cellvar", cellField); + + vtkNew imageData; + imageData->SetDimensions(dims[0], dims[1], dims[2]); +@@ -315,10 +316,10 @@ void TestCurvilinearDataSet() + CoordsCopy(dataset.GetCoordinateSystem(), points); + + vtkNew pointField, cellField; +- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), ++ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), + "pointvar", pointField); +- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", +- cellField); ++ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), ++ "cellvar", cellField); + + vtkNew dsVtk; + dsVtk->SetDimensions(dims[0], dims[1], dims[2]); +@@ -357,10 +358,10 @@ void TestExplicitDataSet() + } + + vtkNew pointField, cellField; +- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), ++ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), + "pointvar", pointField); +- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", +- cellField); ++ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), ++ "cellvar", cellField); + + vtkNew dsVtk; + dsVtk->SetPoints(points); +diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +index 147c3c6e175dbd342095805750bfc4fee81735dc..f1ef72ffae91ca843ca56bdc305ab68bbc955157 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx +@@ -35,8 +35,7 @@ + #include + #include + #include +-#include +-#include ++#include + #include + + #include +@@ -62,8 +61,8 @@ struct vtkmDataSet::DataMembers + vtkm::cont::CoordinateSystem Coordinates; + vtkNew Cell; + +- VtkmLocator PointLocator; +- VtkmLocator CellLocator; ++ VtkmLocator PointLocator; ++ VtkmLocator CellLocator; + }; + + //------------------------------------------------------------------------------ +@@ -172,7 +171,7 @@ void vtkmDataSet::GetCellBounds(vtkIdType cellId, double bounds[6]) + this->Internals->CellSet.IsType>()) + { + auto portal = this->Internals->Coordinates.GetData() +- .Cast() ++ .AsArrayHandle() + .ReadPortal(); + + vtkm::internal::ConnectivityStructuredInternals<3> helper; +@@ -279,7 +278,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3]) + vtkm::Id pointId = -1; + vtkm::FloatDefault d2 = 0; + // exec object created for the Serial device can be called directly +- execLocator->FindNearestNeighbor(point, pointId, d2); ++ execLocator.FindNearestNeighbor(point, pointId, d2); + return pointId; + } + +@@ -316,7 +315,7 @@ vtkIdType vtkmDataSet::FindCell(double x[3], vtkCell*, vtkGenericCell*, vtkIdTyp + vtkm::Vec pc; + vtkm::Id cellId = -1; + // exec object created for the Serial device can be called directly +- execLocator->FindCell(point, cellId, pc); ++ execLocator.FindCell(point, cellId, pc); + + if (cellId >= 0) + { +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx +index 351c0d5ce169cf455d2d3c0a1307ba8e60510371..c7ecff3c9fc5eafecb9dd11d9dbea15cbd44bd3d 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx +@@ -121,7 +121,7 @@ bool Convert( + return false; + } + +- auto points = cs.GetData().Cast(); ++ auto points = cs.GetData().AsArrayHandle(); + auto portal = points.ReadPortal(); + + auto origin = portal.GetOrigin(); +@@ -156,7 +156,7 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSe + return false; + } + +- auto points = cs.GetData().Cast(); ++ auto points = cs.GetData().AsArrayHandle(); + auto portal = points.ReadPortal(); + + auto dim = portal.GetDimensions(); +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx +index f2411d0e70505435cd312ee23b3cb2e653eb28d8..814af43cc168b4c3b44107b0c19e68cc1b42538d 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx +@@ -52,8 +52,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + box->GetXMin(xmin); + box->GetXMax(xmax); + +- auto b = new vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); +- this->OutFunction.Reset(b, true); ++ this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); + } + else if ((cylinder = vtkCylinder::SafeDownCast(function))) + { +@@ -62,9 +61,8 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + cylinder->GetAxis(axis); + radius = cylinder->GetRadius(); + +- auto c = new vtkm::Cylinder( +- MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); +- this->OutFunction.Reset(c, true); ++ this->OutFunction = ++ vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); + } + else if ((plane = vtkPlane::SafeDownCast(function))) + { +@@ -72,8 +70,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + plane->GetOrigin(origin); + plane->GetNormal(normal); + +- auto p = new vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); +- this->OutFunction.Reset(p, true); ++ this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); + } + else if ((sphere = vtkSphere::SafeDownCast(function))) + { +@@ -81,8 +78,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + sphere->GetCenter(center); + radius = sphere->GetRadius(); + +- auto s = new vtkm::Sphere(MakeFVec3(center), static_cast(radius)); +- this->OutFunction.Reset(s, true); ++ this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast(radius)); + } + else + { +@@ -95,7 +91,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) + this->InFunction = function; + } + +-const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const ++const vtkm::ImplicitFunctionGeneral& ImplicitFunctionConverter::Get() + { + if (this->InFunction && (this->MTime < this->InFunction->GetMTime())) + { +@@ -110,9 +106,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + box->GetXMin(xmin); + box->GetXMax(xmax); + +- auto b = static_cast(this->OutFunction.Get()); +- b->SetMinPoint(MakeFVec3(xmin)); +- b->SetMaxPoint(MakeFVec3(xmax)); ++ this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); + } + else if ((cylinder = vtkCylinder::SafeDownCast(this->InFunction))) + { +@@ -121,10 +115,8 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + cylinder->GetAxis(axis); + radius = cylinder->GetRadius(); + +- auto c = static_cast(this->OutFunction.Get()); +- c->SetCenter(MakeFVec3(center)); +- c->SetAxis(MakeFVec3(axis)); +- c->SetRadius(static_cast(radius)); ++ this->OutFunction = ++ vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); + } + else if ((plane = vtkPlane::SafeDownCast(this->InFunction))) + { +@@ -132,9 +124,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + plane->GetOrigin(origin); + plane->GetNormal(normal); + +- auto p = static_cast(this->OutFunction.Get()); +- p->SetOrigin(MakeFVec3(origin)); +- p->SetNormal(MakeFVec3(normal)); ++ this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); + } + else if ((sphere = vtkSphere::SafeDownCast(this->InFunction))) + { +@@ -142,9 +132,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const + sphere->GetCenter(center); + radius = sphere->GetRadius(); + +- auto s = static_cast(this->OutFunction.Get()); +- s->SetCenter(MakeFVec3(center)); +- s->SetRadius(static_cast(radius)); ++ this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast(radius)); + } + + this->MTime = this->InFunction->GetMTime(); +diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h +index 10e2ae99ae819ca86516bf7ab5a0988c75b6323e..a1a571c93d44a7d62f79afc86aab05d1f359af82 100644 +--- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h ++++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h +@@ -20,7 +20,7 @@ + #include "vtkType.h" // For vtkMTimeType + #include "vtkmConfigDataModel.h" //required for general vtkm setup + +-#include "vtkm/cont/ImplicitFunctionHandle.h" ++#include "vtkm/ImplicitFunction.h" + + class vtkImplicitFunction; + +@@ -33,11 +33,11 @@ public: + ImplicitFunctionConverter(); + + void Set(vtkImplicitFunction*); +- const vtkm::cont::ImplicitFunctionHandle& Get() const; ++ const vtkm::ImplicitFunctionGeneral& Get(); + + private: + vtkImplicitFunction* InFunction; +- vtkm::cont::ImplicitFunctionHandle OutFunction; ++ vtkm::ImplicitFunctionGeneral OutFunction; + mutable vtkMTimeType MTime; + }; + +diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +index 04a637a92d487b019742bbf81884750c48ba105d..674d9b6e0dfe36edd787e519e70ec0bf46602c81 100644 +--- a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx ++++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx +@@ -24,12 +24,9 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::c + auto function = this->ClipFunctionConverter->Get(); + + vtkm::cont::DataSet result; +- if (function.GetValid()) +- { +- vtkm::filter::ClipWithImplicitFunction functionFilter; +- functionFilter.SetImplicitFunction(function); +- result = functionFilter.Execute(in); +- } ++ vtkm::filter::ClipWithImplicitFunction functionFilter; ++ functionFilter.SetImplicitFunction(function); ++ result = functionFilter.Execute(in); + + return result; + } diff --git a/ports/vtk/fix-freetype.patch b/ports/vtk/fix-freetype.patch deleted file mode 100644 index aaaf35174d420b..00000000000000 --- a/ports/vtk/fix-freetype.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx -index c54289dc..e6d9b14f 100644 ---- a/Rendering/FreeType/vtkFreeTypeTools.cxx -+++ b/Rendering/FreeType/vtkFreeTypeTools.cxx -@@ -378,7 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() - } - - //---------------------------------------------------------------------------- --FT_CALLBACK_DEF(FT_Error) -+FT_Error - vtkFreeTypeToolsFaceRequester( - FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) - { -diff --git a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx -index 5c1908cf..41ed97e7 100644 ---- a/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx -+++ b/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx -@@ -29,7 +29,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTypeTools); - namespace - { - // The FreeType face requester callback: --FT_CALLBACK_DEF(FT_Error) -+static FT_Error - vtkFontConfigFreeTypeToolsFaceRequester( - FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) - { diff --git a/ports/vtk/module-name-mangling.patch b/ports/vtk/module-name-mangling.patch deleted file mode 100644 index d1bc96c3961099..00000000000000 --- a/ports/vtk/module-name-mangling.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMake/vtkModule.cmake -+++ b/CMake/vtkModule.cmake -@@ -4409,6 +4409,15 @@ endif ()\n\n") - foreach (_vtk_export_module IN LISTS _vtk_export_MODULES) - get_property(_vtk_export_target_name GLOBAL - PROPERTY "_vtk_module_${_vtk_export_module}_target_name") -+ # Use the export name of the target if it has one set. -+ get_property(_vtk_export_target_has_export_name -+ TARGET "${_vtk_export_target_name}" -+ PROPERTY EXPORT_NAME SET) -+ if (_vtk_export_target_has_export_name) -+ get_property(_vtk_export_target_name -+ TARGET "${_vtk_export_target_name}" -+ PROPERTY EXPORT_NAME) -+ endif () - set(_vtk_export_base "_vtk_module_find_package_${_vtk_export_module}") - get_property(_vtk_export_packages GLOBAL - PROPERTY "${_vtk_export_base}") diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 79dec0b4749d75..b9af50ad87860d 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -25,7 +25,9 @@ if("atlmfc" IN_LIST FEATURES) endif() if("vtkm" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKm=YES + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES -DVTK_MODULE_ENABLE_VTK_vtkm=YES ) endif() @@ -37,8 +39,10 @@ if("python" IN_LIST FEATURES) -DVTK_PYTHON_VERSION=3 -DPython3_FIND_REGISTRY=NEVER "-DPython3_EXECUTABLE:PATH=${PYTHON3}" + -DVTK_MODULE_ENABLE_VTK_Python=YES + -DVTK_MODULE_ENABLE_VTK_PythonContext2D=YES + -DVTK_MODULE_ENABLE_VTK_PythonInterpreter=YES ) - #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages endif() @@ -56,7 +60,9 @@ if("paraview" IN_LIST FEATURES) -DVTK_MODULE_ENABLE_VTK_IOVPIC=YES -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES + -DVTK_MODULE_ENABLE_VTK_DomainsChemistry=YES -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=YES ) if("python" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS @@ -123,42 +129,34 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # ============================================================================= # Clone & patch -# This patch is huge, we prefer to download it on demand -vcpkg_download_distfile(QT_NO_KEYWORDS_PATCH - URLS "https://github.com/Kitware/VTK/commit/64265c5fd1a8e26a6a81241284dea6b3272f6db6.diff" - FILENAME 64265c5fd1a8e26a6a81241284dea6b3272f6db6.diff - SHA512 08991f07b30b893b14e906017b77fb700a8298a3a8906086a0c4b67688c1c0431b3d6bf890df70bd3ebf963cbb9c035b5dbcb9d7593e8c716c3a594ccb9a0fc7 -) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/VTK - REF 96e6fa9b3ff245e4d51d49f23d40e9ad8774e85e # v9.0.1 - SHA512 0efb1845053b6143e5ee7fa081b8be98f6825262c59051e88b2be02497e23362055067b2f811eff82e93eb194e5a9afd2a12e3878a252eb4011a5dab95127a6f + REF 2959413ff190bc6e3ff40f5b6c1342edd2e5233f # v9.0.x used by ParaView 5.9.1 + SHA512 16229c107ed904e8fa6850c3814b8bdcdf9700ef44f6ff5b3a77e7d793ce19954fc2c7b1219a0162cf588def6e990883cd3f808c316a4db6e65bd6cd1769dd3f HEAD_REF master PATCHES - 6811.patch - FindLZMA.patch # Will be fixed in 9.1? + FindLZMA.patch FindLZ4.patch Findproj.patch - vtkm.patch # To include an external VTKm build (v.1.5 required) pegtl.patch pythonwrapper.patch # Required by ParaView to Wrap required classes NoUndefDebug.patch # Required to link against correct Python library depending on build type. python_debug.patch fix-using-hdf5.patch - module-name-mangling.patch + # CHECK: module-name-mangling.patch # Last patch TODO: Patch out internal loguru FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat - fix-freetype.patch # Should be fixed next version, !7367 + !7434 - # Remove these 2 official patches in the next update - ${QT_NO_KEYWORDS_PATCH} - 0002-Qt-enforce-QT_NO_KEYWORDS-builds-by-VTK-itself.patch + # upstream vtkm patches to make it work with vtkm 1.6 + vtkm.patch # To include an external VTKm build + 1f00a0c9.patch + 156fb524.patch + d107698a.patch ) # ============================================================================= #Overwrite outdated modules if they have not been patched: -file(COPY "${CURRENT_PORT_DIR}/FindPostgreSQL.cmake" DESTINATION "${SOURCE_PATH}/CMake") # will be backported from CMake in VTK in a future release file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c # ============================================================================= @@ -173,11 +171,6 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DVTK_BUILD_TESTING=OFF -DVTK_BUILD_EXAMPLES=OFF - -DVTK_INSTALL_INCLUDE_DIR=include - -DVTK_INSTALL_DATA_DIR=share/vtk/data - -DVTK_INSTALL_DOC_DIR=share/vtk/doc - -DVTK_INSTALL_PACKAGE_DIR=share/vtk - -DVTK_INSTALL_RUNTIME_DIR=bin -DVTK_FORBID_DOWNLOADS=ON -DVTK_ENABLE_REMOTE_MODULES=OFF # VTK groups to enable @@ -199,44 +192,18 @@ vcpkg_copy_pdbs() # Fixup target files vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtk-9.0) -# TODO: Check if the following is still required -# For some reason the references to the XDMF libraries in the target files do not end up -# correctly, so we fix them here. -# if(VTK_WITH_ALL_MODULES) - # file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake VTK_TARGETS_RELEASE_CONTENT) - # string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - # string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - # string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - # string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}") - # file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake "${VTK_TARGETS_RELEASE_CONTENT}") - - # file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake VTK_TARGETS_DEBUG_CONTENT) - # string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - # string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - # string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - # string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}") - # file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake "${VTK_TARGETS_DEBUG_CONTENT}") -# endif() -# ============================================================================= -# Remove other files and directories that are not valid for vcpkg -# if(VTK_WITH_ALL_MODULES) - # file(REMOVE ${CURRENT_PACKAGES_DIR}/XdmfConfig.cmake) - # file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/XdmfConfig.cmake) -# endif() - # ============================================================================= # Clean-up other directories - # Delete the debug binary TOOL_NAME that is not required function(_vtk_remove_debug_tool TOOL_NAME) - set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - if(EXISTS ${filename}) - file(REMOVE ${filename}) + set(filename "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(EXISTS "${filename}") + file(REMOVE "${filename}") endif() - set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}) - if(EXISTS ${filename}) - file(REMOVE ${filename}) + set(filename "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}d${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + if(EXISTS "${filename}") + file(REMOVE "${filename}") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) # we also have to bend the lines referencing the tools in VTKTargets-debug.cmake @@ -251,9 +218,9 @@ endfunction() # Move the release binary TOOL_NAME from bin to tools function(_vtk_move_release_tool TOOL_NAME) set(old_filename "${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - if(EXISTS ${old_filename}) - file(INSTALL ${old_filename} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk" USE_SOURCE_PERMISSIONS) - file(REMOVE ${old_filename}) + if(EXISTS "${old_filename}") + file(INSTALL "${old_filename}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/vtk" USE_SOURCE_PERMISSIONS) + file(REMOVE "${old_filename}") endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) @@ -290,36 +257,31 @@ foreach(TOOL_NAME IN LISTS VTK_TOOLS) endforeach() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/vtk") ## Files Modules needed by ParaView if("paraview" IN_LIST FEATURES) set(VTK_CMAKE_NEEDED vtkCompilerChecks vtkCompilerPlatformFlags vtkCompilerExtraFlags vtkInitializeBuildType - vtkSupportMacros vtkDirectories vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData) + vtkSupportMacros vtkVersion FindPythonModules vtkModuleDebugging vtkExternalData) foreach(module ${VTK_CMAKE_NEEDED}) file(INSTALL "${SOURCE_PATH}/CMake/${module}.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") endforeach() ## Check List on UPDATE !! file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") + file(INSTALL "${SOURCE_PATH}/Rendering/Volume/vtkBlockSortHelper.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK + file(INSTALL "${SOURCE_PATH}/Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + file(INSTALL "${SOURCE_PATH}/Parallel/DIY/vtkDIYUtilities.txx" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") - file(INSTALL "${SOURCE_PATH}/GUISupport/Qt/QVTKOpenGLWidget.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # Legacy header - - file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRange.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK - file(INSTALL "${SOURCE_PATH}/Common/Core/vtkRangeIterableTraits.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK - file(INSTALL "${SOURCE_PATH}/Common/DataModel/vtkCompositeDataSetNodeReference.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK - #ParaView requires some internal headers - file(INSTALL "${SOURCE_PATH}/Rendering/Annotation/vtkScalarBarActorInternal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") - file(INSTALL "${SOURCE_PATH}/Filters/Statistics/vtkStatisticsAlgorithmPrivate.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") - file(INSTALL "${SOURCE_PATH}/Rendering/OpenGL2/vtkCompositePolyDataMapper2Internal.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -346,4 +308,4 @@ endforeach() # ============================================================================= # Handle copyright -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json new file mode 100644 index 00000000000000..725ace01db526e --- /dev/null +++ b/ports/vtk/vcpkg.json @@ -0,0 +1,174 @@ +{ + "name": "vtk", + "version-semver": "9.0.3-pv5.9.1", + "description": "Software system for 3D computer graphics, image processing, and visualization", + "homepage": "https://github.com/Kitware/VTK", + "dependencies": [ + "double-conversion", + "eigen3", + "expat", + "freetype", + "glew", + { + "name": "hdf5", + "default-features": false + }, + "jsoncpp", + { + "name": "libharu", + "features": [ + "notiffsymbols" + ] + }, + "libjpeg-turbo", + "liblzma", + "libogg", + "libpng", + "libtheora", + "libxml2", + "lz4", + "netcdf-c", + "pegtl-2", + "proj4", + "pugixml", + "sqlite3", + "tiff", + "utfcpp", + "zlib" + ], + "features": { + "all": { + "description": "Build all vtk modules", + "dependencies": [ + "ffmpeg", + "gdal", + "libmysql", + { + "name": "vtk", + "default-features": false, + "features": [ + "mpi", + "python", + "qt" + ] + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "atlmfc", + "utf8" + ], + "platform": "windows" + } + ] + }, + "atlmfc": { + "description": "Mfc functionality for vtk on Windows", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + } + ] + }, + "cuda": { + "description": "Support CUDA compilation", + "dependencies": [ + "cuda" + ] + }, + "mpi": { + "description": "MPI functionality for VTK", + "dependencies": [ + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + }, + "mpi", + { + "name": "vtk-m", + "default-features": false, + "features": [ + "mpi" + ] + } + ] + }, + "opengl": { + "description": "All opengl related modules", + "dependencies": [ + { + "name": "vtk", + "default-features": false + } + ] + }, + "openvr": { + "description": "OpenVR functionality for VTK", + "dependencies": [ + "openvr", + "sdl2" + ] + }, + "paraview": { + "description": "Build vtk modules required by paraview", + "dependencies": [ + { + "name": "vtk", + "default-features": false, + "features": [ + "qt" + ] + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "atlmfc" + ], + "platform": "windows" + } + ] + }, + "python": { + "description": "Python functionality for VTK", + "dependencies": [ + "python3" + ] + }, + "qt": { + "description": "Qt functionality for VTK", + "dependencies": [ + "qt5-imageformats", + "qt5-tools", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + "qt5-xmlpatterns" + ] + }, + "utf8": { + "description": "Enables vtk reader/writer with utf-8 path support", + "dependencies": [ + { + "name": "vtk", + "default-features": false + } + ] + }, + "vtkm": { + "description": "Build with vtk-m accelerator and module.", + "dependencies": [ + { + "name": "vtk-m", + "default-features": false + } + ] + } + } +} diff --git a/ports/vtk/vtkm.patch b/ports/vtk/vtkm.patch index 27b7f40940d87b..72c8ce2bd3495d 100644 --- a/ports/vtk/vtkm.patch +++ b/ports/vtk/vtkm.patch @@ -1,63 +1,110 @@ -diff --git a/Accelerators/Vtkm/CMakeLists.txt b/Accelerators/Vtkm/CMakeLists.txt -index 4297575bd..643df6fd5 100644 ---- a/Accelerators/Vtkm/CMakeLists.txt -+++ b/Accelerators/Vtkm/CMakeLists.txt -@@ -14,8 +14,10 @@ +diff --git a/Accelerators/Vtkm/Core/CMakeLists.txt b/Accelerators/Vtkm/Core/CMakeLists.txt +index b889a771f..317d83f75 100644 +--- a/Accelerators/Vtkm/Core/CMakeLists.txt ++++ b/Accelerators/Vtkm/Core/CMakeLists.txt +@@ -14,8 +14,9 @@ + ## + ##============================================================================= + +-list(INSERT 0 CMAKE_MODULE_PATH +- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") ++find_package(VTKm CONFIG REQUIRED) ++#list(INSERT 0 CMAKE_MODULE_PATH ++# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") + + set(private_headers + vtkmlib/DataArrayConverters.hxx +@@ -77,9 +78,9 @@ vtkm_add_target_information(${vtkm_accel_target} + MODIFY_CUDA_FLAGS + DEVICE_SOURCES ${sources}) + +-vtk_module_set_property(VTK::AcceleratorsVTKmCore +- PROPERTY JOB_POOL_COMPILE +- VALUE vtkm_pool) ++#vtk_module_set_property(VTK::AcceleratorsVTKmCore ++# PROPERTY JOB_POOL_COMPILE ++# VALUE vtkm_pool) + + if (TARGET vtkm::cuda) + vtk_module_set_property(VTK::AcceleratorsVTKmCore +diff --git a/Accelerators/Vtkm/DataModel/CMakeLists.txt b/Accelerators/Vtkm/DataModel/CMakeLists.txt +index 56307be8d..30fff98e8 100644 +--- a/Accelerators/Vtkm/DataModel/CMakeLists.txt ++++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt +@@ -14,8 +14,9 @@ ## ##============================================================================= -list(INSERT 0 CMAKE_MODULE_PATH - "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") +find_package(VTKm CONFIG REQUIRED) -+ +#list(INSERT 0 CMAKE_MODULE_PATH +# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") set(sources vtkmlib/ArrayConvertersReal.cxx -diff --git a/Accelerators/Vtkm/CMakeLists.txt b/Accelerators/Vtkm/CMakeLists.txt -index a01a6bda3..889c87ebb 100644 ---- a/Accelerators/Vtkm/CMakeLists.txt -+++ b/Accelerators/Vtkm/CMakeLists.txt -@@ -126,9 +126,9 @@ vtkm_add_target_information(${vtkm_accel_target} +@@ -85,9 +86,9 @@ vtkm_add_target_information(${vtkm_accel_target} MODIFY_CUDA_FLAGS DEVICE_SOURCES ${sources}) --vtk_module_set_property(VTK::AcceleratorsVTKm +-vtk_module_set_property(VTK::AcceleratorsVTKmDataModel - PROPERTY JOB_POOL_COMPILE - VALUE vtkm_pool) -+#vtk_module_set_property(VTK::AcceleratorsVTKm ++#vtk_module_set_property(VTK::AcceleratorsVTKmDataModel +# PROPERTY JOB_POOL_COMPILE +# VALUE vtkm_pool) - vtk_module_link(VTK::AcceleratorsVTKm - PRIVATE - vtkm_worklet -diff --git a/CMake/FindVTKm.cmake b/CMake/FindVTKm.cmake -new file mode 100644 -index 000000000..c0fe00c0e ---- /dev/null -+++ b/CMake/FindVTKm.cmake -@@ -0,0 +1 @@ + + if (TARGET vtkm::cuda) + vtk_module_set_property(VTK::AcceleratorsVTKmDataModel +diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt +index 14e84f1dd..0a931285d 100644 +--- a/Accelerators/Vtkm/Filters/CMakeLists.txt ++++ b/Accelerators/Vtkm/Filters/CMakeLists.txt +@@ -14,8 +14,9 @@ + ## + ##============================================================================= + +-list(INSERT 0 CMAKE_MODULE_PATH +- "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") +find_package(VTKm CONFIG REQUIRED) -\ No newline at end of file -diff --git a/CMake/vtkCompilerPlatformFlags.cmake b/CMake/vtkCompilerPlatformFlags.cmake -index b0bdba1e6..69c570a25 100644 ---- a/CMake/vtkCompilerPlatformFlags.cmake -+++ b/CMake/vtkCompilerPlatformFlags.cmake -@@ -107,7 +107,7 @@ if(MSVC) - if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]") - STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - else() -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /bigobj") - endif() - endif() ++#list(INSERT 0 CMAKE_MODULE_PATH ++# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") + + set(impl_classes + vtkmAverageToCells +@@ -80,9 +81,9 @@ vtkm_add_target_information(${vtkm_accel_target} + MODIFY_CUDA_FLAGS + DEVICE_SOURCES ${sources}) +-vtk_module_set_property(VTK::AcceleratorsVTKmFilters +- PROPERTY JOB_POOL_COMPILE +- VALUE vtkm_pool) ++#vtk_module_set_property(VTK::AcceleratorsVTKmFilters ++# PROPERTY JOB_POOL_COMPILE ++# VALUE vtkm_pool) + vtk_module_link(VTK::AcceleratorsVTKmFilters + PRIVATE + vtkm_worklet +diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in +index 5a5e8b8df..96413875f 100644 +--- a/CMake/vtk-config.cmake.in ++++ b/CMake/vtk-config.cmake.in +@@ -121,9 +121,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@") + unset("${CMAKE_FIND_PACKAGE_NAME}_FOUND") + set("${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm" "@vtk_has_vtkm@") + if (${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm) +- find_package(VTKm +- PATHS "${CMAKE_CURRENT_LIST_DIR}/vtkm" +- NO_DEFAULT_PATH) ++ find_package(VTKm CONFIG REQUIRED) + if (NOT VTKm_FOUND) + set("${CMAKE_FIND_PACKAGE_NAME}_FOUND" 0) + endif () diff --git a/ThirdParty/vtkm/CMakeLists.txt b/ThirdParty/vtkm/CMakeLists.txt -index 5817d42f8..bc5a33d93 100644 +index 5817d42f8..f21d17da8 100644 --- a/ThirdParty/vtkm/CMakeLists.txt +++ b/ThirdParty/vtkm/CMakeLists.txt -@@ -1,6 +1,47 @@ +@@ -1,6 +1,41 @@ -vtk_module_third_party_internal( - LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" - VERSION "master" @@ -80,7 +127,6 @@ index 5817d42f8..bc5a33d93 100644 + message(STATUS "INCLUDE: ${VTKm_INCLUDE_DIRS}") + get_target_property(VTKm_DIY_INCLUDE_DIRS vtkm_diy INTERFACE_INCLUDE_DIRECTORIES) + get_target_property(VTKm_OPTION_INCLUDE_DIRS vtkm_optionparser INTERFACE_INCLUDE_DIRECTORIES) -+ get_target_property(VTKm_TAO_INCLUDE_DIRS vtkm_taotuple INTERFACE_INCLUDE_DIRECTORIES) + if(MSVC) + set(VTKm_DEFINITIONS /bigobj) + endif() @@ -104,13 +150,9 @@ index 5817d42f8..bc5a33d93 100644 + PACKAGE VTKm + TARGETS vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple + #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple -+ INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS VTKm_TAO_INCLUDE_DIRS) -+# configure_file( -+ # "${CMAKE_CURRENT_SOURCE_DIR}/vtk_utf8.h.in" -+ # "${CMAKE_CURRENT_BINARY_DIR}/vtk_utf8.h") -+ -+# vtk_module_install_headers( -+ # FILES "${CMAKE_CURRENT_BINARY_DIR}/vtk_utf8.h") ++ INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS ++) +\ No newline at end of file diff --git a/ThirdParty/vtkm/vtk.module b/ThirdParty/vtkm/vtk.module index a8e4dad0f..c7bbbf0e8 100644 --- a/ThirdParty/vtkm/vtk.module @@ -124,18 +166,3 @@ index a8e4dad0f..c7bbbf0e8 100644 +LIBRARY_NAME + VTKm THIRD_PARTY -diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in -index 1ecfde326..ae5576e66 100644 ---- a/CMake/vtk-config.cmake.in -+++ b/CMake/vtk-config.cmake.in -@@ -114,9 +114,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@") - unset("${CMAKE_FIND_PACKAGE_NAME}_FOUND") - set("${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm" "@vtk_has_vtkm@") - if (${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm) -- find_package(VTKm -- PATHS "${CMAKE_CURRENT_LIST_DIR}/vtkm" -- NO_DEFAULT_PATH) -+ find_package(VTKm CONFIG REQUIRED) - if (NOT VTKm_FOUND) - set("${CMAKE_FIND_PACKAGE_NAME}_FOUND" 0) - endif () diff --git a/versions/baseline.json b/versions/baseline.json index 9a0efc8c4d5c6a..2a81975f916708 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1221,7 +1221,7 @@ "port-version": 0 }, "cgns": { - "baseline": "3.4.0-1", + "baseline": "4.2.0", "port-version": 0 }, "chaiscript": { @@ -4845,8 +4845,8 @@ "port-version": 0 }, "paraview": { - "baseline": "5.8.0", - "port-version": 3 + "baseline": "5.9.1", + "port-version": 0 }, "parmetis": { "baseline": "4.0.3", @@ -5314,7 +5314,7 @@ }, "qt5-svg": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-tools": { "baseline": "5.15.2", @@ -6677,16 +6677,16 @@ "port-version": 1 }, "vtk": { - "baseline": "9.0.1", - "port-version": 7 + "baseline": "9.0.3-pv5.9.1", + "port-version": 0 }, "vtk-dicom": { "baseline": "0.8.12-1", "port-version": 0 }, "vtk-m": { - "baseline": "1.5.0", - "port-version": 1 + "baseline": "1.6.0", + "port-version": 0 }, "vulkan": { "baseline": "1.1.82.1-1", diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json index 6a9a059d3c04dd..bc33d2bd991678 100644 --- a/versions/c-/cgns.json +++ b/versions/c-/cgns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d33908ce58fbfa6e823c937716e57d84d1cb2a5", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "cc70f3fcc3f4ff2dad2712400208181dc7bb280d", "version-string": "3.4.0-1", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index ad9e156d98d14a..c90ffe0d8995c4 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a43b7d1bc53e7bdafcb4b73c3e9d84b9f80ecc22", + "version-semver": "5.9.1", + "port-version": 0 + }, { "git-tree": "9fb60c7a190e19963cb1811d3987da1e057ba6ad", "version-string": "5.8.0", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 012188db57d814..385bc888290ea6 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84778600522df34a9db6d62f0c217c5d29346492", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "4cdec015d18a0bf66a77ea27006346f0fe382c64", "version-string": "5.15.2", diff --git a/versions/v-/vtk-m.json b/versions/v-/vtk-m.json index 88cc6fdc2aa073..87391760f2c726 100644 --- a/versions/v-/vtk-m.json +++ b/versions/v-/vtk-m.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb3404a3ff10cfdc6bfabc198b44d711b752fd6e", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "38b6b6e37b4b027d7fb92207edbe8e8b97631faf", "version-string": "1.5.0", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 092bac4625837d..7cb9e0621b196d 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87526609113852b1b1c4a1fdc40c96a61b7c0b47", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 0 + }, { "git-tree": "4a64bbb016d5ecf20be3df3bf850748f9f885502", "version-string": "9.0.1", From c417a554011c13b93b000f8e123d52777818b2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 30 Aug 2021 19:04:04 +0200 Subject: [PATCH 0371/1858] [kf5guiaddons] fix Wayland scanner not being found by transitive deps; fix static builds (#19203) * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE variable to Config.cmake * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous options * [kf5guiaddons] update versions * [kf5guiaddons] remove extraneous lines, bump version * [kf5guiaddons] update versions * [kf5guiaddons] add QtWaylandScanner_EXECUTABLE to MAYBE_UNUSED_VARIABLES * [kf5guiaddons] update versions * [kf5guiaddons] replace CURRENT_INSTALLED_DIR without affecting other vars * [kf5guiaddons] update deprecated functions * [kf5guiaddons] wrap paths in quotes * [kf5guiaddons] update versions * [kf5guiaddons] use PACKAGE_PREFIX relative path instead CURRENT_PACKAGES_DIR * [kf5guiaddons] update versions * [kf5guiaddons] cache the QtWaylandScanner_EXECUTABLE variable * [kf5guiaddons] update versions * [kf5guiaddons] update versions * [kf5guiaddons] Add missing static dependency * [kf5guiaddons] update versions * [kf5guiaddons] rename patch file * [kf5guiaddons] update versions * [kf5guiaddons] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5guiaddons] update versions --- .../add_missing_static_dependencies.patch | 84 +++++++++++++++++++ ports/kf5guiaddons/fix_cmake.patch | 12 +++ ports/kf5guiaddons/portfile.cmake | 24 +++--- ports/kf5guiaddons/vcpkg.json | 12 ++- versions/baseline.json | 2 +- versions/k-/kf5guiaddons.json | 5 ++ 6 files changed, 124 insertions(+), 15 deletions(-) create mode 100644 ports/kf5guiaddons/add_missing_static_dependencies.patch create mode 100644 ports/kf5guiaddons/fix_cmake.patch diff --git a/ports/kf5guiaddons/add_missing_static_dependencies.patch b/ports/kf5guiaddons/add_missing_static_dependencies.patch new file mode 100644 index 00000000000000..c8a5fcd6674a44 --- /dev/null +++ b/ports/kf5guiaddons/add_missing_static_dependencies.patch @@ -0,0 +1,84 @@ +From 7b0a5566acbdb6ff8e7eca3e5e75aacbf2abff9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Sat, 28 Aug 2021 17:08:46 +0200 +Subject: [PATCH] Add missing static dependency to Config.cmake.in + +- move find_package(Qt5X11Extras) to root CMakeLists.txt +--- + CMakeLists.txt | 5 +++++ + KF5GuiAddonsConfig.cmake.in | 5 ++++- + src/CMakeLists.txt | 24 ++++++++++-------------- + 3 files changed, 19 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 337122e..80633e5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -39,6 +39,11 @@ if (NOT APPLE AND NOT WIN32) + find_package(XCB MODULE COMPONENTS XCB) + endif() + ++set(WITH_XCB) ++if (NOT APPLE AND X11_FOUND AND X11_Xkb_FOUND AND XCB_XCB_FOUND) ++ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) ++endif() ++ + if (WITH_WAYLAND) + find_package(Qt5WaylandClient ${REQUIRED_QT_VERSION} NO_MODULE) + find_package(QtWaylandScanner REQUIRED) +diff --git a/KF5GuiAddonsConfig.cmake.in b/KF5GuiAddonsConfig.cmake.in +index a3c3e58..ae17f6b 100644 +--- a/KF5GuiAddonsConfig.cmake.in ++++ b/KF5GuiAddonsConfig.cmake.in +@@ -6,9 +6,12 @@ include(CMakeFindDependencyMacro) + find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) + + if (NOT @BUILD_SHARED_LIBS@) ++ if (@Qt5X11Extras_FOUND@) ++ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) ++ endif() + if (@WITH_WAYLAND@) + find_dependency(Wayland REQUIRED Client) +- find_dependency(Qt5WaylandClient) ++ find_dependency(Qt5WaylandClient @REQUIRED_QT_VERSION@) + find_dependency(QtWaylandScanner) + endif() + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1dd66e8..ae0e0aa 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -58,20 +58,16 @@ target_include_directories(KF5GuiAddons INTERFACE "$") + target_link_libraries(KF5GuiAddons PUBLIC Qt5::Gui) + +-set(WITH_XCB) +-if (NOT APPLE AND X11_FOUND AND X11_Xkb_FOUND AND XCB_XCB_FOUND) +- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) +- if (Qt5X11Extras_FOUND) +- add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) +- target_include_directories (kmodifierkey_xcb PRIVATE +- ${X11_Xkb_INCLUDE_PATH} +- ${X11_Xlib_INCLUDE_PATH} +- ${XCB_XCB_INCLUDE_DIR} +- ) +- target_link_libraries(kmodifierkey_xcb PRIVATE ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} Qt5::X11Extras KF5::GuiAddons) +- install( TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/) +- endif() +-endif () ++if (Qt5X11Extras_FOUND) ++ add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) ++ target_include_directories (kmodifierkey_xcb PRIVATE ++ ${X11_Xkb_INCLUDE_PATH} ++ ${X11_Xlib_INCLUDE_PATH} ++ ${XCB_XCB_INCLUDE_DIR} ++ ) ++ target_link_libraries(kmodifierkey_xcb PRIVATE ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} Qt5::X11Extras KF5::GuiAddons) ++ install( TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/) ++endif() + + ecm_generate_headers(KGuiAddons_HEADERS + HEADER_NAMES +-- +GitLab + diff --git a/ports/kf5guiaddons/fix_cmake.patch b/ports/kf5guiaddons/fix_cmake.patch new file mode 100644 index 00000000000000..93b2bc4f58e9b2 --- /dev/null +++ b/ports/kf5guiaddons/fix_cmake.patch @@ -0,0 +1,12 @@ +diff --git a/KF5GuiAddonsConfig.cmake.in b/KF5GuiAddonsConfig.cmake.in +index ae17f6b..34e41bd 100644 +--- a/KF5GuiAddonsConfig.cmake.in ++++ b/KF5GuiAddonsConfig.cmake.in +@@ -10,6 +10,7 @@ if (NOT @BUILD_SHARED_LIBS@) + find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) + endif() + if (@WITH_WAYLAND@) ++ set(QtWaylandScanner_EXECUTABLE "${PACKAGE_PREFIX}/tools/qt5-wayland/bin/qtwaylandscanner" CACHE STRING "QtWaylandScanner workaround") + find_dependency(Wayland REQUIRED Client) + find_dependency(Qt5WaylandClient @REQUIRED_QT_VERSION@) + find_dependency(QtWaylandScanner) diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index fbe95894160a6d..a298210c3a533d 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -4,6 +4,9 @@ vcpkg_from_github( REF v5.84.0 SHA512 e5905c0aa5343ce3d4cd3765cb81390fc89fb78aec3c8de8b31d1dada8074d04f549ff785f3988498d2e274d7cb08a35a83ba031d18562049e6ca41d18ea52ee HEAD_REF master + PATCHES + add_missing_static_dependencies.patch # https://invent.kde.org/frameworks/kguiaddons/-/merge_requests/25 + fix_cmake.patch # https://github.com/microsoft/vcpkg/issues/17607#issuecomment-831518812 ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -15,29 +18,26 @@ if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) message(FATAL_ERROR "Feature wayland is only supported on Linux.") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + QtWaylandScanner_EXECUTABLE ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5GuiAddons) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GuiAddons CONFIG_PATH lib/cmake/KF5GuiAddons) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 871117156ce056..369ff2f1079f5f 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5guiaddons", - "version": "5.84.0", - "port-version": 1, + "version-semver": "5.84.0", + "port-version": 2, "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ @@ -14,6 +14,14 @@ { "name": "qt5-x11extras", "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2a81975f916708..7651a4fcd3359a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2918,7 +2918,7 @@ }, "kf5guiaddons": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5holidays": { "baseline": "5.84.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 723eed3676376b..0a1b25073fa08c 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ecd4e54210c93a999c1cf4ddc24aded8c0d7437", + "version-semver": "5.84.0", + "port-version": 2 + }, { "git-tree": "7413c9e8bfa4e7db669271b3c13fe5cf7c52567a", "version": "5.84.0", From aff82842ff65cf5c905ce9e6a55b9d368a5dc3b6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:05:16 +0200 Subject: [PATCH 0372/1858] [freetype] update to 2.11.0 (#19284) * [freetype] update to 2.11.0 * add version files --- ports/freetype/0001-Fix-install-command.patch | 32 ----------- ports/freetype/CONTROL | 21 -------- ports/freetype/brotli-static.patch | 53 +++++++++---------- ports/freetype/fix-bzip2-pc.patch | 13 +++++ ports/freetype/fix-exports.patch | 9 ++-- ports/freetype/pkgconfig.patch | 20 ------- ports/freetype/portfile.cmake | 18 +++---- ports/freetype/vcpkg.json | 48 +++++++++++++++++ versions/baseline.json | 2 +- versions/f-/freetype.json | 5 ++ 10 files changed, 103 insertions(+), 118 deletions(-) delete mode 100644 ports/freetype/0001-Fix-install-command.patch delete mode 100644 ports/freetype/CONTROL create mode 100644 ports/freetype/fix-bzip2-pc.patch delete mode 100644 ports/freetype/pkgconfig.patch create mode 100644 ports/freetype/vcpkg.json diff --git a/ports/freetype/0001-Fix-install-command.patch b/ports/freetype/0001-Fix-install-command.patch deleted file mode 100644 index feee3aefa57e69..00000000000000 --- a/ports/freetype/0001-Fix-install-command.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ad8ded0..32324d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -407,6 +407,7 @@ endif () - include(GNUInstallDirs) - - if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) -+ if(UNIX) - install( - # Note the trailing slash in the argument to `DIRECTORY'! - DIRECTORY ${PROJECT_SOURCE_DIR}/include/ -@@ -420,6 +421,19 @@ if (NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL) - ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config - COMPONENT headers) -+ else() -+ install( -+ # Note the trailing slash in the argument to `DIRECTORY'! -+ DIRECTORY ${PROJECT_SOURCE_DIR}/include/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2 -+ COMPONENT headers -+ PATTERN "internal" EXCLUDE -+ PATTERN "ftoption.h" EXCLUDE) -+ install( -+ FILES ${PROJECT_BINARY_DIR}/include/freetype/config/ftoption.h -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freetype2/freetype/config -+ COMPONENT headers) -+ endif() - endif () - - if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL deleted file mode 100644 index efb570b7b8afb9..00000000000000 --- a/ports/freetype/CONTROL +++ /dev/null @@ -1,21 +0,0 @@ -Source: freetype -Version: 2.10.4 -Homepage: https://www.freetype.org/ -Description: A library to render fonts. -Default-Features: zlib, bzip2, png, brotli - -Feature: zlib -Build-Depends: zlib -Description: Use zlib instead of internal library for DEFLATE - -Feature: bzip2 -Build-Depends: bzip2 -Description: Support bzip2 compressed fonts. - -Feature: png -Build-Depends: libpng -Description: Support PNG compressed OpenType embedded bitmaps. - -Feature: brotli -Build-Depends: brotli -Description: Support decompression of WOFF2 streams diff --git a/ports/freetype/brotli-static.patch b/ports/freetype/brotli-static.patch index 1635311ade0ecc..8ef7fd5e3b3c8a 100644 --- a/ports/freetype/brotli-static.patch +++ b/ports/freetype/brotli-static.patch @@ -1,29 +1,24 @@ -diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake -index 7c484c7df..0bd49b825 100644 ---- a/builds/cmake/FindBrotliDec.cmake -+++ b/builds/cmake/FindBrotliDec.cmake -@@ -34,14 +34,22 @@ find_path(BROTLIDEC_INCLUDE_DIRS - PATH_SUFFIXES brotli) - - find_library(BROTLIDEC_LIBRARIES -- NAMES brotlidec -+ NAMES brotlidec brotlidec-static - HINTS ${PC_BROTLIDEC_LIBDIR} - ${PC_BROTLIDEC_LIBRARY_DIRS}) - -+find_library(BROTLICOMMON_LIBRARIES -+ NAMES brotlicommon-static -+ HINTS ${PC_BROTLIDEC_LIBDIR} -+ ${PC_BROTLIDEC_LIBRARY_DIRS}) -+ -+if(BROTLICOMMON_LIBRARIES) -+ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) -+endif() - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args( -- brotlidec -+ BrotliDec - REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES - FOUND_VAR BROTLIDEC_FOUND - VERSION_VAR BROTLIDEC_VERSION) +diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake +index 46356b1fd..ed4cc2409 100644 +--- a/builds/cmake/FindBrotliDec.cmake ++++ b/builds/cmake/FindBrotliDec.cmake +@@ -35,10 +35,18 @@ find_path(BROTLIDEC_INCLUDE_DIRS + PATH_SUFFIXES brotli) + + find_library(BROTLIDEC_LIBRARIES +- NAMES brotlidec ++ NAMES brotlidec brotlidec-static + HINTS ${PC_BROTLIDEC_LIBDIR} + ${PC_BROTLIDEC_LIBRARY_DIRS}) + ++find_library(BROTLICOMMON_LIBRARIES ++ NAMES brotlicommon-static ++ HINTS ${PC_BROTLIDEC_LIBDIR} ++ ${PC_BROTLIDEC_LIBRARY_DIRS}) ++ ++if(BROTLICOMMON_LIBRARIES) ++ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) ++endif() + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args( diff --git a/ports/freetype/fix-bzip2-pc.patch b/ports/freetype/fix-bzip2-pc.patch new file mode 100644 index 00000000000000..dac43924c07e24 --- /dev/null +++ b/ports/freetype/fix-bzip2-pc.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb1b9a0f2..53d0bfc68 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -503,7 +503,7 @@ endif () + if (BZIP2_FOUND) + target_link_libraries(freetype PRIVATE ${BZIP2_LIBRARIES}) + target_include_directories(freetype PRIVATE ${BZIP2_INCLUDE_DIR}) # not BZIP2_INCLUDE_DIRS +- list(APPEND PKG_CONFIG_LIBS_PRIVATE "-lbz2") ++ list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "bzip2") + endif () + if (PNG_FOUND) + target_link_libraries(freetype PRIVATE ${PNG_LIBRARIES}) diff --git a/ports/freetype/fix-exports.patch b/ports/freetype/fix-exports.patch index 3574588274798f..44dea78010d1f0 100644 --- a/ports/freetype/fix-exports.patch +++ b/ports/freetype/fix-exports.patch @@ -1,9 +1,9 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2314c79..994c602 100644 +index cb1b9a0f2..edca5d579 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -446,7 +446,7 @@ endif () - set(PKG_CONFIG_REQUIRED_PRIVATE "") +@@ -496,7 +496,7 @@ set(PKG_CONFIG_REQUIRED_PRIVATE "") + set(PKG_CONFIG_LIBS_PRIVATE "") if (ZLIB_FOUND) - target_link_libraries(freetype PRIVATE ${ZLIB_LIBRARIES}) @@ -11,7 +11,7 @@ index 2314c79..994c602 100644 target_include_directories(freetype PRIVATE ${ZLIB_INCLUDE_DIRS}) list(APPEND PKG_CONFIG_REQUIRED_PRIVATE "zlib") endif () -@@ -560,12 +560,26 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) +@@ -596,12 +596,25 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) install( EXPORT freetype-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype @@ -22,7 +22,6 @@ index 2314c79..994c602 100644 DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/freetype COMPONENT headers) + -+ + if(ZLIB_FOUND) + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/freetype-config.cmake" +[[include(CMakeFindDependencyMacro) diff --git a/ports/freetype/pkgconfig.patch b/ports/freetype/pkgconfig.patch deleted file mode 100644 index cf8da2c3f76d34..00000000000000 --- a/ports/freetype/pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 61b174e..2314c79 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -509,7 +509,6 @@ endif () - - if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - # Generate the pkg-config file -- if (UNIX) - file(READ "${PROJECT_SOURCE_DIR}/builds/unix/freetype2.in" FREETYPE2_PC_IN) - - string(REPLACE ";" ", " PKG_CONFIG_REQUIRED_PRIVATE "${PKG_CONFIG_REQUIRED_PRIVATE}") -@@ -543,7 +542,6 @@ if (NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL) - FILES ${PROJECT_BINARY_DIR}/freetype2.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT pkgconfig) -- endif () - - include(CMakePackageConfigHelpers) - write_basic_package_version_file( diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 76e5d891ec7a19..bac143343e2c20 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -1,15 +1,14 @@ -set(FT_VERSION 2.10.4) +set(FT_VERSION 2.11.0) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO freetype/freetype2 REF ${FT_VERSION} FILENAME freetype-${FT_VERSION}.tar.xz - SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f + SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d PATCHES - 0001-Fix-install-command.patch 0003-Fix-UWP.patch - pkgconfig.patch + fix-bzip2-pc.patch # we have a bzip2 file that we can use - https://gitlab.freedesktop.org/freetype/freetype/-/commit/b2aeca5fda870751f3c9d645e0dca4c80fa1ae5a brotli-static.patch fix-exports.patch ) @@ -27,17 +26,16 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS brotli CMAKE_DISABLE_FIND_PACKAGE_BrotliDec ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=ON ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/freetype) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/freetype) # Rename for easy usage (VS integration; CMake and autotools will not care) file(RENAME ${CURRENT_PACKAGES_DIR}/include/freetype2/freetype ${CURRENT_PACKAGES_DIR}/include/freetype) @@ -100,4 +98,4 @@ file(COPY ${SOURCE_PATH}/docs/GPLv2.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} ) -file(INSTALL ${SOURCE_PATH}/docs/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json new file mode 100644 index 00000000000000..137163537ab7a6 --- /dev/null +++ b/ports/freetype/vcpkg.json @@ -0,0 +1,48 @@ +{ + "name": "freetype", + "version-semver": "2.11.0", + "description": "A library to render fonts.", + "homepage": "https://www.freetype.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "brotli", + "bzip2", + "png", + "zlib" + ], + "features": { + "brotli": { + "description": "Support decompression of WOFF2 streams", + "dependencies": [ + "brotli" + ] + }, + "bzip2": { + "description": "Support bzip2 compressed fonts.", + "dependencies": [ + "bzip2" + ] + }, + "png": { + "description": "Support PNG compressed OpenType embedded bitmaps.", + "dependencies": [ + "libpng" + ] + }, + "zlib": { + "description": "Use zlib instead of internal library for DEFLATE", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 7651a4fcd3359a..6dd9af2166331c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2149,7 +2149,7 @@ "port-version": 1 }, "freetype": { - "baseline": "2.10.4", + "baseline": "2.11.0", "port-version": 0 }, "freetype-gl": { diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index 4462655c851df0..b3b5e8c7308fb5 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6814e10440bcdc58c4bd29a0373d2f902783ba54", + "version-semver": "2.11.0", + "port-version": 0 + }, { "git-tree": "dabcba1d5153c796480c50c459ef045b5db8d2a4", "version-string": "2.10.4", From f6513eae12d6d840a8c6cd02c23543ce2d04095b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:18:49 +0200 Subject: [PATCH 0373/1858] Document VCPKG_TARGET_IS_MINGW (#19790) --- docs/maintainers/vcpkg_common_definitions.md | 4 ++-- scripts/cmake/vcpkg_common_definitions.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index dd59e4c733b585..2e1037af5f50bc 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -5,8 +5,8 @@ The latest version of this document lives in the [vcpkg repo](https://github.com This file defines the following variables which are commonly needed or used in portfiles: ```cmake -VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if -VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if +VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index f12e909d90a3f5..e53d9396354171 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -4,8 +4,8 @@ This file defines the following variables which are commonly needed or used in portfiles: ```cmake -VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if -VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if +VCPKG_TARGET_IS_ with being one of the following: WINDOWS, UWP, MINGW, LINUX, OSX, ANDROID, FREEBSD, OPENBSD. only defined if +VCPKG_HOST_IS_ with being one of the following: WINDOWS, LINUX, OSX, FREEBSD, OPENBSD. only defined if VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target From 2a2f0fd18b3380c528b16d7cb6e674defdbcfda1 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 30 Aug 2021 19:20:48 +0200 Subject: [PATCH 0374/1858] [spix] Add new port (#19351) * [anyrpc] Bump version to export missing symbol * [spix] Add port * versioning * Update ports/anyrpc/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * versioning * Update ports/anyrpc/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * versioning Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/anyrpc/portfile.cmake | 19 ++++++++++--------- ports/anyrpc/vcpkg.json | 3 +-- ports/spix/portfile.cmake | 25 +++++++++++++++++++++++++ ports/spix/vcpkg.json | 18 ++++++++++++++++++ versions/a-/anyrpc.json | 5 +++++ versions/baseline.json | 8 ++++++-- versions/s-/spix.json | 9 +++++++++ 7 files changed, 74 insertions(+), 13 deletions(-) create mode 100644 ports/spix/portfile.cmake create mode 100644 ports/spix/vcpkg.json create mode 100644 versions/s-/spix.json diff --git a/ports/anyrpc/portfile.cmake b/ports/anyrpc/portfile.cmake index 513c37cd91cb72..3090d2db9cfec8 100644 --- a/ports/anyrpc/portfile.cmake +++ b/ports/anyrpc/portfile.cmake @@ -1,27 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sgieseking/anyrpc - REF b288617d0ae1d6e227bcda7d3db7db5329fa2322 - SHA512 d50ef96ad13f06991e65e9912225b64c1f244bf89b67e4afcddbb18e08a885ec773aea88e1334d6deb73bb3824e916695b3b187b9023368aec3ba21a53dd2830 + REF b1949b3d40849229055ae75cf5334b9d08579502 + SHA512 8c674d29e80ec2522d6c1ec959663958ab4e1bf1135727c3c2aaa19e62a81ddbbd1e6a46f3e4679ee02894ad2ab26e70ca7e1e6c8750f3289994311069221b53 HEAD_REF master + FILE_DISAMBIGUATOR 1 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS - -DBUILD_EXAMPLES=OFF - -DBUILD_TESTS=OFF - -DBUILD_WITH_LOG4CPLUS=OFF - -DANYRPC_LIB_BUILD_SHARED=${ANYRPC_LIB_BUILD_SHARED} + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_WITH_LOG4CPLUS=OFF + -DANYRPC_LIB_BUILD_SHARED=${ANYRPC_LIB_BUILD_SHARED} ) vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/anyrpc RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL "${SOURCE_PATH}/license" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() diff --git a/ports/anyrpc/vcpkg.json b/ports/anyrpc/vcpkg.json index f71f684cc7fbcb..02ffac66d9dc0a 100644 --- a/ports/anyrpc/vcpkg.json +++ b/ports/anyrpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "anyrpc", - "version-string": "2020-01-13", - "port-version": 2, + "version-date": "2021-08-24", "description": "A multiprotocol remote procedure call system for C++.", "homepage": "https://github.com/sgieseking/anyrpc" } diff --git a/ports/spix/portfile.cmake b/ports/spix/portfile.cmake new file mode 100644 index 00000000000000..91512aa78b4e52 --- /dev/null +++ b/ports/spix/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO faaxm/spix + REF v0.3 + SHA512 be5695e1e061583645a711c91f218c2038ed66896932d9f32129242d20d0a451a032d53aee2fdb917f1423de96ebcba97887421636a13260a7e7c228a13666c0 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ANYRPC_LIB_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSPIX_BUILD_EXAMPLES=OFF + -DSPIX_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_copy_pdbs() diff --git a/ports/spix/vcpkg.json b/ports/spix/vcpkg.json new file mode 100644 index 00000000000000..e2e1e5c48de4c9 --- /dev/null +++ b/ports/spix/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spix", + "version": "0.3", + "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.", + "homepage": "https://github.com/faaxm/spix", + "dependencies": [ + "anyrpc", + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/a-/anyrpc.json b/versions/a-/anyrpc.json index f37d0d4a7281d3..62639f3f0cc696 100644 --- a/versions/a-/anyrpc.json +++ b/versions/a-/anyrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f4ca4180fb5021b85ae6d4c5ad7b7e15f89b367", + "version-date": "2021-08-24", + "port-version": 0 + }, { "git-tree": "e82759546790c693469c78e166e6c83f745849b3", "version-string": "2020-01-13", diff --git a/versions/baseline.json b/versions/baseline.json index 6dd9af2166331c..8a7f7cada16d1e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -93,8 +93,8 @@ "port-version": 0 }, "anyrpc": { - "baseline": "2020-01-13", - "port-version": 2 + "baseline": "2021-08-24", + "port-version": 0 }, "aom": { "baseline": "3.1.2", @@ -6080,6 +6080,10 @@ "baseline": "2021.1", "port-version": 0 }, + "spix": { + "baseline": "0.3", + "port-version": 0 + }, "sprout": { "baseline": "2019-06-20", "port-version": 0 diff --git a/versions/s-/spix.json b/versions/s-/spix.json new file mode 100644 index 00000000000000..a3ab08a1332bf9 --- /dev/null +++ b/versions/s-/spix.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "703bc0f66a7cb23368f4230a35451356b92e5c75", + "version": "0.3", + "port-version": 0 + } + ] +} From 2fd043da31e7f281bf7dd6f596acaa0b1943bb65 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 31 Aug 2021 01:21:15 +0800 Subject: [PATCH 0375/1858] [harfbuzz] update to 2.8.2 (#19615) * [harfbuzz] update to 2.8.2 * update version * revert patch format * update version --- ports/harfbuzz/0001-circumvent-samefile-error.patch | 13 ++++++------- ports/harfbuzz/portfile.cmake | 4 ++-- ports/harfbuzz/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/h-/harfbuzz.json | 5 +++++ 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ports/harfbuzz/0001-circumvent-samefile-error.patch b/ports/harfbuzz/0001-circumvent-samefile-error.patch index 3db21590a64d6c..40aaac0b4d2d68 100755 --- a/ports/harfbuzz/0001-circumvent-samefile-error.patch +++ b/ports/harfbuzz/0001-circumvent-samefile-error.patch @@ -1,9 +1,9 @@ diff --git a/src/gen-harfbuzzcc.py b/src/gen-harfbuzzcc.py -index b25bcc7..97bf2ab 100644 +index b25bcc7..f3bc87a 100644 --- a/src/gen-harfbuzzcc.py +++ b/src/gen-harfbuzzcc.py @@ -15,4 +15,8 @@ with open (OUTPUT, "wb") as f: - f.write ("".join ('#include "{}"\n'.format (os.path.basename (x)) for x in sources if x.endswith (".cc")).encode ()) + f.write ("".join ('#include "{}"\n'.format (os.path.basename (x)) for x in sources if x.endswith (".cc")).encode ()) # copy it also to src/ -shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) @@ -13,11 +13,11 @@ index b25bcc7..97bf2ab 100644 +if not os.path.samefile(src, dst): + shutil.copyfile (src, dst) diff --git a/src/gen-hb-version.py b/src/gen-hb-version.py -index 5ec2024..59d4754 100644 +index 879811f..c376721 100644 --- a/src/gen-hb-version.py +++ b/src/gen-hb-version.py @@ -33,4 +33,8 @@ with open (INPUT, "r", encoding='utf-8') as template: - .encode ()) + .encode ()) # copy it also to src/ -shutil.copyfile (OUTPUT, os.path.join (CURRENT_SOURCE_DIR, os.path.basename (OUTPUT))) @@ -27,11 +27,11 @@ index 5ec2024..59d4754 100644 +if not os.path.samefile(src, dst): + shutil.copyfile (src, dst) diff --git a/src/gen-ragel-artifacts.py b/src/gen-ragel-artifacts.py -index b60ec3b..288e224 100644 +index d22e03a..2b1e819 100644 --- a/src/gen-ragel-artifacts.py +++ b/src/gen-ragel-artifacts.py @@ -22,4 +22,8 @@ hh = rl.replace ('.rl', '.hh') - subprocess.Popen ([ragel, '-e', '-F1', '-o', hh, rl], cwd=outdir).wait () + subprocess.Popen (ragel.split() + ['-e', '-F1', '-o', hh, rl], cwd=outdir).wait () # copy it also to src/ -shutil.copyfile (os.path.join (outdir, hh), os.path.join (CURRENT_SOURCE_DIR, hh)) @@ -40,4 +40,3 @@ index b60ec3b..288e224 100644 +# Avoid SameFileError +if not os.path.samefile(src, dst): + shutil.copyfile (src, dst) - diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 277a2c5b908506..7b3caed4c46f14 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF b37f03f16b39d397a626f097858e9ae550234ca0 # 2.8.1 - SHA512 3eef62df397bc1fe1d08d7d91ff7d38d7af54bb85562915bba65d86cf6862384f5b4538f685d93eead595389d2f417176827fd2f72b3ce71a5562a8ff80f17f4 + REF 63e15eac4f443fa53565d1e4fb9611cdd7814f28 # 2.8.2 + SHA512 8a743ce465f01d6cb49ac74efb1159d965e41c89267eeb4078ec4c342c24599e14419a0416f8d35a0b9dd00e76cc79b4dbd6f50ddd1b8da761d61158d1018ebc HEAD_REF master PATCHES # This patch is a workaround that is needed until the following issues are resolved upstream: diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 6d5007235641b4..2eb7e6d3f5d71f 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,6 @@ { "name": "harfbuzz", - "version": "2.8.1", - "port-version": 1, + "version": "2.8.2", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8a7f7cada16d1e..146180c37cc41d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2505,8 +2505,8 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.8.1", - "port-version": 1 + "baseline": "2.8.2", + "port-version": 0 }, "hayai": { "baseline": "2019-08-10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 698b0ded440a34..ced513c5e85bf5 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "823024398648ee98849f8a4f73f778a8f97ccd1f", + "version": "2.8.2", + "port-version": 0 + }, { "git-tree": "0af28da9fe1d9f70c2f0b572c8e9eee085eb7c3b", "version": "2.8.1", From 64d99bdbb8af71306b5a2cd564931827d8e71fcf Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 31 Aug 2021 01:21:45 +0800 Subject: [PATCH 0376/1858] [wavelib] Update to 2021-08-10 (#19477) * [wavelib] Update to 2021-08-10 [wavelib] Add vcpkg.json * [wavelib] Add version * [wavelib] Clean * [wavelib] Overwrite version --- ports/wavelib/CONTROL | 4 ---- ports/wavelib/portfile.cmake | 15 +++++++-------- ports/wavelib/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 2 +- versions/w-/wavelib.json | 5 +++++ 5 files changed, 30 insertions(+), 13 deletions(-) delete mode 100644 ports/wavelib/CONTROL create mode 100644 ports/wavelib/vcpkg.json diff --git a/ports/wavelib/CONTROL b/ports/wavelib/CONTROL deleted file mode 100644 index 78c10686d3015b..00000000000000 --- a/ports/wavelib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wavelib -Version: 2020-05-29 -Description: C implementation of wavelet transform (DWT,SWT and MODWT) -Homepage: https://github.com/rafat/wavelib diff --git a/ports/wavelib/portfile.cmake b/ports/wavelib/portfile.cmake index 2f4b6aa836fdf3..4951cf40a542ce 100644 --- a/ports/wavelib/portfile.cmake +++ b/ports/wavelib/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rafat/wavelib - REF c7c9ba8b1091610a678b2091ae4edba740fe83a7 - SHA512 16f24288e410732cd7a2744e0039f93ddb435c6aaa59fde169f117e5536e5f452f0e78edc75ad725b18f9e16b34870c3a100c32c84399a004eb443ba0030f758 + REF a92456d2e20451772dd76c2a0a3368537ee94184 + SHA512 d14ebc0d96e86d9226fa346cb6ef157b2949985dfedf4228dd4356ccacaac48fde47edfcba31e7455b25dc95c7a1cb148ad6845143c17ae5972659c98e683865 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DBUILD_UT=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wavelib/vcpkg.json b/ports/wavelib/vcpkg.json new file mode 100644 index 00000000000000..1c346cf8702897 --- /dev/null +++ b/ports/wavelib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "wavelib", + "version-date": "2021-08-10", + "description": "C implementation of wavelet transform (DWT,SWT and MODWT)", + "homepage": "https://github.com/rafat/wavelib", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 146180c37cc41d..a846b1adc72692 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6721,7 +6721,7 @@ "port-version": 0 }, "wavelib": { - "baseline": "2020-05-29", + "baseline": "2021-08-10", "port-version": 0 }, "wavpack": { diff --git a/versions/w-/wavelib.json b/versions/w-/wavelib.json index d1a7abbc9ce1f1..dc7b8096d52dae 100644 --- a/versions/w-/wavelib.json +++ b/versions/w-/wavelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "606ab10437c3dbfcd902fdedd5599dca471a6dde", + "version-date": "2021-08-10", + "port-version": 0 + }, { "git-tree": "66193d7de35196ebf71e6f34ba2f3bad0ee6288c", "version-string": "2020-05-29", From 41deddd864c2bc189d6a7a03e2e5bbcce7fb47ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 30 Aug 2021 19:23:23 +0200 Subject: [PATCH 0377/1858] [kf5wallet] new port (#19450) * Add kf5kwallet port * Fixed kf5wallet for windows * [kf5wallet] update to 5.84.0 * [kf5wallet] port CONTROL to JSON * [kf5wallet] use msgmerge provided by gettext port * [kf5wallet] only remove what's required * [kf5wallet] wrap paths in quotes * [kf5wallet] update deprecated functions * [kf5wallet] DISABLE_PARALLEL_CONFIGURE to fix clang-format error * [kf5wallet] update versions * [kf5wallet] remove static /bin folders * [kf5wallet] update versions * [kf5wallet] use semVer * [kf5wallet] update versions * [kf5wallet] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5wallet] update versions Co-authored-by: Kuntal Majumder --- ports/kf5wallet/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/kf5wallet/vcpkg.json | 31 +++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5wallet.json | 9 +++++++++ 4 files changed, 73 insertions(+) create mode 100644 ports/kf5wallet/portfile.cmake create mode 100644 ports/kf5wallet/vcpkg.json create mode 100644 versions/k-/kf5wallet.json diff --git a/ports/kf5wallet/portfile.cmake b/ports/kf5wallet/portfile.cmake new file mode 100644 index 00000000000000..fb58b065c33324 --- /dev/null +++ b/ports/kf5wallet/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwallet + REF v5.84.0 + SHA512 5bea4c7f46d127de1bc530e03e1033e9e133197cc36bb6963c9154783ef7bb9920bec62443b5bba9b55d3adcc1f7284ce4376422915d93d6df387587fd7ab8e0 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_KWALLETD=OFF + -DBUILD_KWALLET_QUERY=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Wallet CONFIG_PATH lib/cmake/KF5Wallet) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json new file mode 100644 index 00000000000000..964136b210ce83 --- /dev/null +++ b/ports/kf5wallet/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "kf5wallet", + "version-semver": "5.84.0", + "description": "Safe desktop-wide storage for passwords", + "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", + "dependencies": [ + "ecm", + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5windowsystem", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a846b1adc72692..41e04702965620 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2956,6 +2956,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5wallet": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5widgetsaddons": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5wallet.json b/versions/k-/kf5wallet.json new file mode 100644 index 00000000000000..560cd98914a1c5 --- /dev/null +++ b/versions/k-/kf5wallet.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c954ed1f4277c1c7fef03a9736d83d1a2da5ee63", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From ce5fd1beec790d9b6fb88875847ab59e82fc098c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:23:57 +0200 Subject: [PATCH 0378/1858] fix bootstrap.sh on arm macs (#19622) --- scripts/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a20fcb39214419..a7d1b1650c1446 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -268,7 +268,7 @@ else fetchTool "ninja" "$UNAME" ninjaExe || exit 1 fi if [ "$os" = "osx" ]; then - if [ "$vcpkgAllowAppleClang" = "true" ] ; then + if [ "$vcpkgAllowAppleClang" = "true" ] || [[ $(sw_vers -productVersion | awk -F '.' '{print $1}') -ge 11 ]]; then CXX=clang++ else selectCXX From bd287a4e22b8f43e132458f5f9551554ccc83788 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 31 Aug 2021 01:25:07 +0800 Subject: [PATCH 0379/1858] [daw-json-link,daw-header-libraries,daw-utf-range]Update many ports (#19755) * update many ports * update version * Update ports/daw-header-libraries/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-json-link/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-utf-range/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-json-link/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-json-link/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/daw-utf-range/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * update version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/daw-header-libraries/portfile.cmake | 8 ++++---- ports/daw-header-libraries/vcpkg.json | 2 +- ports/daw-json-link/portfile.cmake | 22 +++++++++++----------- ports/daw-json-link/vcpkg.json | 2 +- ports/daw-utf-range/portfile.cmake | 11 +++++------ ports/daw-utf-range/vcpkg.json | 2 +- versions/baseline.json | 6 +++--- versions/d-/daw-header-libraries.json | 5 +++++ versions/d-/daw-json-link.json | 5 +++++ versions/d-/daw-utf-range.json | 5 +++++ 10 files changed, 41 insertions(+), 27 deletions(-) diff --git a/ports/daw-header-libraries/portfile.cmake b/ports/daw-header-libraries/portfile.cmake index 06753efd930d86..5bd908cebe8a01 100644 --- a/ports/daw-header-libraries/portfile.cmake +++ b/ports/daw-header-libraries/portfile.cmake @@ -2,12 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/header_libraries - REF b44178fed16111944d1338999d88b129797608ce - SHA512 0b13bec450ba68e2b2ac2e76c9c529fa84a95df092b104660c88e9cfda91df9e5b70f0f7f6bcbb4f7ea05c1a5613734ceff8d84929b37b115c2bc86c232d9261 + REF bd372e81e04e256a6ba88217c4b99a3601fb5ef7 #v1.29.7 + SHA512 7aad017e70e79c3244011cbcb719afb385a639e1e4d37955be074bd1d2f501052dcae9347d094a8ef970f3762ebdfe33c90318b2e6891f4b354e823acfee7188 HEAD_REF master ) -vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) @@ -15,4 +15,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) # remove empty lib and debug/lib directories (and duplicate files from debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/daw-header-libraries/vcpkg.json b/ports/daw-header-libraries/vcpkg.json index 25c09477650138..d203e9597fb968 100644 --- a/ports/daw-header-libraries/vcpkg.json +++ b/ports/daw-header-libraries/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-header-libraries", - "version-semver": "1.21.1", + "version-semver": "1.29.7", "description": "Set of header-only algorithms used in daw-utf8-range and daw-json-link.", "homepage": "https://github.com/beached/header_libraries", "dependencies": [ diff --git a/ports/daw-json-link/portfile.cmake b/ports/daw-json-link/portfile.cmake index 97ec4b5e3fec65..c9f417ef89ada4 100644 --- a/ports/daw-json-link/portfile.cmake +++ b/ports/daw-json-link/portfile.cmake @@ -2,15 +2,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/daw_json_link - REF d8cb3a25a545b27b6ab5e68f4480b92ad0dc78fe - SHA512 19f486c6782f6134db0f7c8a1a4031b69aeae7f64846f186bccfa37927c8a688545fe5825de841e5ec5408267922b0334db3727d00fcb96b1a36eee81a05eae9 + REF 828565f48bd077e776fcef322457186d8f01e7eb #v2.10.2 + SHA512 8c870d778c9abb295d323ae913d9e2bb0255f176c7e4f1d8cdf424af9bbe4c5eb650436065bb47e3e8745ff1c12234959526c8dcdf2c169ab55af4b150e6b477 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DDAW_USE_PACKAGE_MANAGEMENT=ON + -DDAW_USE_PACKAGE_MANAGEMENT=ON ) vcpkg_cmake_install() @@ -21,13 +21,13 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib # Append the json-link and dragonbox license information into a single # copyright file (they are both Boost v1.0 but it is good to be clear). -file(APPEND ${SOURCE_PATH}/copyright [=[+----------------------------------------------------------------------------+ +file(APPEND "${SOURCE_PATH}/copyright" [=[+----------------------------------------------------------------------------+ | json-link copywrite | +----------------------------------------------------------------------------+ ]=]) -file(READ ${SOURCE_PATH}/LICENSE json_link_copywrite) -file(APPEND ${SOURCE_PATH}/copyright ${json_link_copywrite}) -file(APPEND ${SOURCE_PATH}/copyright [=[ +file(READ "${SOURCE_PATH}/LICENSE" json_link_copywrite) +file(APPEND "${SOURCE_PATH}/copyright" ${json_link_copywrite}) +file(APPEND "${SOURCE_PATH}/copyright" [=[ +----------------------------------------------------------------------------+ @@ -35,6 +35,6 @@ file(APPEND ${SOURCE_PATH}/copyright [=[ +----------------------------------------------------------------------------+ ]=]) -file(READ ${SOURCE_PATH}/LICENSE_Dragonbox dragonbox_copywrite) -file(APPEND ${SOURCE_PATH}/copyright ${dragonbox_copywrite}) -file(INSTALL ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(READ "${SOURCE_PATH}/LICENSE_Dragonbox" dragonbox_copywrite) +file(APPEND "${SOURCE_PATH}/copyright" ${dragonbox_copywrite}) +file(INSTALL "${SOURCE_PATH}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/daw-json-link/vcpkg.json b/ports/daw-json-link/vcpkg.json index 84ccbe00a3c7fe..c9470ecc86eecc 100644 --- a/ports/daw-json-link/vcpkg.json +++ b/ports/daw-json-link/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-json-link", - "version-semver": "2.9.11", + "version-semver": "2.10.2", "description": "Perhaps the fastest JSON deserializer/serializer posssible or at least close to it.", "homepage": "https://github.com/beached/daw_json_link", "dependencies": [ diff --git a/ports/daw-utf-range/portfile.cmake b/ports/daw-utf-range/portfile.cmake index e3b8e10c892ce3..cabdf720be05c4 100644 --- a/ports/daw-utf-range/portfile.cmake +++ b/ports/daw-utf-range/portfile.cmake @@ -2,16 +2,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO beached/utf_range - REF b20d4037db30f69ef73daa4428a631f95e0bbb10 - SHA512 4f9d4b4831c4bd6dc560830077965ae5b3351dc7695d0523262bc6229c8d7623e03338be772337f89084038d7039b4a0b41ef8de2ef98eb880f85ca5e01d5838 + REF cd45b91a1530a68ce019b876a32b1694b4031613 #v2.2.0 + SHA512 21943b488b4efb8696bfe95f80c8043beed8f5f3cc9a34cfb95d34186d6a0ac2354943ebfd767bd6df42837c29e3c467a107d2f8556a7f719833d43f566afa40 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH - ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DDAW_USE_PACKAGE_MANAGEMENT=ON + -DDAW_USE_PACKAGE_MANAGEMENT=ON ) vcpkg_cmake_install() @@ -20,4 +19,4 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) # remove empty lib and debug/lib directories (and duplicate files from debug/include) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/daw-utf-range/vcpkg.json b/ports/daw-utf-range/vcpkg.json index 468da7e7c44b18..60581e13dc3942 100644 --- a/ports/daw-utf-range/vcpkg.json +++ b/ports/daw-utf-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "daw-utf-range", - "version-semver": "2.1.0", + "version-semver": "2.2.0", "description": "Header-only utf8 string range used by daw-json-link. Includes a constexpr/noexcept modified version of utfcpp.", "homepage": "https://github.com/beached/header_libraries", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 41e04702965620..04d9783146efff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1641,15 +1641,15 @@ "port-version": 1 }, "daw-header-libraries": { - "baseline": "1.21.1", + "baseline": "1.29.7", "port-version": 0 }, "daw-json-link": { - "baseline": "2.9.11", + "baseline": "2.10.2", "port-version": 0 }, "daw-utf-range": { - "baseline": "2.1.0", + "baseline": "2.2.0", "port-version": 0 }, "dbg-macro": { diff --git a/versions/d-/daw-header-libraries.json b/versions/d-/daw-header-libraries.json index 7abb51e03b8d8a..14d5e66afe73e3 100644 --- a/versions/d-/daw-header-libraries.json +++ b/versions/d-/daw-header-libraries.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "29ed87ad6aee595ac4a0972c09a1ddf34d13a857", + "version-semver": "1.29.7", + "port-version": 0 + }, { "git-tree": "6687948f2f2f4c3ba578a8ac41624c58a541f1a2", "version-semver": "1.21.1", diff --git a/versions/d-/daw-json-link.json b/versions/d-/daw-json-link.json index 7f49b0d5743026..fdf392f941a0f0 100644 --- a/versions/d-/daw-json-link.json +++ b/versions/d-/daw-json-link.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c7cf1d126f7f7c1bb3759ff5bcf30c585b90d94", + "version-semver": "2.10.2", + "port-version": 0 + }, { "git-tree": "04d0df53fc3b69309aa10f53cc92f0933e8139b8", "version-semver": "2.9.11", diff --git a/versions/d-/daw-utf-range.json b/versions/d-/daw-utf-range.json index dec5553b5c7070..afebad6ee3380e 100644 --- a/versions/d-/daw-utf-range.json +++ b/versions/d-/daw-utf-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aae578a84f804d65b63483335d1b74325906cb01", + "version-semver": "2.2.0", + "port-version": 0 + }, { "git-tree": "e1c08fdf12013384e9a86e5233245321fea58793", "version-semver": "2.1.0", From 69e221f17a4f2d03858a08067ce512a8c3439e4c Mon Sep 17 00:00:00 2001 From: Daniele Pallastrelli <5451767+daniele77@users.noreply.github.com> Date: Mon, 30 Aug 2021 19:25:27 +0200 Subject: [PATCH 0380/1858] [cli] update to v.2.0.0 (#19744) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [cli] Update the version to 1.1.1 * [cli] Update the version to 1.2.1 * [cli] Update the version to 1.2.1: fix PR requests * [aricpp] create a new port (#17162) * [cli] run the command: ./vcpkg x-add-version --all * [aricpp] change request for #18048 * Update ports/aricpp/portfile.cmake * [aricpp] change request for #18048 * Update ports/aricpp/vcpkg.json * Update ports/aricpp/vcpkg.json * Update versions/a-/aricpp.json * Update versions/a-/aricpp.json * [aricpp] port-version -> 0 * [cli] v. 2.0 * [cli] Update ports/cli/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/cli/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [cli] bump port version * Update versions/c-/cli.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Daniele Pallastrelli Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: nicole mazzuca Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/cli/CONTROL | 5 ----- ports/cli/portfile.cmake | 19 ++++++++++--------- ports/cli/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 2 +- versions/c-/cli.json | 5 +++++ 5 files changed, 33 insertions(+), 15 deletions(-) delete mode 100644 ports/cli/CONTROL create mode 100644 ports/cli/vcpkg.json diff --git a/ports/cli/CONTROL b/ports/cli/CONTROL deleted file mode 100644 index 8cda2750e5957e..00000000000000 --- a/ports/cli/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cli -Version: 1.2.1 -Homepage: https://github.com/daniele77/cli -Description: A library for interactive command line interfaces in modern C++ -Build-Depends: boost-asio diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake index 134c718293bff1..e8e1ffc7a4baef 100644 --- a/ports/cli/portfile.cmake +++ b/ports/cli/portfile.cmake @@ -1,18 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO daniele77/cli - REF v1.2.1 - SHA512 fc834608ac2ca6c3f330711c80897cc581eb1ed8da7a0d56a07efe6650d871f5317c777a6a029fdc0177684f08479bd129cc0ce748354bac3dbe6af79a390d14 + REF v2.0.0 + SHA512 8a3e42d02f8bf757628fb876ccfa376771bbe66e7820d7fd5b34119fca262129f5122e67d939e0898b5964a162a8fd4538d5e6ffa96c4935a8c3979e5d5dbd9d HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cli) +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cli) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cli/vcpkg.json b/ports/cli/vcpkg.json new file mode 100644 index 00000000000000..dc433aa91304e1 --- /dev/null +++ b/ports/cli/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cli", + "version-semver": "2.0.0", + "description": "A library for interactive command line interfaces in modern C++", + "homepage": "https://github.com/daniele77/cli", + "dependencies": [ + "boost-asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 04d9783146efff..c1e4352cef4b56 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1301,7 +1301,7 @@ "port-version": 0 }, "cli": { - "baseline": "1.2.1", + "baseline": "2.0.0", "port-version": 0 }, "cli11": { diff --git a/versions/c-/cli.json b/versions/c-/cli.json index a2a1d8e0f52c8e..fa9ecd85596108 100644 --- a/versions/c-/cli.json +++ b/versions/c-/cli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52c57cc23f038ec2f73805b37f42639541036956", + "version-semver": "2.0.0", + "port-version": 0 + }, { "git-tree": "ae335f0cbfecdfb4f7d5448bf3e1fec0ae9aecb9", "version-string": "1.2.1", From feba2f89cd3f1732cd762003cc849a47f8b2e5e1 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 31 Aug 2021 01:25:56 +0800 Subject: [PATCH 0381/1858] [libics] Add DISABLE_PARALLEL_CONFIGURE and update to 1.6.5 (#19652) --- ports/libics/CONTROL | 3 --- ports/libics/portfile.cmake | 20 ++++++++++---------- ports/libics/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 2 +- versions/l-/libics.json | 5 +++++ 5 files changed, 32 insertions(+), 14 deletions(-) delete mode 100644 ports/libics/CONTROL create mode 100644 ports/libics/vcpkg.json diff --git a/ports/libics/CONTROL b/ports/libics/CONTROL deleted file mode 100644 index 9d145975dda0bb..00000000000000 --- a/ports/libics/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libics -Version: 1.6.4 -Description: Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject. \ No newline at end of file diff --git a/ports/libics/portfile.cmake b/ports/libics/portfile.cmake index 4536ed7cd862be..2d66f422586319 100644 --- a/ports/libics/portfile.cmake +++ b/ports/libics/portfile.cmake @@ -1,20 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO svi-opensource/libics - REF 807193979650ab3d474e9a4bf907cf046eb0f3f0 # 1.6.4 - SHA512 9fcbc14d4b62a8f5c6c114123a5cd3102c3398dd25f44caf07d033dbfc8304fc22dcde35e545ed984047a6009a0e7d7e30cbb6075fb10b9ceda0311cabc56ecb + REF ae55128e0532d78aaea4adce21a3fa553d208b83 # 1.6.5 + SHA512 37a1e9034d7e32954840e18f3e3c19f6ed2f8c651ce0da53f678e2f04653be0fc4d9ab3dca8b6f0bfcaec2a9cc560ccfbc7d9034977faa14036281d6a3ca662a HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/GNU_LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libics) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libics/GNU_LICENSE ${CURRENT_PACKAGES_DIR}/share/libics/copyright) \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/GNU_LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libics/vcpkg.json b/ports/libics/vcpkg.json new file mode 100644 index 00000000000000..09e0691557b654 --- /dev/null +++ b/ports/libics/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libics", + "version": "1.6.5", + "description": "Reference library for ICS (Image Cytometry Standard), an open standard for writing images of any dimensionality and data type to file, together with associated information regarding the recording equipment or recorded subject.", + "homepage": "https://github.com/svi-opensource/libics", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c1e4352cef4b56..23d719c621f49d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3305,7 +3305,7 @@ "port-version": 10 }, "libics": { - "baseline": "1.6.4", + "baseline": "1.6.5", "port-version": 0 }, "libideviceactivation": { diff --git a/versions/l-/libics.json b/versions/l-/libics.json index 19d80bfd453e24..dd0bcac49050ad 100644 --- a/versions/l-/libics.json +++ b/versions/l-/libics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aea77d2369ae831edee51b05bc8dcad585795990", + "version": "1.6.5", + "port-version": 0 + }, { "git-tree": "f652729b1d084f65627ccd3c5d302bf73187bb57", "version-string": "1.6.4", From 8aaaa554d2184e1091a84009c18708773eca6643 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 31 Aug 2021 01:26:19 +0800 Subject: [PATCH 0382/1858] [libpmemobj-cpp] update to 1.13.0 (#19630) * [libpmemobj-cpp] update to 1.13.0 * update version --- ports/libpmemobj-cpp/CONTROL | 8 -------- ports/libpmemobj-cpp/portfile.cmake | 21 +++++++++++---------- ports/libpmemobj-cpp/vcpkg.json | 24 ++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/l-/libpmemobj-cpp.json | 5 +++++ 5 files changed, 41 insertions(+), 19 deletions(-) delete mode 100644 ports/libpmemobj-cpp/CONTROL create mode 100644 ports/libpmemobj-cpp/vcpkg.json diff --git a/ports/libpmemobj-cpp/CONTROL b/ports/libpmemobj-cpp/CONTROL deleted file mode 100644 index 4846f52682c6a0..00000000000000 --- a/ports/libpmemobj-cpp/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: libpmemobj-cpp -Version: 1.12 -Homepage: https://github.com/pmem/libpmemobj-cpp -Description: C++ bindings for libpmemobj (https://github.com/pmem/pmdk). - -Feature: benchmark -Build-Depends: pmdk -Description: build benchmarks diff --git a/ports/libpmemobj-cpp/portfile.cmake b/ports/libpmemobj-cpp/portfile.cmake index 8a60244b0f1a5b..ba437d506f2fee 100644 --- a/ports/libpmemobj-cpp/portfile.cmake +++ b/ports/libpmemobj-cpp/portfile.cmake @@ -1,34 +1,35 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pmem/libpmemobj-cpp - REF b570268bec37735df1d4591605c0c7b2077c7bed #v1.12 - SHA512 0914c35c708b5fec81ac2632cfbae52412c2ff2255940b54e72acc03875fdebf03f83194a6f91f1ac1d9c3531c7d1537fa0b9bc1a9da53acc50339a3b7df7b62 + REF 9599f724d4edc3a3d973bac14eeebdc1bc31d327 #v1.13.0 + SHA512 ae1f8ed8aecdc35e9e78c957fcd154e43c7bcb5bf5cf3e5b23be3e95d21de754dbbd9b6549bd6c7991fad24492b08421df338c3706ab0157c31ebc88b65fa4fe HEAD_REF master PATCHES fixlibpmemobj-cpp.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - benchmark BUILD_BENCHMARKS + FEATURES + benchmark BUILD_BENCHMARKS ) vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) vcpkg_add_to_path(${PERL_EXE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF + -DTESTS_USE_VALGRIND=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/libpmemobj++/cmake TARGET_PATH share/libpmemobj++) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/libpmemobj++/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib/libpmemobj++) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib/libpmemobj++") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpmemobj-cpp/vcpkg.json b/ports/libpmemobj-cpp/vcpkg.json new file mode 100644 index 00000000000000..ba0000533ba7bd --- /dev/null +++ b/ports/libpmemobj-cpp/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "libpmemobj-cpp", + "version-semver": "1.13.0", + "description": "C++ bindings for libpmemobj (https://github.com/pmem/pmdk)", + "homepage": "https://github.com/pmem/libpmemobj-cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "benchmark": { + "description": "build benchmarks", + "dependencies": [ + "pmdk" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 23d719c621f49d..a06167ac70f441 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3521,7 +3521,7 @@ "port-version": 1 }, "libpmemobj-cpp": { - "baseline": "1.12", + "baseline": "1.13.0", "port-version": 0 }, "libpng": { diff --git a/versions/l-/libpmemobj-cpp.json b/versions/l-/libpmemobj-cpp.json index 8594fb9d9cf8b9..158beef8f08ed3 100644 --- a/versions/l-/libpmemobj-cpp.json +++ b/versions/l-/libpmemobj-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75d4c464f3bc9823857cab2f378bf7dc53cd7e2b", + "version-semver": "1.13.0", + "port-version": 0 + }, { "git-tree": "debedff0ebcfc704948550b14af45cfa1b7cf3bb", "version-string": "1.12", From e93232f30435a4efe0e7899f2b8ad23136ad7b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Mon, 30 Aug 2021 19:26:47 +0200 Subject: [PATCH 0383/1858] [plf-colony] Update to 6.28 (#19627) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [plf-colony] Update from 5.33 to 6.28 * [plf-colony] Update version files Co-authored-by: Rémy Tassoux --- ports/plf-colony/CONTROL | 4 ---- ports/plf-colony/portfile.cmake | 4 ++-- ports/plf-colony/vcpkg.json | 6 ++++++ versions/baseline.json | 2 +- versions/p-/plf-colony.json | 5 +++++ 5 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 ports/plf-colony/CONTROL create mode 100644 ports/plf-colony/vcpkg.json diff --git a/ports/plf-colony/CONTROL b/ports/plf-colony/CONTROL deleted file mode 100644 index 91750341e4100b..00000000000000 --- a/ports/plf-colony/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: plf-colony -Version: 5.33 -Description: An unordered data container providing fast iteration/insertion/erasure while maintaining pointer validity to non-erased elements -Homepage: https://www.plflib.org/ diff --git a/ports/plf-colony/portfile.cmake b/ports/plf-colony/portfile.cmake index fc1d7669ac6ca3..97e64da711248f 100644 --- a/ports/plf-colony/portfile.cmake +++ b/ports/plf-colony/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mattreecebentley/plf_colony - REF 7aba4b3f27e3dd7ca54cbe41738d04695d2c05e1 - SHA512 78dc8ee96174776e6993b03f15b1e7452864015641854ff89ffbe8d45e2203982347da9bf6eed1f7a0b40a794c53ab7c06e92eee101e4e0aae20997d240db872 + REF e6e563b63dd9e64fc2fcc66a757e366641e62f01 + SHA512 61723a47387fb3ce9a342fbd6db11369774c1a5c5d28ba2db1fee3396a0588a0e9df50cbcaa4561f409d34ddadc17ae61dba29606aa6481647f3bcd003cfaafa HEAD_REF master ) diff --git a/ports/plf-colony/vcpkg.json b/ports/plf-colony/vcpkg.json new file mode 100644 index 00000000000000..5529658fae8dcf --- /dev/null +++ b/ports/plf-colony/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "plf-colony", + "version": "6.28", + "description": "An unordered C++ data container providing fast iteration/insertion/erasure while maintaining pointer/iterator validity to non-erased elements regardless of insertions/erasures.", + "homepage": "https://plflib.org/colony.htm" +} diff --git a/versions/baseline.json b/versions/baseline.json index a06167ac70f441..330ff496459b19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4969,7 +4969,7 @@ "port-version": 6 }, "plf-colony": { - "baseline": "5.33", + "baseline": "6.28", "port-version": 0 }, "plf-list": { diff --git a/versions/p-/plf-colony.json b/versions/p-/plf-colony.json index 0935962f14f0d8..88bbddd62111e9 100644 --- a/versions/p-/plf-colony.json +++ b/versions/p-/plf-colony.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39c9b9a09ea0d7f88ac7a9cd90addb057e259f20", + "version": "6.28", + "port-version": 0 + }, { "git-tree": "0d9c2c09b2926db03ddd83cf09973d885cfc292b", "version-string": "5.33", From 52de3c2aa81be271fea59ffccef18a66d099a74e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 31 Aug 2021 01:28:07 +0800 Subject: [PATCH 0384/1858] [libmt32emu] update from 2.5.0 to 2.5.3 (#19754) * [libmt32emu] update from 2.5.0 to 2.5.3 * update version --- ports/libmt32emu/portfile.cmake | 13 ++++++------- ports/libmt32emu/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/l-/libmt32emu.json | 5 +++++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ports/libmt32emu/portfile.cmake b/ports/libmt32emu/portfile.cmake index fc2ed4ef17729d..cb9ed893973440 100644 --- a/ports/libmt32emu/portfile.cmake +++ b/ports/libmt32emu/portfile.cmake @@ -1,21 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO munt/munt - REF libmt32emu_2_5_0 - SHA512 e86733bb26714a2a5f54a1b443db1e6f320bc3373dde6bbbe6662ecfb5b36c8ba0811919f2ddd54a11f264551add76e7032cd51f5803c502bfd4b1020fafb86b + REF libmt32emu_2_5_3 + SHA512 c801e22e861898281316109533ca6264f5a9cf778d4f0bb14b49bb6d04d53b7e60cd8320d5b29a63534f6c470b4feb67c881e86c49b7860a98639ce01b99debf HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/mt32emu - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/mt32emu" OPTIONS -Dlibmt32emu_SHARED:BOOL=${BUILD_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -23,4 +22,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") -file(INSTALL ${SOURCE_PATH}/mt32emu/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/mt32emu/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmt32emu/vcpkg.json b/ports/libmt32emu/vcpkg.json index ee72d3c71d1f63..aace79c4e27099 100644 --- a/ports/libmt32emu/vcpkg.json +++ b/ports/libmt32emu/vcpkg.json @@ -1,6 +1,16 @@ { "name": "libmt32emu", - "version": "2.5.0", + "version": "2.5.3", "description": "A MT-32 emulator", - "homepage": "https://github.com/munt/munt/tree/master/mt32emu" + "homepage": "https://github.com/munt/munt/tree/master/mt32emu", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 330ff496459b19..705afcdfb018c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3433,7 +3433,7 @@ "port-version": 0 }, "libmt32emu": { - "baseline": "2.5.0", + "baseline": "2.5.3", "port-version": 0 }, "libmupdf": { diff --git a/versions/l-/libmt32emu.json b/versions/l-/libmt32emu.json index 0d2d6ac3eb7961..dc8386caeb3d83 100644 --- a/versions/l-/libmt32emu.json +++ b/versions/l-/libmt32emu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1893148ecacd02e10cb14c90539f23687b597b6", + "version": "2.5.3", + "port-version": 0 + }, { "git-tree": "a57fc5791efae931cf33dc307104c0463a2207be", "version": "2.5.0", From 5eaeff75f275a8a76b2f497192d4e15d7973b4cc Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 30 Aug 2021 10:28:20 -0700 Subject: [PATCH 0385/1858] [ctre] Update to 3.4.1 (#19614) * update to 3.4.1 * update baseline --- ports/ctre/CONTROL | 3 --- ports/ctre/portfile.cmake | 21 ++++++++++++++------- ports/ctre/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 2 +- versions/c-/ctre.json | 5 +++++ 5 files changed, 36 insertions(+), 11 deletions(-) delete mode 100644 ports/ctre/CONTROL create mode 100644 ports/ctre/vcpkg.json diff --git a/ports/ctre/CONTROL b/ports/ctre/CONTROL deleted file mode 100644 index 9fdadd3d8eb84b..00000000000000 --- a/ports/ctre/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: ctre -Version: 2.10 -Description: A Compile time PCRE (almost) compatible regular expression matcher diff --git a/ports/ctre/portfile.cmake b/ports/ctre/portfile.cmake index d88d21b1dc0561..112ad13d5c8126 100644 --- a/ports/ctre/portfile.cmake +++ b/ports/ctre/portfile.cmake @@ -1,13 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hanickadot/compile-time-regular-expressions - REF 4fea9f2745129b3542382646d032787713667448 # v2.10 - SHA512 a6137c6c19e8b535b4794c45a988206df71fe4b91378b2bc48ab265c8e850c20b42e6556a2665fdd5e542d8d7d5109eb0421a1f47b035c6d60d0296c36bdfeb5 - HEAD_REF master + REF v3.4.1 + SHA512 a7b44df9c30fb46373e34d8b98fe3ef3fd0486d33ba4d7bbf58a29eef05b22b8c903bf79ae539008a564f46e0bdee3e7700819d8d072c00537f8d175af59be3e + HEAD_REF main ) -# Install header files -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCTRE_BUILD_TESTS=OFF + -DCTRE_BUILD_PACKAGE=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/ctre") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ctre RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ctre/vcpkg.json b/ports/ctre/vcpkg.json new file mode 100644 index 00000000000000..724d2c9b167fa5 --- /dev/null +++ b/ports/ctre/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "ctre", + "version-semver": "3.4.1", + "description": "A Compile time PCRE (almost) compatible regular expression matcher", + "homepage": "https://github.com/hanickadot/compile-time-regular-expressions", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 705afcdfb018c0..3679e48e239f20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1561,7 +1561,7 @@ "port-version": 0 }, "ctre": { - "baseline": "2.10", + "baseline": "3.4.1", "port-version": 0 }, "cub": { diff --git a/versions/c-/ctre.json b/versions/c-/ctre.json index fab0a526f83e8e..a5f5f91604aee6 100644 --- a/versions/c-/ctre.json +++ b/versions/c-/ctre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd57f6d1ec68aaa67e90f3382cce5668c5ecff5a", + "version-semver": "3.4.1", + "port-version": 0 + }, { "git-tree": "e50c31381fad0a8a4ac062531eaef4f728c2a469", "version-string": "2.10", From 00ba2d9c381b5e4e3e2f1c09b30a247e4313830a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 31 Aug 2021 01:28:34 +0800 Subject: [PATCH 0386/1858] [Mesa] update to 21.2.0 (#19612) * [Mesa] update to 21.2.0 * update verison --- ports/mesa/portfile.cmake | 4 ++-- ports/mesa/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mesa.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/mesa/portfile.cmake b/ports/mesa/portfile.cmake index 62d02a75d23800..0039249051c52f 100644 --- a/ports/mesa/portfile.cmake +++ b/ports/mesa/portfile.cmake @@ -16,8 +16,8 @@ vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO mesa/mesa - REF mesa-21.1.6 - SHA512 93a44c6a83c03fcf3bbcc650430f8f88f5e4ec001ac982f5359b70c840ed43980ae9734db2ad77ef9bb958187948364f32e601d5a5f0087c7adb990073c33339 + REF mesa-21.2.0 + SHA512 4837e42474d69861fbce4fa03d120b56997094d61b3045c417bbab73774dda86e4b7adf54af98585511a3517860c33c77898e6171cd845f760bada4b000ff52d HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/mesa/vcpkg.json b/ports/mesa/vcpkg.json index 19167072bf6ed7..2030dfe0e450c6 100644 --- a/ports/mesa/vcpkg.json +++ b/ports/mesa/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mesa", - "version": "21.1.6", + "version": "21.2.0", "description": "Mesa - The 3D Graphics Library", "homepage": "https://www.mesa3d.org/", "supports": "!(windows & arm)", diff --git a/versions/baseline.json b/versions/baseline.json index 3679e48e239f20..974f3972c1a2f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4057,7 +4057,7 @@ "port-version": 0 }, "mesa": { - "baseline": "21.1.6", + "baseline": "21.2.0", "port-version": 0 }, "meschach": { diff --git a/versions/m-/mesa.json b/versions/m-/mesa.json index ee1f3234ac8b67..7d643482e5d3ee 100644 --- a/versions/m-/mesa.json +++ b/versions/m-/mesa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "931291396b7abd6c8fcdf7d6e995782dfa64bb80", + "version": "21.2.0", + "port-version": 0 + }, { "git-tree": "315d3fe5a64b2a34efeb9caee72c7922bc48c148", "version": "21.1.6", From 11d31b0848ed7b473f5f4b887e1a37a9a99339a1 Mon Sep 17 00:00:00 2001 From: Chris Mc Date: Mon, 30 Aug 2021 13:32:35 -0400 Subject: [PATCH 0387/1858] [jwt-cpp] port update to add version 0.5.1 (#19618) * Update vcpkg.json * Update portfile.cmake * Update baseline.json * Update jwt-cpp.json * Update jwt-cpp.json --- ports/jwt-cpp/portfile.cmake | 2 +- ports/jwt-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/jwt-cpp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/jwt-cpp/portfile.cmake b/ports/jwt-cpp/portfile.cmake index f9390ee3d491e6..548e0da08908e4 100644 --- a/ports/jwt-cpp/portfile.cmake +++ b/ports/jwt-cpp/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Thalhammer/jwt-cpp - REF b45bc9994d8087c5ba7aa1f1588302f04ae84c83 # v0.5.0 + REF 60122bbd8e6b9009c4633c1a33ea94c5b682034a # v0.5.1 SHA512 d2c6e2174cd86c27b8866f6ea50a379a321788e91f97a0548e694d11469c05d93b0713e0c38b37a8f14a0aded4fc4635599dcfb50142e4496fb3c8b9f7e5f8cd HEAD_REF master ) diff --git a/ports/jwt-cpp/vcpkg.json b/ports/jwt-cpp/vcpkg.json index 47533b72fd8f89..7178ba5d7fe31a 100644 --- a/ports/jwt-cpp/vcpkg.json +++ b/ports/jwt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jwt-cpp", - "version-semver": "0.5.0", + "version-semver": "0.5.1", "description": "A header only library for creating and validating json web tokens in c++", "homepage": "https://github.com/Thalhammer/jwt-cpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 974f3972c1a2f6..f1318f8b814cdc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2849,7 +2849,7 @@ "port-version": 2 }, "jwt-cpp": { - "baseline": "0.5.0", + "baseline": "0.5.1", "port-version": 0 }, "jxrlib": { diff --git a/versions/j-/jwt-cpp.json b/versions/j-/jwt-cpp.json index 43cbb1bc6175c4..6f7dc3557f2de8 100644 --- a/versions/j-/jwt-cpp.json +++ b/versions/j-/jwt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "068be311e2c481a636406216d26d0283768de825", + "version-semver": "0.5.1", + "port-version": 0 + }, { "git-tree": "1205d0b1c1db271b04b84e075b21f7b6359effb5", "version-semver": "0.5.0", From d4af2b6654e25a5026445f9271de1f0203af0c44 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Mon, 30 Aug 2021 10:32:50 -0700 Subject: [PATCH 0388/1858] [functions-framework-cpp] update to latest release (v0.6.0) (#19603) * [functions-framework-cpp] update to latest release (v0.6.0) * Fix version in portfile --- ports/functions-framework-cpp/portfile.cmake | 4 ++-- ports/functions-framework-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/functions-framework-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index e0f938f23e008a..1e145de3aa3e95 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/functions-framework-cpp - REF v0.5.0 - SHA512 cc7ba39a86a035625e09e653f1c60ee5125a449a2822c26b3e30d6ed3d84bfce93a8e627069b1c50e0dddcaf0277d82681627d653d42a3e967d191b2d979e2e8 + REF v0.6.0 + SHA512 57d6ec2467d1f9e12c14c3d2c361be15e5c5cfa4a12f3a184a99b8b0e91b2224a9156bfd875c98e8ad0ea44b7f84524fac35c536718fa039941647616a9e8586 HEAD_REF main ) diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json index cb9077fe2e5905..9028886bf1cf2f 100644 --- a/ports/functions-framework-cpp/vcpkg.json +++ b/ports/functions-framework-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "functions-framework-cpp", - "version": "0.5.0", + "version": "0.6.0", "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f1318f8b814cdc..c98a632186f623 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2189,7 +2189,7 @@ "port-version": 0 }, "functions-framework-cpp": { - "baseline": "0.5.0", + "baseline": "0.6.0", "port-version": 0 }, "fuzzylite": { diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index 1e2242af21c3e6..606fa351b06e5f 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "137edc9b4dd9a58f50ae9db1671d4608748088e7", + "version": "0.6.0", + "port-version": 0 + }, { "git-tree": "48d17ad88b188aa35db1a9d18f78b4fa9b9a8e22", "version": "0.5.0", From fef86122638ccc060afc87d9043ed9954f26d7c8 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 31 Aug 2021 02:11:16 +0200 Subject: [PATCH 0389/1858] [docs] improve integrate documentation (#19700) * [docs] improve integrate documentation * Small suggestions Co-authored-by: Robert Schumacher --- docs/README.md | 2 +- docs/users/integration.md | 169 +++++++++++++++++++++----------------- 2 files changed, 96 insertions(+), 75 deletions(-) diff --git a/docs/README.md b/docs/README.md index f5994445a50c9e..71769a8506531f 100644 --- a/docs/README.md +++ b/docs/README.md @@ -14,7 +14,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too ### User Help -- [Integration with build systems](users/integration.md) +- [Buildsystem Integration](users/integration.md) - [Triplet files](users/triplets.md) - [Configuration and Environment](users/config-environment.md) - [Manifest Mode](users/manifests.md) diff --git a/docs/users/integration.md b/docs/users/integration.md index 919719ff4ee226..15a3072e3c7a1a 100644 --- a/docs/users/integration.md +++ b/docs/users/integration.md @@ -1,21 +1,24 @@ -## Buildsystem Integration +# Buildsystem Integration **The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/integration.md).** - -Vcpkg offers many ways to integrate into your build so you can do what's right for your project. There are two main categories of integration: - -- [`integrate` command](#integrate) -- [`export` command](#export) - -Each integration style has heuristics to deduce the correct [triplet][]. This can be overridden using [a common method](#triplet-selection) based on your buildsystem. - - -### Integrate Command - -These link your project(s) to a specific copy of Vcpkg on your machine so any updates or new package installations will be instantly available for the next build of your project. - - -#### User-wide for MSBuild (Recommended for Open Source MSBuild projects) +## Table of Contents +- [MSBuild Integration (Visual Studio)](#msbuild-integration-visual-studio) + - [User-wide integration](#user-wide-integration) + - [Per-project Integration](#per-project-integration) + - [Changing the triplet](#msbuild-changing-the-triplet) +- [CMake Integration](#cmake-integration) + - [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option) + - [Using multiple toolchain files](#using-multiple-toolchain-files) + - [Changing the triplet](#cmake-changing-the-triplet) +- [Manual Compiler Setup](#manual-compiler-setup) +- [`export` Command](#export-command) + +The buildsystem-specific integration styles have heuristics to deduce the correct [triplet][]. This can be overridden in a native way for [MSBuild](#msbuild-changing-the-triplet) and [CMake](#cmake-changing-the-triplet). + +## MSBuild Integration (Visual Studio) + +**If you are using manifest mode(`vcpkg.json`) see [here](manifests.md#msbuild-integration) for additional configuration options.** +### User-wide integration ```no-highlight vcpkg integrate install ``` @@ -32,10 +35,45 @@ Here are some examples, though this is not an exhaustive list: To get a full list for all your installed packages, run `vcpkg owns manual-link`. - -#### CMake toolchain file (Recommended for Open Source CMake projects) +**If you are using manifest mode (`vcpkg.json`) see [here](manifests.md#msbuild-integration) for all available options.** + +### Per-project integration + +**Note: This approach is not recommended for new projects, since it makes them difficult to share with others.** + +**For a portable, self-contained NuGet package, see the [`export command`](#export-command)** + +We also provide individual VS project integration through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. ```no-highlight -cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake +PS D:\src\vcpkg> .\vcpkg integrate project +Created nupkg: D:\src\vcpkg\scripts\buildsystems\vcpkg.D.src.vcpkg.1.0.0.nupkg + +With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: + Install-Package vcpkg.D.src.vcpkg -Source "D:/src/vcpkg/scripts/buildsystems" +``` +*Note: The generated NuGet package does not contain the actual libraries. It instead acts like a shortcut (or symlink) to the vcpkg install and will "automatically" update with any changes (install/remove) to the libraries. You do not need to regenerate or update the NuGet package.* + + + +### Changing the triplet +You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher: + +> *Shortcut: Ctrl+Q "build and run"* +> +> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity + +To override the automatically chosen [triplet][], you can specify the MSBuild property `VcpkgTriplet` in your `.vcxproj`. We recommend adding this to the `Globals` PropertyGroup. +```xml + + + x86-windows-static + x64-windows-static + +``` + +## CMake Integration +```no-highlight +cmake ../my/project -DCMAKE_TOOLCHAIN_FILE=[vcpkg-root]/scripts/buildsystems/vcpkg.cmake ``` Projects configured with the Vcpkg toolchain file will have the appropriate Vcpkg folders added to the cmake search paths. This makes all libraries available to be found through `find_package()`, `find_path()`, and `find_library()`. @@ -48,7 +86,11 @@ find_path(CATCH_INCLUDE_DIR NAMES catch.hpp PATH_SUFFIXES catch2) include_directories(${CATCH_INCLUDE_DIR}) ``` -##### Using an environment variable instead of a command line option +**If you are using manifest mode (`vcpkg.json`) see [here](manifests.md#cmake-integration) for all available options.** + +For different IDE integrations see [here](../../README.md#using-vcpkg-with-cmake). + +### Using an environment variable instead of a command line option The `CMAKE_TOOLCHAIN_FILE` setting simply must be set before the `project()` directive is first called. This means that you can easily read from an environment variable to avoid passing it on the configure line: @@ -61,7 +103,7 @@ endif() project(myproject CXX) ``` -##### Using multiple toolchain files +### Using multiple toolchain files To use an external toolchain file with a project using vcpkg, you can set the cmake variable `VCPKG_CHAINLOAD_TOOLCHAIN_FILE` on the configure line: ```no-highlight @@ -70,21 +112,39 @@ cmake ../my/project \ -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=../my/project/compiler-settings-toolchain.cmake ``` -#### Linking NuGet file +Alternatively, you can include the vcpkg toolchain at the end of the primary toolchain file: +```cmake +# MyToolchain.cmake +set(CMAKE_CXX_COMPILER ...) +set(VCPKG_TARGET_TRIPLET x64-my-custom-windows-triplet) +include(/path/to/vcpkg/scripts/buildsystems/vcpkg.cmake) +``` +**Note: vcpkg does _not_ see the settings in your own triplets, such as your compiler or compilation flags. To change vcpkg's settings, you must make a [custom triplet file](triplets.md) (which can [share your own toolchain](triplets.md#VCPKG_CHAINLOAD_TOOLCHAIN_FILE))** -We also provide individual VS project integration through a NuGet package. This will modify the project file, so we do not recommend this approach for open source projects. + + +### Changing the triplet +You can set `VCPKG_TARGET_TRIPLET` on the configure line: ```no-highlight -PS D:\src\vcpkg> .\vcpkg integrate project -Created nupkg: D:\src\vcpkg\scripts\buildsystems\vcpkg.D.src.vcpkg.1.0.0.nupkg +cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=... +``` +If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to control the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): -With a project open, go to Tools->NuGet Package Manager->Package Manager Console and paste: - Install-Package vcpkg.D.src.vcpkg -Source "D:/src/vcpkg/scripts/buildsystems" +```cmake +if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) + set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") +endif() +``` +Finally, if you have your own toolchain file, you can set `VCPKG_TARGET_TRIPLET` there: +```cmake +# MyToolchain.cmake +set(CMAKE_CXX_COMPILER ...) +set(VCPKG_TARGET_TRIPLET x64-my-custom-triplet) ``` -*Note: The generated NuGet package does not contain the actual libraries. It instead acts like a shortcut (or symlink) to the vcpkg install and will "automatically" update with any changes (install/remove) to the libraries. You do not need to regenerate or update the NuGet package.* -#### Manual compiler settings +## Manual Compiler Setup -Libraries are installed into the `installed\` subfolder, partitioned by architecture (e.g. x86-windows): +Libraries are installed into the `installed\` subfolder in classic mode, partitioned by triplet (e.g. x86-windows): * The header files are installed to `installed\x86-windows\include` * Release `.lib` files are installed to `installed\x86-windows\lib` or `installed\x86-windows\lib\manual-link` @@ -94,18 +154,17 @@ Libraries are installed into the `installed\` subfolder, partitioned by architec See your build system specific documentation for how to use prebuilt binaries. -Generally, to run any produced executables you will also need to either copy the needed DLL files to the same folder as your executable or *prepend* the correct `bin\` directory to your path. +_On Windows dynamic triplets:_ To run any produced executables you will also need to either copy the needed DLL files to the same folder as your executable or *prepend* the correct `bin\` directory to your path. - -### Export Command +## Export Command This command creates a shrinkwrapped archive containing a specific set of libraries (and their dependencies) that can be quickly and reliably shared with build servers or other users in your organization. -- `--nuget`: NuGet package (Recommended for MSBuild projects) +- `--nuget`: NuGet package - `--zip`: Zip archive -- `--7zip`: 7Zip archive (Recommended for CMake projects) +- `--7zip`: 7Zip archive - `--raw`: Raw, uncompressed folder -Each of these have the same layout, which mimics the layout of a full vcpkg: +Each of these have the same internal layout which mimics the layout of a full vcpkg instance: - `installed\` contains the installed package files - `scripts\buildsystems\vcpkg.cmake` is a toolchain file suitable for use with CMake @@ -114,43 +173,5 @@ Additionally, NuGet packages will contain a `build\native\vcpkg.targets` that in Please also see our [blog post](https://blogs.msdn.microsoft.com/vcblog/2017/05/03/vcpkg-introducing-export-command/) for additional examples. - -### Triplet selection -Every integration mechanism besides manually adding the folders will deduce a [triplet][] for your project as one of: - -- x86-windows -- x64-windows -- x86-uwp -- x64-uwp -- arm-uwp - -#### With MSBuild -You can see the automatically deduced triplet by setting your MSBuild verbosity to Normal or higher: - -> *Shortcut: Ctrl+Q "build and run"* -> -> Tools -> Options -> Projects and Solutions -> Build and Run -> MSBuild project build output verbosity - -To override the automatically chosen [triplet][], you can specify the MSBuild property `VcpkgTriplet` in your `.vcxproj`. We recommend adding this to the `Globals` PropertyGroup. -```xml - - - x86-windows-static - x64-windows-static - -``` - -#### With CMake -You can set `VCPKG_TARGET_TRIPLET` on the configure line: -```no-highlight -cmake ../my/project -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=... -``` -If you use `VCPKG_DEFAULT_TRIPLET` [environment variable](config-environment.md) to control the unqualified triplet in vcpkg command lines you can default `VCPKG_TARGET_TRIPLET` in CMake like [Using an environment variable instead of a command line option](#using-an-environment-variable-instead-of-a-command-line-option): - -```cmake -if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET) - set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "") -endif() -``` [triplet]: triplets.md From c028bc518114b29e2939f7633209f82e4045dcd6 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Mon, 30 Aug 2021 17:14:50 -0700 Subject: [PATCH 0390/1858] [google-cloud-cpp] use features to stop package growth (#19600) * [google-cloud-cpp] use features to stop package growth We have plans to grow `google-cloud-cpp`, but we think the build times are large enough already. This creates "features" to at least stop the package growth as new features are added. The "default-features" reflects the current features in the package. * Remove versions created during development * Address review comments --- ports/google-cloud-cpp/portfile.cmake | 5 ++ ports/google-cloud-cpp/vcpkg.json | 113 +++++++++++++++++++++++--- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 ++ 4 files changed, 112 insertions(+), 13 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 6fb513e504e0c6..6dfe0070b3d5cf 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -12,11 +12,16 @@ vcpkg_from_github( vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") +set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") +list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") +list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS + "-DGOOGLE_CLOUD_CPP_ENABLE=${GOOGLE_CLOUD_CPP_ENABLE}" -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index f744436ff4527d..b907123b668278 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,24 +1,113 @@ { "name": "google-cloud-cpp", "version": "1.30.1", + "port-version": 1, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ - "abseil", - "crc32c", - { - "name": "curl", - "features": [ - "ssl" + "abseil" + ], + "default-features": [ + "bigquery", + "bigtable", + "iam", + "pubsub", + "spanner", + "storage" + ], + "features": { + "bigquery": { + "description": "The Google Cloud BigQuery C++ client library", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } ] }, - { - "name": "grpc", - "host": true + "bigtable": { + "description": "The Google Cloud Bigtable C++ client library", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } + ] + }, + "firestore": { + "description": "Community contributions to interact with Firestore" }, - "grpc", - "nlohmann-json" - ] + "iam": { + "description": "The Google Cloud IAM C++ client library", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } + ] + }, + "pubsub": { + "description": "The Google Cloud Bigtable C++ client library", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } + ] + }, + "spanner": { + "description": "The Google Cloud Spanner C++ client library", + "dependencies": [ + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } + ] + }, + "storage": { + "description": "The Google Cloud Storage C++ client library", + "dependencies": [ + "crc32c", + { + "name": "curl", + "features": [ + "ssl" + ] + }, + "nlohmann-json" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index c98a632186f623..bf1ff7b26a5534 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2386,7 +2386,7 @@ }, "google-cloud-cpp": { "baseline": "1.30.1", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 8431af02c4e74f..f743550b59d895 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e4c28a8a9e84631228981bd73a3932596fe8e1f", + "version": "1.30.1", + "port-version": 1 + }, { "git-tree": "254b48f7254b7ab5b4ac6676ccd3149274f154f0", "version": "1.30.1", From f88a28074e79bd94ca8ba4a69693fa241c346924 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 31 Aug 2021 08:54:50 +0800 Subject: [PATCH 0391/1858] [vcpkg] [issue template] Questions would be posted in the discussion section instead (#18696) --- .github/ISSUE_TEMPLATE/i-have-a-question.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/i-have-a-question.md b/.github/ISSUE_TEMPLATE/i-have-a-question.md index 7129976300e66d..643d43dce96ec6 100644 --- a/.github/ISSUE_TEMPLATE/i-have-a-question.md +++ b/.github/ISSUE_TEMPLATE/i-have-a-question.md @@ -7,4 +7,4 @@ assignees: '' --- -When asking a question please also include where you looked for an answer (so we can update the documentation if needed). +Please create a discussion in https://github.com/microsoft/vcpkg/discussions/new instead. From 9cfa9cb18ca4608fe62b12ee75ae04f4bd2db76d Mon Sep 17 00:00:00 2001 From: MidwestB Date: Mon, 30 Aug 2021 20:19:44 -0500 Subject: [PATCH 0392/1858] [libffi] Use -llibffi on Windows (#19655) * Use -llibffi on Windows Replace -lffi with -llibffi for Windows development, not just mingw * Update portfile.cmake * Update baseline.json * Update libffi.json * Add port-version and make path quoted * Update version files Co-authored-by: NancyLi1013 --- ports/libffi/portfile.cmake | 16 ++++++++-------- ports/libffi/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libffi.json | 5 +++++ 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index 8a9c69489fc5fe..ba5d4d88cef156 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -8,11 +8,11 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURCE_PATH}") vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DFFI_CONFIG_FILE=${CMAKE_CURRENT_LIST_DIR}/fficonfig.h @@ -44,16 +44,16 @@ endif() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() -if(VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" "-lffi" "-llibffi") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" "-lffi" "-llibffi") endif() vcpkg_fixup_pkgconfig() if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ffi.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ffi.h" " *know* they are going to link with the static library. */" " *know* they are going to link with the static library. */ @@ -62,4 +62,4 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) ) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 1b015d4037365d..80481cdb7ab012 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libffi", "version": "3.4.2", + "port-version": 1, "description": "Portable, high level programming interface to various calling conventions", "homepage": "https://github.com/libffi/libffi" } diff --git a/versions/baseline.json b/versions/baseline.json index bf1ff7b26a5534..1d771b70bb3069 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3206,7 +3206,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 0 + "port-version": 1 }, "libfido2": { "baseline": "1.7.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index f866b768649419..52f85d99dbdd82 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456", + "version": "3.4.2", + "port-version": 1 + }, { "git-tree": "683012a89ed0185eecbc3035b2490af7d2cd2379", "version": "3.4.2", From 15f6688b16e1a7cfa3aee5c110b30d2d4ce9b2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabien=20P=C3=A9an?= Date: Tue, 31 Aug 2021 03:21:30 +0200 Subject: [PATCH 0393/1858] [eastl] fix dependency eabase (#19643) --- ports/eabase/CONTROL | 4 ---- ports/eabase/fix_cmake_install.patch | 4 ++-- ports/eabase/vcpkg.json | 7 +++++++ ports/eastl/CONTROL | 5 ----- ports/eastl/EASTLConfig.cmake.in | 3 +++ ports/eastl/vcpkg.json | 10 ++++++++++ versions/baseline.json | 6 +++--- versions/e-/eabase.json | 5 +++++ versions/e-/eastl.json | 5 +++++ 9 files changed, 35 insertions(+), 14 deletions(-) delete mode 100644 ports/eabase/CONTROL create mode 100644 ports/eabase/vcpkg.json delete mode 100644 ports/eastl/CONTROL create mode 100644 ports/eastl/vcpkg.json diff --git a/ports/eabase/CONTROL b/ports/eabase/CONTROL deleted file mode 100644 index 2855f5f2fd3cf5..00000000000000 --- a/ports/eabase/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: eabase -Version: 2.09.12-1 -Homepage: https://github.com/electronicarts/EABase -Description: Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros. diff --git a/ports/eabase/fix_cmake_install.patch b/ports/eabase/fix_cmake_install.patch index 1a81fd69f3fd79..ea83e66b201d87 100644 --- a/ports/eabase/fix_cmake_install.patch +++ b/ports/eabase/fix_cmake_install.patch @@ -36,7 +36,7 @@ index 89c6703..ab8e553 100644 + #------------------------------------------------------------------------------------------- + target_include_directories(EABase INTERFACE + $ -+ $ ++ $ + ) + + # create and install an export set for eabase target as EABase::EABase @@ -64,7 +64,7 @@ index 89c6703..ab8e553 100644 + ) + + install(TARGETS EABase LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+ install(DIRECTORY "include/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") ++ install(DIRECTORY "include/Common/" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + + install( + FILES diff --git a/ports/eabase/vcpkg.json b/ports/eabase/vcpkg.json new file mode 100644 index 00000000000000..d9032602ca520d --- /dev/null +++ b/ports/eabase/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "eabase", + "version-string": "2.09.12", + "port-version": 2, + "description": "Electronic Arts Base. EABase is a small set of header files that define platform-independent data types and macros.", + "homepage": "https://github.com/electronicarts/EABase" +} diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL deleted file mode 100644 index da3a4b734c0c99..00000000000000 --- a/ports/eastl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: eastl -Version: 3.17.03 -Homepage: https://github.com/electronicarts/EASTL -Description: Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations. -Build-Depends: eabase diff --git a/ports/eastl/EASTLConfig.cmake.in b/ports/eastl/EASTLConfig.cmake.in index 6e1a8ea90de416..92fb2b18dd9416 100644 --- a/ports/eastl/EASTLConfig.cmake.in +++ b/ports/eastl/EASTLConfig.cmake.in @@ -1,5 +1,8 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) +find_dependency(EABase CONFIG REQUIRED) + # Provide path for scripts list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json new file mode 100644 index 00000000000000..9fd13a0c858b0b --- /dev/null +++ b/ports/eastl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "eastl", + "version-string": "3.17.03", + "port-version": 1, + "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", + "homepage": "https://github.com/electronicarts/EASTL", + "dependencies": [ + "eabase" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1d771b70bb3069..e3f56fde343729 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1817,12 +1817,12 @@ "port-version": 0 }, "eabase": { - "baseline": "2.09.12-1", - "port-version": 0 + "baseline": "2.09.12", + "port-version": 2 }, "eastl": { "baseline": "3.17.03", - "port-version": 0 + "port-version": 1 }, "easycl": { "baseline": "0.3", diff --git a/versions/e-/eabase.json b/versions/e-/eabase.json index fbbfcdb80d4c49..db64610917362b 100644 --- a/versions/e-/eabase.json +++ b/versions/e-/eabase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40dfd9d387e788a7987db75e0d9fc22786b8e43b", + "version-string": "2.09.12", + "port-version": 2 + }, { "git-tree": "171ca1fc19c06e74b273601aa815049126f84212", "version-string": "2.09.12-1", diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json index 7e72cfba2b5460..c525d9baa39569 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63d695972dd9861a2726ca90361aaafac0f710f6", + "version-string": "3.17.03", + "port-version": 1 + }, { "git-tree": "69fe302d6e81880f94a6a9b3ddb88437e42a9731", "version-string": "3.17.03", From 88798808310d814f5f7bb4efe5404875fe241f02 Mon Sep 17 00:00:00 2001 From: Mathis Date: Tue, 31 Aug 2021 03:25:10 +0200 Subject: [PATCH 0394/1858] [comms,commsdsl,comms-ublox] update ports (#19581) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update comms, add tools feature; update commsdsl * update versions * update comms-ublox * update version * add quotes to paths * version * fix comms dir remove * version * remove VCPKG_POLICY_DLLS_WITHOUT_LIBS * version * fix some paths * version * only allow build of tools if triplet is dynamic * version * fail on static * version * replace deprecated functions and replace options * version * fix * fix 2 * update version * apply @JackBoosY suggestions * version * Update ports/comms/portfile.cmake * Update versions/c-/comms.json * add @NancyLi1013 suggestions * update versions Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/comms-ublox/fix-comms.patch | 2 +- ports/comms-ublox/portfile.cmake | 8 ++-- ports/comms-ublox/vcpkg.json | 2 +- ports/comms/portfile.cmake | 64 ++++++++++++++++++++++++------- ports/comms/vcpkg.json | 22 ++++++++++- ports/commsdsl/portfile.cmake | 16 ++++---- ports/commsdsl/vcpkg.json | 2 +- versions/baseline.json | 6 +-- versions/c-/comms-ublox.json | 5 +++ versions/c-/comms.json | 5 +++ versions/c-/commsdsl.json | 5 +++ 11 files changed, 104 insertions(+), 33 deletions(-) diff --git a/ports/comms-ublox/fix-comms.patch b/ports/comms-ublox/fix-comms.patch index c1619bfc266c5b..d9620a4aa5811a 100644 --- a/ports/comms-ublox/fix-comms.patch +++ b/ports/comms-ublox/fix-comms.patch @@ -16,7 +16,7 @@ index e2b69fe..aff5917 100644 endif () +else() + find_package(LibComms CONFIG REQUIRED) -+ set(cc_compile_file ${LibComms_DIR}/CC_Compile.cmake) ++ set(cc_compile_file "${LibComms_DIR}/CC_Compile.cmake") +endif() if (EXISTS ${cc_compile_file}) diff --git a/ports/comms-ublox/portfile.cmake b/ports/comms-ublox/portfile.cmake index fbf86d8bd22ba5..d5fd4bcea27fa0 100644 --- a/ports/comms-ublox/portfile.cmake +++ b/ports/comms-ublox/portfile.cmake @@ -3,15 +3,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/cc.ublox.generated - REF v0.20.1 - SHA512 a03a5e63a1430d91d0f8250da576abdf8c86c85a2673817c38f3c883c7a5b736113974c4b56a804174d7fbcdbd198851435f5589d715950427b55180fce70801 + REF v0.20.2 + SHA512 5672d964ea3e505837e44a5fd928069a219a5731764cb54bfe8609e39c6c6dd0059660bcde317c6c60cd1bd8d1f7942d2faa022095bf651817568291bc6a7569 HEAD_REF master PATCHES fix-comms.patch ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DOPT_BUILD_TEST=OFF @@ -27,4 +27,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/comms-ublox/vcpkg.json b/ports/comms-ublox/vcpkg.json index ae997f2e692082..93668cae03b2ca 100644 --- a/ports/comms-ublox/vcpkg.json +++ b/ports/comms-ublox/vcpkg.json @@ -1,6 +1,6 @@ { "name": "comms-ublox", - "version-semver": "0.20.1", + "version-semver": "0.20.2", "description": "UBLOX (UBX) protocol definition, generated out of cc.ublox.commsdsl", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/cc.ublox.generated", diff --git a/ports/comms/portfile.cmake b/ports/comms/portfile.cmake index 7e2f95df0130fe..3ec544e2fb4816 100644 --- a/ports/comms/portfile.cmake +++ b/ports/comms/portfile.cmake @@ -3,24 +3,60 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/comms_champion - REF v3.3 - SHA512 c60dc6c1ab67a2a5e26468255151ff9f5cbf4a2d7824c8f2ed0f8648b51170150fba26ab6072de9733b8b6e60272f28610d41d6b9df7994a0406f78aed5c686e + REF v3.4 + SHA512 573afbc0aebd72d8a047067410f0f54588675c4cbad37f824edbb6d8303e9c191c573ac9325bf5fec575dffd3d05562c04e75c1e5b748a34d01056bc8b766fb1 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools CC_BUILD_TOOLS_LIBRARY + tools CC_INSTALL_TOOLS_LIBRARY + tools CC_BUILD_TOOLS + tools CC_INSTALL_TOOLS +) + +# check before configure +if("tools" IN_LIST FEATURES) + vcpkg_fail_port_install(ON_LIBRARY_LINKAGE "static" MESSAGE "Feature 'Tools' can't be built statically") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCC_COMMS_LIB_ONLY=ON - -DCC_NO_UNIT_TESTS=ON + ${FEATURE_OPTIONS} + -DCC_INSTALL_COMMS_LIB=ON + -DCC_BUILD_UNIT_TESTS=OFF + -DCC_WARN_AS_ERR=OFF + -DCC_BUILD_DEMO_PROTOCOL=OFF + -DCC_INSTALL_DEMO_PROTOCOL=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/LibComms/cmake TARGET_PATH share/LibComms) -# currently this is only a header only library. after moving lib/LibComms to share this lib path will be empty -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME "LibComms" CONFIG_PATH "lib/LibComms/cmake" ) + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES cc_dump cc_view + AUTO_CLEAN + ) + file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/CommsChampion/plugin" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/lib/CommsChampion/plugin") + vcpkg_cmake_config_fixup(PACKAGE_NAME "CommsChampion" CONFIG_PATH "lib/CommsChampion/cmake") + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/LibComms") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/CommsChampion") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/LibComms") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/CommsChampion") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) diff --git a/ports/comms/vcpkg.json b/ports/comms/vcpkg.json index 62821a8bf5269d..677032b1179745 100644 --- a/ports/comms/vcpkg.json +++ b/ports/comms/vcpkg.json @@ -1,7 +1,25 @@ { "name": "comms", - "version-semver": "3.3.0", + "version-semver": "3.4.0", "description": "COMMS is the C++(11) headers only, platform independent library, which makes the implementation of a communication protocol to be an easy and relatively quick process.", "homepage": "https://commschamp.github.io/", - "documentation": "https://github.com/commschamp/comms_champion" + "documentation": "https://github.com/commschamp/comms_champion", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Builds CommsChampion tools", + "dependencies": [ + "qt5-base" + ] + } + } } diff --git a/ports/commsdsl/portfile.cmake b/ports/commsdsl/portfile.cmake index 7031ab989c50ed..60cb2bbbc1116e 100644 --- a/ports/commsdsl/portfile.cmake +++ b/ports/commsdsl/portfile.cmake @@ -2,24 +2,26 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commschamp/commsdsl - REF v3.6.3 - SHA512 0cb1573cd7dc000961a053601b85bd3c78183a0083fa654a97412c8024a3dc08bff58c833dea0af522a02888fbc198140d81615c7d8c7d5399871c2b0c2c43c5 + REF v3.6.4 + SHA512 dd997bb063baf4e6bc15666539e8d3e8cf435cfda88e8b115b8a1568c8c77cc2ca6dbf1a77ae2fcf9b24f68cb35aa2ae583852cf887fbc85f74e868230374055 HEAD_REF master ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DCOMMSDSL_NO_COMMS_CHAMPION=ON - -DCOMMSDSL_NO_TESTS=ON - -DCOMMSDSL_NO_WARN_AS_ERR=ON # remove on next version or on next version of boost + -DCOMMSDSL_BUILD_APPS=ON + -DCOMMSDSL_INSTALL_APPS=ON + -DCOMMSDSL_CHECKOUT_COMMS_CHAMPION=OFF + -DCOMMSDSL_BUILD_UNIT_TESTS=OFF + -DCOMMSDSL_WARN_AS_ERR=OFF ) vcpkg_install_cmake() vcpkg_copy_tools( TOOL_NAMES commsdsl2comms - SEARCH_DIR ${CURRENT_PACKAGES_DIR}/bin AUTO_CLEAN ) @@ -33,4 +35,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/commsdsl/vcpkg.json b/ports/commsdsl/vcpkg.json index 9e9085fd0e70f0..ebfbd0c7254d43 100644 --- a/ports/commsdsl/vcpkg.json +++ b/ports/commsdsl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "commsdsl", - "version-semver": "3.6.3", + "version-semver": "3.6.4", "description": "DSL schemas parser and code generator for CommsChampion Ecosystem", "homepage": "https://commschamp.github.io/", "documentation": "https://github.com/commschamp/commsdsl", diff --git a/versions/baseline.json b/versions/baseline.json index e3f56fde343729..60a027f1ab7797 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1365,15 +1365,15 @@ "port-version": 1 }, "comms": { - "baseline": "3.3.0", + "baseline": "3.4.0", "port-version": 0 }, "comms-ublox": { - "baseline": "0.20.1", + "baseline": "0.20.2", "port-version": 0 }, "commsdsl": { - "baseline": "3.6.3", + "baseline": "3.6.4", "port-version": 0 }, "concurrentqueue": { diff --git a/versions/c-/comms-ublox.json b/versions/c-/comms-ublox.json index f6e59f735b7546..bde81cf2d42ed8 100644 --- a/versions/c-/comms-ublox.json +++ b/versions/c-/comms-ublox.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d57cdb7ee417cb5e5ed0208d3d9470b79c80f2a", + "version-semver": "0.20.2", + "port-version": 0 + }, { "git-tree": "5d9d9c8e99627bcea62fc1ba2cd9fc496f64a3d2", "version-semver": "0.20.1", diff --git a/versions/c-/comms.json b/versions/c-/comms.json index 5f8ea3c8800f08..5a0c6228f21f16 100644 --- a/versions/c-/comms.json +++ b/versions/c-/comms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05c5eff9612ccbb544cdcbc8f453e12394956ed8", + "version-semver": "3.4.0", + "port-version": 0 + }, { "git-tree": "3ebf2c0d025a1facfe7ea9e9418e631d3015f532", "version-semver": "3.3.0", diff --git a/versions/c-/commsdsl.json b/versions/c-/commsdsl.json index a47cbdb09ca164..8096dfd07c351b 100644 --- a/versions/c-/commsdsl.json +++ b/versions/c-/commsdsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e714012afcd0c56b2b55f6ab18b0092f6cd0066", + "version-semver": "3.6.4", + "port-version": 0 + }, { "git-tree": "76aec94b428a3078c9135d05a46747c86cc24c7c", "version-semver": "3.6.3", From ebb381796a21006a6fede95a1022165574ed598e Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 30 Aug 2021 21:33:17 -0400 Subject: [PATCH 0395/1858] [ngspice] Update to release 35 (#19542) Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/ngspice/CONTROL | 10 - ports/ngspice/portfile.cmake | 11 +- .../ngspice/remove-64-in-codemodel-name.patch | 131 ++++++++++ ports/ngspice/remove-post-build.patch | 230 ++++++++++++++++++ ports/ngspice/vcpkg.json | 15 ++ versions/baseline.json | 4 +- versions/n-/ngspice.json | 5 + 7 files changed, 389 insertions(+), 17 deletions(-) delete mode 100644 ports/ngspice/CONTROL create mode 100644 ports/ngspice/remove-64-in-codemodel-name.patch create mode 100644 ports/ngspice/remove-post-build.patch create mode 100644 ports/ngspice/vcpkg.json diff --git a/ports/ngspice/CONTROL b/ports/ngspice/CONTROL deleted file mode 100644 index 545e117b053049..00000000000000 --- a/ports/ngspice/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: ngspice -Version: 34 -Port-Version: 1 -Homepage: http://ngspice.sourceforge.net/ -Description: Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE -Supports: !(linux|osx|arm|uwp) -Default-Features: codemodels - -Feature: codemodels -Description: Adds optional code models for XSPICE, ADMS (verilog integration) and B-/E-/G- sources. diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake index 915d120bd26da8..e128d737ec52cb 100644 --- a/ports/ngspice/portfile.cmake +++ b/ports/ngspice/portfile.cmake @@ -8,12 +8,15 @@ set(VCPKG_CRT_LINKAGE static) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO ngspice/ng-spice-rework - REF 34 - FILENAME "ngspice-34.tar.gz" - SHA512 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8 + REF 35 + FILENAME "ngspice-35.tar.gz" + SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b PATCHES use-winbison-sharedspice.patch use-winbison-vngspice.patch + remove-post-build.patch + remove-64-in-codemodel-name.patch + ) vcpkg_find_acquire_program(BISON) @@ -49,8 +52,6 @@ if("codemodels" IN_LIST FEATURES) vcpkg_build_msbuild( PROJECT_PATH ${BUILDTREE_PATH}/visualc/vngspice.sln - INCLUDES_SUBPATH /src/include - LICENSE_SUBPATH COPYING # build_msbuild swaps x86 for win32(bad) if we dont force our own setting PLATFORM ${TRIPLET_SYSTEM_ARCH} TARGET Build diff --git a/ports/ngspice/remove-64-in-codemodel-name.patch b/ports/ngspice/remove-64-in-codemodel-name.patch new file mode 100644 index 00000000000000..eb5e774b6552e9 --- /dev/null +++ b/ports/ngspice/remove-64-in-codemodel-name.patch @@ -0,0 +1,131 @@ +From dc6b6c0aa4205047e9fd052c401f3f357d83ef57 Mon Sep 17 00:00:00 2001 +From: Marek Roszko +Date: Thu, 12 Aug 2021 22:26:43 -0400 +Subject: [PATCH] Remove 64 in filename output of codemodels + +--- + visualc/xspice/analog.vcxproj | 4 ++-- + visualc/xspice/digital.vcxproj | 4 ++-- + visualc/xspice/spice2poly.vcxproj | 4 ++-- + visualc/xspice/table.vcxproj | 4 ++-- + visualc/xspice/xtradev.vcxproj | 4 ++-- + visualc/xspice/xtraevt.vcxproj | 4 ++-- + 6 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/visualc/xspice/analog.vcxproj b/visualc/xspice/analog.vcxproj +index cf65a37..8b320ce 100644 +--- a/visualc/xspice/analog.vcxproj ++++ b/visualc/xspice/analog.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/digital.vcxproj b/visualc/xspice/digital.vcxproj +index 87f4802..7722ce6 100644 +--- a/visualc/xspice/digital.vcxproj ++++ b/visualc/xspice/digital.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/spice2poly.vcxproj b/visualc/xspice/spice2poly.vcxproj +index c92471b..786ff7e 100644 +--- a/visualc/xspice/spice2poly.vcxproj ++++ b/visualc/xspice/spice2poly.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/table.vcxproj b/visualc/xspice/table.vcxproj +index fb4791c..ad3ee03 100644 +--- a/visualc/xspice/table.vcxproj ++++ b/visualc/xspice/table.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/xtradev.vcxproj b/visualc/xspice/xtradev.vcxproj +index 6f0197f..53975b0 100644 +--- a/visualc/xspice/xtradev.vcxproj ++++ b/visualc/xspice/xtradev.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +diff --git a/visualc/xspice/xtraevt.vcxproj b/visualc/xspice/xtraevt.vcxproj +index d5741e7..3177a91 100644 +--- a/visualc/xspice/xtraevt.vcxproj ++++ b/visualc/xspice/xtraevt.vcxproj +@@ -77,12 +77,12 @@ + false + + +- $(ProjectName)64 ++ $(ProjectName) + true + false + + +- $(ProjectName)64 ++ $(ProjectName) + false + + +-- +2.32.0.windows.2 + diff --git a/ports/ngspice/remove-post-build.patch b/ports/ngspice/remove-post-build.patch new file mode 100644 index 00000000000000..2a9d40b94f61e8 --- /dev/null +++ b/ports/ngspice/remove-post-build.patch @@ -0,0 +1,230 @@ +From 363737b9e0e5c2f9de85a0caf641204e638115e3 Mon Sep 17 00:00:00 2001 +From: Marek Roszko +Date: Thu, 12 Aug 2021 22:09:34 -0400 +Subject: [PATCH] Remove post build events that copy files out of the tree + +--- + visualc/vngspice-fftw.vcxproj | 24 ------------------------ + visualc/vngspice.vcxproj | 17 +++++------------ + 2 files changed, 5 insertions(+), 36 deletions(-) + +diff --git a/visualc/vngspice-fftw.vcxproj b/visualc/vngspice-fftw.vcxproj +index 14773c8..178aa73 100644 +--- a/visualc/vngspice-fftw.vcxproj ++++ b/visualc/vngspice-fftw.vcxproj +@@ -238,8 +238,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw + + + +@@ -289,8 +287,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -337,8 +333,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw 64 + + + +@@ -393,8 +387,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +@@ -438,8 +430,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw + + + +@@ -489,8 +479,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -537,8 +525,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspiced.bat $(OutDir) fftw 64 + + + +@@ -591,8 +577,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +@@ -643,8 +627,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -700,8 +682,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +@@ -752,8 +732,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw + + + +@@ -807,8 +785,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3 + + + +- copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)" +- make-install-vngspice.bat $(OutDir) fftw 64 + + + +diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj +index 7b6ac0b..7190c1e 100644 +--- a/visualc/vngspice.vcxproj ++++ b/visualc/vngspice.vcxproj +@@ -242,7 +242,7 @@ + true + + +- make-install-vngspiced.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -293,7 +293,6 @@ + + + +- make-install-vngspice.bat $(OutDir) + + + +@@ -342,7 +341,6 @@ + + + +- make-install-vngspiced.bat $(OutDir) 64 + + + +@@ -399,7 +397,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +@@ -444,7 +441,7 @@ + true + + +- make-install-vngspiced.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -494,7 +491,7 @@ + true + + +- make-install-vngspice.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -542,7 +539,6 @@ + + + +- make-install-vngspiced.bat $(OutDir) 64 + + + +@@ -597,7 +593,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +@@ -649,7 +644,7 @@ + true + + +- make-install-vngspice.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -706,7 +701,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +@@ -758,7 +752,7 @@ + true + + +- make-install-vngspice.bat $(OutDir) ++ + + + $(ProjectDir)ngspice-x86.exe.manifest +@@ -813,7 +807,6 @@ + + + +- make-install-vngspice.bat $(OutDir) 64 + + + +-- +2.32.0.windows.2 + diff --git a/ports/ngspice/vcpkg.json b/ports/ngspice/vcpkg.json new file mode 100644 index 00000000000000..1b6da85d1545cc --- /dev/null +++ b/ports/ngspice/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "ngspice", + "version-string": "35", + "description": "Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE", + "homepage": "http://ngspice.sourceforge.net/", + "supports": "!(linux | osx | arm | uwp)", + "default-features": [ + "codemodels" + ], + "features": { + "codemodels": { + "description": "Adds optional code models for XSPICE, ADMS (verilog integration) and B-/E-/G- sources." + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 60a027f1ab7797..defa9d78ad1c11 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4413,8 +4413,8 @@ "port-version": 0 }, "ngspice": { - "baseline": "34", - "port-version": 1 + "baseline": "35", + "port-version": 0 }, "nifticlib": { "baseline": "2020-04-30", diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json index f7d4016c98060c..e5ae9654dde19e 100644 --- a/versions/n-/ngspice.json +++ b/versions/n-/ngspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cce657d55082d7a23496c44cb311e208ea31cab4", + "version-string": "35", + "port-version": 0 + }, { "git-tree": "249a0e9bafd17932e3d46a0f979a2983b8a78b0d", "version-string": "34", From 32525358e1d44acc64fc1d879b97abecd1928803 Mon Sep 17 00:00:00 2001 From: Stephen Kyne Date: Tue, 31 Aug 2021 03:35:02 +0200 Subject: [PATCH 0396/1858] [liblo] Fix filenames for linux in liblo portfile (#19660) * Fix filenames for linux vs windows in liblo portfile * Removed deprecated call and now using vcpkg_copy_tools * Upgraded to manifest file * Increment port-version * Remove now working builds from ci.baseline * Updated versioning files * Fixed type for vcpkg.json * Updated sha for liblo version --- ports/liblo/CONTROL | 4 ---- ports/liblo/portfile.cmake | 6 +----- ports/liblo/vcpkg.json | 7 +++++++ scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/l-/liblo.json | 5 +++++ 6 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 ports/liblo/CONTROL create mode 100644 ports/liblo/vcpkg.json diff --git a/ports/liblo/CONTROL b/ports/liblo/CONTROL deleted file mode 100644 index 4efcd14c701002..00000000000000 --- a/ports/liblo/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: liblo -Version: 0.31 -Homepage: https://github.com/radarsat1/liblo -Description: liblo is an implementation of the Open Sound Control protocol for POSIX systems \ No newline at end of file diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake index 9d02b65993c595..3ddfd9e7a0d931 100644 --- a/ports/liblo/portfile.cmake +++ b/ports/liblo/portfile.cmake @@ -17,14 +17,10 @@ vcpkg_install_cmake() # Install needed files into package directory vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblo) -file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscsend.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo) -file(INSTALL ${CURRENT_PACKAGES_DIR}/bin/oscdump.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblo) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblo) +vcpkg_copy_tools(TOOL_NAMES oscsend oscdump AUTO_CLEAN) # Remove unnecessary files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/oscsend.exe ${CURRENT_PACKAGES_DIR}/bin/oscdump.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/oscsend.exe ${CURRENT_PACKAGES_DIR}/debug/bin/oscdump.exe) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/liblo/vcpkg.json b/ports/liblo/vcpkg.json new file mode 100644 index 00000000000000..f013f968c972b0 --- /dev/null +++ b/ports/liblo/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "liblo", + "version-string": "0.31", + "port-version": 1, + "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems", + "homepage": "https://github.com/radarsat1/liblo" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6943e87adb2917..47a65e1fc22c18 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -617,8 +617,6 @@ liblas:arm64-windows=fail liblemon:arm-uwp=fail liblemon:x64-uwp=fail liblo:arm-uwp=fail -liblo:x64-linux=fail -liblo:x64-osx=fail liblo:x64-uwp=fail liblsl:arm64-windows=fail liblsl:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index defa9d78ad1c11..48d8f1f108a5c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3366,7 +3366,7 @@ }, "liblo": { "baseline": "0.31", - "port-version": 0 + "port-version": 1 }, "liblsl": { "baseline": "1.14.0", diff --git a/versions/l-/liblo.json b/versions/l-/liblo.json index 2905fd1652ee26..d7bfa72e19441c 100644 --- a/versions/l-/liblo.json +++ b/versions/l-/liblo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4df5a746fe8bc045b2287c0b6122717757a30a3", + "version-string": "0.31", + "port-version": 1 + }, { "git-tree": "04145d21ab7fff62c0bbf2a8846bc9ddea192fe2", "version-string": "0.31", From f2c68d77333cac01b2b6d345ed49e73683424406 Mon Sep 17 00:00:00 2001 From: An Tao Date: Tue, 31 Aug 2021 10:27:37 +0800 Subject: [PATCH 0397/1858] [trantor] Update to 1.5.1 (#19443) * [trantor] Update to 1.5.1 * Update ports/trantor/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/trantor/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update cmake functiom * update version * fix ci baseline issue * update version * fix ci error * add port version * update version * Repair old drogon sha. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III --- ports/drogon/portfile.cmake | 1 + ports/drogon/vcpkg.json | 2 +- ports/trantor/CONTROL | 5 ----- ports/trantor/portfile.cmake | 15 +++++++-------- ports/trantor/vcpkg.json | 18 ++++++++++++++++++ ports/trantor/vcpkg.patch | 16 ++++++++-------- versions/baseline.json | 4 ++-- versions/d-/drogon.json | 5 +++++ versions/t-/trantor.json | 5 +++++ 9 files changed, 47 insertions(+), 24 deletions(-) delete mode 100644 ports/trantor/CONTROL create mode 100644 ports/trantor/vcpkg.json diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 101f143e9351f8..897b79985d897a 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_check_features( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index 3aa7f4da7e616e..55544ebccda7ff 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,7 +1,7 @@ { "name": "drogon", "version-semver": "1.7.1", - "port-version": 1, + "port-version": 2, "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", diff --git a/ports/trantor/CONTROL b/ports/trantor/CONTROL deleted file mode 100644 index 447e609fc9cbb8..00000000000000 --- a/ports/trantor/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: trantor -Version: 1.5.0 -Homepage: https://github.com/an-tao/trantor -Description: A non-blocking I/O cross-platform TCP network library, using C++14. -Build-Depends: openssl, c-ares diff --git a/ports/trantor/portfile.cmake b/ports/trantor/portfile.cmake index 0017cb46a3548f..95ef049c54fb82 100644 --- a/ports/trantor/portfile.cmake +++ b/ports/trantor/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/trantor - REF v1.5.0 - SHA512 3e9e0f15aa7e039b70141b1ede16fcfe854af961cc787a0a51d4b020581e2b4ae1b51497e3ca31cfc4b5ed11dd9028a1438339cb726d83588f656c99d9938493 + REF v1.5.1 + SHA512 9f6664abc94943598805192ee09a98340e6e20efb15e448aac5e21480f1798b0991782d18766f5ef54399251d4980c2f68aeda3136c7e058e3c31623c8f7ce3f HEAD_REF master PATCHES vcpkg.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Fix CMake files -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Trantor) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Trantor) vcpkg_fixup_pkgconfig() @@ -24,7 +23,7 @@ vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/License DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Copy pdb files vcpkg_copy_pdbs() diff --git a/ports/trantor/vcpkg.json b/ports/trantor/vcpkg.json new file mode 100644 index 00000000000000..122efa0a7c72c1 --- /dev/null +++ b/ports/trantor/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "trantor", + "version-semver": "1.5.1", + "description": "A non-blocking I/O cross-platform TCP network library, using C++14", + "homepage": "https://github.com/an-tao/trantor", + "dependencies": [ + "c-ares", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/trantor/vcpkg.patch b/ports/trantor/vcpkg.patch index f5b23d64749320..5e484c8568f7ca 100644 --- a/ports/trantor/vcpkg.patch +++ b/ports/trantor/vcpkg.patch @@ -1,14 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d164667..e75b869 100755 +index ad5a1b3..7d59844 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -90,6 +90,9 @@ if(c-ares_FOUND) - message(STATUS "c-ares found!") - target_link_libraries(${PROJECT_NAME} PRIVATE c-ares_lib) - set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/AresResolver.cc) +@@ -133,6 +133,9 @@ if(c-ares_FOUND) + set(private_headers + ${private_headers} + trantor/net/inner/AresResolver.h) + if(APPLE) + target_link_libraries(${PROJECT_NAME} PRIVATE resolv) + endif() - else() - set(TRANTOR_SOURCES ${TRANTOR_SOURCES} trantor/net/inner/NormalResolver.cc) - endif() + else(c-ares_FOUND) + set(TRANTOR_SOURCES + ${TRANTOR_SOURCES} diff --git a/versions/baseline.json b/versions/baseline.json index 48d8f1f108a5c6..39630f5d526a31 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1786,7 +1786,7 @@ }, "drogon": { "baseline": "1.7.1", - "port-version": 1 + "port-version": 2 }, "dtl": { "baseline": "1.19", @@ -6457,7 +6457,7 @@ "port-version": 0 }, "trantor": { - "baseline": "1.5.0", + "baseline": "1.5.1", "port-version": 0 }, "tre": { diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 9073dfa7ed31e4..7ca60b5b71bca8 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34e8225c88ebbf0713112235dddbe6eae11121fb", + "version-semver": "1.7.1", + "port-version": 2 + }, { "git-tree": "6293f8fcc884c9ed56a4a3138722401451ff445d", "version-semver": "1.7.1", diff --git a/versions/t-/trantor.json b/versions/t-/trantor.json index afcabcd9caf78e..42dbcee114b320 100644 --- a/versions/t-/trantor.json +++ b/versions/t-/trantor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06881e6b0abf51c4df93d7bdcb5c715adf57809d", + "version-semver": "1.5.1", + "port-version": 0 + }, { "git-tree": "82647f91d6290a85e1b03801e75e17698b3da691", "version-string": "1.5.0", From fde7dee405394a8a2e5a1dc398960c1ea8ed500b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 31 Aug 2021 21:40:34 +0200 Subject: [PATCH 0398/1858] [kf5configwidgets] new port (#16562) * Add kf5configwidgets port * Fix KF5ConfigWidgets for windows * [kf5configwidgets] update to 5.75.0 * [kf5configwidgets] convert CONTROL to manifest * [kf5configwidgets] update versions * [kf5configwidgets] update to 5.81 * [kf5configwidgets] update versions * [kf5configwidgets] update to 5.84 * [kf5configwidgets] update versions * [kf5configwidgets] add 'designerplugin' feature * [kf5configwidgets] update versions * [kf5configwidgets] wrap paths in quotes * [kf5configwidgets] update versions * [kf5configwidgets] actually update SHA512 * [kf5configwidgets] update versions * [kf5configwidgets] fix static builds * [kf5configwidgets] set QT plugins path correctly * [kf5configwidgets] update versions * [kf5configwidgets] remove obsolete versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5configwidgets] rename patch file * [kf5configaddons] update versions Co-authored-by: Kuntal Majumder Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- .../add_support_for_static_builds.patch | 36 ++++++++++++++++++ ports/kf5configwidgets/portfile.cmake | 38 +++++++++++++++++++ ports/kf5configwidgets/vcpkg.json | 37 ++++++++++++++++++ versions/baseline.json | 4 ++ versions/k-/kf5configwidgets.json | 9 +++++ 5 files changed, 124 insertions(+) create mode 100644 ports/kf5configwidgets/add_support_for_static_builds.patch create mode 100644 ports/kf5configwidgets/portfile.cmake create mode 100644 ports/kf5configwidgets/vcpkg.json create mode 100644 versions/k-/kf5configwidgets.json diff --git a/ports/kf5configwidgets/add_support_for_static_builds.patch b/ports/kf5configwidgets/add_support_for_static_builds.patch new file mode 100644 index 00000000000000..2578a9e66ec64b --- /dev/null +++ b/ports/kf5configwidgets/add_support_for_static_builds.patch @@ -0,0 +1,36 @@ +From 743ec1f30b449b048c942f194ad665bf2170bbf1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Thu, 26 Aug 2021 16:48:23 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5ConfigWidgetsConfig.cmake.in | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/KF5ConfigWidgetsConfig.cmake.in b/KF5ConfigWidgetsConfig.cmake.in +index 57c83f0..78fc736 100644 +--- a/KF5ConfigWidgetsConfig.cmake.in ++++ b/KF5ConfigWidgetsConfig.cmake.in +@@ -8,5 +8,19 @@ find_dependency(KF5Codecs "@KF_DEP_VERSION@") + find_dependency(KF5Config "@KF_DEP_VERSION@") + find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") + ++ ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") ++ ++ if (NOT ANDROID) ++ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") ++ endif() ++ ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++endif() ++ ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigWidgetsTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake new file mode 100644 index 00000000000000..cb7282ada6d4f9 --- /dev/null +++ b/ports/kf5configwidgets/portfile.cmake @@ -0,0 +1,38 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kconfigwidgets + REF v5.84.0 + SHA512 da03f4cfc2a64b3ccccfe2b6b7f392f84aba2b975edbf6a5b08a14604ccb565a4491c7eb707af7191345b55ca81e864b7ee13fe648589a56f3226c26160ed024 + HEAD_REF master + PATCHES + add_support_for_static_builds.patch # https://invent.kde.org/frameworks/kconfigwidgets/-/merge_requests/71 +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN +) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ConfigWidgets CONFIG_PATH lib/cmake/KF5ConfigWidgets) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json new file mode 100644 index 00000000000000..bab6562d502220 --- /dev/null +++ b/ports/kf5configwidgets/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "kf5configwidgets", + "version-semver": "5.84.0", + "description": "Widgets for configuration dialogs", + "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5auth", + "kf5codecs", + "kf5config", + "kf5guiaddons", + "kf5i18n", + "kf5widgetsaddons", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "designerplugin": { + "description": "Enables a Qt Designer plugin" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 39630f5d526a31..c9250d33773bf0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2904,6 +2904,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5configwidgets": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5coreaddons": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5configwidgets.json b/versions/k-/kf5configwidgets.json new file mode 100644 index 00000000000000..c2f9808d6256ef --- /dev/null +++ b/versions/k-/kf5configwidgets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "99dcbe4e7cb84be45f9869e441c274e44309291d", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From 00f0d3ae21bea82e7582a5395661a5c34a4d0d2b Mon Sep 17 00:00:00 2001 From: Mathis Date: Tue, 31 Aug 2021 21:55:56 +0200 Subject: [PATCH 0399/1858] [Bullet3] fixes config failures. (#19236) * fix bullet3 * add-version * change version-string to version * overwrite version * add export targets; change usage_file * version * add bullet include dirs to target * version * remove line break * version * apply changes from @JackBoosY * version * change EOL to LF * version --- ports/bullet3/CONTROL | 7 - ports/bullet3/cmake-fix.patch | 268 +++++++++++++++++++++++++++++++--- ports/bullet3/portfile.cmake | 13 +- ports/bullet3/vcpkg.json | 12 ++ versions/b-/bullet3.json | 5 + versions/baseline.json | 2 +- 6 files changed, 273 insertions(+), 34 deletions(-) delete mode 100644 ports/bullet3/CONTROL create mode 100644 ports/bullet3/vcpkg.json diff --git a/ports/bullet3/CONTROL b/ports/bullet3/CONTROL deleted file mode 100644 index 8fe36ea2f6f5d5..00000000000000 --- a/ports/bullet3/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: bullet3 -Version: 3.17 -Homepage: https://github.com/bulletphysics/bullet3 -Description: Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library - -Feature: multithreading -Description: Multithreading functionality for bullet3 diff --git a/ports/bullet3/cmake-fix.patch b/ports/bullet3/cmake-fix.patch index dacc1271ef9ad1..12457f4ca0fe7b 100644 --- a/ports/bullet3/cmake-fix.patch +++ b/ports/bullet3/cmake-fix.patch @@ -1,11 +1,13 @@ - diff --git a/BulletConfig.cmake.in b/BulletConfig.cmake.in -index f5dc7bdbb..8fb38ce06 100644 +index f5dc7bd..50b3d67 100644 --- a/BulletConfig.cmake.in +++ b/BulletConfig.cmake.in -@@ -15,11 +15,20 @@ +@@ -13,13 +13,23 @@ + # BULLET_LIBRARY_DIRS - List of directories containing Bullet' libraries + # BULLET_ROOT_DIR - The base directory of Bullet # BULLET_VERSION_STRING - A human-readable string containing the version - +- ++@PACKAGE_INIT@ set ( BULLET_FOUND 1 ) -set ( BULLET_USE_FILE "@BULLET_USE_FILE@" ) +set_and_check ( BULLET_USE_FILE "@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/UseBullet.cmake" ) @@ -22,18 +24,18 @@ index f5dc7bdbb..8fb38ce06 100644 +set_and_check ( BULLET_LIBRARY_DIRS "@PACKAGE_LIB_DESTINATION@" ) +set_and_check ( BULLET_ROOT_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@" ) +set ( BULLET_VERSION_STRING "@BULLET_VERSION@" ) -+ +# Load targets +if(NOT TARGET Bullet3Common) ++ # ++ include("@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/LinearMathTargets.cmake") + file(GLOB CONFIG_FILES "@PACKAGE_BULLET_CONFIG_CMAKE_PATH@/*Targets.cmake") -+ foreach(f ${CONFIG_FILES}) ++ foreach(f IN LISTS CONFIG_FILES) + include(${f}) + endforeach() + set(_DIR) +endif() -\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt -index a695b7172..d0f74e2a8 100644 +index a695b71..607edde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ @@ -54,7 +56,7 @@ index a695b7172..d0f74e2a8 100644 + COMPATIBILITY AnyNewerVersion +) + -+set (BULLET_CONFIG_CMAKE_PATH share/bullet3 ) ++set (BULLET_CONFIG_CMAKE_PATH share/bullet ) list (APPEND BULLET_DEFINITIONS ${BULLET_DOUBLE_DEF}) list (APPEND BULLET_LIBRARIES LinearMath) list (APPEND BULLET_LIBRARIES Bullet3Common) @@ -82,8 +84,178 @@ index a695b7172..d0f74e2a8 100644 DESTINATION ${BULLET_CONFIG_CMAKE_PATH} ) ENDIF (INSTALL_CMAKE_FILES) +diff --git a/Extras/BulletRobotics/CMakeLists.txt b/Extras/BulletRobotics/CMakeLists.txt +index d2ab423..dabb504 100644 +--- a/Extras/BulletRobotics/CMakeLists.txt ++++ b/Extras/BulletRobotics/CMakeLists.txt +@@ -282,7 +282,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) ++ TARGET_LINK_LIBRARIES(BulletRobotics PUBLIC BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) + ENDIF (BUILD_SHARED_LIBS) + + +diff --git a/Extras/BulletRoboticsGUI/CMakeLists.txt b/Extras/BulletRoboticsGUI/CMakeLists.txt +index 57ab97f..27b9992 100644 +--- a/Extras/BulletRoboticsGUI/CMakeLists.txt ++++ b/Extras/BulletRoboticsGUI/CMakeLists.txt +@@ -166,7 +166,7 @@ SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletRoboticsGUI PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletRoboticsGUI BulletExampleBrowserLib BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) ++ TARGET_LINK_LIBRARIES(BulletRoboticsGUI PUBLIC BulletExampleBrowserLib BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common) + ENDIF (BUILD_SHARED_LIBS) + + +diff --git a/Extras/ConvexDecomposition/CMakeLists.txt b/Extras/ConvexDecomposition/CMakeLists.txt +index 132a336..62babb0 100644 +--- a/Extras/ConvexDecomposition/CMakeLists.txt ++++ b/Extras/ConvexDecomposition/CMakeLists.txt +@@ -39,7 +39,7 @@ SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(ConvexDecomposition PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(ConvexDecomposition BulletCollision LinearMath) ++ TARGET_LINK_LIBRARIES(ConvexDecomposition PUBLIC BulletCollision LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/Extras/InverseDynamics/CMakeLists.txt b/Extras/InverseDynamics/CMakeLists.txt +index 22e953a..59b733d 100644 +--- a/Extras/InverseDynamics/CMakeLists.txt ++++ b/Extras/InverseDynamics/CMakeLists.txt +@@ -22,7 +22,7 @@ SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES VERSION ${BULLET_VER + SET_TARGET_PROPERTIES(BulletInverseDynamicsUtils PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath) ++ TARGET_LINK_LIBRARIES(BulletInverseDynamicsUtils PUBLIC BulletInverseDynamics BulletDynamics BulletCollision Bullet3Common LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/Extras/Serialize/BulletFileLoader/CMakeLists.txt b/Extras/Serialize/BulletFileLoader/CMakeLists.txt +index 9b5dce7..2f30385 100644 +--- a/Extras/Serialize/BulletFileLoader/CMakeLists.txt ++++ b/Extras/Serialize/BulletFileLoader/CMakeLists.txt +@@ -21,7 +21,7 @@ btBulletFile.h + ADD_LIBRARY(BulletFileLoader ${BulletFileLoader_SRCS} ${BulletFileLoader_HDRS}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletFileLoader PUBLIC LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) +diff --git a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +index b56b39a..1684651 100644 +--- a/Extras/Serialize/BulletWorldImporter/CMakeLists.txt ++++ b/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +@@ -16,7 +16,7 @@ SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletWorldImporter PUBLIC BulletDynamics BulletCollision BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +index 9fd125e..889c30e 100644 +--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt ++++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +@@ -18,7 +18,7 @@ SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSIO + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletXmlWorldImporter PUBLIC BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff --git a/src/Bullet3Collision/CMakeLists.txt b/src/Bullet3Collision/CMakeLists.txt +index 130095c..661a461 100644 +--- a/src/Bullet3Collision/CMakeLists.txt ++++ b/src/Bullet3Collision/CMakeLists.txt +@@ -69,9 +69,10 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3Collision DESTINATION .) ++ INSTALL(TARGETS Bullet3Collision EXPORT Bullet3CollisionTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet3Collision ++ EXPORT Bullet3CollisionTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -89,5 +90,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + #SET_PROPERTY(SOURCE ${Bullet3CollisionBroadPhase_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/BroadPhaseCollision) + + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT Bullet3CollisionTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/Bullet3Common/CMakeLists.txt b/src/Bullet3Common/CMakeLists.txt +index e899e67..e990b16 100644 +--- a/src/Bullet3Common/CMakeLists.txt ++++ b/src/Bullet3Common/CMakeLists.txt +@@ -37,15 +37,17 @@ SET(Bullet3Common_HDRS + ADD_LIBRARY(Bullet3Common ${Bullet3Common_SRCS} ${Bullet3Common_HDRS}) + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES SOVERSION ${BULLET_VERSION}) ++TARGET_INCLUDE_DIRECTORIES(Bullet3Common INTERFACE $) + + IF (INSTALL_LIBS) + IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3Common DESTINATION .) ++ INSTALL(TARGETS Bullet3Common EXPORT Bullet3CommonTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet3Common ++ EXPORT Bullet3CommonTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -59,5 +61,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(Bullet3Common PROPERTIES PUBLIC_HEADER "${Bullet3Common_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT Bullet3CommonTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) +diff --git a/src/Bullet3Dynamics/CMakeLists.txt b/src/Bullet3Dynamics/CMakeLists.txt +index 94c120d..e83503a 100644 +--- a/src/Bullet3Dynamics/CMakeLists.txt ++++ b/src/Bullet3Dynamics/CMakeLists.txt +@@ -41,9 +41,10 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS Bullet3Dynamics DESTINATION .) ++ INSTALL(TARGETS Bullet3Dynamics EXPORT Bullet3DynamicsTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS Bullet3Dynamics ++ EXPORT Bullet3DynamicsTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -57,5 +58,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(Bullet3Dynamics PROPERTIES PUBLIC_HEADER "${Bullet3Dynamics_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT Bullet3DynamicsTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) diff --git a/src/Bullet3Geometry/CMakeLists.txt b/src/Bullet3Geometry/CMakeLists.txt -index 820687270..e51fb64ec 100644 +index 8206872..e605d79 100644 --- a/src/Bullet3Geometry/CMakeLists.txt +++ b/src/Bullet3Geometry/CMakeLists.txt @@ -27,9 +27,12 @@ IF (INSTALL_LIBS) @@ -110,9 +282,18 @@ index 820687270..e51fb64ec 100644 ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/Bullet3OpenCL/CMakeLists.txt b/src/Bullet3OpenCL/CMakeLists.txt -index 1da58d4a9..5f3c234b3 100644 +index 1da58d4..c1b21df 100644 --- a/src/Bullet3OpenCL/CMakeLists.txt +++ b/src/Bullet3OpenCL/CMakeLists.txt +@@ -44,7 +44,7 @@ ADD_LIBRARY(Bullet3OpenCL_clew ${Bullet3OpenCL_clew_SRCS} ${Bullet3OpenCL_clew_H + SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS}) ++ TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew PUBLIC LinearMath Bullet3Dynamics ${CMAKE_DL_LIBS}) + ENDIF (BUILD_SHARED_LIBS) + + @@ -53,9 +53,13 @@ IF (INSTALL_LIBS) #INSTALL of other files requires CMake 2.6 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) @@ -139,7 +320,7 @@ index 1da58d4a9..5f3c234b3 100644 ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt -index 125576634..67112b40b 100644 +index 1255766..67112b4 100644 --- a/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt +++ b/src/Bullet3Serialize/Bullet2FileLoader/CMakeLists.txt @@ -35,9 +35,12 @@ IF (INSTALL_LIBS) @@ -166,9 +347,18 @@ index 125576634..67112b40b 100644 ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt -index f5d725562..23516ca34 100644 +index f5d7255..d857637 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt +@@ -257,7 +257,7 @@ ADD_LIBRARY(BulletCollision ${BulletCollision_SRCS} ${BulletCollision_HDRS}) + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletCollision PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletCollision LinearMath) ++ TARGET_LINK_LIBRARIES(BulletCollision PUBLIC LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + @@ -266,9 +266,13 @@ IF (INSTALL_LIBS) #INSTALL of other files requires CMake 2.6 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) @@ -195,10 +385,19 @@ index f5d725562..23516ca34 100644 ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/BulletDynamics/CMakeLists.txt b/src/BulletDynamics/CMakeLists.txt -index 3332440f2..db4444e4d 100644 +index 3332440..d1a1147 100644 --- a/src/BulletDynamics/CMakeLists.txt +++ b/src/BulletDynamics/CMakeLists.txt -@@ -147,9 +147,13 @@ IF (INSTALL_LIBS) +@@ -140,16 +140,21 @@ ADD_LIBRARY(BulletDynamics ${BulletDynamics_SRCS} ${BulletDynamics_HDRS}) + SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletDynamics PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletDynamics BulletCollision LinearMath) ++ TARGET_LINK_LIBRARIES(BulletDynamics PUBLIC BulletCollision) + ENDIF (BUILD_SHARED_LIBS) ++TARGET_LINK_LIBRARIES(BulletDynamics PUBLIC LinearMath) + + IF (INSTALL_LIBS) IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) @@ -214,7 +413,7 @@ index 3332440f2..db4444e4d 100644 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -@@ -171,5 +175,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletDynamics) +@@ -171,5 +176,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/BulletDynamics) SET_PROPERTY(SOURCE ${Featherstone_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/Featherstone) SET_PROPERTY(SOURCE ${MLCPSolvers_HDRS} PROPERTY MACOSX_PACKAGE_LOCATION Headers/MLCPSolvers) ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) @@ -224,9 +423,18 @@ index 3332440f2..db4444e4d 100644 ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/BulletInverseDynamics/CMakeLists.txt b/src/BulletInverseDynamics/CMakeLists.txt -index 3331c27ea..b5cde24f0 100644 +index 3331c27..d4fad26 100644 --- a/src/BulletInverseDynamics/CMakeLists.txt +++ b/src/BulletInverseDynamics/CMakeLists.txt +@@ -33,7 +33,7 @@ ADD_LIBRARY(BulletInverseDynamics ${BulletInverseDynamics_SRCS} ${BulletInverseD + SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletInverseDynamics PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletInverseDynamics Bullet3Common LinearMath) ++ TARGET_LINK_LIBRARIES(BulletInverseDynamics PUBLIC Bullet3Common LinearMath) + ENDIF (BUILD_SHARED_LIBS) + + @@ -42,9 +42,13 @@ IF (INSTALL_LIBS) #INSTALL of other files requires CMake 2.6 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) @@ -253,7 +461,7 @@ index 3331c27ea..b5cde24f0 100644 ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) diff --git a/src/BulletSoftBody/CMakeLists.txt b/src/BulletSoftBody/CMakeLists.txt -index 945276801..5068a3049 100644 +index 9452768..5068a30 100644 --- a/src/BulletSoftBody/CMakeLists.txt +++ b/src/BulletSoftBody/CMakeLists.txt @@ -78,9 +78,13 @@ IF (INSTALL_LIBS) @@ -281,3 +489,27 @@ index 945276801..5068a3049 100644 + DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF (INSTALL_LIBS) +diff --git a/src/LinearMath/CMakeLists.txt b/src/LinearMath/CMakeLists.txt +index a0532c7..ecf06b3 100644 +--- a/src/LinearMath/CMakeLists.txt ++++ b/src/LinearMath/CMakeLists.txt +@@ -63,9 +63,10 @@ IF (INSTALL_LIBS) + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS LinearMath DESTINATION .) ++ INSTALL(TARGETS LinearMath EXPORT LinearMathTargets DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS LinearMath ++ EXPORT LinearMathTargets + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX}) +@@ -79,5 +80,7 @@ DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN + SET_TARGET_PROPERTIES(LinearMath PROPERTIES FRAMEWORK true) + SET_TARGET_PROPERTIES(LinearMath PROPERTIES PUBLIC_HEADER "${LinearMath_HDRS}") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ++ INSTALL(EXPORT LinearMathTargets ++ DESTINATION ${BULLET_CONFIG_CMAKE_PATH}) + ENDIF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) + ENDIF (INSTALL_LIBS) diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 7170b3db500f8c..886535ee995a70 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -21,7 +21,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON - -DBUILD_DEMOS=OFF -DBUILD_CPU_DEMOS=OFF -DBUILD_BULLET2_DEMOS=OFF -DBUILD_BULLET3=OFF @@ -33,14 +32,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/bullet3") +vcpkg_fixup_cmake_targets(CONFIG_PATH share/bullet TARGET_PATH share/bullet) -# Clean up unneeded files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details") vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json new file mode 100644 index 00000000000000..70c9be0ba1a999 --- /dev/null +++ b/ports/bullet3/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "bullet3", + "version": "3.17", + "port-version": 1, + "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", + "homepage": "https://github.com/bulletphysics/bullet3", + "features": { + "multithreading": { + "description": "Multithreading functionality for bullet3" + } + } +} diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index a8d289a0005970..042edb960a1991 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d6e2d765a4cca130170b4a574e99a938ce54818", + "version": "3.17", + "port-version": 1 + }, { "git-tree": "4fc6b5f085568cedd1171dc99fd75c7e412dcc5a", "version-string": "3.17", diff --git a/versions/baseline.json b/versions/baseline.json index c9250d33773bf0..4cd592e04d4f59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1090,7 +1090,7 @@ }, "bullet3": { "baseline": "3.17", - "port-version": 0 + "port-version": 1 }, "bustache": { "baseline": "1.1.0", From aa3d654295470cdd93ff6a824249fd5b6a6710f4 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 1 Sep 2021 08:04:51 +0800 Subject: [PATCH 0400/1858] [faiss] update to v1.7.1 (#19752) * [faiss] update to v1.7.1 * update version * update vcpkg.json format * update version * update patch * update version * Remove duplicate variable usage from the patch. * x-add-version Co-authored-by: Billy Robert O'Neal III --- ports/faiss/fix-dependencies.patch | 13 +++++++++---- ports/faiss/portfile.cmake | 19 ++++++++----------- ports/faiss/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/f-/faiss.json | 5 +++++ 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/ports/faiss/fix-dependencies.patch b/ports/faiss/fix-dependencies.patch index caddb6b5760cb1..81b9fd58fcd5c7 100644 --- a/ports/faiss/fix-dependencies.patch +++ b/ports/faiss/fix-dependencies.patch @@ -1,5 +1,5 @@ diff --git a/cmake/faiss-config.cmake.in b/cmake/faiss-config.cmake.in -index 43ea9d4c..437a7f81 100644 +index 43ea9d4..437a7f8 100644 --- a/cmake/faiss-config.cmake.in +++ b/cmake/faiss-config.cmake.in @@ -4,4 +4,7 @@ @@ -11,24 +11,29 @@ index 43ea9d4c..437a7f81 100644 +find_dependency(LAPACK REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake") diff --git a/faiss/CMakeLists.txt b/faiss/CMakeLists.txt -index 51680fd1..691f52c2 100644 +index 30d573f..9af8baf 100644 --- a/faiss/CMakeLists.txt +++ b/faiss/CMakeLists.txt -@@ -148,14 +148,14 @@ find_package(OpenMP REQUIRED) - target_link_libraries(faiss PRIVATE OpenMP::OpenMP_CXX) +@@ -212,17 +212,17 @@ target_link_libraries(faiss PRIVATE OpenMP::OpenMP_CXX) + target_link_libraries(faiss_avx2 PRIVATE OpenMP::OpenMP_CXX) find_package(MKL) -if(MKL_FOUND) +if(0) target_link_libraries(faiss PRIVATE ${MKL_LIBRARIES}) + target_link_libraries(faiss_avx2 PRIVATE ${MKL_LIBRARIES}) else() find_package(BLAS REQUIRED) - target_link_libraries(faiss PRIVATE ${BLAS_LIBRARIES}) +- target_link_libraries(faiss_avx2 PRIVATE ${BLAS_LIBRARIES}) + target_link_libraries(faiss PRIVATE BLAS::BLAS) ++ target_link_libraries(faiss_avx2 PRIVATE BLAS::BLAS) find_package(LAPACK REQUIRED) - target_link_libraries(faiss PRIVATE ${LAPACK_LIBRARIES}) +- target_link_libraries(faiss_avx2 PRIVATE ${LAPACK_LIBRARIES}) + target_link_libraries(faiss PRIVATE LAPACK::LAPACK) ++ target_link_libraries(faiss_avx2 PRIVATE LAPACK::LAPACK) endif() install(TARGETS faiss diff --git a/ports/faiss/portfile.cmake b/ports/faiss/portfile.cmake index 51529558f9a6f9..f2670da79aca36 100644 --- a/ports/faiss/portfile.cmake +++ b/ports/faiss/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "x86" ON_TARGET "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebookresearch/faiss - REF 0fb6c00cfa9487416b5cdf514f5f796476eecb06 # v1.6.4 - SHA512 c7019615103fd29124c1f4458a47faebc5fe35545eea185c41cf643f2eabe82d134dc558c85f67faea7680c292abd7477ceefde157a7c3969eda78b77a23462b + REF cff072b78ef019998990c6ba02df83dd7d3c8d38 # v1.7.1 + SHA512 08d4acf30b6a2a0f326cb71035b58e65f05e70817edbf9dda7d5f8b53d4fb722909c2412d42dca4d88d0576a3da528c2db869fb4fd6fb2343b7acad80066051d HEAD_REF master PATCHES fix-dependencies.patch @@ -21,23 +21,20 @@ if ("${FAISS_ENABLE_GPU}") endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DFAISS_ENABLE_PYTHON=OFF # Requires SWIG + -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/faiss/vcpkg.json b/ports/faiss/vcpkg.json index 4b9c63691d7079..dfc5e14b17f442 100644 --- a/ports/faiss/vcpkg.json +++ b/ports/faiss/vcpkg.json @@ -1,14 +1,21 @@ { "name": "faiss", - "version-semver": "1.6.4", - "port-version": 1, + "version-semver": "1.7.1", "description": "Faiss is a library for efficient similarity search and clustering of dense vectors.", "homepage": "https://github.com/facebookresearch/faiss", "license": "MIT", "supports": "!uwp & !osx & !x86", "dependencies": [ "lapack", - "openblas" + "openblas", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "gpu": { diff --git a/versions/baseline.json b/versions/baseline.json index 4cd592e04d4f59..4c514787fe0c2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1953,8 +1953,8 @@ "port-version": 0 }, "faiss": { - "baseline": "1.6.4", - "port-version": 1 + "baseline": "1.7.1", + "port-version": 0 }, "fakeit": { "baseline": "2.0.7", diff --git a/versions/f-/faiss.json b/versions/f-/faiss.json index e98b785dcbcef6..8e9e24bd9581b5 100644 --- a/versions/f-/faiss.json +++ b/versions/f-/faiss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c8e333f76263e7ca027e52fdf1d14b025be234c", + "version-semver": "1.7.1", + "port-version": 0 + }, { "git-tree": "eb401df0155a10cfc7cba057bbf63d10fdc37067", "version-semver": "1.6.4", From b23d71ebe9c0628e621b6904abc07ab6ee710f00 Mon Sep 17 00:00:00 2001 From: siposcsaba89 Date: Wed, 1 Sep 2021 05:27:44 +0200 Subject: [PATCH 0401/1858] [boost-context] arm64 linux abi fix (#19522) * [boost-context] arm64 linux abi fix * [boost-context] baseline version updated --- ports/boost-context/b2-options.cmake.in | 2 +- ports/boost-context/vcpkg.json | 1 + versions/b-/boost-context.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/boost-context/b2-options.cmake.in b/ports/boost-context/b2-options.cmake.in index 419a2b1cb800d0..a16d25fdbe95b7 100644 --- a/ports/boost-context/b2-options.cmake.in +++ b/ports/boost-context/b2-options.cmake.in @@ -13,7 +13,7 @@ if(@VCPKG_TARGET_IS_OSX@) ) endif() -if(@VCPKG_TARGET_IS_ANDROID@) +if("@VCPKG_TARGET_IS_LINUX@" STREQUAL "ON" OR "@VCPKG_TARGET_IS_ANDROID@" STREQUAL "ON") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") list(APPEND B2_OPTIONS abi=aapcs diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 0faddcdb5feb54..22ccf155d784e9 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-context", "version": "1.76.0", + "port-version": 1, "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "supports": "!uwp & !emscripten", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 57b42e3d475a14..02dd5e0ff6f6c0 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42c1043410aaf53351ccaf5c7ee6ae133f78a5db", + "version": "1.76.0", + "port-version": 1 + }, { "git-tree": "7543f135833a2b698617f25a5206dd4194fe01bb", "version": "1.76.0", diff --git a/versions/baseline.json b/versions/baseline.json index 4c514787fe0c2d..b4480c5bedb5c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -546,7 +546,7 @@ }, "boost-context": { "baseline": "1.76.0", - "port-version": 0 + "port-version": 1 }, "boost-contract": { "baseline": "1.76.0", From eeea78c0f1d7c5c78d117c97e153d94402d75f72 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 1 Sep 2021 05:39:38 +0200 Subject: [PATCH 0402/1858] [freexl] Fix mingw, cleanup (#19504) * New port version, format manifest * Revise portfile * Add mingw support * Add libiconv dependency to pc file * x-add-version * Apply PR comment * x-add-version --- ports/freexl/CONTROL | 6 --- ports/freexl/fix-pc-file.patch | 26 ++++++++++++ ports/freexl/portfile.cmake | 73 ++++++++++++---------------------- ports/freexl/vcpkg.json | 10 +++++ versions/baseline.json | 2 +- versions/f-/freexl.json | 5 +++ 6 files changed, 68 insertions(+), 54 deletions(-) delete mode 100644 ports/freexl/CONTROL create mode 100644 ports/freexl/fix-pc-file.patch create mode 100644 ports/freexl/vcpkg.json diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL deleted file mode 100644 index 3855a9cad33f51..00000000000000 --- a/ports/freexl/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: freexl -Version: 1.0.4 -Port-Version: 11 -Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources -Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet -Build-Depends: libiconv diff --git a/ports/freexl/fix-pc-file.patch b/ports/freexl/fix-pc-file.patch new file mode 100644 index 00000000000000..5a429026de0010 --- /dev/null +++ b/ports/freexl/fix-pc-file.patch @@ -0,0 +1,26 @@ +diff --git a/configure.ac b/configure.ac +index a44dbf4..55bd768 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,9 +64,11 @@ AC_CONFIG_FILES([Makefile \ + AC_CHECK_HEADERS(iconv.h,, [AC_MSG_ERROR([cannot find iconv.h, bailing out])]) + # on some systems "iconv()" lives in libc. On others it lives in libiconv + # on older systems "libiconv()" lives in libiconv ++SAVED_LIBS="${LIBS}" + AC_SEARCH_LIBS(iconv,iconv,, + AC_SEARCH_LIBS(libiconv,iconv,,AC_MSG_ERROR(['libiconv' is required but it doesn't seem to be installed on this system.]),)) + AC_SEARCH_LIBS(locale_charset,charset,, + AC_SEARCH_LIBS(nl_langinfo,c,,AC_MSG_ERROR(['libcharset' is required but it doesn't seem to be installed on this system.]),)) ++AC_SUBST(ICONV_LIBS, "${LIBS%${SAVED_LIBS}}") + + AC_OUTPUT + +diff --git a/freexl.pc.in b/freexl.pc.in +index 5813e68..8fc671d 100644 +--- a/freexl.pc.in ++++ b/freexl.pc.in +@@ -10,3 +10,4 @@ Description: a simple library extracting data from .xls (Excel BIFF) files + Version: @VERSION@ + Libs: -L${libdir} -lfreexl -lm + Cflags: -I${includedir} ++Libs.private: @ICONV_LIBS@ diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake index 6b4998b679e99c..12834382f8a214 100644 --- a/ports/freexl/portfile.cmake +++ b/ports/freexl/portfile.cmake @@ -6,15 +6,16 @@ vcpkg_download_distfile(ARCHIVE SHA512 d72561f7b82e0281cb211fbf249e5e45411a7cdd009cfb58da3696f0a0341ea7df210883bfde794be28738486aeb4ffc67ec2c98fd2acde5280e246e204ce788 ) -if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH - PATCHES - fix-makefiles.patch - fix-sources.patch - ) - +vcpkg_extract_source_archive_ex( + ARCHIVE "${ARCHIVE}" + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-makefiles.patch + fix-sources.patch + fix-pc-file.patch +) + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBS_ALL_DBG "\"${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib\" \ \"${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib\"" @@ -25,7 +26,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ) vcpkg_install_nmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}/debug" INST_DIR="${CURRENT_PACKAGES_DIR}/debug" @@ -37,55 +38,33 @@ if (VCPKG_TARGET_IS_WINDOWS) "LINK_FLAGS=" "LIBS_ALL=${LIBS_ALL_REL}" ) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freexl RENAME copyright) - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib") else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/freexl.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib ${CURRENT_PACKAGES_DIR}/lib/freexl.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") endif() endif() -elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX +else() # Build in UNIX - vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH - ) - file(REMOVE_RECURSE "${SOURCE_PATH}/configure") vcpkg_configure_make( - AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} - OPTIONS_DEBUG - INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" - "LINK_FLAGS=/debug" - "CL_FLAGS=${CL_FLAGS_DBG}" - "LIBS_ALL=${LIBS_ALL_DBG}" - OPTIONS_RELEASE - INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" - "LINK_FLAGS=" - "CL_FLAGS=${CL_FLAGS_REL}" - "LIBS_ALL=${LIBS_ALL_REL}" + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG ) - vcpkg_install_make() - vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) - - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freexl RENAME copyright) + vcpkg_fixup_pkgconfig() -else()# Other build system - message(FATAL_ERROR "Unsupported build system.") endif() -message(STATUS "Packaging ${TARGET_TRIPLET} done") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/freexl/vcpkg.json b/ports/freexl/vcpkg.json new file mode 100644 index 00000000000000..3a19e577078c0a --- /dev/null +++ b/ports/freexl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "freexl", + "version-string": "1.0.4", + "port-version": 12, + "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet", + "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources", + "dependencies": [ + "libiconv" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b4480c5bedb5c6..95ead45b4929a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2158,7 +2158,7 @@ }, "freexl": { "baseline": "1.0.4", - "port-version": 11 + "port-version": 12 }, "fribidi": { "baseline": "1.0.10", diff --git a/versions/f-/freexl.json b/versions/f-/freexl.json index 8883043b52ac96..8df61ab9670b08 100644 --- a/versions/f-/freexl.json +++ b/versions/f-/freexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26e9d42e555e69bf1ea1747739daf3d6551bb46b", + "version-string": "1.0.4", + "port-version": 12 + }, { "git-tree": "eb377ce039ce22eaec25f3bf81668c5d77bec086", "version-string": "1.0.4", From 8b1a133e0a8974fb35b19c8f54554ccc26a59177 Mon Sep 17 00:00:00 2001 From: pyrotechnics-io Date: Thu, 2 Sep 2021 02:02:47 +0800 Subject: [PATCH 0403/1858] [jwt-cpp] Fixes SHA512 (#19845) * Fixes jwt-cpp This is a fix for #19837 Not sure why the hash worked a few days ago but appears to have broken now though (that needs some investigation). But the build is indeed broken * update port version * version Co-authored-by: JackBoosY --- ports/jwt-cpp/portfile.cmake | 2 +- ports/jwt-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/j-/jwt-cpp.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/jwt-cpp/portfile.cmake b/ports/jwt-cpp/portfile.cmake index 548e0da08908e4..d501753be6542b 100644 --- a/ports/jwt-cpp/portfile.cmake +++ b/ports/jwt-cpp/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Thalhammer/jwt-cpp REF 60122bbd8e6b9009c4633c1a33ea94c5b682034a # v0.5.1 - SHA512 d2c6e2174cd86c27b8866f6ea50a379a321788e91f97a0548e694d11469c05d93b0713e0c38b37a8f14a0aded4fc4635599dcfb50142e4496fb3c8b9f7e5f8cd + SHA512 ae905e217824d21ec9f098f562d993fbae71b2223e65f3bbcc29d352af61f2aa09b5c6b12c7d94742901a1374f9683335d3b4934c25b11500b710398331f6cb4 HEAD_REF master ) diff --git a/ports/jwt-cpp/vcpkg.json b/ports/jwt-cpp/vcpkg.json index 7178ba5d7fe31a..8f1471c37b2ea7 100644 --- a/ports/jwt-cpp/vcpkg.json +++ b/ports/jwt-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "jwt-cpp", "version-semver": "0.5.1", + "port-version": 1, "description": "A header only library for creating and validating json web tokens in c++", "homepage": "https://github.com/Thalhammer/jwt-cpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 95ead45b4929a2..b754c2bd6cfade 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2850,7 +2850,7 @@ }, "jwt-cpp": { "baseline": "0.5.1", - "port-version": 0 + "port-version": 1 }, "jxrlib": { "baseline": "2019.10.9", diff --git a/versions/j-/jwt-cpp.json b/versions/j-/jwt-cpp.json index 6f7dc3557f2de8..5cab5fb688de91 100644 --- a/versions/j-/jwt-cpp.json +++ b/versions/j-/jwt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbec7fade6b949737e531b1e5f57133e592edf96", + "version-semver": "0.5.1", + "port-version": 1 + }, { "git-tree": "068be311e2c481a636406216d26d0283768de825", "version-semver": "0.5.1", From 8977f74b10ab5c70dbf76c00cf6e206ca474080b Mon Sep 17 00:00:00 2001 From: AndrewDeanMS <45858683+AndrewDeanMS@users.noreply.github.com> Date: Wed, 1 Sep 2021 11:04:19 -0700 Subject: [PATCH 0404/1858] [parallel-hashmap] Update to 1.33 (#19863) * Update parallel-hashmap to version 1.33 * Result or running ./vcpkg x-add-version --all Co-authored-by: Andrew Dean --- ports/parallel-hashmap/CONTROL | 2 +- ports/parallel-hashmap/portfile.cmake | 4 ++-- versions/baseline.json | 2 +- versions/p-/parallel-hashmap.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/parallel-hashmap/CONTROL b/ports/parallel-hashmap/CONTROL index 1732e09fa7f07d..3d8fe0132a0446 100644 --- a/ports/parallel-hashmap/CONTROL +++ b/ports/parallel-hashmap/CONTROL @@ -1,3 +1,3 @@ Source: parallel-hashmap -Version: 1.32 +Version: 1.33 Description: A header-only, very fast and memory-friendly family of C++ hash maps. diff --git a/ports/parallel-hashmap/portfile.cmake b/ports/parallel-hashmap/portfile.cmake index 01a7e1b2dacaf1..e8b81b15d18176 100644 --- a/ports/parallel-hashmap/portfile.cmake +++ b/ports/parallel-hashmap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO greg7mdp/parallel-hashmap - REF 1.32 - SHA512 838358bf5899876a53accea8a10e051d35189b4105b6bc01dfe4f3ff01fdbe68986efb36341cc3082bc58419be33735e76350a2fd9501c2cace153f9d4321f24 + REF 1.33 + SHA512 287f098229153d925632e68e3cdbabfae0ea0ab8864089e4c0553a166c6079ca82ed5246ba53afd2a2917abcf06f37bc18f098e721f5f3b8def4d2d8c1c8c745 HEAD_REF master ) diff --git a/versions/baseline.json b/versions/baseline.json index b754c2bd6cfade..04d23ca35ec002 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4845,7 +4845,7 @@ "port-version": 0 }, "parallel-hashmap": { - "baseline": "1.32", + "baseline": "1.33", "port-version": 0 }, "parallelstl": { diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index 5e2b10cc4fbf5e..c2141416e903a4 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4cfdf7841512d19a12c31705c75cbea341e5705", + "version-string": "1.33", + "port-version": 0 + }, { "git-tree": "2366577284edc25897d22a701976455165f98265", "version-string": "1.32", From 587be85658c79c04f7f401fc0762876fe5ee8a9e Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 2 Sep 2021 02:10:22 +0800 Subject: [PATCH 0405/1858] [vcpkg_from_github] Fix version regex matching issue (#19815) --- scripts/cmake/vcpkg_from_github.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index 68c4e23700cef5..2dae0ba501a941 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -160,7 +160,7 @@ function(vcpkg_from_github) # Parse the github refs response with regex. # TODO: add json-pointer support to vcpkg file(READ "${archive_version}" version_contents) - if(NOT version_contents MATCHES [["sha": "([a-f0-9]+)"]]) + if(NOT version_contents MATCHES [["sha":"([a-f0-9]+)"]]) message(FATAL_ERROR "Failed to parse API response from '${version_url}': ${version_contents} From 2103d5083140dfb2c7c5833fe7760280559d6b83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 1 Sep 2021 20:19:07 +0200 Subject: [PATCH 0406/1858] [kf5archive] fix cmake.in to allow consumption by static builds (#19194) * [kf5archive] fix cmake.in to allow consumption by static builds * [kf5archive] update versions * [kf5archive] add lzma, zstd features * [kf5archive] update versions * [kf5archive] fix MAYBE_UNUSED_VARIABLES usage * [kf5archive] replace deprecated functions * [kf5archive] use semVer * [kf5archive] update versions * [kf5archive] add vcpkg_check_features * [kf5archive] update versions * [kf5archive] remove redundant option Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5archive] wrap all paths in quotes * [kf5archive] update versions * [kf5archive] lookup ZSTD using CMake * [kf5archive] update versions * [kf5archive] fix vcpkg_cmake_config_fixup() usage * [kf5archive] update versions * [kf5archive] rename patch files * [kf5archive] update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- .../add_support_for_static_builds.patch | 46 +++++++++++++++++ .../kf5archive/add_zstd_to_cmake_config.patch | 26 ++++++++++ ...pkg_check_modules_if_pkgconfig_found.patch | 27 ++++++++++ ports/kf5archive/portfile.cmake | 32 +++++++----- ports/kf5archive/use_cmake_to_find_zstd.patch | 49 +++++++++++++++++++ ports/kf5archive/vcpkg.json | 27 +++++++++- versions/baseline.json | 2 +- versions/k-/kf5archive.json | 5 ++ 8 files changed, 199 insertions(+), 15 deletions(-) create mode 100644 ports/kf5archive/add_support_for_static_builds.patch create mode 100644 ports/kf5archive/add_zstd_to_cmake_config.patch create mode 100644 ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch create mode 100644 ports/kf5archive/use_cmake_to_find_zstd.patch diff --git a/ports/kf5archive/add_support_for_static_builds.patch b/ports/kf5archive/add_support_for_static_builds.patch new file mode 100644 index 00000000000000..7ad973d3936c18 --- /dev/null +++ b/ports/kf5archive/add_support_for_static_builds.patch @@ -0,0 +1,46 @@ +From 5dc3f846c27ee6d55131db475975e3c24cd0c19c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Wed, 28 Jul 2021 11:39:30 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5ArchiveConfig.cmake.in | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in +index 3d32642..0a738c2 100644 +--- a/KF5ArchiveConfig.cmake.in ++++ b/KF5ArchiveConfig.cmake.in +@@ -4,9 +4,29 @@ include(CMakeFindDependencyMacro) + find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + + ++set(KArchive_HAVE_ZLIB "@ZLIB_FOUND@") + set(KArchive_HAVE_BZIP2 "@BZIP2_FOUND@") + set(KArchive_HAVE_LZMA "@LIBLZMA_FOUND@") + set(KArchive_HAVE_ZSTD "@LibZstd_FOUND@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ if (@ZLIB_FOUND@) ++ find_dependency(ZLIB) ++ endif() ++ ++ if (@BZIP2_FOUND@) ++ find_dependency(BZip2) ++ endif() ++ ++ if (@LIBLZMA_FOUND@) ++ find_dependency(LibLZMA) ++ endif() ++ ++ if (@LibZstd_FOUND@) ++ find_package(PkgConfig) ++ pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5ArchiveTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5archive/add_zstd_to_cmake_config.patch b/ports/kf5archive/add_zstd_to_cmake_config.patch new file mode 100644 index 00000000000000..8b960bb4f08f39 --- /dev/null +++ b/ports/kf5archive/add_zstd_to_cmake_config.patch @@ -0,0 +1,26 @@ +From 5a79756f381e1a1843cb2171bdc151dad53fb7db Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" +Date: Wed, 7 Jul 2021 03:09:38 +0200 +Subject: [PATCH] Report KArchive_HAVE_ZSTD in CMake Config file to consumers + +Allows users of KArchive to query whether zstd is available, +in the same way as lzma & bzip2 +--- + KF5ArchiveConfig.cmake.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in +index 0d59d63..3d32642 100644 +--- a/KF5ArchiveConfig.cmake.in ++++ b/KF5ArchiveConfig.cmake.in +@@ -6,6 +6,7 @@ find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + + set(KArchive_HAVE_BZIP2 "@BZIP2_FOUND@") + set(KArchive_HAVE_LZMA "@LIBLZMA_FOUND@") ++set(KArchive_HAVE_ZSTD "@LibZstd_FOUND@") + + include("${CMAKE_CURRENT_LIST_DIR}/KF5ArchiveTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch b/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch new file mode 100644 index 00000000000000..f3db3a4fb71bd0 --- /dev/null +++ b/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch @@ -0,0 +1,27 @@ +From 9ab5f2bfbe59038b0d0b6ca7f1b22d1c9229c67e Mon Sep 17 00:00:00 2001 +From: Dawid Wrobel +Date: Fri, 30 Jul 2021 10:23:48 +0000 +Subject: [PATCH] Only pkg_check_modules() if PkgConfig is found + +--- + CMakeLists.txt | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bab7661..2cdda70 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -45,7 +45,9 @@ set_package_properties(LibLZMA PROPERTIES + ) + + find_package(PkgConfig) +-pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") ++if (PkgConfig_FOUND) ++ pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") ++endif() + add_feature_info(LibZstd LibZstd_FOUND + "Support for zstd compressed files and data streams" + ) +-- +GitLab + diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index c9a8e499dcb800..479b4496f04c28 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -4,30 +4,38 @@ vcpkg_from_github( REF v5.84.0 SHA512 82926f62424446df0f4fc300f57ae9bd5baf8e13da2ce4135ac56c0c52a0307bffb06f84ac7e8e658e96ace2ae3d530f27e232061284ac87271404f218e9fdd4 HEAD_REF master + PATCHES + only_pkg_check_modules_if_pkgconfig_found.patch # https://invent.kde.org/frameworks/karchive/-/commit/9ab5f2bfbe59038b0d0b6ca7f1b22d1c9229c67e + add_zstd_to_cmake_config.patch # https://invent.kde.org/frameworks/karchive/-/commit/5a79756f381e1a1843cb2171bdc151dad53fb7db + add_support_for_static_builds.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/23 + use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24 ) -vcpkg_configure_cmake( +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "lzma" CMAKE_DISABLE_FIND_PACKAGE_LibLZMA + "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD +) + +vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Archive) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5archive/use_cmake_to_find_zstd.patch b/ports/kf5archive/use_cmake_to_find_zstd.patch new file mode 100644 index 00000000000000..ee7dfd555b0f80 --- /dev/null +++ b/ports/kf5archive/use_cmake_to_find_zstd.patch @@ -0,0 +1,49 @@ +From 82fc20234d4cf8abdec1a2b4fea9823154f1aecc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Fri, 27 Aug 2021 01:48:53 +0200 +Subject: [PATCH] Use CMake to find ZSTD + +--- + CMakeLists.txt | 11 +++++------ + KF5ArchiveConfig.cmake.in | 3 +-- + 2 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ab85f4..ece1f77 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,12 +44,11 @@ set_package_properties(LibLZMA PROPERTIES + PURPOSE "Support for xz compressed files and data streams" + ) + +-find_package(PkgConfig) +-if (PkgConfig_FOUND) +- pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") +-endif() +-add_feature_info(LibZstd LibZstd_FOUND +- "Support for zstd compressed files and data streams" ++find_package(ZSTD) ++set_package_properties(LibZstd PROPERTIES ++ URL "http://www.zstd.net" ++ DESCRIPTION "Support for zstd compressed files and data streams" ++ PURPOSE "Support for zstd compressed files and data streams" + ) + + include(ECMSetupVersion) +diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in +index 0a738c2..d868324 100644 +--- a/KF5ArchiveConfig.cmake.in ++++ b/KF5ArchiveConfig.cmake.in +@@ -23,8 +23,7 @@ if (NOT @BUILD_SHARED_LIBS@) + endif() + + if (@LibZstd_FOUND@) +- find_package(PkgConfig) +- pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") ++ find_dependency(ZSTD) + endif() + endif() + +-- +GitLab + diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index 9cc00aa03d0561..2ece7aa506eebe 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,12 +1,35 @@ { "name": "kf5archive", - "version": "5.84.0", + "version-semver": "5.84.0", + "port-version": 1, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "dependencies": [ "bzip2", "ecm", "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" - ] + ], + "features": { + "lzma": { + "description": "Support for xz compressed files and data streams", + "dependencies": [ + "liblzma" + ] + }, + "zstd": { + "description": "Support for zstd compressed files and data streams", + "dependencies": [ + "zstd" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 04d23ca35ec002..15aed3900bc160 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2882,7 +2882,7 @@ }, "kf5archive": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5attica": { "baseline": "5.84.0", diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index bb5f443c99a370..068b74c7a533ca 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "03f6943556e1d7600443c1f30445560de3f9b2f7", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "bc7b88da4daf014c751e4ab246a0104d850f5785", "version": "5.84.0", From ac87ec35700bcc7e4091422b5d095075b8230751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 1 Sep 2021 20:29:13 +0200 Subject: [PATCH 0407/1858] [kf5coreaddons] fix Windows static builds & CMake Config (#19439) * [kf5coreaddons] fix Windows static builds https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 Also: - replace deprecated functions - embrace paths in quotes - actually remove the folders that need to be removed * [kf5coreaddons] update versions * [kf5coreaddons] delete redundant REMOVE * [kf5coreaddons] update versions * [kf5coreaddons] save data files to default /share location * [kf5coreaddons] update versions * [kf5coreaddons] fix CMake Config for static builds * [kf5coreaddons] update versions * [kf5coreaddons] update versions * [kf5coreaddons] fix vcpkg_cmake_config_fixup() usage * [kf5coreaddons] update versions * [kf5coreaddons] workaround Linux Inotify issue * [kf5coreaddons] update versions * [kf5coreaddons] rename patch file * [kf5coreaddons] update versions --- ports/kf5coreaddons/fix_cmake_config.patch | 38 ++++++++++++++++ ports/kf5coreaddons/fix_static_build.patch | 51 ++++++++++++++++++++++ ports/kf5coreaddons/portfile.cmake | 27 +++++------- ports/kf5coreaddons/vcpkg.json | 13 +++++- versions/baseline.json | 2 +- versions/k-/kf5coreaddons.json | 5 +++ 6 files changed, 116 insertions(+), 20 deletions(-) create mode 100644 ports/kf5coreaddons/fix_cmake_config.patch create mode 100644 ports/kf5coreaddons/fix_static_build.patch diff --git a/ports/kf5coreaddons/fix_cmake_config.patch b/ports/kf5coreaddons/fix_cmake_config.patch new file mode 100644 index 00000000000000..059da3c70b5e75 --- /dev/null +++ b/ports/kf5coreaddons/fix_cmake_config.patch @@ -0,0 +1,38 @@ +From 4588b0052c11189aa6872e3c3c13f05dbae0c26e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Fri, 27 Aug 2021 02:02:08 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5CoreAddonsConfig.cmake.in | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/KF5CoreAddonsConfig.cmake.in b/KF5CoreAddonsConfig.cmake.in +index f86b69ff..f9e0d31f 100644 +--- a/KF5CoreAddonsConfig.cmake.in ++++ b/KF5CoreAddonsConfig.cmake.in +@@ -18,6 +18,21 @@ else() + set_target_properties(KF5::desktoptojson PROPERTIES IMPORTED_LOCATION ${DESKTOPTOJSON_EXECUTABLE}) + endif() + endif() ++ ++if(NOT @BUILD_SHARED_LIBS@) ++ if(NOT WIN32) ++ find_dependency(Threads) ++ endif() ++ ++ if(@Inotify_FOUND@) ++ find_package(Inotify) # https://bugs.kde.org/show_bug.cgi?id=441604 ++ endif() ++ ++ if(@Procstat_FOUND@) ++ find_dependency(Procstat) ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsTargets.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/KF5CoreAddonsMacros.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5coreaddons/fix_static_build.patch b/ports/kf5coreaddons/fix_static_build.patch new file mode 100644 index 00000000000000..400af0032ca88f --- /dev/null +++ b/ports/kf5coreaddons/fix_static_build.patch @@ -0,0 +1,51 @@ +From de4e22fe644d5df9066ba78f778032a42c2f19b9 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Sat, 7 Aug 2021 17:24:44 +0200 +Subject: [PATCH] Fix issue when building KCrash static + +KCoreAddons forward declares a function from KCrash. + +It contains a Q_DECL_IMPORT but that breaks when doing a static build. + +Only add the Q_DECL_IMPORT when we are doing a dynamic build. + +BUG: 440416 +--- + src/lib/CMakeLists.txt | 4 ++++ + src/lib/kaboutdata.h | 4 ++++ + 2 files changed, 8 insertions(+) + +diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt +index 8e9006fd..b3ea957f 100644 +--- a/src/lib/CMakeLists.txt ++++ b/src/lib/CMakeLists.txt +@@ -16,6 +16,10 @@ configure_file(util/config-accountsservice.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/c + add_library(KF5CoreAddons) + add_library(KF5::CoreAddons ALIAS KF5CoreAddons) + ++if(NOT BUILD_SHARED_LIBS) ++ target_compile_definitions(KF5CoreAddons PUBLIC -DKCOREADDONS_STATIC) ++endif() ++ + ecm_create_qm_loader(KF5CoreAddons kcoreaddons5_qt) + + if (FAM_FOUND) +diff --git a/src/lib/kaboutdata.h b/src/lib/kaboutdata.h +index 4309b145..a0222861 100644 +--- a/src/lib/kaboutdata.h ++++ b/src/lib/kaboutdata.h +@@ -27,7 +27,11 @@ class KAboutData; + class KPluginMetaData; + namespace KCrash + { ++#ifdef KCOREADDONS_STATIC ++void defaultCrashHandler(int sig); ++#else + Q_DECL_IMPORT void defaultCrashHandler(int sig); ++#endif + } + + /** +-- +GitLab + diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 09c9baf8419b88..24f1d78414b183 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -3,22 +3,20 @@ vcpkg_from_github( REPO KDE/kcoreaddons REF v5.84.0 SHA512 58a802d03bea135c192265651540f9f87066b20ee4af620a94a874ec3992c5e734d1ab1e4ccb082de97389fa3479fd3672ec586c3dd36c9b4a5422c7be98d119 + PATCHES + fix_static_build.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 + fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF - -DKDE_INSTALL_DATAROOTDIR=data ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5CoreAddons) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5CoreAddons CONFIG_PATH lib/cmake/KF5CoreAddons) vcpkg_copy_pdbs() vcpkg_copy_tools( @@ -26,18 +24,13 @@ vcpkg_copy_tools( AUTO_CLEAN ) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../data") +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/desktoptojson${EXECUTABLE_SUFFIX}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 7308ce9949d20d..7d81987f0debf7 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,11 +1,20 @@ { "name": "kf5coreaddons", - "version": "5.84.0", + "version-semver": "5.84.0", + "port-version": 1, "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 15aed3900bc160..e1fda552b568d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2910,7 +2910,7 @@ }, "kf5coreaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5crash": { "baseline": "5.84.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 9fd80548b8da00..3527c22e7cfb69 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "001ac94bfbadcc7b05c30448bff3adc9e2dc08dd", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "0afc60c5f0db7847953d1082a96b5a4844047f02", "version": "5.84.0", From 0611a86c2ee59ce8f0a8230ee7134be907eeae6e Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Wed, 1 Sep 2021 14:48:01 -0400 Subject: [PATCH 0408/1858] [oatpp-openssl] new port (#19265) * [oatpp-openssl] new port * [oatpp-openssl] uses version-semver * [oatpp-openssl] uses version-semver * [oatpp-version] has paramters with arguments surrounded by quotes * [oatpp-openssl] vcpkg x-add-version oatpp-openssl --overwrite-version * [oatpp-openssl] no unused vcpkg_cmake_configure options * [oatpp-openssl] no unused vcpkg_cmake_configure options Co-authored-by: mheyman --- ports/oatpp-openssl/portfile.cmake | 25 +++++++++++++++++++++++++ ports/oatpp-openssl/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/o-/oatpp-openssl.json | 9 +++++++++ 4 files changed, 56 insertions(+) create mode 100644 ports/oatpp-openssl/portfile.cmake create mode 100644 ports/oatpp-openssl/vcpkg.json create mode 100644 versions/o-/oatpp-openssl.json diff --git a/ports/oatpp-openssl/portfile.cmake b/ports/oatpp-openssl/portfile.cmake new file mode 100644 index 00000000000000..9445ee7006a2f1 --- /dev/null +++ b/ports/oatpp-openssl/portfile.cmake @@ -0,0 +1,25 @@ +set(OATPP_VERSION "1.2.5") + +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +# get the source +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO oatpp/oatpp-openssl + REF ${OATPP_VERSION} + SHA512 c5a40691d846703378c2965f2ad9b99edb2025d47854719bab4e80a4771258c2b72cfba0135b63dd9e2387da4549b5bc6cebfc1913a8006d14d59e250be19060 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DOATPP_BUILD_TESTS:BOOL=OFF" +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/oatpp-openssl-${OATPP_VERSION}") +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oatpp-openssl/vcpkg.json b/ports/oatpp-openssl/vcpkg.json new file mode 100644 index 00000000000000..b844deaa36f7c7 --- /dev/null +++ b/ports/oatpp-openssl/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "oatpp-openssl", + "version-semver": "1.2.5", + "description": "Oat++ openssl module providing secure server and client connection providers.", + "homepage": "https://github.com/oatpp/oatpp-openssl", + "dependencies": [ + "oatpp", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e1fda552b568d3..83566b49a7ad57 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4520,6 +4520,10 @@ "baseline": "1.2.5", "port-version": 0 }, + "oatpp-openssl": { + "baseline": "1.2.5", + "port-version": 0 + }, "oatpp-postgresql": { "baseline": "1.2.5", "port-version": 0 diff --git a/versions/o-/oatpp-openssl.json b/versions/o-/oatpp-openssl.json new file mode 100644 index 00000000000000..80b4c28e447c60 --- /dev/null +++ b/versions/o-/oatpp-openssl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d127d675e359a2f4a430f49f9dab815dd7991bfb", + "version-semver": "1.2.5", + "port-version": 0 + } + ] +} From 3b3af10ca3d04bbfe4d4b2f609168c751e12eb03 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 1 Sep 2021 11:50:01 -0700 Subject: [PATCH 0409/1858] [libsbsms] add new port with version 2.3.0 (#19312) --- ports/libsbsms/portfile.cmake | 17 +++++++++++++++++ ports/libsbsms/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libsbsms.json | 9 +++++++++ 4 files changed, 47 insertions(+) create mode 100644 ports/libsbsms/portfile.cmake create mode 100644 ports/libsbsms/vcpkg.json create mode 100644 versions/l-/libsbsms.json diff --git a/ports/libsbsms/portfile.cmake b/ports/libsbsms/portfile.cmake new file mode 100644 index 00000000000000..20dcda6f202ecc --- /dev/null +++ b/ports/libsbsms/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO claytonotey/libsbsms + REF 2.3.0 + SHA512 e5b544c2bdbaa2169236987c7a043838c8d1761b25280c476d7a32656d482c6485cb33f579ea9d1ce586ec7b2913ed8fdcf1abe5c7cc8b9e4eef9ce87de54627 + HEAD_REF main +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sbsms" PACKAGE_NAME sbsms) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libsbsms/vcpkg.json b/ports/libsbsms/vcpkg.json new file mode 100644 index 00000000000000..360bef009b987e --- /dev/null +++ b/ports/libsbsms/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libsbsms", + "version-semver": "2.3.0", + "description": "libsbsms is a library for high quality time and pitch scale modification of digital audio. It uses octave subband sinusoidal modeling.", + "homepage": "https://github.com/claytonotey/libsbsms", + "license": "GPL-2.0-or-later", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 83566b49a7ad57..dc1a5d388952e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3612,6 +3612,10 @@ "baseline": "5.18.0", "port-version": 0 }, + "libsbsms": { + "baseline": "2.3.0", + "port-version": 0 + }, "libsigcpp": { "baseline": "3.0.3", "port-version": 1 diff --git a/versions/l-/libsbsms.json b/versions/l-/libsbsms.json new file mode 100644 index 00000000000000..a1840eab3e81e0 --- /dev/null +++ b/versions/l-/libsbsms.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e6367a94b6e35f2acf16b6a931749fcfab8ffefe", + "version-semver": "2.3.0", + "port-version": 0 + } + ] +} From 55498733d9d5a8ad24538011649e3ff77d928bb0 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Thu, 2 Sep 2021 05:27:04 +0800 Subject: [PATCH 0410/1858] [libvpx] Add pkgconfig (#19355) * [libvpx] Add pkgconfig check * Update version files * Add vpx.pc.in on Windows * Update versions/l-/libvpx.json * Remove -lm from vpx.pc.in file * Update versions/l-/libvpx.json * Remove debug messages * Update versions/l-/libvpx.json --- ports/libvpx/portfile.cmake | 29 ++++++++++++++++++++--------- ports/libvpx/vcpkg.json | 1 + ports/libvpx/vpx.pc.in | 13 +++++++++++++ versions/baseline.json | 2 +- versions/l-/libvpx.json | 5 +++++ 5 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 ports/libvpx/vpx.pc.in diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 59bf41fe4268a3..2448cc6fb48a36 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -33,7 +33,7 @@ vcpkg_add_to_path(${NASM_EXE_PATH}) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) + file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") if(VCPKG_CRT_LINKAGE STREQUAL static) set(LIBVPX_CRT_LINKAGE --enable-static-msvcrt) @@ -71,7 +71,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() message(STATUS "Generating makefile") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_execute_required_process( COMMAND ${BASH} --noprofile --norc @@ -126,11 +126,20 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) endif() file( INSTALL - ${LIBVPX_INCLUDE_DIR} + "${LIBVPX_INCLUDE_DIR}" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME "vpx") + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/vpx.pc" @ONLY) + endif() + + if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(LIBVPX_PREFIX "${CURRENT_INSTALLED_DIR}/debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vpx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/vpx.pc" @ONLY) + endif() else() @@ -177,7 +186,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") message(STATUS "Configuring libvpx for Release") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${BASH} --noprofile --norc @@ -210,7 +219,7 @@ else() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") message(STATUS "Configuring libvpx for Debug") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${BASH} --noprofile --norc @@ -238,17 +247,19 @@ else() LOGNAME install-${TARGET_TRIPLET}-dbg ) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libvpx_g.a) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libvpx_g.a") endif() endif() +vcpkg_fixup_pkgconfig() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(LIBVPX_CONFIG_DEBUG ON) else() set(LIBVPX_CONFIG_DEBUG OFF) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in ${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-libvpx-config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/unofficial-libvpx/unofficial-libvpx-config.cmake" @ONLY) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index e928963563faa0..ced530f21be6bc 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libvpx", "version-semver": "1.10.0", + "port-version": 1, "description": "The reference software implementation for the video coding formats VP8 and VP9.", "homepage": "https://github.com/webmproject/libvpx" } diff --git a/ports/libvpx/vpx.pc.in b/ports/libvpx/vpx.pc.in new file mode 100644 index 00000000000000..c01bb2e9beb476 --- /dev/null +++ b/ports/libvpx/vpx.pc.in @@ -0,0 +1,13 @@ +prefix=@LIBVPX_PREFIX@ +# pkg-config file from libvpx v1.10.0 +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: vpx +Description: WebM Project VPx codec implementation +Version: @LIBVPX_VERSION@ +Requires: +Conflicts: +Libs: -L"${libdir}" -lvpx +Cflags: -I"${includedir}" diff --git a/versions/baseline.json b/versions/baseline.json index dc1a5d388952e3..58ff7af0a8d433 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3782,7 +3782,7 @@ }, "libvpx": { "baseline": "1.10.0", - "port-version": 0 + "port-version": 1 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index 2a678f182923f8..e4aa292edba280 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55be5e09000631b1dacd6f86d174eb2cade91bf5", + "version-semver": "1.10.0", + "port-version": 1 + }, { "git-tree": "ba9e1f9d346412c76f17d9fda5a3fbd5b5555afa", "version-semver": "1.10.0", From 8b6c64651c1186238b11b6b87efc53bc98ec7eae Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 1 Sep 2021 23:29:06 +0200 Subject: [PATCH 0411/1858] [icu] remove setting triplet (#19620) * [icu] remove setting triplet * add version files --- ports/icu/portfile.cmake | 9 --------- ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 64ca15b9fc327b..8533c384aa5499 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -38,18 +38,9 @@ if(NOT "${TARGET_TRIPLET}" STREQUAL "${HOST_TRIPLET}") list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}/tools/${PORT}") endif() -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(BUILD_TRIPLET --host=x86_64-w64-mingw32) - else() - set(BUILD_TRIPLET --host=i686-w64-mingw32) - endif() -endif() - vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH source - BUILD_TRIPLET ${BUILD_TRIPLET} OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 3396b0f9c44cc0..c4f6e3c4b4f24b 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 11, + "port-version": 12, "description": "Mature and widely used Unicode and localization library.", "homepage": "http://icu-project.org/apiref/icu4c/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 58ff7af0a8d433..99da61e30ffa9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2586,7 +2586,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 11 + "port-version": 12 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 41fe2dbb8287c7..cf7ef20da17416 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02bcc079d00e16237aa0d1af449d7663581a1525", + "version": "69.1", + "port-version": 12 + }, { "git-tree": "46d639d2e138f9ee3362fd8023f64463ae4e6afa", "version": "69.1", From 5edd8c31063dd49594ec3d7b0d56dea39985978d Mon Sep 17 00:00:00 2001 From: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com> Date: Wed, 1 Sep 2021 23:29:50 +0200 Subject: [PATCH 0412/1858] [tensorflow] fix macOS build errors caused by numpy and bazel upgrades (#19363) * Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * issue targeted in newer numpy version * work-around for broken numpy libs on macOS * temporarily add debug code to analyze CI failures * again temporary debug code * fix linkage command on macOS (broken by Bazel upgrade) * fix regex for macOS linker command * remove debug code, bump version * x-add-version seems to require a separate commit... * Fix misspelled "acceleration". * x-add-version Co-authored-by: jgehw Co-authored-by: Billy Robert O'Neal III --- .../convert_lib_params_macos.py | 18 +++++++++ .../generate_static_link_cmd_linux.py | 2 +- .../generate_static_link_cmd_macos.py | 38 ++++--------------- .../generate_static_link_cmd_windows.py | 2 +- ports/tensorflow-common/portfile.cmake | 1 + .../tensorflow-common/tensorflow-common.cmake | 37 ++++++++++-------- ports/tensorflow-common/vcpkg.json | 2 +- scripts/ci.baseline.txt | 4 -- versions/baseline.json | 2 +- versions/t-/tensorflow-common.json | 5 +++ 10 files changed, 57 insertions(+), 54 deletions(-) create mode 100644 ports/tensorflow-common/convert_lib_params_macos.py diff --git a/ports/tensorflow-common/convert_lib_params_macos.py b/ports/tensorflow-common/convert_lib_params_macos.py new file mode 100644 index 00000000000000..b3c419363e6cf4 --- /dev/null +++ b/ports/tensorflow-common/convert_lib_params_macos.py @@ -0,0 +1,18 @@ +import sys + +version = sys.argv[1] +lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] + +with open(f"libtensorflow{lib_suffix}.{version}.a-2.params", "w") as f_out: + parts = [] + with open(f"libtensorflow_framework.{version}.dylib-2.params", "r") as f_in: + for line in f_in: + if line.startswith("-Wl,-force_load,"): + f_out.write(line[16:]) + parts.append(line[16:]) + parts = set(parts) + with open(f"libtensorflow{lib_suffix}.{version}.dylib-2.params", "r") as f_in: + for line in f_in: + if line.startswith("-Wl,-force_load,"): + if line[16:] not in parts: + f_out.write(line[16:]) diff --git a/ports/tensorflow-common/generate_static_link_cmd_linux.py b/ports/tensorflow-common/generate_static_link_cmd_linux.py index 34c8db13400919..7b17552154b6b3 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_linux.py +++ b/ports/tensorflow-common/generate_static_link_cmd_linux.py @@ -4,7 +4,7 @@ lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: - p_cd = re.compile("^\\((cd .*) && \\\\$") + p_cd = re.compile(r"^\((cd .*) && \\$") p_linker = re.compile(fr"^\s*(.+)gcc.+(@bazel-out\S+libtensorflow{lib_suffix}\.so\.\d\.\d\.\d-2\.params).*") f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") env = [] diff --git a/ports/tensorflow-common/generate_static_link_cmd_macos.py b/ports/tensorflow-common/generate_static_link_cmd_macos.py index bb8f6faa21f43a..5894c99b00232c 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_macos.py +++ b/ports/tensorflow-common/generate_static_link_cmd_macos.py @@ -4,44 +4,20 @@ lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: - p_cd = re.compile("^\\((cd .*) && \\\\$") - p_linker1 = re.compile(fr"^.*cc_wrapper.sh.+-shared.+-o (bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib)") - p_linker2 = re.compile("^.*cc_wrapper.sh.+-shared.+-o (bazel-out\\S+libtensorflow_framework\\.\\d\\.\\d\\.\\d\\.dylib)") + p_cd = re.compile(r"^\((cd .*) && \\$") + p_linker = re.compile(fr"^\s*.+cc_wrapper.sh.+(@bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib-2\.params).*") f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") env = [] - parts = None for line in f_in: if line.startswith("(cd"): # new command, reset env = [line] else: - m1 = p_linker1.match(line) - m2 = p_linker2.match(line) + m1 = p_linker.match(line) if m1: - tokens = line.split() - if parts is None: - parts = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] - else: - m = p_cd.match(env[0]) - f_out.write(m.group(1) + "\n") - tmp = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] - old = set(parts) - parts += [t for t in tmp if t not in old] - line = f"libtool -static -o {m1.group(1).replace('.dylib', '.a')} {' '.join(parts)}\n" - f_out.write(line) - break - elif m2 and len(env) > 6: - tokens = line.split() - if parts is None: - parts = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] - else: - m = p_cd.match(env[0]) - f_out.write(m.group(1) + "\n") - tmp = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] - old = set(parts) - parts += [t for t in tmp if t not in old] - line = f"libtool -static -o {m2.group(1).replace('_framework', lib_suffix).replace('.dylib', '.a')} {' '.join(parts)}\n" - f_out.write(line) - break + m2 = p_cd.match(env[0]) + f_out.write(m2.group(1) + "\n") + line = f'"/usr/bin/libtool" -static -o {m1.group(1)[1:-9].replace(".dylib", ".a")} {m1.group(1).replace(".dylib", ".a")}\n' + f_out.write(line) else: env.append(line) diff --git a/ports/tensorflow-common/generate_static_link_cmd_windows.py b/ports/tensorflow-common/generate_static_link_cmd_windows.py index 780334ad98ab83..84ec9eede2186a 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_windows.py +++ b/ports/tensorflow-common/generate_static_link_cmd_windows.py @@ -5,7 +5,7 @@ lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] with open(sys.argv[1], "r") as f_in: with open("static_link.bat", "w") as f_out: - p_setenv = re.compile("^\s*(SET .+=.*)$") + p_setenv = re.compile(r"^\s*(SET .+=.*)$") p_linker = re.compile(fr".+link\.exe.+tensorflow{lib_suffix}\.dll-2\.params.*") env = [] for line in f_in: diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake index e505c4430ed748..edd171aa48e322 100644 --- a/ports/tensorflow-common/portfile.cmake +++ b/ports/tensorflow-common/portfile.cmake @@ -3,6 +3,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) set(TENSORFLOW_FILES "${CMAKE_CURRENT_LIST_DIR}/change-macros-for-static-lib.patch" "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_linux.py" + "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_macos.py" "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_windows.py" "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch" diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 776cb9c0069829..403f32c6cb8f0e 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -45,7 +45,16 @@ else() get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(PREPEND ${PYTHON3_DIR}) - vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install --user -U numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pip-${TARGET_TRIPLET}) + if(VCPKG_TARGET_IS_OSX) + # acceleration libs currently broken on macOS => force numpy user space reinstall without BLAS/LAPACK/ATLAS + # remove this work-around again, i.e. default to "else" branch, once acceleration libs are fixed upstream + set(ENV{BLAS} "None") + set(ENV{LAPACK} "None") + set(ENV{ATLAS} "None") + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install --user -U --force-reinstall numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pip-${TARGET_TRIPLET}) + else() + vcpkg_execute_required_process(COMMAND ${PYTHON3} -m pip install --user -U numpy WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pip-${TARGET_TRIPLET}) + endif() vcpkg_execute_required_process(COMMAND ${PYTHON3} -c "import site; print(site.getusersitepackages())" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} LOGNAME prerequesits-pypath-${TARGET_TRIPLET} OUTPUT_VARIABLE PYTHON_LIB_PATH) endif() set(ENV{PYTHON_BIN_PATH} "${PYTHON3}") @@ -265,20 +274,18 @@ foreach(BUILD_TYPE dbg rel) LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} ) endif() - if(NOT VCPKG_TARGET_IS_OSX) - if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_LIB_SUFFIX} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow - LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - else() - vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_VERSION} ${TF_LIB_SUFFIX} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow - LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} - ) - endif() + if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow + LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} + ) + else() + vcpkg_execute_build_process( + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_${PLATFORM_SUFFIX}.py" ${TF_VERSION} ${TF_LIB_SUFFIX} + WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-bin/tensorflow + LOGNAME postbuild1-${TARGET_TRIPLET}-${BUILD_TYPE} + ) endif() # for some reason stdout of bazel ends up in stderr, so use err log file in the following command vcpkg_execute_build_process( diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index d97e2c228c5518..b0dfa7959bea25 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow-common", "version-semver": "2.4.1", - "port-version": 3, + "port-version": 4, "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 47a65e1fc22c18..dec70ed3b734ba 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1757,7 +1757,3 @@ dimcli:x64-windows-static=fail # cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. cppgraphqlgen:x64-osx=fail - -# Changes in Python have broken tensorflow on our osx hardware -tensorflow:x64-osx=fail -tensorflow-cc:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index 99da61e30ffa9e..2233413efcacc4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6274,7 +6274,7 @@ }, "tensorflow-common": { "baseline": "2.4.1", - "port-version": 3 + "port-version": 4 }, "tensorpipe": { "baseline": "2021-04-26", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index cbe798a9e67d36..59c201491da010 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d84b641f07ef269a213e0382e719a0c338f4ed7", + "version-semver": "2.4.1", + "port-version": 4 + }, { "git-tree": "dd652b405ef53658c13af438e8414110f2977520", "version-semver": "2.4.1", From f6a0357946dd9530680893200e9131b6c84b73c6 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 2 Sep 2021 12:33:21 -0700 Subject: [PATCH 0413/1858] [vcpkg] Repair msbuild damage and workaround the way we integrate on VS2015. (#19767) * Repair msbuild damage and workaround the way we integrate on VS2015. This is a fix for a pile of issues discovered by https://github.com/microsoft/vcpkg/pull/18906 * VS 2015 has a bug that the $(VcpkgInstalledDir)\ dance we do to get a trailing slash is not applied correctly when VcpkgInstalledDir was edited in the same property group attempting to add the trailing slash. * We need a trailing slash on VcpkgInstalledDir at all times, but https://github.com/microsoft/vcpkg/pull/16173 damaged this by removing it from TreatAsLocalProperty. Add the right TreatAsLocalPropertys back. Add all such slash defenses to the top of the file just beneath, eliminating need to call Path::Combine and friends by following msbuild "directory properties have a trailing slash" convention. * Move VcpkgOSTarget and VcpkgPlatformTarget into the .targets, as they aren't intended to be overridable by users and don't appear in our selection dialog box(es). * Don't bother avoiding setting vcpkg properties when VcpkgEnabled is off; after all, VcpkgEnabled is itself a vcpkg property :). I left attempts to skip creating items since creating items can hit the disk. * Add _Z to several internal msbuild variables. * Move VcpkgApplocalDeps to the .props since it's a user setting. * Don't unconditionally use $(TLogLocation) because it is not set on 2015, and also it's per-project. * Fixed typo in docs "VcpkgInstalledDirectory", and document the limitation that it doesn't work in 2015. * In manifest mode, put the installed tree in a subdirectory including the triplet to make changing configurations faster. Known limitations: * If you change vcpkg.json without changing any .cpp files, we don't rebuild the dependencies even though we should. I don't know how to fix this but it doesn't appear to be a regression. * Fix .tlog handling. * Further defend against modified properties on VS2015. * Document more VS2015 limitations. * Remove TreatAsLocalProperty comment. --- docs/users/manifests.md | 18 ++- scripts/buildsystems/msbuild/vcpkg.props | 17 +- scripts/buildsystems/msbuild/vcpkg.targets | 179 +++++++++++++-------- 3 files changed, 131 insertions(+), 83 deletions(-) diff --git a/docs/users/manifests.md b/docs/users/manifests.md index ae0ee7eedca613..0018ff375d4007 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -441,7 +441,7 @@ See the `--feature-flags=` command line option for more information. ## MSBuild Integration To use manifests with MSBuild, first you need to use an [existing integration method](integration.md#with-msbuild). -Then, simply add a vcpkg.json above your project file (such as in the root of your source repository) and set the +Then, add a vcpkg.json above your project file (such as in the root of your source repository) and set the property `VcpkgEnableManifest` to `true`. You can set this property via the IDE in `Project Properties -> Vcpkg -> Use Vcpkg Manifest`. @@ -453,9 +453,21 @@ Note: It is critical that all project files in a single build consuming the same you need to use different triplets for different projects in your solution, they must consume from different `vcpkg.json` files. +### Known issues + +* Visual Studio 2015 does not correctly track edits to the `vcpkg.json` and `vcpkg-configuration.json` files, and will +not respond to changes unless a `.cpp` is edited. + ### MSBuild Properties -These properties can be defined via the VS GUI under `Project Properties -> Vcpkg` or via a common `.props` file. +When using Visual Studio 2015 integration, these properties can be set in your project file before the + + + +line, which unfortunately requires manual editing of the `.vcxproj` or passing on the msbuild command line with `/p:`. +With 2017 or later integration, These properties can additionally be set via the Visual Studio GUI under +`Project Properties -> Vcpkg` or via a common `.props` file imported between `Microsoft.Cpp.props` and +`Microsoft.Cpp.targets`. #### `VcpkgEnabled` (Use Vcpkg) @@ -495,7 +507,7 @@ vcpkg.json files will be ignored. This will default to true in the future. This property can be set to "false" to disable automatic dependency restoration on project build. Dependencies can be manually restored via the vcpkg command line. -#### `VcpkgInstalledDirectory` (Installed Directory) +#### `VcpkgInstalledDir` (Installed Directory) This property defines the location where headers and binaries are consumed from. In manifest mode, this directory is created and populated based on your manifest. diff --git a/scripts/buildsystems/msbuild/vcpkg.props b/scripts/buildsystems/msbuild/vcpkg.props index 788ba107b53d69..9a01beb5ade60f 100644 --- a/scripts/buildsystems/msbuild/vcpkg.props +++ b/scripts/buildsystems/msbuild/vcpkg.props @@ -1,34 +1,21 @@ - - - - windows - uwp - - - - - $(Platform) - x86 - - true true $(Configuration) false - $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), '..\..\..')) + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..')) true false + true false true $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) - diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 7653c4e91f58a2..98fde24f126348 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -1,53 +1,91 @@ - + - - - - $([System.IO.Path]::Combine($(VcpkgRoot), 'scripts\buildsystems\msbuild\vcpkg-general.xml')) - - - - - - -static - $(VcpkgPlatformTarget)-$(VcpkgOSTarget)$(VcpkgLinkage) + - $([System.IO.Path]::Combine($(VcpkgRoot), 'installed')) - $([System.IO.Path]::Combine($(VcpkgManifestRoot), 'vcpkg_installed')) - $(VcpkgInstalledDir)\ + + <_ZVcpkgRoot>$(VcpkgRoot) + <_ZVcpkgManifestRoot>$(VcpkgManifestRoot) + <_ZVcpkgInstalledDir>$(VcpkgInstalledDir) + - <_ZVcpkgCurrentInstalledDir>$([System.IO.Path]::Combine($(VcpkgInstalledDir), $(VcpkgTriplet))) - <_ZVcpkgCurrentInstalledDir Condition="!$(_ZVcpkgCurrentInstalledDir.EndsWith('\'))">$(_ZVcpkgCurrentInstalledDir)\ + + + <_ZVcpkgRoot Condition="!$(_ZVcpkgRoot.EndsWith('\'))">$(_ZVcpkgRoot)\ + <_ZVcpkgManifestRoot Condition="'$(_ZVcpkgManifestRoot)' != '' and !$(_ZVcpkgManifestRoot.EndsWith('\'))">$(_ZVcpkgManifestRoot)\ + <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' != '' and !$(_ZVcpkgInstalledDir.EndsWith('\'))">$(_ZVcpkgInstalledDir)\ + - Debug - Release + + + windows + uwp + - debug\ - true + + $(Platform) + x86 + - <_ZVcpkgHostTripletParameter Condition="'$(VcpkgHostTriplet)' != ''">"--host-triplet=$(VcpkgHostTriplet)" - <_ZVcpkgExecutable>$([System.IO.Path]::Combine($(VcpkgRoot), 'vcpkg.exe')) + + <_ZVcpkgLinkage /> + <_ZVcpkgLinkage Condition="'$(VcpkgUseStatic)' == 'true'">-static + $(VcpkgPlatformTarget)-$(VcpkgOSTarget)$(_ZVcpkgLinkage) + + + VcpkgTriplet=$(VcpkgTriplet):$(ProjectStateLine) - - + + + + + <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgManifestRoot)vcpkg_installed\$(VcpkgTriplet)\ + + + + + <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgRoot)installed\ + + + + + + <_ZVcpkgCurrentInstalledDir>$(_ZVcpkgInstalledDir)\$(VcpkgTriplet)\ + <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Debug'))">Debug + <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release + + <_ZVcpkgConfigSubdir Condition="'$(_ZVcpkgNormalizedConfiguration)' == 'Debug'">debug\ + <_ZVcpkgExecutable>$(_ZVcpkgRoot)vcpkg.exe + + + + + $(_ZVcpkgRoot)scripts\buildsystems\msbuild\vcpkg-general.xml + + + Project + - %(AdditionalDependencies);$(_ZVcpkgCurrentInstalledDir)$(VcpkgConfigSubdir)lib\*.lib - %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(VcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(VcpkgConfigSubdir)lib\manual-link + %(AdditionalDependencies);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\*.lib + %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link %(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include @@ -59,9 +97,9 @@ - + Condition="'$(VcpkgEnableManifest)' == 'true' and '$(_ZVcpkgManifestRoot)' == ''" /> + @@ -70,41 +108,52 @@ + Importance="High" Condition="'$(VcpkgEnabled)' == 'true' and '$(_ZVcpkgNormalizedConfiguration)' == ''"/> - - <_ZVcpkgManifestFileLocation>$(VcpkgManifestRoot)vcpkg.json - <_ZVcpkgConfigurationFileLocation>$(VcpkgManifestRoot)vcpkg-configuration.json - - <_ZVcpkgTLogFileLocation>$(TLogLocation)VcpkgInstallManifest$(VcpkgTriplet).$(VcpkgHostTriplet).read.1u.tlog - <_ZVcpkgMSBuildStampFile>$(VcpkgInstalledDir).msbuildstamp-$(VcpkgTriplet).$(VcpkgHostTriplet).stamp + + + + <_ZVcpkgHostTripletParameter>"--host-triplet=$(VcpkgHostTriplet)" + <_ZVcpkgHostTripletSuffix>$(VcpkgHostTriplet). + + + + + <_ZVcpkgHostTripletParameter /> + <_ZVcpkgHostTripletSuffix /> + + + + + + <_ZVcpkgManifestFileLocation>$(_ZVcpkgManifestRoot)vcpkg.json + <_ZVcpkgConfigurationFileLocation>$(_ZVcpkgManifestRoot)vcpkg-configuration.json + <_ZVcpkgMSBuildStampFile>$(_ZVcpkgInstalledDir).msbuildstamp-$(VcpkgTriplet).$(_ZVcpkgHostTripletSuffix)stamp + <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgManifestFileLocation)"/> <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgConfigurationFileLocation)" Condition="Exists('$(_ZVcpkgConfigurationFileLocation)')"/> - - <_ZVcpkgInstallManifestDependenciesOutputs Include="$(_ZVcpkgTLogFileLocation)"/> - <_ZVcpkgInstallManifestDependenciesOutputs Include="$(_ZVcpkgMSBuildStampFile)"/> - - - - <_ZVcpkgItemToDelete Include="$(TLogLocation)VcpkgInstallManifest*.read.1u.tlog" /> - <_ZVcpkgItemToDelete Include="$(VcpkgInstalledDir).msbuildstamp-*" /> - - - + + + <_ZVcpkgTLogFileLocation>$(TLogLocation)VcpkgInstallManifest$(VcpkgTriplet).$(_ZVcpkgHostTripletSuffix)read.1u.tlog + + + + + - @@ -118,40 +167,40 @@ Condition="'$(VcpkgEnabled)' == 'true' and '$(VcpkgApplocalDeps)' == 'true' and '$(LinkSkippedExecution)' != 'true'"> - <_VcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgCurrentInstalledDir)$(VcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log" + <_ZVcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log" + PropertyName="_ZVcpkgAppLocalExitCode" /> + Condition="$(_ZVcpkgAppLocalExitCode) == 9009" /> + Condition="$(_ZVcpkgAppLocalExitCode) == 9009"> + PropertyName="_ZVcpkgAppLocalExitCode" /> - + + Condition="$(_ZVcpkgAppLocalExitCode) == 0"> - - + + From df4704676914eae8bbc86d91ddd75df8f517b61f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 2 Sep 2021 12:53:12 -0700 Subject: [PATCH 0414/1858] [qt5-activeqt, qt5-declarative] Skip activeqt in CI. (#19945) See https://github.com/microsoft/vcpkg/issues/19922 --- scripts/ci.baseline.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dec70ed3b734ba..0affebdd8e1bed 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1293,6 +1293,14 @@ qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail +# Conflicts with qt5-declarative, see https://github.com/microsoft/vcpkg/issues/19922 +qt5-activeqt:arm-uwp=skip +qt5-activeqt:arm64-windows=skip +qt5-activeqt:x64-uwp=skip +qt5-activeqt:x64-windows-static-md=skip +qt5-activeqt:x64-windows-static=skip +qt5-activeqt:x64-windows=skip +qt5-activeqt:x86-windows=skip quickfix:arm-uwp=fail quickfix:arm64-windows=fail quickfix:x64-uwp=fail From d9223a22930d36e695e2a899f00522c8beb03c2e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 2 Sep 2021 13:09:42 -0700 Subject: [PATCH 0415/1858] Apply @workpadwan 's fix to bootstrap.sh on non-bash systems. (#19911) --- scripts/bootstrap.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index a7d1b1650c1446..3e07762725cce7 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -165,10 +165,11 @@ fetchTool() xmlFileAsString=`cat "$vcpkgRootDir/scripts/vcpkgTools.xml"` toolRegexStart="" toolData="$(extractStringBetweenDelimiters "$xmlFileAsString" "$toolRegexStart" "")" - if [ "$toolData" = "" ] || [[ "$toolData" == "" "")" From 7f1afd3cd8e613ecdb6b0f12decab673bbf77c51 Mon Sep 17 00:00:00 2001 From: sslivins Date: Thu, 2 Sep 2021 13:11:17 -0700 Subject: [PATCH 0416/1858] [libvpx] Add realtime and highbitdepth features. (#19532) * added features for vpx to enable realtime, highbitdepth and pic * output of vcpkg format-manifest * added port version * ran format-manifest again * changed to port version 1 as implicit version is 0 * added updated version files * removed pic feature and instead set --enable-pic as default option * updated version database Co-authored-by: Billy Robert O'Neal III --- ports/libvpx/portfile.cmake | 24 ++++++++++++++++++++---- ports/libvpx/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/l-/libvpx.json | 5 +++++ 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 2448cc6fb48a36..10ce04878d14f4 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -70,6 +70,16 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(LIBVPX_TARGET_VS "vs15") endif() + set(OPTIONS "--disable-examples --disable-tools --disable-docs --enable-pic") + + if("realtime" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-realtime-only") + endif() + + if("highbitdepth" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth") + endif() + message(STATUS "Generating makefile") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_execute_required_process( @@ -78,9 +88,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) "${SOURCE_PATH}/configure" --target=${LIBVPX_TARGET_ARCH}-${LIBVPX_TARGET_VS} ${LIBVPX_CRT_LINKAGE} - --disable-examples - --disable-tools - --disable-docs + ${OPTIONS} --as=nasm WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}" LOGNAME configure-${TARGET_TRIPLET}) @@ -143,7 +151,7 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) else() - set(OPTIONS "--disable-examples --disable-tools --disable-docs --disable-unit-tests") + set(OPTIONS "--disable-examples --disable-tools --disable-docs --disable-unit-tests --enable-pic") set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug") set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}") @@ -154,6 +162,14 @@ else() set(OPTIONS "${OPTIONS} --enable-static --disable-shared") endif() + if("realtime" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-realtime-only") + endif() + + if("highbitdepth" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-vp9-highbitdepth") + endif() + if(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(LIBVPX_TARGET_ARCH "x86") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) diff --git a/ports/libvpx/vcpkg.json b/ports/libvpx/vcpkg.json index ced530f21be6bc..c002bdddff5235 100644 --- a/ports/libvpx/vcpkg.json +++ b/ports/libvpx/vcpkg.json @@ -1,7 +1,15 @@ { "name": "libvpx", "version-semver": "1.10.0", - "port-version": 1, + "port-version": 2, "description": "The reference software implementation for the video coding formats VP8 and VP9.", - "homepage": "https://github.com/webmproject/libvpx" + "homepage": "https://github.com/webmproject/libvpx", + "features": { + "highbitdepth": { + "description": "use VP9 high bit depth (10/12) profiles" + }, + "realtime": { + "description": "enable this option while building for real-time encoding" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 2233413efcacc4..e333a3c349fb71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3782,7 +3782,7 @@ }, "libvpx": { "baseline": "1.10.0", - "port-version": 1 + "port-version": 2 }, "libwandio": { "baseline": "4.2.1", diff --git a/versions/l-/libvpx.json b/versions/l-/libvpx.json index e4aa292edba280..68e6537962276b 100644 --- a/versions/l-/libvpx.json +++ b/versions/l-/libvpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79a7e2cf4e6df063990dc59d1aa221150eb0ce0e", + "version-semver": "1.10.0", + "port-version": 2 + }, { "git-tree": "55be5e09000631b1dacd6f86d174eb2cade91bf5", "version-semver": "1.10.0", From ca3a025402b1754deafc57893cbca5d807d3a7f8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 2 Sep 2021 22:21:52 +0200 Subject: [PATCH 0417/1858] Fix target_link_libraries on repeated inclusion of wrappers (#19120) * Fix repeated inclusion of wrappers * x-add-version --- ports/exiv2/vcpkg-cmake-wrapper.cmake | 2 +- ports/exiv2/vcpkg.json | 2 +- ports/gdal/vcpkg-cmake-wrapper.cmake | 2 +- ports/gdal/vcpkg.json | 2 +- ports/libarchive/vcpkg-cmake-wrapper.cmake.in | 14 +++++++------- ports/libarchive/vcpkg.json | 2 +- ports/libiconv/CONTROL | 5 ----- ports/libiconv/vcpkg.json | 7 +++++++ ports/libuv/CONTROL | 4 ---- ports/libuv/vcpkg-cmake-wrapper.cmake | 4 ++-- ports/libuv/vcpkg.json | 7 +++++++ ports/libxml2/vcpkg-cmake-wrapper.cmake | 8 ++++---- ports/libxml2/vcpkg.json | 2 +- versions/baseline.json | 12 ++++++------ versions/e-/exiv2.json | 5 +++++ versions/g-/gdal.json | 5 +++++ versions/l-/libarchive.json | 5 +++++ versions/l-/libiconv.json | 5 +++++ versions/l-/libuv.json | 5 +++++ versions/l-/libxml2.json | 5 +++++ 20 files changed, 69 insertions(+), 34 deletions(-) delete mode 100644 ports/libiconv/CONTROL create mode 100644 ports/libiconv/vcpkg.json delete mode 100644 ports/libuv/CONTROL create mode 100644 ports/libuv/vcpkg.json diff --git a/ports/exiv2/vcpkg-cmake-wrapper.cmake b/ports/exiv2/vcpkg-cmake-wrapper.cmake index 354a7909cdafa6..62f4ecca347b39 100644 --- a/ports/exiv2/vcpkg-cmake-wrapper.cmake +++ b/ports/exiv2/vcpkg-cmake-wrapper.cmake @@ -10,7 +10,7 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") Iconv::Iconv ) if(@EXIV2_ENABLE_NLS@) - target_link_libraries(exiv2lib INTERFACE ${Intl_LIBRARIES}) + set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${Intl_LIBRARIES}) endif() endif() endif() diff --git a/ports/exiv2/vcpkg.json b/ports/exiv2/vcpkg.json index a043f83bfefe54..5ed357690aab2e 100644 --- a/ports/exiv2/vcpkg.json +++ b/ports/exiv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "exiv2", "version": "0.27.4", - "port-version": 1, + "port-version": 2, "description": "Image metadata library and tools", "homepage": "https://www.exiv2.org", "supports": "!uwp", diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index f6241e25939f20..77e48eb4ad90e7 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -56,7 +56,7 @@ function(_gdal_add_dependency target package) endif() if(dependency) if(TARGET GDAL::GDAL) # CMake 3.14 - target_link_libraries(GDAL::GDAL INTERFACE ${dependency}) + set_property(TARGET GDAL::GDAL APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${dependency}) endif() if(NOT GDAL_LIBRARIES STREQUAL "GDAL::GDAL") set(GDAL_LIBRARIES "${GDAL_LIBRARIES};${dependency}" PARENT_SCOPE) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 8ef4de49b4de55..2bb7b63b114c34 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 3, + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in index e0712d3e2aa546..81cc39e39b30b3 100644 --- a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in +++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in @@ -65,19 +65,19 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(TARGET LibArchive::LibArchive) if(@ENABLE_BZip2@) - target_link_libraries(LibArchive::LibArchive INTERFACE BZip2::BZip2) + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) endif() if(@ENABLE_ZLIB@) - target_link_libraries(LibArchive::LibArchive INTERFACE ZLIB::ZLIB) + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) endif() if(@ENABLE_LIBXML2@) - target_link_libraries(LibArchive::LibArchive INTERFACE LibXml2::LibXml2) + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibXml2::LibXml2) endif() if(@ENABLE_LZ4@) - target_link_libraries(LibArchive::LibArchive INTERFACE lz4::lz4) + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES lz4::lz4) endif() if(@ENABLE_LZMA@) - target_link_libraries(LibArchive::LibArchive INTERFACE LibLZMA::LibLZMA) + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA) endif() if(@ENABLE_LZO@) if(LZO_LIBRARY_RELEASE) @@ -89,10 +89,10 @@ if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib}) endif() if(@ENABLE_ZSTD@) - target_link_libraries(LibArchive::LibArchive INTERFACE zstd::libzstd_static) + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES zstd::libzstd_static) endif() if(@ENABLE_OPENSSL@) - target_link_libraries(LibArchive::LibArchive INTERFACE OpenSSL::Crypto) + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::Crypto) endif() endif() endif() diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 3d95284a4887d8..53650dc2d8fe20 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libarchive", "version-semver": "3.4.3", - "port-version": 7, + "port-version": 8, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "supports": "!uwp", diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL deleted file mode 100644 index 2e69c031b37ea7..00000000000000 --- a/ports/libiconv/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libiconv -Version: 1.16 -Port-Version: 10 -Homepage: https://www.gnu.org/software/libiconv/ -Description: GNU Unicode text conversion diff --git a/ports/libiconv/vcpkg.json b/ports/libiconv/vcpkg.json new file mode 100644 index 00000000000000..2cafb021836a0a --- /dev/null +++ b/ports/libiconv/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libiconv", + "version": "1.16", + "port-version": 11, + "description": "GNU Unicode text conversion", + "homepage": "https://www.gnu.org/software/libiconv/" +} diff --git a/ports/libuv/CONTROL b/ports/libuv/CONTROL deleted file mode 100644 index 27938a4ad07b3a..00000000000000 --- a/ports/libuv/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libuv -Version: 1.41.0 -Homepage: https://github.com/libuv/libuv -Description: libuv is a multi-platform support library with a focus on asynchronous I/O. diff --git a/ports/libuv/vcpkg-cmake-wrapper.cmake b/ports/libuv/vcpkg-cmake-wrapper.cmake index 10b6e649838a58..d95350a6d4c7b9 100644 --- a/ports/libuv/vcpkg-cmake-wrapper.cmake +++ b/ports/libuv/vcpkg-cmake-wrapper.cmake @@ -3,14 +3,14 @@ _find_package(${ARGS}) if(WIN32) list(APPEND LibUV_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) if(TARGET LibUV::LibUV) - target_link_libraries(LibUV::LibUV INTERFACE iphlpapi psapi shell32 userenv ws2_32) + set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES iphlpapi psapi shell32 userenv ws2_32) endif() endif() include(CMakeFindDependencyMacro) find_dependency(Threads) list(APPEND LibUV_LIBRARIES Threads::Threads) if(TARGET LibUV::LibUV) - target_link_libraries(LibUV::LibUV INTERFACE Threads::Threads) + set_property(TARGET LibUV::LibUV APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads) endif() diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json new file mode 100644 index 00000000000000..d43b82c54e8629 --- /dev/null +++ b/ports/libuv/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libuv", + "version": "1.41.0", + "port-version": 1, + "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", + "homepage": "https://github.com/libuv/libuv" +} diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake index 9287c37e630bce..f80be639addbc8 100644 --- a/ports/libxml2/vcpkg-cmake-wrapper.cmake +++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake @@ -31,18 +31,18 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0 if(CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBXML2_LIBRARIES m) if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE "m") + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "m") endif() elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") list(APPEND LIBXML2_LIBRARIES ws2_32) if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE "ws2_32") + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "ws2_32") endif() endif() if(TARGET LibXml2::LibXml2) - target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB") + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "liblzma::liblzma" "ZLIB::ZLIB") if(TARGET Iconv::Iconv) - target_link_libraries(LibXml2::LibXml2 INTERFACE "Iconv::Iconv") + set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Iconv::Iconv") endif() endif() cmake_policy(POP) diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json index 228b43572206ce..68cb1e3eb4da44 100644 --- a/ports/libxml2/vcpkg.json +++ b/ports/libxml2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libxml2", "version-semver": "2.9.12", - "port-version": 3, + "port-version": 4, "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).", "homepage": "https://xmlsoft.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e333a3c349fb71..3240c763101d76 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1926,7 +1926,7 @@ }, "exiv2": { "baseline": "0.27.4", - "port-version": 1 + "port-version": 2 }, "expat": { "baseline": "2.4.1", @@ -2238,7 +2238,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 3 + "port-version": 4 }, "gdcm": { "baseline": "3.0.7", @@ -3086,7 +3086,7 @@ }, "libarchive": { "baseline": "3.4.3", - "port-version": 7 + "port-version": 8 }, "libass": { "baseline": "0.15.1", @@ -3306,7 +3306,7 @@ }, "libiconv": { "baseline": "1.16", - "port-version": 10 + "port-version": 11 }, "libics": { "baseline": "1.6.5", @@ -3766,7 +3766,7 @@ }, "libuv": { "baseline": "1.41.0", - "port-version": 0 + "port-version": 1 }, "libuvc": { "baseline": "2020-11-24", @@ -3810,7 +3810,7 @@ }, "libxml2": { "baseline": "2.9.12", - "port-version": 3 + "port-version": 4 }, "libxmlmm": { "baseline": "0.6.0", diff --git a/versions/e-/exiv2.json b/versions/e-/exiv2.json index 5673a816d02653..b98e6e654c75c5 100644 --- a/versions/e-/exiv2.json +++ b/versions/e-/exiv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ce7841080b34ab8f91006430e9a40e0d9bfba96", + "version": "0.27.4", + "port-version": 2 + }, { "git-tree": "1e93f266421999dd82b931b2dbf672d255b14b43", "version": "0.27.4", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index d6da35027c5dc3..762f3061eeb770 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b87df6a4a70bb9afb31992195a8ccc6e04d59663", + "version-semver": "3.2.2", + "port-version": 4 + }, { "git-tree": "5bb72450f69322e39e09bea191e5c947833e698d", "version-semver": "3.2.2", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index 97dcae3bdf0569..689a49eec5fb17 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "576d8d60f06c8b4c616fd55559f3da94b9a8ae27", + "version-semver": "3.4.3", + "port-version": 8 + }, { "git-tree": "3c9f2bae07e5615f25bfc8326b1b85686953e918", "version-semver": "3.4.3", diff --git a/versions/l-/libiconv.json b/versions/l-/libiconv.json index 63631614f331b5..9423b2719d2fcf 100644 --- a/versions/l-/libiconv.json +++ b/versions/l-/libiconv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f82980bff6c23bcccd043300679ebf8afa3e0a22", + "version": "1.16", + "port-version": 11 + }, { "git-tree": "59948ca7f6b4427c2ea93be7a1558843cdd8cde3", "version-string": "1.16", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 673b06bea8c896..011e4609c2b0e9 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42fa2a97059c54e5c2374a9762a7060d85a1091b", + "version": "1.41.0", + "port-version": 1 + }, { "git-tree": "25ef9957bffba1e73f3dd857f8dc27148ec6f84f", "version-string": "1.41.0", diff --git a/versions/l-/libxml2.json b/versions/l-/libxml2.json index 455ba947736e3c..5645cd5645cac3 100644 --- a/versions/l-/libxml2.json +++ b/versions/l-/libxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5cb8ed61786fdd081204880cd02d9376b17130eb", + "version-semver": "2.9.12", + "port-version": 4 + }, { "git-tree": "091644d055f6ab14ab96001c90418be9f5c4d6e3", "version-semver": "2.9.12", From 54963f7f4c8cbcec5c52ba22a5a7310ef01e226f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 2 Sep 2021 22:23:35 +0200 Subject: [PATCH 0418/1858] [portmidi] add osx support (#19366) * [portmidi] add osx support * [portmidi] replace CONTROL with vcpkg.json * [portmidi] Introduce "port-version": 1 * [portmidi] quote all path strings * [portmidi] update version database * [portmidi] make use of ${PORT} Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/portmidi/CONTROL | 5 ---- ports/portmidi/portfile.cmake | 45 +++++++++++++++++++++++++---------- ports/portmidi/vcpkg.json | 8 +++++++ versions/baseline.json | 2 +- versions/p-/portmidi.json | 5 ++++ 5 files changed, 46 insertions(+), 19 deletions(-) delete mode 100644 ports/portmidi/CONTROL create mode 100644 ports/portmidi/vcpkg.json diff --git a/ports/portmidi/CONTROL b/ports/portmidi/CONTROL deleted file mode 100644 index 9f9f60c365d6a3..00000000000000 --- a/ports/portmidi/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: portmidi -Version: 0.234 -Homepage: https://sourceforge.net/projects/portmedia/ -Description: Free, cross-platform, open-source I/O library for MIDI -Supports: windows&!uwp&!arm diff --git a/ports/portmidi/portfile.cmake b/ports/portmidi/portfile.cmake index a2049278bf6c9e..5fc9d62e39cbd0 100644 --- a/ports/portmidi/portfile.cmake +++ b/ports/portmidi/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "linux" "osx" "uwp" ON_ARCH "arm") +vcpkg_fail_port_install(ON_TARGET "linux" "uwp" ON_ARCH "arm") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -10,13 +10,19 @@ vcpkg_from_sourceforge( # Alter path to main portmidi root set(SOURCE_PATH "${SOURCE_PATH}/portmidi/trunk") -# Mark portmidi-static as static, disable pmjni library depending on the Java SDK +file(READ "${SOURCE_PATH}/CMakeLists.txt" PM_CMAKE) +string(REPLACE + "set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING \"change to needed architecture for a smaller library\" FORCE)" + "# Removed preconfigured CMAKE_OSX_ARCHITECTURES" PM_CMAKE "${PM_CMAKE}") +file(WRITE "${SOURCE_PATH}/CMakeLists.txt" "${PM_CMAKE}") +# Mark portmidi-static as static, disable pmjni library depending on the Java SDK file(READ "${SOURCE_PATH}/pm_common/CMakeLists.txt" PM_CMAKE) string(REPLACE "add_library(portmidi-static \${LIBSRC})" "add_library(portmidi-static STATIC \${LIBSRC})" PM_CMAKE "${PM_CMAKE}") string(REPLACE "add_library(pmjni SHARED \${JNISRC})" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") string(REPLACE "target_link_libraries(pmjni \${JNI_EXTRA_LIBS})" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") string(REPLACE "set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION \"jnilib\")" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") +string(REPLACE "INSTALL(TARGETS portmidi-static pmjni" "INSTALL(TARGETS portmidi-static" PM_CMAKE "${PM_CMAKE}") file(WRITE "${SOURCE_PATH}/pm_common/CMakeLists.txt" "${PM_CMAKE}") # Run cmake configure step @@ -26,22 +32,35 @@ vcpkg_configure_cmake( -DJAVA_INCLUDE_PATH= -DJAVA_INCLUDE_PATH2= -DJAVA_JVM_LIBRARY= + -DCMAKE_CACHEFILE_DIR=.. ) # Run cmake build step, nothing is installed on Windows vcpkg_build_cmake() -file(INSTALL ${SOURCE_PATH}/pm_common/portmidi.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/porttime/porttime.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/pm_common/portmidi.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/porttime/porttime.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi_s.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi_s.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi_s.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi_s.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() else() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi_s.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi_s.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() +endif() -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/portmidi RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/portmidi/vcpkg.json b/ports/portmidi/vcpkg.json new file mode 100644 index 00000000000000..5d95f2ef974be4 --- /dev/null +++ b/ports/portmidi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "portmidi", + "version-string": "0.234", + "port-version": 1, + "description": "Free, cross-platform, open-source I/O library for MIDI", + "homepage": "https://sourceforge.net/projects/portmedia/", + "supports": "windows & osx & !uwp & !arm" +} diff --git a/versions/baseline.json b/versions/baseline.json index 3240c763101d76..9bd4e2e4cf14b5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5078,7 +5078,7 @@ }, "portmidi": { "baseline": "0.234", - "port-version": 0 + "port-version": 1 }, "portsmf": { "baseline": "0.238", diff --git a/versions/p-/portmidi.json b/versions/p-/portmidi.json index 240a39a25d77a6..5e1b3dd93a498a 100644 --- a/versions/p-/portmidi.json +++ b/versions/p-/portmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74273108463488d1c268248429a06de79521506b", + "version-string": "0.234", + "port-version": 1 + }, { "git-tree": "16f079de23d02226d49bd22659392d85e568528e", "version-string": "0.234", From 83b634b87dc87b3948a05b0f84567963624dd8be Mon Sep 17 00:00:00 2001 From: Jonathan Hale Date: Thu, 2 Sep 2021 22:24:33 +0200 Subject: [PATCH 0419/1858] [corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435) * [magnum/-plugins] Remove obsolete patches that no longer apply Signed-off-by: Squareys * [corrade] Make feature to flag translation consistent to fix warning Consistent with magnum & magnum-plugins Signed-off-by: Squareys * Fix warning message for dlls without matching pdbs always displayed Signed-off-by: Squareys * Fix the baseline version * Revert the changes in vcpkg_copy_pdbs.cmake Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/corrade/portfile.cmake | 16 ++++++-------- ports/corrade/vcpkg.json | 2 +- ports/magnum-plugins/001-tools-path.patch | 26 ----------------------- ports/magnum-plugins/CONTROL | 2 +- ports/magnum-plugins/portfile.cmake | 1 - ports/magnum/001-tools-path.patch | 26 ----------------------- ports/magnum/CONTROL | 2 +- ports/magnum/portfile.cmake | 1 - versions/baseline.json | 6 +++--- versions/c-/corrade.json | 5 +++++ versions/m-/magnum-plugins.json | 5 +++++ versions/m-/magnum.json | 5 +++++ 12 files changed, 28 insertions(+), 69 deletions(-) delete mode 100644 ports/magnum-plugins/001-tools-path.patch delete mode 100644 ports/magnum/001-tools-path.patch diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 06615bf11bfb3d..187374a6de1999 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -10,28 +10,27 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) # Handle features -set(_COMPONENT_FLAGS "") +set(_COMPONENTS "") foreach(_feature IN LISTS ALL_FEATURES) # Uppercase the feature name and replace "-" with "_" string(TOUPPER "${_feature}" _FEATURE) string(REPLACE "-" "_" _FEATURE "${_FEATURE}") - # Turn "-DWITH_*=" ON or OFF depending on whether the feature - # is in the list. - if(_feature IN_LIST FEATURES) - list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=ON") - else() - list(APPEND _COMPONENT_FLAGS "-DWITH_${_FEATURE}=OFF") + # Final feature is empty, ignore it + if(_feature) + list(APPEND _COMPONENTS ${_feature} WITH_${_FEATURE}) endif() endforeach() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS + ${FEATURE_OPTIONS} -DUTILITY_USE_ANSI_COLORS=ON -DBUILD_STATIC=${BUILD_STATIC} - ${_COMPONENT_FLAGS} ) vcpkg_install_cmake() @@ -68,5 +67,4 @@ file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - vcpkg_copy_pdbs() diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index 3f738261d901eb..83940abbc521ca 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 1, + "port-version": 2, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "default-features": [ diff --git a/ports/magnum-plugins/001-tools-path.patch b/ports/magnum-plugins/001-tools-path.patch deleted file mode 100644 index 18a351c2ea06a5..00000000000000 --- a/ports/magnum-plugins/001-tools-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake -index e63bc03..052006f 100644 ---- a/modules/FindCorrade.cmake -+++ b/modules/FindCorrade.cmake -@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS}) - if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS}) - add_executable(Corrade::${_component} IMPORTED) - -- find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component}) -+ find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade) - mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE) - - if(CORRADE_${_COMPONENT}_EXECUTABLE) -diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake -index 8df555d..12f7aa4 100644 ---- a/modules/FindMagnum.cmake -+++ b/modules/FindMagnum.cmake -@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) - if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS}) - add_executable(Magnum::${_component} IMPORTED) - -- find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component}) -+ find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum) - mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE) - - if(MAGNUM_${_COMPONENT}_EXECUTABLE) diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL index bbec383e9118db..09eaab78268770 100644 --- a/ports/magnum-plugins/CONTROL +++ b/ports/magnum-plugins/CONTROL @@ -1,6 +1,6 @@ Source: magnum-plugins Version: 2020.06 -Port-Version: 5 +Port-Version: 6 Build-Depends: magnum[core] Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index f1c27750eb0941..b3ed961df89687 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -5,7 +5,6 @@ vcpkg_from_github( SHA512 3c11c2928bfc9d04c1ad64f72b6ffac6cf80a1ef3aacc5d0486b9ad955cf4f6ea6d5dcb3846dc5d73f64ec522a015eafb997f62c79ad7ff91169702341f23af0 HEAD_REF master PATCHES - 001-tools-path.patch 002-fix-stb-conflict.patch ) diff --git a/ports/magnum/001-tools-path.patch b/ports/magnum/001-tools-path.patch deleted file mode 100644 index 18a351c2ea06a5..00000000000000 --- a/ports/magnum/001-tools-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/modules/FindCorrade.cmake b/modules/FindCorrade.cmake -index e63bc03..052006f 100644 ---- a/modules/FindCorrade.cmake -+++ b/modules/FindCorrade.cmake -@@ -397,7 +397,7 @@ foreach(_component ${Corrade_FIND_COMPONENTS}) - if(_component MATCHES ${_CORRADE_EXECUTABLE_COMPONENTS}) - add_executable(Corrade::${_component} IMPORTED) - -- find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component}) -+ find_program(CORRADE_${_COMPONENT}_EXECUTABLE corrade-${_component} PATH_SUFFIXES corrade) - mark_as_advanced(CORRADE_${_COMPONENT}_EXECUTABLE) - - if(CORRADE_${_COMPONENT}_EXECUTABLE) -diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake -index 8df555d..12f7aa4 100644 ---- a/modules/FindMagnum.cmake -+++ b/modules/FindMagnum.cmake -@@ -493,7 +493,7 @@ foreach(_component ${Magnum_FIND_COMPONENTS}) - if(_component MATCHES ${_MAGNUM_EXECUTABLE_COMPONENTS}) - add_executable(Magnum::${_component} IMPORTED) - -- find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component}) -+ find_program(MAGNUM_${_COMPONENT}_EXECUTABLE magnum-${_component} PATH_SUFFIXES magnum) - mark_as_advanced(MAGNUM_${_COMPONENT}_EXECUTABLE) - - if(MAGNUM_${_COMPONENT}_EXECUTABLE) diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL index b595fa45c15033..1383eb1f8a8970 100644 --- a/ports/magnum/CONTROL +++ b/ports/magnum/CONTROL @@ -1,6 +1,6 @@ Source: magnum Version: 2020.06 -Port-Version: 5 +Port-Version: 6 Build-Depends: corrade[utility] Description: C++11/C++14 graphics middleware for games and data visualization Homepage: https://magnum.graphics/ diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake index e4144595edb008..d060c4b9a7fb71 100644 --- a/ports/magnum/portfile.cmake +++ b/ports/magnum/portfile.cmake @@ -5,7 +5,6 @@ vcpkg_from_github( SHA512 65b0c8a4520d1d282420c30ecd7c8525525d4dbb6e562e1e2e93d110f4eb686af43f098bf02460727fab1e1f9446dd00a99051e150c05ea40b1486a44fea1042 HEAD_REF master PATCHES - 001-tools-path.patch 002-sdl-includes.patch ) diff --git a/versions/baseline.json b/versions/baseline.json index 9bd4e2e4cf14b5..44f2f5921f0d50 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1406,7 +1406,7 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 1 + "port-version": 2 }, "cpp-base64": { "baseline": "V2.rc.08", @@ -3966,7 +3966,7 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 5 + "port-version": 6 }, "magnum-extras": { "baseline": "2020.06", @@ -3978,7 +3978,7 @@ }, "magnum-plugins": { "baseline": "2020.06", - "port-version": 5 + "port-version": 6 }, "mailio": { "baseline": "0.20.0", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index e0f2e29f79d369..08452c7336027b 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec9f53411152ed98e9d591afed7e34e65fb7abeb", + "version-string": "2020.06", + "port-version": 2 + }, { "git-tree": "12cd1f62edbe4e05de794c862facfdfd0fe8171d", "version-string": "2020.06", diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json index 84b2d06f13af1e..c506406ff6fd97 100644 --- a/versions/m-/magnum-plugins.json +++ b/versions/m-/magnum-plugins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3aedbba0e9e694651549ff34fba8d6eeeb3fdde6", + "version-string": "2020.06", + "port-version": 6 + }, { "git-tree": "457d2fb07dd06abe61d8bdee77bc5dc1ff9391a5", "version-string": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index 6103787d6c9aba..006dae3e1f3546 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f420e42c1b841b4f3b2f2cda488a35f68b0677d7", + "version-string": "2020.06", + "port-version": 6 + }, { "git-tree": "cb97c301133d04f205cb1547e5559341474f842e", "version-string": "2020.06", From 4be8ee1d70c03794eafb494dd38b2330ba2337c5 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 3 Sep 2021 04:25:35 +0800 Subject: [PATCH 0420/1858] [qtbase] Download submodules over https instead of plain git protocol (#19844) --- ports/qtbase/cmake/qt_install_submodule.cmake | 2 +- ports/qtbase/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 13ec84b847f770..41f82d169d4561 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -37,7 +37,7 @@ function(qt_install_submodule) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - URL git://code.qt.io/qt/${PORT}.git + URL https://code.qt.io/qt/${PORT}.git TAG ${${PORT}_TAG} REF ${${PORT}_REF} ${UPDATE_PORT_GIT_OPTIONS} diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 4f1ba221496c08..55401d71a0c836 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version-semver": "6.1.2", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 44f2f5921f0d50..e1b0db0c7d6ffe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5394,7 +5394,7 @@ }, "qtbase": { "baseline": "6.1.2", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.1.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 784fc5be001804..19399498927912 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed0018dce35e4246be83589358400a7617a8933f", + "version-semver": "6.1.2", + "port-version": 1 + }, { "git-tree": "953b2fbc4ecc9e3ec83df47f2470d078f21758bd", "version-semver": "6.1.2", From a43e25ff5a9b9699c1b9a5946e4d08b67724202d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 3 Sep 2021 04:27:36 +0800 Subject: [PATCH 0421/1858] [asio] update to 1.19.2 (#19846) * [asio] update to 1.19.2 * update version --- ports/asio/portfile.cmake | 23 +++++++++++------------ ports/asio/vcpkg.json | 12 +++++++++++- versions/a-/asio.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index d5f65149acdd39..c3c2a22e50a167 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-18-2 - SHA512 5a2312f1a14106e3109a9f02e8ac65a1d639b411834f0aa301767a4dd30d8384f6f1a94034b6016ef989c7d7880fd4c8de11c7be0cb58b4dc64a49ec335a7113 + REF asio-1-19-2 + SHA512 a6d1c5534fef0fe5ac549e1bd20919d180fbfe4c146be40ec6ebfa862534b8551778b0e79a5ba822ed645535e010646909f02f9e1d1f385ed758f07f57351ea8 HEAD_REF master ) @@ -12,19 +12,18 @@ vcpkg_from_github( vcpkg_replace_string("${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)") # CMake install -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH "share/asio") +vcpkg_cmake_config_fixup() file(INSTALL - ${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(INSTALL ${SOURCE_PATH}/asio/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/asio/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 5f285c16fa15a0..380eaea25da977 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,9 +1,19 @@ { "name": "asio", - "version": "1.18.2", + "version": "1.19.2", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "coroutine": { "description": "Boost.Coroutine (optional) if you use spawn() to launch coroutines", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 658bbdd9af9d03..813f1a7864b4fe 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6bba20de9d8e7d6278ab8d7b333bb14bd35f21f", + "version": "1.19.2", + "port-version": 0 + }, { "git-tree": "ae594f45685a04883ec38208caf740ee9c9635e8", "version": "1.18.2", diff --git a/versions/baseline.json b/versions/baseline.json index e1b0db0c7d6ffe..d3b52c810944bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -173,7 +173,7 @@ "port-version": 0 }, "asio": { - "baseline": "1.18.2", + "baseline": "1.19.2", "port-version": 0 }, "asiosdk": { From 076abb44fe027256fd2f9f4345c4eab182ab7ab8 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 3 Sep 2021 04:56:12 +0800 Subject: [PATCH 0422/1858] [tvision] Add new port (#19480) * [tvision] Add new port (fix #15839) * [tvision] Add version file * [tvision] getenv is not available on uwp * [tvision] Overwrite version * [tvision] Clean * [tvision] Overwrite version --- ports/tvision/portfile.cmake | 23 +++++++++++++++++++++++ ports/tvision/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/t-/tvision.json | 9 +++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/tvision/portfile.cmake create mode 100644 ports/tvision/vcpkg.json create mode 100644 versions/t-/tvision.json diff --git a/ports/tvision/portfile.cmake b/ports/tvision/portfile.cmake new file mode 100644 index 00000000000000..c8f42021d83bf5 --- /dev/null +++ b/ports/tvision/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO magiblot/tvision + REF 638f963fe4f6c84854f60f1e9c5772bf6603e4b2 + HEAD_REF master + SHA512 87c26fed26a332dd4b2a431dfbe0f8629d6565c59f61a3968fc658beda313ee8dad9bb59f53d47b1d664c0494841850b09e5c05533b2a74a372cc03548def2c5 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DTV_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/tvision/vcpkg.json b/ports/tvision/vcpkg.json new file mode 100644 index 00000000000000..4e1f52a18962ce --- /dev/null +++ b/ports/tvision/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "tvision", + "version-date": "2021-08-10", + "description": "A modern port of Turbo Vision 2.0, the classical framework for text-based user interfaces.", + "homepage": "https://github.com/magiblot/tvision", + "license": "MIT", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d3b52c810944bb..353e719b87c088 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6508,6 +6508,10 @@ "baseline": "2020-01-12", "port-version": 0 }, + "tvision": { + "baseline": "2021-08-10", + "port-version": 0 + }, "tweeny": { "baseline": "3.2.0", "port-version": 0 diff --git a/versions/t-/tvision.json b/versions/t-/tvision.json new file mode 100644 index 00000000000000..888ab5edd1c10d --- /dev/null +++ b/versions/t-/tvision.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9d7a52a21054aae326fe5793acc7d54b04ec40f6", + "version-date": "2021-08-10", + "port-version": 0 + } + ] +} From 03cf609c70bb5a66440d0288b93288b0ba2ec182 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 3 Sep 2021 01:05:01 +0200 Subject: [PATCH 0423/1858] [nlohmann-json] update to 3.10.2 (#19690) * update to 3.10.0 * version * install pkg-config * version * fix package naming * version * apply @NancyLi1013 suggestions * version * update to new minor * version * update to 3.10.2 * version --- ports/nlohmann-json/CONTROL | 4 -- ports/nlohmann-json/portfile.cmake | 73 +++++++++--------------------- ports/nlohmann-json/vcpkg.json | 16 +++++++ versions/baseline.json | 2 +- versions/n-/nlohmann-json.json | 5 ++ 5 files changed, 43 insertions(+), 57 deletions(-) delete mode 100644 ports/nlohmann-json/CONTROL create mode 100644 ports/nlohmann-json/vcpkg.json diff --git a/ports/nlohmann-json/CONTROL b/ports/nlohmann-json/CONTROL deleted file mode 100644 index f474ce9067e82e..00000000000000 --- a/ports/nlohmann-json/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nlohmann-json -Version: 3.9.1 -Homepage: https://github.com/nlohmann/json -Description: JSON for Modern C++ diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index 448ca04b399c1d..e6c34a526ce508 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,68 +1,37 @@ -set(SOURCE_VERSION 3.9.1) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${PORT}-v${SOURCE_VERSION}) - -file(MAKE_DIRECTORY ${SOURCE_PATH}) - -function(download_src SUBPATH SHA512) - vcpkg_download_distfile(FILE - URLS "https://github.com/nlohmann/json/raw/v${SOURCE_VERSION}/${SUBPATH}" - FILENAME "${PORT}-v${SOURCE_VERSION}/${SUBPATH}" - SHA512 ${SHA512} - ) - get_filename_component(SUBPATH_DIR "${SOURCE_PATH}/${SUBPATH}" DIRECTORY) - file(COPY ${FILE} DESTINATION ${SUBPATH_DIR}) -endfunction() - -download_src(CMakeLists.txt d0ea797de0e3f98778cfcfa1249e9a363f0ae14f057f8f4338a2026d59eb929ddee9e45889c7f25d2c48633baa89ae9b4db4e5d99205f5ce7e1238fd82f3c113) -download_src(LICENSE.MIT d5f7bb6a33469e19250a5e20db44e7ba09602ee85bc0afb03e4932402b08ca1c0dbbe6376b7e0a84eb11c782d70ae96f130755967204d35420c6ecbcafd301e5) -download_src(nlohmann_json.natvis 9bce6758db0e54777394a4e718e60a281952b15f0c6dc6a6ad4a6d023c958b5515b2d39b7d4c66c03f0d3fdfdc1d6c23afb8b8419f1345c9d44d7b9a9ee2582b) -download_src(cmake/config.cmake.in 7caab6166baa891f77f5b632ac4a920e548610ec41777b885ec51fe68d3665ffe91984dd2881caf22298b5392dfbd84b526fda252467bb66de9eb90e6e6ade5a) -download_src(cmake/pkg-config.pc.in 34afe9f9ef9c77c9053f81bdc5605523ba5c20ca1bc2e0cb26afe1754362b25e88d809df47cdd63024c60f346240010a6aa343ff46d6a959a38612b3f1955664) -download_src(cmake/nlohmann_jsonConfigVersion.cmake.in 3b3ca2cfe740ba9646e5976b1112ba37c229bf527959bfb47a5e6c2fcd5ba6b5626d3c2455c181fe41a72ec78500738e2950e4fe76a2e91ba2073ba01f5595a8) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/nlohmann/json/releases/download/v${SOURCE_VERSION}/include.zip" - FILENAME ${PORT}-v${SOURCE_VERSION}-include.zip - SHA512 24984da33c5bf80eb276712d4bdc698c2724e72dc0f4c70e87527fb6b16e21f535f5a022d52c7ed2f59dcfe4a4e5b61a56101b61def09b31c827689f6c7ec673 -) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH OUT_PATH - ARCHIVE ${ARCHIVE} - REF ${SOURCE_VERSION} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - NO_REMOVE_ONE_LEVEL +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO nlohmann/json + REF v3.10.2 + SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed + HEAD_REF master ) -file(COPY "${OUT_PATH}/include" DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DJSON_BuildTests=0 + OPTIONS + -DJSON_Install=ON -DJSON_MultipleHeaders=ON + -DJSON_BuildTests=OFF ) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nlohmann_json TARGET_PATH share/nlohmann_json) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "nlohmann_json" CONFIG_PATH "lib/cmake/nlohmann_json") +vcpkg_fixup_pkgconfig() vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_jsonTargets.cmake + "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_jsonTargets.cmake" "{_IMPORT_PREFIX}/nlohmann_json.natvis" "{_IMPORT_PREFIX}/share/nlohmann_json/nlohmann_json.natvis" ) - -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib -) - if(EXISTS ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis) file(RENAME - ${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis - ${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis + "${CURRENT_PACKAGES_DIR}/nlohmann_json.natvis" + "${CURRENT_PACKAGES_DIR}/share/nlohmann_json/nlohmann_json.natvis" ) endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/nlohmann_json.natvis") + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json new file mode 100644 index 00000000000000..10650043fa0646 --- /dev/null +++ b/ports/nlohmann-json/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "nlohmann-json", + "version-semver": "3.10.2", + "description": "JSON for Modern C++", + "homepage": "https://github.com/nlohmann/json", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 353e719b87c088..470e22f6d75a7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4433,7 +4433,7 @@ "port-version": 0 }, "nlohmann-json": { - "baseline": "3.9.1", + "baseline": "3.10.2", "port-version": 0 }, "nlopt": { diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index 035d248b8db4ba..435786805131be 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8221e7cbc0745629018b122f192835bed642e844", + "version-semver": "3.10.2", + "port-version": 0 + }, { "git-tree": "3b9a6d5f3d94db5699d4448f717ff32e4ea5722b", "version-string": "3.9.1", From 07d620f8d480628622db1711be1e8848d51159bb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 3 Sep 2021 02:54:14 +0200 Subject: [PATCH 0424/1858] [geos,librttopo] Fix linkage and other quirks (#19492) * [geos] Minor portfile maintenance * [geos] Export implicit C++ lib dependencies * [geos] x-add-version * [librttopo] New port version, format manifest * [librttopo] Modernize portfile * [librttopo] Fix mingw build * [librttopo] Use geos-config, allow dynamic linkage for non-windows * [librttopo] Fix pc file * [librttopo] Use pristine download from osgeo.org * [librttopo] x-add-version --- ports/geos/fix-static-deps.patch | 68 +++++++++++++++++++++++++++++ ports/geos/portfile.cmake | 3 +- ports/geos/vcpkg.json | 2 +- ports/librttopo/CONTROL | 5 --- ports/librttopo/fix-geoconfig.patch | 37 ---------------- ports/librttopo/fix-pc-file.patch | 9 ++++ ports/librttopo/geos-config.patch | 25 +++++++++++ ports/librttopo/portfile.cmake | 50 ++++++++++----------- ports/librttopo/vcpkg.json | 10 +++++ versions/baseline.json | 6 +-- versions/g-/geos.json | 5 +++ versions/l-/librttopo.json | 5 +++ 12 files changed, 150 insertions(+), 75 deletions(-) create mode 100644 ports/geos/fix-static-deps.patch delete mode 100644 ports/librttopo/CONTROL delete mode 100644 ports/librttopo/fix-geoconfig.patch create mode 100644 ports/librttopo/fix-pc-file.patch create mode 100644 ports/librttopo/geos-config.patch create mode 100644 ports/librttopo/vcpkg.json diff --git a/ports/geos/fix-static-deps.patch b/ports/geos/fix-static-deps.patch new file mode 100644 index 00000000000000..680e185eb78395 --- /dev/null +++ b/ports/geos/fix-static-deps.patch @@ -0,0 +1,68 @@ +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index 8a81a2a..724a68c 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -13,6 +13,15 @@ + + + if(NOT MSVC) ++ # C++ libraries needed even for the C API, for geos-config and geos.pc. ++ set(cxx_libs "") ++ foreach(lib IN ITEMS stdc++ c++) ++ if(lib IN_LIST CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) ++ string(APPEND cxx_libs "-l${lib} ") ++ break() ++ endif() ++ endforeach() ++ + # Consider CMAKE_INSTALL_PREFIX with spaces + string(REPLACE " " "\\ " ESCAPED_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) + configure_file( +diff --git a/tools/geos-config.cmake b/tools/geos-config.cmake +index 4c546b5..4bdbc47 100644 +--- a/tools/geos-config.cmake ++++ b/tools/geos-config.cmake +@@ -29,6 +29,12 @@ if test $# -eq 0; then + usage 1 1>&2 + fi + ++if test "@BUILD_SHARED_LIBS@" = "ON"; then ++ extra_libs= ++else ++ extra_libs="-lgeos -lm @cxx_libs@" ++fi ++ + while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +@@ -47,16 +53,16 @@ while test $# -gt 0; do + echo -L${libdir} -lgeos-@GEOS_VERSION_MAJOR@ + ;; + --clibs) +- echo -L${libdir} -lgeos_c ++ echo -L${libdir} -lgeos_c ${extra_libs} + ;; + --cclibs) +- echo -L${libdir} -lgeos ++ echo -L${libdir} -lgeos ${extra_libs#-lgeos } + ;; + --static-clibs) +- echo -L${libdir} -lgeos_c -lgeos -lm ++ echo -L${libdir} -lgeos_c -lgeos -lm @cxx_libs@ + ;; + --static-cclibs) +- echo -L${libdir} -lgeos -lm ++ echo -L${libdir} -lgeos -lm @cxx_libs@ + ;; + --cflags) + echo -I${prefix}/include +diff --git a/tools/geos.pc.cmake b/tools/geos.pc.cmake +index 53f43d9..0ebd4d5 100644 +--- a/tools/geos.pc.cmake ++++ b/tools/geos.pc.cmake +@@ -9,4 +9,4 @@ Requires: + Version: @GEOS_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lgeos_c +-Libs.private: -lgeos ++Libs.private: -lgeos @cxx_libs@ diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index a2793f94cfbb2e..017db495338b5a 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_extract_source_archive_ex( dont-build-astyle.patch pc-file-libs-private.patch make-geos-config-relocatable.patch + fix-static-deps.patch ) # NOTE: GEOS provides CMake as optional build configuration, it might not be actively @@ -27,7 +28,6 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DCMAKE_DEBUG_POSTFIX=d -DBUILD_TESTING=OFF @@ -57,7 +57,6 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # vcpkg-cmake-config quirk, cf. GH-18063 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index f22f385585d463..0df73d3c4906bd 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,7 +1,7 @@ { "name": "geos", "version": "3.9.1", - "port-version": 1, + "port-version": 2, "description": "Geometry Engine Open Source", "homepage": "https://www.osgeo.org/projects/geos/", "dependencies": [ diff --git a/ports/librttopo/CONTROL b/ports/librttopo/CONTROL deleted file mode 100644 index c54f902b1dc073..00000000000000 --- a/ports/librttopo/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: librttopo -Version: 1.1.0-3 -Homepage: https://git.osgeo.org/gitea/rttopo/librttopo -Description: The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided [data stores] (doc/DATASTORES.md) and released under the GNU GPL license (version 2 or later). -Build-Depends: geos diff --git a/ports/librttopo/fix-geoconfig.patch b/ports/librttopo/fix-geoconfig.patch deleted file mode 100644 index db6910c8835648..00000000000000 --- a/ports/librttopo/fix-geoconfig.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index a9561069c..7adef1bf5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -87,6 +87,7 @@ AC_CONFIG_FILES([Makefile \ - #----------------------------------------------------------------------- - # --with-geosconfig - # -+if 0; then - AC_ARG_WITH([geosconfig], - [AS_HELP_STRING([--with-geosconfig=FILE], [specify an alternative geos-config file])], - [GEOSCONFIG="$withval"], [GEOSCONFIG=""]) -@@ -112,6 +113,7 @@ fi - # Extract the linker and include flags - GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` - GEOS_CFLAGS=-I`$GEOSCONFIG --includes` -+fi - AC_SUBST([GEOS_LDFLAGS]) - AC_SUBST([GEOS_CFLAGS]) - # Ensure that we can parse geos_c.h -@@ -120,6 +122,7 @@ CPPFLAGS="$GEOS_CFLAGS" - AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])]) - CPPFLAGS="$CPPFLAGS_SAVE" - # Ensure we can link against libgeos_c -+if 0; then - LIBS_SAVE="$LIBS" - LIBS="$GEOS_LDFLAGS" - AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.5.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) -@@ -127,6 +130,8 @@ LIBS="$LIBS_SAVE" - LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" - GEOS_MAJOR_VERSION=`$GEOSCONFIG --version | cut -d. -f1 | sed 's/[[^0-9]]//g'` - GEOS_MINOR_VERSION=`$GEOSCONFIG --version | cut -d. -f2 | sed 's/[[^0-9]]//g'` -+fi -+LIBS="$LIBS $GEOS_LDFLAGS" - RTGEOM_GEOS_VERSION="$GEOS_MAJOR_VERSION$GEOS_MINOR_VERSION" - AC_DEFINE_UNQUOTED([RTGEOM_GEOS_VERSION], [$RTGEOM_GEOS_VERSION], [GEOS library version]) - AC_SUBST([RTGEOM_GEOS_VERSION]) diff --git a/ports/librttopo/fix-pc-file.patch b/ports/librttopo/fix-pc-file.patch new file mode 100644 index 00000000000000..12483781b5257b --- /dev/null +++ b/ports/librttopo/fix-pc-file.patch @@ -0,0 +1,9 @@ +diff --git a/rttopo.pc.in b/rttopo.pc.in +index 86c71dc..4064506 100644 +--- a/rttopo.pc.in ++++ b/rttopo.pc.in +@@ -10,3 +10,4 @@ Description: the RT Topology library + Version: @VERSION@ + Libs: -L${libdir} -lrttopo -lm + Cflags: -I${includedir} ++Requires.private: geos diff --git a/ports/librttopo/geos-config.patch b/ports/librttopo/geos-config.patch new file mode 100644 index 00000000000000..eb6b90506f1513 --- /dev/null +++ b/ports/librttopo/geos-config.patch @@ -0,0 +1,25 @@ +diff --git a/configure.ac b/configure.ac +index a956106..739ee88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -110,7 +110,7 @@ else + fi + fi + # Extract the linker and include flags +-GEOS_LDFLAGS=`$GEOSCONFIG --ldflags` ++GEOS_LDFLAGS=`$GEOSCONFIG --clibs` + GEOS_CFLAGS=-I`$GEOSCONFIG --includes` + AC_SUBST([GEOS_LDFLAGS]) + AC_SUBST([GEOS_CFLAGS]) +@@ -122,9 +122,9 @@ CPPFLAGS="$CPPFLAGS_SAVE" + # Ensure we can link against libgeos_c + LIBS_SAVE="$LIBS" + LIBS="$GEOS_LDFLAGS" +-AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.5.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) ++AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,,,AC_MSG_ERROR([could not find libgeos_c (or obsolete 'libgeos_c' < v.3.5.0 found) - you may need to specify the directory of a geos-config file using --with-geosconfig])) + LIBS="$LIBS_SAVE" +-LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" ++LIBS="$LIBS $GEOS_LDFLAGS" + GEOS_MAJOR_VERSION=`$GEOSCONFIG --version | cut -d. -f1 | sed 's/[[^0-9]]//g'` + GEOS_MINOR_VERSION=`$GEOSCONFIG --version | cut -d. -f2 | sed 's/[[^0-9]]//g'` + RTGEOM_GEOS_VERSION="$GEOS_MAJOR_VERSION$GEOS_MINOR_VERSION" diff --git a/ports/librttopo/portfile.cmake b/ports/librttopo/portfile.cmake index a689b00431b784..a1939b8631501f 100644 --- a/ports/librttopo/portfile.cmake +++ b/ports/librttopo/portfile.cmake @@ -1,54 +1,50 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - # NOTE: update the version and checksum for new LIBRTTOPO release -set(LIBRTTOPO_VERSION_STR "1.1.0-2") -set(LIBRTTOPO_PACKAGE_SUM "cc2f646dd9ac3099c77e621984cdd2baa676ed1d8e6aaa9642afe2855e6fdef585603cc052ca09084204a1325e38bb626133072fbb5080e8adc369cc4854c40e") +set(LIBRTTOPO_VERSION_STR "1.1.0") +set(LIBRTTOPO_PACKAGE_SUM "d9c2f4db1261cc942152d348abb7f03e6053a63b6966e081c5381d40bbebd3c7ca1963224487355f384d7562a90287fb24d7af9e7eda4a1e230ee6441cef5de9") vcpkg_download_distfile(ARCHIVE - URLS "https://salsa.debian.org/debian-gis-team/librttopo/-/archive/debian/${LIBRTTOPO_VERSION_STR}/librttopo-debian-${LIBRTTOPO_VERSION_STR}.tar.gz" - FILENAME "librttopo${LIBRTTOPO_VERSION_STR}.zip" + URLS "https://download.osgeo.org/librttopo/src/librttopo-${LIBRTTOPO_VERSION_STR}.tar.gz" + FILENAME "librttopo-${LIBRTTOPO_VERSION_STR}.tar.gz" SHA512 ${LIBRTTOPO_PACKAGE_SUM} ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-makefiles.patch - fix-geoconfig.patch + geos-config.patch + fix-pc-file.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - set(SRID_MAX 999999) - set(SRID_USR_MAX 998999) - configure_file(${CMAKE_CURRENT_LIST_DIR}/rttopo_config.h.in ${SOURCE_PATH}/src/rttopo_config.h @ONLY) - configure_file(${SOURCE_PATH}/headers/librttopo_geom.h.in ${SOURCE_PATH}/headers/librttopo_geom.h @ONLY) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + + file(REMOVE "${SOURCE_PATH}/src/rttopo_config.h") + configure_file("${CMAKE_CURRENT_LIST_DIR}/rttopo_config.h.in" "${SOURCE_PATH}/src/rttopo_config.h" @ONLY) vcpkg_build_nmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" TARGET librttopo.lib ) - file(GLOB LIBRTTOPO_INCLUDE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/headers/*.h) - file(COPY ${LIBRTTOPO_INCLUDE} DESTINATION ${CURRENT_PACKAGES_DIR}/include) + file(GLOB LIBRTTOPO_INCLUDE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/headers/*.h") + file(COPY ${LIBRTTOPO_INCLUDE} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -else () # Build in UNIX + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +else() # Build in UNIX vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG - OPTIONS - "GEOS_MAJOR_VERSION=3" - "GEOS_MINOR_VERSION=8" OPTIONS_DEBUG - "GEOS_LDFLAGS=-lgeos_cd -lgeosd -lm" + "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/debug/bin/geos-config" OPTIONS_RELEASE - "GEOS_LDFLAGS=-lgeos_c -lgeos -lm" + "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/bin/geos-config" ) - vcpkg_install_make() + vcpkg_fixup_pkgconfig() endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/librttopo/vcpkg.json b/ports/librttopo/vcpkg.json new file mode 100644 index 00000000000000..16e12134e5bfdf --- /dev/null +++ b/ports/librttopo/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "librttopo", + "version": "1.1.0", + "port-version": 4, + "description": "The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided data stores.", + "homepage": "https://git.osgeo.org/gitea/rttopo/librttopo", + "dependencies": [ + "geos" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 470e22f6d75a7b..c70d848af14c8b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2266,7 +2266,7 @@ }, "geos": { "baseline": "3.9.1", - "port-version": 1 + "port-version": 2 }, "geotrans": { "baseline": "3.8", @@ -3597,8 +3597,8 @@ "port-version": 2 }, "librttopo": { - "baseline": "1.1.0-3", - "port-version": 0 + "baseline": "1.1.0", + "port-version": 4 }, "libsamplerate": { "baseline": "0.2.1", diff --git a/versions/g-/geos.json b/versions/g-/geos.json index 84f1396ed284ee..dbe7c058acec69 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5", + "version": "3.9.1", + "port-version": 2 + }, { "git-tree": "19ac6640378da611cbee774dae84e8e2f18cfe82", "version": "3.9.1", diff --git a/versions/l-/librttopo.json b/versions/l-/librttopo.json index 48dc1400e6e2bf..88bbabc82ea50a 100644 --- a/versions/l-/librttopo.json +++ b/versions/l-/librttopo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fae3fefb29d1972caa2643351ebf83ca47f7d04a", + "version": "1.1.0", + "port-version": 4 + }, { "git-tree": "b248b7c998e21a3feaf8581d8418306d54d5edc9", "version-string": "1.1.0-3", From e24d18e78c2b8fd0e65ddc85d73600601edf1600 Mon Sep 17 00:00:00 2001 From: talregev Date: Fri, 3 Sep 2021 03:56:47 +0300 Subject: [PATCH 0425/1858] Add aurodock-vina port (#19645) --- ports/autodock-vina/01-windows.patch | 12 ++++ ports/autodock-vina/CMakeLists.txt | 100 +++++++++++++++++++++++++++ ports/autodock-vina/portfile.cmake | 32 +++++++++ ports/autodock-vina/vcpkg.json | 31 +++++++++ versions/a-/autodock-vina.json | 9 +++ versions/baseline.json | 4 ++ 6 files changed, 188 insertions(+) create mode 100644 ports/autodock-vina/01-windows.patch create mode 100644 ports/autodock-vina/CMakeLists.txt create mode 100644 ports/autodock-vina/portfile.cmake create mode 100644 ports/autodock-vina/vcpkg.json create mode 100644 versions/a-/autodock-vina.json diff --git a/ports/autodock-vina/01-windows.patch b/ports/autodock-vina/01-windows.patch new file mode 100644 index 00000000000000..89c3bfd3ad408b --- /dev/null +++ b/ports/autodock-vina/01-windows.patch @@ -0,0 +1,12 @@ +diff --git a/src/lib/forcefield.h b/src/lib/forcefield.h +index 81bd4c1..44761e2 100644 +--- a/src/lib/forcefield.h ++++ b/src/lib/forcefield.h +@@ -24,6 +24,7 @@ + #define VINA_FORCEFIELD_H + + ++#include + #include + #include + #include diff --git a/ports/autodock-vina/CMakeLists.txt b/ports/autodock-vina/CMakeLists.txt new file mode 100644 index 00000000000000..2390d9753d318e --- /dev/null +++ b/ports/autodock-vina/CMakeLists.txt @@ -0,0 +1,100 @@ +cmake_minimum_required(VERSION 3.11) +cmake_policy(VERSION 3.11) + +project(autodock-vina) + +set(GIT_VERSION v1.2.2) +set(CMAKE_CXX_STANDARD 11) + +find_package(Boost REQUIRED COMPONENTS + filesystem + log + math_tr1 + program_options + random + serialization + thread + timer +) + +file(GLOB SRC_AUTODOCK_VINA_LIBS + "src/lib/*.cpp" +) + +file(GLOB SRC_AUTODOCK_VINA_SPLIT + "src/split/*.cpp" +) + +file(GLOB HEADERS + "src/lib/*.h" +) + +add_library(vina ${SRC_AUTODOCK_VINA_LIBS}) +add_library(vina_split ${SRC_AUTODOCK_VINA_SPLIT}) + +target_include_directories(vina + PUBLIC + $ + $ + PRIVATE + $ +) + +target_include_directories(vina_split + PUBLIC + $ + $ + PRIVATE + $ +) + +target_compile_definitions(vina + PUBLIC + -DVERSION=\"${GIT_VERSION}\" +) + +target_compile_definitions(vina_split + PUBLIC + -DVERSION=\"${GIT_VERSION}\" +) + +target_link_libraries(vina + PRIVATE + Boost::boost + Boost::filesystem + Boost::log + Boost::math_tr1 + Boost::program_options + Boost::random + Boost::serialization + Boost::thread + Boost::timer +) + +target_link_libraries(vina_split + PRIVATE + Boost::boost + Boost::filesystem + Boost::log + Boost::math_tr1 + Boost::program_options + Boost::random + Boost::serialization + Boost::thread + Boost::timer +) + +install(TARGETS vina EXPORT autodock-vina-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(TARGETS vina_split EXPORT autodock-vina-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib +) + +install(FILES ${HEADERS} DESTINATION include/autodock-vina) +install(EXPORT autodock-vina-config NAMESPACE autodock-vina::autodock-vina:: DESTINATION share/autodock-vina) diff --git a/ports/autodock-vina/portfile.cmake b/ports/autodock-vina/portfile.cmake new file mode 100644 index 00000000000000..7ba0823884ca91 --- /dev/null +++ b/ports/autodock-vina/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ccsb-scripps/AutoDock-Vina + REF v1.2.2 + SHA512 a6117137292b9b77afd3dff4a5ca31c65c9e85edd0b2351795fb2cccc06eca5b865b7dc054bb2859d0cf32abb6f6a72aaf62647e6d53709be879cc12a0336ba8 + HEAD_REF develop + PATCHES + 01-windows.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/autodock-vina/vcpkg.json b/ports/autodock-vina/vcpkg.json new file mode 100644 index 00000000000000..b3384a570262b6 --- /dev/null +++ b/ports/autodock-vina/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "autodock-vina", + "version-semver": "1.2.2", + "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.", + "homepage": "http://vina.scripps.edu/", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-filesystem", + "boost-lexical-cast", + "boost-log", + "boost-math", + "boost-optional", + "boost-program-options", + "boost-ptr-container", + "boost-random", + "boost-serialization", + "boost-static-assert", + "boost-thread", + "boost-timer", + "boost-utility", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/autodock-vina.json b/versions/a-/autodock-vina.json new file mode 100644 index 00000000000000..4f2281800ca2aa --- /dev/null +++ b/versions/a-/autodock-vina.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "393884054347c19ff78db882674ce17dd51476e0", + "version-semver": "1.2.2", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c70d848af14c8b..42a6b5552a3dd9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -228,6 +228,10 @@ "baseline": "20.8.1", "port-version": 0 }, + "autodock-vina": { + "baseline": "1.2.2", + "port-version": 0 + }, "avcpp": { "baseline": "2021-06-14", "port-version": 0 From 7bc65589ae4771659c1c41d74212fd999685a67a Mon Sep 17 00:00:00 2001 From: eli Date: Fri, 3 Sep 2021 09:57:20 +0900 Subject: [PATCH 0426/1858] [lager] add port (#19661) * add lager port * run `vcpkg x-add-version --all` Co-authored-by: Robert Schumacher --- ports/lager/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/lager/vcpkg.json | 23 +++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/lager.json | 9 +++++++++ 4 files changed, 63 insertions(+) create mode 100644 ports/lager/portfile.cmake create mode 100644 ports/lager/vcpkg.json create mode 100644 versions/l-/lager.json diff --git a/ports/lager/portfile.cmake b/ports/lager/portfile.cmake new file mode 100644 index 00000000000000..8df28b481385e9 --- /dev/null +++ b/ports/lager/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arximboldi/lager + REF 5924508df1e08752274404818c460c80f0666bb8 + SHA512 ee186b82dd1d729454c61207b48fb80ac8a861511ff501fab499aff5d3ba123ca669f89bdbbd37f120af6dc11a651ba6c163250b5ca94e6290657a35870618d7 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + docs lager_BUILD_DOCS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dlager_BUILD_EXAMPLES=OFF + -Dlager_BUILD_TESTS=OFF + ${FEATURE_OPTIONS} +) + + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Lager) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lager/vcpkg.json b/ports/lager/vcpkg.json new file mode 100644 index 00000000000000..af6e3d5652afc5 --- /dev/null +++ b/ports/lager/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "lager", + "version-date": "2021-06-17", + "description": "C++ library for value-oriented design using the unidirectional data-flow architecture", + "homepage": "https://sinusoid.es/lager/", + "dependencies": [ + "boost-hana", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zug" + ], + "features": { + "docs": { + "description": "Build documentation" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 42a6b5552a3dd9..c8ab43a30cba51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3024,6 +3024,10 @@ "baseline": "2021-08-06", "port-version": 0 }, + "lager": { + "baseline": "2021-06-17", + "port-version": 0 + }, "lapack": { "baseline": "3", "port-version": 1 diff --git a/versions/l-/lager.json b/versions/l-/lager.json new file mode 100644 index 00000000000000..9dba0ce2287c18 --- /dev/null +++ b/versions/l-/lager.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cc45cef2ecee354f255b9026c8397ca850259ab3", + "version-date": "2021-06-17", + "port-version": 0 + } + ] +} From b422eb466bce4148786b28530bcded1c1e398709 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 2 Sep 2021 17:59:28 -0700 Subject: [PATCH 0427/1858] [google-cloud-cpp] update to latest release (v1.31.0) (#19889) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 25 +++++++++++++++++++++++-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 6dfe0070b3d5cf..6d935c9cf1ea99 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.30.1 - SHA512 2a49c92eae39e2389bb8c765c2aa9374ae38a64f8f19a7744887d2176dc846017d8bc78c0391c55654765aaeff11bb1f3ea7e904d1e7b16580941ab74585e8bc + REF v1.31.0 + SHA512 aa650297e60d36f79392a9e206f42bd58f63036e32466ee7a5cd2862cb4b38edf8178e2b04ef3a2dda47ab4f4a544ad3fa4de560f8fd8b9dcf02e60b76a07108 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index b907123b668278..446aacacfec194 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.30.1", - "port-version": 1, + "version": "1.31.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -48,6 +47,28 @@ } ] }, + "experimental-storage-grpc": { + "description": "The GCS+gRPC plugin", + "dependencies": [ + { + "name": "google-cloud-cpp", + "default-features": false, + "features": [ + "storage" + ] + }, + "grpc", + { + "name": "grpc", + "host": true + }, + "protobuf", + { + "name": "protobuf", + "host": true + } + ] + }, "firestore": { "description": "Community contributions to interact with Firestore" }, diff --git a/versions/baseline.json b/versions/baseline.json index c8ab43a30cba51..4505cce1d633ea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2389,8 +2389,8 @@ "port-version": 6 }, "google-cloud-cpp": { - "baseline": "1.30.1", - "port-version": 1 + "baseline": "1.31.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index f743550b59d895..754bb5877f25d1 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81d0a42380da299b4942b6d7f8c00ecba4ca7745", + "version": "1.31.0", + "port-version": 0 + }, { "git-tree": "7e4c28a8a9e84631228981bd73a3932596fe8e1f", "version": "1.30.1", From b072bd2042a92980c57d12d7554b69a812e5071e Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 3 Sep 2021 09:01:14 +0800 Subject: [PATCH 0428/1858] [pangolin] Update to 0.6 and also support osx (#19840) * [pangolin] Update to 0.6 * Update version files * Format manifest * Revert to CRLF in original patches * Update versions/p-/pangolin.json * Support osx and add features * Remove extra space line * Update versions/p-/pangolin.json * Remove unused options * Update versions/p-/pangolin.json * Add MAYBE_UNUSED_VARIABLES * Update versions/p-/pangolin.json --- ports/pangolin/add-definition.patch | 17 +++-- ports/pangolin/deprecated_constants.patch | 69 ------------------- .../pangolin/fix-build-error-in-vs2019.patch | 13 ++++ ports/pangolin/fix-cmake-version.patch | 11 ++- ports/pangolin/fix-dependency-python.patch | 17 ++--- ports/pangolin/fix-includepath-error.patch | 4 +- ports/pangolin/portfile.cmake | 64 ++++++++--------- ports/pangolin/vcpkg.json | 28 ++++++-- versions/baseline.json | 4 +- versions/p-/pangolin.json | 5 ++ 10 files changed, 99 insertions(+), 133 deletions(-) delete mode 100644 ports/pangolin/deprecated_constants.patch create mode 100644 ports/pangolin/fix-build-error-in-vs2019.patch diff --git a/ports/pangolin/add-definition.patch b/ports/pangolin/add-definition.patch index 02790216ebd1bd..ce27d4b33023b9 100644 --- a/ports/pangolin/add-definition.patch +++ b/ports/pangolin/add-definition.patch @@ -1,13 +1,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9e0baac..bb3ef76 100644 +index 49dcf02..d448928 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -287,6 +287,8 @@ if(BUILD_PANGOLIN_VIDEO AND _LINUX_) - message(STATUS "V4L Found and Enabled") - endif() +@@ -384,6 +384,7 @@ endif() -+add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT) -+ - find_package(FFMPEG QUIET) - if(BUILD_PANGOLIN_VIDEO AND FFMPEG_FOUND) - set(HAVE_FFMPEG 1) + option(BUILD_PANGOLIN_FFMPEG "Build support for ffmpeg video input" ON) + if(BUILD_PANGOLIN_FFMPEG AND BUILD_PANGOLIN_VIDEO) ++ add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT) + find_package(FFMPEG QUIET) + if(FFMPEG_FOUND) + set(HAVE_FFMPEG 1) diff --git a/ports/pangolin/deprecated_constants.patch b/ports/pangolin/deprecated_constants.patch deleted file mode 100644 index 813d2360d8f321..00000000000000 --- a/ports/pangolin/deprecated_constants.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff --git a/src/video/drivers/ffmpeg.cpp b/src/video/drivers/ffmpeg.cpp -index 435225d..ff30349 100644 ---- a/src/video/drivers/ffmpeg.cpp -+++ b/src/video/drivers/ffmpeg.cpp -@@ -34,6 +34,8 @@ extern "C" - #include - } - -+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER -+ - namespace pangolin - { - -@@ -74,8 +76,10 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt) - TEST_PIX_FMT_RETURN(YUVJ420P); - TEST_PIX_FMT_RETURN(YUVJ422P); - TEST_PIX_FMT_RETURN(YUVJ444P); -+#ifdef FF_API_XVMC - TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC); - TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT); -+#endif - TEST_PIX_FMT_RETURN(UYVY422); - TEST_PIX_FMT_RETURN(UYYVYY411); - TEST_PIX_FMT_RETURN(BGR8); -@@ -95,11 +99,13 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt) - TEST_PIX_FMT_RETURN(YUV440P); - TEST_PIX_FMT_RETURN(YUVJ440P); - TEST_PIX_FMT_RETURN(YUVA420P); -+#ifdef FF_API_VDPAU - TEST_PIX_FMT_RETURN(VDPAU_H264); - TEST_PIX_FMT_RETURN(VDPAU_MPEG1); - TEST_PIX_FMT_RETURN(VDPAU_MPEG2); - TEST_PIX_FMT_RETURN(VDPAU_WMV3); - TEST_PIX_FMT_RETURN(VDPAU_VC1); -+#endif - TEST_PIX_FMT_RETURN(RGB48BE ); - TEST_PIX_FMT_RETURN(RGB48LE ); - TEST_PIX_FMT_RETURN(RGB565BE); -@@ -119,7 +125,9 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt) - TEST_PIX_FMT_RETURN(YUV422P16BE); - TEST_PIX_FMT_RETURN(YUV444P16LE); - TEST_PIX_FMT_RETURN(YUV444P16BE); -+#ifdef FF_API_VDPAU - TEST_PIX_FMT_RETURN(VDPAU_MPEG4); -+#endif - TEST_PIX_FMT_RETURN(DXVA2_VLD); - TEST_PIX_FMT_RETURN(RGB444BE); - TEST_PIX_FMT_RETURN(RGB444LE); -@@ -559,7 +567,8 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame) - - int ret; - int got_packet = 1; -- -+ -+#if FF_API_LAVF_FMT_RAWPICTURE - // Setup AVPacket - if (recorder.oc->oformat->flags & AVFMT_RAWPICTURE) { - /* Raw video case - directly store the picture in the packet */ -@@ -569,6 +578,10 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame) - pkt.pts = frame->pts; - ret = 0; - } else { -+#else -+ { -+#endif -+ - /* encode the image */ - #if (LIBAVFORMAT_VERSION_MAJOR >= 54) - ret = avcodec_encode_video2(stream->codec, &pkt, frame, &got_packet); diff --git a/ports/pangolin/fix-build-error-in-vs2019.patch b/ports/pangolin/fix-build-error-in-vs2019.patch new file mode 100644 index 00000000000000..1b7be934ea3219 --- /dev/null +++ b/ports/pangolin/fix-build-error-in-vs2019.patch @@ -0,0 +1,13 @@ +diff --git a/include/mpark/variant.hpp b/include/mpark/variant.hpp +index fb2cf06..6debb99 100644 +--- a/include/mpark/variant.hpp ++++ b/include/mpark/variant.hpp +@@ -243,7 +243,7 @@ namespace std { + #endif + + #if defined(__cpp_constexpr) && __cpp_constexpr >= 201304 +-#define MPARK_CPP14_CONSTEXPR ++//#define MPARK_CPP14_CONSTEXPR + #endif + + #if __has_feature(cxx_exceptions) || defined(__cpp_exceptions) || \ diff --git a/ports/pangolin/fix-cmake-version.patch b/ports/pangolin/fix-cmake-version.patch index 352171d32a673a..0153d90eaf5948 100644 --- a/ports/pangolin/fix-cmake-version.patch +++ b/ports/pangolin/fix-cmake-version.patch @@ -1,11 +1,10 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index dd08d31..7f364a7 100644 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0e13110..6adf1e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ --cmake_minimum_required(VERSION 2.6) +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.8) project("Pangolin") set(PANGOLIN_VERSION_MAJOR 0) - set(PANGOLIN_VERSION_MINOR 5) - set(PANGOLIN_VERSION ${PANGOLIN_VERSION_MAJOR}.${PANGOLIN_VERSION_MINOR}) + set(PANGOLIN_VERSION_MINOR 6) diff --git a/ports/pangolin/fix-dependency-python.patch b/ports/pangolin/fix-dependency-python.patch index 67eae1288cf54a..276e0f092fceaf 100644 --- a/ports/pangolin/fix-dependency-python.patch +++ b/ports/pangolin/fix-dependency-python.patch @@ -1,14 +1,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7f364a7..9e0baac 100644 +index ddeb144..49dcf02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -213,6 +213,9 @@ endif() - find_package(PythonLibs QUIET) - if(BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND PYTHONLIBS_FOUND AND NOT _WIN_) - set(HAVE_PYTHON 1) +@@ -299,7 +299,9 @@ if(BUILD_PANGOLIN_PYTHON AND BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND NOT + + if(pybind11_FOUND) + set(HAVE_PYTHON 1) +- + if (UNIX) + set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util) + endif() - list(APPEND HEADERS - ${INCDIR}/console/ConsoleInterpreter.h - ${INCDIR}/console/ConsoleView.h + file(GLOB pypangolin_SRC "python/pypangolin/*.cpp" ) + file(GLOB pypangolin_HDR "python/pypangolin/*.hpp" ) + list(APPEND HEADERS diff --git a/ports/pangolin/fix-includepath-error.patch b/ports/pangolin/fix-includepath-error.patch index debb3348ad70c5..a5ee1ad1d77948 100644 --- a/ports/pangolin/fix-includepath-error.patch +++ b/ports/pangolin/fix-includepath-error.patch @@ -1,8 +1,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index dd08d31..7f364a7 100644 +index a2c60ea..ddeb144 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -506,7 +506,7 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in +@@ -735,7 +735,7 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake @ONLY IMMEDIATE ) # Install tree config diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index b6b8837f9765d8..410fe6a1420e74 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -1,34 +1,41 @@ -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP") +vcpkg_fail_port_install(ON_TARGET "UWP") -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stevenlovegrove/Pangolin - REF v0.5 - SHA512 7ebeec108f33f1aa8b1ad08e3ca128a837b22d33e3fc580021f981784043b023a1bf563bbfa8b51d46863db770b336d24fc84ee3d836b85e0da1848281b2a5b2 + REF dd801d244db3a8e27b7fe8020cd751404aa818fd #v0.6 + SHA512 8004ab6f146f319df41e4b8d4bdb6677b8faf6db725e34fea76fcbf065522fa286d334c2426dcb39faf0cfb3332946104f78393d2b2b2418fe02d91450916e78 HEAD_REF master PATCHES - deprecated_constants.patch # Change from upstream pangolin to address build failures from latest ffmpeg library fix-includepath-error.patch # include path has one more ../ fix-dependency-python.patch add-definition.patch fix-cmake-version.patch + fix-build-error-in-vs2019.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test BUILD_TESTS + tools BUILD_TOOLS + examples BUILD_EXAMPLES ) -file(REMOVE ${SOURCE_PATH}/CMakeModules/FindGLEW.cmake) -file(REMOVE ${SOURCE_PATH}/CMakeModules/FindFFMPEG.cmake) +file(REMOVE "${SOURCE_PATH}/CMakeModules/FindGLEW.cmake") +file(REMOVE "${SOURCE_PATH}/CMakeModules/FindFFMPEG.cmake") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_CRT) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} -DBUILD_EXTERN_GLEW=OFF -DBUILD_EXTERN_LIBPNG=OFF -DBUILD_EXTERN_LIBJPEG=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON -DCMAKE_DISABLE_FIND_PACKAGE_TooN=ON -DCMAKE_DISABLE_FIND_PACKAGE_DC1394=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibRealSense=ON @@ -41,38 +48,31 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=ON -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT} + MAYBE_UNUSED_VARIABLES + MSVC_USE_STATIC_CRT ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Pangolin) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Pangolin) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(GLOB EXE ${CURRENT_PACKAGES_DIR}/lib/*.dll) - file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE ${EXE}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) - file(COPY ${DEBUG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${DEBUG_EXE}) +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES Plotter VideoConvert VideoJsonPrint VideoJsonTransform VideoViewer AUTO_CLEAN) +endif() - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/pangolin/PangolinTargets-debug.cmake - "lib/pangolin.dll" "bin/pangolin.dll" - ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/pangolin/PangolinTargets-release.cmake - "lib/pangolin.dll" "bin/pangolin.dll" - ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() if(VCPKG_TARGET_IS_WINDOWS) # Copy missing header file - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/include/pangolin/pangolin_export.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/pangolin) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/include/pangolin/pangolin_export.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/pangolin") endif() # Put the license file where vcpkg expects it -file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/) -file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json index 94864e848a6ca1..360eb2e0c4583e 100644 --- a/ports/pangolin/vcpkg.json +++ b/ports/pangolin/vcpkg.json @@ -1,10 +1,9 @@ { "name": "pangolin", - "version-string": "0.5", - "port-version": 15, + "version": "0.6", "description": "Lightweight GUI Library", "homepage": "https://github.com/stevenlovegrove/Pangolin", - "supports": "!uwp & !osx", + "supports": "!uwp", "dependencies": [ "eigen3", { @@ -15,6 +14,25 @@ }, "glew", "libjpeg-turbo", - "libpng" - ] + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "examples": { + "description": "Build Examples" + }, + "test": { + "description": "Build Tests" + }, + "tools": { + "description": "Build Tools" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 4505cce1d633ea..4b7e940245595e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4853,8 +4853,8 @@ "port-version": 1 }, "pangolin": { - "baseline": "0.5", - "port-version": 15 + "baseline": "0.6", + "port-version": 0 }, "pangomm": { "baseline": "2.48.0", diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json index aad761058fbacb..f55cbf05e93ad8 100644 --- a/versions/p-/pangolin.json +++ b/versions/p-/pangolin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e28a4e1603d5ee1843787223a55dce439b579b94", + "version": "0.6", + "port-version": 0 + }, { "git-tree": "77d0735cc19bbb45a0212a8b15ea101ca3598219", "version-string": "0.5", From 32bfe61ff3bb949bfcd385842955d46d83195937 Mon Sep 17 00:00:00 2001 From: Cal McLean Date: Fri, 3 Sep 2021 02:03:41 +0100 Subject: [PATCH 0429/1858] [libdatachannel] Update to v0.14.3 (#19826) * [libdatachannel] update to version 0.14.3, fixing linking errors * [libdatachannel] correctly format manifest * [libdatachannel]: x-add-version --all --- ...r-vcpkg.patch => 0001-fix-for-vcpkg.patch} | 22 +++++++++++-------- ports/libdatachannel/portfile.cmake | 6 ++--- ports/libdatachannel/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 +++++ 5 files changed, 23 insertions(+), 14 deletions(-) rename ports/libdatachannel/{fix-for-vcpkg.patch => 0001-fix-for-vcpkg.patch} (91%) diff --git a/ports/libdatachannel/fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch similarity index 91% rename from ports/libdatachannel/fix-for-vcpkg.patch rename to ports/libdatachannel/0001-fix-for-vcpkg.patch index 075b7baf2e7aa7..528f47a8835f56 100644 --- a/ports/libdatachannel/fix-for-vcpkg.patch +++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -1,20 +1,24 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index beb5000..d6c26cf 100644 +index f0559b1..3c01184 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -30,5 +30,4 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) +@@ -27,7 +27,6 @@ endif() + set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules) -set(BUILD_SHARED_LIBS OFF) # to force usrsctp to be built static if(WIN32) -@@ -196,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) + add_definitions(-DWIN32_LEAN_AND_MEAN) +@@ -197,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) -set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) -add_subdirectory(deps/plog EXCLUDE_FROM_ALL) -- ++find_library(USRSCTP_LIBRARY usrsctp REQUIRED) ++find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") + -option(sctp_build_programs 0) -option(sctp_build_shared_lib 0) -set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) @@ -26,15 +30,13 @@ index beb5000..d6c26cf 100644 - target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) -endif() -add_library(Usrsctp::Usrsctp ALIAS usrsctp) -+find_library(USRSCTP_LIBRARY usrsctp REQUIRED) -+find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") - +- -add_library(datachannel SHARED +add_library(datachannel ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -232,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES +@@ -233,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES target_include_directories(datachannel PUBLIC $) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) @@ -53,7 +55,7 @@ index beb5000..d6c26cf 100644 if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -@@ -334,11 +324,11 @@ else() +@@ -335,11 +324,11 @@ else() target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) else() @@ -68,4 +70,6 @@ index beb5000..d6c26cf 100644 endif() endif() +-- +2.33.0.windows.1 diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 902220a90d486d..0f8b15881b7d67 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF v0.14.1 - SHA512 a0eb834eacdb5aef644fc4456b5087742aab37ac58e2871daa7ba2ac25cab4ddb530bd0a12cf5f4754c28749a2f59fc2fb3e2ae945b867cec8aaad22f4ac71c6 + REF v0.14.3 + SHA512 21746d1a02aa8eb98a5c9716c12f14048a680f85efab8d8beca02379946bb49858c7ed02e7238f61e94d0aba6d70069136778d78484b88f8d09640c0740e24a3 HEAD_REF master PATCHES - fix-for-vcpkg.patch + 0001-fix-for-vcpkg.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index d657a384112d70..cccbf06e11a6dc 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.14.1", + "version-semver": "0.14.3", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4b7e940245595e..4f12977ae437df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3161,7 +3161,7 @@ "port-version": 0 }, "libdatachannel": { - "baseline": "0.14.1", + "baseline": "0.14.3", "port-version": 0 }, "libdatrie": { diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 7592d11615b49a..2b7b41a6f67fd3 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cb7fedbd9d94190697740000539fb124d2b57d4", + "version-semver": "0.14.3", + "port-version": 0 + }, { "git-tree": "a58c126e0f1be88bc997210e63fe2e07cf64d1e5", "version-semver": "0.14.1", From a54195df0fdfcdd26ec57953518e6d5f01ba05fd Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 3 Sep 2021 09:04:16 +0800 Subject: [PATCH 0430/1858] [jasper] update to 2.0.33 (#19798) * jasper * update version * update function * update version --- ports/jasper/CONTROL | 5 ----- ports/jasper/portfile.cmake | 28 +++++++++++----------------- ports/jasper/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 2 +- versions/j-/jasper.json | 5 +++++ 5 files changed, 39 insertions(+), 23 deletions(-) delete mode 100644 ports/jasper/CONTROL create mode 100644 ports/jasper/vcpkg.json diff --git a/ports/jasper/CONTROL b/ports/jasper/CONTROL deleted file mode 100644 index 34da128511f566..00000000000000 --- a/ports/jasper/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: jasper -Version: 2.0.20 -Homepage: https://github.com/mdadams/jasper -Description: Open source implementation of the JPEG-2000 Part-1 standard -Build-Depends: libjpeg-turbo, opengl, freeglut (!osx) diff --git a/ports/jasper/portfile.cmake b/ports/jasper/portfile.cmake index cc19e902bdcf9e..f02b2db39510cb 100644 --- a/ports/jasper/portfile.cmake +++ b/ports/jasper/portfile.cmake @@ -1,20 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mdadams/jasper - REF d10a710f31da3d079a984d35ff6cc82a853d25d7 # version-2.0.20 - SHA512 b581268d9a36ef4756aa0ec74ab4a96624e8cb6d03753e6f21148b6d2f62c081d434b319466f29c2cca34c547543ad5d41f68b838f3e131bbf01bab960d0f51c + REF fe00207dc10db1d7cc6f2757961c5c6bdfd10973 # version-2.0.33 + SHA512 887bb8e6096b41d5b61970d70b0e7b9cc1c31dd63467386aa35003c146d200bbae9ad46825a3313aeed403ac6fb26d504f489386cbc7ca364d95deeb5a94af46 HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(JAS_ENABLE_SHARED ON) -else() - set(JAS_ENABLE_SHARED OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" JAS_ENABLE_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF -DJAS_ENABLE_LIBJPEG=ON @@ -25,13 +20,12 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d # Due to CMakes FindJasper ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/jasper RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jasper/vcpkg.json b/ports/jasper/vcpkg.json new file mode 100644 index 00000000000000..124a0095a13d33 --- /dev/null +++ b/ports/jasper/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "jasper", + "version": "2.0.33", + "description": "Open source implementation of the JPEG-2000 Part-1 standard", + "homepage": "https://github.com/mdadams/jasper", + "dependencies": [ + { + "name": "freeglut", + "platform": "!osx" + }, + "libjpeg-turbo", + "opengl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 4f12977ae437df..c5271320a47f0d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2789,7 +2789,7 @@ "port-version": 0 }, "jasper": { - "baseline": "2.0.20", + "baseline": "2.0.33", "port-version": 0 }, "jbig2dec": { diff --git a/versions/j-/jasper.json b/versions/j-/jasper.json index e762ab046c532e..cb4bc78cf31da1 100644 --- a/versions/j-/jasper.json +++ b/versions/j-/jasper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c00bfcf7f17b8ba6db6ee5e62ac379902bbba96f", + "version": "2.0.33", + "port-version": 0 + }, { "git-tree": "042e508623cae7cb25924aff2544acf360aa9862", "version-string": "2.0.20", From e53c196ce0ad702936d97ddbe4fb51a6e164356b Mon Sep 17 00:00:00 2001 From: Gelila Seifu Date: Fri, 3 Sep 2021 00:00:29 -0700 Subject: [PATCH 0431/1858] [hexl] Update version to 1.2.1 (#19468) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update HEXL v1.2 * added x-add-version output * rename intel-hexl to hexl * update x-add-version output * update homepage * Update version database * update portfile * update portfile * add find GIT * Update version database * Update ports/hexl/portfile.cmake * use MSBUILD for Windows * Update version database * set generator * Update version database * update typo * Update version database * Fix build error * Update ports/hexl/portfile.cmake * Re-fix the dependencies * update hexl version * Update version database * locate git, remove unused file * Update version database * update version, add dependency * update dependency * Update version database * update HEXL to 1.2.1 * Update version database * Fix version database. Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: JackBoosY Co-authored-by: Billy Robert O'Neal III --- .../disable_downloading_cpu_features.patch | 101 ------------------ ports/hexl/find_dependency_cpu_features.patch | 31 ------ ports/hexl/portfile.cmake | 17 ++- ports/hexl/vcpkg.json | 3 +- versions/baseline.json | 2 +- versions/h-/hexl.json | 5 + 6 files changed, 14 insertions(+), 145 deletions(-) delete mode 100644 ports/hexl/disable_downloading_cpu_features.patch delete mode 100644 ports/hexl/find_dependency_cpu_features.patch diff --git a/ports/hexl/disable_downloading_cpu_features.patch b/ports/hexl/disable_downloading_cpu_features.patch deleted file mode 100644 index c80681e67eaf8b..00000000000000 --- a/ports/hexl/disable_downloading_cpu_features.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 16095678843dadf13b0f786ddf53c726e837bc74 Mon Sep 17 00:00:00 2001 -From: Wei Dai -Date: Tue, 8 Jun 2021 15:55:18 -0700 -Subject: [PATCH] Disabled downloading cpu-features. - ---- - CMakeLists.txt | 9 ++++++++- - hexl/CMakeLists.txt | 15 ++++++--------- - 2 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05e42f9..a7ad993 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -183,7 +183,14 @@ message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") - #------------------------------------------------------------------------------ - # Third-party code... - #------------------------------------------------------------------------------ --add_subdirectory(cmake/cpu-features) -+find_package(CpuFeatures CONFIG REQUIRED) -+if(CpuFeatures_FOUND) -+ add_library(cpu_features ALIAS CpuFeatures::cpu_features) -+ get_target_property( -+ CpuFeatures_INCLUDE_DIR -+ CpuFeatures::cpu_features -+ INTERFACE_INCLUDE_DIRECTORIES) -+endif() - - if (HEXL_TESTING OR HEXL_BENCHMARK OR HEXL_DEBUG) - if(NOT TARGET Threads::Threads) -diff --git a/hexl/CMakeLists.txt b/hexl/CMakeLists.txt -index 7e603e3..b83a94e 100644 ---- a/hexl/CMakeLists.txt -+++ b/hexl/CMakeLists.txt -@@ -44,6 +44,7 @@ target_include_directories(hexl - PUBLIC $ # Public headers - PUBLIC $ # Public headers - ) -+target_include_directories(hexl PUBLIC ${CpuFeatures_INCLUDE_DIR}) # Public headers - - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - target_compile_options(hexl PRIVATE -Wall -Wconversion -Wshadow -pedantic -Wextra -@@ -74,7 +75,7 @@ else () - # For proper export of IntelHEXLConfig.cmake / IntelHEXLTargts.cmake, - # we avoid explicitly linking dependencies via target_link_libraries, since - # this would add dependencies to the exported hexl target. -- add_dependencies(hexl cpu_features) -+ target_link_libraries(hexl PRIVATE cpu_features) - if (HEXL_DEBUG) - add_dependencies(hexl gflags) - # Manually add logging include directory -@@ -95,42 +96,38 @@ else () - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - add_custom_command(TARGET hexl POST_BUILD - COMMAND ar -x $ -- COMMAND ar -x $ - COMMAND ar -x $ - COMMAND ar -x $ - COMMAND ar -qcs $ *.o - COMMAND rm -f *.o - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features gflags easyloggingpp -+ DEPENDS hexl gflags easyloggingpp - ) - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - add_custom_command(TARGET hexl POST_BUILD - COMMAND lib.exe /OUT:$ - $ -- $ - $ - $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features gflags easyloggingpp -+ DEPENDS hexl gflags easyloggingpp - ) - endif() - else() - if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") - add_custom_command(TARGET hexl POST_BUILD - COMMAND ar -x $ -- COMMAND ar -x $ - COMMAND ar -qcs $ *.o - COMMAND rm -f *.o - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features -+ DEPENDS hexl - ) - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - add_custom_command(TARGET hexl POST_BUILD - COMMAND lib.exe /OUT:$ - $ -- $ - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} -- DEPENDS hexl cpu_features -+ DEPENDS hexl - ) - endif() - endif() --- -2.25.1 - diff --git a/ports/hexl/find_dependency_cpu_features.patch b/ports/hexl/find_dependency_cpu_features.patch deleted file mode 100644 index fbc79ec8783307..00000000000000 --- a/ports/hexl/find_dependency_cpu_features.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b399342016573d6f45bd5bb1aa8d4df358e0761c Mon Sep 17 00:00:00 2001 -From: Wei Dai -Date: Wed, 16 Jun 2021 18:21:51 -0700 -Subject: [PATCH] Fixed config. - ---- - cmake/HEXLConfig.cmake.in | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/cmake/HEXLConfig.cmake.in b/cmake/HEXLConfig.cmake.in -index 57089bd..f112380 100644 ---- a/cmake/HEXLConfig.cmake.in -+++ b/cmake/HEXLConfig.cmake.in -@@ -11,6 +11,14 @@ - - @PACKAGE_INIT@ - -+include(CMakeFindDependencyMacro) -+find_dependency(CpuFeatures) -+if(NOT CpuFeatures_FOUND) -+ message(WARNING "Could not find dependency `CpuFeatures` required by this configuration") -+ set(HEXL_FOUND FALSE) -+ return() -+endif() -+ - include(${CMAKE_CURRENT_LIST_DIR}/HEXLTargets.cmake) - - # Defines HEXL_FOUND: If Intel HEXL library was found --- -2.25.1 - diff --git a/ports/hexl/portfile.cmake b/ports/hexl/portfile.cmake index fa3362c6693f96..74d6735d5264ab 100644 --- a/ports/hexl/portfile.cmake +++ b/ports/hexl/portfile.cmake @@ -4,12 +4,9 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl - REF 2dc1db6824be3fc89d13740efd0270ec9afec77e - SHA512 aaa80dc53a21586d763a2b84b40d60062020470988422601bc5e9c2b31c6263847a97ea8f956d002a95e2d5e843cafa96fabdfd8b8ee892c7a7b9747133adebb - HEAD_REF main - PATCHES - disable_downloading_cpu_features.patch - find_dependency_cpu_features.patch + REF df6c26fdd2f2752e2bfa17981be113ff32946375 + SHA512 c4353410091b019dad05326818d66bc74b438a26ec28192da20f13581781556b7aad11c3e9c2c2c9ed7ec66bc422152e2a2811206109b39939f30c91952ef765 + HEAD_REF 1.2.1 ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -18,23 +15,21 @@ else() set(HEXL_SHARED ON) endif() +vcpkg_find_acquire_program(GIT) + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE OPTIONS - "-DHEXL_DEBUG=OFF" "-DHEXL_BENCHMARK=OFF" - "-DHEXL_EXPORT=ON" "-DHEXL_COVERAGE=OFF" "-DHEXL_TESTING=OFF" "-DHEXL_SHARED_LIB=${HEXL_SHARED}" ) vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake") - vcpkg_fixup_pkgconfig() +vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.1") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/hexl/vcpkg.json b/ports/hexl/vcpkg.json index d75a263a7bd7c2..490851451424fc 100644 --- a/ports/hexl/vcpkg.json +++ b/ports/hexl/vcpkg.json @@ -1,11 +1,12 @@ { "name": "hexl", - "version": "1.1.0", + "version": "1.2.1", "description": "Intel® HEXL is an open-source library which provides efficient implementations of integer arithmetic on Galois fields.", "homepage": "https://github.com/intel/hexl", "supports": "x64 & !(windows & !static)", "dependencies": [ "cpu-features", + "easyloggingpp", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index c5271320a47f0d..4f4bbcc55ec79c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2533,7 +2533,7 @@ "port-version": 0 }, "hexl": { - "baseline": "1.1.0", + "baseline": "1.2.1", "port-version": 0 }, "hffix": { diff --git a/versions/h-/hexl.json b/versions/h-/hexl.json index dbee52a465c282..45b391e0530c45 100644 --- a/versions/h-/hexl.json +++ b/versions/h-/hexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14a96b80d062ba4dea3d18839c4d737792584a3c", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "abbac3846835a67c818b2fd51c32a1e859aca7b3", "version": "1.1.0", From 677aff8e5f57881edccb3d135a7d7ea5b4f38ba0 Mon Sep 17 00:00:00 2001 From: Pablo Busse Date: Fri, 3 Sep 2021 08:01:15 +0100 Subject: [PATCH 0432/1858] [openssl] Support static builds on UWP (#19636) Co-authored-by: Billy Robert O'Neal III --- ports/openssl/uwp/portfile.cmake | 15 ++++++++++++--- ports/openssl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ports/openssl/uwp/portfile.cmake b/ports/openssl/uwp/portfile.cmake index 08a523cda39bc1..d474abe0373813 100644 --- a/ports/openssl/uwp/portfile.cmake +++ b/ports/openssl/uwp/portfile.cmake @@ -1,11 +1,14 @@ vcpkg_fail_port_install(MESSAGE "${PORT} is only for Windows Universal Platform" ON_TARGET "Linux" "OSX") -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_find_acquire_program(JOM) get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") +set(OPENSSL_SHARED no-shared) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(OPENSSL_SHARED shared) +endif() + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -26,7 +29,7 @@ set(CONFIGURE_COMMAND ${PERL} Configure no-uplink no-tests -utf-8 - shared + ${OPENSSL_SHARED} ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") @@ -143,6 +146,12 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist" ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + # They should be empty, only the exes deleted above were in these directories + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/") +endif() + file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" _contents) string(REPLACE "" "" _contents "${_contents}") file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" "${_contents}") diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 96397867bf301f..3a4a62dda2d58e 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version-string": "1.1.1l", + "port-version": 1, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/versions/baseline.json b/versions/baseline.json index 4f4bbcc55ec79c..4e7a2d3dce1b11 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4734,7 +4734,7 @@ }, "openssl": { "baseline": "1.1.1l", - "port-version": 0 + "port-version": 1 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 9ad872e51b6123..caf3958130a9a1 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d19a647704efae9398b178a0012140c1f1ee8b8", + "version-string": "1.1.1l", + "port-version": 1 + }, { "git-tree": "1916410d0a836cb70be2341fa3ec3cce74d25267", "version-string": "1.1.1l", From cafb45a457aa4badc7b085ae39d7619b3e7a3f70 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 3 Sep 2021 00:02:29 -0700 Subject: [PATCH 0433/1858] Decouple the storage account used for binary caching from the images. (#19912) * Decouple the storage account used for binary caching from the images. We are being forced to change infrastructure somewhat more frequently than we would like, so change the binary caches to use a shared storage account like we already use for asset caching. * blob blob blob * Add quotes * Avoid name stomping. --- .../azure-pipelines/linux/azure-pipelines.yml | 5 ++- .../azure-pipelines/test-modified-ports.ps1 | 43 +++++-------------- .../windows/azure-pipelines.yml | 5 ++- 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index e76ebc5b66cab6..f68f971e5a3219 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -17,6 +17,9 @@ jobs: - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES value: "x-azurl,$(root-url),$(sas),readwrite" + - group: vcpkg-binary-caching-credentials + - name: X_VCPKG_BINARY_SOURCE_STUB + value: "x-azblob,$(root-bin-url),$(sas-bin)" steps: - bash: df -h @@ -42,7 +45,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -UseEnvironmentSasToken -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - bash: | df -h diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index e089d7a1c5ca86..b7d5036b518d65 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -18,9 +18,6 @@ The Azure Pipelines artifacts directory. If not supplied, defaults to the curren .PARAMETER ArchivesRoot Equivalent to '-BinarySourceStub "files,$ArchivesRoot"' -.PARAMETER UseEnvironmentSasToken -Equivalent to '-BinarySourceStub "x-azblob,https://$($env:PROVISIONED_AZURE_STORAGE_NAME).blob.core.windows.net/archives,$($env:PROVISIONED_AZURE_STORAGE_SAS_TOKEN)"' - .PARAMETER BinarySourceStub The type and parameters of the binary source. Shared across runs of this script. If this parameter is not set, binary caching will not be used. Example: "files,W:\" @@ -47,8 +44,6 @@ Param( $ArtifactStagingDirectory = '.', [Parameter(ParameterSetName='ArchivesRoot')] $ArchivesRoot = $null, - [switch] - $UseEnvironmentSasToken = $false, [Parameter(ParameterSetName='BinarySourceStub')] $BinarySourceStub = $null, $BuildReason = $null, @@ -61,25 +56,13 @@ if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/communi throw } -$usingBinaryCaching = $true -if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { - if ([string]::IsNullOrWhiteSpace($ArchivesRoot)) { - if ($UseEnvironmentSasToken) { - $BinarySourceStub = "x-azblob,https://$($env:PROVISIONED_AZURE_STORAGE_NAME).blob.core.windows.net/archives,$($env:PROVISIONED_AZURE_STORAGE_SAS_TOKEN)" - } else { - $usingBinaryCaching = $false - } - } else { - if ($UseEnvironmentSasToken) { - Write-Error "Only one binary caching setting may be used." - throw - } else { - $BinarySourceStub = "files,$ArchivesRoot" - } +if ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot))) { + if ((-Not [string]::IsNullOrWhiteSpace($BinarySourceStub))) { + Write-Error "Only one binary caching setting may be used." + throw } -} elseif ((-Not [string]::IsNullOrWhiteSpace($ArchivesRoot)) -Or $UseEnvironmentSasToken) { - Write-Error "Only one binary caching setting may be used." - throw + + $BinarySourceStub = "files,$ArchivesRoot" } $env:VCPKG_DOWNLOADS = Join-Path $WorkingRoot 'downloads' @@ -87,14 +70,7 @@ $buildtreesRoot = Join-Path $WorkingRoot 'buildtrees' $installRoot = Join-Path $WorkingRoot 'installed' $packagesRoot = Join-Path $WorkingRoot 'packages' -$commonArgs = @() -if ($usingBinaryCaching) { - $commonArgs += @('--binarycaching') -} else { - $commonArgs += @('--no-binarycaching') -} - -$commonArgs += @( +$commonArgs = @( "--x-buildtrees-root=$buildtreesRoot", "--x-install-root=$installRoot", "--x-packages-root=$packagesRoot", @@ -102,7 +78,10 @@ $commonArgs += @( ) $skipFailures = $false -if ($usingBinaryCaching) { +if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { + $commonArgs += @('--no-binarycaching') +} else { + $commonArgs += @('--binarycaching') $binaryCachingMode = 'readwrite' if ([string]::IsNullOrWhiteSpace($BuildReason)) { Write-Host 'Build reason not specified, defaulting to using binary caching in read write mode.' diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 7bd1cab0fa9ab1..b88a5f12036372 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -17,6 +17,9 @@ jobs: - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES value: "x-azurl,$(root-url),$(sas),readwrite" + - group: vcpkg-binary-caching-credentials + - name: X_VCPKG_BINARY_SOURCE_STUB + value: "x-azblob,$(root-bin-url),$(sas-bin)" steps: - task: PowerShell@2 @@ -36,7 +39,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -UseEnvironmentSasToken -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - task: PowerShell@2 displayName: 'Validate version files' From c8f027cc2b37070c57aaa6042f31d05420db3d33 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 3 Sep 2021 15:03:13 +0800 Subject: [PATCH 0434/1858] [qt5-base] Download submodules over https instead of http (#19843) --- ports/qt5-base/cmake/qt_download_submodule.cmake | 4 ++-- ports/qt5-base/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/qt5-base/cmake/qt_download_submodule.cmake b/ports/qt5-base/cmake/qt_download_submodule.cmake index 5210f34d371e99..63850a4ef2a831 100644 --- a/ports/qt5-base/cmake/qt_download_submodule.cmake +++ b/ports/qt5-base/cmake/qt_download_submodule.cmake @@ -15,8 +15,8 @@ function(qt_download_submodule) set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}") set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz") - set(URLS "http://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" - "http://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + set(URLS "https://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" + "https://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}" ) vcpkg_download_distfile(ARCHIVE_FILE URLS ${URLS} diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 0d0c32119661e8..6dd639243e4c32 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 9, + "port-version": 10, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4e7a2d3dce1b11..0f818a104a623b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5234,7 +5234,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 9 + "port-version": 10 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 6fda6b893c7437..8df1a943528664 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13593d8640bdca2663ba5bd497243274e51c4dc3", + "version-semver": "5.15.2", + "port-version": 10 + }, { "git-tree": "2362119eaacd46f6d1b0d27bac82b8851d84448f", "version-semver": "5.15.2", From 652223673b4c4a146024f99b4adca9ac2fcd5af5 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 3 Sep 2021 15:03:38 +0800 Subject: [PATCH 0435/1858] [zlib] Download source over https instead of http (#19842) Co-authored-by: Billy Robert O'Neal III --- ports/zlib/portfile.cmake | 2 +- ports/zlib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zlib.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 572eb09072153e..88e9e0fe486f5c 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -1,7 +1,7 @@ set(VERSION 1.2.11) vcpkg_download_distfile(ARCHIVE_FILE - URLS "http://www.zlib.net/zlib-${VERSION}.tar.gz" "https://downloads.sourceforge.net/project/libpng/zlib/${VERSION}/zlib-${VERSION}.tar.gz" + URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz" "https://downloads.sourceforge.net/project/libpng/zlib/${VERSION}/zlib-${VERSION}.tar.gz" FILENAME "zlib1211.tar.gz" SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae ) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index 39457efec8cabf..fd85f6b122ec1f 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zlib", "version-string": "1.2.11", - "port-version": 11, + "port-version": 12, "description": "A compression library", "homepage": "https://www.zlib.net/" } diff --git a/versions/baseline.json b/versions/baseline.json index 0f818a104a623b..8bcb5dd4cc2070 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6994,7 +6994,7 @@ }, "zlib": { "baseline": "1.2.11", - "port-version": 11 + "port-version": 12 }, "zlib-ng": { "baseline": "2.0.3", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 050e1de28b39b7..41bec9d225ec37 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89dce3592d1a0a275009278b14bd85fd817b4ad9", + "version-string": "1.2.11", + "port-version": 12 + }, { "git-tree": "ad5b59cd3722af26f09921297562dfc76c83dbf8", "version-string": "1.2.11", From ac82c8fe75e3d4c4aef1b17ef7d4a8a3de639416 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 4 Sep 2021 05:14:39 +0800 Subject: [PATCH 0436/1858] [libosmium/libxlsxwriter] Update to the latest version (#19935) * [libosmium/libxlsxwriter] Update to the latest version * Update version files * Update versions/l-/libosmium.json * Attempt to fix version database again. Co-authored-by: Billy Robert O'Neal III --- ports/libosmium/CONTROL | 5 ----- ports/libosmium/portfile.cmake | 21 +++++++++++---------- ports/libosmium/vcpkg.json | 19 +++++++++++++++++++ ports/libxlsxwriter/CONTROL | 5 ----- ports/libxlsxwriter/portfile.cmake | 20 ++++++++++---------- ports/libxlsxwriter/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 4 ++-- versions/l-/libosmium.json | 5 +++++ versions/l-/libxlsxwriter.json | 5 +++++ 9 files changed, 65 insertions(+), 32 deletions(-) delete mode 100644 ports/libosmium/CONTROL create mode 100644 ports/libosmium/vcpkg.json delete mode 100644 ports/libxlsxwriter/CONTROL create mode 100644 ports/libxlsxwriter/vcpkg.json diff --git a/ports/libosmium/CONTROL b/ports/libosmium/CONTROL deleted file mode 100644 index 42b97a70106664..00000000000000 --- a/ports/libosmium/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libosmium -Version: 2.15.5 -Homepage: https://osmcode.org/libosmium/ -Description: A fast and flexible C++ library for working with OpenStreetMap data -Build-Depends: utfcpp, expat, zlib, proj4, bzip2, protozero, boost diff --git a/ports/libosmium/portfile.cmake b/ports/libosmium/portfile.cmake index 9dd5c09e877744..ebc364284db92d 100644 --- a/ports/libosmium/portfile.cmake +++ b/ports/libosmium/portfile.cmake @@ -2,20 +2,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmcode/libosmium - REF v2.15.5 - SHA512 a4972901db8ed89302e6ba15fd104543b5e36a41bc83daf8f6f6fb29ce73b0dbd8596de801d099a33df413b26eec1b3a6f4f0d669936ecc6d25f88d783468a59 + REF b263ba5e85c9ac254fa4090c855ec6f0556795e2 #v2.17.0 + SHA512 fd2955af6153ef58d76cca1e5b83cb70cd33cb616a3e221a80df94ee1256eeeaa5f15f4727cd1023f0335e55d7f3f36e3f9f5490bcd78ba9d267b2075480d1ba ) -set(BOOST_ROOT ${CURRENT_INSTALLED_DIR}) +set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja - OPTIONS -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") \ No newline at end of file diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json new file mode 100644 index 00000000000000..2bd42371b58b87 --- /dev/null +++ b/ports/libosmium/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libosmium", + "version-semver": "2.17.0", + "description": "A fast and flexible C++ library for working with OpenStreetMap data", + "homepage": "https://osmcode.org/libosmium/", + "dependencies": [ + "boost", + "bzip2", + "expat", + "proj4", + "protozero", + "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/ports/libxlsxwriter/CONTROL b/ports/libxlsxwriter/CONTROL deleted file mode 100644 index 2cd6384ce00fd0..00000000000000 --- a/ports/libxlsxwriter/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libxlsxwriter -Version: 0.9.4 -Description: Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file. -Homepage: https://github.com/jmcnamara/libxlsxwriter -Build-Depends: zlib diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index c19db947b8ce64..20700c76c2e0dd 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jmcnamara/libxlsxwriter - REF RELEASE_0.9.4 - SHA512 d7bc319e6b9cd2ad6aaa2f3eb6fdce1c5bcc1d5af23ffb3413e29760191f6aed41f836aaa71a322efe7966f3753a6d8a01cb0b403d682b13a6a3734a87cc12ba - HEAD_REF master + REF 576d169463c7f9990045fd9223f5cf688150def0 #RELEASE_1.1.3 + SHA512 376db117df3ab48a6471d7004fc77fb8bd9b5d9dfaff53675f1bd99c8bc9bec7cadcefbd7116b206ef4703b9146cf097ad3b8aadff36b66302f1c82e8e1fa988 + HEAD_REF master ) if (VCPKG_TARGET_IS_UWP) @@ -12,16 +12,16 @@ else() set(USE_WINDOWSSTORE OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DWINDOWSSTORE=${USE_WINDOWSSTORE} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DWINDOWSSTORE=${USE_WINDOWSSTORE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json new file mode 100644 index 00000000000000..2138d56be6f8c6 --- /dev/null +++ b/ports/libxlsxwriter/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libxlsxwriter", + "version-semver": "1.1.3", + "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.", + "homepage": "https://github.com/jmcnamara/libxlsxwriter", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8bcb5dd4cc2070..f19adb3c636467 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3505,7 +3505,7 @@ "port-version": 0 }, "libosmium": { - "baseline": "2.15.5", + "baseline": "2.17.0", "port-version": 0 }, "libosmscout": { @@ -3813,7 +3813,7 @@ "port-version": 0 }, "libxlsxwriter": { - "baseline": "0.9.4", + "baseline": "1.1.3", "port-version": 0 }, "libxml2": { diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index 1f8a52d8e6b001..7d8e06643abcab 100644 --- a/versions/l-/libosmium.json +++ b/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cfda0b067f25efdb3d3f35421c5eb898cba74c3", + "version-semver": "2.17.0", + "port-version": 0 + }, { "git-tree": "2ee36f73249f1102786deb5e2fea00ef8480de54", "version-string": "2.15.5", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index 59b302feabe8f3..6403a027698b25 100644 --- a/versions/l-/libxlsxwriter.json +++ b/versions/l-/libxlsxwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6355a7b3fb476841c51ccde98e671ca3b181b000", + "version-semver": "1.1.3", + "port-version": 0 + }, { "git-tree": "f4f03a0a0d45dc562ef63a482b4307a3f2c858b9", "version-string": "0.9.4", From 63d60ddfa72cae36ccf3db2535a187732ff0bc5a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 4 Sep 2021 07:31:10 +0800 Subject: [PATCH 0437/1858] [ktx] update to 4.0.0 release (#18644) * [ktx] update to 4.0.0 * update version * fix-arm64-error * update version * fix ci error * update version --- ports/ktx/0001-Use-vcpkg-zstd.patch | 104 ++++++++++++++++++++++++++-- ports/ktx/portfile.cmake | 13 ++-- ports/ktx/vcpkg.json | 5 +- versions/baseline.json | 4 +- versions/k-/ktx.json | 5 ++ 5 files changed, 114 insertions(+), 17 deletions(-) diff --git a/ports/ktx/0001-Use-vcpkg-zstd.patch b/ports/ktx/0001-Use-vcpkg-zstd.patch index 9a39573bf02b21..8dff4a59a9004e 100644 --- a/ports/ktx/0001-Use-vcpkg-zstd.patch +++ b/ports/ktx/0001-Use-vcpkg-zstd.patch @@ -1,16 +1,108 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index de38d5fe..1244ce55 100644 +index 0bdb708..356c160 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -283,9 +283,10 @@ macro(commom_lib_settings lib write ) +@@ -121,7 +121,6 @@ set(KTX_MAIN_SRC + lib/basisu/transcoder/basisu_transcoder.cpp + lib/basisu/transcoder/basisu_transcoder.h + lib/basisu/transcoder/basisu.h +- lib/basisu/zstd/zstd.c + lib/checkheader.c + lib/dfdutils/createdfd.c + lib/dfdutils/colourspaces.c +@@ -227,7 +226,6 @@ macro(commom_lib_settings lib write) + $ + + $ +- $ + + $ + $ +@@ -309,6 +307,11 @@ macro(commom_lib_settings lib write) endif() if(WIN32) + find_package(zstd CONFIG REQUIRED) - target_link_libraries( - ${lib} -- ${CMAKE_CURRENT_SOURCE_DIR}/other_lib/win/Release-x64/zstd_static.lib ++ target_link_libraries( ++ ${lib} + $,zstd::libzstd_shared,zstd::libzstd_static> - ) ++ ) # By wrapping in generator expression we force multi configuration generators (like Visual Studio) # to take the exact path and not change it. + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$>) +diff --git a/lib/basisu/CMakeLists.txt b/lib/basisu/CMakeLists.txt +index 78dd110..e155896 100644 +--- a/lib/basisu/CMakeLists.txt ++++ b/lib/basisu/CMakeLists.txt +@@ -118,7 +118,7 @@ set(BASISU_SRC_LIST ${COMMON_SRC_LIST} + ) + + if (ZSTD) +- set(BASISU_SRC_LIST ${BASISU_SRC_LIST} zstd/zstd.c) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") + endif() + + if (APPLE) +@@ -137,6 +137,10 @@ else() + target_compile_definitions(basisu PRIVATE BASISD_SUPPORT_KTX2_ZSTD=0) + endif() + ++if(ZSTD_LIBRARIES) ++ target_link_libraries(basisu ${ZSTD_LIBRARIES}) ++endif() ++ + if (NOT MSVC) + target_link_libraries(basisu m pthread) + endif() +diff --git a/lib/basisu/webgl/encoder/CMakeLists.txt b/lib/basisu/webgl/encoder/CMakeLists.txt +index e365e1b..6e6a7a5 100644 +--- a/lib/basisu/webgl/encoder/CMakeLists.txt ++++ b/lib/basisu/webgl/encoder/CMakeLists.txt +@@ -36,9 +36,7 @@ if (EMSCRIPTEN) + ) + + if (KTX2_ZSTANDARD) +- set(SRC_LIST ${SRC_LIST} +- ../../zstd/zstd.c +- ) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) + else() + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) +@@ -58,6 +56,10 @@ if (EMSCRIPTEN) + + target_include_directories(basis_encoder.js PRIVATE ../../transcoder) + ++ if(ZSTD_LIBRARIES) ++ target_link_libraries(basis_encoder.js ${ZSTD_LIBRARIES}) ++ endif() ++ + set_target_properties(basis_encoder.js PROPERTIES + OUTPUT_NAME "basis_encoder" + SUFFIX ".js" +diff --git a/lib/basisu/webgl/transcoder/CMakeLists.txt b/lib/basisu/webgl/transcoder/CMakeLists.txt +index 372653d..2e19ece 100644 +--- a/lib/basisu/webgl/transcoder/CMakeLists.txt ++++ b/lib/basisu/webgl/transcoder/CMakeLists.txt +@@ -28,9 +28,7 @@ if (EMSCRIPTEN) + endif() + + if (KTX2_ZSTANDARD) +- set(SRC_LIST ${SRC_LIST} +- ../../zstd/zstddeclib.c +- ) ++ set(ZSTD_LIBRARIES "$,zstd::libzstd_shared,zstd::libzstd_static>") + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=1) + else() + set(ZSTD_DEFINITION BASISD_SUPPORT_KTX2_ZSTD=0) +@@ -44,7 +42,9 @@ if (EMSCRIPTEN) + target_compile_definitions(basis_transcoder.js PRIVATE NDEBUG BASISD_SUPPORT_UASTC=1 BASISD_SUPPORT_BC7=1 BASISD_SUPPORT_ATC=0 BASISD_SUPPORT_ASTC_HIGHER_OPAQUE_QUALITY=0 BASISD_SUPPORT_PVRTC2=0 BASISD_SUPPORT_FXT1=0 BASISD_SUPPORT_ETC2_EAC_RG11=0 BASISU_SUPPORT_ENCODING=0 ${KTX2_DEFINITION} ${ZSTD_DEFINITION} ) + target_compile_options(basis_transcoder.js PRIVATE -O3 -fno-strict-aliasing) + target_include_directories(basis_transcoder.js PRIVATE ../../transcoder) +- ++ if(ZSTD_LIBRARIES) ++ target_link_libraries(basis_transcoder.js ${ZSTD_LIBRARIES}) ++ endif() + set_target_properties(basis_transcoder.js PROPERTIES + OUTPUT_NAME "basis_transcoder" + SUFFIX ".js" diff --git a/ports/ktx/portfile.cmake b/ports/ktx/portfile.cmake index c5cbe1f99cfb8a..8731a85b8928e9 100644 --- a/ports/ktx/portfile.cmake +++ b/ports/ktx/portfile.cmake @@ -1,12 +1,12 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86") +vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm64") -set(PORT_VERSION 4.0.0-beta5) +set(PORT_VERSION 4.0.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/KTX-Software REF v${PORT_VERSION} - SHA512 0ee0672413eaa8cbfacab13bfab9935be23fadcd63253012d9710f3f9ce9b0d62c43d50c652e47cb44d2878b20377026e65f3d37cdb1dd36b1c0241da250606a + SHA512 49787cf0230939ae0c737f6080ef483dd27ebd653c16525b469b078511ab72e85aecba9bffe71ed45ce1692e8448b845e60545c39f9333e6d216b20f56595faa HEAD_REF master FILE_DISAMBIGUATOR 1 PATCHES @@ -33,8 +33,9 @@ endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools KTX_FEATURE_TOOLS - vulkan KTX_FEATURE_VULKAN + FEATURES + tools KTX_FEATURE_TOOLS + vulkan KTX_FEATURE_VULKAN ) vcpkg_configure_cmake( @@ -65,7 +66,7 @@ if(tools IN_LIST FEATURES) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx TARGET_PATH share/${PORT}) +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ktx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") diff --git a/ports/ktx/vcpkg.json b/ports/ktx/vcpkg.json index 42d06e8ee92b3a..ae905f55d89c46 100644 --- a/ports/ktx/vcpkg.json +++ b/ports/ktx/vcpkg.json @@ -1,10 +1,9 @@ { "name": "ktx", - "version-string": "4.0.0-beta5", - "port-version": 2, + "version": "4.0.0", "description": "A small library of functions for writing and reading KTX files, and instantiating OpenGL®, OpenGL ESâ„¢ï¸ and Vulkan® textures from them", "homepage": "https://github.com/KhronosGroup/KTX-Software", - "supports": "!(uwp | x86)", + "supports": "!(uwp | x86 | arm64)", "dependencies": [ "zstd" ], diff --git a/versions/baseline.json b/versions/baseline.json index f19adb3c636467..60c44c92beb306 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3005,8 +3005,8 @@ "port-version": 0 }, "ktx": { - "baseline": "4.0.0-beta5", - "port-version": 2 + "baseline": "4.0.0", + "port-version": 0 }, "kubazip": { "baseline": "0.1.19", diff --git a/versions/k-/ktx.json b/versions/k-/ktx.json index 935f983b37c0b1..21db2789d2a52d 100644 --- a/versions/k-/ktx.json +++ b/versions/k-/ktx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb7f4de2ff7141cda0da61c7a0419559fc30c53a", + "version": "4.0.0", + "port-version": 0 + }, { "git-tree": "7a9d8e946937d795afa8a57d63357aa76be2d4ce", "version-string": "4.0.0-beta5", From e906d682415d8ec0733994e944946b052e195efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Sat, 4 Sep 2021 01:41:20 +0200 Subject: [PATCH 0438/1858] [kf5crash] fix cmake.in to allow consumption by static builds (#19179) * [kf5crash] fix cmake.in to allow consumption by static builds * [kf5crash] update versions * [kf5crash] kcrash is supported on Win and macOS, too * [kf5crash] update versions * [kf5crash] replace deprecated functions * [kf5crash] update versions * [kf5crash] don't overzealously delete folders * [kf5crash] update versions * [kf5crash] proactively disable docs * [kf5crash] use semVer * [kf5crash] update versions * [kf5crash] remove extraneous options * [kf5crash] update versions * [kf5crash] wrap paths in quotes * [kf5crash] update versions * [kf5crash] remove bin folders in static build * [kf5crash] update versions * [kf5crash] rename patch file * [kf5crash] update versions * [kf5crash] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5crash] update versions --- ports/kf5crash/portfile.cmake | 25 +++++++++-------- ports/kf5crash/support_static_builds.patch | 31 ++++++++++++++++++++++ ports/kf5crash/vcpkg.json | 12 +++++++-- versions/baseline.json | 2 +- versions/k-/kf5crash.json | 5 ++++ 5 files changed, 61 insertions(+), 14 deletions(-) create mode 100644 ports/kf5crash/support_static_builds.patch diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 96837708e635c6..32dc7ff8e70882 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -4,25 +4,28 @@ vcpkg_from_github( REF v5.84.0 SHA512 db37a481e0d34e0024cabd77c22680171fa383ea300c56c73f807380fd818263d27f36fb012fc6604b462dbf9374db39bab94c4dc2c3bff488ac9812d01eb2dd HEAD_REF master + PATCHES + support_static_builds.patch # https://invent.kde.org/frameworks/kcrash/-/merge_requests/23 ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Crash) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Crash CONFIG_PATH lib/cmake/KF5Crash) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/data") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5crash/support_static_builds.patch b/ports/kf5crash/support_static_builds.patch new file mode 100644 index 00000000000000..4c5eb8e529aa5d --- /dev/null +++ b/ports/kf5crash/support_static_builds.patch @@ -0,0 +1,31 @@ +From dc45a01fec854b5e2a49196e82e1a336ab642764 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Wed, 28 Jul 2021 03:04:39 +0200 +Subject: [PATCH] Support static builds + +--- + KF5CrashConfig.cmake.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/KF5CrashConfig.cmake.in b/KF5CrashConfig.cmake.in +index 0222495..494c810 100644 +--- a/KF5CrashConfig.cmake.in ++++ b/KF5CrashConfig.cmake.in +@@ -5,6 +5,14 @@ + include(CMakeFindDependencyMacro) + find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(KF5CoreAddons REQUIRED) ++ find_dependency(KF5WindowSystem REQUIRED) ++ ++ if (@X11_FOUND@) ++ find_dependency(Qt5X11Extras REQUIRED) ++ endif() ++endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5CrashTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 3e60efd0de7b73..6976bb5d41d5f3 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,9 +1,9 @@ { "name": "kf5crash", - "version": "5.84.0", + "version-semver": "5.84.0", + "port-version": 1, "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", - "supports": "linux", "dependencies": [ "ecm", "kf5coreaddons", @@ -11,6 +11,14 @@ { "name": "qt5-x11extras", "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 60c44c92beb306..08cd9a94da74f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2918,7 +2918,7 @@ }, "kf5crash": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5dbusaddons": { "baseline": "5.84.0", diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index f1113293923cd2..6260690df55dc8 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b4122c60d561d232fbd5294a304be12509b736d", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "e316c8fc3bd2c92825a198615d99b61ede2986cb", "version": "5.84.0", From 1302f6c38dc82a4af2b702ceb70f58538ae5aa86 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 3 Sep 2021 17:42:38 -0600 Subject: [PATCH 0439/1858] [icu] fixes for macOS dynamic lib install (#19441) * fixes for macOS dynamic lib install * bump port version * remove mingw change * move install outside of conditional * update portfile hash Co-authored-by: Billy Robert O'Neal III --- ports/icu/portfile.cmake | 16 +++++----------- ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 8533c384aa5499..bd67c0711c09f9 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -116,18 +116,10 @@ if(VCPKG_TARGET_IS_OSX AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND (NOT DEF WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/lib" LOGNAME "make-build-fix-rpath-${RELEASE_TRIPLET}" ) - - # make install - vcpkg_execute_build_process( - COMMAND bash --noprofile --norc -c "make install" - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}" - LOGNAME "make-install-${RELEASE_TRIPLET}") - message(STATUS "Package ${RELEASE_TRIPLET} done") - -else() - vcpkg_install_make() endif() +vcpkg_install_make() + if(VCPKG_TARGET_IS_MINGW) file(GLOB ICU_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX} @@ -147,7 +139,9 @@ file(REMOVE_RECURSE file(GLOB TEST_LIBS ${CURRENT_PACKAGES_DIR}/lib/*test* ${CURRENT_PACKAGES_DIR}/debug/lib/*test*) -file(REMOVE ${TEST_LIBS}) +if(TEST_LIBS) + file(REMOVE ${TEST_LIBS}) +endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index c4f6e3c4b4f24b..4473713fa4f73a 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 12, + "port-version": 13, "description": "Mature and widely used Unicode and localization library.", "homepage": "http://icu-project.org/apiref/icu4c/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 08cd9a94da74f5..5527193635fd3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2590,7 +2590,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 12 + "port-version": 13 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index cf7ef20da17416..cd747442b5fab3 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8c36cdfe8059aadefd80b2d5800a5d9f3494cd6", + "version": "69.1", + "port-version": 13 + }, { "git-tree": "02bcc079d00e16237aa0d1af449d7663581a1525", "version": "69.1", From 661301dd590906e91969ef7518b2ba7ee9d159a7 Mon Sep 17 00:00:00 2001 From: Xing Ji <33065325+jixingcn@users.noreply.github.com> Date: Sat, 4 Sep 2021 08:00:07 +0800 Subject: [PATCH 0440/1858] [pystring] rename `libpystring` to `pystring` (#19740) * rename `libpystring` to `pystring` * run `vcpkg x-add-version --all` * [pystring] Simplify CMake * [pystring] Use target name as per opencolorio Co-authored-by: Robert Schumacher --- ports/pystring/CMakeLists.txt | 26 +++++++++++++++++++------- ports/pystring/portfile.cmake | 7 ++++--- ports/pystring/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/p-/pystring.json | 5 +++++ 5 files changed, 41 insertions(+), 13 deletions(-) diff --git a/ports/pystring/CMakeLists.txt b/ports/pystring/CMakeLists.txt index ca410d6dc3eccc..48df849192b0fa 100644 --- a/ports/pystring/CMakeLists.txt +++ b/ports/pystring/CMakeLists.txt @@ -1,19 +1,31 @@ -cmake_minimum_required(VERSION 3.5.1) -project(libpystring C CXX) +cmake_minimum_required(VERSION 3.12) +project(pystring CXX) if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS) endif() -add_library(libpystring pystring.cpp) +add_library(pystring pystring.cpp) +target_include_directories( + pystring + PUBLIC + $ + $ +) + +include(GNUInstallDirs) install( - TARGETS libpystring - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + TARGETS pystring + EXPORT pystring-config ) if(NOT DISABLE_INSTALL_HEADERS) install(FILES pystring.h DESTINATION include/pystring) endif() + +install( + EXPORT pystring-config + NAMESPACE pystring:: + DESTINATION share/pystring +) diff --git a/ports/pystring/portfile.cmake b/ports/pystring/portfile.cmake index 24a038aa5e0d2b..31143c5c9cab97 100644 --- a/ports/pystring/portfile.cmake +++ b/ports/pystring/portfile.cmake @@ -10,13 +10,14 @@ vcpkg_from_github( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pystring RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/pystring/vcpkg.json b/ports/pystring/vcpkg.json index f9b0dcaff44346..4011f52e790ce6 100644 --- a/ports/pystring/vcpkg.json +++ b/ports/pystring/vcpkg.json @@ -1,7 +1,17 @@ { "name": "pystring", "version-semver": "1.1.3", - "port-version": 3, + "port-version": 4, "description": "Pystring is a collection of C++ functions which match the interface and behavior of python's string class methods using std::string", - "homepage": "https://github.com/imageworks/pystring" + "homepage": "https://github.com/imageworks/pystring", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5527193635fd3a..0bdd977162f099 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5174,7 +5174,7 @@ }, "pystring": { "baseline": "1.1.3", - "port-version": 3 + "port-version": 4 }, "python2": { "baseline": "2.7.18", diff --git a/versions/p-/pystring.json b/versions/p-/pystring.json index d89279e5ad2031..7fef6450f65e29 100644 --- a/versions/p-/pystring.json +++ b/versions/p-/pystring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed5bf60bd6e1720457de5eaa39f01f5b3a414f01", + "version-semver": "1.1.3", + "port-version": 4 + }, { "git-tree": "f79bc19acdfb0e0d9445191d54f89234c27db843", "version-semver": "1.1.3", From b129ccd6e51ef72df7b2258a42d13265129ab88b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sat, 4 Sep 2021 02:00:37 +0200 Subject: [PATCH 0441/1858] [folly] also support arm64 (#19738) --- ports/folly/portfile.cmake | 6 ++++-- ports/folly/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/folly.json | 5 +++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index a2e8a436e88ac7..21df520bf86dd1 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -1,5 +1,7 @@ -if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - message(FATAL_ERROR "Folly only supports the x64 architecture.") +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "x86" "arm" "arm64") +else() + vcpkg_fail_port_install(ON_ARCH "x86" "arm") endif() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index e7762e6cf923e2..453e08e9c36c1e 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,9 +1,10 @@ { "name": "folly", "version-string": "2021.06.14.00", + "port-version": 1, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", - "supports": "x64", + "supports": "x64 | (arm64 & !windows)", "dependencies": [ "boost-chrono", "boost-context", diff --git a/versions/baseline.json b/versions/baseline.json index 0bdd977162f099..3f19fa544f6b29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2098,7 +2098,7 @@ }, "folly": { "baseline": "2021.06.14.00", - "port-version": 0 + "port-version": 1 }, "font-chef": { "baseline": "1.0.1", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 28e912a52ddf90..473a4c1c694c94 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92b7d618fda609b74ea8862c9950e40a9f03418d", + "version-string": "2021.06.14.00", + "port-version": 1 + }, { "git-tree": "4a11b9cd2ca209a5277f7b90bc8d1c6c6b501079", "version-string": "2021.06.14.00", From cabf7a99b2187c7d778cef0bf0d1b7182bd2d989 Mon Sep 17 00:00:00 2001 From: Rayan Date: Sat, 4 Sep 2021 08:01:51 +0800 Subject: [PATCH 0442/1858] [catch2] Guard build type for Catch2 (#19793) * guard build type for catch2 * update port-version * update baseline & version --- ports/catch2/portfile.cmake | 13 ++++++++----- ports/catch2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/catch2.json | 5 +++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ports/catch2/portfile.cmake b/ports/catch2/portfile.cmake index b157b48cdcf4c4..140e1cba1f2fc2 100644 --- a/ports/catch2/portfile.cmake +++ b/ports/catch2/portfile.cmake @@ -18,11 +18,14 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - -file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/share/catch2") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/Catch2" "${CURRENT_PACKAGES_DIR}/share/catch2_") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/catch2_" "${CURRENT_PACKAGES_DIR}/share/catch2") +endif() +if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/Catch2" "${CURRENT_PACKAGES_DIR}/debug/share/catch2_") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/catch2_" "${CURRENT_PACKAGES_DIR}/debug/share/catch2") +endif() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Catch2") vcpkg_fixup_pkgconfig() diff --git a/ports/catch2/vcpkg.json b/ports/catch2/vcpkg.json index dc2af5075b1af4..83dd9ff3df7a61 100644 --- a/ports/catch2/vcpkg.json +++ b/ports/catch2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "catch2", "version-semver": "2.13.7", + "port-version": 1, "description": "A modern, header-only test framework for unit testing.", "homepage": "https://github.com/catchorg/Catch2", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3f19fa544f6b29..7dbea8563f2fcd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1166,7 +1166,7 @@ }, "catch2": { "baseline": "2.13.7", - "port-version": 0 + "port-version": 1 }, "cccapstone": { "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json index 5986f9ef0d828f..ff3158afeb8d5b 100644 --- a/versions/c-/catch2.json +++ b/versions/c-/catch2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4df380019e5c3a0e450798db43d9ce70906b7aad", + "version-semver": "2.13.7", + "port-version": 1 + }, { "git-tree": "900833643e0eb468d957b4c46f46ba6647e283ff", "version-semver": "2.13.7", From 2ed9f1efca8c86cb972b97ff72acd2f3b87ffd74 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sat, 4 Sep 2021 02:03:15 +0200 Subject: [PATCH 0443/1858] [simdutf] add new port (#19742) --- ports/simdutf/portfile.cmake | 18 ++++++++++++++++++ ports/simdutf/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/simdutf.json | 9 +++++++++ 4 files changed, 47 insertions(+) create mode 100644 ports/simdutf/portfile.cmake create mode 100644 ports/simdutf/vcpkg.json create mode 100644 versions/s-/simdutf.json diff --git a/ports/simdutf/portfile.cmake b/ports/simdutf/portfile.cmake new file mode 100644 index 00000000000000..c9e6bead82443c --- /dev/null +++ b/ports/simdutf/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO simdutf/simdutf + REF v1.0.0 + SHA512 3ab09aa61cb9765bf1a77de59c5b823ee58ae5e4badfd5dd70e511fd4f378f8d3917a5b577e7f275720b975740344968132ce0b3f628452bde67f2ab6cc82337 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE-APACHE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/simdutf/vcpkg.json b/ports/simdutf/vcpkg.json new file mode 100644 index 00000000000000..67f03f8e237737 --- /dev/null +++ b/ports/simdutf/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "simdutf", + "version-semver": "1.0.0", + "description": "Unicode validation and transcoding at billions of characters per second", + "homepage": "https://github.com/simdutf/simdutf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 7dbea8563f2fcd..9d229293851aab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5924,6 +5924,10 @@ "baseline": "0.9.7", "port-version": 0 }, + "simdutf": { + "baseline": "1.0.0", + "port-version": 0 + }, "simple-fft": { "baseline": "2020-06-14", "port-version": 0 diff --git a/versions/s-/simdutf.json b/versions/s-/simdutf.json new file mode 100644 index 00000000000000..628e03575ed8bb --- /dev/null +++ b/versions/s-/simdutf.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "86279d4e90015257171464027e3658544c748342", + "version-semver": "1.0.0", + "port-version": 0 + } + ] +} From 0fb7a684954bb7fb9be638eb62152563e903a2cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Sat, 4 Sep 2021 02:04:00 +0200 Subject: [PATCH 0444/1858] [quill] Update to 1.6.3 (#19827) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [quill] Update to 1.6.3 * [quill] Update version files Co-authored-by: Rémy Tassoux --- ports/quill/CONTROL | 7 ------- ports/quill/portfile.cmake | 4 ++-- ports/quill/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 5 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 ports/quill/CONTROL create mode 100644 ports/quill/vcpkg.json diff --git a/ports/quill/CONTROL b/ports/quill/CONTROL deleted file mode 100644 index 5faedf02199fc1..00000000000000 --- a/ports/quill/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: quill -Version: 1.6.2 -Port-Version: 0 -Homepage: https://github.com/odygrd/quill/ -Description: C++14 Asynchronous Low Latency Logging Library -Supports: !(uwp|android) -Build-Depends: fmt diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 8fb5be21060f83..c0893aa8fa3ad8 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO odygrd/quill - REF v1.6.2 - SHA512 c1db04c96c70b6bced38ecc83b4bba9e60b02cf13ff48ab92132ceb828414fcf046cb2c41337a4ae321b0bad8598eb280a7edcc30e0720d7609898e15d514380 + REF v1.6.3 + SHA512 e75aca827fe0833422da0d38df482cbc39db0e43dcc3cb791f3e2649f7022dcc448831a5ede85daf6feada60a2d5eaf312a3411abbba92fb9d76466336a7244d HEAD_REF master ) diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json new file mode 100644 index 00000000000000..a3441a033aa28a --- /dev/null +++ b/ports/quill/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "quill", + "version-semver": "1.6.3", + "description": "C++14 Asynchronous Low Latency Logging Library", + "homepage": "https://github.com/odygrd/quill/", + "supports": "!(uwp | android)", + "dependencies": [ + "fmt" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 9d229293851aab..f1e27bb49e3933 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5513,7 +5513,7 @@ "port-version": 0 }, "quill": { - "baseline": "1.6.2", + "baseline": "1.6.3", "port-version": 0 }, "quirc": { diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 5cf510cf354596..027adcae43b2a3 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6ee8372d06d69dda719c955d24baa1f61924f86", + "version-semver": "1.6.3", + "port-version": 0 + }, { "git-tree": "0e3b811db3b65c4239a657bfd1a2fae470a8096a", "version-string": "1.6.2", From bfabea07647b0045dca51a299c89175c2a10c8a7 Mon Sep 17 00:00:00 2001 From: yemreinci <18687880+yemreinci@users.noreply.github.com> Date: Sat, 4 Sep 2021 03:05:18 +0300 Subject: [PATCH 0445/1858] [hazelcast-cpp-client] update to v4.2.0 (#19853) * update hazelcast-cpp-client to 4.2.0 * run x-add-version --- ports/hazelcast-cpp-client/portfile.cmake | 4 ++-- ports/hazelcast-cpp-client/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hazelcast-cpp-client.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/hazelcast-cpp-client/portfile.cmake b/ports/hazelcast-cpp-client/portfile.cmake index 4d2199c38b3998..d7f7278b65fa18 100644 --- a/ports/hazelcast-cpp-client/portfile.cmake +++ b/ports/hazelcast-cpp-client/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hazelcast/hazelcast-cpp-client - REF v4.1.1 - SHA512 2f6d578c43dfc8c03f83a5b7c98fe67b7dc450cbc542031e625ec3bc91b9ec2e430e3ced670608a651fcf77775d2d4a333ca82689cae793e8b13a8e0438bbfb9 + REF v4.2.0 + SHA512 7dc91968c95930d966c9bf005c0756c3702b9f27d96543bd6beffd20be36f9d9840676be2e9473b68f5cfa420c39c6feef0d7538270c798633aad5d0714df56c HEAD_REF master ) diff --git a/ports/hazelcast-cpp-client/vcpkg.json b/ports/hazelcast-cpp-client/vcpkg.json index 810cce2356d653..42879c11df3cca 100644 --- a/ports/hazelcast-cpp-client/vcpkg.json +++ b/ports/hazelcast-cpp-client/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hazelcast-cpp-client", - "version-semver": "4.1.1", + "version-semver": "4.2.0", "description": "C++ client library for Hazelcast in-memory database.", "homepage": "https://github.com/hazelcast/hazelcast-cpp-client", "documentation": "http://hazelcast.github.io/hazelcast-cpp-client/index.html", diff --git a/versions/baseline.json b/versions/baseline.json index f1e27bb49e3933..0f55a098346fc1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2517,7 +2517,7 @@ "port-version": 0 }, "hazelcast-cpp-client": { - "baseline": "4.1.1", + "baseline": "4.2.0", "port-version": 0 }, "hdf5": { diff --git a/versions/h-/hazelcast-cpp-client.json b/versions/h-/hazelcast-cpp-client.json index 8d18d93bb89848..f1795c7bfaf7d0 100644 --- a/versions/h-/hazelcast-cpp-client.json +++ b/versions/h-/hazelcast-cpp-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3b0181d25656c1a524f51a5aca0279faba58318", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "17cace53a35339535e20e587090ae1c6c16f5a3d", "version-semver": "4.1.1", From 469e7f749f3a7f30a405560645a06e3fe1bcb212 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 3 Sep 2021 17:05:59 -0700 Subject: [PATCH 0446/1858] [maintainer-guide.md] Add short names note. (#19956) --- docs/maintainers/maintainer-guide.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index b0dd0c4b79826f..e459fa36676c8d 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -23,7 +23,10 @@ then obviously beneficial changes like fixing typos are appreciated! A good service to check many at once is [Repology](https://repology.org/). If the library you are adding could be confused with another one, -consider renaming to make it clear. +consider renaming to make it clear. We prefer when names are longer and/or +unlikely to conflict with any future use of the same name. If the port refers +to a library on GitHub, a good practice is to prefix the name with the organization +if there is any chance of confusion. ### Use GitHub Draft PRs From 9f22d5d7db9ebee004f7404cd68c39aed1ff6a4a Mon Sep 17 00:00:00 2001 From: Llewellyn Falco Date: Sat, 4 Sep 2021 00:07:24 +0000 Subject: [PATCH 0447/1858] [approval-tests-cpp] Update to 10.11.0 (#19941) * [approval-tests-cpp] Update to 10.11.0 * add version files Co-authored-by: Billy Robert O'Neal III --- ports/approval-tests-cpp/portfile.cmake | 10 +++++----- ports/approval-tests-cpp/vcpkg.json | 2 +- versions/a-/approval-tests-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/approval-tests-cpp/portfile.cmake b/ports/approval-tests-cpp/portfile.cmake index f5c60a96ecfdc4..bd16f3b09b2a30 100644 --- a/ports/approval-tests-cpp/portfile.cmake +++ b/ports/approval-tests-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_download_distfile(single_header - URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.10.0/ApprovalTests.v.10.10.0.hpp - FILENAME ApprovalTests.v.10.10.0.hpp - SHA512 909302175fcaa23aea9839a8276a1c20b654e8544600bfb05d6bb76bc6a635f51ef6efe437ac07e01391724b2dc0e31cbf16bcb688fbec1ef3e378b027a6eb64 + URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.11.0/ApprovalTests.v.10.11.0.hpp + FILENAME ApprovalTests.v.10.11.0.hpp + SHA512 2b43792b28a1dd44d76584c4d3bb9cb99563f92fdeafefd747516a8cfe0baf118b27ad235e1b023b3f5f3a34ecf920c12ab8a6d337776efc036456f4277142ae ) vcpkg_download_distfile(license_file - URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.10.0/LICENSE - FILENAME ApprovalTestsLicense.v.10.10.0 + URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.11.0/LICENSE + FILENAME ApprovalTestsLicense.v.10.11.0 SHA512 dc6b68d13b8cf959644b935f1192b02c71aa7a5cf653bd43b4480fa89eec8d4d3f16a2278ec8c3b40ab1fdb233b3173a78fd83590d6f739e0c9e8ff56c282557 ) diff --git a/ports/approval-tests-cpp/vcpkg.json b/ports/approval-tests-cpp/vcpkg.json index f4e2d3e40641af..32c085ca2bf624 100644 --- a/ports/approval-tests-cpp/vcpkg.json +++ b/ports/approval-tests-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "approval-tests-cpp", - "version": "10.10.0", + "version": "10.11.0", "description": "Approval Tests allow you to verify a chunk of output (such as a file) in one operation as opposed to writing test assertions for each element.", "homepage": "https://github.com/approvals/ApprovalTests.cpp" } diff --git a/versions/a-/approval-tests-cpp.json b/versions/a-/approval-tests-cpp.json index bcda7b3fb2eb94..2ea2ad460b1cd6 100644 --- a/versions/a-/approval-tests-cpp.json +++ b/versions/a-/approval-tests-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42def472fd3039fb2e54a41a6980822a20518eff", + "version": "10.11.0", + "port-version": 0 + }, { "git-tree": "a1134cf4c5199fef643ff13362b568948df8cc55", "version": "10.10.0", diff --git a/versions/baseline.json b/versions/baseline.json index 0f55a098346fc1..f9bc7d72e529c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -101,7 +101,7 @@ "port-version": 0 }, "approval-tests-cpp": { - "baseline": "10.10.0", + "baseline": "10.11.0", "port-version": 0 }, "apr": { From ad707e8858350d6743c8ac358cf929c7ebc075fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Sat, 4 Sep 2021 02:12:24 +0200 Subject: [PATCH 0448/1858] [docs] Fix a typo in CMAKE_DISABLE_FIND_PACKAGE command (#19829) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index b0dd0c4b7..48ea75d08 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -154,7 +154,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -CMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} ) ``` --- docs/maintainers/maintainer-guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index e459fa36676c8d..c2dd9cb72502fb 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -157,7 +157,7 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -CMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} + -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${CMAKE_DISABLE_FIND_PACKAGE_ZLIB} ) ``` From 967e93f11ad73fd5098d244eea8189f571f945fc Mon Sep 17 00:00:00 2001 From: Alvin Date: Sat, 4 Sep 2021 08:15:27 +0800 Subject: [PATCH 0449/1858] [co] Add new port (#19535) * add package co * add version * fix support * fix version * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/co/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * using features instead of dependency * update version schema * fix portfile * fix hash * add comments & cleanup * fix hash * update portfile * up hash Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/co/portfile.cmake | 34 ++++++++++++++++++++++++++++++++++ ports/co/vcpkg.json | 33 +++++++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/co.json | 9 +++++++++ 4 files changed, 80 insertions(+) create mode 100644 ports/co/portfile.cmake create mode 100644 ports/co/vcpkg.json create mode 100644 versions/c-/co.json diff --git a/ports/co/portfile.cmake b/ports/co/portfile.cmake new file mode 100644 index 00000000000000..a4b4a08d5799d9 --- /dev/null +++ b/ports/co/portfile.cmake @@ -0,0 +1,34 @@ +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + vcpkg_fail_port_install(ON_ARCH "arm" ON_TAREGT "uwp") +endif() + +# It's not safe to use dynamic library, as we hooked some system APIs in CO. +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO idealvin/co + REF 82b9f75dcd114c69d2b9c2c5a13ce2c3b95ba99f #v2.0.1 + SHA512 ec33c5b920adf8b5e5500ed7c9768bd595ba2b568b604f26f953ddb5d04e411e8a2ea05b213595a44cafbadf90c1e1661208855301b2b47295ccc6e20f36e8d8 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + libcurl WITH_LIBCURL + openssl WITH_OPENSSL +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/co/vcpkg.json b/ports/co/vcpkg.json new file mode 100644 index 00000000000000..70adff17214b58 --- /dev/null +++ b/ports/co/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "co", + "version-semver": "2.0.1", + "description": "A go-style coroutine library in C++11 and more", + "homepage": "https://github.com/idealvin/co", + "supports": "!uwp & !(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "libcurl": { + "description": "libcurl with OpenSSL support", + "dependencies": [ + { + "name": "curl", + "default-features": false, + "features": [ + "openssl" + ] + } + ] + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index f9bc7d72e529c6..d0b4731ae1ec17 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1352,6 +1352,10 @@ "baseline": "1.1.7", "port-version": 1 }, + "co": { + "baseline": "2.0.1", + "port-version": 0 + }, "coin": { "baseline": "4.0.0", "port-version": 2 diff --git a/versions/c-/co.json b/versions/c-/co.json new file mode 100644 index 00000000000000..165d9e3ff01d92 --- /dev/null +++ b/versions/c-/co.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c9f30ca17733d2c0f4b071ca90d6500c456ac7d0", + "version-semver": "2.0.1", + "port-version": 0 + } + ] +} From 3077cc7225024ea4435275ebb85abdcd2b76fdda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Sat, 4 Sep 2021 02:17:46 +0200 Subject: [PATCH 0450/1858] [kf5globalaccel] new port (#19757) * Add kf5globalaccel port * Revert "Add kf5globalaccel port" This reverts commit f1ac3db8e2019f474a09d6964aea8e21bc9da166. * Add kf5globalaccel port * Fixed kf5globalaccel for windows * [kf5globalaccel] update to 5.75.0 * [kf5globalaccel] update to 5.84.0 * [kf5globalaccel] use vcpkg_copy_tools * [kf5globalaccel] only remove what's needed * [kf5globalaccel] wrap paths in quotes * [kf5globalaccel] use semVer * [kf5globalaccel] update versions * [kf5globalaccel] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5globalaccel] update versions Co-authored-by: Kuntal Majumder --- ports/kf5globalaccel/portfile.cmake | 31 +++++++++++++++++++++++++++++ ports/kf5globalaccel/vcpkg.json | 28 ++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5globalaccel.json | 9 +++++++++ 4 files changed, 72 insertions(+) create mode 100644 ports/kf5globalaccel/portfile.cmake create mode 100644 ports/kf5globalaccel/vcpkg.json create mode 100644 versions/k-/kf5globalaccel.json diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake new file mode 100644 index 00000000000000..dbdbbdf8f03ba7 --- /dev/null +++ b/ports/kf5globalaccel/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kglobalaccel + REF v5.84.0 + SHA512 2b18c708175572dd9787fde799f6dc01ab2e0006dfb75ef95d357ae91cf4dda6c719c58e4b08fd10038ad5b6e404adeb359f63371ec7ee0887e349e8ce469c51 + HEAD_REF master +) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kglobalaccel5 + AUTO_CLEAN + ) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json new file mode 100644 index 00000000000000..c6afe6043fb12a --- /dev/null +++ b/ports/kf5globalaccel/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "kf5globalaccel", + "version-semver": "5.84.0", + "description": "lobal desktop keyboard shortcuts", + "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5windowsystem", + "qt5-base", + "qt5-tools", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d0b4731ae1ec17..2ed32d4e2b3b5e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2928,6 +2928,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5globalaccel": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5guiaddons": { "baseline": "5.84.0", "port-version": 2 diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json new file mode 100644 index 00000000000000..32bfc0d44c71d7 --- /dev/null +++ b/versions/k-/kf5globalaccel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "de0672be2e76751be304b4856466b9df6deaa29f", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From 68f09e2a31aaa50b21b04eca9550e1ac996ba7bb Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 4 Sep 2021 08:37:20 +0800 Subject: [PATCH 0451/1858] [libmupdf/liblinear/libkeyfinder] Update to latest version (#19959) * [libmupdf/liblinear/libkeyfinder] Update to latest version * update version * update vcpkg.json format * update version --- ports/libkeyfinder/portfile.cmake | 17 +++++++++-------- ports/libkeyfinder/vcpkg.json | 12 ++++++++++-- ports/liblinear/CONTROL | 5 ----- ports/liblinear/portfile.cmake | 19 +++++++++---------- ports/liblinear/vcpkg.json | 17 +++++++++++++++++ ports/libmupdf/CONTROL | 6 ------ ports/libmupdf/portfile.cmake | 15 +++++++-------- ports/libmupdf/vcpkg.json | 26 ++++++++++++++++++++++++++ versions/baseline.json | 6 +++--- versions/l-/libkeyfinder.json | 5 +++++ versions/l-/liblinear.json | 5 +++++ versions/l-/libmupdf.json | 5 +++++ 12 files changed, 96 insertions(+), 42 deletions(-) delete mode 100644 ports/liblinear/CONTROL create mode 100644 ports/liblinear/vcpkg.json delete mode 100644 ports/libmupdf/CONTROL create mode 100644 ports/libmupdf/vcpkg.json diff --git a/ports/libkeyfinder/portfile.cmake b/ports/libkeyfinder/portfile.cmake index 0eba972be2ebce..8b06add324f093 100644 --- a/ports/libkeyfinder/portfile.cmake +++ b/ports/libkeyfinder/portfile.cmake @@ -1,24 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mixxxdj/libkeyfinder - REF v2.2.4 - SHA512 6673b9a81dbfa3693fc4e7af4e5fc0f351f0c60b00fdafeb9e3437e2f77b5fec7d1e78e3989ff1daca72770a1d3cdbe3837508718b8e8aba3ac3f3d56af81a56 + REF v2.2.5 + SHA512 54463d1f1111dc474d3e43723fddd5579ea1a3842f99f43e50e85622a1d6ee6fe42b22c300ce5ba5807cf6b2d7067af741773af95974a42c5d863c53165893eb HEAD_REF main ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - test BUILD_TESTING + FEATURES + test BUILD_TESTING ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KeyFinder TARGET_PATH share/KeyFinder) +vcpkg_cmake_config_fixup(PACKAGE_NAME KeyFinder CONFIG_PATH lib/cmake/KeyFinder) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libkeyfinder/vcpkg.json b/ports/libkeyfinder/vcpkg.json index c1fa0a6a83ef0a..c52f0c914978a8 100644 --- a/ports/libkeyfinder/vcpkg.json +++ b/ports/libkeyfinder/vcpkg.json @@ -1,11 +1,19 @@ { "name": "libkeyfinder", - "version-string": "2.2.4", + "version-string": "2.2.5", "description": "Musical key detection for digital audio", "homepage": "https://github.com/mixxxdj/libkeyfinder", "license": "GPL-3.0-or-later", "dependencies": [ - "fftw3" + "fftw3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "test": { diff --git a/ports/liblinear/CONTROL b/ports/liblinear/CONTROL deleted file mode 100644 index 03a915a14344b8..00000000000000 --- a/ports/liblinear/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: liblinear -Version: 241 -Homepage: https://github.com/cjlin1/liblinear -Description: A Library for Large Linear Classification -Supports: !uwp diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake index b48f03cd8aad86..fab41c0396829e 100644 --- a/ports/liblinear/portfile.cmake +++ b/ports/liblinear/portfile.cmake @@ -3,27 +3,26 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cjlin1/liblinear - REF 2381122d05bbb1e4ee24b522298dd548f0ec0d24 #v241 - SHA512 ee784b6325681b3d9e3dc0b59f4a703d87be35fb898cc16df93e4a814a959d530736a8451be4f0f2c856769d81e3f5acbcd6f0f8677425e700597e3502f9f36d + REF 60f1adf6f35d6f3e031c334b33dfe8399d6f8a9d #v243 + SHA512 0f88f8dd768313d0a9b3bb82e7b878d7173ea43ef609e993dc79e94398897373faf2688249b17111e2b6e06e78e26a50570a1b746dc4e73fb7416ccc24936c66 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(NOT DISABLE_INSTALL_TOOLS) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblinear) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/liblinear") endif() -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/liblinear/vcpkg.json b/ports/liblinear/vcpkg.json new file mode 100644 index 00000000000000..a65229aa0d1b19 --- /dev/null +++ b/ports/liblinear/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "liblinear", + "version-string": "243", + "description": "A Library for Large Linear Classification", + "homepage": "https://github.com/cjlin1/liblinear", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL deleted file mode 100644 index 7283b524e00054..00000000000000 --- a/ports/libmupdf/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libmupdf -Version: 1.18.0 -Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec, gumbo -Homepage: https://github.com/ArtifexSoftware/mupdf -Description: a lightweight PDF, XPS, and E-book library -Supports: !osx diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index 9836bbf349e42d..7eb51680f3994e 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -5,25 +5,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArtifexSoftware/mupdf - REF ea5799e01730c4aa15cddd1023700e4f7b78cc27 # 1.18.0 - SHA512 4904565e900970939f93bf4326df86851e699699c8e49df7abdbedf6ba3e9d26b74691710b2019d04bba2dea11c7880fe4418b643866128828e388500aa666c2 + REF af0e25cec567868a04eaacf6410c395712fe4b90 #1.18.1-so-3.11.14 + SHA512 3dc6b75964d93af84921ee30a5b14e0ab84d16afa31f97a0fbf62e2006ace62f9c0366d1c3872cd678dab71eb23a422daeca0eb0b5db58e434f27657bbf9b5bc HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(COPY ${SOURCE_PATH}/include/mupdf DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/include/mupdf" DESTINATION "${CURRENT_PACKAGES_DIR}/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmupdf/vcpkg.json b/ports/libmupdf/vcpkg.json new file mode 100644 index 00000000000000..f0342c005e66d5 --- /dev/null +++ b/ports/libmupdf/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libmupdf", + "version-string": "1.18.1-so-3.11.14", + "description": "a lightweight PDF, XPS, and E-book library", + "homepage": "https://github.com/ArtifexSoftware/mupdf", + "supports": "!osx", + "dependencies": [ + "curl", + "freetype", + "glfw3", + "gumbo", + "harfbuzz", + "jbig2dec", + "libjpeg-turbo", + "openjpeg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 2ed32d4e2b3b5e..b7003381243be9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3361,7 +3361,7 @@ "port-version": 0 }, "libkeyfinder": { - "baseline": "2.2.4", + "baseline": "2.2.5", "port-version": 0 }, "libkml": { @@ -3381,7 +3381,7 @@ "port-version": 0 }, "liblinear": { - "baseline": "241", + "baseline": "243", "port-version": 0 }, "liblo": { @@ -3457,7 +3457,7 @@ "port-version": 0 }, "libmupdf": { - "baseline": "1.18.0", + "baseline": "1.18.1-so-3.11.14", "port-version": 0 }, "libmysql": { diff --git a/versions/l-/libkeyfinder.json b/versions/l-/libkeyfinder.json index b3738e716ab195..3ec54157c557a0 100644 --- a/versions/l-/libkeyfinder.json +++ b/versions/l-/libkeyfinder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2f8022bca9bc70894c26b7d73437eadfa9b9bca", + "version-string": "2.2.5", + "port-version": 0 + }, { "git-tree": "0ea7e74c79c626ed0185ee546a684293663cf651", "version-string": "2.2.4", diff --git a/versions/l-/liblinear.json b/versions/l-/liblinear.json index 1cb52696bdabcb..bc5f622669df61 100644 --- a/versions/l-/liblinear.json +++ b/versions/l-/liblinear.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a1acaef662beb37406c20bf6293109025f8df1b", + "version-string": "243", + "port-version": 0 + }, { "git-tree": "32c7a7c42530041f778e5a00b54c43ebcc0839d9", "version-string": "241", diff --git a/versions/l-/libmupdf.json b/versions/l-/libmupdf.json index 0d3ff20be1926c..5015bebc1bea26 100644 --- a/versions/l-/libmupdf.json +++ b/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20a08f46ae4e7bd7afa7eaad146a2709bd782ea3", + "version-string": "1.18.1-so-3.11.14", + "port-version": 0 + }, { "git-tree": "df4714ec8c7080d91b3fc0ed0db8c91557d1bfbf", "version-string": "1.18.0", From c3ae6bf7f923f5725c7e80653f064723b63d2ea8 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Sat, 4 Sep 2021 02:37:59 +0200 Subject: [PATCH 0452/1858] [sentry-native] Update port to use new vcpkg cmake scripts (#19839) Signed-off-by: Vitalii Koshura --- ports/sentry-native/portfile.cmake | 7 +++---- ports/sentry-native/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/portfile.cmake b/ports/sentry-native/portfile.cmake index e538c122227dbb..64165b1c5eac50 100644 --- a/ports/sentry-native/portfile.cmake +++ b/ports/sentry-native/portfile.cmake @@ -30,9 +30,8 @@ if (NOT DEFINED SENTRY_BACKEND) endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DSENTRY_BUILD_TESTS=OFF -DSENTRY_BUILD_EXAMPLES=OFF @@ -40,13 +39,13 @@ vcpkg_configure_cmake( -DCRASHPAD_ZLIB_SYSTEM=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sentry TARGET_PATH share/sentry) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sentry) if (SENTRY_BACKEND STREQUAL "crashpad") vcpkg_copy_tools( diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 84840940e50f45..012a0d2e6321f1 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sentry-native", "version-semver": "0.4.12", + "port-version": 1, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", @@ -9,6 +10,14 @@ "name": "curl", "platform": "!windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index b7003381243be9..6512e015b557e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5858,7 +5858,7 @@ }, "sentry-native": { "baseline": "0.4.12", - "port-version": 0 + "port-version": 1 }, "septag-sx": { "baseline": "2019-05-07-2", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 8db9ae5506bb01..a8f936318430e6 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6281c2a09a664a34db72684ff944c5920925e33e", + "version-semver": "0.4.12", + "port-version": 1 + }, { "git-tree": "85e3e8c19428a75c746ff7389f86746f1a7ef93f", "version-semver": "0.4.12", From efd47b4f37aa6c05f1786b56010820a907f909b4 Mon Sep 17 00:00:00 2001 From: Dorq <44760523+aizuon@users.noreply.github.com> Date: Sat, 4 Sep 2021 03:38:46 +0300 Subject: [PATCH 0453/1858] [libigl] fix imgui feature (#19746) * [libigl] fix imgui feature * run x-add-version --- ports/libigl/CONTROL | 4 ++-- versions/baseline.json | 2 +- versions/l-/libigl.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libigl/CONTROL b/ports/libigl/CONTROL index bc0ce7ef3598b6..bec0967746f470 100644 --- a/ports/libigl/CONTROL +++ b/ports/libigl/CONTROL @@ -1,6 +1,6 @@ Source: libigl Version: 2.2.0 -Port-Version: 4 +Port-Version: 5 Homepage: https://github.com/libigl/libigl Description: libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB. Build-Depends: eigen3 @@ -20,7 +20,7 @@ Build-Depends: libigl[core, opengl], glfw3 Feature: imgui Description: Build with imgui -Build-Depends: libigl[core, glfw], imgui[core, glfw-binding, opengl3-glew-binding, libigl-imgui] +Build-Depends: libigl[core, glfw], imgui[core, glfw-binding, opengl3-binding, libigl-imgui] Feature: xml Description: Build with libxml diff --git a/versions/baseline.json b/versions/baseline.json index 6512e015b557e1..a01465b54c8047 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3338,7 +3338,7 @@ }, "libigl": { "baseline": "2.2.0", - "port-version": 4 + "port-version": 5 }, "libilbc": { "baseline": "3.0.3", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index 04095ebf5a75e6..b72f54b761d283 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09f126e97a2f0d9e76a1109d6855bbdd4cab9c9d", + "version-string": "2.2.0", + "port-version": 5 + }, { "git-tree": "d150e0cc468dec8769382b413a5c477a0682f1fd", "version-string": "2.2.0", From d03d792cf9585fb64b770f8e05ac88345c7c76a7 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 3 Sep 2021 22:16:43 -0700 Subject: [PATCH 0454/1858] [simdutf] Disable benchmarks and tests. (#19987) --- .../disable-tests-and-benchmarks.patch | 22 +++++++++++++++++++ ports/simdutf/portfile.cmake | 4 +++- ports/simdutf/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/simdutf.json | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ports/simdutf/disable-tests-and-benchmarks.patch diff --git a/ports/simdutf/disable-tests-and-benchmarks.patch b/ports/simdutf/disable-tests-and-benchmarks.patch new file mode 100644 index 00000000000000..d621f6d7abff9c --- /dev/null +++ b/ports/simdutf/disable-tests-and-benchmarks.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5453644..d3f2869 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,17 +14,10 @@ include(cmake/simdutf-flags.cmake) + + set(SIMDUTF_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) + +-enable_testing() + add_subdirectory(src) +-add_subdirectory(tests) + + + +-if(CMAKE_CXX_COMPILER_ID MATCHES GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) +- message(STATUS "The benchmark tool requires GCC 8.0 or better.") +-else() +- add_subdirectory(benchmarks) +-endif() + + + # ---- Install rules ---- diff --git a/ports/simdutf/portfile.cmake b/ports/simdutf/portfile.cmake index c9e6bead82443c..809247a8c63c81 100644 --- a/ports/simdutf/portfile.cmake +++ b/ports/simdutf/portfile.cmake @@ -2,8 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdutf/simdutf REF v1.0.0 - SHA512 3ab09aa61cb9765bf1a77de59c5b823ee58ae5e4badfd5dd70e511fd4f378f8d3917a5b577e7f275720b975740344968132ce0b3f628452bde67f2ab6cc82337 + SHA512 3ab09aa61cb9765bf1a77de59c5b823ee58ae5e4badfd5dd70e511fd4f378f8d3917a5b577e7f275720b975740344968132ce0b3f628452bde67f2ab6cc82337 HEAD_REF master + PATCHES + disable-tests-and-benchmarks.patch ) vcpkg_cmake_configure( diff --git a/ports/simdutf/vcpkg.json b/ports/simdutf/vcpkg.json index 67f03f8e237737..68ddc24a221a04 100644 --- a/ports/simdutf/vcpkg.json +++ b/ports/simdutf/vcpkg.json @@ -1,6 +1,7 @@ { "name": "simdutf", "version-semver": "1.0.0", + "port-version": 1, "description": "Unicode validation and transcoding at billions of characters per second", "homepage": "https://github.com/simdutf/simdutf", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a01465b54c8047..6124d116988564 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5934,7 +5934,7 @@ }, "simdutf": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "simple-fft": { "baseline": "2020-06-14", diff --git a/versions/s-/simdutf.json b/versions/s-/simdutf.json index 628e03575ed8bb..f102a45a358923 100644 --- a/versions/s-/simdutf.json +++ b/versions/s-/simdutf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d32f4a5bb9643b561a26f555064b2341a93df4b", + "version-semver": "1.0.0", + "port-version": 1 + }, { "git-tree": "86279d4e90015257171464027e3658544c748342", "version-semver": "1.0.0", From 0cde558415e1027284c0d98e71d59e4d5839efb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Sat, 4 Sep 2021 07:20:10 +0200 Subject: [PATCH 0455/1858] [kf5solid] Fix CMake config; some extra fixes (#19810) * [kf5solid] require bison >= 3.0 * [kf5solid] fix CMake config file * [kf5solid] some apps actually use solid-hardware5 diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index b876b00c0..53cf1841b 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -44,6 +44,11 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid) vcpkg_copy_pdbs() +vcpkg_copy_tools( + TOOL_NAMES solid-hardware5 + AUTO_CLEAN + ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() @@ -51,9 +56,6 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# solid-hardware and solid-power are a non-dev tools allowing to list hardware and power managament status of one's system. No need to keep them. -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml") * [kf5solid] /etc is empty, no need to remove it * [kf5solid] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5solid] update versions --- ports/kf5solid/fix_config_cmake.patch | 36 +++++++++++++++++++++++ ports/kf5solid/portfile.cmake | 41 ++++++++++++++------------- ports/kf5solid/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/k-/kf5solid.json | 5 ++++ 5 files changed, 65 insertions(+), 20 deletions(-) create mode 100644 ports/kf5solid/fix_config_cmake.patch diff --git a/ports/kf5solid/fix_config_cmake.patch b/ports/kf5solid/fix_config_cmake.patch new file mode 100644 index 00000000000000..d099bb082ba91b --- /dev/null +++ b/ports/kf5solid/fix_config_cmake.patch @@ -0,0 +1,36 @@ +From c1e261d57383533a008f0c02689dd0292d4dc75a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Tue, 31 Aug 2021 02:18:42 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5SolidConfig.cmake.in | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in +index b597b3a..0a23f44 100644 +--- a/KF5SolidConfig.cmake.in ++++ b/KF5SolidConfig.cmake.in +@@ -19,6 +19,19 @@ set(SOLID_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@") + include(CMakeFindDependencyMacro) + find_dependency(Qt5Core @REQUIRED_QT_VERSION@) + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) ++ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) ++ ++ if (@Qt5DBus_FOUND@) ++ find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if (@UDev_FOUND@) ++ find_dependency(UDev) ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5SolidTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ + +-- +GitLab + diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 36602f6aad8333..849281621f3998 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -4,23 +4,24 @@ vcpkg_from_github( REF v5.84.0 SHA512 b6452e56c6029289450850c1fcfff96da0005f8dfa03f1817754910945e3ccadd8502e330a4484a5c5e9a8d5525838c8090268bb083639062dfca7176852c159 HEAD_REF master + PATCHES + fix_config_cmake.patch # https://invent.kde.org/frameworks/solid/-/merge_requests/53 ) if(VCPKG_TARGET_IS_OSX) - # In Darwin platform, there can be an old version of `bison`, - # Which can't be used for `gst-build`. It requires 2.4+ - vcpkg_find_acquire_program(BISON) - execute_process( - COMMAND ${BISON} --version - OUTPUT_VARIABLE BISON_OUTPUT - ) - string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") - set(BISON_MAJOR ${CMAKE_MATCH_1}) - set(BISON_MINOR ${CMAKE_MATCH_2}) - message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") - if(NOT (BISON_MAJOR GREATER_EQUAL 2 AND BISON_MINOR GREATER_EQUAL 4)) - message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") - endif() + # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0). + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() endif() vcpkg_find_acquire_program(BISON) @@ -40,19 +41,21 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid) vcpkg_copy_pdbs() +vcpkg_copy_tools( + TOOL_NAMES solid-hardware5 + AUTO_CLEAN + ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# solid-hardware and solid-power are a non-dev tools allowing to list hardware and power managament status of one's system. No need to keep them. -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml") diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index e0177169476f42..fa67c524da94b8 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5solid", "version-semver": "5.84.0", + "port-version": 1, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6124d116988564..d33a0c6b15e8d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2962,7 +2962,7 @@ }, "kf5solid": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5sonnet": { "baseline": "5.84.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index a47818aa808c51..e449cf69991886 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f726a86d2961fd90661f27469d1e77b2b75c612", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "4ddc168b71ca68e8c765edca7a018753871b84e6", "version-semver": "5.84.0", From bd30c5741a3bbeb2d95ae88078596236d740c70d Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Sat, 4 Sep 2021 07:25:12 +0200 Subject: [PATCH 0456/1858] [OpenCV] fix protobuf references (#19770) * [OpenCV] fix protobuf targets * [OpenCV] fix port versions * [OpenCV] fix references --- ports/opencv3/0001-disable-downloading.patch | 2 -- ports/opencv3/0002-install-options.patch | 6 ----- .../0003-force-package-requirements.patch | 2 -- ports/opencv3/0004-fix-eigen.patch | 2 -- ports/opencv3/0005-fix-vtk9.patch | 18 ------------- ports/opencv3/0006-fix-uwp.patch | 2 -- ports/opencv3/0007-fix-hdf5.patch | 2 -- ports/opencv3/0008-devendor-quirc.patch | 4 --- ports/opencv3/0009-fix-protobuf.patch | 26 +++++++++++++++++++ .../opencv3/0010-fix-uwp-tiff-imgcodecs.patch | 2 -- ports/opencv3/portfile.cmake | 1 + ports/opencv3/vcpkg.json | 1 + ports/opencv4/0001-disable-downloading.patch | 2 -- ports/opencv4/0002-install-options.patch | 8 ------ .../0003-force-package-requirements.patch | 2 -- ports/opencv4/0004-fix-policy-CMP0057.patch | 2 -- ports/opencv4/0005-fix-eigen.patch | 2 -- ports/opencv4/0006-fix-uwp.patch | 2 -- ports/opencv4/0007-fix-hdf5.patch | 2 -- ports/opencv4/0008-devendor-quirc.patch | 4 --- ports/opencv4/0009-fix-protobuf.patch | 26 +++++++++++++++++++ .../opencv4/0010-fix-uwp-tiff-imgcodecs.patch | 2 -- ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 1 + versions/baseline.json | 4 +-- versions/o-/opencv3.json | 5 ++++ versions/o-/opencv4.json | 5 ++++ 27 files changed, 68 insertions(+), 68 deletions(-) create mode 100644 ports/opencv3/0009-fix-protobuf.patch create mode 100644 ports/opencv4/0009-fix-protobuf.patch diff --git a/ports/opencv3/0001-disable-downloading.patch b/ports/opencv3/0001-disable-downloading.patch index 41131c6a811b21..e2c886d455f229 100644 --- a/ports/opencv3/0001-disable-downloading.patch +++ b/ports/opencv3/0001-disable-downloading.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake -index 63cf6d3..01e84a5 100644 --- a/cmake/OpenCVDownload.cmake +++ b/cmake/OpenCVDownload.cmake @@ -157,6 +157,9 @@ function(ocv_download) diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 481f17651e451a..2c76f7d1c0f572 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6a2da5..10aa531 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -607,7 +607,7 @@ endif() @@ -11,8 +9,6 @@ index f6a2da5..10aa531 100644 include(cmake/OpenCVDetectPython.cmake) endif() -diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 303d4f4..b727937 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -284,7 +284,6 @@ if(MSVC) @@ -23,8 +19,6 @@ index 303d4f4..b727937 100644 set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") -diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake -index c7f9fc2..a1f657b 100644 --- a/cmake/OpenCVGenConfig.cmake +++ b/cmake/OpenCVGenConfig.cmake @@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index 097e8abf8f8034..dd12caad531ab1 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 2d28dff..6dbeca9 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -11,7 +11,7 @@ else() diff --git a/ports/opencv3/0004-fix-eigen.patch b/ports/opencv3/0004-fix-eigen.patch index ec8f6a489ca046..196542dcdd2ea6 100644 --- a/ports/opencv3/0004-fix-eigen.patch +++ b/ports/opencv3/0004-fix-eigen.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake -index 3753084..0aeb31a 100644 --- a/cmake/OpenCVFindLibsPerf.cmake +++ b/cmake/OpenCVFindLibsPerf.cmake @@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) diff --git a/ports/opencv3/0005-fix-vtk9.patch b/ports/opencv3/0005-fix-vtk9.patch index 2dfdee8f651ff7..967cc9e94d32d8 100644 --- a/ports/opencv3/0005-fix-vtk9.patch +++ b/ports/opencv3/0005-fix-vtk9.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake -index 1495688..e5c6049 100644 --- a/cmake/OpenCVDetectVTK.cmake +++ b/cmake/OpenCVDetectVTK.cmake @@ -1,12 +1,30 @@ @@ -111,8 +109,6 @@ index 65571a1..e9a470c 100644 while (polygons->GetNextCell(nr_cell_points, cell_points)) { *poly_ptr++ = nr_cell_points; -diff --git a/modules/viz/src/vizimpl.cpp b/modules/viz/src/vizimpl.cpp -index 23cba75..89f1249 100644 --- a/modules/viz/src/vizimpl.cpp +++ b/modules/viz/src/vizimpl.cpp @@ -55,8 +55,17 @@ cv::viz::Viz3d::VizImpl::VizImpl(const String &name) : spin_once_state_(false), @@ -135,8 +131,6 @@ index 23cba75..89f1249 100644 window_->AddRenderer(renderer_); // Create the interactor style -diff --git a/modules/viz/src/vtk/vtkOBJWriter.cpp b/modules/viz/src/vtk/vtkOBJWriter.cpp -index 296b6eb..2e5764f 100644 --- a/modules/viz/src/vtk/vtkOBJWriter.cpp +++ b/modules/viz/src/vtk/vtkOBJWriter.cpp @@ -72,7 +72,7 @@ void cv::viz::vtkOBJWriter::WriteData() @@ -188,8 +182,6 @@ index 296b6eb..2e5764f 100644 vtkCellArray *cells = input->GetStrips(); for (cells->InitTraversal(); cells->GetNextCell(npts, index); ) { -diff --git a/modules/viz/src/vtk/vtkXYZReader.cpp b/modules/viz/src/vtk/vtkXYZReader.cpp -index 57726ea..3b9265f 100644 --- a/modules/viz/src/vtk/vtkXYZReader.cpp +++ b/modules/viz/src/vtk/vtkXYZReader.cpp @@ -77,7 +77,7 @@ int cv::viz::vtkXYZReader::RequestData(vtkInformation*, vtkInformationVector**, @@ -201,8 +193,6 @@ index 57726ea..3b9265f 100644 if(!fin) { vtkErrorMacro("Error opening file " << this->FileName); -diff --git a/modules/viz/src/vtk/vtkXYZWriter.cpp b/modules/viz/src/vtk/vtkXYZWriter.cpp -index cf95e3c..56a26b3 100644 --- a/modules/viz/src/vtk/vtkXYZWriter.cpp +++ b/modules/viz/src/vtk/vtkXYZWriter.cpp @@ -69,7 +69,7 @@ void cv::viz::vtkXYZWriter::WriteData() @@ -214,8 +204,6 @@ index cf95e3c..56a26b3 100644 if (outfilep->fail()) { vtkErrorMacro(<< "Unable to open file: "<< this->FileName); -diff --git a/modules/viz/test/test_tutorial2.cpp b/modules/viz/test/test_tutorial2.cpp -index 6b2972f..a4b5b99 100644 --- a/modules/viz/test/test_tutorial2.cpp +++ b/modules/viz/test/test_tutorial2.cpp @@ -28,7 +28,7 @@ static void tutorial2() @@ -236,8 +224,6 @@ index 6b2972f..a4b5b99 100644 } } -diff --git a/modules/viz/test/test_tutorial3.cpp b/modules/viz/test/test_tutorial3.cpp -index 232130f..32e33b1 100644 --- a/modules/viz/test/test_tutorial3.cpp +++ b/modules/viz/test/test_tutorial3.cpp @@ -48,7 +48,7 @@ static void tutorial3(bool camera_pov) @@ -249,8 +235,6 @@ index 232130f..32e33b1 100644 } TEST(Viz, tutorial3_global_view) -diff --git a/modules/viz/test/test_viz3d.cpp b/modules/viz/test/test_viz3d.cpp -index cdf8a00..4ab05c3 100644 --- a/modules/viz/test/test_viz3d.cpp +++ b/modules/viz/test/test_viz3d.cpp @@ -59,7 +59,7 @@ TEST(Viz_viz3d, DISABLED_develop) @@ -262,8 +246,6 @@ index cdf8a00..4ab05c3 100644 } }} // namespace -diff --git a/modules/viz/test/tests_simple.cpp b/modules/viz/test/tests_simple.cpp -index 12d696d..5584483 100644 --- a/modules/viz/test/tests_simple.cpp +++ b/modules/viz/test/tests_simple.cpp @@ -56,7 +56,7 @@ TEST(Viz, show_cloud_bluberry) diff --git a/ports/opencv3/0006-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch index 13048d030750c3..cc0216b16435c4 100644 --- a/ports/opencv3/0006-fix-uwp.patch +++ b/ports/opencv3/0006-fix-uwp.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 5501b99..578b00e 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -1188,7 +1188,7 @@ function(ocv_add_perf_tests) diff --git a/ports/opencv3/0007-fix-hdf5.patch b/ports/opencv3/0007-fix-hdf5.patch index de81c79b2cee4e..8e7e154ad40671 100644 --- a/ports/opencv3/0007-fix-hdf5.patch +++ b/ports/opencv3/0007-fix-hdf5.patch @@ -1,5 +1,3 @@ -diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt -index 2a1ae68..e40a192 100644 --- a/modules/hdf/CMakeLists.txt +++ b/modules/hdf/CMakeLists.txt @@ -1,25 +1,8 @@ diff --git a/ports/opencv3/0008-devendor-quirc.patch b/ports/opencv3/0008-devendor-quirc.patch index 1dc11ffd787aeb..76803851bf94e8 100644 --- a/ports/opencv3/0008-devendor-quirc.patch +++ b/ports/opencv3/0008-devendor-quirc.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 10aa531..74e5ca4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -778,7 +778,7 @@ if(WITH_OPENVX) @@ -11,8 +9,6 @@ index 10aa531..74e5ca4 100644 set(HAVE_QUIRC TRUE) endif() # ---------------------------------------------------------------------------- -diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt -index 414e578..4f26d75 100644 --- a/modules/objdetect/CMakeLists.txt +++ b/modules/objdetect/CMakeLists.txt @@ -2,7 +2,5 @@ set(the_description "Object Detection") diff --git a/ports/opencv3/0009-fix-protobuf.patch b/ports/opencv3/0009-fix-protobuf.patch new file mode 100644 index 00000000000000..38572e309f8469 --- /dev/null +++ b/ports/opencv3/0009-fix-protobuf.patch @@ -0,0 +1,26 @@ +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF) + set(HAVE_PROTOBUF TRUE) + else() + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(Protobuf CONFIG REQUIRED) + + # Backwards compatibility + # Define camel case versions of input variables +@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF) + if(NOT BUILD_PROTOBUF) + if(TARGET "${Protobuf_LIBRARIES}") + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE) ++ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG) + if(NOT __location) + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION) + endif() +@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF) + endif() + list(APPEND CUSTOM_STATUS_protobuf " Protobuf:" + BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" +- ELSE "${__location} (${Protobuf_VERSION})") ++ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})") + endif() diff --git a/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch b/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch index 02fbaedd5484cc..0bd3d701b959fc 100644 --- a/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch +++ b/ports/opencv3/0010-fix-uwp-tiff-imgcodecs.patch @@ -1,5 +1,3 @@ -diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt -index 24f89e6..435deb6 100644 --- a/modules/imgcodecs/CMakeLists.txt +++ b/modules/imgcodecs/CMakeLists.txt @@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 618f2f17013222..751f6423e69d74 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( 0005-fix-vtk9.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch + 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch ) diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 6c88ac069601ee..6ed1d5032bcdae 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv3", "version": "3.4.15", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/opencv4/0001-disable-downloading.patch b/ports/opencv4/0001-disable-downloading.patch index 41131c6a811b21..e2c886d455f229 100644 --- a/ports/opencv4/0001-disable-downloading.patch +++ b/ports/opencv4/0001-disable-downloading.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVDownload.cmake b/cmake/OpenCVDownload.cmake -index 63cf6d3..01e84a5 100644 --- a/cmake/OpenCVDownload.cmake +++ b/cmake/OpenCVDownload.cmake @@ -157,6 +157,9 @@ function(ocv_download) diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index b681c066c1c6fc..a551023c3bf85b 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 49abe01..b51bcde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -616,7 +616,7 @@ endif() @@ -11,8 +9,6 @@ index 49abe01..b51bcde 100644 include(cmake/OpenCVDetectPython.cmake) endif() -diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 6e56a2e..11034db 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -286,7 +286,6 @@ if(MSVC) @@ -23,8 +19,6 @@ index 6e56a2e..11034db 100644 set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") set(OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_MODULE_LINKER_FLAGS_RELEASE} /debug") -diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake -index 838852c..04906b3 100644 --- a/cmake/OpenCVGenConfig.cmake +++ b/cmake/OpenCVGenConfig.cmake @@ -114,11 +114,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) @@ -50,8 +44,6 @@ index 838852c..04906b3 100644 if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 1f0d720..0bb1ff7 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,8 +1,6 @@ diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index 80101a51df4cbb..15ce3756be50ee 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 23a6ca6..8ea5497 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake @@ -11,7 +11,7 @@ else() diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch index bc7b21de56d9e7..d126d9d96a14e7 100644 --- a/ports/opencv4/0004-fix-policy-CMP0057.patch +++ b/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -1,5 +1,3 @@ -diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt -index 534fcf0..a02460c 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -1,3 +1,4 @@ diff --git a/ports/opencv4/0005-fix-eigen.patch b/ports/opencv4/0005-fix-eigen.patch index ec8f6a489ca046..196542dcdd2ea6 100644 --- a/ports/opencv4/0005-fix-eigen.patch +++ b/ports/opencv4/0005-fix-eigen.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake -index 3753084..0aeb31a 100644 --- a/cmake/OpenCVFindLibsPerf.cmake +++ b/cmake/OpenCVFindLibsPerf.cmake @@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) diff --git a/ports/opencv4/0006-fix-uwp.patch b/ports/opencv4/0006-fix-uwp.patch index 02589858331b12..ec315b4980a897 100644 --- a/ports/opencv4/0006-fix-uwp.patch +++ b/ports/opencv4/0006-fix-uwp.patch @@ -1,5 +1,3 @@ -diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 7c48aad..0d261b0 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -1205,7 +1205,7 @@ function(ocv_add_perf_tests) diff --git a/ports/opencv4/0007-fix-hdf5.patch b/ports/opencv4/0007-fix-hdf5.patch index de81c79b2cee4e..8e7e154ad40671 100644 --- a/ports/opencv4/0007-fix-hdf5.patch +++ b/ports/opencv4/0007-fix-hdf5.patch @@ -1,5 +1,3 @@ -diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt -index 2a1ae68..e40a192 100644 --- a/modules/hdf/CMakeLists.txt +++ b/modules/hdf/CMakeLists.txt @@ -1,25 +1,8 @@ diff --git a/ports/opencv4/0008-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch index d5a3f624cace47..62b02ce0ad0d84 100644 --- a/ports/opencv4/0008-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b51bcde..15edc92 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -803,7 +803,7 @@ if(WITH_OPENVX) @@ -11,8 +9,6 @@ index b51bcde..15edc92 100644 set(HAVE_QUIRC TRUE) endif() -diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt -index 3fa0c5d..f4c0ad6 100644 --- a/modules/objdetect/CMakeLists.txt +++ b/modules/objdetect/CMakeLists.txt @@ -2,7 +2,5 @@ set(the_description "Object Detection") diff --git a/ports/opencv4/0009-fix-protobuf.patch b/ports/opencv4/0009-fix-protobuf.patch new file mode 100644 index 00000000000000..38572e309f8469 --- /dev/null +++ b/ports/opencv4/0009-fix-protobuf.patch @@ -0,0 +1,26 @@ +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF) + set(HAVE_PROTOBUF TRUE) + else() + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(Protobuf CONFIG REQUIRED) + + # Backwards compatibility + # Define camel case versions of input variables +@@ -76,6 +76,7 @@ if(HAVE_PROTOBUF) + if(NOT BUILD_PROTOBUF) + if(TARGET "${Protobuf_LIBRARIES}") + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_RELEASE) ++ get_target_property(__location_debug "${Protobuf_LIBRARIES}" IMPORTED_LOCATION_DEBUG) + if(NOT __location) + get_target_property(__location "${Protobuf_LIBRARIES}" IMPORTED_LOCATION) + endif() +@@ -87,5 +88,5 @@ if(HAVE_PROTOBUF) + endif() + list(APPEND CUSTOM_STATUS_protobuf " Protobuf:" + BUILD_PROTOBUF THEN "build (${Protobuf_VERSION})" +- ELSE "${__location} (${Protobuf_VERSION})") ++ ELSE "optimized ${__location} debug ${__location_debug} ; version (${Protobuf_VERSION})") + endif() diff --git a/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch b/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch index 02fbaedd5484cc..0bd3d701b959fc 100644 --- a/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch +++ b/ports/opencv4/0010-fix-uwp-tiff-imgcodecs.patch @@ -1,5 +1,3 @@ -diff --git a/modules/imgcodecs/CMakeLists.txt b/modules/imgcodecs/CMakeLists.txt -index 24f89e6..435deb6 100644 --- a/modules/imgcodecs/CMakeLists.txt +++ b/modules/imgcodecs/CMakeLists.txt @@ -9,6 +9,10 @@ ocv_add_module(imgcodecs opencv_imgproc WRAP java objc python) diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 72d389d52e4425..e965dd2a07a461 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( 0005-fix-eigen.patch 0006-fix-uwp.patch 0008-devendor-quirc.patch + 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch ) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 7edc329f4801cc..dce331bf1de4e9 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,6 +1,7 @@ { "name": "opencv4", "version": "4.5.3", + "port-version": 1, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d33a0c6b15e8d8..57b5280efc4c4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4674,11 +4674,11 @@ }, "opencv3": { "baseline": "3.4.15", - "port-version": 0 + "port-version": 1 }, "opencv4": { "baseline": "4.5.3", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 69366e64d78559..281f9897008b1b 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47b6ae97aeb00ba20b231fdbb2fa043cdc5de2c5", + "version": "3.4.15", + "port-version": 1 + }, { "git-tree": "cb4ed9774da974697dde70c75cbf9639e9209673", "version": "3.4.15", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index befb61c69fe7b8..2b404d7c4f9e63 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d18da7f0c17619f7912a5d53b0316c7a18d625a", + "version": "4.5.3", + "port-version": 1 + }, { "git-tree": "f7110f51e74414c1111a6403d1979f7786c5f2ad", "version": "4.5.3", From 689925d608865e5a213679d83ec2dbe3365870d6 Mon Sep 17 00:00:00 2001 From: Liu Chenxin Date: Sat, 4 Sep 2021 13:36:23 +0800 Subject: [PATCH 0457/1858] [libssh] add static build support for MinGW subsystem (#19854) * add MinGW subsystem support for nana * update port version * [nana] update versions * format-manifest * add static build support for MingW subsystem Co-authored-by: Billy Robert ONeal III Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libssh/0002-mingw_for_Android.patch | 12 ++++++++---- ports/libssh/0003-create_symlink_unix_only.patch | 16 ++++++++++++++++ ports/libssh/CONTROL | 2 +- ports/libssh/portfile.cmake | 1 + versions/baseline.json | 2 +- versions/l-/libssh.json | 5 +++++ 6 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 ports/libssh/0003-create_symlink_unix_only.patch diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch index e0e3472b11fcff..973f6eafa9671b 100644 --- a/ports/libssh/0002-mingw_for_Android.patch +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -1,12 +1,16 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt (revision 0cceefd49d4d397eb21bd36e314ac87739da51ff) -+++ b/src/CMakeLists.txt (date 1617870624653) -@@ -361,7 +361,7 @@ +index ccf5a33..8e88494 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -361,9 +361,9 @@ if (WITH_VISIBILITY_HIDDEN) set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") endif (WITH_VISIBILITY_HIDDEN) -if (MINGW) +if (MINGW AND NOT ANDROID) set_target_properties(ssh PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup") - set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE") +- set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE") ++ set_property(TARGET ssh APPEND PROPERTY COMPILE_FLAGS "-D_POSIX_SOURCE") endif () + + diff --git a/ports/libssh/0003-create_symlink_unix_only.patch b/ports/libssh/0003-create_symlink_unix_only.patch new file mode 100644 index 00000000000000..140d7e1c8449fc --- /dev/null +++ b/ports/libssh/0003-create_symlink_unix_only.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1f5b0bf..6559468 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -206,9 +206,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) + add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET}) + + # Link compile database for clangd ++if(UNIX) + execute_process(COMMAND cmake -E create_symlink + "${CMAKE_BINARY_DIR}/compile_commands.json" + "${CMAKE_SOURCE_DIR}/compile_commands.json") ++endif() + + message(STATUS "********************************************") + message(STATUS "********** ${PROJECT_NAME} build options : **********") diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL index 5f7ee61c17f9aa..cec23294e1244e 100644 --- a/ports/libssh/CONTROL +++ b/ports/libssh/CONTROL @@ -1,6 +1,6 @@ Source: libssh Version: 0.9.5 -Port-Version: 4 +Port-Version: 5 Homepage: https://www.libssh.org/ Build-Depends: libssh[core,mbedtls] (android) Description: libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index f9a430129eb64b..c15cc0a9c1d602 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_git( PATCHES 0001-export-pkgconfig-file.patch 0002-mingw_for_Android.patch + 0003-create_symlink_unix_only.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/versions/baseline.json b/versions/baseline.json index 57b5280efc4c4c..6e7defe6b406cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3686,7 +3686,7 @@ }, "libssh": { "baseline": "0.9.5", - "port-version": 4 + "port-version": 5 }, "libssh2": { "baseline": "1.9.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 9cbf34ae4ffad3..3f1e6ca4169764 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d49a7a228c1f082d7e86bfb443af3a063a692ac7", + "version-string": "0.9.5", + "port-version": 5 + }, { "git-tree": "0c5ced4b1fab4db90e2b032a3339a404cdc2f3ab", "version-string": "0.9.5", From 13333ea93d15735849200222a08cb9e708e4e4de Mon Sep 17 00:00:00 2001 From: 7FrogTW Date: Mon, 6 Sep 2021 00:49:17 +0800 Subject: [PATCH 0458/1858] [sentencepiece] v0.1.95 (#19858) --- ports/sentencepiece/portfile.cmake | 6 ++---- ports/sentencepiece/rename-version.patch | 8 -------- ports/sentencepiece/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sentencepiece.json | 5 +++++ 5 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 ports/sentencepiece/rename-version.patch diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake index e554a0d5a23716..38c551cee6ce11 100644 --- a/ports/sentencepiece/portfile.cmake +++ b/ports/sentencepiece/portfile.cmake @@ -5,12 +5,10 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/sentencepiece - REF v0.1.82 - SHA512 669d6a1e86c44587d725b1e93f11b707e510a180dec08afb79268158f5de009cb20ffccc72c501c84f032360e52e53ae227504f3538f59978629433e0d6fcf65 + REF v0.1.95 + SHA512 22484cf0311315e25a3184561f4e18b45286ad068bfb722c860e1b44fb16913c96d34723b486fab5e4e1e69f4b620a0e3cff410f56cb6561a67193ebaf565a31 HEAD_REF master - PATCHES rename-version.patch ) -file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/sentencepiece/rename-version.patch b/ports/sentencepiece/rename-version.patch deleted file mode 100644 index 823a1b9b0206c4..00000000000000 --- a/ports/sentencepiece/rename-version.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -15,4 +15,4 @@ - cmake_minimum_required(VERSION 3.1 FATAL_ERROR) --file(STRINGS "VERSION" SPM_VERSION) -+file(STRINGS "VERSION.txt" SPM_VERSION) - message(STATUS "VERSION: ${SPM_VERSION}") - project(sentencepiece VERSION ${SPM_VERSION} LANGUAGES CXX) diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json index cdd93888585c4a..0a621c341b9bac 100644 --- a/ports/sentencepiece/vcpkg.json +++ b/ports/sentencepiece/vcpkg.json @@ -1,6 +1,5 @@ { "name": "sentencepiece", - "version": "0.1.82", - "port-version": 1, + "version": "0.1.95", "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training" } diff --git a/versions/baseline.json b/versions/baseline.json index 6e7defe6b406cb..07b4d96bcbeca5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5853,8 +5853,8 @@ "port-version": 5 }, "sentencepiece": { - "baseline": "0.1.82", - "port-version": 1 + "baseline": "0.1.95", + "port-version": 0 }, "sentry-native": { "baseline": "0.4.12", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index fe93e69d264075..5a139553e2fe4e 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "107679132fbb9a52ab4c995583db14a748554565", + "version": "0.1.95", + "port-version": 0 + }, { "git-tree": "80fecc6a62e7e634b59ec58f737202c0773fa73e", "version": "0.1.82", From 41f8f29c820bbdb127982d204f7f5759dbc1fa15 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 8 Sep 2021 02:55:54 +0800 Subject: [PATCH 0459/1858] [fmt] update to 8.0.1 (#18581) * [fmt] update to 8.0.0 * update version * revert patch foramt * update version * update version * [fmt] update to 8.0.0 * update version * [fmt] update to 8.0.1 * update version * Apply suggested change * update version --- ports/fmt/fix-warning4189.patch | 14 -------------- ports/fmt/portfile.cmake | 23 +++++++++++------------ ports/fmt/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/fmt.json | 5 +++++ 5 files changed, 19 insertions(+), 30 deletions(-) delete mode 100644 ports/fmt/fix-warning4189.patch diff --git a/ports/fmt/fix-warning4189.patch b/ports/fmt/fix-warning4189.patch deleted file mode 100644 index 76431c3672b268..00000000000000 --- a/ports/fmt/fix-warning4189.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/include/fmt/format.h b/include/fmt/format.h -index 4e96539..0f1d179 100644 ---- a/include/fmt/format.h -+++ b/include/fmt/format.h -@@ -33,6 +33,9 @@ - #ifndef FMT_FORMAT_H_ - #define FMT_FORMAT_H_ - -+#ifdef _MSC_VER -+#pragma warning(disable:4189) -+#endif - #include - #include - #include diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake index bdaa65876a7c3a..39208f6fb544a2 100644 --- a/ports/fmt/portfile.cmake +++ b/ports/fmt/portfile.cmake @@ -1,16 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fmtlib/fmt - REF 7bdf0628b1276379886c7f6dda2cef2b3b374f0b # v7.1.3 - SHA512 52ea8f9d2c0cb52ec3a740e38fcdfd6a0318566e3b599bd2e8d557168642d005c0a59bc213cff2641a88fed3bb771d15f46c39035ccd64809569af982aba47aa + REF d141cdbeb0fb422a3fb7173b285fd38e0d1772dc # v8.0.1 + SHA512 1171f0305bed07497d2957b4053e8802030f448921c5bc1b066345dc1e77fbdb96d2c7f323452a32278ae4adb01e69e80b816119b0821e37d50980800e7406f8 HEAD_REF master PATCHES - fix-warning4189.patch fix-write-batch.patch ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFMT_CMAKE_DIR=share/fmt -DFMT_TEST=OFF @@ -18,19 +17,19 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE.rst DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_TARGET_IS_WINDOWS) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/fmtd.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/fmtd.dll") endif() endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/fmt.dll") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/fmt.dll ${CURRENT_PACKAGES_DIR}/bin/fmt.dll) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/fmt.dll" "${CURRENT_PACKAGES_DIR}/bin/fmt.dll") endif() endif() endif() @@ -40,7 +39,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) "1" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() @@ -59,8 +58,8 @@ if(VCPKG_TARGET_IS_WINDOWS) ) endif() endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle post-build CMake instructions vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json index b55b731cca125d..67e7d2041a63d0 100644 --- a/ports/fmt/vcpkg.json +++ b/ports/fmt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmt", - "version": "7.1.3", - "port-version": 5, + "version-semver": "8.0.1", "description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.", "homepage": "https://github.com/fmtlib/fmt", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 07b4d96bcbeca5..0e9114392fd1d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2097,8 +2097,8 @@ "port-version": 3 }, "fmt": { - "baseline": "7.1.3", - "port-version": 5 + "baseline": "8.0.1", + "port-version": 0 }, "folly": { "baseline": "2021.06.14.00", diff --git a/versions/f-/fmt.json b/versions/f-/fmt.json index 13c7be1723249b..563687b9ed0529 100644 --- a/versions/f-/fmt.json +++ b/versions/f-/fmt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "105214e3085a1404bca0fa89e7d80aa016e8cacb", + "version-semver": "8.0.1", + "port-version": 0 + }, { "git-tree": "52a5c56d85771a278330e955b703f4db86cfe86d", "version": "7.1.3", From 24c9b900198083564dcc3f2489582b8794ed1797 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 7 Sep 2021 20:56:42 +0200 Subject: [PATCH 0460/1858] [kealib] Update, revise features (#19118) * Convert manifest to JSON * Remove purely transitive dependencies * Parallel is unsupported with HDF5 C++ * Revise portfile * Update to 1.4.14 * x-add-version --- ports/kealib/CONTROL | 9 -------- ports/kealib/hdf5_include.patch | 37 ++++++++++++++++++--------------- ports/kealib/portfile.cmake | 32 ++++++++-------------------- ports/kealib/vcpkg.json | 18 ++++++++++++++++ versions/baseline.json | 2 +- versions/k-/kealib.json | 5 +++++ 6 files changed, 53 insertions(+), 50 deletions(-) delete mode 100644 ports/kealib/CONTROL create mode 100644 ports/kealib/vcpkg.json diff --git a/ports/kealib/CONTROL b/ports/kealib/CONTROL deleted file mode 100644 index d31490c4d5a936..00000000000000 --- a/ports/kealib/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: kealib -Version: 1.4.11-3 -Build-Depends: hdf5[cpp], zlib, szip -Homepage: https://bitbucket.org/chchrsc/kealib -Description: kealib is gdal model using HDF5 standard. - -Feature: parallel -Description: Use parallel support for HDF5 -Build-Depends: hdf5[parallel], mpi diff --git a/ports/kealib/hdf5_include.patch b/ports/kealib/hdf5_include.patch index 35935dc34c6d2a..19598c56ba5789 100644 --- a/ports/kealib/hdf5_include.patch +++ b/ports/kealib/hdf5_include.patch @@ -1,4 +1,5 @@ -index 1f4b1474..40a0f55d 100644 +diff --git a/include/libkea/KEAAttributeTable.h b/include/libkea/KEAAttributeTable.h +index 95a5d7f..fbfebc1 100644 --- a/include/libkea/KEAAttributeTable.h +++ b/include/libkea/KEAAttributeTable.h @@ -37,7 +37,7 @@ @@ -10,7 +11,8 @@ index 1f4b1474..40a0f55d 100644 #include "libkea/KEACommon.h" #include "libkea/KEAException.h" - +diff --git a/include/libkea/KEAAttributeTableFile.h b/include/libkea/KEAAttributeTableFile.h +index 9987a7c..39dbb21 100644 --- a/include/libkea/KEAAttributeTableFile.h +++ b/include/libkea/KEAAttributeTableFile.h @@ -35,7 +35,7 @@ @@ -22,31 +24,34 @@ index 1f4b1474..40a0f55d 100644 #include "libkea/KEACommon.h" #include "libkea/KEAException.h" - ---- a/include/libkea/KEACommon.h -+++ b/include/libkea/KEACommon.h -@@ -36,7 +36,7 @@ +diff --git a/include/libkea/KEAAttributeTableInMem.h b/include/libkea/KEAAttributeTableInMem.h +index b4f7fad..6a8a8b7 100644 +--- a/include/libkea/KEAAttributeTableInMem.h ++++ b/include/libkea/KEAAttributeTableInMem.h +@@ -35,7 +35,7 @@ #include #include -#include "H5Cpp.h" +#include - // mark all exported classes/functions with DllExport to have - // them exported by Visual Studio - ---- a/include/libkea/KEAAttributeTableInMem.h -+++ b/include/libkea/KEAAttributeTableInMem.h -@@ -35,7 +35,7 @@ + #include "libkea/KEACommon.h" + #include "libkea/KEAException.h" +diff --git a/include/libkea/KEACommon.h b/include/libkea/KEACommon.h +index 3175c93..67b02a2 100644 +--- a/include/libkea/KEACommon.h ++++ b/include/libkea/KEACommon.h +@@ -38,7 +38,7 @@ #include #include -#include "H5Cpp.h" +#include - #include "libkea/KEACommon.h" - #include "libkea/KEAException.h" - + // MSVC 2008 uses different names.... + #ifdef _MSC_VER +diff --git a/include/libkea/KEAImageIO.h b/include/libkea/KEAImageIO.h +index d510cae..4c2aa97 100644 --- a/include/libkea/KEAImageIO.h +++ b/include/libkea/KEAImageIO.h @@ -35,7 +35,7 @@ @@ -58,5 +63,3 @@ index 1f4b1474..40a0f55d 100644 #include "libkea/KEACommon.h" #include "libkea/KEAException.h" - - diff --git a/ports/kealib/portfile.cmake b/ports/kealib/portfile.cmake index 24446d948e6c9a..eabf0c46de1ea7 100644 --- a/ports/kealib/portfile.cmake +++ b/ports/kealib/portfile.cmake @@ -1,39 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ubarsc/kealib - REF de6dabd414039dd36a1ff01243901cec3f45256e #1.4.11 - SHA512 34032dd27aee0714cbe6b76b2f731a05408fd5ff78080343bcfbc3aa7e6eeb06a341a423cee1e7f3624f4c1f661feaf4ea3a3d2e53172933e49982df0c438a6f + REF 4984102cf5867105a28ae754689566217309d120 #1.4.14 + SHA512 06628996757bc9cffc5af0f03468ec32246980b6f72f7f1c88a489a8a2aed70924115df0726fcbb9851e44030c6a44ee0f3137660de43af421dec1eab81cc147 HEAD_REF master PATCHES hdf5_include.patch ) -if ("parallel" IN_LIST FEATURES) - set(ENABLE_PARALLEL ON) -else() - set(ENABLE_PARALLEL OFF) -endif() - -if(${VCPKG_LIBRARY_LINKAGE} MATCHES "static") - set(HDF5_USE_STATIC_LIBRARIES ON) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DHDF5_PREFER_PARALLEL=${ENABLE_PARALLEL} - -DLIBKEA_WITH_GDAL=OFF - -DDISABLE_TESTS=ON - -DHDF5_USE_STATIC_LIBRARIES=${HDF5_USE_STATIC_LIBRARIES} + -DLIBKEA_WITH_GDAL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/python/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kealib/vcpkg.json b/ports/kealib/vcpkg.json new file mode 100644 index 00000000000000..d956725b952fca --- /dev/null +++ b/ports/kealib/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "kealib", + "version": "1.4.14", + "description": "KEALib provides an implementation of the GDAL data model using HDF5.", + "homepage": "https://github.com/ubarsc/kealib", + "dependencies": [ + { + "name": "hdf5", + "features": [ + "cpp" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0e9114392fd1d0..293a613a6aa7e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2877,7 +2877,7 @@ "port-version": 0 }, "kealib": { - "baseline": "1.4.11-3", + "baseline": "1.4.14", "port-version": 0 }, "kenlm": { diff --git a/versions/k-/kealib.json b/versions/k-/kealib.json index 82206c3c28c443..a4fe941e3ee5f1 100644 --- a/versions/k-/kealib.json +++ b/versions/k-/kealib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11878c71d1418c0bdcc380e7ebf8e90f9e563260", + "version": "1.4.14", + "port-version": 0 + }, { "git-tree": "cc06088dbd4f6a3bce64af1b452b5ef2543f5b76", "version-string": "1.4.11-3", From c11acc88b6e56f504d2129841f8ba34cbf702c46 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Wed, 8 Sep 2021 05:12:35 +0800 Subject: [PATCH 0461/1858] [cpp-ipc] Add new port (#19360) * [teemo] Update version to v2.3. * [teemo] Modify version to v2.2 * [teemo] Run `vcpkg x-add-version teemo` to add version info. * [teemo] Update Build-Depends. * Update versions/t-/teemo.json * [libipc] Add new library. * [libipc] Run ./vcpkg x-add-version --all * [libipc] Fix compile error. * update version * Update ports/libipc/CONTROL * update version * Update ports/libipc/portfile.cmake Co-authored-by: Billy O'Neal * Update ports/libipc/portfile.cmake Co-authored-by: Billy O'Neal * [cpp-ipc] rename libipc to cpp-ipc * [cpp-ipc] Run vcpkg x-add-version --all * [cpp-ipc] Remove old libipc * update cpp-ipc * update version * delet libipc.json Co-authored-by: NancyLi1013 Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy O'Neal --- ports/cpp-ipc/portfile.cmake | 39 ++++++++++++++++++++++++++++++++++++ ports/cpp-ipc/vcpkg.json | 17 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/cpp-ipc.json | 9 +++++++++ 4 files changed, 69 insertions(+) create mode 100644 ports/cpp-ipc/portfile.cmake create mode 100644 ports/cpp-ipc/vcpkg.json create mode 100644 versions/c-/cpp-ipc.json diff --git a/ports/cpp-ipc/portfile.cmake b/ports/cpp-ipc/portfile.cmake new file mode 100644 index 00000000000000..0f3d3981cbfd5b --- /dev/null +++ b/ports/cpp-ipc/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_fail_port_install(ON_TARGET "OSX") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mutouyun/cpp-ipc + REF df3cf1b4c42143e6675c6fb0f33f85a48b7c7701 #v1.0.0 + SHA512 de319d48ac396f567b2f5faae87a264b9ebfbaf0559a3e00de61facd6a3f2de1739e064c6e037ad694111ed211c0fb9ea6ec2db0259c100e2bafe553c15ed2f6 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBIPC_BUILD_SHARED_LIBS) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" LIBIPC_USE_STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBIPC_BUILD_SHARED_LIBS:BOOL=${LIBIPC_BUILD_SHARED_LIBS} + -DLIBIPC_USE_STATIC_CRT:BOOL=${LIBIPC_USE_STATIC_CRT} + -DLIBIPC_BUILD_TESTS:BOOL=OFF + -DLIBIPC_BUILD_DEMOS:BOOL=OFF +) + +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/cpp-ipc") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpp-ipc) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/cpp-ipc") + vcpkg_cmake_config_fixup(CONFIG_PATH share/cpp-ipc) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libipc/export.h" "#elif defined(LIBIPC_LIBRARY_SHARED_USING__)" "#elif 1") +endif() + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") \ No newline at end of file diff --git a/ports/cpp-ipc/vcpkg.json b/ports/cpp-ipc/vcpkg.json new file mode 100644 index 00000000000000..5e42a0a659da50 --- /dev/null +++ b/ports/cpp-ipc/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cpp-ipc", + "version": "1.0.0", + "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.", + "homepage": "https://github.com/mutouyun/cpp-ipc", + "supports": "!osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 293a613a6aa7e6..b440f5dae33929 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1424,6 +1424,10 @@ "baseline": "0.9.1", "port-version": 0 }, + "cpp-ipc": { + "baseline": "1.0.0", + "port-version": 0 + }, "cpp-netlib": { "baseline": "0.13.0", "port-version": 4 diff --git a/versions/c-/cpp-ipc.json b/versions/c-/cpp-ipc.json new file mode 100644 index 00000000000000..75ed310a17e201 --- /dev/null +++ b/versions/c-/cpp-ipc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a54fbdb4b0fa6b820b1f6a55004f5622f3c02941", + "version": "1.0.0", + "port-version": 0 + } + ] +} From c6a4e870cecd42c1ed709d967737054d539ad340 Mon Sep 17 00:00:00 2001 From: Buck Yeh Date: Wed, 8 Sep 2021 05:13:35 +0800 Subject: [PATCH 0462/1858] [buck-yeh-bux] add port (#19670) * [bux] Add new port * Corrections according to Create Pull Request suggested questions * SHA512 * Mark fails into .\scripts\ci.baseline.txt * Mark fails into .\scripts\ci.baseline.txt * No need of "port-version": 1 in vcpkg.json * Update version database * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update bux.json * Update ports/bux/vcpkg.json * update version * Update scripts/ci.baseline.txt Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update bux support * update version * update version * Rename bux to buck-yeh-bux * Update version database Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/buck-yeh-bux/portfile.cmake | 17 +++++++++++++++++ ports/buck-yeh-bux/vcpkg.json | 18 ++++++++++++++++++ versions/b-/buck-yeh-bux.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 48 insertions(+) create mode 100644 ports/buck-yeh-bux/portfile.cmake create mode 100644 ports/buck-yeh-bux/vcpkg.json create mode 100644 versions/b-/buck-yeh-bux.json diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake new file mode 100644 index 00000000000000..cfcaadc69698b9 --- /dev/null +++ b/ports/buck-yeh-bux/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_fail_port_install(ON_ARCH "arm" "arm64") +vcpkg_fail_port_install(ON_TARGET "linux" "uwp" "osx") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO buck-yeh/bux + REF 4636183159f74f350238e6ee59583b34f7e7aca9 # v1.4.1 + SHA512 319cd15c73ca469849cbc364635d7147cfa3fed57d6043b0cb2b52d504a253645518ec6254ddba51fc8cc32cc89e345458530628b331629cabce5b64d8723a6a + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json new file mode 100644 index 00000000000000..3ae078499010a2 --- /dev/null +++ b/ports/buck-yeh-bux/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "buck-yeh-bux", + "version": "1.4.1", + "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", + "homepage": "https://github.com/buck-yeh/bux", + "supports": "!(arm | uwp | osx | linux)", + "dependencies": [ + "fmt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json new file mode 100644 index 00000000000000..1829717189c816 --- /dev/null +++ b/versions/b-/buck-yeh-bux.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4cdd433b94429da69f293e95dd60390daf6966a0", + "version": "1.4.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b440f5dae33929..0351f2a8d77b57 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1092,6 +1092,10 @@ "baseline": "1.0.0", "port-version": 0 }, + "buck-yeh-bux": { + "baseline": "1.4.1", + "port-version": 0 + }, "bullet3": { "baseline": "3.17", "port-version": 1 From 7ed4c716adf7ac77b7fafce0930321854d00fc28 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 7 Sep 2021 23:17:18 +0200 Subject: [PATCH 0463/1858] [yaml-cpp] fix cmake and pkgconfig files (#19703) --- ports/yaml-cpp/portfile.cmake | 27 ++++++++++++--------------- ports/yaml-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/y-/yaml-cpp.json | 5 +++++ 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ports/yaml-cpp/portfile.cmake b/ports/yaml-cpp/portfile.cmake index 33208b0ea3dab7..de519bd6018984 100644 --- a/ports/yaml-cpp/portfile.cmake +++ b/ports/yaml-cpp/portfile.cmake @@ -6,11 +6,7 @@ vcpkg_from_github( HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(YAML_BUILD_SHARED_LIBS ON) -else() - set(YAML_BUILD_SHARED_LIBS OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" YAML_BUILD_SHARED_LIBS) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -22,24 +18,25 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/yaml-cpp") - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/yaml-cpp) + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/${PORT}) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/yaml-cpp.pc" "-lyaml-cpp" "-lyaml-cppd") endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +vcpkg_fixup_pkgconfig() -# Remove debug include files +# Remove debug include and pkgconfig files file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") -file(READ "${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" DLL_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) - string(REPLACE "#ifdef YAML_CPP_DLL" "#if 1" DLL_H "${DLL_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 1") else() - string(REPLACE "#ifdef YAML_CPP_DLL" "#if 0" DLL_H "${DLL_H}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "#ifdef YAML_CPP_DLL" "#if 0") endif() -file(WRITE "${CURRENT_PACKAGES_DIR}/include/yaml-cpp/dll.h" "${DLL_H}") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yaml-cpp/vcpkg.json b/ports/yaml-cpp/vcpkg.json index afdbabbf715a0f..039bcd47e6cb8f 100644 --- a/ports/yaml-cpp/vcpkg.json +++ b/ports/yaml-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "yaml-cpp", "version-semver": "0.7.0", + "port-version": 1, "description": "yaml-cpp is a YAML parser and emitter in C++ matching the YAML 1.2 spec.", "homepage": "https://github.com/jbeder/yaml-cpp", "documentation": "https://codedocs.xyz/jbeder/yaml-cpp/index.html", diff --git a/versions/baseline.json b/versions/baseline.json index 0351f2a8d77b57..0363c07753b897 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6954,7 +6954,7 @@ }, "yaml-cpp": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "yara": { "baseline": "4.1.1", diff --git a/versions/y-/yaml-cpp.json b/versions/y-/yaml-cpp.json index 6b39e7fe0beb68..8d7170546f244f 100644 --- a/versions/y-/yaml-cpp.json +++ b/versions/y-/yaml-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a79d9c026aefee69214dbd39294da49398b07c7b", + "version-semver": "0.7.0", + "port-version": 1 + }, { "git-tree": "a71932a4f18c3cc6e0bd2bdce57fbf744e0efe2b", "version-semver": "0.7.0", From f1d4913909615b68b1127892e8d36b4a123280d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Wed, 8 Sep 2021 00:19:07 +0200 Subject: [PATCH 0464/1858] [lcms] Update to 2.12 (#19551) In addition to updating the version to 2.12, the following modifications were applied to the port: - Use the name lcms2 for the library, as it is called upstream since version 2 of Little-CMS. Remark: In the past, the library has already been called lcms2 for a while in vcpkg (1e53c60 until 726c111). The ports in vcpkg, which currently require the port lcms (devil, libraw and opencolorio), use and support lcms2 include/lib. - Add generating a pkg-config file - Add quotes to file commands in portfile.cmake --- ports/lcms/CMakeLists.txt | 42 +++++++++++++++++++++++++++++---------- ports/lcms/CONTROL | 2 +- ports/lcms/portfile.cmake | 11 +++++----- versions/baseline.json | 2 +- versions/l-/lcms.json | 5 +++++ 5 files changed, 44 insertions(+), 18 deletions(-) diff --git a/ports/lcms/CMakeLists.txt b/ports/lcms/CMakeLists.txt index 07e62995f88faa..d45ed2e8c77007 100644 --- a/ports/lcms/CMakeLists.txt +++ b/ports/lcms/CMakeLists.txt @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.5) option(CMAKE_VERBOSE_MAKEFILE "Create verbose makefile" OFF) -option(BUILD_SHARED_LIBS "Create lcms as a shared library" ON) +option(BUILD_SHARED_LIBS "Create lcms2 as a shared library" ON) project(little-cms) set(CMAKE_DEBUG_POSTFIX d) -add_library(lcms +add_library(lcms2 "${CMAKE_CURRENT_LIST_DIR}/src/cmstypes.c" "${CMAKE_CURRENT_LIST_DIR}/src/cmsvirt.c" "${CMAKE_CURRENT_LIST_DIR}/src/cmswtpnt.c" @@ -39,15 +39,33 @@ add_library(lcms ) if(BUILD_SHARED_LIBS) - target_compile_options(lcms PRIVATE -DCMS_DLL_BUILD) - target_compile_options(lcms PUBLIC -DCMS_DLL) + target_compile_options(lcms2 PRIVATE -DCMS_DLL_BUILD) + target_compile_options(lcms2 PUBLIC -DCMS_DLL) endif() -target_compile_options(lcms PRIVATE -DUNICODE -D_UNICODE) +target_compile_options(lcms2 PRIVATE -DUNICODE -D_UNICODE) -target_include_directories(lcms PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include") -set_target_properties(lcms PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/include/lcms2.h;${CMAKE_CURRENT_LIST_DIR}/include/lcms2_plugin.h") +target_include_directories(lcms2 PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include") +set_target_properties(lcms2 PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/include/lcms2.h;${CMAKE_CURRENT_LIST_DIR}/include/lcms2_plugin.h") -install(TARGETS lcms +# Generate pkg-config file +SET(PACKAGE "lcms2") +# Read VERSION from file configure +file(READ "${CMAKE_CURRENT_LIST_DIR}/configure" lcms2_configure) +string(REGEX MATCH "PACKAGE_VERSION='(([0-9]+)\\.([0-9]+))'" _ ${lcms2_configure}) +set(VERSION "${CMAKE_MATCH_1}") +SET(prefix "${CMAKE_INSTALL_PREFIX}") +SET(exec_prefix "\${prefix}") +SET(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") +SET(includedir "\${prefix}/include") +CONFIGURE_FILE(lcms2.pc.in "${PROJECT_BINARY_DIR}/lcms2.pc" @ONLY) +IF(CMAKE_BUILD_TYPE MATCHES Debug) + # Add CMAKE_DEBUG_POSTFIX + file(READ "${PROJECT_BINARY_DIR}/lcms2.pc" LCMS2_PC) + string(REPLACE "-llcms2" "-llcms2${CMAKE_DEBUG_POSTFIX}" LCMS2_PC "${LCMS2_PC}") + file(WRITE "${PROJECT_BINARY_DIR}/lcms2.pc" "${LCMS2_PC}") +ENDIF() + +install(TARGETS lcms2 EXPORT lcmsConfig RUNTIME DESTINATION "bin" LIBRARY DESTINATION "lib" @@ -56,12 +74,14 @@ install(TARGETS lcms COMPONENT dev ) -export(TARGETS lcms - NAMESPACE lcms:: +INSTALL(FILES ${PROJECT_BINARY_DIR}/lcms2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + +export(TARGETS lcms2 + NAMESPACE lcms2:: FILE "share/lcms/lcmsConfig.cmake" ) install(EXPORT lcmsConfig DESTINATION "share/lcms" - NAMESPACE lcms:: + NAMESPACE lcms2:: ) diff --git a/ports/lcms/CONTROL b/ports/lcms/CONTROL index bf440c3871bffc..e9de483c7c8bee 100644 --- a/ports/lcms/CONTROL +++ b/ports/lcms/CONTROL @@ -1,4 +1,4 @@ Source: lcms -Version: 2.11 +Version: 2.12 Homepage: https://github.com/mm2/Little-CMS Description: Little CMS. diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 6805e4b11e8153..2a2d2deae23fc8 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -5,15 +5,15 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mm2/Little-CMS - REF 17eb080324a9f16e0e7ab37bbcda7ae42b946294 # 2.11 - SHA512 e8112bc4868448770d3ca33fc5aef5ef83cae59e907675b861931719a6a043df76a1ce72ac945111ce966698be96117388eb4770697797d93d75726b23a490ad + REF 924a020d09bfe468c665467caf24aadeb41ff77c # 2.12 + SHA512 0c2dc069878ca38a92af4800aa3fb2660203fbcdf6dccd9db60cfacb6896185e3e9222893f39ec3e132b0f4900a2932d490dd8db5b1b431519966a64d28404d2 HEAD_REF master PATCHES remove_library_directive.patch ${ADDITIONAL_PATCH} ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -23,6 +23,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/lcms RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/versions/baseline.json b/versions/baseline.json index 0363c07753b897..37380854f916fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3069,7 +3069,7 @@ "port-version": 2 }, "lcms": { - "baseline": "2.11", + "baseline": "2.12", "port-version": 0 }, "leaf": { diff --git a/versions/l-/lcms.json b/versions/l-/lcms.json index 91b03084a2fb3a..8155efcc4b00f9 100644 --- a/versions/l-/lcms.json +++ b/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0020f124dcd6fa36e8ab5edad1efc85c59c51a56", + "version-string": "2.12", + "port-version": 0 + }, { "git-tree": "87ed3cf04e19a238f357a256419016aa49f88eb4", "version-string": "2.11", From f40d9f56d572c08c9eb4101045c0624201a09413 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 8 Sep 2021 06:19:28 +0800 Subject: [PATCH 0465/1858] [icu] Fix tool path (#19726) * [icu] Fix tool path * Update the baseline version * Apply the review suggestions Co-authored-by: Billy Robert O'Neal III --- ports/icu/portfile.cmake | 5 ++++- ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index bd67c0711c09f9..9731bf5b4b2138 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -35,7 +35,10 @@ set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) if(NOT "${TARGET_TRIPLET}" STREQUAL "${HOST_TRIPLET}") # cross compiling - list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}/tools/${PORT}") + set(TOOL_PATH "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") + # convert to unix path + string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" _VCPKG_TOOL_PATH "${TOOL_PATH}") + list(APPEND CONFIGURE_OPTIONS "--with-cross-build=${_VCPKG_TOOL_PATH}") endif() vcpkg_configure_make( diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 4473713fa4f73a..c1e80e53057806 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 13, + "port-version": 14, "description": "Mature and widely used Unicode and localization library.", "homepage": "http://icu-project.org/apiref/icu4c/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 37380854f916fc..5035b32a7db596 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2602,7 +2602,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 13 + "port-version": 14 }, "ideviceinstaller": { "baseline": "1.1.2.23-1", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index cd747442b5fab3..bac44faa4692fc 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2632dd55c20f6830027ae1e167524817b1a9d7ec", + "version": "69.1", + "port-version": 14 + }, { "git-tree": "d8c36cdfe8059aadefd80b2d5800a5d9f3494cd6", "version": "69.1", From 203611576772f587bd80ad40ed714a56ddb1843c Mon Sep 17 00:00:00 2001 From: Geoff Evans Date: Tue, 7 Sep 2021 21:02:10 -0700 Subject: [PATCH 0466/1858] proj4 uwp improvments (#18323) * Remove prior arm/uwp patch since host dependencies now allow for proj database generation, and add a new patch that repairs Win32 API calls to use UWP counterparts in UWP builds * Update ci baseline for port changes * Update port version * Fix patch list for PR * Bump port-version, disable some broken downstream libs * Update port version commit --- ports/proj4/disable-projdb-with-arm-uwp.patch | 15 ---- ports/proj4/fix-filemanager-uwp.patch | 71 +++++++++++++++++++ ports/proj4/portfile.cmake | 2 +- ports/proj4/vcpkg.json | 2 +- scripts/ci.baseline.txt | 4 +- versions/baseline.json | 2 +- versions/p-/proj4.json | 5 ++ 7 files changed, 81 insertions(+), 20 deletions(-) delete mode 100644 ports/proj4/disable-projdb-with-arm-uwp.patch create mode 100644 ports/proj4/fix-filemanager-uwp.patch diff --git a/ports/proj4/disable-projdb-with-arm-uwp.patch b/ports/proj4/disable-projdb-with-arm-uwp.patch deleted file mode 100644 index 411a39860804e2..00000000000000 --- a/ports/proj4/disable-projdb-with-arm-uwp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7d736d129..93d7801dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -269,7 +269,9 @@ endif() - ################################################################################ - include_directories(${PROJ_SOURCE_DIR}/src) - --add_subdirectory(data) -+if(BUILD_PROJ_DATABASE) -+ add_subdirectory(data) -+endif() - add_subdirectory(include) - add_subdirectory(src) - add_subdirectory(man) diff --git a/ports/proj4/fix-filemanager-uwp.patch b/ports/proj4/fix-filemanager-uwp.patch new file mode 100644 index 00000000000000..14dba72c29c55b --- /dev/null +++ b/ports/proj4/fix-filemanager-uwp.patch @@ -0,0 +1,71 @@ +diff --git a/src/filemanager.cpp b/src/filemanager.cpp +index e6a9ed9..d85290b 100644 +--- a/src/filemanager.cpp ++++ b/src/filemanager.cpp +@@ -48,6 +48,12 @@ + + #include "proj_config.h" + ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP) ++#define UWP 1 ++#else ++#define UWP 0 ++#endif ++ + #ifdef _WIN32 + #include + #include +@@ -692,10 +698,21 @@ std::unique_ptr FileWin32::open(PJ_CONTEXT *ctx, const char *filename, + ? FILE_ATTRIBUTE_READONLY + : FILE_ATTRIBUTE_NORMAL; + try { ++#if UWP ++ CREATEFILE2_EXTENDED_PARAMETERS extendedParameters; ++ ZeroMemory(&extendedParameters, sizeof(extendedParameters)); ++ extendedParameters.dwSize = sizeof(extendedParameters); ++ extendedParameters.dwFileAttributes = dwFlagsAndAttributes; ++ HANDLE hFile = CreateFile2( ++ UTF8ToWString(std::string(filename)).c_str(), dwDesiredAccess, ++ FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, ++ dwCreationDisposition, &extendedParameters); ++#else // UWP + HANDLE hFile = CreateFileW( + UTF8ToWString(std::string(filename)).c_str(), dwDesiredAccess, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, nullptr, + dwCreationDisposition, dwFlagsAndAttributes, nullptr); ++#endif // UWP + return std::unique_ptr(hFile != INVALID_HANDLE_VALUE + ? new FileWin32(filename, ctx, hFile) + : nullptr); +@@ -1211,6 +1228,9 @@ const char *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx, + wPath.resize(wcslen(wPath.data())); + path = NS_PROJ::WStringToUTF8(wPath); + #else ++#if UWP ++ if (false) { ++#else // UWP + wchar_t *wPath; + if (SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, nullptr, &wPath) == + S_OK) { +@@ -1218,6 +1238,7 @@ const char *proj_context_get_user_writable_directory(PJ_CONTEXT *ctx, + std::string str = NS_PROJ::WStringToUTF8(ws); + path = str; + CoTaskMemFree(wPath); ++#endif // UWP + #endif + } else { + const char *local_app_data = getenv("LOCALAPPDATA"); +@@ -1311,11 +1332,13 @@ static std::string pj_get_relative_share_proj_internal_no_check() { + #if defined(_WIN32) || defined(HAVE_LIBDL) + #ifdef _WIN32 + HMODULE hm = NULL; ++#if !UWP + if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | + GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + (LPCSTR)&pj_get_relative_share_proj, &hm) == 0) { + return std::string(); + } ++#endif // UWP + + DWORD path_size = 1024; + diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index c19e07b076dfa2..34fb1fd028cf9c 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_from_github( SHA512 e6e77266dcd70c939c16667c916cccab8de161221d2ef600cfca43382f50da2dc8d790561556b4416adbb4ac6fba939004e0cc936c278e0e808dc3566e9a70d4 HEAD_REF master PATCHES + fix-filemanager-uwp.patch fix-sqlite3-bin.patch - disable-projdb-with-arm-uwp.patch fix-win-output-name.patch fix-proj4-targets-cmake.patch tools-cmake.patch diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 770896f9c5f12c..b2d12fc0013bf5 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proj4", "version-semver": "7.2.1", - "port-version": 4, + "port-version": 5, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0affebdd8e1bed..eb7e7226d3ad01 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -546,6 +546,8 @@ libcopp:arm64-windows=fail libcopp:arm-uwp=fail libcrafter:x86-windows=fail libcrafter:x64-windows=fail +libgeotiff:arm-uwp=fail +libgeotiff:x64-uwp=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail @@ -1235,8 +1237,6 @@ popsift:x64-windows-static-md=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail pqp:x64-uwp=fail -proj4:arm-uwp=fail -proj4:x64-uwp=fail protobuf-c:x86-windows=fail protobuf-c:x64-windows=fail protobuf-c:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5035b32a7db596..0f86cbcb51c416 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5134,7 +5134,7 @@ }, "proj4": { "baseline": "7.2.1", - "port-version": 4 + "port-version": 5 }, "prometheus-cpp": { "baseline": "0.12.3", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index 077e213aa2445a..1c72aae292c594 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa22133ae2355b540a2676402896abc323f26aa9", + "version-semver": "7.2.1", + "port-version": 5 + }, { "git-tree": "dee626b6811eafe58cf40fbceeb3cc28dfaf678c", "version-semver": "7.2.1", From 08126af63b4dae836a4377966d053b0fa3e0b965 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:04:22 +0800 Subject: [PATCH 0467/1858] [harfbuzz] update to 2.9.0 (#19817) * [harfbuzz] update to 2.9.0 * update version * update version to version-semver * update version * remove fontconfig option * update version --- ports/harfbuzz/portfile.cmake | 5 ++--- ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/harfbuzz.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 7b3caed4c46f14..bb5cdc37f68a78 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 63e15eac4f443fa53565d1e4fb9611cdd7814f28 # 2.8.2 - SHA512 8a743ce465f01d6cb49ac74efb1159d965e41c89267eeb4078ec4c342c24599e14419a0416f8d35a0b9dd00e76cc79b4dbd6f50ddd1b8da761d61158d1018ebc + REF 9aa6f8a93f035dd0a1e3978da495d830049480c8 # 2.9.0 + SHA512 7ef82298e6f5e0d8a78bb6a408e2ec0a4016c7931ef69d52e75ed8e9e0b31628f2ae5ea913dcbfa7d5159412ae487400ea1391254477064ba8fb1aa0cdbe5ed9 HEAD_REF master PATCHES # This patch is a workaround that is needed until the following issues are resolved upstream: @@ -49,7 +49,6 @@ vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} OPTIONS ${FEATURE_OPTIONS} -Dcairo=disabled # Use Cairo graphics library - -Dfontconfig=disabled # Use fontconfig -Dintrospection=disabled # Generate gobject-introspection bindings (.gir/.typelib files) -Ddocs=disabled # Generate documentation with gtk-doc -Dtests=disabled diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 2eb7e6d3f5d71f..4bab551741e0e2 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version": "2.8.2", + "version-semver": "2.9.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0f86cbcb51c416..d949a0cd597669 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2521,7 +2521,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.8.2", + "baseline": "2.9.0", "port-version": 0 }, "hayai": { diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index ced513c5e85bf5..928a7b385e0edb 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bc55c4f88d240855ec6c7da3907811600e61b28", + "version-semver": "2.9.0", + "port-version": 0 + }, { "git-tree": "823024398648ee98849f8a4f73f778a8f97ccd1f", "version": "2.8.2", From ec5db773a5681de3e8ca897e8055b0f78ff5b99b Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 8 Sep 2021 12:04:44 +0800 Subject: [PATCH 0468/1858] [uriparser] Update to v0.9.5 (#19820) * [uriparser] Update to 0.9.5 * [uriparser] Add new version * Small changes Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/uriparser/CONTROL | 7 ------- ports/uriparser/portfile.cmake | 21 +++++++++------------ ports/uriparser/vcpkg.json | 22 ++++++++++++++++++++++ versions/baseline.json | 2 +- versions/u-/uriparser.json | 5 +++++ 5 files changed, 37 insertions(+), 20 deletions(-) delete mode 100644 ports/uriparser/CONTROL create mode 100644 ports/uriparser/vcpkg.json diff --git a/ports/uriparser/CONTROL b/ports/uriparser/CONTROL deleted file mode 100644 index 6196b0a45f01fd..00000000000000 --- a/ports/uriparser/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: uriparser -Version: 0.9.4 -Homepage: https://github.com/uriparser/uriparser -Description: uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C89 ("ANSI C"). uriparser is cross-platform, fast, supports Unicode, and is licensed under the New BSD license. - -Feature: tool -Description: Builds tools (e.g. CLI "uriparse") diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index 36e24ce9e6035f..e09c67d88ddbe2 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uriparser/uriparser - REF 25dddb16cf044a7df27884e7ad3911baaaca3d7c # uriparser-0.9.4 - SHA512 9001649eb027d0ff4f990b20d0f05643939e2bb8ab89d158f32353d6f7c4264a551a6af7856ad13890d05f58b3d15d59e6d82ee0d95b7788c03b34bb52086cd2 + REF 092c2ed1c1cdf2e3305f76927369a07b294eb279 # uriparser-0.9.5 + SHA512 2d7a4e9d186389bada2a8e6b4400b628ea54d17fb8d8ba32f2f416205480a72e94c724ba04462b874b3b4b9399b7f776bcfae76a8cb96a8b896514c05d2be775 HEAD_REF master ) @@ -12,9 +12,8 @@ else() set(URIPARSER_BUILD_TOOLS OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DURIPARSER_BUILD_DOCS=OFF -DURIPARSER_BUILD_TESTS=OFF @@ -24,7 +23,7 @@ vcpkg_configure_cmake( -DURIPARSER_BUILD_TOOLS=${URIPARSER_BUILD_TOOLS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -42,18 +41,16 @@ file(STRINGS ) string(REGEX REPLACE "${_package_version_re}" "\\1" _package_version ${_package_version_define}) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}-${_package_version}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}-${_package_version}) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/uriparser/UriBase.h + "${CURRENT_PACKAGES_DIR}/include/uriparser/UriBase.h" "defined(URI_STATIC_BUILD)" "1 // defined(URI_STATIC_BUILD)" ) endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/uriparser RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -# Remove duplicate info -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/uriparser/vcpkg.json b/ports/uriparser/vcpkg.json new file mode 100644 index 00000000000000..dab0db2bb09689 --- /dev/null +++ b/ports/uriparser/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "uriparser", + "version-semver": "0.9.5", + "description": "Strictly RFC 3986 compliant URI parsing and handling library written in C89.", + "homepage": "https://uriparser.github.io/", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tool": { + "description": "Builds CLI tool uriparse." + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index d949a0cd597669..9c7065b1efb05f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6605,7 +6605,7 @@ "port-version": 1 }, "uriparser": { - "baseline": "0.9.4", + "baseline": "0.9.5", "port-version": 0 }, "usbmuxd": { diff --git a/versions/u-/uriparser.json b/versions/u-/uriparser.json index 1d85b48277dee9..e5a5c312417884 100644 --- a/versions/u-/uriparser.json +++ b/versions/u-/uriparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf383916004ac2ef910b4ea82632d8474763956", + "version-semver": "0.9.5", + "port-version": 0 + }, { "git-tree": "85975d0874cda87d367d337f4c7dddf8e7f37bce", "version-string": "0.9.4", From 8a8ed05150e03955d932d219b62dd0699071d3a8 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:06:30 +0800 Subject: [PATCH 0469/1858] [libmediainfo/glslang] Update to the latest version (#19917) * [libmediainfo/glslang] Update to the latest version * Update version files Co-authored-by: Billy Robert O'Neal III --- ports/glslang/copyright | 35 ------------------- ports/glslang/portfile.cmake | 30 ++++++++-------- ports/glslang/vcpkg.json | 14 ++++++-- ports/libmediainfo/CONTROL | 5 --- ports/libmediainfo/portfile.cmake | 23 +++++++----- ports/libmediainfo/vcpkg.json | 19 ++++++++++ .../vcpkg_support_in_cmakelists.patch | 15 ++++---- versions/baseline.json | 4 +-- versions/g-/glslang.json | 5 +++ versions/l-/libmediainfo.json | 5 +++ 10 files changed, 80 insertions(+), 75 deletions(-) delete mode 100644 ports/glslang/copyright delete mode 100644 ports/libmediainfo/CONTROL create mode 100644 ports/libmediainfo/vcpkg.json diff --git a/ports/glslang/copyright b/ports/glslang/copyright deleted file mode 100644 index dfffea6a8c1226..00000000000000 --- a/ports/glslang/copyright +++ /dev/null @@ -1,35 +0,0 @@ -// -//Copyright (C) 2002-2005 3Dlabs Inc. Ltd. -//Copyright (C) 2012-2013 LunarG, Inc. -// -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without -//modification, are permitted provided that the following conditions -//are met: -// -// Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// Neither the name of 3Dlabs Inc. Ltd. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -//POSSIBILITY OF SUCH DAMAGE. -// diff --git a/ports/glslang/portfile.cmake b/ports/glslang/portfile.cmake index 2ee7c9b3af0837..08609f2a7e8e2f 100644 --- a/ports/glslang/portfile.cmake +++ b/ports/glslang/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KhronosGroup/glslang - REF ae2a562936cc8504c9ef2757cceaff163147834f - SHA512 1c5a91e60c1809c6c26f11649659090a75501b0570f3147e5b27ac65c539b591967f258d14c399d33019317864ede823353ea44e0015bc3f7afc5a787f046cc7 + REF 2fb89a0072ae7316af1c856f22663fde4928128a #11.6.0 + SHA512 e22b85bb0c98d35c80f06dd6352d98c34ea0b965c5bec077d122d9aa346293672a11aec4964b410db8a6050c70dbc0a46fbbb599e178424d78234608075c110e HEAD_REF master PATCHES ignore-crt.patch @@ -22,36 +22,34 @@ else() set(BUILD_BINARIES ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSKIP_GLSLANG_INSTALL=OFF -DBUILD_EXTERNAL=OFF -DENABLE_GLSLANG_BINARIES=${BUILD_BINARIES} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/glslang) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) vcpkg_copy_pdbs() if(NOT BUILD_BINARIES) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") else() - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/glslang) + vcpkg_copy_tools(TOOL_NAMES glslangValidator spirv-remap AUTO_CLEAN) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin") -if(EXISTS ${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake OR EXISTS ${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake) +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslang-config.cmake" OR EXISTS "${CURRENT_PACKAGES_DIR}/share/glslang/glslangConfig.cmake") message(FATAL_ERROR "glslang has been updated to provide a -config file -- please remove the vcpkg provided version from the portfile") endif() file(COPY - ${CMAKE_CURRENT_LIST_DIR}/copyright - ${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${CMAKE_CURRENT_LIST_DIR}/glslang-config.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/glslang/vcpkg.json b/ports/glslang/vcpkg.json index addd408f36af45..e17f25a972bfca 100644 --- a/ports/glslang/vcpkg.json +++ b/ports/glslang/vcpkg.json @@ -1,6 +1,16 @@ { "name": "glslang", - "version": "11.5.0", + "version": "11.6.0", "description": "Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator", - "homepage": "https://github.com/KhronosGroup/glslang" + "homepage": "https://github.com/KhronosGroup/glslang", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libmediainfo/CONTROL b/ports/libmediainfo/CONTROL deleted file mode 100644 index 9b7bb21c1c921e..00000000000000 --- a/ports/libmediainfo/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libmediainfo -Version: 20.09 -Homepage: https://github.com/MediaArea/MediaInfoLib -Description: Get most relevant technical and tag data from video and audio files -Build-Depends: libzen, curl, zlib diff --git a/ports/libmediainfo/portfile.cmake b/ports/libmediainfo/portfile.cmake index 75e602edc05463..987fcdc9884535 100644 --- a/ports/libmediainfo/portfile.cmake +++ b/ports/libmediainfo/portfile.cmake @@ -1,23 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO MediaArea/MediaInfoLib - REF v20.09 - SHA512 0e9407d0a430c396b98f8e911e606bc4fa14914881540552bc81d78a57908aa4a54666f415474dda176527ed88148629660e3f2c090f648db8b75a92fec2449f + REF d5fb067e1539aa7a74c491e8262c81214f9c8bcb #v21.03 + SHA512 6d49c8187dca264b4d9fb1f93a82cb65435e81a2540cfb84f885d53737560f7e8e60c8209e7d184cb191f298495db90ffb3185481e3ed44bf5a1f5131f671d89 HEAD_REF master PATCHES vcpkg_support_in_cmakelists.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/Project/CMake - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/Project/CMake" OPTIONS -DBUILD_ZENLIB=0 -DBUILD_ZLIB=0 ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/mediainfolib TARGET_PATH share/mediainfolib) +vcpkg_cmake_install() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/mediainfolib") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/share/MediaInfoLib") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/mediainfolib" "${CURRENT_PACKAGES_DIR}/debug/share/MediaInfoLib") +endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME MediaInfoLib CONFIG_PATH share/MediaInfoLib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json new file mode 100644 index 00000000000000..f254ce92487f93 --- /dev/null +++ b/ports/libmediainfo/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libmediainfo", + "version-string": "21.03", + "description": "Get most relevant technical and tag data from video and audio files", + "homepage": "https://github.com/MediaArea/MediaInfoLib", + "dependencies": [ + "curl", + "libzen", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/ports/libmediainfo/vcpkg_support_in_cmakelists.patch b/ports/libmediainfo/vcpkg_support_in_cmakelists.patch index d3c22ab021690a..c38c919c81a193 100644 --- a/ports/libmediainfo/vcpkg_support_in_cmakelists.patch +++ b/ports/libmediainfo/vcpkg_support_in_cmakelists.patch @@ -1,5 +1,5 @@ diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt -index 47c4ed13..f13ff531 100644 +index f983343..c6ba5ea 100644 --- a/Project/CMake/CMakeLists.txt +++ b/Project/CMake/CMakeLists.txt @@ -88,7 +88,7 @@ endif() @@ -11,7 +11,7 @@ index 47c4ed13..f13ff531 100644 include_directories(${MediaInfoLib_SOURCES_PATH}) include_directories(${MediaInfoLib_SOURCES_PATH}/ThirdParty/md5/) -@@ -398,13 +398,7 @@ endif() +@@ -400,13 +400,7 @@ endif() target_link_libraries(mediainfo ${ZenLib_LIBRARY} ${ZLIB_LIBRARIES}) if(MSVC AND BUILD_SHARED_LIBS) @@ -27,19 +27,20 @@ index 47c4ed13..f13ff531 100644 if (APPLE) diff --git a/Source/ThirdParty/aes-gladman/aesopt.h b/Source/ThirdParty/aes-gladman/aesopt.h -index 6ad9ca1e..a858396f 100644 +index d3ac0f9..eeefa40 100644 --- a/Source/ThirdParty/aes-gladman/aesopt.h +++ b/Source/ThirdParty/aes-gladman/aesopt.h -@@ -183,6 +183,6 @@ Issue Date: 20/12/2007 - AES_REV_DKS must NOT be defined when such assembler files are - built +@@ -183,7 +183,7 @@ Issue Date: 20/12/2007 + AES_REV_DKS must NOT be defined when such assembler files are + built */ -#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) +#if 1 && defined( _WIN64 ) && defined( _MSC_VER ) && defined( _M_AMD64 ) # define INTEL_AES_POSSIBLE #endif + diff --git a/Source/ThirdParty/aes-gladman/brg_endian.h b/Source/ThirdParty/aes-gladman/brg_endian.h -index 4c34f2b5..fae471b9 100644 +index b44c5cb..8c34364 100644 --- a/Source/ThirdParty/aes-gladman/brg_endian.h +++ b/Source/ThirdParty/aes-gladman/brg_endian.h @@ -110,7 +110,8 @@ Issue Date: 20/12/2007 diff --git a/versions/baseline.json b/versions/baseline.json index 9c7065b1efb05f..494b8e07f6b71f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2381,7 +2381,7 @@ "port-version": 0 }, "glslang": { - "baseline": "11.5.0", + "baseline": "11.6.0", "port-version": 0 }, "glui": { @@ -3421,7 +3421,7 @@ "port-version": 0 }, "libmediainfo": { - "baseline": "20.09", + "baseline": "21.03", "port-version": 0 }, "libmesh": { diff --git a/versions/g-/glslang.json b/versions/g-/glslang.json index 9d0ddcbad91896..312611485261a5 100644 --- a/versions/g-/glslang.json +++ b/versions/g-/glslang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e89013d81f909760cdc3ce9015f84ce74621eec", + "version": "11.6.0", + "port-version": 0 + }, { "git-tree": "e1d95a78d1dee917b157cbdef0896ab7256ea637", "version": "11.5.0", diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index e40cf3845e93b7..95dad996eb2fcc 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a24db679914e335ba6235de799467dfcb8842fc6", + "version-string": "21.03", + "port-version": 0 + }, { "git-tree": "e23c8e758ec10752765cf5fd0c4f86ff4fc0515c", "version-string": "20.09", From 8874c4634a6e37261dcb0565aeebe7aeeb125167 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 7 Sep 2021 21:06:57 -0700 Subject: [PATCH 0470/1858] [google-cloud-cpp] update to latest release (v1.31.1) (#19957) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 6d935c9cf1ea99..22a0829e5757d3 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.31.0 - SHA512 aa650297e60d36f79392a9e206f42bd58f63036e32466ee7a5cd2862cb4b38edf8178e2b04ef3a2dda47ab4f4a544ad3fa4de560f8fd8b9dcf02e60b76a07108 + REF v1.31.1 + SHA512 c172280cc934978505524d53bc804dc9079af21a1357f347b0bd3554d25cc2d57dec3869f1ba01f9eacaa1367feede84ae158fa3e9039b0e6bb87f7c27717bb1 HEAD_REF master ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 446aacacfec194..430fc44f41c761 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.31.0", + "version": "1.31.1", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 494b8e07f6b71f..ac1a5a098e0232 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2401,7 +2401,7 @@ "port-version": 6 }, "google-cloud-cpp": { - "baseline": "1.31.0", + "baseline": "1.31.1", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 754bb5877f25d1..b2a8c9989a7822 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64af5624931918b1df7ff30a2f44ef86104739cd", + "version": "1.31.1", + "port-version": 0 + }, { "git-tree": "81d0a42380da299b4942b6d7f8c00ecba4ca7745", "version": "1.31.0", From 09870ebe126a39ea39a77a1e1e1ccd3e8d56f79d Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:09:06 +0800 Subject: [PATCH 0471/1858] [ms-gltf] Update to latest release r1.9.5.4 (#19958) * [ms-gltf] Fix the wrong homepage * Update pdb file path * Pass WINDOWS_USE_MSBUILD to vcpkg_cmake_configure * Update to latest release r1.9.5.4 --- ports/ms-gltf/portfile.cmake | 29 +++++++++++++++++------------ ports/ms-gltf/vcpkg.json | 10 +++++++--- versions/baseline.json | 2 +- versions/m-/ms-gltf.json | 5 +++++ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/ports/ms-gltf/portfile.cmake b/ports/ms-gltf/portfile.cmake index 503fdae04d0055..1382dc046c22a1 100644 --- a/ports/ms-gltf/portfile.cmake +++ b/ports/ms-gltf/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/glTF-SDK - REF 9428f114b540fb93e6533d5ec460fc123efe0c86 # todo: r1.9.6.0 - SHA512 900caf6d72d360bae4c7af769a8879507f7f727b40f61723ffed679ad22877fb37daed2a0dfcbf27e15ab3adc8afe3249530b95691ce489b3446e5d9a35f205a + REF ac3e70392feb6aef18a07314669f6af2ebc72787 # r1.9.5.4 + SHA512 389b801ddc6f0b29269bcd1215fa9e63fe46a1f1a8778125c6439e34fe0925d5534b1cdbea30824a4a8aa008015124dc7cc4558daa9522fc6d85e00e8e41e4a9 HEAD_REF master PATCHES fix-install.patch @@ -16,26 +16,31 @@ vcpkg_from_github( # note: Test/Sample executables won't be installed vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES test ENABLE_UNIT_TESTS samples ENABLE_SAMPLES ) # note: Platform-native buildsystem will be more helpful to launch/debug the tests/samples. -# note: The PDB file path is making Ninja fails to install. +# note: The PDB file path is making Ninja fails to install. # For Windows, we rely on /MP. The other platforms should be able to build with PREFER_NINJA. -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +set(WINDOWS_USE_MSBUILD) +if(VCPKG_TARGET_IS_WINDOWS) + set(WINDOWS_USE_MSBUILD "WINDOWS_USE_MSBUILD") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ${WINDOWS_USE_MSBUILD} OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright -) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ms-gltf/vcpkg.json b/ports/ms-gltf/vcpkg.json index f734d95865d626..9b7983b2737d97 100644 --- a/ports/ms-gltf/vcpkg.json +++ b/ports/ms-gltf/vcpkg.json @@ -1,11 +1,15 @@ { "name": "ms-gltf", - "version-string": "r1.9.5.0", + "version-string": "r1.9.5.4", "description": "glTF-SDK is a C++ Software Development Kit for glTF", - "homepage": "https://github.com/microsoft/ms-gltf", + "homepage": "https://github.com/microsoft/glTF-SDK", "supports": "!linux", "dependencies": [ - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + } ], "default-features": [ "test" diff --git a/versions/baseline.json b/versions/baseline.json index ac1a5a098e0232..c737de9973c06c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4289,7 +4289,7 @@ "port-version": 0 }, "ms-gltf": { - "baseline": "r1.9.5.0", + "baseline": "r1.9.5.4", "port-version": 0 }, "ms-gsl": { diff --git a/versions/m-/ms-gltf.json b/versions/m-/ms-gltf.json index f583a8a81ecc4c..ccc4e4b3d17b5b 100644 --- a/versions/m-/ms-gltf.json +++ b/versions/m-/ms-gltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeeeac2de78af647be1312f6e9ab687c18369e99", + "version-string": "r1.9.5.4", + "port-version": 0 + }, { "git-tree": "1c3bf009ece6942607e095c0088810b6dbf86d38", "version-string": "r1.9.5.0", From 8d6c094d25202d36d3c1aef4a622cea7d7b97e76 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Tue, 7 Sep 2021 21:09:32 -0700 Subject: [PATCH 0472/1858] [openimageio] update version to 2.3.7.2 (#19961) * [openimageio] update version to 2.3.7.2 * Disable the test in vcpkg Co-authored-by: Cheney-Wang --- ports/openimageio/disable-test.patch | 18 ++++++++++++++++++ ports/openimageio/portfile.cmake | 5 +++-- ports/openimageio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/openimageio.json | 5 +++++ 5 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 ports/openimageio/disable-test.patch diff --git a/ports/openimageio/disable-test.patch b/ports/openimageio/disable-test.patch new file mode 100644 index 00000000000000..fc46c40b47176a --- /dev/null +++ b/ports/openimageio/disable-test.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 54fe7d9..65f47fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -281,11 +281,12 @@ install (EXPORT OIIO_EXPORTED_TARGETS + FILE ${OIIO_TARGETS_EXPORT_NAME} + NAMESPACE ${PROJECT_NAME}::) + +- ++if (0) + if (NOT ${PROJECT_NAME}_IS_SUBPROJECT) + oiio_setup_test_data() + oiio_add_all_tests() + endif () ++endif () + + if (NOT ${PROJECT_NAME}_IS_SUBPROJECT) + include (packaging) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 86c2899d8fd779..496ec5c437d688 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -8,12 +8,13 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenImageIO/oiio - REF 099c8585e3add6f58fab9aa438a491fa55d3f67e # 2.2.17.0 - SHA512 36e3aef52e082fcff64a16d10ad372a6335b3562c3d6e62aac88173476ae6c3694ac565084d50551724f47be83a7a8182e608c81c7a787392e576d9c401f65f5 + REF 9f74cf4d9813bfdcad5bca08b4ff75a25d056cb0 # 2.3.7.2 + SHA512 cebc388e842e983f010c5f3bf57bed3fe1ae9d2eac79019472f8431b194d6a8b156b27cc5688bd0998aa2d01959d47bcdc7e637417f755433ffe32c491cdc376 HEAD_REF master PATCHES fix-config-cmake.patch fix_static_build.patch + disable-test.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index c89d105d69b09e..78ab842b92735d 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openimageio", - "version": "2.2.17.0", - "port-version": 1, + "version": "2.3.7.2", "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c737de9973c06c..b2bc2818a6b59c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4713,8 +4713,8 @@ "port-version": 1 }, "openimageio": { - "baseline": "2.2.17.0", - "port-version": 1 + "baseline": "2.3.7.2", + "port-version": 0 }, "openjpeg": { "baseline": "2.3.1", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 97fa6210a7a997..e68d13dda864e6 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6da138c7530d19649391636a660a06aac51db135", + "version": "2.3.7.2", + "port-version": 0 + }, { "git-tree": "1567eaa1f67e0996635f0d4213b55e9b97882acf", "version": "2.2.17.0", From 130764f8d53a133c67bd3b7e575dc9f9675593c6 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:40:10 +0800 Subject: [PATCH 0473/1858] [libuv/librsync/libqrencode] Update to latest release version (#19972) * [libuv/librsync/libqrencode] Update to latest release version * Update the baseline version * [libuv] Add new source file epoll.c * Update the source * Small changes --- ports/libqrencode/CONTROL | 9 ------ ports/libqrencode/portfile.cmake | 47 +++++++++++++++----------------- ports/libqrencode/vcpkg.json | 25 +++++++++++++++++ ports/librsync/CONTROL | 6 ---- ports/librsync/portfile.cmake | 34 ++++++++++------------- ports/librsync/vcpkg.json | 13 +++++++++ ports/libuv/CMakeLists.txt | 1 + ports/libuv/portfile.cmake | 27 +++++++++--------- ports/libuv/vcpkg.json | 15 ++++++++-- versions/baseline.json | 10 +++---- versions/l-/libqrencode.json | 5 ++++ versions/l-/librsync.json | 5 ++++ versions/l-/libuv.json | 5 ++++ 13 files changed, 121 insertions(+), 81 deletions(-) delete mode 100644 ports/libqrencode/CONTROL create mode 100644 ports/libqrencode/vcpkg.json delete mode 100644 ports/librsync/CONTROL create mode 100644 ports/librsync/vcpkg.json diff --git a/ports/libqrencode/CONTROL b/ports/libqrencode/CONTROL deleted file mode 100644 index 51ac671a408b18..00000000000000 --- a/ports/libqrencode/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: libqrencode -Version: 4.1.0 -Build-Depends: libpng, libiconv -Homepage: https://github.com/fukuchi/libqrencode -Description: libqrencode - a fast and compact QR Code encoding library - -Feature: tool -Description: Build qrencode tool -Build-Depends: getopt (windows) diff --git a/ports/libqrencode/portfile.cmake b/ports/libqrencode/portfile.cmake index 0097ad6fc12eb4..40e383c3cbeb4b 100644 --- a/ports/libqrencode/portfile.cmake +++ b/ports/libqrencode/portfile.cmake @@ -1,22 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fukuchi/libqrencode - REF 0f6149e41533a34029e72ff9234a18e0f22ab992 #v4.1.0 - SHA512 7aa215d1a9b06df19bcc0178d241af285d5215f6df994f9e2cf64cde716c7451252380a17e60ef27899bf9039e91306c8eb1948b40ede188d49a25555a94c22a + REF 715e29fd4cd71b6e452ae0f4e36d917b43122ce8 # v4.1.1 + SHA512 78a5464c6fd37d2b4ed6d81c5faf8d95f6f1c95bfdb55dfe89fc227cd487c1685e8080694b1c93128364337959562ea133b3bb332ae1c5a4094614b493611e9f HEAD_REF master ) -if("tool" IN_LIST FEATURES) - set(WITH_TOOLS YES) -else() - set(WITH_TOOLS NO) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool WITH_TOOLS +) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS - -DWITH_TOOLS=${WITH_TOOLS} + ${FEATURE_OPTIONS} -DWITH_TEST=NO -DSKIP_INSTALL_PROGRAMS=ON -DSKIP_INSTALL_EXECUTABLES=ON @@ -26,32 +24,31 @@ vcpkg_configure_cmake( -DWITH_TOOLS=NO ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS) # Windows - set(EXECUTABLE_SUFFIX ".exe") + set(EXECUTABLE_SUFFIX ".exe") else() - set(EXECUTABLE_SUFFIX "") + set(EXECUTABLE_SUFFIX "") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/qrencode.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qrencode.dll ${CURRENT_PACKAGES_DIR}/bin/qrencode.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/qrencode.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qrencode.dll" "${CURRENT_PACKAGES_DIR}/bin/qrencode.dll") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll ${CURRENT_PACKAGES_DIR}/debug/bin/qrencoded.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qrencoded.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/qrencoded.dll") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/qrencode") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/qrencode${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/qrencode/qrencode${EXECUTABLE_SUFFIX}") - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/qrencode) + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/qrencode") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libqrencode/vcpkg.json b/ports/libqrencode/vcpkg.json new file mode 100644 index 00000000000000..e9f572ad9644ed --- /dev/null +++ b/ports/libqrencode/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "libqrencode", + "version-semver": "4.1.1", + "description": "libqrencode - a fast and compact QR Code encoding library", + "homepage": "https://github.com/fukuchi/libqrencode", + "dependencies": [ + "libiconv", + "libpng", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tool": { + "description": "Build qrencode tool", + "dependencies": [ + { + "name": "getopt", + "platform": "windows" + } + ] + } + } +} diff --git a/ports/librsync/CONTROL b/ports/librsync/CONTROL deleted file mode 100644 index bb1bb15f24b474..00000000000000 --- a/ports/librsync/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: librsync -Version: 2020-09-16 -Port-Version: 1 -Description: librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications. -Homepage: http://librsync.sourcefrog.net/ -Supports: !uwp diff --git a/ports/librsync/portfile.cmake b/ports/librsync/portfile.cmake index a701f76ca96b95..e9bb64ab9cad2a 100644 --- a/ports/librsync/portfile.cmake +++ b/ports/librsync/portfile.cmake @@ -5,44 +5,38 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO librsync/librsync - REF d1938c387e86ab5bbf7cb2e84244229c5bbd5ebf # commit 2020-06-04 - SHA512 2afb844f20e6d74d8874b2022db5c4c4befa09f2cfcf5360ffcdd4fd3ef56270d3ab8de6be76fc68f8648d871c28f3bbe15e4f6f417c0776b542f86ac6a910cb + REF 42b636d2a65ab6914ea7cac50886da28192aaf9b # V2.3.2 + SHA512 4903a64e327a7d49ae5f741b7b9fe3a76018010147249e2bc53917b06d31ee0f9b917f6c3e36a2d241ae66c19fa881113b59911d777742a859922486d9fe9c4c HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_RDIFF:BOOL=OFF -DENABLE_COMPRESSION:BOOL=OFF -DENABLE_TRACE:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/rsync.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/rsync.dll ${CURRENT_PACKAGES_DIR}/bin/rsync.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/rsync.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/rsync.dll" "${CURRENT_PACKAGES_DIR}/bin/rsync.dll") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll ${CURRENT_PACKAGES_DIR}/debug/bin/rsync.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/rsync.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/rsync.dll") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/librsync_export.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/librsync_export.h" "# ifdef LIBRSYNC_STATIC_DEFINE" "# if 1 /* LIBRSYNC_STATIC_DEFINE */" ) endif() -file(INSTALL - ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright -) - vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/librsync/vcpkg.json b/ports/librsync/vcpkg.json new file mode 100644 index 00000000000000..34aafdb9bcadf4 --- /dev/null +++ b/ports/librsync/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "librsync", + "version-semver": "2.3.2", + "description": "librsync is a library for calculating and applying network deltas, with an interface designed to ease integration into diverse network applications.", + "homepage": "http://librsync.sourcefrog.net/", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt index b51630d78edf86..d400b60ba76e94 100644 --- a/ports/libuv/CMakeLists.txt +++ b/ports/libuv/CMakeLists.txt @@ -32,6 +32,7 @@ file(GLOB UV_SOURCES_LINUX src/unix/procfs-exepath.c src/unix/sysinfo-loadavg.c src/unix/sysinfo-memory.c + src/unix/epoll.c ) file(GLOB UV_SOURCES_DARWIN src/unix/proctitle.c diff --git a/ports/libuv/portfile.cmake b/ports/libuv/portfile.cmake index 67e7eb009a42d8..6c2c384bb64b3c 100644 --- a/ports/libuv/portfile.cmake +++ b/ports/libuv/portfile.cmake @@ -1,38 +1,39 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libuv/libuv - REF 1dff88e5161cba5c59276d2070d2e304e4dcb242 # v1.41.0 - SHA512 c98b1c0b79ab87fcb49b9b7e69274d2f88318f58ec6403a75126ebda048a1f5c8bb28ed382996a0fd79f38a2f4b726e1bf6bc76a59339b5e80f2d32d9e42dc53 + REF 6ce14710da7079eb248868171f6343bc409ea3a4 # v1.42.0 + SHA512 305b0e8beb9372d22b767f1f792c6351d4b2d747b31cda95a4657cfca101806a17dd0bfab2039d22e29387c9d5ee376fe1b22d63aba1baf0d88817cbcacd97b8 HEAD_REF v1.x ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DUV_SKIP_HEADERS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libuv TARGET_PATH share/unofficial-libuv) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libuv CONFIG_PATH share/unofficial-libuv) vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + configure_file( - ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake - ${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake + "${CMAKE_CURRENT_LIST_DIR}/unofficial-libuv-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/unofficial-libuv/unofficial-libuv-config.cmake" @ONLY ) -file(READ ${CURRENT_PACKAGES_DIR}/include/uv.h UV_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/uv.h" UV_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") string(REPLACE "defined(USING_UV_SHARED)" "1" UV_H "${UV_H}") else() string(REPLACE "defined(USING_UV_SHARED)" "0" UV_H "${UV_H}") configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/uv.h "${UV_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/uv.h" "${UV_H}") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index d43b82c54e8629..44b67b26cc168b 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,7 +1,16 @@ { "name": "libuv", - "version": "1.41.0", - "port-version": 1, + "version-semver": "1.42.0", "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", - "homepage": "https://github.com/libuv/libuv" + "homepage": "https://github.com/libuv/libuv", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index b2bc2818a6b59c..13a56e3e4a6df3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3585,7 +3585,7 @@ "port-version": 0 }, "libqrencode": { - "baseline": "4.1.0", + "baseline": "4.1.1", "port-version": 0 }, "librabbitmq": { @@ -3613,8 +3613,8 @@ "port-version": 5 }, "librsync": { - "baseline": "2020-09-16", - "port-version": 1 + "baseline": "2.3.2", + "port-version": 0 }, "librtmp": { "baseline": "2019-11-11", @@ -3789,8 +3789,8 @@ "port-version": 8 }, "libuv": { - "baseline": "1.41.0", - "port-version": 1 + "baseline": "1.42.0", + "port-version": 0 }, "libuvc": { "baseline": "2020-11-24", diff --git a/versions/l-/libqrencode.json b/versions/l-/libqrencode.json index f930d7603b9ba1..e078d4768f7a17 100644 --- a/versions/l-/libqrencode.json +++ b/versions/l-/libqrencode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89b4597328eb8e7399b0cdaf1342c0abc74771c7", + "version-semver": "4.1.1", + "port-version": 0 + }, { "git-tree": "21e120487f7ddca306d7ddb04c75a86f360b7a4c", "version-string": "4.1.0", diff --git a/versions/l-/librsync.json b/versions/l-/librsync.json index 2dd200a236dc84..1233b9154e4736 100644 --- a/versions/l-/librsync.json +++ b/versions/l-/librsync.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6fbc4e5fec56fbef5ac08d642e8b550a1c47490", + "version-semver": "2.3.2", + "port-version": 0 + }, { "git-tree": "ce3c47220d819e3348b72aad90254cabdf238000", "version-string": "2020-09-16", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 011e4609c2b0e9..2faee63522eb0a 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf96a59d9d41035fe89515464b3f93bcb9b84f27", + "version-semver": "1.42.0", + "port-version": 0 + }, { "git-tree": "42fa2a97059c54e5c2374a9762a7060d85a1091b", "version": "1.41.0", From 78c93d7f709801b6cc7998ea1b30d8d21dcbdfe1 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 8 Sep 2021 12:41:40 +0800 Subject: [PATCH 0474/1858] [arcus/any-lite/aixlog] Update to the latest version (#19977) * [arcus/any-lite/aixlog] Update to the latest version * update version * Apply requested changes * update version * update vcpkg.json * update version --- ports/aixlog/CONTROL | 3 --- ports/aixlog/portfile.cmake | 17 +++++++++++------ ports/aixlog/vcpkg.json | 11 +++++++++++ ports/any-lite/CONTROL | 3 --- ports/any-lite/portfile.cmake | 24 ++++++++---------------- ports/any-lite/vcpkg.json | 15 +++++++++++++++ ports/arcus/CONTROL | 6 ------ ports/arcus/portfile.cmake | 15 +++++++-------- ports/arcus/vcpkg.json | 18 ++++++++++++++++++ versions/a-/aixlog.json | 5 +++++ versions/a-/any-lite.json | 5 +++++ versions/a-/arcus.json | 5 +++++ versions/baseline.json | 6 +++--- 13 files changed, 88 insertions(+), 45 deletions(-) delete mode 100644 ports/aixlog/CONTROL create mode 100644 ports/aixlog/vcpkg.json delete mode 100644 ports/any-lite/CONTROL create mode 100644 ports/any-lite/vcpkg.json delete mode 100644 ports/arcus/CONTROL create mode 100644 ports/arcus/vcpkg.json diff --git a/ports/aixlog/CONTROL b/ports/aixlog/CONTROL deleted file mode 100644 index d0b7edb2f9064e..00000000000000 --- a/ports/aixlog/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: aixlog -Version: 1.4.0 -Description: Header-only C++ logging library diff --git a/ports/aixlog/portfile.cmake b/ports/aixlog/portfile.cmake index c1e27894752cef..5249e4d23d1f2c 100644 --- a/ports/aixlog/portfile.cmake +++ b/ports/aixlog/portfile.cmake @@ -1,11 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO badaix/aixlog - REF c268f271ef7e7181389205e985740f29e6744a8c # v1.4.0 - SHA512 7014d22a0bdbaf85191d18652531af6e0c8ff6d8041bf92a80d51994cfbdf0d9d63c4f8836b9bba16d1895ffa03ad0749a42bd11706eb5f3cde1dcbe76746c24 + REF fd4a341740ee840092963de852584ec8ff811c4f # v1.5.0 + SHA512 10ab07dcb1e67064c0d69ddcf9289d79d914c70fe6922f32179f9ac38d5c682a4ebe08b686d8160c699a6b966bc7aa2fd7d0268664570a10ce146850e78b292d ) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aixlog/vcpkg.json b/ports/aixlog/vcpkg.json new file mode 100644 index 00000000000000..978c86f3f67927 --- /dev/null +++ b/ports/aixlog/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "aixlog", + "version-semver": "1.5.0", + "description": "Header-only C++ logging library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/any-lite/CONTROL b/ports/any-lite/CONTROL deleted file mode 100644 index 6eaf3d1670f5c8..00000000000000 --- a/ports/any-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: any-lite -Version: 0.2.0 -Description: A C++17-like any, a type-safe container for single values of any type for C++98, C++11 and later in a single-file header-only library diff --git a/ports/any-lite/portfile.cmake b/ports/any-lite/portfile.cmake index 22809839c25cb1..a1b509d65880c1 100644 --- a/ports/any-lite/portfile.cmake +++ b/ports/any-lite/portfile.cmake @@ -1,29 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/any-lite - REF v0.2.0 - SHA512 703900d7bac96d41f903b6cabba4bce15ef3cf7ef0a6a66de76230498ededff110e43d68d4a3fd6996869b2edd001f69bd53039a214d06b774ce99518f384a68 + REF d45a83b8e49d09ff5e5b66c10a56c997946436d9 #v0.4.0 + SHA512 b73fe2d1e6de24e143337ef72f71949bf2ae4157a58a5c7e45dd0e9412dd798da6ef929fa09d104305483e769a603b37babd7ba65ab854a33483ab3ec8a921ec ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DANY_LITE_OPT_BUILD_TESTS=OFF -DANY_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file( REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file( INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/any-lite/vcpkg.json b/ports/any-lite/vcpkg.json new file mode 100644 index 00000000000000..31f836c51dd20c --- /dev/null +++ b/ports/any-lite/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "any-lite", + "version-semver": "0.4.0", + "description": "A C++17-like any, a type-safe container for single values of any type for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/arcus/CONTROL b/ports/arcus/CONTROL deleted file mode 100644 index 297d3b05557468..00000000000000 --- a/ports/arcus/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: arcus -Version: 4.8.0 -Homepage: https://github.com/Ultimaker/libArcus -Description: This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library. -Supports: !uwp -Build-Depends: protobuf diff --git a/ports/arcus/portfile.cmake b/ports/arcus/portfile.cmake index a149c16964cca4..d22a64d30bd114 100644 --- a/ports/arcus/portfile.cmake +++ b/ports/arcus/portfile.cmake @@ -3,28 +3,27 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ultimaker/libArcus - REF 4.8.0 - SHA512 44db9b48ab6be08c30f2121d68197a7347eaf3ee255649969a773afbe45ec2433e2cc082aa72f6d40dad7ea28345da858471fff9a129365a4e848df8c8c07689 + REF 617f6f71572090f73cb44592b12f49567b539e5b #v4.10.0 + SHA512 cf0954d8b10d9f94165aa5c086d0e58c2925464f9fbe4252535c36d7e6bb12b767d89efb816c9e642f9cd7f0ec0d66d61ca21c5121a05340499d38d5d851f73b HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_PYTHON=OFF -DBUILD_EXAMPLES=OFF -DBUILD_STATIC=${ENABLE_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Arcus TARGET_PATH share/arcus) +vcpkg_cmake_config_fixup(PACKAGE_NAME Arcus CONFIG_PATH lib/cmake/Arcus) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/arcus/copyright" COPYONLY) \ No newline at end of file +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) \ No newline at end of file diff --git a/ports/arcus/vcpkg.json b/ports/arcus/vcpkg.json new file mode 100644 index 00000000000000..bb3d46b35c32b2 --- /dev/null +++ b/ports/arcus/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "arcus", + "version-semver": "4.10.0", + "description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.", + "homepage": "https://github.com/Ultimaker/libArcus", + "supports": "!uwp", + "dependencies": [ + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/aixlog.json b/versions/a-/aixlog.json index ce2a415ade78b8..203715084bde84 100644 --- a/versions/a-/aixlog.json +++ b/versions/a-/aixlog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca812db174980bd0007da672c5ec4dd52134bf73", + "version-semver": "1.5.0", + "port-version": 0 + }, { "git-tree": "b75ca5f2a37de51c0e0b369a124fb0ae5a05d323", "version-string": "1.4.0", diff --git a/versions/a-/any-lite.json b/versions/a-/any-lite.json index 50b9920160adbc..1ad1fa100cc3e0 100644 --- a/versions/a-/any-lite.json +++ b/versions/a-/any-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80479a956ce0c1547469f0b887278b07ac8de0c0", + "version-semver": "0.4.0", + "port-version": 0 + }, { "git-tree": "cf16580f5d27b67f0fca4ebf3eba27ad70925859", "version-string": "0.2.0", diff --git a/versions/a-/arcus.json b/versions/a-/arcus.json index 1c8f915e0aa38c..c222d1ef0e3f8f 100644 --- a/versions/a-/arcus.json +++ b/versions/a-/arcus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76f86c7d5993d59f58a0863b9e2ca439db88efba", + "version-semver": "4.10.0", + "port-version": 0 + }, { "git-tree": "60c6c8f7ebf7b481fba071481b60e89085093e87", "version-string": "4.8.0", diff --git a/versions/baseline.json b/versions/baseline.json index 13a56e3e4a6df3..528f2b2d162bfd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -33,7 +33,7 @@ "port-version": 0 }, "aixlog": { - "baseline": "1.4.0", + "baseline": "1.5.0", "port-version": 0 }, "akali": { @@ -89,7 +89,7 @@ "port-version": 0 }, "any-lite": { - "baseline": "0.2.0", + "baseline": "0.4.0", "port-version": 0 }, "anyrpc": { @@ -121,7 +121,7 @@ "port-version": 0 }, "arcus": { - "baseline": "4.8.0", + "baseline": "4.10.0", "port-version": 0 }, "argagg": { From 6cb2a9ec90fc20a9690dcef0802cb2e93578fa31 Mon Sep 17 00:00:00 2001 From: Jafar Abdi Date: Wed, 8 Sep 2021 07:48:24 +0300 Subject: [PATCH 0475/1858] [libharu] Fix renaming library when one of the build type is selected (#19979) * libharu: Fix renaming library when build type is either release or debug Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Run vcpkg x-add-version --all * Small changes Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/libharu/CONTROL | 10 --------- ports/libharu/portfile.cmake | 40 +++++++++++++++++++++--------------- ports/libharu/vcpkg.json | 26 +++++++++++++++++++++++ versions/baseline.json | 4 ++-- versions/l-/libharu.json | 5 +++++ 5 files changed, 56 insertions(+), 29 deletions(-) delete mode 100644 ports/libharu/CONTROL create mode 100644 ports/libharu/vcpkg.json diff --git a/ports/libharu/CONTROL b/ports/libharu/CONTROL deleted file mode 100644 index 95e84e34aa34ce..00000000000000 --- a/ports/libharu/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: libharu -Version: 2017-08-15-9 -Homepage: https://github.com/libharu/libharu -Description: libharu - free PDF library -Build-Depends: zlib, libpng -Default-Features: notiffsymbols - -Feature: notiffsymbols -Description: disable symbols also defined by the tiff port -Build-Depends: tiff \ No newline at end of file diff --git a/ports/libharu/portfile.cmake b/ports/libharu/portfile.cmake index 7a9f6891c0c2b2..20c5952547b937 100644 --- a/ports/libharu/portfile.cmake +++ b/ports/libharu/portfile.cmake @@ -31,34 +31,41 @@ else() set(VCPKG_BUILD_STATIC_LIBS ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLIBHPDF_STATIC=${VCPKG_BUILD_STATIC_LIBS} -DLIBHPDF_SHARED=${VCPKG_BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib ${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.lib" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.lib") + endif() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfsd.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.lib") + endif() else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a ${CURRENT_PACKAGES_DIR}/lib/libhpdf.a) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a ${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a) + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/lib/libhpdf.a") + endif() + if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfs.a" "${CURRENT_PACKAGES_DIR}/debug/lib/libhpdfd.a") + endif() endif() endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/README - ${CURRENT_PACKAGES_DIR}/debug/CHANGES - ${CURRENT_PACKAGES_DIR}/debug/INSTALL - ${CURRENT_PACKAGES_DIR}/README - ${CURRENT_PACKAGES_DIR}/CHANGES - ${CURRENT_PACKAGES_DIR}/INSTALL + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/README" + "${CURRENT_PACKAGES_DIR}/debug/CHANGES" + "${CURRENT_PACKAGES_DIR}/debug/INSTALL" + "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/CHANGES" + "${CURRENT_PACKAGES_DIR}/INSTALL" ) file(READ "${CURRENT_PACKAGES_DIR}/include/hpdf.h" _contents) @@ -77,6 +84,5 @@ else() endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/hpdf_types.h" "${_contents}") -file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libharu RENAME copyright) - vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libharu/vcpkg.json b/ports/libharu/vcpkg.json new file mode 100644 index 00000000000000..76537e89f59694 --- /dev/null +++ b/ports/libharu/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "libharu", + "version-string": "2017-08-15", + "port-version": 10, + "description": "libharu - free PDF library", + "homepage": "https://github.com/libharu/libharu", + "dependencies": [ + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ], + "default-features": [ + "notiffsymbols" + ], + "features": { + "notiffsymbols": { + "description": "disable symbols also defined by the tiff port", + "dependencies": [ + "tiff" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 528f2b2d162bfd..9df7bc0ece3340 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3305,8 +3305,8 @@ "port-version": 0 }, "libharu": { - "baseline": "2017-08-15-9", - "port-version": 0 + "baseline": "2017-08-15", + "port-version": 10 }, "libhdfs3": { "baseline": "2019-11-05", diff --git a/versions/l-/libharu.json b/versions/l-/libharu.json index 6b3132ff480260..e08b48e1b6486b 100644 --- a/versions/l-/libharu.json +++ b/versions/l-/libharu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "312f4b697d2f46818c218e270bd447cdeb76322c", + "version-string": "2017-08-15", + "port-version": 10 + }, { "git-tree": "61662ee1cfa10c3e5244a43e24eb1f47e524c293", "version-string": "2017-08-15-9", From 99c058c397b15771e71a0dad109615f997a67e1f Mon Sep 17 00:00:00 2001 From: evpobr Date: Wed, 8 Sep 2021 09:49:35 +0500 Subject: [PATCH 0476/1858] [libsamplerate] Update 0.2.1 -> 0.2.2 (#20003) --- ports/libsamplerate/portfile.cmake | 4 ++-- ports/libsamplerate/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libsamplerate.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libsamplerate/portfile.cmake b/ports/libsamplerate/portfile.cmake index 3066cb21369004..a6a76490f017b7 100644 --- a/ports/libsamplerate/portfile.cmake +++ b/ports/libsamplerate/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsndfile/libsamplerate - REF 0.2.1 - SHA512 ee661f0f1010f19af623edfa0b52960f9397a99583919a1cc758915e68478271f287ee24bf1ba62ad44413846dff9456d8f7500e9c01290df3a57e58873eaa8f + REF 0.2.2 + SHA512 37e0fd604907caf978659466289315befd66eec16c21a94e0b6106de18ffe803fbf2e7f3a8fb0430b33c0b784ecd6d4eaf3b9a862ed2670104647decbee913d6 HEAD_REF master ) diff --git a/ports/libsamplerate/vcpkg.json b/ports/libsamplerate/vcpkg.json index 83d9709f0f9ad5..aec150fb99ad72 100644 --- a/ports/libsamplerate/vcpkg.json +++ b/ports/libsamplerate/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libsamplerate", - "version-string": "0.2.1", + "version-string": "0.2.2", "description": "Sample Rate Converter for audio", "homepage": "http://libsndfile.github.io/libsamplerate/" } diff --git a/versions/baseline.json b/versions/baseline.json index 9df7bc0ece3340..38bc48495f3cc9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3625,7 +3625,7 @@ "port-version": 4 }, "libsamplerate": { - "baseline": "0.2.1", + "baseline": "0.2.2", "port-version": 0 }, "libsass": { diff --git a/versions/l-/libsamplerate.json b/versions/l-/libsamplerate.json index e7f2a9813eebc9..9917373de64f49 100644 --- a/versions/l-/libsamplerate.json +++ b/versions/l-/libsamplerate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb3644f62b521a50eebc5ede8718fc0669b1f6b5", + "version-string": "0.2.2", + "port-version": 0 + }, { "git-tree": "658d28f9892b0676577bb6b61b3eff7d2730e72e", "version-string": "0.2.1", From 18b66b6276eafda9687e6e0f5587f3a73695f423 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 8 Sep 2021 22:45:37 +0800 Subject: [PATCH 0477/1858] [libhsplasma/libpcap/lv2/libcrafter] Update to the latest version (#19965) * [libhsplasma/libpcap/lv2] Update to the latest version * [libpcap] Remove unused comments * Update version files * [lv2] Fix usage [libpcap] Update ci.baseline.txt * [libhsplasma] Remove x64-windows-static=fail from ci.baseline.txt * [libcrafter] Update to 1.0 * [libcrafter] Add vcpkg.json * Update version files * Add CRT check for libpcap and update version as versin-semver for libpcap * Update version files Co-authored-by: Billy Robert O'Neal III --- ports/libcrafter/CONTROL | 6 - ports/libcrafter/portfile.cmake | 12 +- ports/libcrafter/vcpkg.json | 10 ++ ports/libhsplasma/CONTROL | 10 -- ports/libhsplasma/portfile.cmake | 23 ++-- ports/libhsplasma/vcpkg.json | 29 +++++ ports/libpcap/0001-fix-package-name.patch | 12 -- ports/libpcap/CONTROL | 5 - ports/libpcap/add-disable-packet-option.patch | 48 +++----- ports/libpcap/install-pc-on-msvc.patch | 104 ++++-------------- ports/libpcap/portfile.cmake | 77 ++++++------- ports/libpcap/vcpkg.json | 13 +++ ports/lv2/CMakeLists.txt | 2 +- ports/lv2/portfile.cmake | 14 +-- ports/lv2/vcpkg.json | 14 ++- scripts/ci.baseline.txt | 9 -- versions/baseline.json | 10 +- versions/l-/libcrafter.json | 5 + versions/l-/libhsplasma.json | 5 + versions/l-/libpcap.json | 5 + versions/l-/lv2.json | 5 + 21 files changed, 184 insertions(+), 234 deletions(-) delete mode 100644 ports/libcrafter/CONTROL create mode 100644 ports/libcrafter/vcpkg.json delete mode 100644 ports/libhsplasma/CONTROL create mode 100644 ports/libhsplasma/vcpkg.json delete mode 100644 ports/libpcap/0001-fix-package-name.patch delete mode 100644 ports/libpcap/CONTROL create mode 100644 ports/libpcap/vcpkg.json diff --git a/ports/libcrafter/CONTROL b/ports/libcrafter/CONTROL deleted file mode 100644 index 47538dae935abe..00000000000000 --- a/ports/libcrafter/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libcrafter -Version: 0.3 -Port-Version: 2 -Homepage: https://github.com/pellegre/libcrafter -Description: Libcrafter is a high level library for C++ designed to create and decode network packets. -Build-Depends: libpcap diff --git a/ports/libcrafter/portfile.cmake b/ports/libcrafter/portfile.cmake index 565a0c3462a575..3b78eadf912089 100644 --- a/ports/libcrafter/portfile.cmake +++ b/ports/libcrafter/portfile.cmake @@ -1,15 +1,17 @@ +vcpkg_fail_port_install(ON_TARGET "windows") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pellegre/libcrafter - REF version-0.3 - SHA512 7c396ba942b304dddfaa569adb44697f75568d3ef2ed48dda758e281f3b7c172439309033bbf5498069a4a61a952f93e41af99b129ce874ce76b5ec08da58116 + REF 86f81f101b5e3051ed04563b3ad3dd7a823afb21 #version-1.0 + SHA512 bd0eac06896df63f0fff0ed3cf7ca5176e56615476c8134bd26f035692ab9e583f58f1f57daa7673771a710d6921c0c6a6473ab181982ad57727584f2cde56d0 HEAD_REF master PATCHES fix-build-error.patch ) vcpkg_configure_make( AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH libcrafter OPTIONS "--with-libpcap=${CURRENT_INSTALLED_DIR}" @@ -17,9 +19,9 @@ vcpkg_configure_make( vcpkg_install_make() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/libcrafter/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/libcrafter/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libcrafter/vcpkg.json b/ports/libcrafter/vcpkg.json new file mode 100644 index 00000000000000..0f774a171abe74 --- /dev/null +++ b/ports/libcrafter/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libcrafter", + "version": "1.0", + "description": "Libcrafter is a high level library for C++ designed to create and decode network packets.", + "homepage": "https://github.com/pellegre/libcrafter", + "supports": "!windows", + "dependencies": [ + "libpcap" + ] +} diff --git a/ports/libhsplasma/CONTROL b/ports/libhsplasma/CONTROL deleted file mode 100644 index eb5c047edd67db..00000000000000 --- a/ports/libhsplasma/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: libhsplasma -Version: 2020.08.30 -Homepage: https://github.com/H-uru/libhsplasma -Description: Cross-platform Plasma data and network library -Build-Depends: libjpeg-turbo, libpng, string-theory, zlib -Supports: !(arm|uwp) - -Feature: net -Description: Network functionality -Build-Depends: openssl diff --git a/ports/libhsplasma/portfile.cmake b/ports/libhsplasma/portfile.cmake index 506f09d20acbf0..b37dfa7ae5f528 100644 --- a/ports/libhsplasma/portfile.cmake +++ b/ports/libhsplasma/portfile.cmake @@ -1,20 +1,20 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO H-uru/libhsplasma - REF afd9c46fa72afbbaf5260800ecfde0704ba2a475 - SHA512 21774b465ede7fe5e44df4470ed6867977ac9249400ba6d0bed33fd0e856d467de1afe79afb8a4dc6145eef21c5a3f79590b5cfa3ea1337cc355ca8f3bf1a11c + REF e435db76f86a0258ccd6f62a8bcd1f8b42d4f22d #2021.06.08 + SHA512 ebd53633f22662793613c689b5a07f6149ed2b437c42a024e7c14a18d4411356edb11c95c08e1215dde443988fd1e4bcdd8d35fc30ca2545f507d6a61565cc69 HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - net ENABLE_NET + FEATURES + net ENABLE_NET ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DENABLE_PHYSX=OFF @@ -22,14 +22,11 @@ vcpkg_configure_cmake( -DENABLE_TOOLS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets( - CONFIG_PATH share/cmake/HSPlasma - TARGET_PATH share/HSPlasma -) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME HSPlasma CONFIG_PATH share/cmake/HSPlasma) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libhsplasma/vcpkg.json b/ports/libhsplasma/vcpkg.json new file mode 100644 index 00000000000000..3c6ea3930f5c5b --- /dev/null +++ b/ports/libhsplasma/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libhsplasma", + "version-string": "2021.06.08", + "description": "Cross-platform Plasma data and network library", + "homepage": "https://github.com/H-uru/libhsplasma", + "supports": "!(arm | uwp)", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "string-theory", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "net": { + "description": "Network functionality", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/ports/libpcap/0001-fix-package-name.patch b/ports/libpcap/0001-fix-package-name.patch deleted file mode 100644 index cd1deeed267c00..00000000000000 --- a/ports/libpcap/0001-fix-package-name.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55b93f1..f4f9d51 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2358,7 +2358,6 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include) - # On UN*X, and on Windows when not using MSVC, generate libpcap.pc and - # pcap-config and process man pages and arrange that they be installed. - if(NOT MSVC) -- set(PACKAGE_NAME ${LIBRARY_NAME}) - set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix "\${prefix}") - set(includedir "\${prefix}/include") diff --git a/ports/libpcap/CONTROL b/ports/libpcap/CONTROL deleted file mode 100644 index d96e55895d3af9..00000000000000 --- a/ports/libpcap/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libpcap -Version: 1.9.1-2 -Description: A portable C/C++ library for network traffic capture -Homepage: https://www.tcpdump.org/ -Supports: !(arm64|uwp|osx) diff --git a/ports/libpcap/add-disable-packet-option.patch b/ports/libpcap/add-disable-packet-option.patch index 842176a559720f..9d89a550596e13 100644 --- a/ports/libpcap/add-disable-packet-option.patch +++ b/ports/libpcap/add-disable-packet-option.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fe9979..23783d3 100644 +index 2f675d1..e9d6d96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -161,6 +161,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire +@@ -244,6 +244,7 @@ set(SEPTEL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../septel" CACHE PATH "Path to dire option(DISABLE_SNF "Disable Myricom SNF support" OFF) option(DISABLE_TC "Disable Riverbed TurboCap support" OFF) @@ -10,38 +10,22 @@ index 3fe9979..23783d3 100644 # # Debugging options. -@@ -220,19 +221,21 @@ if(WIN32) +@@ -302,7 +303,7 @@ if(WIN32) + if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) include_directories(${CMAKE_HOME_DIRECTORY}/../../Common) endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/../../Common) - -- find_package(Packet) -- if(PACKET_FOUND) -- set(HAVE_PACKET32 TRUE) -- include_directories(${PACKET_INCLUDE_DIRS}) -- # -- # Check whether we have the NPcap PacketIsLoopbackAdapter() -- # function. -- # -- cmake_push_check_state() -- set(CMAKE_REQUIRED_LIBRARIES ${PACKET_LIBRARIES}) -- check_function_exists(PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER) -- cmake_pop_check_state() -- endif(PACKET_FOUND) +- + if(NOT DISABLE_PACKET) -+ find_package(Packet) -+ if(PACKET_FOUND) -+ set(HAVE_PACKET32 TRUE) -+ include_directories(${PACKET_INCLUDE_DIRS}) -+ # -+ # Check whether we have the NPcap PacketIsLoopbackAdapter() -+ # function. -+ # -+ cmake_push_check_state() -+ set(CMAKE_REQUIRED_LIBRARIES ${PACKET_LIBRARIES}) -+ check_function_exists(PacketIsLoopbackAdapter HAVE_PACKET_IS_LOOPBACK_ADAPTER) -+ cmake_pop_check_state() -+ endif(PACKET_FOUND) + find_package(Packet) + if(PACKET_FOUND) + set(HAVE_PACKET32 TRUE) +@@ -317,7 +318,8 @@ if(WIN32) + check_function_exists(PacketGetTimestampModes HAVE_PACKET_GET_TIMESTAMP_MODES) + cmake_pop_check_state() + endif(PACKET_FOUND) +- + endif() - ++ message(STATUS "checking for Npcap's version.h") - check_symbol_exists(WINPCAP_PRODUCT_NAME "../../version.h" HAVE_VERSION_H) + check_symbol_exists(WINPCAP_PRODUCT_NAME "${CMAKE_SOURCE_DIR}/../../version.h" HAVE_VERSION_H) + if(HAVE_VERSION_H) diff --git a/ports/libpcap/install-pc-on-msvc.patch b/ports/libpcap/install-pc-on-msvc.patch index f2cd64b44ef1b3..6dd18f202340c0 100644 --- a/ports/libpcap/install-pc-on-msvc.patch +++ b/ports/libpcap/install-pc-on-msvc.patch @@ -1,97 +1,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 55b93f1..3fe9979 100644 +index b83fbbd..2f675d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2355,48 +2355,54 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) +@@ -2678,9 +2678,12 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-bpf.h DESTINATION include) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap-namedb.h DESTINATION include) -# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and +-# pcap-config and process man pages and arrange that they be installed. +-if(NOT MSVC) +# Generate libpcap.pc +if(BUILD_SHARED_LIBS) + set(PACKAGE_NAME ${LIBRARY_NAME}) +else() + set(PACKAGE_NAME pcap) +endif() -+set(prefix ${CMAKE_INSTALL_PREFIX}) -+set(exec_prefix "\${prefix}") -+set(includedir "\${prefix}/include") -+set(libdir "\${exec_prefix}/lib") -+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR -+ CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR -+ CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR -+ CMAKE_SYSTEM_NAME STREQUAL "DragonFly BSD" OR -+ CMAKE_SYSTEM_NAME STREQUAL "Linux" OR -+ CMAKE_SYSTEM_NAME STREQUAL "OSF1") -+ # -+ # Platforms where the linker is the GNU linker -+ # or accepts command-line arguments like -+ # those the GNU linker accepts. -+ # -+ set(V_RPATH_OPT "-Wl,-rpath,") -+elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*") -+ # -+ # SunOS 5.x. -+ # -+ # XXX - this assumes GCC is using the Sun linker, -+ # rather than the GNU linker. -+ # -+ set(V_RPATH_OPT "-Wl,-R,") -+else() -+ # -+ # No option needed to set the RPATH. -+ # -+ set(V_RPATH_OPT "") -+endif() -+set(LIBS "") -+foreach(LIB ${PCAP_LINK_LIBRARIES}) -+ set(LIBS "${LIBS} -l${LIB}") -+endforeach(LIB) -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) -+ -+# On UN*X, and on Windows when not using MSVC, generate - # pcap-config and process man pages and arrange that they be installed. - if(NOT MSVC) -- set(prefix ${CMAKE_INSTALL_PREFIX}) -- set(exec_prefix "\${prefix}") -- set(includedir "\${prefix}/include") -- set(libdir "\${exec_prefix}/lib") -- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR -- CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR -- CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR -- CMAKE_SYSTEM_NAME STREQUAL "DragonFly BSD" OR -- CMAKE_SYSTEM_NAME STREQUAL "Linux" OR -- CMAKE_SYSTEM_NAME STREQUAL "OSF1") -- # -- # Platforms where the linker is the GNU linker -- # or accepts command-line arguments like -- # those the GNU linker accepts. -- # -- set(V_RPATH_OPT "-Wl,-rpath,") -- elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_VERSION MATCHES "5[.][0-9.]*") -- # -- # SunOS 5.x. -- # -- # XXX - this assumes GCC is using the Sun linker, -- # rather than the GNU linker. -- # -- set(V_RPATH_OPT "-Wl,-R,") -- else() -- # -- # No option needed to set the RPATH. -- # -- set(V_RPATH_OPT "") -- endif() -- set(LIBS "") -- foreach(LIB ${PCAP_LINK_LIBRARIES}) -- set(LIBS "${LIBS} -l${LIB}") -- endforeach(LIB) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) -- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) -- + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "\${prefix}") + set(includedir "\${prefix}/include") +@@ -2715,10 +2718,14 @@ if(NOT MSVC) + foreach(LIB ${PCAP_LINK_LIBRARIES}) + set(LIBS "${LIBS} -l${LIB}") + endforeach(LIB) +- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpcap.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc @ONLY) +- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libpcap.pc DESTINATION lib/pkgconfig) ++ ++# On UN*X, and on Windows when not using MSVC, generate libpcap.pc and ++# pcap-config and process man pages and arrange that they be installed. ++if(NOT MSVC) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/pcap-config.in ${CMAKE_CURRENT_BINARY_DIR}/pcap-config @ONLY) ++ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/pcap-config DESTINATION bin) + # # Man pages. - # diff --git a/ports/libpcap/portfile.cmake b/ports/libpcap/portfile.cmake index ab254048230b37..9fef5379d03eeb 100644 --- a/ports/libpcap/portfile.cmake +++ b/ports/libpcap/portfile.cmake @@ -1,10 +1,10 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports x64-windows, x86-windows and Linux" ON_TARGET "UWP" "OSX" ON_ARCH "arm64") +vcpkg_fail_port_install(ON_TARGET "UWP" "OSX") if(EXISTS "${CURRENT_INSTALLED_DIR}/share/winpcap") message(FATAL_ERROR "FATAL ERROR: winpcap and libpcap are incompatible.") endif() -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") +if(VCPKG_TARGET_IS_LINUX) message( "libpcap currently requires the following libraries from the system package manager: flex @@ -13,30 +13,19 @@ These can be installed on Ubuntu systems via sudo apt install flex libbison-dev" ) endif() -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") -vcpkg_download_distfile( - SOURCE_ARCHIVE_PATH - URLS http://www.tcpdump.org/release/libpcap-1.9.1.tar.gz - FILENAME libpcap-1.9.1.tar.gz - SHA512 ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${SOURCE_ARCHIVE_PATH} - REF 1.9.1 + REPO the-tcpdump-group/libpcap + REF c7642e2cc0c5bd65754685b160d25dc23c76c6bd #1.10.1 + SHA512 ed46095863aaee79ca2833d26438f6c837cc3e64acb73efd5a388a11ff7d0d1245d23e5404070a9f2c2c77840c93c09328746761e4481e9a530593a5cbf2ad6f + HEAD_REF master PATCHES - 0001-fix-package-name.patch install-pc-on-msvc.patch add-disable-packet-option.patch ) -# Only dynamic builds are currently supported on Windows -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) -endif() - vcpkg_find_acquire_program(BISON) get_filename_component(BISON_PATH ${BISON} DIRECTORY) vcpkg_add_to_path(${BISON_PATH}) @@ -44,11 +33,11 @@ vcpkg_find_acquire_program(FLEX) get_filename_component(FLEX_PATH ${FLEX} DIRECTORY) vcpkg_add_to_path(${FLEX_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DDISABLE_USB=ON -DDISABLE_NETMAP=ON -DDISABLE_BLUETOOTH=ON -DDISABLE_DBUS=ON @@ -59,37 +48,37 @@ vcpkg_configure_cmake( -DDISABLE_TC=ON -DDISABLE_PACKET=ON -DENABLE_REMOTE=OFF + -DUSE_STATIC_RT=${USE_STATIC_RT} ) -vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -# On Windows 64-bit, libpcap 1.9.1 installs the libraries in a amd64 subdirectory of the usual directories +# On Windows 64-bit, libpcap 1.10.1 installs the libraries in a x64 subdirectory of the usual directories if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - set(libsubdir "amd64") - file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/lib/${libsubdir}/*) - file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}/*) - file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/bin/${libsubdir}/*) - file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(GLOB_RECURSE FILES_TO_MOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}/*) - file(COPY ${FILES_TO_MOVE} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/${libsubdir} - ${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir} - ${CURRENT_PACKAGES_DIR}/bin/${libsubdir} - ${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}) + set(libsubdir "x64") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/lib/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/bin/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(GLOB_RECURSE FILES_TO_MOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}/*") + file(COPY ${FILES_TO_MOVE} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/${libsubdir}" + "${CURRENT_PACKAGES_DIR}/debug/lib/${libsubdir}" + "${CURRENT_PACKAGES_DIR}/bin/${libsubdir}" + "${CURRENT_PACKAGES_DIR}/debug/bin/${libsubdir}") endif() # Even if compiled with BUILD_SHARED_LIBS=ON, pcap also install a pcap_static library if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/pcap_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/pcap_static.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/pcap_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/pcap_static.lib") endif() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ws2_32) +vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/man) - +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/man") \ No newline at end of file diff --git a/ports/libpcap/vcpkg.json b/ports/libpcap/vcpkg.json new file mode 100644 index 00000000000000..56e2a86ae08d21 --- /dev/null +++ b/ports/libpcap/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libpcap", + "version-semver": "1.10.1", + "description": "A portable C/C++ library for network traffic capture", + "homepage": "https://www.tcpdump.org/", + "supports": "!(uwp | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/ports/lv2/CMakeLists.txt b/ports/lv2/CMakeLists.txt index fb51906cd2ed9f..6e17095e90a5d5 100644 --- a/ports/lv2/CMakeLists.txt +++ b/ports/lv2/CMakeLists.txt @@ -31,5 +31,5 @@ endforeach() install( EXPORT lv2-config NAMESPACE lv2:: - DESTINATION "${CMAKE_INSTALL_PREFIX}/share/lv2" + DESTINATION share/lv2 ) diff --git a/ports/lv2/portfile.cmake b/ports/lv2/portfile.cmake index 393bd5dc9d7a08..1c4e8640d3eba3 100644 --- a/ports/lv2/portfile.cmake +++ b/ports/lv2/portfile.cmake @@ -1,22 +1,20 @@ -vcpkg_from_gitlab( - GITLAB_URL https://gitlab.com +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lv2/lv2 - REF v1.18.0 - SHA512 f84c5f2b31f42ed5cab10976d1975743c62f06025a5b67bc99778ba5d0f354c06cb9fad8f5899a52b8c1131f4c9085f5867c83da4d8269c234fd2a22a2c6a689 + REF cd152104c84bcee9fec22ef780cec2af7ba85d0c #v1.18.2 + SHA512 77220524481e97222b12782a89efdcfcb73ee6ac9b9aac88741475c60a2c21049153297860a24b77c0ebd4de32d38a38232ba4fc64d12b8558a56ef50b316801 HEAD_REF master ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") file( INSTALL "${SOURCE_PATH}/COPYING" diff --git a/ports/lv2/vcpkg.json b/ports/lv2/vcpkg.json index 8192f734ad413d..14ff65d9a572ec 100644 --- a/ports/lv2/vcpkg.json +++ b/ports/lv2/vcpkg.json @@ -1,7 +1,17 @@ { "name": "lv2", - "version-string": "1.18.0", + "version-semver": "1.18.2", "description": "LV2 is a plugin standard for audio systems. It defines a minimal yet extensible C API for plugin code and a format for plugin \"bundles\".", "homepage": "https://lv2plug.in", - "license": "ISC" + "license": "ISC", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index eb7e7226d3ad01..ff30d695b977d0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -438,7 +438,6 @@ hiredis:x64-uwp=fail hpx:x64-windows-static=fail hpx:x64-linux=fail hunspell:x64-windows-static-md=fail -libhsplasma:x64-windows-static=fail ideviceinstaller:x64-windows-static-md=fail idevicerestore:x64-linux=fail idevicerestore:x64-osx=fail @@ -544,14 +543,11 @@ libcds:arm-uwp=fail libcds:x64-uwp=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail -libcrafter:x86-windows=fail -libcrafter:x64-windows=fail libgeotiff:arm-uwp=fail libgeotiff:x64-uwp=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail -libcrafter:x64-windows-static-md=fail cpuid:arm-uwp=fail cpuid:x64-uwp=fail cpuid:arm64-windows=fail @@ -673,11 +669,6 @@ libopusenc:arm-uwp=fail libopusenc:x64-osx=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail -libpcap:arm64-windows=fail -libpcap:arm-uwp=fail -libpcap:x64-osx=fail -libpcap:x64-uwp=fail -libpcap:x64-windows-static=fail libpff:arm-uwp=fail libpff:x64-linux=fail libpff:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index 38bc48495f3cc9..4b61fbfe508e9d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3165,8 +3165,8 @@ "port-version": 0 }, "libcrafter": { - "baseline": "0.3", - "port-version": 2 + "baseline": "1.0", + "port-version": 0 }, "libcroco": { "baseline": "0.6.13", @@ -3317,7 +3317,7 @@ "port-version": 3 }, "libhsplasma": { - "baseline": "2020.08.30", + "baseline": "2021.06.08", "port-version": 0 }, "libhv": { @@ -3537,7 +3537,7 @@ "port-version": 0 }, "libpcap": { - "baseline": "1.9.1-2", + "baseline": "1.10.1", "port-version": 0 }, "libpff": { @@ -3961,7 +3961,7 @@ "port-version": 0 }, "lv2": { - "baseline": "1.18.0", + "baseline": "1.18.2", "port-version": 0 }, "lz4": { diff --git a/versions/l-/libcrafter.json b/versions/l-/libcrafter.json index 17626b388f0f4a..54a6f19a85f313 100644 --- a/versions/l-/libcrafter.json +++ b/versions/l-/libcrafter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d64cfcfa4f2d76c110499477112db136cca34ca", + "version": "1.0", + "port-version": 0 + }, { "git-tree": "ab60b081bd44f7a40a649a66c793373931815487", "version-string": "0.3", diff --git a/versions/l-/libhsplasma.json b/versions/l-/libhsplasma.json index 4655181e6228e4..43e6b79a5bfedf 100644 --- a/versions/l-/libhsplasma.json +++ b/versions/l-/libhsplasma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ffbd25ec776fbae40999d98a50d927180b560b5", + "version-string": "2021.06.08", + "port-version": 0 + }, { "git-tree": "3cc323670945b88a5da121aa2823e4ac154d964e", "version-string": "2020.08.30", diff --git a/versions/l-/libpcap.json b/versions/l-/libpcap.json index 772b0beffb5374..4d97a3741392d0 100644 --- a/versions/l-/libpcap.json +++ b/versions/l-/libpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fb18d1935c9d7db3a7ff158e2aba95d5a9c6cd2", + "version-semver": "1.10.1", + "port-version": 0 + }, { "git-tree": "7dbf78276e1e48505930da6993e36bf381a51b3e", "version-string": "1.9.1-2", diff --git a/versions/l-/lv2.json b/versions/l-/lv2.json index 0f803067df8c5e..039be1d3c8243a 100644 --- a/versions/l-/lv2.json +++ b/versions/l-/lv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a811ec51d55cce1d5eaf4a430a8e274f1916bb9", + "version-semver": "1.18.2", + "port-version": 0 + }, { "git-tree": "4fcc1df0a11567c74dccb3fafe922a1f2686eff3", "version-string": "1.18.0", From c53006472ef9dd827fca6aa8a4e81c4c1146b715 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 8 Sep 2021 07:51:30 -0700 Subject: [PATCH 0478/1858] [vamp-sdk] fix library filenames to match upstream build systems (#20002) * [vamp-sdk] fix library filenames to match upstream build systems There were two problems: 1. The port added a `d` suffix for debug builds that upstream did not. This caused `find_library(VampHostSDK_LIBRARY NAMES vamp-sdk)` to fail to find the debug library. 2. The port used the same file name for libraries on every OS but that is not what upstream does. * [vamp-sdk] fix capitalization of Vamp Vamp is not an acronym. --- ports/vamp-sdk/CMakeLists.txt | 10 ++++++++-- ports/vamp-sdk/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/v-/vamp-sdk.json | 5 +++++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ports/vamp-sdk/CMakeLists.txt b/ports/vamp-sdk/CMakeLists.txt index d24851b31785f2..a3d98073dba784 100644 --- a/ports/vamp-sdk/CMakeLists.txt +++ b/ports/vamp-sdk/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.8) project(vamp-cmake) -set(CMAKE_DEBUG_POSTFIX d) - find_package(SndFile REQUIRED) set(VAMP_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/vamp/vamp.h) @@ -65,6 +63,14 @@ set_target_properties(vamp-sdk PROPERTIES PUBLIC_HEADER "${SDK_HEADERS}") set_target_properties(vamp-hostsdk PROPERTIES PUBLIC_HEADER "${HOST_SDK_HEADERS}") +# The Visual Studio project files upstream intentionally output different +# library file names than autotools. +# https://github.com/tenacityteam/tenacity/pull/577#discussion_r702328284 +if(WIN32) + set_target_properties(vamp-sdk PROPERTIES OUTPUT_NAME VampPluginSDK) + set_target_properties(vamp-hostsdk PROPERTIES OUTPUT_NAME VampHostSDK) +endif() + set_property(TARGET vamp-sdk PROPERTY CXX_STANDARD 11) set_property(TARGET vamp-hostsdk PROPERTY CXX_STANDARD 11) diff --git a/ports/vamp-sdk/vcpkg.json b/ports/vamp-sdk/vcpkg.json index c4bc939e25791a..2e6b1fea4fc92e 100644 --- a/ports/vamp-sdk/vcpkg.json +++ b/ports/vamp-sdk/vcpkg.json @@ -2,7 +2,8 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "vamp-sdk", "version": "2.10", - "description": "Library for VAMP plugins", + "port-version": 1, + "description": "Library for Vamp plugins", "homepage": "https://www.vamp-plugins.org/develop.html", "supports": "!uwp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4b61fbfe508e9d..5c064cf1d570bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6674,7 +6674,7 @@ }, "vamp-sdk": { "baseline": "2.10", - "port-version": 0 + "port-version": 1 }, "variant-lite": { "baseline": "1.2.2", diff --git a/versions/v-/vamp-sdk.json b/versions/v-/vamp-sdk.json index ecc1e3b2176cd8..d43b514319b7a6 100644 --- a/versions/v-/vamp-sdk.json +++ b/versions/v-/vamp-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c71927e1997998f40a9d051d65ba4e5760f4257", + "version": "2.10", + "port-version": 1 + }, { "git-tree": "da7ad3424d8266657eec1b28b16a8d389e50b67c", "version": "2.10", From 6981387cc63a44e2898d2492b63d4e3131476eba Mon Sep 17 00:00:00 2001 From: eao197 Date: Wed, 8 Sep 2021 17:51:54 +0300 Subject: [PATCH 0479/1858] [so5extra] Update to 1.4.1.1 (#20004) * so5extra updated to the latest version. * Fix for so5extra's manifest format. * so5extra version added to baseline. * Accepting suggestion for so5extra's manifest. * Update for so5extra version in baseline. --- ports/so5extra/CONTROL | 5 ----- ports/so5extra/portfile.cmake | 4 ++-- ports/so5extra/vcpkg.json | 10 ++++++++++ versions/baseline.json | 2 +- versions/s-/so5extra.json | 5 +++++ 5 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 ports/so5extra/CONTROL create mode 100644 ports/so5extra/vcpkg.json diff --git a/ports/so5extra/CONTROL b/ports/so5extra/CONTROL deleted file mode 100644 index db1624a833e677..00000000000000 --- a/ports/so5extra/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: so5extra -Version: 1.4.1 -Homepage: https://github.com/Stiffstream/so5extra -Description: A set of additional tools for SObjectizer framework. -Build-Depends: sobjectizer diff --git a/ports/so5extra/portfile.cmake b/ports/so5extra/portfile.cmake index c48ca98d9c8890..7ff8f47b6f46d4 100644 --- a/ports/so5extra/portfile.cmake +++ b/ports/so5extra/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/so5extra - REF e03e025b08921c76a650656019a04cf7500620be # v.1.4.1 - SHA512 0ee7b98d713cf5c8789f3275f96e7e92b33cb8d3c44fd98752c11cab07914cb3b104ccaf346e714afd43e115ef854dccb4d04ea37d9063b20947aa0d514dac52 + REF 20f4c83ecde1509fbaf337dcf40f2f49dcf2690d # v.1.4.1.1 + SHA512 a3df042b60afc4c57361b5b3c21f4b7c077f1b0ab7a4d33fda14cc915f10b22a42ef0acbb1c7c8b356ce31ee84f24391164120642faf96235549204c83b40294 ) vcpkg_configure_cmake( diff --git a/ports/so5extra/vcpkg.json b/ports/so5extra/vcpkg.json new file mode 100644 index 00000000000000..0d172497cadc15 --- /dev/null +++ b/ports/so5extra/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "so5extra", + "version": "1.4.1.1", + "description": "A set of additional tools for SObjectizer framework.", + "homepage": "https://github.com/Stiffstream/so5extra", + "license": "BSD-3-Clause", + "dependencies": [ + "sobjectizer" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5c064cf1d570bd..5f99fd332716d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5993,7 +5993,7 @@ "port-version": 0 }, "so5extra": { - "baseline": "1.4.1", + "baseline": "1.4.1.1", "port-version": 0 }, "sobjectizer": { diff --git a/versions/s-/so5extra.json b/versions/s-/so5extra.json index cbff1806325f4e..e78cac9f6f3569 100644 --- a/versions/s-/so5extra.json +++ b/versions/s-/so5extra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19014d4bd5c636ba619162dfad251af8142e4843", + "version": "1.4.1.1", + "port-version": 0 + }, { "git-tree": "393e65540e9e66bdb66333aed31160795f91e220", "version-string": "1.4.1", From 04982b5e6dc64d8a900ebcd0b27e2a4d78946e4f Mon Sep 17 00:00:00 2001 From: Mathis Date: Wed, 8 Sep 2021 16:54:28 +0200 Subject: [PATCH 0480/1858] [imgui] update to 1.84.2 (#20012) * update imgui * version * use correct ref for docking * version * update commit for dockiung * version --- ports/imgui/portfile.cmake | 8 ++++---- ports/imgui/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 2f964b450f0bda..45add6cc0f6ead 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF 47fb332fb20921658732107e115aa397e9b08cbe - SHA512 92bfb20c9734dc37381d24325156c149f110b53dfabaf294e4bb2b0bccd618ab421aa347fa3c7fcaa1929b5bec8885246e7f49dc5fb6e81f1a8e80ff2d980f28 + REF dedb381c510cc0b87164e16b9e7ef6bf50ffccec + SHA512 0b331cbf81fed15cdceb84ccf1962b5db19af1b6dc75a19460810919b7f61088a9ba46acf3e6fcadfda6297204b03f1be0ab08fa427f89e504d70be8da1f2281 HEAD_REF docking ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.84.1 - SHA512 054beebda9a17758a9a6b9edf075279800a314b0e255e528bb9ac248b4911fd8fd2b5160079896d116b58fe6d993281ba9082780a31197faefd9f7adf32aec51 + REF v1.84.2 + SHA512 ea62d03ffc4c8d3dbc6be0076fb93158d464f4f02e88028c2bc64768f72e3117297854816bb7a776bd750c003013fe1d2871a1b505d04dd0922dfb2f214dd0a3 HEAD_REF master ) endif() diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index 5d7b96f735814d..e58bf6b945507a 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui", - "version": "1.84.1", + "version": "1.84.2", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 5f99fd332716d7..a799197a38ceeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2701,7 +2701,7 @@ "port-version": 0 }, "imgui": { - "baseline": "1.84.1", + "baseline": "1.84.2", "port-version": 0 }, "imgui-sfml": { diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 8def6cd7e0e009..28772d0043bec4 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c07b221daf49a22fc9e8e7571bb329485f618a7f", + "version": "1.84.2", + "port-version": 0 + }, { "git-tree": "1be902aeef127530aa2817829ff44f29b1eb6e52", "version": "1.84.1", From 1ee7f214a1980b71882cca36ea4eb6c88277c168 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 8 Sep 2021 16:54:48 +0200 Subject: [PATCH 0481/1858] [rappture] Update port to use vcpkg.json instead of CONTROL (#20049) Signed-off-by: Vitalii Koshura --- ports/rappture/CONTROL | 4 ---- ports/rappture/portfile.cmake | 7 +++---- ports/rappture/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 2 +- versions/r-/rappture.json | 5 +++++ 5 files changed, 27 insertions(+), 9 deletions(-) delete mode 100644 ports/rappture/CONTROL create mode 100644 ports/rappture/vcpkg.json diff --git a/ports/rappture/CONTROL b/ports/rappture/CONTROL deleted file mode 100644 index 611bda78a82f59..00000000000000 --- a/ports/rappture/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: rappture -Version: 1.9 -Description: Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications. -Build-Depends: expat, zlib diff --git a/ports/rappture/portfile.cmake b/ports/rappture/portfile.cmake index 00bde7d3a97121..e79ec308553930 100644 --- a/ports/rappture/portfile.cmake +++ b/ports/rappture/portfile.cmake @@ -15,14 +15,13 @@ vcpkg_extract_source_archive_ex( file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() diff --git a/ports/rappture/vcpkg.json b/ports/rappture/vcpkg.json new file mode 100644 index 00000000000000..68a1a5efa9467f --- /dev/null +++ b/ports/rappture/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "rappture", + "version": "1.9", + "port-version": 1, + "description": "Rappture is a toolkit supporting Rapid application infrastructure, making it quick and easy to develop powerful scientific applications.", + "dependencies": [ + "expat", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a799197a38ceeb..04b48279063820 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5586,7 +5586,7 @@ }, "rappture": { "baseline": "1.9", - "port-version": 0 + "port-version": 1 }, "raylib": { "baseline": "3.7.0", diff --git a/versions/r-/rappture.json b/versions/r-/rappture.json index 0ba67c263c4d50..ae1cfa5a6216f4 100644 --- a/versions/r-/rappture.json +++ b/versions/r-/rappture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46511874b74e433c10e518d592ae43a475bb7aaf", + "version": "1.9", + "port-version": 1 + }, { "git-tree": "1bff8b135623078465252ff2d940407537851f2a", "version-string": "1.9", From 61fb9302b1d5452f45d812b093d101a8459cbd42 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 8 Sep 2021 22:55:21 +0800 Subject: [PATCH 0482/1858] [libfort/libgit2/cli11] update to the latest version (#20024) * [libfort/libgit2/cli11] update to the latest version * update version * delete useless dependencies * update version --- ports/cli11/CONTROL | 4 -- ports/cli11/portfile.cmake | 19 ++++---- ports/cli11/vcpkg.json | 16 +++++++ ports/libfort/portfile.cmake | 17 ++++--- ports/libfort/vcpkg.json | 14 +++++- ports/libgit2/CONTROL | 38 --------------- ports/libgit2/portfile.cmake | 15 +++--- ports/libgit2/vcpkg.json | 93 ++++++++++++++++++++++++++++++++++++ versions/baseline.json | 6 +-- versions/c-/cli11.json | 5 ++ versions/l-/libfort.json | 5 ++ versions/l-/libgit2.json | 5 ++ 12 files changed, 163 insertions(+), 74 deletions(-) delete mode 100644 ports/cli11/CONTROL create mode 100644 ports/cli11/vcpkg.json delete mode 100644 ports/libgit2/CONTROL create mode 100644 ports/libgit2/vcpkg.json diff --git a/ports/cli11/CONTROL b/ports/cli11/CONTROL deleted file mode 100644 index e9e64abc69ae0e..00000000000000 --- a/ports/cli11/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cli11 -Version: 1.9.1 -Description: CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface. -Homepage: https://github.com/CLIUtils/CLI11 diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 69f0a26fe6c2d7..78776fdbebdfd0 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -1,25 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF 2b059cbdbe844450e1675a5dda3cb8acb1147631 #version 1.9.1 - SHA512 8b7999ae3692ccb7b324bef033ad4cedccbf720b904aa3aa8d07d1cbc8f09f4ecbd9701d2a50a6266f81fe877e30a63a3b6e07d746fa738291b07476405e866d + REF 0d06d21b56eadef9dcb24907ee2866b2b6f0babe #version 2.0.0 + SHA512 1952ce0e9fd3bc6646f00abdd7f0f7bae541c383b691a985b0f70ca53fe80a9acbcf68c07c59e021c92aae7b1e062fd7ffe4c9f9b198b95525dde3a1ce83c2f5 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCLI11_BUILD_EXAMPLES=OFF -DCLI11_BUILD_DOCS=OFF -DCLI11_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CLI11) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLI11) +vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json new file mode 100644 index 00000000000000..93f45475d5a495 --- /dev/null +++ b/ports/cli11/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cli11", + "version-semver": "2.0.0", + "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", + "homepage": "https://github.com/CLIUtils/CLI11", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/libfort/portfile.cmake b/ports/libfort/portfile.cmake index 1ff01476526198..969af67eb1779a 100644 --- a/ports/libfort/portfile.cmake +++ b/ports/libfort/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO seleznevae/libfort - REF ccb892f77dc30c2ebc42916a3f862a965e8c097f # v0.4.1 - SHA512 0397e52985b56b6740d22533c48039bf1d61fb90795e97a6153e9360702d1e89b5353ba74de92005bbc874822766d157de21d175387ffd00d0a5294e531d2d8b + REF b1c32b67511f4612996b287a1ef4a9df012521d2 # v0.4.2 + SHA512 56d3bd00b8a72a5f9deb9bca9a325e100319aed55e10321d04243d8a2a94c0fa513ada1b13bc59957af01b1f2c5f1655304a4a608e118cbeb65d2b4527f102d0 HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFORT_ENABLE_TESTING=OFF -DFORT_ENABLE_ASTYLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libfort) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libfort/vcpkg.json b/ports/libfort/vcpkg.json index 613042cb635ce9..7a13edcc58b104 100644 --- a/ports/libfort/vcpkg.json +++ b/ports/libfort/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libfort", - "version-string": "0.4.1", + "version-semver": "0.4.2", "description": "A simple crossplatform library to create formatted text tables", "homepage": "https://github.com/seleznevae/libfort", - "license": "MIT" + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libgit2/CONTROL b/ports/libgit2/CONTROL deleted file mode 100644 index 4435d83cfe1b20..00000000000000 --- a/ports/libgit2/CONTROL +++ /dev/null @@ -1,38 +0,0 @@ -Source: libgit2 -Version: 1.1.0 -Homepage: https://github.com/libgit2/libgit2 -Build-Depends: zlib, http-parser -Description: Git linkable library -Default-Features: pcre, ssl -Supports: !uwp - -Feature: pcre -Description: Build against external libpcre -Build-Depends: pcre - -Feature: pcre2 -Description: Build against external libpcre2 -Build-Depends: pcre2 - -Feature: ssh -Build-Depends: libgit2[core,openssl], libssh2 -Description: SSH support via libssh2 - -Feature: ssl -Build-Depends: libgit2[core,openssl] (!windows&!osx), libgit2[core,winhttp] (windows), libgit2[core,sectransp] (osx) -Description: Default SSL backend - -# SSL backends -Feature: openssl -Build-Depends: openssl -Description: SSL support (OpenSSL) - -Feature: winhttp -Description: SSL support (WinHTTP) - -Feature: sectransp -Description: SSL support (sectransp) - -Feature: mbedtls -Build-Depends: mbedtls -Description: SSL support (mbedTLS) diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 82ed07e90bd2a2..c8b1dec1a4a51c 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF 7f4fa178629d559c037a1f72f79f79af9c1ef8ce#version 1.1.0 - SHA512 2fdbbb263fe71dc6d04b64c2967e7acff1a5b6102e62d69c9a7ea1b6777ab74a1625e798438ea239d8b489648a9335833f937f893f73a66e16c658eae453ab62 + REF 4fd32be01c79a5c003bb47674ac1d76d948518b7#version 1.2.0 + SHA512 f9defe0dd51537ae374fe25ef3ccea74d8d05588f26b1865275067e63ad65a7cd283ee83099b97cea50ef5c367036734ba34be73a06b030be2903344b2778fff HEAD_REF master ) @@ -63,9 +63,8 @@ vcpkg_check_features( ssh USE_SSH ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_CLAR=OFF -DUSE_HTTP_PARSER=system @@ -75,8 +74,8 @@ vcpkg_configure_cmake( ${GIT2_FEATURES} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json new file mode 100644 index 00000000000000..c82e7024980e5c --- /dev/null +++ b/ports/libgit2/vcpkg.json @@ -0,0 +1,93 @@ +{ + "name": "libgit2", + "version-semver": "1.2.0", + "description": "Git linkable library", + "homepage": "https://github.com/libgit2/libgit2", + "supports": "!uwp", + "dependencies": [ + "http-parser", + { + "name": "vcpkg-cmake", + "host": true + }, + "zlib" + ], + "default-features": [ + "pcre", + "ssl" + ], + "features": { + "mbedtls": { + "description": "SSL support (mbedTLS)", + "dependencies": [ + "mbedtls" + ] + }, + "openssl": { + "description": "SSL support (OpenSSL)", + "dependencies": [ + "openssl" + ] + }, + "pcre": { + "description": "Build against external libpcre", + "dependencies": [ + "pcre" + ] + }, + "pcre2": { + "description": "Build against external libpcre2", + "dependencies": [ + "pcre2" + ] + }, + "sectransp": { + "description": "SSL support (sectransp)" + }, + "ssh": { + "description": "SSH support via libssh2", + "dependencies": [ + { + "name": "libgit2", + "default-features": false, + "features": [ + "openssl" + ] + }, + "libssh2" + ] + }, + "ssl": { + "description": "Default SSL backend", + "dependencies": [ + { + "name": "libgit2", + "default-features": false, + "features": [ + "sectransp" + ], + "platform": "osx" + }, + { + "name": "libgit2", + "default-features": false, + "features": [ + "winhttp" + ], + "platform": "windows" + }, + { + "name": "libgit2", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !osx" + } + ] + }, + "winhttp": { + "description": "SSL support (WinHTTP)" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 04b48279063820..efe5970acaaf8a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1313,7 +1313,7 @@ "port-version": 0 }, "cli11": { - "baseline": "1.9.1", + "baseline": "2.0.0", "port-version": 0 }, "clickhouse-cpp": { @@ -3245,7 +3245,7 @@ "port-version": 5 }, "libfort": { - "baseline": "0.4.1", + "baseline": "0.4.2", "port-version": 0 }, "libfreenect2": { @@ -3273,7 +3273,7 @@ "port-version": 3 }, "libgit2": { - "baseline": "1.1.0", + "baseline": "1.2.0", "port-version": 0 }, "libgnutls": { diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json index ce5f0cd51af241..019131c1064450 100644 --- a/versions/c-/cli11.json +++ b/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1430611e0538943498bb96f67ab5de443c76cad2", + "version-semver": "2.0.0", + "port-version": 0 + }, { "git-tree": "47d52d6f0f742e0c0799cd5de355c81732d82d5b", "version-string": "1.9.1", diff --git a/versions/l-/libfort.json b/versions/l-/libfort.json index 7ebfdf38b5f784..319568ce4b8dc5 100644 --- a/versions/l-/libfort.json +++ b/versions/l-/libfort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3323e3e7b75556050db8a8ff3adeb38c3b7bfb98", + "version-semver": "0.4.2", + "port-version": 0 + }, { "git-tree": "0c816bc07eb1bf136201ff9dfeddbb6bc921ff50", "version-string": "0.4.1", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 4449341697c970..cdfb0785081687 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daddb751c1ff040d820dd32d62f08c94482b49ae", + "version-semver": "1.2.0", + "port-version": 0 + }, { "git-tree": "23d98ed81409eaac3ae1abc9ddbc175564533d65", "version-string": "1.1.0", From 7575c505b21611b3937a0f33aca881833837e1b2 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 8 Sep 2021 22:56:56 +0800 Subject: [PATCH 0483/1858] [glew/openvdb/xtensor-io] Update to latest release version (#20022) * [glew/openvdb/xtensor-io] Update to latest release version * [glew] Update patch * [xtensor-io] Update version --- ports/glew/fix-LNK2019.patch | 30 +-- ports/glew/portfile.cmake | 42 ++-- ports/glew/vcpkg.json | 13 +- ports/openvdb/0003-fix-cmake.patch | 276 +++++++++++------------- ports/openvdb/portfile.cmake | 8 +- ports/openvdb/vcpkg.json | 2 +- ports/xtensor-io/CONTROL | 7 - ports/xtensor-io/disable-highfive.patch | 20 -- ports/xtensor-io/portfile.cmake | 22 +- ports/xtensor-io/vcpkg.json | 18 ++ versions/baseline.json | 10 +- versions/g-/glew.json | 5 + versions/o-/openvdb.json | 5 + versions/x-/xtensor-io.json | 5 + 14 files changed, 229 insertions(+), 234 deletions(-) delete mode 100644 ports/xtensor-io/CONTROL delete mode 100644 ports/xtensor-io/disable-highfive.patch create mode 100644 ports/xtensor-io/vcpkg.json diff --git a/ports/glew/fix-LNK2019.patch b/ports/glew/fix-LNK2019.patch index d45e61a8806319..8b628fa88e29cb 100644 --- a/ports/glew/fix-LNK2019.patch +++ b/ports/glew/fix-LNK2019.patch @@ -1,13 +1,17 @@ -diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt -index 5081e0f..f76725a 100644 ---- a/build/cmake/CMakeLists.txt -+++ b/build/cmake/CMakeLists.txt -@@ -108,7 +108,7 @@ if (MSVC) - target_compile_options (glew PRIVATE -GS-) - target_compile_options (glew_s PRIVATE -GS-) - # remove stdlib dependency -- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) -+ # target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) - string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) - elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) - # remove stdlib dependency on windows with GCC and Clang (for similar reasons +diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt +index 419c243..f81fab4 100644 +--- a/build/cmake/CMakeLists.txt ++++ b/build/cmake/CMakeLists.txt +@@ -120,9 +120,9 @@ if (MSVC) + target_compile_options (glew PRIVATE -GS-) + target_compile_options (glew_s PRIVATE -GS-) + # remove stdlib dependency +- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) +- target_link_libraries (glew LINK_PRIVATE libvcruntime.lib) +- target_link_libraries (glew LINK_PRIVATE msvcrt.lib ) ++ #target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) ++ #target_link_libraries (glew LINK_PRIVATE libvcruntime.lib) ++ #target_link_libraries (glew LINK_PRIVATE msvcrt.lib ) + string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) + elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) + # remove stdlib dependency on windows with GCC and Clang (for similar reasons diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 5dd0c03ce3dfb9..dc64a2aca978e1 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -5,28 +5,28 @@ endif() # Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases. # More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/nigels-com/glew/releases/download/glew-2.1.0/glew-2.1.0.tgz" - FILENAME "glew-2.1.0.tgz" - SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab + URLS "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.tgz" + FILENAME "glew-2.2.0.tgz" + SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1 ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF glew - PATCHES fix-LNK2019.patch + PATCHES + fix-LNK2019.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/build/cmake - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/build/cmake" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_UTILS=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glew) # Skip check the required dependency opengl vcpkg_fixup_pkgconfig(SKIP_CHECK) @@ -45,18 +45,18 @@ foreach(FILE ${_targets_cmake_files}) file(WRITE ${FILE} "${_contents}") endforeach() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libglew32.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libglew32.lib ${CURRENT_PACKAGES_DIR}/lib/glew32.lib) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib" "${CURRENT_PACKAGES_DIR}/lib/glew32.lib") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib") endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - foreach(FILE ${CURRENT_PACKAGES_DIR}/include/GL/glew.h ${CURRENT_PACKAGES_DIR}/include/GL/wglew.h ${CURRENT_PACKAGES_DIR}/include/GL/glxew.h) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + foreach(FILE "${CURRENT_PACKAGES_DIR}/include/GL/glew.h" "${CURRENT_PACKAGES_DIR}/include/GL/wglew.h" "${CURRENT_PACKAGES_DIR}/include/GL/glxew.h") file(READ ${FILE} _contents) string(REPLACE "#ifdef GLEW_STATIC" "#if 1" _contents "${_contents}") file(WRITE ${FILE} "${_contents}") @@ -65,9 +65,9 @@ endif() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/glew/vcpkg.json b/ports/glew/vcpkg.json index 22271d883d6107..7468ecadf894a3 100644 --- a/ports/glew/vcpkg.json +++ b/ports/glew/vcpkg.json @@ -1,10 +1,17 @@ { "name": "glew", - "version-string": "2.1.0", - "port-version": 11, + "version-string": "2.2.0", "description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", "homepage": "https://github.com/nigels-com/glew", "dependencies": [ - "opengl" + "opengl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/openvdb/0003-fix-cmake.patch b/ports/openvdb/0003-fix-cmake.patch index caaf4f256caaa7..5db8cdde9ede53 100644 --- a/ports/openvdb/0003-fix-cmake.patch +++ b/ports/openvdb/0003-fix-cmake.patch @@ -1,147 +1,129 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 93a65c7..24ec864 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -338,13 +338,9 @@ endif() - - if(OPENVDB_INSTALL_CMAKE_MODULES) - set(OPENVDB_CMAKE_MODULES -- cmake/FindBlosc.cmake - cmake/FindJemalloc.cmake -- cmake/FindIlmBase.cmake - cmake/FindLog4cplus.cmake -- cmake/FindOpenEXR.cmake - cmake/FindOpenVDB.cmake -- cmake/FindTBB.cmake - cmake/OpenVDBGLFW3Setup.cmake - cmake/OpenVDBHoudiniSetup.cmake - cmake/OpenVDBMayaSetup.cmake -diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index 219b90a..b280f85 100644 ---- a/cmake/FindOpenVDB.cmake -+++ b/cmake/FindOpenVDB.cmake -@@ -448,8 +448,8 @@ endif() - - # Add standard dependencies - --find_package(IlmBase REQUIRED COMPONENTS Half) --find_package(TBB REQUIRED COMPONENTS tbb) -+find_package(IlmBase CONFIG REQUIRED) -+find_package(TBB CONFIG REQUIRED) - find_package(ZLIB REQUIRED) - - if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) -@@ -588,7 +588,7 @@ else() - endif() - - if(OpenVDB_USES_BLOSC) -- find_package(Blosc REQUIRED) -+ find_package(blosc CONFIG REQUIRED) - endif() - - if(OpenVDB_USES_ZLIB) -@@ -602,6 +602,8 @@ endif() - if(OpenVDB_USES_EXR) - find_package(IlmBase REQUIRED) - find_package(OpenEXR REQUIRED) -+ find_package(IlmBase CONFIG REQUIRED) -+ find_package(OpenEXR CONFIG REQUIRED) - endif() - - if(UNIX) -@@ -662,7 +664,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) - - if(NOT OPENVDB_USE_STATIC_LIBS) - if(OpenVDB_USES_BLOSC) -- list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc) -+ list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc) - endif() - if(OpenVDB_USES_ZLIB) - list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) -diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt -index 536bf1e..568fec1 100644 ---- a/openvdb/openvdb/CMakeLists.txt -+++ b/openvdb/openvdb/CMakeLists.txt -@@ -47,7 +47,7 @@ message(STATUS "----------------------------------------------------") - ########################################################################## - - # Collect and configure lib dependencies -- -+if(0) - if(USE_EXR) - find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED) - find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED) -@@ -57,8 +57,14 @@ if(USE_EXR) - "is deprecated and will be removed.") - endif() - endif() -+endif() -+endif() -+ -+if(USE_EXR) -+ find_package(IlmBase CONFIG REQUIRED) -+ find_package(OpenEXR CONFIG REQUIRED) - else() -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) -+ find_package(IlmBase CONFIG REQUIRED) - endif() - - if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) -@@ -68,7 +74,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) - endif() - endif() - --find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) -+find_package(TBB CONFIG REQUIRED) - - if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) - if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) -@@ -82,14 +88,7 @@ if(USE_LOG4CPLUS) - endif() - - if(USE_BLOSC) -- find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED) -- if(Blosc_FOUND AND Blosc_VERSION VERSION_GREATER MINIMUM_BLOSC_VERSION) -- message(WARNING "The version of Blosc located is greater than ${MINIMUM_BLOSC_VERSION}. " -- "There have been reported issues with using later versions of Blosc with OpenVDB. " -- "OpenVDB has been tested fully against Blosc ${MINIMUM_BLOSC_VERSION}, it is " -- "recommended that you use this version where possible." -- ) -- endif() -+ find_package(blosc CONFIG REQUIRED) - else() - message(WARNING "Blosc support is disabled. It is strongly recommended to " - "enable blosc for optimal builds of OpenVDB and to support compatible " -@@ -165,7 +164,7 @@ endif() - # See FindOpenVDB.cmake - - if(USE_BLOSC) -- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) -+ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc) - endif() - - if(USE_BLOSC OR USE_ZLIB) -diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt -index ba78f4b..461fd2f 100644 ---- a/openvdb/openvdb/cmd/CMakeLists.txt -+++ b/openvdb/openvdb/cmd/CMakeLists.txt -@@ -50,7 +50,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") - find_package(Jemalloc REQUIRED) - list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc) - elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") -- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) -+ find_package(TBB CONFIG REQUIRED) - list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) - endif() - -@@ -120,8 +120,8 @@ endif() - #### vdb_render - - if(OPENVDB_BUILD_VDB_RENDER) -- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) -- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) -+ find_package(IlmBase CONFIG REQUIRED) -+ find_package(OpenEXR CONFIG REQUIRED) - - set(VDB_RENDER_SOURCE_FILES openvdb_render.cc) - add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES}) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3456346..f7e5796 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -354,13 +354,9 @@ endif() + + if(OPENVDB_INSTALL_CMAKE_MODULES) + set(OPENVDB_CMAKE_MODULES +- cmake/FindBlosc.cmake + cmake/FindJemalloc.cmake +- cmake/FindIlmBase.cmake + cmake/FindLog4cplus.cmake +- cmake/FindOpenEXR.cmake + cmake/FindOpenVDB.cmake +- cmake/FindTBB.cmake + cmake/OpenVDBGLFW3Setup.cmake + cmake/OpenVDBHoudiniSetup.cmake + cmake/OpenVDBMayaSetup.cmake +diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake +index 1dc5bc0..d84d8f1 100644 +--- a/cmake/FindOpenVDB.cmake ++++ b/cmake/FindOpenVDB.cmake +@@ -457,7 +457,7 @@ endif() + + # Add standard dependencies + +-find_package(TBB REQUIRED COMPONENTS tbb) ++find_package(TBB CONFIG REQUIRED) + + if(NOT OPENVDB_USE_STATIC_LIBS AND NOT Boost_USE_STATIC_LIBS) + # @note Both of these must be set for Boost 1.70 (VFX2020) to link against +@@ -607,7 +607,7 @@ elseif(NOT OPENVDB_USE_STATIC_LIBS) + endif() + + if(OpenVDB_USES_BLOSC) +- find_package(Blosc REQUIRED) ++ find_package(blosc CONFIG REQUIRED) + endif() + + if(OpenVDB_USES_ZLIB) +@@ -619,7 +619,7 @@ if(OpenVDB_USES_LOG4CPLUS) + endif() + + if(OpenVDB_USES_IMATH_HALF) +- find_package(IlmBase REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + if(WIN32) + # @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed + if(OPENEXR_USE_STATIC_LIBS OR (${ILMBASE_LIB_TYPE} STREQUAL STATIC_LIBRARY)) +@@ -664,7 +664,7 @@ set(_OPENVDB_HIDDEN_DEPENDENCIES) + + if(NOT OPENVDB_USE_STATIC_LIBS) + if(OpenVDB_USES_BLOSC) +- list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES Blosc::blosc) ++ list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES blosc) + endif() + if(OpenVDB_USES_ZLIB) + list(APPEND _OPENVDB_HIDDEN_DEPENDENCIES ZLIB::ZLIB) +diff --git a/openvdb/openvdb/CMakeLists.txt b/openvdb/openvdb/CMakeLists.txt +index 88543df..92efaee 100644 +--- a/openvdb/openvdb/CMakeLists.txt ++++ b/openvdb/openvdb/CMakeLists.txt +@@ -120,7 +120,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION) + endif() + endif() + +-find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbb) ++find_package(TBB CONFIG REQUIRED) + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) + if(${Tbb_VERSION} VERSION_LESS FUTURE_MINIMUM_TBB_VERSION) + message(DEPRECATION "Support for TBB versions < ${FUTURE_MINIMUM_TBB_VERSION} " +@@ -129,7 +129,7 @@ if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_TBB_VERSION) + endif() + + if(USE_IMATH_HALF) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half) ++ find_package(IlmBase CONFIG REQUIRED) + if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_ILMBASE_VERSION) + if(${IlmBase_VERSION} VERSION_LESS FUTURE_MINIMUM_ILMBASE_VERSION) + message(DEPRECATION "Support for IlmBase versions < ${FUTURE_MINIMUM_ILMBASE_VERSION} " +@@ -145,14 +145,7 @@ endif() + + if(USE_BLOSC) + # Find Blosc libraries +- find_package(Blosc ${MINIMUM_BLOSC_VERSION} REQUIRED) +- if(Blosc_FOUND AND Blosc_VERSION VERSION_GREATER MINIMUM_BLOSC_VERSION) +- message(WARNING "The version of Blosc located is greater than ${MINIMUM_BLOSC_VERSION}. " +- "There have been reported issues with using later versions of Blosc with OpenVDB. " +- "OpenVDB has been tested fully against Blosc ${MINIMUM_BLOSC_VERSION}, it is " +- "recommended that you use this version where possible." +- ) +- endif() ++ find_package(blosc CONFIG REQUIRED) + else() + message(WARNING "Blosc support is disabled. It is strongly recommended to " + "enable blosc for optimal builds of OpenVDB and to support compatible " +@@ -215,7 +208,7 @@ endif() + # See FindOpenVDB.cmake + + if(USE_BLOSC) +- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS Blosc::blosc) ++ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS blosc) + endif() + + if(USE_BLOSC OR USE_ZLIB) +diff --git a/openvdb/openvdb/cmd/CMakeLists.txt b/openvdb/openvdb/cmd/CMakeLists.txt +index 8d9c375..14e1296 100644 +--- a/openvdb/openvdb/cmd/CMakeLists.txt ++++ b/openvdb/openvdb/cmd/CMakeLists.txt +@@ -46,7 +46,7 @@ if(CONCURRENT_MALLOC STREQUAL "Jemalloc") + find_package(Jemalloc REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS Jemalloc::jemalloc) + elseif(CONCURRENT_MALLOC STREQUAL "Tbbmalloc") +- find_package(TBB ${MINIMUM_TBB_VERSION} REQUIRED COMPONENTS tbbmalloc) ++ find_package(TBB CONFIG REQUIRED) + list(APPEND OPENVDB_BINARIES_DEPENDENT_LIBS TBB::tbbmalloc) + endif() + +@@ -116,8 +116,8 @@ endif() + #### vdb_render + + if(OPENVDB_BUILD_VDB_RENDER) +- find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath) +- find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf) ++ find_package(IlmBase CONFIG REQUIRED) ++ find_package(OpenEXR CONFIG REQUIRED) + + set(VDB_RENDER_SOURCE_FILES openvdb_render.cc) + add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES}) diff --git a/ports/openvdb/portfile.cmake b/ports/openvdb/portfile.cmake index 63867f9f404ba5..116cbb34b50913 100644 --- a/ports/openvdb/portfile.cmake +++ b/ports/openvdb/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/openvdb - REF 587c9ae84c2822bbc03d0d7eceb52898582841b9 # v8.0.0 - SHA512 4abc442a86dd0614492edf70e887886b755102f04d44eebd1a154df24e05e53a80de8e9b47b370946bcc3888ab7a94ae331a3addac8d784e25ae5da7523afca9 + REF ea786c46b7a1b5158789293d9b148b379fc9914c # v8.1.0 + SHA512 3c4ab3db35b3eb019149ac455f0c7a262081e9866b7e49eaba05424bf837debccf0c987c2555d3c91a2cff2d1ba4b41862f544fd4684558f3a319616ef3c9eb3 HEAD_REF master PATCHES 0003-fix-cmake.patch @@ -56,12 +56,12 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenVDB) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if (OPENVDB_BUILD_TOOLS) vcpkg_copy_tools(TOOL_NAMES vdb_print vdb_render vdb_view vdb_lod AUTO_CLEAN) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/openvdb/openvdb/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openvdb/vcpkg.json b/ports/openvdb/vcpkg.json index cb7969105fa186..242f3f46ea5d98 100644 --- a/ports/openvdb/vcpkg.json +++ b/ports/openvdb/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openvdb", - "version": "8.0.0", + "version": "8.1.0", "description": "Sparse volume data structure and tools", "homepage": "https://github.com/dreamworksanimation/openvdb", "dependencies": [ diff --git a/ports/xtensor-io/CONTROL b/ports/xtensor-io/CONTROL deleted file mode 100644 index d426f0935f4ac9..00000000000000 --- a/ports/xtensor-io/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: xtensor-io -Version: 0.9.0 -Port-Version: 1 -Description: xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5 -Homepage: https://github.com/xtensor-stack/xtensor-io -Build-Depends: xtensor, xtl - diff --git a/ports/xtensor-io/disable-highfive.patch b/ports/xtensor-io/disable-highfive.patch deleted file mode 100644 index e0733b0a94ebfa..00000000000000 --- a/ports/xtensor-io/disable-highfive.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c3595a1..d38dc21 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -136,6 +136,7 @@ else() - message(WARNING "ZLIB not found - install zlib for xnpz file support") - endif() - -+if (0) - message(STATUS "Trying to find HighFive for npz file support") - find_package(HighFive) - find_package(HDF5) -@@ -154,6 +155,7 @@ if (${HighFive_FOUND} AND ${HDF5_FOUND}) - else() - message(WARNING "HighFive and/or HDF5 not found - install HighFive and HDF5 for HDF5 file support") - endif() -+endif() - - if(DOWNLOAD_GTEST OR GTEST_SRC_DIR) - set(BUILD_TESTS ON) diff --git a/ports/xtensor-io/portfile.cmake b/ports/xtensor-io/portfile.cmake index 992aaeb4df87ab..d1f1bb1a03cb7e 100644 --- a/ports/xtensor-io/portfile.cmake +++ b/ports/xtensor-io/portfile.cmake @@ -3,27 +3,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor-io - REF 863dd7dad6010038568c169f20e3d3e87bd3b37a # 0.9.0 - SHA512 f6190c5c2c487a8170e5af1ddfd2e921c414274762dac6c8f9519d579d5eb5dd3683678e7b4f589b7ced8a42f648742755acb42e2122960d6ca7fc1a82b0723e + REF 2bc048b3f34731385f29e2f3b307103ee6d4e5ab # 0.12.8 + SHA512 d7c5c85489aea9b9d8af7ee33a43dd8ab888e7f03da8b533ace39e143f89acbae4fe88bb10253931a3cc44041e1532bd76483686f7f20c00e2850647a574349c HEAD_REF master - PATCHES - disable-highfive.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTS=OFF -DDOWNLOAD_GTEST=OFF -DDOWNLOAD_GBENCHMARK=OFF + -DHAVE_HighFive=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) - -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xtensor-io/vcpkg.json b/ports/xtensor-io/vcpkg.json new file mode 100644 index 00000000000000..403c06c79d18bb --- /dev/null +++ b/ports/xtensor-io/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xtensor-io", + "version": "0.12.8", + "description": "xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5", + "homepage": "https://github.com/xtensor-stack/xtensor-io", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "xtensor", + "xtl" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index efe5970acaaf8a..e4e7c88a760b91 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2345,8 +2345,8 @@ "port-version": 3 }, "glew": { - "baseline": "2.1.0", - "port-version": 11 + "baseline": "2.2.0", + "port-version": 0 }, "glfw3": { "baseline": "3.3.4", @@ -4777,7 +4777,7 @@ "port-version": 1 }, "openvdb": { - "baseline": "8.0.0", + "baseline": "8.1.0", "port-version": 0 }, "openvpn3": { @@ -6937,8 +6937,8 @@ "port-version": 0 }, "xtensor-io": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "0.12.8", + "port-version": 0 }, "xtl": { "baseline": "0.7.2", diff --git a/versions/g-/glew.json b/versions/g-/glew.json index 8969554ac1c67c..48da5827673c34 100644 --- a/versions/g-/glew.json +++ b/versions/g-/glew.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3211ed09c36542372ab3f1f690a42e2edbb072bc", + "version-string": "2.2.0", + "port-version": 0 + }, { "git-tree": "622e27b2a746c088f0acd2f98445c0968f485a69", "version-string": "2.1.0", diff --git a/versions/o-/openvdb.json b/versions/o-/openvdb.json index 19b06c1bb90824..f26e57bb9fcd37 100644 --- a/versions/o-/openvdb.json +++ b/versions/o-/openvdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecd4c1d0e5c1e497615d75cb0748c97fa1d70384", + "version": "8.1.0", + "port-version": 0 + }, { "git-tree": "5dd93bca4d648b1e0ab01d3cf4df79a183944688", "version": "8.0.0", diff --git a/versions/x-/xtensor-io.json b/versions/x-/xtensor-io.json index 47bb3eacc7d9ca..f28be0ca7e6405 100644 --- a/versions/x-/xtensor-io.json +++ b/versions/x-/xtensor-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f70c1f44abb24d6d3883b9cd5efd4acc0473787", + "version": "0.12.8", + "port-version": 0 + }, { "git-tree": "3320a5f7436e8ecde84b90eb918806fbf034cafa", "version-string": "0.9.0", From 6ff1a8bb7049fe6039996efff686385c5a80a51a Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:00:54 +0800 Subject: [PATCH 0484/1858] [h3/jaeger-client-cpp] Update to the latest version (#20008) * [h3/jaeger-client-cpp] Update to the latest version * Remove CONTROL files * Update version files * Update patch * Update versions/j-/jaeger-client-cpp.json --- ports/h3/CONTROL | 4 --- ports/h3/portfile.cmake | 27 +++++++------- ports/h3/vcpkg.json | 17 +++++++++ ports/jaeger-client-cpp/CONTROL | 6 ---- ports/jaeger-client-cpp/fix-CMakeLists.patch | 8 ++--- ports/jaeger-client-cpp/portfile.cmake | 37 ++++++++++---------- ports/jaeger-client-cpp/vcpkg.json | 21 +++++++++++ scripts/ci.baseline.txt | 4 --- versions/baseline.json | 4 +-- versions/h-/h3.json | 5 +++ versions/j-/jaeger-client-cpp.json | 5 +++ 11 files changed, 85 insertions(+), 53 deletions(-) delete mode 100644 ports/h3/CONTROL create mode 100644 ports/h3/vcpkg.json delete mode 100644 ports/jaeger-client-cpp/CONTROL create mode 100644 ports/jaeger-client-cpp/vcpkg.json diff --git a/ports/h3/CONTROL b/ports/h3/CONTROL deleted file mode 100644 index 8f37d9d6e8f6a7..00000000000000 --- a/ports/h3/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: h3 -Version: 3.6.3 -Homepage: https://github.com/uber/h3 -Description: A Hexagonal Hierarchical Geospatial Indexing System diff --git a/ports/h3/portfile.cmake b/ports/h3/portfile.cmake index 07a5b47f3ef044..880bcb98fc3990 100644 --- a/ports/h3/portfile.cmake +++ b/ports/h3/portfile.cmake @@ -1,29 +1,28 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") +vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO uber/h3 - REF v3.6.3 - SHA512 925438663ef9fb6541e4655dc95febe6233f078f8277937d8a9b33a76cf9b257d8c14e3ac5109460ac9188c426e6997700c4ec17926cf401577b3faf74c6c320 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO uber/h3 + REF 26a6409156ba8539b2b332f799486572f1f8bab2 #v3.6.3 + SHA512 ee3450a5720951254fcdd9bb3acc4b33ed4a58c214e1ed8a091791674b57f0a48de76f0483b31b0b2ad9c316af6a5fcb0c3b72428b8f6380d6b6f717aaed73d7 + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS -DBUILD_BENCHMARKS=OFF -DBUILD_FILTERS=OFF -DBUILD_GENERATORS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/h3/vcpkg.json b/ports/h3/vcpkg.json new file mode 100644 index 00000000000000..6e1c8ebeec31f4 --- /dev/null +++ b/ports/h3/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "h3", + "version-semver": "3.7.2", + "description": "A Hexagonal Hierarchical Geospatial Indexing System", + "homepage": "https://github.com/uber/h3", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/jaeger-client-cpp/CONTROL b/ports/jaeger-client-cpp/CONTROL deleted file mode 100644 index 6d6d47032cb497..00000000000000 --- a/ports/jaeger-client-cpp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: jaeger-client-cpp -Version: 0.5.1-1 -Build-Depends: nlohmann-json,thrift,yaml-cpp,opentracing -Homepage: https://github.com/jaegertracing/jaeger-client-cpp -Description: C++ OpenTracing binding for Jaeger https://jaegertracing.io/ -Supports: !arm64 diff --git a/ports/jaeger-client-cpp/fix-CMakeLists.patch b/ports/jaeger-client-cpp/fix-CMakeLists.patch index e0e1b6c5991f5f..4e7db3216f043c 100644 --- a/ports/jaeger-client-cpp/fix-CMakeLists.patch +++ b/ports/jaeger-client-cpp/fix-CMakeLists.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5893f31..c8864fd 100644 +index d9bf7b5..eb2692c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -59,7 +59,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND +@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND endif() hunter_add_package(thrift) @@ -11,7 +11,7 @@ index 5893f31..c8864fd 100644 if(HUNTER_ENABLED) list(APPEND LIBS thrift::thrift_static) else() -@@ -268,6 +268,9 @@ if(JAEGERTRACING_PLUGIN) +@@ -273,6 +273,9 @@ if(JAEGERTRACING_PLUGIN) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/export.map "{ global: OpenTracingMakeTracerFactory; local: *; };") add_library(jaegertracing_plugin MODULE ${SRC}) @@ -21,7 +21,7 @@ index 5893f31..c8864fd 100644 add_lib_deps(jaegertracing_plugin) target_link_libraries(jaegertracing_plugin PUBLIC -static-libgcc -@@ -410,7 +413,7 @@ include(GNUInstallDirs) +@@ -418,7 +421,7 @@ include(GNUInstallDirs) # * /lib*/cmake/ # * /lib*/ # * /include/ diff --git a/ports/jaeger-client-cpp/portfile.cmake b/ports/jaeger-client-cpp/portfile.cmake index d56f5ec1cedee6..be3d38b851271c 100644 --- a/ports/jaeger-client-cpp/portfile.cmake +++ b/ports/jaeger-client-cpp/portfile.cmake @@ -4,21 +4,21 @@ vcpkg_fail_port_install(ON_ARCH "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jaegertracing/jaeger-idl - REF 378b83a64a4a822a4e7d2936bac5d787780555ad - SHA512 eceea3dc806600bea8a05b597e26035e97950db227bbefc582d8f20ad549e0be42ebfad92ef3927ebc4892233bac9bcf85a96a25c17ec71fbca0b1b1755f556f + REF b9acaab7b20fd4f984225657ffe272799ebdfefb #commit on 2021-08-04 + SHA512 d136e68e54f39779a48b1c5bc61f81dc06b312120dc8d3788a9c360f89aa924ca4cc074c6515743a930982637f9fca94299000a4b2dca1f9c243d8d9d1c62de2 HEAD_REF master ) # Create target directory for proxy/stub generation -file(MAKE_DIRECTORY ${SOURCE_PATH}/data) +file(MAKE_DIRECTORY "${SOURCE_PATH}/data") # List of input files set(THRIFT_SOURCE_FILES agent.thrift jaeger.thrift sampling.thrift zipkincore.thrift crossdock/tracetest.thrift baggage.thrift dependency.thrift aggregation_validator.thrift) # Generate proxy/stubs for the input files foreach(THRIFT_SOURCE_FILE IN LISTS THRIFT_SOURCE_FILES) vcpkg_execute_required_process( - COMMAND ${CURRENT_INSTALLED_DIR}/tools/thrift/thrift --gen cpp:no_skeleton -o "${SOURCE_PATH}/data" ${THRIFT_SOURCE_FILE} - WORKING_DIRECTORY ${SOURCE_PATH}/thrift + COMMAND "${CURRENT_INSTALLED_DIR}/tools/thrift/thrift" --gen cpp:no_skeleton -o "${SOURCE_PATH}/data" ${THRIFT_SOURCE_FILE} + WORKING_DIRECTORY "${SOURCE_PATH}/thrift" LOGNAME jaeger-idl-${TARGET_TRIPLET} ) endforeach() @@ -30,17 +30,16 @@ set(IDL_SOURCE_DIR "${SOURCE_PATH}/data/gen-cpp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jaegertracing/jaeger-client-cpp - REF 47fbf19aae2e48d59dd8335b6f2a1e1a99abba7f - SHA512 a07e4d3e585c0f3e99aff6a662229f6beed8aef80fc6f7188629da38421bc49ab9effea479398e0d94e0a127bd931054ab332b38b73c2191bf75d4adfe5f6928 + REF 277fdd75e413c914bff04d510afafc7f0811a31a #v0.7.0 + SHA512 5112bda5ec24621044bbcd5393922564de70f4d696b1d4248e889dd3d49e492155bfc88626fea214ce4e4cb50e9a49ea031ddb8efbaafc6f1753a586db534a50 HEAD_REF master PATCHES - "fix-CMakeLists.patch" + fix-CMakeLists.patch ) # Do not use hunter, not testtools and build opentracing plugin -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DHUNTER_ENABLED=0 -DBUILD_TESTING=0 @@ -49,20 +48,20 @@ vcpkg_configure_cmake( ) # Copy generated files over to jaeger-client-cpp -file(GLOB IDL_SOURCE_FILES LIST_DIRECTORIES false ${IDL_SOURCE_DIR}/*) -file(COPY ${IDL_SOURCE_FILES} DESTINATION ${SOURCE_PATH}/src/jaegertracing/thrift-gen) +file(GLOB IDL_SOURCE_FILES LIST_DIRECTORIES false "${IDL_SOURCE_DIR}/*") +file(COPY ${IDL_SOURCE_FILES} DESTINATION "${SOURCE_PATH}/src/jaegertracing/thrift-gen") # Generate Jaeger client -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() # Cleanup unused Debug files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Cleanup -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/jaegertracing/testutils) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/jaegertracing/testutils") diff --git a/ports/jaeger-client-cpp/vcpkg.json b/ports/jaeger-client-cpp/vcpkg.json new file mode 100644 index 00000000000000..cc4db80a3a3a0c --- /dev/null +++ b/ports/jaeger-client-cpp/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "jaeger-client-cpp", + "version-semver": "0.7.0", + "description": "C++ OpenTracing binding for Jaeger https://jaegertracing.io/", + "homepage": "https://github.com/jaegertracing/jaeger-client-cpp", + "supports": "!arm64", + "dependencies": [ + "nlohmann-json", + "opentracing", + "thrift", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "yaml-cpp" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ff30d695b977d0..d6bdfcbc973975 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -418,9 +418,6 @@ gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail gts:x64-osx=fail guetzli:x64-osx=fail -h3:arm64-windows=fail -h3:arm-uwp=fail -h3:x64-uwp=fail halide:x64-windows-static=fail hdf5:arm64-windows=fail hdf5:arm-uwp=fail @@ -489,7 +486,6 @@ isal:x64-windows=fail isal:x64-windows-static=fail isal:x64-windows-static-md=fail isal:x86-windows=fail -jaeger-client-cpp:arm64-windows=fail jbig2dec:arm-uwp=fail jbig2dec:x64-uwp=fail jemalloc:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index e4e7c88a760b91..a30150f0c408a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2505,7 +2505,7 @@ "port-version": 0 }, "h3": { - "baseline": "3.6.3", + "baseline": "3.7.2", "port-version": 0 }, "h5py-lzf": { @@ -2793,7 +2793,7 @@ "port-version": 0 }, "jaeger-client-cpp": { - "baseline": "0.5.1-1", + "baseline": "0.7.0", "port-version": 0 }, "jansson": { diff --git a/versions/h-/h3.json b/versions/h-/h3.json index 698478948ae382..f886f11668c797 100644 --- a/versions/h-/h3.json +++ b/versions/h-/h3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c441a2da3a894cd1f1ec177c4b73abf2686f5b2", + "version-semver": "3.7.2", + "port-version": 0 + }, { "git-tree": "fa85d7bae358fa15d03381d256c84bccb04ff1ea", "version-string": "3.6.3", diff --git a/versions/j-/jaeger-client-cpp.json b/versions/j-/jaeger-client-cpp.json index d392c766ba4981..ecd406ae536e39 100644 --- a/versions/j-/jaeger-client-cpp.json +++ b/versions/j-/jaeger-client-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b0bbe0b96ee8a4f4bffc825ada7b9c713468307", + "version-semver": "0.7.0", + "port-version": 0 + }, { "git-tree": "66b3f5f6f74acba54c8ab222118d0ae91a726299", "version-string": "0.5.1-1", From 305dc57ea7e8e15f8639a4191e84df0b4f8fb192 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 8 Sep 2021 23:02:07 +0800 Subject: [PATCH 0485/1858] [simdjson] Update to v1.0.0 (#20052) * [simdjson] Update to 1.0.0 * [simdjson] Bump version --- ports/simdjson/portfile.cmake | 6 +++--- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index eb7f85c902dbcb..1f14e309058e8e 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 33d926bd4448e2e087511f34e49461230691a503 # v0.9.7 + REF 3bd8b0b575f43403705dcce57d427944c11421f8 # v1.0.0 HEAD_REF master - SHA512 1c492ed4c19019abbe6743c8ad60f0a03f9171f5ece6a3b2ec6429eec610d3b0750eceba81cda11791fe6fd34881af1810ee18f1ba486f9147e188c955546cad + SHA512 61c5db9bdf331cc692d85f135fda29ad5db7ee23d9518153adfd44cf26d76dae834a3071bd6c9e9b2a99a27a2881899162ac146750f444e9829a6dbbe986f769 ) vcpkg_check_features( @@ -18,7 +18,7 @@ vcpkg_check_features( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSIMDJSON_JUST_LIBRARY=ON -DSIMDJSON_SANITIZE_UNDEFINED=OFF diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 3f77cc510e39c4..010a5a73403d5a 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version": "0.9.7", + "version-semver": "1.0.0", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a30150f0c408a2..4e6b6ec4998eb6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5937,7 +5937,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "0.9.7", + "baseline": "1.0.0", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index e3fb5db0a39b33..3052efe238093e 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80800c0596226b9d3a818cf8ddf903b2e66e279c", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "9f3cbe33b4ec739d22f7549f1b73846067f78d84", "version": "0.9.7", From 1d19fa97606ee7d13b447da96dce826b5c489528 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:02:56 +0800 Subject: [PATCH 0486/1858] [fftw3/libwebsockets/uwebsockets] Update to latest release (#20051) --- ports/fftw3/CONTROL | 22 --------- ports/fftw3/portfile.cmake | 48 +++++++++---------- ports/fftw3/vcpkg.json | 36 ++++++++++++++ ports/libwebsockets/export-include-path.patch | 43 +++++++---------- ports/libwebsockets/portfile.cmake | 41 ++++++++-------- ports/libwebsockets/vcpkg.json | 11 ++++- ports/uwebsockets/portfile.cmake | 10 ++-- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 8 ++-- versions/f-/fftw3.json | 5 ++ versions/l-/libwebsockets.json | 5 ++ versions/u-/uwebsockets.json | 5 ++ 12 files changed, 129 insertions(+), 107 deletions(-) delete mode 100644 ports/fftw3/CONTROL create mode 100644 ports/fftw3/vcpkg.json diff --git a/ports/fftw3/CONTROL b/ports/fftw3/CONTROL deleted file mode 100644 index 95c6936319029c..00000000000000 --- a/ports/fftw3/CONTROL +++ /dev/null @@ -1,22 +0,0 @@ -Source: fftw3 -Version: 3.3.8-7 -Homepage: https://www.fftw.org/ -Description: FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST). - -Feature: openmp -Description: Builds openmp enabled lib - -Feature: sse -Description: Builds part of the library with sse - -Feature: sse2 -Description: Builds part of the library with sse2, sse - -Feature: avx -Description: Builds part of the library with avx, sse2, sse - -Feature: avx2 -Description: Builds part of the library with avx2, fma, avx, sse2, sse - -Feature: threads -Description: Enable threads in fftw3 diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 161cff768ec9ec..c9802469591173 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://www.fftw.org/fftw-3.3.8.tar.gz" - FILENAME "fftw-3.3.8.tar.gz" - SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38 + URLS "http://www.fftw.org/fftw-3.3.9.tar.gz" + FILENAME "fftw-3.3.9.tar.gz" + SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf ) vcpkg_extract_source_archive_ex( @@ -16,13 +16,14 @@ vcpkg_extract_source_archive_ex( vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - openmp ENABLE_OPENMP - threads ENABLE_THREADS - threads WITH_COMBINED_THREADS - avx2 ENABLE_AVX2 - avx ENABLE_AVX - sse2 ENABLE_SSE2 - sse ENABLE_SSE + FEATURES + openmp ENABLE_OPENMP + threads ENABLE_THREADS + threads WITH_COMBINED_THREADS + avx2 ENABLE_AVX2 + avx ENABLE_AVX + sse2 ENABLE_SSE2 + sse ENABLE_SSE ) set(ENABLE_FLOAT_CMAKE fftw3f) @@ -31,9 +32,8 @@ set(ENABLE_DEFAULT_PRECISION_CMAKE fftw3) foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION) if(PRECISION STREQUAL "ENABLE_LONG_DOUBLE") - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -D${PRECISION}=ON -DENABLE_OPENMP=${ENABLE_OPENMP} @@ -42,9 +42,8 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION) -DBUILD_TESTS=OFF ) else() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -D${PRECISION}=ON ${FEATURE_OPTIONS} @@ -52,25 +51,22 @@ foreach(PRECISION ENABLE_FLOAT ENABLE_LONG_DOUBLE ENABLE_DEFAULT_PRECISION) ) endif() - vcpkg_install_cmake() + vcpkg_cmake_install() vcpkg_copy_pdbs() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/${${PRECISION}_CMAKE}) + vcpkg_cmake_config_fixup(PACKAGE_NAME ${${PRECISION}_CMAKE} CONFIG_PATH lib/cmake) endforeach() -file(READ ${SOURCE_PATH}/api/fftw3.h _contents) +file(READ "${SOURCE_PATH}/api/fftw3.h" _contents) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined(FFTW_DLL)" "0" _contents "${_contents}") else() string(REPLACE "defined(FFTW_DLL)" "1" _contents "${_contents}") endif() -file(WRITE ${SOURCE_PATH}/include/fftw3.h "${_contents}") +file(WRITE "${SOURCE_PATH}/include/fftw3.h" "${_contents}") -# Cleanup -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fftw3) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/fftw3/COPYING ${CURRENT_PACKAGES_DIR}/share/fftw3/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json new file mode 100644 index 00000000000000..646e2627e932d3 --- /dev/null +++ b/ports/fftw3/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "fftw3", + "version-string": "3.3.9", + "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", + "homepage": "https://www.fftw.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "avx": { + "description": "Builds part of the library with avx, sse2, sse" + }, + "avx2": { + "description": "Builds part of the library with avx2, fma, avx, sse2, sse" + }, + "openmp": { + "description": "Builds openmp enabled lib" + }, + "sse": { + "description": "Builds part of the library with sse" + }, + "sse2": { + "description": "Builds part of the library with sse2, sse" + }, + "threads": { + "description": "Enable threads in fftw3" + } + } +} diff --git a/ports/libwebsockets/export-include-path.patch b/ports/libwebsockets/export-include-path.patch index 562c71285f0364..fe589ca3cfbf17 100644 --- a/ports/libwebsockets/export-include-path.patch +++ b/ports/libwebsockets/export-include-path.patch @@ -1,48 +1,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06d9eec..5606601 100644 +index f9b5557..ebc624b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -840,8 +840,8 @@ else() - set(DEF_INSTALL_CMAKE_DIR lib${LIB_SUFFIX}/cmake/libwebsockets) - endif() +@@ -1045,8 +1045,8 @@ file(RELATIVE_PATH + "${LWS_ABSOLUTE_INSTALL_CMAKE_DIR}" + "${LWS_ABSOLUTE_INSTALL_INCLUDE_DIR}") # Calculate the relative directory from the cmake dir. -if (DEFINED REL_INCLUDE_DIR) - set(LWS__INCLUDE_DIRS "\${LWS_CMAKE_DIR}/${REL_INCLUDE_DIR}") +if (1) + set(LWS__INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../include") - endif() - - configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in -@@ -853,10 +853,6 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config-version.cmake.in - ${PROJECT_BINARY_DIR}/libwebsockets-config-version.cmake - @ONLY) + endif() --# Generate the config file for the build-tree. --set(LWS__INCLUDE_DIRS -- "${PROJECT_SOURCE_DIR}/lib" -- "${PROJECT_BINARY_DIR}") - set(LIBWEBSOCKETS_INCLUDE_DIRS ${LWS__INCLUDE_DIRS} CACHE PATH "Libwebsockets include directories") configure_file(${PROJECT_SOURCE_DIR}/cmake/libwebsockets-config.cmake.in - ${PROJECT_BINARY_DIR}/libwebsockets-config.cmake diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 82b9170..eab2bf0 100644 +index 85b43d5..724f0b7 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -153,7 +153,7 @@ if (LWS_WITH_STATIC) - add_library(websockets STATIC ${SOURCES})# ${HDR_PUBLIC}) - set_target_properties(websockets PROPERTIES LINKER_LANGUAGE C) - list(APPEND LWS_LIBRARIES websockets) +@@ -164,7 +164,7 @@ if (LWS_WITH_STATIC) + $ + $ + ) - target_include_directories(websockets PRIVATE ${LWS_LIB_BUILD_INC_PATHS}) + target_include_directories(websockets PRIVATE $ PUBLIC $) + target_compile_definitions(websockets PRIVATE LWS_BUILDING_STATIC) if (WIN32) - # Windows uses the same .lib ending for static libraries and shared -@@ -173,7 +173,7 @@ if (LWS_WITH_SHARED) - add_library(websockets_shared SHARED ${SOURCES} ${RESOURCES})# ${HDR_PUBLIC}) - set_target_properties(websockets_shared PROPERTIES LINKER_LANGUAGE C) - list(APPEND LWS_LIBRARIES websockets_shared) +@@ -190,7 +190,7 @@ if (LWS_WITH_SHARED) + $ + $ + ) - target_include_directories(websockets_shared PRIVATE ${LWS_LIB_BUILD_INC_PATHS}) + target_include_directories(websockets_shared PRIVATE $ PUBLIC $) + target_compile_definitions(websockets_shared PRIVATE LWS_BUILDING_SHARED) # We want the shared lib to be named "libwebsockets" - # not "libwebsocket_shared". diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index c617c96ab69a1d..4bbaefbb82b25d 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO warmcat/libwebsockets - REF 736f0739ed8c75db0e29c7678b5a9194e957c347 # v4.1.6 - SHA512 7632439f8cdc87d275a0524b87ea5cd19c3401c1b7bb7fcf673eef3e1ab36c0ec022d2dce050d07bc106af3166575882507a56ac829a4361329311484dc2c5c4 + REF 8d605f0649ed1ab6d27a443c7688598ea21fdb75 # v4.2.2 + SHA512 824b7e7eded0fea41a1c22da8453b97a1ffd0f416e2d2ee3a23f799cfd449d1d0cc2f58de19a7d5dbd336e0ebceec16dd2a78cb80519d02bb49133047f99a9e2 HEAD_REF master PATCHES fix-dependency-libuv.patch @@ -132,9 +132,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LWS_WITH_SHARED) # option(LWS_WITH_LWS_DSH "Support lws_dsh_t Disordered Shared Heap" OFF) ## -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLWS_WITH_STATIC=${LWS_WITH_STATIC} -DLWS_WITH_SHARED=${LWS_WITH_SHARED} @@ -150,31 +149,33 @@ vcpkg_configure_cmake( # OPTIONS_DEBUG -DDEBUGGABLE=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libwebsockets) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libwebsockets) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server) -file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake LIBWEBSOCKETSCONFIG_CMAKE) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server") +file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" LIBWEBSOCKETSCONFIG_CMAKE) string(REPLACE "/../include" "/../../include" LIBWEBSOCKETSCONFIG_CMAKE "${LIBWEBSOCKETSCONFIG_CMAKE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake "${LIBWEBSOCKETSCONFIG_CMAKE}") -file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake LIBWEBSOCKETSTARGETSDEBUG_CMAKE) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" "${LIBWEBSOCKETSCONFIG_CMAKE}") +file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" LIBWEBSOCKETSTARGETSDEBUG_CMAKE) string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSDEBUG_CMAKE "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}") -file(READ ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake LIBWEBSOCKETSTARGETSRELEASE_CMAKE) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}") +file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" LIBWEBSOCKETSTARGETSRELEASE_CMAKE) string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSRELEASE_CMAKE "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}") + if (VCPKG_LIBRARY_LINKAGE STREQUAL static) if (VCPKG_TARGET_IS_WINDOWS) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib ${CURRENT_PACKAGES_DIR}/lib/websockets.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/websockets.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/websockets_static.lib" "${CURRENT_PACKAGES_DIR}/lib/websockets.lib") endif() endif () + vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index 897f6772b70d62..e33c30a2ec43d1 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libwebsockets", - "version-semver": "4.1.6", - "port-version": 2, + "version-semver": "4.2.2", "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", "supports": "!(arm | uwp)", @@ -9,6 +8,14 @@ "libuv", "openssl", "pthreads", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 9c415012602a13..220a202073ec48 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF b7c82d791010bd4c9b45528846f95b9886e9f984 # v19.2.0 - SHA512 54bd50d3e16e6d78081c1d780ddcb67668ab6d54d90fd99531522833b1a49796c94cc4dbe4e3685a3b1b2372fe6c08e4f84b3c0da061587da198e4076da4c3c1 + REF d40c2d1a3119e5855ddc187f6647d79fd2229e08 # v19.5.0 + SHA512 c99df55c1e557ba2ea035a4774988d76b0d5d239b42b5cccd267d7d0344aa84d5134efb960f46520f246d8bd7b2034f3626942e07a080e8493e9664dd2de5f49 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/src DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/include/src ${CURRENT_PACKAGES_DIR}/include/uwebsockets/) +file(COPY "${SOURCE_PATH}/src" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/src" "${CURRENT_PACKAGES_DIR}/include/uwebsockets") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 642458b0b6f948..e886f53a1a9337 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version": "19.2.0", + "version": "19.5.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4e6b6ec4998eb6..31586bad95fb96 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2041,7 +2041,7 @@ "port-version": 1 }, "fftw3": { - "baseline": "3.3.8-7", + "baseline": "3.3.9", "port-version": 0 }, "fftwpp": { @@ -3821,8 +3821,8 @@ "port-version": 3 }, "libwebsockets": { - "baseline": "4.1.6", - "port-version": 2 + "baseline": "4.2.2", + "port-version": 0 }, "libxdiff": { "baseline": "0.23", @@ -6653,7 +6653,7 @@ "port-version": 0 }, "uwebsockets": { - "baseline": "19.2.0", + "baseline": "19.5.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 5abf3a408798a6..2bb735e8053119 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28c3b35930f17c8ec3e05cd24d582e81df0c9dce", + "version-string": "3.3.9", + "port-version": 0 + }, { "git-tree": "6fd8682a3c82db155e040aa24a3a396b5c6c1332", "version-string": "3.3.8-7", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index 765c8cb009c3f7..50ea7bdaa0c370 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3336ccb948156f48c50ee15980a5bb56374d3b3", + "version-semver": "4.2.2", + "port-version": 0 + }, { "git-tree": "fa509ae21580082ef8aea72e394bb7005f689371", "version-semver": "4.1.6", diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index a31b28fc344153..8b5f54baab4a34 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f80ce22f9718454ab35607c0a65138b65c06fe7", + "version": "19.5.0", + "port-version": 0 + }, { "git-tree": "b01131e5a07feb1613415677213d377995bfdc40", "version": "19.2.0", From a0a3395e7237cf02be2f09b7b2c3f34c03e7fec5 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 8 Sep 2021 11:56:06 -0700 Subject: [PATCH 0487/1858] [libbson, mongo-c-driver] Convert to vcpkg.json. (#20039) * Fixes source writes rather than using DISABLE_PARALLEL_CONFIGURE * Fixes to use modern vcpkg helpers. * Fixes to install to the correct include path rather than moving the resulting includes after the fact. * Remove do-nothign renames. * Fixes to make static cmake configs find the correct bits. --- ports/libbson/CONTROL | 5 -- ports/libbson/disable-source-write.patch | 15 ++++ ports/libbson/fix-include-directory.patch | 13 +++ ports/libbson/fix-static-cmake-2.patch | 13 +++ ports/libbson/portfile.cmake | 78 ++++++---------- ports/libbson/vcpkg.json | 17 ++++ ports/mongo-c-driver/CONTROL | 14 --- .../mongo-c-driver/disable-source-write.patch | 15 ++++ .../fix-include-directory.patch | 13 +++ ports/mongo-c-driver/fix-static-cmake.patch | 13 +++ ports/mongo-c-driver/portfile.cmake | 90 ++++++------------- ports/mongo-c-driver/usage | 12 +-- ports/mongo-c-driver/vcpkg.json | 37 ++++++++ versions/baseline.json | 4 +- versions/l-/libbson.json | 5 ++ versions/m-/mongo-c-driver.json | 5 ++ 16 files changed, 211 insertions(+), 138 deletions(-) delete mode 100644 ports/libbson/CONTROL create mode 100644 ports/libbson/disable-source-write.patch create mode 100644 ports/libbson/fix-include-directory.patch create mode 100644 ports/libbson/fix-static-cmake-2.patch create mode 100644 ports/libbson/vcpkg.json delete mode 100644 ports/mongo-c-driver/CONTROL create mode 100644 ports/mongo-c-driver/disable-source-write.patch create mode 100644 ports/mongo-c-driver/fix-include-directory.patch create mode 100644 ports/mongo-c-driver/fix-static-cmake.patch create mode 100644 ports/mongo-c-driver/vcpkg.json diff --git a/ports/libbson/CONTROL b/ports/libbson/CONTROL deleted file mode 100644 index c74336ee5b3d2b..00000000000000 --- a/ports/libbson/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libbson -Version: 1.16.1 -Port-Version: 2 -Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents. -Homepage: https://github.com/mongodb/libbson diff --git a/ports/libbson/disable-source-write.patch b/ports/libbson/disable-source-write.patch new file mode 100644 index 00000000000000..ff2f9cab52f0f1 --- /dev/null +++ b/ports/libbson/disable-source-write.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ff8bbf..32c2e00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,8 +114,8 @@ if (BUILD_VERSION STREQUAL "0.0.0") + file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + else () +- message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") +- file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) ++ #message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") ++ #file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + + include (LoadVersion) diff --git a/ports/libbson/fix-include-directory.patch b/ports/libbson/fix-include-directory.patch new file mode 100644 index 00000000000000..beead37bd36625 --- /dev/null +++ b/ports/libbson/fix-include-directory.patch @@ -0,0 +1,13 @@ +diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt +index d383424..cc633f6 100644 +--- a/src/libbson/CMakeLists.txt ++++ b/src/libbson/CMakeLists.txt +@@ -326,7 +326,7 @@ if (ENABLE_EXAMPLES) + endif () # ENABLE_EXAMPLES + + set (BSON_HEADER_INSTALL_DIR +- "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}" ++ "${CMAKE_INSTALL_INCLUDEDIR}" + ) + + if (ENABLE_STATIC MATCHES "ON|AUTO") diff --git a/ports/libbson/fix-static-cmake-2.patch b/ports/libbson/fix-static-cmake-2.patch new file mode 100644 index 00000000000000..1a694a1bfb2cd6 --- /dev/null +++ b/ports/libbson/fix-static-cmake-2.patch @@ -0,0 +1,13 @@ +diff --git a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in +index 92933fe..90eb16f 100644 +--- a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in ++++ b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in +@@ -27,7 +27,7 @@ set_and_check (BSON_STATIC_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIRS@") + # directory and the base name, but not the suffix, so we use CMake's + # find_library () to pick that up. Users can override this by configuring + # BSON_STATIC_LIBRARY themselves. +-find_library (BSON_STATIC_LIBRARY bson-static-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) ++find_library (BSON_STATIC_LIBRARY bson-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) + + set (BSON_STATIC_LIBRARIES ${BSON_STATIC_LIBRARY}) + diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 7bd0bf8f7abcbc..eb534a26028846 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -8,24 +8,19 @@ vcpkg_from_github( PATCHES fix-uwp.patch fix-static-cmake.patch + disable-source-write.patch + fix-include-directory.patch + fix-static-cmake-2.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(ENABLE_STATIC ON) -else() - set(ENABLE_STATIC OFF) -endif() - -file(READ ${CMAKE_CURRENT_LIST_DIR}/CONTROL _contents) -string(REGEX MATCH "\nVersion:[ ]*[^ \n]+" _contents "${_contents}") -string(REGEX REPLACE ".+Version:[ ]*([\\.0-9]+).*" "\\1" BUILD_VERSION "${_contents}") +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) -file(WRITE "${BUILD_VERSION}" ${SOURCE_PATH}/VERSION_CURRENT) +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON BUILD_VERSION GET "${_contents}" version) +file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${BUILD_VERSION}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_MONGOC=OFF -DENABLE_BSON=ON @@ -34,55 +29,40 @@ vcpkg_configure_cmake( -DENABLE_STATIC=${ENABLE_STATIC} -DBUILD_VERSION=${BUILD_VERSION} -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_PythonInterp ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -set(PORT_POSTFIX "1.0") - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libbson-static-${PORT_POSTFIX} TARGET_PATH share/libbson-${PORT_POSTFIX}) + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libbson-static-1.0" PACKAGE_NAME "libbson-1.0") else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libbson-${PORT_POSTFIX} TARGET_PATH share/libbson-${PORT_POSTFIX}) + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libbson-1.0" PACKAGE_NAME "libbson-1.0") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver) - -# This rename is needed because the official examples expect to use #include -# See Microsoft/vcpkg#904 -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/libbson-${PORT_POSTFIX} - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/mongo-c-driver") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) # drop the __declspec(dllimport) when building static - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/bson/bson-macros.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/bson/bson-macros.h" "define BSON_API __declspec(dllimport)" "define BSON_API") - - file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-static-${PORT_POSTFIX}-config.cmake - ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-${PORT_POSTFIX}-config.cmake) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-static-${PORT_POSTFIX}-config-version.cmake - ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-${PORT_POSTFIX}-config-version.cmake) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) -else() - file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-${PORT_POSTFIX}-config.cmake - ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-${PORT_POSTFIX}-config.cmake) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-${PORT_POSTFIX}-config-version.cmake - ${CURRENT_PACKAGES_DIR}/share/libbson-${PORT_POSTFIX}/libbson-${PORT_POSTFIX}-config-version.cmake) -endif() + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-static-1.0-config.cmake" + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-1.0-config.cmake") + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-static-1.0-config-version.cmake" + "${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-1.0-config-version.cmake") -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libbson-1.0/libbson-1.0-config.cmake - "include/libbson-1.0" "include/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +endif() -file(COPY ${SOURCE_PATH}/THIRD_PARTY_NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson) +file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libbson") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json new file mode 100644 index 00000000000000..c9ab96124e6420 --- /dev/null +++ b/ports/libbson/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libbson", + "version": "1.16.1", + "port-version": 3, + "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", + "homepage": "https://github.com/mongodb/libbson", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/mongo-c-driver/CONTROL b/ports/mongo-c-driver/CONTROL deleted file mode 100644 index 54a225a02e5a46..00000000000000 --- a/ports/mongo-c-driver/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: mongo-c-driver -Version: 1.16.1 -Port-Version: 5 -Build-Depends: libbson, openssl (!windows), zlib -Description: Client library written in C for MongoDB. -Homepage: https://github.com/mongodb/mongo-c-driver - -Feature: snappy -Description: Enables snappy compressor support -Build-Depends: snappy - -Feature: icu -Description: Enable ICU support, necessary to use non-ASCII usernames or passwords -Build-Depends: icu diff --git a/ports/mongo-c-driver/disable-source-write.patch b/ports/mongo-c-driver/disable-source-write.patch new file mode 100644 index 00000000000000..ff2f9cab52f0f1 --- /dev/null +++ b/ports/mongo-c-driver/disable-source-write.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ff8bbf..32c2e00 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,8 +114,8 @@ if (BUILD_VERSION STREQUAL "0.0.0") + file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + else () +- message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") +- file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) ++ #message ("storing BUILD_VERSION ${BUILD_VERSION} in file VERSION_CURRENT for later use") ++ #file (WRITE ${PROJECT_SOURCE_DIR}/VERSION_CURRENT ${BUILD_VERSION}) + endif () + + include (LoadVersion) diff --git a/ports/mongo-c-driver/fix-include-directory.patch b/ports/mongo-c-driver/fix-include-directory.patch new file mode 100644 index 00000000000000..8fdf45334d2528 --- /dev/null +++ b/ports/mongo-c-driver/fix-include-directory.patch @@ -0,0 +1,13 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index a5767ac..3656efa 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -998,7 +998,7 @@ else () + endif () + + set (MONGOC_HEADER_INSTALL_DIR +- "${CMAKE_INSTALL_INCLUDEDIR}/libmongoc-${MONGOC_API_VERSION}" ++ "${CMAKE_INSTALL_INCLUDEDIR}" + ) + + install ( diff --git a/ports/mongo-c-driver/fix-static-cmake.patch b/ports/mongo-c-driver/fix-static-cmake.patch new file mode 100644 index 00000000000000..bb3e018e73171f --- /dev/null +++ b/ports/mongo-c-driver/fix-static-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in +index c23da9f..05c03e8 100644 +--- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in ++++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in +@@ -30,7 +30,7 @@ list (APPEND MONGOC_STATIC_INCLUDE_DIRS ${BSON_STATIC_INCLUDE_DIRS}) + # directory and the base name, but not the suffix, so we use CMake's + # find_library () to pick that up. Users can override this by configuring + # MONGOC_STATIC_LIBRARY themselves. +-find_library (MONGOC_STATIC_LIBRARY mongoc-static-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) ++find_library (MONGOC_STATIC_LIBRARY mongoc-1.0 PATHS "@PACKAGE_LIBRARY_INSTALL_DIRS@" NO_DEFAULT_PATH) + if (MSVC) + set (MONGOC_STATIC_LIB_EXT "lib") + else () diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index eca359bd6dc728..b95266f5dc916e 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -9,18 +9,18 @@ vcpkg_from_github( fix-dependency-libbson.patch disable-static-when-dynamic-build.patch fix-arm-build.patch + disable-source-write.patch + fix-include-directory.patch + fix-static-cmake.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES "snappy" ENABLE_SNAPPY "icu" ENABLE_ICU ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(ENABLE_STATIC ON) -else() - set(ENABLE_STATIC OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) if(VCPKG_TARGET_IS_WINDOWS) set(ENABLE_SSL "WINDOWS") @@ -36,15 +36,12 @@ else() set(ENABLE_SHM_COUNTERS AUTO) endif() -file(READ ${CMAKE_CURRENT_LIST_DIR}/CONTROL _contents) -string(REGEX MATCH "\nVersion:[ ]*[^ \n]+" _contents "${_contents}") -string(REGEX REPLACE ".+Version:[ ]*([\\.0-9]+).*" "\\1" BUILD_VERSION "${_contents}") +file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) +string(JSON BUILD_VERSION GET "${_contents}" version) +file(WRITE "${SOURCE_PATH}/VERSION_CURRENT" "${BUILD_VERSION}") -file(WRITE "${BUILD_VERSION}" ${SOURCE_PATH}/VERSION_CURRENT) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBSON_ROOT_DIR=${CURRENT_INSTALLED_DIR} -DENABLE_MONGOC=ON @@ -59,70 +56,39 @@ vcpkg_configure_cmake( -DBUILD_VERSION=${BUILD_VERSION} -DCMAKE_DISABLE_FIND_PACKAGE_PythonInterp=ON ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_PythonInterp ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -set(PORT_POSTFIX "1.0") - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libmongoc-static-${PORT_POSTFIX} TARGET_PATH share/libmongoc-${PORT_POSTFIX}) + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libmongoc-static-1.0" PACKAGE_NAME libmongoc-1.0) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libmongoc-${PORT_POSTFIX} TARGET_PATH share/libmongoc-${PORT_POSTFIX}) + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libmongoc-1.0" PACKAGE_NAME libmongoc-1.0) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -# This rename is needed because the official examples expect to use #include -# See Microsoft/vcpkg#904 -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/libmongoc-${PORT_POSTFIX} - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if(NOT VCPKG_TARGET_IS_WINDOWS) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/lib/libmongoc-1.0.a) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-static-1.0.a - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongoc-1.0.a) - endif() - else() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) - endif() - endif() - # drop the __declspec(dllimport) when building static vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/mongoc/mongoc-macros.h "define MONGOC_API __declspec(dllimport)" "define MONGOC_API") - file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmongoc-${PORT_POSTFIX}/libmongoc-static-${PORT_POSTFIX}-config.cmake - ${CURRENT_PACKAGES_DIR}/share/libmongoc-${PORT_POSTFIX}/libmongoc-${PORT_POSTFIX}-config.cmake) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmongoc-${PORT_POSTFIX}/libmongoc-static-${PORT_POSTFIX}-config-version.cmake - ${CURRENT_PACKAGES_DIR}/share/libmongoc-${PORT_POSTFIX}/libmongoc-${PORT_POSTFIX}-config-version.cmake) + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-static-1.0-config.cmake" + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake") + file(RENAME + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-static-1.0-config-version.cmake" + "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config-version.cmake") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) endif() # Create cmake files for _both_ find_package(mongo-c-driver) and find_package(libmongoc-static-1.0)/find_package(libmongoc-1.0) -file(READ ${CURRENT_PACKAGES_DIR}/share/libmongoc-${PORT_POSTFIX}/libmongoc-${PORT_POSTFIX}-config.cmake LIBMONGOC_CONFIG_CMAKE) +file(READ "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake" LIBMONGOC_CONFIG_CMAKE) # Patch: Set _IMPORT_PREFIX and replace PACKAGE_PREFIX_DIR string(REPLACE @@ -150,8 +116,8 @@ if (NOT VCPKG_TARGET_IS_WINDOWS) string(REPLACE "/lib/libz.a" "\$<\$:/debug>/lib/libz.a" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongoc-${PORT_POSTFIX}/libmongoc-${PORT_POSTFIX}-config.cmake "${LIBMONGOC_CONFIG_CMAKE}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake" "${LIBMONGOC_CONFIG_CMAKE}") -file(COPY ${SOURCE_PATH}/THIRD_PARTY_NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mongo-c-driver/usage b/ports/mongo-c-driver/usage index d3347960ed38c0..561dc7ac80df9d 100644 --- a/ports/mongo-c-driver/usage +++ b/ports/mongo-c-driver/usage @@ -1,7 +1,7 @@ The package mongo-c-driver is compatible with built-in CMake targets: - - find_package(libmongoc-1.0 CONFIG REQUIRED) - - target_include_directories(main PRIVATE ${MONGOC_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${MONGOC_LIBRARIES}) - target_compile_definitions(main PRIVATE ${MONGOC_DEFINITIONS}) + + find_package(libmongoc-1.0 CONFIG REQUIRED) + + target_include_directories(main PRIVATE ${MONGOC_INCLUDE_DIRS}) + target_link_libraries(main PRIVATE ${MONGOC_LIBRARIES}) + target_compile_definitions(main PRIVATE ${MONGOC_DEFINITIONS}) diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json new file mode 100644 index 00000000000000..ba3779b2a8519a --- /dev/null +++ b/ports/mongo-c-driver/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "mongo-c-driver", + "version": "1.16.1", + "port-version": 6, + "description": "Client library written in C for MongoDB.", + "homepage": "https://github.com/mongodb/mongo-c-driver", + "dependencies": [ + "libbson", + { + "name": "openssl", + "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "icu": { + "description": "Enable ICU support, necessary to use non-ASCII usernames or passwords", + "dependencies": [ + "icu" + ] + }, + "snappy": { + "description": "Enables snappy compressor support", + "dependencies": [ + "snappy" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 31586bad95fb96..4b795ac57a7678 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3138,7 +3138,7 @@ }, "libbson": { "baseline": "1.16.1", - "port-version": 2 + "port-version": 3 }, "libcbor": { "baseline": "0.8.0", @@ -4206,7 +4206,7 @@ }, "mongo-c-driver": { "baseline": "1.16.1", - "port-version": 5 + "port-version": 6 }, "mongo-cxx-driver": { "baseline": "3.4.0-5", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 6dfab9724b55fe..6aedc49e53f574 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e6782528f3e1d88372ebe20fa82128419ab0c1c", + "version": "1.16.1", + "port-version": 3 + }, { "git-tree": "9988ee3812d5134cb3ebe09af0178e77518a1368", "version-string": "1.16.1", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index 033ff1e25338d8..6d90ec4a22976c 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c13a612d9a93a8a338b5a32d14338683065813fd", + "version": "1.16.1", + "port-version": 6 + }, { "git-tree": "6a68782eaa1afe2fc3de47db769e230ebd542ca7", "version-string": "1.16.1", From e69c59e8f359575d51192c95b458f5a28959c63d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 8 Sep 2021 21:21:06 +0200 Subject: [PATCH 0488/1858] [msbuild] add vcpkg to search path (#20054) --- scripts/buildsystems/msbuild/vcpkg.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 98fde24f126348..36fd347648160d 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -83,6 +83,9 @@ + + %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link + %(AdditionalDependencies);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\*.lib %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link From 7d2c02372edbbb907020d8296fb6de7eae6abde3 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 8 Sep 2021 23:58:24 +0200 Subject: [PATCH 0489/1858] [aubio] Add support for find_package (#19996) * [aubio] Add support for find_package * Add include(CMakeFindDependencyMacro) * x-add-version Co-authored-by: Billy Robert O'Neal III --- ports/aubio/CMakeLists.txt | 48 ++++++++++++++++++++++++++++++-------- ports/aubio/portfile.cmake | 9 ++++--- ports/aubio/vcpkg.json | 12 +++++++++- versions/a-/aubio.json | 5 ++++ versions/baseline.json | 2 +- 5 files changed, 61 insertions(+), 15 deletions(-) diff --git a/ports/aubio/CMakeLists.txt b/ports/aubio/CMakeLists.txt index e352acb34ba278..b711c9f39cd9ee 100644 --- a/ports/aubio/CMakeLists.txt +++ b/ports/aubio/CMakeLists.txt @@ -83,19 +83,47 @@ if(BUILD_TOOLS AND WITH_DEPENDENCIES) endif() install( - TARGETS aubio + TARGETS aubio EXPORT AubioTargets + INCLUDES DESTINATION include RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) -if(NOT DISABLE_INSTALL_HEADERS) - install( - DIRECTORY src/ - DESTINATION include/aubio - FILES_MATCHING - PATTERN "*.h" - PATTERN "*_priv.h" EXCLUDE - PATTERN "config.h" EXCLUDE - ) +install(EXPORT AubioTargets NAMESPACE Aubio:: DESTINATION share/aubio) + +install( + DIRECTORY src/ + DESTINATION include/aubio + FILES_MATCHING + PATTERN "*.h" + PATTERN "*_priv.h" EXCLUDE + PATTERN "config.h" EXCLUDE +) + +# Create CMake configuration export file. +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in "@PACKAGE_INIT@\n") +if(WITH_DEPENDENCIES) +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in " + include(CMakeFindDependencyMacro) + find_dependency(FFMPEG COMPONENTS avcodec avutil avformat swresample REQUIRED) + find_dependency(BZip2 REQUIRED) + find_dependency(LibLZMA REQUIRED) + find_dependency(SndFile REQUIRED) + ") endif() +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in "include(\${CMAKE_CURRENT_LIST_DIR}/AubioTargets.cmake)") + +# Install CMake configuration export file. +include(CMakePackageConfigHelpers) +configure_package_config_file( + ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/AubioConfig.cmake + INSTALL_DESTINATION share/aubio +) +install( + FILES + ${CMAKE_BINARY_DIR}/AubioConfig.cmake + DESTINATION + share/aubio +) diff --git a/ports/aubio/portfile.cmake b/ports/aubio/portfile.cmake index 4cb7f7f6c9b423..e8d49dce4c0dbb 100644 --- a/ports/aubio/portfile.cmake +++ b/ports/aubio/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools WITH_DEPENDENCIES ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} @@ -23,10 +23,13 @@ vcpkg_configure_cmake( -DTOOLS_INSTALLDIR=tools/aubio -DBUILD_TOOLS=ON OPTIONS_DEBUG - -DDISABLE_INSTALL_HEADERS=1 -DBUILD_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright and credentials file(COPY diff --git a/ports/aubio/vcpkg.json b/ports/aubio/vcpkg.json index bb9e7eda597023..dd977ac9242754 100644 --- a/ports/aubio/vcpkg.json +++ b/ports/aubio/vcpkg.json @@ -1,9 +1,19 @@ { "name": "aubio", "version-semver": "0.4.9", - "port-version": 6, + "port-version": 7, "description": "Aubio is a tool designed for the extraction of annotations from audio signals. Its features include segmenting a sound file before each of its attacks, performing pitch detection, tapping the beat and producing midi streams from live audio.", "homepage": "https://github.com/aubio/aubio", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "tools" ], diff --git a/versions/a-/aubio.json b/versions/a-/aubio.json index 488d8b81fe795e..540f6d7eafa42c 100644 --- a/versions/a-/aubio.json +++ b/versions/a-/aubio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7115b787e5f71bf65454f4c3cff3ec85b4eb264", + "version-semver": "0.4.9", + "port-version": 7 + }, { "git-tree": "0abf18908332cd2ccfe8e298f8fd90c0db42dcd9", "version-semver": "0.4.9", diff --git a/versions/baseline.json b/versions/baseline.json index 4b795ac57a7678..3c8e19aa22418d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -214,7 +214,7 @@ }, "aubio": { "baseline": "0.4.9", - "port-version": 6 + "port-version": 7 }, "audiofile": { "baseline": "1.0.7", From 898306952a9246dbe2c6245ab72eb6386b02feef Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 9 Sep 2021 00:28:41 +0200 Subject: [PATCH 0490/1858] [libjpeg-turbo] Update wrapper to correctly find debug/release variant (#19319) * Format manifest * Fix cmake wrapper * Drop windows debug lib renaming * Fix build warnings * x-add-version * Consolidate azure-kinect-sensor-sdk patches * Fix jpegturbo dependency * x-add-version * Fix wrapper message * x-add-version --- .../add-MATROSKA_VERSION-define.patch | 13 --- .../azure-kinect-sensor-sdk/fix-builds.patch | 106 ++++++++++-------- ports/azure-kinect-sensor-sdk/fix-uvc.patch | 36 ------ ports/azure-kinect-sensor-sdk/portfile.cmake | 2 - ports/azure-kinect-sensor-sdk/vcpkg.json | 2 +- ports/libjpeg-turbo/CONTROL | 10 -- ports/libjpeg-turbo/portfile.cmake | 24 ++-- ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake | 11 ++ ports/libjpeg-turbo/vcpkg.json | 15 +++ versions/a-/azure-kinect-sensor-sdk.json | 5 + versions/baseline.json | 4 +- versions/l-/libjpeg-turbo.json | 5 + 12 files changed, 107 insertions(+), 126 deletions(-) delete mode 100644 ports/azure-kinect-sensor-sdk/add-MATROSKA_VERSION-define.patch delete mode 100644 ports/azure-kinect-sensor-sdk/fix-uvc.patch delete mode 100644 ports/libjpeg-turbo/CONTROL create mode 100644 ports/libjpeg-turbo/vcpkg.json diff --git a/ports/azure-kinect-sensor-sdk/add-MATROSKA_VERSION-define.patch b/ports/azure-kinect-sensor-sdk/add-MATROSKA_VERSION-define.patch deleted file mode 100644 index b830fd5df3ccd9..00000000000000 --- a/ports/azure-kinect-sensor-sdk/add-MATROSKA_VERSION-define.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 58a092e..ed4a6d2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -107,6 +107,7 @@ find_package(EBML CONFIG REQUIRED) - find_package(JPEG REQUIRED) - find_library(JPEG_TURBO turbojpeg REQUIRED) - find_package(Matroska CONFIG REQUIRED) -+add_definitions(-DMATROSKA_VERSION=2) - find_package(libsoundio CONFIG REQUIRED) - find_package(libusb CONFIG REQUIRED) - find_package(libuvc CONFIG REQUIRED) - find_package(libyuv CONFIG REQUIRED) diff --git a/ports/azure-kinect-sensor-sdk/fix-builds.patch b/ports/azure-kinect-sensor-sdk/fix-builds.patch index 4dbc61b362a5c3..750667eef279b8 100644 --- a/ports/azure-kinect-sensor-sdk/fix-builds.patch +++ b/ports/azure-kinect-sensor-sdk/fix-builds.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4f002b5..cef79d6 100644 +index 4f002b5..d48f3f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,8 +27,6 @@ option(K4A_BUILD_DOCS "Build K4A doxygen documentation" OFF) @@ -11,7 +11,7 @@ index 4f002b5..cef79d6 100644 # Set the project version include(K4AProjectVersion) -@@ -100,6 +98,36 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL +@@ -100,6 +98,43 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) endif() @@ -21,25 +21,32 @@ index 4f002b5..cef79d6 100644 +find_package(GTest CONFIG REQUIRED) +find_package(imgui CONFIG REQUIRED) +find_package(EBML CONFIG REQUIRED) -+find_package(JPEG REQUIRED) -+find_library(JPEG_TURBO turbojpeg REQUIRED) ++find_path(TURBOJPEG_INCLUDE_DIR NAMES turbojpeg.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH REQUIRED) ++find_library(TURBOJPEG_LIBRARY_RELEASE NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH REQUIRED) ++add_library(libjpeg-turbo::libjpeg-turbo UNKNOWN IMPORTED) ++set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${TURBOJPEG_INCLUDE_DIR}) ++set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_RELEASE ${TURBOJPEG_LIBRARY_RELEASE}) ++if(EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib") ++ find_library(TURBOJPEG_LIBRARY_DEBUG NAMES turbojpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH REQUIRED) ++ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION_DEBUG ${TURBOJPEG_LIBRARY_DEBUG}) ++endif() +find_package(Matroska CONFIG REQUIRED) ++add_definitions(-DMATROSKA_VERSION=2) +find_package(libsoundio CONFIG REQUIRED) -+find_package(libusb CONFIG REQUIRED) -+find_package(libuvc CONFIG REQUIRED) ++if (NOT WIN32) ++ find_package(libusb CONFIG REQUIRED) ++ find_package(libuvc CONFIG REQUIRED) ++ add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) ++ find_package(OpenSSL REQUIRED) ++ find_package(ZLIB REQUIRED) ++else() ++ find_library(LibUSB libusb-1.0 REQUIRED) ++endif() +find_package(libyuv CONFIG REQUIRED) +find_package(spdlog CONFIG REQUIRED) -+find_package(OpenSSL REQUIRED) -+find_package(ZLIB REQUIRED) +if (BUILD_TOOLS) + find_package(gl3w CONFIG REQUIRED) +endif() -+add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) -+add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED) -+set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR}) -+set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES}) -+# add jpeg-turbo library to jpeg libraries. -+set(JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_TURBO}) +# Fix embl error +if ("MSVC") +add_compile_options(/wd4828 /wd4251 /wd4275) @@ -48,7 +55,7 @@ index 4f002b5..cef79d6 100644 # Find all dependencies add_subdirectory(extern) -@@ -160,10 +188,16 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") +@@ -161,10 +196,16 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") endif() endif() @@ -69,17 +76,8 @@ index 4f002b5..cef79d6 100644 if (K4A_BUILD_DOCS) find_package(Doxygen 1.8.14 EXACT) -diff --git a/examples/transformation/CMakeLists.txt b/examples/transformation/CMakeLists.txt ---- a/examples/transformation/CMakeLists.txt -+++ b/examples/transformation/CMakeLists.txt -@@ -9,5 +9,5 @@ add_executable(transformation_example - target_link_libraries(transformation_example PRIVATE - k4a::k4a - k4a::k4arecord -- libjpeg-turbo::libjpeg-turbo -+ ${JPEG_LIBRARIES} - ) diff --git a/examples/viewer/opengl/CMakeLists.txt b/examples/viewer/opengl/CMakeLists.txt +index 166fe2a..a3db07f 100644 --- a/examples/viewer/opengl/CMakeLists.txt +++ b/examples/viewer/opengl/CMakeLists.txt @@ -14,6 +14,6 @@ add_executable(viewer_opengl @@ -92,7 +90,7 @@ diff --git a/examples/viewer/opengl/CMakeLists.txt b/examples/viewer/opengl/CMak ${OPENGL_LIBRARIES}) \ No newline at end of file diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt -index cb4f7b4..c3eab98 100644 +index cb4f7b4..3d00084 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -1,7 +1,6 @@ @@ -138,6 +136,7 @@ index 7140274..3bb6747 100644 k4ainternal::logging) diff --git a/src/calibration/CMakeLists.txt b/src/calibration/CMakeLists.txt +index e96b7d0..ed69f41 100644 --- a/src/calibration/CMakeLists.txt +++ b/src/calibration/CMakeLists.txt @@ -11,7 +11,7 @@ target_include_directories(k4a_calibration PUBLIC @@ -163,6 +162,7 @@ index bf5f34a..d37c4e6 100644 // System dependencies diff --git a/src/capturesync/CMakeLists.txt b/src/capturesync/CMakeLists.txt +index a434593..bcb19ba 100644 --- a/src/capturesync/CMakeLists.txt +++ b/src/capturesync/CMakeLists.txt @@ -11,7 +11,7 @@ target_include_directories(k4a_capturesync PUBLIC @@ -175,6 +175,7 @@ diff --git a/src/capturesync/CMakeLists.txt b/src/capturesync/CMakeLists.txt # Define alias for other targets to link against diff --git a/src/dewrapper/CMakeLists.txt b/src/dewrapper/CMakeLists.txt +index 2756e43..f736fd1 100644 --- a/src/dewrapper/CMakeLists.txt +++ b/src/dewrapper/CMakeLists.txt @@ -10,7 +10,7 @@ target_include_directories(k4a_dewrapper PUBLIC @@ -187,6 +188,7 @@ diff --git a/src/dewrapper/CMakeLists.txt b/src/dewrapper/CMakeLists.txt k4ainternal::calibration k4ainternal::logging diff --git a/src/image/CMakeLists.txt b/src/image/CMakeLists.txt +index c40999b..82406e2 100644 --- a/src/image/CMakeLists.txt +++ b/src/image/CMakeLists.txt @@ -11,7 +11,7 @@ target_include_directories(k4a_image PUBLIC @@ -199,6 +201,7 @@ diff --git a/src/image/CMakeLists.txt b/src/image/CMakeLists.txt k4ainternal::logging) diff --git a/src/logging/CMakeLists.txt b/src/logging/CMakeLists.txt +index cbf0e4d..ca81c41 100644 --- a/src/logging/CMakeLists.txt +++ b/src/logging/CMakeLists.txt @@ -11,7 +11,7 @@ target_include_directories(k4a_logging PUBLIC @@ -211,6 +214,7 @@ diff --git a/src/logging/CMakeLists.txt b/src/logging/CMakeLists.txt k4ainternal::rwlock k4ainternal::global diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp +index 05264c5..41185de 100644 --- a/src/logging/logging.cpp +++ b/src/logging/logging.cpp @@ -24,6 +24,9 @@ @@ -224,6 +228,7 @@ diff --git a/src/logging/logging.cpp b/src/logging/logging.cpp #pragma warning(default : 4702) #endif diff --git a/src/queue/CMakeLists.txt b/src/queue/CMakeLists.txt +index 03d15f4..a42a135 100644 --- a/src/queue/CMakeLists.txt +++ b/src/queue/CMakeLists.txt @@ -10,7 +10,7 @@ target_include_directories(k4a_queue PUBLIC @@ -236,9 +241,10 @@ diff --git a/src/queue/CMakeLists.txt b/src/queue/CMakeLists.txt k4ainternal::logging ) diff --git a/src/record/internal/CMakeLists.txt b/src/record/internal/CMakeLists.txt +index 97c6cf3..e9f5b1a 100644 --- a/src/record/internal/CMakeLists.txt +++ b/src/record/internal/CMakeLists.txt -@@ -22,17 +22,17 @@ target_include_directories(k4a_playback PUBLIC +@@ -22,16 +22,16 @@ target_include_directories(k4a_playback PUBLIC target_link_libraries(k4a_record PUBLIC k4a::k4a k4ainternal::logging @@ -254,14 +260,12 @@ diff --git a/src/record/internal/CMakeLists.txt b/src/record/internal/CMakeLists - ebml::ebml - matroska::matroska - libyuv::libyuv -- libjpeg-turbo::libjpeg-turbo + EBML::ebml + Matroska::matroska + yuv -+ ${JPEG_LIBRARIES} + libjpeg-turbo::libjpeg-turbo ) - # Define alias for other targets to link against diff --git a/src/record/sdk/CMakeLists.txt b/src/record/sdk/CMakeLists.txt index 2e23295..d150e70 100644 --- a/src/record/sdk/CMakeLists.txt @@ -278,6 +282,7 @@ index 2e23295..d150e70 100644 target_link_libraries(k4arecord PUBLIC diff --git a/src/tewrapper/CMakeLists.txt b/src/tewrapper/CMakeLists.txt +index e4a696e..6ee6696 100644 --- a/src/tewrapper/CMakeLists.txt +++ b/src/tewrapper/CMakeLists.txt @@ -10,7 +10,7 @@ target_include_directories(k4a_tewrapper PUBLIC @@ -290,6 +295,7 @@ diff --git a/src/tewrapper/CMakeLists.txt b/src/tewrapper/CMakeLists.txt k4ainternal::deloader) diff --git a/src/usbcommand/CMakeLists.txt b/src/usbcommand/CMakeLists.txt +index f75bd55..5403216 100644 --- a/src/usbcommand/CMakeLists.txt +++ b/src/usbcommand/CMakeLists.txt @@ -12,8 +12,8 @@ target_include_directories(k4a_usb_cmd PUBLIC @@ -304,6 +310,7 @@ diff --git a/src/usbcommand/CMakeLists.txt b/src/usbcommand/CMakeLists.txt k4ainternal::image k4ainternal::logging) diff --git a/src/usbcommand/usb_cmd_priv.h b/src/usbcommand/usb_cmd_priv.h +index 0aa502c..0405b58 100644 --- a/src/usbcommand/usb_cmd_priv.h +++ b/src/usbcommand/usb_cmd_priv.h @@ -20,7 +20,7 @@ @@ -316,6 +323,7 @@ diff --git a/src/usbcommand/usb_cmd_priv.h b/src/usbcommand/usb_cmd_priv.h // Ensure we have LIBUSB_API_VERSION defined if not defined by libusb.h #ifndef LIBUSB_API_VERSION diff --git a/tests/Calibration/CMakeLists.txt b/tests/Calibration/CMakeLists.txt +index ea6a9dd..c107269 100644 --- a/tests/Calibration/CMakeLists.txt +++ b/tests/Calibration/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -330,6 +338,7 @@ diff --git a/tests/Calibration/CMakeLists.txt b/tests/Calibration/CMakeLists.txt k4ainternal::utcommon) diff --git a/tests/CaptureSync/CMakeLists.txt b/tests/CaptureSync/CMakeLists.txt +index 0a9a8e2..f7bff42 100644 --- a/tests/CaptureSync/CMakeLists.txt +++ b/tests/CaptureSync/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -344,6 +353,7 @@ diff --git a/tests/CaptureSync/CMakeLists.txt b/tests/CaptureSync/CMakeLists.txt k4ainternal::capturesync k4ainternal::image diff --git a/tests/ColorTests/FunctionalTest/CMakeLists.txt b/tests/ColorTests/FunctionalTest/CMakeLists.txt +index 1e65ad7..709dfb0 100644 --- a/tests/ColorTests/FunctionalTest/CMakeLists.txt +++ b/tests/ColorTests/FunctionalTest/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(color_ft color_ft.cpp) @@ -356,19 +366,8 @@ diff --git a/tests/ColorTests/FunctionalTest/CMakeLists.txt b/tests/ColorTests/F + aziotsharedutil) k4a_add_tests(TARGET color_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) -diff --git a/tests/ColorTests/UnitTest/CMakeLists.txt b/tests/ColorTests/UnitTest/CMakeLists.txt ---- a/tests/ColorTests/UnitTest/CMakeLists.txt -+++ b/tests/ColorTests/UnitTest/CMakeLists.txt -@@ -42,7 +42,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") - elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") - target_link_libraries(color_ut PRIVATE - libuvc::libuvc -- libjpeg-turbo::libjpeg-turbo) -+ ${JPEG_LIBRARIES}) - endif() - - k4a_add_tests(TARGET color_ut TEST_TYPE UNIT) diff --git a/tests/DepthTests/FunctionalTest/CMakeLists.txt b/tests/DepthTests/FunctionalTest/CMakeLists.txt +index 469c125..00f15f8 100644 --- a/tests/DepthTests/FunctionalTest/CMakeLists.txt +++ b/tests/DepthTests/FunctionalTest/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(depth_ft depth_ft.cpp) @@ -382,6 +381,7 @@ diff --git a/tests/DepthTests/FunctionalTest/CMakeLists.txt b/tests/DepthTests/F k4a_add_tests(TARGET depth_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) diff --git a/tests/ExternLibraries/azure_c_shared/CMakeLists.txt b/tests/ExternLibraries/azure_c_shared/CMakeLists.txt +index a487cde..44170f4 100644 --- a/tests/ExternLibraries/azure_c_shared/CMakeLists.txt +++ b/tests/ExternLibraries/azure_c_shared/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(azure_c_shared_test @@ -395,6 +395,7 @@ diff --git a/tests/ExternLibraries/azure_c_shared/CMakeLists.txt b/tests/ExternL k4a_add_tests(TARGET azure_c_shared_test TEST_TYPE UNIT) diff --git a/tests/IMUTests/FunctionalTest/CMakeLists.txt b/tests/IMUTests/FunctionalTest/CMakeLists.txt +index cc6b3c2..d8762f6 100644 --- a/tests/IMUTests/FunctionalTest/CMakeLists.txt +++ b/tests/IMUTests/FunctionalTest/CMakeLists.txt @@ -6,7 +6,7 @@ add_executable(imu_ft imu_ft.cpp) @@ -408,6 +409,7 @@ diff --git a/tests/IMUTests/FunctionalTest/CMakeLists.txt b/tests/IMUTests/Funct k4a_add_tests(TARGET imu_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) diff --git a/tests/Transformation/CMakeLists.txt b/tests/Transformation/CMakeLists.txt +index 7f11a2f..c4ddaf8 100644 --- a/tests/Transformation/CMakeLists.txt +++ b/tests/Transformation/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -422,6 +424,7 @@ diff --git a/tests/Transformation/CMakeLists.txt b/tests/Transformation/CMakeLis k4ainternal::transformation k4ainternal::utcommon diff --git a/tests/UnitTests/allocator_ut/CMakeLists.txt b/tests/UnitTests/allocator_ut/CMakeLists.txt +index 913a7d8..0b7baeb 100644 --- a/tests/UnitTests/allocator_ut/CMakeLists.txt +++ b/tests/UnitTests/allocator_ut/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -436,6 +439,7 @@ diff --git a/tests/UnitTests/allocator_ut/CMakeLists.txt b/tests/UnitTests/alloc k4ainternal::image k4ainternal::utcommon) diff --git a/tests/UnitTests/dynlib_ut/CMakeLists.txt b/tests/UnitTests/dynlib_ut/CMakeLists.txt +index fbecc17..af73be2 100644 --- a/tests/UnitTests/dynlib_ut/CMakeLists.txt +++ b/tests/UnitTests/dynlib_ut/CMakeLists.txt @@ -34,7 +34,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") @@ -448,6 +452,7 @@ diff --git a/tests/UnitTests/dynlib_ut/CMakeLists.txt b/tests/UnitTests/dynlib_u k4ainternal::utcommon) diff --git a/tests/UnitTests/queue_ut/CMakeLists.txt b/tests/UnitTests/queue_ut/CMakeLists.txt +index cf9b040..ec4a024 100644 --- a/tests/UnitTests/queue_ut/CMakeLists.txt +++ b/tests/UnitTests/queue_ut/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -462,6 +467,7 @@ diff --git a/tests/UnitTests/queue_ut/CMakeLists.txt b/tests/UnitTests/queue_ut/ k4ainternal::image k4ainternal::queue diff --git a/tests/UnitTests/utcommon/CMakeLists.txt b/tests/UnitTests/utcommon/CMakeLists.txt +index cca52c6..dfdd13d 100644 --- a/tests/UnitTests/utcommon/CMakeLists.txt +++ b/tests/UnitTests/utcommon/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -476,6 +482,7 @@ diff --git a/tests/UnitTests/utcommon/CMakeLists.txt b/tests/UnitTests/utcommon/ ) diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt +index 3305a1a..be0b667 100644 --- a/tests/example/CMakeLists.txt +++ b/tests/example/CMakeLists.txt @@ -3,6 +3,6 @@ @@ -487,6 +494,7 @@ diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt k4a_add_tests(TARGET k4a_example_test HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) diff --git a/tests/executables/CMakeLists.txt b/tests/executables/CMakeLists.txt +index 7b03d15..6c070ee 100644 --- a/tests/executables/CMakeLists.txt +++ b/tests/executables/CMakeLists.txt @@ -17,12 +17,12 @@ target_compile_definitions(executables_ft_custom PRIVATE -DUSE_CUSTOM_TEST_CONFI @@ -505,6 +513,7 @@ diff --git a/tests/executables/CMakeLists.txt b/tests/executables/CMakeLists.txt k4a_add_tests(TARGET executables_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) k4a_add_tests(TARGET executables_ft_custom HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL_CUSTOM) diff --git a/tests/global/CMakeLists.txt b/tests/global/CMakeLists.txt +index ea0a0e5..d85728d 100644 --- a/tests/global/CMakeLists.txt +++ b/tests/global/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -519,6 +528,7 @@ diff --git a/tests/global/CMakeLists.txt b/tests/global/CMakeLists.txt k4ainternal::utcommon) diff --git a/tests/multidevice/CMakeLists.txt b/tests/multidevice/CMakeLists.txt +index 3fe044b..85f3058 100644 --- a/tests/multidevice/CMakeLists.txt +++ b/tests/multidevice/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -533,6 +543,7 @@ diff --git a/tests/multidevice/CMakeLists.txt b/tests/multidevice/CMakeLists.txt k4ainternal::utcommon) diff --git a/tests/projections/cpp/CMakeLists.txt b/tests/projections/cpp/CMakeLists.txt +index 2fdfa2c..09b5303 100644 --- a/tests/projections/cpp/CMakeLists.txt +++ b/tests/projections/cpp/CMakeLists.txt @@ -6,6 +6,6 @@ add_executable(cpp_projection_ft cpp_projection_ft.cpp) @@ -544,6 +555,7 @@ diff --git a/tests/projections/cpp/CMakeLists.txt b/tests/projections/cpp/CMakeL k4a_add_tests(TARGET cpp_projection_ft HARDWARE_REQUIRED TEST_TYPE FUNCTIONAL) diff --git a/tests/rwlock/CMakeLists.txt b/tests/rwlock/CMakeLists.txt +index 5889435..c6c1f73 100644 --- a/tests/rwlock/CMakeLists.txt +++ b/tests/rwlock/CMakeLists.txt @@ -4,8 +4,8 @@ @@ -558,6 +570,7 @@ diff --git a/tests/rwlock/CMakeLists.txt b/tests/rwlock/CMakeLists.txt k4ainternal::utcommon) diff --git a/tests/throughput/CMakeLists.txt b/tests/throughput/CMakeLists.txt +index c544e1e..9489bf8 100644 --- a/tests/throughput/CMakeLists.txt +++ b/tests/throughput/CMakeLists.txt @@ -6,8 +6,8 @@ add_executable(throughput_perf throughput_perf.cpp) @@ -572,14 +585,12 @@ diff --git a/tests/throughput/CMakeLists.txt b/tests/throughput/CMakeLists.txt k4ainternal::logging k4ainternal::utcommon) diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt +index 98578c0..6ab38d9 100644 --- a/tools/k4aviewer/CMakeLists.txt +++ b/tools/k4aviewer/CMakeLists.txt -@@ -58,12 +58,13 @@ set(EXTERNAL_LIBRARIES - k4a::k4a - k4a::k4arecord +@@ -60,10 +60,11 @@ set(EXTERNAL_LIBRARIES imgui::imgui -- libjpeg-turbo::libjpeg-turbo -+ ${JPEG_LIBRARIES} + libjpeg-turbo::libjpeg-turbo libsoundio::libsoundio - LibUSB::LibUSB - libyuv::libyuv @@ -593,6 +604,7 @@ diff --git a/tools/k4aviewer/CMakeLists.txt b/tools/k4aviewer/CMakeLists.txt # On Windows, we need to call into setupapi to get USB container ID information diff --git a/tools/k4aviewer/k4aaudiomanager.cpp b/tools/k4aviewer/k4aaudiomanager.cpp +index 243c800..ef85d45 100644 --- a/tools/k4aviewer/k4aaudiomanager.cpp +++ b/tools/k4aviewer/k4aaudiomanager.cpp @@ -11,7 +11,7 @@ diff --git a/ports/azure-kinect-sensor-sdk/fix-uvc.patch b/ports/azure-kinect-sensor-sdk/fix-uvc.patch deleted file mode 100644 index d9eaa9c1e06c56..00000000000000 --- a/ports/azure-kinect-sensor-sdk/fix-uvc.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 672f6e2..555cb8f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -109,19 +109,23 @@ find_library(JPEG_TURBO turbojpeg REQUIRED) - find_package(Matroska CONFIG REQUIRED) - add_definitions(-DMATROSKA_VERSION=2) - find_package(libsoundio CONFIG REQUIRED) --find_package(libusb CONFIG REQUIRED) --find_package(libuvc CONFIG REQUIRED) -+if (NOT WIN32) -+ find_package(libusb CONFIG REQUIRED) -+ find_package(libuvc CONFIG REQUIRED) -+ add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) -+ find_package(OpenSSL REQUIRED) -+ find_package(ZLIB REQUIRED) -+ add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED) -+ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR}) -+ set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES}) -+else() -+ find_library(LibUSB libusb-1.0 REQUIRED) -+endif() - find_package(libyuv CONFIG REQUIRED) - find_package(spdlog CONFIG REQUIRED) --find_package(OpenSSL REQUIRED) --find_package(ZLIB REQUIRED) - if (BUILD_TOOLS) - find_package(gl3w CONFIG REQUIRED) - endif() --add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic) --add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED) --set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR}) --set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES}) - # add jpeg-turbo library to jpeg libraries. - set(JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_TURBO}) - # Fix embl error diff --git a/ports/azure-kinect-sensor-sdk/portfile.cmake b/ports/azure-kinect-sensor-sdk/portfile.cmake index 5255481b406981..bffcf83e8fd725 100644 --- a/ports/azure-kinect-sensor-sdk/portfile.cmake +++ b/ports/azure-kinect-sensor-sdk/portfile.cmake @@ -8,9 +8,7 @@ vcpkg_from_github( PATCHES fix-builds.patch fix-dependency-imgui.patch - add-MATROSKA_VERSION-define.patch fix-linux.patch - fix-uvc.patch fix-calibration-c.patch ) diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index 4226c5adf4d6cc..d54e59d4faefbd 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 1, + "port-version": 2, "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", "supports": "!osx", diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL deleted file mode 100644 index dd1c189875712c..00000000000000 --- a/ports/libjpeg-turbo/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: libjpeg-turbo -Version: 2.0.6 -Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo -Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems. - -Feature: jpeg7 -Description: Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) - -Feature: jpeg8 -Description: Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 302530c38568f7..98446fdbcfae21 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -33,8 +33,9 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - jpeg7 WITH_JPEG7 - jpeg8 WITH_JPEG8 + FEATURES + jpeg7 WITH_JPEG7 + jpeg8 WITH_JPEG8 ) vcpkg_configure_cmake( @@ -48,7 +49,10 @@ vcpkg_configure_cmake( -DWITH_CRT_DLL=${WITH_CRT_DLL} ${FEATURE_OPTIONS} ${LIBJPEGTURBO_SIMD} - OPTIONS_DEBUG -DINSTALL_HEADERS=OFF + OPTIONS_DEBUG + -DINSTALL_HEADERS=OFF + MAYBE_UNUSED_VARIABLES + WITH_CRT_DLL ) vcpkg_install_cmake() @@ -60,23 +64,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") - endif() endif() -set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libjpeg.pc") -if(EXISTS "${_file}" AND VCPKG_TARGET_IS_WINDOWS) - vcpkg_replace_string("${_file}" "-ljpeg" "-ljpegd") -endif() - vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake index 5b0dae6c774f32..22f0ab92e50dea 100644 --- a/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake +++ b/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake @@ -1,3 +1,14 @@ +find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) +find_library(JPEG_LIBRARY_RELEASE NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(JPEG_LIBRARY_DEBUG NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +if(NOT JPEG_INCLUDE_DIR OR NOT JPEG_LIBRARY_RELEASE OR (NOT JPEG_LIBRARY_DEBUG AND EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib")) + message(FATAL_ERROR "Broken installation of vcpkg port libjpeg-turbo") +endif() +if(CMAKE_VERSION VERSION_LESS 3.12) + include(SelectLibraryConfigurations) + select_library_configurations(JPEG) + unset(JPEG_FOUND) +endif() _find_package(${ARGS}) if(JPEG_FOUND AND NOT TARGET JPEG::JPEG) # Backfill JPEG::JPEG to versions of cmake before 3.12 diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json new file mode 100644 index 00000000000000..043a0c4e9fefb0 --- /dev/null +++ b/ports/libjpeg-turbo/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libjpeg-turbo", + "version": "2.0.6", + "port-version": 1, + "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", + "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", + "features": { + "jpeg7": { + "description": "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)" + }, + "jpeg8": { + "description": "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)" + } + } +} diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 12f10ca85f24fb..53b81468fc402f 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "012a033caf02486f3079b0c42036a807f3a7c4d7", + "version": "1.4.1", + "port-version": 2 + }, { "git-tree": "dc7fdf585419fadcd96b13a800c4323b098256cd", "version": "1.4.1", diff --git a/versions/baseline.json b/versions/baseline.json index 3c8e19aa22418d..74d0b7d063ea05 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -290,7 +290,7 @@ }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 1 + "port-version": 2 }, "azure-macro-utils-c": { "baseline": "2020-06-17", @@ -3362,7 +3362,7 @@ }, "libjpeg-turbo": { "baseline": "2.0.6", - "port-version": 0 + "port-version": 1 }, "libjuice": { "baseline": "0.8.4", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 6bcdc411f77f4e..2d771d855d6436 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88d4315ae4daa0619554d0465564beee0a688d71", + "version": "2.0.6", + "port-version": 1 + }, { "git-tree": "42aed1a37d04ecdc437a4f52c6dd71740339f478", "version-string": "2.0.6", From afa74713e03ab7ab80154b37d0cbe6b55a75e833 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 8 Sep 2021 15:43:23 -0700 Subject: [PATCH 0491/1858] [azure-core-cpp] Update to 1.2.1 (#19943) ## 1.2.1 (2021-09-02) ### Bugs Fixed - [2785](https://github.com/Azure/azure-sdk-for-cpp/issues/2785) Fix to build on g++ 5.5. ### Other Changes - Fixed compilation error on POSIX platforms where OpenSSL was not available. - Support CMake version 3.12 Co-authored-by: Billy Robert O'Neal III --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 3 +-- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index b94807690bc4cf..2a5471e3e1d012 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.2.0 - SHA512 03297bcb54156730a35467bfd1591d07c0ef131c6183ac97f98ab845f32103cd930bb99e0fee2f334f64dceece866ec0c5e9c4ad91c96299c6fb08537a863983 + REF azure-core_1.2.1 + SHA512 3628c4845eb1a842a06339a606fba8ae127f3744a097cc3ecd7552a052b9c932e0a008f8654a4affde68c483be38678a1728bf19d644c6ee04b2cd34f1513b32 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index 732480c8376ed5..b2dd3697330fb1 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,13 +1,12 @@ { "name": "azure-core-cpp", - "version-semver": "1.2.0", + "version-semver": "1.2.1", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." ], "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/core/azure-core", "license": "MIT", - "builtin-baseline": "14c54c49b56a964ac7f2f701a6857adb02ae1bec", "dependencies": [ { "name": "openssl", diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 2dd5f7e20c4d00..64ca6f6d91cc4f 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "842ba2028c1b8b50de96e7c27e85959889778ab0", + "version-semver": "1.2.1", + "port-version": 0 + }, { "git-tree": "68831f9976e41448ebf74ead081d41ce09042c38", "version-semver": "1.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 74d0b7d063ea05..6b066b815a9d4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -277,7 +277,7 @@ "port-version": 1 }, "azure-core-cpp": { - "baseline": "1.2.0", + "baseline": "1.2.1", "port-version": 0 }, "azure-identity-cpp": { From 7c233defc81d577f4886a5dcbd00a74c0c38b651 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 9 Sep 2021 01:24:04 -0700 Subject: [PATCH 0492/1858] Bulk convert control files. (#19986) ``` function Convert-Control { Param($full) .\vcpkg.exe format-manifest $full $root = $full.Substring(0, $full.Length - 7) # CONTROL $new = $root + 'vcpkg.json' $content = Get-Content -Raw $new $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100 $oldVersion = $asJson['port-version'] if ($null -eq $oldVersion) { $oldVersionFull = $asJson['version-string'] Write-Host "Got version $oldVersionFull" $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$') if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) { $newFullVersion = [string]$match.Groups[1].Value $oldVersion = [int]$match.Groups[2].Value Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion" $newVersion = $oldVersion + 1 $asJson['version-string'] = $newFullVersion Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion" } else { Write-Host "No previous version for $full -- setting 1" $newVersion = 1 } } else { $newVersion = [int]$oldVersion + 1 Write-Host "New version for $full : $newVersion" } $asJson['port-version'] = $newVersion $content = ConvertTo-Json $asJson -Depth 100 Set-Content -Path $new -Value $content .\vcpkg.exe format-manifest $new } Get-ChildItem ports\CONTROL -Recurse | Foreach-Object { Convert-Control $_.FullName } git commit -am "this message" .\vcpkg.exe x-add-version -all git commit -a --amend ``` --- ports/7zip/CONTROL | 6 - ports/7zip/vcpkg.json | 8 + ports/absent/CONTROL | 4 - ports/absent/vcpkg.json | 7 + ports/ace/CONTROL | 22 - ports/ace/vcpkg.json | 30 + ports/activemq-cpp/CONTROL | 5 - ports/activemq-cpp/vcpkg.json | 10 + ports/ade/CONTROL | 4 - ports/ade/vcpkg.json | 6 + ports/akali/CONTROL | 6 - ports/akali/vcpkg.json | 8 + ports/alac-decoder/CONTROL | 5 - ports/alac-decoder/vcpkg.json | 7 + ports/alac/CONTROL | 5 - ports/alac/vcpkg.json | 8 + ports/aliyun-oss-c-sdk/CONTROL | 5 - ports/aliyun-oss-c-sdk/vcpkg.json | 11 + ports/ampl-asl/CONTROL | 5 - ports/ampl-asl/vcpkg.json | 8 + ports/anax/CONTROL | 4 - ports/anax/vcpkg.json | 7 + ports/antlr4/CONTROL | 6 - ports/antlr4/vcpkg.json | 14 + ports/apr-util/CONTROL | 6 - ports/apr-util/vcpkg.json | 12 + ports/arb/CONTROL | 5 - ports/arb/vcpkg.json | 10 + ports/argagg/CONTROL | 3 - ports/argagg/vcpkg.json | 6 + ports/argh/CONTROL | 3 - ports/argh/vcpkg.json | 6 + ports/argtable2/CONTROL | 6 - ports/argtable2/vcpkg.json | 8 + ports/argumentum/CONTROL | 4 - ports/argumentum/vcpkg.json | 7 + ports/asmjit/CONTROL | 5 - ports/asmjit/vcpkg.json | 8 + ports/assimp/CONTROL | 6 - ports/assimp/vcpkg.json | 18 + ports/asynch/CONTROL | 4 - ports/asynch/vcpkg.json | 7 + ports/asyncplusplus/CONTROL | 4 - ports/asyncplusplus/vcpkg.json | 7 + ports/atlmfc/CONTROL | 4 - ports/atlmfc/vcpkg.json | 7 + ports/aurora/CONTROL | 4 - ports/aurora/vcpkg.json | 7 + ports/autobahn/CONTROL | 5 - ports/autobahn/vcpkg.json | 13 + ports/avro-c/CONTROL | 6 - ports/avro-c/vcpkg.json | 14 + ports/aws-c-common/CONTROL | 6 - ports/aws-c-common/vcpkg.json | 8 + ports/aws-c-event-stream/CONTROL | 4 - ports/aws-c-event-stream/vcpkg.json | 10 + ports/aws-checksums/CONTROL | 5 - ports/aws-checksums/vcpkg.json | 10 + ports/aws-lambda-cpp/CONTROL | 5 - ports/aws-lambda-cpp/vcpkg.json | 10 + ports/azmq/CONTROL | 7 - ports/azmq/vcpkg.json | 30 + ports/azure-c-shared-utility/CONTROL | 11 - ports/azure-c-shared-utility/vcpkg.json | 47 + ports/azure-macro-utils-c/CONTROL | 7 - ports/azure-macro-utils-c/vcpkg.json | 11 + ports/azure-storage-cpp/CONTROL | 8 - ports/azure-storage-cpp/vcpkg.json | 41 + ports/azure-uamqp-c/CONTROL | 9 - ports/azure-uamqp-c/vcpkg.json | 37 + ports/azure-uhttp-c/CONTROL | 9 - ports/azure-uhttp-c/vcpkg.json | 37 + ports/azure-umqtt-c/CONTROL | 9 - ports/azure-umqtt-c/vcpkg.json | 37 + ports/basisu/CONTROL | 6 - ports/basisu/vcpkg.json | 10 + ports/bde/CONTROL | 5 - ports/bde/vcpkg.json | 7 + ports/bdwgc/CONTROL | 3 - ports/bdwgc/vcpkg.json | 6 + ports/beast/CONTROL | 5 - ports/beast/vcpkg.json | 10 + ports/bento4/CONTROL | 5 - ports/bento4/vcpkg.json | 7 + ports/berkeleydb/CONTROL | 6 - ports/berkeleydb/vcpkg.json | 8 + ports/bigint/CONTROL | 5 - ports/bigint/vcpkg.json | 7 + ports/binn/CONTROL | 3 - ports/binn/vcpkg.json | 6 + ports/bitmagic/CONTROL | 4 - ports/bitmagic/vcpkg.json | 7 + ports/bitserializer-cpprestjson/CONTROL | 4 - ports/bitserializer-cpprestjson/vcpkg.json | 14 + ports/bitserializer-pugixml/CONTROL | 4 - ports/bitserializer-pugixml/vcpkg.json | 14 + ports/bitserializer-rapidjson/CONTROL | 4 - ports/bitserializer-rapidjson/vcpkg.json | 14 + ports/bitserializer-rapidyaml/CONTROL | 5 - ports/bitserializer-rapidyaml/vcpkg.json | 15 + ports/bitsery/CONTROL | 4 - ports/bitsery/vcpkg.json | 7 + ports/blas/CONTROL | 4 - ports/blas/vcpkg.json | 9 + ports/blaze/CONTROL | 6 - ports/blaze/vcpkg.json | 11 + ports/blitz/CONTROL | 5 - ports/blitz/vcpkg.json | 8 + ports/blosc/CONTROL | 5 - ports/blosc/vcpkg.json | 13 + ports/breakpad/CONTROL | 6 - ports/breakpad/vcpkg.json | 10 + ports/brigand/CONTROL | 6 - ports/brigand/vcpkg.json | 10 + ports/brotli/CONTROL | 5 - ports/brotli/vcpkg.json | 7 + ports/brpc/CONTROL | 6 - ports/brpc/vcpkg.json | 21 + ports/brunocodutra-metal/CONTROL | 3 - ports/brunocodutra-metal/vcpkg.json | 6 + ports/brynet/CONTROL | 4 - ports/brynet/vcpkg.json | 7 + ports/bustache/CONTROL | 5 - ports/bustache/vcpkg.json | 11 + ports/butteraugli/CONTROL | 5 - ports/butteraugli/vcpkg.json | 11 + ports/byte-lite/CONTROL | 3 - ports/byte-lite/vcpkg.json | 6 + ports/caffe2/CONTROL | 6 - ports/caffe2/vcpkg.json | 15 + ports/camport3/CONTROL | 5 - ports/camport3/vcpkg.json | 8 + ports/capnproto/CONTROL | 7 - ports/capnproto/vcpkg.json | 11 + ports/casclib/CONTROL | 4 - ports/casclib/vcpkg.json | 9 + ports/catch-classic/CONTROL | 6 - ports/catch-classic/vcpkg.json | 11 + ports/catch/CONTROL | 4 - ports/catch/vcpkg.json | 9 + ports/cccapstone/CONTROL | 5 - ports/cccapstone/vcpkg.json | 10 + ports/ccd/CONTROL | 5 - ports/ccd/vcpkg.json | 7 + ports/cctz/CONTROL | 5 - ports/cctz/vcpkg.json | 10 + ports/celero/CONTROL | 4 - ports/celero/vcpkg.json | 7 + ports/cello/CONTROL | 4 - ports/cello/vcpkg.json | 7 + ports/cereal/CONTROL | 4 - ports/cereal/vcpkg.json | 7 + ports/cgicc/CONTROL | 4 - ports/cgicc/vcpkg.json | 7 + ports/cgl/CONTROL | 5 - ports/cgl/vcpkg.json | 12 + ports/cgltf/CONTROL | 4 - ports/cgltf/vcpkg.json | 7 + ports/chaiscript/CONTROL | 4 - ports/chaiscript/vcpkg.json | 7 + ports/charls/CONTROL | 4 - ports/charls/vcpkg.json | 7 + ports/check/CONTROL | 4 - ports/check/vcpkg.json | 7 + ports/chipmunk/CONTROL | 5 - ports/chipmunk/vcpkg.json | 7 + ports/chmlib/CONTROL | 4 - ports/chmlib/vcpkg.json | 7 + ports/chromium-base/CONTROL | 6 - ports/chromium-base/vcpkg.json | 8 + ports/cimg/CONTROL | 4 - ports/cimg/vcpkg.json | 7 + ports/cityhash/CONTROL | 4 - ports/cityhash/vcpkg.json | 7 + ports/clara/CONTROL | 4 - ports/clara/vcpkg.json | 7 + ports/clblas/CONTROL | 4 - ports/clblas/vcpkg.json | 9 + ports/clblast/CONTROL | 4 - ports/clblast/vcpkg.json | 9 + ports/clfft/CONTROL | 5 - ports/clfft/vcpkg.json | 10 + ports/clickhouse-cpp/CONTROL | 5 - ports/clickhouse-cpp/vcpkg.json | 11 + ports/clipp/CONTROL | 3 - ports/clipp/vcpkg.json | 6 + ports/clockutils/CONTROL | 4 - ports/clockutils/vcpkg.json | 7 + ports/clp/CONTROL | 4 - ports/clp/vcpkg.json | 10 + ports/clrng/CONTROL | 6 - ports/clrng/vcpkg.json | 11 + ports/cmark/CONTROL | 3 - ports/cmark/vcpkg.json | 6 + ports/cmcstl2/CONTROL | 4 - ports/cmcstl2/vcpkg.json | 7 + ports/coin/CONTROL | 32 - ports/coin/vcpkg.json | 65 + ports/coinutils/CONTROL | 3 - ports/coinutils/vcpkg.json | 6 + ports/collada-dom/CONTROL | 6 - ports/collada-dom/vcpkg.json | 16 + ports/console-bridge/CONTROL | 5 - ports/console-bridge/vcpkg.json | 7 + ports/constexpr-contracts/CONTROL | 4 - ports/constexpr-contracts/vcpkg.json | 7 + ports/constexpr/CONTROL | 4 - ports/constexpr/vcpkg.json | 7 + ports/cpp-netlib/CONTROL | 7 - ports/cpp-netlib/vcpkg.json | 17 + ports/cpp-peglib/CONTROL | 3 - ports/cpp-peglib/vcpkg.json | 6 + ports/cpp-redis/CONTROL | 5 - ports/cpp-redis/vcpkg.json | 10 + ports/cpp-taskflow/CONTROL | 5 - ports/cpp-taskflow/vcpkg.json | 10 + ports/cppad/CONTROL | 5 - ports/cppad/vcpkg.json | 8 + ports/cppcms/CONTROL | 7 - ports/cppcms/vcpkg.json | 14 + ports/cppcodec/CONTROL | 3 - ports/cppcodec/vcpkg.json | 6 + ports/cppcoro/CONTROL | 5 - ports/cppcoro/vcpkg.json | 8 + ports/cppfs/CONTROL | 8 - ports/cppfs/vcpkg.json | 17 + ports/cppitertools/CONTROL | 5 - ports/cppitertools/vcpkg.json | 10 + ports/cppkafka/CONTROL | 5 - ports/cppkafka/vcpkg.json | 11 + ports/cppmicroservices/CONTROL | 6 - ports/cppmicroservices/vcpkg.json | 10 + ports/cpptoml/CONTROL | 3 - ports/cpptoml/vcpkg.json | 6 + ports/cpputest/CONTROL | 4 - ports/cpputest/vcpkg.json | 7 + ports/cpuid/CONTROL | 5 - ports/cpuid/vcpkg.json | 8 + ports/cr/CONTROL | 4 - ports/cr/vcpkg.json | 7 + ports/crashpad/CONTROL | 7 - ports/crashpad/vcpkg.json | 14 + ports/crc32c/CONTROL | 4 - ports/crc32c/vcpkg.json | 7 + ports/croncpp/CONTROL | 5 - ports/croncpp/vcpkg.json | 7 + ports/crossguid/CONTROL | 4 - ports/crossguid/vcpkg.json | 12 + ports/cryptopp/CONTROL | 7 - ports/cryptopp/vcpkg.json | 12 + ports/cspice/CONTROL | 5 - ports/cspice/vcpkg.json | 7 + ports/ctbignum/CONTROL | 6 - ports/ctbignum/vcpkg.json | 10 + ports/ctemplate/CONTROL | 4 - ports/ctemplate/vcpkg.json | 7 + ports/ctp/CONTROL | 8 - ports/ctp/vcpkg.json | 12 + ports/cuda/CONTROL | 5 - ports/cuda/vcpkg.json | 7 + ports/cunit/CONTROL | 4 - ports/cunit/vcpkg.json | 7 + ports/curlpp/CONTROL | 4 - ports/curlpp/vcpkg.json | 9 + ports/cute-headers/CONTROL | 4 - ports/cute-headers/vcpkg.json | 7 + ports/cutelyst2/CONTROL | 4 - ports/cutelyst2/vcpkg.json | 12 + ports/cxxopts/CONTROL | 4 - ports/cxxopts/vcpkg.json | 7 + ports/darts-clone/CONTROL | 3 - ports/darts-clone/vcpkg.json | 6 + ports/dataframe/CONTROL | 5 - ports/dataframe/vcpkg.json | 8 + ports/date/CONTROL | 9 - ports/date/vcpkg.json | 15 + ports/dbg-macro/CONTROL | 4 - ports/dbg-macro/vcpkg.json | 7 + ports/dbghelp/CONTROL | 4 - ports/dbghelp/vcpkg.json | 7 + ports/dbow2/CONTROL | 5 - ports/dbow2/vcpkg.json | 10 + ports/dbow3/CONTROL | 4 - ports/dbow3/vcpkg.json | 14 + ports/dcmtk/CONTROL | 3 - ports/dcmtk/vcpkg.json | 6 + ports/decimal-for-cpp/CONTROL | 5 - ports/decimal-for-cpp/vcpkg.json | 6 + ports/detours/CONTROL | 5 - ports/detours/vcpkg.json | 7 + ports/devicenameresolver/CONTROL | 3 - ports/devicenameresolver/vcpkg.json | 6 + ports/dimcli/CONTROL | 4 - ports/dimcli/vcpkg.json | 7 + ports/dirent/CONTROL | 4 - ports/dirent/vcpkg.json | 7 + ports/discord-game-sdk/CONTROL | 5 - ports/discord-game-sdk/vcpkg.json | 8 + ports/discord-rpc/CONTROL | 5 - ports/discord-rpc/vcpkg.json | 10 + ports/discount/CONTROL | 4 - ports/discount/vcpkg.json | 7 + ports/discreture/CONTROL | 5 - ports/discreture/vcpkg.json | 11 + ports/distorm/CONTROL | 3 - ports/distorm/vcpkg.json | 6 + ports/dlfcn-win32/CONTROL | 4 - ports/dlfcn-win32/vcpkg.json | 7 + ports/docopt/CONTROL | 3 - ports/docopt/vcpkg.json | 6 + ports/doctest/CONTROL | 4 - ports/doctest/vcpkg.json | 7 + ports/double-conversion/CONTROL | 4 - ports/double-conversion/vcpkg.json | 7 + ports/dpdk/CONTROL | 4 - ports/dpdk/vcpkg.json | 7 + ports/drlibs/CONTROL | 4 - ports/drlibs/vcpkg.json | 7 + ports/dtl/CONTROL | 3 - ports/dtl/vcpkg.json | 6 + ports/duckx/CONTROL | 4 - ports/duckx/vcpkg.json | 7 + ports/duilib/CONTROL | 5 - ports/duilib/vcpkg.json | 7 + ports/duktape/CONTROL | 5 - ports/duktape/vcpkg.json | 7 + ports/dx/CONTROL | 4 - ports/dx/vcpkg.json | 7 + ports/easycl/CONTROL | 5 - ports/easycl/vcpkg.json | 10 + ports/easyloggingpp/CONTROL | 3 - ports/easyloggingpp/vcpkg.json | 6 + ports/eathread/CONTROL | 5 - ports/eathread/vcpkg.json | 11 + ports/ebml/CONTROL | 5 - ports/ebml/vcpkg.json | 8 + ports/ecsutil/CONTROL | 6 - ports/ecsutil/vcpkg.json | 14 + ports/edlib/CONTROL | 4 - ports/edlib/vcpkg.json | 7 + ports/effolkronium-random/CONTROL | 3 - ports/effolkronium-random/vcpkg.json | 6 + ports/efsw/CONTROL | 6 - ports/efsw/vcpkg.json | 8 + ports/egl-registry/CONTROL | 4 - ports/egl-registry/vcpkg.json | 7 + ports/eigen3/CONTROL | 4 - ports/eigen3/vcpkg.json | 7 + ports/elfutils/CONTROL | 6 - ports/elfutils/vcpkg.json | 14 + ports/entityx/CONTROL | 4 - ports/entityx/vcpkg.json | 7 + ports/epsilon/CONTROL | 5 - ports/epsilon/vcpkg.json | 10 + ports/esaxx/CONTROL | 3 - ports/esaxx/vcpkg.json | 6 + ports/evpp/CONTROL | 6 - ports/evpp/vcpkg.json | 30 + ports/expected-lite/CONTROL | 3 - ports/expected-lite/vcpkg.json | 6 + ports/exprtk/CONTROL | 4 - ports/exprtk/vcpkg.json | 7 + ports/faad2/CONTROL | 8 - ports/faad2/vcpkg.json | 12 + ports/fadbad/CONTROL | 4 - ports/fadbad/vcpkg.json | 7 + ports/farmhash/CONTROL | 6 - ports/farmhash/vcpkg.json | 8 + ports/fast-cpp-csv-parser/CONTROL | 4 - ports/fast-cpp-csv-parser/vcpkg.json | 7 + ports/fastcgi/CONTROL | 4 - ports/fastcgi/vcpkg.json | 7 + ports/fastfeat/CONTROL | 3 - ports/fastfeat/vcpkg.json | 6 + ports/fastrtps/CONTROL | 5 - ports/fastrtps/vcpkg.json | 14 + ports/fcl/CONTROL | 5 - ports/fcl/vcpkg.json | 12 + ports/fdlibm/CONTROL | 3 - ports/fdlibm/vcpkg.json | 6 + ports/ffnvcodec/CONTROL | 6 - ports/ffnvcodec/vcpkg.json | 8 + ports/fftwpp/CONTROL | 5 - ports/fftwpp/vcpkg.json | 10 + ports/field3d/CONTROL | 7 - ports/field3d/vcpkg.json | 20 + ports/fixed-string/CONTROL | 4 - ports/fixed-string/vcpkg.json | 7 + ports/flatbuffers/CONTROL | 5 - ports/flatbuffers/vcpkg.json | 10 + ports/flint/CONTROL | 5 - ports/flint/vcpkg.json | 13 + ports/fluidlite/CONTROL | 4 - ports/fluidlite/vcpkg.json | 7 + ports/fmem/CONTROL | 3 - ports/fmem/vcpkg.json | 6 + ports/fmi4cpp/CONTROL | 15 - ports/fmi4cpp/vcpkg.json | 31 + ports/fmilib/CONTROL | 5 - ports/fmilib/vcpkg.json | 7 + ports/font-chef/CONTROL | 4 - ports/font-chef/vcpkg.json | 7 + ports/fontconfig/CONTROL | 6 - ports/fontconfig/vcpkg.json | 20 + ports/foonathan-memory/CONTROL | 8 - ports/foonathan-memory/vcpkg.json | 15 + ports/freeglut/CONTROL | 5 - ports/freeglut/vcpkg.json | 7 + ports/freeimage/CONTROL | 6 - ports/freeimage/vcpkg.json | 21 + ports/freeopcua/CONTROL | 4 - ports/freeopcua/vcpkg.json | 17 + ports/freetype-gl/CONTROL | 5 - ports/freetype-gl/vcpkg.json | 11 + ports/fribidi/CONTROL | 6 - ports/fribidi/vcpkg.json | 10 + ports/fruit/CONTROL | 4 - ports/fruit/vcpkg.json | 7 + ports/ftgl/CONTROL | 7 - ports/ftgl/vcpkg.json | 15 + ports/function2/CONTROL | 4 - ports/function2/vcpkg.json | 7 + ports/fuzzylite/CONTROL | 5 - ports/fuzzylite/vcpkg.json | 7 + ports/g2o/CONTROL | 6 - ports/g2o/vcpkg.json | 13 + ports/gainput/CONTROL | 4 - ports/gainput/vcpkg.json | 7 + ports/gamma/CONTROL | 6 - ports/gamma/vcpkg.json | 11 + ports/gasol/CONTROL | 4 - ports/gasol/vcpkg.json | 7 + ports/gaussianlib/CONTROL | 4 - ports/gaussianlib/vcpkg.json | 7 + ports/gcem/CONTROL | 3 - ports/gcem/vcpkg.json | 6 + ports/gdcm/CONTROL | 7 - ports/gdcm/vcpkg.json | 13 + ports/gdcm2/CONTROL | 5 - ports/gdcm2/vcpkg.json | 10 + ports/genann/CONTROL | 4 - ports/genann/vcpkg.json | 7 + ports/geogram/CONTROL | 11 - ports/geogram/vcpkg.json | 20 + ports/getdns/CONTROL | 14 - ports/getdns/vcpkg.json | 26 + ports/getopt/CONTROL | 5 - ports/getopt/vcpkg.json | 13 + ports/gettimeofday/CONTROL | 3 - ports/gettimeofday/vcpkg.json | 6 + ports/gflags/CONTROL | 6 - ports/gflags/vcpkg.json | 8 + ports/gherkin-c/CONTROL | 3 - ports/gherkin-c/vcpkg.json | 6 + ports/gl2ps/CONTROL | 5 - ports/gl2ps/vcpkg.json | 12 + ports/glog/CONTROL | 5 - ports/glog/vcpkg.json | 10 + ports/glui/CONTROL | 5 - ports/glui/vcpkg.json | 10 + ports/gmmlib/CONTROL | 4 - ports/gmmlib/vcpkg.json | 7 + ports/google-cloud-cpp-common/CONTROL | 4 - ports/google-cloud-cpp-common/vcpkg.json | 9 + ports/google-cloud-cpp-spanner/CONTROL | 4 - ports/google-cloud-cpp-spanner/vcpkg.json | 9 + ports/googleapis/CONTROL | 4 - ports/googleapis/vcpkg.json | 9 + ports/gperf/CONTROL | 4 - ports/gperf/vcpkg.json | 7 + ports/gperftools/CONTROL | 11 - ports/gperftools/vcpkg.json | 16 + ports/gpgme/CONTROL | 10 - ports/gpgme/vcpkg.json | 20 + ports/graphicsmagick/CONTROL | 5 - ports/graphicsmagick/vcpkg.json | 15 + ports/graphite2/CONTROL | 5 - ports/graphite2/vcpkg.json | 10 + ports/greatest/CONTROL | 4 - ports/greatest/vcpkg.json | 7 + ports/grppi/CONTROL | 4 - ports/grppi/vcpkg.json | 7 + ports/gsl/CONTROL | 5 - ports/gsl/vcpkg.json | 7 + ports/guetzli/CONTROL | 5 - ports/guetzli/vcpkg.json | 11 + ports/gumbo/CONTROL | 4 - ports/gumbo/vcpkg.json | 7 + ports/gzip-hpp/CONTROL | 5 - ports/gzip-hpp/vcpkg.json | 10 + ports/h5py-lzf/CONTROL | 5 - ports/h5py-lzf/vcpkg.json | 10 + ports/hayai/CONTROL | 4 - ports/hayai/vcpkg.json | 7 + ports/healpix/CONTROL | 7 - ports/healpix/vcpkg.json | 11 + ports/hffix/CONTROL | 4 - ports/hffix/vcpkg.json | 7 + ports/hfsm2/CONTROL | 5 - ports/hfsm2/vcpkg.json | 10 + ports/http-parser/CONTROL | 4 - ports/http-parser/vcpkg.json | 7 + ports/hungarian/CONTROL | 3 - ports/hungarian/vcpkg.json | 6 + ports/hwloc/CONTROL | 6 - ports/hwloc/vcpkg.json | 11 + ports/hyperscan/CONTROL | 7 - ports/hyperscan/vcpkg.json | 31 + ports/hypre/CONTROL | 5 - ports/hypre/vcpkg.json | 12 + ports/ideviceinstaller/CONTROL | 4 - ports/ideviceinstaller/vcpkg.json | 10 + ports/idevicerestore/CONTROL | 5 - ports/idevicerestore/vcpkg.json | 13 + ports/if97/CONTROL | 4 - ports/if97/vcpkg.json | 7 + ports/igloo/CONTROL | 3 - ports/igloo/vcpkg.json | 6 + ports/ignition-cmake0/CONTROL | 7 - ports/ignition-cmake0/vcpkg.json | 10 + ports/ignition-common1/CONTROL | 4 - ports/ignition-common1/vcpkg.json | 30 + ports/ignition-common3/CONTROL | 5 - ports/ignition-common3/vcpkg.json | 24 + ports/ignition-fuel-tools1/CONTROL | 4 - ports/ignition-fuel-tools1/vcpkg.json | 14 + ports/ignition-fuel-tools4/CONTROL | 5 - ports/ignition-fuel-tools4/vcpkg.json | 18 + ports/ignition-math4/CONTROL | 5 - ports/ignition-math4/vcpkg.json | 10 + ports/ignition-math6/CONTROL | 5 - ports/ignition-math6/vcpkg.json | 12 + ports/ignition-modularscripts/CONTROL | 3 - ports/ignition-modularscripts/vcpkg.json | 6 + ports/ignition-msgs1/CONTROL | 5 - ports/ignition-msgs1/vcpkg.json | 11 + ports/ignition-msgs5/CONTROL | 6 - ports/ignition-msgs5/vcpkg.json | 14 + ports/ignition-msgs6/CONTROL | 6 - ports/ignition-msgs6/vcpkg.json | 14 + ports/ignition-plugin1/CONTROL | 5 - ports/ignition-plugin1/vcpkg.json | 15 + ports/ignition-transport4/CONTROL | 4 - ports/ignition-transport4/vcpkg.json | 18 + ports/ignition-transport8/CONTROL | 4 - ports/ignition-transport8/vcpkg.json | 18 + ports/ignition-transport9/CONTROL | 4 - ports/ignition-transport9/vcpkg.json | 18 + ports/ilmbase/CONTROL | 4 - ports/ilmbase/vcpkg.json | 9 + ports/imgui-sfml/CONTROL | 5 - ports/imgui-sfml/vcpkg.json | 12 + ports/inih/CONTROL | 3 - ports/inih/vcpkg.json | 6 + ports/iniparser/CONTROL | 4 - ports/iniparser/vcpkg.json | 7 + ports/intel-ipsec/CONTROL | 3 - ports/intel-ipsec/vcpkg.json | 6 + ports/intelrdfpmathlib/CONTROL | 3 - ports/intelrdfpmathlib/vcpkg.json | 6 + ports/irrlicht/CONTROL | 16 - ports/irrlicht/vcpkg.json | 27 + ports/isal/CONTROL | 4 - ports/isal/vcpkg.json | 6 + ports/ismrmrd/CONTROL | 5 - ports/ismrmrd/vcpkg.json | 13 + ports/jansson/CONTROL | 4 - ports/jansson/vcpkg.json | 7 + ports/jbig2dec/CONTROL | 4 - ports/jbig2dec/vcpkg.json | 7 + ports/jbigkit/CONTROL | 4 - ports/jbigkit/vcpkg.json | 7 + ports/jemalloc/CONTROL | 5 - ports/jemalloc/vcpkg.json | 7 + ports/jinja2cpplight/CONTROL | 5 - ports/jinja2cpplight/vcpkg.json | 8 + ports/josuttis-jthread/CONTROL | 5 - ports/josuttis-jthread/vcpkg.json | 7 + ports/jsmn/CONTROL | 3 - ports/jsmn/vcpkg.json | 6 + ports/json-c/CONTROL | 5 - ports/json-c/vcpkg.json | 7 + ports/json-schema-validator/CONTROL | 5 - ports/json-schema-validator/vcpkg.json | 13 + ports/json-spirit/CONTROL | 4 - ports/json-spirit/vcpkg.json | 13 + ports/json11/CONTROL | 3 - ports/json11/vcpkg.json | 6 + ports/json5-parser/CONTROL | 6 - ports/json5-parser/vcpkg.json | 10 + ports/jsoncons/CONTROL | 4 - ports/jsoncons/vcpkg.json | 7 + ports/jsoncpp/CONTROL | 4 - ports/jsoncpp/vcpkg.json | 7 + ports/jsonnet/CONTROL | 6 - ports/jsonnet/vcpkg.json | 10 + ports/kangaru/CONTROL | 3 - ports/kangaru/vcpkg.json | 6 + ports/kcp/CONTROL | 4 - ports/kcp/vcpkg.json | 7 + ports/kd-soap/CONTROL | 5 - ports/kd-soap/vcpkg.json | 13 + ports/kfr/CONTROL | 15 - ports/kfr/vcpkg.json | 27 + ports/kinectsdk2/CONTROL | 4 - ports/kinectsdk2/vcpkg.json | 7 + ports/kissfft/CONTROL | 4 - ports/kissfft/vcpkg.json | 7 + ports/kubazip/CONTROL | 4 - ports/kubazip/vcpkg.json | 7 + ports/kuku/CONTROL | 4 - ports/kuku/vcpkg.json | 7 + ports/kvasir-mpl/CONTROL | 8 - ports/kvasir-mpl/vcpkg.json | 12 + ports/lapack/CONTROL | 5 - ports/lapack/vcpkg.json | 16 + ports/lastools/CONTROL | 5 - ports/lastools/vcpkg.json | 8 + ports/lazy-importer/CONTROL | 4 - ports/lazy-importer/vcpkg.json | 7 + ports/lcms/CONTROL | 4 - ports/lcms/vcpkg.json | 7 + ports/lemon/CONTROL | 4 - ports/lemon/vcpkg.json | 9 + ports/leptonica/CONTROL | 6 - ports/leptonica/vcpkg.json | 16 + ports/lerc/CONTROL | 5 - ports/lerc/vcpkg.json | 7 + ports/lest/CONTROL | 5 - ports/lest/vcpkg.json | 7 + ports/leveldb/CONTROL | 5 - ports/leveldb/vcpkg.json | 8 + ports/libaaplus/CONTROL | 7 - ports/libaaplus/vcpkg.json | 12 + ports/libaiff/CONTROL | 4 - ports/libaiff/vcpkg.json | 7 + ports/libassuan/CONTROL | 7 - ports/libassuan/vcpkg.json | 11 + ports/libbf/CONTROL | 3 - ports/libbf/vcpkg.json | 6 + ports/libcds/CONTROL | 5 - ports/libcds/vcpkg.json | 11 + ports/libcerf/CONTROL | 4 - ports/libcerf/vcpkg.json | 7 + ports/libconfig/CONTROL | 5 - ports/libconfig/vcpkg.json | 7 + ports/libconfuse/CONTROL | 4 - ports/libconfuse/vcpkg.json | 7 + ports/libcuckoo/CONTROL | 4 - ports/libcuckoo/vcpkg.json | 7 + ports/libdatrie/CONTROL | 5 - ports/libdatrie/vcpkg.json | 10 + ports/libde265/CONTROL | 5 - ports/libde265/vcpkg.json | 8 + ports/libdisasm/CONTROL | 4 - ports/libdisasm/vcpkg.json | 7 + ports/libdivide/CONTROL | 7 - ports/libdivide/vcpkg.json | 12 + ports/libdshowcapture/CONTROL | 3 - ports/libdshowcapture/vcpkg.json | 6 + ports/libevent/CONTROL | 14 - ports/libevent/vcpkg.json | 28 + ports/libevhtp/CONTROL | 16 - ports/libevhtp/vcpkg.json | 27 + ports/libexif/CONTROL | 5 - ports/libexif/vcpkg.json | 8 + ports/libfabric/CONTROL | 6 - ports/libfabric/vcpkg.json | 14 + ports/libflac/CONTROL | 9 - ports/libflac/vcpkg.json | 15 + ports/libfreenect2/CONTROL | 15 - ports/libfreenect2/vcpkg.json | 29 + ports/libftdi/CONTROL | 4 - ports/libftdi/vcpkg.json | 9 + ports/libgcrypt/CONTROL | 7 - ports/libgcrypt/vcpkg.json | 11 + ports/libgd/CONTROL | 29 - ports/libgd/vcpkg.json | 53 + ports/libgeotiff/CONTROL | 6 - ports/libgeotiff/vcpkg.json | 13 + ports/libgta/CONTROL | 5 - ports/libgta/vcpkg.json | 12 + ports/libguarded/CONTROL | 4 - ports/libguarded/vcpkg.json | 7 + ports/libhdfs3/CONTROL | 5 - ports/libhdfs3/vcpkg.json | 13 + ports/libhydrogen/CONTROL | 4 - ports/libhydrogen/vcpkg.json | 7 + ports/libideviceactivation/CONTROL | 4 - ports/libideviceactivation/vcpkg.json | 12 + ports/libigl/CONTROL | 27 - ports/libigl/vcpkg.json | 66 + ports/libilbc/CONTROL | 5 - ports/libilbc/vcpkg.json | 8 + ports/libimobiledevice/CONTROL | 6 - ports/libimobiledevice/vcpkg.json | 14 + ports/libirecovery/CONTROL | 4 - ports/libirecovery/vcpkg.json | 11 + ports/libjpeg-turbo/vcpkg.json | 2 +- ports/libkml/CONTROL | 6 - ports/libkml/vcpkg.json | 19 + ports/liblas/CONTROL | 13 - ports/liblas/vcpkg.json | 29 + ports/liblbfgs/CONTROL | 4 - ports/liblbfgs/vcpkg.json | 7 + ports/liblemon/CONTROL | 4 - ports/liblemon/vcpkg.json | 7 + ports/liblsl/CONTROL | 7 - ports/liblsl/vcpkg.json | 11 + ports/libmad/CONTROL | 4 - ports/libmad/vcpkg.json | 7 + ports/libmaxminddb/CONTROL | 4 - ports/libmaxminddb/vcpkg.json | 7 + ports/libmesh/CONTROL | 4 - ports/libmesh/vcpkg.json | 7 + ports/libmikmod/CONTROL | 5 - ports/libmikmod/vcpkg.json | 10 + ports/libmodman/CONTROL | 8 - ports/libmodman/vcpkg.json | 15 + ports/libmorton/CONTROL | 3 - ports/libmorton/vcpkg.json | 6 + ports/libmpeg2/CONTROL | 8 - ports/libmpeg2/vcpkg.json | 13 + ports/libmspack/CONTROL | 4 - ports/libmspack/vcpkg.json | 7 + ports/libnoise/CONTROL | 5 - ports/libnoise/vcpkg.json | 7 + ports/libodb-boost/CONTROL | 5 - ports/libodb-boost/vcpkg.json | 9 + ports/libodb-pgsql/CONTROL | 6 - ports/libodb-pgsql/vcpkg.json | 11 + ports/libodb-sqlite/CONTROL | 6 - ports/libodb-sqlite/vcpkg.json | 11 + ports/libp7-baical/CONTROL | 4 - ports/libp7-baical/vcpkg.json | 9 + ports/libp7client/CONTROL | 5 - ports/libp7client/vcpkg.json | 8 + ports/libpff/CONTROL | 4 - ports/libpff/vcpkg.json | 9 + ports/libpopt/CONTROL | 3 - ports/libpopt/vcpkg.json | 6 + ports/libproxy/CONTROL | 26 - ports/libproxy/vcpkg.json | 33 + ports/libqcow/CONTROL | 6 - ports/libqcow/vcpkg.json | 13 + ports/libqglviewer/CONTROL | 4 - ports/libqglviewer/vcpkg.json | 12 + ports/librabbitmq/CONTROL | 5 - ports/librabbitmq/vcpkg.json | 10 + ports/libraqm/CONTROL | 5 - ports/libraqm/vcpkg.json | 11 + ports/libraw/CONTROL | 5 - ports/libraw/vcpkg.json | 11 + ports/librdkafka/CONTROL | 23 - ports/librdkafka/vcpkg.json | 36 + ports/libsass/CONTROL | 7 - ports/libsass/vcpkg.json | 8 + ports/libsbml/CONTROL | 49 - ports/libsbml/vcpkg.json | 72 + ports/libspatialite/CONTROL | 6 - ports/libspatialite/vcpkg.json | 17 + ports/libspnav/CONTROL | 5 - ports/libspnav/vcpkg.json | 8 + ports/libsquish/CONTROL | 4 - ports/libsquish/vcpkg.json | 7 + ports/libsrt/CONTROL | 8 - ports/libsrt/vcpkg.json | 19 + ports/libsrtp/CONTROL | 3 - ports/libsrtp/vcpkg.json | 6 + ports/libssh/CONTROL | 24 - ports/libssh/vcpkg.json | 62 + ports/libssh2/CONTROL | 5 - ports/libssh2/vcpkg.json | 11 + ports/libstemmer/CONTROL | 4 - ports/libstemmer/vcpkg.json | 7 + ports/libstk/CONTROL | 3 - ports/libstk/vcpkg.json | 6 + ports/libtheora/CONTROL | 6 - ports/libtheora/vcpkg.json | 10 + ports/libtins/CONTROL | 4 - ports/libtins/vcpkg.json | 14 + ports/libtomcrypt/CONTROL | 5 - ports/libtomcrypt/vcpkg.json | 10 + ports/libtommath/CONTROL | 4 - ports/libtommath/vcpkg.json | 7 + ports/libu2f-server/CONTROL | 7 - ports/libu2f-server/vcpkg.json | 12 + ports/libudns/CONTROL | 4 - ports/libudns/vcpkg.json | 7 + ports/libunibreak/CONTROL | 4 - ports/libunibreak/vcpkg.json | 7 + ports/libusb-win32/CONTROL | 5 - ports/libusb-win32/vcpkg.json | 8 + ports/libusbmuxd/CONTROL | 5 - ports/libusbmuxd/vcpkg.json | 10 + ports/libuvc/CONTROL | 6 - ports/libuvc/vcpkg.json | 11 + ports/libvmdk/CONTROL | 6 - ports/libvmdk/vcpkg.json | 12 + ports/libwandio/CONTROL | 7 - ports/libwandio/vcpkg.json | 18 + ports/libwebm/CONTROL | 5 - ports/libwebm/vcpkg.json | 7 + ports/libwebp/CONTROL | 59 - ports/libwebp/vcpkg.json | 145 ++ ports/libxdiff/CONTROL | 5 - ports/libxdiff/vcpkg.json | 8 + ports/libxmlmm/CONTROL | 5 - ports/libxmlmm/vcpkg.json | 10 + ports/libxmp-lite/CONTROL | 4 - ports/libxmp-lite/vcpkg.json | 7 + ports/libyaml/CONTROL | 4 - ports/libyaml/vcpkg.json | 7 + ports/libzen/CONTROL | 3 - ports/libzen/vcpkg.json | 6 + ports/libzippp/CONTROL | 8 - ports/libzippp/vcpkg.json | 22 + ports/licensepp/CONTROL | 7 - ports/licensepp/vcpkg.json | 16 + ports/linalg/CONTROL | 3 - ports/linalg/vcpkg.json | 6 + ports/linenoise-ng/CONTROL | 3 - ports/linenoise-ng/vcpkg.json | 6 + ports/live555/CONTROL | 5 - ports/live555/vcpkg.json | 10 + ports/llfio/CONTROL | 12 - ports/llfio/vcpkg.json | 19 + ports/llgl/CONTROL | 12 - ports/llgl/vcpkg.json | 16 + ports/lmdb/CONTROL | 4 - ports/lmdb/vcpkg.json | 7 + ports/log4cplus/CONTROL | 9 - ports/log4cplus/vcpkg.json | 15 + ports/log4cpp/CONTROL | 6 - ports/log4cpp/vcpkg.json | 8 + ports/log4cxx/CONTROL | 7 - ports/log4cxx/vcpkg.json | 13 + ports/loguru/CONTROL | 4 - ports/loguru/vcpkg.json | 7 + ports/lpeg/CONTROL | 5 - ports/lpeg/vcpkg.json | 10 + ports/luabridge/CONTROL | 3 - ports/luabridge/vcpkg.json | 6 + ports/luafilesystem/CONTROL | 5 - ports/luafilesystem/vcpkg.json | 10 + ports/luajit/CONTROL | 5 - ports/luajit/vcpkg.json | 8 + ports/luasocket/CONTROL | 5 - ports/luasocket/vcpkg.json | 10 + ports/lz4/CONTROL | 5 - ports/lz4/vcpkg.json | 10 + ports/lzfse/CONTROL | 5 - ports/lzfse/vcpkg.json | 8 + ports/lzo/CONTROL | 5 - ports/lzo/vcpkg.json | 7 + ports/magic-enum/CONTROL | 4 - ports/magic-enum/vcpkg.json | 7 + ports/magnum-extras/CONTROL | 9 - ports/magnum-extras/vcpkg.json | 32 + ports/magnum-integration/CONTROL | 27 - ports/magnum-integration/vcpkg.json | 39 + ports/magnum-plugins/CONTROL | 125 -- ports/magnum-plugins/vcpkg.json | 411 ++++ ports/magnum/CONTROL | 175 -- ports/magnum/vcpkg.json | 529 +++++ ports/mapbox-variant/CONTROL | 3 - ports/mapbox-variant/vcpkg.json | 6 + ports/mathc/CONTROL | 4 - ports/mathc/vcpkg.json | 7 + ports/mathgl/CONTROL | 48 - ports/mathgl/vcpkg.json | 80 + ports/matplotlib-cpp/CONTROL | 4 - ports/matplotlib-cpp/vcpkg.json | 7 + ports/matroska/CONTROL | 6 - ports/matroska/vcpkg.json | 11 + ports/mbedtls/CONTROL | 10 - ports/mbedtls/vcpkg.json | 19 + ports/mcpp/CONTROL | 5 - ports/mcpp/vcpkg.json | 7 + ports/mdnsresponder/CONTROL | 6 - ports/mdnsresponder/vcpkg.json | 8 + ports/mecab/CONTROL | 5 - ports/mecab/vcpkg.json | 7 + ports/memorymodule/CONTROL | 8 - ports/memorymodule/vcpkg.json | 15 + ports/meschach/CONTROL | 4 - ports/meschach/vcpkg.json | 7 + ports/meshoptimizer/CONTROL | 5 - ports/meshoptimizer/vcpkg.json | 7 + ports/metis/CONTROL | 5 - ports/metis/vcpkg.json | 7 + ports/mgnlibs/CONTROL | 4 - ports/mgnlibs/vcpkg.json | 7 + ports/mhook/CONTROL | 3 - ports/mhook/vcpkg.json | 6 + ports/microsoft-signalr/CONTROL | 18 - ports/microsoft-signalr/vcpkg.json | 42 + ports/mikktspace/CONTROL | 4 - ports/mikktspace/vcpkg.json | 7 + ports/milerius-sfml-imgui/CONTROL | 4 - ports/milerius-sfml-imgui/vcpkg.json | 10 + ports/mimalloc/CONTROL | 14 - ports/mimalloc/vcpkg.json | 19 + ports/minc/CONTROL | 10 - ports/minc/vcpkg.json | 26 + ports/minhook/CONTROL | 5 - ports/minhook/vcpkg.json | 7 + ports/minifb/CONTROL | 5 - ports/minifb/vcpkg.json | 8 + ports/minimp3/CONTROL | 4 - ports/minimp3/vcpkg.json | 7 + ports/minisat-master-keying/CONTROL | 5 - ports/minisat-master-keying/vcpkg.json | 10 + ports/minitrace/CONTROL | 3 - ports/minitrace/vcpkg.json | 6 + ports/miniupnpc/CONTROL | 3 - ports/miniupnpc/vcpkg.json | 6 + ports/miniz/CONTROL | 4 - ports/miniz/vcpkg.json | 7 + ports/mio/CONTROL | 3 - ports/mio/vcpkg.json | 6 + ports/mman/CONTROL | 4 - ports/mman/vcpkg.json | 7 + ports/mmx/CONTROL | 4 - ports/mmx/vcpkg.json | 7 + ports/modp-base64/CONTROL | 3 - ports/modp-base64/vcpkg.json | 6 + ports/mongo-cxx-driver/CONTROL | 18 - ports/mongo-cxx-driver/vcpkg.json | 28 + ports/monkeys-audio/CONTROL | 9 - ports/monkeys-audio/vcpkg.json | 16 + ports/moos-core/CONTROL | 5 - ports/moos-core/vcpkg.json | 7 + ports/moos-essential/CONTROL | 5 - ports/moos-essential/vcpkg.json | 10 + ports/moos-ui/CONTROL | 5 - ports/moos-ui/vcpkg.json | 10 + ports/morton-nd/CONTROL | 4 - ports/morton-nd/vcpkg.json | 7 + ports/mozjpeg/CONTROL | 6 - ports/mozjpeg/vcpkg.json | 10 + ports/mp-units/CONTROL | 5 - ports/mp-units/vcpkg.json | 11 + ports/mp3lame/CONTROL | 5 - ports/mp3lame/vcpkg.json | 7 + ports/mpark-variant/CONTROL | 3 - ports/mpark-variant/vcpkg.json | 6 + ports/mpc/CONTROL | 5 - ports/mpc/vcpkg.json | 11 + ports/mpfr/CONTROL | 5 - ports/mpfr/vcpkg.json | 10 + ports/mpi/CONTROL | 4 - ports/mpi/vcpkg.json | 16 + ports/mpmcqueue/CONTROL | 4 - ports/mpmcqueue/vcpkg.json | 7 + ports/mqtt-cpp/CONTROL | 5 - ports/mqtt-cpp/vcpkg.json | 14 + ports/ms-angle/CONTROL | 4 - ports/ms-angle/vcpkg.json | 9 + ports/ms-gsl/CONTROL | 4 - ports/ms-gsl/vcpkg.json | 7 + ports/msgpack/CONTROL | 4 - ports/msgpack/vcpkg.json | 7 + ports/msinttypes/CONTROL | 4 - ports/msinttypes/vcpkg.json | 7 + ports/mstch/CONTROL | 5 - ports/mstch/vcpkg.json | 10 + ports/mujs/CONTROL | 4 - ports/mujs/vcpkg.json | 7 + ports/munit/CONTROL | 7 - ports/munit/vcpkg.json | 11 + ports/muparser/CONTROL | 5 - ports/muparser/vcpkg.json | 8 + ports/murmurhash/CONTROL | 4 - ports/murmurhash/vcpkg.json | 7 + ports/mygui/CONTROL | 9 - ports/mygui/vcpkg.json | 19 + ports/nameof/CONTROL | 4 - ports/nameof/vcpkg.json | 7 + ports/nano-signal-slot/CONTROL | 5 - ports/nano-signal-slot/vcpkg.json | 8 + ports/nanobench/CONTROL | 4 - ports/nanobench/vcpkg.json | 7 + ports/nanoflann/CONTROL | 4 - ports/nanoflann/vcpkg.json | 7 + ports/nanogui/CONTROL | 7 - ports/nanogui/vcpkg.json | 13 + ports/nanomsg/CONTROL | 7 - ports/nanomsg/vcpkg.json | 14 + ports/nanoprintf/CONTROL | 4 - ports/nanoprintf/vcpkg.json | 7 + ports/nanorange/CONTROL | 3 - ports/nanorange/vcpkg.json | 6 + ports/nanort/CONTROL | 4 - ports/nanort/vcpkg.json | 7 + ports/nanovg/CONTROL | 5 - ports/nanovg/vcpkg.json | 10 + ports/neargye-semver/CONTROL | 4 - ports/neargye-semver/vcpkg.json | 7 + ports/ned14-internal-quickcpplib/CONTROL | 5 - ports/ned14-internal-quickcpplib/vcpkg.json | 11 + ports/netcdf-cxx4/CONTROL | 6 - ports/netcdf-cxx4/vcpkg.json | 11 + ports/nethost/CONTROL | 4 - ports/nethost/vcpkg.json | 7 + ports/networkdirect-sdk/CONTROL | 6 - ports/networkdirect-sdk/vcpkg.json | 8 + ports/nifticlib/CONTROL | 25 - ports/nifticlib/vcpkg.json | 35 + ports/nlohmann-fifo-map/CONTROL | 4 - ports/nlohmann-fifo-map/vcpkg.json | 7 + ports/nmslib/CONTROL | 5 - ports/nmslib/vcpkg.json | 8 + ports/nngpp/CONTROL | 6 - ports/nngpp/vcpkg.json | 10 + ports/nonius/CONTROL | 4 - ports/nonius/vcpkg.json | 11 + ports/nrf-ble-driver/CONTROL | 4 - ports/nrf-ble-driver/vcpkg.json | 12 + ports/nt-wrapper/CONTROL | 4 - ports/nt-wrapper/vcpkg.json | 7 + ports/numactl/CONTROL | 3 - ports/numactl/vcpkg.json | 6 + ports/nvtt/CONTROL | 7 - ports/nvtt/vcpkg.json | 11 + ports/observer-ptr-lite/CONTROL | 3 - ports/observer-ptr-lite/vcpkg.json | 6 + ports/octomap/CONTROL | 4 - ports/octomap/vcpkg.json | 7 + ports/ode/CONTROL | 4 - ports/ode/vcpkg.json | 7 + ports/offscale-libetcd-cpp/CONTROL | 5 - ports/offscale-libetcd-cpp/vcpkg.json | 11 + ports/ogdf/CONTROL | 5 - ports/ogdf/vcpkg.json | 7 + ports/ogre-next/CONTROL | 18 - ports/ogre-next/vcpkg.json | 38 + ports/ompl/CONTROL | 6 - ports/ompl/vcpkg.json | 20 + ports/oniguruma/CONTROL | 7 - ports/oniguruma/vcpkg.json | 12 + ports/opencascade/CONTROL | 14 - ports/opencascade/vcpkg.json | 24 + ports/opencc/CONTROL | 9 - ports/opencc/vcpkg.json | 13 + ports/opencensus-cpp/CONTROL | 9 - ports/opencensus-cpp/vcpkg.json | 16 + ports/opencl/CONTROL | 6 - ports/opencl/vcpkg.json | 8 + ports/opencsg/CONTROL | 4 - ports/opencsg/vcpkg.json | 9 + ports/opengl-registry/CONTROL | 5 - ports/opengl-registry/vcpkg.json | 10 + ports/opengl/CONTROL | 4 - ports/opengl/vcpkg.json | 6 + ports/openigtlink/CONTROL | 5 - ports/openigtlink/vcpkg.json | 7 + ports/openmesh/CONTROL | 3 - ports/openmesh/vcpkg.json | 6 + ports/openmpi/CONTROL | 5 - ports/openmpi/vcpkg.json | 8 + ports/openmvs/CONTROL | 13 - ports/openmvs/vcpkg.json | 43 + ports/openni2/CONTROL | 6 - ports/openni2/vcpkg.json | 11 + ports/openscap/CONTROL | 18 - ports/openscap/vcpkg.json | 39 + ports/openssl-unix/CONTROL | 6 - ports/openssl-unix/vcpkg.json | 10 + ports/openssl-uwp/CONTROL | 6 - ports/openssl-uwp/vcpkg.json | 10 + ports/openssl-windows/CONTROL | 6 - ports/openssl-windows/vcpkg.json | 10 + ports/openvpn3/CONTROL | 4 - ports/openvpn3/vcpkg.json | 14 + ports/openvr/CONTROL | 5 - ports/openvr/vcpkg.json | 8 + ports/openxr-loader/CONTROL | 10 - ports/openxr-loader/vcpkg.json | 18 + ports/optional-bare/CONTROL | 3 - ports/optional-bare/vcpkg.json | 6 + ports/optional-lite/CONTROL | 3 - ports/optional-lite/vcpkg.json | 6 + ports/opus/CONTROL | 8 - ports/opus/vcpkg.json | 12 + ports/opusfile/CONTROL | 10 - ports/opusfile/vcpkg.json | 20 + ports/orc/CONTROL | 6 - ports/orc/vcpkg.json | 15 + ports/osg-qt/CONTROL | 5 - ports/osg-qt/vcpkg.json | 13 + ports/osg/CONTROL | 28 - ports/osg/vcpkg.json | 124 ++ ports/osi/CONTROL | 4 - ports/osi/vcpkg.json | 9 + ports/outcome/CONTROL | 9 - ports/outcome/vcpkg.json | 17 + ports/p-ranav-csv/CONTROL | 4 - ports/p-ranav-csv/vcpkg.json | 7 + ports/p-ranav-csv2/CONTROL | 4 - ports/p-ranav-csv2/vcpkg.json | 7 + ports/parallel-hashmap/CONTROL | 3 - ports/parallel-hashmap/vcpkg.json | 6 + ports/parallelstl/CONTROL | 5 - ports/parallelstl/vcpkg.json | 10 + ports/parmetis/CONTROL | 6 - ports/parmetis/vcpkg.json | 11 + ports/parquet/CONTROL | 4 - ports/parquet/vcpkg.json | 9 + ports/parson/CONTROL | 3 - ports/parson/vcpkg.json | 6 + ports/pbc/CONTROL | 7 - ports/pbc/vcpkg.json | 18 + ports/pcg/CONTROL | 3 - ports/pcg/vcpkg.json | 6 + ports/pdal-c/CONTROL | 4 - ports/pdal-c/vcpkg.json | 9 + ports/pdal/CONTROL | 5 - ports/pdal/vcpkg.json | 15 + ports/pdcurses/CONTROL | 4 - ports/pdcurses/vcpkg.json | 7 + ports/pdqsort/CONTROL | 4 - ports/pdqsort/vcpkg.json | 7 + ports/pe-parse/CONTROL | 5 - ports/pe-parse/vcpkg.json | 8 + ports/pegtl-2/CONTROL | 4 - ports/pegtl-2/vcpkg.json | 7 + ports/pegtl/CONTROL | 4 - ports/pegtl/vcpkg.json | 7 + ports/pfring/CONTROL | 5 - ports/pfring/vcpkg.json | 10 + ports/pfultz2-linq/CONTROL | 4 - ports/pfultz2-linq/vcpkg.json | 18 + ports/picojson/CONTROL | 5 - ports/picojson/vcpkg.json | 7 + ports/picosha2/CONTROL | 4 - ports/picosha2/vcpkg.json | 7 + ports/piex/CONTROL | 4 - ports/piex/vcpkg.json | 7 + ports/pixel/CONTROL | 6 - ports/pixel/vcpkg.json | 13 + ports/platform-folders/CONTROL | 4 - ports/platform-folders/vcpkg.json | 6 + ports/plf-list/CONTROL | 4 - ports/plf-list/vcpkg.json | 7 + ports/plf-nanotimer/CONTROL | 4 - ports/plf-nanotimer/vcpkg.json | 7 + ports/plf-stack/CONTROL | 4 - ports/plf-stack/vcpkg.json | 7 + ports/plib/CONTROL | 3 - ports/plib/vcpkg.json | 6 + ports/plibsys/CONTROL | 6 - ports/plibsys/vcpkg.json | 8 + ports/plog/CONTROL | 4 - ports/plog/vcpkg.json | 7 + ports/plustache/CONTROL | 4 - ports/plustache/vcpkg.json | 10 + ports/pngwriter/CONTROL | 4 - ports/pngwriter/vcpkg.json | 11 + ports/poly2tri/CONTROL | 5 - ports/poly2tri/vcpkg.json | 8 + ports/polyclipping/CONTROL | 5 - ports/polyclipping/vcpkg.json | 7 + ports/polyhook2/CONTROL | 30 - ports/polyhook2/vcpkg.json | 54 + ports/polymorphic-value/CONTROL | 4 - ports/polymorphic-value/vcpkg.json | 7 + ports/ponder/CONTROL | 4 - ports/ponder/vcpkg.json | 7 + ports/portable-snippets/CONTROL | 4 - ports/portable-snippets/vcpkg.json | 7 + ports/ppconsul/CONTROL | 5 - ports/ppconsul/vcpkg.json | 20 + ports/ppmagic/CONTROL | 4 - ports/ppmagic/vcpkg.json | 7 + ports/pprint/CONTROL | 4 - ports/pprint/vcpkg.json | 7 + ports/pqp/CONTROL | 4 - ports/pqp/vcpkg.json | 7 + ports/proj/CONTROL | 4 - ports/proj/vcpkg.json | 9 + ports/prometheus-cpp/CONTROL | 20 - ports/prometheus-cpp/vcpkg.json | 36 + ports/protobuf-c/CONTROL | 12 - ports/protobuf-c/vcpkg.json | 26 + ports/pthread/CONTROL | 4 - ports/pthread/vcpkg.json | 9 + ports/pugixml/CONTROL | 4 - ports/pugixml/vcpkg.json | 7 + ports/qca/CONTROL | 6 - ports/qca/vcpkg.json | 13 + ports/qhull/CONTROL | 5 - ports/qhull/vcpkg.json | 7 + ports/qpid-proton/CONTROL | 5 - ports/qpid-proton/vcpkg.json | 18 + ports/qt-advanced-docking-system/CONTROL | 6 - ports/qt-advanced-docking-system/vcpkg.json | 19 + ports/qt5-3d/CONTROL | 5 - ports/qt5-3d/vcpkg.json | 16 + ports/qt5-activeqt/CONTROL | 5 - ports/qt5-activeqt/vcpkg.json | 14 + ports/qt5-androidextras/CONTROL | 5 - ports/qt5-androidextras/vcpkg.json | 13 + ports/qt5-canvas3d/CONTROL | 4 - ports/qt5-canvas3d/vcpkg.json | 12 + ports/qt5-charts/CONTROL | 4 - ports/qt5-charts/vcpkg.json | 14 + ports/qt5-connectivity/CONTROL | 5 - ports/qt5-connectivity/vcpkg.json | 12 + ports/qt5-datavis3d/CONTROL | 4 - ports/qt5-datavis3d/vcpkg.json | 14 + ports/qt5-declarative/CONTROL | 4 - ports/qt5-declarative/vcpkg.json | 14 + ports/qt5-doc/CONTROL | 5 - ports/qt5-doc/vcpkg.json | 16 + ports/qt5-gamepad/CONTROL | 4 - ports/qt5-gamepad/vcpkg.json | 13 + ports/qt5-graphicaleffects/CONTROL | 4 - ports/qt5-graphicaleffects/vcpkg.json | 13 + ports/qt5-imageformats/CONTROL | 5 - ports/qt5-imageformats/vcpkg.json | 15 + ports/qt5-location/CONTROL | 4 - ports/qt5-location/vcpkg.json | 16 + ports/qt5-macextras/CONTROL | 5 - ports/qt5-macextras/vcpkg.json | 13 + ports/qt5-modularscripts/CONTROL | 3 - ports/qt5-modularscripts/vcpkg.json | 6 + ports/qt5-multimedia/CONTROL | 4 - ports/qt5-multimedia/vcpkg.json | 13 + ports/qt5-networkauth/CONTROL | 4 - ports/qt5-networkauth/vcpkg.json | 12 + ports/qt5-purchasing/CONTROL | 4 - ports/qt5-purchasing/vcpkg.json | 13 + ports/qt5-quickcontrols/CONTROL | 4 - ports/qt5-quickcontrols/vcpkg.json | 14 + ports/qt5-quickcontrols2/CONTROL | 4 - ports/qt5-quickcontrols2/vcpkg.json | 14 + ports/qt5-remoteobjects/CONTROL | 4 - ports/qt5-remoteobjects/vcpkg.json | 13 + ports/qt5-script/CONTROL | 4 - ports/qt5-script/vcpkg.json | 13 + ports/qt5-scxml/CONTROL | 4 - ports/qt5-scxml/vcpkg.json | 13 + ports/qt5-sensors/CONTROL | 4 - ports/qt5-sensors/vcpkg.json | 13 + ports/qt5-serialbus/CONTROL | 4 - ports/qt5-serialbus/vcpkg.json | 13 + ports/qt5-serialport/CONTROL | 4 - ports/qt5-serialport/vcpkg.json | 12 + ports/qt5-speech/CONTROL | 4 - ports/qt5-speech/vcpkg.json | 18 + ports/qt5-svg/CONTROL | 5 - ports/qt5-svg/vcpkg.json | 12 + ports/qt5-tools/CONTROL | 5 - ports/qt5-tools/vcpkg.json | 17 + ports/qt5-translations/CONTROL | 4 - ports/qt5-translations/vcpkg.json | 13 + ports/qt5-virtualkeyboard/CONTROL | 4 - ports/qt5-virtualkeyboard/vcpkg.json | 12 + ports/qt5-webchannel/CONTROL | 4 - ports/qt5-webchannel/vcpkg.json | 13 + ports/qt5-webengine/CONTROL | 10 - ports/qt5-webengine/vcpkg.json | 33 + ports/qt5-webglplugin/CONTROL | 4 - ports/qt5-webglplugin/vcpkg.json | 12 + ports/qt5-websockets/CONTROL | 4 - ports/qt5-websockets/vcpkg.json | 13 + ports/qt5-webview/CONTROL | 4 - ports/qt5-webview/vcpkg.json | 9 + ports/qt5-winextras/CONTROL | 5 - ports/qt5-winextras/vcpkg.json | 19 + ports/qt5-x11extras/CONTROL | 4 - ports/qt5-x11extras/vcpkg.json | 12 + ports/qt5-xmlpatterns/CONTROL | 4 - ports/qt5-xmlpatterns/vcpkg.json | 13 + ports/qt5/CONTROL | 162 -- ports/qt5/vcpkg.json | 344 +++ ports/qtkeychain/CONTROL | 5 - ports/qtkeychain/vcpkg.json | 14 + ports/quadtree/CONTROL | 4 - ports/quadtree/vcpkg.json | 7 + ports/quaternions/CONTROL | 5 - ports/quaternions/vcpkg.json | 10 + ports/quazip/CONTROL | 5 - ports/quazip/vcpkg.json | 11 + ports/quickfast/CONTROL | 5 - ports/quickfast/vcpkg.json | 11 + ports/quickfix/CONTROL | 5 - ports/quickfix/vcpkg.json | 10 + ports/qwtw/CONTROL | 6 - ports/qwtw/vcpkg.json | 23 + ports/rabit/CONTROL | 6 - ports/rabit/vcpkg.json | 11 + ports/ragel/CONTROL | 4 - ports/ragel/vcpkg.json | 7 + ports/rang/CONTROL | 3 - ports/rang/vcpkg.json | 6 + ports/range-v3-vs2015/CONTROL | 4 - ports/range-v3-vs2015/vcpkg.json | 7 + ports/range-v3/CONTROL | 4 - ports/range-v3/vcpkg.json | 7 + ports/rapidcheck/CONTROL | 4 - ports/rapidcheck/vcpkg.json | 7 + ports/rapidxml-ns/CONTROL | 3 - ports/rapidxml-ns/vcpkg.json | 6 + ports/rapidxml/CONTROL | 4 - ports/rapidxml/vcpkg.json | 7 + ports/re2/CONTROL | 4 - ports/re2/vcpkg.json | 7 + ports/readline-win32/CONTROL | 4 - ports/readline-win32/vcpkg.json | 7 + ports/readline/CONTROL | 5 - ports/readline/vcpkg.json | 13 + ports/readosm/CONTROL | 5 - ports/readosm/vcpkg.json | 11 + ports/refl-cpp/CONTROL | 4 - ports/refl-cpp/vcpkg.json | 7 + ports/refprop-headers/CONTROL | 4 - ports/refprop-headers/vcpkg.json | 7 + ports/replxx/CONTROL | 5 - ports/replxx/vcpkg.json | 8 + ports/reproc/CONTROL | 4 - ports/reproc/vcpkg.json | 7 + ports/rest-rpc/CONTROL | 6 - ports/rest-rpc/vcpkg.json | 10 + ports/restclient-cpp/CONTROL | 5 - ports/restclient-cpp/vcpkg.json | 10 + ports/rhash/CONTROL | 5 - ports/rhash/vcpkg.json | 8 + ports/riffcpp/CONTROL | 4 - ports/riffcpp/vcpkg.json | 7 + ports/ring-span-lite/CONTROL | 3 - ports/ring-span-lite/vcpkg.json | 6 + ports/roaring/CONTROL | 3 - ports/roaring/vcpkg.json | 6 + ports/rocksdb/CONTROL | 29 - ports/rocksdb/vcpkg.json | 48 + ports/rpclib/CONTROL | 5 - ports/rpclib/vcpkg.json | 7 + ports/rply/CONTROL | 4 - ports/rply/vcpkg.json | 7 + ports/rs-core-lib/CONTROL | 5 - ports/rs-core-lib/vcpkg.json | 7 + ports/rsocket/CONTROL | 6 - ports/rsocket/vcpkg.json | 23 + ports/rtlsdr/CONTROL | 6 - ports/rtlsdr/vcpkg.json | 15 + ports/rttr/CONTROL | 5 - ports/rttr/vcpkg.json | 10 + ports/rxcpp/CONTROL | 4 - ports/rxcpp/vcpkg.json | 7 + ports/rxqt/CONTROL | 5 - ports/rxqt/vcpkg.json | 10 + ports/sais/CONTROL | 3 - ports/sais/vcpkg.json | 6 + ports/sajson/CONTROL | 3 - ports/sajson/vcpkg.json | 6 + ports/sassc/CONTROL | 6 - ports/sassc/vcpkg.json | 11 + ports/sciter/CONTROL | 8 - ports/sciter/vcpkg.json | 13 + ports/scnlib/CONTROL | 4 - ports/scnlib/vcpkg.json | 7 + ports/scylla-wrapper/CONTROL | 4 - ports/scylla-wrapper/vcpkg.json | 9 + ports/sdformat10/CONTROL | 6 - ports/sdformat10/vcpkg.json | 13 + ports/sdformat9/CONTROL | 6 - ports/sdformat9/vcpkg.json | 13 + ports/sdl1-net/CONTROL | 4 - ports/sdl1-net/vcpkg.json | 9 + ports/sdl1/CONTROL | 5 - ports/sdl1/vcpkg.json | 7 + ports/sdl2-gfx/CONTROL | 5 - ports/sdl2-gfx/vcpkg.json | 9 + ports/sdl2-image/CONTROL | 18 - ports/sdl2-image/vcpkg.json | 31 + ports/sdl2-net/CONTROL | 5 - ports/sdl2-net/vcpkg.json | 10 + ports/sdl2-ttf/CONTROL | 5 - ports/sdl2-ttf/vcpkg.json | 11 + ports/sdl2pp/CONTROL | 5 - ports/sdl2pp/vcpkg.json | 13 + ports/secp256k1/CONTROL | 5 - ports/secp256k1/vcpkg.json | 7 + ports/septag-sx/CONTROL | 4 - ports/septag-sx/vcpkg.json | 7 + ports/seqan/CONTROL | 3 - ports/seqan/vcpkg.json | 6 + ports/sf2cute/CONTROL | 6 - ports/sf2cute/vcpkg.json | 11 + ports/sfgui/CONTROL | 5 - ports/sfgui/vcpkg.json | 10 + ports/sfsexp/CONTROL | 4 - ports/sfsexp/vcpkg.json | 7 + ports/shapelib/CONTROL | 4 - ports/shapelib/vcpkg.json | 7 + ports/shiva-sfml/CONTROL | 4 - ports/shiva-sfml/vcpkg.json | 13 + ports/shiva/CONTROL | 5 - ports/shiva/vcpkg.json | 22 + ports/shogun/CONTROL | 6 - ports/shogun/vcpkg.json | 22 + ports/signalrclient/CONTROL | 6 - ports/signalrclient/vcpkg.json | 17 + ports/sigslot/CONTROL | 3 - ports/sigslot/vcpkg.json | 6 + ports/simde/CONTROL | 4 - ports/simde/vcpkg.json | 7 + ports/simple-fft/CONTROL | 4 - ports/simple-fft/vcpkg.json | 7 + ports/simpleini/CONTROL | 4 - ports/simpleini/vcpkg.json | 7 + ports/skia/CONTROL | 12 - ports/skia/vcpkg.json | 35 + ports/skyr-url/CONTROL | 5 - ports/skyr-url/vcpkg.json | 12 + ports/smpeg2/CONTROL | 5 - ports/smpeg2/vcpkg.json | 10 + ports/snappy/CONTROL | 4 - ports/snappy/vcpkg.json | 7 + ports/sndfile/CONTROL | 9 - ports/sndfile/vcpkg.json | 25 + ports/snowhouse/CONTROL | 3 - ports/snowhouse/vcpkg.json | 6 + ports/sockpp/CONTROL | 5 - ports/sockpp/vcpkg.json | 8 + ports/sokol/CONTROL | 4 - ports/sokol/vcpkg.json | 7 + ports/sol2/CONTROL | 5 - ports/sol2/vcpkg.json | 13 + ports/solid3/CONTROL | 3 - ports/solid3/vcpkg.json | 6 + ports/soqt/CONTROL | 7 - ports/soqt/vcpkg.json | 15 + ports/soundtouch/CONTROL | 6 - ports/soundtouch/vcpkg.json | 14 + ports/soxr/CONTROL | 5 - ports/soxr/vcpkg.json | 7 + ports/spaceland/CONTROL | 4 - ports/spaceland/vcpkg.json | 9 + ports/sparsehash/CONTROL | 4 - ports/sparsehash/vcpkg.json | 7 + ports/sparsepp/CONTROL | 3 - ports/sparsepp/vcpkg.json | 6 + ports/spatialite-tools/CONTROL | 6 - ports/spatialite-tools/vcpkg.json | 18 + ports/spdk-dpdk/CONTROL | 4 - ports/spdk-dpdk/vcpkg.json | 7 + ports/spdk-ipsec/CONTROL | 4 - ports/spdk-ipsec/vcpkg.json | 7 + ports/spdk-isal/CONTROL | 4 - ports/spdk-isal/vcpkg.json | 7 + ports/spdk/CONTROL | 6 - ports/spdk/vcpkg.json | 12 + ports/speex/CONTROL | 5 - ports/speex/vcpkg.json | 7 + ports/speexdsp/CONTROL | 5 - ports/speexdsp/vcpkg.json | 7 + ports/spirit-po/CONTROL | 5 - ports/spirit-po/vcpkg.json | 10 + ports/sprout/CONTROL | 5 - ports/sprout/vcpkg.json | 11 + ports/spscqueue/CONTROL | 4 - ports/spscqueue/vcpkg.json | 7 + ports/sqlite-modern-cpp/CONTROL | 5 - ports/sqlite-modern-cpp/vcpkg.json | 10 + ports/sqlite-orm/CONTROL | 12 - ports/sqlite-orm/vcpkg.json | 21 + ports/sqlpp11-connector-mysql/CONTROL | 14 - ports/sqlpp11-connector-mysql/vcpkg.json | 28 + ports/sqlpp11-connector-sqlite3/CONTROL | 4 - ports/sqlpp11-connector-sqlite3/vcpkg.json | 11 + ports/sqlpp11/CONTROL | 5 - ports/sqlpp11/vcpkg.json | 10 + ports/status-code/CONTROL | 4 - ports/status-code/vcpkg.json | 7 + ports/status-value-lite/CONTROL | 7 - ports/status-value-lite/vcpkg.json | 12 + ports/stb/CONTROL | 4 - ports/stb/vcpkg.json | 7 + ports/stlab/CONTROL | 6 - ports/stlab/vcpkg.json | 15 + ports/stormlib/CONTROL | 5 - ports/stormlib/vcpkg.json | 10 + ports/strict-variant/CONTROL | 3 - ports/strict-variant/vcpkg.json | 6 + ports/string-theory/CONTROL | 4 - ports/string-theory/vcpkg.json | 7 + ports/string-view-lite/CONTROL | 3 - ports/string-view-lite/vcpkg.json | 6 + ports/strtk/CONTROL | 5 - ports/strtk/vcpkg.json | 10 + ports/stx/CONTROL | 8 - ports/stx/vcpkg.json | 15 + ports/stxxl/CONTROL | 3 - ports/stxxl/vcpkg.json | 6 + ports/superlu/CONTROL | 7 - ports/superlu/vcpkg.json | 11 + ports/systemc/CONTROL | 3 - ports/systemc/vcpkg.json | 6 + ports/tabulate/CONTROL | 4 - ports/tabulate/vcpkg.json | 7 + ports/tacopie/CONTROL | 4 - ports/tacopie/vcpkg.json | 7 + ports/taocpp-json/CONTROL | 3 - ports/taocpp-json/vcpkg.json | 6 + ports/tap-windows6/CONTROL | 3 - ports/tap-windows6/vcpkg.json | 6 + ports/tbb/CONTROL | 6 - ports/tbb/vcpkg.json | 8 + ports/tcl/CONTROL | 17 - ports/tcl/vcpkg.json | 21 + ports/tclap/CONTROL | 4 - ports/tclap/vcpkg.json | 7 + ports/teemo/CONTROL | 5 - ports/teemo/vcpkg.json | 13 + ports/telnetpp/CONTROL | 11 - ports/telnetpp/vcpkg.json | 27 + ports/tgbot-cpp/CONTROL | 5 - ports/tgbot-cpp/vcpkg.json | 19 + ports/tgc/CONTROL | 4 - ports/tgc/vcpkg.json | 7 + ports/theia/CONTROL | 6 - ports/theia/vcpkg.json | 23 + ports/think-cell-range/CONTROL | 5 - ports/think-cell-range/vcpkg.json | 10 + ports/threadpool/CONTROL | 6 - ports/threadpool/vcpkg.json | 10 + ports/thrift/CONTROL | 5 - ports/thrift/vcpkg.json | 17 + ports/tidy-html5/CONTROL | 4 - ports/tidy-html5/vcpkg.json | 7 + ports/tinkerforge/CONTROL | 4 - ports/tinkerforge/vcpkg.json | 7 + ports/tiny-aes-c/CONTROL | 4 - ports/tiny-aes-c/vcpkg.json | 7 + ports/tiny-bignum-c/CONTROL | 4 - ports/tiny-bignum-c/vcpkg.json | 7 + ports/tiny-dnn/CONTROL | 4 - ports/tiny-dnn/vcpkg.json | 7 + ports/tiny-process-library/CONTROL | 3 - ports/tiny-process-library/vcpkg.json | 6 + ports/tiny-regex-c/CONTROL | 4 - ports/tiny-regex-c/vcpkg.json | 7 + ports/tinycthread/CONTROL | 4 - ports/tinycthread/vcpkg.json | 7 + ports/tinydir/CONTROL | 4 - ports/tinydir/vcpkg.json | 7 + ports/tinyexif/CONTROL | 5 - ports/tinyexif/vcpkg.json | 10 + ports/tinyexr/CONTROL | 4 - ports/tinyexr/vcpkg.json | 7 + ports/tinygltf/CONTROL | 6 - ports/tinygltf/vcpkg.json | 11 + ports/tinynpy/CONTROL | 4 - ports/tinynpy/vcpkg.json | 9 + ports/tinyobjloader/CONTROL | 7 - ports/tinyobjloader/vcpkg.json | 11 + ports/tinyply/CONTROL | 4 - ports/tinyply/vcpkg.json | 7 + ports/tinyspline/CONTROL | 3 - ports/tinyspline/vcpkg.json | 6 + ports/tinythread/CONTROL | 4 - ports/tinythread/vcpkg.json | 7 + ports/tinytoml/CONTROL | 4 - ports/tinytoml/vcpkg.json | 7 + ports/tinyutf8/CONTROL | 3 - ports/tinyutf8/vcpkg.json | 6 + ports/tinyxml/CONTROL | 4 - ports/tinyxml/vcpkg.json | 7 + ports/tinyxml2/CONTROL | 4 - ports/tinyxml2/vcpkg.json | 7 + ports/tl-expected/CONTROL | 3 - ports/tl-expected/vcpkg.json | 6 + ports/tl-function-ref/CONTROL | 3 - ports/tl-function-ref/vcpkg.json | 6 + ports/tl-optional/CONTROL | 3 - ports/tl-optional/vcpkg.json | 6 + ports/tlx/CONTROL | 4 - ports/tlx/vcpkg.json | 7 + ports/tmx/CONTROL | 4 - ports/tmx/vcpkg.json | 10 + ports/tmxlite/CONTROL | 3 - ports/tmxlite/vcpkg.json | 6 + ports/tmxparser/CONTROL | 4 - ports/tmxparser/vcpkg.json | 10 + ports/toml11/CONTROL | 5 - ports/toml11/vcpkg.json | 7 + ports/tomlplusplus/CONTROL | 5 - ports/tomlplusplus/vcpkg.json | 8 + ports/torch-th/CONTROL | 4 - ports/torch-th/vcpkg.json | 7 + ports/tre/CONTROL | 5 - ports/tre/vcpkg.json | 7 + ports/treehopper/CONTROL | 5 - ports/treehopper/vcpkg.json | 10 + ports/triangle/CONTROL | 5 - ports/triangle/vcpkg.json | 8 + ports/trompeloeil/CONTROL | 4 - ports/trompeloeil/vcpkg.json | 7 + ports/tsl-hopscotch-map/CONTROL | 3 - ports/tsl-hopscotch-map/vcpkg.json | 6 + ports/tsl-ordered-map/CONTROL | 3 - ports/tsl-ordered-map/vcpkg.json | 6 + ports/tsl-sparse-map/CONTROL | 3 - ports/tsl-sparse-map/vcpkg.json | 6 + ports/turbobase64/CONTROL | 4 - ports/turbobase64/vcpkg.json | 7 + ports/type-lite/CONTROL | 9 - ports/type-lite/vcpkg.json | 12 + ports/uchardet/CONTROL | 8 - ports/uchardet/vcpkg.json | 15 + ports/umock-c/CONTROL | 9 - ports/umock-c/vcpkg.json | 23 + ports/unicorn-lib/CONTROL | 5 - ports/unicorn-lib/vcpkg.json | 13 + ports/unicorn/CONTROL | 5 - ports/unicorn/vcpkg.json | 8 + ports/units/CONTROL | 4 - ports/units/vcpkg.json | 7 + ports/unixodbc/CONTROL | 6 - ports/unixodbc/vcpkg.json | 8 + ports/unrar/CONTROL | 4 - ports/unrar/vcpkg.json | 7 + ports/urdfdom-headers/CONTROL | 5 - ports/urdfdom-headers/vcpkg.json | 7 + ports/urdfdom/CONTROL | 6 - ports/urdfdom/vcpkg.json | 12 + ports/usbmuxd/CONTROL | 5 - ports/usbmuxd/vcpkg.json | 13 + ports/usd/CONTROL | 6 - ports/usd/vcpkg.json | 22 + ports/usrsctp/CONTROL | 3 - ports/usrsctp/vcpkg.json | 6 + ports/utf8h/CONTROL | 4 - ports/utf8h/vcpkg.json | 7 + ports/utfz/CONTROL | 4 - ports/utfz/vcpkg.json | 7 + ports/uthenticode/CONTROL | 6 - ports/uthenticode/vcpkg.json | 12 + ports/uvw/CONTROL | 5 - ports/uvw/vcpkg.json | 10 + ports/v-hacd/CONTROL | 13 - ports/v-hacd/vcpkg.json | 19 + ports/valijson/CONTROL | 3 - ports/valijson/vcpkg.json | 6 + ports/variant-lite/CONTROL | 3 - ports/variant-lite/vcpkg.json | 6 + ports/vc/CONTROL | 5 - ports/vc/vcpkg.json | 8 + ports/vcglib/CONTROL | 4 - ports/vcglib/vcpkg.json | 9 + ports/vcpkg-gfortran/CONTROL | 4 - ports/vcpkg-gfortran/vcpkg.json | 7 + ports/vectorclass/CONTROL | 5 - ports/vectorclass/vcpkg.json | 8 + ports/visit-struct/CONTROL | 3 - ports/visit-struct/vcpkg.json | 6 + ports/vlfeat/CONTROL | 4 - ports/vlfeat/vcpkg.json | 7 + ports/vlpp/CONTROL | 4 - ports/vlpp/vcpkg.json | 7 + ports/volk/CONTROL | 7 - ports/volk/vcpkg.json | 14 + ports/vtk-dicom/CONTROL | 9 - ports/vtk-dicom/vcpkg.json | 22 + ports/vulkan-hpp/CONTROL | 4 - ports/vulkan-hpp/vcpkg.json | 9 + ports/vulkan-memory-allocator/CONTROL | 3 - ports/vulkan-memory-allocator/vcpkg.json | 6 + ports/vulkan/CONTROL | 3 - ports/vulkan/vcpkg.json | 6 + ports/vxl/CONTROL | 8 - ports/vxl/vcpkg.json | 21 + ports/wampcc/CONTROL | 10 - ports/wampcc/vcpkg.json | 19 + ports/wavpack/CONTROL | 6 - ports/wavpack/vcpkg.json | 8 + ports/wg21-sg14/CONTROL | 4 - ports/wg21-sg14/vcpkg.json | 7 + ports/wil/CONTROL | 4 - ports/wil/vcpkg.json | 7 + ports/wildmidi/CONTROL | 4 - ports/wildmidi/vcpkg.json | 7 + ports/wincrypt/CONTROL | 3 - ports/wincrypt/vcpkg.json | 6 + ports/winpcap/CONTROL | 5 - ports/winpcap/vcpkg.json | 7 + ports/winreg/CONTROL | 5 - ports/winreg/vcpkg.json | 8 + ports/winsock2/CONTROL | 3 - ports/winsock2/vcpkg.json | 6 + ports/wintoast/CONTROL | 4 - ports/wintoast/vcpkg.json | 7 + ports/woff2/CONTROL | 5 - ports/woff2/vcpkg.json | 9 + ports/wordnet/CONTROL | 6 - ports/wordnet/vcpkg.json | 11 + ports/wpilib/CONTROL | 14 - ports/wpilib/vcpkg.json | 32 + ports/wren/CONTROL | 4 - ports/wren/vcpkg.json | 7 + ports/wt/CONTROL | 29 - ports/wt/vcpkg.json | 107 + ports/wtl/CONTROL | 4 - ports/wtl/vcpkg.json | 7 + ports/x265/CONTROL | 6 - ports/x265/vcpkg.json | 8 + ports/xerces-c/CONTROL | 12 - ports/xerces-c/vcpkg.json | 18 + ports/xeus/CONTROL | 5 - ports/xeus/vcpkg.json | 18 + ports/xframe/CONTROL | 5 - ports/xframe/vcpkg.json | 11 + ports/xmsh/CONTROL | 5 - ports/xmsh/vcpkg.json | 11 + ports/xproperty/CONTROL | 4 - ports/xproperty/vcpkg.json | 9 + ports/xsimd/CONTROL | 8 - ports/xsimd/vcpkg.json | 15 + ports/xtensor-blas/CONTROL | 5 - ports/xtensor-blas/vcpkg.json | 10 + ports/xtensor-fftw/CONTROL | 5 - ports/xtensor-fftw/vcpkg.json | 11 + ports/xxhash/CONTROL | 8 - ports/xxhash/vcpkg.json | 12 + ports/yajl/CONTROL | 3 - ports/yajl/vcpkg.json | 6 + ports/yas/CONTROL | 4 - ports/yas/vcpkg.json | 7 + ports/yasm/CONTROL | 5 - ports/yasm/vcpkg.json | 8 + ports/yato/CONTROL | 3 - ports/yato/vcpkg.json | 6 + ports/yoga/CONTROL | 5 - ports/yoga/vcpkg.json | 8 + ports/z85/CONTROL | 3 - ports/z85/vcpkg.json | 6 + ports/zfp/CONTROL | 19 - ports/zfp/vcpkg.json | 24 + ports/zkpp/CONTROL | 5 - ports/zkpp/vcpkg.json | 10 + ports/zookeeper/CONTROL | 7 - ports/zookeeper/vcpkg.json | 14 + ports/zopfli/CONTROL | 4 - ports/zopfli/vcpkg.json | 7 + ports/zserge-webview/CONTROL | 3 - ports/zserge-webview/vcpkg.json | 6 + ports/zstr/CONTROL | 3 - ports/zstr/vcpkg.json | 6 + ports/zxing-cpp/CONTROL | 14 - ports/zxing-cpp/vcpkg.json | 28 + ports/zydis/CONTROL | 4 - ports/zydis/vcpkg.json | 7 + ports/zyre/CONTROL | 5 - ports/zyre/vcpkg.json | 10 + ports/zziplib/CONTROL | 6 - ports/zziplib/vcpkg.json | 10 + versions/7-/7zip.json | 5 + versions/a-/absent.json | 5 + versions/a-/ace.json | 5 + versions/a-/activemq-cpp.json | 5 + versions/a-/ade.json | 5 + versions/a-/akali.json | 5 + versions/a-/alac-decoder.json | 5 + versions/a-/alac.json | 5 + versions/a-/aliyun-oss-c-sdk.json | 5 + versions/a-/ampl-asl.json | 5 + versions/a-/anax.json | 5 + versions/a-/antlr4.json | 5 + versions/a-/apr-util.json | 5 + versions/a-/arb.json | 5 + versions/a-/argagg.json | 5 + versions/a-/argh.json | 5 + versions/a-/argtable2.json | 5 + versions/a-/argumentum.json | 5 + versions/a-/asmjit.json | 5 + versions/a-/assimp.json | 5 + versions/a-/asynch.json | 5 + versions/a-/asyncplusplus.json | 5 + versions/a-/atlmfc.json | 5 + versions/a-/aurora.json | 5 + versions/a-/autobahn.json | 5 + versions/a-/avro-c.json | 5 + versions/a-/aws-c-common.json | 5 + versions/a-/aws-c-event-stream.json | 5 + versions/a-/aws-checksums.json | 5 + versions/a-/aws-lambda-cpp.json | 5 + versions/a-/azmq.json | 5 + versions/a-/azure-c-shared-utility.json | 5 + versions/a-/azure-macro-utils-c.json | 5 + versions/a-/azure-storage-cpp.json | 5 + versions/a-/azure-uamqp-c.json | 5 + versions/a-/azure-uhttp-c.json | 5 + versions/a-/azure-umqtt-c.json | 5 + versions/b-/basisu.json | 5 + versions/b-/bde.json | 5 + versions/b-/bdwgc.json | 5 + versions/b-/beast.json | 5 + versions/b-/bento4.json | 5 + versions/b-/berkeleydb.json | 5 + versions/b-/bigint.json | 5 + versions/b-/binn.json | 5 + versions/b-/bitmagic.json | 5 + versions/b-/bitserializer-cpprestjson.json | 5 + versions/b-/bitserializer-pugixml.json | 5 + versions/b-/bitserializer-rapidjson.json | 5 + versions/b-/bitserializer-rapidyaml.json | 5 + versions/b-/bitsery.json | 5 + versions/b-/blas.json | 5 + versions/b-/blaze.json | 5 + versions/b-/blitz.json | 5 + versions/b-/blosc.json | 5 + versions/b-/breakpad.json | 5 + versions/b-/brigand.json | 5 + versions/b-/brotli.json | 5 + versions/b-/brpc.json | 5 + versions/b-/brunocodutra-metal.json | 5 + versions/b-/brynet.json | 5 + versions/b-/bustache.json | 5 + versions/b-/butteraugli.json | 5 + versions/b-/byte-lite.json | 5 + versions/baseline.json | 2192 +++++++++---------- versions/c-/caffe2.json | 5 + versions/c-/camport3.json | 5 + versions/c-/capnproto.json | 5 + versions/c-/casclib.json | 5 + versions/c-/catch-classic.json | 5 + versions/c-/catch.json | 5 + versions/c-/cccapstone.json | 5 + versions/c-/ccd.json | 5 + versions/c-/cctz.json | 5 + versions/c-/celero.json | 5 + versions/c-/cello.json | 5 + versions/c-/cereal.json | 5 + versions/c-/cgicc.json | 5 + versions/c-/cgl.json | 5 + versions/c-/cgltf.json | 5 + versions/c-/chaiscript.json | 5 + versions/c-/charls.json | 5 + versions/c-/check.json | 5 + versions/c-/chipmunk.json | 5 + versions/c-/chmlib.json | 5 + versions/c-/chromium-base.json | 5 + versions/c-/cimg.json | 5 + versions/c-/cityhash.json | 5 + versions/c-/clara.json | 5 + versions/c-/clblas.json | 5 + versions/c-/clblast.json | 5 + versions/c-/clfft.json | 5 + versions/c-/clickhouse-cpp.json | 5 + versions/c-/clipp.json | 5 + versions/c-/clockutils.json | 5 + versions/c-/clp.json | 5 + versions/c-/clrng.json | 5 + versions/c-/cmark.json | 5 + versions/c-/cmcstl2.json | 5 + versions/c-/coin.json | 5 + versions/c-/coinutils.json | 5 + versions/c-/collada-dom.json | 5 + versions/c-/console-bridge.json | 5 + versions/c-/constexpr-contracts.json | 5 + versions/c-/constexpr.json | 5 + versions/c-/cpp-netlib.json | 5 + versions/c-/cpp-peglib.json | 5 + versions/c-/cpp-redis.json | 5 + versions/c-/cpp-taskflow.json | 5 + versions/c-/cppad.json | 5 + versions/c-/cppcms.json | 5 + versions/c-/cppcodec.json | 5 + versions/c-/cppcoro.json | 5 + versions/c-/cppfs.json | 5 + versions/c-/cppitertools.json | 5 + versions/c-/cppkafka.json | 5 + versions/c-/cppmicroservices.json | 5 + versions/c-/cpptoml.json | 5 + versions/c-/cpputest.json | 5 + versions/c-/cpuid.json | 5 + versions/c-/cr.json | 5 + versions/c-/crashpad.json | 5 + versions/c-/crc32c.json | 5 + versions/c-/croncpp.json | 5 + versions/c-/crossguid.json | 5 + versions/c-/cryptopp.json | 5 + versions/c-/cspice.json | 5 + versions/c-/ctbignum.json | 5 + versions/c-/ctemplate.json | 5 + versions/c-/ctp.json | 5 + versions/c-/cuda.json | 5 + versions/c-/cunit.json | 5 + versions/c-/curlpp.json | 5 + versions/c-/cute-headers.json | 5 + versions/c-/cutelyst2.json | 5 + versions/c-/cxxopts.json | 5 + versions/d-/darts-clone.json | 5 + versions/d-/dataframe.json | 5 + versions/d-/date.json | 5 + versions/d-/dbg-macro.json | 5 + versions/d-/dbghelp.json | 5 + versions/d-/dbow2.json | 5 + versions/d-/dbow3.json | 5 + versions/d-/dcmtk.json | 5 + versions/d-/decimal-for-cpp.json | 5 + versions/d-/detours.json | 5 + versions/d-/devicenameresolver.json | 5 + versions/d-/dimcli.json | 5 + versions/d-/dirent.json | 5 + versions/d-/discord-game-sdk.json | 5 + versions/d-/discord-rpc.json | 5 + versions/d-/discount.json | 5 + versions/d-/discreture.json | 5 + versions/d-/distorm.json | 5 + versions/d-/dlfcn-win32.json | 5 + versions/d-/docopt.json | 5 + versions/d-/doctest.json | 5 + versions/d-/double-conversion.json | 5 + versions/d-/dpdk.json | 5 + versions/d-/drlibs.json | 5 + versions/d-/dtl.json | 5 + versions/d-/duckx.json | 5 + versions/d-/duilib.json | 5 + versions/d-/duktape.json | 5 + versions/d-/dx.json | 5 + versions/e-/easycl.json | 5 + versions/e-/easyloggingpp.json | 5 + versions/e-/eathread.json | 5 + versions/e-/ebml.json | 5 + versions/e-/ecsutil.json | 5 + versions/e-/edlib.json | 5 + versions/e-/effolkronium-random.json | 5 + versions/e-/efsw.json | 5 + versions/e-/egl-registry.json | 5 + versions/e-/eigen3.json | 5 + versions/e-/elfutils.json | 5 + versions/e-/entityx.json | 5 + versions/e-/epsilon.json | 5 + versions/e-/esaxx.json | 5 + versions/e-/evpp.json | 5 + versions/e-/expected-lite.json | 5 + versions/e-/exprtk.json | 5 + versions/f-/faad2.json | 5 + versions/f-/fadbad.json | 5 + versions/f-/farmhash.json | 5 + versions/f-/fast-cpp-csv-parser.json | 5 + versions/f-/fastcgi.json | 5 + versions/f-/fastfeat.json | 5 + versions/f-/fastrtps.json | 5 + versions/f-/fcl.json | 5 + versions/f-/fdlibm.json | 5 + versions/f-/ffnvcodec.json | 5 + versions/f-/fftwpp.json | 5 + versions/f-/field3d.json | 5 + versions/f-/fixed-string.json | 5 + versions/f-/flatbuffers.json | 5 + versions/f-/flint.json | 5 + versions/f-/fluidlite.json | 5 + versions/f-/fmem.json | 5 + versions/f-/fmi4cpp.json | 5 + versions/f-/fmilib.json | 5 + versions/f-/font-chef.json | 5 + versions/f-/fontconfig.json | 5 + versions/f-/foonathan-memory.json | 5 + versions/f-/freeglut.json | 5 + versions/f-/freeimage.json | 5 + versions/f-/freeopcua.json | 5 + versions/f-/freetype-gl.json | 5 + versions/f-/fribidi.json | 5 + versions/f-/fruit.json | 5 + versions/f-/ftgl.json | 5 + versions/f-/function2.json | 5 + versions/f-/fuzzylite.json | 5 + versions/g-/g2o.json | 5 + versions/g-/gainput.json | 5 + versions/g-/gamma.json | 5 + versions/g-/gasol.json | 5 + versions/g-/gaussianlib.json | 5 + versions/g-/gcem.json | 5 + versions/g-/gdcm.json | 5 + versions/g-/gdcm2.json | 5 + versions/g-/genann.json | 5 + versions/g-/geogram.json | 5 + versions/g-/getdns.json | 5 + versions/g-/getopt.json | 5 + versions/g-/gettimeofday.json | 5 + versions/g-/gflags.json | 5 + versions/g-/gherkin-c.json | 5 + versions/g-/gl2ps.json | 5 + versions/g-/glog.json | 5 + versions/g-/glui.json | 5 + versions/g-/gmmlib.json | 5 + versions/g-/google-cloud-cpp-common.json | 5 + versions/g-/google-cloud-cpp-spanner.json | 5 + versions/g-/googleapis.json | 5 + versions/g-/gperf.json | 5 + versions/g-/gperftools.json | 5 + versions/g-/gpgme.json | 5 + versions/g-/graphicsmagick.json | 5 + versions/g-/graphite2.json | 5 + versions/g-/greatest.json | 5 + versions/g-/grppi.json | 5 + versions/g-/gsl.json | 5 + versions/g-/guetzli.json | 5 + versions/g-/gumbo.json | 5 + versions/g-/gzip-hpp.json | 5 + versions/h-/h5py-lzf.json | 5 + versions/h-/hayai.json | 5 + versions/h-/healpix.json | 5 + versions/h-/hffix.json | 5 + versions/h-/hfsm2.json | 5 + versions/h-/http-parser.json | 5 + versions/h-/hungarian.json | 5 + versions/h-/hwloc.json | 5 + versions/h-/hyperscan.json | 5 + versions/h-/hypre.json | 5 + versions/i-/ideviceinstaller.json | 5 + versions/i-/idevicerestore.json | 5 + versions/i-/if97.json | 5 + versions/i-/igloo.json | 5 + versions/i-/ignition-cmake0.json | 5 + versions/i-/ignition-common1.json | 5 + versions/i-/ignition-common3.json | 5 + versions/i-/ignition-fuel-tools1.json | 5 + versions/i-/ignition-fuel-tools4.json | 5 + versions/i-/ignition-math4.json | 5 + versions/i-/ignition-math6.json | 5 + versions/i-/ignition-modularscripts.json | 5 + versions/i-/ignition-msgs1.json | 5 + versions/i-/ignition-msgs5.json | 5 + versions/i-/ignition-msgs6.json | 5 + versions/i-/ignition-plugin1.json | 5 + versions/i-/ignition-transport4.json | 5 + versions/i-/ignition-transport8.json | 5 + versions/i-/ignition-transport9.json | 5 + versions/i-/ilmbase.json | 5 + versions/i-/imgui-sfml.json | 5 + versions/i-/inih.json | 5 + versions/i-/iniparser.json | 5 + versions/i-/intel-ipsec.json | 5 + versions/i-/intelrdfpmathlib.json | 5 + versions/i-/irrlicht.json | 5 + versions/i-/isal.json | 5 + versions/i-/ismrmrd.json | 5 + versions/j-/jansson.json | 5 + versions/j-/jbig2dec.json | 5 + versions/j-/jbigkit.json | 5 + versions/j-/jemalloc.json | 5 + versions/j-/jinja2cpplight.json | 5 + versions/j-/josuttis-jthread.json | 5 + versions/j-/jsmn.json | 5 + versions/j-/json-c.json | 5 + versions/j-/json-schema-validator.json | 5 + versions/j-/json-spirit.json | 5 + versions/j-/json11.json | 5 + versions/j-/json5-parser.json | 5 + versions/j-/jsoncons.json | 5 + versions/j-/jsoncpp.json | 5 + versions/j-/jsonnet.json | 5 + versions/k-/kangaru.json | 5 + versions/k-/kcp.json | 5 + versions/k-/kd-soap.json | 5 + versions/k-/kfr.json | 5 + versions/k-/kinectsdk2.json | 5 + versions/k-/kissfft.json | 5 + versions/k-/kubazip.json | 5 + versions/k-/kuku.json | 5 + versions/k-/kvasir-mpl.json | 5 + versions/l-/lapack.json | 5 + versions/l-/lastools.json | 5 + versions/l-/lazy-importer.json | 5 + versions/l-/lcms.json | 5 + versions/l-/lemon.json | 5 + versions/l-/leptonica.json | 5 + versions/l-/lerc.json | 5 + versions/l-/lest.json | 5 + versions/l-/leveldb.json | 5 + versions/l-/libaaplus.json | 5 + versions/l-/libaiff.json | 5 + versions/l-/libassuan.json | 5 + versions/l-/libbf.json | 5 + versions/l-/libcds.json | 5 + versions/l-/libcerf.json | 5 + versions/l-/libconfig.json | 5 + versions/l-/libconfuse.json | 5 + versions/l-/libcuckoo.json | 5 + versions/l-/libdatrie.json | 5 + versions/l-/libde265.json | 5 + versions/l-/libdisasm.json | 5 + versions/l-/libdivide.json | 5 + versions/l-/libdshowcapture.json | 5 + versions/l-/libevent.json | 5 + versions/l-/libevhtp.json | 5 + versions/l-/libexif.json | 5 + versions/l-/libfabric.json | 5 + versions/l-/libflac.json | 5 + versions/l-/libfreenect2.json | 5 + versions/l-/libftdi.json | 5 + versions/l-/libgcrypt.json | 5 + versions/l-/libgd.json | 5 + versions/l-/libgeotiff.json | 5 + versions/l-/libgta.json | 5 + versions/l-/libguarded.json | 5 + versions/l-/libhdfs3.json | 5 + versions/l-/libhydrogen.json | 5 + versions/l-/libideviceactivation.json | 5 + versions/l-/libigl.json | 5 + versions/l-/libilbc.json | 5 + versions/l-/libimobiledevice.json | 5 + versions/l-/libirecovery.json | 5 + versions/l-/libjpeg-turbo.json | 5 + versions/l-/libkml.json | 5 + versions/l-/liblas.json | 5 + versions/l-/liblbfgs.json | 5 + versions/l-/liblemon.json | 5 + versions/l-/liblsl.json | 5 + versions/l-/libmad.json | 5 + versions/l-/libmaxminddb.json | 5 + versions/l-/libmesh.json | 5 + versions/l-/libmikmod.json | 5 + versions/l-/libmodman.json | 5 + versions/l-/libmorton.json | 5 + versions/l-/libmpeg2.json | 5 + versions/l-/libmspack.json | 5 + versions/l-/libnoise.json | 5 + versions/l-/libodb-boost.json | 5 + versions/l-/libodb-pgsql.json | 5 + versions/l-/libodb-sqlite.json | 5 + versions/l-/libp7-baical.json | 5 + versions/l-/libp7client.json | 5 + versions/l-/libpff.json | 5 + versions/l-/libpopt.json | 5 + versions/l-/libproxy.json | 5 + versions/l-/libqcow.json | 5 + versions/l-/libqglviewer.json | 5 + versions/l-/librabbitmq.json | 5 + versions/l-/libraqm.json | 5 + versions/l-/libraw.json | 5 + versions/l-/librdkafka.json | 5 + versions/l-/libsass.json | 5 + versions/l-/libsbml.json | 5 + versions/l-/libspatialite.json | 5 + versions/l-/libspnav.json | 5 + versions/l-/libsquish.json | 5 + versions/l-/libsrt.json | 5 + versions/l-/libsrtp.json | 5 + versions/l-/libssh.json | 5 + versions/l-/libssh2.json | 5 + versions/l-/libstemmer.json | 5 + versions/l-/libstk.json | 5 + versions/l-/libtheora.json | 5 + versions/l-/libtins.json | 5 + versions/l-/libtomcrypt.json | 5 + versions/l-/libtommath.json | 5 + versions/l-/libu2f-server.json | 5 + versions/l-/libudns.json | 5 + versions/l-/libunibreak.json | 5 + versions/l-/libusb-win32.json | 5 + versions/l-/libusbmuxd.json | 5 + versions/l-/libuvc.json | 5 + versions/l-/libvmdk.json | 5 + versions/l-/libwandio.json | 5 + versions/l-/libwebm.json | 5 + versions/l-/libwebp.json | 5 + versions/l-/libxdiff.json | 5 + versions/l-/libxmlmm.json | 5 + versions/l-/libxmp-lite.json | 5 + versions/l-/libyaml.json | 5 + versions/l-/libzen.json | 5 + versions/l-/libzippp.json | 5 + versions/l-/licensepp.json | 5 + versions/l-/linalg.json | 5 + versions/l-/linenoise-ng.json | 5 + versions/l-/live555.json | 5 + versions/l-/llfio.json | 5 + versions/l-/llgl.json | 5 + versions/l-/lmdb.json | 5 + versions/l-/log4cplus.json | 5 + versions/l-/log4cpp.json | 5 + versions/l-/log4cxx.json | 5 + versions/l-/loguru.json | 5 + versions/l-/lpeg.json | 5 + versions/l-/luabridge.json | 5 + versions/l-/luafilesystem.json | 5 + versions/l-/luajit.json | 5 + versions/l-/luasocket.json | 5 + versions/l-/lz4.json | 5 + versions/l-/lzfse.json | 5 + versions/l-/lzo.json | 5 + versions/m-/magic-enum.json | 5 + versions/m-/magnum-extras.json | 5 + versions/m-/magnum-integration.json | 5 + versions/m-/magnum-plugins.json | 5 + versions/m-/magnum.json | 5 + versions/m-/mapbox-variant.json | 5 + versions/m-/mathc.json | 5 + versions/m-/mathgl.json | 5 + versions/m-/matplotlib-cpp.json | 5 + versions/m-/matroska.json | 5 + versions/m-/mbedtls.json | 5 + versions/m-/mcpp.json | 5 + versions/m-/mdnsresponder.json | 5 + versions/m-/mecab.json | 5 + versions/m-/memorymodule.json | 5 + versions/m-/meschach.json | 5 + versions/m-/meshoptimizer.json | 5 + versions/m-/metis.json | 5 + versions/m-/mgnlibs.json | 5 + versions/m-/mhook.json | 5 + versions/m-/microsoft-signalr.json | 5 + versions/m-/mikktspace.json | 5 + versions/m-/milerius-sfml-imgui.json | 5 + versions/m-/mimalloc.json | 5 + versions/m-/minc.json | 5 + versions/m-/minhook.json | 5 + versions/m-/minifb.json | 5 + versions/m-/minimp3.json | 5 + versions/m-/minisat-master-keying.json | 5 + versions/m-/minitrace.json | 5 + versions/m-/miniupnpc.json | 5 + versions/m-/miniz.json | 5 + versions/m-/mio.json | 5 + versions/m-/mman.json | 5 + versions/m-/mmx.json | 5 + versions/m-/modp-base64.json | 5 + versions/m-/mongo-cxx-driver.json | 5 + versions/m-/monkeys-audio.json | 5 + versions/m-/moos-core.json | 5 + versions/m-/moos-essential.json | 5 + versions/m-/moos-ui.json | 5 + versions/m-/morton-nd.json | 5 + versions/m-/mozjpeg.json | 5 + versions/m-/mp-units.json | 5 + versions/m-/mp3lame.json | 5 + versions/m-/mpark-variant.json | 5 + versions/m-/mpc.json | 5 + versions/m-/mpfr.json | 5 + versions/m-/mpi.json | 5 + versions/m-/mpmcqueue.json | 5 + versions/m-/mqtt-cpp.json | 5 + versions/m-/ms-angle.json | 5 + versions/m-/ms-gsl.json | 5 + versions/m-/msgpack.json | 5 + versions/m-/msinttypes.json | 5 + versions/m-/mstch.json | 5 + versions/m-/mujs.json | 5 + versions/m-/munit.json | 5 + versions/m-/muparser.json | 5 + versions/m-/murmurhash.json | 5 + versions/m-/mygui.json | 5 + versions/n-/nameof.json | 5 + versions/n-/nano-signal-slot.json | 5 + versions/n-/nanobench.json | 5 + versions/n-/nanoflann.json | 5 + versions/n-/nanogui.json | 5 + versions/n-/nanomsg.json | 5 + versions/n-/nanoprintf.json | 5 + versions/n-/nanorange.json | 5 + versions/n-/nanort.json | 5 + versions/n-/nanovg.json | 5 + versions/n-/neargye-semver.json | 5 + versions/n-/ned14-internal-quickcpplib.json | 5 + versions/n-/netcdf-cxx4.json | 5 + versions/n-/nethost.json | 5 + versions/n-/networkdirect-sdk.json | 5 + versions/n-/nifticlib.json | 5 + versions/n-/nlohmann-fifo-map.json | 5 + versions/n-/nmslib.json | 5 + versions/n-/nngpp.json | 5 + versions/n-/nonius.json | 5 + versions/n-/nrf-ble-driver.json | 5 + versions/n-/nt-wrapper.json | 5 + versions/n-/numactl.json | 5 + versions/n-/nvtt.json | 5 + versions/o-/observer-ptr-lite.json | 5 + versions/o-/octomap.json | 5 + versions/o-/ode.json | 5 + versions/o-/offscale-libetcd-cpp.json | 5 + versions/o-/ogdf.json | 5 + versions/o-/ogre-next.json | 5 + versions/o-/ompl.json | 5 + versions/o-/oniguruma.json | 5 + versions/o-/opencascade.json | 5 + versions/o-/opencc.json | 5 + versions/o-/opencensus-cpp.json | 5 + versions/o-/opencl.json | 5 + versions/o-/opencsg.json | 5 + versions/o-/opengl-registry.json | 5 + versions/o-/opengl.json | 5 + versions/o-/openigtlink.json | 5 + versions/o-/openmesh.json | 5 + versions/o-/openmpi.json | 5 + versions/o-/openmvs.json | 5 + versions/o-/openni2.json | 5 + versions/o-/openscap.json | 5 + versions/o-/openssl-unix.json | 5 + versions/o-/openssl-uwp.json | 5 + versions/o-/openssl-windows.json | 5 + versions/o-/openvpn3.json | 5 + versions/o-/openvr.json | 5 + versions/o-/openxr-loader.json | 5 + versions/o-/optional-bare.json | 5 + versions/o-/optional-lite.json | 5 + versions/o-/opus.json | 5 + versions/o-/opusfile.json | 5 + versions/o-/orc.json | 5 + versions/o-/osg-qt.json | 5 + versions/o-/osg.json | 5 + versions/o-/osi.json | 5 + versions/o-/outcome.json | 5 + versions/p-/p-ranav-csv.json | 5 + versions/p-/p-ranav-csv2.json | 5 + versions/p-/parallel-hashmap.json | 5 + versions/p-/parallelstl.json | 5 + versions/p-/parmetis.json | 5 + versions/p-/parquet.json | 5 + versions/p-/parson.json | 5 + versions/p-/pbc.json | 5 + versions/p-/pcg.json | 5 + versions/p-/pdal-c.json | 5 + versions/p-/pdal.json | 5 + versions/p-/pdcurses.json | 5 + versions/p-/pdqsort.json | 5 + versions/p-/pe-parse.json | 5 + versions/p-/pegtl-2.json | 5 + versions/p-/pegtl.json | 5 + versions/p-/pfring.json | 5 + versions/p-/pfultz2-linq.json | 5 + versions/p-/picojson.json | 5 + versions/p-/picosha2.json | 5 + versions/p-/piex.json | 5 + versions/p-/pixel.json | 5 + versions/p-/platform-folders.json | 5 + versions/p-/plf-list.json | 5 + versions/p-/plf-nanotimer.json | 5 + versions/p-/plf-stack.json | 5 + versions/p-/plib.json | 5 + versions/p-/plibsys.json | 5 + versions/p-/plog.json | 5 + versions/p-/plustache.json | 5 + versions/p-/pngwriter.json | 5 + versions/p-/poly2tri.json | 5 + versions/p-/polyclipping.json | 5 + versions/p-/polyhook2.json | 5 + versions/p-/polymorphic-value.json | 5 + versions/p-/ponder.json | 5 + versions/p-/portable-snippets.json | 5 + versions/p-/ppconsul.json | 5 + versions/p-/ppmagic.json | 5 + versions/p-/pprint.json | 5 + versions/p-/pqp.json | 5 + versions/p-/proj.json | 5 + versions/p-/prometheus-cpp.json | 5 + versions/p-/protobuf-c.json | 5 + versions/p-/pthread.json | 5 + versions/p-/pugixml.json | 5 + versions/q-/qca.json | 5 + versions/q-/qhull.json | 5 + versions/q-/qpid-proton.json | 5 + versions/q-/qt-advanced-docking-system.json | 5 + versions/q-/qt5-3d.json | 5 + versions/q-/qt5-activeqt.json | 5 + versions/q-/qt5-androidextras.json | 5 + versions/q-/qt5-canvas3d.json | 5 + versions/q-/qt5-charts.json | 5 + versions/q-/qt5-connectivity.json | 5 + versions/q-/qt5-datavis3d.json | 5 + versions/q-/qt5-declarative.json | 5 + versions/q-/qt5-doc.json | 5 + versions/q-/qt5-gamepad.json | 5 + versions/q-/qt5-graphicaleffects.json | 5 + versions/q-/qt5-imageformats.json | 5 + versions/q-/qt5-location.json | 5 + versions/q-/qt5-macextras.json | 5 + versions/q-/qt5-modularscripts.json | 5 + versions/q-/qt5-multimedia.json | 5 + versions/q-/qt5-networkauth.json | 5 + versions/q-/qt5-purchasing.json | 5 + versions/q-/qt5-quickcontrols.json | 5 + versions/q-/qt5-quickcontrols2.json | 5 + versions/q-/qt5-remoteobjects.json | 5 + versions/q-/qt5-script.json | 5 + versions/q-/qt5-scxml.json | 5 + versions/q-/qt5-sensors.json | 5 + versions/q-/qt5-serialbus.json | 5 + versions/q-/qt5-serialport.json | 5 + versions/q-/qt5-speech.json | 5 + versions/q-/qt5-svg.json | 5 + versions/q-/qt5-tools.json | 5 + versions/q-/qt5-translations.json | 5 + versions/q-/qt5-virtualkeyboard.json | 5 + versions/q-/qt5-webchannel.json | 5 + versions/q-/qt5-webengine.json | 5 + versions/q-/qt5-webglplugin.json | 5 + versions/q-/qt5-websockets.json | 5 + versions/q-/qt5-webview.json | 5 + versions/q-/qt5-winextras.json | 5 + versions/q-/qt5-x11extras.json | 5 + versions/q-/qt5-xmlpatterns.json | 5 + versions/q-/qt5.json | 5 + versions/q-/qtkeychain.json | 5 + versions/q-/quadtree.json | 5 + versions/q-/quaternions.json | 5 + versions/q-/quazip.json | 5 + versions/q-/quickfast.json | 5 + versions/q-/quickfix.json | 5 + versions/q-/qwtw.json | 5 + versions/r-/rabit.json | 5 + versions/r-/ragel.json | 5 + versions/r-/rang.json | 5 + versions/r-/range-v3-vs2015.json | 5 + versions/r-/range-v3.json | 5 + versions/r-/rapidcheck.json | 5 + versions/r-/rapidxml-ns.json | 5 + versions/r-/rapidxml.json | 5 + versions/r-/re2.json | 5 + versions/r-/readline-win32.json | 5 + versions/r-/readline.json | 5 + versions/r-/readosm.json | 5 + versions/r-/refl-cpp.json | 5 + versions/r-/refprop-headers.json | 5 + versions/r-/replxx.json | 5 + versions/r-/reproc.json | 5 + versions/r-/rest-rpc.json | 5 + versions/r-/restclient-cpp.json | 5 + versions/r-/rhash.json | 5 + versions/r-/riffcpp.json | 5 + versions/r-/ring-span-lite.json | 5 + versions/r-/roaring.json | 5 + versions/r-/rocksdb.json | 5 + versions/r-/rpclib.json | 5 + versions/r-/rply.json | 5 + versions/r-/rs-core-lib.json | 5 + versions/r-/rsocket.json | 5 + versions/r-/rtlsdr.json | 5 + versions/r-/rttr.json | 5 + versions/r-/rxcpp.json | 5 + versions/r-/rxqt.json | 5 + versions/s-/sais.json | 5 + versions/s-/sajson.json | 5 + versions/s-/sassc.json | 5 + versions/s-/sciter.json | 5 + versions/s-/scnlib.json | 5 + versions/s-/scylla-wrapper.json | 5 + versions/s-/sdformat10.json | 5 + versions/s-/sdformat9.json | 5 + versions/s-/sdl1-net.json | 5 + versions/s-/sdl1.json | 5 + versions/s-/sdl2-gfx.json | 5 + versions/s-/sdl2-image.json | 5 + versions/s-/sdl2-net.json | 5 + versions/s-/sdl2-ttf.json | 5 + versions/s-/sdl2pp.json | 5 + versions/s-/secp256k1.json | 5 + versions/s-/septag-sx.json | 5 + versions/s-/seqan.json | 5 + versions/s-/sf2cute.json | 5 + versions/s-/sfgui.json | 5 + versions/s-/sfsexp.json | 5 + versions/s-/shapelib.json | 5 + versions/s-/shiva-sfml.json | 5 + versions/s-/shiva.json | 5 + versions/s-/shogun.json | 5 + versions/s-/signalrclient.json | 5 + versions/s-/sigslot.json | 5 + versions/s-/simde.json | 5 + versions/s-/simple-fft.json | 5 + versions/s-/simpleini.json | 5 + versions/s-/skia.json | 5 + versions/s-/skyr-url.json | 5 + versions/s-/smpeg2.json | 5 + versions/s-/snappy.json | 5 + versions/s-/sndfile.json | 5 + versions/s-/snowhouse.json | 5 + versions/s-/sockpp.json | 5 + versions/s-/sokol.json | 5 + versions/s-/sol2.json | 5 + versions/s-/solid3.json | 5 + versions/s-/soqt.json | 5 + versions/s-/soundtouch.json | 5 + versions/s-/soxr.json | 5 + versions/s-/spaceland.json | 5 + versions/s-/sparsehash.json | 5 + versions/s-/sparsepp.json | 5 + versions/s-/spatialite-tools.json | 5 + versions/s-/spdk-dpdk.json | 5 + versions/s-/spdk-ipsec.json | 5 + versions/s-/spdk-isal.json | 5 + versions/s-/spdk.json | 5 + versions/s-/speex.json | 5 + versions/s-/speexdsp.json | 5 + versions/s-/spirit-po.json | 5 + versions/s-/sprout.json | 5 + versions/s-/spscqueue.json | 5 + versions/s-/sqlite-modern-cpp.json | 5 + versions/s-/sqlite-orm.json | 5 + versions/s-/sqlpp11-connector-mysql.json | 5 + versions/s-/sqlpp11-connector-sqlite3.json | 5 + versions/s-/sqlpp11.json | 5 + versions/s-/status-code.json | 5 + versions/s-/status-value-lite.json | 5 + versions/s-/stb.json | 5 + versions/s-/stlab.json | 5 + versions/s-/stormlib.json | 5 + versions/s-/strict-variant.json | 5 + versions/s-/string-theory.json | 5 + versions/s-/string-view-lite.json | 5 + versions/s-/strtk.json | 5 + versions/s-/stx.json | 5 + versions/s-/stxxl.json | 5 + versions/s-/superlu.json | 5 + versions/s-/systemc.json | 5 + versions/t-/tabulate.json | 5 + versions/t-/tacopie.json | 5 + versions/t-/taocpp-json.json | 5 + versions/t-/tap-windows6.json | 5 + versions/t-/tbb.json | 5 + versions/t-/tcl.json | 5 + versions/t-/tclap.json | 5 + versions/t-/teemo.json | 5 + versions/t-/telnetpp.json | 5 + versions/t-/tgbot-cpp.json | 5 + versions/t-/tgc.json | 5 + versions/t-/theia.json | 5 + versions/t-/think-cell-range.json | 5 + versions/t-/threadpool.json | 5 + versions/t-/thrift.json | 5 + versions/t-/tidy-html5.json | 5 + versions/t-/tinkerforge.json | 5 + versions/t-/tiny-aes-c.json | 5 + versions/t-/tiny-bignum-c.json | 5 + versions/t-/tiny-dnn.json | 5 + versions/t-/tiny-process-library.json | 5 + versions/t-/tiny-regex-c.json | 5 + versions/t-/tinycthread.json | 5 + versions/t-/tinydir.json | 5 + versions/t-/tinyexif.json | 5 + versions/t-/tinyexr.json | 5 + versions/t-/tinygltf.json | 5 + versions/t-/tinynpy.json | 5 + versions/t-/tinyobjloader.json | 5 + versions/t-/tinyply.json | 5 + versions/t-/tinyspline.json | 5 + versions/t-/tinythread.json | 5 + versions/t-/tinytoml.json | 5 + versions/t-/tinyutf8.json | 5 + versions/t-/tinyxml.json | 5 + versions/t-/tinyxml2.json | 5 + versions/t-/tl-expected.json | 5 + versions/t-/tl-function-ref.json | 5 + versions/t-/tl-optional.json | 5 + versions/t-/tlx.json | 5 + versions/t-/tmx.json | 5 + versions/t-/tmxlite.json | 5 + versions/t-/tmxparser.json | 5 + versions/t-/toml11.json | 5 + versions/t-/tomlplusplus.json | 5 + versions/t-/torch-th.json | 5 + versions/t-/tre.json | 5 + versions/t-/treehopper.json | 5 + versions/t-/triangle.json | 5 + versions/t-/trompeloeil.json | 5 + versions/t-/tsl-hopscotch-map.json | 5 + versions/t-/tsl-ordered-map.json | 5 + versions/t-/tsl-sparse-map.json | 5 + versions/t-/turbobase64.json | 5 + versions/t-/type-lite.json | 5 + versions/u-/uchardet.json | 5 + versions/u-/umock-c.json | 5 + versions/u-/unicorn-lib.json | 5 + versions/u-/unicorn.json | 5 + versions/u-/units.json | 5 + versions/u-/unixodbc.json | 5 + versions/u-/unrar.json | 5 + versions/u-/urdfdom-headers.json | 5 + versions/u-/urdfdom.json | 5 + versions/u-/usbmuxd.json | 5 + versions/u-/usd.json | 5 + versions/u-/usrsctp.json | 5 + versions/u-/utf8h.json | 5 + versions/u-/utfz.json | 5 + versions/u-/uthenticode.json | 5 + versions/u-/uvw.json | 5 + versions/v-/v-hacd.json | 5 + versions/v-/valijson.json | 5 + versions/v-/variant-lite.json | 5 + versions/v-/vc.json | 5 + versions/v-/vcglib.json | 5 + versions/v-/vcpkg-gfortran.json | 5 + versions/v-/vectorclass.json | 5 + versions/v-/visit-struct.json | 5 + versions/v-/vlfeat.json | 5 + versions/v-/vlpp.json | 5 + versions/v-/volk.json | 5 + versions/v-/vtk-dicom.json | 5 + versions/v-/vulkan-hpp.json | 5 + versions/v-/vulkan-memory-allocator.json | 5 + versions/v-/vulkan.json | 5 + versions/v-/vxl.json | 5 + versions/w-/wampcc.json | 5 + versions/w-/wavpack.json | 5 + versions/w-/wg21-sg14.json | 5 + versions/w-/wil.json | 5 + versions/w-/wildmidi.json | 5 + versions/w-/wincrypt.json | 5 + versions/w-/winpcap.json | 5 + versions/w-/winreg.json | 5 + versions/w-/winsock2.json | 5 + versions/w-/wintoast.json | 5 + versions/w-/woff2.json | 5 + versions/w-/wordnet.json | 5 + versions/w-/wpilib.json | 5 + versions/w-/wren.json | 5 + versions/w-/wt.json | 5 + versions/w-/wtl.json | 5 + versions/x-/x265.json | 5 + versions/x-/xerces-c.json | 5 + versions/x-/xeus.json | 5 + versions/x-/xframe.json | 5 + versions/x-/xmsh.json | 5 + versions/x-/xproperty.json | 5 + versions/x-/xsimd.json | 5 + versions/x-/xtensor-blas.json | 5 + versions/x-/xtensor-fftw.json | 5 + versions/x-/xxhash.json | 5 + versions/y-/yajl.json | 5 + versions/y-/yas.json | 5 + versions/y-/yasm.json | 5 + versions/y-/yato.json | 5 + versions/y-/yoga.json | 5 + versions/z-/z85.json | 5 + versions/z-/zfp.json | 5 + versions/z-/zkpp.json | 5 + versions/z-/zookeeper.json | 5 + versions/z-/zopfli.json | 5 + versions/z-/zserge-webview.json | 5 + versions/z-/zstr.json | 5 + versions/z-/zxing-cpp.json | 5 + versions/z-/zydis.json | 5 + versions/z-/zyre.json | 5 + versions/z-/zziplib.json | 5 + 2640 files changed, 16880 insertions(+), 6473 deletions(-) delete mode 100644 ports/7zip/CONTROL create mode 100644 ports/7zip/vcpkg.json delete mode 100644 ports/absent/CONTROL create mode 100644 ports/absent/vcpkg.json delete mode 100644 ports/ace/CONTROL create mode 100644 ports/ace/vcpkg.json delete mode 100644 ports/activemq-cpp/CONTROL create mode 100644 ports/activemq-cpp/vcpkg.json delete mode 100644 ports/ade/CONTROL create mode 100644 ports/ade/vcpkg.json delete mode 100644 ports/akali/CONTROL create mode 100644 ports/akali/vcpkg.json delete mode 100644 ports/alac-decoder/CONTROL create mode 100644 ports/alac-decoder/vcpkg.json delete mode 100644 ports/alac/CONTROL create mode 100644 ports/alac/vcpkg.json delete mode 100644 ports/aliyun-oss-c-sdk/CONTROL create mode 100644 ports/aliyun-oss-c-sdk/vcpkg.json delete mode 100644 ports/ampl-asl/CONTROL create mode 100644 ports/ampl-asl/vcpkg.json delete mode 100644 ports/anax/CONTROL create mode 100644 ports/anax/vcpkg.json delete mode 100644 ports/antlr4/CONTROL create mode 100644 ports/antlr4/vcpkg.json delete mode 100644 ports/apr-util/CONTROL create mode 100644 ports/apr-util/vcpkg.json delete mode 100644 ports/arb/CONTROL create mode 100644 ports/arb/vcpkg.json delete mode 100644 ports/argagg/CONTROL create mode 100644 ports/argagg/vcpkg.json delete mode 100644 ports/argh/CONTROL create mode 100644 ports/argh/vcpkg.json delete mode 100644 ports/argtable2/CONTROL create mode 100644 ports/argtable2/vcpkg.json delete mode 100755 ports/argumentum/CONTROL create mode 100644 ports/argumentum/vcpkg.json delete mode 100644 ports/asmjit/CONTROL create mode 100644 ports/asmjit/vcpkg.json delete mode 100644 ports/assimp/CONTROL create mode 100644 ports/assimp/vcpkg.json delete mode 100644 ports/asynch/CONTROL create mode 100644 ports/asynch/vcpkg.json delete mode 100644 ports/asyncplusplus/CONTROL create mode 100644 ports/asyncplusplus/vcpkg.json delete mode 100644 ports/atlmfc/CONTROL create mode 100644 ports/atlmfc/vcpkg.json delete mode 100644 ports/aurora/CONTROL create mode 100644 ports/aurora/vcpkg.json delete mode 100644 ports/autobahn/CONTROL create mode 100644 ports/autobahn/vcpkg.json delete mode 100644 ports/avro-c/CONTROL create mode 100644 ports/avro-c/vcpkg.json delete mode 100644 ports/aws-c-common/CONTROL create mode 100644 ports/aws-c-common/vcpkg.json delete mode 100644 ports/aws-c-event-stream/CONTROL create mode 100644 ports/aws-c-event-stream/vcpkg.json delete mode 100644 ports/aws-checksums/CONTROL create mode 100644 ports/aws-checksums/vcpkg.json delete mode 100644 ports/aws-lambda-cpp/CONTROL create mode 100644 ports/aws-lambda-cpp/vcpkg.json delete mode 100644 ports/azmq/CONTROL create mode 100644 ports/azmq/vcpkg.json delete mode 100644 ports/azure-c-shared-utility/CONTROL create mode 100644 ports/azure-c-shared-utility/vcpkg.json delete mode 100644 ports/azure-macro-utils-c/CONTROL create mode 100644 ports/azure-macro-utils-c/vcpkg.json delete mode 100644 ports/azure-storage-cpp/CONTROL create mode 100644 ports/azure-storage-cpp/vcpkg.json delete mode 100644 ports/azure-uamqp-c/CONTROL create mode 100644 ports/azure-uamqp-c/vcpkg.json delete mode 100644 ports/azure-uhttp-c/CONTROL create mode 100644 ports/azure-uhttp-c/vcpkg.json delete mode 100644 ports/azure-umqtt-c/CONTROL create mode 100644 ports/azure-umqtt-c/vcpkg.json delete mode 100644 ports/basisu/CONTROL create mode 100644 ports/basisu/vcpkg.json delete mode 100644 ports/bde/CONTROL create mode 100644 ports/bde/vcpkg.json delete mode 100644 ports/bdwgc/CONTROL create mode 100644 ports/bdwgc/vcpkg.json delete mode 100644 ports/beast/CONTROL create mode 100644 ports/beast/vcpkg.json delete mode 100644 ports/bento4/CONTROL create mode 100644 ports/bento4/vcpkg.json delete mode 100644 ports/berkeleydb/CONTROL create mode 100644 ports/berkeleydb/vcpkg.json delete mode 100644 ports/bigint/CONTROL create mode 100644 ports/bigint/vcpkg.json delete mode 100644 ports/binn/CONTROL create mode 100644 ports/binn/vcpkg.json delete mode 100644 ports/bitmagic/CONTROL create mode 100644 ports/bitmagic/vcpkg.json delete mode 100644 ports/bitserializer-cpprestjson/CONTROL create mode 100644 ports/bitserializer-cpprestjson/vcpkg.json delete mode 100644 ports/bitserializer-pugixml/CONTROL create mode 100644 ports/bitserializer-pugixml/vcpkg.json delete mode 100644 ports/bitserializer-rapidjson/CONTROL create mode 100644 ports/bitserializer-rapidjson/vcpkg.json delete mode 100644 ports/bitserializer-rapidyaml/CONTROL create mode 100644 ports/bitserializer-rapidyaml/vcpkg.json delete mode 100644 ports/bitsery/CONTROL create mode 100644 ports/bitsery/vcpkg.json delete mode 100644 ports/blas/CONTROL create mode 100644 ports/blas/vcpkg.json delete mode 100644 ports/blaze/CONTROL create mode 100644 ports/blaze/vcpkg.json delete mode 100644 ports/blitz/CONTROL create mode 100644 ports/blitz/vcpkg.json delete mode 100644 ports/blosc/CONTROL create mode 100644 ports/blosc/vcpkg.json delete mode 100644 ports/breakpad/CONTROL create mode 100644 ports/breakpad/vcpkg.json delete mode 100644 ports/brigand/CONTROL create mode 100644 ports/brigand/vcpkg.json delete mode 100644 ports/brotli/CONTROL create mode 100644 ports/brotli/vcpkg.json delete mode 100644 ports/brpc/CONTROL create mode 100644 ports/brpc/vcpkg.json delete mode 100644 ports/brunocodutra-metal/CONTROL create mode 100644 ports/brunocodutra-metal/vcpkg.json delete mode 100644 ports/brynet/CONTROL create mode 100644 ports/brynet/vcpkg.json delete mode 100644 ports/bustache/CONTROL create mode 100644 ports/bustache/vcpkg.json delete mode 100644 ports/butteraugli/CONTROL create mode 100644 ports/butteraugli/vcpkg.json delete mode 100644 ports/byte-lite/CONTROL create mode 100644 ports/byte-lite/vcpkg.json delete mode 100644 ports/caffe2/CONTROL create mode 100644 ports/caffe2/vcpkg.json delete mode 100644 ports/camport3/CONTROL create mode 100644 ports/camport3/vcpkg.json delete mode 100644 ports/capnproto/CONTROL create mode 100644 ports/capnproto/vcpkg.json delete mode 100644 ports/casclib/CONTROL create mode 100644 ports/casclib/vcpkg.json delete mode 100644 ports/catch-classic/CONTROL create mode 100644 ports/catch-classic/vcpkg.json delete mode 100644 ports/catch/CONTROL create mode 100644 ports/catch/vcpkg.json delete mode 100644 ports/cccapstone/CONTROL create mode 100644 ports/cccapstone/vcpkg.json delete mode 100644 ports/ccd/CONTROL create mode 100644 ports/ccd/vcpkg.json delete mode 100644 ports/cctz/CONTROL create mode 100644 ports/cctz/vcpkg.json delete mode 100644 ports/celero/CONTROL create mode 100644 ports/celero/vcpkg.json delete mode 100644 ports/cello/CONTROL create mode 100644 ports/cello/vcpkg.json delete mode 100644 ports/cereal/CONTROL create mode 100644 ports/cereal/vcpkg.json delete mode 100644 ports/cgicc/CONTROL create mode 100644 ports/cgicc/vcpkg.json delete mode 100644 ports/cgl/CONTROL create mode 100644 ports/cgl/vcpkg.json delete mode 100644 ports/cgltf/CONTROL create mode 100644 ports/cgltf/vcpkg.json delete mode 100644 ports/chaiscript/CONTROL create mode 100644 ports/chaiscript/vcpkg.json delete mode 100644 ports/charls/CONTROL create mode 100644 ports/charls/vcpkg.json delete mode 100644 ports/check/CONTROL create mode 100644 ports/check/vcpkg.json delete mode 100644 ports/chipmunk/CONTROL create mode 100644 ports/chipmunk/vcpkg.json delete mode 100644 ports/chmlib/CONTROL create mode 100644 ports/chmlib/vcpkg.json delete mode 100644 ports/chromium-base/CONTROL create mode 100644 ports/chromium-base/vcpkg.json delete mode 100644 ports/cimg/CONTROL create mode 100644 ports/cimg/vcpkg.json delete mode 100644 ports/cityhash/CONTROL create mode 100644 ports/cityhash/vcpkg.json delete mode 100644 ports/clara/CONTROL create mode 100644 ports/clara/vcpkg.json delete mode 100644 ports/clblas/CONTROL create mode 100644 ports/clblas/vcpkg.json delete mode 100644 ports/clblast/CONTROL create mode 100644 ports/clblast/vcpkg.json delete mode 100644 ports/clfft/CONTROL create mode 100644 ports/clfft/vcpkg.json delete mode 100644 ports/clickhouse-cpp/CONTROL create mode 100644 ports/clickhouse-cpp/vcpkg.json delete mode 100644 ports/clipp/CONTROL create mode 100644 ports/clipp/vcpkg.json delete mode 100644 ports/clockutils/CONTROL create mode 100644 ports/clockutils/vcpkg.json delete mode 100644 ports/clp/CONTROL create mode 100644 ports/clp/vcpkg.json delete mode 100644 ports/clrng/CONTROL create mode 100644 ports/clrng/vcpkg.json delete mode 100644 ports/cmark/CONTROL create mode 100644 ports/cmark/vcpkg.json delete mode 100644 ports/cmcstl2/CONTROL create mode 100644 ports/cmcstl2/vcpkg.json delete mode 100644 ports/coin/CONTROL create mode 100644 ports/coin/vcpkg.json delete mode 100644 ports/coinutils/CONTROL create mode 100644 ports/coinutils/vcpkg.json delete mode 100644 ports/collada-dom/CONTROL create mode 100644 ports/collada-dom/vcpkg.json delete mode 100644 ports/console-bridge/CONTROL create mode 100644 ports/console-bridge/vcpkg.json delete mode 100644 ports/constexpr-contracts/CONTROL create mode 100644 ports/constexpr-contracts/vcpkg.json delete mode 100644 ports/constexpr/CONTROL create mode 100644 ports/constexpr/vcpkg.json delete mode 100644 ports/cpp-netlib/CONTROL create mode 100644 ports/cpp-netlib/vcpkg.json delete mode 100644 ports/cpp-peglib/CONTROL create mode 100644 ports/cpp-peglib/vcpkg.json delete mode 100644 ports/cpp-redis/CONTROL create mode 100644 ports/cpp-redis/vcpkg.json delete mode 100644 ports/cpp-taskflow/CONTROL create mode 100644 ports/cpp-taskflow/vcpkg.json delete mode 100644 ports/cppad/CONTROL create mode 100644 ports/cppad/vcpkg.json delete mode 100644 ports/cppcms/CONTROL create mode 100644 ports/cppcms/vcpkg.json delete mode 100644 ports/cppcodec/CONTROL create mode 100644 ports/cppcodec/vcpkg.json delete mode 100644 ports/cppcoro/CONTROL create mode 100644 ports/cppcoro/vcpkg.json delete mode 100644 ports/cppfs/CONTROL create mode 100644 ports/cppfs/vcpkg.json delete mode 100644 ports/cppitertools/CONTROL create mode 100644 ports/cppitertools/vcpkg.json delete mode 100644 ports/cppkafka/CONTROL create mode 100644 ports/cppkafka/vcpkg.json delete mode 100644 ports/cppmicroservices/CONTROL create mode 100644 ports/cppmicroservices/vcpkg.json delete mode 100644 ports/cpptoml/CONTROL create mode 100644 ports/cpptoml/vcpkg.json delete mode 100644 ports/cpputest/CONTROL create mode 100644 ports/cpputest/vcpkg.json delete mode 100644 ports/cpuid/CONTROL create mode 100644 ports/cpuid/vcpkg.json delete mode 100644 ports/cr/CONTROL create mode 100644 ports/cr/vcpkg.json delete mode 100644 ports/crashpad/CONTROL create mode 100644 ports/crashpad/vcpkg.json delete mode 100644 ports/crc32c/CONTROL create mode 100644 ports/crc32c/vcpkg.json delete mode 100644 ports/croncpp/CONTROL create mode 100644 ports/croncpp/vcpkg.json delete mode 100644 ports/crossguid/CONTROL create mode 100644 ports/crossguid/vcpkg.json delete mode 100644 ports/cryptopp/CONTROL create mode 100644 ports/cryptopp/vcpkg.json delete mode 100644 ports/cspice/CONTROL create mode 100644 ports/cspice/vcpkg.json delete mode 100644 ports/ctbignum/CONTROL create mode 100644 ports/ctbignum/vcpkg.json delete mode 100644 ports/ctemplate/CONTROL create mode 100644 ports/ctemplate/vcpkg.json delete mode 100644 ports/ctp/CONTROL create mode 100644 ports/ctp/vcpkg.json delete mode 100644 ports/cuda/CONTROL create mode 100644 ports/cuda/vcpkg.json delete mode 100644 ports/cunit/CONTROL create mode 100644 ports/cunit/vcpkg.json delete mode 100644 ports/curlpp/CONTROL create mode 100644 ports/curlpp/vcpkg.json delete mode 100644 ports/cute-headers/CONTROL create mode 100644 ports/cute-headers/vcpkg.json delete mode 100644 ports/cutelyst2/CONTROL create mode 100644 ports/cutelyst2/vcpkg.json delete mode 100644 ports/cxxopts/CONTROL create mode 100644 ports/cxxopts/vcpkg.json delete mode 100644 ports/darts-clone/CONTROL create mode 100644 ports/darts-clone/vcpkg.json delete mode 100644 ports/dataframe/CONTROL create mode 100644 ports/dataframe/vcpkg.json delete mode 100644 ports/date/CONTROL create mode 100644 ports/date/vcpkg.json delete mode 100644 ports/dbg-macro/CONTROL create mode 100644 ports/dbg-macro/vcpkg.json delete mode 100644 ports/dbghelp/CONTROL create mode 100644 ports/dbghelp/vcpkg.json delete mode 100644 ports/dbow2/CONTROL create mode 100644 ports/dbow2/vcpkg.json delete mode 100644 ports/dbow3/CONTROL create mode 100644 ports/dbow3/vcpkg.json delete mode 100644 ports/dcmtk/CONTROL create mode 100644 ports/dcmtk/vcpkg.json delete mode 100644 ports/decimal-for-cpp/CONTROL create mode 100644 ports/decimal-for-cpp/vcpkg.json delete mode 100644 ports/detours/CONTROL create mode 100644 ports/detours/vcpkg.json delete mode 100644 ports/devicenameresolver/CONTROL create mode 100644 ports/devicenameresolver/vcpkg.json delete mode 100644 ports/dimcli/CONTROL create mode 100644 ports/dimcli/vcpkg.json delete mode 100644 ports/dirent/CONTROL create mode 100644 ports/dirent/vcpkg.json delete mode 100644 ports/discord-game-sdk/CONTROL create mode 100644 ports/discord-game-sdk/vcpkg.json delete mode 100644 ports/discord-rpc/CONTROL create mode 100644 ports/discord-rpc/vcpkg.json delete mode 100644 ports/discount/CONTROL create mode 100644 ports/discount/vcpkg.json delete mode 100644 ports/discreture/CONTROL create mode 100644 ports/discreture/vcpkg.json delete mode 100644 ports/distorm/CONTROL create mode 100644 ports/distorm/vcpkg.json delete mode 100644 ports/dlfcn-win32/CONTROL create mode 100644 ports/dlfcn-win32/vcpkg.json delete mode 100644 ports/docopt/CONTROL create mode 100644 ports/docopt/vcpkg.json delete mode 100644 ports/doctest/CONTROL create mode 100644 ports/doctest/vcpkg.json delete mode 100644 ports/double-conversion/CONTROL create mode 100644 ports/double-conversion/vcpkg.json delete mode 100644 ports/dpdk/CONTROL create mode 100644 ports/dpdk/vcpkg.json delete mode 100644 ports/drlibs/CONTROL create mode 100644 ports/drlibs/vcpkg.json delete mode 100644 ports/dtl/CONTROL create mode 100644 ports/dtl/vcpkg.json delete mode 100644 ports/duckx/CONTROL create mode 100644 ports/duckx/vcpkg.json delete mode 100644 ports/duilib/CONTROL create mode 100644 ports/duilib/vcpkg.json delete mode 100644 ports/duktape/CONTROL create mode 100644 ports/duktape/vcpkg.json delete mode 100644 ports/dx/CONTROL create mode 100644 ports/dx/vcpkg.json delete mode 100644 ports/easycl/CONTROL create mode 100644 ports/easycl/vcpkg.json delete mode 100644 ports/easyloggingpp/CONTROL create mode 100644 ports/easyloggingpp/vcpkg.json delete mode 100644 ports/eathread/CONTROL create mode 100644 ports/eathread/vcpkg.json delete mode 100644 ports/ebml/CONTROL create mode 100644 ports/ebml/vcpkg.json delete mode 100644 ports/ecsutil/CONTROL create mode 100644 ports/ecsutil/vcpkg.json delete mode 100644 ports/edlib/CONTROL create mode 100644 ports/edlib/vcpkg.json delete mode 100644 ports/effolkronium-random/CONTROL create mode 100644 ports/effolkronium-random/vcpkg.json delete mode 100644 ports/efsw/CONTROL create mode 100644 ports/efsw/vcpkg.json delete mode 100644 ports/egl-registry/CONTROL create mode 100644 ports/egl-registry/vcpkg.json delete mode 100644 ports/eigen3/CONTROL create mode 100644 ports/eigen3/vcpkg.json delete mode 100644 ports/elfutils/CONTROL create mode 100644 ports/elfutils/vcpkg.json delete mode 100644 ports/entityx/CONTROL create mode 100644 ports/entityx/vcpkg.json delete mode 100644 ports/epsilon/CONTROL create mode 100644 ports/epsilon/vcpkg.json delete mode 100644 ports/esaxx/CONTROL create mode 100644 ports/esaxx/vcpkg.json delete mode 100644 ports/evpp/CONTROL create mode 100644 ports/evpp/vcpkg.json delete mode 100644 ports/expected-lite/CONTROL create mode 100644 ports/expected-lite/vcpkg.json delete mode 100644 ports/exprtk/CONTROL create mode 100644 ports/exprtk/vcpkg.json delete mode 100644 ports/faad2/CONTROL create mode 100644 ports/faad2/vcpkg.json delete mode 100644 ports/fadbad/CONTROL create mode 100644 ports/fadbad/vcpkg.json delete mode 100644 ports/farmhash/CONTROL create mode 100644 ports/farmhash/vcpkg.json delete mode 100644 ports/fast-cpp-csv-parser/CONTROL create mode 100644 ports/fast-cpp-csv-parser/vcpkg.json delete mode 100644 ports/fastcgi/CONTROL create mode 100644 ports/fastcgi/vcpkg.json delete mode 100644 ports/fastfeat/CONTROL create mode 100644 ports/fastfeat/vcpkg.json delete mode 100644 ports/fastrtps/CONTROL create mode 100644 ports/fastrtps/vcpkg.json delete mode 100644 ports/fcl/CONTROL create mode 100644 ports/fcl/vcpkg.json delete mode 100644 ports/fdlibm/CONTROL create mode 100644 ports/fdlibm/vcpkg.json delete mode 100644 ports/ffnvcodec/CONTROL create mode 100644 ports/ffnvcodec/vcpkg.json delete mode 100644 ports/fftwpp/CONTROL create mode 100644 ports/fftwpp/vcpkg.json delete mode 100644 ports/field3d/CONTROL create mode 100644 ports/field3d/vcpkg.json delete mode 100644 ports/fixed-string/CONTROL create mode 100644 ports/fixed-string/vcpkg.json delete mode 100644 ports/flatbuffers/CONTROL create mode 100644 ports/flatbuffers/vcpkg.json delete mode 100644 ports/flint/CONTROL create mode 100644 ports/flint/vcpkg.json delete mode 100644 ports/fluidlite/CONTROL create mode 100644 ports/fluidlite/vcpkg.json delete mode 100644 ports/fmem/CONTROL create mode 100644 ports/fmem/vcpkg.json delete mode 100644 ports/fmi4cpp/CONTROL create mode 100644 ports/fmi4cpp/vcpkg.json delete mode 100644 ports/fmilib/CONTROL create mode 100644 ports/fmilib/vcpkg.json delete mode 100644 ports/font-chef/CONTROL create mode 100644 ports/font-chef/vcpkg.json delete mode 100644 ports/fontconfig/CONTROL create mode 100644 ports/fontconfig/vcpkg.json delete mode 100644 ports/foonathan-memory/CONTROL create mode 100644 ports/foonathan-memory/vcpkg.json delete mode 100644 ports/freeglut/CONTROL create mode 100644 ports/freeglut/vcpkg.json delete mode 100644 ports/freeimage/CONTROL create mode 100644 ports/freeimage/vcpkg.json delete mode 100644 ports/freeopcua/CONTROL create mode 100644 ports/freeopcua/vcpkg.json delete mode 100644 ports/freetype-gl/CONTROL create mode 100644 ports/freetype-gl/vcpkg.json delete mode 100644 ports/fribidi/CONTROL create mode 100644 ports/fribidi/vcpkg.json delete mode 100644 ports/fruit/CONTROL create mode 100644 ports/fruit/vcpkg.json delete mode 100644 ports/ftgl/CONTROL create mode 100644 ports/ftgl/vcpkg.json delete mode 100644 ports/function2/CONTROL create mode 100644 ports/function2/vcpkg.json delete mode 100644 ports/fuzzylite/CONTROL create mode 100644 ports/fuzzylite/vcpkg.json delete mode 100644 ports/g2o/CONTROL create mode 100644 ports/g2o/vcpkg.json delete mode 100644 ports/gainput/CONTROL create mode 100644 ports/gainput/vcpkg.json delete mode 100644 ports/gamma/CONTROL create mode 100644 ports/gamma/vcpkg.json delete mode 100644 ports/gasol/CONTROL create mode 100644 ports/gasol/vcpkg.json delete mode 100644 ports/gaussianlib/CONTROL create mode 100644 ports/gaussianlib/vcpkg.json delete mode 100644 ports/gcem/CONTROL create mode 100644 ports/gcem/vcpkg.json delete mode 100644 ports/gdcm/CONTROL create mode 100644 ports/gdcm/vcpkg.json delete mode 100644 ports/gdcm2/CONTROL create mode 100644 ports/gdcm2/vcpkg.json delete mode 100644 ports/genann/CONTROL create mode 100644 ports/genann/vcpkg.json delete mode 100644 ports/geogram/CONTROL create mode 100644 ports/geogram/vcpkg.json delete mode 100644 ports/getdns/CONTROL create mode 100644 ports/getdns/vcpkg.json delete mode 100644 ports/getopt/CONTROL create mode 100644 ports/getopt/vcpkg.json delete mode 100644 ports/gettimeofday/CONTROL create mode 100644 ports/gettimeofday/vcpkg.json delete mode 100644 ports/gflags/CONTROL create mode 100644 ports/gflags/vcpkg.json delete mode 100644 ports/gherkin-c/CONTROL create mode 100644 ports/gherkin-c/vcpkg.json delete mode 100644 ports/gl2ps/CONTROL create mode 100644 ports/gl2ps/vcpkg.json delete mode 100644 ports/glog/CONTROL create mode 100644 ports/glog/vcpkg.json delete mode 100644 ports/glui/CONTROL create mode 100644 ports/glui/vcpkg.json delete mode 100644 ports/gmmlib/CONTROL create mode 100644 ports/gmmlib/vcpkg.json delete mode 100644 ports/google-cloud-cpp-common/CONTROL create mode 100644 ports/google-cloud-cpp-common/vcpkg.json delete mode 100644 ports/google-cloud-cpp-spanner/CONTROL create mode 100644 ports/google-cloud-cpp-spanner/vcpkg.json delete mode 100644 ports/googleapis/CONTROL create mode 100644 ports/googleapis/vcpkg.json delete mode 100644 ports/gperf/CONTROL create mode 100644 ports/gperf/vcpkg.json delete mode 100644 ports/gperftools/CONTROL create mode 100644 ports/gperftools/vcpkg.json delete mode 100644 ports/gpgme/CONTROL create mode 100644 ports/gpgme/vcpkg.json delete mode 100644 ports/graphicsmagick/CONTROL create mode 100644 ports/graphicsmagick/vcpkg.json delete mode 100644 ports/graphite2/CONTROL create mode 100644 ports/graphite2/vcpkg.json delete mode 100644 ports/greatest/CONTROL create mode 100644 ports/greatest/vcpkg.json delete mode 100644 ports/grppi/CONTROL create mode 100644 ports/grppi/vcpkg.json delete mode 100644 ports/gsl/CONTROL create mode 100644 ports/gsl/vcpkg.json delete mode 100644 ports/guetzli/CONTROL create mode 100644 ports/guetzli/vcpkg.json delete mode 100644 ports/gumbo/CONTROL create mode 100644 ports/gumbo/vcpkg.json delete mode 100644 ports/gzip-hpp/CONTROL create mode 100644 ports/gzip-hpp/vcpkg.json delete mode 100644 ports/h5py-lzf/CONTROL create mode 100644 ports/h5py-lzf/vcpkg.json delete mode 100644 ports/hayai/CONTROL create mode 100644 ports/hayai/vcpkg.json delete mode 100644 ports/healpix/CONTROL create mode 100644 ports/healpix/vcpkg.json delete mode 100644 ports/hffix/CONTROL create mode 100644 ports/hffix/vcpkg.json delete mode 100644 ports/hfsm2/CONTROL create mode 100644 ports/hfsm2/vcpkg.json delete mode 100644 ports/http-parser/CONTROL create mode 100644 ports/http-parser/vcpkg.json delete mode 100644 ports/hungarian/CONTROL create mode 100644 ports/hungarian/vcpkg.json delete mode 100644 ports/hwloc/CONTROL create mode 100644 ports/hwloc/vcpkg.json delete mode 100644 ports/hyperscan/CONTROL create mode 100644 ports/hyperscan/vcpkg.json delete mode 100644 ports/hypre/CONTROL create mode 100644 ports/hypre/vcpkg.json delete mode 100644 ports/ideviceinstaller/CONTROL create mode 100644 ports/ideviceinstaller/vcpkg.json delete mode 100644 ports/idevicerestore/CONTROL create mode 100644 ports/idevicerestore/vcpkg.json delete mode 100644 ports/if97/CONTROL create mode 100644 ports/if97/vcpkg.json delete mode 100644 ports/igloo/CONTROL create mode 100644 ports/igloo/vcpkg.json delete mode 100644 ports/ignition-cmake0/CONTROL create mode 100644 ports/ignition-cmake0/vcpkg.json delete mode 100644 ports/ignition-common1/CONTROL create mode 100644 ports/ignition-common1/vcpkg.json delete mode 100644 ports/ignition-common3/CONTROL create mode 100644 ports/ignition-common3/vcpkg.json delete mode 100644 ports/ignition-fuel-tools1/CONTROL create mode 100644 ports/ignition-fuel-tools1/vcpkg.json delete mode 100644 ports/ignition-fuel-tools4/CONTROL create mode 100644 ports/ignition-fuel-tools4/vcpkg.json delete mode 100644 ports/ignition-math4/CONTROL create mode 100644 ports/ignition-math4/vcpkg.json delete mode 100644 ports/ignition-math6/CONTROL create mode 100644 ports/ignition-math6/vcpkg.json delete mode 100644 ports/ignition-modularscripts/CONTROL create mode 100644 ports/ignition-modularscripts/vcpkg.json delete mode 100644 ports/ignition-msgs1/CONTROL create mode 100644 ports/ignition-msgs1/vcpkg.json delete mode 100644 ports/ignition-msgs5/CONTROL create mode 100644 ports/ignition-msgs5/vcpkg.json delete mode 100644 ports/ignition-msgs6/CONTROL create mode 100644 ports/ignition-msgs6/vcpkg.json delete mode 100644 ports/ignition-plugin1/CONTROL create mode 100644 ports/ignition-plugin1/vcpkg.json delete mode 100644 ports/ignition-transport4/CONTROL create mode 100644 ports/ignition-transport4/vcpkg.json delete mode 100644 ports/ignition-transport8/CONTROL create mode 100644 ports/ignition-transport8/vcpkg.json delete mode 100644 ports/ignition-transport9/CONTROL create mode 100644 ports/ignition-transport9/vcpkg.json delete mode 100644 ports/ilmbase/CONTROL create mode 100644 ports/ilmbase/vcpkg.json delete mode 100644 ports/imgui-sfml/CONTROL create mode 100644 ports/imgui-sfml/vcpkg.json delete mode 100644 ports/inih/CONTROL create mode 100644 ports/inih/vcpkg.json delete mode 100644 ports/iniparser/CONTROL create mode 100644 ports/iniparser/vcpkg.json delete mode 100644 ports/intel-ipsec/CONTROL create mode 100644 ports/intel-ipsec/vcpkg.json delete mode 100644 ports/intelrdfpmathlib/CONTROL create mode 100644 ports/intelrdfpmathlib/vcpkg.json delete mode 100644 ports/irrlicht/CONTROL create mode 100644 ports/irrlicht/vcpkg.json delete mode 100644 ports/isal/CONTROL create mode 100644 ports/isal/vcpkg.json delete mode 100644 ports/ismrmrd/CONTROL create mode 100644 ports/ismrmrd/vcpkg.json delete mode 100644 ports/jansson/CONTROL create mode 100644 ports/jansson/vcpkg.json delete mode 100644 ports/jbig2dec/CONTROL create mode 100644 ports/jbig2dec/vcpkg.json delete mode 100644 ports/jbigkit/CONTROL create mode 100644 ports/jbigkit/vcpkg.json delete mode 100644 ports/jemalloc/CONTROL create mode 100644 ports/jemalloc/vcpkg.json delete mode 100644 ports/jinja2cpplight/CONTROL create mode 100644 ports/jinja2cpplight/vcpkg.json delete mode 100644 ports/josuttis-jthread/CONTROL create mode 100644 ports/josuttis-jthread/vcpkg.json delete mode 100644 ports/jsmn/CONTROL create mode 100644 ports/jsmn/vcpkg.json delete mode 100644 ports/json-c/CONTROL create mode 100644 ports/json-c/vcpkg.json delete mode 100644 ports/json-schema-validator/CONTROL create mode 100644 ports/json-schema-validator/vcpkg.json delete mode 100644 ports/json-spirit/CONTROL create mode 100644 ports/json-spirit/vcpkg.json delete mode 100644 ports/json11/CONTROL create mode 100644 ports/json11/vcpkg.json delete mode 100644 ports/json5-parser/CONTROL create mode 100644 ports/json5-parser/vcpkg.json delete mode 100644 ports/jsoncons/CONTROL create mode 100644 ports/jsoncons/vcpkg.json delete mode 100644 ports/jsoncpp/CONTROL create mode 100644 ports/jsoncpp/vcpkg.json delete mode 100644 ports/jsonnet/CONTROL create mode 100644 ports/jsonnet/vcpkg.json delete mode 100644 ports/kangaru/CONTROL create mode 100644 ports/kangaru/vcpkg.json delete mode 100644 ports/kcp/CONTROL create mode 100644 ports/kcp/vcpkg.json delete mode 100644 ports/kd-soap/CONTROL create mode 100644 ports/kd-soap/vcpkg.json delete mode 100644 ports/kfr/CONTROL create mode 100644 ports/kfr/vcpkg.json delete mode 100644 ports/kinectsdk2/CONTROL create mode 100644 ports/kinectsdk2/vcpkg.json delete mode 100644 ports/kissfft/CONTROL create mode 100644 ports/kissfft/vcpkg.json delete mode 100644 ports/kubazip/CONTROL create mode 100644 ports/kubazip/vcpkg.json delete mode 100644 ports/kuku/CONTROL create mode 100644 ports/kuku/vcpkg.json delete mode 100644 ports/kvasir-mpl/CONTROL create mode 100644 ports/kvasir-mpl/vcpkg.json delete mode 100644 ports/lapack/CONTROL create mode 100644 ports/lapack/vcpkg.json delete mode 100644 ports/lastools/CONTROL create mode 100644 ports/lastools/vcpkg.json delete mode 100644 ports/lazy-importer/CONTROL create mode 100644 ports/lazy-importer/vcpkg.json delete mode 100644 ports/lcms/CONTROL create mode 100644 ports/lcms/vcpkg.json delete mode 100644 ports/lemon/CONTROL create mode 100644 ports/lemon/vcpkg.json delete mode 100644 ports/leptonica/CONTROL create mode 100644 ports/leptonica/vcpkg.json delete mode 100644 ports/lerc/CONTROL create mode 100644 ports/lerc/vcpkg.json delete mode 100644 ports/lest/CONTROL create mode 100644 ports/lest/vcpkg.json delete mode 100644 ports/leveldb/CONTROL create mode 100644 ports/leveldb/vcpkg.json delete mode 100644 ports/libaaplus/CONTROL create mode 100644 ports/libaaplus/vcpkg.json delete mode 100644 ports/libaiff/CONTROL create mode 100644 ports/libaiff/vcpkg.json delete mode 100644 ports/libassuan/CONTROL create mode 100644 ports/libassuan/vcpkg.json delete mode 100644 ports/libbf/CONTROL create mode 100644 ports/libbf/vcpkg.json delete mode 100644 ports/libcds/CONTROL create mode 100644 ports/libcds/vcpkg.json delete mode 100644 ports/libcerf/CONTROL create mode 100644 ports/libcerf/vcpkg.json delete mode 100644 ports/libconfig/CONTROL create mode 100644 ports/libconfig/vcpkg.json delete mode 100644 ports/libconfuse/CONTROL create mode 100644 ports/libconfuse/vcpkg.json delete mode 100644 ports/libcuckoo/CONTROL create mode 100644 ports/libcuckoo/vcpkg.json delete mode 100644 ports/libdatrie/CONTROL create mode 100644 ports/libdatrie/vcpkg.json delete mode 100644 ports/libde265/CONTROL create mode 100644 ports/libde265/vcpkg.json delete mode 100644 ports/libdisasm/CONTROL create mode 100644 ports/libdisasm/vcpkg.json delete mode 100644 ports/libdivide/CONTROL create mode 100644 ports/libdivide/vcpkg.json delete mode 100644 ports/libdshowcapture/CONTROL create mode 100644 ports/libdshowcapture/vcpkg.json delete mode 100644 ports/libevent/CONTROL create mode 100644 ports/libevent/vcpkg.json delete mode 100644 ports/libevhtp/CONTROL create mode 100644 ports/libevhtp/vcpkg.json delete mode 100644 ports/libexif/CONTROL create mode 100644 ports/libexif/vcpkg.json delete mode 100644 ports/libfabric/CONTROL create mode 100644 ports/libfabric/vcpkg.json delete mode 100644 ports/libflac/CONTROL create mode 100644 ports/libflac/vcpkg.json delete mode 100644 ports/libfreenect2/CONTROL create mode 100644 ports/libfreenect2/vcpkg.json delete mode 100644 ports/libftdi/CONTROL create mode 100644 ports/libftdi/vcpkg.json delete mode 100644 ports/libgcrypt/CONTROL create mode 100644 ports/libgcrypt/vcpkg.json delete mode 100644 ports/libgd/CONTROL create mode 100644 ports/libgd/vcpkg.json delete mode 100644 ports/libgeotiff/CONTROL create mode 100644 ports/libgeotiff/vcpkg.json delete mode 100644 ports/libgta/CONTROL create mode 100644 ports/libgta/vcpkg.json delete mode 100644 ports/libguarded/CONTROL create mode 100644 ports/libguarded/vcpkg.json delete mode 100644 ports/libhdfs3/CONTROL create mode 100644 ports/libhdfs3/vcpkg.json delete mode 100644 ports/libhydrogen/CONTROL create mode 100644 ports/libhydrogen/vcpkg.json delete mode 100644 ports/libideviceactivation/CONTROL create mode 100644 ports/libideviceactivation/vcpkg.json delete mode 100644 ports/libigl/CONTROL create mode 100644 ports/libigl/vcpkg.json delete mode 100644 ports/libilbc/CONTROL create mode 100644 ports/libilbc/vcpkg.json delete mode 100644 ports/libimobiledevice/CONTROL create mode 100644 ports/libimobiledevice/vcpkg.json delete mode 100644 ports/libirecovery/CONTROL create mode 100644 ports/libirecovery/vcpkg.json delete mode 100644 ports/libkml/CONTROL create mode 100644 ports/libkml/vcpkg.json delete mode 100644 ports/liblas/CONTROL create mode 100644 ports/liblas/vcpkg.json delete mode 100644 ports/liblbfgs/CONTROL create mode 100644 ports/liblbfgs/vcpkg.json delete mode 100644 ports/liblemon/CONTROL create mode 100644 ports/liblemon/vcpkg.json delete mode 100644 ports/liblsl/CONTROL create mode 100644 ports/liblsl/vcpkg.json delete mode 100644 ports/libmad/CONTROL create mode 100644 ports/libmad/vcpkg.json delete mode 100644 ports/libmaxminddb/CONTROL create mode 100644 ports/libmaxminddb/vcpkg.json delete mode 100644 ports/libmesh/CONTROL create mode 100644 ports/libmesh/vcpkg.json delete mode 100644 ports/libmikmod/CONTROL create mode 100644 ports/libmikmod/vcpkg.json delete mode 100644 ports/libmodman/CONTROL create mode 100644 ports/libmodman/vcpkg.json delete mode 100644 ports/libmorton/CONTROL create mode 100644 ports/libmorton/vcpkg.json delete mode 100644 ports/libmpeg2/CONTROL create mode 100644 ports/libmpeg2/vcpkg.json delete mode 100644 ports/libmspack/CONTROL create mode 100644 ports/libmspack/vcpkg.json delete mode 100644 ports/libnoise/CONTROL create mode 100644 ports/libnoise/vcpkg.json delete mode 100644 ports/libodb-boost/CONTROL create mode 100644 ports/libodb-boost/vcpkg.json delete mode 100644 ports/libodb-pgsql/CONTROL create mode 100644 ports/libodb-pgsql/vcpkg.json delete mode 100644 ports/libodb-sqlite/CONTROL create mode 100644 ports/libodb-sqlite/vcpkg.json delete mode 100644 ports/libp7-baical/CONTROL create mode 100644 ports/libp7-baical/vcpkg.json delete mode 100644 ports/libp7client/CONTROL create mode 100644 ports/libp7client/vcpkg.json delete mode 100644 ports/libpff/CONTROL create mode 100644 ports/libpff/vcpkg.json delete mode 100644 ports/libpopt/CONTROL create mode 100644 ports/libpopt/vcpkg.json delete mode 100644 ports/libproxy/CONTROL create mode 100644 ports/libproxy/vcpkg.json delete mode 100644 ports/libqcow/CONTROL create mode 100644 ports/libqcow/vcpkg.json delete mode 100644 ports/libqglviewer/CONTROL create mode 100644 ports/libqglviewer/vcpkg.json delete mode 100644 ports/librabbitmq/CONTROL create mode 100644 ports/librabbitmq/vcpkg.json delete mode 100644 ports/libraqm/CONTROL create mode 100644 ports/libraqm/vcpkg.json delete mode 100644 ports/libraw/CONTROL create mode 100644 ports/libraw/vcpkg.json delete mode 100644 ports/librdkafka/CONTROL create mode 100644 ports/librdkafka/vcpkg.json delete mode 100644 ports/libsass/CONTROL create mode 100644 ports/libsass/vcpkg.json delete mode 100644 ports/libsbml/CONTROL create mode 100644 ports/libsbml/vcpkg.json delete mode 100644 ports/libspatialite/CONTROL create mode 100644 ports/libspatialite/vcpkg.json delete mode 100644 ports/libspnav/CONTROL create mode 100644 ports/libspnav/vcpkg.json delete mode 100644 ports/libsquish/CONTROL create mode 100644 ports/libsquish/vcpkg.json delete mode 100644 ports/libsrt/CONTROL create mode 100644 ports/libsrt/vcpkg.json delete mode 100644 ports/libsrtp/CONTROL create mode 100644 ports/libsrtp/vcpkg.json delete mode 100644 ports/libssh/CONTROL create mode 100644 ports/libssh/vcpkg.json delete mode 100644 ports/libssh2/CONTROL create mode 100644 ports/libssh2/vcpkg.json delete mode 100644 ports/libstemmer/CONTROL create mode 100644 ports/libstemmer/vcpkg.json delete mode 100644 ports/libstk/CONTROL create mode 100644 ports/libstk/vcpkg.json delete mode 100644 ports/libtheora/CONTROL create mode 100644 ports/libtheora/vcpkg.json delete mode 100644 ports/libtins/CONTROL create mode 100644 ports/libtins/vcpkg.json delete mode 100644 ports/libtomcrypt/CONTROL create mode 100644 ports/libtomcrypt/vcpkg.json delete mode 100644 ports/libtommath/CONTROL create mode 100644 ports/libtommath/vcpkg.json delete mode 100644 ports/libu2f-server/CONTROL create mode 100644 ports/libu2f-server/vcpkg.json delete mode 100644 ports/libudns/CONTROL create mode 100644 ports/libudns/vcpkg.json delete mode 100644 ports/libunibreak/CONTROL create mode 100644 ports/libunibreak/vcpkg.json delete mode 100644 ports/libusb-win32/CONTROL create mode 100644 ports/libusb-win32/vcpkg.json delete mode 100644 ports/libusbmuxd/CONTROL create mode 100644 ports/libusbmuxd/vcpkg.json delete mode 100644 ports/libuvc/CONTROL create mode 100644 ports/libuvc/vcpkg.json delete mode 100644 ports/libvmdk/CONTROL create mode 100644 ports/libvmdk/vcpkg.json delete mode 100644 ports/libwandio/CONTROL create mode 100644 ports/libwandio/vcpkg.json delete mode 100644 ports/libwebm/CONTROL create mode 100644 ports/libwebm/vcpkg.json delete mode 100644 ports/libwebp/CONTROL create mode 100644 ports/libwebp/vcpkg.json delete mode 100644 ports/libxdiff/CONTROL create mode 100644 ports/libxdiff/vcpkg.json delete mode 100644 ports/libxmlmm/CONTROL create mode 100644 ports/libxmlmm/vcpkg.json delete mode 100644 ports/libxmp-lite/CONTROL create mode 100644 ports/libxmp-lite/vcpkg.json delete mode 100644 ports/libyaml/CONTROL create mode 100644 ports/libyaml/vcpkg.json delete mode 100644 ports/libzen/CONTROL create mode 100644 ports/libzen/vcpkg.json delete mode 100644 ports/libzippp/CONTROL create mode 100644 ports/libzippp/vcpkg.json delete mode 100644 ports/licensepp/CONTROL create mode 100644 ports/licensepp/vcpkg.json delete mode 100644 ports/linalg/CONTROL create mode 100644 ports/linalg/vcpkg.json delete mode 100644 ports/linenoise-ng/CONTROL create mode 100644 ports/linenoise-ng/vcpkg.json delete mode 100644 ports/live555/CONTROL create mode 100644 ports/live555/vcpkg.json delete mode 100644 ports/llfio/CONTROL create mode 100644 ports/llfio/vcpkg.json delete mode 100644 ports/llgl/CONTROL create mode 100644 ports/llgl/vcpkg.json delete mode 100644 ports/lmdb/CONTROL create mode 100644 ports/lmdb/vcpkg.json delete mode 100644 ports/log4cplus/CONTROL create mode 100644 ports/log4cplus/vcpkg.json delete mode 100644 ports/log4cpp/CONTROL create mode 100644 ports/log4cpp/vcpkg.json delete mode 100644 ports/log4cxx/CONTROL create mode 100644 ports/log4cxx/vcpkg.json delete mode 100644 ports/loguru/CONTROL create mode 100644 ports/loguru/vcpkg.json delete mode 100644 ports/lpeg/CONTROL create mode 100644 ports/lpeg/vcpkg.json delete mode 100644 ports/luabridge/CONTROL create mode 100644 ports/luabridge/vcpkg.json delete mode 100644 ports/luafilesystem/CONTROL create mode 100644 ports/luafilesystem/vcpkg.json delete mode 100644 ports/luajit/CONTROL create mode 100644 ports/luajit/vcpkg.json delete mode 100644 ports/luasocket/CONTROL create mode 100644 ports/luasocket/vcpkg.json delete mode 100644 ports/lz4/CONTROL create mode 100644 ports/lz4/vcpkg.json delete mode 100644 ports/lzfse/CONTROL create mode 100644 ports/lzfse/vcpkg.json delete mode 100644 ports/lzo/CONTROL create mode 100644 ports/lzo/vcpkg.json delete mode 100644 ports/magic-enum/CONTROL create mode 100644 ports/magic-enum/vcpkg.json delete mode 100644 ports/magnum-extras/CONTROL create mode 100644 ports/magnum-extras/vcpkg.json delete mode 100644 ports/magnum-integration/CONTROL create mode 100644 ports/magnum-integration/vcpkg.json delete mode 100644 ports/magnum-plugins/CONTROL create mode 100644 ports/magnum-plugins/vcpkg.json delete mode 100644 ports/magnum/CONTROL create mode 100644 ports/magnum/vcpkg.json delete mode 100644 ports/mapbox-variant/CONTROL create mode 100644 ports/mapbox-variant/vcpkg.json delete mode 100644 ports/mathc/CONTROL create mode 100644 ports/mathc/vcpkg.json delete mode 100644 ports/mathgl/CONTROL create mode 100644 ports/mathgl/vcpkg.json delete mode 100644 ports/matplotlib-cpp/CONTROL create mode 100644 ports/matplotlib-cpp/vcpkg.json delete mode 100644 ports/matroska/CONTROL create mode 100644 ports/matroska/vcpkg.json delete mode 100644 ports/mbedtls/CONTROL create mode 100644 ports/mbedtls/vcpkg.json delete mode 100644 ports/mcpp/CONTROL create mode 100644 ports/mcpp/vcpkg.json delete mode 100644 ports/mdnsresponder/CONTROL create mode 100644 ports/mdnsresponder/vcpkg.json delete mode 100644 ports/mecab/CONTROL create mode 100644 ports/mecab/vcpkg.json delete mode 100644 ports/memorymodule/CONTROL create mode 100644 ports/memorymodule/vcpkg.json delete mode 100644 ports/meschach/CONTROL create mode 100644 ports/meschach/vcpkg.json delete mode 100644 ports/meshoptimizer/CONTROL create mode 100644 ports/meshoptimizer/vcpkg.json delete mode 100644 ports/metis/CONTROL create mode 100644 ports/metis/vcpkg.json delete mode 100644 ports/mgnlibs/CONTROL create mode 100644 ports/mgnlibs/vcpkg.json delete mode 100644 ports/mhook/CONTROL create mode 100644 ports/mhook/vcpkg.json delete mode 100644 ports/microsoft-signalr/CONTROL create mode 100644 ports/microsoft-signalr/vcpkg.json delete mode 100644 ports/mikktspace/CONTROL create mode 100644 ports/mikktspace/vcpkg.json delete mode 100644 ports/milerius-sfml-imgui/CONTROL create mode 100644 ports/milerius-sfml-imgui/vcpkg.json delete mode 100644 ports/mimalloc/CONTROL create mode 100644 ports/mimalloc/vcpkg.json delete mode 100644 ports/minc/CONTROL create mode 100644 ports/minc/vcpkg.json delete mode 100644 ports/minhook/CONTROL create mode 100644 ports/minhook/vcpkg.json delete mode 100644 ports/minifb/CONTROL create mode 100644 ports/minifb/vcpkg.json delete mode 100644 ports/minimp3/CONTROL create mode 100644 ports/minimp3/vcpkg.json delete mode 100644 ports/minisat-master-keying/CONTROL create mode 100644 ports/minisat-master-keying/vcpkg.json delete mode 100644 ports/minitrace/CONTROL create mode 100644 ports/minitrace/vcpkg.json delete mode 100644 ports/miniupnpc/CONTROL create mode 100644 ports/miniupnpc/vcpkg.json delete mode 100644 ports/miniz/CONTROL create mode 100644 ports/miniz/vcpkg.json delete mode 100644 ports/mio/CONTROL create mode 100644 ports/mio/vcpkg.json delete mode 100644 ports/mman/CONTROL create mode 100644 ports/mman/vcpkg.json delete mode 100644 ports/mmx/CONTROL create mode 100644 ports/mmx/vcpkg.json delete mode 100644 ports/modp-base64/CONTROL create mode 100644 ports/modp-base64/vcpkg.json delete mode 100644 ports/mongo-cxx-driver/CONTROL create mode 100644 ports/mongo-cxx-driver/vcpkg.json delete mode 100644 ports/monkeys-audio/CONTROL create mode 100644 ports/monkeys-audio/vcpkg.json delete mode 100644 ports/moos-core/CONTROL create mode 100644 ports/moos-core/vcpkg.json delete mode 100644 ports/moos-essential/CONTROL create mode 100644 ports/moos-essential/vcpkg.json delete mode 100644 ports/moos-ui/CONTROL create mode 100644 ports/moos-ui/vcpkg.json delete mode 100644 ports/morton-nd/CONTROL create mode 100644 ports/morton-nd/vcpkg.json delete mode 100644 ports/mozjpeg/CONTROL create mode 100644 ports/mozjpeg/vcpkg.json delete mode 100644 ports/mp-units/CONTROL create mode 100644 ports/mp-units/vcpkg.json delete mode 100644 ports/mp3lame/CONTROL create mode 100644 ports/mp3lame/vcpkg.json delete mode 100644 ports/mpark-variant/CONTROL create mode 100644 ports/mpark-variant/vcpkg.json delete mode 100644 ports/mpc/CONTROL create mode 100644 ports/mpc/vcpkg.json delete mode 100644 ports/mpfr/CONTROL create mode 100644 ports/mpfr/vcpkg.json delete mode 100644 ports/mpi/CONTROL create mode 100644 ports/mpi/vcpkg.json delete mode 100644 ports/mpmcqueue/CONTROL create mode 100644 ports/mpmcqueue/vcpkg.json delete mode 100644 ports/mqtt-cpp/CONTROL create mode 100644 ports/mqtt-cpp/vcpkg.json delete mode 100644 ports/ms-angle/CONTROL create mode 100644 ports/ms-angle/vcpkg.json delete mode 100644 ports/ms-gsl/CONTROL create mode 100644 ports/ms-gsl/vcpkg.json delete mode 100644 ports/msgpack/CONTROL create mode 100644 ports/msgpack/vcpkg.json delete mode 100644 ports/msinttypes/CONTROL create mode 100644 ports/msinttypes/vcpkg.json delete mode 100644 ports/mstch/CONTROL create mode 100644 ports/mstch/vcpkg.json delete mode 100644 ports/mujs/CONTROL create mode 100644 ports/mujs/vcpkg.json delete mode 100644 ports/munit/CONTROL create mode 100644 ports/munit/vcpkg.json delete mode 100644 ports/muparser/CONTROL create mode 100644 ports/muparser/vcpkg.json delete mode 100644 ports/murmurhash/CONTROL create mode 100644 ports/murmurhash/vcpkg.json delete mode 100644 ports/mygui/CONTROL create mode 100644 ports/mygui/vcpkg.json delete mode 100644 ports/nameof/CONTROL create mode 100644 ports/nameof/vcpkg.json delete mode 100644 ports/nano-signal-slot/CONTROL create mode 100644 ports/nano-signal-slot/vcpkg.json delete mode 100644 ports/nanobench/CONTROL create mode 100644 ports/nanobench/vcpkg.json delete mode 100644 ports/nanoflann/CONTROL create mode 100644 ports/nanoflann/vcpkg.json delete mode 100644 ports/nanogui/CONTROL create mode 100644 ports/nanogui/vcpkg.json delete mode 100644 ports/nanomsg/CONTROL create mode 100644 ports/nanomsg/vcpkg.json delete mode 100644 ports/nanoprintf/CONTROL create mode 100644 ports/nanoprintf/vcpkg.json delete mode 100644 ports/nanorange/CONTROL create mode 100644 ports/nanorange/vcpkg.json delete mode 100644 ports/nanort/CONTROL create mode 100644 ports/nanort/vcpkg.json delete mode 100644 ports/nanovg/CONTROL create mode 100644 ports/nanovg/vcpkg.json delete mode 100644 ports/neargye-semver/CONTROL create mode 100644 ports/neargye-semver/vcpkg.json delete mode 100644 ports/ned14-internal-quickcpplib/CONTROL create mode 100644 ports/ned14-internal-quickcpplib/vcpkg.json delete mode 100644 ports/netcdf-cxx4/CONTROL create mode 100644 ports/netcdf-cxx4/vcpkg.json delete mode 100644 ports/nethost/CONTROL create mode 100644 ports/nethost/vcpkg.json delete mode 100644 ports/networkdirect-sdk/CONTROL create mode 100644 ports/networkdirect-sdk/vcpkg.json delete mode 100644 ports/nifticlib/CONTROL create mode 100644 ports/nifticlib/vcpkg.json delete mode 100644 ports/nlohmann-fifo-map/CONTROL create mode 100644 ports/nlohmann-fifo-map/vcpkg.json delete mode 100644 ports/nmslib/CONTROL create mode 100644 ports/nmslib/vcpkg.json delete mode 100644 ports/nngpp/CONTROL create mode 100644 ports/nngpp/vcpkg.json delete mode 100644 ports/nonius/CONTROL create mode 100644 ports/nonius/vcpkg.json delete mode 100644 ports/nrf-ble-driver/CONTROL create mode 100644 ports/nrf-ble-driver/vcpkg.json delete mode 100644 ports/nt-wrapper/CONTROL create mode 100644 ports/nt-wrapper/vcpkg.json delete mode 100644 ports/numactl/CONTROL create mode 100644 ports/numactl/vcpkg.json delete mode 100644 ports/nvtt/CONTROL create mode 100644 ports/nvtt/vcpkg.json delete mode 100644 ports/observer-ptr-lite/CONTROL create mode 100644 ports/observer-ptr-lite/vcpkg.json delete mode 100644 ports/octomap/CONTROL create mode 100644 ports/octomap/vcpkg.json delete mode 100644 ports/ode/CONTROL create mode 100644 ports/ode/vcpkg.json delete mode 100644 ports/offscale-libetcd-cpp/CONTROL create mode 100644 ports/offscale-libetcd-cpp/vcpkg.json delete mode 100644 ports/ogdf/CONTROL create mode 100644 ports/ogdf/vcpkg.json delete mode 100644 ports/ogre-next/CONTROL create mode 100644 ports/ogre-next/vcpkg.json delete mode 100644 ports/ompl/CONTROL create mode 100644 ports/ompl/vcpkg.json delete mode 100644 ports/oniguruma/CONTROL create mode 100644 ports/oniguruma/vcpkg.json delete mode 100644 ports/opencascade/CONTROL create mode 100644 ports/opencascade/vcpkg.json delete mode 100644 ports/opencc/CONTROL create mode 100644 ports/opencc/vcpkg.json delete mode 100644 ports/opencensus-cpp/CONTROL create mode 100644 ports/opencensus-cpp/vcpkg.json delete mode 100644 ports/opencl/CONTROL create mode 100644 ports/opencl/vcpkg.json delete mode 100644 ports/opencsg/CONTROL create mode 100644 ports/opencsg/vcpkg.json delete mode 100644 ports/opengl-registry/CONTROL create mode 100644 ports/opengl-registry/vcpkg.json delete mode 100644 ports/opengl/CONTROL create mode 100644 ports/opengl/vcpkg.json delete mode 100644 ports/openigtlink/CONTROL create mode 100644 ports/openigtlink/vcpkg.json delete mode 100644 ports/openmesh/CONTROL create mode 100644 ports/openmesh/vcpkg.json delete mode 100644 ports/openmpi/CONTROL create mode 100644 ports/openmpi/vcpkg.json delete mode 100644 ports/openmvs/CONTROL create mode 100644 ports/openmvs/vcpkg.json delete mode 100644 ports/openni2/CONTROL create mode 100644 ports/openni2/vcpkg.json delete mode 100644 ports/openscap/CONTROL create mode 100644 ports/openscap/vcpkg.json delete mode 100644 ports/openssl-unix/CONTROL create mode 100644 ports/openssl-unix/vcpkg.json delete mode 100644 ports/openssl-uwp/CONTROL create mode 100644 ports/openssl-uwp/vcpkg.json delete mode 100644 ports/openssl-windows/CONTROL create mode 100644 ports/openssl-windows/vcpkg.json delete mode 100644 ports/openvpn3/CONTROL create mode 100644 ports/openvpn3/vcpkg.json delete mode 100644 ports/openvr/CONTROL create mode 100644 ports/openvr/vcpkg.json delete mode 100644 ports/openxr-loader/CONTROL create mode 100644 ports/openxr-loader/vcpkg.json delete mode 100644 ports/optional-bare/CONTROL create mode 100644 ports/optional-bare/vcpkg.json delete mode 100644 ports/optional-lite/CONTROL create mode 100644 ports/optional-lite/vcpkg.json delete mode 100644 ports/opus/CONTROL create mode 100644 ports/opus/vcpkg.json delete mode 100644 ports/opusfile/CONTROL create mode 100644 ports/opusfile/vcpkg.json delete mode 100644 ports/orc/CONTROL create mode 100644 ports/orc/vcpkg.json delete mode 100644 ports/osg-qt/CONTROL create mode 100644 ports/osg-qt/vcpkg.json delete mode 100644 ports/osg/CONTROL create mode 100644 ports/osg/vcpkg.json delete mode 100644 ports/osi/CONTROL create mode 100644 ports/osi/vcpkg.json delete mode 100644 ports/outcome/CONTROL create mode 100644 ports/outcome/vcpkg.json delete mode 100644 ports/p-ranav-csv/CONTROL create mode 100644 ports/p-ranav-csv/vcpkg.json delete mode 100644 ports/p-ranav-csv2/CONTROL create mode 100644 ports/p-ranav-csv2/vcpkg.json delete mode 100644 ports/parallel-hashmap/CONTROL create mode 100644 ports/parallel-hashmap/vcpkg.json delete mode 100644 ports/parallelstl/CONTROL create mode 100644 ports/parallelstl/vcpkg.json delete mode 100644 ports/parmetis/CONTROL create mode 100644 ports/parmetis/vcpkg.json delete mode 100644 ports/parquet/CONTROL create mode 100644 ports/parquet/vcpkg.json delete mode 100644 ports/parson/CONTROL create mode 100644 ports/parson/vcpkg.json delete mode 100644 ports/pbc/CONTROL create mode 100644 ports/pbc/vcpkg.json delete mode 100644 ports/pcg/CONTROL create mode 100644 ports/pcg/vcpkg.json delete mode 100644 ports/pdal-c/CONTROL create mode 100644 ports/pdal-c/vcpkg.json delete mode 100644 ports/pdal/CONTROL create mode 100644 ports/pdal/vcpkg.json delete mode 100644 ports/pdcurses/CONTROL create mode 100644 ports/pdcurses/vcpkg.json delete mode 100644 ports/pdqsort/CONTROL create mode 100644 ports/pdqsort/vcpkg.json delete mode 100644 ports/pe-parse/CONTROL create mode 100644 ports/pe-parse/vcpkg.json delete mode 100644 ports/pegtl-2/CONTROL create mode 100644 ports/pegtl-2/vcpkg.json delete mode 100644 ports/pegtl/CONTROL create mode 100644 ports/pegtl/vcpkg.json delete mode 100644 ports/pfring/CONTROL create mode 100644 ports/pfring/vcpkg.json delete mode 100644 ports/pfultz2-linq/CONTROL create mode 100644 ports/pfultz2-linq/vcpkg.json delete mode 100644 ports/picojson/CONTROL create mode 100644 ports/picojson/vcpkg.json delete mode 100644 ports/picosha2/CONTROL create mode 100644 ports/picosha2/vcpkg.json delete mode 100644 ports/piex/CONTROL create mode 100644 ports/piex/vcpkg.json delete mode 100644 ports/pixel/CONTROL create mode 100644 ports/pixel/vcpkg.json delete mode 100644 ports/platform-folders/CONTROL create mode 100644 ports/platform-folders/vcpkg.json delete mode 100644 ports/plf-list/CONTROL create mode 100644 ports/plf-list/vcpkg.json delete mode 100644 ports/plf-nanotimer/CONTROL create mode 100644 ports/plf-nanotimer/vcpkg.json delete mode 100644 ports/plf-stack/CONTROL create mode 100644 ports/plf-stack/vcpkg.json delete mode 100644 ports/plib/CONTROL create mode 100644 ports/plib/vcpkg.json delete mode 100644 ports/plibsys/CONTROL create mode 100644 ports/plibsys/vcpkg.json delete mode 100644 ports/plog/CONTROL create mode 100644 ports/plog/vcpkg.json delete mode 100644 ports/plustache/CONTROL create mode 100644 ports/plustache/vcpkg.json delete mode 100644 ports/pngwriter/CONTROL create mode 100644 ports/pngwriter/vcpkg.json delete mode 100644 ports/poly2tri/CONTROL create mode 100644 ports/poly2tri/vcpkg.json delete mode 100644 ports/polyclipping/CONTROL create mode 100644 ports/polyclipping/vcpkg.json delete mode 100644 ports/polyhook2/CONTROL create mode 100644 ports/polyhook2/vcpkg.json delete mode 100644 ports/polymorphic-value/CONTROL create mode 100644 ports/polymorphic-value/vcpkg.json delete mode 100644 ports/ponder/CONTROL create mode 100644 ports/ponder/vcpkg.json delete mode 100644 ports/portable-snippets/CONTROL create mode 100644 ports/portable-snippets/vcpkg.json delete mode 100644 ports/ppconsul/CONTROL create mode 100644 ports/ppconsul/vcpkg.json delete mode 100644 ports/ppmagic/CONTROL create mode 100644 ports/ppmagic/vcpkg.json delete mode 100644 ports/pprint/CONTROL create mode 100644 ports/pprint/vcpkg.json delete mode 100644 ports/pqp/CONTROL create mode 100644 ports/pqp/vcpkg.json delete mode 100644 ports/proj/CONTROL create mode 100644 ports/proj/vcpkg.json delete mode 100644 ports/prometheus-cpp/CONTROL create mode 100644 ports/prometheus-cpp/vcpkg.json delete mode 100644 ports/protobuf-c/CONTROL create mode 100644 ports/protobuf-c/vcpkg.json delete mode 100644 ports/pthread/CONTROL create mode 100644 ports/pthread/vcpkg.json delete mode 100644 ports/pugixml/CONTROL create mode 100644 ports/pugixml/vcpkg.json delete mode 100644 ports/qca/CONTROL create mode 100644 ports/qca/vcpkg.json delete mode 100644 ports/qhull/CONTROL create mode 100644 ports/qhull/vcpkg.json delete mode 100644 ports/qpid-proton/CONTROL create mode 100644 ports/qpid-proton/vcpkg.json delete mode 100644 ports/qt-advanced-docking-system/CONTROL create mode 100644 ports/qt-advanced-docking-system/vcpkg.json delete mode 100644 ports/qt5-3d/CONTROL create mode 100644 ports/qt5-3d/vcpkg.json delete mode 100644 ports/qt5-activeqt/CONTROL create mode 100644 ports/qt5-activeqt/vcpkg.json delete mode 100644 ports/qt5-androidextras/CONTROL create mode 100644 ports/qt5-androidextras/vcpkg.json delete mode 100644 ports/qt5-canvas3d/CONTROL create mode 100644 ports/qt5-canvas3d/vcpkg.json delete mode 100644 ports/qt5-charts/CONTROL create mode 100644 ports/qt5-charts/vcpkg.json delete mode 100644 ports/qt5-connectivity/CONTROL create mode 100644 ports/qt5-connectivity/vcpkg.json delete mode 100644 ports/qt5-datavis3d/CONTROL create mode 100644 ports/qt5-datavis3d/vcpkg.json delete mode 100644 ports/qt5-declarative/CONTROL create mode 100644 ports/qt5-declarative/vcpkg.json delete mode 100644 ports/qt5-doc/CONTROL create mode 100644 ports/qt5-doc/vcpkg.json delete mode 100644 ports/qt5-gamepad/CONTROL create mode 100644 ports/qt5-gamepad/vcpkg.json delete mode 100644 ports/qt5-graphicaleffects/CONTROL create mode 100644 ports/qt5-graphicaleffects/vcpkg.json delete mode 100644 ports/qt5-imageformats/CONTROL create mode 100644 ports/qt5-imageformats/vcpkg.json delete mode 100644 ports/qt5-location/CONTROL create mode 100644 ports/qt5-location/vcpkg.json delete mode 100644 ports/qt5-macextras/CONTROL create mode 100644 ports/qt5-macextras/vcpkg.json delete mode 100644 ports/qt5-modularscripts/CONTROL create mode 100644 ports/qt5-modularscripts/vcpkg.json delete mode 100644 ports/qt5-multimedia/CONTROL create mode 100644 ports/qt5-multimedia/vcpkg.json delete mode 100644 ports/qt5-networkauth/CONTROL create mode 100644 ports/qt5-networkauth/vcpkg.json delete mode 100644 ports/qt5-purchasing/CONTROL create mode 100644 ports/qt5-purchasing/vcpkg.json delete mode 100644 ports/qt5-quickcontrols/CONTROL create mode 100644 ports/qt5-quickcontrols/vcpkg.json delete mode 100644 ports/qt5-quickcontrols2/CONTROL create mode 100644 ports/qt5-quickcontrols2/vcpkg.json delete mode 100644 ports/qt5-remoteobjects/CONTROL create mode 100644 ports/qt5-remoteobjects/vcpkg.json delete mode 100644 ports/qt5-script/CONTROL create mode 100644 ports/qt5-script/vcpkg.json delete mode 100644 ports/qt5-scxml/CONTROL create mode 100644 ports/qt5-scxml/vcpkg.json delete mode 100644 ports/qt5-sensors/CONTROL create mode 100644 ports/qt5-sensors/vcpkg.json delete mode 100644 ports/qt5-serialbus/CONTROL create mode 100644 ports/qt5-serialbus/vcpkg.json delete mode 100644 ports/qt5-serialport/CONTROL create mode 100644 ports/qt5-serialport/vcpkg.json delete mode 100644 ports/qt5-speech/CONTROL create mode 100644 ports/qt5-speech/vcpkg.json delete mode 100644 ports/qt5-svg/CONTROL create mode 100644 ports/qt5-svg/vcpkg.json delete mode 100644 ports/qt5-tools/CONTROL create mode 100644 ports/qt5-tools/vcpkg.json delete mode 100644 ports/qt5-translations/CONTROL create mode 100644 ports/qt5-translations/vcpkg.json delete mode 100644 ports/qt5-virtualkeyboard/CONTROL create mode 100644 ports/qt5-virtualkeyboard/vcpkg.json delete mode 100644 ports/qt5-webchannel/CONTROL create mode 100644 ports/qt5-webchannel/vcpkg.json delete mode 100644 ports/qt5-webengine/CONTROL create mode 100644 ports/qt5-webengine/vcpkg.json delete mode 100644 ports/qt5-webglplugin/CONTROL create mode 100644 ports/qt5-webglplugin/vcpkg.json delete mode 100644 ports/qt5-websockets/CONTROL create mode 100644 ports/qt5-websockets/vcpkg.json delete mode 100644 ports/qt5-webview/CONTROL create mode 100644 ports/qt5-webview/vcpkg.json delete mode 100644 ports/qt5-winextras/CONTROL create mode 100644 ports/qt5-winextras/vcpkg.json delete mode 100644 ports/qt5-x11extras/CONTROL create mode 100644 ports/qt5-x11extras/vcpkg.json delete mode 100644 ports/qt5-xmlpatterns/CONTROL create mode 100644 ports/qt5-xmlpatterns/vcpkg.json delete mode 100644 ports/qt5/CONTROL create mode 100644 ports/qt5/vcpkg.json delete mode 100644 ports/qtkeychain/CONTROL create mode 100644 ports/qtkeychain/vcpkg.json delete mode 100644 ports/quadtree/CONTROL create mode 100644 ports/quadtree/vcpkg.json delete mode 100644 ports/quaternions/CONTROL create mode 100644 ports/quaternions/vcpkg.json delete mode 100644 ports/quazip/CONTROL create mode 100644 ports/quazip/vcpkg.json delete mode 100644 ports/quickfast/CONTROL create mode 100644 ports/quickfast/vcpkg.json delete mode 100644 ports/quickfix/CONTROL create mode 100644 ports/quickfix/vcpkg.json delete mode 100644 ports/qwtw/CONTROL create mode 100644 ports/qwtw/vcpkg.json delete mode 100644 ports/rabit/CONTROL create mode 100644 ports/rabit/vcpkg.json delete mode 100644 ports/ragel/CONTROL create mode 100644 ports/ragel/vcpkg.json delete mode 100644 ports/rang/CONTROL create mode 100644 ports/rang/vcpkg.json delete mode 100644 ports/range-v3-vs2015/CONTROL create mode 100644 ports/range-v3-vs2015/vcpkg.json delete mode 100644 ports/range-v3/CONTROL create mode 100644 ports/range-v3/vcpkg.json delete mode 100644 ports/rapidcheck/CONTROL create mode 100644 ports/rapidcheck/vcpkg.json delete mode 100644 ports/rapidxml-ns/CONTROL create mode 100644 ports/rapidxml-ns/vcpkg.json delete mode 100644 ports/rapidxml/CONTROL create mode 100644 ports/rapidxml/vcpkg.json delete mode 100644 ports/re2/CONTROL create mode 100644 ports/re2/vcpkg.json delete mode 100644 ports/readline-win32/CONTROL create mode 100644 ports/readline-win32/vcpkg.json delete mode 100644 ports/readline/CONTROL create mode 100644 ports/readline/vcpkg.json delete mode 100644 ports/readosm/CONTROL create mode 100644 ports/readosm/vcpkg.json delete mode 100644 ports/refl-cpp/CONTROL create mode 100644 ports/refl-cpp/vcpkg.json delete mode 100644 ports/refprop-headers/CONTROL create mode 100644 ports/refprop-headers/vcpkg.json delete mode 100644 ports/replxx/CONTROL create mode 100644 ports/replxx/vcpkg.json delete mode 100644 ports/reproc/CONTROL create mode 100644 ports/reproc/vcpkg.json delete mode 100644 ports/rest-rpc/CONTROL create mode 100644 ports/rest-rpc/vcpkg.json delete mode 100644 ports/restclient-cpp/CONTROL create mode 100644 ports/restclient-cpp/vcpkg.json delete mode 100644 ports/rhash/CONTROL create mode 100644 ports/rhash/vcpkg.json delete mode 100644 ports/riffcpp/CONTROL create mode 100644 ports/riffcpp/vcpkg.json delete mode 100644 ports/ring-span-lite/CONTROL create mode 100644 ports/ring-span-lite/vcpkg.json delete mode 100644 ports/roaring/CONTROL create mode 100644 ports/roaring/vcpkg.json delete mode 100644 ports/rocksdb/CONTROL create mode 100644 ports/rocksdb/vcpkg.json delete mode 100644 ports/rpclib/CONTROL create mode 100644 ports/rpclib/vcpkg.json delete mode 100644 ports/rply/CONTROL create mode 100644 ports/rply/vcpkg.json delete mode 100644 ports/rs-core-lib/CONTROL create mode 100644 ports/rs-core-lib/vcpkg.json delete mode 100644 ports/rsocket/CONTROL create mode 100644 ports/rsocket/vcpkg.json delete mode 100644 ports/rtlsdr/CONTROL create mode 100644 ports/rtlsdr/vcpkg.json delete mode 100644 ports/rttr/CONTROL create mode 100644 ports/rttr/vcpkg.json delete mode 100644 ports/rxcpp/CONTROL create mode 100644 ports/rxcpp/vcpkg.json delete mode 100644 ports/rxqt/CONTROL create mode 100644 ports/rxqt/vcpkg.json delete mode 100644 ports/sais/CONTROL create mode 100644 ports/sais/vcpkg.json delete mode 100644 ports/sajson/CONTROL create mode 100644 ports/sajson/vcpkg.json delete mode 100644 ports/sassc/CONTROL create mode 100644 ports/sassc/vcpkg.json delete mode 100644 ports/sciter/CONTROL create mode 100644 ports/sciter/vcpkg.json delete mode 100644 ports/scnlib/CONTROL create mode 100644 ports/scnlib/vcpkg.json delete mode 100644 ports/scylla-wrapper/CONTROL create mode 100644 ports/scylla-wrapper/vcpkg.json delete mode 100644 ports/sdformat10/CONTROL create mode 100644 ports/sdformat10/vcpkg.json delete mode 100644 ports/sdformat9/CONTROL create mode 100644 ports/sdformat9/vcpkg.json delete mode 100644 ports/sdl1-net/CONTROL create mode 100644 ports/sdl1-net/vcpkg.json delete mode 100644 ports/sdl1/CONTROL create mode 100644 ports/sdl1/vcpkg.json delete mode 100644 ports/sdl2-gfx/CONTROL create mode 100644 ports/sdl2-gfx/vcpkg.json delete mode 100644 ports/sdl2-image/CONTROL create mode 100644 ports/sdl2-image/vcpkg.json delete mode 100644 ports/sdl2-net/CONTROL create mode 100644 ports/sdl2-net/vcpkg.json delete mode 100644 ports/sdl2-ttf/CONTROL create mode 100644 ports/sdl2-ttf/vcpkg.json delete mode 100644 ports/sdl2pp/CONTROL create mode 100644 ports/sdl2pp/vcpkg.json delete mode 100644 ports/secp256k1/CONTROL create mode 100644 ports/secp256k1/vcpkg.json delete mode 100644 ports/septag-sx/CONTROL create mode 100644 ports/septag-sx/vcpkg.json delete mode 100644 ports/seqan/CONTROL create mode 100644 ports/seqan/vcpkg.json delete mode 100644 ports/sf2cute/CONTROL create mode 100644 ports/sf2cute/vcpkg.json delete mode 100644 ports/sfgui/CONTROL create mode 100644 ports/sfgui/vcpkg.json delete mode 100644 ports/sfsexp/CONTROL create mode 100644 ports/sfsexp/vcpkg.json delete mode 100644 ports/shapelib/CONTROL create mode 100644 ports/shapelib/vcpkg.json delete mode 100644 ports/shiva-sfml/CONTROL create mode 100644 ports/shiva-sfml/vcpkg.json delete mode 100644 ports/shiva/CONTROL create mode 100644 ports/shiva/vcpkg.json delete mode 100644 ports/shogun/CONTROL create mode 100644 ports/shogun/vcpkg.json delete mode 100644 ports/signalrclient/CONTROL create mode 100644 ports/signalrclient/vcpkg.json delete mode 100644 ports/sigslot/CONTROL create mode 100644 ports/sigslot/vcpkg.json delete mode 100644 ports/simde/CONTROL create mode 100644 ports/simde/vcpkg.json delete mode 100644 ports/simple-fft/CONTROL create mode 100644 ports/simple-fft/vcpkg.json delete mode 100644 ports/simpleini/CONTROL create mode 100644 ports/simpleini/vcpkg.json delete mode 100644 ports/skia/CONTROL create mode 100644 ports/skia/vcpkg.json delete mode 100644 ports/skyr-url/CONTROL create mode 100644 ports/skyr-url/vcpkg.json delete mode 100644 ports/smpeg2/CONTROL create mode 100644 ports/smpeg2/vcpkg.json delete mode 100644 ports/snappy/CONTROL create mode 100644 ports/snappy/vcpkg.json delete mode 100644 ports/sndfile/CONTROL create mode 100644 ports/sndfile/vcpkg.json delete mode 100644 ports/snowhouse/CONTROL create mode 100644 ports/snowhouse/vcpkg.json delete mode 100644 ports/sockpp/CONTROL create mode 100644 ports/sockpp/vcpkg.json delete mode 100644 ports/sokol/CONTROL create mode 100644 ports/sokol/vcpkg.json delete mode 100644 ports/sol2/CONTROL create mode 100644 ports/sol2/vcpkg.json delete mode 100644 ports/solid3/CONTROL create mode 100644 ports/solid3/vcpkg.json delete mode 100644 ports/soqt/CONTROL create mode 100644 ports/soqt/vcpkg.json delete mode 100644 ports/soundtouch/CONTROL create mode 100644 ports/soundtouch/vcpkg.json delete mode 100644 ports/soxr/CONTROL create mode 100644 ports/soxr/vcpkg.json delete mode 100644 ports/spaceland/CONTROL create mode 100644 ports/spaceland/vcpkg.json delete mode 100644 ports/sparsehash/CONTROL create mode 100644 ports/sparsehash/vcpkg.json delete mode 100644 ports/sparsepp/CONTROL create mode 100644 ports/sparsepp/vcpkg.json delete mode 100644 ports/spatialite-tools/CONTROL create mode 100644 ports/spatialite-tools/vcpkg.json delete mode 100644 ports/spdk-dpdk/CONTROL create mode 100644 ports/spdk-dpdk/vcpkg.json delete mode 100644 ports/spdk-ipsec/CONTROL create mode 100644 ports/spdk-ipsec/vcpkg.json delete mode 100644 ports/spdk-isal/CONTROL create mode 100644 ports/spdk-isal/vcpkg.json delete mode 100644 ports/spdk/CONTROL create mode 100644 ports/spdk/vcpkg.json delete mode 100644 ports/speex/CONTROL create mode 100644 ports/speex/vcpkg.json delete mode 100644 ports/speexdsp/CONTROL create mode 100644 ports/speexdsp/vcpkg.json delete mode 100644 ports/spirit-po/CONTROL create mode 100644 ports/spirit-po/vcpkg.json delete mode 100644 ports/sprout/CONTROL create mode 100644 ports/sprout/vcpkg.json delete mode 100644 ports/spscqueue/CONTROL create mode 100644 ports/spscqueue/vcpkg.json delete mode 100644 ports/sqlite-modern-cpp/CONTROL create mode 100644 ports/sqlite-modern-cpp/vcpkg.json delete mode 100644 ports/sqlite-orm/CONTROL create mode 100644 ports/sqlite-orm/vcpkg.json delete mode 100644 ports/sqlpp11-connector-mysql/CONTROL create mode 100644 ports/sqlpp11-connector-mysql/vcpkg.json delete mode 100644 ports/sqlpp11-connector-sqlite3/CONTROL create mode 100644 ports/sqlpp11-connector-sqlite3/vcpkg.json delete mode 100644 ports/sqlpp11/CONTROL create mode 100644 ports/sqlpp11/vcpkg.json delete mode 100644 ports/status-code/CONTROL create mode 100644 ports/status-code/vcpkg.json delete mode 100644 ports/status-value-lite/CONTROL create mode 100644 ports/status-value-lite/vcpkg.json delete mode 100644 ports/stb/CONTROL create mode 100644 ports/stb/vcpkg.json delete mode 100644 ports/stlab/CONTROL create mode 100644 ports/stlab/vcpkg.json delete mode 100644 ports/stormlib/CONTROL create mode 100644 ports/stormlib/vcpkg.json delete mode 100644 ports/strict-variant/CONTROL create mode 100644 ports/strict-variant/vcpkg.json delete mode 100644 ports/string-theory/CONTROL create mode 100644 ports/string-theory/vcpkg.json delete mode 100644 ports/string-view-lite/CONTROL create mode 100644 ports/string-view-lite/vcpkg.json delete mode 100644 ports/strtk/CONTROL create mode 100644 ports/strtk/vcpkg.json delete mode 100644 ports/stx/CONTROL create mode 100644 ports/stx/vcpkg.json delete mode 100644 ports/stxxl/CONTROL create mode 100644 ports/stxxl/vcpkg.json delete mode 100644 ports/superlu/CONTROL create mode 100644 ports/superlu/vcpkg.json delete mode 100644 ports/systemc/CONTROL create mode 100644 ports/systemc/vcpkg.json delete mode 100644 ports/tabulate/CONTROL create mode 100644 ports/tabulate/vcpkg.json delete mode 100644 ports/tacopie/CONTROL create mode 100644 ports/tacopie/vcpkg.json delete mode 100644 ports/taocpp-json/CONTROL create mode 100644 ports/taocpp-json/vcpkg.json delete mode 100644 ports/tap-windows6/CONTROL create mode 100644 ports/tap-windows6/vcpkg.json delete mode 100644 ports/tbb/CONTROL create mode 100644 ports/tbb/vcpkg.json delete mode 100644 ports/tcl/CONTROL create mode 100644 ports/tcl/vcpkg.json delete mode 100644 ports/tclap/CONTROL create mode 100644 ports/tclap/vcpkg.json delete mode 100644 ports/teemo/CONTROL create mode 100644 ports/teemo/vcpkg.json delete mode 100644 ports/telnetpp/CONTROL create mode 100644 ports/telnetpp/vcpkg.json delete mode 100644 ports/tgbot-cpp/CONTROL create mode 100644 ports/tgbot-cpp/vcpkg.json delete mode 100644 ports/tgc/CONTROL create mode 100644 ports/tgc/vcpkg.json delete mode 100644 ports/theia/CONTROL create mode 100644 ports/theia/vcpkg.json delete mode 100644 ports/think-cell-range/CONTROL create mode 100644 ports/think-cell-range/vcpkg.json delete mode 100644 ports/threadpool/CONTROL create mode 100644 ports/threadpool/vcpkg.json delete mode 100644 ports/thrift/CONTROL create mode 100644 ports/thrift/vcpkg.json delete mode 100644 ports/tidy-html5/CONTROL create mode 100644 ports/tidy-html5/vcpkg.json delete mode 100644 ports/tinkerforge/CONTROL create mode 100644 ports/tinkerforge/vcpkg.json delete mode 100644 ports/tiny-aes-c/CONTROL create mode 100644 ports/tiny-aes-c/vcpkg.json delete mode 100644 ports/tiny-bignum-c/CONTROL create mode 100644 ports/tiny-bignum-c/vcpkg.json delete mode 100644 ports/tiny-dnn/CONTROL create mode 100644 ports/tiny-dnn/vcpkg.json delete mode 100644 ports/tiny-process-library/CONTROL create mode 100644 ports/tiny-process-library/vcpkg.json delete mode 100644 ports/tiny-regex-c/CONTROL create mode 100644 ports/tiny-regex-c/vcpkg.json delete mode 100644 ports/tinycthread/CONTROL create mode 100644 ports/tinycthread/vcpkg.json delete mode 100644 ports/tinydir/CONTROL create mode 100644 ports/tinydir/vcpkg.json delete mode 100644 ports/tinyexif/CONTROL create mode 100644 ports/tinyexif/vcpkg.json delete mode 100644 ports/tinyexr/CONTROL create mode 100644 ports/tinyexr/vcpkg.json delete mode 100644 ports/tinygltf/CONTROL create mode 100644 ports/tinygltf/vcpkg.json delete mode 100644 ports/tinynpy/CONTROL create mode 100644 ports/tinynpy/vcpkg.json delete mode 100644 ports/tinyobjloader/CONTROL create mode 100644 ports/tinyobjloader/vcpkg.json delete mode 100644 ports/tinyply/CONTROL create mode 100644 ports/tinyply/vcpkg.json delete mode 100644 ports/tinyspline/CONTROL create mode 100644 ports/tinyspline/vcpkg.json delete mode 100644 ports/tinythread/CONTROL create mode 100644 ports/tinythread/vcpkg.json delete mode 100644 ports/tinytoml/CONTROL create mode 100644 ports/tinytoml/vcpkg.json delete mode 100644 ports/tinyutf8/CONTROL create mode 100644 ports/tinyutf8/vcpkg.json delete mode 100644 ports/tinyxml/CONTROL create mode 100644 ports/tinyxml/vcpkg.json delete mode 100644 ports/tinyxml2/CONTROL create mode 100644 ports/tinyxml2/vcpkg.json delete mode 100644 ports/tl-expected/CONTROL create mode 100644 ports/tl-expected/vcpkg.json delete mode 100644 ports/tl-function-ref/CONTROL create mode 100644 ports/tl-function-ref/vcpkg.json delete mode 100644 ports/tl-optional/CONTROL create mode 100644 ports/tl-optional/vcpkg.json delete mode 100644 ports/tlx/CONTROL create mode 100644 ports/tlx/vcpkg.json delete mode 100644 ports/tmx/CONTROL create mode 100644 ports/tmx/vcpkg.json delete mode 100644 ports/tmxlite/CONTROL create mode 100644 ports/tmxlite/vcpkg.json delete mode 100644 ports/tmxparser/CONTROL create mode 100644 ports/tmxparser/vcpkg.json delete mode 100644 ports/toml11/CONTROL create mode 100644 ports/toml11/vcpkg.json delete mode 100644 ports/tomlplusplus/CONTROL create mode 100644 ports/tomlplusplus/vcpkg.json delete mode 100644 ports/torch-th/CONTROL create mode 100644 ports/torch-th/vcpkg.json delete mode 100644 ports/tre/CONTROL create mode 100644 ports/tre/vcpkg.json delete mode 100644 ports/treehopper/CONTROL create mode 100644 ports/treehopper/vcpkg.json delete mode 100644 ports/triangle/CONTROL create mode 100644 ports/triangle/vcpkg.json delete mode 100644 ports/trompeloeil/CONTROL create mode 100644 ports/trompeloeil/vcpkg.json delete mode 100644 ports/tsl-hopscotch-map/CONTROL create mode 100644 ports/tsl-hopscotch-map/vcpkg.json delete mode 100644 ports/tsl-ordered-map/CONTROL create mode 100644 ports/tsl-ordered-map/vcpkg.json delete mode 100644 ports/tsl-sparse-map/CONTROL create mode 100644 ports/tsl-sparse-map/vcpkg.json delete mode 100644 ports/turbobase64/CONTROL create mode 100644 ports/turbobase64/vcpkg.json delete mode 100644 ports/type-lite/CONTROL create mode 100644 ports/type-lite/vcpkg.json delete mode 100644 ports/uchardet/CONTROL create mode 100644 ports/uchardet/vcpkg.json delete mode 100644 ports/umock-c/CONTROL create mode 100644 ports/umock-c/vcpkg.json delete mode 100644 ports/unicorn-lib/CONTROL create mode 100644 ports/unicorn-lib/vcpkg.json delete mode 100644 ports/unicorn/CONTROL create mode 100644 ports/unicorn/vcpkg.json delete mode 100644 ports/units/CONTROL create mode 100644 ports/units/vcpkg.json delete mode 100644 ports/unixodbc/CONTROL create mode 100644 ports/unixodbc/vcpkg.json delete mode 100644 ports/unrar/CONTROL create mode 100644 ports/unrar/vcpkg.json delete mode 100644 ports/urdfdom-headers/CONTROL create mode 100644 ports/urdfdom-headers/vcpkg.json delete mode 100644 ports/urdfdom/CONTROL create mode 100644 ports/urdfdom/vcpkg.json delete mode 100644 ports/usbmuxd/CONTROL create mode 100644 ports/usbmuxd/vcpkg.json delete mode 100644 ports/usd/CONTROL create mode 100644 ports/usd/vcpkg.json delete mode 100644 ports/usrsctp/CONTROL create mode 100644 ports/usrsctp/vcpkg.json delete mode 100644 ports/utf8h/CONTROL create mode 100644 ports/utf8h/vcpkg.json delete mode 100644 ports/utfz/CONTROL create mode 100644 ports/utfz/vcpkg.json delete mode 100644 ports/uthenticode/CONTROL create mode 100644 ports/uthenticode/vcpkg.json delete mode 100644 ports/uvw/CONTROL create mode 100644 ports/uvw/vcpkg.json delete mode 100644 ports/v-hacd/CONTROL create mode 100644 ports/v-hacd/vcpkg.json delete mode 100644 ports/valijson/CONTROL create mode 100644 ports/valijson/vcpkg.json delete mode 100644 ports/variant-lite/CONTROL create mode 100644 ports/variant-lite/vcpkg.json delete mode 100644 ports/vc/CONTROL create mode 100644 ports/vc/vcpkg.json delete mode 100644 ports/vcglib/CONTROL create mode 100644 ports/vcglib/vcpkg.json delete mode 100644 ports/vcpkg-gfortran/CONTROL create mode 100644 ports/vcpkg-gfortran/vcpkg.json delete mode 100644 ports/vectorclass/CONTROL create mode 100644 ports/vectorclass/vcpkg.json delete mode 100644 ports/visit-struct/CONTROL create mode 100644 ports/visit-struct/vcpkg.json delete mode 100644 ports/vlfeat/CONTROL create mode 100644 ports/vlfeat/vcpkg.json delete mode 100644 ports/vlpp/CONTROL create mode 100644 ports/vlpp/vcpkg.json delete mode 100644 ports/volk/CONTROL create mode 100644 ports/volk/vcpkg.json delete mode 100644 ports/vtk-dicom/CONTROL create mode 100644 ports/vtk-dicom/vcpkg.json delete mode 100644 ports/vulkan-hpp/CONTROL create mode 100644 ports/vulkan-hpp/vcpkg.json delete mode 100644 ports/vulkan-memory-allocator/CONTROL create mode 100644 ports/vulkan-memory-allocator/vcpkg.json delete mode 100644 ports/vulkan/CONTROL create mode 100644 ports/vulkan/vcpkg.json delete mode 100644 ports/vxl/CONTROL create mode 100644 ports/vxl/vcpkg.json delete mode 100644 ports/wampcc/CONTROL create mode 100644 ports/wampcc/vcpkg.json delete mode 100644 ports/wavpack/CONTROL create mode 100644 ports/wavpack/vcpkg.json delete mode 100644 ports/wg21-sg14/CONTROL create mode 100644 ports/wg21-sg14/vcpkg.json delete mode 100644 ports/wil/CONTROL create mode 100644 ports/wil/vcpkg.json delete mode 100644 ports/wildmidi/CONTROL create mode 100644 ports/wildmidi/vcpkg.json delete mode 100644 ports/wincrypt/CONTROL create mode 100644 ports/wincrypt/vcpkg.json delete mode 100644 ports/winpcap/CONTROL create mode 100644 ports/winpcap/vcpkg.json delete mode 100644 ports/winreg/CONTROL create mode 100644 ports/winreg/vcpkg.json delete mode 100644 ports/winsock2/CONTROL create mode 100644 ports/winsock2/vcpkg.json delete mode 100644 ports/wintoast/CONTROL create mode 100644 ports/wintoast/vcpkg.json delete mode 100644 ports/woff2/CONTROL create mode 100644 ports/woff2/vcpkg.json delete mode 100644 ports/wordnet/CONTROL create mode 100644 ports/wordnet/vcpkg.json delete mode 100644 ports/wpilib/CONTROL create mode 100644 ports/wpilib/vcpkg.json delete mode 100644 ports/wren/CONTROL create mode 100644 ports/wren/vcpkg.json delete mode 100644 ports/wt/CONTROL create mode 100644 ports/wt/vcpkg.json delete mode 100644 ports/wtl/CONTROL create mode 100644 ports/wtl/vcpkg.json delete mode 100644 ports/x265/CONTROL create mode 100644 ports/x265/vcpkg.json delete mode 100644 ports/xerces-c/CONTROL create mode 100644 ports/xerces-c/vcpkg.json delete mode 100644 ports/xeus/CONTROL create mode 100644 ports/xeus/vcpkg.json delete mode 100644 ports/xframe/CONTROL create mode 100644 ports/xframe/vcpkg.json delete mode 100644 ports/xmsh/CONTROL create mode 100644 ports/xmsh/vcpkg.json delete mode 100644 ports/xproperty/CONTROL create mode 100644 ports/xproperty/vcpkg.json delete mode 100644 ports/xsimd/CONTROL create mode 100644 ports/xsimd/vcpkg.json delete mode 100644 ports/xtensor-blas/CONTROL create mode 100644 ports/xtensor-blas/vcpkg.json delete mode 100644 ports/xtensor-fftw/CONTROL create mode 100644 ports/xtensor-fftw/vcpkg.json delete mode 100644 ports/xxhash/CONTROL create mode 100644 ports/xxhash/vcpkg.json delete mode 100644 ports/yajl/CONTROL create mode 100644 ports/yajl/vcpkg.json delete mode 100644 ports/yas/CONTROL create mode 100644 ports/yas/vcpkg.json delete mode 100644 ports/yasm/CONTROL create mode 100644 ports/yasm/vcpkg.json delete mode 100644 ports/yato/CONTROL create mode 100644 ports/yato/vcpkg.json delete mode 100644 ports/yoga/CONTROL create mode 100644 ports/yoga/vcpkg.json delete mode 100644 ports/z85/CONTROL create mode 100644 ports/z85/vcpkg.json delete mode 100644 ports/zfp/CONTROL create mode 100644 ports/zfp/vcpkg.json delete mode 100644 ports/zkpp/CONTROL create mode 100644 ports/zkpp/vcpkg.json delete mode 100644 ports/zookeeper/CONTROL create mode 100644 ports/zookeeper/vcpkg.json delete mode 100644 ports/zopfli/CONTROL create mode 100644 ports/zopfli/vcpkg.json delete mode 100644 ports/zserge-webview/CONTROL create mode 100644 ports/zserge-webview/vcpkg.json delete mode 100644 ports/zstr/CONTROL create mode 100644 ports/zstr/vcpkg.json delete mode 100644 ports/zxing-cpp/CONTROL create mode 100644 ports/zxing-cpp/vcpkg.json delete mode 100644 ports/zydis/CONTROL create mode 100644 ports/zydis/vcpkg.json delete mode 100644 ports/zyre/CONTROL create mode 100644 ports/zyre/vcpkg.json delete mode 100644 ports/zziplib/CONTROL create mode 100644 ports/zziplib/vcpkg.json diff --git a/ports/7zip/CONTROL b/ports/7zip/CONTROL deleted file mode 100644 index b37fa18d186678..00000000000000 --- a/ports/7zip/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: 7zip -Version: 19.00 -Port-Version: 2 -Homepage: https://www.7-zip.org -Description: Library for archiving file with a high compression ratio. -Supports: !(linux|osx|arm|uwp) diff --git a/ports/7zip/vcpkg.json b/ports/7zip/vcpkg.json new file mode 100644 index 00000000000000..a8c7b6ce54dc00 --- /dev/null +++ b/ports/7zip/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "7zip", + "version-string": "19.00", + "port-version": 3, + "description": "Library for archiving file with a high compression ratio.", + "homepage": "https://www.7-zip.org", + "supports": "!(linux | osx | arm | uwp)" +} diff --git a/ports/absent/CONTROL b/ports/absent/CONTROL deleted file mode 100644 index 6d689b04a3f8c2..00000000000000 --- a/ports/absent/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: absent -Version: 0.3.1 -Homepage: https://github.com/rvarago/absent -Description: A small C++17 library meant to simplify the composition of nullable types in a generic, type-safe, and declarative way diff --git a/ports/absent/vcpkg.json b/ports/absent/vcpkg.json new file mode 100644 index 00000000000000..3f6ae21dcdd89d --- /dev/null +++ b/ports/absent/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "absent", + "version-string": "0.3.1", + "port-version": 1, + "description": "A small C++17 library meant to simplify the composition of nullable types in a generic, type-safe, and declarative way", + "homepage": "https://github.com/rvarago/absent" +} diff --git a/ports/ace/CONTROL b/ports/ace/CONTROL deleted file mode 100644 index a1d97bc527bbae..00000000000000 --- a/ports/ace/CONTROL +++ /dev/null @@ -1,22 +0,0 @@ -Source: ace -Version: 7.0.3 -Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html -Description: The ADAPTIVE Communication Environment -Port-Version: 0 - -Feature: wchar -Description: Enable extra wide char functions in ACE - -Feature: ssl -Description: Enable SSL/TLS features in ACE -Build-Depends: openssl - -Feature: xml -Description: Enable XML features in ACE - -Feature: zlib -Build-Depends: zlib -Description: Enable zlib support - -Feature: tao -Description: The ACE ORB diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json new file mode 100644 index 00000000000000..dd48feba3030c8 --- /dev/null +++ b/ports/ace/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "ace", + "version-string": "7.0.3", + "port-version": 1, + "description": "The ADAPTIVE Communication Environment", + "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", + "features": { + "ssl": { + "description": "Enable SSL/TLS features in ACE", + "dependencies": [ + "openssl" + ] + }, + "tao": { + "description": "The ACE ORB" + }, + "wchar": { + "description": "Enable extra wide char functions in ACE" + }, + "xml": { + "description": "Enable XML features in ACE" + }, + "zlib": { + "description": "Enable zlib support", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/activemq-cpp/CONTROL b/ports/activemq-cpp/CONTROL deleted file mode 100644 index 3d06d97151d1e0..00000000000000 --- a/ports/activemq-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: activemq-cpp -Version: 3.9.5-3 -Build-Depends: apr -Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server. -Supports: !(uwp|linux|osx) diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json new file mode 100644 index 00000000000000..f950dba6736f19 --- /dev/null +++ b/ports/activemq-cpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "activemq-cpp", + "version-string": "3.9.5", + "port-version": 4, + "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", + "supports": "!(uwp | linux | osx)", + "dependencies": [ + "apr" + ] +} diff --git a/ports/ade/CONTROL b/ports/ade/CONTROL deleted file mode 100644 index 2837ebad3cb1c0..00000000000000 --- a/ports/ade/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ade -Version: 0.1.1f -Port-Version: 1 -Description: ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution. diff --git a/ports/ade/vcpkg.json b/ports/ade/vcpkg.json new file mode 100644 index 00000000000000..53fb3606d73169 --- /dev/null +++ b/ports/ade/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ade", + "version-string": "0.1.1f", + "port-version": 2, + "description": "ADE Framework is a graph construction, manipulation, and processing framework. ADE Framework is suitable for organizing data flow processing and execution." +} diff --git a/ports/akali/CONTROL b/ports/akali/CONTROL deleted file mode 100644 index 333143ca969811..00000000000000 --- a/ports/akali/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: akali -Version: 1.42 -Port-Version: 1 -Description: C++ Common Library. -Homepage: https://github.com/winsoft666/akali -Supports: !(arm|arm64|uwp) diff --git a/ports/akali/vcpkg.json b/ports/akali/vcpkg.json new file mode 100644 index 00000000000000..fb1cc78517e26e --- /dev/null +++ b/ports/akali/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "akali", + "version-string": "1.42", + "port-version": 2, + "description": "C++ Common Library.", + "homepage": "https://github.com/winsoft666/akali", + "supports": "!(arm | arm64 | uwp)" +} diff --git a/ports/alac-decoder/CONTROL b/ports/alac-decoder/CONTROL deleted file mode 100644 index e9bc6f606c046b..00000000000000 --- a/ports/alac-decoder/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: alac-decoder -Version: 0.2 -Port-Version: 4 -Homepage: https://distfiles.macports.org/alac_decoder -Description: ALAC C implementation of a decoder, written from reverse engineering the file format diff --git a/ports/alac-decoder/vcpkg.json b/ports/alac-decoder/vcpkg.json new file mode 100644 index 00000000000000..b844541009bfca --- /dev/null +++ b/ports/alac-decoder/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "alac-decoder", + "version-string": "0.2", + "port-version": 5, + "description": "ALAC C implementation of a decoder, written from reverse engineering the file format", + "homepage": "https://distfiles.macports.org/alac_decoder" +} diff --git a/ports/alac/CONTROL b/ports/alac/CONTROL deleted file mode 100644 index 7938d6b7144dbf..00000000000000 --- a/ports/alac/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: alac -Version: 2017-11-03-c38887c5-1 -Homepage: https://github.com/macosforge/alac -Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices. -Supports: !uwp \ No newline at end of file diff --git a/ports/alac/vcpkg.json b/ports/alac/vcpkg.json new file mode 100644 index 00000000000000..74adbe459d0d26 --- /dev/null +++ b/ports/alac/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "alac", + "version-string": "2017-11-03-c38887c5", + "port-version": 2, + "description": "The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.", + "homepage": "https://github.com/macosforge/alac", + "supports": "!uwp" +} diff --git a/ports/aliyun-oss-c-sdk/CONTROL b/ports/aliyun-oss-c-sdk/CONTROL deleted file mode 100644 index 576ab1cb81453f..00000000000000 --- a/ports/aliyun-oss-c-sdk/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: aliyun-oss-c-sdk -Version: 3.10.0 -Description: Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability. -Build-Depends: curl, apr-util -Supports: !(uwp|linux|osx) diff --git a/ports/aliyun-oss-c-sdk/vcpkg.json b/ports/aliyun-oss-c-sdk/vcpkg.json new file mode 100644 index 00000000000000..3494e59994412a --- /dev/null +++ b/ports/aliyun-oss-c-sdk/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "aliyun-oss-c-sdk", + "version-string": "3.10.0", + "port-version": 1, + "description": "Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.", + "supports": "!(uwp | linux | osx)", + "dependencies": [ + "apr-util", + "curl" + ] +} diff --git a/ports/ampl-asl/CONTROL b/ports/ampl-asl/CONTROL deleted file mode 100644 index 93801f4a5b3c0f..00000000000000 --- a/ports/ampl-asl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ampl-asl -Version: 2020-11-11 -Homepage: https://github.com/ampl/asl -Description: AMPL Solver Library -Supports: !uwp \ No newline at end of file diff --git a/ports/ampl-asl/vcpkg.json b/ports/ampl-asl/vcpkg.json new file mode 100644 index 00000000000000..5a9827dfdb2596 --- /dev/null +++ b/ports/ampl-asl/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "ampl-asl", + "version-string": "2020-11-11", + "port-version": 1, + "description": "AMPL Solver Library", + "homepage": "https://github.com/ampl/asl", + "supports": "!uwp" +} diff --git a/ports/anax/CONTROL b/ports/anax/CONTROL deleted file mode 100644 index a672637cf6858a..00000000000000 --- a/ports/anax/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: anax -Version: 2.1.0-6 -Description: An open source C++ entity system. -Homepage: https://github.com/miguelmartin75/anax diff --git a/ports/anax/vcpkg.json b/ports/anax/vcpkg.json new file mode 100644 index 00000000000000..1b44cd38d6e519 --- /dev/null +++ b/ports/anax/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "anax", + "version-string": "2.1.0", + "port-version": 7, + "description": "An open source C++ entity system.", + "homepage": "https://github.com/miguelmartin75/anax" +} diff --git a/ports/antlr4/CONTROL b/ports/antlr4/CONTROL deleted file mode 100644 index 64287d02b98440..00000000000000 --- a/ports/antlr4/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: antlr4 -Version: 4.9.1 -Homepage: https://www.antlr.org -Description: ANother Tool for Language Recognition -Build-Depends: libuuid (!uwp&!windows&!osx) -Supports: !uwp diff --git a/ports/antlr4/vcpkg.json b/ports/antlr4/vcpkg.json new file mode 100644 index 00000000000000..22a33dc30588e8 --- /dev/null +++ b/ports/antlr4/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "antlr4", + "version-string": "4.9.1", + "port-version": 1, + "description": "ANother Tool for Language Recognition", + "homepage": "https://www.antlr.org", + "supports": "!uwp", + "dependencies": [ + { + "name": "libuuid", + "platform": "!uwp & !windows & !osx" + } + ] +} diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL deleted file mode 100644 index c419c43324d64f..00000000000000 --- a/ports/apr-util/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: apr-util -Version: 1.6.1 -Port-Version: 3 -Homepage: https://apr.apache.org/ -Description: Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation -Build-Depends: expat, apr, openssl diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json new file mode 100644 index 00000000000000..aa7937210aa20c --- /dev/null +++ b/ports/apr-util/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "apr-util", + "version-string": "1.6.1", + "port-version": 4, + "description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation", + "homepage": "https://apr.apache.org/", + "dependencies": [ + "apr", + "expat", + "openssl" + ] +} diff --git a/ports/arb/CONTROL b/ports/arb/CONTROL deleted file mode 100644 index 5e75c8b3530f20..00000000000000 --- a/ports/arb/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: arb -Version: 2.18.1 -Homepage: https://github.com/fredrik-johansson/arb -Description: a C library for arbitrary-precision interval arithmetic -Build-Depends: flint diff --git a/ports/arb/vcpkg.json b/ports/arb/vcpkg.json new file mode 100644 index 00000000000000..142abb7b9bc502 --- /dev/null +++ b/ports/arb/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "arb", + "version-string": "2.18.1", + "port-version": 1, + "description": "a C library for arbitrary-precision interval arithmetic", + "homepage": "https://github.com/fredrik-johansson/arb", + "dependencies": [ + "flint" + ] +} diff --git a/ports/argagg/CONTROL b/ports/argagg/CONTROL deleted file mode 100644 index d317cbe2716fae..00000000000000 --- a/ports/argagg/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: argagg -Version: 0.4.6 -Description: A simple C++11 command line argument parser diff --git a/ports/argagg/vcpkg.json b/ports/argagg/vcpkg.json new file mode 100644 index 00000000000000..73dc92e5d6d58c --- /dev/null +++ b/ports/argagg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "argagg", + "version-string": "0.4.6", + "port-version": 1, + "description": "A simple C++11 command line argument parser" +} diff --git a/ports/argh/CONTROL b/ports/argh/CONTROL deleted file mode 100644 index 045c96eedb9479..00000000000000 --- a/ports/argh/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: argh -Version: 2018-12-18-2 -Description: Argh! A minimalist argument handler. diff --git a/ports/argh/vcpkg.json b/ports/argh/vcpkg.json new file mode 100644 index 00000000000000..38835e1cd37936 --- /dev/null +++ b/ports/argh/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "argh", + "version-string": "2018-12-18", + "port-version": 3, + "description": "Argh! A minimalist argument handler." +} diff --git a/ports/argtable2/CONTROL b/ports/argtable2/CONTROL deleted file mode 100644 index 6364d396af0366..00000000000000 --- a/ports/argtable2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: argtable2 -Version: 2.13 -Port-Version: 8 -Homepage: http://argtable.sourceforge.net -Description: Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss. -Supports: !uwp \ No newline at end of file diff --git a/ports/argtable2/vcpkg.json b/ports/argtable2/vcpkg.json new file mode 100644 index 00000000000000..54431fc6271f29 --- /dev/null +++ b/ports/argtable2/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "argtable2", + "version-string": "2.13", + "port-version": 9, + "description": "Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss.", + "homepage": "http://argtable.sourceforge.net", + "supports": "!uwp" +} diff --git a/ports/argumentum/CONTROL b/ports/argumentum/CONTROL deleted file mode 100755 index a41e9c25022bf1..00000000000000 --- a/ports/argumentum/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: argumentum -Version: 0.3.1 -Description: A C++17 command line argument parser inspired by Python argparse -Homepage: https://github.com/mmahnic/argumentum diff --git a/ports/argumentum/vcpkg.json b/ports/argumentum/vcpkg.json new file mode 100644 index 00000000000000..282dbf6d3affc0 --- /dev/null +++ b/ports/argumentum/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "argumentum", + "version-string": "0.3.1", + "port-version": 1, + "description": "A C++17 command line argument parser inspired by Python argparse", + "homepage": "https://github.com/mmahnic/argumentum" +} diff --git a/ports/asmjit/CONTROL b/ports/asmjit/CONTROL deleted file mode 100644 index 44cc2e55cc4a52..00000000000000 --- a/ports/asmjit/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: asmjit -Version: 2020-09-14 -Homepage: https://github.com/asmjit/asmjit -Description: Complete x86/x64 JIT and Remote Assembler for C++ -Supports: !arm diff --git a/ports/asmjit/vcpkg.json b/ports/asmjit/vcpkg.json new file mode 100644 index 00000000000000..929f37b421b192 --- /dev/null +++ b/ports/asmjit/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "asmjit", + "version-string": "2020-09-14", + "port-version": 1, + "description": "Complete x86/x64 JIT and Remote Assembler for C++", + "homepage": "https://github.com/asmjit/asmjit", + "supports": "!arm" +} diff --git a/ports/assimp/CONTROL b/ports/assimp/CONTROL deleted file mode 100644 index f5c89deeea9d53..00000000000000 --- a/ports/assimp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: assimp -Version: 5.0.1 -Port-Version: 4 -Homepage: https://github.com/assimp/assimp -Description: The Open Asset import library -Build-Depends: zlib, rapidjson, minizip, stb, kubazip, irrlicht, polyclipping, utfcpp, poly2tri diff --git a/ports/assimp/vcpkg.json b/ports/assimp/vcpkg.json new file mode 100644 index 00000000000000..3e573c17d5ac41 --- /dev/null +++ b/ports/assimp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "assimp", + "version-string": "5.0.1", + "port-version": 5, + "description": "The Open Asset import library", + "homepage": "https://github.com/assimp/assimp", + "dependencies": [ + "irrlicht", + "kubazip", + "minizip", + "poly2tri", + "polyclipping", + "rapidjson", + "stb", + "utfcpp", + "zlib" + ] +} diff --git a/ports/asynch/CONTROL b/ports/asynch/CONTROL deleted file mode 100644 index 2187be40715011..00000000000000 --- a/ports/asynch/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: asynch -Version: 2019-09-21-1 -Homepage: https://github.com/naasking/async.h -Description: Async.h - asynchronous, stackless subroutines. \ No newline at end of file diff --git a/ports/asynch/vcpkg.json b/ports/asynch/vcpkg.json new file mode 100644 index 00000000000000..0ee8a5df26a511 --- /dev/null +++ b/ports/asynch/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "asynch", + "version-string": "2019-09-21", + "port-version": 2, + "description": "Async.h - asynchronous, stackless subroutines.", + "homepage": "https://github.com/naasking/async.h" +} diff --git a/ports/asyncplusplus/CONTROL b/ports/asyncplusplus/CONTROL deleted file mode 100644 index 8947946277f9f2..00000000000000 --- a/ports/asyncplusplus/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: asyncplusplus -Version: 1.1 -Description: Async++ is a lightweight concurrency framework for C++11 -Supports: !uwp diff --git a/ports/asyncplusplus/vcpkg.json b/ports/asyncplusplus/vcpkg.json new file mode 100644 index 00000000000000..d768e7bed2f86a --- /dev/null +++ b/ports/asyncplusplus/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "asyncplusplus", + "version-string": "1.1", + "port-version": 1, + "description": "Async++ is a lightweight concurrency framework for C++11", + "supports": "!uwp" +} diff --git a/ports/atlmfc/CONTROL b/ports/atlmfc/CONTROL deleted file mode 100644 index a5af713fcbf156..00000000000000 --- a/ports/atlmfc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: atlmfc -Version: 0 -Description: a stub package that ensures VS has ATL/MFC installed. -Supports: windows \ No newline at end of file diff --git a/ports/atlmfc/vcpkg.json b/ports/atlmfc/vcpkg.json new file mode 100644 index 00000000000000..5a8ce22d6b14e2 --- /dev/null +++ b/ports/atlmfc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "atlmfc", + "version-string": "0", + "port-version": 1, + "description": "a stub package that ensures VS has ATL/MFC installed.", + "supports": "windows" +} diff --git a/ports/aurora/CONTROL b/ports/aurora/CONTROL deleted file mode 100644 index b99aed73eb48e7..00000000000000 --- a/ports/aurora/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: aurora -Version: 2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933 -Homepage: https://github.com/Bromeon/Aurora -Description: Aurora is an open-source C++ library providing various rather uncommon C++ utilities diff --git a/ports/aurora/vcpkg.json b/ports/aurora/vcpkg.json new file mode 100644 index 00000000000000..e0efe0331e641e --- /dev/null +++ b/ports/aurora/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "aurora", + "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 1, + "description": "Aurora is an open-source C++ library providing various rather uncommon C++ utilities", + "homepage": "https://github.com/Bromeon/Aurora" +} diff --git a/ports/autobahn/CONTROL b/ports/autobahn/CONTROL deleted file mode 100644 index 13085d3e76fdba..00000000000000 --- a/ports/autobahn/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: autobahn -Version: 20.8.1 -Build-Depends: websocketpp, msgpack, boost-asio, boost-thread -Description: WAMP for C++ in Boost/Asio -Homepage: https://crossbar.io/autobahn diff --git a/ports/autobahn/vcpkg.json b/ports/autobahn/vcpkg.json new file mode 100644 index 00000000000000..cc755ff05796cd --- /dev/null +++ b/ports/autobahn/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "autobahn", + "version-string": "20.8.1", + "port-version": 1, + "description": "WAMP for C++ in Boost/Asio", + "homepage": "https://crossbar.io/autobahn", + "dependencies": [ + "boost-asio", + "boost-thread", + "msgpack", + "websocketpp" + ] +} diff --git a/ports/avro-c/CONTROL b/ports/avro-c/CONTROL deleted file mode 100644 index e7554a30b6763e..00000000000000 --- a/ports/avro-c/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: avro-c -Version: 1.9.2-1 -Supports: !(uwp|osx) -Homepage: https://github.com/apache/avro -Description: Apache Avro is a data serialization system -Build-Depends: jansson, liblzma, zlib, snappy diff --git a/ports/avro-c/vcpkg.json b/ports/avro-c/vcpkg.json new file mode 100644 index 00000000000000..634b2c9482e21a --- /dev/null +++ b/ports/avro-c/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "avro-c", + "version-string": "1.9.2", + "port-version": 2, + "description": "Apache Avro is a data serialization system", + "homepage": "https://github.com/apache/avro", + "supports": "!(uwp | osx)", + "dependencies": [ + "jansson", + "liblzma", + "snappy", + "zlib" + ] +} diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL deleted file mode 100644 index 030d99ee5f1c72..00000000000000 --- a/ports/aws-c-common/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: aws-c-common -Version: 0.4.56 -Port-Version: 1 -Homepage: https://github.com/awslabs/aws-c-common -Description: AWS common library for C -Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json new file mode 100644 index 00000000000000..21a7142e11dca6 --- /dev/null +++ b/ports/aws-c-common/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "aws-c-common", + "version-string": "0.4.56", + "port-version": 2, + "description": "AWS common library for C", + "homepage": "https://github.com/awslabs/aws-c-common", + "supports": "!(arm | uwp)" +} diff --git a/ports/aws-c-event-stream/CONTROL b/ports/aws-c-event-stream/CONTROL deleted file mode 100644 index f19d28c36559a7..00000000000000 --- a/ports/aws-c-event-stream/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: aws-c-event-stream -Version: 0.1.6 -Description: C99 implementation of the vnd.amazon.event-stream content-type. -Build-Depends: aws-c-common, aws-checksums \ No newline at end of file diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json new file mode 100644 index 00000000000000..8ab115237b2234 --- /dev/null +++ b/ports/aws-c-event-stream/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "aws-c-event-stream", + "version-string": "0.1.6", + "port-version": 1, + "description": "C99 implementation of the vnd.amazon.event-stream content-type.", + "dependencies": [ + "aws-c-common", + "aws-checksums" + ] +} diff --git a/ports/aws-checksums/CONTROL b/ports/aws-checksums/CONTROL deleted file mode 100644 index d9b9e53c92f3e1..00000000000000 --- a/ports/aws-checksums/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: aws-checksums -Version: 0.1.9 -Description: Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations. -Build-Depends: aws-c-common -Supports: !(arm&windows) \ No newline at end of file diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json new file mode 100644 index 00000000000000..f68022c4e26618 --- /dev/null +++ b/ports/aws-checksums/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "aws-checksums", + "version-string": "0.1.9", + "port-version": 1, + "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", + "supports": "!(arm & windows)", + "dependencies": [ + "aws-c-common" + ] +} diff --git a/ports/aws-lambda-cpp/CONTROL b/ports/aws-lambda-cpp/CONTROL deleted file mode 100644 index a5533ba8bf66b3..00000000000000 --- a/ports/aws-lambda-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: aws-lambda-cpp -Version: 0.2.6 -Build-Depends: curl -Description: C++ Runtime for AWS Lambda. -Supports: linux \ No newline at end of file diff --git a/ports/aws-lambda-cpp/vcpkg.json b/ports/aws-lambda-cpp/vcpkg.json new file mode 100644 index 00000000000000..c466c11a7c8689 --- /dev/null +++ b/ports/aws-lambda-cpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "aws-lambda-cpp", + "version-string": "0.2.6", + "port-version": 1, + "description": "C++ Runtime for AWS Lambda.", + "supports": "linux", + "dependencies": [ + "curl" + ] +} diff --git a/ports/azmq/CONTROL b/ports/azmq/CONTROL deleted file mode 100644 index 8d29c6d030c96a..00000000000000 --- a/ports/azmq/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: azmq -Version: 2020-03-03 -Build-Depends: boost-asio, boost-assert, boost-config, boost-container, boost-format, boost-intrusive, boost-iterator, boost-lexical-cast, boost-logic, boost-optional, boost-random, boost-range, boost-regex, boost-system, boost-thread, boost-utility, zeromq -Homepage: https://github.com/zeromq/azmq -Description: Boost Asio style bindings for ZeroMQ - This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular. - The main abstraction exposed by the library is azmq::socket which provides an Asio style socket interface to the underlying zeromq socket and interfaces with Asio's io_service(). The socket implementation participates in the io_service's reactor for asynchronous IO and may be freely mixed with other Asio socket types (raw TCP/UDP/Serial/etc.). diff --git a/ports/azmq/vcpkg.json b/ports/azmq/vcpkg.json new file mode 100644 index 00000000000000..6344423fa7ca8e --- /dev/null +++ b/ports/azmq/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "azmq", + "version-string": "2020-03-03", + "port-version": 1, + "description": [ + "Boost Asio style bindings for ZeroMQ", + "This library is built on top of ZeroMQ's standard C interface and is intended to work well with C++ applications which use the Boost libraries in general, and Asio in particular.", + "The main abstraction exposed by the library is azmq::socket which provides an Asio style socket interface to the underlying zeromq socket and interfaces with Asio's io_service(). The socket implementation participates in the io_service's reactor for asynchronous IO and may be freely mixed with other Asio socket types (raw TCP/UDP/Serial/etc.)." + ], + "homepage": "https://github.com/zeromq/azmq", + "dependencies": [ + "boost-asio", + "boost-assert", + "boost-config", + "boost-container", + "boost-format", + "boost-intrusive", + "boost-iterator", + "boost-lexical-cast", + "boost-logic", + "boost-optional", + "boost-random", + "boost-range", + "boost-regex", + "boost-system", + "boost-thread", + "boost-utility", + "zeromq" + ] +} diff --git a/ports/azure-c-shared-utility/CONTROL b/ports/azure-c-shared-utility/CONTROL deleted file mode 100644 index e3ed1f609cd4ca..00000000000000 --- a/ports/azure-c-shared-utility/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: azure-c-shared-utility -Version: 2020-12-09 -Port-Version: 1 -Description: Azure C SDKs common code -Homepage: https://github.com/Azure/azure-c-shared-utility -Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c, umock-c -Supports: !uwp - -Feature: public-preview -Description: Azure C SDKs common code (public preview) -Build-Depends: curl (linux), openssl (linux), azure-macro-utils-c[public-preview], umock-c[public-preview] diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json new file mode 100644 index 00000000000000..c50f1061ff0685 --- /dev/null +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "azure-c-shared-utility", + "version-string": "2020-12-09", + "port-version": 2, + "description": "Azure C SDKs common code", + "homepage": "https://github.com/Azure/azure-c-shared-utility", + "supports": "!uwp", + "dependencies": [ + "azure-macro-utils-c", + { + "name": "curl", + "platform": "linux" + }, + { + "name": "openssl", + "platform": "linux" + }, + "umock-c" + ], + "features": { + "public-preview": { + "description": "Azure C SDKs common code (public preview)", + "dependencies": [ + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "curl", + "platform": "linux" + }, + { + "name": "openssl", + "platform": "linux" + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/ports/azure-macro-utils-c/CONTROL b/ports/azure-macro-utils-c/CONTROL deleted file mode 100644 index 6bbde00818cd10..00000000000000 --- a/ports/azure-macro-utils-c/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: azure-macro-utils-c -Version: 2020-06-17 -Port-Version: 2 -Description: A library of macros for the Azure IoT SDK Suite - -Feature: public-preview -Description: A library of macros for the Azure IoT SDK Suite (public-preview) diff --git a/ports/azure-macro-utils-c/vcpkg.json b/ports/azure-macro-utils-c/vcpkg.json new file mode 100644 index 00000000000000..367a73a1746a22 --- /dev/null +++ b/ports/azure-macro-utils-c/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "azure-macro-utils-c", + "version-string": "2020-06-17", + "port-version": 3, + "description": "A library of macros for the Azure IoT SDK Suite", + "features": { + "public-preview": { + "description": "A library of macros for the Azure IoT SDK Suite (public-preview)" + } + } +} diff --git a/ports/azure-storage-cpp/CONTROL b/ports/azure-storage-cpp/CONTROL deleted file mode 100644 index d8c772570932ab..00000000000000 --- a/ports/azure-storage-cpp/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: azure-storage-cpp -Version: 7.5.0 -Port-Version: 1 -Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext (osx) -Description: [legacy] Microsoft Azure Storage Client SDK for C++ - A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client. -Homepage: https://blogs.msdn.com/b/windowsazurestorage/ -Supports: !uwp diff --git a/ports/azure-storage-cpp/vcpkg.json b/ports/azure-storage-cpp/vcpkg.json new file mode 100644 index 00000000000000..21180d49ff3332 --- /dev/null +++ b/ports/azure-storage-cpp/vcpkg.json @@ -0,0 +1,41 @@ +{ + "name": "azure-storage-cpp", + "version-string": "7.5.0", + "port-version": 2, + "description": [ + "[legacy] Microsoft Azure Storage Client SDK for C++", + "A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client." + ], + "homepage": "https://blogs.msdn.com/b/windowsazurestorage/", + "supports": "!uwp", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "boost-locale", + "platform": "!windows & !uwp" + }, + { + "name": "boost-log", + "platform": "!windows & !uwp" + }, + { + "name": "cpprestsdk", + "default-features": false + }, + { + "name": "gettext", + "platform": "osx" + }, + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx" + }, + { + "name": "libxml2", + "platform": "!windows & !uwp" + } + ] +} diff --git a/ports/azure-uamqp-c/CONTROL b/ports/azure-uamqp-c/CONTROL deleted file mode 100644 index c6f9cb6fee0ae4..00000000000000 --- a/ports/azure-uamqp-c/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: azure-uamqp-c -Version: 2020-12-09 -Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c -Description: AMQP library for C -Homepage: https://github.com/Azure/azure-uamqp-c - -Feature: public-preview -Description: AMQP library for C (public preview) -Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c[public-preview], umock-c[public-preview] diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json new file mode 100644 index 00000000000000..ac72438c296390 --- /dev/null +++ b/ports/azure-uamqp-c/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "azure-uamqp-c", + "version-string": "2020-12-09", + "port-version": 1, + "description": "AMQP library for C", + "homepage": "https://github.com/Azure/azure-uamqp-c", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "umock-c" + ], + "features": { + "public-preview": { + "description": "AMQP library for C (public preview)", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/ports/azure-uhttp-c/CONTROL b/ports/azure-uhttp-c/CONTROL deleted file mode 100644 index 20a43ec8f612c1..00000000000000 --- a/ports/azure-uhttp-c/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: azure-uhttp-c -Version: 2020-12-09 -Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c -Description: Azure HTTP Library written in C -Homepage: https://github.com/Azure/azure-uhttp-c - -Feature: public-preview -Description: Azure HTTP Library written in C (public preview) -Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c[public-preview], umock-c[public-preview] diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json new file mode 100644 index 00000000000000..ec8a12c57b0953 --- /dev/null +++ b/ports/azure-uhttp-c/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "azure-uhttp-c", + "version-string": "2020-12-09", + "port-version": 1, + "description": "Azure HTTP Library written in C", + "homepage": "https://github.com/Azure/azure-uhttp-c", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "umock-c" + ], + "features": { + "public-preview": { + "description": "Azure HTTP Library written in C (public preview)", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/ports/azure-umqtt-c/CONTROL b/ports/azure-umqtt-c/CONTROL deleted file mode 100644 index 17cb9e39aba7fa..00000000000000 --- a/ports/azure-umqtt-c/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: azure-umqtt-c -Version: 2020-12-09 -Build-Depends: azure-c-shared-utility, azure-macro-utils-c, umock-c -Description: General purpose library for communication over the mqtt protocol -Homepage: https://github.com/Azure/azure-umqtt-c - -Feature: public-preview -Description: General purpose library for communication over the mqtt protocol (public preview) -Build-Depends: azure-c-shared-utility[public-preview], azure-macro-utils-c[public-preview], umock-c[public-preview] diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json new file mode 100644 index 00000000000000..bb3de7eaa18774 --- /dev/null +++ b/ports/azure-umqtt-c/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "azure-umqtt-c", + "version-string": "2020-12-09", + "port-version": 1, + "description": "General purpose library for communication over the mqtt protocol", + "homepage": "https://github.com/Azure/azure-umqtt-c", + "dependencies": [ + "azure-c-shared-utility", + "azure-macro-utils-c", + "umock-c" + ], + "features": { + "public-preview": { + "description": "General purpose library for communication over the mqtt protocol (public preview)", + "dependencies": [ + { + "name": "azure-c-shared-utility", + "features": [ + "public-preview" + ] + }, + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + }, + { + "name": "umock-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/ports/basisu/CONTROL b/ports/basisu/CONTROL deleted file mode 100644 index a690f6dbdac128..00000000000000 --- a/ports/basisu/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: basisu -Version: 1.11-4 -Homepage: https://github.com/BinomialLLC/basis_universal -Description: Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats. -Build-Depends: lodepng - diff --git a/ports/basisu/vcpkg.json b/ports/basisu/vcpkg.json new file mode 100644 index 00000000000000..a0fe5cc685326c --- /dev/null +++ b/ports/basisu/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "basisu", + "version-string": "1.11", + "port-version": 5, + "description": "Basis Universal is a supercompressed GPU texture and video compression format that outputs a highly compressed intermediate file format (.basis) that can be quickly transcoded to a wide variety of GPU texture compression formats.", + "homepage": "https://github.com/BinomialLLC/basis_universal", + "dependencies": [ + "lodepng" + ] +} diff --git a/ports/bde/CONTROL b/ports/bde/CONTROL deleted file mode 100644 index b31c0e2eb5022e..00000000000000 --- a/ports/bde/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: bde -Version: 3.2.0.0 -Port-Version: 2 -Description: Basic Development Environment - a set of foundational C++ libraries used at Bloomberg. -Supports: !windows \ No newline at end of file diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json new file mode 100644 index 00000000000000..4d7499c2fe0358 --- /dev/null +++ b/ports/bde/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bde", + "version-string": "3.2.0.0", + "port-version": 3, + "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", + "supports": "!windows" +} diff --git a/ports/bdwgc/CONTROL b/ports/bdwgc/CONTROL deleted file mode 100644 index 9730760041bdde..00000000000000 --- a/ports/bdwgc/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: bdwgc -Version: 8.0.4-1 -Description: The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc) diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json new file mode 100644 index 00000000000000..ed88dc2a5ca837 --- /dev/null +++ b/ports/bdwgc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "bdwgc", + "version-string": "8.0.4", + "port-version": 2, + "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)" +} diff --git a/ports/beast/CONTROL b/ports/beast/CONTROL deleted file mode 100644 index d2f2fd896afea4..00000000000000 --- a/ports/beast/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: beast -Version: 0 -Homepage: https://www.boost.org/doc/libs/release/libs/beast/ -Build-Depends: boost-beast -Description: HTTP/1 and WebSocket, header-only using Boost.Asio and C++11 diff --git a/ports/beast/vcpkg.json b/ports/beast/vcpkg.json new file mode 100644 index 00000000000000..7fd6806ce5e75f --- /dev/null +++ b/ports/beast/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "beast", + "version-string": "0", + "port-version": 1, + "description": "HTTP/1 and WebSocket, header-only using Boost.Asio and C++11", + "homepage": "https://www.boost.org/doc/libs/release/libs/beast/", + "dependencies": [ + "boost-beast" + ] +} diff --git a/ports/bento4/CONTROL b/ports/bento4/CONTROL deleted file mode 100644 index eff84ed988f8ec..00000000000000 --- a/ports/bento4/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: bento4 -Version: 1.5.1-628 -Homepage: https://github.com/axiomatic-systems/Bento4 -Description: Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15. - diff --git a/ports/bento4/vcpkg.json b/ports/bento4/vcpkg.json new file mode 100644 index 00000000000000..d5278c24fb1fee --- /dev/null +++ b/ports/bento4/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bento4", + "version-string": "1.5.1", + "port-version": 629, + "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.", + "homepage": "https://github.com/axiomatic-systems/Bento4" +} diff --git a/ports/berkeleydb/CONTROL b/ports/berkeleydb/CONTROL deleted file mode 100644 index 91677a1f79150a..00000000000000 --- a/ports/berkeleydb/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: berkeleydb -Version: 4.8.30 -Port-Version: 5 -Homepage: https://download.oracle.com/ -Description: BDB - A high-performance embedded database for key/value data. -Supports: !(uwp|linux|osx) diff --git a/ports/berkeleydb/vcpkg.json b/ports/berkeleydb/vcpkg.json new file mode 100644 index 00000000000000..318643530b6cc5 --- /dev/null +++ b/ports/berkeleydb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "berkeleydb", + "version-string": "4.8.30", + "port-version": 6, + "description": "BDB - A high-performance embedded database for key/value data.", + "homepage": "https://download.oracle.com/", + "supports": "!(uwp | linux | osx)" +} diff --git a/ports/bigint/CONTROL b/ports/bigint/CONTROL deleted file mode 100644 index 1f0d8f63b46e97..00000000000000 --- a/ports/bigint/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: bigint -Version: 2010.04.30 -Port-Version: 6 -Homepage: https://mattmccutchen.net/bigint -Description: C++ Big Integer Library diff --git a/ports/bigint/vcpkg.json b/ports/bigint/vcpkg.json new file mode 100644 index 00000000000000..6a70944a6a0d1d --- /dev/null +++ b/ports/bigint/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bigint", + "version-string": "2010.04.30", + "port-version": 7, + "description": "C++ Big Integer Library", + "homepage": "https://mattmccutchen.net/bigint" +} diff --git a/ports/binn/CONTROL b/ports/binn/CONTROL deleted file mode 100644 index 3c367b05facbe5..00000000000000 --- a/ports/binn/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: binn -Version: 3.0 -Description: Binn is a binary data serialization format designed to be compact, fast and easy to use. diff --git a/ports/binn/vcpkg.json b/ports/binn/vcpkg.json new file mode 100644 index 00000000000000..09fc20cb203e7d --- /dev/null +++ b/ports/binn/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "binn", + "version-string": "3.0", + "port-version": 1, + "description": "Binn is a binary data serialization format designed to be compact, fast and easy to use." +} diff --git a/ports/bitmagic/CONTROL b/ports/bitmagic/CONTROL deleted file mode 100644 index 993c7799bb1963..00000000000000 --- a/ports/bitmagic/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: bitmagic -Version: 7.2.0 -Homepage: http://bitmagic.io -Description: Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing. diff --git a/ports/bitmagic/vcpkg.json b/ports/bitmagic/vcpkg.json new file mode 100644 index 00000000000000..c6203e75567f13 --- /dev/null +++ b/ports/bitmagic/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bitmagic", + "version-string": "7.2.0", + "port-version": 1, + "description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.", + "homepage": "http://bitmagic.io" +} diff --git a/ports/bitserializer-cpprestjson/CONTROL b/ports/bitserializer-cpprestjson/CONTROL deleted file mode 100644 index 24c03ce9a853d2..00000000000000 --- a/ports/bitserializer-cpprestjson/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: bitserializer-cpprestjson -Version: alias -Build-Depends: bitserializer[cpprestjson-archive] -Description: Deprecated alias for bitserializer-cpprestjson diff --git a/ports/bitserializer-cpprestjson/vcpkg.json b/ports/bitserializer-cpprestjson/vcpkg.json new file mode 100644 index 00000000000000..e12e04f042e611 --- /dev/null +++ b/ports/bitserializer-cpprestjson/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "bitserializer-cpprestjson", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for bitserializer-cpprestjson", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "cpprestjson-archive" + ] + } + ] +} diff --git a/ports/bitserializer-pugixml/CONTROL b/ports/bitserializer-pugixml/CONTROL deleted file mode 100644 index 23ab329239ac3b..00000000000000 --- a/ports/bitserializer-pugixml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: bitserializer-pugixml -Version: alias -Build-Depends: bitserializer[pugixml-archive] -Description: Deprecated alias for bitserializer-pugixml diff --git a/ports/bitserializer-pugixml/vcpkg.json b/ports/bitserializer-pugixml/vcpkg.json new file mode 100644 index 00000000000000..8e705da12b69f1 --- /dev/null +++ b/ports/bitserializer-pugixml/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "bitserializer-pugixml", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for bitserializer-pugixml", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "pugixml-archive" + ] + } + ] +} diff --git a/ports/bitserializer-rapidjson/CONTROL b/ports/bitserializer-rapidjson/CONTROL deleted file mode 100644 index 3cb55085bf3462..00000000000000 --- a/ports/bitserializer-rapidjson/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: bitserializer-rapidjson -Version: alias -Build-Depends: bitserializer[rapidjson-archive] -Description: Deprecated alias for bitserializer-rapidjson diff --git a/ports/bitserializer-rapidjson/vcpkg.json b/ports/bitserializer-rapidjson/vcpkg.json new file mode 100644 index 00000000000000..2da6054e393980 --- /dev/null +++ b/ports/bitserializer-rapidjson/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "bitserializer-rapidjson", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for bitserializer-rapidjson", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "rapidjson-archive" + ] + } + ] +} diff --git a/ports/bitserializer-rapidyaml/CONTROL b/ports/bitserializer-rapidyaml/CONTROL deleted file mode 100644 index 3d622fdf31aea2..00000000000000 --- a/ports/bitserializer-rapidyaml/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: bitserializer-rapidyaml -Version: alias -Build-Depends: bitserializer[rapidyaml-archive] -Description: Deprecated alias for bitserializer-rapidyaml -Supports: !(arm|arm64|osx) diff --git a/ports/bitserializer-rapidyaml/vcpkg.json b/ports/bitserializer-rapidyaml/vcpkg.json new file mode 100644 index 00000000000000..590519df0b4620 --- /dev/null +++ b/ports/bitserializer-rapidyaml/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "bitserializer-rapidyaml", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for bitserializer-rapidyaml", + "supports": "!(arm | arm64 | osx)", + "dependencies": [ + { + "name": "bitserializer", + "features": [ + "rapidyaml-archive" + ] + } + ] +} diff --git a/ports/bitsery/CONTROL b/ports/bitsery/CONTROL deleted file mode 100644 index 30c159d8ba4b76..00000000000000 --- a/ports/bitsery/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: bitsery -Version: 5.2.1 -Description: Header only C++ binary serialization library -Homepage: https://github.com/fraillt/bitsery diff --git a/ports/bitsery/vcpkg.json b/ports/bitsery/vcpkg.json new file mode 100644 index 00000000000000..dfad4f5c580f4f --- /dev/null +++ b/ports/bitsery/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "bitsery", + "version-string": "5.2.1", + "port-version": 1, + "description": "Header only C++ binary serialization library", + "homepage": "https://github.com/fraillt/bitsery" +} diff --git a/ports/blas/CONTROL b/ports/blas/CONTROL deleted file mode 100644 index 6f660d228e5580..00000000000000 --- a/ports/blas/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: blas -Version: 1 -Description: Metapackage for packages which provide BLAS -Build-Depends: openblas diff --git a/ports/blas/vcpkg.json b/ports/blas/vcpkg.json new file mode 100644 index 00000000000000..aca4cf894e418c --- /dev/null +++ b/ports/blas/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "blas", + "version-string": "1", + "port-version": 1, + "description": "Metapackage for packages which provide BLAS", + "dependencies": [ + "openblas" + ] +} diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL deleted file mode 100644 index 94d148368f7bce..00000000000000 --- a/ports/blaze/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: blaze -Version: 3.8 -Port-Version: 1 -Build-Depends: lapack, boost-exception -Homepage: https://bitbucket.org/blaze-lib/blaze -Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic. diff --git a/ports/blaze/vcpkg.json b/ports/blaze/vcpkg.json new file mode 100644 index 00000000000000..19a46638cbd977 --- /dev/null +++ b/ports/blaze/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "blaze", + "version-string": "3.8", + "port-version": 2, + "description": "Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.", + "homepage": "https://bitbucket.org/blaze-lib/blaze", + "dependencies": [ + "boost-exception", + "lapack" + ] +} diff --git a/ports/blitz/CONTROL b/ports/blitz/CONTROL deleted file mode 100644 index 2df45ecfe459fc..00000000000000 --- a/ports/blitz/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: blitz -Version: 2020-03-25 -Homepage: https://github.com/blitzpp/blitz -Description: Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing. -Supports: !(arm|arm64|uwp) \ No newline at end of file diff --git a/ports/blitz/vcpkg.json b/ports/blitz/vcpkg.json new file mode 100644 index 00000000000000..22e8dd6e0bd098 --- /dev/null +++ b/ports/blitz/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "blitz", + "version-string": "2020-03-25", + "port-version": 1, + "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.", + "homepage": "https://github.com/blitzpp/blitz", + "supports": "!(arm | arm64 | uwp)" +} diff --git a/ports/blosc/CONTROL b/ports/blosc/CONTROL deleted file mode 100644 index abda40db0f7cf6..00000000000000 --- a/ports/blosc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: blosc -Version: 1.18.1-1 -Build-Depends: lz4, snappy, zlib, zstd -Homepage: https://github.com/Blosc/c-blosc -Description: A blocking, shuffling and loss-less compression library that can be faster than `memcpy()` diff --git a/ports/blosc/vcpkg.json b/ports/blosc/vcpkg.json new file mode 100644 index 00000000000000..f9b3e0513b9dae --- /dev/null +++ b/ports/blosc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "blosc", + "version-string": "1.18.1", + "port-version": 2, + "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`", + "homepage": "https://github.com/Blosc/c-blosc", + "dependencies": [ + "lz4", + "snappy", + "zlib", + "zstd" + ] +} diff --git a/ports/breakpad/CONTROL b/ports/breakpad/CONTROL deleted file mode 100644 index 6852c08a3115f6..00000000000000 --- a/ports/breakpad/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: breakpad -Version: 2020-09-14 -Port-Version: 2 -Build-Depends: libdisasm -Homepage: https://github.com/google/breakpad -Description: a set of client and server components which implement a crash-reporting system. diff --git a/ports/breakpad/vcpkg.json b/ports/breakpad/vcpkg.json new file mode 100644 index 00000000000000..fc9efed3df96be --- /dev/null +++ b/ports/breakpad/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "breakpad", + "version-string": "2020-09-14", + "port-version": 3, + "description": "a set of client and server components which implement a crash-reporting system.", + "homepage": "https://github.com/google/breakpad", + "dependencies": [ + "libdisasm" + ] +} diff --git a/ports/brigand/CONTROL b/ports/brigand/CONTROL deleted file mode 100644 index 2fba63f77081d0..00000000000000 --- a/ports/brigand/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: brigand -Version: 1.3.0 -Homepage: https://github.com/edouarda/brigand -Description: Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. -Build-Depends: boost - diff --git a/ports/brigand/vcpkg.json b/ports/brigand/vcpkg.json new file mode 100644 index 00000000000000..4f9d994120e30d --- /dev/null +++ b/ports/brigand/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "brigand", + "version-string": "1.3.0", + "port-version": 1, + "description": "Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.", + "homepage": "https://github.com/edouarda/brigand", + "dependencies": [ + "boost" + ] +} diff --git a/ports/brotli/CONTROL b/ports/brotli/CONTROL deleted file mode 100644 index 93d89044460740..00000000000000 --- a/ports/brotli/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: brotli -Version: 1.0.9 -Port-Version: 1 -Homepage: https://github.com/google/brotli -Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling. diff --git a/ports/brotli/vcpkg.json b/ports/brotli/vcpkg.json new file mode 100644 index 00000000000000..c5b7fc09dff7e5 --- /dev/null +++ b/ports/brotli/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "brotli", + "version-string": "1.0.9", + "port-version": 2, + "description": "a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling.", + "homepage": "https://github.com/google/brotli" +} diff --git a/ports/brpc/CONTROL b/ports/brpc/CONTROL deleted file mode 100644 index 39860698135c2b..00000000000000 --- a/ports/brpc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: brpc -Version: 0.9.7 -Homepage: https://github.com/apache/incubator-brpc -Description: Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called "baidu-rpc" inside Baidu. -Build-Depends: leveldb, gflags, glog, protobuf[zlib], openssl, thrift -Supports: !windows diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json new file mode 100644 index 00000000000000..61c1d27a3f32a9 --- /dev/null +++ b/ports/brpc/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "brpc", + "version-string": "0.9.7", + "port-version": 1, + "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", + "homepage": "https://github.com/apache/incubator-brpc", + "supports": "!windows", + "dependencies": [ + "gflags", + "glog", + "leveldb", + "openssl", + { + "name": "protobuf", + "features": [ + "zlib" + ] + }, + "thrift" + ] +} diff --git a/ports/brunocodutra-metal/CONTROL b/ports/brunocodutra-metal/CONTROL deleted file mode 100644 index f0af9080667152..00000000000000 --- a/ports/brunocodutra-metal/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: brunocodutra-metal -Version: 2.1.1 -Description: A single header C++11 library designed to make you love template metaprogramming diff --git a/ports/brunocodutra-metal/vcpkg.json b/ports/brunocodutra-metal/vcpkg.json new file mode 100644 index 00000000000000..a4934eb54350a7 --- /dev/null +++ b/ports/brunocodutra-metal/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "brunocodutra-metal", + "version-string": "2.1.1", + "port-version": 1, + "description": "A single header C++11 library designed to make you love template metaprogramming" +} diff --git a/ports/brynet/CONTROL b/ports/brynet/CONTROL deleted file mode 100644 index 7a9bf72ad08448..00000000000000 --- a/ports/brynet/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: brynet -Version: 1.11.0 -Homepage: https://github.com/IronsDu/brynet -Description: A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket. diff --git a/ports/brynet/vcpkg.json b/ports/brynet/vcpkg.json new file mode 100644 index 00000000000000..79dec2c58202d2 --- /dev/null +++ b/ports/brynet/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "brynet", + "version-string": "1.11.0", + "port-version": 1, + "description": "A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket.", + "homepage": "https://github.com/IronsDu/brynet" +} diff --git a/ports/bustache/CONTROL b/ports/bustache/CONTROL deleted file mode 100644 index 82aeb3a16ddb56..00000000000000 --- a/ports/bustache/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: bustache -Version: 1.1.0 -Build-Depends: boost-unordered, boost-utility -Description: C++11 implementation of {{ mustache }} -Homepage: https://github.com/jamboree/bustache diff --git a/ports/bustache/vcpkg.json b/ports/bustache/vcpkg.json new file mode 100644 index 00000000000000..92e11540891e97 --- /dev/null +++ b/ports/bustache/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "bustache", + "version-string": "1.1.0", + "port-version": 1, + "description": "C++11 implementation of {{ mustache }}", + "homepage": "https://github.com/jamboree/bustache", + "dependencies": [ + "boost-unordered", + "boost-utility" + ] +} diff --git a/ports/butteraugli/CONTROL b/ports/butteraugli/CONTROL deleted file mode 100644 index aab641738f881a..00000000000000 --- a/ports/butteraugli/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: butteraugli -Version: 2019-05-08-1 -Homepage: https://github.com/google/butteraugli -Description: butteraugli estimates the psychovisual difference between two images -Build-Depends: libpng, libjpeg-turbo diff --git a/ports/butteraugli/vcpkg.json b/ports/butteraugli/vcpkg.json new file mode 100644 index 00000000000000..d11da192d644c3 --- /dev/null +++ b/ports/butteraugli/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "butteraugli", + "version-string": "2019-05-08", + "port-version": 2, + "description": "butteraugli estimates the psychovisual difference between two images", + "homepage": "https://github.com/google/butteraugli", + "dependencies": [ + "libjpeg-turbo", + "libpng" + ] +} diff --git a/ports/byte-lite/CONTROL b/ports/byte-lite/CONTROL deleted file mode 100644 index e16ff8e3c11fa7..00000000000000 --- a/ports/byte-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: byte-lite -Version: 0.2.0 -Description: A C++17-like byte type for C++98, C++11 and later in a single-file header-only library diff --git a/ports/byte-lite/vcpkg.json b/ports/byte-lite/vcpkg.json new file mode 100644 index 00000000000000..64639b6867d684 --- /dev/null +++ b/ports/byte-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "byte-lite", + "version-string": "0.2.0", + "port-version": 1, + "description": "A C++17-like byte type for C++98, C++11 and later in a single-file header-only library" +} diff --git a/ports/caffe2/CONTROL b/ports/caffe2/CONTROL deleted file mode 100644 index e9bb4dbd7b0564..00000000000000 --- a/ports/caffe2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: caffe2 -Version: 0.8.1-3 -Build-Depends: lmdb, gflags, glog, eigen3, protobuf -Homepage: https://github.com/caffe2/caffe2 -Description: Caffe2 is a lightweight, modular, and scalable deep learning framework. -Supports: !x86 \ No newline at end of file diff --git a/ports/caffe2/vcpkg.json b/ports/caffe2/vcpkg.json new file mode 100644 index 00000000000000..1f4f34d63e1045 --- /dev/null +++ b/ports/caffe2/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "caffe2", + "version-string": "0.8.1", + "port-version": 4, + "description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.", + "homepage": "https://github.com/caffe2/caffe2", + "supports": "!x86", + "dependencies": [ + "eigen3", + "gflags", + "glog", + "lmdb", + "protobuf" + ] +} diff --git a/ports/camport3/CONTROL b/ports/camport3/CONTROL deleted file mode 100644 index 5aeb6b2cba5838..00000000000000 --- a/ports/camport3/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: camport3 -Version: 1.5.3 -Description: percipio.xyz cameras SDK -Homepage: https://github.com/percipioxyz/camport3 -Supports: ((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32 diff --git a/ports/camport3/vcpkg.json b/ports/camport3/vcpkg.json new file mode 100644 index 00000000000000..0bf92791f34cf6 --- /dev/null +++ b/ports/camport3/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "camport3", + "version-string": "1.5.3", + "port-version": 1, + "description": "percipio.xyz cameras SDK", + "homepage": "https://github.com/percipioxyz/camport3", + "supports": "((windows & !uwp & !arm & !arm64 & !static) | linux) & !wasm32" +} diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL deleted file mode 100644 index 506fb73515d331..00000000000000 --- a/ports/capnproto/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: capnproto -Version: 0.8.0 -Port-Version: 1 -Description: Data interchange format and capability-based RPC system -Homepage: https://capnproto.org/ -Build-Depends: zlib -Supports: !uwp&!((arm|arm64)&windows) diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json new file mode 100644 index 00000000000000..49b619ee57f1d3 --- /dev/null +++ b/ports/capnproto/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "capnproto", + "version-string": "0.8.0", + "port-version": 2, + "description": "Data interchange format and capability-based RPC system", + "homepage": "https://capnproto.org/", + "supports": "!uwp & !((arm | arm64) & windows)", + "dependencies": [ + "zlib" + ] +} diff --git a/ports/casclib/CONTROL b/ports/casclib/CONTROL deleted file mode 100644 index 9c0a083ba6b193..00000000000000 --- a/ports/casclib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: casclib -Version: 1.50b-1 -Build-Depends: zlib -Description: An open-source implementation of library for reading CASC storage from Blizzard games since 2014 diff --git a/ports/casclib/vcpkg.json b/ports/casclib/vcpkg.json new file mode 100644 index 00000000000000..a97d0344496a2f --- /dev/null +++ b/ports/casclib/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "casclib", + "version-string": "1.50b", + "port-version": 2, + "description": "An open-source implementation of library for reading CASC storage from Blizzard games since 2014", + "dependencies": [ + "zlib" + ] +} diff --git a/ports/catch-classic/CONTROL b/ports/catch-classic/CONTROL deleted file mode 100644 index bce6fc1060982c..00000000000000 --- a/ports/catch-classic/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: catch-classic -Version: 1.12.2 -Homepage: https://github.com/catchorg/Catch2 -Description: A modern, header-only test framework for unit tests - This is specifically the legacy 1.x branch provided for compatibility - with older compilers. diff --git a/ports/catch-classic/vcpkg.json b/ports/catch-classic/vcpkg.json new file mode 100644 index 00000000000000..bfe9b7ef4aee9d --- /dev/null +++ b/ports/catch-classic/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "catch-classic", + "version-string": "1.12.2", + "port-version": 1, + "description": [ + "A modern, header-only test framework for unit tests", + "This is specifically the legacy 1.x branch provided for compatibility", + "with older compilers." + ], + "homepage": "https://github.com/catchorg/Catch2" +} diff --git a/ports/catch/CONTROL b/ports/catch/CONTROL deleted file mode 100644 index f486f31b0f2a3d..00000000000000 --- a/ports/catch/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: catch -Version: alias -Build-Depends: catch2 -Description: Deprecated alias for Catch2 unit testing framework diff --git a/ports/catch/vcpkg.json b/ports/catch/vcpkg.json new file mode 100644 index 00000000000000..fccc6890420877 --- /dev/null +++ b/ports/catch/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "catch", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for Catch2 unit testing framework", + "dependencies": [ + "catch2" + ] +} diff --git a/ports/cccapstone/CONTROL b/ports/cccapstone/CONTROL deleted file mode 100644 index 8681f2328267ea..00000000000000 --- a/ports/cccapstone/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cccapstone -Version: 9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1 -Homepage: https://github.com/zer0mem/cccapstone -Description: c++ bindings for capstone disasembly framework -Build-Depends: capstone diff --git a/ports/cccapstone/vcpkg.json b/ports/cccapstone/vcpkg.json new file mode 100644 index 00000000000000..239fdc3d1630ae --- /dev/null +++ b/ports/cccapstone/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cccapstone", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 2, + "description": "c++ bindings for capstone disasembly framework", + "homepage": "https://github.com/zer0mem/cccapstone", + "dependencies": [ + "capstone" + ] +} diff --git a/ports/ccd/CONTROL b/ports/ccd/CONTROL deleted file mode 100644 index 6a7d5eeb099f06..00000000000000 --- a/ports/ccd/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ccd -Version: 2.1-4 -Port-Version: 1 -Homepage: https://github.com/danfis/libccd -Description: Library for collision detection between two convex shapes diff --git a/ports/ccd/vcpkg.json b/ports/ccd/vcpkg.json new file mode 100644 index 00000000000000..43110c69d5ed9a --- /dev/null +++ b/ports/ccd/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ccd", + "version-string": "2.1-4", + "port-version": 2, + "description": "Library for collision detection between two convex shapes", + "homepage": "https://github.com/danfis/libccd" +} diff --git a/ports/cctz/CONTROL b/ports/cctz/CONTROL deleted file mode 100644 index a223586d63e3d3..00000000000000 --- a/ports/cctz/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cctz -Version: 2.3-2 -Homepage: https://github.com/google/cctz -Build-Depends: benchmark -Description: two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner. diff --git a/ports/cctz/vcpkg.json b/ports/cctz/vcpkg.json new file mode 100644 index 00000000000000..aaf937dfb04e78 --- /dev/null +++ b/ports/cctz/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cctz", + "version-string": "2.3", + "port-version": 3, + "description": "two libraries that cooperate with to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.", + "homepage": "https://github.com/google/cctz", + "dependencies": [ + "benchmark" + ] +} diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL deleted file mode 100644 index d61655b2d5d581..00000000000000 --- a/ports/celero/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: celero -Version: 2.8.2 -Homepage: https://github.com/DigitalInBlue/Celero -Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++. diff --git a/ports/celero/vcpkg.json b/ports/celero/vcpkg.json new file mode 100644 index 00000000000000..5296cfa17d4032 --- /dev/null +++ b/ports/celero/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "celero", + "version-string": "2.8.2", + "port-version": 1, + "description": "Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.", + "homepage": "https://github.com/DigitalInBlue/Celero" +} diff --git a/ports/cello/CONTROL b/ports/cello/CONTROL deleted file mode 100644 index 6ea9d2bce85891..00000000000000 --- a/ports/cello/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cello -Version: 2019-07-23 -Description: Higher level programming in C -Homepage: http://libcello.org/ diff --git a/ports/cello/vcpkg.json b/ports/cello/vcpkg.json new file mode 100644 index 00000000000000..ebb509e68f4ac3 --- /dev/null +++ b/ports/cello/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cello", + "version-string": "2019-07-23", + "port-version": 1, + "description": "Higher level programming in C", + "homepage": "http://libcello.org/" +} diff --git a/ports/cereal/CONTROL b/ports/cereal/CONTROL deleted file mode 100644 index 5111134824fc97..00000000000000 --- a/ports/cereal/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cereal -Version: 1.3.0 -Homepage: https://github.com/USCiLab/cereal -Description: a header-only C++11 serialization library (built in support for binary, XML and JSon) diff --git a/ports/cereal/vcpkg.json b/ports/cereal/vcpkg.json new file mode 100644 index 00000000000000..432b330e26a826 --- /dev/null +++ b/ports/cereal/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cereal", + "version-string": "1.3.0", + "port-version": 1, + "description": "a header-only C++11 serialization library (built in support for binary, XML and JSon)", + "homepage": "https://github.com/USCiLab/cereal" +} diff --git a/ports/cgicc/CONTROL b/ports/cgicc/CONTROL deleted file mode 100644 index ad598509fac88a..00000000000000 --- a/ports/cgicc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cgicc -Version: 3.2.19-4 -Homepage: https://www.gnu.org/software/cgicc/ -Description: GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web diff --git a/ports/cgicc/vcpkg.json b/ports/cgicc/vcpkg.json new file mode 100644 index 00000000000000..5d3b9b146aa632 --- /dev/null +++ b/ports/cgicc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cgicc", + "version-string": "3.2.19", + "port-version": 5, + "description": "GNU Cgicc is an ANSI C++ compliant class library that greatly simplifies the creation of CGI applications for the World Wide Web", + "homepage": "https://www.gnu.org/software/cgicc/" +} diff --git a/ports/cgl/CONTROL b/ports/cgl/CONTROL deleted file mode 100644 index 9c715c8a19fb97..00000000000000 --- a/ports/cgl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cgl -Version: 0.60.2-2 -Homepage: https://github.com/coin-or/Cgl -Description: The COIN-OR Cut Generation Library (Cgl) is a collection of cut generators that can be used with other COIN-OR packages that make use of cuts, such as, among others, the linear solver Clp or the mixed integer linear programming solvers Cbc or BCP. -Build-Depends: coinutils, osi, clp \ No newline at end of file diff --git a/ports/cgl/vcpkg.json b/ports/cgl/vcpkg.json new file mode 100644 index 00000000000000..3e59231a838027 --- /dev/null +++ b/ports/cgl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cgl", + "version-string": "0.60.2", + "port-version": 3, + "description": "The COIN-OR Cut Generation Library (Cgl) is a collection of cut generators that can be used with other COIN-OR packages that make use of cuts, such as, among others, the linear solver Clp or the mixed integer linear programming solvers Cbc or BCP.", + "homepage": "https://github.com/coin-or/Cgl", + "dependencies": [ + "clp", + "coinutils", + "osi" + ] +} diff --git a/ports/cgltf/CONTROL b/ports/cgltf/CONTROL deleted file mode 100644 index 58dd91c792e7a5..00000000000000 --- a/ports/cgltf/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cgltf -Version: 1.8 -Homepage: https://github.com/jkuhlmann/cgltf -Description: Single-file glTF 2.0 loader and writer written in C99 diff --git a/ports/cgltf/vcpkg.json b/ports/cgltf/vcpkg.json new file mode 100644 index 00000000000000..14e732885192b1 --- /dev/null +++ b/ports/cgltf/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cgltf", + "version-string": "1.8", + "port-version": 1, + "description": "Single-file glTF 2.0 loader and writer written in C99", + "homepage": "https://github.com/jkuhlmann/cgltf" +} diff --git a/ports/chaiscript/CONTROL b/ports/chaiscript/CONTROL deleted file mode 100644 index 8ae6a8488e8a39..00000000000000 --- a/ports/chaiscript/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: chaiscript -Version: 6.1.0-1 -Homepage: https://github.com/ChaiScript/ChaiScript -Description: Embedded Scripting Language Designed for C++ diff --git a/ports/chaiscript/vcpkg.json b/ports/chaiscript/vcpkg.json new file mode 100644 index 00000000000000..e4362e804165b2 --- /dev/null +++ b/ports/chaiscript/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "chaiscript", + "version-string": "6.1.0", + "port-version": 2, + "description": "Embedded Scripting Language Designed for C++", + "homepage": "https://github.com/ChaiScript/ChaiScript" +} diff --git a/ports/charls/CONTROL b/ports/charls/CONTROL deleted file mode 100644 index 57fdd3ec666cbc..00000000000000 --- a/ports/charls/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: charls -Version: 2.2.0 -Homepage: https://github.com/team-charls/charls -Description: CharLS, a C++ JPEG-LS library implementation. \ No newline at end of file diff --git a/ports/charls/vcpkg.json b/ports/charls/vcpkg.json new file mode 100644 index 00000000000000..b03c6bcdd25a8b --- /dev/null +++ b/ports/charls/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "charls", + "version-string": "2.2.0", + "port-version": 1, + "description": "CharLS, a C++ JPEG-LS library implementation.", + "homepage": "https://github.com/team-charls/charls" +} diff --git a/ports/check/CONTROL b/ports/check/CONTROL deleted file mode 100644 index 7f1583a0264cc9..00000000000000 --- a/ports/check/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: check -Version: 0.15.2 -Homepage: https://github.com/libcheck/check -Description: A unit testing framework for C diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json new file mode 100644 index 00000000000000..d94e11b6862262 --- /dev/null +++ b/ports/check/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "check", + "version-string": "0.15.2", + "port-version": 1, + "description": "A unit testing framework for C", + "homepage": "https://github.com/libcheck/check" +} diff --git a/ports/chipmunk/CONTROL b/ports/chipmunk/CONTROL deleted file mode 100644 index d5948caf797d34..00000000000000 --- a/ports/chipmunk/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: chipmunk -Version: 7.0.3 -Port-Version: 1 -Homepage: https://github.com/slembcke/Chipmunk2D -Description: A fast and lightweight 2D game physics library. \ No newline at end of file diff --git a/ports/chipmunk/vcpkg.json b/ports/chipmunk/vcpkg.json new file mode 100644 index 00000000000000..07bda6fcb914a8 --- /dev/null +++ b/ports/chipmunk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "chipmunk", + "version-string": "7.0.3", + "port-version": 2, + "description": "A fast and lightweight 2D game physics library.", + "homepage": "https://github.com/slembcke/Chipmunk2D" +} diff --git a/ports/chmlib/CONTROL b/ports/chmlib/CONTROL deleted file mode 100644 index 6042ceb994a5b7..00000000000000 --- a/ports/chmlib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: chmlib -Version: 0.40-4 -Homepage: https://www.jedrea.com/chmlib/ -Description: CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives. diff --git a/ports/chmlib/vcpkg.json b/ports/chmlib/vcpkg.json new file mode 100644 index 00000000000000..f3fcf3d84c7e16 --- /dev/null +++ b/ports/chmlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "chmlib", + "version-string": "0.40", + "port-version": 5, + "description": "CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right now, it is a very simple library, but sufficient for dealing with all of the .chm files I've come across. Due to the fairly well-designed indexing built into this particular file format, even a small library is able to gain reasonably good performance indexing into ITSS archives.", + "homepage": "https://www.jedrea.com/chmlib/" +} diff --git a/ports/chromium-base/CONTROL b/ports/chromium-base/CONTROL deleted file mode 100644 index 589f60a26ac58c..00000000000000 --- a/ports/chromium-base/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: chromium-base -Version: 86.0.4199.1 -Port-Version: 1 -Homepage: https://chromium.googlesource.com/chromium/src -Description: Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web. -Supports: x64 & (osx|windows|linux) & !uwp diff --git a/ports/chromium-base/vcpkg.json b/ports/chromium-base/vcpkg.json new file mode 100644 index 00000000000000..6ca5e8a9e14dc1 --- /dev/null +++ b/ports/chromium-base/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "chromium-base", + "version-string": "86.0.4199.1", + "port-version": 2, + "description": "Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.", + "homepage": "https://chromium.googlesource.com/chromium/src", + "supports": "x64 & (osx | windows | linux) & !uwp" +} diff --git a/ports/cimg/CONTROL b/ports/cimg/CONTROL deleted file mode 100644 index 6d7389d54f71ac..00000000000000 --- a/ports/cimg/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cimg -Version: 2.9.4 -Homepage: https://github.com/dtschump/CImg -Description: The CImg Library is a small, open-source, and modern C++ toolkit for image processing diff --git a/ports/cimg/vcpkg.json b/ports/cimg/vcpkg.json new file mode 100644 index 00000000000000..c7e58a67c0917f --- /dev/null +++ b/ports/cimg/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cimg", + "version-string": "2.9.4", + "port-version": 1, + "description": "The CImg Library is a small, open-source, and modern C++ toolkit for image processing", + "homepage": "https://github.com/dtschump/CImg" +} diff --git a/ports/cityhash/CONTROL b/ports/cityhash/CONTROL deleted file mode 100644 index 2b45a58c994bce..00000000000000 --- a/ports/cityhash/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cityhash -Version: 2013-01-08 -Homepage: https://github.com/google/cityhash -Description: CityHash, a family of hash functions for strings. diff --git a/ports/cityhash/vcpkg.json b/ports/cityhash/vcpkg.json new file mode 100644 index 00000000000000..bcd255aed32eb9 --- /dev/null +++ b/ports/cityhash/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cityhash", + "version-string": "2013-01-08", + "port-version": 1, + "description": "CityHash, a family of hash functions for strings.", + "homepage": "https://github.com/google/cityhash" +} diff --git a/ports/clara/CONTROL b/ports/clara/CONTROL deleted file mode 100644 index bb0af5dfbc27ef..00000000000000 --- a/ports/clara/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: clara -Version: 1.1.5 -Homepage: https://github.com/philsquared/Clara -Description: A simple to use command line parser for C++ \ No newline at end of file diff --git a/ports/clara/vcpkg.json b/ports/clara/vcpkg.json new file mode 100644 index 00000000000000..7752fb5201856b --- /dev/null +++ b/ports/clara/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "clara", + "version-string": "1.1.5", + "port-version": 1, + "description": "A simple to use command line parser for C++", + "homepage": "https://github.com/philsquared/Clara" +} diff --git a/ports/clblas/CONTROL b/ports/clblas/CONTROL deleted file mode 100644 index bd4d8a552771a0..00000000000000 --- a/ports/clblas/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: clblas -Version: 2.12-4 -Build-Depends: opencl -Description: clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library. diff --git a/ports/clblas/vcpkg.json b/ports/clblas/vcpkg.json new file mode 100644 index 00000000000000..975a0982bc7600 --- /dev/null +++ b/ports/clblas/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "clblas", + "version-string": "2.12", + "port-version": 5, + "description": "clBLAS is an OpenCL 1.2 accelerated BLAS (Basic Linear Algebra Subsystem) library.", + "dependencies": [ + "opencl" + ] +} diff --git a/ports/clblast/CONTROL b/ports/clblast/CONTROL deleted file mode 100644 index 52c2c7533315d4..00000000000000 --- a/ports/clblast/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: clblast -Version: 1.5.1 -Build-Depends: opencl -Description: A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11. \ No newline at end of file diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json new file mode 100644 index 00000000000000..1bf12a26b2e004 --- /dev/null +++ b/ports/clblast/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "clblast", + "version-string": "1.5.1", + "port-version": 1, + "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", + "dependencies": [ + "opencl" + ] +} diff --git a/ports/clfft/CONTROL b/ports/clfft/CONTROL deleted file mode 100644 index 522a641e49ac84..00000000000000 --- a/ports/clfft/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: clfft -Version: 2.12.2-2 -Build-Depends: opencl -Homepage: https://github.com/clMathLibraries/clFFT -Description: clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library. diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json new file mode 100644 index 00000000000000..c3e287507552c4 --- /dev/null +++ b/ports/clfft/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "clfft", + "version-string": "2.12.2", + "port-version": 3, + "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.", + "homepage": "https://github.com/clMathLibraries/clFFT", + "dependencies": [ + "opencl" + ] +} diff --git a/ports/clickhouse-cpp/CONTROL b/ports/clickhouse-cpp/CONTROL deleted file mode 100644 index fc8cf6a61b28a2..00000000000000 --- a/ports/clickhouse-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: clickhouse-cpp -Version: 2019-05-22 -Build-Depends: lz4, cityhash -Homepage: https://github.com/artpaul/clickhouse-cpp -Description: C++ client for Yandex ClickHouse. diff --git a/ports/clickhouse-cpp/vcpkg.json b/ports/clickhouse-cpp/vcpkg.json new file mode 100644 index 00000000000000..2c5d6a4f3f61e3 --- /dev/null +++ b/ports/clickhouse-cpp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "clickhouse-cpp", + "version-string": "2019-05-22", + "port-version": 1, + "description": "C++ client for Yandex ClickHouse.", + "homepage": "https://github.com/artpaul/clickhouse-cpp", + "dependencies": [ + "cityhash", + "lz4" + ] +} diff --git a/ports/clipp/CONTROL b/ports/clipp/CONTROL deleted file mode 100644 index ed8084936b8074..00000000000000 --- a/ports/clipp/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: clipp -Version: 2019-04-30 -Description: command line interfaces for modern C++ \ No newline at end of file diff --git a/ports/clipp/vcpkg.json b/ports/clipp/vcpkg.json new file mode 100644 index 00000000000000..e5fc0850cc518d --- /dev/null +++ b/ports/clipp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "clipp", + "version-string": "2019-04-30", + "port-version": 1, + "description": "command line interfaces for modern C++" +} diff --git a/ports/clockutils/CONTROL b/ports/clockutils/CONTROL deleted file mode 100644 index c555fd4182263b..00000000000000 --- a/ports/clockutils/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: clockutils -Version: 1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3 -Homepage: https://github.com/ClockworkOrigins/clockUtils -Description: A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed. diff --git a/ports/clockutils/vcpkg.json b/ports/clockutils/vcpkg.json new file mode 100644 index 00000000000000..066a9ccac7549c --- /dev/null +++ b/ports/clockutils/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "clockutils", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", + "port-version": 4, + "description": "A lightweight c++ library for commonly needed tasks. Optimized for simplicity and speed.", + "homepage": "https://github.com/ClockworkOrigins/clockUtils" +} diff --git a/ports/clp/CONTROL b/ports/clp/CONTROL deleted file mode 100644 index c181d845f8c527..00000000000000 --- a/ports/clp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: clp -Version: 1.17.6 -Description: Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available. -Build-Depends: coinutils, osi diff --git a/ports/clp/vcpkg.json b/ports/clp/vcpkg.json new file mode 100644 index 00000000000000..7e598d1997df65 --- /dev/null +++ b/ports/clp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "clp", + "version-string": "1.17.6", + "port-version": 1, + "description": "Clp (Coin-or linear programming) is an open-source linear programming solver written in C++. It is primarily meant to be used as a callable library, but a basic, stand-alone executable version is also available.", + "dependencies": [ + "coinutils", + "osi" + ] +} diff --git a/ports/clrng/CONTROL b/ports/clrng/CONTROL deleted file mode 100644 index 35c19e5e64a611..00000000000000 --- a/ports/clrng/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: clrng -Version: 2020-12-01 -Build-Depends: opencl -Supports: !arm64 -Homepage: https://github.com/clMathLibraries/clRNG -Description: clRNG is a library for uniform random number generation in OpenCL. diff --git a/ports/clrng/vcpkg.json b/ports/clrng/vcpkg.json new file mode 100644 index 00000000000000..a7415ab0bf8832 --- /dev/null +++ b/ports/clrng/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "clrng", + "version-string": "2020-12-01", + "port-version": 1, + "description": "clRNG is a library for uniform random number generation in OpenCL.", + "homepage": "https://github.com/clMathLibraries/clRNG", + "supports": "!arm64", + "dependencies": [ + "opencl" + ] +} diff --git a/ports/cmark/CONTROL b/ports/cmark/CONTROL deleted file mode 100644 index 8528ca5793954b..00000000000000 --- a/ports/cmark/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: cmark -Version: 0.29.0 -Description: CommonMark parsing and rendering library diff --git a/ports/cmark/vcpkg.json b/ports/cmark/vcpkg.json new file mode 100644 index 00000000000000..8ada6339c4bd4c --- /dev/null +++ b/ports/cmark/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cmark", + "version-string": "0.29.0", + "port-version": 1, + "description": "CommonMark parsing and rendering library" +} diff --git a/ports/cmcstl2/CONTROL b/ports/cmcstl2/CONTROL deleted file mode 100644 index 42b652ce4dd71f..00000000000000 --- a/ports/cmcstl2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cmcstl2 -Version: 2019-07-20 -Description: An implementation of C++ Extensions for Ranges -Homepage: https://github.com/CaseyCarter/cmcstl2 diff --git a/ports/cmcstl2/vcpkg.json b/ports/cmcstl2/vcpkg.json new file mode 100644 index 00000000000000..df0d6a2a52add9 --- /dev/null +++ b/ports/cmcstl2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cmcstl2", + "version-string": "2019-07-20", + "port-version": 1, + "description": "An implementation of C++ Extensions for Ranges", + "homepage": "https://github.com/CaseyCarter/cmcstl2" +} diff --git a/ports/coin/CONTROL b/ports/coin/CONTROL deleted file mode 100644 index f5147e350793fb..00000000000000 --- a/ports/coin/CONTROL +++ /dev/null @@ -1,32 +0,0 @@ -Source: coin -Version: 4.0.0 -Port-Version: 2 -Description: A high-level 3D visualization library with Open Inventor 2.1 API -Build-Depends: boost-assert, boost-config, boost-lexical-cast, boost-math, boost-smart-ptr, boost-static-assert, opengl-registry -Homepage: https://github.com/coin3d/coin -Default-Features: simage, zlib -Supports: !(arm|arm64|uwp) - -Feature: bzip2 -Build-Depends: bzip2, freetype[bzip2] -Description: Support bzip2 compressed fonts - -Feature: fontconfig -Build-Depends: fontconfig -Description: Use fontconfig for font support - -Feature: freetype -Build-Depends: freetype -Description: Use freetype for font support - -Feature: openal -Build-Depends: openal-soft -Description: Use OpenAL for sound support in VRML97 - -Feature: simage -Build-Depends: simage -Description: Use simage for loading images (textures), audio, and animations - -Feature: zlib -Build-Depends: zlib -Description: Use zlib for reading/writing compressed files diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json new file mode 100644 index 00000000000000..c9f254f77d2243 --- /dev/null +++ b/ports/coin/vcpkg.json @@ -0,0 +1,65 @@ +{ + "name": "coin", + "version-string": "4.0.0", + "port-version": 3, + "description": "A high-level 3D visualization library with Open Inventor 2.1 API", + "homepage": "https://github.com/coin3d/coin", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + "boost-assert", + "boost-config", + "boost-lexical-cast", + "boost-math", + "boost-smart-ptr", + "boost-static-assert", + "opengl-registry" + ], + "default-features": [ + "simage", + "zlib" + ], + "features": { + "bzip2": { + "description": "Support bzip2 compressed fonts", + "dependencies": [ + "bzip2", + { + "name": "freetype", + "features": [ + "bzip2" + ] + } + ] + }, + "fontconfig": { + "description": "Use fontconfig for font support", + "dependencies": [ + "fontconfig" + ] + }, + "freetype": { + "description": "Use freetype for font support", + "dependencies": [ + "freetype" + ] + }, + "openal": { + "description": "Use OpenAL for sound support in VRML97", + "dependencies": [ + "openal-soft" + ] + }, + "simage": { + "description": "Use simage for loading images (textures), audio, and animations", + "dependencies": [ + "simage" + ] + }, + "zlib": { + "description": "Use zlib for reading/writing compressed files", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/coinutils/CONTROL b/ports/coinutils/CONTROL deleted file mode 100644 index a242265bfafc7c..00000000000000 --- a/ports/coinutils/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: coinutils -Version: 2.11.4 -Description: CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project diff --git a/ports/coinutils/vcpkg.json b/ports/coinutils/vcpkg.json new file mode 100644 index 00000000000000..2f71443767ea45 --- /dev/null +++ b/ports/coinutils/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "coinutils", + "version-string": "2.11.4", + "port-version": 1, + "description": "CoinUtils (Coin-or Utilities) is an open-source collection of classes and functions that are generally useful to more than one COIN-OR project" +} diff --git a/ports/collada-dom/CONTROL b/ports/collada-dom/CONTROL deleted file mode 100644 index 9b61361534d353..00000000000000 --- a/ports/collada-dom/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: collada-dom -Version: 2.5.0 -Port-Version: 4 -Homepage: https://github.com/rdiankov/collada-dom -Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document. -Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system diff --git a/ports/collada-dom/vcpkg.json b/ports/collada-dom/vcpkg.json new file mode 100644 index 00000000000000..e929b4a076eed0 --- /dev/null +++ b/ports/collada-dom/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "collada-dom", + "version-string": "2.5.0", + "port-version": 5, + "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.", + "homepage": "https://github.com/rdiankov/collada-dom", + "dependencies": [ + "boost-filesystem", + "boost-system", + "libxml2", + "minizip", + "pcre", + "uriparser", + "zlib" + ] +} diff --git a/ports/console-bridge/CONTROL b/ports/console-bridge/CONTROL deleted file mode 100644 index 035b900760f551..00000000000000 --- a/ports/console-bridge/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: console-bridge -Version: 1.0.1 -Port-Version: 1 -Homepage: https://github.com/ros/console_bridge -Description: a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages. diff --git a/ports/console-bridge/vcpkg.json b/ports/console-bridge/vcpkg.json new file mode 100644 index 00000000000000..d841bb9e868798 --- /dev/null +++ b/ports/console-bridge/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "console-bridge", + "version-string": "1.0.1", + "port-version": 2, + "description": "a ROS-independent package for logging that seamlessly pipes into rosconsole/rosout for ROS-dependent packages.", + "homepage": "https://github.com/ros/console_bridge" +} diff --git a/ports/constexpr-contracts/CONTROL b/ports/constexpr-contracts/CONTROL deleted file mode 100644 index 515b9b2b56907f..00000000000000 --- a/ports/constexpr-contracts/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: constexpr-contracts -Version: 2020-08-09 -Homepage: https://github.com/cjdb/constexpr-contracts -Description: A constexpr-friendly, optimisation-friendly contracts library. diff --git a/ports/constexpr-contracts/vcpkg.json b/ports/constexpr-contracts/vcpkg.json new file mode 100644 index 00000000000000..1e5da41352de0e --- /dev/null +++ b/ports/constexpr-contracts/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "constexpr-contracts", + "version-string": "2020-08-09", + "port-version": 1, + "description": "A constexpr-friendly, optimisation-friendly contracts library.", + "homepage": "https://github.com/cjdb/constexpr-contracts" +} diff --git a/ports/constexpr/CONTROL b/ports/constexpr/CONTROL deleted file mode 100644 index 78dc70aa42ae1a..00000000000000 --- a/ports/constexpr/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: constexpr -Version: 1.0-1 -Homepage: https://github.com/elbeno/constexpr -Description: Small MIT License Library of general stdlib functions written as C++11 constexpr functions. diff --git a/ports/constexpr/vcpkg.json b/ports/constexpr/vcpkg.json new file mode 100644 index 00000000000000..85a8a46c97d8fc --- /dev/null +++ b/ports/constexpr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "constexpr", + "version-string": "1.0", + "port-version": 2, + "description": "Small MIT License Library of general stdlib functions written as C++11 constexpr functions.", + "homepage": "https://github.com/elbeno/constexpr" +} diff --git a/ports/cpp-netlib/CONTROL b/ports/cpp-netlib/CONTROL deleted file mode 100644 index f31cc101b6aa44..00000000000000 --- a/ports/cpp-netlib/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: cpp-netlib -Version: 0.13.0 -Port-Version: 4 -Homepage: https://cpp-netlib.org/ -Build-Depends: boost-spirit, boost-smart-ptr, boost-asio, boost-program-options, boost-assign, boost-logic, boost-scope-exit -Description: A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library -Supports: !uwp \ No newline at end of file diff --git a/ports/cpp-netlib/vcpkg.json b/ports/cpp-netlib/vcpkg.json new file mode 100644 index 00000000000000..22a7c7b9ed3087 --- /dev/null +++ b/ports/cpp-netlib/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cpp-netlib", + "version-string": "0.13.0", + "port-version": 5, + "description": "A collection of network-related routines/implementations geared towards providing a robust cross-platform networking library", + "homepage": "https://cpp-netlib.org/", + "supports": "!uwp", + "dependencies": [ + "boost-asio", + "boost-assign", + "boost-logic", + "boost-program-options", + "boost-scope-exit", + "boost-smart-ptr", + "boost-spirit" + ] +} diff --git a/ports/cpp-peglib/CONTROL b/ports/cpp-peglib/CONTROL deleted file mode 100644 index 6a6ed9ad5df903..00000000000000 --- a/ports/cpp-peglib/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: cpp-peglib -Version: 0.1.0 -Description: C++11 header-only PEG (Parsing Expression Grammars) library. diff --git a/ports/cpp-peglib/vcpkg.json b/ports/cpp-peglib/vcpkg.json new file mode 100644 index 00000000000000..b7e97849632314 --- /dev/null +++ b/ports/cpp-peglib/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cpp-peglib", + "version-string": "0.1.0", + "port-version": 1, + "description": "C++11 header-only PEG (Parsing Expression Grammars) library." +} diff --git a/ports/cpp-redis/CONTROL b/ports/cpp-redis/CONTROL deleted file mode 100644 index 702c107a1de4f0..00000000000000 --- a/ports/cpp-redis/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cpp-redis -Version: 4.3.1-2 -Build-Depends: tacopie -Homepage: https://github.com/cpp-redis/cpp_redis -Description: cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining. diff --git a/ports/cpp-redis/vcpkg.json b/ports/cpp-redis/vcpkg.json new file mode 100644 index 00000000000000..a0b08e18a7cff3 --- /dev/null +++ b/ports/cpp-redis/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cpp-redis", + "version-string": "4.3.1", + "port-version": 3, + "description": "cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.", + "homepage": "https://github.com/cpp-redis/cpp_redis", + "dependencies": [ + "tacopie" + ] +} diff --git a/ports/cpp-taskflow/CONTROL b/ports/cpp-taskflow/CONTROL deleted file mode 100644 index 49885ffd030e06..00000000000000 --- a/ports/cpp-taskflow/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cpp-taskflow -Version: 2.6.0 -Description: Fast Parallel Tasking Programming Library using Modern C++. -Homepage: https://github.com/taskflow/taskflow -Build-Depends: taskflow diff --git a/ports/cpp-taskflow/vcpkg.json b/ports/cpp-taskflow/vcpkg.json new file mode 100644 index 00000000000000..ca690bb21f0996 --- /dev/null +++ b/ports/cpp-taskflow/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cpp-taskflow", + "version-string": "2.6.0", + "port-version": 1, + "description": "Fast Parallel Tasking Programming Library using Modern C++.", + "homepage": "https://github.com/taskflow/taskflow", + "dependencies": [ + "taskflow" + ] +} diff --git a/ports/cppad/CONTROL b/ports/cppad/CONTROL deleted file mode 100644 index f38cfd121b4da8..00000000000000 --- a/ports/cppad/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cppad -Version: 20200000.3 -Homepage: https://github.com/coin-or/CppAD -Description: CppAD: A Package for Differentiation of C++ Algorithms -Supports: !(arm|uwp) diff --git a/ports/cppad/vcpkg.json b/ports/cppad/vcpkg.json new file mode 100644 index 00000000000000..a2108bcec9c264 --- /dev/null +++ b/ports/cppad/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "cppad", + "version-string": "20200000.3", + "port-version": 1, + "description": "CppAD: A Package for Differentiation of C++ Algorithms", + "homepage": "https://github.com/coin-or/CppAD", + "supports": "!(arm | uwp)" +} diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL deleted file mode 100644 index 2d4f6309544468..00000000000000 --- a/ports/cppcms/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: cppcms -Version: 1.2.1 -Port-Version: 2 -Homepage: https://github.com/artyom-beilis/cppcms -Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development -Build-Depends: icu, pcre, openssl, zlib -Supports: !(linux|osx) diff --git a/ports/cppcms/vcpkg.json b/ports/cppcms/vcpkg.json new file mode 100644 index 00000000000000..0991668efc1a9d --- /dev/null +++ b/ports/cppcms/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "cppcms", + "version-string": "1.2.1", + "port-version": 3, + "description": "CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development", + "homepage": "https://github.com/artyom-beilis/cppcms", + "supports": "!(linux | osx)", + "dependencies": [ + "icu", + "openssl", + "pcre", + "zlib" + ] +} diff --git a/ports/cppcodec/CONTROL b/ports/cppcodec/CONTROL deleted file mode 100644 index 32f72bf2ff3e0c..00000000000000 --- a/ports/cppcodec/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: cppcodec -Version: 0.2 -Description: Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32. \ No newline at end of file diff --git a/ports/cppcodec/vcpkg.json b/ports/cppcodec/vcpkg.json new file mode 100644 index 00000000000000..0713dfd7f0fd8a --- /dev/null +++ b/ports/cppcodec/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cppcodec", + "version-string": "0.2", + "port-version": 1, + "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32." +} diff --git a/ports/cppcoro/CONTROL b/ports/cppcoro/CONTROL deleted file mode 100644 index ea3a391fa12d6e..00000000000000 --- a/ports/cppcoro/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cppcoro -Homepage: https://github.com/lewissbaker/cppcoro -Version: 2020-2-28-1 -Description: A library of C++ coroutine abstractions for the Coroutines TS -Supports: !uwp diff --git a/ports/cppcoro/vcpkg.json b/ports/cppcoro/vcpkg.json new file mode 100644 index 00000000000000..e5e116dc85e503 --- /dev/null +++ b/ports/cppcoro/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "cppcoro", + "version-string": "2020-2-28", + "port-version": 2, + "description": "A library of C++ coroutine abstractions for the Coroutines TS", + "homepage": "https://github.com/lewissbaker/cppcoro", + "supports": "!uwp" +} diff --git a/ports/cppfs/CONTROL b/ports/cppfs/CONTROL deleted file mode 100644 index d32f5a7f8a09f2..00000000000000 --- a/ports/cppfs/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: cppfs -Version: 1.3.0 -Description: Cross-platform C++ file system library supporting multiple backends -Supports: !uwp - -Feature: ssh -Description: SSH backend for cppfs -Build-Depends: libssh2,openssl,zlib diff --git a/ports/cppfs/vcpkg.json b/ports/cppfs/vcpkg.json new file mode 100644 index 00000000000000..75db6fc3e70457 --- /dev/null +++ b/ports/cppfs/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "cppfs", + "version-string": "1.3.0", + "port-version": 1, + "description": "Cross-platform C++ file system library supporting multiple backends", + "supports": "!uwp", + "features": { + "ssh": { + "description": "SSH backend for cppfs", + "dependencies": [ + "libssh2", + "openssl", + "zlib" + ] + } + } +} diff --git a/ports/cppitertools/CONTROL b/ports/cppitertools/CONTROL deleted file mode 100644 index 84897b20c393a8..00000000000000 --- a/ports/cppitertools/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cppitertools -Version: 2.1 -Homepage: https://github.com/ryanhaining/cppitertools -Description: Range-based for loop add-ons inspired by the Python builtins and itertools library -Build-Depends: boost-optional diff --git a/ports/cppitertools/vcpkg.json b/ports/cppitertools/vcpkg.json new file mode 100644 index 00000000000000..8f643e6bc1b66f --- /dev/null +++ b/ports/cppitertools/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cppitertools", + "version-string": "2.1", + "port-version": 1, + "description": "Range-based for loop add-ons inspired by the Python builtins and itertools library", + "homepage": "https://github.com/ryanhaining/cppitertools", + "dependencies": [ + "boost-optional" + ] +} diff --git a/ports/cppkafka/CONTROL b/ports/cppkafka/CONTROL deleted file mode 100644 index 5dec433ef6ea4d..00000000000000 --- a/ports/cppkafka/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cppkafka -Version: 0.3.1-2 -Homepage: https://github.com/mfontanini/cppkafka -Description: cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum. -Build-Depends: boost-program-options, librdkafka diff --git a/ports/cppkafka/vcpkg.json b/ports/cppkafka/vcpkg.json new file mode 100644 index 00000000000000..00473d9725c836 --- /dev/null +++ b/ports/cppkafka/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "cppkafka", + "version-string": "0.3.1", + "port-version": 3, + "description": "cppkafka allows C++ applications to consume and produce messages using the Apache Kafka protocol. The library is built on top of librdkafka, and provides a high level API that uses modern C++ features to make it easier to write code while keeping the wrapper's performance overhead to a minimum.", + "homepage": "https://github.com/mfontanini/cppkafka", + "dependencies": [ + "boost-program-options", + "librdkafka" + ] +} diff --git a/ports/cppmicroservices/CONTROL b/ports/cppmicroservices/CONTROL deleted file mode 100644 index 2db76b91d418dd..00000000000000 --- a/ports/cppmicroservices/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: cppmicroservices -Version: 3.4.0 -Port-Version: 2 -Homepage: https://github.com/CppMicroServices/CppMicroServices -Description: An OSGi-like C++ dynamic module system and service registry -Build-Depends: gtest \ No newline at end of file diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json new file mode 100644 index 00000000000000..1c28245eb77d89 --- /dev/null +++ b/ports/cppmicroservices/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "cppmicroservices", + "version-string": "3.4.0", + "port-version": 3, + "description": "An OSGi-like C++ dynamic module system and service registry", + "homepage": "https://github.com/CppMicroServices/CppMicroServices", + "dependencies": [ + "gtest" + ] +} diff --git a/ports/cpptoml/CONTROL b/ports/cpptoml/CONTROL deleted file mode 100644 index 2409ddbd215210..00000000000000 --- a/ports/cpptoml/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: cpptoml -Version: v0.1.1 -Description: A header-only library for parsing TOML configuration files. diff --git a/ports/cpptoml/vcpkg.json b/ports/cpptoml/vcpkg.json new file mode 100644 index 00000000000000..13afe69b4caa2c --- /dev/null +++ b/ports/cpptoml/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "cpptoml", + "version-string": "v0.1.1", + "port-version": 1, + "description": "A header-only library for parsing TOML configuration files." +} diff --git a/ports/cpputest/CONTROL b/ports/cpputest/CONTROL deleted file mode 100644 index 7d08408292aef4..00000000000000 --- a/ports/cpputest/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cpputest -Version: 2019-9-16-1 -Homepage: https://github.com/cpputest/cpputest -Description: CppUTest unit testing and mocking framework for C/C++. \ No newline at end of file diff --git a/ports/cpputest/vcpkg.json b/ports/cpputest/vcpkg.json new file mode 100644 index 00000000000000..3e5867d70766b3 --- /dev/null +++ b/ports/cpputest/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cpputest", + "version-string": "2019-9-16", + "port-version": 2, + "description": "CppUTest unit testing and mocking framework for C/C++.", + "homepage": "https://github.com/cpputest/cpputest" +} diff --git a/ports/cpuid/CONTROL b/ports/cpuid/CONTROL deleted file mode 100644 index 8445533af5d9d4..00000000000000 --- a/ports/cpuid/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cpuid -Version: 0.4.1-1 -Homepage: https://github.com/anrieff/libcpuid -Description: Provides CPU identification for the x86 (and x86_64) -Supports: x86 | x64 diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json new file mode 100644 index 00000000000000..6c63a4c7723c43 --- /dev/null +++ b/ports/cpuid/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "cpuid", + "version-string": "0.4.1", + "port-version": 2, + "description": "Provides CPU identification for the x86 (and x86_64)", + "homepage": "https://github.com/anrieff/libcpuid", + "supports": "x86 | x64" +} diff --git a/ports/cr/CONTROL b/ports/cr/CONTROL deleted file mode 100644 index 864d23f639be79..00000000000000 --- a/ports/cr/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cr -Version: 2020-04-26 -Homepage: https://fungos.github.io/cr-simple-c-hot-reload/ -Description: cr.h: A Simple C Hot Reload Header-only Library diff --git a/ports/cr/vcpkg.json b/ports/cr/vcpkg.json new file mode 100644 index 00000000000000..a80ef70595a9d8 --- /dev/null +++ b/ports/cr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cr", + "version-string": "2020-04-26", + "port-version": 1, + "description": "cr.h: A Simple C Hot Reload Header-only Library", + "homepage": "https://fungos.github.io/cr-simple-c-hot-reload/" +} diff --git a/ports/crashpad/CONTROL b/ports/crashpad/CONTROL deleted file mode 100644 index dab2671f67193e..00000000000000 --- a/ports/crashpad/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: crashpad -Version: 2020-03-18 -Homepage: https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md -Description: Crashpad is a crash-reporting system. - Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss. -Build-Depends: zlib -Supports: x64 & (osx|windows) diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json new file mode 100644 index 00000000000000..a470314994806f --- /dev/null +++ b/ports/crashpad/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "crashpad", + "version-string": "2020-03-18", + "port-version": 1, + "description": [ + "Crashpad is a crash-reporting system.", + "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." + ], + "homepage": "https://chromium.googlesource.com/crashpad/crashpad/+/master/README.md", + "supports": "x64 & (osx | windows)", + "dependencies": [ + "zlib" + ] +} diff --git a/ports/crc32c/CONTROL b/ports/crc32c/CONTROL deleted file mode 100644 index b7d86b001346f0..00000000000000 --- a/ports/crc32c/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: crc32c -Version: 1.1.1 -Homepage: https://github.com/google/crc32c -Description: CRC32C implementation with support for CPU-specific acceleration instructions. diff --git a/ports/crc32c/vcpkg.json b/ports/crc32c/vcpkg.json new file mode 100644 index 00000000000000..b8bd8e5b9ec348 --- /dev/null +++ b/ports/crc32c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "crc32c", + "version-string": "1.1.1", + "port-version": 1, + "description": "CRC32C implementation with support for CPU-specific acceleration instructions.", + "homepage": "https://github.com/google/crc32c" +} diff --git a/ports/croncpp/CONTROL b/ports/croncpp/CONTROL deleted file mode 100644 index 32ef3b907f8e33..00000000000000 --- a/ports/croncpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: croncpp -Version: 2020-09-04 -Port-Version: 1 -Homepage: https://github.com/mariusbancila/croncpp -Description: croncpp is a C++17 header-only cross-platform library for handling CRON expressions. diff --git a/ports/croncpp/vcpkg.json b/ports/croncpp/vcpkg.json new file mode 100644 index 00000000000000..d1b9e05dea43a6 --- /dev/null +++ b/ports/croncpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "croncpp", + "version-string": "2020-09-04", + "port-version": 2, + "description": "croncpp is a C++17 header-only cross-platform library for handling CRON expressions.", + "homepage": "https://github.com/mariusbancila/croncpp" +} diff --git a/ports/crossguid/CONTROL b/ports/crossguid/CONTROL deleted file mode 100644 index 574d444d22a2bf..00000000000000 --- a/ports/crossguid/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: crossguid -Version: 0.2.2-2018-06-16-1 -Build-Depends: libuuid (!windows&!uwp&!osx&!android) -Description: CrossGuid is a minimal, cross platform, C++ GUID library. diff --git a/ports/crossguid/vcpkg.json b/ports/crossguid/vcpkg.json new file mode 100644 index 00000000000000..0532bad6633d36 --- /dev/null +++ b/ports/crossguid/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "crossguid", + "version-string": "0.2.2-2018-06-16", + "port-version": 2, + "description": "CrossGuid is a minimal, cross platform, C++ GUID library.", + "dependencies": [ + { + "name": "libuuid", + "platform": "!windows & !uwp & !osx & !android" + } + ] +} diff --git a/ports/cryptopp/CONTROL b/ports/cryptopp/CONTROL deleted file mode 100644 index 2cebc7177cda6a..00000000000000 --- a/ports/cryptopp/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: cryptopp -Version: 8.5.0 -Homepage: https://github.com/weidai11/cryptopp -Description: Crypto++ is a free C++ class library of cryptographic schemes. - -Feature: pem-pack -Description: Crypto++ with PEM pack diff --git a/ports/cryptopp/vcpkg.json b/ports/cryptopp/vcpkg.json new file mode 100644 index 00000000000000..e75fa21625bf38 --- /dev/null +++ b/ports/cryptopp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cryptopp", + "version-string": "8.5.0", + "port-version": 1, + "description": "Crypto++ is a free C++ class library of cryptographic schemes.", + "homepage": "https://github.com/weidai11/cryptopp", + "features": { + "pem-pack": { + "description": "Crypto++ with PEM pack" + } + } +} diff --git a/ports/cspice/CONTROL b/ports/cspice/CONTROL deleted file mode 100644 index 00c2943a399d75..00000000000000 --- a/ports/cspice/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cspice -Version: 66 -Port-Version: 4 -Homepage: https://naif.jpl.nasa.gov/naif/toolkit_C.html -Description: NASA C SPICE toolkit diff --git a/ports/cspice/vcpkg.json b/ports/cspice/vcpkg.json new file mode 100644 index 00000000000000..abbf6dfaf58792 --- /dev/null +++ b/ports/cspice/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cspice", + "version-string": "66", + "port-version": 5, + "description": "NASA C SPICE toolkit", + "homepage": "https://naif.jpl.nasa.gov/naif/toolkit_C.html" +} diff --git a/ports/ctbignum/CONTROL b/ports/ctbignum/CONTROL deleted file mode 100644 index 977abc21fe4c53..00000000000000 --- a/ports/ctbignum/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ctbignum -Version: 2019-08-02 -Homepage: https://github.com/niekbouman/ctbignum -Description: This is a header-only template library for fixed-width "small big-integer" computations, for use during run-time as well as compile-time. -Build-Depends: boost - diff --git a/ports/ctbignum/vcpkg.json b/ports/ctbignum/vcpkg.json new file mode 100644 index 00000000000000..093dfbcfbf6b38 --- /dev/null +++ b/ports/ctbignum/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "ctbignum", + "version-string": "2019-08-02", + "port-version": 1, + "description": "This is a header-only template library for fixed-width \"small big-integer\" computations, for use during run-time as well as compile-time.", + "homepage": "https://github.com/niekbouman/ctbignum", + "dependencies": [ + "boost" + ] +} diff --git a/ports/ctemplate/CONTROL b/ports/ctemplate/CONTROL deleted file mode 100644 index fe8958a80aacb1..00000000000000 --- a/ports/ctemplate/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ctemplate -Version: 2020-09-14 -Homepage: https://github.com/OlafvdSpek/ctemplate -Description: C++ CTemplate system diff --git a/ports/ctemplate/vcpkg.json b/ports/ctemplate/vcpkg.json new file mode 100644 index 00000000000000..110b0c58ae1474 --- /dev/null +++ b/ports/ctemplate/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ctemplate", + "version-string": "2020-09-14", + "port-version": 1, + "description": "C++ CTemplate system", + "homepage": "https://github.com/OlafvdSpek/ctemplate" +} diff --git a/ports/ctp/CONTROL b/ports/ctp/CONTROL deleted file mode 100644 index f8e11413711a27..00000000000000 --- a/ports/ctp/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: ctp -Version: 6.6.1_P1_20210406_se -Port-Version: 0 -Homepage: http://www.sfit.com.cn/index.htm -Description: The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading. - -Feature: datacollect -Description: Data collect support of CTP diff --git a/ports/ctp/vcpkg.json b/ports/ctp/vcpkg.json new file mode 100644 index 00000000000000..640df906dcf762 --- /dev/null +++ b/ports/ctp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "ctp", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 1, + "description": "The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading.", + "homepage": "http://www.sfit.com.cn/index.htm", + "features": { + "datacollect": { + "description": "Data collect support of CTP" + } + } +} diff --git a/ports/cuda/CONTROL b/ports/cuda/CONTROL deleted file mode 100644 index d9719ab409d934..00000000000000 --- a/ports/cuda/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: cuda -Version: 10.1 -Port-Version: 7 -Description: A parallel computing platform and programming model -Homepage: https://developer.nvidia.com/cuda-toolkit diff --git a/ports/cuda/vcpkg.json b/ports/cuda/vcpkg.json new file mode 100644 index 00000000000000..a448794d30090d --- /dev/null +++ b/ports/cuda/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cuda", + "version-string": "10.1", + "port-version": 8, + "description": "A parallel computing platform and programming model", + "homepage": "https://developer.nvidia.com/cuda-toolkit" +} diff --git a/ports/cunit/CONTROL b/ports/cunit/CONTROL deleted file mode 100644 index c5725875f3a100..00000000000000 --- a/ports/cunit/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cunit -Version: 2.1.3-6 -Homepage: https://sourceforge.net/projects/cunit/ -Description: CUnit is a lightweight system for writing, administering, and running unit tests in C. It provides C programmers a basic testing functionality with a flexible variety of user interfaces diff --git a/ports/cunit/vcpkg.json b/ports/cunit/vcpkg.json new file mode 100644 index 00000000000000..c3b2d3032e7128 --- /dev/null +++ b/ports/cunit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cunit", + "version-string": "2.1.3", + "port-version": 7, + "description": "CUnit is a lightweight system for writing, administering, and running unit tests in C. It provides C programmers a basic testing functionality with a flexible variety of user interfaces", + "homepage": "https://sourceforge.net/projects/cunit/" +} diff --git a/ports/curlpp/CONTROL b/ports/curlpp/CONTROL deleted file mode 100644 index cac6a6048d66ef..00000000000000 --- a/ports/curlpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: curlpp -Version: 2018-06-15-3 -Description: C++ wrapper around libcURL -Build-Depends: curl diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json new file mode 100644 index 00000000000000..9ca5d29edc3770 --- /dev/null +++ b/ports/curlpp/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "curlpp", + "version-string": "2018-06-15", + "port-version": 4, + "description": "C++ wrapper around libcURL", + "dependencies": [ + "curl" + ] +} diff --git a/ports/cute-headers/CONTROL b/ports/cute-headers/CONTROL deleted file mode 100644 index f3b98ff564c950..00000000000000 --- a/ports/cute-headers/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cute-headers -Version: 2019-09-20 -Description: Collection of cross-platform one-file C/C++ libraries with no dependencies -Homepage: https://github.com/RandyGaul/cute_headers diff --git a/ports/cute-headers/vcpkg.json b/ports/cute-headers/vcpkg.json new file mode 100644 index 00000000000000..bd12b94b48cb45 --- /dev/null +++ b/ports/cute-headers/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cute-headers", + "version-string": "2019-09-20", + "port-version": 1, + "description": "Collection of cross-platform one-file C/C++ libraries with no dependencies", + "homepage": "https://github.com/RandyGaul/cute_headers" +} diff --git a/ports/cutelyst2/CONTROL b/ports/cutelyst2/CONTROL deleted file mode 100644 index 56155853848ded..00000000000000 --- a/ports/cutelyst2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cutelyst2 -Version: 2.12.0 -Description: A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework -Build-Depends: qt5-base[core] diff --git a/ports/cutelyst2/vcpkg.json b/ports/cutelyst2/vcpkg.json new file mode 100644 index 00000000000000..2a0bdda3f7d737 --- /dev/null +++ b/ports/cutelyst2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cutelyst2", + "version-string": "2.12.0", + "port-version": 1, + "description": "A C++ Web Framework built on top of Qt, using the simple approach of Catalyst (Perl) framework", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/cxxopts/CONTROL b/ports/cxxopts/CONTROL deleted file mode 100644 index 68d7d918753129..00000000000000 --- a/ports/cxxopts/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cxxopts -Version: 2.2.1 -Homepage: https://github.com/jarro2783/cxxopts -Description: This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options diff --git a/ports/cxxopts/vcpkg.json b/ports/cxxopts/vcpkg.json new file mode 100644 index 00000000000000..213f5cefcc357d --- /dev/null +++ b/ports/cxxopts/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "cxxopts", + "version-string": "2.2.1", + "port-version": 1, + "description": "This is a lightweight C++ option parser library, supporting the standard GNU style syntax for options", + "homepage": "https://github.com/jarro2783/cxxopts" +} diff --git a/ports/darts-clone/CONTROL b/ports/darts-clone/CONTROL deleted file mode 100644 index a0bfad433cd9f4..00000000000000 --- a/ports/darts-clone/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: darts-clone -Version: 1767ab87cffe-1 -Description: A static double-array trie structure diff --git a/ports/darts-clone/vcpkg.json b/ports/darts-clone/vcpkg.json new file mode 100644 index 00000000000000..e99a2315ff725a --- /dev/null +++ b/ports/darts-clone/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "darts-clone", + "version-string": "1767ab87cffe", + "port-version": 2, + "description": "A static double-array trie structure" +} diff --git a/ports/dataframe/CONTROL b/ports/dataframe/CONTROL deleted file mode 100644 index 01e1ee6b4427a7..00000000000000 --- a/ports/dataframe/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: dataframe -Version: 1.17.0 -Description: This is a C++ statistical library that provides an interface similar to Pandas package in Python -Homepage: https://github.com/hosseinmoein/DataFrame -Supports: !uwp diff --git a/ports/dataframe/vcpkg.json b/ports/dataframe/vcpkg.json new file mode 100644 index 00000000000000..902221408efda9 --- /dev/null +++ b/ports/dataframe/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "dataframe", + "version-string": "1.17.0", + "port-version": 1, + "description": "This is a C++ statistical library that provides an interface similar to Pandas package in Python", + "homepage": "https://github.com/hosseinmoein/DataFrame", + "supports": "!uwp" +} diff --git a/ports/date/CONTROL b/ports/date/CONTROL deleted file mode 100644 index 0489b34d37231c..00000000000000 --- a/ports/date/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: date -Version: 3.0.0 -Port-Version: 2 -Homepage: https://github.com/HowardHinnant/date -Description: A date and time library based on the C++17 header - -Feature: remote-api -Description: support automatic download of tz data -Build-Depends: curl diff --git a/ports/date/vcpkg.json b/ports/date/vcpkg.json new file mode 100644 index 00000000000000..cbca5d9b0495c8 --- /dev/null +++ b/ports/date/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "date", + "version-string": "3.0.0", + "port-version": 3, + "description": "A date and time library based on the C++17 header", + "homepage": "https://github.com/HowardHinnant/date", + "features": { + "remote-api": { + "description": "support automatic download of tz data", + "dependencies": [ + "curl" + ] + } + } +} diff --git a/ports/dbg-macro/CONTROL b/ports/dbg-macro/CONTROL deleted file mode 100644 index 80a2e3165e9b24..00000000000000 --- a/ports/dbg-macro/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dbg-macro -Version: 2019-07-11 -Description: A dbg(...) macro for C++ -Homepage: https://github.com/sharkdp/dbg-macro diff --git a/ports/dbg-macro/vcpkg.json b/ports/dbg-macro/vcpkg.json new file mode 100644 index 00000000000000..23cdf24d15fd63 --- /dev/null +++ b/ports/dbg-macro/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dbg-macro", + "version-string": "2019-07-11", + "port-version": 1, + "description": "A dbg(...) macro for C++", + "homepage": "https://github.com/sharkdp/dbg-macro" +} diff --git a/ports/dbghelp/CONTROL b/ports/dbghelp/CONTROL deleted file mode 100644 index e92599d577c28e..00000000000000 --- a/ports/dbghelp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dbghelp -Version: 0.0 -Description: Windows Debug Help Library -Supports: windows \ No newline at end of file diff --git a/ports/dbghelp/vcpkg.json b/ports/dbghelp/vcpkg.json new file mode 100644 index 00000000000000..cb7786a83e03b1 --- /dev/null +++ b/ports/dbghelp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dbghelp", + "version-string": "0.0", + "port-version": 1, + "description": "Windows Debug Help Library", + "supports": "windows" +} diff --git a/ports/dbow2/CONTROL b/ports/dbow2/CONTROL deleted file mode 100644 index 4b5c4c1e048e4a..00000000000000 --- a/ports/dbow2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: dbow2 -Version: 2019-08-05 -Homepage: https://github.com/dorian3d/DBoW2 -Description: DBoW2 is an improved version of the DBow library, an open source C++ library for indexing and converting images into a bag-of-word representation. -Build-Depends: opencv diff --git a/ports/dbow2/vcpkg.json b/ports/dbow2/vcpkg.json new file mode 100644 index 00000000000000..6f0fec46d324ab --- /dev/null +++ b/ports/dbow2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "dbow2", + "version-string": "2019-08-05", + "port-version": 1, + "description": "DBoW2 is an improved version of the DBow library, an open source C++ library for indexing and converting images into a bag-of-word representation.", + "homepage": "https://github.com/dorian3d/DBoW2", + "dependencies": [ + "opencv" + ] +} diff --git a/ports/dbow3/CONTROL b/ports/dbow3/CONTROL deleted file mode 100644 index 831ea9f0fb14fa..00000000000000 --- a/ports/dbow3/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dbow3 -Version: 1.0.0 -Description: DBoW3 is an improved version of the DBow2 library, an open source C++ library for indexing and converting images into a bag-of-word representation. -Build-Depends: opencv3[contrib] \ No newline at end of file diff --git a/ports/dbow3/vcpkg.json b/ports/dbow3/vcpkg.json new file mode 100644 index 00000000000000..4e213ba47b46bc --- /dev/null +++ b/ports/dbow3/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "dbow3", + "version-string": "1.0.0", + "port-version": 1, + "description": "DBoW3 is an improved version of the DBow2 library, an open source C++ library for indexing and converting images into a bag-of-word representation.", + "dependencies": [ + { + "name": "opencv3", + "features": [ + "contrib" + ] + } + ] +} diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL deleted file mode 100644 index be526617e4d1a2..00000000000000 --- a/ports/dcmtk/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: dcmtk -Version: 3.6.6 -Description: This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard. diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json new file mode 100644 index 00000000000000..a75b5a7bd4bf44 --- /dev/null +++ b/ports/dcmtk/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "dcmtk", + "version-string": "3.6.6", + "port-version": 1, + "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard." +} diff --git a/ports/decimal-for-cpp/CONTROL b/ports/decimal-for-cpp/CONTROL deleted file mode 100644 index 9cf6554c4d6b57..00000000000000 --- a/ports/decimal-for-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: decimal-for-cpp -Version: 1.16 -Port-Version: 1 -Description: Decimal data type support, for COBOL-like fixed-point operations on currency values. - diff --git a/ports/decimal-for-cpp/vcpkg.json b/ports/decimal-for-cpp/vcpkg.json new file mode 100644 index 00000000000000..16ba18fc3a9a3a --- /dev/null +++ b/ports/decimal-for-cpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "decimal-for-cpp", + "version-string": "1.16", + "port-version": 2, + "description": "Decimal data type support, for COBOL-like fixed-point operations on currency values." +} diff --git a/ports/detours/CONTROL b/ports/detours/CONTROL deleted file mode 100644 index baf44f69d5973a..00000000000000 --- a/ports/detours/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: detours -Version: 4.0.1 -Port-Version: 2 -Homepage: https://github.com/microsoft/Detours -Description: Detours is a software package for monitoring and instrumenting API calls on Windows. \ No newline at end of file diff --git a/ports/detours/vcpkg.json b/ports/detours/vcpkg.json new file mode 100644 index 00000000000000..2813febbd9d93d --- /dev/null +++ b/ports/detours/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "detours", + "version-string": "4.0.1", + "port-version": 3, + "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", + "homepage": "https://github.com/microsoft/Detours" +} diff --git a/ports/devicenameresolver/CONTROL b/ports/devicenameresolver/CONTROL deleted file mode 100644 index 1accbf8c5fe3f5..00000000000000 --- a/ports/devicenameresolver/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: devicenameresolver -Version: 2016-06-26-0850d88fa6-1 -Description: a little library that resolves a path from a (virtual) device name. diff --git a/ports/devicenameresolver/vcpkg.json b/ports/devicenameresolver/vcpkg.json new file mode 100644 index 00000000000000..b52d9c4fd4a569 --- /dev/null +++ b/ports/devicenameresolver/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "devicenameresolver", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 2, + "description": "a little library that resolves a path from a (virtual) device name." +} diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL deleted file mode 100644 index 40f2109ac78865..00000000000000 --- a/ports/dimcli/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dimcli -Version: 5.0.2 -Homepage: https://github.com/gknowles/dimcli -Description: C++ command line parser toolkit diff --git a/ports/dimcli/vcpkg.json b/ports/dimcli/vcpkg.json new file mode 100644 index 00000000000000..319d33cc888fe7 --- /dev/null +++ b/ports/dimcli/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dimcli", + "version-string": "5.0.2", + "port-version": 1, + "description": "C++ command line parser toolkit", + "homepage": "https://github.com/gknowles/dimcli" +} diff --git a/ports/dirent/CONTROL b/ports/dirent/CONTROL deleted file mode 100644 index b8444bc98985a5..00000000000000 --- a/ports/dirent/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dirent -Version: 1.23.2 -Homepage: https://github.com/tronkko/dirent -Description: Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows. diff --git a/ports/dirent/vcpkg.json b/ports/dirent/vcpkg.json new file mode 100644 index 00000000000000..82a21b2ced5ca7 --- /dev/null +++ b/ports/dirent/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dirent", + "version-string": "1.23.2", + "port-version": 1, + "description": "Dirent is a C/C++ programming interface that allows programmers to retrieve information about files and directories under Linux/UNIX. This project provides Linux compatible Dirent interface for Microsoft Windows.", + "homepage": "https://github.com/tronkko/dirent" +} diff --git a/ports/discord-game-sdk/CONTROL b/ports/discord-game-sdk/CONTROL deleted file mode 100644 index a164d53f08402f..00000000000000 --- a/ports/discord-game-sdk/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: discord-game-sdk -Version: 2.5.6-1 -Homepage: https://discordapp.com/developers/docs/game-sdk/sdk-starter-guide -Description: The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game. -Supports: ((x64 && (windows || osx || linux)) || (x86 && windows)) && !uwp && !static \ No newline at end of file diff --git a/ports/discord-game-sdk/vcpkg.json b/ports/discord-game-sdk/vcpkg.json new file mode 100644 index 00000000000000..0532cec36868fb --- /dev/null +++ b/ports/discord-game-sdk/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "discord-game-sdk", + "version-string": "2.5.6", + "port-version": 2, + "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", + "homepage": "https://discordapp.com/developers/docs/game-sdk/sdk-starter-guide", + "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static" +} diff --git a/ports/discord-rpc/CONTROL b/ports/discord-rpc/CONTROL deleted file mode 100644 index 094c4eaa39e3a9..00000000000000 --- a/ports/discord-rpc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: discord-rpc -Version: 3.4.0 -Homepage: https://github.com/discordapp/discord-rpc -Description: Rich Presence allows you to leverage the totally overhauled "Now Playing" section in a Discord user's profile to help people play your game together. -Build-Depends: rapidjson diff --git a/ports/discord-rpc/vcpkg.json b/ports/discord-rpc/vcpkg.json new file mode 100644 index 00000000000000..12ab91796302b3 --- /dev/null +++ b/ports/discord-rpc/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "discord-rpc", + "version-string": "3.4.0", + "port-version": 1, + "description": "Rich Presence allows you to leverage the totally overhauled \"Now Playing\" section in a Discord user's profile to help people play your game together.", + "homepage": "https://github.com/discordapp/discord-rpc", + "dependencies": [ + "rapidjson" + ] +} diff --git a/ports/discount/CONTROL b/ports/discount/CONTROL deleted file mode 100644 index 51c8b5e90b32f2..00000000000000 --- a/ports/discount/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: discount -Version: 2.2.6 -Homepage: https://github.com/Orc/discount -Description: DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language. diff --git a/ports/discount/vcpkg.json b/ports/discount/vcpkg.json new file mode 100644 index 00000000000000..7fcbc5103fc27c --- /dev/null +++ b/ports/discount/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "discount", + "version-string": "2.2.6", + "port-version": 1, + "description": "DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.", + "homepage": "https://github.com/Orc/discount" +} diff --git a/ports/discreture/CONTROL b/ports/discreture/CONTROL deleted file mode 100644 index a2dff85cfc94df..00000000000000 --- a/ports/discreture/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: discreture -Version: 2020-01-29 -Homepage: https://github.com/mraggi/discreture -Description: A modern C++ library for efficiently and easily iterating through common combinatorial objects, such as combinations, permutations, partitions and more. -Build-Depends: boost-iterator, boost-container diff --git a/ports/discreture/vcpkg.json b/ports/discreture/vcpkg.json new file mode 100644 index 00000000000000..f5869ba4cf5dd6 --- /dev/null +++ b/ports/discreture/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "discreture", + "version-string": "2020-01-29", + "port-version": 1, + "description": "A modern C++ library for efficiently and easily iterating through common combinatorial objects, such as combinations, permutations, partitions and more.", + "homepage": "https://github.com/mraggi/discreture", + "dependencies": [ + "boost-container", + "boost-iterator" + ] +} diff --git a/ports/distorm/CONTROL b/ports/distorm/CONTROL deleted file mode 100644 index 620dfa981ff152..00000000000000 --- a/ports/distorm/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: distorm -Version: 3.4.1 -Description: Powerful Disassembler Library For x86/AMD64 \ No newline at end of file diff --git a/ports/distorm/vcpkg.json b/ports/distorm/vcpkg.json new file mode 100644 index 00000000000000..e83775d893ada3 --- /dev/null +++ b/ports/distorm/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "distorm", + "version-string": "3.4.1", + "port-version": 1, + "description": "Powerful Disassembler Library For x86/AMD64" +} diff --git a/ports/dlfcn-win32/CONTROL b/ports/dlfcn-win32/CONTROL deleted file mode 100644 index 69968ae540dcb1..00000000000000 --- a/ports/dlfcn-win32/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dlfcn-win32 -Version: 1.1.1-4 -Homepage: https://github.com/dlfcn-win32/dlfcn-win32 -Description: dlfcn-win32 is an implementation of dlfcn for Windows. diff --git a/ports/dlfcn-win32/vcpkg.json b/ports/dlfcn-win32/vcpkg.json new file mode 100644 index 00000000000000..505674d5b232c0 --- /dev/null +++ b/ports/dlfcn-win32/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dlfcn-win32", + "version-string": "1.1.1", + "port-version": 5, + "description": "dlfcn-win32 is an implementation of dlfcn for Windows.", + "homepage": "https://github.com/dlfcn-win32/dlfcn-win32" +} diff --git a/ports/docopt/CONTROL b/ports/docopt/CONTROL deleted file mode 100644 index b6599438c24345..00000000000000 --- a/ports/docopt/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: docopt -Version: 2018-11-01 -Description: Command line arguments parser that will make you smile (C++11 port). diff --git a/ports/docopt/vcpkg.json b/ports/docopt/vcpkg.json new file mode 100644 index 00000000000000..8e17436c418154 --- /dev/null +++ b/ports/docopt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "docopt", + "version-string": "2018-11-01", + "port-version": 1, + "description": "Command line arguments parser that will make you smile (C++11 port)." +} diff --git a/ports/doctest/CONTROL b/ports/doctest/CONTROL deleted file mode 100644 index 6e4e93e42cfefb..00000000000000 --- a/ports/doctest/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: doctest -Version: 2.4.5 -Homepage: https://github.com/onqtam/doctest -Description: The fastest feature-rich C++ single-header testing framework for unit tests and TDD diff --git a/ports/doctest/vcpkg.json b/ports/doctest/vcpkg.json new file mode 100644 index 00000000000000..4a4cdaad24d3aa --- /dev/null +++ b/ports/doctest/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "doctest", + "version-string": "2.4.5", + "port-version": 1, + "description": "The fastest feature-rich C++ single-header testing framework for unit tests and TDD", + "homepage": "https://github.com/onqtam/doctest" +} diff --git a/ports/double-conversion/CONTROL b/ports/double-conversion/CONTROL deleted file mode 100644 index 215bb77fb0aa78..00000000000000 --- a/ports/double-conversion/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: double-conversion -Version: 3.1.5 -Homepage: https://github.com/google/double-conversion -Description: Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles. diff --git a/ports/double-conversion/vcpkg.json b/ports/double-conversion/vcpkg.json new file mode 100644 index 00000000000000..541bf7701b881c --- /dev/null +++ b/ports/double-conversion/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "double-conversion", + "version-string": "3.1.5", + "port-version": 1, + "description": "Efficient binary-decimal and decimal-binary conversion routines for IEEE doubles.", + "homepage": "https://github.com/google/double-conversion" +} diff --git a/ports/dpdk/CONTROL b/ports/dpdk/CONTROL deleted file mode 100644 index 53d79f7e690898..00000000000000 --- a/ports/dpdk/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dpdk -Version: 19.02 -Description: A set of libraries and drivers for fast packet processing -Supports: linux diff --git a/ports/dpdk/vcpkg.json b/ports/dpdk/vcpkg.json new file mode 100644 index 00000000000000..111defe838e75b --- /dev/null +++ b/ports/dpdk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dpdk", + "version-string": "19.02", + "port-version": 1, + "description": "A set of libraries and drivers for fast packet processing", + "supports": "linux" +} diff --git a/ports/drlibs/CONTROL b/ports/drlibs/CONTROL deleted file mode 100644 index 284f99c3503205..00000000000000 --- a/ports/drlibs/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: drlibs -Version: 2019-08-12 -Homepage: https://github.com/mackron/dr_libs -Description: A collection of public domain single-file libraries for C/C++. diff --git a/ports/drlibs/vcpkg.json b/ports/drlibs/vcpkg.json new file mode 100644 index 00000000000000..717933aa06d5a2 --- /dev/null +++ b/ports/drlibs/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "drlibs", + "version-string": "2019-08-12", + "port-version": 1, + "description": "A collection of public domain single-file libraries for C/C++.", + "homepage": "https://github.com/mackron/dr_libs" +} diff --git a/ports/dtl/CONTROL b/ports/dtl/CONTROL deleted file mode 100644 index cd4109d0460a91..00000000000000 --- a/ports/dtl/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: dtl -Version: 1.19 -Description: Diff template library diff --git a/ports/dtl/vcpkg.json b/ports/dtl/vcpkg.json new file mode 100644 index 00000000000000..d4a6964742dfb3 --- /dev/null +++ b/ports/dtl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "dtl", + "version-string": "1.19", + "port-version": 1, + "description": "Diff template library" +} diff --git a/ports/duckx/CONTROL b/ports/duckx/CONTROL deleted file mode 100644 index ec0e6c35624809..00000000000000 --- a/ports/duckx/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: duckx -Version: 1.0.0 -Homepage: https://github.com/amiremohamadi/DuckX -Description: DuckX is a library for creation of Office docx files. diff --git a/ports/duckx/vcpkg.json b/ports/duckx/vcpkg.json new file mode 100644 index 00000000000000..f38749088ba67a --- /dev/null +++ b/ports/duckx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "duckx", + "version-string": "1.0.0", + "port-version": 1, + "description": "DuckX is a library for creation of Office docx files.", + "homepage": "https://github.com/amiremohamadi/DuckX" +} diff --git a/ports/duilib/CONTROL b/ports/duilib/CONTROL deleted file mode 100644 index be7173359fe551..00000000000000 --- a/ports/duilib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: duilib -Version: 2019-4-28 -Port-Version: 3 -Description: Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines. -Homepage: https://github.com/duilib/duilib diff --git a/ports/duilib/vcpkg.json b/ports/duilib/vcpkg.json new file mode 100644 index 00000000000000..6c08b75db2ad4b --- /dev/null +++ b/ports/duilib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "duilib", + "version-string": "2019-4-28", + "port-version": 4, + "description": "Duilib is a free open source DirectUI interface library under Windows. It is widely accepted by major Internet companies due to its simple and easy to expand design and stable and efficient implementation. It is widely used in IM, video client, stock market software, navigation software, and mobile phone assistive software. Duilib is still evolving, and will continue to improve in many aspects such as documentation, examples, animations, and rendering engines.", + "homepage": "https://github.com/duilib/duilib" +} diff --git a/ports/duktape/CONTROL b/ports/duktape/CONTROL deleted file mode 100644 index dd0e86447cb1d6..00000000000000 --- a/ports/duktape/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: duktape -Version: 2.5.0 -Port-Version: 1 -Homepage: https://github.com/svaarala/duktape -Description: Embeddable Javascript engine with a focus on portability and compact footprint. diff --git a/ports/duktape/vcpkg.json b/ports/duktape/vcpkg.json new file mode 100644 index 00000000000000..59a78b9d6dcc7f --- /dev/null +++ b/ports/duktape/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "duktape", + "version-string": "2.5.0", + "port-version": 2, + "description": "Embeddable Javascript engine with a focus on portability and compact footprint.", + "homepage": "https://github.com/svaarala/duktape" +} diff --git a/ports/dx/CONTROL b/ports/dx/CONTROL deleted file mode 100644 index d5ad978721d06e..00000000000000 --- a/ports/dx/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: dx -Version: 1.0.1-1 -Homepage: https://github.com/sdcb/dx -Description: A modern C++ library for DirectX programming \ No newline at end of file diff --git a/ports/dx/vcpkg.json b/ports/dx/vcpkg.json new file mode 100644 index 00000000000000..ddee4841024627 --- /dev/null +++ b/ports/dx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "dx", + "version-string": "1.0.1", + "port-version": 2, + "description": "A modern C++ library for DirectX programming", + "homepage": "https://github.com/sdcb/dx" +} diff --git a/ports/easycl/CONTROL b/ports/easycl/CONTROL deleted file mode 100644 index ad61f226040c8f..00000000000000 --- a/ports/easycl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: easycl -Version: 0.3 -Homepage: https://github.com/architector1324/EasyCL -Build-Depends: opencl -Description: OpenCL based lightweight c++ computing library diff --git a/ports/easycl/vcpkg.json b/ports/easycl/vcpkg.json new file mode 100644 index 00000000000000..2df4f360900dbf --- /dev/null +++ b/ports/easycl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "easycl", + "version-string": "0.3", + "port-version": 1, + "description": "OpenCL based lightweight c++ computing library", + "homepage": "https://github.com/architector1324/EasyCL", + "dependencies": [ + "opencl" + ] +} diff --git a/ports/easyloggingpp/CONTROL b/ports/easyloggingpp/CONTROL deleted file mode 100644 index a10dbb2d668bc3..00000000000000 --- a/ports/easyloggingpp/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: easyloggingpp -Version: 9.96.7-1 -Description: Easylogging++ is a single header efficient logging library for C++ applications. \ No newline at end of file diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json new file mode 100644 index 00000000000000..8f7066d5531c5a --- /dev/null +++ b/ports/easyloggingpp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "easyloggingpp", + "version-string": "9.96.7", + "port-version": 2, + "description": "Easylogging++ is a single header efficient logging library for C++ applications." +} diff --git a/ports/eathread/CONTROL b/ports/eathread/CONTROL deleted file mode 100644 index a0111764588839..00000000000000 --- a/ports/eathread/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: eathread -Version: 1.32.09-1 -Homepage: https://github.com/electronicarts/EAThread -Description: Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms. -Build-Depends: eabase, eastl diff --git a/ports/eathread/vcpkg.json b/ports/eathread/vcpkg.json new file mode 100644 index 00000000000000..b5ad4d3cf3f6a9 --- /dev/null +++ b/ports/eathread/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "eathread", + "version-string": "1.32.09", + "port-version": 2, + "description": "Electronic Arts Thread Library. EAThread implements a unified cross-platform interface for multithreaded programming on various platforms.", + "homepage": "https://github.com/electronicarts/EAThread", + "dependencies": [ + "eabase", + "eastl" + ] +} diff --git a/ports/ebml/CONTROL b/ports/ebml/CONTROL deleted file mode 100644 index 7e491e6fcc9bc7..00000000000000 --- a/ports/ebml/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ebml -Version: 1.4.0 -Homepage: https://github.com/Matroska-Org/libebml -Description: a C++ library to parse EBML files -Supports: !uwp \ No newline at end of file diff --git a/ports/ebml/vcpkg.json b/ports/ebml/vcpkg.json new file mode 100644 index 00000000000000..764a42e798d008 --- /dev/null +++ b/ports/ebml/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "ebml", + "version-string": "1.4.0", + "port-version": 1, + "description": "a C++ library to parse EBML files", + "homepage": "https://github.com/Matroska-Org/libebml", + "supports": "!uwp" +} diff --git a/ports/ecsutil/CONTROL b/ports/ecsutil/CONTROL deleted file mode 100644 index e406ed457a9712..00000000000000 --- a/ports/ecsutil/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ecsutil -Version: 1.0.7.15 -Homepage: https://github.com/EMCECS/ecs-object-client-windows-cpp -Description: Native Windows SDK for accessing ECS via the S3 HTTP protocol. -Build-Depends: atlmfc (windows) -Supports: windows&(x64|x86) diff --git a/ports/ecsutil/vcpkg.json b/ports/ecsutil/vcpkg.json new file mode 100644 index 00000000000000..fc372275695bda --- /dev/null +++ b/ports/ecsutil/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ecsutil", + "version-string": "1.0.7.15", + "port-version": 1, + "description": "Native Windows SDK for accessing ECS via the S3 HTTP protocol.", + "homepage": "https://github.com/EMCECS/ecs-object-client-windows-cpp", + "supports": "windows & (x64 | x86)", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + } + ] +} diff --git a/ports/edlib/CONTROL b/ports/edlib/CONTROL deleted file mode 100644 index 3a3e4b5e3796d1..00000000000000 --- a/ports/edlib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: edlib -Version: 1.2.6 -Homepage: https://github.com/Martinsos/edlib -Description: Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance. \ No newline at end of file diff --git a/ports/edlib/vcpkg.json b/ports/edlib/vcpkg.json new file mode 100644 index 00000000000000..1676dd9339786c --- /dev/null +++ b/ports/edlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "edlib", + "version-string": "1.2.6", + "port-version": 1, + "description": "Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance.", + "homepage": "https://github.com/Martinsos/edlib" +} diff --git a/ports/effolkronium-random/CONTROL b/ports/effolkronium-random/CONTROL deleted file mode 100644 index b3501e22c4aa54..00000000000000 --- a/ports/effolkronium-random/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: effolkronium-random -Version: 1.3.1 -Description: Random with a modern C++ API diff --git a/ports/effolkronium-random/vcpkg.json b/ports/effolkronium-random/vcpkg.json new file mode 100644 index 00000000000000..39d13104477ee9 --- /dev/null +++ b/ports/effolkronium-random/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "effolkronium-random", + "version-string": "1.3.1", + "port-version": 1, + "description": "Random with a modern C++ API" +} diff --git a/ports/efsw/CONTROL b/ports/efsw/CONTROL deleted file mode 100644 index daeabee322be01..00000000000000 --- a/ports/efsw/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: efsw -Version: 2020-06-08 -Port-Version: 1 -Homepage: https://github.com/SpartanJ/efsw -Description: efsw is a C++ cross-platform file system watcher and notifier. -Supports: !uwp diff --git a/ports/efsw/vcpkg.json b/ports/efsw/vcpkg.json new file mode 100644 index 00000000000000..a001ada8f61327 --- /dev/null +++ b/ports/efsw/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "efsw", + "version-string": "2020-06-08", + "port-version": 2, + "description": "efsw is a C++ cross-platform file system watcher and notifier.", + "homepage": "https://github.com/SpartanJ/efsw", + "supports": "!uwp" +} diff --git a/ports/egl-registry/CONTROL b/ports/egl-registry/CONTROL deleted file mode 100644 index 74cdf16b170748..00000000000000 --- a/ports/egl-registry/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: egl-registry -Version: 2020-02-20 -Homepage: https://github.com/KhronosGroup/EGL-Registry -Description: the EGL API and Extension Registry diff --git a/ports/egl-registry/vcpkg.json b/ports/egl-registry/vcpkg.json new file mode 100644 index 00000000000000..229edb6773d8dd --- /dev/null +++ b/ports/egl-registry/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "egl-registry", + "version-string": "2020-02-20", + "port-version": 1, + "description": "the EGL API and Extension Registry", + "homepage": "https://github.com/KhronosGroup/EGL-Registry" +} diff --git a/ports/eigen3/CONTROL b/ports/eigen3/CONTROL deleted file mode 100644 index e285c62d28635a..00000000000000 --- a/ports/eigen3/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: eigen3 -Version: 3.3.9 -Homepage: http://eigen.tuxfamily.org -Description: C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. diff --git a/ports/eigen3/vcpkg.json b/ports/eigen3/vcpkg.json new file mode 100644 index 00000000000000..bf355b87c9e16e --- /dev/null +++ b/ports/eigen3/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "eigen3", + "version-string": "3.3.9", + "port-version": 1, + "description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.", + "homepage": "http://eigen.tuxfamily.org" +} diff --git a/ports/elfutils/CONTROL b/ports/elfutils/CONTROL deleted file mode 100644 index 8dcee64a73e61a..00000000000000 --- a/ports/elfutils/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: elfutils -Version: 0.182 -Homepage: https://sourceware.org/elfutils/ -Description: elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux. -Build-Depends: bzip2, zlib, liblzma, zstd -Supports: !windows diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json new file mode 100644 index 00000000000000..ba686648fb8fd4 --- /dev/null +++ b/ports/elfutils/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "elfutils", + "version-string": "0.182", + "port-version": 1, + "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.", + "homepage": "https://sourceware.org/elfutils/", + "supports": "!windows", + "dependencies": [ + "bzip2", + "liblzma", + "zlib", + "zstd" + ] +} diff --git a/ports/entityx/CONTROL b/ports/entityx/CONTROL deleted file mode 100644 index 281a4206b02130..00000000000000 --- a/ports/entityx/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: entityx -Version: 1.3.0-2 -Description: EntityX - A fast, type-safe C++ Entity-Component system. -Homepage: https://github.com/alecthomas/entityx diff --git a/ports/entityx/vcpkg.json b/ports/entityx/vcpkg.json new file mode 100644 index 00000000000000..101eb1fa0b6cfa --- /dev/null +++ b/ports/entityx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "entityx", + "version-string": "1.3.0", + "port-version": 3, + "description": "EntityX - A fast, type-safe C++ Entity-Component system.", + "homepage": "https://github.com/alecthomas/entityx" +} diff --git a/ports/epsilon/CONTROL b/ports/epsilon/CONTROL deleted file mode 100644 index 1547a9967837a5..00000000000000 --- a/ports/epsilon/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: epsilon -Version: 0.9.2-4 -Homepage: https://sourceforge.net/projects/epsilon-project/ -Description: EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing. -Build-Depends: libpopt \ No newline at end of file diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json new file mode 100644 index 00000000000000..de99c7e705b810 --- /dev/null +++ b/ports/epsilon/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "epsilon", + "version-string": "0.9.2", + "port-version": 5, + "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", + "homepage": "https://sourceforge.net/projects/epsilon-project/", + "dependencies": [ + "libpopt" + ] +} diff --git a/ports/esaxx/CONTROL b/ports/esaxx/CONTROL deleted file mode 100644 index 48b7eebecc3ab2..00000000000000 --- a/ports/esaxx/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: esaxx -Version: ca7cb332011ec37 -Description: This library provides the implementation of enhanced suffix array. diff --git a/ports/esaxx/vcpkg.json b/ports/esaxx/vcpkg.json new file mode 100644 index 00000000000000..74c69bddfb63ec --- /dev/null +++ b/ports/esaxx/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "esaxx", + "version-string": "ca7cb332011ec37", + "port-version": 1, + "description": "This library provides the implementation of enhanced suffix array." +} diff --git a/ports/evpp/CONTROL b/ports/evpp/CONTROL deleted file mode 100644 index 047c77a4404031..00000000000000 --- a/ports/evpp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: evpp -Version: 0.7.0 -Port-Version: 4 -Homepage: https://github.com/Qihoo360/evpp -Description: A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols. -Build-Depends: glog, libevent (windows), libevent[openssl] (!windows), rapidjson, concurrentqueue (!windows), boost-lockfree (!windows) \ No newline at end of file diff --git a/ports/evpp/vcpkg.json b/ports/evpp/vcpkg.json new file mode 100644 index 00000000000000..ee95a96a78957d --- /dev/null +++ b/ports/evpp/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "evpp", + "version-string": "0.7.0", + "port-version": 5, + "description": "A modern C++ network library based on libevent for developing high performance network services in TCP/UDP/HTTP protocols.", + "homepage": "https://github.com/Qihoo360/evpp", + "dependencies": [ + { + "name": "boost-lockfree", + "platform": "!windows" + }, + { + "name": "concurrentqueue", + "platform": "!windows" + }, + "glog", + { + "name": "libevent", + "platform": "windows" + }, + { + "name": "libevent", + "features": [ + "openssl" + ], + "platform": "!windows" + }, + "rapidjson" + ] +} diff --git a/ports/expected-lite/CONTROL b/ports/expected-lite/CONTROL deleted file mode 100644 index 315f1d01aa12ba..00000000000000 --- a/ports/expected-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: expected-lite -Version: 0.3.0 -Description: Expected objects in C++11 and later in a single-file header-only library diff --git a/ports/expected-lite/vcpkg.json b/ports/expected-lite/vcpkg.json new file mode 100644 index 00000000000000..f80f0abfff0012 --- /dev/null +++ b/ports/expected-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "expected-lite", + "version-string": "0.3.0", + "port-version": 1, + "description": "Expected objects in C++11 and later in a single-file header-only library" +} diff --git a/ports/exprtk/CONTROL b/ports/exprtk/CONTROL deleted file mode 100644 index e961b7ace78dc5..00000000000000 --- a/ports/exprtk/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: exprtk -Version: 2021-01-01 -Homepage: http://www.partow.net/programming/exprtk/index.html -Description: Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine. diff --git a/ports/exprtk/vcpkg.json b/ports/exprtk/vcpkg.json new file mode 100644 index 00000000000000..9a1d1a1a288028 --- /dev/null +++ b/ports/exprtk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "exprtk", + "version-string": "2021-01-01", + "port-version": 1, + "description": "Simple to use, easy to integrate and extremely efficient run-time C++ mathematical expression parser and evaluation engine.", + "homepage": "http://www.partow.net/programming/exprtk/index.html" +} diff --git a/ports/faad2/CONTROL b/ports/faad2/CONTROL deleted file mode 100644 index 65b02f103f6e3c..00000000000000 --- a/ports/faad2/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: faad2 -Version: 2.9.1 -Port-Version: 2 -Homepage: https://sourceforge.net/projects/faac/ -Description: Freeware Advanced Audio (AAC) Decoder - -Feature: build-decoder -Description: Build the embedded decoder executable diff --git a/ports/faad2/vcpkg.json b/ports/faad2/vcpkg.json new file mode 100644 index 00000000000000..856b88daf4161b --- /dev/null +++ b/ports/faad2/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "faad2", + "version-string": "2.9.1", + "port-version": 3, + "description": "Freeware Advanced Audio (AAC) Decoder", + "homepage": "https://sourceforge.net/projects/faac/", + "features": { + "build-decoder": { + "description": "Build the embedded decoder executable" + } + } +} diff --git a/ports/fadbad/CONTROL b/ports/fadbad/CONTROL deleted file mode 100644 index 103890c0ed6d85..00000000000000 --- a/ports/fadbad/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: fadbad -Version: 2.1.0 -Homepage: https://www.fadbad.com/ -Description: FADBAD++ Templates for Automatic Differentiation diff --git a/ports/fadbad/vcpkg.json b/ports/fadbad/vcpkg.json new file mode 100644 index 00000000000000..162be37066f264 --- /dev/null +++ b/ports/fadbad/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fadbad", + "version-string": "2.1.0", + "port-version": 1, + "description": "FADBAD++ Templates for Automatic Differentiation", + "homepage": "https://www.fadbad.com/" +} diff --git a/ports/farmhash/CONTROL b/ports/farmhash/CONTROL deleted file mode 100644 index 7d7f4d386f528c..00000000000000 --- a/ports/farmhash/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: farmhash -Version: 1.1 -Port-Version: 2 -Homepage: https://github.com/google/farmhash -Description: FarmHash, a family of hash functions. -Supports: !arm diff --git a/ports/farmhash/vcpkg.json b/ports/farmhash/vcpkg.json new file mode 100644 index 00000000000000..1d85ed1a1a219f --- /dev/null +++ b/ports/farmhash/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "farmhash", + "version-string": "1.1", + "port-version": 3, + "description": "FarmHash, a family of hash functions.", + "homepage": "https://github.com/google/farmhash", + "supports": "!arm" +} diff --git a/ports/fast-cpp-csv-parser/CONTROL b/ports/fast-cpp-csv-parser/CONTROL deleted file mode 100644 index aab47496f0a217..00000000000000 --- a/ports/fast-cpp-csv-parser/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: fast-cpp-csv-parser -Version: 2021-01-03 -Description: A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files -Homepage: https://github.com/ben-strasser/fast-cpp-csv-parser diff --git a/ports/fast-cpp-csv-parser/vcpkg.json b/ports/fast-cpp-csv-parser/vcpkg.json new file mode 100644 index 00000000000000..8e2640a61f564d --- /dev/null +++ b/ports/fast-cpp-csv-parser/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fast-cpp-csv-parser", + "version-string": "2021-01-03", + "port-version": 1, + "description": "A small, easy-to-use and fast header-only library for reading comma separated value (CSV) files", + "homepage": "https://github.com/ben-strasser/fast-cpp-csv-parser" +} diff --git a/ports/fastcgi/CONTROL b/ports/fastcgi/CONTROL deleted file mode 100644 index f1d5e659e8eee1..00000000000000 --- a/ports/fastcgi/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: fastcgi -Version: 2020-09-11 -Homepage: https://fastcgi-archives.github.io/ -Description: The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes. diff --git a/ports/fastcgi/vcpkg.json b/ports/fastcgi/vcpkg.json new file mode 100644 index 00000000000000..83d7fa763362b2 --- /dev/null +++ b/ports/fastcgi/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fastcgi", + "version-string": "2020-09-11", + "port-version": 1, + "description": "The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes.", + "homepage": "https://fastcgi-archives.github.io/" +} diff --git a/ports/fastfeat/CONTROL b/ports/fastfeat/CONTROL deleted file mode 100644 index 9349930346eb11..00000000000000 --- a/ports/fastfeat/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: fastfeat -Version: 391d5e9-1 -Description: FAST feature detectors in C diff --git a/ports/fastfeat/vcpkg.json b/ports/fastfeat/vcpkg.json new file mode 100644 index 00000000000000..550c8b70822556 --- /dev/null +++ b/ports/fastfeat/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fastfeat", + "version-string": "391d5e9", + "port-version": 2, + "description": "FAST feature detectors in C" +} diff --git a/ports/fastrtps/CONTROL b/ports/fastrtps/CONTROL deleted file mode 100644 index 8d52ba9a23862d..00000000000000 --- a/ports/fastrtps/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fastrtps -Version: 2.0.1 -Homepage: https://www.eprosima.com/ -Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. -Build-Depends: openssl, asio, tinyxml2, fastcdr, foonathan-memory \ No newline at end of file diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json new file mode 100644 index 00000000000000..c214822af39368 --- /dev/null +++ b/ports/fastrtps/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "fastrtps", + "version-string": "2.0.1", + "port-version": 1, + "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", + "homepage": "https://www.eprosima.com/", + "dependencies": [ + "asio", + "fastcdr", + "foonathan-memory", + "openssl", + "tinyxml2" + ] +} diff --git a/ports/fcl/CONTROL b/ports/fcl/CONTROL deleted file mode 100644 index 8ab0cde2fdf75e..00000000000000 --- a/ports/fcl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fcl -Version: 0.6.1 -Homepage: https://github.com/flexible-collision-library/fcl -Description: a library for performing three types of proximity queries on a pair of geometric models composed of triangles -Build-Depends: ccd, octomap, eigen3 diff --git a/ports/fcl/vcpkg.json b/ports/fcl/vcpkg.json new file mode 100644 index 00000000000000..e722e46d2329cc --- /dev/null +++ b/ports/fcl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "fcl", + "version-string": "0.6.1", + "port-version": 1, + "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles", + "homepage": "https://github.com/flexible-collision-library/fcl", + "dependencies": [ + "ccd", + "eigen3", + "octomap" + ] +} diff --git a/ports/fdlibm/CONTROL b/ports/fdlibm/CONTROL deleted file mode 100644 index 14bc9ad645b536..00000000000000 --- a/ports/fdlibm/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: fdlibm -Version: 5.3-4 -Description: FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic diff --git a/ports/fdlibm/vcpkg.json b/ports/fdlibm/vcpkg.json new file mode 100644 index 00000000000000..f90a637c991e71 --- /dev/null +++ b/ports/fdlibm/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fdlibm", + "version-string": "5.3", + "port-version": 5, + "description": "FDLIBM (Freely Distributable LIBM) is a C math library for machines that support IEEE 754 floating-point arithmetic" +} diff --git a/ports/ffnvcodec/CONTROL b/ports/ffnvcodec/CONTROL deleted file mode 100644 index d1cde3bfea9fae..00000000000000 --- a/ports/ffnvcodec/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ffnvcodec -Version: 10.0.26.0 -Port-Version: 1 -Homepage: https://github.com/FFmpeg/nv-codec-headers -Description: FFmpeg version of Nvidia Codec SDK headers. -Supports: (windows|linux)&!uwp diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json new file mode 100644 index 00000000000000..f21ec1e945ccd0 --- /dev/null +++ b/ports/ffnvcodec/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "ffnvcodec", + "version-string": "10.0.26.0", + "port-version": 2, + "description": "FFmpeg version of Nvidia Codec SDK headers.", + "homepage": "https://github.com/FFmpeg/nv-codec-headers", + "supports": "(windows | linux) & !uwp" +} diff --git a/ports/fftwpp/CONTROL b/ports/fftwpp/CONTROL deleted file mode 100644 index ba65d71853b906..00000000000000 --- a/ports/fftwpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fftwpp -Version: 2019-12-19 -Homepage: https://www.fftw.org/ -Description: FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (http://www.fftw.org) Fourier Transform library. -Build-Depends: fftw3 diff --git a/ports/fftwpp/vcpkg.json b/ports/fftwpp/vcpkg.json new file mode 100644 index 00000000000000..e702a1b933d0af --- /dev/null +++ b/ports/fftwpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "fftwpp", + "version-string": "2019-12-19", + "port-version": 1, + "description": "FFTW++ is a C++ header/MPI transpose for Version 3 of the highly optimized FFTW (http://www.fftw.org) Fourier Transform library.", + "homepage": "https://www.fftw.org/", + "dependencies": [ + "fftw3" + ] +} diff --git a/ports/field3d/CONTROL b/ports/field3d/CONTROL deleted file mode 100644 index d16bd4cb4839de..00000000000000 --- a/ports/field3d/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: field3d -Version: 1.7.3 -Port-Version: 1 -Homepage: https://github.com/imageworks/Field3D -Description: An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk. -Build-Depends: hdf5, boost-regex, boost-thread, boost-program-options, boost-system, openexr, boost-foreach, boost-test, boost-timer, boost-format -Supports: !(uwp) diff --git a/ports/field3d/vcpkg.json b/ports/field3d/vcpkg.json new file mode 100644 index 00000000000000..21ca20bdc1e486 --- /dev/null +++ b/ports/field3d/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "field3d", + "version-string": "1.7.3", + "port-version": 2, + "description": "An open source library for storing voxel data. It provides C++ classes that handle in-memory storage and a file format based on HDF5 that allows the C++ objects to be written to and read from disk.", + "homepage": "https://github.com/imageworks/Field3D", + "supports": "!uwp", + "dependencies": [ + "boost-foreach", + "boost-format", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-test", + "boost-thread", + "boost-timer", + "hdf5", + "openexr" + ] +} diff --git a/ports/fixed-string/CONTROL b/ports/fixed-string/CONTROL deleted file mode 100644 index 935b0ff1dc02dc..00000000000000 --- a/ports/fixed-string/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: fixed-string -Version: 0.1.0 -Description: Header-only C++17 library provides a string class with std::array fixed-size semantic. -Homepage: https://github.com/unterumarmung/fixed_string diff --git a/ports/fixed-string/vcpkg.json b/ports/fixed-string/vcpkg.json new file mode 100644 index 00000000000000..b7ed3e4d7aee68 --- /dev/null +++ b/ports/fixed-string/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fixed-string", + "version-string": "0.1.0", + "port-version": 1, + "description": "Header-only C++17 library provides a string class with std::array fixed-size semantic.", + "homepage": "https://github.com/unterumarmung/fixed_string" +} diff --git a/ports/flatbuffers/CONTROL b/ports/flatbuffers/CONTROL deleted file mode 100644 index da211dc0d93e67..00000000000000 --- a/ports/flatbuffers/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: flatbuffers -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/vcpkg.json b/ports/flatbuffers/vcpkg.json new file mode 100644 index 00000000000000..76d6c2a5df1f78 --- /dev/null +++ b/ports/flatbuffers/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "flatbuffers", + "version-string": "2.0.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/flint/CONTROL b/ports/flint/CONTROL deleted file mode 100644 index cac9d256905bd2..00000000000000 --- a/ports/flint/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: flint -Version: 2.5.2-4 -Homepage: https://www.flintlib.org/ -Description: Fast Library for Number Theory -Build-Depends: mpir, mpfr, pthreads, gettimeofday diff --git a/ports/flint/vcpkg.json b/ports/flint/vcpkg.json new file mode 100644 index 00000000000000..520dc5a810f38f --- /dev/null +++ b/ports/flint/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "flint", + "version-string": "2.5.2", + "port-version": 5, + "description": "Fast Library for Number Theory", + "homepage": "https://www.flintlib.org/", + "dependencies": [ + "gettimeofday", + "mpfr", + "mpir", + "pthreads" + ] +} diff --git a/ports/fluidlite/CONTROL b/ports/fluidlite/CONTROL deleted file mode 100644 index b591dcf027317d..00000000000000 --- a/ports/fluidlite/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: fluidlite -Version: 2020-08-27 -Homepage: https://github.com/divideconcept/FluidLite -Description: FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant. diff --git a/ports/fluidlite/vcpkg.json b/ports/fluidlite/vcpkg.json new file mode 100644 index 00000000000000..4e0bb02ad9f921 --- /dev/null +++ b/ports/fluidlite/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fluidlite", + "version-string": "2020-08-27", + "port-version": 1, + "description": "FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant.", + "homepage": "https://github.com/divideconcept/FluidLite" +} diff --git a/ports/fmem/CONTROL b/ports/fmem/CONTROL deleted file mode 100644 index 25f24652aeb2c4..00000000000000 --- a/ports/fmem/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: fmem -Version: c-libs-2ccee3d2fb -Description: A cross-platform library for opening memory-backed libc streams. diff --git a/ports/fmem/vcpkg.json b/ports/fmem/vcpkg.json new file mode 100644 index 00000000000000..17d54850a86e42 --- /dev/null +++ b/ports/fmem/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "fmem", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 1, + "description": "A cross-platform library for opening memory-backed libc streams." +} diff --git a/ports/fmi4cpp/CONTROL b/ports/fmi4cpp/CONTROL deleted file mode 100644 index 20f8f641ce151d..00000000000000 --- a/ports/fmi4cpp/CONTROL +++ /dev/null @@ -1,15 +0,0 @@ -Source: fmi4cpp -Version: 0.7.0-2 -Homepage: https://github.com/NTNU-IHB/FMI4cpp -Description: FMI 2.0 implementation written in modern C++ -Build-Depends: boost-property-tree, libzip[openssl] - -Feature: curl -Build-Depends: curl -Description: Allows loading FMUs from URL - -Feature: odeint -Build-Depends: boost-ublas, boost-odeint -Description: Adds support for wrapping Model Exchange models as Co-simulation models using odeint solvers - - diff --git a/ports/fmi4cpp/vcpkg.json b/ports/fmi4cpp/vcpkg.json new file mode 100644 index 00000000000000..298fa7cf41f2ec --- /dev/null +++ b/ports/fmi4cpp/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "fmi4cpp", + "version-string": "0.7.0", + "port-version": 3, + "description": "FMI 2.0 implementation written in modern C++", + "homepage": "https://github.com/NTNU-IHB/FMI4cpp", + "dependencies": [ + "boost-property-tree", + { + "name": "libzip", + "features": [ + "openssl" + ] + } + ], + "features": { + "curl": { + "description": "Allows loading FMUs from URL", + "dependencies": [ + "curl" + ] + }, + "odeint": { + "description": "Adds support for wrapping Model Exchange models as Co-simulation models using odeint solvers", + "dependencies": [ + "boost-odeint", + "boost-ublas" + ] + } + } +} diff --git a/ports/fmilib/CONTROL b/ports/fmilib/CONTROL deleted file mode 100644 index b5a0517c33819b..00000000000000 --- a/ports/fmilib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fmilib -Version: 2.0.3 -Port-Version: 3 -Description: FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0. -Homepage: https://www.fmi-standard.org/ diff --git a/ports/fmilib/vcpkg.json b/ports/fmilib/vcpkg.json new file mode 100644 index 00000000000000..6f0afd8aab9f9d --- /dev/null +++ b/ports/fmilib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fmilib", + "version-string": "2.0.3", + "port-version": 4, + "description": "FMI library is intended as a foundation for applications interfacing FMUs (Functional Mockup Units) that follow FMI Standard. This version of the library supports FMI 1.0 and FMI2.0.", + "homepage": "https://www.fmi-standard.org/" +} diff --git a/ports/font-chef/CONTROL b/ports/font-chef/CONTROL deleted file mode 100644 index 4b097acb90b563..00000000000000 --- a/ports/font-chef/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: font-chef -Version: 1.0.1 -Description: A font cooking library -Homepage: https://github.com/mobius3/font-chef diff --git a/ports/font-chef/vcpkg.json b/ports/font-chef/vcpkg.json new file mode 100644 index 00000000000000..0203b566112afa --- /dev/null +++ b/ports/font-chef/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "font-chef", + "version-string": "1.0.1", + "port-version": 1, + "description": "A font cooking library", + "homepage": "https://github.com/mobius3/font-chef" +} diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL deleted file mode 100644 index f83c3b1cecf449..00000000000000 --- a/ports/fontconfig/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: fontconfig -Version: 2.13.1 -Port-Version: 7 -Homepage: https://www.freedesktop.org/software/fontconfig/front.html -Description: Library for configuring and customizing font access. -Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, libuuid (!windows&!osx&!mingw), gettext diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json new file mode 100644 index 00000000000000..c8b827de9756d6 --- /dev/null +++ b/ports/fontconfig/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "fontconfig", + "version-string": "2.13.1", + "port-version": 8, + "description": "Library for configuring and customizing font access.", + "homepage": "https://www.freedesktop.org/software/fontconfig/front.html", + "dependencies": [ + "dirent", + "expat", + "freetype", + "gettext", + "json-c", + "libiconv", + { + "name": "libuuid", + "platform": "!windows & !osx & !mingw" + }, + "pthread" + ] +} diff --git a/ports/foonathan-memory/CONTROL b/ports/foonathan-memory/CONTROL deleted file mode 100644 index 8c105a104de5db..00000000000000 --- a/ports/foonathan-memory/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: foonathan-memory -Version: 2019-07-21-1 -Description: STL compatible C++ memory allocator library -Homepage: https://foonathan.net/doc/memory/ -Default-Features: tool - -Feature: tool -Description: Build foonathan memory tool diff --git a/ports/foonathan-memory/vcpkg.json b/ports/foonathan-memory/vcpkg.json new file mode 100644 index 00000000000000..e668bd94f54734 --- /dev/null +++ b/ports/foonathan-memory/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "foonathan-memory", + "version-string": "2019-07-21", + "port-version": 2, + "description": "STL compatible C++ memory allocator library", + "homepage": "https://foonathan.net/doc/memory/", + "default-features": [ + "tool" + ], + "features": { + "tool": { + "description": "Build foonathan memory tool" + } + } +} diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL deleted file mode 100644 index f4abd33bdbbc4d..00000000000000 --- a/ports/freeglut/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: freeglut -Version: 3.2.1 -Port-Version: 5 -Homepage: https://sourceforge.net/projects/freeglut/ -Description: Open source implementation of GLUT with source and binary backwards compatibility. diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json new file mode 100644 index 00000000000000..9c53e4f6bcf217 --- /dev/null +++ b/ports/freeglut/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "freeglut", + "version-string": "3.2.1", + "port-version": 6, + "description": "Open source implementation of GLUT with source and binary backwards compatibility.", + "homepage": "https://sourceforge.net/projects/freeglut/" +} diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL deleted file mode 100644 index 811028ca6b97f4..00000000000000 --- a/ports/freeimage/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: freeimage -Version: 3.18.0 -Port-Version: 19 -Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr -Homepage: https://sourceforge.net/projects/freeimage/ -Description: Support library for graphics image formats diff --git a/ports/freeimage/vcpkg.json b/ports/freeimage/vcpkg.json new file mode 100644 index 00000000000000..4f78fd876dc176 --- /dev/null +++ b/ports/freeimage/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "freeimage", + "version-string": "3.18.0", + "port-version": 20, + "description": "Support library for graphics image formats", + "homepage": "https://sourceforge.net/projects/freeimage/", + "dependencies": [ + "jxrlib", + "libjpeg-turbo", + "libpng", + "libraw", + { + "name": "libwebp", + "platform": "!uwp" + }, + "openexr", + "openjpeg", + "tiff", + "zlib" + ] +} diff --git a/ports/freeopcua/CONTROL b/ports/freeopcua/CONTROL deleted file mode 100644 index 29a273f009d3a7..00000000000000 --- a/ports/freeopcua/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: freeopcua -Version: 20190125-3 -Description: OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python. -Build-Depends: boost-asio,boost-system,boost-program-options,boost-filesystem,boost-thread,boost-format,boost-foreach,boost-property-tree,boost-date-time diff --git a/ports/freeopcua/vcpkg.json b/ports/freeopcua/vcpkg.json new file mode 100644 index 00000000000000..b2cd24b19acfd2 --- /dev/null +++ b/ports/freeopcua/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "freeopcua", + "version-string": "20190125", + "port-version": 4, + "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.", + "dependencies": [ + "boost-asio", + "boost-date-time", + "boost-filesystem", + "boost-foreach", + "boost-format", + "boost-program-options", + "boost-property-tree", + "boost-system", + "boost-thread" + ] +} diff --git a/ports/freetype-gl/CONTROL b/ports/freetype-gl/CONTROL deleted file mode 100644 index 21ee0e17513e0c..00000000000000 --- a/ports/freetype-gl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: freetype-gl -Version: 2020-09-14 -Homepage: https://github.com/rougier/freetype-gl -Description: OpenGL text using one vertex buffer, one texture and FreeType -Build-Depends: glew, freetype diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json new file mode 100644 index 00000000000000..6ac62331cbd916 --- /dev/null +++ b/ports/freetype-gl/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "freetype-gl", + "version-string": "2020-09-14", + "port-version": 1, + "description": "OpenGL text using one vertex buffer, one texture and FreeType", + "homepage": "https://github.com/rougier/freetype-gl", + "dependencies": [ + "freetype", + "glew" + ] +} diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL deleted file mode 100644 index 9de3f926efca12..00000000000000 --- a/ports/fribidi/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: fribidi -Version: 1.0.10 -Port-Version: 2 -Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi) -Build-Depends: tool-meson -Supports: !(uwp | arm) diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json new file mode 100644 index 00000000000000..130fbe0de0f9cb --- /dev/null +++ b/ports/fribidi/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "fribidi", + "version-string": "1.0.10", + "port-version": 3, + "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", + "supports": "!(uwp | arm)", + "dependencies": [ + "tool-meson" + ] +} diff --git a/ports/fruit/CONTROL b/ports/fruit/CONTROL deleted file mode 100644 index d0c8d5951556bf..00000000000000 --- a/ports/fruit/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: fruit -Version: 3.6.0 -Homepage: https://github.com/google/fruit -Description: Fruit, a dependency injection framework for C++ by Google diff --git a/ports/fruit/vcpkg.json b/ports/fruit/vcpkg.json new file mode 100644 index 00000000000000..b182643b35a5bb --- /dev/null +++ b/ports/fruit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fruit", + "version-string": "3.6.0", + "port-version": 1, + "description": "Fruit, a dependency injection framework for C++ by Google", + "homepage": "https://github.com/google/fruit" +} diff --git a/ports/ftgl/CONTROL b/ports/ftgl/CONTROL deleted file mode 100644 index 221bf10e6438a5..00000000000000 --- a/ports/ftgl/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: ftgl -Version: 2.4.0-2 -Homepage: https://github.com/frankheckenbach/ftgl -Description: FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications. - Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format. - FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering. -Build-Depends: freetype, opengl diff --git a/ports/ftgl/vcpkg.json b/ports/ftgl/vcpkg.json new file mode 100644 index 00000000000000..e40f6f2cc19a30 --- /dev/null +++ b/ports/ftgl/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "ftgl", + "version-string": "2.4.0", + "port-version": 3, + "description": [ + "FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.", + "Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.", + "FTGL uses the Freetype (www.freetype.org) font library to open and 'decode' the fonts. It then takes that output and stores it in a format most efficient for OpenGL rendering." + ], + "homepage": "https://github.com/frankheckenbach/ftgl", + "dependencies": [ + "freetype", + "opengl" + ] +} diff --git a/ports/function2/CONTROL b/ports/function2/CONTROL deleted file mode 100644 index 7fe0554318e190..00000000000000 --- a/ports/function2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: function2 -Version: 4.2.0 -Homepage: https://github.com/Naios/function2 -Description: Improved drop-in replacement to std::function diff --git a/ports/function2/vcpkg.json b/ports/function2/vcpkg.json new file mode 100644 index 00000000000000..6bea8f2aaa7235 --- /dev/null +++ b/ports/function2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "function2", + "version-string": "4.2.0", + "port-version": 1, + "description": "Improved drop-in replacement to std::function", + "homepage": "https://github.com/Naios/function2" +} diff --git a/ports/fuzzylite/CONTROL b/ports/fuzzylite/CONTROL deleted file mode 100644 index f7376d25873e78..00000000000000 --- a/ports/fuzzylite/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: fuzzylite -Version: 6.0 -Port-Version: 3 -Homepage: https://github.com/fuzzylite/fuzzylite -Description: A fuzzy logic control library in C++ diff --git a/ports/fuzzylite/vcpkg.json b/ports/fuzzylite/vcpkg.json new file mode 100644 index 00000000000000..2bddccc38c22ce --- /dev/null +++ b/ports/fuzzylite/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "fuzzylite", + "version-string": "6.0", + "port-version": 4, + "description": "A fuzzy logic control library in C++", + "homepage": "https://github.com/fuzzylite/fuzzylite" +} diff --git a/ports/g2o/CONTROL b/ports/g2o/CONTROL deleted file mode 100644 index 5234914a2de257..00000000000000 --- a/ports/g2o/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: g2o -Version: 2020-02-07 -Port-Version: 1 -Build-Depends: suitesparse, eigen3, lapack, ceres -Description: g2o: A General Framework for Graph Optimization -Homepage: https://openslam.org/g2o.html diff --git a/ports/g2o/vcpkg.json b/ports/g2o/vcpkg.json new file mode 100644 index 00000000000000..b81b5d65c9f8fc --- /dev/null +++ b/ports/g2o/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "g2o", + "version-string": "2020-02-07", + "port-version": 2, + "description": "g2o: A General Framework for Graph Optimization", + "homepage": "https://openslam.org/g2o.html", + "dependencies": [ + "ceres", + "eigen3", + "lapack", + "suitesparse" + ] +} diff --git a/ports/gainput/CONTROL b/ports/gainput/CONTROL deleted file mode 100644 index 70ec0210f8f5e0..00000000000000 --- a/ports/gainput/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: gainput -Version: 1.0.0-3 -Homepage: https://github.com/jkuhlmann/gainput -Description: Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers diff --git a/ports/gainput/vcpkg.json b/ports/gainput/vcpkg.json new file mode 100644 index 00000000000000..85da1c0d174149 --- /dev/null +++ b/ports/gainput/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gainput", + "version-string": "1.0.0", + "port-version": 4, + "description": "Gainput is a multiplatform C++ input library, supporting mouse, keyboard and controllers", + "homepage": "https://github.com/jkuhlmann/gainput" +} diff --git a/ports/gamma/CONTROL b/ports/gamma/CONTROL deleted file mode 100644 index b0814d91960de3..00000000000000 --- a/ports/gamma/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: gamma -Version: gamma-2018-01-27 -Port-Version: 2 -Homepage: https://github.com/LancePutnam/Gamma -Build-Depends: libsndfile, portaudio -Description: Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be "light-footed" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects. diff --git a/ports/gamma/vcpkg.json b/ports/gamma/vcpkg.json new file mode 100644 index 00000000000000..9e13ebd52ce97b --- /dev/null +++ b/ports/gamma/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "gamma", + "version-string": "gamma-2018-01-27", + "port-version": 3, + "description": "Gamma is a cross-platform, C++ library for doing generic synthesis and filtering of signals. It is oriented towards real-time sound and graphics applications, but is equally useful for non-real-time tasks. Gamma is designed to be \"light-footed\" in terms of memory and processing making it highly suitable for plug-in development or embedding in other C++ projects.", + "homepage": "https://github.com/LancePutnam/Gamma", + "dependencies": [ + "libsndfile", + "portaudio" + ] +} diff --git a/ports/gasol/CONTROL b/ports/gasol/CONTROL deleted file mode 100644 index 2ae5ce2d3fba7b..00000000000000 --- a/ports/gasol/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: gasol -Version: 2018-01-04 -Homepage: https://github.com/PytLab/GASol -Description: A general Genetic Algorithm Solver in C++ diff --git a/ports/gasol/vcpkg.json b/ports/gasol/vcpkg.json new file mode 100644 index 00000000000000..8b979704f3cbed --- /dev/null +++ b/ports/gasol/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gasol", + "version-string": "2018-01-04", + "port-version": 1, + "description": "A general Genetic Algorithm Solver in C++", + "homepage": "https://github.com/PytLab/GASol " +} diff --git a/ports/gaussianlib/CONTROL b/ports/gaussianlib/CONTROL deleted file mode 100644 index 7f0be1d5a719f5..00000000000000 --- a/ports/gaussianlib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: gaussianlib -Version: 2019-08-04 -Description: Basic linear algebra C++ library for 2D and 3D applications -Homepage: https://github.com/LukasBanana/GaussianLib diff --git a/ports/gaussianlib/vcpkg.json b/ports/gaussianlib/vcpkg.json new file mode 100644 index 00000000000000..81ed9e4467c035 --- /dev/null +++ b/ports/gaussianlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gaussianlib", + "version-string": "2019-08-04", + "port-version": 1, + "description": "Basic linear algebra C++ library for 2D and 3D applications", + "homepage": "https://github.com/LukasBanana/GaussianLib" +} diff --git a/ports/gcem/CONTROL b/ports/gcem/CONTROL deleted file mode 100644 index 7af19ce9a07e89..00000000000000 --- a/ports/gcem/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: gcem -Version: 1.13.1 -Description: A C++ compile-time math library using generalized constant expressions diff --git a/ports/gcem/vcpkg.json b/ports/gcem/vcpkg.json new file mode 100644 index 00000000000000..ef9aef7151a9ff --- /dev/null +++ b/ports/gcem/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "gcem", + "version-string": "1.13.1", + "port-version": 1, + "description": "A C++ compile-time math library using generalized constant expressions" +} diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL deleted file mode 100644 index a08a2a5cfa2169..00000000000000 --- a/ports/gdcm/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: gdcm -Version: 3.0.7 -Port-Version: 1 -Homepage: https://github.com/malaterre/GDCM -Description: Grassroots DICOM library -Build-Depends: zlib, expat, openjpeg -Supports: !uwp&!(windows&(arm|arm64)) diff --git a/ports/gdcm/vcpkg.json b/ports/gdcm/vcpkg.json new file mode 100644 index 00000000000000..78e3866995ac26 --- /dev/null +++ b/ports/gdcm/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "gdcm", + "version-string": "3.0.7", + "port-version": 2, + "description": "Grassroots DICOM library", + "homepage": "https://github.com/malaterre/GDCM", + "supports": "!uwp & !(windows & (arm | arm64))", + "dependencies": [ + "expat", + "openjpeg", + "zlib" + ] +} diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL deleted file mode 100644 index e7f43b1609f8ce..00000000000000 --- a/ports/gdcm2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gdcm2 -Version: deprecated -Homepage: https://github.com/malaterre/GDCM -Description: This port was renamed to gdcm. The gdcm2 name is deprecated. -Build-Depends: gdcm \ No newline at end of file diff --git a/ports/gdcm2/vcpkg.json b/ports/gdcm2/vcpkg.json new file mode 100644 index 00000000000000..bdbe890c59bdc3 --- /dev/null +++ b/ports/gdcm2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gdcm2", + "version-string": "deprecated", + "port-version": 1, + "description": "This port was renamed to gdcm. The gdcm2 name is deprecated.", + "homepage": "https://github.com/malaterre/GDCM", + "dependencies": [ + "gdcm" + ] +} diff --git a/ports/genann/CONTROL b/ports/genann/CONTROL deleted file mode 100644 index 6397319bba1272..00000000000000 --- a/ports/genann/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: genann -Version: 2019-07-10 -Homepage: https://github.com/codeplea/genann -Description: Genann is a minimal, well-tested library for training and using feedforward artificial neural networks (ANN) in C. diff --git a/ports/genann/vcpkg.json b/ports/genann/vcpkg.json new file mode 100644 index 00000000000000..7e9de881533bc8 --- /dev/null +++ b/ports/genann/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "genann", + "version-string": "2019-07-10", + "port-version": 1, + "description": "Genann is a minimal, well-tested library for training and using feedforward artificial neural networks (ANN) in C.", + "homepage": "https://github.com/codeplea/genann" +} diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL deleted file mode 100644 index 19bbb144be059a..00000000000000 --- a/ports/geogram/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: geogram -Version: 1.7.5 -Port-Version: 3 -Homepage: https://gforge.inria.fr/projects/geogram/ -Description: Geogram is a programming library of geometric algorithms. -Build-Depends: blas, lapack -Supports: !uwp - -Feature: graphics -Description: Build viewers and geogram_gfx library. -Build-Depends: glfw3 diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json new file mode 100644 index 00000000000000..f3d3175b2e4248 --- /dev/null +++ b/ports/geogram/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "geogram", + "version-string": "1.7.5", + "port-version": 4, + "description": "Geogram is a programming library of geometric algorithms.", + "homepage": "https://gforge.inria.fr/projects/geogram/", + "supports": "!uwp", + "dependencies": [ + "blas", + "lapack" + ], + "features": { + "graphics": { + "description": "Build viewers and geogram_gfx library.", + "dependencies": [ + "glfw3" + ] + } + } +} diff --git a/ports/getdns/CONTROL b/ports/getdns/CONTROL deleted file mode 100644 index 69dc8e3a14ac24..00000000000000 --- a/ports/getdns/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: getdns -Version: 1.6.0 -Build-Depends: libidn2, openssl -Description: GetDNS is a modern asynchronous DNS API -Homepage: https://getdnsapi.net/ -Supports: !uwp&windows - -Feature: libevent -Description: libevent event loop integration -Build-Depends: libevent - -Feature: libuv -Description: libuv event loop integration -Build-Depends: libuv diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json new file mode 100644 index 00000000000000..05fceec365b2b3 --- /dev/null +++ b/ports/getdns/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "getdns", + "version-string": "1.6.0", + "port-version": 1, + "description": "GetDNS is a modern asynchronous DNS API", + "homepage": "https://getdnsapi.net/", + "supports": "!uwp & windows", + "dependencies": [ + "libidn2", + "openssl" + ], + "features": { + "libevent": { + "description": "libevent event loop integration", + "dependencies": [ + "libevent" + ] + }, + "libuv": { + "description": "libuv event loop integration", + "dependencies": [ + "libuv" + ] + } + } +} diff --git a/ports/getopt/CONTROL b/ports/getopt/CONTROL deleted file mode 100644 index d2b9c2930d2ebf..00000000000000 --- a/ports/getopt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: getopt -Version: 0 -Description: The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options. -Build-Depends: getopt-win32 (windows) -Supports: !uwp \ No newline at end of file diff --git a/ports/getopt/vcpkg.json b/ports/getopt/vcpkg.json new file mode 100644 index 00000000000000..cd31a24416feb4 --- /dev/null +++ b/ports/getopt/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "getopt", + "version-string": "0", + "port-version": 1, + "description": "The getopt and getopt_long functions automate some of the chore involved in parsing typical unix command line options.", + "supports": "!uwp", + "dependencies": [ + { + "name": "getopt-win32", + "platform": "windows" + } + ] +} diff --git a/ports/gettimeofday/CONTROL b/ports/gettimeofday/CONTROL deleted file mode 100644 index d1b85e05f21820..00000000000000 --- a/ports/gettimeofday/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: gettimeofday -Version: 2017-10-14-3 -Description: An implementation of gettimeofday for WIN32 diff --git a/ports/gettimeofday/vcpkg.json b/ports/gettimeofday/vcpkg.json new file mode 100644 index 00000000000000..9528e9a2c57b4b --- /dev/null +++ b/ports/gettimeofday/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "gettimeofday", + "version-string": "2017-10-14", + "port-version": 4, + "description": "An implementation of gettimeofday for WIN32" +} diff --git a/ports/gflags/CONTROL b/ports/gflags/CONTROL deleted file mode 100644 index fec8eeb0ff7662..00000000000000 --- a/ports/gflags/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: gflags -Version: 2.2.2 -Port-Version: 2 -Homepage: https://github.com/gflags/gflags -Description: A C++ library that implements commandline flags processing -Supports: !uwp \ No newline at end of file diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json new file mode 100644 index 00000000000000..695ab6a922139f --- /dev/null +++ b/ports/gflags/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "gflags", + "version-string": "2.2.2", + "port-version": 3, + "description": "A C++ library that implements commandline flags processing", + "homepage": "https://github.com/gflags/gflags", + "supports": "!uwp" +} diff --git a/ports/gherkin-c/CONTROL b/ports/gherkin-c/CONTROL deleted file mode 100644 index e1533180f8c772..00000000000000 --- a/ports/gherkin-c/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: gherkin-c -Version: 2019-10-07-1 -Description: Gherkin parser/compiler in C diff --git a/ports/gherkin-c/vcpkg.json b/ports/gherkin-c/vcpkg.json new file mode 100644 index 00000000000000..462f19b78e5bf5 --- /dev/null +++ b/ports/gherkin-c/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "gherkin-c", + "version-string": "2019-10-07", + "port-version": 2, + "description": "Gherkin parser/compiler in C" +} diff --git a/ports/gl2ps/CONTROL b/ports/gl2ps/CONTROL deleted file mode 100644 index 8eab0c030dcd95..00000000000000 --- a/ports/gl2ps/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gl2ps -Version: 1.4.2 -Homepage: https://gitlab.onelab.info/gl2ps/gl2ps -Description: OpenGL to PostScript Printing Library -Build-Depends: freeglut, zlib, libpng diff --git a/ports/gl2ps/vcpkg.json b/ports/gl2ps/vcpkg.json new file mode 100644 index 00000000000000..4230bc45cbd86a --- /dev/null +++ b/ports/gl2ps/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "gl2ps", + "version-string": "1.4.2", + "port-version": 1, + "description": "OpenGL to PostScript Printing Library", + "homepage": "https://gitlab.onelab.info/gl2ps/gl2ps", + "dependencies": [ + "freeglut", + "libpng", + "zlib" + ] +} diff --git a/ports/glog/CONTROL b/ports/glog/CONTROL deleted file mode 100644 index 649381e3812c29..00000000000000 --- a/ports/glog/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: glog -Version: 0.4.0-3 -Homepage: https://github.com/google/glog -Description: C++ implementation of the Google logging module -Build-Depends: gflags diff --git a/ports/glog/vcpkg.json b/ports/glog/vcpkg.json new file mode 100644 index 00000000000000..6a0da077d82841 --- /dev/null +++ b/ports/glog/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "glog", + "version-string": "0.4.0", + "port-version": 4, + "description": "C++ implementation of the Google logging module", + "homepage": "https://github.com/google/glog", + "dependencies": [ + "gflags" + ] +} diff --git a/ports/glui/CONTROL b/ports/glui/CONTROL deleted file mode 100644 index c4451d61a9da6d..00000000000000 --- a/ports/glui/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: glui -Version: 2019-11-30 -Description: GLUI is a GLUT-based C++ user interface library -Homepage: https://github.com/libglui/glui -Build-Depends: freeglut diff --git a/ports/glui/vcpkg.json b/ports/glui/vcpkg.json new file mode 100644 index 00000000000000..c585a4f2bfbc88 --- /dev/null +++ b/ports/glui/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "glui", + "version-string": "2019-11-30", + "port-version": 1, + "description": "GLUI is a GLUT-based C++ user interface library", + "homepage": "https://github.com/libglui/glui", + "dependencies": [ + "freeglut" + ] +} diff --git a/ports/gmmlib/CONTROL b/ports/gmmlib/CONTROL deleted file mode 100644 index 90faeeb17e58be..00000000000000 --- a/ports/gmmlib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: gmmlib -Version: 20.3.1 -Description: intel's graphics memory management library -Supports: linux \ No newline at end of file diff --git a/ports/gmmlib/vcpkg.json b/ports/gmmlib/vcpkg.json new file mode 100644 index 00000000000000..613b45e830a184 --- /dev/null +++ b/ports/gmmlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gmmlib", + "version-string": "20.3.1", + "port-version": 1, + "description": "intel's graphics memory management library", + "supports": "linux" +} diff --git a/ports/google-cloud-cpp-common/CONTROL b/ports/google-cloud-cpp-common/CONTROL deleted file mode 100644 index 481343c97e6509..00000000000000 --- a/ports/google-cloud-cpp-common/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: google-cloud-cpp-common -Version: alias -Build-Depends: google-cloud-cpp -Description: Deprecated, use google-cloud-cpp instead diff --git a/ports/google-cloud-cpp-common/vcpkg.json b/ports/google-cloud-cpp-common/vcpkg.json new file mode 100644 index 00000000000000..12377d6c8166ae --- /dev/null +++ b/ports/google-cloud-cpp-common/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "google-cloud-cpp-common", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated, use google-cloud-cpp instead", + "dependencies": [ + "google-cloud-cpp" + ] +} diff --git a/ports/google-cloud-cpp-spanner/CONTROL b/ports/google-cloud-cpp-spanner/CONTROL deleted file mode 100644 index 69cc736359ac2b..00000000000000 --- a/ports/google-cloud-cpp-spanner/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: google-cloud-cpp-spanner -Version: alias -Build-Depends: google-cloud-cpp -Description: Deprecated, use google-cloud-cpp instead diff --git a/ports/google-cloud-cpp-spanner/vcpkg.json b/ports/google-cloud-cpp-spanner/vcpkg.json new file mode 100644 index 00000000000000..87f8b18c587f6f --- /dev/null +++ b/ports/google-cloud-cpp-spanner/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "google-cloud-cpp-spanner", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated, use google-cloud-cpp instead", + "dependencies": [ + "google-cloud-cpp" + ] +} diff --git a/ports/googleapis/CONTROL b/ports/googleapis/CONTROL deleted file mode 100644 index 08a9ee1130d99e..00000000000000 --- a/ports/googleapis/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: googleapis -Version: alias -Build-Depends: google-cloud-cpp -Description: Deprecated, use google-cloud-cpp instead. diff --git a/ports/googleapis/vcpkg.json b/ports/googleapis/vcpkg.json new file mode 100644 index 00000000000000..37755f8dbe5cf9 --- /dev/null +++ b/ports/googleapis/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "googleapis", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated, use google-cloud-cpp instead.", + "dependencies": [ + "google-cloud-cpp" + ] +} diff --git a/ports/gperf/CONTROL b/ports/gperf/CONTROL deleted file mode 100644 index 34d19df809617c..00000000000000 --- a/ports/gperf/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: gperf -Version: 3.1-1 -Description: GNU perfect hash function generator -Homepage: https://www.gnu.org/software/gperf/ diff --git a/ports/gperf/vcpkg.json b/ports/gperf/vcpkg.json new file mode 100644 index 00000000000000..248f4da4c3f794 --- /dev/null +++ b/ports/gperf/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gperf", + "version-string": "3.1", + "port-version": 2, + "description": "GNU perfect hash function generator", + "homepage": "https://www.gnu.org/software/gperf/" +} diff --git a/ports/gperftools/CONTROL b/ports/gperftools/CONTROL deleted file mode 100644 index 0d7e536b754a91..00000000000000 --- a/ports/gperftools/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: gperftools -Version: 2019-09-02 -Description: A set of tools for performance profiling and memory checking -Supports: !(arm|arm64|uwp) -Homepage: https://github.com/gperftools/gperftools - -Feature: override -Description: Override allocators - -Feature: tools -Description: Build gperftools CLI tools diff --git a/ports/gperftools/vcpkg.json b/ports/gperftools/vcpkg.json new file mode 100644 index 00000000000000..8d12a9b734f4b9 --- /dev/null +++ b/ports/gperftools/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "gperftools", + "version-string": "2019-09-02", + "port-version": 1, + "description": "A set of tools for performance profiling and memory checking", + "homepage": "https://github.com/gperftools/gperftools", + "supports": "!(arm | arm64 | uwp)", + "features": { + "override": { + "description": "Override allocators" + }, + "tools": { + "description": "Build gperftools CLI tools" + } + } +} diff --git a/ports/gpgme/CONTROL b/ports/gpgme/CONTROL deleted file mode 100644 index 90c025ce5b01df..00000000000000 --- a/ports/gpgme/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: gpgme -Version: 1.14.0 -Homepage: https://gnupg.org/software/gpgme/index.html -Description: A library designed to make access to GnuPG easier for applications -Build-Depends: libgpg-error, libassuan -Default-Features: cpp -Supports: !windows - -Feature: cpp -Description: C++ bindings diff --git a/ports/gpgme/vcpkg.json b/ports/gpgme/vcpkg.json new file mode 100644 index 00000000000000..1c36254c618f07 --- /dev/null +++ b/ports/gpgme/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "gpgme", + "version-string": "1.14.0", + "port-version": 1, + "description": "A library designed to make access to GnuPG easier for applications", + "homepage": "https://gnupg.org/software/gpgme/index.html", + "supports": "!windows", + "dependencies": [ + "libassuan", + "libgpg-error" + ], + "default-features": [ + "cpp" + ], + "features": { + "cpp": { + "description": "C++ bindings" + } + } +} diff --git a/ports/graphicsmagick/CONTROL b/ports/graphicsmagick/CONTROL deleted file mode 100644 index cec6a804024272..00000000000000 --- a/ports/graphicsmagick/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: graphicsmagick -Version: 1.3.36 -Build-Depends: zlib, bzip2, freetype, libjpeg-turbo, libpng, tiff -Homepage: https://sourceforge.net/projects/graphicsmagick/ -Description: Image processing library diff --git a/ports/graphicsmagick/vcpkg.json b/ports/graphicsmagick/vcpkg.json new file mode 100644 index 00000000000000..7e8ef699e00f45 --- /dev/null +++ b/ports/graphicsmagick/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "graphicsmagick", + "version-string": "1.3.36", + "port-version": 1, + "description": "Image processing library", + "homepage": "https://sourceforge.net/projects/graphicsmagick/", + "dependencies": [ + "bzip2", + "freetype", + "libjpeg-turbo", + "libpng", + "tiff", + "zlib" + ] +} diff --git a/ports/graphite2/CONTROL b/ports/graphite2/CONTROL deleted file mode 100644 index 0c4899fc939508..00000000000000 --- a/ports/graphite2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: graphite2 -Version: 1.3.14 -Homepage: https://github.com/silnrsi/graphite -Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world. - Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications. diff --git a/ports/graphite2/vcpkg.json b/ports/graphite2/vcpkg.json new file mode 100644 index 00000000000000..cd5e479f4029d4 --- /dev/null +++ b/ports/graphite2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "graphite2", + "version-string": "1.3.14", + "port-version": 1, + "description": [ + "Graphite is a \"smart font\" system developed specifically to handle the complexities of lesser-known languages of the world.", + "Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications." + ], + "homepage": "https://github.com/silnrsi/graphite" +} diff --git a/ports/greatest/CONTROL b/ports/greatest/CONTROL deleted file mode 100644 index 05c679d8ec19de..00000000000000 --- a/ports/greatest/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: greatest -Version: 1.4.2 -Description: Single-file testing system for C -Homepage: https://github.com/silentbicycle/greatest diff --git a/ports/greatest/vcpkg.json b/ports/greatest/vcpkg.json new file mode 100644 index 00000000000000..c7a179ff5d3221 --- /dev/null +++ b/ports/greatest/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "greatest", + "version-string": "1.4.2", + "port-version": 1, + "description": "Single-file testing system for C", + "homepage": "https://github.com/silentbicycle/greatest" +} diff --git a/ports/grppi/CONTROL b/ports/grppi/CONTROL deleted file mode 100644 index c638ad212a6753..00000000000000 --- a/ports/grppi/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: grppi -Version: 0.4.0 -Homepage: https://github.com/arcosuc3m/grppi -Description: GrPPI is an open source generic and reusable parallel pattern programming interface developed at University Carlos III of Madrid. \ No newline at end of file diff --git a/ports/grppi/vcpkg.json b/ports/grppi/vcpkg.json new file mode 100644 index 00000000000000..1cc832ab3ed7e1 --- /dev/null +++ b/ports/grppi/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "grppi", + "version-string": "0.4.0", + "port-version": 1, + "description": "GrPPI is an open source generic and reusable parallel pattern programming interface developed at University Carlos III of Madrid.", + "homepage": "https://github.com/arcosuc3m/grppi" +} diff --git a/ports/gsl/CONTROL b/ports/gsl/CONTROL deleted file mode 100644 index 03b3e6e74608d2..00000000000000 --- a/ports/gsl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gsl -Version: 2.6 -Port-Version: 1 -Homepage: https://www.gnu.org/software/gsl/ -Description: The GNU Scientific Library is a numerical library for C and C++ programmers diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json new file mode 100644 index 00000000000000..092f208c2d61c4 --- /dev/null +++ b/ports/gsl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gsl", + "version-string": "2.6", + "port-version": 2, + "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", + "homepage": "https://www.gnu.org/software/gsl/" +} diff --git a/ports/guetzli/CONTROL b/ports/guetzli/CONTROL deleted file mode 100644 index 142789bbd0129d..00000000000000 --- a/ports/guetzli/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: guetzli -Version: 2020-09-14 -Homepage: https://github.com/google/guetzli -Description: Perceptual JPEG encoder -Build-Depends: libpng, butteraugli diff --git a/ports/guetzli/vcpkg.json b/ports/guetzli/vcpkg.json new file mode 100644 index 00000000000000..63228967765c94 --- /dev/null +++ b/ports/guetzli/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "guetzli", + "version-string": "2020-09-14", + "port-version": 1, + "description": "Perceptual JPEG encoder", + "homepage": "https://github.com/google/guetzli", + "dependencies": [ + "butteraugli", + "libpng" + ] +} diff --git a/ports/gumbo/CONTROL b/ports/gumbo/CONTROL deleted file mode 100644 index c6741b93417a92..00000000000000 --- a/ports/gumbo/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: gumbo -Version: 0.10.1-3 -Homepage: https://github.com/google/gumbo-parser -Description: An HTML5 parsing library in pure C99 diff --git a/ports/gumbo/vcpkg.json b/ports/gumbo/vcpkg.json new file mode 100644 index 00000000000000..650c5b6f385e30 --- /dev/null +++ b/ports/gumbo/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "gumbo", + "version-string": "0.10.1", + "port-version": 4, + "description": "An HTML5 parsing library in pure C99", + "homepage": "https://github.com/google/gumbo-parser" +} diff --git a/ports/gzip-hpp/CONTROL b/ports/gzip-hpp/CONTROL deleted file mode 100644 index 86eba1394ef3f2..00000000000000 --- a/ports/gzip-hpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: gzip-hpp -Version: 0.1.0 -Homepage: https://github.com/mapbox/gzip-hpp/ -Description: Gzip header-only C++ library -Build-Depends: zlib \ No newline at end of file diff --git a/ports/gzip-hpp/vcpkg.json b/ports/gzip-hpp/vcpkg.json new file mode 100644 index 00000000000000..96cb8d6f073b10 --- /dev/null +++ b/ports/gzip-hpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "gzip-hpp", + "version-string": "0.1.0", + "port-version": 1, + "description": "Gzip header-only C++ library", + "homepage": "https://github.com/mapbox/gzip-hpp/", + "dependencies": [ + "zlib" + ] +} diff --git a/ports/h5py-lzf/CONTROL b/ports/h5py-lzf/CONTROL deleted file mode 100644 index 3ef62f85a31f5e..00000000000000 --- a/ports/h5py-lzf/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: h5py-lzf -Version: 2019-12-04 -Build-Depends: hdf5 -Homepage: https://github.com/h5py/h5py/tree/master/lzf -Description: The LZF filter is an alternative DEFLATE-style compressor for HDF5 datasets, using the free LZF library by Marc Alexander Lehmann. diff --git a/ports/h5py-lzf/vcpkg.json b/ports/h5py-lzf/vcpkg.json new file mode 100644 index 00000000000000..eb203ee5fdd13c --- /dev/null +++ b/ports/h5py-lzf/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "h5py-lzf", + "version-string": "2019-12-04", + "port-version": 1, + "description": "The LZF filter is an alternative DEFLATE-style compressor for HDF5 datasets, using the free LZF library by Marc Alexander Lehmann.", + "homepage": "https://github.com/h5py/h5py/tree/master/lzf", + "dependencies": [ + "hdf5" + ] +} diff --git a/ports/hayai/CONTROL b/ports/hayai/CONTROL deleted file mode 100644 index 7943d301b92b88..00000000000000 --- a/ports/hayai/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: hayai -Version: 2019-08-10 -Description: C++ benchmarking framework -Homepage: https://github.com/nickbruun/hayai diff --git a/ports/hayai/vcpkg.json b/ports/hayai/vcpkg.json new file mode 100644 index 00000000000000..847c0d2fc1d704 --- /dev/null +++ b/ports/hayai/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "hayai", + "version-string": "2019-08-10", + "port-version": 1, + "description": "C++ benchmarking framework", + "homepage": "https://github.com/nickbruun/hayai" +} diff --git a/ports/healpix/CONTROL b/ports/healpix/CONTROL deleted file mode 100644 index 554f8fb1ffa194..00000000000000 --- a/ports/healpix/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: healpix -Version: 1.12.10 -Port-Version: 7 -Homepage: http://healpix.sourceforge.net/ -Description: HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere. -Build-Depends: cfitsio -Supports: linux \ No newline at end of file diff --git a/ports/healpix/vcpkg.json b/ports/healpix/vcpkg.json new file mode 100644 index 00000000000000..15b383f089fb74 --- /dev/null +++ b/ports/healpix/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "healpix", + "version-string": "1.12.10", + "port-version": 8, + "description": "HEALPix is an acronym for Hierarchical Equal Area isoLatitude Pixelation of a sphere.", + "homepage": "http://healpix.sourceforge.net/", + "supports": "linux", + "dependencies": [ + "cfitsio" + ] +} diff --git a/ports/hffix/CONTROL b/ports/hffix/CONTROL deleted file mode 100644 index f5453c0f44f218..00000000000000 --- a/ports/hffix/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: hffix -Version: 1.0.0 -Homepage: https://jamesdbrock.github.io/hffix -Description: Financial Information Exchange Protocol C++ Library \ No newline at end of file diff --git a/ports/hffix/vcpkg.json b/ports/hffix/vcpkg.json new file mode 100644 index 00000000000000..64e8946e9612e7 --- /dev/null +++ b/ports/hffix/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "hffix", + "version-string": "1.0.0", + "port-version": 1, + "description": "Financial Information Exchange Protocol C++ Library", + "homepage": "https://jamesdbrock.github.io/hffix" +} diff --git a/ports/hfsm2/CONTROL b/ports/hfsm2/CONTROL deleted file mode 100644 index 4677f8b088d096..00000000000000 --- a/ports/hfsm2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: hfsm2 -Version: beta7 -Homepage: https://github.com/andrew-gresyk/HFSM2 -Description: Header-only heriarchical FSM framework in C++14, with fully statically-defined structure (no dynamic allocations), built with variadic templates. -Build-Depends: catch2 diff --git a/ports/hfsm2/vcpkg.json b/ports/hfsm2/vcpkg.json new file mode 100644 index 00000000000000..6486dfaa5f7e81 --- /dev/null +++ b/ports/hfsm2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "hfsm2", + "version-string": "beta7", + "port-version": 1, + "description": "Header-only heriarchical FSM framework in C++14, with fully statically-defined structure (no dynamic allocations), built with variadic templates.", + "homepage": "https://github.com/andrew-gresyk/HFSM2", + "dependencies": [ + "catch2" + ] +} diff --git a/ports/http-parser/CONTROL b/ports/http-parser/CONTROL deleted file mode 100644 index 8e7329bad76605..00000000000000 --- a/ports/http-parser/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: http-parser -Version: 2.9.4 -Homepage: https://github.com/nodejs/http-parser -Description: HTTP Parser. diff --git a/ports/http-parser/vcpkg.json b/ports/http-parser/vcpkg.json new file mode 100644 index 00000000000000..bd316b2a24a0ea --- /dev/null +++ b/ports/http-parser/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "http-parser", + "version-string": "2.9.4", + "port-version": 1, + "description": "HTTP Parser.", + "homepage": "https://github.com/nodejs/http-parser" +} diff --git a/ports/hungarian/CONTROL b/ports/hungarian/CONTROL deleted file mode 100644 index 96dd5f7991be10..00000000000000 --- a/ports/hungarian/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: hungarian -Version: v0.1.3 -Description: C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase diff --git a/ports/hungarian/vcpkg.json b/ports/hungarian/vcpkg.json new file mode 100644 index 00000000000000..3d74f6cde35d7b --- /dev/null +++ b/ports/hungarian/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "hungarian", + "version-string": "v0.1.3", + "port-version": 1, + "description": "C-implementation of the Hungarian Method: finding the optimal assignment (assigning a set of jobs to a set of machines) in O(n^3), where n=max{#jobs, #machines}. The implementation is a sligntly enhanced version of the implementation provided by the Stanford GraphBase" +} diff --git a/ports/hwloc/CONTROL b/ports/hwloc/CONTROL deleted file mode 100644 index f2a7afc6b6ecff..00000000000000 --- a/ports/hwloc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: hwloc -Version: 2.2.0 -Homepage: https://github.com/open-mpi/hwloc -Description: Portable Hardware Locality (hwloc) - The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs. -Supports: !(uwp|arm|arm64) \ No newline at end of file diff --git a/ports/hwloc/vcpkg.json b/ports/hwloc/vcpkg.json new file mode 100644 index 00000000000000..bcd406ad024ee5 --- /dev/null +++ b/ports/hwloc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "hwloc", + "version-string": "2.2.0", + "port-version": 1, + "description": [ + "Portable Hardware Locality (hwloc)", + "The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs." + ], + "homepage": "https://github.com/open-mpi/hwloc", + "supports": "!(uwp | arm | arm64)" +} diff --git a/ports/hyperscan/CONTROL b/ports/hyperscan/CONTROL deleted file mode 100644 index 3c6e5e956ed218..00000000000000 --- a/ports/hyperscan/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: hyperscan -Version: 5.3.0 -Port-Version: 1 -Homepage: https://www.hyperscan.io -Description: A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed. -Build-Depends: boost-array, boost-chrono, boost-config, boost-core, boost-crc, boost-detail, boost-functional, boost-regex, boost-system, boost-thread, boost-type-traits, boost-unordered, boost-utility, boost-dynamic-bitset, boost-random, boost-graph, boost-multi-array, boost-icl, boost-ptr-container, pcre, ragel -Supports: !arm diff --git a/ports/hyperscan/vcpkg.json b/ports/hyperscan/vcpkg.json new file mode 100644 index 00000000000000..bddb221f39bd8f --- /dev/null +++ b/ports/hyperscan/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "hyperscan", + "version-string": "5.3.0", + "port-version": 2, + "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.", + "homepage": "https://www.hyperscan.io", + "supports": "!arm", + "dependencies": [ + "boost-array", + "boost-chrono", + "boost-config", + "boost-core", + "boost-crc", + "boost-detail", + "boost-dynamic-bitset", + "boost-functional", + "boost-graph", + "boost-icl", + "boost-multi-array", + "boost-ptr-container", + "boost-random", + "boost-regex", + "boost-system", + "boost-thread", + "boost-type-traits", + "boost-unordered", + "boost-utility", + "pcre", + "ragel" + ] +} diff --git a/ports/hypre/CONTROL b/ports/hypre/CONTROL deleted file mode 100644 index b82a4ede88ee9f..00000000000000 --- a/ports/hypre/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: hypre -Version: 2.19.0 -Homepage: https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods -Description: SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS -Build-Depends: mpi, blas, lapack diff --git a/ports/hypre/vcpkg.json b/ports/hypre/vcpkg.json new file mode 100644 index 00000000000000..4ca1f11b40d7b4 --- /dev/null +++ b/ports/hypre/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "hypre", + "version-string": "2.19.0", + "port-version": 1, + "description": "SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS", + "homepage": "https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods", + "dependencies": [ + "blas", + "lapack", + "mpi" + ] +} diff --git a/ports/ideviceinstaller/CONTROL b/ports/ideviceinstaller/CONTROL deleted file mode 100644 index 3697611a4e7661..00000000000000 --- a/ports/ideviceinstaller/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ideviceinstaller -Version: 1.1.2.23-1 -Description: Manage apps of iOS devices -Build-Depends: libimobiledevice, libzip \ No newline at end of file diff --git a/ports/ideviceinstaller/vcpkg.json b/ports/ideviceinstaller/vcpkg.json new file mode 100644 index 00000000000000..f0ba45361a1ed9 --- /dev/null +++ b/ports/ideviceinstaller/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "ideviceinstaller", + "version-string": "1.1.2.23", + "port-version": 2, + "description": "Manage apps of iOS devices", + "dependencies": [ + "libimobiledevice", + "libzip" + ] +} diff --git a/ports/idevicerestore/CONTROL b/ports/idevicerestore/CONTROL deleted file mode 100644 index a8db4e250c8a07..00000000000000 --- a/ports/idevicerestore/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: idevicerestore -Version: 1.0.12-4 -Description: Restore/upgrade firmware of iOS devices -Build-Depends: libimobiledevice, curl, libirecovery, libzip -Supports: windows diff --git a/ports/idevicerestore/vcpkg.json b/ports/idevicerestore/vcpkg.json new file mode 100644 index 00000000000000..c2d9b175e56f17 --- /dev/null +++ b/ports/idevicerestore/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "idevicerestore", + "version-string": "1.0.12", + "port-version": 5, + "description": "Restore/upgrade firmware of iOS devices", + "supports": "windows", + "dependencies": [ + "curl", + "libimobiledevice", + "libirecovery", + "libzip" + ] +} diff --git a/ports/if97/CONTROL b/ports/if97/CONTROL deleted file mode 100644 index 787bc11828b740..00000000000000 --- a/ports/if97/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: if97 -Version: 2.1.2 -Homepage: https://github.com/CoolProp/IF97 -Description: This repository implements the IF97 formulation for the properties of pure water substance. diff --git a/ports/if97/vcpkg.json b/ports/if97/vcpkg.json new file mode 100644 index 00000000000000..56f733bde2b076 --- /dev/null +++ b/ports/if97/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "if97", + "version-string": "2.1.2", + "port-version": 1, + "description": "This repository implements the IF97 formulation for the properties of pure water substance.", + "homepage": "https://github.com/CoolProp/IF97" +} diff --git a/ports/igloo/CONTROL b/ports/igloo/CONTROL deleted file mode 100644 index ffa162695e00c4..00000000000000 --- a/ports/igloo/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: igloo -Version: 1.1.1 -Description: A framework for unit testing in C++ diff --git a/ports/igloo/vcpkg.json b/ports/igloo/vcpkg.json new file mode 100644 index 00000000000000..58c0a3c1e41450 --- /dev/null +++ b/ports/igloo/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "igloo", + "version-string": "1.1.1", + "port-version": 1, + "description": "A framework for unit testing in C++" +} diff --git a/ports/ignition-cmake0/CONTROL b/ports/ignition-cmake0/CONTROL deleted file mode 100644 index 936683193a978d..00000000000000 --- a/ports/ignition-cmake0/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: ignition-cmake0 -Version: 0.6.2-2 -Homepage: https://ignitionrobotics.org/libs/cmake -Description: CMake helper functions for building robotic applications -Build-Depends: ignition-modularscripts - - diff --git a/ports/ignition-cmake0/vcpkg.json b/ports/ignition-cmake0/vcpkg.json new file mode 100644 index 00000000000000..4decf445a61339 --- /dev/null +++ b/ports/ignition-cmake0/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "ignition-cmake0", + "version-string": "0.6.2", + "port-version": 3, + "description": "CMake helper functions for building robotic applications", + "homepage": "https://ignitionrobotics.org/libs/cmake", + "dependencies": [ + "ignition-modularscripts" + ] +} diff --git a/ports/ignition-common1/CONTROL b/ports/ignition-common1/CONTROL deleted file mode 100644 index 810904d3e9b341..00000000000000 --- a/ports/ignition-common1/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ignition-common1 -Version: 1.1.1-1 -Build-Depends: dlfcn-win32 (windows|uwp), ffmpeg (!windows&!uwp), freeimage (!windows&!uwp), gts (!windows&!uwp), ignition-cmake0, ignition-math4, tinyxml2 (!windows&!uwp) -Description: Common libraries for robotics applications diff --git a/ports/ignition-common1/vcpkg.json b/ports/ignition-common1/vcpkg.json new file mode 100644 index 00000000000000..a7df59922a9abb --- /dev/null +++ b/ports/ignition-common1/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "ignition-common1", + "version-string": "1.1.1", + "port-version": 2, + "description": "Common libraries for robotics applications", + "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + { + "name": "ffmpeg", + "platform": "!windows & !uwp" + }, + { + "name": "freeimage", + "platform": "!windows & !uwp" + }, + { + "name": "gts", + "platform": "!windows & !uwp" + }, + "ignition-cmake0", + "ignition-math4", + { + "name": "tinyxml2", + "platform": "!windows & !uwp" + } + ] +} diff --git a/ports/ignition-common3/CONTROL b/ports/ignition-common3/CONTROL deleted file mode 100644 index 8bca013a1bee06..00000000000000 --- a/ports/ignition-common3/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ignition-common3 -Version: 3.9.0 -Build-Depends: dlfcn-win32 (windows|uwp), ffmpeg, freeimage, gts, ignition-cmake2, ignition-math6, ignition-modularscripts, libuuid (!windows&!uwp), tinyxml2 -Homepage: https://ignitionrobotics.org/libs/common -Description: Common libraries for robotics applications diff --git a/ports/ignition-common3/vcpkg.json b/ports/ignition-common3/vcpkg.json new file mode 100644 index 00000000000000..ce71be39dac52a --- /dev/null +++ b/ports/ignition-common3/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "ignition-common3", + "version-string": "3.9.0", + "port-version": 1, + "description": "Common libraries for robotics applications", + "homepage": "https://ignitionrobotics.org/libs/common", + "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + "ffmpeg", + "freeimage", + "gts", + "ignition-cmake2", + "ignition-math6", + "ignition-modularscripts", + { + "name": "libuuid", + "platform": "!windows & !uwp" + }, + "tinyxml2" + ] +} diff --git a/ports/ignition-fuel-tools1/CONTROL b/ports/ignition-fuel-tools1/CONTROL deleted file mode 100644 index acabd13dfe4445..00000000000000 --- a/ports/ignition-fuel-tools1/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ignition-fuel-tools1 -Version: 1.2.0-2 -Build-Depends: curl, ignition-cmake0, ignition-common1, libyaml, libzip, jsoncpp -Description: Tools for using fuel API to download robot models diff --git a/ports/ignition-fuel-tools1/vcpkg.json b/ports/ignition-fuel-tools1/vcpkg.json new file mode 100644 index 00000000000000..3c4435458b5186 --- /dev/null +++ b/ports/ignition-fuel-tools1/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ignition-fuel-tools1", + "version-string": "1.2.0", + "port-version": 3, + "description": "Tools for using fuel API to download robot models", + "dependencies": [ + "curl", + "ignition-cmake0", + "ignition-common1", + "jsoncpp", + "libyaml", + "libzip" + ] +} diff --git a/ports/ignition-fuel-tools4/CONTROL b/ports/ignition-fuel-tools4/CONTROL deleted file mode 100644 index af6e66d7603d26..00000000000000 --- a/ports/ignition-fuel-tools4/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ignition-fuel-tools4 -Version: 4.3.0 -Homepage: https://ignitionrobotics.org/libs/fuel_tools -Build-Depends: curl, ignition-cmake2, ignition-common3, ignition-modularscripts, ignition-msgs5, libyaml, libzip, jsoncpp, tinyxml2 -Description: Tools for using fuel API to download robot models diff --git a/ports/ignition-fuel-tools4/vcpkg.json b/ports/ignition-fuel-tools4/vcpkg.json new file mode 100644 index 00000000000000..093056ffbcdece --- /dev/null +++ b/ports/ignition-fuel-tools4/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-fuel-tools4", + "version-string": "4.3.0", + "port-version": 1, + "description": "Tools for using fuel API to download robot models", + "homepage": "https://ignitionrobotics.org/libs/fuel_tools", + "dependencies": [ + "curl", + "ignition-cmake2", + "ignition-common3", + "ignition-modularscripts", + "ignition-msgs5", + "jsoncpp", + "libyaml", + "libzip", + "tinyxml2" + ] +} diff --git a/ports/ignition-math4/CONTROL b/ports/ignition-math4/CONTROL deleted file mode 100644 index f9e87feb3d73c0..00000000000000 --- a/ports/ignition-math4/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ignition-math4 -Version: 4.0.0-1 -Homepage: https://ignitionrobotics.org/libs/math -Build-Depends: ignition-cmake0 -Description: Math API for robotic applications diff --git a/ports/ignition-math4/vcpkg.json b/ports/ignition-math4/vcpkg.json new file mode 100644 index 00000000000000..bcdab1843b2a7a --- /dev/null +++ b/ports/ignition-math4/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "ignition-math4", + "version-string": "4.0.0", + "port-version": 2, + "description": "Math API for robotic applications", + "homepage": "https://ignitionrobotics.org/libs/math", + "dependencies": [ + "ignition-cmake0" + ] +} diff --git a/ports/ignition-math6/CONTROL b/ports/ignition-math6/CONTROL deleted file mode 100644 index 72401976581b62..00000000000000 --- a/ports/ignition-math6/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ignition-math6 -Version: 6.6.0 -Homepage: https://ignitionrobotics.org/libs/math -Build-Depends: eigen3, ignition-cmake2, ignition-modularscripts -Description: Math API for robotic applications diff --git a/ports/ignition-math6/vcpkg.json b/ports/ignition-math6/vcpkg.json new file mode 100644 index 00000000000000..bf5c3cfbb06065 --- /dev/null +++ b/ports/ignition-math6/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "ignition-math6", + "version-string": "6.6.0", + "port-version": 1, + "description": "Math API for robotic applications", + "homepage": "https://ignitionrobotics.org/libs/math", + "dependencies": [ + "eigen3", + "ignition-cmake2", + "ignition-modularscripts" + ] +} diff --git a/ports/ignition-modularscripts/CONTROL b/ports/ignition-modularscripts/CONTROL deleted file mode 100644 index 647efbbf18cb5d..00000000000000 --- a/ports/ignition-modularscripts/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: ignition-modularscripts -Version: 2020-11-23 -Description: Vcpkg helpers to package ignition libraries diff --git a/ports/ignition-modularscripts/vcpkg.json b/ports/ignition-modularscripts/vcpkg.json new file mode 100644 index 00000000000000..d6c0c638bb10c9 --- /dev/null +++ b/ports/ignition-modularscripts/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ignition-modularscripts", + "version-string": "2020-11-23", + "port-version": 1, + "description": "Vcpkg helpers to package ignition libraries" +} diff --git a/ports/ignition-msgs1/CONTROL b/ports/ignition-msgs1/CONTROL deleted file mode 100644 index 653c5ea94aa48a..00000000000000 --- a/ports/ignition-msgs1/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ignition-msgs1 -Version: 1.0.0 -Port-Version: 3 -Build-Depends: ignition-cmake0, ignition-math4, protobuf -Description: Middleware protobuf messages for robotics diff --git a/ports/ignition-msgs1/vcpkg.json b/ports/ignition-msgs1/vcpkg.json new file mode 100644 index 00000000000000..f81434b7afec2b --- /dev/null +++ b/ports/ignition-msgs1/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "ignition-msgs1", + "version-string": "1.0.0", + "port-version": 4, + "description": "Middleware protobuf messages for robotics", + "dependencies": [ + "ignition-cmake0", + "ignition-math4", + "protobuf" + ] +} diff --git a/ports/ignition-msgs5/CONTROL b/ports/ignition-msgs5/CONTROL deleted file mode 100644 index c9f357b49f4fe9..00000000000000 --- a/ports/ignition-msgs5/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ignition-msgs5 -Version: 5.3.0 -Port-Version: 2 -Build-Depends: ignition-modularscripts, ignition-cmake2, ignition-math6, protobuf, tinyxml2 -Description: Middleware protobuf messages for robotics -Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/ignition-msgs5/vcpkg.json b/ports/ignition-msgs5/vcpkg.json new file mode 100644 index 00000000000000..24c072d73ed969 --- /dev/null +++ b/ports/ignition-msgs5/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ignition-msgs5", + "version-string": "5.3.0", + "port-version": 3, + "description": "Middleware protobuf messages for robotics", + "supports": "!(arm | uwp)", + "dependencies": [ + "ignition-cmake2", + "ignition-math6", + "ignition-modularscripts", + "protobuf", + "tinyxml2" + ] +} diff --git a/ports/ignition-msgs6/CONTROL b/ports/ignition-msgs6/CONTROL deleted file mode 100644 index b09a4039493585..00000000000000 --- a/ports/ignition-msgs6/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ignition-msgs6 -Version: 6.0.0 -Port-Version: 1 -Build-Depends: ignition-modularscripts, ignition-cmake2, ignition-math6, protobuf, tinyxml2 -Description: Middleware protobuf messages for robotics -Supports: !(arm|uwp) diff --git a/ports/ignition-msgs6/vcpkg.json b/ports/ignition-msgs6/vcpkg.json new file mode 100644 index 00000000000000..995f166e11f43a --- /dev/null +++ b/ports/ignition-msgs6/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "ignition-msgs6", + "version-string": "6.0.0", + "port-version": 2, + "description": "Middleware protobuf messages for robotics", + "supports": "!(arm | uwp)", + "dependencies": [ + "ignition-cmake2", + "ignition-math6", + "ignition-modularscripts", + "protobuf", + "tinyxml2" + ] +} diff --git a/ports/ignition-plugin1/CONTROL b/ports/ignition-plugin1/CONTROL deleted file mode 100644 index ba3aa4c312188f..00000000000000 --- a/ports/ignition-plugin1/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ignition-plugin1 -Version: 1.1.0 -Homepage: https://ignitionrobotics.org/libs/plugin -Build-Depends: dlfcn-win32 (windows|uwp), ignition-cmake2, ignition-modularscripts -Description: Library for registering plugin libraries and dynamically loading them at runtime diff --git a/ports/ignition-plugin1/vcpkg.json b/ports/ignition-plugin1/vcpkg.json new file mode 100644 index 00000000000000..58e42c8c1ef392 --- /dev/null +++ b/ports/ignition-plugin1/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "ignition-plugin1", + "version-string": "1.1.0", + "port-version": 1, + "description": "Library for registering plugin libraries and dynamically loading them at runtime", + "homepage": "https://ignitionrobotics.org/libs/plugin", + "dependencies": [ + { + "name": "dlfcn-win32", + "platform": "windows | uwp" + }, + "ignition-cmake2", + "ignition-modularscripts" + ] +} diff --git a/ports/ignition-transport4/CONTROL b/ports/ignition-transport4/CONTROL deleted file mode 100644 index 73f2eafd2f476d..00000000000000 --- a/ports/ignition-transport4/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ignition-transport4 -Version: 4.0.0-2 -Build-Depends: cppzmq, ignition-cmake0, ignition-modularscripts, ignition-msgs1, libuuid (!windows&!uwp), protobuf, zeromq -Description: Transport middleware for robotics diff --git a/ports/ignition-transport4/vcpkg.json b/ports/ignition-transport4/vcpkg.json new file mode 100644 index 00000000000000..4b315b85ebfe43 --- /dev/null +++ b/ports/ignition-transport4/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-transport4", + "version-string": "4.0.0", + "port-version": 3, + "description": "Transport middleware for robotics", + "dependencies": [ + "cppzmq", + "ignition-cmake0", + "ignition-modularscripts", + "ignition-msgs1", + { + "name": "libuuid", + "platform": "!windows & !uwp" + }, + "protobuf", + "zeromq" + ] +} diff --git a/ports/ignition-transport8/CONTROL b/ports/ignition-transport8/CONTROL deleted file mode 100644 index e28231c99864c1..00000000000000 --- a/ports/ignition-transport8/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ignition-transport8 -Version: 8.1.0 -Build-Depends: cppzmq, ignition-cmake2, ignition-msgs5, libuuid (!windows&!uwp), protobuf, sqlite3, zeromq -Description: Transport middleware for robotics diff --git a/ports/ignition-transport8/vcpkg.json b/ports/ignition-transport8/vcpkg.json new file mode 100644 index 00000000000000..6d9f810c006263 --- /dev/null +++ b/ports/ignition-transport8/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-transport8", + "version-string": "8.1.0", + "port-version": 1, + "description": "Transport middleware for robotics", + "dependencies": [ + "cppzmq", + "ignition-cmake2", + "ignition-msgs5", + { + "name": "libuuid", + "platform": "!windows & !uwp" + }, + "protobuf", + "sqlite3", + "zeromq" + ] +} diff --git a/ports/ignition-transport9/CONTROL b/ports/ignition-transport9/CONTROL deleted file mode 100644 index 5c8a26b35540f2..00000000000000 --- a/ports/ignition-transport9/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ignition-transport9 -Version: 9.0.0 -Build-Depends: cppzmq, ignition-cmake2, ignition-msgs6, libuuid (!windows&!uwp), protobuf, sqlite3, zeromq -Description: Transport middleware for robotics diff --git a/ports/ignition-transport9/vcpkg.json b/ports/ignition-transport9/vcpkg.json new file mode 100644 index 00000000000000..9e9147c0d68982 --- /dev/null +++ b/ports/ignition-transport9/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "ignition-transport9", + "version-string": "9.0.0", + "port-version": 1, + "description": "Transport middleware for robotics", + "dependencies": [ + "cppzmq", + "ignition-cmake2", + "ignition-msgs6", + { + "name": "libuuid", + "platform": "!windows & !uwp" + }, + "protobuf", + "sqlite3", + "zeromq" + ] +} diff --git a/ports/ilmbase/CONTROL b/ports/ilmbase/CONTROL deleted file mode 100644 index 51ea5dffc2bd27..00000000000000 --- a/ports/ilmbase/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ilmbase -Version: 2.3.0 -Build-Depends: openexr -Description: empty package, linking to newer one diff --git a/ports/ilmbase/vcpkg.json b/ports/ilmbase/vcpkg.json new file mode 100644 index 00000000000000..9b09a3c7b6d375 --- /dev/null +++ b/ports/ilmbase/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "ilmbase", + "version-string": "2.3.0", + "port-version": 1, + "description": "empty package, linking to newer one", + "dependencies": [ + "openexr" + ] +} diff --git a/ports/imgui-sfml/CONTROL b/ports/imgui-sfml/CONTROL deleted file mode 100644 index a792691ad5a789..00000000000000 --- a/ports/imgui-sfml/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: imgui-sfml -Version: 2.1-2 -Homepage: https://github.com/eliasdaler/imgui-sfml -Description: ImGui binding for use with SFML -Build-Depends: sfml, imgui, opengl diff --git a/ports/imgui-sfml/vcpkg.json b/ports/imgui-sfml/vcpkg.json new file mode 100644 index 00000000000000..e12799de8cd36b --- /dev/null +++ b/ports/imgui-sfml/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "imgui-sfml", + "version-string": "2.1", + "port-version": 3, + "description": "ImGui binding for use with SFML", + "homepage": "https://github.com/eliasdaler/imgui-sfml", + "dependencies": [ + "imgui", + "opengl", + "sfml" + ] +} diff --git a/ports/inih/CONTROL b/ports/inih/CONTROL deleted file mode 100644 index 8f54f04edeec45..00000000000000 --- a/ports/inih/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: inih -Version: 51 -Description: Simple .INI file parser diff --git a/ports/inih/vcpkg.json b/ports/inih/vcpkg.json new file mode 100644 index 00000000000000..5b137dcba4bc8c --- /dev/null +++ b/ports/inih/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "inih", + "version-string": "51", + "port-version": 1, + "description": "Simple .INI file parser" +} diff --git a/ports/iniparser/CONTROL b/ports/iniparser/CONTROL deleted file mode 100644 index ee5f47c00d28ff..00000000000000 --- a/ports/iniparser/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: iniparser -Version: 2020-04-06 -Homepage: ndevilla.free.fr/iniparser -Description: C library for parsing INI-style files diff --git a/ports/iniparser/vcpkg.json b/ports/iniparser/vcpkg.json new file mode 100644 index 00000000000000..a5acd226bd1c4a --- /dev/null +++ b/ports/iniparser/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "iniparser", + "version-string": "2020-04-06", + "port-version": 1, + "description": "C library for parsing INI-style files", + "homepage": "ndevilla.free.fr/iniparser" +} diff --git a/ports/intel-ipsec/CONTROL b/ports/intel-ipsec/CONTROL deleted file mode 100644 index c5b495a37b2172..00000000000000 --- a/ports/intel-ipsec/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: intel-ipsec -Version: 0.52-1 -Description: Intel(R) Multi-Buffer Crypto for IPsec Library diff --git a/ports/intel-ipsec/vcpkg.json b/ports/intel-ipsec/vcpkg.json new file mode 100644 index 00000000000000..eb8da35ce0d1b4 --- /dev/null +++ b/ports/intel-ipsec/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "intel-ipsec", + "version-string": "0.52", + "port-version": 2, + "description": "Intel(R) Multi-Buffer Crypto for IPsec Library" +} diff --git a/ports/intelrdfpmathlib/CONTROL b/ports/intelrdfpmathlib/CONTROL deleted file mode 100644 index c5c1cd07134bf8..00000000000000 --- a/ports/intelrdfpmathlib/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: intelrdfpmathlib -Version: 20U2-1 -Description: Intel(R) Decimal Floating-Point Math Library diff --git a/ports/intelrdfpmathlib/vcpkg.json b/ports/intelrdfpmathlib/vcpkg.json new file mode 100644 index 00000000000000..661c295ad92e56 --- /dev/null +++ b/ports/intelrdfpmathlib/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "intelrdfpmathlib", + "version-string": "20U2", + "port-version": 2, + "description": "Intel(R) Decimal Floating-Point Math Library" +} diff --git a/ports/irrlicht/CONTROL b/ports/irrlicht/CONTROL deleted file mode 100644 index 5161a33b2671d0..00000000000000 --- a/ports/irrlicht/CONTROL +++ /dev/null @@ -1,16 +0,0 @@ -Source: irrlicht -Version: 1.8.4 -Port-Version: 11 -Homepage: http://irrlicht.sourceforge.net -Description: The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers. -Build-Depends: zlib, libpng, bzip2, libjpeg-turbo, vcpkg-cmake, vcpkg-cmake-config -Supports: !(arm|uwp) - -Feature: unicode -Description: Support unicode path on windows - -Feature: fast-fpu -Description: Enable fast maths (at the expense of precision) - -Feature: tools -Description: Build the Tools FileToHeader, FontTool, GUIEditor and MeshConverter diff --git a/ports/irrlicht/vcpkg.json b/ports/irrlicht/vcpkg.json new file mode 100644 index 00000000000000..2f348b948e8240 --- /dev/null +++ b/ports/irrlicht/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "irrlicht", + "version-string": "1.8.4", + "port-version": 12, + "description": "The Irrlicht Engine is an open source realtime 3D engine written in C++. It is cross-platform, using D3D, OpenGL and its own software renderers.", + "homepage": "http://irrlicht.sourceforge.net", + "supports": "!(arm | uwp)", + "dependencies": [ + "bzip2", + "libjpeg-turbo", + "libpng", + "vcpkg-cmake", + "vcpkg-cmake-config", + "zlib" + ], + "features": { + "fast-fpu": { + "description": "Enable fast maths (at the expense of precision)" + }, + "tools": { + "description": "Build the Tools FileToHeader, FontTool, GUIEditor and MeshConverter" + }, + "unicode": { + "description": "Support unicode path on windows" + } + } +} diff --git a/ports/isal/CONTROL b/ports/isal/CONTROL deleted file mode 100644 index e478ee553c482a..00000000000000 --- a/ports/isal/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: isal -Version: 2.25.0 -Description: Intel(R) Intelligent Storage Acceleration Library - diff --git a/ports/isal/vcpkg.json b/ports/isal/vcpkg.json new file mode 100644 index 00000000000000..7a18c00957096e --- /dev/null +++ b/ports/isal/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "isal", + "version-string": "2.25.0", + "port-version": 1, + "description": "Intel(R) Intelligent Storage Acceleration Library" +} diff --git a/ports/ismrmrd/CONTROL b/ports/ismrmrd/CONTROL deleted file mode 100644 index 2fc4c5d1463087..00000000000000 --- a/ports/ismrmrd/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ismrmrd -Version: 1.5.0 -Description: ISMRM Raw Data Format -Build-Depends: pugixml, hdf5, boost, fftw3 -Homepage: https://github.com/ismrmrd/ismrmrd \ No newline at end of file diff --git a/ports/ismrmrd/vcpkg.json b/ports/ismrmrd/vcpkg.json new file mode 100644 index 00000000000000..27514f617e68f8 --- /dev/null +++ b/ports/ismrmrd/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "ismrmrd", + "version-string": "1.5.0", + "port-version": 1, + "description": "ISMRM Raw Data Format", + "homepage": "https://github.com/ismrmrd/ismrmrd", + "dependencies": [ + "boost", + "fftw3", + "hdf5", + "pugixml" + ] +} diff --git a/ports/jansson/CONTROL b/ports/jansson/CONTROL deleted file mode 100644 index 333b70108ad152..00000000000000 --- a/ports/jansson/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: jansson -Version: 2.13.1 -Homepage: https://github.com/akheron/jansson -Description: Jansson is a C library for encoding, decoding and manipulating JSON data diff --git a/ports/jansson/vcpkg.json b/ports/jansson/vcpkg.json new file mode 100644 index 00000000000000..d494c8d5df602f --- /dev/null +++ b/ports/jansson/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jansson", + "version-string": "2.13.1", + "port-version": 1, + "description": "Jansson is a C library for encoding, decoding and manipulating JSON data", + "homepage": "https://github.com/akheron/jansson" +} diff --git a/ports/jbig2dec/CONTROL b/ports/jbig2dec/CONTROL deleted file mode 100644 index d4e1939e282d86..00000000000000 --- a/ports/jbig2dec/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: jbig2dec -Version: 0.19 -Homepage: https://github.com/ArtifexSoftware/jbig2dec -Description: a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later. diff --git a/ports/jbig2dec/vcpkg.json b/ports/jbig2dec/vcpkg.json new file mode 100644 index 00000000000000..a4f145f69ccc47 --- /dev/null +++ b/ports/jbig2dec/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jbig2dec", + "version-string": "0.19", + "port-version": 1, + "description": "a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.", + "homepage": "https://github.com/ArtifexSoftware/jbig2dec" +} diff --git a/ports/jbigkit/CONTROL b/ports/jbigkit/CONTROL deleted file mode 100644 index c1c76a89c7c675..00000000000000 --- a/ports/jbigkit/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: jbigkit -Version: 2.1-4 -Homepage: https://www.cl.cam.ac.uk/~mgk25/jbigkit -Description: A software implementation of the JBIG1 data compression standard (ITU-T T.82) diff --git a/ports/jbigkit/vcpkg.json b/ports/jbigkit/vcpkg.json new file mode 100644 index 00000000000000..1498be4fa7fc92 --- /dev/null +++ b/ports/jbigkit/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jbigkit", + "version-string": "2.1", + "port-version": 5, + "description": "A software implementation of the JBIG1 data compression standard (ITU-T T.82)", + "homepage": "https://www.cl.cam.ac.uk/~mgk25/jbigkit" +} diff --git a/ports/jemalloc/CONTROL b/ports/jemalloc/CONTROL deleted file mode 100644 index 3f6be44a544c71..00000000000000 --- a/ports/jemalloc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: jemalloc -Version: 4.3.1-4 -Homepage: https://github.com/jemalloc/jemalloc-cmake -Description: jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support -Build-Depends: diff --git a/ports/jemalloc/vcpkg.json b/ports/jemalloc/vcpkg.json new file mode 100644 index 00000000000000..c23bdcaa803915 --- /dev/null +++ b/ports/jemalloc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jemalloc", + "version-string": "4.3.1", + "port-version": 5, + "description": "jemalloc is a general purpose malloc(3) implementation that emphasizes fragmentation avoidance and scalable concurrency support", + "homepage": "https://github.com/jemalloc/jemalloc-cmake" +} diff --git a/ports/jinja2cpplight/CONTROL b/ports/jinja2cpplight/CONTROL deleted file mode 100644 index f918eb28f5a1f3..00000000000000 --- a/ports/jinja2cpplight/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: jinja2cpplight -Version: 2018-05-08 -Homepage: https://github.com/hughperkins/Jinja2CppLight -Description: (very) lightweight version of Jinja2 for C++, Lightweight templating engine for C++, based on Jinja2. -Supports: !uwp \ No newline at end of file diff --git a/ports/jinja2cpplight/vcpkg.json b/ports/jinja2cpplight/vcpkg.json new file mode 100644 index 00000000000000..004282a82947ed --- /dev/null +++ b/ports/jinja2cpplight/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "jinja2cpplight", + "version-string": "2018-05-08", + "port-version": 1, + "description": "(very) lightweight version of Jinja2 for C++, Lightweight templating engine for C++, based on Jinja2.", + "homepage": "https://github.com/hughperkins/Jinja2CppLight", + "supports": "!uwp" +} diff --git a/ports/josuttis-jthread/CONTROL b/ports/josuttis-jthread/CONTROL deleted file mode 100644 index 8a0fc3c58d6608..00000000000000 --- a/ports/josuttis-jthread/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: josuttis-jthread -Version: 2020-07-21 -Port-Version: 1 -Homepage: https://github.com/josuttis/jthread -Description: C++ class for a joining and cooperative interruptible thread (std::jthread) with stop_token helper diff --git a/ports/josuttis-jthread/vcpkg.json b/ports/josuttis-jthread/vcpkg.json new file mode 100644 index 00000000000000..565f8b4e3794f7 --- /dev/null +++ b/ports/josuttis-jthread/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "josuttis-jthread", + "version-string": "2020-07-21", + "port-version": 2, + "description": "C++ class for a joining and cooperative interruptible thread (std::jthread) with stop_token helper", + "homepage": "https://github.com/josuttis/jthread" +} diff --git a/ports/jsmn/CONTROL b/ports/jsmn/CONTROL deleted file mode 100644 index b19e265858e0bc..00000000000000 --- a/ports/jsmn/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: jsmn -Version: 2019-04-27 -Description: A minimalistic JSON parser in C. diff --git a/ports/jsmn/vcpkg.json b/ports/jsmn/vcpkg.json new file mode 100644 index 00000000000000..96956d18d2f735 --- /dev/null +++ b/ports/jsmn/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "jsmn", + "version-string": "2019-04-27", + "port-version": 1, + "description": "A minimalistic JSON parser in C." +} diff --git a/ports/json-c/CONTROL b/ports/json-c/CONTROL deleted file mode 100644 index 3b9076c8cf2f77..00000000000000 --- a/ports/json-c/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: json-c -Version: 2019-09-10 -Port-Version: 1 -Description: A JSON implementation in C -Homepage: https://github.com/json-c/json-c diff --git a/ports/json-c/vcpkg.json b/ports/json-c/vcpkg.json new file mode 100644 index 00000000000000..ff61b336e01403 --- /dev/null +++ b/ports/json-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "json-c", + "version-string": "2019-09-10", + "port-version": 2, + "description": "A JSON implementation in C", + "homepage": "https://github.com/json-c/json-c" +} diff --git a/ports/json-schema-validator/CONTROL b/ports/json-schema-validator/CONTROL deleted file mode 100644 index a602b1dec7e4d3..00000000000000 --- a/ports/json-schema-validator/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: json-schema-validator -Version: 2.1.0 -Homepage: https://github.com/pboettch/json-schema-validator -Description: This is a C++ library for validating JSON documents based on a JSON Schema. This validator is based on nlohmann json library. -Build-Depends: nlohmann-json[core] diff --git a/ports/json-schema-validator/vcpkg.json b/ports/json-schema-validator/vcpkg.json new file mode 100644 index 00000000000000..387afe10938ecb --- /dev/null +++ b/ports/json-schema-validator/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "json-schema-validator", + "version-string": "2.1.0", + "port-version": 1, + "description": "This is a C++ library for validating JSON documents based on a JSON Schema. This validator is based on nlohmann json library.", + "homepage": "https://github.com/pboettch/json-schema-validator", + "dependencies": [ + { + "name": "nlohmann-json", + "default-features": false + } + ] +} diff --git a/ports/json-spirit/CONTROL b/ports/json-spirit/CONTROL deleted file mode 100644 index e2b1d807973b21..00000000000000 --- a/ports/json-spirit/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: json-spirit -Version: 4.1.0-1 -Description: json parser using boost library -Build-Depends: boost-config, boost-integer, boost-smart-ptr, boost-variant, boost-spirit diff --git a/ports/json-spirit/vcpkg.json b/ports/json-spirit/vcpkg.json new file mode 100644 index 00000000000000..35517305eca6bd --- /dev/null +++ b/ports/json-spirit/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "json-spirit", + "version-string": "4.1.0", + "port-version": 2, + "description": "json parser using boost library", + "dependencies": [ + "boost-config", + "boost-integer", + "boost-smart-ptr", + "boost-spirit", + "boost-variant" + ] +} diff --git a/ports/json11/CONTROL b/ports/json11/CONTROL deleted file mode 100644 index 34cee37de0c59b..00000000000000 --- a/ports/json11/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: json11 -Version: 2017-06-20-2 -Description: json11 is a tiny JSON library for C++11, providing JSON parsing and serialization. diff --git a/ports/json11/vcpkg.json b/ports/json11/vcpkg.json new file mode 100644 index 00000000000000..f2aad6b8cbbcc4 --- /dev/null +++ b/ports/json11/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "json11", + "version-string": "2017-06-20", + "port-version": 3, + "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization." +} diff --git a/ports/json5-parser/CONTROL b/ports/json5-parser/CONTROL deleted file mode 100644 index 99041602192373..00000000000000 --- a/ports/json5-parser/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: json5-parser -Version: 1.0.0 -Port-Version: 2 -Homepage: https://github.com/Caltech-IPAC/json5_parser -Description: An enhancement of the JSON Spirit C++ library to understand json5. -Build-Depends: boost-spirit diff --git a/ports/json5-parser/vcpkg.json b/ports/json5-parser/vcpkg.json new file mode 100644 index 00000000000000..13c1e6bb3568de --- /dev/null +++ b/ports/json5-parser/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "json5-parser", + "version-string": "1.0.0", + "port-version": 3, + "description": "An enhancement of the JSON Spirit C++ library to understand json5.", + "homepage": "https://github.com/Caltech-IPAC/json5_parser", + "dependencies": [ + "boost-spirit" + ] +} diff --git a/ports/jsoncons/CONTROL b/ports/jsoncons/CONTROL deleted file mode 100644 index c3b550b10d6a5e..00000000000000 --- a/ports/jsoncons/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: jsoncons -Version: 0.165.0 -Description: A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON -Homepage: https://github.com/danielaparker/jsoncons diff --git a/ports/jsoncons/vcpkg.json b/ports/jsoncons/vcpkg.json new file mode 100644 index 00000000000000..84fea30327de90 --- /dev/null +++ b/ports/jsoncons/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jsoncons", + "version-string": "0.165.0", + "port-version": 1, + "description": "A C++, header-only library for constructing JSON and JSON-like text and binary data formats, with JSON Pointer, JSON Patch, JSON Schema, JSONPath, JMESPath, CSV, MessagePack, CBOR, BSON, UBJSON", + "homepage": "https://github.com/danielaparker/jsoncons" +} diff --git a/ports/jsoncpp/CONTROL b/ports/jsoncpp/CONTROL deleted file mode 100644 index 012e45b9d22354..00000000000000 --- a/ports/jsoncpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: jsoncpp -Version: 1.9.4 -Homepage: https://github.com/open-source-parsers/jsoncpp -Description: jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human. diff --git a/ports/jsoncpp/vcpkg.json b/ports/jsoncpp/vcpkg.json new file mode 100644 index 00000000000000..c334a11c112b09 --- /dev/null +++ b/ports/jsoncpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "jsoncpp", + "version-string": "1.9.4", + "port-version": 1, + "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.", + "homepage": "https://github.com/open-source-parsers/jsoncpp" +} diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL deleted file mode 100644 index 0708225310efb1..00000000000000 --- a/ports/jsonnet/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: jsonnet -Version: 0.16.0 -Port-Version: 2 -Homepage: https://github.com/google/jsonnet -Description: Jsonnet - The data templating language -Build-Depends: nlohmann-json diff --git a/ports/jsonnet/vcpkg.json b/ports/jsonnet/vcpkg.json new file mode 100644 index 00000000000000..fd4541d3f8c2e6 --- /dev/null +++ b/ports/jsonnet/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "jsonnet", + "version-string": "0.16.0", + "port-version": 3, + "description": "Jsonnet - The data templating language", + "homepage": "https://github.com/google/jsonnet", + "dependencies": [ + "nlohmann-json" + ] +} diff --git a/ports/kangaru/CONTROL b/ports/kangaru/CONTROL deleted file mode 100644 index 3ea64eb81d8721..00000000000000 --- a/ports/kangaru/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: kangaru -Version: 4.2.4 -Description: A dependency injection container for C++11, C++14 and later diff --git a/ports/kangaru/vcpkg.json b/ports/kangaru/vcpkg.json new file mode 100644 index 00000000000000..411c67133b602a --- /dev/null +++ b/ports/kangaru/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "kangaru", + "version-string": "4.2.4", + "port-version": 1, + "description": "A dependency injection container for C++11, C++14 and later" +} diff --git a/ports/kcp/CONTROL b/ports/kcp/CONTROL deleted file mode 100644 index 0573eb3cf4221d..00000000000000 --- a/ports/kcp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kcp -Version: 2019-09-20 -Description: A fast and reliable ARQ protocol -Homepage: https://github.com/skywind3000/kcp diff --git a/ports/kcp/vcpkg.json b/ports/kcp/vcpkg.json new file mode 100644 index 00000000000000..edc61d2307892a --- /dev/null +++ b/ports/kcp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kcp", + "version-string": "2019-09-20", + "port-version": 1, + "description": "A fast and reliable ARQ protocol", + "homepage": "https://github.com/skywind3000/kcp" +} diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL deleted file mode 100644 index edcba960da3b51..00000000000000 --- a/ports/kd-soap/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kd-soap -Version: 1.9.0 -Homepage: https://www.kdab.com/products/kd-soap -Description: A Qt-based client-side and server-side SOAP component -Build-Depends: qt5-base[core] diff --git a/ports/kd-soap/vcpkg.json b/ports/kd-soap/vcpkg.json new file mode 100644 index 00000000000000..3cd11e0e42b4c7 --- /dev/null +++ b/ports/kd-soap/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "kd-soap", + "version-string": "1.9.0", + "port-version": 1, + "description": "A Qt-based client-side and server-side SOAP component", + "homepage": "https://www.kdab.com/products/kd-soap", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/kfr/CONTROL b/ports/kfr/CONTROL deleted file mode 100644 index 985ba86bf82575..00000000000000 --- a/ports/kfr/CONTROL +++ /dev/null @@ -1,15 +0,0 @@ -Source: kfr -Version: 2020-06-15 -Description: Fast, modern C++ DSP framework -Homepage: https://www.kfr.dev/ -Supports: !(arm|linux) - -Feature: capi -Description: Enable C API build -Build-Depends: kfr[dft] - -Feature: dft -Description: Enable DFT and related algorithms - -Feature: dft-np -Description: Enable Non-power of 2 DFT diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json new file mode 100644 index 00000000000000..25d8c74bd4f37d --- /dev/null +++ b/ports/kfr/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "kfr", + "version-string": "2020-06-15", + "port-version": 1, + "description": "Fast, modern C++ DSP framework", + "homepage": "https://www.kfr.dev/", + "supports": "!(arm | linux)", + "features": { + "capi": { + "description": "Enable C API build", + "dependencies": [ + { + "name": "kfr", + "features": [ + "dft" + ] + } + ] + }, + "dft": { + "description": "Enable DFT and related algorithms" + }, + "dft-np": { + "description": "Enable Non-power of 2 DFT" + } + } +} diff --git a/ports/kinectsdk2/CONTROL b/ports/kinectsdk2/CONTROL deleted file mode 100644 index d92784df46cf6f..00000000000000 --- a/ports/kinectsdk2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kinectsdk2 -Version: 2.0-2 -Description: Kinect for Windows SDK for Kinect v2 sensor. -Supports: !arm \ No newline at end of file diff --git a/ports/kinectsdk2/vcpkg.json b/ports/kinectsdk2/vcpkg.json new file mode 100644 index 00000000000000..5b065d28f6a6e2 --- /dev/null +++ b/ports/kinectsdk2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kinectsdk2", + "version-string": "2.0", + "port-version": 3, + "description": "Kinect for Windows SDK for Kinect v2 sensor.", + "supports": "!arm" +} diff --git a/ports/kissfft/CONTROL b/ports/kissfft/CONTROL deleted file mode 100644 index 0c4f0f6a8b46e4..00000000000000 --- a/ports/kissfft/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kissfft -Version: 2020-03-30 -Homepage: https://github.com/mborgerding/kissfft -Description: A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid diff --git a/ports/kissfft/vcpkg.json b/ports/kissfft/vcpkg.json new file mode 100644 index 00000000000000..b3e0193da6ada6 --- /dev/null +++ b/ports/kissfft/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kissfft", + "version-string": "2020-03-30", + "port-version": 1, + "description": "A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid", + "homepage": "https://github.com/mborgerding/kissfft" +} diff --git a/ports/kubazip/CONTROL b/ports/kubazip/CONTROL deleted file mode 100644 index d19677ff4a1f25..00000000000000 --- a/ports/kubazip/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kubazip -Version: 0.1.19 -Homepage: https://github.com/kuba--/zip -Description: A portable, simple zip library written in C diff --git a/ports/kubazip/vcpkg.json b/ports/kubazip/vcpkg.json new file mode 100644 index 00000000000000..1eecb26ba311de --- /dev/null +++ b/ports/kubazip/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kubazip", + "version-string": "0.1.19", + "port-version": 1, + "description": "A portable, simple zip library written in C", + "homepage": "https://github.com/kuba--/zip" +} diff --git a/ports/kuku/CONTROL b/ports/kuku/CONTROL deleted file mode 100644 index 27766063a1898a..00000000000000 --- a/ports/kuku/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: kuku -Version: 2.1 -Homepage: https://github.com/microsoft/Kuku -Description: Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft. diff --git a/ports/kuku/vcpkg.json b/ports/kuku/vcpkg.json new file mode 100644 index 00000000000000..2f7b13515cefff --- /dev/null +++ b/ports/kuku/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "kuku", + "version-string": "2.1", + "port-version": 1, + "description": "Kuku is a simple open-source (MIT licensed) cuckoo hashing library developed by the Cryptography and Privacy Research group at Microsoft.", + "homepage": "https://github.com/microsoft/Kuku" +} diff --git a/ports/kvasir-mpl/CONTROL b/ports/kvasir-mpl/CONTROL deleted file mode 100644 index 63b93df5fe594d..00000000000000 --- a/ports/kvasir-mpl/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: kvasir-mpl -Version: 2019-08-06 -Homepage: https://github.com/kvasir-io/mpl -Description: This library is part of the Kvasir project. Kvasir is a collection of zero cost statically checked libraries for resource constrained systems including microcontrollers. - -Feature: test -Description: Build with test - diff --git a/ports/kvasir-mpl/vcpkg.json b/ports/kvasir-mpl/vcpkg.json new file mode 100644 index 00000000000000..4d817575a72cb9 --- /dev/null +++ b/ports/kvasir-mpl/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kvasir-mpl", + "version-string": "2019-08-06", + "port-version": 1, + "description": "This library is part of the Kvasir project. Kvasir is a collection of zero cost statically checked libraries for resource constrained systems including microcontrollers.", + "homepage": "https://github.com/kvasir-io/mpl", + "features": { + "test": { + "description": "Build with test" + } + } +} diff --git a/ports/lapack/CONTROL b/ports/lapack/CONTROL deleted file mode 100644 index 6147ef3a807f8f..00000000000000 --- a/ports/lapack/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lapack -Version: 3 -Port-Version: 1 -Description: Metapackage for packages which provide LAPACK -Build-Depends: clapack(arm&windows), lapack-reference(!arm|!windows) diff --git a/ports/lapack/vcpkg.json b/ports/lapack/vcpkg.json new file mode 100644 index 00000000000000..49dbcfc2236863 --- /dev/null +++ b/ports/lapack/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "lapack", + "version-string": "3", + "port-version": 2, + "description": "Metapackage for packages which provide LAPACK", + "dependencies": [ + { + "name": "clapack", + "platform": "arm & windows" + }, + { + "name": "lapack-reference", + "platform": "!arm | !windows" + } + ] +} diff --git a/ports/lastools/CONTROL b/ports/lastools/CONTROL deleted file mode 100644 index dbeb69fc890b2b..00000000000000 --- a/ports/lastools/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lastools -Version: 2020-05-09 -Homepage: https://github.com/LAStools/LAStools -Description: LAStools: award-winning software for efficient LiDAR processing (with LASzip) -Supports: !uwp \ No newline at end of file diff --git a/ports/lastools/vcpkg.json b/ports/lastools/vcpkg.json new file mode 100644 index 00000000000000..4d54c1a813b939 --- /dev/null +++ b/ports/lastools/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "lastools", + "version-string": "2020-05-09", + "port-version": 1, + "description": "LAStools: award-winning software for efficient LiDAR processing (with LASzip)", + "homepage": "https://github.com/LAStools/LAStools", + "supports": "!uwp" +} diff --git a/ports/lazy-importer/CONTROL b/ports/lazy-importer/CONTROL deleted file mode 100644 index c46a768b000fd5..00000000000000 --- a/ports/lazy-importer/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: lazy-importer -Version: 2019-08-10 -Description: Library for importing functions from dlls in a hidden, reverse engineer unfriendly way -Homepage: https://github.com/JustasMasiulis/lazy_importer diff --git a/ports/lazy-importer/vcpkg.json b/ports/lazy-importer/vcpkg.json new file mode 100644 index 00000000000000..a543eee314ae58 --- /dev/null +++ b/ports/lazy-importer/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lazy-importer", + "version-string": "2019-08-10", + "port-version": 1, + "description": "Library for importing functions from dlls in a hidden, reverse engineer unfriendly way", + "homepage": "https://github.com/JustasMasiulis/lazy_importer" +} diff --git a/ports/lcms/CONTROL b/ports/lcms/CONTROL deleted file mode 100644 index e9de483c7c8bee..00000000000000 --- a/ports/lcms/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: lcms -Version: 2.12 -Homepage: https://github.com/mm2/Little-CMS -Description: Little CMS. diff --git a/ports/lcms/vcpkg.json b/ports/lcms/vcpkg.json new file mode 100644 index 00000000000000..0618ac8479d455 --- /dev/null +++ b/ports/lcms/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lcms", + "version-string": "2.12", + "port-version": 1, + "description": "Little CMS.", + "homepage": "https://github.com/mm2/Little-CMS" +} diff --git a/ports/lemon/CONTROL b/ports/lemon/CONTROL deleted file mode 100644 index 08b73936879b97..00000000000000 --- a/ports/lemon/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: lemon -Version: 0 -Description: Deprecated port, use liblemon instead -Build-Depends: liblemon diff --git a/ports/lemon/vcpkg.json b/ports/lemon/vcpkg.json new file mode 100644 index 00000000000000..b75102e5498d87 --- /dev/null +++ b/ports/lemon/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "lemon", + "version-string": "0", + "port-version": 1, + "description": "Deprecated port, use liblemon instead", + "dependencies": [ + "liblemon" + ] +} diff --git a/ports/leptonica/CONTROL b/ports/leptonica/CONTROL deleted file mode 100644 index b1b93cd19d721a..00000000000000 --- a/ports/leptonica/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: leptonica -Version: 1.80.0 -Port-Version: 2 -Homepage: https://github.com/DanBloomberg/leptonica -Description: An open source library containing software that is broadly useful for image processing and image analysis applications -Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib, libwebp, openjpeg diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json new file mode 100644 index 00000000000000..3a84db22a4b280 --- /dev/null +++ b/ports/leptonica/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "leptonica", + "version-string": "1.80.0", + "port-version": 3, + "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", + "homepage": "https://github.com/DanBloomberg/leptonica", + "dependencies": [ + "giflib", + "libjpeg-turbo", + "libpng", + "libwebp", + "openjpeg", + "tiff", + "zlib" + ] +} diff --git a/ports/lerc/CONTROL b/ports/lerc/CONTROL deleted file mode 100644 index 6be5d0a7542753..00000000000000 --- a/ports/lerc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lerc -Version: 2.2 -Port-Version: 1 -Homepage: https://github.com/Esri/lerc -Description: An open-source image or raster format which supports rapid encoding and decoding for any pixel type diff --git a/ports/lerc/vcpkg.json b/ports/lerc/vcpkg.json new file mode 100644 index 00000000000000..6772a248b35261 --- /dev/null +++ b/ports/lerc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lerc", + "version-string": "2.2", + "port-version": 2, + "description": "An open-source image or raster format which supports rapid encoding and decoding for any pixel type", + "homepage": "https://github.com/Esri/lerc" +} diff --git a/ports/lest/CONTROL b/ports/lest/CONTROL deleted file mode 100644 index e8eb03bd426fcf..00000000000000 --- a/ports/lest/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lest -Version: 1.35.1 -Port-Version: 1 -Description: A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant) -Homepage: https://github.com/martinmoene/lest diff --git a/ports/lest/vcpkg.json b/ports/lest/vcpkg.json new file mode 100644 index 00000000000000..f8b68ff7351350 --- /dev/null +++ b/ports/lest/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lest", + "version-string": "1.35.1", + "port-version": 2, + "description": "A modern, C++11-native, single-file header-only, tiny framework for unit-tests, TDD and BDD (includes C++98 variant)", + "homepage": "https://github.com/martinmoene/lest" +} diff --git a/ports/leveldb/CONTROL b/ports/leveldb/CONTROL deleted file mode 100644 index 1b1302f979dca7..00000000000000 --- a/ports/leveldb/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: leveldb -Version: 1.22-1 -Homepage: https://github.com/bitcoin-core/leveldb -Description: LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values. -Supports: !uwp \ No newline at end of file diff --git a/ports/leveldb/vcpkg.json b/ports/leveldb/vcpkg.json new file mode 100644 index 00000000000000..00df32a4f0d388 --- /dev/null +++ b/ports/leveldb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "leveldb", + "version-string": "1.22", + "port-version": 2, + "description": "LevelDB is a fast key-value storage library written at Google that provides an ordered mapping from string keys to string values.", + "homepage": "https://github.com/bitcoin-core/leveldb", + "supports": "!uwp" +} diff --git a/ports/libaaplus/CONTROL b/ports/libaaplus/CONTROL deleted file mode 100644 index 2d14f7e06d130a..00000000000000 --- a/ports/libaaplus/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libaaplus -Version: 2.12-1 -Description: libaaplus is an astronomical computations library by naughter software -Homepage: http://www.naughter.com/aa.html - -Feature: tools -Description: Build libaaplus tools \ No newline at end of file diff --git a/ports/libaaplus/vcpkg.json b/ports/libaaplus/vcpkg.json new file mode 100644 index 00000000000000..7bf35394570234 --- /dev/null +++ b/ports/libaaplus/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libaaplus", + "version-string": "2.12", + "port-version": 2, + "description": "libaaplus is an astronomical computations library by naughter software", + "homepage": "http://www.naughter.com/aa.html", + "features": { + "tools": { + "description": "Build libaaplus tools" + } + } +} diff --git a/ports/libaiff/CONTROL b/ports/libaiff/CONTROL deleted file mode 100644 index 889511a5cf602e..00000000000000 --- a/ports/libaiff/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libaiff -Version: 5.0-6 -Homepage: https://sourceforge.net/projects/aifftools -Description: LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features diff --git a/ports/libaiff/vcpkg.json b/ports/libaiff/vcpkg.json new file mode 100644 index 00000000000000..d8e0abb4cfb84c --- /dev/null +++ b/ports/libaiff/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libaiff", + "version-string": "5.0", + "port-version": 7, + "description": "LibAiff is an open-source library, providing C applications transparent read & write operations for Audio Interchange File Format (AIFF) files, with the goal of supporting all of its features", + "homepage": "https://sourceforge.net/projects/aifftools" +} diff --git a/ports/libassuan/CONTROL b/ports/libassuan/CONTROL deleted file mode 100644 index a82da4811b7418..00000000000000 --- a/ports/libassuan/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libassuan -Version: 2.5.3 -Port-Version: 1 -Homepage: https://gnupg.org/software/libassuan/index.html -Description: A library implementing the so-called Assuan protocol -Build-Depends: libgpg-error -Supports: !windows diff --git a/ports/libassuan/vcpkg.json b/ports/libassuan/vcpkg.json new file mode 100644 index 00000000000000..f7808864cacf31 --- /dev/null +++ b/ports/libassuan/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libassuan", + "version-string": "2.5.3", + "port-version": 2, + "description": "A library implementing the so-called Assuan protocol", + "homepage": "https://gnupg.org/software/libassuan/index.html", + "supports": "!windows", + "dependencies": [ + "libgpg-error" + ] +} diff --git a/ports/libbf/CONTROL b/ports/libbf/CONTROL deleted file mode 100644 index 35ee0fbcc1dffd..00000000000000 --- a/ports/libbf/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libbf -Version: 1.0.0-1 -Description: Bloom filters for C++11. \ No newline at end of file diff --git a/ports/libbf/vcpkg.json b/ports/libbf/vcpkg.json new file mode 100644 index 00000000000000..1b184fddf45f2d --- /dev/null +++ b/ports/libbf/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libbf", + "version-string": "1.0.0", + "port-version": 2, + "description": "Bloom filters for C++11." +} diff --git a/ports/libcds/CONTROL b/ports/libcds/CONTROL deleted file mode 100644 index 5c306231896c2c..00000000000000 --- a/ports/libcds/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libcds -Version: 2.3.3 -Build-Depends: boost-system, boost-thread -Homepage: https://github.com/khizmax/libcds -Description: a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR. diff --git a/ports/libcds/vcpkg.json b/ports/libcds/vcpkg.json new file mode 100644 index 00000000000000..2464e61ce2f500 --- /dev/null +++ b/ports/libcds/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libcds", + "version-string": "2.3.3", + "port-version": 1, + "description": "a collection of concurrent containers that don't require external (manual) synchronization for shared access, and safe memory reclamation (SMR) algorithms like Hazard Pointer and user-space RCU that is used as an epoch-based SMR.", + "homepage": "https://github.com/khizmax/libcds", + "dependencies": [ + "boost-system", + "boost-thread" + ] +} diff --git a/ports/libcerf/CONTROL b/ports/libcerf/CONTROL deleted file mode 100644 index 72b1324d346c59..00000000000000 --- a/ports/libcerf/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libcerf -Version: 1.13 -Description: A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions. -Homepage: https://jugit.fz-juelich.de/mlz/libcerf diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json new file mode 100644 index 00000000000000..73b60013ee8263 --- /dev/null +++ b/ports/libcerf/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libcerf", + "version-string": "1.13", + "port-version": 1, + "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.", + "homepage": "https://jugit.fz-juelich.de/mlz/libcerf" +} diff --git a/ports/libconfig/CONTROL b/ports/libconfig/CONTROL deleted file mode 100644 index a13a2c83d6316f..00000000000000 --- a/ports/libconfig/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libconfig -Version: 1.7.3 -Port-Version: 0 -Homepage: https://github.com/hyperrealm/libconfig -Description: C/C++ library for processing configuration files diff --git a/ports/libconfig/vcpkg.json b/ports/libconfig/vcpkg.json new file mode 100644 index 00000000000000..6acd72878ba263 --- /dev/null +++ b/ports/libconfig/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libconfig", + "version-string": "1.7.3", + "port-version": 1, + "description": "C/C++ library for processing configuration files", + "homepage": "https://github.com/hyperrealm/libconfig" +} diff --git a/ports/libconfuse/CONTROL b/ports/libconfuse/CONTROL deleted file mode 100644 index 15044cce3d63d3..00000000000000 --- a/ports/libconfuse/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libconfuse -Version: 2019-07-14 -Description: Small configuration file parser library for C -Homepage: https://github.com/martinh/libconfuse diff --git a/ports/libconfuse/vcpkg.json b/ports/libconfuse/vcpkg.json new file mode 100644 index 00000000000000..2a9a604f5775cf --- /dev/null +++ b/ports/libconfuse/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libconfuse", + "version-string": "2019-07-14", + "port-version": 1, + "description": "Small configuration file parser library for C", + "homepage": "https://github.com/martinh/libconfuse" +} diff --git a/ports/libcuckoo/CONTROL b/ports/libcuckoo/CONTROL deleted file mode 100644 index e4f4807ee7ac64..00000000000000 --- a/ports/libcuckoo/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libcuckoo -Version: 0.3 -Description: A high-performance, concurrent hash table -Homepage: https://github.com/efficient/libcuckoo diff --git a/ports/libcuckoo/vcpkg.json b/ports/libcuckoo/vcpkg.json new file mode 100644 index 00000000000000..49f4312eac8c09 --- /dev/null +++ b/ports/libcuckoo/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libcuckoo", + "version-string": "0.3", + "port-version": 1, + "description": "A high-performance, concurrent hash table", + "homepage": "https://github.com/efficient/libcuckoo" +} diff --git a/ports/libdatrie/CONTROL b/ports/libdatrie/CONTROL deleted file mode 100644 index ddcdf9972eb6e4..00000000000000 --- a/ports/libdatrie/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libdatrie -Version: 0.2.10-3 -Homepage: https://linux.thai.net/pub/ThaiLinux/software/libthai -Description: implementation of double-array structure for representing trie -Build-Depends: libiconv diff --git a/ports/libdatrie/vcpkg.json b/ports/libdatrie/vcpkg.json new file mode 100644 index 00000000000000..b9f1f545705060 --- /dev/null +++ b/ports/libdatrie/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libdatrie", + "version-string": "0.2.10", + "port-version": 4, + "description": "implementation of double-array structure for representing trie", + "homepage": "https://linux.thai.net/pub/ThaiLinux/software/libthai", + "dependencies": [ + "libiconv" + ] +} diff --git a/ports/libde265/CONTROL b/ports/libde265/CONTROL deleted file mode 100644 index 898e0fe128ffc7..00000000000000 --- a/ports/libde265/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libde265 -Version: 1.0.8 -Homepage: https://www.libde265.org/ -Description: Open h.265 video codec implementation. -Supports: !(arm|uwp) diff --git a/ports/libde265/vcpkg.json b/ports/libde265/vcpkg.json new file mode 100644 index 00000000000000..a239794f5f6ff6 --- /dev/null +++ b/ports/libde265/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libde265", + "version-string": "1.0.8", + "port-version": 1, + "description": "Open h.265 video codec implementation.", + "homepage": "https://www.libde265.org/", + "supports": "!(arm | uwp)" +} diff --git a/ports/libdisasm/CONTROL b/ports/libdisasm/CONTROL deleted file mode 100644 index 1a09c870ea370c..00000000000000 --- a/ports/libdisasm/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libdisasm -Version: 0.23-7 -Homepage: https://sourceforge.net/projects/bastard -Description: x86 Disassembler Library. diff --git a/ports/libdisasm/vcpkg.json b/ports/libdisasm/vcpkg.json new file mode 100644 index 00000000000000..ef5cb7b0672054 --- /dev/null +++ b/ports/libdisasm/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libdisasm", + "version-string": "0.23", + "port-version": 8, + "description": "x86 Disassembler Library.", + "homepage": "https://sourceforge.net/projects/bastard" +} diff --git a/ports/libdivide/CONTROL b/ports/libdivide/CONTROL deleted file mode 100644 index 9d2a4adbc9add3..00000000000000 --- a/ports/libdivide/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libdivide -Version: 4.0.0 -Homepage: https://github.com/ridiculousfish/libdivide -Description: libdivide.h is a header-only C/C++ library for optimizing integer division. - -Feature: test -Description: Build test \ No newline at end of file diff --git a/ports/libdivide/vcpkg.json b/ports/libdivide/vcpkg.json new file mode 100644 index 00000000000000..5ae81457514ae0 --- /dev/null +++ b/ports/libdivide/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libdivide", + "version-string": "4.0.0", + "port-version": 1, + "description": "libdivide.h is a header-only C/C++ library for optimizing integer division.", + "homepage": "https://github.com/ridiculousfish/libdivide", + "features": { + "test": { + "description": "Build test" + } + } +} diff --git a/ports/libdshowcapture/CONTROL b/ports/libdshowcapture/CONTROL deleted file mode 100644 index 3d88262c8f9794..00000000000000 --- a/ports/libdshowcapture/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libdshowcapture -Version: 0.6.0-1 -Description: Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows. diff --git a/ports/libdshowcapture/vcpkg.json b/ports/libdshowcapture/vcpkg.json new file mode 100644 index 00000000000000..ca807e319aa055 --- /dev/null +++ b/ports/libdshowcapture/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libdshowcapture", + "version-string": "0.6.0", + "port-version": 2, + "description": "Free and Open Source C++11 Library for capturing DirectShow video/audio devices on windows." +} diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL deleted file mode 100644 index b51c55e9f67329..00000000000000 --- a/ports/libevent/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: libevent -Version: 2.1.12 -Port-Version: 1 -Homepage: https://github.com/libevent/libevent -Description: An event notification library -Supports: !uwp -Default-Features: thread - -Feature: openssl -Description: Support for openssl -Build-Depends: openssl, libevent[thread] - -Feature: thread -Description: Support for thread diff --git a/ports/libevent/vcpkg.json b/ports/libevent/vcpkg.json new file mode 100644 index 00000000000000..1ddfa7a44f5ec9 --- /dev/null +++ b/ports/libevent/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "libevent", + "version-string": "2.1.12", + "port-version": 2, + "description": "An event notification library", + "homepage": "https://github.com/libevent/libevent", + "supports": "!uwp", + "default-features": [ + "thread" + ], + "features": { + "openssl": { + "description": "Support for openssl", + "dependencies": [ + { + "name": "libevent", + "features": [ + "thread" + ] + }, + "openssl" + ] + }, + "thread": { + "description": "Support for thread" + } + } +} diff --git a/ports/libevhtp/CONTROL b/ports/libevhtp/CONTROL deleted file mode 100644 index 1653bf25d2d4f7..00000000000000 --- a/ports/libevhtp/CONTROL +++ /dev/null @@ -1,16 +0,0 @@ -Source: libevhtp -Version: 1.2.18 -Homepage: https://github.com/criticalstack/libevhtp -Build-Depends: libevent -Description: Libevhtp was created as a replacement API for Libevent's current HTTP API. - -Feature: openssl -Description: Support SSL for libevhtp -Build-Depends: openssl - -Feature: thread -Description: Support thread for libevhtp - -Feature: regex -Description: Support oniguruma for libevhtp -Build-Depends: oniguruma \ No newline at end of file diff --git a/ports/libevhtp/vcpkg.json b/ports/libevhtp/vcpkg.json new file mode 100644 index 00000000000000..5d95f7901669ff --- /dev/null +++ b/ports/libevhtp/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "libevhtp", + "version-string": "1.2.18", + "port-version": 1, + "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.", + "homepage": "https://github.com/criticalstack/libevhtp", + "dependencies": [ + "libevent" + ], + "features": { + "openssl": { + "description": "Support SSL for libevhtp", + "dependencies": [ + "openssl" + ] + }, + "regex": { + "description": "Support oniguruma for libevhtp", + "dependencies": [ + "oniguruma" + ] + }, + "thread": { + "description": "Support thread for libevhtp" + } + } +} diff --git a/ports/libexif/CONTROL b/ports/libexif/CONTROL deleted file mode 100644 index 7bf6d64b6de8ed..00000000000000 --- a/ports/libexif/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libexif -Version: 0.6.22 -Homepage: https://libexif.github.io/ -Description: a library for parsing, editing, and saving EXIF data -Supports: !uwp diff --git a/ports/libexif/vcpkg.json b/ports/libexif/vcpkg.json new file mode 100644 index 00000000000000..d27752d4b700dd --- /dev/null +++ b/ports/libexif/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libexif", + "version-string": "0.6.22", + "port-version": 1, + "description": "a library for parsing, editing, and saving EXIF data", + "homepage": "https://libexif.github.io/", + "supports": "!uwp" +} diff --git a/ports/libfabric/CONTROL b/ports/libfabric/CONTROL deleted file mode 100644 index 267fb717acaf7b..00000000000000 --- a/ports/libfabric/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libfabric -Version: 1.8.1-1 -Description: The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release. -Homepage: https://github.com/ofiwg/libfabric -Build-Depends: networkdirect-sdk (windows) -Supports: windows&x64&(!static) \ No newline at end of file diff --git a/ports/libfabric/vcpkg.json b/ports/libfabric/vcpkg.json new file mode 100644 index 00000000000000..c482a6ea69862f --- /dev/null +++ b/ports/libfabric/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libfabric", + "version-string": "1.8.1", + "port-version": 2, + "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.", + "homepage": "https://github.com/ofiwg/libfabric", + "supports": "windows & x64 & !static", + "dependencies": [ + { + "name": "networkdirect-sdk", + "platform": "windows" + } + ] +} diff --git a/ports/libflac/CONTROL b/ports/libflac/CONTROL deleted file mode 100644 index 4af8f1576b05d7..00000000000000 --- a/ports/libflac/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: libflac -Version: 1.3.3 -Port-Version: 5 -Homepage: https://xiph.org/flac/ -Description: Library for manipulating FLAC files -Build-Depends: libogg - -Feature: asm -Description: Use any assembly optimization routines diff --git a/ports/libflac/vcpkg.json b/ports/libflac/vcpkg.json new file mode 100644 index 00000000000000..07073d8020775e --- /dev/null +++ b/ports/libflac/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libflac", + "version-string": "1.3.3", + "port-version": 6, + "description": "Library for manipulating FLAC files", + "homepage": "https://xiph.org/flac/", + "dependencies": [ + "libogg" + ], + "features": { + "asm": { + "description": "Use any assembly optimization routines" + } + } +} diff --git a/ports/libfreenect2/CONTROL b/ports/libfreenect2/CONTROL deleted file mode 100644 index 3618d2a7395a56..00000000000000 --- a/ports/libfreenect2/CONTROL +++ /dev/null @@ -1,15 +0,0 @@ -Source: libfreenect2 -Version: 0.2.0 -Port-Version: 5 -Build-Depends: libusb, libjpeg-turbo -Homepage: https://github.com/OpenKinect/libfreenect2 -Description: Open source drivers for the Kinect for Windows v2 device -Default-Features: opengl - -Feature: opengl -Description: OpenGL support for libfreenect2 -Build-Depends: opengl, glfw3 - -Feature: opencl -Description: OpenCL support for libfreenect2 -Build-Depends: opencl diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json new file mode 100644 index 00000000000000..a68b6564e4458d --- /dev/null +++ b/ports/libfreenect2/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libfreenect2", + "version-string": "0.2.0", + "port-version": 6, + "description": "Open source drivers for the Kinect for Windows v2 device", + "homepage": "https://github.com/OpenKinect/libfreenect2", + "dependencies": [ + "libjpeg-turbo", + "libusb" + ], + "default-features": [ + "opengl" + ], + "features": { + "opencl": { + "description": "OpenCL support for libfreenect2", + "dependencies": [ + "opencl" + ] + }, + "opengl": { + "description": "OpenGL support for libfreenect2", + "dependencies": [ + "glfw3", + "opengl" + ] + } + } +} diff --git a/ports/libftdi/CONTROL b/ports/libftdi/CONTROL deleted file mode 100644 index 16ebe6fabc6c9d..00000000000000 --- a/ports/libftdi/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libftdi -Version: 0.20-1 -Build-Depends: libusb-win32 -Description: FTDI USB driver with bitbang mode (v0.20) diff --git a/ports/libftdi/vcpkg.json b/ports/libftdi/vcpkg.json new file mode 100644 index 00000000000000..953acd0b8690d1 --- /dev/null +++ b/ports/libftdi/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libftdi", + "version-string": "0.20", + "port-version": 2, + "description": "FTDI USB driver with bitbang mode (v0.20)", + "dependencies": [ + "libusb-win32" + ] +} diff --git a/ports/libgcrypt/CONTROL b/ports/libgcrypt/CONTROL deleted file mode 100644 index af3a0fb17cc39e..00000000000000 --- a/ports/libgcrypt/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libgcrypt -Version: 1.8.7 -Port-Version: 1 -Homepage: https://gnupg.org/software/libgcrypt/index.html -Description: A library implementing the so-called Assuan protocol -Build-Depends: libgpg-error -Supports: linux|osx diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json new file mode 100644 index 00000000000000..40a0566446fa3a --- /dev/null +++ b/ports/libgcrypt/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libgcrypt", + "version-string": "1.8.7", + "port-version": 2, + "description": "A library implementing the so-called Assuan protocol", + "homepage": "https://gnupg.org/software/libgcrypt/index.html", + "supports": "linux | osx", + "dependencies": [ + "libgpg-error" + ] +} diff --git a/ports/libgd/CONTROL b/ports/libgd/CONTROL deleted file mode 100644 index 81384cb06e2c67..00000000000000 --- a/ports/libgd/CONTROL +++ /dev/null @@ -1,29 +0,0 @@ -Source: libgd -Version: 2.2.5-4 -Homepage: https://github.com/libgd/libgd -Description: Open source code library for the dynamic creation of images by programmers. -Default-Features: fontconfig, freetype, jpeg, png, tiff, webp - -Feature: fontconfig -Description: Support for fontconfig -Build-Depends: fontconfig - -Feature: freetype -Description: Support for freetype -Build-Depends: freetype - -Feature: jpeg -Description: Support for jpeg -Build-Depends: libjpeg-turbo - -Feature: png -Description: Support for png -Build-Depends: libpng - -Feature: tiff -Description: Support for tiff -Build-Depends: tiff - -Feature: webp -Description: Support for webp -Build-Depends: libwebp diff --git a/ports/libgd/vcpkg.json b/ports/libgd/vcpkg.json new file mode 100644 index 00000000000000..901a3eb62b793b --- /dev/null +++ b/ports/libgd/vcpkg.json @@ -0,0 +1,53 @@ +{ + "name": "libgd", + "version-string": "2.2.5", + "port-version": 5, + "description": "Open source code library for the dynamic creation of images by programmers.", + "homepage": "https://github.com/libgd/libgd", + "default-features": [ + "fontconfig", + "freetype", + "jpeg", + "png", + "tiff", + "webp" + ], + "features": { + "fontconfig": { + "description": "Support for fontconfig", + "dependencies": [ + "fontconfig" + ] + }, + "freetype": { + "description": "Support for freetype", + "dependencies": [ + "freetype" + ] + }, + "jpeg": { + "description": "Support for jpeg", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "png": { + "description": "Support for png", + "dependencies": [ + "libpng" + ] + }, + "tiff": { + "description": "Support for tiff", + "dependencies": [ + "tiff" + ] + }, + "webp": { + "description": "Support for webp", + "dependencies": [ + "libwebp" + ] + } + } +} diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL deleted file mode 100644 index 03fc37b621ca8c..00000000000000 --- a/ports/libgeotiff/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libgeotiff -Version: 1.6.0 -Port-Version: 3 -Homepage: https://github.com/OSGeo/libgeotiff -Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags. -Build-Depends: tiff, proj4, zlib, libjpeg-turbo diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json new file mode 100644 index 00000000000000..86ecc9b1ec7ede --- /dev/null +++ b/ports/libgeotiff/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libgeotiff", + "version-string": "1.6.0", + "port-version": 4, + "description": "Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.", + "homepage": "https://github.com/OSGeo/libgeotiff", + "dependencies": [ + "libjpeg-turbo", + "proj4", + "tiff", + "zlib" + ] +} diff --git a/ports/libgta/CONTROL b/ports/libgta/CONTROL deleted file mode 100644 index d338243cf12ab6..00000000000000 --- a/ports/libgta/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libgta -Version: 1.0.8-1 -Homepage: https://download.savannah.nongnu.org/releases/gta -Description: Libgta is a portable library that implements the Generic Tagged Array (GTA) file format. -Build-Depends: bzip2, zlib, liblzma diff --git a/ports/libgta/vcpkg.json b/ports/libgta/vcpkg.json new file mode 100644 index 00000000000000..789978fe468767 --- /dev/null +++ b/ports/libgta/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libgta", + "version-string": "1.0.8", + "port-version": 2, + "description": "Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.", + "homepage": "https://download.savannah.nongnu.org/releases/gta", + "dependencies": [ + "bzip2", + "liblzma", + "zlib" + ] +} diff --git a/ports/libguarded/CONTROL b/ports/libguarded/CONTROL deleted file mode 100644 index 9d2c4c8303d14c..00000000000000 --- a/ports/libguarded/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libguarded -Version: 2019-08-27-1 -Homepage: https://github.com/copperspice/libguarded -Description: The libGuarded library is a standalone header-only library for multithreaded programming. \ No newline at end of file diff --git a/ports/libguarded/vcpkg.json b/ports/libguarded/vcpkg.json new file mode 100644 index 00000000000000..d6bc463967f01b --- /dev/null +++ b/ports/libguarded/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libguarded", + "version-string": "2019-08-27", + "port-version": 2, + "description": "The libGuarded library is a standalone header-only library for multithreaded programming.", + "homepage": "https://github.com/copperspice/libguarded" +} diff --git a/ports/libhdfs3/CONTROL b/ports/libhdfs3/CONTROL deleted file mode 100644 index d2b646e08804ab..00000000000000 --- a/ports/libhdfs3/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libhdfs3 -Version: 2019-11-05 -Homepage: https://github.com/erikmuttersbach/libhdfs3 -Description: Native Hadoop RPC protocol and HDFS data transfer protocol implementation -Build-Depends: libxml2, protobuf, libuuid, boost diff --git a/ports/libhdfs3/vcpkg.json b/ports/libhdfs3/vcpkg.json new file mode 100644 index 00000000000000..aebe7c702ed492 --- /dev/null +++ b/ports/libhdfs3/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libhdfs3", + "version-string": "2019-11-05", + "port-version": 1, + "description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation", + "homepage": "https://github.com/erikmuttersbach/libhdfs3", + "dependencies": [ + "boost", + "libuuid", + "libxml2", + "protobuf" + ] +} diff --git a/ports/libhydrogen/CONTROL b/ports/libhydrogen/CONTROL deleted file mode 100644 index d1af13e0e5e9a1..00000000000000 --- a/ports/libhydrogen/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libhydrogen -Version: 2019-08-11 -Description: A lightweight, secure, easy-to-use crypto library suitable for constrained environments -Homepage: https://github.com/jedisct1/libhydrogen diff --git a/ports/libhydrogen/vcpkg.json b/ports/libhydrogen/vcpkg.json new file mode 100644 index 00000000000000..a340a80e2b6682 --- /dev/null +++ b/ports/libhydrogen/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libhydrogen", + "version-string": "2019-08-11", + "port-version": 1, + "description": "A lightweight, secure, easy-to-use crypto library suitable for constrained environments", + "homepage": "https://github.com/jedisct1/libhydrogen" +} diff --git a/ports/libideviceactivation/CONTROL b/ports/libideviceactivation/CONTROL deleted file mode 100644 index 24bec86a7336ba..00000000000000 --- a/ports/libideviceactivation/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libideviceactivation -Version: 1.2.235 -Description: A library to handle the activation process of iOS devices -Build-Depends: libimobiledevice, libxml2, curl, libplist diff --git a/ports/libideviceactivation/vcpkg.json b/ports/libideviceactivation/vcpkg.json new file mode 100644 index 00000000000000..6a864bd005a584 --- /dev/null +++ b/ports/libideviceactivation/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libideviceactivation", + "version-string": "1.2.235", + "port-version": 1, + "description": "A library to handle the activation process of iOS devices", + "dependencies": [ + "curl", + "libimobiledevice", + "libplist", + "libxml2" + ] +} diff --git a/ports/libigl/CONTROL b/ports/libigl/CONTROL deleted file mode 100644 index bec0967746f470..00000000000000 --- a/ports/libigl/CONTROL +++ /dev/null @@ -1,27 +0,0 @@ -Source: libigl -Version: 2.2.0 -Port-Version: 5 -Homepage: https://github.com/libigl/libigl -Description: libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB. -Build-Depends: eigen3 -Supports: !(arm|uwp) - -Feature: embree -Description: Build with embree -Build-Depends: embree3 - -Feature: opengl -Description: Build with opengl -Build-Depends: opengl, glad - -Feature: glfw -Description: Build with glfw -Build-Depends: libigl[core, opengl], glfw3 - -Feature: imgui -Description: Build with imgui -Build-Depends: libigl[core, glfw], imgui[core, glfw-binding, opengl3-binding, libigl-imgui] - -Feature: xml -Description: Build with libxml -Build-Depends: tinyxml2 diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json new file mode 100644 index 00000000000000..2a4a9797df5e1a --- /dev/null +++ b/ports/libigl/vcpkg.json @@ -0,0 +1,66 @@ +{ + "name": "libigl", + "version-string": "2.2.0", + "port-version": 6, + "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", + "homepage": "https://github.com/libigl/libigl", + "supports": "!(arm | uwp)", + "dependencies": [ + "eigen3" + ], + "features": { + "embree": { + "description": "Build with embree", + "dependencies": [ + "embree3" + ] + }, + "glfw": { + "description": "Build with glfw", + "dependencies": [ + "glfw3", + { + "name": "libigl", + "default-features": false, + "features": [ + "opengl" + ] + } + ] + }, + "imgui": { + "description": "Build with imgui", + "dependencies": [ + { + "name": "imgui", + "default-features": false, + "features": [ + "glfw-binding", + "libigl-imgui", + "opengl3-binding" + ] + }, + { + "name": "libigl", + "default-features": false, + "features": [ + "glfw" + ] + } + ] + }, + "opengl": { + "description": "Build with opengl", + "dependencies": [ + "glad", + "opengl" + ] + }, + "xml": { + "description": "Build with libxml", + "dependencies": [ + "tinyxml2" + ] + } + } +} diff --git a/ports/libilbc/CONTROL b/ports/libilbc/CONTROL deleted file mode 100644 index 15503b658638ac..00000000000000 --- a/ports/libilbc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libilbc -Version: 3.0.3 -Description: Open source implementation of the Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec from the WebRTC project. -Homepage: https://github.com/TimothyGu/libilbc -Supports: !(arm&uwp) \ No newline at end of file diff --git a/ports/libilbc/vcpkg.json b/ports/libilbc/vcpkg.json new file mode 100644 index 00000000000000..96daeb881fb1ca --- /dev/null +++ b/ports/libilbc/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libilbc", + "version-string": "3.0.3", + "port-version": 1, + "description": "Open source implementation of the Internet Low Bit Rate Codec (iLBC) / RFC 3951 codec from the WebRTC project.", + "homepage": "https://github.com/TimothyGu/libilbc", + "supports": "!(arm & uwp)" +} diff --git a/ports/libimobiledevice/CONTROL b/ports/libimobiledevice/CONTROL deleted file mode 100644 index 3a87a5cfd80d4b..00000000000000 --- a/ports/libimobiledevice/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libimobiledevice -Version: 1.3.6 -Port-Version: 1 -Homepage: http://www.libimobiledevice.org -Description: A cross-platform protocol library to communicate with iOS devices -Build-Depends: libplist, libusbmuxd, openssl, dirent, getopt diff --git a/ports/libimobiledevice/vcpkg.json b/ports/libimobiledevice/vcpkg.json new file mode 100644 index 00000000000000..2bef3413703104 --- /dev/null +++ b/ports/libimobiledevice/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libimobiledevice", + "version-string": "1.3.6", + "port-version": 2, + "description": "A cross-platform protocol library to communicate with iOS devices", + "homepage": "http://www.libimobiledevice.org", + "dependencies": [ + "dirent", + "getopt", + "libplist", + "libusbmuxd", + "openssl" + ] +} diff --git a/ports/libirecovery/CONTROL b/ports/libirecovery/CONTROL deleted file mode 100644 index c3f423b93e055a..00000000000000 --- a/ports/libirecovery/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libirecovery -Version: 1.0.25-2 -Description: Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux -Build-Depends: libusbmuxd, readline, getopt \ No newline at end of file diff --git a/ports/libirecovery/vcpkg.json b/ports/libirecovery/vcpkg.json new file mode 100644 index 00000000000000..8b5a6e942afdbe --- /dev/null +++ b/ports/libirecovery/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libirecovery", + "version-string": "1.0.25", + "port-version": 3, + "description": "Library and utility to talk to iBoot/iBSS via USB on Mac OS X, Windows, and Linux", + "dependencies": [ + "getopt", + "libusbmuxd", + "readline" + ] +} diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 043a0c4e9fefb0..4e59d2b69abefa 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.0.6", - "port-version": 1, + "port-version": 2, "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "features": { diff --git a/ports/libkml/CONTROL b/ports/libkml/CONTROL deleted file mode 100644 index 33de1219bec3de..00000000000000 --- a/ports/libkml/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libkml -Version: 1.3.0 -Port-Version: 6 -Homepage: https://github.com/libkml/libkml -Description: Reference implementation of OGC KML 2.2 -Build-Depends: zlib, expat, minizip[bzip2], uriparser, boost-smart-ptr \ No newline at end of file diff --git a/ports/libkml/vcpkg.json b/ports/libkml/vcpkg.json new file mode 100644 index 00000000000000..adb47787c4c9f9 --- /dev/null +++ b/ports/libkml/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libkml", + "version-string": "1.3.0", + "port-version": 7, + "description": "Reference implementation of OGC KML 2.2", + "homepage": "https://github.com/libkml/libkml", + "dependencies": [ + "boost-smart-ptr", + "expat", + { + "name": "minizip", + "features": [ + "bzip2" + ] + }, + "uriparser", + "zlib" + ] +} diff --git a/ports/liblas/CONTROL b/ports/liblas/CONTROL deleted file mode 100644 index 91735159fc6e17..00000000000000 --- a/ports/liblas/CONTROL +++ /dev/null @@ -1,13 +0,0 @@ -Source: liblas -Version: 1.8.1 -Port-Version: 6 -Build-Depends: boost, boost-thread, boost-system, boost-iostreams, boost-filesystem, boost-detail, libgeotiff -Description: A C/C++ library for reading and writing the very common LAS LiDAR format. - -Feature: jpeg -Description: Support for jpeg -Build-Depends: libjpeg-turbo - -Feature: zlib -Build-Depends: zlib -Description: Support zlib for compression diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json new file mode 100644 index 00000000000000..eb0674a0a940fe --- /dev/null +++ b/ports/liblas/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "liblas", + "version-string": "1.8.1", + "port-version": 7, + "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", + "dependencies": [ + "boost", + "boost-detail", + "boost-filesystem", + "boost-iostreams", + "boost-system", + "boost-thread", + "libgeotiff" + ], + "features": { + "jpeg": { + "description": "Support for jpeg", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "zlib": { + "description": "Support zlib for compression", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/liblbfgs/CONTROL b/ports/liblbfgs/CONTROL deleted file mode 100644 index bb1514f188558d..00000000000000 --- a/ports/liblbfgs/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: liblbfgs -Version: 1.10 -Homepage: http://www.chokkan.org/software/liblbfgs/ -Description: libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS) diff --git a/ports/liblbfgs/vcpkg.json b/ports/liblbfgs/vcpkg.json new file mode 100644 index 00000000000000..d648f802752b18 --- /dev/null +++ b/ports/liblbfgs/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "liblbfgs", + "version-string": "1.10", + "port-version": 1, + "description": "libLBFGS: a library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)", + "homepage": "http://www.chokkan.org/software/liblbfgs/" +} diff --git a/ports/liblemon/CONTROL b/ports/liblemon/CONTROL deleted file mode 100644 index 3463c5e301e4ef..00000000000000 --- a/ports/liblemon/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: liblemon -Version: 2019-06-13-1 -Homepage: https://lemon.cs.elte.hu/trac/lemon -Description: Library for Efficient Modeling and Optimization in Networks \ No newline at end of file diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json new file mode 100644 index 00000000000000..06e75ebcda66bc --- /dev/null +++ b/ports/liblemon/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "liblemon", + "version-string": "2019-06-13", + "port-version": 2, + "description": "Library for Efficient Modeling and Optimization in Networks", + "homepage": "https://lemon.cs.elte.hu/trac/lemon" +} diff --git a/ports/liblsl/CONTROL b/ports/liblsl/CONTROL deleted file mode 100644 index 1433bf14392ac8..00000000000000 --- a/ports/liblsl/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: liblsl -Version: 1.14.0 -Port-Version: 1 -Homepage: https://github.com/sccn/liblsl -Description: C++ lsl library for multi-modal time-synched data transmission over the local network -Supports: !staticcrt -Build-Depends: pugixml diff --git a/ports/liblsl/vcpkg.json b/ports/liblsl/vcpkg.json new file mode 100644 index 00000000000000..dfacb5398718b3 --- /dev/null +++ b/ports/liblsl/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "liblsl", + "version-string": "1.14.0", + "port-version": 2, + "description": "C++ lsl library for multi-modal time-synched data transmission over the local network", + "homepage": "https://github.com/sccn/liblsl", + "supports": "!staticcrt", + "dependencies": [ + "pugixml" + ] +} diff --git a/ports/libmad/CONTROL b/ports/libmad/CONTROL deleted file mode 100644 index 356ecc65f98fa6..00000000000000 --- a/ports/libmad/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libmad -Version: 0.15.1-8 -Homepage: http://www.mars.org/home/rob/proj/mpeg/ -Description: high-quality MPEG audio decoder diff --git a/ports/libmad/vcpkg.json b/ports/libmad/vcpkg.json new file mode 100644 index 00000000000000..2e44d7571c6e24 --- /dev/null +++ b/ports/libmad/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmad", + "version-string": "0.15.1", + "port-version": 9, + "description": "high-quality MPEG audio decoder", + "homepage": "http://www.mars.org/home/rob/proj/mpeg/" +} diff --git a/ports/libmaxminddb/CONTROL b/ports/libmaxminddb/CONTROL deleted file mode 100644 index c12d4031556674..00000000000000 --- a/ports/libmaxminddb/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libmaxminddb -Version: 1.4.3 -Homepage: https://github.com/maxmind/libmaxminddb -Description: C library for the MaxMind DB file format \ No newline at end of file diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json new file mode 100644 index 00000000000000..c24cb9c92cadfe --- /dev/null +++ b/ports/libmaxminddb/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmaxminddb", + "version-string": "1.4.3", + "port-version": 1, + "description": "C library for the MaxMind DB file format", + "homepage": "https://github.com/maxmind/libmaxminddb" +} diff --git a/ports/libmesh/CONTROL b/ports/libmesh/CONTROL deleted file mode 100644 index 0350119c2867dd..00000000000000 --- a/ports/libmesh/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libmesh -Version: 1.5.0-1 -Homepage: https://github.com/libMesh/libmesh -Description: The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling. diff --git a/ports/libmesh/vcpkg.json b/ports/libmesh/vcpkg.json new file mode 100644 index 00000000000000..7c4b273f1c3ce3 --- /dev/null +++ b/ports/libmesh/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmesh", + "version-string": "1.5.0", + "port-version": 2, + "description": "The libMesh library provides a framework for the numerical simulation of partial differential equations using arbitrary unstructured discretizations on serial and parallel platforms. A major goal of the library is to provide support for adaptive mesh refinement (AMR) computations in parallel while allowing a research scientist to focus on the physics they are modeling.", + "homepage": "https://github.com/libMesh/libmesh" +} diff --git a/ports/libmikmod/CONTROL b/ports/libmikmod/CONTROL deleted file mode 100644 index 637052cb2637e7..00000000000000 --- a/ports/libmikmod/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libmikmod -Version: 3.3.11.1-8 -Homepage: https://sourceforge.net/projects/mikmod/ -Description: Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm. -Build-Depends: openal-soft diff --git a/ports/libmikmod/vcpkg.json b/ports/libmikmod/vcpkg.json new file mode 100644 index 00000000000000..f981fac5c16e1f --- /dev/null +++ b/ports/libmikmod/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libmikmod", + "version-string": "3.3.11.1", + "port-version": 9, + "description": "Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.", + "homepage": "https://sourceforge.net/projects/mikmod/", + "dependencies": [ + "openal-soft" + ] +} diff --git a/ports/libmodman/CONTROL b/ports/libmodman/CONTROL deleted file mode 100644 index 21b45a2c6ea368..00000000000000 --- a/ports/libmodman/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: libmodman -Version: 2.0.1-2 -Homepage: https://code.google.com/p/libmodman -Description: a simple library for managing modules - -Feature: tests -Description: Build libmodman tests -Build-Depends: zlib diff --git a/ports/libmodman/vcpkg.json b/ports/libmodman/vcpkg.json new file mode 100644 index 00000000000000..a69e70e3b2059e --- /dev/null +++ b/ports/libmodman/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libmodman", + "version-string": "2.0.1", + "port-version": 3, + "description": "a simple library for managing modules", + "homepage": "https://code.google.com/p/libmodman", + "features": { + "tests": { + "description": "Build libmodman tests", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/libmorton/CONTROL b/ports/libmorton/CONTROL deleted file mode 100644 index bfbf6bfcab3d7c..00000000000000 --- a/ports/libmorton/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libmorton -Version: 0.2 -Description: header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates diff --git a/ports/libmorton/vcpkg.json b/ports/libmorton/vcpkg.json new file mode 100644 index 00000000000000..c3df1681a7192e --- /dev/null +++ b/ports/libmorton/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libmorton", + "version-string": "0.2", + "port-version": 1, + "description": "header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates" +} diff --git a/ports/libmpeg2/CONTROL b/ports/libmpeg2/CONTROL deleted file mode 100644 index 380cc6493801d4..00000000000000 --- a/ports/libmpeg2/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: libmpeg2 -Version: 0.5.1 -Homepage: http://libmpeg2.sourceforge.net/ -Description: a free MPEG-2 video stream decoder -Supports: !(linux|osx|uwp) - -Feature: tools -Description: Build tools provided with libmpeg2 diff --git a/ports/libmpeg2/vcpkg.json b/ports/libmpeg2/vcpkg.json new file mode 100644 index 00000000000000..4936a91dbc792f --- /dev/null +++ b/ports/libmpeg2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libmpeg2", + "version-string": "0.5.1", + "port-version": 1, + "description": "a free MPEG-2 video stream decoder", + "homepage": "http://libmpeg2.sourceforge.net/", + "supports": "!(linux | osx | uwp)", + "features": { + "tools": { + "description": "Build tools provided with libmpeg2" + } + } +} diff --git a/ports/libmspack/CONTROL b/ports/libmspack/CONTROL deleted file mode 100644 index 4bde92043ae8cf..00000000000000 --- a/ports/libmspack/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libmspack -Version: 0.10.1-3 -Homepage: https://www.cabextract.org.uk/libmspack -Description: libmspack is a portable library for some loosely related Microsoft compression formats. diff --git a/ports/libmspack/vcpkg.json b/ports/libmspack/vcpkg.json new file mode 100644 index 00000000000000..41ed734e0fdc7e --- /dev/null +++ b/ports/libmspack/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libmspack", + "version-string": "0.10.1", + "port-version": 4, + "description": "libmspack is a portable library for some loosely related Microsoft compression formats.", + "homepage": "https://www.cabextract.org.uk/libmspack" +} diff --git a/ports/libnoise/CONTROL b/ports/libnoise/CONTROL deleted file mode 100644 index 1442733054b5d1..00000000000000 --- a/ports/libnoise/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libnoise -Version: 1.0.0 -Port-Version: 1 -Homepage: https://github.com/RobertHue/libnoise -Description: A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques. diff --git a/ports/libnoise/vcpkg.json b/ports/libnoise/vcpkg.json new file mode 100644 index 00000000000000..d82097ee5cfb8b --- /dev/null +++ b/ports/libnoise/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libnoise", + "version-string": "1.0.0", + "port-version": 2, + "description": "A general-purpose library that generates three-dimensional coherent noise. Useful for terrain generation and procedural texture generation. Uses a broad number of techniques (Perlin noise, ridged multifractal, etc.) and combinations of those techniques.", + "homepage": "https://github.com/RobertHue/libnoise" +} diff --git a/ports/libodb-boost/CONTROL b/ports/libodb-boost/CONTROL deleted file mode 100644 index 23e3d913fbde95..00000000000000 --- a/ports/libodb-boost/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libodb-boost -Version: 2.4.0 -Port-Version: 4 -Description: Description: Boost support for the ODB ORM library -Build-Depends: libodb diff --git a/ports/libodb-boost/vcpkg.json b/ports/libodb-boost/vcpkg.json new file mode 100644 index 00000000000000..0294b5004ffe81 --- /dev/null +++ b/ports/libodb-boost/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libodb-boost", + "version-string": "2.4.0", + "port-version": 5, + "description": "Description: Boost support for the ODB ORM library", + "dependencies": [ + "libodb" + ] +} diff --git a/ports/libodb-pgsql/CONTROL b/ports/libodb-pgsql/CONTROL deleted file mode 100644 index 5268b44dc86acf..00000000000000 --- a/ports/libodb-pgsql/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libodb-pgsql -Version: 2.4.0 -Port-Version: 4 -Homepage: https://www.codesynthesis.com/products/odb/ -Description: Description: PostgreSQL support for the ODB ORM library -Build-Depends: libodb, libpq diff --git a/ports/libodb-pgsql/vcpkg.json b/ports/libodb-pgsql/vcpkg.json new file mode 100644 index 00000000000000..76e3ef673250ba --- /dev/null +++ b/ports/libodb-pgsql/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libodb-pgsql", + "version-string": "2.4.0", + "port-version": 5, + "description": "Description: PostgreSQL support for the ODB ORM library", + "homepage": "https://www.codesynthesis.com/products/odb/", + "dependencies": [ + "libodb", + "libpq" + ] +} diff --git a/ports/libodb-sqlite/CONTROL b/ports/libodb-sqlite/CONTROL deleted file mode 100644 index 99b38824e3f090..00000000000000 --- a/ports/libodb-sqlite/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libodb-sqlite -Version: 2.4.0 -Port-Version: 8 -Homepage: https://www.codesynthesis.com/products/odb/ -Description: Sqlite support for the ODB ORM library -Build-Depends: libodb, sqlite3 diff --git a/ports/libodb-sqlite/vcpkg.json b/ports/libodb-sqlite/vcpkg.json new file mode 100644 index 00000000000000..466dc4da3578df --- /dev/null +++ b/ports/libodb-sqlite/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libodb-sqlite", + "version-string": "2.4.0", + "port-version": 9, + "description": "Sqlite support for the ODB ORM library", + "homepage": "https://www.codesynthesis.com/products/odb/", + "dependencies": [ + "libodb", + "sqlite3" + ] +} diff --git a/ports/libp7-baical/CONTROL b/ports/libp7-baical/CONTROL deleted file mode 100644 index d23258e0311cc3..00000000000000 --- a/ports/libp7-baical/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libp7-baical -Version: replaced -Build-Depends: libp7client -Description: An old name for the port libp7client; please install libp7client instead. diff --git a/ports/libp7-baical/vcpkg.json b/ports/libp7-baical/vcpkg.json new file mode 100644 index 00000000000000..b599fd07076e1c --- /dev/null +++ b/ports/libp7-baical/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libp7-baical", + "version-string": "replaced", + "port-version": 1, + "description": "An old name for the port libp7client; please install libp7client instead.", + "dependencies": [ + "libp7client" + ] +} diff --git a/ports/libp7client/CONTROL b/ports/libp7client/CONTROL deleted file mode 100644 index aa506cf6c5aa65..00000000000000 --- a/ports/libp7client/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libp7client -Version: 5.6 -Homepage: https://baical.net/ -Description: Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application. -Supports: !(arm|uwp|osx) diff --git a/ports/libp7client/vcpkg.json b/ports/libp7client/vcpkg.json new file mode 100644 index 00000000000000..dda660ebc884e2 --- /dev/null +++ b/ports/libp7client/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libp7client", + "version-string": "5.6", + "port-version": 1, + "description": "Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.", + "homepage": "https://baical.net/", + "supports": "!(arm | uwp | osx)" +} diff --git a/ports/libpff/CONTROL b/ports/libpff/CONTROL deleted file mode 100644 index 8520aa188dc7cd..00000000000000 --- a/ports/libpff/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libpff -Version: 2018-07-14-1 -Build-Depends: zlib -Description: Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format. diff --git a/ports/libpff/vcpkg.json b/ports/libpff/vcpkg.json new file mode 100644 index 00000000000000..5480dbdaa84ffa --- /dev/null +++ b/ports/libpff/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "libpff", + "version-string": "2018-07-14", + "port-version": 2, + "description": "Library and tools to access the Personal Folder File (PFF) and the Offline Folder File (OFF) format.", + "dependencies": [ + "zlib" + ] +} diff --git a/ports/libpopt/CONTROL b/ports/libpopt/CONTROL deleted file mode 100644 index 7dc75fcbcc17b7..00000000000000 --- a/ports/libpopt/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libpopt -Version: 1.16-13 -Description: Library for parsing command line parameters diff --git a/ports/libpopt/vcpkg.json b/ports/libpopt/vcpkg.json new file mode 100644 index 00000000000000..cbb2f825410434 --- /dev/null +++ b/ports/libpopt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libpopt", + "version-string": "1.16", + "port-version": 14, + "description": "Library for parsing command line parameters" +} diff --git a/ports/libproxy/CONTROL b/ports/libproxy/CONTROL deleted file mode 100644 index 1855f9947a3e46..00000000000000 --- a/ports/libproxy/CONTROL +++ /dev/null @@ -1,26 +0,0 @@ -Source: libproxy -Version: 0.4.15-2 -Homepage: https://github.com/libproxy/libproxy -Description: libproxy is a library that provides automatic proxy configuration management. -Build-Depends: libmodman - -Feature: bindings-csharp -Description: Install C# bindings - -Feature: bindings-python -Description: Install Python bindings - -Feature: bindings-perl -Description: Install PERL bindings - -Feature: bindings-ruby -Description: Install Ruby bindings - -Feature: bindings-vala -Description: Install Vala bindings - -Feature: tools -Description: build tools - -Feature: tests -Description: Build libproxy tests diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json new file mode 100644 index 00000000000000..8f396510474156 --- /dev/null +++ b/ports/libproxy/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "libproxy", + "version-string": "0.4.15", + "port-version": 3, + "description": "libproxy is a library that provides automatic proxy configuration management.", + "homepage": "https://github.com/libproxy/libproxy", + "dependencies": [ + "libmodman" + ], + "features": { + "bindings-csharp": { + "description": "Install C# bindings" + }, + "bindings-perl": { + "description": "Install PERL bindings" + }, + "bindings-python": { + "description": "Install Python bindings" + }, + "bindings-ruby": { + "description": "Install Ruby bindings" + }, + "bindings-vala": { + "description": "Install Vala bindings" + }, + "tests": { + "description": "Build libproxy tests" + }, + "tools": { + "description": "build tools" + } + } +} diff --git a/ports/libqcow/CONTROL b/ports/libqcow/CONTROL deleted file mode 100644 index b141e0b09d5f8a..00000000000000 --- a/ports/libqcow/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libqcow -Version: 20210419 -Homepage: https://github.com/libyal/libqcow -Build-Depends: gettext,openssl,zlib -Description: Library and tools to access the QEMU Copy-On-Write (QCOW) image format. -Supports: !uwp diff --git a/ports/libqcow/vcpkg.json b/ports/libqcow/vcpkg.json new file mode 100644 index 00000000000000..5f8992d0be2f64 --- /dev/null +++ b/ports/libqcow/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "libqcow", + "version-string": "20210419", + "port-version": 1, + "description": "Library and tools to access the QEMU Copy-On-Write (QCOW) image format.", + "homepage": "https://github.com/libyal/libqcow", + "supports": "!uwp", + "dependencies": [ + "gettext", + "openssl", + "zlib" + ] +} diff --git a/ports/libqglviewer/CONTROL b/ports/libqglviewer/CONTROL deleted file mode 100644 index b5adc19131c69d..00000000000000 --- a/ports/libqglviewer/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libqglviewer -Version: 2.7.2-3 -Description: libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers. -Build-Depends: qt5-base[core] diff --git a/ports/libqglviewer/vcpkg.json b/ports/libqglviewer/vcpkg.json new file mode 100644 index 00000000000000..0488752923912e --- /dev/null +++ b/ports/libqglviewer/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libqglviewer", + "version-string": "2.7.2", + "port-version": 4, + "description": "libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/librabbitmq/CONTROL b/ports/librabbitmq/CONTROL deleted file mode 100644 index ae06b8b2be3b1f..00000000000000 --- a/ports/librabbitmq/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: librabbitmq -Version: 2020-06-03 -Build-Depends: openssl -Homepage: https://github.com/alanxz/rabbitmq-c -Description: A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker. diff --git a/ports/librabbitmq/vcpkg.json b/ports/librabbitmq/vcpkg.json new file mode 100644 index 00000000000000..f79a890baf85cc --- /dev/null +++ b/ports/librabbitmq/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "librabbitmq", + "version-string": "2020-06-03", + "port-version": 1, + "description": "A C-language AMQP client library for use with v2.0+ of the RabbitMQ broker.", + "homepage": "https://github.com/alanxz/rabbitmq-c", + "dependencies": [ + "openssl" + ] +} diff --git a/ports/libraqm/CONTROL b/ports/libraqm/CONTROL deleted file mode 100644 index 460e66c1676a97..00000000000000 --- a/ports/libraqm/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libraqm -Version: 0.7.0 -Port-Version: 2 -Description: A library for complex text layout -Build-Depends: freetype, harfbuzz, fribidi \ No newline at end of file diff --git a/ports/libraqm/vcpkg.json b/ports/libraqm/vcpkg.json new file mode 100644 index 00000000000000..7e124e8639ccc4 --- /dev/null +++ b/ports/libraqm/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libraqm", + "version-string": "0.7.0", + "port-version": 3, + "description": "A library for complex text layout", + "dependencies": [ + "freetype", + "fribidi", + "harfbuzz" + ] +} diff --git a/ports/libraw/CONTROL b/ports/libraw/CONTROL deleted file mode 100644 index b5cbd733263ab4..00000000000000 --- a/ports/libraw/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libraw -Version: 201903-3 -Build-Depends: lcms, jasper -Homepage: https://www.libraw.org -Description: raw image decoder library diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json new file mode 100644 index 00000000000000..01b3babe00ead0 --- /dev/null +++ b/ports/libraw/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libraw", + "version-string": "201903", + "port-version": 4, + "description": "raw image decoder library", + "homepage": "https://www.libraw.org", + "dependencies": [ + "jasper", + "lcms" + ] +} diff --git a/ports/librdkafka/CONTROL b/ports/librdkafka/CONTROL deleted file mode 100644 index 20d9a8606ba4a3..00000000000000 --- a/ports/librdkafka/CONTROL +++ /dev/null @@ -1,23 +0,0 @@ -Source: librdkafka -Version: 1.7.0 -Description: The Apache Kafka C/C++ library -Homepage: https://github.com/edenhill/librdkafka - -Feature: lz4 -Description: Enable external LZ4 library support -Build-Depends: lz4 - -Feature: ssl -Description: Build with OpenSSL -Build-Depends: openssl - -Feature: zlib -Description: Build with zlib -Build-Depends: zlib - -Feature: zstd -Description: Build with zstd -Build-Depends: zstd - -Feature: snappy -Description: Build with snappy diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json new file mode 100644 index 00000000000000..77894d11653221 --- /dev/null +++ b/ports/librdkafka/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "librdkafka", + "version-string": "1.7.0", + "port-version": 1, + "description": "The Apache Kafka C/C++ library", + "homepage": "https://github.com/edenhill/librdkafka", + "features": { + "lz4": { + "description": "Enable external LZ4 library support", + "dependencies": [ + "lz4" + ] + }, + "snappy": { + "description": "Build with snappy" + }, + "ssl": { + "description": "Build with OpenSSL", + "dependencies": [ + "openssl" + ] + }, + "zlib": { + "description": "Build with zlib", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Build with zstd", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/ports/libsass/CONTROL b/ports/libsass/CONTROL deleted file mode 100644 index e29f5b9279e201..00000000000000 --- a/ports/libsass/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libsass -Version: 3.6.4 -Port-Version: 0 -Description: LibSass - Sass compiler written in C++ -Homepage: https://github.com/sass/libsass -Supports: !uwp - diff --git a/ports/libsass/vcpkg.json b/ports/libsass/vcpkg.json new file mode 100644 index 00000000000000..a67da017e96bc3 --- /dev/null +++ b/ports/libsass/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libsass", + "version-string": "3.6.4", + "port-version": 1, + "description": "LibSass - Sass compiler written in C++", + "homepage": "https://github.com/sass/libsass", + "supports": "!uwp" +} diff --git a/ports/libsbml/CONTROL b/ports/libsbml/CONTROL deleted file mode 100644 index 654ea75bd13702..00000000000000 --- a/ports/libsbml/CONTROL +++ /dev/null @@ -1,49 +0,0 @@ -Source: libsbml -Version: 5.18.0 -Description: A library for reading / writing SBML files -Default-Features: expat,comp,fbc,groups,layout,render,libxml2 -Supports: !uwp - -Feature: test -Description: Unit testing of libSBMLs implementation -Build-Depends: check - -Feature: bzip2 -Description: bz2 compression support for libsbml -Build-Depends: bzip2 - -Feature: zlib -Description: gzip compression support for libsbml -Build-Depends: zlib - -Feature: expat -Description: libsbml using expat parser -Build-Depends: expat - -Feature: libxml2 -Description: libsbml using libxml2 parser -Build-Depends: libxml2 - -Feature: comp -Description: support for Hierarchical Model Composition - -Feature: fbc -Description: support for Flux Balance Constrant Modeling - -Feature: groups -Description: support for Groups - -Feature: layout -Description: support for Pathway Layouts - -Feature: multi -Description: support for Multistate Modeling - -Feature: qual -Description: support for Qualitative Modeling - -Feature: render -Description: support for Rendering information - -Feature: namespace -Description: Build with the WITH_CPP_NAMESPACE option set to on diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json new file mode 100644 index 00000000000000..b675427212a281 --- /dev/null +++ b/ports/libsbml/vcpkg.json @@ -0,0 +1,72 @@ +{ + "name": "libsbml", + "version-string": "5.18.0", + "port-version": 1, + "description": "A library for reading / writing SBML files", + "supports": "!uwp", + "default-features": [ + "comp", + "expat", + "fbc", + "groups", + "layout", + "libxml2", + "render" + ], + "features": { + "bzip2": { + "description": "bz2 compression support for libsbml", + "dependencies": [ + "bzip2" + ] + }, + "comp": { + "description": "support for Hierarchical Model Composition" + }, + "expat": { + "description": "libsbml using expat parser", + "dependencies": [ + "expat" + ] + }, + "fbc": { + "description": "support for Flux Balance Constrant Modeling" + }, + "groups": { + "description": "support for Groups" + }, + "layout": { + "description": "support for Pathway Layouts" + }, + "libxml2": { + "description": "libsbml using libxml2 parser", + "dependencies": [ + "libxml2" + ] + }, + "multi": { + "description": "support for Multistate Modeling" + }, + "namespace": { + "description": "Build with the WITH_CPP_NAMESPACE option set to on" + }, + "qual": { + "description": "support for Qualitative Modeling" + }, + "render": { + "description": "support for Rendering information" + }, + "test": { + "description": "Unit testing of libSBMLs implementation", + "dependencies": [ + "check" + ] + }, + "zlib": { + "description": "gzip compression support for libsbml", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/libspatialite/CONTROL b/ports/libspatialite/CONTROL deleted file mode 100644 index a44f701dc38116..00000000000000 --- a/ports/libspatialite/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libspatialite -Version: 5.0.0 -Port-Version: 2 -Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources -Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities. -Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv, librttopo diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json new file mode 100644 index 00000000000000..98c634786d129a --- /dev/null +++ b/ports/libspatialite/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libspatialite", + "version-string": "5.0.0", + "port-version": 3, + "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", + "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", + "dependencies": [ + "freexl", + "geos", + "libiconv", + "librttopo", + "libxml2", + "proj4", + "sqlite3", + "zlib" + ] +} diff --git a/ports/libspnav/CONTROL b/ports/libspnav/CONTROL deleted file mode 100644 index d1012d154de230..00000000000000 --- a/ports/libspnav/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libspnav -Version: 0.2.3 -Homepage: https://github.com/FreeSpacenav/libspnav -Description: Library for communicating with spacenavd or 3dxsrv to get input from 6-dof devices. -Supports: linux diff --git a/ports/libspnav/vcpkg.json b/ports/libspnav/vcpkg.json new file mode 100644 index 00000000000000..f3bb1f791e0cc5 --- /dev/null +++ b/ports/libspnav/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libspnav", + "version-string": "0.2.3", + "port-version": 1, + "description": "Library for communicating with spacenavd or 3dxsrv to get input from 6-dof devices.", + "homepage": "https://github.com/FreeSpacenav/libspnav", + "supports": "linux" +} diff --git a/ports/libsquish/CONTROL b/ports/libsquish/CONTROL deleted file mode 100644 index 2e3500478e4472..00000000000000 --- a/ports/libsquish/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libsquish -Version: 1.15-7 -Homepage: https://sourceforge.net/projects/libsquish -Description: Open source DXT compression library. diff --git a/ports/libsquish/vcpkg.json b/ports/libsquish/vcpkg.json new file mode 100644 index 00000000000000..9cb40167af3d88 --- /dev/null +++ b/ports/libsquish/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libsquish", + "version-string": "1.15", + "port-version": 8, + "description": "Open source DXT compression library.", + "homepage": "https://sourceforge.net/projects/libsquish" +} diff --git a/ports/libsrt/CONTROL b/ports/libsrt/CONTROL deleted file mode 100644 index 76a985f2b5e6a9..00000000000000 --- a/ports/libsrt/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: libsrt -Version: 1.3.4 -Description: Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet. -Homepage: https://github.com/Haivision/srt -Build-Depends: openssl, pthreads (windows) - -Feature: tool -Description: Builds libsrt executable \ No newline at end of file diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json new file mode 100644 index 00000000000000..16d20929af47e5 --- /dev/null +++ b/ports/libsrt/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "libsrt", + "version-string": "1.3.4", + "port-version": 1, + "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", + "homepage": "https://github.com/Haivision/srt", + "dependencies": [ + "openssl", + { + "name": "pthreads", + "platform": "windows" + } + ], + "features": { + "tool": { + "description": "Builds libsrt executable" + } + } +} diff --git a/ports/libsrtp/CONTROL b/ports/libsrtp/CONTROL deleted file mode 100644 index 9fa7f486023f4c..00000000000000 --- a/ports/libsrtp/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libsrtp -Version: 2.2.0 -Description: This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel. \ No newline at end of file diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json new file mode 100644 index 00000000000000..fd0d3db3d2a7fd --- /dev/null +++ b/ports/libsrtp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libsrtp", + "version-string": "2.2.0", + "port-version": 1, + "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel." +} diff --git a/ports/libssh/CONTROL b/ports/libssh/CONTROL deleted file mode 100644 index cec23294e1244e..00000000000000 --- a/ports/libssh/CONTROL +++ /dev/null @@ -1,24 +0,0 @@ -Source: libssh -Version: 0.9.5 -Port-Version: 5 -Homepage: https://www.libssh.org/ -Build-Depends: libssh[core,mbedtls] (android) -Description: libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side -Default-Features: crypto -Supports: !(uwp | arm) - -Feature: crypto -Build-Depends: libssh[mbedtls] -Description: Default crypto backend - -Feature: mbedtls -Build-Depends: mbedtls[pthreads] (!android), mbedtls[core] -Description: Crypto support (mbedTLS) - -Feature: openssl -Build-Depends: openssl -Description: Crypto support (OpenSSL) - -Feature: zlib -Description: libssh with zlib -Build-Depends: zlib diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json new file mode 100644 index 00000000000000..47669c5a226fbd --- /dev/null +++ b/ports/libssh/vcpkg.json @@ -0,0 +1,62 @@ +{ + "name": "libssh", + "version-string": "0.9.5", + "port-version": 6, + "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", + "homepage": "https://www.libssh.org/", + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "libssh", + "default-features": false, + "features": [ + "mbedtls" + ], + "platform": "android" + } + ], + "default-features": [ + "crypto" + ], + "features": { + "crypto": { + "description": "Default crypto backend", + "dependencies": [ + { + "name": "libssh", + "features": [ + "mbedtls" + ] + } + ] + }, + "mbedtls": { + "description": "Crypto support (mbedTLS)", + "dependencies": [ + { + "name": "mbedtls", + "default-features": false + }, + { + "name": "mbedtls", + "features": [ + "pthreads" + ], + "platform": "!android" + } + ] + }, + "openssl": { + "description": "Crypto support (OpenSSL)", + "dependencies": [ + "openssl" + ] + }, + "zlib": { + "description": "libssh with zlib", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/libssh2/CONTROL b/ports/libssh2/CONTROL deleted file mode 100644 index e870b0e151495e..00000000000000 --- a/ports/libssh2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libssh2 -Version: 1.9.0 -Build-Depends: zlib, openssl -Homepage: https://www.libssh2.org -Description: The SSH library diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json new file mode 100644 index 00000000000000..c5692d464608df --- /dev/null +++ b/ports/libssh2/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libssh2", + "version-string": "1.9.0", + "port-version": 1, + "description": "The SSH library", + "homepage": "https://www.libssh2.org", + "dependencies": [ + "openssl", + "zlib" + ] +} diff --git a/ports/libstemmer/CONTROL b/ports/libstemmer/CONTROL deleted file mode 100644 index 57d28d85572cf0..00000000000000 --- a/ports/libstemmer/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libstemmer -Version: 2017-9-5 -Homepage: https://snowball.tartarus.org/ -Description: Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval diff --git a/ports/libstemmer/vcpkg.json b/ports/libstemmer/vcpkg.json new file mode 100644 index 00000000000000..8dee5abc54e5e4 --- /dev/null +++ b/ports/libstemmer/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libstemmer", + "version-string": "2017-9", + "port-version": 6, + "description": "Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval", + "homepage": "https://snowball.tartarus.org/" +} diff --git a/ports/libstk/CONTROL b/ports/libstk/CONTROL deleted file mode 100644 index 1de9780e13fe0a..00000000000000 --- a/ports/libstk/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libstk -Version: 4.6.1 -Description: The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. diff --git a/ports/libstk/vcpkg.json b/ports/libstk/vcpkg.json new file mode 100644 index 00000000000000..0c4d3073108de1 --- /dev/null +++ b/ports/libstk/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libstk", + "version-string": "4.6.1", + "port-version": 1, + "description": "The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language." +} diff --git a/ports/libtheora/CONTROL b/ports/libtheora/CONTROL deleted file mode 100644 index e40a8f28ff4bd8..00000000000000 --- a/ports/libtheora/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libtheora -Version: 1.2.0alpha1-20170719 -Port-Version: 2 -Homepage: https://github.com/xiph/theora -Description: Theora is a free and open video compression format from the Xiph.org Foundation. -Build-Depends: libogg diff --git a/ports/libtheora/vcpkg.json b/ports/libtheora/vcpkg.json new file mode 100644 index 00000000000000..58167e7d1bbf41 --- /dev/null +++ b/ports/libtheora/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libtheora", + "version-string": "1.2.0alpha1-20170719", + "port-version": 3, + "description": "Theora is a free and open video compression format from the Xiph.org Foundation.", + "homepage": "https://github.com/xiph/theora", + "dependencies": [ + "libogg" + ] +} diff --git a/ports/libtins/CONTROL b/ports/libtins/CONTROL deleted file mode 100644 index 7c68a648b4f7d1..00000000000000 --- a/ports/libtins/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libtins -Version: 4.3 -Description: High-level, multiplatform C++ network packet sniffing and crafting library -Build-Depends: winpcap (windows), boost-icl, boost-any diff --git a/ports/libtins/vcpkg.json b/ports/libtins/vcpkg.json new file mode 100644 index 00000000000000..f4f2b274806d2e --- /dev/null +++ b/ports/libtins/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "libtins", + "version-string": "4.3", + "port-version": 1, + "description": "High-level, multiplatform C++ network packet sniffing and crafting library", + "dependencies": [ + "boost-any", + "boost-icl", + { + "name": "winpcap", + "platform": "windows" + } + ] +} diff --git a/ports/libtomcrypt/CONTROL b/ports/libtomcrypt/CONTROL deleted file mode 100644 index c5f79aa3281385..00000000000000 --- a/ports/libtomcrypt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libtomcrypt -Version: 1.18.2-1 -Description: LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit that provides developers with a vast array of well known published block ciphers, one-way hash functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines. -Homepage: https://www.libtom.net/LibTomCrypt/ -Build-Depends: libtommath \ No newline at end of file diff --git a/ports/libtomcrypt/vcpkg.json b/ports/libtomcrypt/vcpkg.json new file mode 100644 index 00000000000000..4607ff07606ab5 --- /dev/null +++ b/ports/libtomcrypt/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libtomcrypt", + "version-string": "1.18.2", + "port-version": 2, + "description": "LibTomCrypt is a fairly comprehensive, modular and portable cryptographic toolkit that provides developers with a vast array of well known published block ciphers, one-way hash functions, chaining modes, pseudo-random number generators, public key cryptography and a plethora of other routines.", + "homepage": "https://www.libtom.net/LibTomCrypt/", + "dependencies": [ + "libtommath" + ] +} diff --git a/ports/libtommath/CONTROL b/ports/libtommath/CONTROL deleted file mode 100644 index dd6359bed5b18a..00000000000000 --- a/ports/libtommath/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libtommath -Version: 1.2.0-1 -Description: LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C. -Homepage: https://www.libtom.net/LibTomMath/ diff --git a/ports/libtommath/vcpkg.json b/ports/libtommath/vcpkg.json new file mode 100644 index 00000000000000..e6472aa8f70304 --- /dev/null +++ b/ports/libtommath/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libtommath", + "version-string": "1.2.0", + "port-version": 2, + "description": "LibTomMath is a free open source portable number theoretic multiple-precision integer library written entirely in C.", + "homepage": "https://www.libtom.net/LibTomMath/" +} diff --git a/ports/libu2f-server/CONTROL b/ports/libu2f-server/CONTROL deleted file mode 100644 index 1af6aa8f1d5cb6..00000000000000 --- a/ports/libu2f-server/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libu2f-server -Version: 1.1.0 -Port-Version: 2 -Build-Depends: openssl, json-c -Homepage: https://developers.yubico.com/libu2f-server/ -Description: Yubico Universal 2nd Factor (U2F) Server C Library -Supports: (x86 | x64) & windows diff --git a/ports/libu2f-server/vcpkg.json b/ports/libu2f-server/vcpkg.json new file mode 100644 index 00000000000000..b66f13cee88369 --- /dev/null +++ b/ports/libu2f-server/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libu2f-server", + "version-string": "1.1.0", + "port-version": 3, + "description": "Yubico Universal 2nd Factor (U2F) Server C Library", + "homepage": "https://developers.yubico.com/libu2f-server/", + "supports": "(x86 | x64) & windows", + "dependencies": [ + "json-c", + "openssl" + ] +} diff --git a/ports/libudns/CONTROL b/ports/libudns/CONTROL deleted file mode 100644 index d9bb84f9e91908..00000000000000 --- a/ports/libudns/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libudns -Version: 0.4-2 -Homepage: https://github.com/ortclib/udns -Description: The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop. diff --git a/ports/libudns/vcpkg.json b/ports/libudns/vcpkg.json new file mode 100644 index 00000000000000..9d328490cb36b6 --- /dev/null +++ b/ports/libudns/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libudns", + "version-string": "0.4", + "port-version": 3, + "description": "The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop.", + "homepage": "https://github.com/ortclib/udns" +} diff --git a/ports/libunibreak/CONTROL b/ports/libunibreak/CONTROL deleted file mode 100644 index 4ff9641ad73ac6..00000000000000 --- a/ports/libunibreak/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libunibreak -Version: 4.3-0 -Homepage: https://github.com/adah1972/libunibreak -Description: an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information. diff --git a/ports/libunibreak/vcpkg.json b/ports/libunibreak/vcpkg.json new file mode 100644 index 00000000000000..c1d89b1a2e5d68 --- /dev/null +++ b/ports/libunibreak/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libunibreak", + "version-string": "4.3", + "port-version": 1, + "description": "an implementation of the line breaking and word breaking algorithms as described in [Unicode Standard Annex 14] 1 and [Unicode Standard Annex 29] 2. Check the project's [home page] 3 for up-to-date information.", + "homepage": "https://github.com/adah1972/libunibreak" +} diff --git a/ports/libusb-win32/CONTROL b/ports/libusb-win32/CONTROL deleted file mode 100644 index 24dd02c85fdb9d..00000000000000 --- a/ports/libusb-win32/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libusb-win32 -Version: 1.2.6.0-6 -Homepage: https://sourceforge.net/projects/libusb-win32 -Description: Allows user space applications to access many USB device on Windows. -Supports: windows \ No newline at end of file diff --git a/ports/libusb-win32/vcpkg.json b/ports/libusb-win32/vcpkg.json new file mode 100644 index 00000000000000..462fd2322f6cc2 --- /dev/null +++ b/ports/libusb-win32/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libusb-win32", + "version-string": "1.2.6.0", + "port-version": 7, + "description": "Allows user space applications to access many USB device on Windows.", + "homepage": "https://sourceforge.net/projects/libusb-win32", + "supports": "windows" +} diff --git a/ports/libusbmuxd/CONTROL b/ports/libusbmuxd/CONTROL deleted file mode 100644 index 72d5257cfe65c2..00000000000000 --- a/ports/libusbmuxd/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libusbmuxd -Version: 1.2.219 -Description: A client library to multiplex connections from and to iOS devices -Build-Depends: libplist -Supports: !(uwp|linux|osx) diff --git a/ports/libusbmuxd/vcpkg.json b/ports/libusbmuxd/vcpkg.json new file mode 100644 index 00000000000000..f9bfb7f9fc1bf6 --- /dev/null +++ b/ports/libusbmuxd/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libusbmuxd", + "version-string": "1.2.219", + "port-version": 1, + "description": "A client library to multiplex connections from and to iOS devices", + "supports": "!(uwp | linux | osx)", + "dependencies": [ + "libplist" + ] +} diff --git a/ports/libuvc/CONTROL b/ports/libuvc/CONTROL deleted file mode 100644 index b780f19982b3f6..00000000000000 --- a/ports/libuvc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libuvc -Version: 2020-11-24 -Build-Depends: libusb -Homepage: https://github.com/libuvc/libuvc -Description: a cross-platform library for USB video devices -Supports: linux diff --git a/ports/libuvc/vcpkg.json b/ports/libuvc/vcpkg.json new file mode 100644 index 00000000000000..ce4a13b0a764be --- /dev/null +++ b/ports/libuvc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "libuvc", + "version-string": "2020-11-24", + "port-version": 1, + "description": "a cross-platform library for USB video devices", + "homepage": "https://github.com/libuvc/libuvc", + "supports": "linux", + "dependencies": [ + "libusb" + ] +} diff --git a/ports/libvmdk/CONTROL b/ports/libvmdk/CONTROL deleted file mode 100644 index 21a1e9c5e69838..00000000000000 --- a/ports/libvmdk/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: libvmdk -Version: 20200926 -Homepage: https://github.com/libyal/libvmdk -Description: Library and tools to access the VMware Virtual Disk (VMDK) format -Build-Depends: gettext,zlib -Supports: !uwp diff --git a/ports/libvmdk/vcpkg.json b/ports/libvmdk/vcpkg.json new file mode 100644 index 00000000000000..e8211d6c62e367 --- /dev/null +++ b/ports/libvmdk/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "libvmdk", + "version-string": "20200926", + "port-version": 1, + "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", + "homepage": "https://github.com/libyal/libvmdk", + "supports": "!uwp", + "dependencies": [ + "gettext", + "zlib" + ] +} diff --git a/ports/libwandio/CONTROL b/ports/libwandio/CONTROL deleted file mode 100644 index 1150b06ec140fb..00000000000000 --- a/ports/libwandio/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: libwandio -Version: 4.2.1 -Port-Version: 3 -Homepage: https://github.com/wanduow/wandio -Description: C library for simple and efficient file IO. -Build-Depends: zlib, zstd, liblzma, lzo, lz4, curl, pthread, bzip2 -Supports: !windows diff --git a/ports/libwandio/vcpkg.json b/ports/libwandio/vcpkg.json new file mode 100644 index 00000000000000..94c493eca248bf --- /dev/null +++ b/ports/libwandio/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "libwandio", + "version-string": "4.2.1", + "port-version": 4, + "description": "C library for simple and efficient file IO.", + "homepage": "https://github.com/wanduow/wandio", + "supports": "!windows", + "dependencies": [ + "bzip2", + "curl", + "liblzma", + "lz4", + "lzo", + "pthread", + "zlib", + "zstd" + ] +} diff --git a/ports/libwebm/CONTROL b/ports/libwebm/CONTROL deleted file mode 100644 index 243a220c5eb9c1..00000000000000 --- a/ports/libwebm/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libwebm -Version: 1.0.0.27 -Port-Version: 6 -Homepage: https://github.com/webmproject/libwebm -Description: WebM File Parser diff --git a/ports/libwebm/vcpkg.json b/ports/libwebm/vcpkg.json new file mode 100644 index 00000000000000..018ddc0816a47e --- /dev/null +++ b/ports/libwebm/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libwebm", + "version-string": "1.0.0.27", + "port-version": 7, + "description": "WebM File Parser", + "homepage": "https://github.com/webmproject/libwebm" +} diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL deleted file mode 100644 index 2d9b2fd7d9cf24..00000000000000 --- a/ports/libwebp/CONTROL +++ /dev/null @@ -1,59 +0,0 @@ -Source: libwebp -Version: 1.1.0 -Port-Version: 3 -Homepage: https://github.com/webmproject/libwebp -Description: WebP codec: library to encode and decode images in WebP format -Default-Features: simd, nearlossless -Build-Depends: libwebp[unicode] (windows) - -Feature: anim -Description: Build animation utilities. -Build-Depends: libwebp[mux, img2webp] - -Feature: gif2webp -Description: Build the gif2webp conversion tool. -Build-Depends: giflib - -Feature: img2webp -Description: Build the img2webp animation tool. -Build-Depends: libjpeg-turbo, libpng, tiff - -Feature: vwebp -Description: Build the vwebp viewer tool. -Build-Depends: opengl, freeglut (!osx) - -Feature: vwebp-sdl -Description: Build the vwebp viewer tool. -Build-Depends: libwebp[vwebp], sdl1 (windows) - -Feature: info -Description: Build the webpinfo command line tool. - -Feature: mux -Description: Build the webpmux command line tool. - -Feature: extras -Description: Build extras. -Build-Depends: sdl1 (windows), libwebp[vwebp] - -Feature: nearlossless -Description: Enable near-lossless encoding - -Feature: unicode -Description: Build Unicode executables. (Adds definition UNICODE and _UNICODE) - -Feature: simd -Description: Enable any SIMD optimization. - -Feature: cwebp -Description: Build the cwebp command line tool. - -Feature: dwebp -Description: Build the dwebp command line tool. - -Feature: swap16bitcsp -Description: Enable byte swap for 16 bit colorspaces. - -Feature: all -Description: enable all features except for swap16bitcsp -Build-Depends: libwebp[anim, gif2webp, img2webp, info, mux, nearlossless, simd, cwebp, dwebp], libwebp[vwebp-sdl] (!osx), libwebp[extras] (!osx) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json new file mode 100644 index 00000000000000..1f19252160bd96 --- /dev/null +++ b/ports/libwebp/vcpkg.json @@ -0,0 +1,145 @@ +{ + "name": "libwebp", + "version-string": "1.1.0", + "port-version": 4, + "description": "WebP codec: library to encode and decode images in WebP format", + "homepage": "https://github.com/webmproject/libwebp", + "dependencies": [ + { + "name": "libwebp", + "features": [ + "unicode" + ], + "platform": "windows" + } + ], + "default-features": [ + "nearlossless", + "simd" + ], + "features": { + "all": { + "description": "enable all features except for swap16bitcsp", + "dependencies": [ + { + "name": "libwebp", + "features": [ + "anim", + "cwebp", + "dwebp", + "gif2webp", + "img2webp", + "info", + "mux", + "nearlossless", + "simd" + ] + }, + { + "name": "libwebp", + "features": [ + "extras" + ], + "platform": "!osx" + }, + { + "name": "libwebp", + "features": [ + "vwebp-sdl" + ], + "platform": "!osx" + } + ] + }, + "anim": { + "description": "Build animation utilities.", + "dependencies": [ + { + "name": "libwebp", + "features": [ + "img2webp", + "mux" + ] + } + ] + }, + "cwebp": { + "description": "Build the cwebp command line tool." + }, + "dwebp": { + "description": "Build the dwebp command line tool." + }, + "extras": { + "description": "Build extras.", + "dependencies": [ + { + "name": "libwebp", + "features": [ + "vwebp" + ] + }, + { + "name": "sdl1", + "platform": "windows" + } + ] + }, + "gif2webp": { + "description": "Build the gif2webp conversion tool.", + "dependencies": [ + "giflib" + ] + }, + "img2webp": { + "description": "Build the img2webp animation tool.", + "dependencies": [ + "libjpeg-turbo", + "libpng", + "tiff" + ] + }, + "info": { + "description": "Build the webpinfo command line tool." + }, + "mux": { + "description": "Build the webpmux command line tool." + }, + "nearlossless": { + "description": "Enable near-lossless encoding" + }, + "simd": { + "description": "Enable any SIMD optimization." + }, + "swap16bitcsp": { + "description": "Enable byte swap for 16 bit colorspaces." + }, + "unicode": { + "description": "Build Unicode executables. (Adds definition UNICODE and _UNICODE)" + }, + "vwebp": { + "description": "Build the vwebp viewer tool.", + "dependencies": [ + { + "name": "freeglut", + "platform": "!osx" + }, + "opengl" + ] + }, + "vwebp-sdl": { + "description": "Build the vwebp viewer tool.", + "dependencies": [ + { + "name": "libwebp", + "features": [ + "vwebp" + ] + }, + { + "name": "sdl1", + "platform": "windows" + } + ] + } + } +} diff --git a/ports/libxdiff/CONTROL b/ports/libxdiff/CONTROL deleted file mode 100644 index 81db30fc840d1a..00000000000000 --- a/ports/libxdiff/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libxdiff -Version: 0.23 -Homepage: https://github.com/Drako/libxdiff -Description: The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability. -Supports: !uwp \ No newline at end of file diff --git a/ports/libxdiff/vcpkg.json b/ports/libxdiff/vcpkg.json new file mode 100644 index 00000000000000..ab48b66baff822 --- /dev/null +++ b/ports/libxdiff/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libxdiff", + "version-string": "0.23", + "port-version": 1, + "description": "The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability.", + "homepage": "https://github.com/Drako/libxdiff", + "supports": "!uwp" +} diff --git a/ports/libxmlmm/CONTROL b/ports/libxmlmm/CONTROL deleted file mode 100644 index a943bcf289eec9..00000000000000 --- a/ports/libxmlmm/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libxmlmm -Version: 0.6.0 -Homepage: https://github.com/rioki/libxmlmm -Description: Libxmlmm is a C++ wrapper for libxml 2.0 that only relies on standard C++ and libxml2. -Build-Depends: libxml2 diff --git a/ports/libxmlmm/vcpkg.json b/ports/libxmlmm/vcpkg.json new file mode 100644 index 00000000000000..03fdcba58d95d3 --- /dev/null +++ b/ports/libxmlmm/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libxmlmm", + "version-string": "0.6.0", + "port-version": 1, + "description": "Libxmlmm is a C++ wrapper for libxml 2.0 that only relies on standard C++ and libxml2.", + "homepage": "https://github.com/rioki/libxmlmm", + "dependencies": [ + "libxml2" + ] +} diff --git a/ports/libxmp-lite/CONTROL b/ports/libxmp-lite/CONTROL deleted file mode 100644 index fd791aa29012a7..00000000000000 --- a/ports/libxmp-lite/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libxmp-lite -Version: 4.4.1-6 -Homepage: https://sourceforge.net/projects/xmp/ -Description: Lightweight version of libxmp that supports MOD, S3M, XM and IT modules. diff --git a/ports/libxmp-lite/vcpkg.json b/ports/libxmp-lite/vcpkg.json new file mode 100644 index 00000000000000..ec4ffce7847984 --- /dev/null +++ b/ports/libxmp-lite/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libxmp-lite", + "version-string": "4.4.1", + "port-version": 7, + "description": "Lightweight version of libxmp that supports MOD, S3M, XM and IT modules.", + "homepage": "https://sourceforge.net/projects/xmp/" +} diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL deleted file mode 100644 index d6d9107c28f972..00000000000000 --- a/ports/libyaml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libyaml -Version: 0.2.5 -Homepage: https://github.com/yaml/libyaml -Description: A C library for parsing and emitting YAML. diff --git a/ports/libyaml/vcpkg.json b/ports/libyaml/vcpkg.json new file mode 100644 index 00000000000000..da3bff85b96bbb --- /dev/null +++ b/ports/libyaml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "libyaml", + "version-string": "0.2.5", + "port-version": 1, + "description": "A C library for parsing and emitting YAML.", + "homepage": "https://github.com/yaml/libyaml" +} diff --git a/ports/libzen/CONTROL b/ports/libzen/CONTROL deleted file mode 100644 index 7470be2bd22a5a..00000000000000 --- a/ports/libzen/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: libzen -Version: 0.4.38 -Description: ZenLib is a C++ utility library for easiest cross-platform development diff --git a/ports/libzen/vcpkg.json b/ports/libzen/vcpkg.json new file mode 100644 index 00000000000000..86b8cba2bef77d --- /dev/null +++ b/ports/libzen/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "libzen", + "version-string": "0.4.38", + "port-version": 1, + "description": "ZenLib is a C++ utility library for easiest cross-platform development" +} diff --git a/ports/libzippp/CONTROL b/ports/libzippp/CONTROL deleted file mode 100644 index 830675d365d565..00000000000000 --- a/ports/libzippp/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: libzippp -Version: 5.0-1.8.0 -Homepage: https://github.com/ctabin/libzippp -Description: Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling -Build-Depends: zlib, libzip[core,bzip2] - -Feature: encryption -Description: Support encryption diff --git a/ports/libzippp/vcpkg.json b/ports/libzippp/vcpkg.json new file mode 100644 index 00000000000000..e17b123b287893 --- /dev/null +++ b/ports/libzippp/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libzippp", + "version-string": "5.0-1.8.0", + "port-version": 1, + "description": "Simple basic C++ wrapper around the libzip library. It is meant to be a portable and easy-to-use library for ZIP handling", + "homepage": "https://github.com/ctabin/libzippp", + "dependencies": [ + { + "name": "libzip", + "default-features": false, + "features": [ + "bzip2" + ] + }, + "zlib" + ], + "features": { + "encryption": { + "description": "Support encryption" + } + } +} diff --git a/ports/licensepp/CONTROL b/ports/licensepp/CONTROL deleted file mode 100644 index b9bf20b7b970c1..00000000000000 --- a/ports/licensepp/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: licensepp -Version: 2020-05-19 -Port-Version: 1 -Description: Cross platform software licensing library -Build-Depends: cryptopp[pem-pack] -Supports: !uwp -Homepage: https://github.com/zuhd-org/licensepp diff --git a/ports/licensepp/vcpkg.json b/ports/licensepp/vcpkg.json new file mode 100644 index 00000000000000..04de78675ebca8 --- /dev/null +++ b/ports/licensepp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "licensepp", + "version-string": "2020-05-19", + "port-version": 2, + "description": "Cross platform software licensing library", + "homepage": "https://github.com/zuhd-org/licensepp", + "supports": "!uwp", + "dependencies": [ + { + "name": "cryptopp", + "features": [ + "pem-pack" + ] + } + ] +} diff --git a/ports/linalg/CONTROL b/ports/linalg/CONTROL deleted file mode 100644 index eb2afe6f3622d8..00000000000000 --- a/ports/linalg/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: linalg -Version: 2.1 -Description: linalg.h is a single header public domain linear algebra library for C++11 diff --git a/ports/linalg/vcpkg.json b/ports/linalg/vcpkg.json new file mode 100644 index 00000000000000..07871bcfdb0d22 --- /dev/null +++ b/ports/linalg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "linalg", + "version-string": "2.1", + "port-version": 1, + "description": "linalg.h is a single header public domain linear algebra library for C++11" +} diff --git a/ports/linenoise-ng/CONTROL b/ports/linenoise-ng/CONTROL deleted file mode 100644 index cb5f9429ae5b56..00000000000000 --- a/ports/linenoise-ng/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: linenoise-ng -Version: 4754bee2d8eb3-1 -Description: A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters. \ No newline at end of file diff --git a/ports/linenoise-ng/vcpkg.json b/ports/linenoise-ng/vcpkg.json new file mode 100644 index 00000000000000..01e6e121ef2f1b --- /dev/null +++ b/ports/linenoise-ng/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "linenoise-ng", + "version-string": "4754bee2d8eb3", + "port-version": 2, + "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters." +} diff --git a/ports/live555/CONTROL b/ports/live555/CONTROL deleted file mode 100644 index 490972f093b830..00000000000000 --- a/ports/live555/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: live555 -Version: latest-1 -Homepage: https://www.live555.com/liveMedia -Description: A complete RTSP server application -Build-Depends: openssl diff --git a/ports/live555/vcpkg.json b/ports/live555/vcpkg.json new file mode 100644 index 00000000000000..176110f2d57141 --- /dev/null +++ b/ports/live555/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "live555", + "version-string": "latest", + "port-version": 2, + "description": "A complete RTSP server application", + "homepage": "https://www.live555.com/liveMedia", + "dependencies": [ + "openssl" + ] +} diff --git a/ports/llfio/CONTROL b/ports/llfio/CONTROL deleted file mode 100644 index 4779cf0453d06b..00000000000000 --- a/ports/llfio/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -Source: llfio -Version: 2.0-20210420 -Homepage: https://github.com/ned14/llfio -Description: P1031 low level file i/o and filesystem library for the C++ standard -Build-Depends: outcome -Supports: !(uwp|static) - -Feature: status-code -Description: Have LLFIO use SG14 `status_code` (proposed `std::error`) instead of `std::error_code`. - -Feature: run-tests -Description: Build and run the dependency validation tests diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json new file mode 100644 index 00000000000000..8f343387c5f731 --- /dev/null +++ b/ports/llfio/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "llfio", + "version-string": "2.0", + "port-version": 20210421, + "description": "P1031 low level file i/o and filesystem library for the C++ standard", + "homepage": "https://github.com/ned14/llfio", + "supports": "!(uwp | static)", + "dependencies": [ + "outcome" + ], + "features": { + "run-tests": { + "description": "Build and run the dependency validation tests" + }, + "status-code": { + "description": "Have LLFIO use SG14 `status_code` (proposed `std::error`) instead of `std::error_code`." + } + } +} diff --git a/ports/llgl/CONTROL b/ports/llgl/CONTROL deleted file mode 100644 index 48341f27dc427d..00000000000000 --- a/ports/llgl/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -Source: llgl -Version: 2019-08-15 -Port-Version: 1 -Homepage: https://github.com/LukasBanana/LLGL -Description: Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal. -Supports: !uwp - -Feature: opengl -Description: Support for opengl - -Feature: direct3d11 -Description: Support for direct3d11 \ No newline at end of file diff --git a/ports/llgl/vcpkg.json b/ports/llgl/vcpkg.json new file mode 100644 index 00000000000000..f653d01f597d1f --- /dev/null +++ b/ports/llgl/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "llgl", + "version-string": "2019-08-15", + "port-version": 2, + "description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.", + "homepage": "https://github.com/LukasBanana/LLGL", + "supports": "!uwp", + "features": { + "direct3d11": { + "description": "Support for direct3d11" + }, + "opengl": { + "description": "Support for opengl" + } + } +} diff --git a/ports/lmdb/CONTROL b/ports/lmdb/CONTROL deleted file mode 100644 index baee5bd2dcf801..00000000000000 --- a/ports/lmdb/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: lmdb -Version: 0.9.24 -Homepage: https://github.com/LMDB/lmdb -Description: LMDB is an extraordinarily fast, memory-efficient database diff --git a/ports/lmdb/vcpkg.json b/ports/lmdb/vcpkg.json new file mode 100644 index 00000000000000..011be1311074e1 --- /dev/null +++ b/ports/lmdb/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lmdb", + "version-string": "0.9.24", + "port-version": 1, + "description": "LMDB is an extraordinarily fast, memory-efficient database", + "homepage": "https://github.com/LMDB/lmdb" +} diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL deleted file mode 100644 index 39e877fbc2bdfd..00000000000000 --- a/ports/log4cplus/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: log4cplus -Version: 2.0.5 -Port-Version: 1 -Homepage: https://github.com/log4cplus/log4cplus -Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration -Build-Depends: catch - -Feature: unicode -Description: Unicode logger diff --git a/ports/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json new file mode 100644 index 00000000000000..e80dd9e46f0d45 --- /dev/null +++ b/ports/log4cplus/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "log4cplus", + "version-string": "2.0.5", + "port-version": 2, + "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", + "homepage": "https://github.com/log4cplus/log4cplus", + "dependencies": [ + "catch" + ], + "features": { + "unicode": { + "description": "Unicode logger" + } + } +} diff --git a/ports/log4cpp/CONTROL b/ports/log4cpp/CONTROL deleted file mode 100644 index 2b43a635cd62a3..00000000000000 --- a/ports/log4cpp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: log4cpp -Version: 2.9.1 -Port-Version: 4 -Homepage: https://github.com/orocos-toolchain/log4cpp -Description: Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable. -Supports: !uwp diff --git a/ports/log4cpp/vcpkg.json b/ports/log4cpp/vcpkg.json new file mode 100644 index 00000000000000..18c56ff490eabe --- /dev/null +++ b/ports/log4cpp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "log4cpp", + "version-string": "2.9.1", + "port-version": 5, + "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.", + "homepage": "https://github.com/orocos-toolchain/log4cpp", + "supports": "!uwp" +} diff --git a/ports/log4cxx/CONTROL b/ports/log4cxx/CONTROL deleted file mode 100644 index bf34f4ba071c3c..00000000000000 --- a/ports/log4cxx/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: log4cxx -Version: 0.11.0 -Port-Version: 2 -Homepage: https://logging.apache.org/log4cxx -Description: Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR -Supports: !uwp -Build-Depends: apr, apr-util, expat diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json new file mode 100644 index 00000000000000..c10ca296041510 --- /dev/null +++ b/ports/log4cxx/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "log4cxx", + "version-string": "0.11.0", + "port-version": 3, + "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", + "homepage": "https://logging.apache.org/log4cxx", + "supports": "!uwp", + "dependencies": [ + "apr", + "apr-util", + "expat" + ] +} diff --git a/ports/loguru/CONTROL b/ports/loguru/CONTROL deleted file mode 100644 index dd800304d0b5d1..00000000000000 --- a/ports/loguru/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: loguru -Version: 2.1.0-1 -Homepage: https://github.com/emilk/loguru -Description: A lightweight and flexible C++ logging library diff --git a/ports/loguru/vcpkg.json b/ports/loguru/vcpkg.json new file mode 100644 index 00000000000000..b29fb65c8bf2c8 --- /dev/null +++ b/ports/loguru/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "loguru", + "version-string": "2.1.0", + "port-version": 2, + "description": "A lightweight and flexible C++ logging library", + "homepage": "https://github.com/emilk/loguru" +} diff --git a/ports/lpeg/CONTROL b/ports/lpeg/CONTROL deleted file mode 100644 index c88fdada21c73f..00000000000000 --- a/ports/lpeg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lpeg -Version: 1.0.2-1 -Homepage: https://www.inf.puc-rio.br/~roberto/lpeg -Description: LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs). -Build-Depends: lua diff --git a/ports/lpeg/vcpkg.json b/ports/lpeg/vcpkg.json new file mode 100644 index 00000000000000..7e4c8b30379da4 --- /dev/null +++ b/ports/lpeg/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "lpeg", + "version-string": "1.0.2", + "port-version": 2, + "description": "LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).", + "homepage": "https://www.inf.puc-rio.br/~roberto/lpeg", + "dependencies": [ + "lua" + ] +} diff --git a/ports/luabridge/CONTROL b/ports/luabridge/CONTROL deleted file mode 100644 index d8a0840196410d..00000000000000 --- a/ports/luabridge/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: luabridge -Version: 2.6 -Description: A lightweight, dependency-free library for binding Lua to C++ diff --git a/ports/luabridge/vcpkg.json b/ports/luabridge/vcpkg.json new file mode 100644 index 00000000000000..e26ef433917534 --- /dev/null +++ b/ports/luabridge/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "luabridge", + "version-string": "2.6", + "port-version": 1, + "description": "A lightweight, dependency-free library for binding Lua to C++" +} diff --git a/ports/luafilesystem/CONTROL b/ports/luafilesystem/CONTROL deleted file mode 100644 index 021620ec10a7bd..00000000000000 --- a/ports/luafilesystem/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: luafilesystem -Version: 1.8.0-1 -Homepage: https://github.com/keplerproject/luafilesystem -Description: LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution. -Build-Depends: lua diff --git a/ports/luafilesystem/vcpkg.json b/ports/luafilesystem/vcpkg.json new file mode 100644 index 00000000000000..bdc33582d6984b --- /dev/null +++ b/ports/luafilesystem/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "luafilesystem", + "version-string": "1.8.0", + "port-version": 2, + "description": "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.", + "homepage": "https://github.com/keplerproject/luafilesystem", + "dependencies": [ + "lua" + ] +} diff --git a/ports/luajit/CONTROL b/ports/luajit/CONTROL deleted file mode 100644 index f37d4dcbeb63b3..00000000000000 --- a/ports/luajit/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: luajit -Version: 2.0.5-3 -Homepage: https://github.com/LuaJIT/LuaJIT -Description: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. -Supports: !uwp \ No newline at end of file diff --git a/ports/luajit/vcpkg.json b/ports/luajit/vcpkg.json new file mode 100644 index 00000000000000..e4cd839f458aea --- /dev/null +++ b/ports/luajit/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "luajit", + "version-string": "2.0.5", + "port-version": 4, + "description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.", + "homepage": "https://github.com/LuaJIT/LuaJIT", + "supports": "!uwp" +} diff --git a/ports/luasocket/CONTROL b/ports/luasocket/CONTROL deleted file mode 100644 index 41ec382ce7d5d0..00000000000000 --- a/ports/luasocket/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: luasocket -Version: 2020-09-14 -Homepage: https://github.com/diegonehab/luasocket -Description: LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet. -Build-Depends: lua diff --git a/ports/luasocket/vcpkg.json b/ports/luasocket/vcpkg.json new file mode 100644 index 00000000000000..064972699205e2 --- /dev/null +++ b/ports/luasocket/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "luasocket", + "version-string": "2020-09-14", + "port-version": 1, + "description": "LuaSocket is a Lua extension library that is composed by two parts: a C core that provides support for the TCP and UDP transport layers, and a set of Lua modules that add support for functionality commonly needed by applications that deal with the Internet.", + "homepage": "https://github.com/diegonehab/luasocket", + "dependencies": [ + "lua" + ] +} diff --git a/ports/lz4/CONTROL b/ports/lz4/CONTROL deleted file mode 100644 index 43b4f61172efd3..00000000000000 --- a/ports/lz4/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lz4 -Version: 1.9.3 -Homepage: https://github.com/lz4/lz4 -Description: Lossless compression algorithm, providing compression speed at 400 MB/s per core. -Build-Depends: xxhash diff --git a/ports/lz4/vcpkg.json b/ports/lz4/vcpkg.json new file mode 100644 index 00000000000000..f38d5defb7284e --- /dev/null +++ b/ports/lz4/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "lz4", + "version-string": "1.9.3", + "port-version": 1, + "description": "Lossless compression algorithm, providing compression speed at 400 MB/s per core.", + "homepage": "https://github.com/lz4/lz4", + "dependencies": [ + "xxhash" + ] +} diff --git a/ports/lzfse/CONTROL b/ports/lzfse/CONTROL deleted file mode 100644 index cc4669974139cc..00000000000000 --- a/ports/lzfse/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lzfse -Version: 1.0-2 -Homepage: https://github.com/lzfse/lzfse -Description: Lempel-Ziv style data compressor using Finite State Entropy coding. -Supports: !arm \ No newline at end of file diff --git a/ports/lzfse/vcpkg.json b/ports/lzfse/vcpkg.json new file mode 100644 index 00000000000000..774da1302a817d --- /dev/null +++ b/ports/lzfse/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "lzfse", + "version-string": "1.0", + "port-version": 3, + "description": "Lempel-Ziv style data compressor using Finite State Entropy coding.", + "homepage": "https://github.com/lzfse/lzfse", + "supports": "!arm" +} diff --git a/ports/lzo/CONTROL b/ports/lzo/CONTROL deleted file mode 100644 index fa904083ab12a7..00000000000000 --- a/ports/lzo/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: lzo -Version: 2.10 -Port-Version: 6 -Homepage: https://www.oberhumer.com/opensource/lzo/ -Description: Lossless data compression library diff --git a/ports/lzo/vcpkg.json b/ports/lzo/vcpkg.json new file mode 100644 index 00000000000000..0e238c8253b037 --- /dev/null +++ b/ports/lzo/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "lzo", + "version-string": "2.10", + "port-version": 7, + "description": "Lossless data compression library", + "homepage": "https://www.oberhumer.com/opensource/lzo/" +} diff --git a/ports/magic-enum/CONTROL b/ports/magic-enum/CONTROL deleted file mode 100644 index ae6aa68b876680..00000000000000 --- a/ports/magic-enum/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: magic-enum -Version: 0.7.3 -Description: Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code. -Homepage: https://github.com/Neargye/magic_enum diff --git a/ports/magic-enum/vcpkg.json b/ports/magic-enum/vcpkg.json new file mode 100644 index 00000000000000..44979659563122 --- /dev/null +++ b/ports/magic-enum/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "magic-enum", + "version-string": "0.7.3", + "port-version": 1, + "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.", + "homepage": "https://github.com/Neargye/magic_enum" +} diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL deleted file mode 100644 index b9583b5f18ead0..00000000000000 --- a/ports/magnum-extras/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: magnum-extras -Version: 2020.06 -Build-Depends: magnum[core] -Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization -Homepage: https://magnum.graphics/ - -Feature: ui -Description: Ui library -Build-Depends: corrade[interconnect], magnum[text] diff --git a/ports/magnum-extras/vcpkg.json b/ports/magnum-extras/vcpkg.json new file mode 100644 index 00000000000000..8ed9aa296c8e2d --- /dev/null +++ b/ports/magnum-extras/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "magnum-extras", + "version-string": "2020.06", + "port-version": 1, + "description": "Extras for magnum, C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "magnum", + "default-features": false + } + ], + "features": { + "ui": { + "description": "Ui library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "interconnect" + ] + }, + { + "name": "magnum", + "features": [ + "text" + ] + } + ] + } + } +} diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL deleted file mode 100644 index 893ce966f1331a..00000000000000 --- a/ports/magnum-integration/CONTROL +++ /dev/null @@ -1,27 +0,0 @@ -Source: magnum-integration -Version: 2020.06 -Build-Depends: magnum[core] -Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization -Homepage: https://magnum.graphics/ - -Feature: bullet -Description: BulletIntegration library -Build-Depends: bullet3 - -Feature: eigen -Description: EigenIntegration library -Build-Depends: eigen3 - -Feature: glm -Description: GlmIntegration library -Build-Depends: glm - -Feature: imgui -Description: ImGuiIntegration library -Build-Depends: imgui -#Feature: ovr -#Description: OvrIntegration library -#Build-Depends: ovrsdk -#Feature: dart -#Description: DartIntegration library -#Build-Depends: dart diff --git a/ports/magnum-integration/vcpkg.json b/ports/magnum-integration/vcpkg.json new file mode 100644 index 00000000000000..9d50cd69dd99fe --- /dev/null +++ b/ports/magnum-integration/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "magnum-integration", + "version-string": "2020.06", + "port-version": 1, + "description": "Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "magnum", + "default-features": false + } + ], + "features": { + "bullet": { + "description": "BulletIntegration library", + "dependencies": [ + "bullet3" + ] + }, + "eigen": { + "description": "EigenIntegration library", + "dependencies": [ + "eigen3" + ] + }, + "glm": { + "description": "GlmIntegration library", + "dependencies": [ + "glm" + ] + }, + "imgui": { + "description": "ImGuiIntegration library", + "dependencies": [ + "imgui" + ] + } + } +} diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL deleted file mode 100644 index 09eaab78268770..00000000000000 --- a/ports/magnum-plugins/CONTROL +++ /dev/null @@ -1,125 +0,0 @@ -Source: magnum-plugins -Version: 2020.06 -Port-Version: 6 -Build-Depends: magnum[core] -Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization -Homepage: https://magnum.graphics/ -Default-Features: ddsimporter, icoimporter, miniexrimageconverter, opengeximporter, stanfordimporter, stanfordsceneconverter, stbimageconverter, stbimageimporter, stlimporter - -Feature: assimpimporter -Description: AssimpImporter plugin -Build-Depends: assimp, magnum[core,anyimageimporter], magnum[core,trade] - -Feature: openddl -Description: OpenDdl library - -Feature: basisimageconverter -Description: BasisImageConverter plugin -Build-Depends: magnum[core,trade] - -Feature: basisimporter -Description: BasisImporter plugin -Build-Depends: magnum[core,trade] - -Feature: ddsimporter -Description: DdsImporter plugin -Build-Depends: magnum[core,trade] - -Feature: devilimageimporter -Description: DevIlImageImporter plugin -Build-Depends: devil, magnum[core,trade] - -Feature: drflacaudioimporter -Description: DrFlacAudioImporter plugin -Build-Depends: magnum[core,audio] - -Feature: drmp3audioimporter -Description: DrMp3AudioImporter plugin -Build-Depends: magnum[core,audio] - -Feature: drwavaudioimporter -Description: DrWavAudioImporter plugin -Build-Depends: magnum[core,audio] -#Feature: faad2audioimporter -#Description: Faad2AudioImporter plugin -#Build-Depends: magnum[core,audio], faad2 - -Feature: freetypefont -Description: FreeTypeFont plugin -Build-Depends: freetype, magnum[core,text] - -Feature: glslangshaderconverter -Description: GlslangShaderConverter plugin -Build-Depends: glslang, magnum[core,shadertools] - -Feature: harfbuzzfont -Description: HarfBuzzFont plugin -Build-Depends: harfbuzz, magnum-plugins[core,freetypefont] - -Feature: icoimporter -Description: IcoImporter plugin -Build-Depends: magnum[core,trade] - -Feature: jpegimporter -Description: JpegImporter plugin -Build-Depends: libjpeg-turbo, magnum[core,trade] - -Feature: jpegimageconverter -Description: JpegImageConverter plugin -Build-Depends: libjpeg-turbo, magnum[core,trade] - -Feature: meshoptimizersceneconverter -Description: MeshOptimizerSceneConverter plugin -Build-Depends: magnum[core,trade], meshoptimizer - -Feature: miniexrimageconverter -Description: MiniExrImageConverter plugin -Build-Depends: magnum[core,trade] - -Feature: opengeximporter -Description: OpenGexImporter plugin -Build-Depends: magnum[core,anyimageimporter], magnum[core,trade], magnum-plugins[core,openddl] - -Feature: pngimageconverter -Description: PngImageConverter plugin -Build-Depends: libpng, magnum[core,trade] - -Feature: pngimporter -Description: PngImporter plugin -Build-Depends: libpng, magnum[core,trade] - -Feature: spirvtoolsshaderconverter -Description: SpirvToolsShaderConverter plugin -Build-Depends: spirv-tools, magnum[core,shadertools] - -Feature: stanfordimporter -Description: StanfordImporter plugin -Build-Depends: magnum[core,trade] - -Feature: stanfordsceneconverter -Description: StanfordSceneConverter plugin -Build-Depends: magnum[core,trade] - -Feature: stbimageconverter -Description: StbImageConverter plugin -Build-Depends: magnum[core,trade] - -Feature: stbimageimporter -Description: StbImageImporter plugin -Build-Depends: magnum[core,trade] - -Feature: stbtruetypefont -Description: StbTrueTypeFont plugin -Build-Depends: magnum[core,text] - -Feature: stbvorbisaudioimporter -Description: StbVorbisAudioImporter plugin -Build-Depends: magnum[core,audio] - -Feature: stlimporter -Description: StlImporter plugin -Build-Depends: magnum[core,trade] - -Feature: tinygltfimporter -Description: TinyGltfImporter plugin -Build-Depends: magnum[core,anyimageimporter], magnum-plugins[core,stbimageimporter], magnum[core,trade] diff --git a/ports/magnum-plugins/vcpkg.json b/ports/magnum-plugins/vcpkg.json new file mode 100644 index 00000000000000..d4280e76b889a8 --- /dev/null +++ b/ports/magnum-plugins/vcpkg.json @@ -0,0 +1,411 @@ +{ + "name": "magnum-plugins", + "version-string": "2020.06", + "port-version": 7, + "description": "Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "magnum", + "default-features": false + } + ], + "default-features": [ + "ddsimporter", + "icoimporter", + "miniexrimageconverter", + "opengeximporter", + "stanfordimporter", + "stanfordsceneconverter", + "stbimageconverter", + "stbimageimporter", + "stlimporter" + ], + "features": { + "assimpimporter": { + "description": "AssimpImporter plugin", + "dependencies": [ + "assimp", + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "basisimageconverter": { + "description": "BasisImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "basisimporter": { + "description": "BasisImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "ddsimporter": { + "description": "DdsImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "devilimageimporter": { + "description": "DevIlImageImporter plugin", + "dependencies": [ + "devil", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "drflacaudioimporter": { + "description": "DrFlacAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "drmp3audioimporter": { + "description": "DrMp3AudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "drwavaudioimporter": { + "description": "DrWavAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "freetypefont": { + "description": "FreeTypeFont plugin", + "dependencies": [ + "freetype", + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "glslangshaderconverter": { + "description": "GlslangShaderConverter plugin", + "dependencies": [ + "glslang", + { + "name": "magnum", + "default-features": false, + "features": [ + "shadertools" + ] + } + ] + }, + "harfbuzzfont": { + "description": "HarfBuzzFont plugin", + "dependencies": [ + "harfbuzz", + { + "name": "magnum-plugins", + "default-features": false, + "features": [ + "freetypefont" + ] + } + ] + }, + "icoimporter": { + "description": "IcoImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "jpegimageconverter": { + "description": "JpegImageConverter plugin", + "dependencies": [ + "libjpeg-turbo", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "jpegimporter": { + "description": "JpegImporter plugin", + "dependencies": [ + "libjpeg-turbo", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "meshoptimizersceneconverter": { + "description": "MeshOptimizerSceneConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "meshoptimizer" + ] + }, + "miniexrimageconverter": { + "description": "MiniExrImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "openddl": { + "description": "OpenDdl library" + }, + "opengeximporter": { + "description": "OpenGexImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + { + "name": "magnum-plugins", + "default-features": false, + "features": [ + "openddl" + ] + } + ] + }, + "pngimageconverter": { + "description": "PngImageConverter plugin", + "dependencies": [ + "libpng", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "pngimporter": { + "description": "PngImporter plugin", + "dependencies": [ + "libpng", + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "spirvtoolsshaderconverter": { + "description": "SpirvToolsShaderConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "shadertools" + ] + }, + "spirv-tools" + ] + }, + "stanfordimporter": { + "description": "StanfordImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stanfordsceneconverter": { + "description": "StanfordSceneConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stbimageconverter": { + "description": "StbImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stbimageimporter": { + "description": "StbImageImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "stbtruetypefont": { + "description": "StbTrueTypeFont plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "stbvorbisaudioimporter": { + "description": "StbVorbisAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "stlimporter": { + "description": "StlImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "tinygltfimporter": { + "description": "TinyGltfImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + { + "name": "magnum-plugins", + "default-features": false, + "features": [ + "stbimageimporter" + ] + } + ] + } + } +} diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL deleted file mode 100644 index 1383eb1f8a8970..00000000000000 --- a/ports/magnum/CONTROL +++ /dev/null @@ -1,175 +0,0 @@ -Source: magnum -Version: 2020.06 -Port-Version: 6 -Build-Depends: corrade[utility] -Description: C++11/C++14 graphics middleware for games and data visualization -Homepage: https://magnum.graphics/ -Default-Features: anyaudioimporter, anyimageimporter, anyimageconverter, anysceneconverter, anysceneimporter, anyshaderconverter, debugtools, gl, meshtools, primitives, scenegraph, shaders, shadertools, text, texturetools, trade, sdl2application - -Feature: al-info -Description: magnum-al-info utility -Build-Depends: magnum[core,audio] - -Feature: anyimageimporter -Description: AnyImageImporter plugin -Build-Depends: magnum[core,trade] - -Feature: anyaudioimporter -Description: AnyAudioImporter plugin -Build-Depends: magnum[core,audio], corrade[pluginmanager] - -Feature: anyimageconverter -Description: AnyImageConverter plugin -Build-Depends: magnum[core,trade] - -Feature: anysceneconverter -Description: AnySceneConverter plugin -Build-Depends: magnum[core,trade] - -Feature: anysceneimporter -Description: AnySceneImporter plugin -Build-Depends: magnum[core,trade] - -Feature: anyshaderconverter -Description: AnyShaderConverter plugin -Build-Depends: magnum[core,shadertools] - -Feature: audio -Description: Audio library -Build-Depends: openal-soft - -Feature: debugtools -Description: DebugTools library - -Feature: distancefieldconverter -Description: magnum-distancefieldconverter utility -Build-Depends: magnum[core,texturetools], magnum[core,gl] - -Feature: fontconverter -Description: magnum-fontconverter utility -Build-Depends: magnum[core,text], magnum[core,gl] - -Feature: gl -Description: GL library - -Feature: gl-info -Description: gl-info utility -Build-Depends: magnum[core,gl] - -Feature: glfwapplication -Description: GlfwApplication library -Build-Depends: glfw3 - -Feature: imageconverter -Description: magnum-imageconverter utility -Build-Depends: magnum[core,trade] - -Feature: magnumfont -Description: MagnumFont plugin -Build-Depends: magnum[core,text] - -Feature: magnumfontconverter -Description: MagnumFontConverter plugin -Build-Depends: magnum[core,text], magnum[core,tgaimageconverter] - -Feature: meshtools -Description: MeshTools library -Build-Depends: magnum[core,trade] - -Feature: objimporter -Description: ObjImporter plugin -Build-Depends: magnum[core,trade] - -Feature: tgaimageconverter -Description: TgaImageConverter plugin -Build-Depends: magnum[core,trade] - -Feature: opengltester -Description: OpenGLTester library -Build-Depends: corrade[testsuite], magnum[core,gl] - -Feature: primitives -Description: Primitives library -Build-Depends: magnum[core,trade] - -Feature: sdl2application -Description: Sdl2Application library -Build-Depends: sdl2 - -Feature: scenegraph -Description: SceneGraph library - -Feature: sceneconverter -Description: magnum-sceneconverter utility -Build-Depends: magnum[core,anysceneconverter] - -Feature: shaderconverter -Description: magnum-shaderconverter utility -Build-Depends: magnum[core,shadertools,anyshaderconverter] - -Feature: shaders -Description: Shaders library -Build-Depends: magnum[core,gl] - -Feature: text -Description: Text library -Build-Depends: magnum[core,texturetools], magnum[core,gl], corrade[pluginmanager] - -Feature: texturetools -Description: TextureTools library - -Feature: tgaimporter -Description: TgaImporter plugin -Build-Depends: magnum[core,trade] - -Feature: trade -Description: Trade library -Build-Depends: corrade[pluginmanager] - -Feature: wavaudioimporter -Description: WavAudioImporter plugin -Build-Depends: magnum[core,audio] - -Feature: windowlesscglapplication -Description: WindowlessCglApplication library -Build-Depends: magnum[core,gl] - -Feature: cglcontext -Description: CglContext library -Build-Depends: magnum[core,gl] - -Feature: windowlesswglapplication -Description: WindowlessWglApplication library -Build-Depends: magnum[core,gl] - -Feature: wglcontext -Description: WglContext library -Build-Depends: magnum[core,gl] - -Feature: windowlesseglapplication -Description: WindowlessEglApplication library -Build-Depends: magnum[core,gl] - -Feature: eglcontext -Description: EglContext library -Build-Depends: magnum[core,gl] - -Feature: windowlessglxapplication -Description: WindowlessGlxApplication library -Build-Depends: magnum[core,gl] - -Feature: glxcontext -Description: GlxContext library -Build-Depends: magnum[core,gl] - -Feature: shadertools -Description: ShaderTools library - -Feature: vk -Description: Vk library -Build-Depends: vulkan - -Feature: vk-info -Description: vk-info utility -Build-Depends: magnum[core,vk] - diff --git a/ports/magnum/vcpkg.json b/ports/magnum/vcpkg.json new file mode 100644 index 00000000000000..246c279140b61c --- /dev/null +++ b/ports/magnum/vcpkg.json @@ -0,0 +1,529 @@ +{ + "name": "magnum", + "version-string": "2020.06", + "port-version": 7, + "description": "C++11/C++14 graphics middleware for games and data visualization", + "homepage": "https://magnum.graphics/", + "dependencies": [ + { + "name": "corrade", + "features": [ + "utility" + ] + } + ], + "default-features": [ + "anyaudioimporter", + "anyimageconverter", + "anyimageimporter", + "anysceneconverter", + "anysceneimporter", + "anyshaderconverter", + "debugtools", + "gl", + "meshtools", + "primitives", + "scenegraph", + "sdl2application", + "shaders", + "shadertools", + "text", + "texturetools", + "trade" + ], + "features": { + "al-info": { + "description": "magnum-al-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "anyaudioimporter": { + "description": "AnyAudioImporter plugin", + "dependencies": [ + { + "name": "corrade", + "features": [ + "pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "anyimageconverter": { + "description": "AnyImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anyimageimporter": { + "description": "AnyImageImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anysceneconverter": { + "description": "AnySceneConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anysceneimporter": { + "description": "AnySceneImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "anyshaderconverter": { + "description": "AnyShaderConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "shadertools" + ] + } + ] + }, + "audio": { + "description": "Audio library", + "dependencies": [ + "openal-soft" + ] + }, + "cglcontext": { + "description": "CglContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "debugtools": { + "description": "DebugTools library" + }, + "distancefieldconverter": { + "description": "magnum-distancefieldconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "texturetools" + ] + } + ] + }, + "eglcontext": { + "description": "EglContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "fontconverter": { + "description": "magnum-fontconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "gl": { + "description": "GL library" + }, + "gl-info": { + "description": "gl-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "glfwapplication": { + "description": "GlfwApplication library", + "dependencies": [ + "glfw3" + ] + }, + "glxcontext": { + "description": "GlxContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "imageconverter": { + "description": "magnum-imageconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "magnumfont": { + "description": "MagnumFont plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + } + ] + }, + "magnumfontconverter": { + "description": "MagnumFontConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "text" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "tgaimageconverter" + ] + } + ] + }, + "meshtools": { + "description": "MeshTools library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "objimporter": { + "description": "ObjImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "opengltester": { + "description": "OpenGLTester library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "testsuite" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "primitives": { + "description": "Primitives library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "sceneconverter": { + "description": "magnum-sceneconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anysceneconverter" + ] + } + ] + }, + "scenegraph": { + "description": "SceneGraph library" + }, + "sdl2application": { + "description": "Sdl2Application library", + "dependencies": [ + "sdl2" + ] + }, + "shaderconverter": { + "description": "magnum-shaderconverter utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyshaderconverter", + "shadertools" + ] + } + ] + }, + "shaders": { + "description": "Shaders library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "shadertools": { + "description": "ShaderTools library" + }, + "text": { + "description": "Text library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "pluginmanager" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + }, + { + "name": "magnum", + "default-features": false, + "features": [ + "texturetools" + ] + } + ] + }, + "texturetools": { + "description": "TextureTools library" + }, + "tgaimageconverter": { + "description": "TgaImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "tgaimporter": { + "description": "TgaImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "trade": { + "description": "Trade library", + "dependencies": [ + { + "name": "corrade", + "features": [ + "pluginmanager" + ] + } + ] + }, + "vk": { + "description": "Vk library", + "dependencies": [ + "vulkan" + ] + }, + "vk-info": { + "description": "vk-info utility", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "vk" + ] + } + ] + }, + "wavaudioimporter": { + "description": "WavAudioImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "audio" + ] + } + ] + }, + "wglcontext": { + "description": "WglContext library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesscglapplication": { + "description": "WindowlessCglApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesseglapplication": { + "description": "WindowlessEglApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlessglxapplication": { + "description": "WindowlessGlxApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + }, + "windowlesswglapplication": { + "description": "WindowlessWglApplication library", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "gl" + ] + } + ] + } + } +} diff --git a/ports/mapbox-variant/CONTROL b/ports/mapbox-variant/CONTROL deleted file mode 100644 index 5b3aaafefb3a17..00000000000000 --- a/ports/mapbox-variant/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: mapbox-variant -Version: 1.2.0 -Description: C++11/C++14 Variant diff --git a/ports/mapbox-variant/vcpkg.json b/ports/mapbox-variant/vcpkg.json new file mode 100644 index 00000000000000..91f0b61eca10a1 --- /dev/null +++ b/ports/mapbox-variant/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mapbox-variant", + "version-string": "1.2.0", + "port-version": 1, + "description": "C++11/C++14 Variant" +} diff --git a/ports/mathc/CONTROL b/ports/mathc/CONTROL deleted file mode 100644 index 47292b5c430d87..00000000000000 --- a/ports/mathc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mathc -Version: 2019-09-29 -Description: Pure C math library for 2D and 3D programming -Homepage: https://github.com/felselva/mathc diff --git a/ports/mathc/vcpkg.json b/ports/mathc/vcpkg.json new file mode 100644 index 00000000000000..1cabd8c53af394 --- /dev/null +++ b/ports/mathc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mathc", + "version-string": "2019-09-29", + "port-version": 1, + "description": "Pure C math library for 2D and 3D programming", + "homepage": "https://github.com/felselva/mathc" +} diff --git a/ports/mathgl/CONTROL b/ports/mathgl/CONTROL deleted file mode 100644 index 7dc82d3f97d770..00000000000000 --- a/ports/mathgl/CONTROL +++ /dev/null @@ -1,48 +0,0 @@ -Source: mathgl -Version: 2.4.3-6 -Description: MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions -Default-Features: opengl, jpeg, png, zlib - -Feature: hdf5 -Build-Depends: hdf5 -Description: hdf5 module - -Feature: fltk -Build-Depends: fltk -Description: fltk module - -Feature: gif -Build-Depends: giflib -Description: gif module - -Feature: png -Build-Depends: libpng -Description: png module - -Feature: zlib -Build-Depends: zlib -Description: zlib module - -Feature: jpeg -Build-Depends: libjpeg-turbo -Description: jpeg module - -Feature: gsl -Build-Depends: gsl -Description: gsl module - -Feature: opengl -Build-Depends: opengl -Description: opengl module - -Feature: glut -Build-Depends: freeglut -Description: glut module - -Feature: wx -Build-Depends: wxwidgets -Description: wx module - -Feature: qt5 -Build-Depends: qt5 -Description: qt5 module diff --git a/ports/mathgl/vcpkg.json b/ports/mathgl/vcpkg.json new file mode 100644 index 00000000000000..f3bfc67fa4708d --- /dev/null +++ b/ports/mathgl/vcpkg.json @@ -0,0 +1,80 @@ +{ + "name": "mathgl", + "version-string": "2.4.3", + "port-version": 7, + "description": "MathGL is a free library of fast C++ routines for the plotting of the data varied in one or more dimensions", + "default-features": [ + "jpeg", + "opengl", + "png", + "zlib" + ], + "features": { + "fltk": { + "description": "fltk module", + "dependencies": [ + "fltk" + ] + }, + "gif": { + "description": "gif module", + "dependencies": [ + "giflib" + ] + }, + "glut": { + "description": "glut module", + "dependencies": [ + "freeglut" + ] + }, + "gsl": { + "description": "gsl module", + "dependencies": [ + "gsl" + ] + }, + "hdf5": { + "description": "hdf5 module", + "dependencies": [ + "hdf5" + ] + }, + "jpeg": { + "description": "jpeg module", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "opengl": { + "description": "opengl module", + "dependencies": [ + "opengl" + ] + }, + "png": { + "description": "png module", + "dependencies": [ + "libpng" + ] + }, + "qt5": { + "description": "qt5 module", + "dependencies": [ + "qt5" + ] + }, + "wx": { + "description": "wx module", + "dependencies": [ + "wxwidgets" + ] + }, + "zlib": { + "description": "zlib module", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/matplotlib-cpp/CONTROL b/ports/matplotlib-cpp/CONTROL deleted file mode 100644 index 807f6c1cb51516..00000000000000 --- a/ports/matplotlib-cpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: matplotlib-cpp -Version: 2020-08-27 -Description: Extremely simple yet powerful header-only C++ plotting library built on the popular matplotlib -Homepage: https://github.com/lava/matplotlib-cpp diff --git a/ports/matplotlib-cpp/vcpkg.json b/ports/matplotlib-cpp/vcpkg.json new file mode 100644 index 00000000000000..83944db18a7d0d --- /dev/null +++ b/ports/matplotlib-cpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "matplotlib-cpp", + "version-string": "2020-08-27", + "port-version": 1, + "description": "Extremely simple yet powerful header-only C++ plotting library built on the popular matplotlib", + "homepage": "https://github.com/lava/matplotlib-cpp" +} diff --git a/ports/matroska/CONTROL b/ports/matroska/CONTROL deleted file mode 100644 index ba4f33c2c02b68..00000000000000 --- a/ports/matroska/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: matroska -Version: 1.6.2 -Homepage: https://github.com/Matroska-Org/libmatroska -Description: a C++ library to parse Matroska files (.mkv and .mka) -Build-Depends: ebml -Supports: !uwp \ No newline at end of file diff --git a/ports/matroska/vcpkg.json b/ports/matroska/vcpkg.json new file mode 100644 index 00000000000000..339ca0355a1a12 --- /dev/null +++ b/ports/matroska/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "matroska", + "version-string": "1.6.2", + "port-version": 1, + "description": "a C++ library to parse Matroska files (.mkv and .mka)", + "homepage": "https://github.com/Matroska-Org/libmatroska", + "supports": "!uwp", + "dependencies": [ + "ebml" + ] +} diff --git a/ports/mbedtls/CONTROL b/ports/mbedtls/CONTROL deleted file mode 100644 index dc8bded7bbfe11..00000000000000 --- a/ports/mbedtls/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: mbedtls -Version: 2.24.0 -Port-Version: 2 -Homepage: https://github.com/ARMmbed/mbedtls -Description: An open source, portable, easy to use, readable and flexible SSL library -Supports: !uwp - -Feature: pthreads -Build-Depends: pthreads (windows) -Description: Multi-threading support diff --git a/ports/mbedtls/vcpkg.json b/ports/mbedtls/vcpkg.json new file mode 100644 index 00000000000000..ec036a05f62094 --- /dev/null +++ b/ports/mbedtls/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "mbedtls", + "version-string": "2.24.0", + "port-version": 3, + "description": "An open source, portable, easy to use, readable and flexible SSL library", + "homepage": "https://github.com/ARMmbed/mbedtls", + "supports": "!uwp", + "features": { + "pthreads": { + "description": "Multi-threading support", + "dependencies": [ + { + "name": "pthreads", + "platform": "windows" + } + ] + } + } +} diff --git a/ports/mcpp/CONTROL b/ports/mcpp/CONTROL deleted file mode 100644 index dc607aeb04aaad..00000000000000 --- a/ports/mcpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mcpp -Version: 2.7.2.14 -Port-Version: 2 -Homepage: https://github.com/zeroc-ice/mcpp -Description: Fork of mcpp, a C/C++ preprocessor diff --git a/ports/mcpp/vcpkg.json b/ports/mcpp/vcpkg.json new file mode 100644 index 00000000000000..4be6e6f68b51d3 --- /dev/null +++ b/ports/mcpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mcpp", + "version-string": "2.7.2.14", + "port-version": 3, + "description": "Fork of mcpp, a C/C++ preprocessor", + "homepage": "https://github.com/zeroc-ice/mcpp" +} diff --git a/ports/mdnsresponder/CONTROL b/ports/mdnsresponder/CONTROL deleted file mode 100644 index a281e83bf4c2d0..00000000000000 --- a/ports/mdnsresponder/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: mdnsresponder -Version: 765.30.11 -Port-Version: 3 -Description: The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative. -Homepage: https://developer.apple.com/bonjour/ -Supports: !arm \ No newline at end of file diff --git a/ports/mdnsresponder/vcpkg.json b/ports/mdnsresponder/vcpkg.json new file mode 100644 index 00000000000000..0cdef4cb732300 --- /dev/null +++ b/ports/mdnsresponder/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "mdnsresponder", + "version-string": "765.30.11", + "port-version": 4, + "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.", + "homepage": "https://developer.apple.com/bonjour/", + "supports": "!arm" +} diff --git a/ports/mecab/CONTROL b/ports/mecab/CONTROL deleted file mode 100644 index 7e0e23612868eb..00000000000000 --- a/ports/mecab/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mecab -Version: 2019-09-25 -Port-Version: 1 -Description: A morphological analysis engine based on CRF -Supports: !(uwp|arm|arm64) diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json new file mode 100644 index 00000000000000..7475acf4a663cf --- /dev/null +++ b/ports/mecab/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mecab", + "version-string": "2019-09-25", + "port-version": 2, + "description": "A morphological analysis engine based on CRF", + "supports": "!(uwp | arm | arm64)" +} diff --git a/ports/memorymodule/CONTROL b/ports/memorymodule/CONTROL deleted file mode 100644 index ffc05ce9f91d1b..00000000000000 --- a/ports/memorymodule/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: memorymodule -Version: 2019-12-31 -Description: Library to load a DLL from memory -Homepage: https://github.com/fancycode/MemoryModule -Default-Features: unicode - -Feature: unicode -Description: Compile with UNICODE support diff --git a/ports/memorymodule/vcpkg.json b/ports/memorymodule/vcpkg.json new file mode 100644 index 00000000000000..3e5ca2f3a06e4b --- /dev/null +++ b/ports/memorymodule/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "memorymodule", + "version-string": "2019-12-31", + "port-version": 1, + "description": "Library to load a DLL from memory", + "homepage": "https://github.com/fancycode/MemoryModule", + "default-features": [ + "unicode" + ], + "features": { + "unicode": { + "description": "Compile with UNICODE support" + } + } +} diff --git a/ports/meschach/CONTROL b/ports/meschach/CONTROL deleted file mode 100644 index 2a9d86976450ac..00000000000000 --- a/ports/meschach/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: meschach -Version: 1.2b-3 -Homepage: https://homepage.math.uiowa.edu/~dstewart/meschach -Description: Matrix computations in C diff --git a/ports/meschach/vcpkg.json b/ports/meschach/vcpkg.json new file mode 100644 index 00000000000000..b22ceba583029a --- /dev/null +++ b/ports/meschach/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "meschach", + "version-string": "1.2b", + "port-version": 4, + "description": "Matrix computations in C", + "homepage": "https://homepage.math.uiowa.edu/~dstewart/meschach" +} diff --git a/ports/meshoptimizer/CONTROL b/ports/meshoptimizer/CONTROL deleted file mode 100644 index 320908e70c22e9..00000000000000 --- a/ports/meshoptimizer/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: meshoptimizer -Version: 0.14 -Port-Version: 1 -Homepage: https://github.com/zeux/meshoptimizer -Description: Mesh optimization library that makes meshes smaller and faster to render diff --git a/ports/meshoptimizer/vcpkg.json b/ports/meshoptimizer/vcpkg.json new file mode 100644 index 00000000000000..47439742eaabe6 --- /dev/null +++ b/ports/meshoptimizer/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "meshoptimizer", + "version-string": "0.14", + "port-version": 2, + "description": "Mesh optimization library that makes meshes smaller and faster to render", + "homepage": "https://github.com/zeux/meshoptimizer" +} diff --git a/ports/metis/CONTROL b/ports/metis/CONTROL deleted file mode 100644 index 8feca5689a7371..00000000000000 --- a/ports/metis/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: metis -Version: 5.1.0 -Port-Version: 7 -Homepage: https://glaros.dtc.umn.edu/gkhome/metis/metis/overview -Description: Serial Graph Partitioning and Fill-reducing Matrix Ordering diff --git a/ports/metis/vcpkg.json b/ports/metis/vcpkg.json new file mode 100644 index 00000000000000..82baa5438e954d --- /dev/null +++ b/ports/metis/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "metis", + "version-string": "5.1.0", + "port-version": 8, + "description": "Serial Graph Partitioning and Fill-reducing Matrix Ordering", + "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/metis/overview" +} diff --git a/ports/mgnlibs/CONTROL b/ports/mgnlibs/CONTROL deleted file mode 100644 index 0be2570591ddfd..00000000000000 --- a/ports/mgnlibs/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mgnlibs -Version: 2019-09-29 -Homepage: https://github.com/mattiasgustavsson/libs -Description: Single-file public domain libraries for C/C++ diff --git a/ports/mgnlibs/vcpkg.json b/ports/mgnlibs/vcpkg.json new file mode 100644 index 00000000000000..e6b8522580344c --- /dev/null +++ b/ports/mgnlibs/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mgnlibs", + "version-string": "2019-09-29", + "port-version": 1, + "description": "Single-file public domain libraries for C/C++", + "homepage": "https://github.com/mattiasgustavsson/libs" +} diff --git a/ports/mhook/CONTROL b/ports/mhook/CONTROL deleted file mode 100644 index 24fae14dfc553f..00000000000000 --- a/ports/mhook/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: mhook -Version: 2.5.1-1 -Description: A Windows API hooking library. diff --git a/ports/mhook/vcpkg.json b/ports/mhook/vcpkg.json new file mode 100644 index 00000000000000..8c55068ce6dabf --- /dev/null +++ b/ports/mhook/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mhook", + "version-string": "2.5.1", + "port-version": 2, + "description": "A Windows API hooking library." +} diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL deleted file mode 100644 index 51b35417b53b07..00000000000000 --- a/ports/microsoft-signalr/CONTROL +++ /dev/null @@ -1,18 +0,0 @@ -Source: microsoft-signalr -Version: 0.1.0-alpha3 -Port-Version: 0 -Description: C++ Client for ASP.NET Core SignalR. -Default-Features: default-features -Homepage: https://github.com/aspnet/SignalR-Client-Cpp - -Feature: default-features -Build-Depends: microsoft-signalr[cpprestsdk] (!uwp) -Description: Features installed by default - -Feature: cpprestsdk -Description: Add default Http and WebSocket implementations using CppRestSDK -Build-Depends: cpprestsdk[default-features,websockets] - -Feature: messagepack -Description: Add support for the messagepack hub protocol, must enable in code still -Build-Depends: msgpack \ No newline at end of file diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json new file mode 100644 index 00000000000000..12e555add59c87 --- /dev/null +++ b/ports/microsoft-signalr/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "microsoft-signalr", + "version-string": "0.1.0-alpha3", + "port-version": 1, + "description": "C++ Client for ASP.NET Core SignalR.", + "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", + "default-features": [ + "default-features" + ], + "features": { + "cpprestsdk": { + "description": "Add default Http and WebSocket implementations using CppRestSDK", + "dependencies": [ + { + "name": "cpprestsdk", + "features": [ + "default-features", + "websockets" + ] + } + ] + }, + "default-features": { + "description": "Features installed by default", + "dependencies": [ + { + "name": "microsoft-signalr", + "features": [ + "cpprestsdk" + ], + "platform": "!uwp" + } + ] + }, + "messagepack": { + "description": "Add support for the messagepack hub protocol, must enable in code still", + "dependencies": [ + "msgpack" + ] + } + } +} diff --git a/ports/mikktspace/CONTROL b/ports/mikktspace/CONTROL deleted file mode 100644 index 2cbf00680934d3..00000000000000 --- a/ports/mikktspace/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mikktspace -Version: 2020-10-06 -Homepage: https://github.com/mmikk/MikkTSpace -Description: A common standard for tangent space used in baking tools to produce normal maps diff --git a/ports/mikktspace/vcpkg.json b/ports/mikktspace/vcpkg.json new file mode 100644 index 00000000000000..c26b3e36070f44 --- /dev/null +++ b/ports/mikktspace/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mikktspace", + "version-string": "2020-10-06", + "port-version": 1, + "description": "A common standard for tangent space used in baking tools to produce normal maps", + "homepage": "https://github.com/mmikk/MikkTSpace" +} diff --git a/ports/milerius-sfml-imgui/CONTROL b/ports/milerius-sfml-imgui/CONTROL deleted file mode 100644 index 0414fc11a78314..00000000000000 --- a/ports/milerius-sfml-imgui/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: milerius-sfml-imgui -Version: 1.1-2 -Description: imgui dll for sfml usage -Build-Depends: sfml, imgui diff --git a/ports/milerius-sfml-imgui/vcpkg.json b/ports/milerius-sfml-imgui/vcpkg.json new file mode 100644 index 00000000000000..e208a73f3b863e --- /dev/null +++ b/ports/milerius-sfml-imgui/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "milerius-sfml-imgui", + "version-string": "1.1", + "port-version": 3, + "description": "imgui dll for sfml usage", + "dependencies": [ + "imgui", + "sfml" + ] +} diff --git a/ports/mimalloc/CONTROL b/ports/mimalloc/CONTROL deleted file mode 100644 index 90cb64d93fd416..00000000000000 --- a/ports/mimalloc/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: mimalloc -Version: 1.6.4 -Description: Compact general purpose allocator with excellent performance -Homepage: https://github.com/microsoft/mimalloc -Supports: !(arm|uwp) - -Feature: asm -Description: Generate assembly files - -Feature: override -Description: Override the standard malloc interface - -Feature: secure -Description: Use security mitigations (like guard pages and randomization) diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json new file mode 100644 index 00000000000000..09a5065e804b68 --- /dev/null +++ b/ports/mimalloc/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "mimalloc", + "version-string": "1.6.4", + "port-version": 1, + "description": "Compact general purpose allocator with excellent performance", + "homepage": "https://github.com/microsoft/mimalloc", + "supports": "!(arm | uwp)", + "features": { + "asm": { + "description": "Generate assembly files" + }, + "override": { + "description": "Override the standard malloc interface" + }, + "secure": { + "description": "Use security mitigations (like guard pages and randomization)" + } + } +} diff --git a/ports/minc/CONTROL b/ports/minc/CONTROL deleted file mode 100644 index c31621bcd68b16..00000000000000 --- a/ports/minc/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: minc -Version: 2.4.03 -Port-Version: 1 -Description: MINC - Medical Image NetCDF or MINC isn't netCDF -Homepage: https://github.com/BIC-MNI/libminc -Build-Depends: nifticlib, hdf5[core], zlib - -Feature: minc1 -Description: Support minc1 file format, requires NETCDF -Build-Depends: netcdf[core] \ No newline at end of file diff --git a/ports/minc/vcpkg.json b/ports/minc/vcpkg.json new file mode 100644 index 00000000000000..0fd609d6779cfc --- /dev/null +++ b/ports/minc/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "minc", + "version-string": "2.4.03", + "port-version": 2, + "description": "MINC - Medical Image NetCDF or MINC isn't netCDF", + "homepage": "https://github.com/BIC-MNI/libminc", + "dependencies": [ + { + "name": "hdf5", + "default-features": false + }, + "nifticlib", + "zlib" + ], + "features": { + "minc1": { + "description": "Support minc1 file format, requires NETCDF", + "dependencies": [ + { + "name": "netcdf", + "default-features": false + } + ] + } + } +} diff --git a/ports/minhook/CONTROL b/ports/minhook/CONTROL deleted file mode 100644 index 1c475bd174af3b..00000000000000 --- a/ports/minhook/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: minhook -Version: 1.3.3 -Port-Version: 1 -Description: The Minimalistic x86/x64 API Hooking Library for Windows. -Supports: !uwp \ No newline at end of file diff --git a/ports/minhook/vcpkg.json b/ports/minhook/vcpkg.json new file mode 100644 index 00000000000000..707945cccce056 --- /dev/null +++ b/ports/minhook/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "minhook", + "version-string": "1.3.3", + "port-version": 2, + "description": "The Minimalistic x86/x64 API Hooking Library for Windows.", + "supports": "!uwp" +} diff --git a/ports/minifb/CONTROL b/ports/minifb/CONTROL deleted file mode 100644 index 5a86f9bbe9673a..00000000000000 --- a/ports/minifb/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: minifb -Version: 2019-08-20-1 -Homepage: https://github.com/emoon/minifb -Description: MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window. -Supports: !uwp \ No newline at end of file diff --git a/ports/minifb/vcpkg.json b/ports/minifb/vcpkg.json new file mode 100644 index 00000000000000..760b9d2aac5d03 --- /dev/null +++ b/ports/minifb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "minifb", + "version-string": "2019-08-20", + "port-version": 2, + "description": "MiniFB (Mini FrameBuffer) is a small cross platform library that makes it easy to render (32-bit) pixels in a window.", + "homepage": "https://github.com/emoon/minifb", + "supports": "!uwp" +} diff --git a/ports/minimp3/CONTROL b/ports/minimp3/CONTROL deleted file mode 100644 index 1d26ffdaa472b9..00000000000000 --- a/ports/minimp3/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: minimp3 -Version: 2020-12-25 -Homepage: https://github.com/lieff/minimp3 -Description: Minimalistic, single-header library for decoding MP3. minimp3 is designed to be small, fast (with SSE and NEON support), and accurate (ISO conformant). \ No newline at end of file diff --git a/ports/minimp3/vcpkg.json b/ports/minimp3/vcpkg.json new file mode 100644 index 00000000000000..5fad0a36310ca7 --- /dev/null +++ b/ports/minimp3/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "minimp3", + "version-string": "2020-12-25", + "port-version": 1, + "description": "Minimalistic, single-header library for decoding MP3. minimp3 is designed to be small, fast (with SSE and NEON support), and accurate (ISO conformant).", + "homepage": "https://github.com/lieff/minimp3" +} diff --git a/ports/minisat-master-keying/CONTROL b/ports/minisat-master-keying/CONTROL deleted file mode 100644 index 109ba31b5ef1cb..00000000000000 --- a/ports/minisat-master-keying/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: minisat-master-keying -Version: 2.2-mod-2 -Description: A minimalistic high-performance SAT solver - This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat. -Homepage: https://github.com/master-keying/minisat diff --git a/ports/minisat-master-keying/vcpkg.json b/ports/minisat-master-keying/vcpkg.json new file mode 100644 index 00000000000000..9df7d9d6e0c4f4 --- /dev/null +++ b/ports/minisat-master-keying/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "minisat-master-keying", + "version-string": "2.2-mod", + "port-version": 3, + "description": [ + "A minimalistic high-performance SAT solver", + "This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat." + ], + "homepage": "https://github.com/master-keying/minisat" +} diff --git a/ports/minitrace/CONTROL b/ports/minitrace/CONTROL deleted file mode 100644 index 83763faba2e0df..00000000000000 --- a/ports/minitrace/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: minitrace -Version: 2019.02.06 -Description: Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer. diff --git a/ports/minitrace/vcpkg.json b/ports/minitrace/vcpkg.json new file mode 100644 index 00000000000000..47484d35d23d86 --- /dev/null +++ b/ports/minitrace/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "minitrace", + "version-string": "2019.02.06", + "port-version": 1, + "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer." +} diff --git a/ports/miniupnpc/CONTROL b/ports/miniupnpc/CONTROL deleted file mode 100644 index a639f1ab9f38f3..00000000000000 --- a/ports/miniupnpc/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: miniupnpc -Version: 2.1-1 -Description: UPnP client library/tool to access Internet Gateway Devices diff --git a/ports/miniupnpc/vcpkg.json b/ports/miniupnpc/vcpkg.json new file mode 100644 index 00000000000000..8621794bd598fb --- /dev/null +++ b/ports/miniupnpc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "miniupnpc", + "version-string": "2.1", + "port-version": 2, + "description": "UPnP client library/tool to access Internet Gateway Devices" +} diff --git a/ports/miniz/CONTROL b/ports/miniz/CONTROL deleted file mode 100644 index 519eee29c37ebc..00000000000000 --- a/ports/miniz/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: miniz -Version: 2.1.0-1 -Homepage: https://github.com/richgel999/miniz -Description: Single C source file zlib-replacement library diff --git a/ports/miniz/vcpkg.json b/ports/miniz/vcpkg.json new file mode 100644 index 00000000000000..5719d162170c29 --- /dev/null +++ b/ports/miniz/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "miniz", + "version-string": "2.1.0", + "port-version": 2, + "description": "Single C source file zlib-replacement library", + "homepage": "https://github.com/richgel999/miniz" +} diff --git a/ports/mio/CONTROL b/ports/mio/CONTROL deleted file mode 100644 index 895c4c3a79635e..00000000000000 --- a/ports/mio/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: mio -Version: 2019-02-10 -Description: Cross-platform header-only C++11 library for memory mapped file IO. diff --git a/ports/mio/vcpkg.json b/ports/mio/vcpkg.json new file mode 100644 index 00000000000000..6cf4b544594b7d --- /dev/null +++ b/ports/mio/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mio", + "version-string": "2019-02-10", + "port-version": 1, + "description": "Cross-platform header-only C++11 library for memory mapped file IO." +} diff --git a/ports/mman/CONTROL b/ports/mman/CONTROL deleted file mode 100644 index 75a043f79c0680..00000000000000 --- a/ports/mman/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mman -Version: git-f5ff813-3 -Homepage: https://github.com/witwall/mman-win32 -Description: A light implementation of the mmap functions for MinGW. diff --git a/ports/mman/vcpkg.json b/ports/mman/vcpkg.json new file mode 100644 index 00000000000000..37516b67990c0a --- /dev/null +++ b/ports/mman/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mman", + "version-string": "git-f5ff813", + "port-version": 4, + "description": "A light implementation of the mmap functions for MinGW.", + "homepage": "https://github.com/witwall/mman-win32" +} diff --git a/ports/mmx/CONTROL b/ports/mmx/CONTROL deleted file mode 100644 index ee6403630d3d37..00000000000000 --- a/ports/mmx/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mmx -Version: 2019-09-29 -Homepage: https://github.com/vurtun/mmx -Description: Single header libraries for C/C++ \ No newline at end of file diff --git a/ports/mmx/vcpkg.json b/ports/mmx/vcpkg.json new file mode 100644 index 00000000000000..9a7fe081d123ec --- /dev/null +++ b/ports/mmx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mmx", + "version-string": "2019-09-29", + "port-version": 1, + "description": "Single header libraries for C/C++", + "homepage": "https://github.com/vurtun/mmx" +} diff --git a/ports/modp-base64/CONTROL b/ports/modp-base64/CONTROL deleted file mode 100644 index 396fa0b9996ace..00000000000000 --- a/ports/modp-base64/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: modp-base64 -Version: 2020-09-26 -Description: High performance base64 encoder/decoder diff --git a/ports/modp-base64/vcpkg.json b/ports/modp-base64/vcpkg.json new file mode 100644 index 00000000000000..2f222a982dc636 --- /dev/null +++ b/ports/modp-base64/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "modp-base64", + "version-string": "2020-09-26", + "port-version": 1, + "description": "High performance base64 encoder/decoder" +} diff --git a/ports/mongo-cxx-driver/CONTROL b/ports/mongo-cxx-driver/CONTROL deleted file mode 100644 index c7b22bef131593..00000000000000 --- a/ports/mongo-cxx-driver/CONTROL +++ /dev/null @@ -1,18 +0,0 @@ -Source: mongo-cxx-driver -Version: 3.4.0-5 -Port-Version: 2 -Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility -Homepage: https://github.com/mongodb/mongo-cxx-driver -Description: MongoDB C++ Driver. - -Feature: mnmlstc -Description: Use MNMLSTC/core C++17 polyfill. - -Feature: system-mnmlstc -Description: Use an available version of MNMLSTC on your system as C++17 polyfill. - -Feature: boost -Description: Use Boost C++17 polyfill. The only option under MSVC. - -Feature: std-experimental -Description: Use optional and string_view from std::experimental. diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json new file mode 100644 index 00000000000000..60e374eba8ebb8 --- /dev/null +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "mongo-cxx-driver", + "version-string": "3.4.0-5", + "port-version": 3, + "description": "MongoDB C++ Driver.", + "homepage": "https://github.com/mongodb/mongo-cxx-driver", + "dependencies": [ + "boost-optional", + "boost-smart-ptr", + "boost-utility", + "libbson", + "mongo-c-driver" + ], + "features": { + "boost": { + "description": "Use Boost C++17 polyfill. The only option under MSVC." + }, + "mnmlstc": { + "description": "Use MNMLSTC/core C++17 polyfill." + }, + "std-experimental": { + "description": "Use optional and string_view from std::experimental." + }, + "system-mnmlstc": { + "description": "Use an available version of MNMLSTC on your system as C++17 polyfill." + } + } +} diff --git a/ports/monkeys-audio/CONTROL b/ports/monkeys-audio/CONTROL deleted file mode 100644 index 833aad90b587c7..00000000000000 --- a/ports/monkeys-audio/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: monkeys-audio -Version: 5.70 -Homepage: https://monkeysaudio.com -Description: Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods. - Audio files compressed with it end with .ape extension. -Supports: !(uwp|osx|linux) - -Feature: tools -Description: Build monkeys-audio tools diff --git a/ports/monkeys-audio/vcpkg.json b/ports/monkeys-audio/vcpkg.json new file mode 100644 index 00000000000000..ceb22ba8b1b63e --- /dev/null +++ b/ports/monkeys-audio/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "monkeys-audio", + "version-string": "5.70", + "port-version": 1, + "description": [ + "Monkey's Audio is an excellent audio compression tool which has multiple advantages over traditional methods.", + "Audio files compressed with it end with .ape extension." + ], + "homepage": "https://monkeysaudio.com", + "supports": "!(uwp | osx | linux)", + "features": { + "tools": { + "description": "Build monkeys-audio tools" + } + } +} diff --git a/ports/moos-core/CONTROL b/ports/moos-core/CONTROL deleted file mode 100644 index 1d1e20d0920c12..00000000000000 --- a/ports/moos-core/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: moos-core -Version: 10.4.0 -Port-Version: 5 -Description: A very light weight, easy to use middleware. -Homepage: https://sites.google.com/site/moossoftware/ diff --git a/ports/moos-core/vcpkg.json b/ports/moos-core/vcpkg.json new file mode 100644 index 00000000000000..43a01cf2539ce3 --- /dev/null +++ b/ports/moos-core/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "moos-core", + "version-string": "10.4.0", + "port-version": 6, + "description": "A very light weight, easy to use middleware.", + "homepage": "https://sites.google.com/site/moossoftware/" +} diff --git a/ports/moos-essential/CONTROL b/ports/moos-essential/CONTROL deleted file mode 100644 index 32fd954e320fdf..00000000000000 --- a/ports/moos-essential/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: moos-essential -Version: 10.0.1-2 -Description: a set of useful applications that leverage the core-moos communications layer. -Homepage: https://sites.google.com/site/moossoftware/ -Build-Depends: moos-core diff --git a/ports/moos-essential/vcpkg.json b/ports/moos-essential/vcpkg.json new file mode 100644 index 00000000000000..48da1769f32a56 --- /dev/null +++ b/ports/moos-essential/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "moos-essential", + "version-string": "10.0.1", + "port-version": 3, + "description": "a set of useful applications that leverage the core-moos communications layer.", + "homepage": "https://sites.google.com/site/moossoftware/", + "dependencies": [ + "moos-core" + ] +} diff --git a/ports/moos-ui/CONTROL b/ports/moos-ui/CONTROL deleted file mode 100644 index 8894e8b091232d..00000000000000 --- a/ports/moos-ui/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: moos-ui -Version: 10.0.1-2 -Description: set of user interface tools to use and leverage the MOOS project. -Homepage: https://sites.google.com/site/moossoftware/ -Build-Depends: moos-core diff --git a/ports/moos-ui/vcpkg.json b/ports/moos-ui/vcpkg.json new file mode 100644 index 00000000000000..8dfc9307b86a60 --- /dev/null +++ b/ports/moos-ui/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "moos-ui", + "version-string": "10.0.1", + "port-version": 3, + "description": "set of user interface tools to use and leverage the MOOS project.", + "homepage": "https://sites.google.com/site/moossoftware/", + "dependencies": [ + "moos-core" + ] +} diff --git a/ports/morton-nd/CONTROL b/ports/morton-nd/CONTROL deleted file mode 100644 index 34bd160e57f36b..00000000000000 --- a/ports/morton-nd/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: morton-nd -Version: 4.0.0 -Homepage: https://github.com/kevinhartman/morton-nd -Description: header-only constexpr library for fast Morton encoding/decoding in N dimensions. diff --git a/ports/morton-nd/vcpkg.json b/ports/morton-nd/vcpkg.json new file mode 100644 index 00000000000000..c1cc4907c291cf --- /dev/null +++ b/ports/morton-nd/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "morton-nd", + "version-string": "4.0.0", + "port-version": 1, + "description": "header-only constexpr library for fast Morton encoding/decoding in N dimensions.", + "homepage": "https://github.com/kevinhartman/morton-nd" +} diff --git a/ports/mozjpeg/CONTROL b/ports/mozjpeg/CONTROL deleted file mode 100644 index 39ee813a056237..00000000000000 --- a/ports/mozjpeg/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: mozjpeg -Version: 2020-06-02 -Port-Version: 2 -Build-Depends: libpng -Homepage: https://github.com/mozilla/mozjpeg -Description: MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg. diff --git a/ports/mozjpeg/vcpkg.json b/ports/mozjpeg/vcpkg.json new file mode 100644 index 00000000000000..605abca1c253dc --- /dev/null +++ b/ports/mozjpeg/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "mozjpeg", + "version-string": "2020-06-02", + "port-version": 3, + "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.", + "homepage": "https://github.com/mozilla/mozjpeg", + "dependencies": [ + "libpng" + ] +} diff --git a/ports/mp-units/CONTROL b/ports/mp-units/CONTROL deleted file mode 100644 index 355d1cf456e5e6..00000000000000 --- a/ports/mp-units/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mp-units -Version: 0.6.0 -Homepage: https://github.com/mpusz/units -Description: mp-units - A Units Library for C++ -Build-Depends: fmt, ms-gsl diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json new file mode 100644 index 00000000000000..34ca3b8f0540c8 --- /dev/null +++ b/ports/mp-units/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mp-units", + "version-string": "0.6.0", + "port-version": 1, + "description": "mp-units - A Units Library for C++", + "homepage": "https://github.com/mpusz/units", + "dependencies": [ + "fmt", + "ms-gsl" + ] +} diff --git a/ports/mp3lame/CONTROL b/ports/mp3lame/CONTROL deleted file mode 100644 index 7e090c2e9665dc..00000000000000 --- a/ports/mp3lame/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mp3lame -Version: 3.100 -Port-Version: 6 -Homepage: http://lame.sourceforge.net/ -Description: LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. diff --git a/ports/mp3lame/vcpkg.json b/ports/mp3lame/vcpkg.json new file mode 100644 index 00000000000000..f0c7cfca97f9ff --- /dev/null +++ b/ports/mp3lame/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mp3lame", + "version-string": "3.100", + "port-version": 7, + "description": "LAME is a high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL.", + "homepage": "http://lame.sourceforge.net/" +} diff --git a/ports/mpark-variant/CONTROL b/ports/mpark-variant/CONTROL deleted file mode 100644 index 45cd9e237c3517..00000000000000 --- a/ports/mpark-variant/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: mpark-variant -Version: 1.4.0 -Description: an implementation of C++17 std::variant for C++11/14/17. diff --git a/ports/mpark-variant/vcpkg.json b/ports/mpark-variant/vcpkg.json new file mode 100644 index 00000000000000..a3c03ffaaf7bd0 --- /dev/null +++ b/ports/mpark-variant/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "mpark-variant", + "version-string": "1.4.0", + "port-version": 1, + "description": "an implementation of C++17 std::variant for C++11/14/17." +} diff --git a/ports/mpc/CONTROL b/ports/mpc/CONTROL deleted file mode 100644 index 4514e62897dbc6..00000000000000 --- a/ports/mpc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mpc -Version: 1.2.0 -Homepage: http://www.multiprecision.org/mpc/ -Description: GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result. -Build-Depends: gmp, mpfr diff --git a/ports/mpc/vcpkg.json b/ports/mpc/vcpkg.json new file mode 100644 index 00000000000000..2c8e38d1da1f30 --- /dev/null +++ b/ports/mpc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "mpc", + "version-string": "1.2.0", + "port-version": 1, + "description": "GNU MPC is a C library for the arithmetic of complex numbers with arbitrarily high precision and correct rounding of the result.", + "homepage": "http://www.multiprecision.org/mpc/", + "dependencies": [ + "gmp", + "mpfr" + ] +} diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL deleted file mode 100644 index 487e6cef0b091b..00000000000000 --- a/ports/mpfr/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mpfr -Version: 4.1.0 -Homepage: https://www.mpfr.org -Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding -Build-Depends: gmp diff --git a/ports/mpfr/vcpkg.json b/ports/mpfr/vcpkg.json new file mode 100644 index 00000000000000..7f742a50c4727d --- /dev/null +++ b/ports/mpfr/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "mpfr", + "version-string": "4.1.0", + "port-version": 1, + "description": "The MPFR library is a C library for multiple-precision floating-point computations with correct rounding", + "homepage": "https://www.mpfr.org", + "dependencies": [ + "gmp" + ] +} diff --git a/ports/mpi/CONTROL b/ports/mpi/CONTROL deleted file mode 100644 index b5db97f1338293..00000000000000 --- a/ports/mpi/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mpi -Version: 1 -Description: Message Passing Interface (MPI) is a standardized and portable message-passing standard designed by a group of researchers from academia and industry to function on a wide variety of parallel computing architectures. The standard defines the syntax and semantics of a core of library routines useful to a wide range of users writing portable message-passing programs in C, C++, and Fortran. There are several well-tested and efficient implementations of MPI, many of which are open-source or in the public domain. -Build-Depends: msmpi (windows), openmpi (!windows) diff --git a/ports/mpi/vcpkg.json b/ports/mpi/vcpkg.json new file mode 100644 index 00000000000000..0b7b9d9be7f873 --- /dev/null +++ b/ports/mpi/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "mpi", + "version-string": "1", + "port-version": 1, + "description": "Message Passing Interface (MPI) is a standardized and portable message-passing standard designed by a group of researchers from academia and industry to function on a wide variety of parallel computing architectures. The standard defines the syntax and semantics of a core of library routines useful to a wide range of users writing portable message-passing programs in C, C++, and Fortran. There are several well-tested and efficient implementations of MPI, many of which are open-source or in the public domain.", + "dependencies": [ + { + "name": "msmpi", + "platform": "windows" + }, + { + "name": "openmpi", + "platform": "!windows" + } + ] +} diff --git a/ports/mpmcqueue/CONTROL b/ports/mpmcqueue/CONTROL deleted file mode 100644 index 3da89f6a522110..00000000000000 --- a/ports/mpmcqueue/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mpmcqueue -Version: 2019-07-26 -Description: A bounded multi-producer multi-consumer lock-free queue written in C++11 -Homepage: https://github.com/rigtorp/MPMCQueue diff --git a/ports/mpmcqueue/vcpkg.json b/ports/mpmcqueue/vcpkg.json new file mode 100644 index 00000000000000..4a6075538f15d6 --- /dev/null +++ b/ports/mpmcqueue/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mpmcqueue", + "version-string": "2019-07-26", + "port-version": 1, + "description": "A bounded multi-producer multi-consumer lock-free queue written in C++11", + "homepage": "https://github.com/rigtorp/MPMCQueue" +} diff --git a/ports/mqtt-cpp/CONTROL b/ports/mqtt-cpp/CONTROL deleted file mode 100644 index 70e7baf10b0b98..00000000000000 --- a/ports/mqtt-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mqtt-cpp -Version: 9.0.0 -Description: Header-only MQTT client/server for C++14 based on Boost.Asio. -Homepage: https://github.com/redboltz/mqtt_cpp -Build-Depends: boost-asio, boost-any, boost-multi-index, boost-type-erasure, boost-log diff --git a/ports/mqtt-cpp/vcpkg.json b/ports/mqtt-cpp/vcpkg.json new file mode 100644 index 00000000000000..dac362846bfbff --- /dev/null +++ b/ports/mqtt-cpp/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "mqtt-cpp", + "version-string": "9.0.0", + "port-version": 1, + "description": "Header-only MQTT client/server for C++14 based on Boost.Asio.", + "homepage": "https://github.com/redboltz/mqtt_cpp", + "dependencies": [ + "boost-any", + "boost-asio", + "boost-log", + "boost-multi-index", + "boost-type-erasure" + ] +} diff --git a/ports/ms-angle/CONTROL b/ports/ms-angle/CONTROL deleted file mode 100644 index 003ab3f3bcfd21..00000000000000 --- a/ports/ms-angle/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ms-angle -Version: alias -Description: Deprecated alias for ms-angle -Build-Depends: angle \ No newline at end of file diff --git a/ports/ms-angle/vcpkg.json b/ports/ms-angle/vcpkg.json new file mode 100644 index 00000000000000..22c7a3386f31d0 --- /dev/null +++ b/ports/ms-angle/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "ms-angle", + "version-string": "alias", + "port-version": 1, + "description": "Deprecated alias for ms-angle", + "dependencies": [ + "angle" + ] +} diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL deleted file mode 100644 index 7fb93335e26f25..00000000000000 --- a/ports/ms-gsl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ms-gsl -Version: 3.1.0 -Homepage: https://github.com/Microsoft/GSL -Description: Microsoft implementation of the Guidelines Support Library diff --git a/ports/ms-gsl/vcpkg.json b/ports/ms-gsl/vcpkg.json new file mode 100644 index 00000000000000..e8f6f9adc785fe --- /dev/null +++ b/ports/ms-gsl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ms-gsl", + "version-string": "3.1.0", + "port-version": 1, + "description": "Microsoft implementation of the Guidelines Support Library", + "homepage": "https://github.com/Microsoft/GSL" +} diff --git a/ports/msgpack/CONTROL b/ports/msgpack/CONTROL deleted file mode 100644 index 0ec6083c8794b2..00000000000000 --- a/ports/msgpack/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: msgpack -Version: 3.3.0 -Homepage: https://github.com/msgpack/msgpack-c -Description: MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller. diff --git a/ports/msgpack/vcpkg.json b/ports/msgpack/vcpkg.json new file mode 100644 index 00000000000000..6901ce161022b8 --- /dev/null +++ b/ports/msgpack/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "msgpack", + "version-string": "3.3.0", + "port-version": 1, + "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", + "homepage": "https://github.com/msgpack/msgpack-c" +} diff --git a/ports/msinttypes/CONTROL b/ports/msinttypes/CONTROL deleted file mode 100644 index 51939d075dc85d..00000000000000 --- a/ports/msinttypes/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: msinttypes -Version: 2018-02-25 -Homepage: https://github.com/chemeris/msinttypes -Description: msinttypes is a package to provide missing ISO C9x compliant headers for Microsoft Visual Studio diff --git a/ports/msinttypes/vcpkg.json b/ports/msinttypes/vcpkg.json new file mode 100644 index 00000000000000..46bc22f188a622 --- /dev/null +++ b/ports/msinttypes/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "msinttypes", + "version-string": "2018-02-25", + "port-version": 1, + "description": "msinttypes is a package to provide missing ISO C9x compliant headers for Microsoft Visual Studio", + "homepage": "https://github.com/chemeris/msinttypes" +} diff --git a/ports/mstch/CONTROL b/ports/mstch/CONTROL deleted file mode 100644 index eef64a578d6886..00000000000000 --- a/ports/mstch/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: mstch -Version: 1.0.2-2 -Homepage: https://github.com/no1msd/mstch -Description: Mstch is a complete implementation of {{mustache}} templates using modern C++ -Build-Depends: boost-variant diff --git a/ports/mstch/vcpkg.json b/ports/mstch/vcpkg.json new file mode 100644 index 00000000000000..489584814bb9bc --- /dev/null +++ b/ports/mstch/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "mstch", + "version-string": "1.0.2", + "port-version": 3, + "description": "Mstch is a complete implementation of {{mustache}} templates using modern C++", + "homepage": "https://github.com/no1msd/mstch", + "dependencies": [ + "boost-variant" + ] +} diff --git a/ports/mujs/CONTROL b/ports/mujs/CONTROL deleted file mode 100644 index 1444af126ee44a..00000000000000 --- a/ports/mujs/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: mujs -Version: 2018-07-30-1 -Homepage: https://github.com/ccxvii/mujs -Description: An embeddable Javascript interpreter in C diff --git a/ports/mujs/vcpkg.json b/ports/mujs/vcpkg.json new file mode 100644 index 00000000000000..689ad0d5b19c1c --- /dev/null +++ b/ports/mujs/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "mujs", + "version-string": "2018-07-30", + "port-version": 2, + "description": "An embeddable Javascript interpreter in C", + "homepage": "https://github.com/ccxvii/mujs" +} diff --git a/ports/munit/CONTROL b/ports/munit/CONTROL deleted file mode 100644 index cd1d6f303d6af3..00000000000000 --- a/ports/munit/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: munit -Version: 2019-04-06 -Port-Version: 1 -Description: A small but full-featured unit testing framework for C -Build-Depends: tool-meson -Supports: !(arm|arm64|uwp) -Homepage: https://github.com/nemequ/munit diff --git a/ports/munit/vcpkg.json b/ports/munit/vcpkg.json new file mode 100644 index 00000000000000..ca60d49b7040bc --- /dev/null +++ b/ports/munit/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "munit", + "version-string": "2019-04-06", + "port-version": 2, + "description": "A small but full-featured unit testing framework for C", + "homepage": "https://github.com/nemequ/munit", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + "tool-meson" + ] +} diff --git a/ports/muparser/CONTROL b/ports/muparser/CONTROL deleted file mode 100644 index b41faa900de94a..00000000000000 --- a/ports/muparser/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: muparser -Version: 2.3.2 -Homepage: https://github.com/beltoforion/muparser -Description: Fast math parser library -Supports: !uwp diff --git a/ports/muparser/vcpkg.json b/ports/muparser/vcpkg.json new file mode 100644 index 00000000000000..2ba2aa091c6494 --- /dev/null +++ b/ports/muparser/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "muparser", + "version-string": "2.3.2", + "port-version": 1, + "description": "Fast math parser library", + "homepage": "https://github.com/beltoforion/muparser", + "supports": "!uwp" +} diff --git a/ports/murmurhash/CONTROL b/ports/murmurhash/CONTROL deleted file mode 100644 index c83cb984dbb29e..00000000000000 --- a/ports/murmurhash/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: murmurhash -Version: 2016-01-09-3 -Homepage: https://github.com/aappleby/smhasher -Description: MurmurHash a family of hash functions. diff --git a/ports/murmurhash/vcpkg.json b/ports/murmurhash/vcpkg.json new file mode 100644 index 00000000000000..98789370d04218 --- /dev/null +++ b/ports/murmurhash/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "murmurhash", + "version-string": "2016-01-09", + "port-version": 4, + "description": "MurmurHash a family of hash functions.", + "homepage": "https://github.com/aappleby/smhasher" +} diff --git a/ports/mygui/CONTROL b/ports/mygui/CONTROL deleted file mode 100644 index 934ee31ab11d83..00000000000000 --- a/ports/mygui/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: mygui -Version: 2020-06-17 -Build-Depends: freetype, sdl2-image -Homepage: http://mygui.info -Description: Fast, flexible and simple GUI - -Feature: opengl -Description: Use OpenGL render system. -Build-Depends: opengl diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json new file mode 100644 index 00000000000000..28a32c06074bdc --- /dev/null +++ b/ports/mygui/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "mygui", + "version-string": "2020-06-17", + "port-version": 1, + "description": "Fast, flexible and simple GUI", + "homepage": "http://mygui.info", + "dependencies": [ + "freetype", + "sdl2-image" + ], + "features": { + "opengl": { + "description": "Use OpenGL render system.", + "dependencies": [ + "opengl" + ] + } + } +} diff --git a/ports/nameof/CONTROL b/ports/nameof/CONTROL deleted file mode 100644 index b9b51e0487ba8d..00000000000000 --- a/ports/nameof/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nameof -Version: 0.10.1 -Description: Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum. -Homepage: https://github.com/Neargye/nameof diff --git a/ports/nameof/vcpkg.json b/ports/nameof/vcpkg.json new file mode 100644 index 00000000000000..78bce0d8e056a8 --- /dev/null +++ b/ports/nameof/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nameof", + "version-string": "0.10.1", + "port-version": 1, + "description": "Nameof operator for modern C++, simply obtain the name of a variable, type, function, macro, and enum.", + "homepage": "https://github.com/Neargye/nameof" +} diff --git a/ports/nano-signal-slot/CONTROL b/ports/nano-signal-slot/CONTROL deleted file mode 100644 index 99cee9fec497ec..00000000000000 --- a/ports/nano-signal-slot/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: nano-signal-slot -Version: 2.0.1 -Homepage: https://github.com/NoAvailableAlias/nano-signal-slot -Description: Pure C++17 Signals and Slots -Supports: !uwp \ No newline at end of file diff --git a/ports/nano-signal-slot/vcpkg.json b/ports/nano-signal-slot/vcpkg.json new file mode 100644 index 00000000000000..55e08710650cd5 --- /dev/null +++ b/ports/nano-signal-slot/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "nano-signal-slot", + "version-string": "2.0.1", + "port-version": 1, + "description": "Pure C++17 Signals and Slots", + "homepage": "https://github.com/NoAvailableAlias/nano-signal-slot", + "supports": "!uwp" +} diff --git a/ports/nanobench/CONTROL b/ports/nanobench/CONTROL deleted file mode 100644 index 7e01f0e1f1c849..00000000000000 --- a/ports/nanobench/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nanobench -Version: 4.3.0 -Homepage: https://nanobench.ankerl.com -Description: Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20 diff --git a/ports/nanobench/vcpkg.json b/ports/nanobench/vcpkg.json new file mode 100644 index 00000000000000..d8c6a583ee55d3 --- /dev/null +++ b/ports/nanobench/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nanobench", + "version-string": "4.3.0", + "port-version": 1, + "description": "Simple, fast, accurate single-header microbenchmarking functionality for C++11/14/17/20", + "homepage": "https://nanobench.ankerl.com" +} diff --git a/ports/nanoflann/CONTROL b/ports/nanoflann/CONTROL deleted file mode 100644 index efdc648cfe7302..00000000000000 --- a/ports/nanoflann/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nanoflann -Version: 1.3.1 -Homepage: https://github.com/jlblancoc/nanoflann -Description: nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups). \ No newline at end of file diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json new file mode 100644 index 00000000000000..1c9afca8b1b86e --- /dev/null +++ b/ports/nanoflann/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nanoflann", + "version-string": "1.3.1", + "port-version": 1, + "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", + "homepage": "https://github.com/jlblancoc/nanoflann" +} diff --git a/ports/nanogui/CONTROL b/ports/nanogui/CONTROL deleted file mode 100644 index 9c532e4f15e2ee..00000000000000 --- a/ports/nanogui/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: nanogui -Version: 2019-09-23 -Port-Version: 1 -Homepage: https://github.com/wjakob/nanogui -Description: NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher. -Build-Depends: glfw3, nanovg, eigen3 -Supports: !uwp diff --git a/ports/nanogui/vcpkg.json b/ports/nanogui/vcpkg.json new file mode 100644 index 00000000000000..c4c7b43254aae1 --- /dev/null +++ b/ports/nanogui/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "nanogui", + "version-string": "2019-09-23", + "port-version": 2, + "description": "NanoGUI is a minimalistic cross-platform widget library for OpenGL 3.x or higher.", + "homepage": "https://github.com/wjakob/nanogui", + "supports": "!uwp", + "dependencies": [ + "eigen3", + "glfw3", + "nanovg" + ] +} diff --git a/ports/nanomsg/CONTROL b/ports/nanomsg/CONTROL deleted file mode 100644 index 8f6d45e8bc660a..00000000000000 --- a/ports/nanomsg/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: nanomsg -Version: 1.1.5-2 -Description: a simple high-performance implementation of several "scalability protocols". - These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket. - -Feature: tool -Description: nanomsg tool (nanocat) diff --git a/ports/nanomsg/vcpkg.json b/ports/nanomsg/vcpkg.json new file mode 100644 index 00000000000000..4ed0ef1c5f8df4 --- /dev/null +++ b/ports/nanomsg/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "nanomsg", + "version-string": "1.1.5", + "port-version": 3, + "description": [ + "a simple high-performance implementation of several \"scalability protocols\".", + "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket." + ], + "features": { + "tool": { + "description": "nanomsg tool (nanocat)" + } + } +} diff --git a/ports/nanoprintf/CONTROL b/ports/nanoprintf/CONTROL deleted file mode 100644 index f3518b9006b1a8..00000000000000 --- a/ports/nanoprintf/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nanoprintf -Version: 2020-05-27 -Description: A tiny embeddable printf replacement written in C99 -Homepage: https://github.com/charlesnicholson/nanoprintf diff --git a/ports/nanoprintf/vcpkg.json b/ports/nanoprintf/vcpkg.json new file mode 100644 index 00000000000000..9828d6baa28eea --- /dev/null +++ b/ports/nanoprintf/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nanoprintf", + "version-string": "2020-05-27", + "port-version": 1, + "description": "A tiny embeddable printf replacement written in C99", + "homepage": "https://github.com/charlesnicholson/nanoprintf" +} diff --git a/ports/nanorange/CONTROL b/ports/nanorange/CONTROL deleted file mode 100644 index 0ff1b400feb619..00000000000000 --- a/ports/nanorange/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: nanorange -Version: 0.0.0 -Description: NanoRange is a C++14 implementation of the C++20 Ranges proposals. \ No newline at end of file diff --git a/ports/nanorange/vcpkg.json b/ports/nanorange/vcpkg.json new file mode 100644 index 00000000000000..7ed217cb00007a --- /dev/null +++ b/ports/nanorange/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "nanorange", + "version-string": "0.0.0", + "port-version": 1, + "description": "NanoRange is a C++14 implementation of the C++20 Ranges proposals." +} diff --git a/ports/nanort/CONTROL b/ports/nanort/CONTROL deleted file mode 100644 index 6b45af8d4e0b59..00000000000000 --- a/ports/nanort/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nanort -Version: 2019-08-20-1 -Description: Single header only modern ray tracing kernel -Homepage: https://github.com/lighttransport/nanort diff --git a/ports/nanort/vcpkg.json b/ports/nanort/vcpkg.json new file mode 100644 index 00000000000000..c91db27aeabf11 --- /dev/null +++ b/ports/nanort/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nanort", + "version-string": "2019-08-20", + "port-version": 2, + "description": "Single header only modern ray tracing kernel", + "homepage": "https://github.com/lighttransport/nanort" +} diff --git a/ports/nanovg/CONTROL b/ports/nanovg/CONTROL deleted file mode 100644 index 57bd00f7264638..00000000000000 --- a/ports/nanovg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: nanovg -Version: 2019-8-30-3 -Homepage: https://github.com/memononen/nanovg -Description: NanoVG is small antialiased vector graphics rendering library for OpenGL. -Build-Depends: stb \ No newline at end of file diff --git a/ports/nanovg/vcpkg.json b/ports/nanovg/vcpkg.json new file mode 100644 index 00000000000000..39e3cd017f68bd --- /dev/null +++ b/ports/nanovg/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "nanovg", + "version-string": "2019-8-30", + "port-version": 4, + "description": "NanoVG is small antialiased vector graphics rendering library for OpenGL.", + "homepage": "https://github.com/memononen/nanovg", + "dependencies": [ + "stb" + ] +} diff --git a/ports/neargye-semver/CONTROL b/ports/neargye-semver/CONTROL deleted file mode 100644 index 4b7745b394b8c0..00000000000000 --- a/ports/neargye-semver/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: neargye-semver -Version: 0.2.2 -Description: C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0 -Homepage: https://github.com/Neargye/semver diff --git a/ports/neargye-semver/vcpkg.json b/ports/neargye-semver/vcpkg.json new file mode 100644 index 00000000000000..925b02892f2fb0 --- /dev/null +++ b/ports/neargye-semver/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "neargye-semver", + "version-string": "0.2.2", + "port-version": 1, + "description": "C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0", + "homepage": "https://github.com/Neargye/semver" +} diff --git a/ports/ned14-internal-quickcpplib/CONTROL b/ports/ned14-internal-quickcpplib/CONTROL deleted file mode 100644 index 907c6584aae6d9..00000000000000 --- a/ports/ned14-internal-quickcpplib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ned14-internal-quickcpplib -Version: 0.0.0-7cb75d4e -Homepage: https://github.com/ned14/quickcpplib -Description: NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries. -Build-Depends: byte-lite, gsl-lite diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json new file mode 100644 index 00000000000000..b201b5fdcc6daa --- /dev/null +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "ned14-internal-quickcpplib", + "version-string": "0.0.0-7cb75d4e", + "port-version": 1, + "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", + "homepage": "https://github.com/ned14/quickcpplib", + "dependencies": [ + "byte-lite", + "gsl-lite" + ] +} diff --git a/ports/netcdf-cxx4/CONTROL b/ports/netcdf-cxx4/CONTROL deleted file mode 100644 index cf69865612e63c..00000000000000 --- a/ports/netcdf-cxx4/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: netcdf-cxx4 -Version: 4.3.1 -Port-Version: 2 -Build-Depends: hdf5, netcdf-c -Homepage: https://github.com/Unidata/netcdf-cxx4 -Description: a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-cxx4/vcpkg.json b/ports/netcdf-cxx4/vcpkg.json new file mode 100644 index 00000000000000..58fcf7625be67f --- /dev/null +++ b/ports/netcdf-cxx4/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "netcdf-cxx4", + "version-string": "4.3.1", + "port-version": 3, + "description": "a set of machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", + "homepage": "https://github.com/Unidata/netcdf-cxx4", + "dependencies": [ + "hdf5", + "netcdf-c" + ] +} diff --git a/ports/nethost/CONTROL b/ports/nethost/CONTROL deleted file mode 100644 index f1e97e1d0c8544..00000000000000 --- a/ports/nethost/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nethost -Version: 2019-12-21 -Description: Provides a set of APIs that can be used to host .NET Core (dotnet) -Homepage: https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost diff --git a/ports/nethost/vcpkg.json b/ports/nethost/vcpkg.json new file mode 100644 index 00000000000000..467d4249c8b13b --- /dev/null +++ b/ports/nethost/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nethost", + "version-string": "2019-12-21", + "port-version": 1, + "description": "Provides a set of APIs that can be used to host .NET Core (dotnet)", + "homepage": "https://github.com/dotnet/runtime/tree/master/src/installer/corehost/cli/nethost" +} diff --git a/ports/networkdirect-sdk/CONTROL b/ports/networkdirect-sdk/CONTROL deleted file mode 100644 index 4863ffae154e7f..00000000000000 --- a/ports/networkdirect-sdk/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: networkdirect-sdk -Version: 2.0.1 -Port-Version: 1 -Description: The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices. -Homepage: https://www.nuget.org/packages/NetworkDirect -Supports: windows & (x64|x86) & !uwp \ No newline at end of file diff --git a/ports/networkdirect-sdk/vcpkg.json b/ports/networkdirect-sdk/vcpkg.json new file mode 100644 index 00000000000000..ec8ec3f989082f --- /dev/null +++ b/ports/networkdirect-sdk/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "networkdirect-sdk", + "version-string": "2.0.1", + "port-version": 2, + "description": "The Network Direct architecture allows hardware vendors to expose the advanced capabilities of their networking devices.", + "homepage": "https://www.nuget.org/packages/NetworkDirect", + "supports": "windows & (x64 | x86) & !uwp" +} diff --git a/ports/nifticlib/CONTROL b/ports/nifticlib/CONTROL deleted file mode 100644 index acd8aedaa51db3..00000000000000 --- a/ports/nifticlib/CONTROL +++ /dev/null @@ -1,25 +0,0 @@ -Source: nifticlib -Version: 2020-04-30 -Description: Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format. -Homepage: NIFTI-Imaging/nifti_clib -Build-Depends: zlib -Default-Features: nifti2, nifticdf -Supports: !uwp - -Feature: cifti -Description: Build cifti libraries and tools - -Feature: fsl -Description: Build fsl libraries and tools - -Feature: nifti2 -Description: Build nifti2 libraries and tools - -Feature: nifticdf -Description: Build nifticdf libraries and tools - -Feature: tools -Description: Build tools - -Feature: tests -Description: Build tests diff --git a/ports/nifticlib/vcpkg.json b/ports/nifticlib/vcpkg.json new file mode 100644 index 00000000000000..8a35da5a0ae0a8 --- /dev/null +++ b/ports/nifticlib/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "nifticlib", + "version-string": "2020-04-30", + "port-version": 1, + "description": "Nifticlib is a C I/O library for reading and writing files in the nifti-1 data format.", + "homepage": "NIFTI-Imaging/nifti_clib", + "supports": "!uwp", + "dependencies": [ + "zlib" + ], + "default-features": [ + "nifti2", + "nifticdf" + ], + "features": { + "cifti": { + "description": "Build cifti libraries and tools" + }, + "fsl": { + "description": "Build fsl libraries and tools" + }, + "nifti2": { + "description": "Build nifti2 libraries and tools" + }, + "nifticdf": { + "description": "Build nifticdf libraries and tools" + }, + "tests": { + "description": "Build tests" + }, + "tools": { + "description": "Build tools" + } + } +} diff --git a/ports/nlohmann-fifo-map/CONTROL b/ports/nlohmann-fifo-map/CONTROL deleted file mode 100644 index 22b81c51f5f06d..00000000000000 --- a/ports/nlohmann-fifo-map/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nlohmann-fifo-map -Version: 2018.05.07-1 -Homepage: https://github.com/nlohmann/fifo_map -Description: a FIFO-ordered associative container for C++ diff --git a/ports/nlohmann-fifo-map/vcpkg.json b/ports/nlohmann-fifo-map/vcpkg.json new file mode 100644 index 00000000000000..e18734a35f4f05 --- /dev/null +++ b/ports/nlohmann-fifo-map/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nlohmann-fifo-map", + "version-string": "2018.05.07", + "port-version": 2, + "description": "a FIFO-ordered associative container for C++", + "homepage": "https://github.com/nlohmann/fifo_map" +} diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL deleted file mode 100644 index 4faefb97572119..00000000000000 --- a/ports/nmslib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: nmslib -Version: 2.0.6 -Homepage: https://github.com/searchivarius/nmslib -Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces. -Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/nmslib/vcpkg.json b/ports/nmslib/vcpkg.json new file mode 100644 index 00000000000000..55af27add03f7d --- /dev/null +++ b/ports/nmslib/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "nmslib", + "version-string": "2.0.6", + "port-version": 1, + "description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.", + "homepage": "https://github.com/searchivarius/nmslib", + "supports": "!(arm | uwp)" +} diff --git a/ports/nngpp/CONTROL b/ports/nngpp/CONTROL deleted file mode 100644 index 9c52b24b4ef154..00000000000000 --- a/ports/nngpp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: nngpp -Version: 1.3.0 -Homepage: https://github.com/cwzx/nngpp -Description: C++ wrapper around the nanomsg NNG API. -Build-Depends: nng - diff --git a/ports/nngpp/vcpkg.json b/ports/nngpp/vcpkg.json new file mode 100644 index 00000000000000..d7e62a2ea9a7cc --- /dev/null +++ b/ports/nngpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "nngpp", + "version-string": "1.3.0", + "port-version": 1, + "description": "C++ wrapper around the nanomsg NNG API.", + "homepage": "https://github.com/cwzx/nngpp", + "dependencies": [ + "nng" + ] +} diff --git a/ports/nonius/CONTROL b/ports/nonius/CONTROL deleted file mode 100644 index 46c984038260eb..00000000000000 --- a/ports/nonius/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nonius -Version: 2019-04-20-1 -Description: A C++ micro-benchmarking framework -Build-Depends: boost-algorithm, boost-lexical-cast, boost-math diff --git a/ports/nonius/vcpkg.json b/ports/nonius/vcpkg.json new file mode 100644 index 00000000000000..71fef7a085139b --- /dev/null +++ b/ports/nonius/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "nonius", + "version-string": "2019-04-20", + "port-version": 2, + "description": "A C++ micro-benchmarking framework", + "dependencies": [ + "boost-algorithm", + "boost-lexical-cast", + "boost-math" + ] +} diff --git a/ports/nrf-ble-driver/CONTROL b/ports/nrf-ble-driver/CONTROL deleted file mode 100644 index fa530b0440343e..00000000000000 --- a/ports/nrf-ble-driver/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nrf-ble-driver -Version: 4.1.2 -Description: BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits. -Build-Depends: spdlog, catch2, cli11, asio diff --git a/ports/nrf-ble-driver/vcpkg.json b/ports/nrf-ble-driver/vcpkg.json new file mode 100644 index 00000000000000..07176c46608bd9 --- /dev/null +++ b/ports/nrf-ble-driver/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "nrf-ble-driver", + "version-string": "4.1.2", + "port-version": 1, + "description": "BLE driver is a library for Bluetooth Low Energy communication using Nordic Semiconductor development kits.", + "dependencies": [ + "asio", + "catch2", + "cli11", + "spdlog" + ] +} diff --git a/ports/nt-wrapper/CONTROL b/ports/nt-wrapper/CONTROL deleted file mode 100644 index cd16e95412b3ef..00000000000000 --- a/ports/nt-wrapper/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: nt-wrapper -Version: 2019-08-10 -Description: A header only wrapper library around native windows system APIs -Homepage: https://github.com/JustasMasiulis/nt_wrapper diff --git a/ports/nt-wrapper/vcpkg.json b/ports/nt-wrapper/vcpkg.json new file mode 100644 index 00000000000000..7504ae1903e74c --- /dev/null +++ b/ports/nt-wrapper/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "nt-wrapper", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A header only wrapper library around native windows system APIs", + "homepage": "https://github.com/JustasMasiulis/nt_wrapper" +} diff --git a/ports/numactl/CONTROL b/ports/numactl/CONTROL deleted file mode 100644 index 4c5c03687e98e1..00000000000000 --- a/ports/numactl/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: numactl -Version: 2.0.12 -Description: NUMA support for Linux diff --git a/ports/numactl/vcpkg.json b/ports/numactl/vcpkg.json new file mode 100644 index 00000000000000..062e737eafa5cf --- /dev/null +++ b/ports/numactl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "numactl", + "version-string": "2.0.12", + "port-version": 1, + "description": "NUMA support for Linux" +} diff --git a/ports/nvtt/CONTROL b/ports/nvtt/CONTROL deleted file mode 100644 index 4e2332dad8802c..00000000000000 --- a/ports/nvtt/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: nvtt -Version: 2.1.2 -Port-Version: 1 -Homepage: https://github.com/castano/nvidia-texture-tools -Description: Texture processing tools with support for Direct3D 10 and 11 formats. -Supports: !x86 -Build-Depends: libsquish diff --git a/ports/nvtt/vcpkg.json b/ports/nvtt/vcpkg.json new file mode 100644 index 00000000000000..24ad40926d3072 --- /dev/null +++ b/ports/nvtt/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "nvtt", + "version-string": "2.1.2", + "port-version": 2, + "description": "Texture processing tools with support for Direct3D 10 and 11 formats.", + "homepage": "https://github.com/castano/nvidia-texture-tools", + "supports": "!x86", + "dependencies": [ + "libsquish" + ] +} diff --git a/ports/observer-ptr-lite/CONTROL b/ports/observer-ptr-lite/CONTROL deleted file mode 100644 index 547e64289dd677..00000000000000 --- a/ports/observer-ptr-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: observer-ptr-lite -Version: 0.4.0 -Description: A C++17-like observer_ptr for C++98 and later in a single-file header-only library diff --git a/ports/observer-ptr-lite/vcpkg.json b/ports/observer-ptr-lite/vcpkg.json new file mode 100644 index 00000000000000..e2d70546534145 --- /dev/null +++ b/ports/observer-ptr-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "observer-ptr-lite", + "version-string": "0.4.0", + "port-version": 1, + "description": "A C++17-like observer_ptr for C++98 and later in a single-file header-only library" +} diff --git a/ports/octomap/CONTROL b/ports/octomap/CONTROL deleted file mode 100644 index 1607f51409db1a..00000000000000 --- a/ports/octomap/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: octomap -Version: 1.9.5 -Homepage: https://octomap.github.io/ -Description: An Efficient Probabilistic 3D Mapping Framework Based on Octrees diff --git a/ports/octomap/vcpkg.json b/ports/octomap/vcpkg.json new file mode 100644 index 00000000000000..8aa0e86d57c540 --- /dev/null +++ b/ports/octomap/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "octomap", + "version-string": "1.9.5", + "port-version": 1, + "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", + "homepage": "https://octomap.github.io/" +} diff --git a/ports/ode/CONTROL b/ports/ode/CONTROL deleted file mode 100644 index 4c01578be7b6fa..00000000000000 --- a/ports/ode/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ode -Version: 0.16.1 -Homepage: https://bitbucket.org/odedevs/ode/src/default/ -Description: Open Dynamics Engine diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json new file mode 100644 index 00000000000000..4d507866a37512 --- /dev/null +++ b/ports/ode/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ode", + "version-string": "0.16.1", + "port-version": 1, + "description": "Open Dynamics Engine", + "homepage": "https://bitbucket.org/odedevs/ode/src/default/" +} diff --git a/ports/offscale-libetcd-cpp/CONTROL b/ports/offscale-libetcd-cpp/CONTROL deleted file mode 100644 index e164c928ecbfc7..00000000000000 --- a/ports/offscale-libetcd-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: offscale-libetcd-cpp -Version: 2019-07-10-1 -Homepage: https://github.com/offscale/libetcd-cpp -Description: A C++ client library for etcd. etcd is a distributed, reliable key-value store. -Build-Depends: grpc, protobuf diff --git a/ports/offscale-libetcd-cpp/vcpkg.json b/ports/offscale-libetcd-cpp/vcpkg.json new file mode 100644 index 00000000000000..b6c2f5164cf77f --- /dev/null +++ b/ports/offscale-libetcd-cpp/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "offscale-libetcd-cpp", + "version-string": "2019-07-10", + "port-version": 2, + "description": "A C++ client library for etcd. etcd is a distributed, reliable key-value store.", + "homepage": "https://github.com/offscale/libetcd-cpp", + "dependencies": [ + "grpc", + "protobuf" + ] +} diff --git a/ports/ogdf/CONTROL b/ports/ogdf/CONTROL deleted file mode 100644 index f7f7909f11028a..00000000000000 --- a/ports/ogdf/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ogdf -Version: 2019-08-23 -Port-Version: 1 -Homepage: https://github.com/ogdf/ogdf -Description: Open Graph Drawing Framework diff --git a/ports/ogdf/vcpkg.json b/ports/ogdf/vcpkg.json new file mode 100644 index 00000000000000..dc21d5e43f8141 --- /dev/null +++ b/ports/ogdf/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ogdf", + "version-string": "2019-08-23", + "port-version": 2, + "description": "Open Graph Drawing Framework", + "homepage": "https://github.com/ogdf/ogdf" +} diff --git a/ports/ogre-next/CONTROL b/ports/ogre-next/CONTROL deleted file mode 100644 index f2ebbddafa8bf1..00000000000000 --- a/ports/ogre-next/CONTROL +++ /dev/null @@ -1,18 +0,0 @@ -Source: ogre-next -Version: 2019-10-20-1 -Build-Depends: zlib, freeimage, freetype, rapidjson, openvr, boost-thread, boost-date-time, poco, tbb, sdl2, tinyxml, zziplib -Homepage: https://github.com/OGRECave/ogre-next -Description: Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++ - -Feature: d3d9 -Description: Build Direct3D9 RenderSystem - -Feature: csharp -Description: Build csharp bindings - -Feature: java -Description: Build Java (JNI) bindings - -Feature: python -Description: Build Python bindings -Build-Depends: python3 diff --git a/ports/ogre-next/vcpkg.json b/ports/ogre-next/vcpkg.json new file mode 100644 index 00000000000000..a729f0bfd84319 --- /dev/null +++ b/ports/ogre-next/vcpkg.json @@ -0,0 +1,38 @@ +{ + "name": "ogre-next", + "version-string": "2019-10-20", + "port-version": 2, + "description": "Ogre 2.1 & 2.2 - scene-oriented, flexible 3D engine written in C++", + "homepage": "https://github.com/OGRECave/ogre-next", + "dependencies": [ + "boost-date-time", + "boost-thread", + "freeimage", + "freetype", + "openvr", + "poco", + "rapidjson", + "sdl2", + "tbb", + "tinyxml", + "zlib", + "zziplib" + ], + "features": { + "csharp": { + "description": "Build csharp bindings" + }, + "d3d9": { + "description": "Build Direct3D9 RenderSystem" + }, + "java": { + "description": "Build Java (JNI) bindings" + }, + "python": { + "description": "Build Python bindings", + "dependencies": [ + "python3" + ] + } + } +} diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL deleted file mode 100644 index 259006c2c4a5ad..00000000000000 --- a/ports/ompl/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: ompl -Version: 1.5.1 -Port-Version: 1 -Homepage: https://ompl.kavrakilab.org/ -Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms -Build-Depends: boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3 diff --git a/ports/ompl/vcpkg.json b/ports/ompl/vcpkg.json new file mode 100644 index 00000000000000..81a8c5ff4a332c --- /dev/null +++ b/ports/ompl/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "ompl", + "version-string": "1.5.1", + "port-version": 2, + "description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms", + "homepage": "https://ompl.kavrakilab.org/", + "dependencies": [ + "boost-dynamic-bitset", + "boost-filesystem", + "boost-graph", + "boost-odeint", + "boost-program-options", + "boost-serialization", + "boost-system", + "boost-test", + "boost-timer", + "boost-ublas", + "eigen3" + ] +} diff --git a/ports/oniguruma/CONTROL b/ports/oniguruma/CONTROL deleted file mode 100644 index 8ca0146fed00d4..00000000000000 --- a/ports/oniguruma/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: oniguruma -Version: 6.9.4 -Description: Modern and flexible regular expressions library -Homepage: https://github.com/kkos/oniguruma - -Feature: non-posix -Description: Disable POSIX API diff --git a/ports/oniguruma/vcpkg.json b/ports/oniguruma/vcpkg.json new file mode 100644 index 00000000000000..8b73eea8d81f82 --- /dev/null +++ b/ports/oniguruma/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "oniguruma", + "version-string": "6.9.4", + "port-version": 1, + "description": "Modern and flexible regular expressions library", + "homepage": "https://github.com/kkos/oniguruma", + "features": { + "non-posix": { + "description": "Disable POSIX API" + } + } +} diff --git a/ports/opencascade/CONTROL b/ports/opencascade/CONTROL deleted file mode 100644 index 11df638352d19d..00000000000000 --- a/ports/opencascade/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: opencascade -Version: 7.5.0 -Port-Version: 1 -Build-Depends: freetype -Description: Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE. -Supports: !(uwp|osx|linux|arm) - -Feature: freeimage -Build-Depends: freeimage -Description: Enable optional usage of freeimage - -Feature: tbb -Build-Depends: tbb -Description: Enable optional usage of tbb diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json new file mode 100644 index 00000000000000..8296c5a98ccefc --- /dev/null +++ b/ports/opencascade/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "opencascade", + "version-string": "7.5.0", + "port-version": 2, + "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", + "supports": "!(uwp | osx | linux | arm)", + "dependencies": [ + "freetype" + ], + "features": { + "freeimage": { + "description": "Enable optional usage of freeimage", + "dependencies": [ + "freeimage" + ] + }, + "tbb": { + "description": "Enable optional usage of tbb", + "dependencies": [ + "tbb" + ] + } + } +} diff --git a/ports/opencc/CONTROL b/ports/opencc/CONTROL deleted file mode 100644 index ab49052f045bb0..00000000000000 --- a/ports/opencc/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: opencc -Version: 2020-04-26 -Port-Version: 7 -Description: A project for conversion between Traditional and Simplified Chinese -Homepage: https://github.com/BYVoid/OpenCC -Supports: !(arm|arm64|uwp) - -Feature: tools -Description: Build OpenCC command-line tools diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json new file mode 100644 index 00000000000000..dc346293c31b3d --- /dev/null +++ b/ports/opencc/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "opencc", + "version-string": "2020-04-26", + "port-version": 8, + "description": "A project for conversion between Traditional and Simplified Chinese", + "homepage": "https://github.com/BYVoid/OpenCC", + "supports": "!(arm | arm64 | uwp)", + "features": { + "tools": { + "description": "Build OpenCC command-line tools" + } + } +} diff --git a/ports/opencensus-cpp/CONTROL b/ports/opencensus-cpp/CONTROL deleted file mode 100644 index bb0e4e0e63c61a..00000000000000 --- a/ports/opencensus-cpp/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: opencensus-cpp -Version: 0.4.0-1 -Homepage: https://github.com/census-instrumentation/opencensus-cpp -Description: OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats. -Build-Depends: abseil -Supports: !windows - -Feature: test -Description: Build test \ No newline at end of file diff --git a/ports/opencensus-cpp/vcpkg.json b/ports/opencensus-cpp/vcpkg.json new file mode 100644 index 00000000000000..892a8754e7c715 --- /dev/null +++ b/ports/opencensus-cpp/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "opencensus-cpp", + "version-string": "0.4.0", + "port-version": 2, + "description": "OpenCensus is a toolkit for collecting application performance and behavior data. It currently includes an API for tracing and stats.", + "homepage": "https://github.com/census-instrumentation/opencensus-cpp", + "supports": "!windows", + "dependencies": [ + "abseil" + ], + "features": { + "test": { + "description": "Build test" + } + } +} diff --git a/ports/opencl/CONTROL b/ports/opencl/CONTROL deleted file mode 100644 index d9e08847cd6e86..00000000000000 --- a/ports/opencl/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: opencl -Version: 2.2 -Port-Version: 7 -Homepage: https://github.com/KhronosGroup/OpenCL-Headers -Description: C/C++ headers and ICD loader (Installable Client Driver) for OpenCL -Supports: !uwp diff --git a/ports/opencl/vcpkg.json b/ports/opencl/vcpkg.json new file mode 100644 index 00000000000000..633a0ab8c874f4 --- /dev/null +++ b/ports/opencl/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "opencl", + "version-string": "2.2", + "port-version": 8, + "description": "C/C++ headers and ICD loader (Installable Client Driver) for OpenCL", + "homepage": "https://github.com/KhronosGroup/OpenCL-Headers", + "supports": "!uwp" +} diff --git a/ports/opencsg/CONTROL b/ports/opencsg/CONTROL deleted file mode 100644 index f48cff6d3e99c1..00000000000000 --- a/ports/opencsg/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: opencsg -Version: 1.4.2-1 -Build-Depends: glew -Description: OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system. diff --git a/ports/opencsg/vcpkg.json b/ports/opencsg/vcpkg.json new file mode 100644 index 00000000000000..829a0f63aabde9 --- /dev/null +++ b/ports/opencsg/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "opencsg", + "version-string": "1.4.2", + "port-version": 2, + "description": "OpenCSG is a library that does image-based CSG rendering using OpenGL. OpenCSG is written in C++ and supports most modern graphics hardware using Microsoft Windows or the Linux operating system.", + "dependencies": [ + "glew" + ] +} diff --git a/ports/opengl-registry/CONTROL b/ports/opengl-registry/CONTROL deleted file mode 100644 index fece53105d2469..00000000000000 --- a/ports/opengl-registry/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: opengl-registry -Version: 2020-03-25 -Homepage: https://github.com/KhronosGroup/OpenGL-Registry -Build-Depends: egl-registry -Description: the API and Extension registries for the OpenGL family APIs diff --git a/ports/opengl-registry/vcpkg.json b/ports/opengl-registry/vcpkg.json new file mode 100644 index 00000000000000..2ba48cf6abcadd --- /dev/null +++ b/ports/opengl-registry/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "opengl-registry", + "version-string": "2020-03-25", + "port-version": 1, + "description": "the API and Extension registries for the OpenGL family APIs", + "homepage": "https://github.com/KhronosGroup/OpenGL-Registry", + "dependencies": [ + "egl-registry" + ] +} diff --git a/ports/opengl/CONTROL b/ports/opengl/CONTROL deleted file mode 100644 index 625d51c3518521..00000000000000 --- a/ports/opengl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: opengl -Version: 0.0 -Port-Version: 8 -Description: Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics. diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json new file mode 100644 index 00000000000000..da77cb58b28bf2 --- /dev/null +++ b/ports/opengl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "opengl", + "version-string": "0.0", + "port-version": 9, + "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics." +} diff --git a/ports/openigtlink/CONTROL b/ports/openigtlink/CONTROL deleted file mode 100644 index 46af2d45efc5cc..00000000000000 --- a/ports/openigtlink/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: openigtlink -Version: 3.0 -Port-Version: 1 -Homepage: https://github.com/openigtlink/OpenIGTLink -Description: OpenIGTLink is an open-source network communication interface specifically designed for image-guided interventions. diff --git a/ports/openigtlink/vcpkg.json b/ports/openigtlink/vcpkg.json new file mode 100644 index 00000000000000..a106056b515650 --- /dev/null +++ b/ports/openigtlink/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "openigtlink", + "version-string": "3.0", + "port-version": 2, + "description": "OpenIGTLink is an open-source network communication interface specifically designed for image-guided interventions.", + "homepage": "https://github.com/openigtlink/OpenIGTLink" +} diff --git a/ports/openmesh/CONTROL b/ports/openmesh/CONTROL deleted file mode 100644 index 08bb7199822ecc..00000000000000 --- a/ports/openmesh/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: openmesh -Version: 8.1 -Description: A generic and efficient polygon mesh data structure diff --git a/ports/openmesh/vcpkg.json b/ports/openmesh/vcpkg.json new file mode 100644 index 00000000000000..9d64ee9cac047d --- /dev/null +++ b/ports/openmesh/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "openmesh", + "version-string": "8.1", + "port-version": 1, + "description": "A generic and efficient polygon mesh data structure" +} diff --git a/ports/openmpi/CONTROL b/ports/openmpi/CONTROL deleted file mode 100644 index 9eaf0f3f3bf9e5..00000000000000 --- a/ports/openmpi/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: openmpi -Version: 4.1.0 -Homepage: https://www.open-mpi.org/ -Description: The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers. -Supports: !(windows|uwp) diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json new file mode 100644 index 00000000000000..96fae3a06df50e --- /dev/null +++ b/ports/openmpi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "openmpi", + "version-string": "4.1.0", + "port-version": 1, + "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", + "homepage": "https://www.open-mpi.org/", + "supports": "!(windows | uwp)" +} diff --git a/ports/openmvs/CONTROL b/ports/openmvs/CONTROL deleted file mode 100644 index 6947e9241647d7..00000000000000 --- a/ports/openmvs/CONTROL +++ /dev/null @@ -1,13 +0,0 @@ -Source: openmvs -Version: 1.1 -Port-Version: 4 -Description: OpenMVS: open Multi-View Stereo reconstruction library -Homepage: https://cdcseacave.github.io/openMVS -Build-Depends: zlib, boost-iostreams, boost-program-options, boost-system, boost-serialization, eigen3, opencv, cgal[core], glew, glfw3, vcglib, openmvg[software] (!(windows&static)), libpng, tiff - -Feature: cuda -Build-Depends: cuda -Description: cuda support for openmvs - -Feature: openmp -Description: openmp support for openmvs diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json new file mode 100644 index 00000000000000..74df96ee51e340 --- /dev/null +++ b/ports/openmvs/vcpkg.json @@ -0,0 +1,43 @@ +{ + "name": "openmvs", + "version-string": "1.1", + "port-version": 5, + "description": "OpenMVS: open Multi-View Stereo reconstruction library", + "homepage": "https://cdcseacave.github.io/openMVS", + "dependencies": [ + "boost-iostreams", + "boost-program-options", + "boost-serialization", + "boost-system", + { + "name": "cgal", + "default-features": false + }, + "eigen3", + "glew", + "glfw3", + "libpng", + "opencv", + { + "name": "openmvg", + "features": [ + "software" + ], + "platform": "!(windows & static)" + }, + "tiff", + "vcglib", + "zlib" + ], + "features": { + "cuda": { + "description": "cuda support for openmvs", + "dependencies": [ + "cuda" + ] + }, + "openmp": { + "description": "openmp support for openmvs" + } + } +} diff --git a/ports/openni2/CONTROL b/ports/openni2/CONTROL deleted file mode 100644 index c1b869a57bdfec..00000000000000 --- a/ports/openni2/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: openni2 -Version: 2.2.0.33-11 -Build-Depends: kinectsdk1 -Homepage: https://github.com/OpenNI/OpenNI2 -Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera. -Supports: !uwp \ No newline at end of file diff --git a/ports/openni2/vcpkg.json b/ports/openni2/vcpkg.json new file mode 100644 index 00000000000000..6cb6c7c367fe78 --- /dev/null +++ b/ports/openni2/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "openni2", + "version-string": "2.2.0.33", + "port-version": 12, + "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.", + "homepage": "https://github.com/OpenNI/OpenNI2", + "supports": "!uwp", + "dependencies": [ + "kinectsdk1" + ] +} diff --git a/ports/openscap/CONTROL b/ports/openscap/CONTROL deleted file mode 100644 index 631a0c7946cbbf..00000000000000 --- a/ports/openscap/CONTROL +++ /dev/null @@ -1,18 +0,0 @@ -Source: openscap -Version: 1.3.1 -Homepage: https://github.com/OpenSCAP/openscap -Description: The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents. -Build-Depends: libxslt, libxml2, libzip, curl, pcre2, libpopt, pthread, glib, openssl, zlib - -Feature: docs -Description: install docs - -Feature: tests -Description: build with tests - -Feature: util -Description: build available utils -Build-Depends: getopt-win32 (windows) - -Feature: python -Description: build with python3 \ No newline at end of file diff --git a/ports/openscap/vcpkg.json b/ports/openscap/vcpkg.json new file mode 100644 index 00000000000000..3bab620ed2dd74 --- /dev/null +++ b/ports/openscap/vcpkg.json @@ -0,0 +1,39 @@ +{ + "name": "openscap", + "version-string": "1.3.1", + "port-version": 1, + "description": "The oscap program is a command line tool that allows users to load, scan, validate, edit, and export SCAP documents.", + "homepage": "https://github.com/OpenSCAP/openscap", + "dependencies": [ + "curl", + "glib", + "libpopt", + "libxml2", + "libxslt", + "libzip", + "openssl", + "pcre2", + "pthread", + "zlib" + ], + "features": { + "docs": { + "description": "install docs" + }, + "python": { + "description": "build with python3" + }, + "tests": { + "description": "build with tests" + }, + "util": { + "description": "build available utils", + "dependencies": [ + { + "name": "getopt-win32", + "platform": "windows" + } + ] + } + } +} diff --git a/ports/openssl-unix/CONTROL b/ports/openssl-unix/CONTROL deleted file mode 100644 index 02553017b0616a..00000000000000 --- a/ports/openssl-unix/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: openssl-unix -Version: 1.1.1h -Port-Version: 1 -Description: Deprecated OpenSSL port -Supports: !(windows|uwp) -Build-Depends: openssl \ No newline at end of file diff --git a/ports/openssl-unix/vcpkg.json b/ports/openssl-unix/vcpkg.json new file mode 100644 index 00000000000000..16ac635a7d548f --- /dev/null +++ b/ports/openssl-unix/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "openssl-unix", + "version-string": "1.1.1h", + "port-version": 2, + "description": "Deprecated OpenSSL port", + "supports": "!(windows | uwp)", + "dependencies": [ + "openssl" + ] +} diff --git a/ports/openssl-uwp/CONTROL b/ports/openssl-uwp/CONTROL deleted file mode 100644 index ca8b597901178e..00000000000000 --- a/ports/openssl-uwp/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: openssl-uwp -Version: 1.1.1h -Port-Version: 1 -Description: Deprecated OpenSSL port -Supports: uwp -Build-Depends: openssl \ No newline at end of file diff --git a/ports/openssl-uwp/vcpkg.json b/ports/openssl-uwp/vcpkg.json new file mode 100644 index 00000000000000..eba2d4781ee4a3 --- /dev/null +++ b/ports/openssl-uwp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "openssl-uwp", + "version-string": "1.1.1h", + "port-version": 2, + "description": "Deprecated OpenSSL port", + "supports": "uwp", + "dependencies": [ + "openssl" + ] +} diff --git a/ports/openssl-windows/CONTROL b/ports/openssl-windows/CONTROL deleted file mode 100644 index 0dd8bc4621a46c..00000000000000 --- a/ports/openssl-windows/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: openssl-windows -Version: 1.1.1h -Port-Version: 1 -Description: Deprecated OpenSSL port -Supports: windows -Build-Depends: openssl \ No newline at end of file diff --git a/ports/openssl-windows/vcpkg.json b/ports/openssl-windows/vcpkg.json new file mode 100644 index 00000000000000..069235b15ee031 --- /dev/null +++ b/ports/openssl-windows/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "openssl-windows", + "version-string": "1.1.1h", + "port-version": 2, + "description": "Deprecated OpenSSL port", + "supports": "windows", + "dependencies": [ + "openssl" + ] +} diff --git a/ports/openvpn3/CONTROL b/ports/openvpn3/CONTROL deleted file mode 100644 index 7ec06391882669..00000000000000 --- a/ports/openvpn3/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: openvpn3 -Version: 3.4.1-1 -Build-Depends: asio, tap-windows6 (windows), mbedtls -Description: a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch. diff --git a/ports/openvpn3/vcpkg.json b/ports/openvpn3/vcpkg.json new file mode 100644 index 00000000000000..ea718ed621af0e --- /dev/null +++ b/ports/openvpn3/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "openvpn3", + "version-string": "3.4.1", + "port-version": 2, + "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.", + "dependencies": [ + "asio", + "mbedtls", + { + "name": "tap-windows6", + "platform": "windows" + } + ] +} diff --git a/ports/openvr/CONTROL b/ports/openvr/CONTROL deleted file mode 100644 index 8ae10a92c60e12..00000000000000 --- a/ports/openvr/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: openvr -Version: 1.16.8 -Homepage: https://github.com/ValveSoftware/openvr -Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting. -Supports: !(arm|uwp|osx|android) \ No newline at end of file diff --git a/ports/openvr/vcpkg.json b/ports/openvr/vcpkg.json new file mode 100644 index 00000000000000..3a3b00bab4d153 --- /dev/null +++ b/ports/openvr/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "openvr", + "version-string": "1.16.8", + "port-version": 1, + "description": "an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting.", + "homepage": "https://github.com/ValveSoftware/openvr", + "supports": "!(arm | uwp | osx | android)" +} diff --git a/ports/openxr-loader/CONTROL b/ports/openxr-loader/CONTROL deleted file mode 100644 index 12cfd6a2c9af82..00000000000000 --- a/ports/openxr-loader/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: openxr-loader -Version: 1.0.18 -Port-Version: 1 -Description: Khronos API for abstracting VR/MR/AR hardware -Build-Depends: jsoncpp -Supports: !(arm|uwp) - -Feature: vulkan -Description: Vulkan functionality for OpenXR -Build-Depends: vulkan diff --git a/ports/openxr-loader/vcpkg.json b/ports/openxr-loader/vcpkg.json new file mode 100644 index 00000000000000..43ca0e1907caf9 --- /dev/null +++ b/ports/openxr-loader/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "openxr-loader", + "version-string": "1.0.18", + "port-version": 2, + "description": "Khronos API for abstracting VR/MR/AR hardware", + "supports": "!(arm | uwp)", + "dependencies": [ + "jsoncpp" + ], + "features": { + "vulkan": { + "description": "Vulkan functionality for OpenXR", + "dependencies": [ + "vulkan" + ] + } + } +} diff --git a/ports/optional-bare/CONTROL b/ports/optional-bare/CONTROL deleted file mode 100644 index 0c9fe141114a59..00000000000000 --- a/ports/optional-bare/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: optional-bare -Version: 1.1.0 -Description: A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library diff --git a/ports/optional-bare/vcpkg.json b/ports/optional-bare/vcpkg.json new file mode 100644 index 00000000000000..673d184acc268e --- /dev/null +++ b/ports/optional-bare/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "optional-bare", + "version-string": "1.1.0", + "port-version": 1, + "description": "A simple version of a C++17-like optional for default-constructible, copyable types, for C++98 and later in a single-file header-only library" +} diff --git a/ports/optional-lite/CONTROL b/ports/optional-lite/CONTROL deleted file mode 100644 index 076a05640d3ff1..00000000000000 --- a/ports/optional-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: optional-lite -Version: 3.2.0 -Description: A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library diff --git a/ports/optional-lite/vcpkg.json b/ports/optional-lite/vcpkg.json new file mode 100644 index 00000000000000..452f75670e083c --- /dev/null +++ b/ports/optional-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "optional-lite", + "version-string": "3.2.0", + "port-version": 1, + "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library" +} diff --git a/ports/opus/CONTROL b/ports/opus/CONTROL deleted file mode 100644 index 924e0dd8392909..00000000000000 --- a/ports/opus/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: opus -Version: 1.3.1 -Port-Version: 5 -Homepage: https://github.com/xiph/opus -Description: Totally open, royalty-free, highly versatile audio codec - -Feature: avx -Description: Builds the library with avx instruction set diff --git a/ports/opus/vcpkg.json b/ports/opus/vcpkg.json new file mode 100644 index 00000000000000..f1ea43d6952d02 --- /dev/null +++ b/ports/opus/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "opus", + "version-string": "1.3.1", + "port-version": 6, + "description": "Totally open, royalty-free, highly versatile audio codec", + "homepage": "https://github.com/xiph/opus", + "features": { + "avx": { + "description": "Builds the library with avx instruction set" + } + } +} diff --git a/ports/opusfile/CONTROL b/ports/opusfile/CONTROL deleted file mode 100644 index 139b7fa7e5ef2b..00000000000000 --- a/ports/opusfile/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: opusfile -Version: 0.12 -Homepage: https://github.com/xiph/opusfile -Description: Stand-alone decoder library for .opus streams -Build-Depends: libogg, opus -Supports: !uwp - -Feature: opusurl -Description: Support decoding of http(s) streams -Build-Depends: openssl diff --git a/ports/opusfile/vcpkg.json b/ports/opusfile/vcpkg.json new file mode 100644 index 00000000000000..212c393f55964c --- /dev/null +++ b/ports/opusfile/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "opusfile", + "version-string": "0.12", + "port-version": 1, + "description": "Stand-alone decoder library for .opus streams", + "homepage": "https://github.com/xiph/opusfile", + "supports": "!uwp", + "dependencies": [ + "libogg", + "opus" + ], + "features": { + "opusurl": { + "description": "Support decoding of http(s) streams", + "dependencies": [ + "openssl" + ] + } + } +} diff --git a/ports/orc/CONTROL b/ports/orc/CONTROL deleted file mode 100644 index 13302349eb8750..00000000000000 --- a/ports/orc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: orc -Version: 1.6.4 -Port-Version: 1 -Homepage: https://orc.apache.org/ -Build-Depends: zlib, protobuf, lz4, snappy, zstd, gtest -Description: The smallest, fastest columnar storage for Hadoop workloads. diff --git a/ports/orc/vcpkg.json b/ports/orc/vcpkg.json new file mode 100644 index 00000000000000..7f87b3c6236d10 --- /dev/null +++ b/ports/orc/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "orc", + "version-string": "1.6.4", + "port-version": 2, + "description": "The smallest, fastest columnar storage for Hadoop workloads.", + "homepage": "https://orc.apache.org/", + "dependencies": [ + "gtest", + "lz4", + "protobuf", + "snappy", + "zlib", + "zstd" + ] +} diff --git a/ports/osg-qt/CONTROL b/ports/osg-qt/CONTROL deleted file mode 100644 index c3c9dc621c1c26..00000000000000 --- a/ports/osg-qt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: osg-qt -Version: Qt5 -Port-Version: 1 -Description: osgQt - Qt project for making use of OpenSceneGraph(OSG) -Build-Depends: osg, qt5-base[core] diff --git a/ports/osg-qt/vcpkg.json b/ports/osg-qt/vcpkg.json new file mode 100644 index 00000000000000..06848711055c55 --- /dev/null +++ b/ports/osg-qt/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "osg-qt", + "version-string": "Qt5", + "port-version": 2, + "description": "osgQt - Qt project for making use of OpenSceneGraph(OSG)", + "dependencies": [ + "osg", + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL deleted file mode 100644 index a05f5abe7116e1..00000000000000 --- a/ports/osg/CONTROL +++ /dev/null @@ -1,28 +0,0 @@ -Source: osg -Version: 3.6.5 -Port-Version: 7 -Homepage: https://github.com/openscenegraph/OpenSceneGraph -Description: The OpenSceneGraph is an open source high performance 3D graphics toolkit. -Build-Depends: zlib, fontconfig (!windows), expat (windows), openimageio (osx) - -Feature: collada -Description: Support for Collada (.dae) files -Build-Depends: collada-dom - -Feature: tools -Description: Enable to build OSG Applications (e.g. osgviewer) -Build-Depends: freetype, sdl1, curl, libjpeg-turbo, libpng, libiconv (windows) - -Feature: examples -Description: Enable to build OSG Examples -Build-Depends: freetype, sdl1, sdl2, libiconv (windows) - -Feature: plugins -Description: Build OSG Plugins - Disable for compile testing examples on a time limit -Build-Depends: freetype, sdl1, curl, openexr, ilmbase, gdal, giflib (windows), jasper, libjpeg-turbo, libpng, tiff, libxml2 (windows), libiconv (windows), libgta, liblas, nvtt (!x86), coin, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows) - -Feature: packages -Description: Set to ON to generate CPack configuration files and packaging targets - -Feature: docs -Description: Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json new file mode 100644 index 00000000000000..8ad7f03b1621c5 --- /dev/null +++ b/ports/osg/vcpkg.json @@ -0,0 +1,124 @@ +{ + "name": "osg", + "version-string": "3.6.5", + "port-version": 8, + "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", + "homepage": "https://github.com/openscenegraph/OpenSceneGraph", + "dependencies": [ + { + "name": "expat", + "platform": "windows" + }, + { + "name": "fontconfig", + "platform": "!windows" + }, + { + "name": "openimageio", + "platform": "osx" + }, + "zlib" + ], + "features": { + "collada": { + "description": "Support for Collada (.dae) files", + "dependencies": [ + "collada-dom" + ] + }, + "docs": { + "description": "Build OpenSceneGraph reference documentation using doxygen (use: make doc_openscenegraph doc_openthreads" + }, + "examples": { + "description": "Enable to build OSG Examples", + "dependencies": [ + "freetype", + { + "name": "libiconv", + "platform": "windows" + }, + "sdl1", + "sdl2" + ] + }, + "packages": { + "description": "Set to ON to generate CPack configuration files and packaging targets" + }, + "plugins": { + "description": "Build OSG Plugins - Disable for compile testing examples on a time limit", + "dependencies": [ + { + "name": "boost-asio", + "platform": "!windows" + }, + { + "name": "boost-bind", + "platform": "!windows" + }, + { + "name": "boost-core", + "platform": "!windows" + }, + { + "name": "boost-lexical-cast", + "platform": "!windows" + }, + { + "name": "boost-logic", + "platform": "!windows" + }, + { + "name": "boost-smart-ptr", + "platform": "!windows" + }, + { + "name": "boost-tuple", + "platform": "!windows" + }, + "coin", + "curl", + "freetype", + "gdal", + { + "name": "giflib", + "platform": "windows" + }, + "ilmbase", + "jasper", + "libgta", + { + "name": "libiconv", + "platform": "windows" + }, + "libjpeg-turbo", + "liblas", + "libpng", + { + "name": "libxml2", + "platform": "windows" + }, + { + "name": "nvtt", + "platform": "!x86" + }, + "openexr", + "sdl1", + "tiff" + ] + }, + "tools": { + "description": "Enable to build OSG Applications (e.g. osgviewer)", + "dependencies": [ + "curl", + "freetype", + { + "name": "libiconv", + "platform": "windows" + }, + "libjpeg-turbo", + "libpng", + "sdl1" + ] + } + } +} diff --git a/ports/osi/CONTROL b/ports/osi/CONTROL deleted file mode 100644 index 5057f156df144d..00000000000000 --- a/ports/osi/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: osi -Version: 0.108.6 -Description: Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver. -Build-Depends: coinutils diff --git a/ports/osi/vcpkg.json b/ports/osi/vcpkg.json new file mode 100644 index 00000000000000..de8d0a488b76fe --- /dev/null +++ b/ports/osi/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "osi", + "version-string": "0.108.6", + "port-version": 1, + "description": "Osi (Open Solver Interface) provides an abstract base class to a generic linear programming (LP) solver, along with derived classes for specific solvers. Many applications may be able to use the Osi to insulate themselves from a specific LP solver.", + "dependencies": [ + "coinutils" + ] +} diff --git a/ports/outcome/CONTROL b/ports/outcome/CONTROL deleted file mode 100644 index 08e9024684cfe0..00000000000000 --- a/ports/outcome/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: outcome -Version: 2.2.0-release -Homepage: https://github.com/ned14/outcome -Description: Provides very lightweight outcome and result (non-Boost edition) -Build-Depends: ned14-internal-quickcpplib, status-code -Supports: !uwp - -Feature: run-tests -Description: Build and run the dependency validation tests diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json new file mode 100644 index 00000000000000..6c0a4e93ad307e --- /dev/null +++ b/ports/outcome/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "outcome", + "version-string": "2.2.0-release", + "port-version": 1, + "description": "Provides very lightweight outcome and result (non-Boost edition)", + "homepage": "https://github.com/ned14/outcome", + "supports": "!uwp", + "dependencies": [ + "ned14-internal-quickcpplib", + "status-code" + ], + "features": { + "run-tests": { + "description": "Build and run the dependency validation tests" + } + } +} diff --git a/ports/p-ranav-csv/CONTROL b/ports/p-ranav-csv/CONTROL deleted file mode 100644 index 6ab672e3d1013d..00000000000000 --- a/ports/p-ranav-csv/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: p-ranav-csv -Version: 2019-07-11 -Description: [deprecated] CSV for modern C++ -Homepage: https://github.com/p-ranav/csv diff --git a/ports/p-ranav-csv/vcpkg.json b/ports/p-ranav-csv/vcpkg.json new file mode 100644 index 00000000000000..86a2e0a0ca6061 --- /dev/null +++ b/ports/p-ranav-csv/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "p-ranav-csv", + "version-string": "2019-07-11", + "port-version": 1, + "description": "[deprecated] CSV for modern C++", + "homepage": "https://github.com/p-ranav/csv" +} diff --git a/ports/p-ranav-csv2/CONTROL b/ports/p-ranav-csv2/CONTROL deleted file mode 100644 index 003c97b0bf3f1b..00000000000000 --- a/ports/p-ranav-csv2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: p-ranav-csv2 -Version: 2020-12-14 -Homepage: https://github.com/p-ranav/csv2 -Description: CSV for modern C++ diff --git a/ports/p-ranav-csv2/vcpkg.json b/ports/p-ranav-csv2/vcpkg.json new file mode 100644 index 00000000000000..2b3d4dd861591d --- /dev/null +++ b/ports/p-ranav-csv2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "p-ranav-csv2", + "version-string": "2020-12-14", + "port-version": 1, + "description": "CSV for modern C++", + "homepage": "https://github.com/p-ranav/csv2" +} diff --git a/ports/parallel-hashmap/CONTROL b/ports/parallel-hashmap/CONTROL deleted file mode 100644 index 3d8fe0132a0446..00000000000000 --- a/ports/parallel-hashmap/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: parallel-hashmap -Version: 1.33 -Description: A header-only, very fast and memory-friendly family of C++ hash maps. diff --git a/ports/parallel-hashmap/vcpkg.json b/ports/parallel-hashmap/vcpkg.json new file mode 100644 index 00000000000000..b1d7230cf1d651 --- /dev/null +++ b/ports/parallel-hashmap/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "parallel-hashmap", + "version-string": "1.33", + "port-version": 1, + "description": "A header-only, very fast and memory-friendly family of C++ hash maps." +} diff --git a/ports/parallelstl/CONTROL b/ports/parallelstl/CONTROL deleted file mode 100644 index 4b7b0549a8ac7b..00000000000000 --- a/ports/parallelstl/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: parallelstl -Version: 20200330 -Homepage: https://github.com/intel/parallelstl -Description: Parallel STL is an implementation of the C++ standard library algorithms with support for execution policies, as specified in ISO/IEC 14882:2017 standard, commonly called C++17. -Build-Depends: tbb \ No newline at end of file diff --git a/ports/parallelstl/vcpkg.json b/ports/parallelstl/vcpkg.json new file mode 100644 index 00000000000000..f64a2af0fd0823 --- /dev/null +++ b/ports/parallelstl/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "parallelstl", + "version-string": "20200330", + "port-version": 1, + "description": "Parallel STL is an implementation of the C++ standard library algorithms with support for execution policies, as specified in ISO/IEC 14882:2017 standard, commonly called C++17.", + "homepage": "https://github.com/intel/parallelstl", + "dependencies": [ + "tbb" + ] +} diff --git a/ports/parmetis/CONTROL b/ports/parmetis/CONTROL deleted file mode 100644 index 7ef872facb8004..00000000000000 --- a/ports/parmetis/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: parmetis -Version: 4.0.3 -Port-Version: 4 -Homepage: https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview -Description: Parallel Graph Partitioning and Fill-reducing Matrix Ordering -Build-Depends: metis, mpi diff --git a/ports/parmetis/vcpkg.json b/ports/parmetis/vcpkg.json new file mode 100644 index 00000000000000..4b5cf996605b69 --- /dev/null +++ b/ports/parmetis/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "parmetis", + "version-string": "4.0.3", + "port-version": 5, + "description": "Parallel Graph Partitioning and Fill-reducing Matrix Ordering", + "homepage": "https://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview", + "dependencies": [ + "metis", + "mpi" + ] +} diff --git a/ports/parquet/CONTROL b/ports/parquet/CONTROL deleted file mode 100644 index 21584e8ee19268..00000000000000 --- a/ports/parquet/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: parquet -Version: 0 -Build-Depends: arrow -Description: Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format. It is now part of the arrow library. \ No newline at end of file diff --git a/ports/parquet/vcpkg.json b/ports/parquet/vcpkg.json new file mode 100644 index 00000000000000..c604f1a9f7fd72 --- /dev/null +++ b/ports/parquet/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "parquet", + "version-string": "0", + "port-version": 1, + "description": "Parquet-cpp is a C++ library to read and write the Apache Parquet columnar data format. It is now part of the arrow library.", + "dependencies": [ + "arrow" + ] +} diff --git a/ports/parson/CONTROL b/ports/parson/CONTROL deleted file mode 100644 index fc3cb26f214517..00000000000000 --- a/ports/parson/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: parson -Version: 2020-09-14 -Description: a lighweight json library written in C diff --git a/ports/parson/vcpkg.json b/ports/parson/vcpkg.json new file mode 100644 index 00000000000000..b128637b2a2509 --- /dev/null +++ b/ports/parson/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "parson", + "version-string": "2020-09-14", + "port-version": 1, + "description": "a lighweight json library written in C" +} diff --git a/ports/pbc/CONTROL b/ports/pbc/CONTROL deleted file mode 100644 index e7f0cc3c06c3e1..00000000000000 --- a/ports/pbc/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: pbc -Version: 0.5.14 -Port-Version: 4 -Build-Depends: mpir (windows), gmp (!windows) -Homepage: https://crypto.stanford.edu/pbc -Description: Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems. -Supports: !uwp diff --git a/ports/pbc/vcpkg.json b/ports/pbc/vcpkg.json new file mode 100644 index 00000000000000..3f9c2fc8082728 --- /dev/null +++ b/ports/pbc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "pbc", + "version-string": "0.5.14", + "port-version": 5, + "description": "Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.", + "homepage": "https://crypto.stanford.edu/pbc", + "supports": "!uwp", + "dependencies": [ + { + "name": "gmp", + "platform": "!windows" + }, + { + "name": "mpir", + "platform": "windows" + } + ] +} diff --git a/ports/pcg/CONTROL b/ports/pcg/CONTROL deleted file mode 100644 index 781d8ef2842302..00000000000000 --- a/ports/pcg/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: pcg -Version: 2021-04-06 -Description: Permuted Congruential Generator diff --git a/ports/pcg/vcpkg.json b/ports/pcg/vcpkg.json new file mode 100644 index 00000000000000..ce5e0de213f9b1 --- /dev/null +++ b/ports/pcg/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "pcg", + "version-string": "2021-04-06", + "port-version": 1, + "description": "Permuted Congruential Generator" +} diff --git a/ports/pdal-c/CONTROL b/ports/pdal-c/CONTROL deleted file mode 100644 index 061e1a6597143f..00000000000000 --- a/ports/pdal-c/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pdal-c -Version: 1.8-2 -Description: C API for the Point Data Abstraction Library (PDAL) -Build-Depends: pdal diff --git a/ports/pdal-c/vcpkg.json b/ports/pdal-c/vcpkg.json new file mode 100644 index 00000000000000..c0629c9909de99 --- /dev/null +++ b/ports/pdal-c/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "pdal-c", + "version-string": "1.8", + "port-version": 3, + "description": "C API for the Point Data Abstraction Library (PDAL)", + "dependencies": [ + "pdal" + ] +} diff --git a/ports/pdal/CONTROL b/ports/pdal/CONTROL deleted file mode 100644 index 99643803d3173b..00000000000000 --- a/ports/pdal/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pdal -Version: 1.7.1 -Port-Version: 11 -Description: PDAL - Point Data Abstraction Library is a library for manipulating point cloud data. -Build-Depends: gdal, geos, jsoncpp, libgeotiff, laszip, boost-system, boost-filesystem diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json new file mode 100644 index 00000000000000..cdcbd4e7c22865 --- /dev/null +++ b/ports/pdal/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "pdal", + "version-string": "1.7.1", + "port-version": 12, + "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", + "dependencies": [ + "boost-filesystem", + "boost-system", + "gdal", + "geos", + "jsoncpp", + "laszip", + "libgeotiff" + ] +} diff --git a/ports/pdcurses/CONTROL b/ports/pdcurses/CONTROL deleted file mode 100644 index 96fcf8e244a52e..00000000000000 --- a/ports/pdcurses/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pdcurses -Version: 3.9 -Homepage: https://sourceforge.net/projects/pdcurses/ -Description: Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model. diff --git a/ports/pdcurses/vcpkg.json b/ports/pdcurses/vcpkg.json new file mode 100644 index 00000000000000..55ae1a1d9e7a2d --- /dev/null +++ b/ports/pdcurses/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pdcurses", + "version-string": "3.9", + "port-version": 1, + "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", + "homepage": "https://sourceforge.net/projects/pdcurses/" +} diff --git a/ports/pdqsort/CONTROL b/ports/pdqsort/CONTROL deleted file mode 100644 index 6d1d9e6601b8d7..00000000000000 --- a/ports/pdqsort/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pdqsort -Version: 2019-07-30 -Homepage: https://github.com/orlp/pdqsort -Description: Pattern-defeating quicksort (pdqsort) is a novel sorting algorithm diff --git a/ports/pdqsort/vcpkg.json b/ports/pdqsort/vcpkg.json new file mode 100644 index 00000000000000..60a5647ea36fbb --- /dev/null +++ b/ports/pdqsort/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pdqsort", + "version-string": "2019-07-30", + "port-version": 1, + "description": "Pattern-defeating quicksort (pdqsort) is a novel sorting algorithm", + "homepage": "https://github.com/orlp/pdqsort" +} diff --git a/ports/pe-parse/CONTROL b/ports/pe-parse/CONTROL deleted file mode 100644 index c269edd7ff1f01..00000000000000 --- a/ports/pe-parse/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pe-parse -Version: 1.2.0 -Description: pe-parse is a principled, lightweight C/C++ PE parser -Homepage: https://github.com/trailofbits/pe-parse -Supports: !uwp diff --git a/ports/pe-parse/vcpkg.json b/ports/pe-parse/vcpkg.json new file mode 100644 index 00000000000000..9243b0eb3362fe --- /dev/null +++ b/ports/pe-parse/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "pe-parse", + "version-string": "1.2.0", + "port-version": 1, + "description": "pe-parse is a principled, lightweight C/C++ PE parser", + "homepage": "https://github.com/trailofbits/pe-parse", + "supports": "!uwp" +} diff --git a/ports/pegtl-2/CONTROL b/ports/pegtl-2/CONTROL deleted file mode 100644 index 3ff09b8dfb29f5..00000000000000 --- a/ports/pegtl-2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pegtl-2 -Version: 2.8.3 -Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). This version maintains compatibility with C++11. -Homepage: https://github.com/taocpp/PEGTL \ No newline at end of file diff --git a/ports/pegtl-2/vcpkg.json b/ports/pegtl-2/vcpkg.json new file mode 100644 index 00000000000000..55ee5e69f1e1bc --- /dev/null +++ b/ports/pegtl-2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pegtl-2", + "version-string": "2.8.3", + "port-version": 1, + "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). This version maintains compatibility with C++11.", + "homepage": "https://github.com/taocpp/PEGTL" +} diff --git a/ports/pegtl/CONTROL b/ports/pegtl/CONTROL deleted file mode 100644 index 06f75c201155b0..00000000000000 --- a/ports/pegtl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pegtl -Version: 3.2.0 -Description: The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG). -Homepage: https://github.com/taocpp/PEGTL diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json new file mode 100644 index 00000000000000..0a56f3f726d460 --- /dev/null +++ b/ports/pegtl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pegtl", + "version-string": "3.2.0", + "port-version": 1, + "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", + "homepage": "https://github.com/taocpp/PEGTL" +} diff --git a/ports/pfring/CONTROL b/ports/pfring/CONTROL deleted file mode 100644 index edddaa9a5d9178..00000000000000 --- a/ports/pfring/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: pfring -Version: 2019-10-17-2 -Homepage: https://github.com/ntop/PF_RING -Description: PF_RING™ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications. -Build-Depends: libpcap diff --git a/ports/pfring/vcpkg.json b/ports/pfring/vcpkg.json new file mode 100644 index 00000000000000..9e78c638bb5dd9 --- /dev/null +++ b/ports/pfring/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "pfring", + "version-string": "2019-10-17", + "port-version": 3, + "description": "PF_RING™ is a Linux kernel module and user-space framework that allows you to process packets at high-rates while providing you a consistent API for packet processing applications.", + "homepage": "https://github.com/ntop/PF_RING", + "dependencies": [ + "libpcap" + ] +} diff --git a/ports/pfultz2-linq/CONTROL b/ports/pfultz2-linq/CONTROL deleted file mode 100644 index e8185c327d570e..00000000000000 --- a/ports/pfultz2-linq/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pfultz2-linq -Version: 2019-05-14 -Description: Linq for list comprehension in C++ -Build-Depends: boost-fusion, boost-iterator, boost-mpl, boost-optional, boost-preprocessor, boost-range, boost-static-assert, boost-type-traits, boost-unordered, boost-utility diff --git a/ports/pfultz2-linq/vcpkg.json b/ports/pfultz2-linq/vcpkg.json new file mode 100644 index 00000000000000..768c6118bca652 --- /dev/null +++ b/ports/pfultz2-linq/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "pfultz2-linq", + "version-string": "2019-05-14", + "port-version": 1, + "description": "Linq for list comprehension in C++", + "dependencies": [ + "boost-fusion", + "boost-iterator", + "boost-mpl", + "boost-optional", + "boost-preprocessor", + "boost-range", + "boost-static-assert", + "boost-type-traits", + "boost-unordered", + "boost-utility" + ] +} diff --git a/ports/picojson/CONTROL b/ports/picojson/CONTROL deleted file mode 100644 index 72ac9c51383c7a..00000000000000 --- a/ports/picojson/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: picojson -Version: 1.3.0-1 -Homepage: https://github.com/kazuho/picojson -Description: A header-file-only, JSON parser serializer in C++. - diff --git a/ports/picojson/vcpkg.json b/ports/picojson/vcpkg.json new file mode 100644 index 00000000000000..540a2ad3d50907 --- /dev/null +++ b/ports/picojson/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "picojson", + "version-string": "1.3.0", + "port-version": 2, + "description": "A header-file-only, JSON parser serializer in C++.", + "homepage": "https://github.com/kazuho/picojson" +} diff --git a/ports/picosha2/CONTROL b/ports/picosha2/CONTROL deleted file mode 100644 index a388045a2289c0..00000000000000 --- a/ports/picosha2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: picosha2 -Version: 2018-07-30 -Homepage: https://github.com/okdshin/PicoSHA2 -Description: PicoSHA2 - a C++ SHA256 hash generator diff --git a/ports/picosha2/vcpkg.json b/ports/picosha2/vcpkg.json new file mode 100644 index 00000000000000..45091e449f79e2 --- /dev/null +++ b/ports/picosha2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "picosha2", + "version-string": "2018-07-30", + "port-version": 1, + "description": "PicoSHA2 - a C++ SHA256 hash generator", + "homepage": "https://github.com/okdshin/PicoSHA2" +} diff --git a/ports/piex/CONTROL b/ports/piex/CONTROL deleted file mode 100644 index 2ff82df971f9d5..00000000000000 --- a/ports/piex/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: piex -Version: 2019-07-11 -Homepage: https://github.com/google/piex -Description: The Preview Image Extractor (PIEX) is designed to find and extract the largest diff --git a/ports/piex/vcpkg.json b/ports/piex/vcpkg.json new file mode 100644 index 00000000000000..fdb727fb705db4 --- /dev/null +++ b/ports/piex/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "piex", + "version-string": "2019-07-11", + "port-version": 1, + "description": "The Preview Image Extractor (PIEX) is designed to find and extract the largest", + "homepage": "https://github.com/google/piex" +} diff --git a/ports/pixel/CONTROL b/ports/pixel/CONTROL deleted file mode 100644 index fae73d2fd2bbb3..00000000000000 --- a/ports/pixel/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: pixel -Version: 0.3-1 -Description: Simple 2D Graphics based on standard and portable OpenGL. -Build-Depends: glew, opengl, sdl2 -Homepage: https://github.com/dascandy/pixel -Supports: !windows \ No newline at end of file diff --git a/ports/pixel/vcpkg.json b/ports/pixel/vcpkg.json new file mode 100644 index 00000000000000..a562aa8afbdf35 --- /dev/null +++ b/ports/pixel/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "pixel", + "version-string": "0.3", + "port-version": 2, + "description": "Simple 2D Graphics based on standard and portable OpenGL.", + "homepage": "https://github.com/dascandy/pixel", + "supports": "!windows", + "dependencies": [ + "glew", + "opengl", + "sdl2" + ] +} diff --git a/ports/platform-folders/CONTROL b/ports/platform-folders/CONTROL deleted file mode 100644 index 8b5227dd37c236..00000000000000 --- a/ports/platform-folders/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: platform-folders -Version: 4.0.0 -Port-Version: 6 -Description: A C++ library to look for special directories like "My Documents" and "%APPDATA%" diff --git a/ports/platform-folders/vcpkg.json b/ports/platform-folders/vcpkg.json new file mode 100644 index 00000000000000..e0f57ccac5af8e --- /dev/null +++ b/ports/platform-folders/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "platform-folders", + "version-string": "4.0.0", + "port-version": 7, + "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"" +} diff --git a/ports/plf-list/CONTROL b/ports/plf-list/CONTROL deleted file mode 100644 index 338eec5ea7804d..00000000000000 --- a/ports/plf-list/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: plf-list -Version: 2019-08-10 -Description: A drop-in replacement for std::list with 293% faster insertion, 57% faster erasure, 17% faster iteration and 77% faster sorting on average -Homepage: https://www.plflib.org/ diff --git a/ports/plf-list/vcpkg.json b/ports/plf-list/vcpkg.json new file mode 100644 index 00000000000000..e86191647f677a --- /dev/null +++ b/ports/plf-list/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "plf-list", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A drop-in replacement for std::list with 293% faster insertion, 57% faster erasure, 17% faster iteration and 77% faster sorting on average", + "homepage": "https://www.plflib.org/" +} diff --git a/ports/plf-nanotimer/CONTROL b/ports/plf-nanotimer/CONTROL deleted file mode 100644 index 10ac0ac2cd8547..00000000000000 --- a/ports/plf-nanotimer/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: plf-nanotimer -Version: 2019-08-10 -Description: A simple C++ 03/11/etc timer class for ~microsecond-precision cross-platform benchmarking -Homepage: https://www.plflib.org/ diff --git a/ports/plf-nanotimer/vcpkg.json b/ports/plf-nanotimer/vcpkg.json new file mode 100644 index 00000000000000..26e8a22e466f31 --- /dev/null +++ b/ports/plf-nanotimer/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "plf-nanotimer", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A simple C++ 03/11/etc timer class for ~microsecond-precision cross-platform benchmarking", + "homepage": "https://www.plflib.org/" +} diff --git a/ports/plf-stack/CONTROL b/ports/plf-stack/CONTROL deleted file mode 100644 index d0a40be45cb3f5..00000000000000 --- a/ports/plf-stack/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: plf-stack -Version: 2019-08-10 -Description: A C++ data container replicating std::stack functionality but with better performance -Homepage: https://www.plflib.org/ diff --git a/ports/plf-stack/vcpkg.json b/ports/plf-stack/vcpkg.json new file mode 100644 index 00000000000000..6c0a75f6815c0f --- /dev/null +++ b/ports/plf-stack/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "plf-stack", + "version-string": "2019-08-10", + "port-version": 1, + "description": "A C++ data container replicating std::stack functionality but with better performance", + "homepage": "https://www.plflib.org/" +} diff --git a/ports/plib/CONTROL b/ports/plib/CONTROL deleted file mode 100644 index 3b6b99c71961af..00000000000000 --- a/ports/plib/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: plib -Version: 1.8.5-4 -Description: A suite of portable game libraries diff --git a/ports/plib/vcpkg.json b/ports/plib/vcpkg.json new file mode 100644 index 00000000000000..421823aff3c706 --- /dev/null +++ b/ports/plib/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "plib", + "version-string": "1.8.5", + "port-version": 5, + "description": "A suite of portable game libraries" +} diff --git a/ports/plibsys/CONTROL b/ports/plibsys/CONTROL deleted file mode 100644 index dec1285c9f528e..00000000000000 --- a/ports/plibsys/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: plibsys -Version: 0.0.4 -Port-Version: 4 -Homepage: https://github.com/saprykin/plibsys -Description: Highly portable C system library: threads and synchronization, sockets, IPC, data structures and more. -Supports: !uwp diff --git a/ports/plibsys/vcpkg.json b/ports/plibsys/vcpkg.json new file mode 100644 index 00000000000000..4960c01a26cb2c --- /dev/null +++ b/ports/plibsys/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "plibsys", + "version-string": "0.0.4", + "port-version": 5, + "description": "Highly portable C system library: threads and synchronization, sockets, IPC, data structures and more.", + "homepage": "https://github.com/saprykin/plibsys", + "supports": "!uwp" +} diff --git a/ports/plog/CONTROL b/ports/plog/CONTROL deleted file mode 100644 index 8ffd4fdfabaa21..00000000000000 --- a/ports/plog/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: plog -Version: 1.1.5 -Homepage: https://github.com/SergiusTheBest/plog -Description: Portable, simple and extensible C++ logging library. diff --git a/ports/plog/vcpkg.json b/ports/plog/vcpkg.json new file mode 100644 index 00000000000000..c1de0acffa0386 --- /dev/null +++ b/ports/plog/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "plog", + "version-string": "1.1.5", + "port-version": 1, + "description": "Portable, simple and extensible C++ logging library.", + "homepage": "https://github.com/SergiusTheBest/plog" +} diff --git a/ports/plustache/CONTROL b/ports/plustache/CONTROL deleted file mode 100644 index f01f1598b00237..00000000000000 --- a/ports/plustache/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: plustache -Version: 0.4.0-1 -Description: {{mustaches}} for C++ -Build-Depends: boost-regex, boost-algorithm diff --git a/ports/plustache/vcpkg.json b/ports/plustache/vcpkg.json new file mode 100644 index 00000000000000..3908571d2fb904 --- /dev/null +++ b/ports/plustache/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "plustache", + "version-string": "0.4.0", + "port-version": 2, + "description": "{{mustaches}} for C++", + "dependencies": [ + "boost-algorithm", + "boost-regex" + ] +} diff --git a/ports/pngwriter/CONTROL b/ports/pngwriter/CONTROL deleted file mode 100644 index 286244e934f9cc..00000000000000 --- a/ports/pngwriter/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pngwriter -Version: 0.7.0-2 -Build-Depends: zlib, libpng, freetype -Description: PNGwriter is a very easy to use open source graphics library that uses PNG as its output format diff --git a/ports/pngwriter/vcpkg.json b/ports/pngwriter/vcpkg.json new file mode 100644 index 00000000000000..f7fa371e323ea8 --- /dev/null +++ b/ports/pngwriter/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "pngwriter", + "version-string": "0.7.0", + "port-version": 3, + "description": "PNGwriter is a very easy to use open source graphics library that uses PNG as its output format", + "dependencies": [ + "freetype", + "libpng", + "zlib" + ] +} diff --git a/ports/poly2tri/CONTROL b/ports/poly2tri/CONTROL deleted file mode 100644 index 21ed149e37c2a1..00000000000000 --- a/ports/poly2tri/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: poly2tri -Version: 2020-07-21 -Homepage: https://github.com/greenm01/poly2tri -Description: The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons. -Supports: !uwp diff --git a/ports/poly2tri/vcpkg.json b/ports/poly2tri/vcpkg.json new file mode 100644 index 00000000000000..9fbdff23afbfa0 --- /dev/null +++ b/ports/poly2tri/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "poly2tri", + "version-string": "2020-07-21", + "port-version": 1, + "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", + "homepage": "https://github.com/greenm01/poly2tri", + "supports": "!uwp" +} diff --git a/ports/polyclipping/CONTROL b/ports/polyclipping/CONTROL deleted file mode 100644 index 6ae3575885da42..00000000000000 --- a/ports/polyclipping/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: polyclipping -Version: 6.4.2 -Port-Version: 6 -Homepage: https://sourceforge.net/projects/polyclipping/ -Description: The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons. diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json new file mode 100644 index 00000000000000..8e524232f81085 --- /dev/null +++ b/ports/polyclipping/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "polyclipping", + "version-string": "6.4.2", + "port-version": 7, + "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", + "homepage": "https://sourceforge.net/projects/polyclipping/" +} diff --git a/ports/polyhook2/CONTROL b/ports/polyhook2/CONTROL deleted file mode 100644 index 311b64ebb798c3..00000000000000 --- a/ports/polyhook2/CONTROL +++ /dev/null @@ -1,30 +0,0 @@ -Source: polyhook2 -Version: 2021-05-09 -Homepage: https://github.com/stevemk14ebr/PolyHook_2_0 -Description: C++17, x86/x64 Hooking Library v2.0 -Supports: !(arm|uwp|linux|osx) -Default-Features: capstone,zydis,exception,detours,inlinentd,pe,virtuals - -Feature: capstone -Build-Depends: capstone[x86] -Description: Capstone disassembler integration. - -Feature: zydis -Build-Depends: zydis -Description: Zydis disassembler integration. - -Feature: exception -Description: Implement all exception hooking functionality - -Feature: detours -Description: Implement detour functionality - -Feature: inlinentd -Build-Depends: asmjit -Description: Support inline hooks without specifying typedefs by generating callback stubs at runtime with AsmJit - -Feature: pe -Description: Implement all win pe hooking functionality - -Feature: virtuals -Description: Implement all virtual table hooking functionality diff --git a/ports/polyhook2/vcpkg.json b/ports/polyhook2/vcpkg.json new file mode 100644 index 00000000000000..252fb1a87217a2 --- /dev/null +++ b/ports/polyhook2/vcpkg.json @@ -0,0 +1,54 @@ +{ + "name": "polyhook2", + "version-string": "2021-05-09", + "port-version": 1, + "description": "C++17, x86/x64 Hooking Library v2.0", + "homepage": "https://github.com/stevemk14ebr/PolyHook_2_0", + "supports": "!(arm | uwp | linux | osx)", + "default-features": [ + "capstone", + "detours", + "exception", + "inlinentd", + "pe", + "virtuals", + "zydis" + ], + "features": { + "capstone": { + "description": "Capstone disassembler integration.", + "dependencies": [ + { + "name": "capstone", + "features": [ + "x86" + ] + } + ] + }, + "detours": { + "description": "Implement detour functionality" + }, + "exception": { + "description": "Implement all exception hooking functionality" + }, + "inlinentd": { + "description": "Support inline hooks without specifying typedefs by generating callback stubs at runtime with AsmJit", + "dependencies": [ + "asmjit" + ] + }, + "pe": { + "description": "Implement all win pe hooking functionality" + }, + "virtuals": { + "description": "Implement all virtual table hooking functionality" + }, + "zydis": { + "description": "Zydis disassembler integration.", + "dependencies": [ + "zydis" + ] + } + } +} diff --git a/ports/polymorphic-value/CONTROL b/ports/polymorphic-value/CONTROL deleted file mode 100644 index 1016ead69a5836..00000000000000 --- a/ports/polymorphic-value/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: polymorphic-value -Version: 1.3.0-1 -Description: A polymorphic value-type for C++ -Homepage: https://github.com/jbcoe/polymorphic_value diff --git a/ports/polymorphic-value/vcpkg.json b/ports/polymorphic-value/vcpkg.json new file mode 100644 index 00000000000000..a47f482943f5cf --- /dev/null +++ b/ports/polymorphic-value/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "polymorphic-value", + "version-string": "1.3.0", + "port-version": 2, + "description": "A polymorphic value-type for C++", + "homepage": "https://github.com/jbcoe/polymorphic_value" +} diff --git a/ports/ponder/CONTROL b/ports/ponder/CONTROL deleted file mode 100644 index 6efa617997f6f8..00000000000000 --- a/ports/ponder/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ponder -Version: 3.0.0-1 -Description: A C++ multi-purpose reflection library. -Homepage: https://github.com/billyquith/ponder diff --git a/ports/ponder/vcpkg.json b/ports/ponder/vcpkg.json new file mode 100644 index 00000000000000..265d12f5f67d77 --- /dev/null +++ b/ports/ponder/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ponder", + "version-string": "3.0.0", + "port-version": 2, + "description": "A C++ multi-purpose reflection library.", + "homepage": "https://github.com/billyquith/ponder" +} diff --git a/ports/portable-snippets/CONTROL b/ports/portable-snippets/CONTROL deleted file mode 100644 index 792cb9fc988803..00000000000000 --- a/ports/portable-snippets/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: portable-snippets -Version: 2019-09-20 -Description: Collection of miscellaneous portable C snippets -Homepage: https://github.com/nemequ/portable-snippets diff --git a/ports/portable-snippets/vcpkg.json b/ports/portable-snippets/vcpkg.json new file mode 100644 index 00000000000000..acd3cde956da84 --- /dev/null +++ b/ports/portable-snippets/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "portable-snippets", + "version-string": "2019-09-20", + "port-version": 1, + "description": "Collection of miscellaneous portable C snippets", + "homepage": "https://github.com/nemequ/portable-snippets" +} diff --git a/ports/ppconsul/CONTROL b/ports/ppconsul/CONTROL deleted file mode 100644 index 0c8dfd8b68ddb8..00000000000000 --- a/ports/ppconsul/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: ppconsul -Version: 0.5-1 -Homepage: https://github.com/oliora/ppconsul -Description: A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure. -Build-Depends: boost-core, boost-variant, boost-optional, boost-fusion, curl[openssl], json11 diff --git a/ports/ppconsul/vcpkg.json b/ports/ppconsul/vcpkg.json new file mode 100644 index 00000000000000..7dd7895a47f2f6 --- /dev/null +++ b/ports/ppconsul/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "ppconsul", + "version-string": "0.5", + "port-version": 2, + "description": "A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure.", + "homepage": "https://github.com/oliora/ppconsul", + "dependencies": [ + "boost-core", + "boost-fusion", + "boost-optional", + "boost-variant", + { + "name": "curl", + "features": [ + "openssl" + ] + }, + "json11" + ] +} diff --git a/ports/ppmagic/CONTROL b/ports/ppmagic/CONTROL deleted file mode 100644 index c31d605b7d5add..00000000000000 --- a/ports/ppmagic/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ppmagic -Version: 2020-07-03 -Description: C/C++ preprocessor macros that you can use to simplify your life. -Homepage: https://github.com/kobalicek/ppmagic diff --git a/ports/ppmagic/vcpkg.json b/ports/ppmagic/vcpkg.json new file mode 100644 index 00000000000000..7bf584f3354678 --- /dev/null +++ b/ports/ppmagic/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ppmagic", + "version-string": "2020-07-03", + "port-version": 1, + "description": "C/C++ preprocessor macros that you can use to simplify your life.", + "homepage": "https://github.com/kobalicek/ppmagic" +} diff --git a/ports/pprint/CONTROL b/ports/pprint/CONTROL deleted file mode 100644 index ea94b198ecd7f4..00000000000000 --- a/ports/pprint/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pprint -Version: 2019-07-19 -Description: Pretty Printer for Modern C++ -Homepage: https://github.com/p-ranav/pprint diff --git a/ports/pprint/vcpkg.json b/ports/pprint/vcpkg.json new file mode 100644 index 00000000000000..386ed290699d3d --- /dev/null +++ b/ports/pprint/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pprint", + "version-string": "2019-07-19", + "port-version": 1, + "description": "Pretty Printer for Modern C++", + "homepage": "https://github.com/p-ranav/pprint" +} diff --git a/ports/pqp/CONTROL b/ports/pqp/CONTROL deleted file mode 100644 index 8525cacbf51b4b..00000000000000 --- a/ports/pqp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pqp -Version: 1.3-4 -Homepage: https://gamma.cs.unc.edu/SSV/ -Description: a proximity query package diff --git a/ports/pqp/vcpkg.json b/ports/pqp/vcpkg.json new file mode 100644 index 00000000000000..70d452f261d6d6 --- /dev/null +++ b/ports/pqp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pqp", + "version-string": "1.3", + "port-version": 5, + "description": "a proximity query package", + "homepage": "https://gamma.cs.unc.edu/SSV/" +} diff --git a/ports/proj/CONTROL b/ports/proj/CONTROL deleted file mode 100644 index d6c204fda4cab2..00000000000000 --- a/ports/proj/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: proj -Version: 0 -Description: a stub package that pulls in proj4. Do not depend on this package. -Build-Depends: proj4 diff --git a/ports/proj/vcpkg.json b/ports/proj/vcpkg.json new file mode 100644 index 00000000000000..50beaca9bc8e84 --- /dev/null +++ b/ports/proj/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "proj", + "version-string": "0", + "port-version": 1, + "description": "a stub package that pulls in proj4. Do not depend on this package.", + "dependencies": [ + "proj4" + ] +} diff --git a/ports/prometheus-cpp/CONTROL b/ports/prometheus-cpp/CONTROL deleted file mode 100644 index c1db0101f5a4c6..00000000000000 --- a/ports/prometheus-cpp/CONTROL +++ /dev/null @@ -1,20 +0,0 @@ -Source: prometheus-cpp -Version: 0.12.3 -Description: Prometheus Client Library for Modern C++ -Default-Features: compression, pull - -Feature: compression -Build-Depends: zlib -Description: Enable zlib compression - -Feature: tests -Build-Depends: gtest -Description: Additional testing support - -Feature: pull -Build-Depends: civetweb -Description: Support for regular pull mode - -Feature: push -Build-Depends: curl -Description: Support push gateway diff --git a/ports/prometheus-cpp/vcpkg.json b/ports/prometheus-cpp/vcpkg.json new file mode 100644 index 00000000000000..246c7e4517747b --- /dev/null +++ b/ports/prometheus-cpp/vcpkg.json @@ -0,0 +1,36 @@ +{ + "name": "prometheus-cpp", + "version-string": "0.12.3", + "port-version": 1, + "description": "Prometheus Client Library for Modern C++", + "default-features": [ + "compression", + "pull" + ], + "features": { + "compression": { + "description": "Enable zlib compression", + "dependencies": [ + "zlib" + ] + }, + "pull": { + "description": "Support for regular pull mode", + "dependencies": [ + "civetweb" + ] + }, + "push": { + "description": "Support push gateway", + "dependencies": [ + "curl" + ] + }, + "tests": { + "description": "Additional testing support", + "dependencies": [ + "gtest" + ] + } + } +} diff --git a/ports/protobuf-c/CONTROL b/ports/protobuf-c/CONTROL deleted file mode 100644 index 171a6d17ac218a..00000000000000 --- a/ports/protobuf-c/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -Source: protobuf-c -Version: 1.3.2-2 -Homepage: https://github.com/protobuf-c/protobuf-c -Description: This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format. -Build-Depends: protobuf - -Feature: tools -Description: build tools. - -Feature: test -Description: build test project. -Build-Depends: protobuf-c[tools] \ No newline at end of file diff --git a/ports/protobuf-c/vcpkg.json b/ports/protobuf-c/vcpkg.json new file mode 100644 index 00000000000000..548cce39b6c9a7 --- /dev/null +++ b/ports/protobuf-c/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "protobuf-c", + "version-string": "1.3.2", + "port-version": 3, + "description": "This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format.", + "homepage": "https://github.com/protobuf-c/protobuf-c", + "dependencies": [ + "protobuf" + ], + "features": { + "test": { + "description": "build test project.", + "dependencies": [ + { + "name": "protobuf-c", + "features": [ + "tools" + ] + } + ] + }, + "tools": { + "description": "build tools." + } + } +} diff --git a/ports/pthread/CONTROL b/ports/pthread/CONTROL deleted file mode 100644 index 6ce3193256a23a..00000000000000 --- a/ports/pthread/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pthread -Version: 3.0.0 -Build-Depends: pthreads -Description: empty package, linking to other port diff --git a/ports/pthread/vcpkg.json b/ports/pthread/vcpkg.json new file mode 100644 index 00000000000000..7cc1edb464f4a3 --- /dev/null +++ b/ports/pthread/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "pthread", + "version-string": "3.0.0", + "port-version": 1, + "description": "empty package, linking to other port", + "dependencies": [ + "pthreads" + ] +} diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL deleted file mode 100644 index 910ad83294056b..00000000000000 --- a/ports/pugixml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: pugixml -Version: 1.11.4 -Homepage: https://github.com/zeux/pugixml -Description: Light-weight, simple and fast XML parser for C++ with XPath support diff --git a/ports/pugixml/vcpkg.json b/ports/pugixml/vcpkg.json new file mode 100644 index 00000000000000..28158b325349cd --- /dev/null +++ b/ports/pugixml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "pugixml", + "version-string": "1.11.4", + "port-version": 1, + "description": "Light-weight, simple and fast XML parser for C++ with XPath support", + "homepage": "https://github.com/zeux/pugixml" +} diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL deleted file mode 100644 index 5cc9bb1d662c91..00000000000000 --- a/ports/qca/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: qca -Version: 2.3.1 -Port-Version: 2 -Description: Qt Cryptographic Architecture (QCA). -Homepage: https://cgit.kde.org/qca.git/ -Build-Depends: qt5-base[core] diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json new file mode 100644 index 00000000000000..f4376e6ee75fc0 --- /dev/null +++ b/ports/qca/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qca", + "version-string": "2.3.1", + "port-version": 3, + "description": "Qt Cryptographic Architecture (QCA).", + "homepage": "https://cgit.kde.org/qca.git/", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL deleted file mode 100644 index 32752143eaf71a..00000000000000 --- a/ports/qhull/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qhull -Version: 8.0.2 -Port-Version: 1 -Homepage: https://github.com/qhull/qhull -Description: computes the convex hull, Delaunay triangulation, Voronoi diagram diff --git a/ports/qhull/vcpkg.json b/ports/qhull/vcpkg.json new file mode 100644 index 00000000000000..b115f1331af5ef --- /dev/null +++ b/ports/qhull/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "qhull", + "version-string": "8.0.2", + "port-version": 2, + "description": "computes the convex hull, Delaunay triangulation, Voronoi diagram", + "homepage": "https://github.com/qhull/qhull" +} diff --git a/ports/qpid-proton/CONTROL b/ports/qpid-proton/CONTROL deleted file mode 100644 index 9dd445484487ac..00000000000000 --- a/ports/qpid-proton/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qpid-proton -Version: 0.32.0 -Build-Depends: openssl (!windows&!uwp), libuv (osx), jsoncpp -Homepage: https://github.com/apache/qpid-proton -Description: Qpid Proton is a high-performance, lightweight messaging library. \ No newline at end of file diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json new file mode 100644 index 00000000000000..04bbec9af06e39 --- /dev/null +++ b/ports/qpid-proton/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qpid-proton", + "version-string": "0.32.0", + "port-version": 1, + "description": "Qpid Proton is a high-performance, lightweight messaging library.", + "homepage": "https://github.com/apache/qpid-proton", + "dependencies": [ + "jsoncpp", + { + "name": "libuv", + "platform": "osx" + }, + { + "name": "openssl", + "platform": "!windows & !uwp" + } + ] +} diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL deleted file mode 100644 index 49a2b28fed1ed2..00000000000000 --- a/ports/qt-advanced-docking-system/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: qt-advanced-docking-system -Version: 3.6.3 -Build-Depends: qt5-base[core], qt5-x11extras (!windows), zlib, bzip2 -Port-Version: 1 -Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio -Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System diff --git a/ports/qt-advanced-docking-system/vcpkg.json b/ports/qt-advanced-docking-system/vcpkg.json new file mode 100644 index 00000000000000..ae8fe0ff68edb8 --- /dev/null +++ b/ports/qt-advanced-docking-system/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "qt-advanced-docking-system", + "version-string": "3.6.3", + "port-version": 2, + "description": "Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio", + "homepage": "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System", + "dependencies": [ + "bzip2", + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "qt5-x11extras", + "platform": "!windows" + }, + "zlib" + ] +} diff --git a/ports/qt5-3d/CONTROL b/ports/qt5-3d/CONTROL deleted file mode 100644 index 1ec0c15a669e54..00000000000000 --- a/ports/qt5-3d/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-3d -Version: 5.15.2 -Port-Version: 1 -Description: Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering -Build-Depends: qt5-base[core], qt5-declarative, qt5-imageformats, qt5-gamepad, assimp diff --git a/ports/qt5-3d/vcpkg.json b/ports/qt5-3d/vcpkg.json new file mode 100644 index 00000000000000..ea4f27ee834f1f --- /dev/null +++ b/ports/qt5-3d/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qt5-3d", + "version-string": "5.15.2", + "port-version": 2, + "description": "Qt5 3d Module - Functionality for near-realtime simulation systems with support for 2D and 3D rendering", + "dependencies": [ + "assimp", + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-gamepad", + "qt5-imageformats" + ] +} diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL deleted file mode 100644 index 5008e6afeca78c..00000000000000 --- a/ports/qt5-activeqt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-activeqt -Version: 5.15.2 -Description: Qt5 ActiveQt Module - ActiveX components -Build-Depends: qt5-base[core], qt5-declarative -Supports: windows \ No newline at end of file diff --git a/ports/qt5-activeqt/vcpkg.json b/ports/qt5-activeqt/vcpkg.json new file mode 100644 index 00000000000000..05dd52842bc86a --- /dev/null +++ b/ports/qt5-activeqt/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-activeqt", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 ActiveQt Module - ActiveX components", + "supports": "windows", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-androidextras/CONTROL b/ports/qt5-androidextras/CONTROL deleted file mode 100644 index 4b2fff7eec020e..00000000000000 --- a/ports/qt5-androidextras/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-androidextras -Version: 5.15.2 -Description: Qt5 androidextras Module; -Build-Depends: qt5-base[core] -Supports: android \ No newline at end of file diff --git a/ports/qt5-androidextras/vcpkg.json b/ports/qt5-androidextras/vcpkg.json new file mode 100644 index 00000000000000..12024cbd29872a --- /dev/null +++ b/ports/qt5-androidextras/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-androidextras", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 androidextras Module;", + "supports": "android", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-canvas3d/CONTROL b/ports/qt5-canvas3d/CONTROL deleted file mode 100644 index 2da0b47376430a..00000000000000 --- a/ports/qt5-canvas3d/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-canvas3d -Version: 0 -Description: Qt5 Canvas 3d Module; -Build-Depends: qt5-base[core] diff --git a/ports/qt5-canvas3d/vcpkg.json b/ports/qt5-canvas3d/vcpkg.json new file mode 100644 index 00000000000000..f26c201b8e2fcc --- /dev/null +++ b/ports/qt5-canvas3d/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-canvas3d", + "version-string": "0", + "port-version": 1, + "description": "Qt5 Canvas 3d Module;", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-charts/CONTROL b/ports/qt5-charts/CONTROL deleted file mode 100644 index e2187c0c98c246..00000000000000 --- a/ports/qt5-charts/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-charts -Version: 5.15.2 -Description: Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models -Build-Depends: qt5-base[core], qt5-declarative, qt5-multimedia diff --git a/ports/qt5-charts/vcpkg.json b/ports/qt5-charts/vcpkg.json new file mode 100644 index 00000000000000..9d0a9b981e7684 --- /dev/null +++ b/ports/qt5-charts/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-charts", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Charts Module - UI components for displaying charts, driven by static or dynamic data models", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-multimedia" + ] +} diff --git a/ports/qt5-connectivity/CONTROL b/ports/qt5-connectivity/CONTROL deleted file mode 100644 index 3fea5453c16534..00000000000000 --- a/ports/qt5-connectivity/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-connectivity -Version: 5.15.2 -Port-Version: 1 -Description: Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware -Build-Depends: qt5-base[core] diff --git a/ports/qt5-connectivity/vcpkg.json b/ports/qt5-connectivity/vcpkg.json new file mode 100644 index 00000000000000..a887329794d839 --- /dev/null +++ b/ports/qt5-connectivity/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-connectivity", + "version-string": "5.15.2", + "port-version": 2, + "description": "Qt5 Connectivity module - Provides access to Bluetooth and NFC hardware", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-datavis3d/CONTROL b/ports/qt5-datavis3d/CONTROL deleted file mode 100644 index dd2ead5302d029..00000000000000 --- a/ports/qt5-datavis3d/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-datavis3d -Version: 5.15.2 -Description: Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations -Build-Depends: qt5-base[core], qt5-declarative, qt5-multimedia diff --git a/ports/qt5-datavis3d/vcpkg.json b/ports/qt5-datavis3d/vcpkg.json new file mode 100644 index 00000000000000..ddb155c33834b0 --- /dev/null +++ b/ports/qt5-datavis3d/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-datavis3d", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Data Visualization 3d Module - UI Components for creating 3D data visualizations", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-multimedia" + ] +} diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL deleted file mode 100644 index 6814190e380a73..00000000000000 --- a/ports/qt5-declarative/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-declarative -Version: 5.15.2 -Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. -Build-Depends: qt5-base[core], qt5-imageformats, qt5-svg diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json new file mode 100644 index 00000000000000..c6716a208f17f7 --- /dev/null +++ b/ports/qt5-declarative/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-declarative", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-imageformats", + "qt5-svg" + ] +} diff --git a/ports/qt5-doc/CONTROL b/ports/qt5-doc/CONTROL deleted file mode 100644 index 0db178bcccdbf9..00000000000000 --- a/ports/qt5-doc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-doc -Version: 5.15.2 -Description: Qt5 doc Module; -Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols2, qt5-tools -Supports: linux \ No newline at end of file diff --git a/ports/qt5-doc/vcpkg.json b/ports/qt5-doc/vcpkg.json new file mode 100644 index 00000000000000..d311b5ada3a488 --- /dev/null +++ b/ports/qt5-doc/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qt5-doc", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 doc Module;", + "supports": "linux", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-quickcontrols2", + "qt5-tools" + ] +} diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL deleted file mode 100644 index df716aa56664e4..00000000000000 --- a/ports/qt5-gamepad/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-gamepad -Version: 5.15.2 -Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-gamepad/vcpkg.json b/ports/qt5-gamepad/vcpkg.json new file mode 100644 index 00000000000000..4bd3fb05f7507d --- /dev/null +++ b/ports/qt5-gamepad/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-gamepad", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL deleted file mode 100644 index 9ebde4866b8976..00000000000000 --- a/ports/qt5-graphicaleffects/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-graphicaleffects -Version: 5.15.2 -Description: Qt5 GraphicalEffects Module. -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-graphicaleffects/vcpkg.json b/ports/qt5-graphicaleffects/vcpkg.json new file mode 100644 index 00000000000000..83055ba6e14dcf --- /dev/null +++ b/ports/qt5-graphicaleffects/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-graphicaleffects", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 GraphicalEffects Module.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-imageformats/CONTROL b/ports/qt5-imageformats/CONTROL deleted file mode 100644 index 1d978f1bc4a48d..00000000000000 --- a/ports/qt5-imageformats/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-imageformats -Version: 5.15.2 -Port-Version: 0 -Description: Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP -Build-Depends: qt5-base[core], tiff, libwebp, jasper diff --git a/ports/qt5-imageformats/vcpkg.json b/ports/qt5-imageformats/vcpkg.json new file mode 100644 index 00000000000000..9c4d0e0f4e1370 --- /dev/null +++ b/ports/qt5-imageformats/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "qt5-imageformats", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Image Formats Module - Plugins for additional image formats: TIFF, MNG, TGA, WBMP", + "dependencies": [ + "jasper", + "libwebp", + { + "name": "qt5-base", + "default-features": false + }, + "tiff" + ] +} diff --git a/ports/qt5-location/CONTROL b/ports/qt5-location/CONTROL deleted file mode 100644 index e123c56b9bdb1d..00000000000000 --- a/ports/qt5-location/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-location -Version: 5.15.2 -Description: Qt5 Location Module - Displays map, navigation, and place content in a QML application. -Build-Depends: qt5-base[core], qt5-declarative, qt5-quickcontrols, qt5-quickcontrols2, qt5-serialport diff --git a/ports/qt5-location/vcpkg.json b/ports/qt5-location/vcpkg.json new file mode 100644 index 00000000000000..8abfa73c8aff13 --- /dev/null +++ b/ports/qt5-location/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "qt5-location", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Location Module - Displays map, navigation, and place content in a QML application.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-quickcontrols", + "qt5-quickcontrols2", + "qt5-serialport" + ] +} diff --git a/ports/qt5-macextras/CONTROL b/ports/qt5-macextras/CONTROL deleted file mode 100644 index 7bceef25c27c34..00000000000000 --- a/ports/qt5-macextras/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-macextras -Version: 5.15.2 -Description: Qt5 Mac Extras Module. Provides platform-specific APIs for mac. -Build-Depends: qt5-base[core] -Supports: osx \ No newline at end of file diff --git a/ports/qt5-macextras/vcpkg.json b/ports/qt5-macextras/vcpkg.json new file mode 100644 index 00000000000000..3ac6b3fc7f73d6 --- /dev/null +++ b/ports/qt5-macextras/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-macextras", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Mac Extras Module. Provides platform-specific APIs for mac.", + "supports": "osx", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL deleted file mode 100644 index cff6939e6b6663..00000000000000 --- a/ports/qt5-modularscripts/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: qt5-modularscripts -Version: deprecated -Description: now part of qt5-base, formerly vcpkg helpers to package qt5 modules \ No newline at end of file diff --git a/ports/qt5-modularscripts/vcpkg.json b/ports/qt5-modularscripts/vcpkg.json new file mode 100644 index 00000000000000..30de99c4c4a50c --- /dev/null +++ b/ports/qt5-modularscripts/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "qt5-modularscripts", + "version-string": "deprecated", + "port-version": 1, + "description": "now part of qt5-base, formerly vcpkg helpers to package qt5 modules" +} diff --git a/ports/qt5-multimedia/CONTROL b/ports/qt5-multimedia/CONTROL deleted file mode 100644 index d45446bbb92246..00000000000000 --- a/ports/qt5-multimedia/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-multimedia -Version: 5.15.2 -Description: Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-multimedia/vcpkg.json b/ports/qt5-multimedia/vcpkg.json new file mode 100644 index 00000000000000..bc35ddac76fd80 --- /dev/null +++ b/ports/qt5-multimedia/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-multimedia", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Multimedia Module - Classes and widgets for audio, video, radio and camera functionality", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL deleted file mode 100644 index 91d61337851394..00000000000000 --- a/ports/qt5-networkauth/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-networkauth -Version: 5.15.2 -Description: Qt5 Network Authorization Module -Build-Depends: qt5-base[core] diff --git a/ports/qt5-networkauth/vcpkg.json b/ports/qt5-networkauth/vcpkg.json new file mode 100644 index 00000000000000..5aa743b193dd37 --- /dev/null +++ b/ports/qt5-networkauth/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-networkauth", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Network Authorization Module", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL deleted file mode 100644 index 65b4d32566b405..00000000000000 --- a/ports/qt5-purchasing/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-purchasing -Version: 5.15.2 -Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications. -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-purchasing/vcpkg.json b/ports/qt5-purchasing/vcpkg.json new file mode 100644 index 00000000000000..b1b52cd67b5a2c --- /dev/null +++ b/ports/qt5-purchasing/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-purchasing", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-quickcontrols/CONTROL b/ports/qt5-quickcontrols/CONTROL deleted file mode 100644 index 27cfa45df8c02b..00000000000000 --- a/ports/qt5-quickcontrols/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-quickcontrols -Version: 5.15.2 -Description: Qt5 QuickControls Module. -Build-Depends: qt5-base[core], qt5-declarative, qt5-graphicaleffects diff --git a/ports/qt5-quickcontrols/vcpkg.json b/ports/qt5-quickcontrols/vcpkg.json new file mode 100644 index 00000000000000..ca2bd64054dd23 --- /dev/null +++ b/ports/qt5-quickcontrols/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-quickcontrols", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 QuickControls Module.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-graphicaleffects" + ] +} diff --git a/ports/qt5-quickcontrols2/CONTROL b/ports/qt5-quickcontrols2/CONTROL deleted file mode 100644 index 1b7e231fc16d9d..00000000000000 --- a/ports/qt5-quickcontrols2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-quickcontrols2 -Version: 5.15.2 -Description: Qt5 QuickControls2 Module. -Build-Depends: qt5-base[core], qt5-declarative, qt5-imageformats diff --git a/ports/qt5-quickcontrols2/vcpkg.json b/ports/qt5-quickcontrols2/vcpkg.json new file mode 100644 index 00000000000000..bf9665c890991d --- /dev/null +++ b/ports/qt5-quickcontrols2/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qt5-quickcontrols2", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 QuickControls2 Module.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-imageformats" + ] +} diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL deleted file mode 100644 index aa2e51a738c0d6..00000000000000 --- a/ports/qt5-remoteobjects/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-remoteobjects -Version: 5.15.2 -Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices. -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-remoteobjects/vcpkg.json b/ports/qt5-remoteobjects/vcpkg.json new file mode 100644 index 00000000000000..38f4f5a8f39bd0 --- /dev/null +++ b/ports/qt5-remoteobjects/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-remoteobjects", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-script/CONTROL b/ports/qt5-script/CONTROL deleted file mode 100644 index a17dbcdfb0d71b..00000000000000 --- a/ports/qt5-script/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-script -Version: 5.15.2 -Build-Depends: qt5-base[core], qt5-tools -Description:Qt5 Script Module. diff --git a/ports/qt5-script/vcpkg.json b/ports/qt5-script/vcpkg.json new file mode 100644 index 00000000000000..874be0e27d5b96 --- /dev/null +++ b/ports/qt5-script/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-script", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Script Module.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-tools" + ] +} diff --git a/ports/qt5-scxml/CONTROL b/ports/qt5-scxml/CONTROL deleted file mode 100644 index f330eadd455043..00000000000000 --- a/ports/qt5-scxml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-scxml -Version: 5.15.2 -Description: Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-scxml/vcpkg.json b/ports/qt5-scxml/vcpkg.json new file mode 100644 index 00000000000000..b32ce788301eb6 --- /dev/null +++ b/ports/qt5-scxml/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-scxml", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 SCXML Module - Provides classes and tools for creating state machines from SCXML files and embedding them in applications", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL deleted file mode 100644 index 4f3f1b402dc1c8..00000000000000 --- a/ports/qt5-sensors/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-sensors -Version: 5.15.2 -Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition. -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-sensors/vcpkg.json b/ports/qt5-sensors/vcpkg.json new file mode 100644 index 00000000000000..2fe0948eda3baa --- /dev/null +++ b/ports/qt5-sensors/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-sensors", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-serialbus/CONTROL b/ports/qt5-serialbus/CONTROL deleted file mode 100644 index b05504825364f6..00000000000000 --- a/ports/qt5-serialbus/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-serialbus -Version: 5.15.2 -Description: Qt5 Serialbus Module; -Build-Depends: qt5-base[core], qt5-serialport diff --git a/ports/qt5-serialbus/vcpkg.json b/ports/qt5-serialbus/vcpkg.json new file mode 100644 index 00000000000000..3e34dd716e8e12 --- /dev/null +++ b/ports/qt5-serialbus/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-serialbus", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Serialbus Module;", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-serialport" + ] +} diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL deleted file mode 100644 index a353df783343a1..00000000000000 --- a/ports/qt5-serialport/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-serialport -Version: 5.15.2 -Description: Qt5 Serial Port - provides access to hardware and virtual serial ports -Build-Depends: qt5-base[core] diff --git a/ports/qt5-serialport/vcpkg.json b/ports/qt5-serialport/vcpkg.json new file mode 100644 index 00000000000000..8d9e79ccf8d2ef --- /dev/null +++ b/ports/qt5-serialport/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-serialport", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Serial Port - provides access to hardware and virtual serial ports", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-speech/CONTROL b/ports/qt5-speech/CONTROL deleted file mode 100644 index 58238879e99b7c..00000000000000 --- a/ports/qt5-speech/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-speech -Version: 5.15.2 -Description: Qt5 Speech Module -Build-Depends: qt5-base[core], atlmfc (windows), qt5-declarative, qt5-multimedia diff --git a/ports/qt5-speech/vcpkg.json b/ports/qt5-speech/vcpkg.json new file mode 100644 index 00000000000000..387b650a306bc4 --- /dev/null +++ b/ports/qt5-speech/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "qt5-speech", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Speech Module", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-multimedia" + ] +} diff --git a/ports/qt5-svg/CONTROL b/ports/qt5-svg/CONTROL deleted file mode 100644 index 1b182ea1893c9d..00000000000000 --- a/ports/qt5-svg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-svg -Version: 5.15.2 -Port-Version: 1 -Description: Qt5 SVG Module - provides classes for displaying the contents of SVG files -Build-Depends: qt5-base[core] diff --git a/ports/qt5-svg/vcpkg.json b/ports/qt5-svg/vcpkg.json new file mode 100644 index 00000000000000..125ae9503bb110 --- /dev/null +++ b/ports/qt5-svg/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-svg", + "version-string": "5.15.2", + "port-version": 2, + "description": "Qt5 SVG Module - provides classes for displaying the contents of SVG files", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL deleted file mode 100644 index bb503e7b90d673..00000000000000 --- a/ports/qt5-tools/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-tools -Version: 5.15.2 -Port-Version: 0 -Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications -Build-Depends: qt5-base[core], qt5-declarative, qt5-activeqt (windows) diff --git a/ports/qt5-tools/vcpkg.json b/ports/qt5-tools/vcpkg.json new file mode 100644 index 00000000000000..5c81111397b2f5 --- /dev/null +++ b/ports/qt5-tools/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "qt5-tools", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications", + "dependencies": [ + { + "name": "qt5-activeqt", + "platform": "windows" + }, + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-translations/CONTROL b/ports/qt5-translations/CONTROL deleted file mode 100644 index 37e37728faca32..00000000000000 --- a/ports/qt5-translations/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-translations -Version: 5.15.2 -Description: Qt5 translations module -Build-Depends: qt5-base[core], qt5-tools diff --git a/ports/qt5-translations/vcpkg.json b/ports/qt5-translations/vcpkg.json new file mode 100644 index 00000000000000..c85cd0149e59d5 --- /dev/null +++ b/ports/qt5-translations/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-translations", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 translations module", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-tools" + ] +} diff --git a/ports/qt5-virtualkeyboard/CONTROL b/ports/qt5-virtualkeyboard/CONTROL deleted file mode 100644 index 716ec162e71aa1..00000000000000 --- a/ports/qt5-virtualkeyboard/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-virtualkeyboard -Version: 5.15.2 -Description: Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes -Build-Depends: qt5-svg, qt5-quickcontrols, qt5-multimedia, qt5-quickcontrols diff --git a/ports/qt5-virtualkeyboard/vcpkg.json b/ports/qt5-virtualkeyboard/vcpkg.json new file mode 100644 index 00000000000000..c53720d04842f3 --- /dev/null +++ b/ports/qt5-virtualkeyboard/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-virtualkeyboard", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Virtual Keyboard Module - A framework for implementing different input methods. Supports localized keyboard layouts and custom visual themes", + "dependencies": [ + "qt5-multimedia", + "qt5-quickcontrols", + "qt5-quickcontrols", + "qt5-svg" + ] +} diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL deleted file mode 100644 index f20ef3e59ee0f1..00000000000000 --- a/ports/qt5-webchannel/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-webchannel -Version: 5.15.2 -Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients. -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-webchannel/vcpkg.json b/ports/qt5-webchannel/vcpkg.json new file mode 100644 index 00000000000000..a50e4f1a4f7201 --- /dev/null +++ b/ports/qt5-webchannel/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-webchannel", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-webengine/CONTROL b/ports/qt5-webengine/CONTROL deleted file mode 100644 index a34cdc1ecd25ac..00000000000000 --- a/ports/qt5-webengine/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: qt5-webengine -Version: 5.15.2 -Port-Version: 2 -Description: Qt5 webengine Module; -Build-Depends: qt5-base[core], qt5-declarative, qt5-location, qt5-quickcontrols, qt5-quickcontrols2, qt5-tools, qt5-webchannel, atlmfc (windows), ffmpeg[core] (!windows) -Supports: !static -Default-Features: - -Feature: proprietary-codecs -Description: Enable proprietary-codecs in qtwebengine \ No newline at end of file diff --git a/ports/qt5-webengine/vcpkg.json b/ports/qt5-webengine/vcpkg.json new file mode 100644 index 00000000000000..83a599f65bf8b5 --- /dev/null +++ b/ports/qt5-webengine/vcpkg.json @@ -0,0 +1,33 @@ +{ + "name": "qt5-webengine", + "version-string": "5.15.2", + "port-version": 3, + "description": "Qt5 webengine Module;", + "supports": "!static", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "ffmpeg", + "default-features": false, + "platform": "!windows" + }, + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-location", + "qt5-quickcontrols", + "qt5-quickcontrols2", + "qt5-tools", + "qt5-webchannel" + ], + "features": { + "proprietary-codecs": { + "description": "Enable proprietary-codecs in qtwebengine" + } + } +} diff --git a/ports/qt5-webglplugin/CONTROL b/ports/qt5-webglplugin/CONTROL deleted file mode 100644 index 8a1603abf215cf..00000000000000 --- a/ports/qt5-webglplugin/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-webglplugin -Version: 5.15.2 -Description: Qt5 webglplugin Module; -Build-Depends: qt5-base[core] diff --git a/ports/qt5-webglplugin/vcpkg.json b/ports/qt5-webglplugin/vcpkg.json new file mode 100644 index 00000000000000..596fb42c8b4fe6 --- /dev/null +++ b/ports/qt5-webglplugin/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-webglplugin", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 webglplugin Module;", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-websockets/CONTROL b/ports/qt5-websockets/CONTROL deleted file mode 100644 index 54ae79c5784952..00000000000000 --- a/ports/qt5-websockets/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-websockets -Version: 5.15.2 -Description: Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455 -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-websockets/vcpkg.json b/ports/qt5-websockets/vcpkg.json new file mode 100644 index 00000000000000..173b65271dba34 --- /dev/null +++ b/ports/qt5-websockets/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-websockets", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Web Sockets Module - provides WebSocket communication compliant with RFC 6455", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5-webview/CONTROL b/ports/qt5-webview/CONTROL deleted file mode 100644 index 22e292d0e52c61..00000000000000 --- a/ports/qt5-webview/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-webview -Version: 5.15.2 -Description: Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense. -Build-Depends: qt5-declarative diff --git a/ports/qt5-webview/vcpkg.json b/ports/qt5-webview/vcpkg.json new file mode 100644 index 00000000000000..c033a0465328ff --- /dev/null +++ b/ports/qt5-webview/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "qt5-webview", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 WebView module - Provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", + "dependencies": [ + "qt5-declarative" + ] +} diff --git a/ports/qt5-winextras/CONTROL b/ports/qt5-winextras/CONTROL deleted file mode 100644 index ab0c4fb30a0fe1..00000000000000 --- a/ports/qt5-winextras/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qt5-winextras -Version: 5.15.2 -Description: Qt5 Windows Extras Module. Provides platform-specific APIs for Windows. -Build-Depends: qt5-base[core], atlmfc (windows), qt5-declarative, qt5-multimedia -Supports: windows diff --git a/ports/qt5-winextras/vcpkg.json b/ports/qt5-winextras/vcpkg.json new file mode 100644 index 00000000000000..64434f24eb83fb --- /dev/null +++ b/ports/qt5-winextras/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "qt5-winextras", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Windows Extras Module. Provides platform-specific APIs for Windows.", + "supports": "windows", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + }, + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative", + "qt5-multimedia" + ] +} diff --git a/ports/qt5-x11extras/CONTROL b/ports/qt5-x11extras/CONTROL deleted file mode 100644 index 7c3f174c9a113b..00000000000000 --- a/ports/qt5-x11extras/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-x11extras -Version: 5.15.2 -Description: Qt5 x11extras Module; -Build-Depends: qt5-base[core] diff --git a/ports/qt5-x11extras/vcpkg.json b/ports/qt5-x11extras/vcpkg.json new file mode 100644 index 00000000000000..032093137ff979 --- /dev/null +++ b/ports/qt5-x11extras/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-x11extras", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 x11extras Module;", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL deleted file mode 100644 index 8b533502e53ef4..00000000000000 --- a/ports/qt5-xmlpatterns/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-xmlpatterns -Version: 5.15.2 -Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation -Build-Depends: qt5-base[core], qt5-declarative diff --git a/ports/qt5-xmlpatterns/vcpkg.json b/ports/qt5-xmlpatterns/vcpkg.json new file mode 100644 index 00000000000000..efe86ebc5f0245 --- /dev/null +++ b/ports/qt5-xmlpatterns/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "qt5-xmlpatterns", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-declarative" + ] +} diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL deleted file mode 100644 index 085cfa17e097ca..00000000000000 --- a/ports/qt5/CONTROL +++ /dev/null @@ -1,162 +0,0 @@ -Source: qt5 -Version: 5.15.2 -Homepage: https://www.qt.io/ -Description: Qt5 Application Framework -Build-Depends: qt5-base[core] -Default-Features: essentials - -Feature: essentials -Build-Depends: qt5[core, tools, networkauth, quickcontrols2, multimedia, imageformats, declarative, svg, activeqt] -Description: Build the essential qt modules - -Feature: latest -Build-Depends: qt5-base[core, latest] -Description: Build latest qt version (5.15.2) instead of LTS (Currently latest==LTS) - -Feature: all -Build-Depends: qt5[3d, webchannel, websockets, extras, xmlpatterns, sensors, serialport, speech, svg, tools, virtualkeyboard, networkauth, purchasing, quickcontrols, quickcontrols2, script, scxml, activeqt, charts, datavis3d, declarative, gamepad, graphicaleffects, imageformats, location, multimedia, mqtt, webglplugin, webview, serialbus, translations, doc, remoteobjects, connectivity], qt5[core,webengine,mysqlplugin] (!static), qt5[core,wayland] (!windows) -Description: Install all Qt5 submodules (Warning: Could take a long time and fail...) - -Feature: extras -Build-Depends: qt5-winextras (windows), qt5-macextras (osx), qt5-x11extras (linux), qt5-androidextras (android) -Description: - -Feature: 3d -Build-Depends: qt5-3d -Description: - -Feature: webchannel -Build-Depends: qt5-webchannel -Description: - -Feature: websockets -Build-Depends: qt5-websockets -Description: - -Feature: xmlpatterns -Build-Depends: qt5-xmlpatterns -Description: (deprecated) - -Feature: sensors -Build-Depends: qt5-sensors -Description: - -Feature: serialport -Build-Depends: qt5-serialport -Description: - -Feature: speech -Build-Depends: qt5-speech -Description: - -Feature: svg -Build-Depends: qt5-svg -Description: - -Feature: tools -Build-Depends: qt5-tools -Description: - -Feature: virtualkeyboard -Build-Depends: qt5-virtualkeyboard -Description: - -Feature: networkauth -Build-Depends: qt5-networkauth -Description: - -Feature: purchasing -Build-Depends: qt5-purchasing -Description: - -Feature: quickcontrols -Build-Depends: qt5-quickcontrols -Description: (deprecated) - -Feature: quickcontrols2 -Build-Depends: qt5-quickcontrols2 -Description: - -Feature: script -Build-Depends: qt5-script -Description: (deprecated) - -Feature: scxml -Build-Depends: qt5-scxml -Description: - -Feature: activeqt -Build-Depends: qt5-activeqt (windows) -Description: Windows Only - -Feature: charts -Build-Depends: qt5-charts -Description: - -Feature: datavis3d -Build-Depends: qt5-datavis3d -Description: - -Feature: declarative -Build-Depends: qt5-declarative -Description: - -Feature: gamepad -Build-Depends: qt5-gamepad -Description: - -Feature: graphicaleffects -Build-Depends: qt5-graphicaleffects -Description: - -Feature: imageformats -Build-Depends: qt5-imageformats -Description: - -Feature: location -Build-Depends: qt5-location -Description: - -Feature: multimedia -Build-Depends: qt5-multimedia -Description: - -Feature: mqtt -Build-Depends: qt5-mqtt -Description: - -Feature: webglplugin -Build-Depends: qt5-webglplugin -Description: - -Feature: webview -Build-Depends: qt5-webview -Description: - -Feature: wayland -Build-Depends: qt5-wayland -Description: - -Feature: webengine -Build-Depends: qt5-webengine -Description: - -Feature: serialbus -Build-Depends: qt5-serialbus -Description: - -Feature: translations -Build-Depends: qt5-translations -Description: - -Feature: doc -Build-Depends: qt5-doc -Description: - -Feature: remoteobjects -Build-Depends: qt5-remoteobjects -Description: - -Feature: connectivity -Build-Depends: qt5-connectivity -Description: diff --git a/ports/qt5/vcpkg.json b/ports/qt5/vcpkg.json new file mode 100644 index 00000000000000..bbf4197fdf3f6e --- /dev/null +++ b/ports/qt5/vcpkg.json @@ -0,0 +1,344 @@ +{ + "name": "qt5", + "version-string": "5.15.2", + "port-version": 1, + "description": "Qt5 Application Framework", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ], + "default-features": [ + "essentials" + ], + "features": { + "3d": { + "description": [], + "dependencies": [ + "qt5-3d" + ] + }, + "activeqt": { + "description": "Windows Only", + "dependencies": [ + { + "name": "qt5-activeqt", + "platform": "windows" + } + ] + }, + "all": { + "description": "Install all Qt5 submodules (Warning: Could take a long time and fail...)", + "dependencies": [ + { + "name": "qt5", + "features": [ + "3d", + "activeqt", + "charts", + "connectivity", + "datavis3d", + "declarative", + "doc", + "extras", + "gamepad", + "graphicaleffects", + "imageformats", + "location", + "mqtt", + "multimedia", + "networkauth", + "purchasing", + "quickcontrols", + "quickcontrols2", + "remoteobjects", + "script", + "scxml", + "sensors", + "serialbus", + "serialport", + "speech", + "svg", + "tools", + "translations", + "virtualkeyboard", + "webchannel", + "webglplugin", + "websockets", + "webview", + "xmlpatterns" + ] + }, + { + "name": "qt5", + "default-features": false, + "features": [ + "mysqlplugin", + "webengine" + ], + "platform": "!static" + }, + { + "name": "qt5", + "default-features": false, + "features": [ + "wayland" + ], + "platform": "!windows" + } + ] + }, + "charts": { + "description": [], + "dependencies": [ + "qt5-charts" + ] + }, + "connectivity": { + "description": [], + "dependencies": [ + "qt5-connectivity" + ] + }, + "datavis3d": { + "description": [], + "dependencies": [ + "qt5-datavis3d" + ] + }, + "declarative": { + "description": [], + "dependencies": [ + "qt5-declarative" + ] + }, + "doc": { + "description": [], + "dependencies": [ + "qt5-doc" + ] + }, + "essentials": { + "description": "Build the essential qt modules", + "dependencies": [ + { + "name": "qt5", + "default-features": false, + "features": [ + "activeqt", + "declarative", + "imageformats", + "multimedia", + "networkauth", + "quickcontrols2", + "svg", + "tools" + ] + } + ] + }, + "extras": { + "description": [], + "dependencies": [ + { + "name": "qt5-androidextras", + "platform": "android" + }, + { + "name": "qt5-macextras", + "platform": "osx" + }, + { + "name": "qt5-winextras", + "platform": "windows" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] + }, + "gamepad": { + "description": [], + "dependencies": [ + "qt5-gamepad" + ] + }, + "graphicaleffects": { + "description": [], + "dependencies": [ + "qt5-graphicaleffects" + ] + }, + "imageformats": { + "description": [], + "dependencies": [ + "qt5-imageformats" + ] + }, + "latest": { + "description": "Build latest qt version (5.15.2) instead of LTS (Currently latest==LTS)", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false, + "features": [ + "latest" + ] + } + ] + }, + "location": { + "description": [], + "dependencies": [ + "qt5-location" + ] + }, + "mqtt": { + "description": [], + "dependencies": [ + "qt5-mqtt" + ] + }, + "multimedia": { + "description": [], + "dependencies": [ + "qt5-multimedia" + ] + }, + "networkauth": { + "description": [], + "dependencies": [ + "qt5-networkauth" + ] + }, + "purchasing": { + "description": [], + "dependencies": [ + "qt5-purchasing" + ] + }, + "quickcontrols": { + "description": "(deprecated)", + "dependencies": [ + "qt5-quickcontrols" + ] + }, + "quickcontrols2": { + "description": [], + "dependencies": [ + "qt5-quickcontrols2" + ] + }, + "remoteobjects": { + "description": [], + "dependencies": [ + "qt5-remoteobjects" + ] + }, + "script": { + "description": "(deprecated)", + "dependencies": [ + "qt5-script" + ] + }, + "scxml": { + "description": [], + "dependencies": [ + "qt5-scxml" + ] + }, + "sensors": { + "description": [], + "dependencies": [ + "qt5-sensors" + ] + }, + "serialbus": { + "description": [], + "dependencies": [ + "qt5-serialbus" + ] + }, + "serialport": { + "description": [], + "dependencies": [ + "qt5-serialport" + ] + }, + "speech": { + "description": [], + "dependencies": [ + "qt5-speech" + ] + }, + "svg": { + "description": [], + "dependencies": [ + "qt5-svg" + ] + }, + "tools": { + "description": [], + "dependencies": [ + "qt5-tools" + ] + }, + "translations": { + "description": [], + "dependencies": [ + "qt5-translations" + ] + }, + "virtualkeyboard": { + "description": [], + "dependencies": [ + "qt5-virtualkeyboard" + ] + }, + "wayland": { + "description": [], + "dependencies": [ + "qt5-wayland" + ] + }, + "webchannel": { + "description": [], + "dependencies": [ + "qt5-webchannel" + ] + }, + "webengine": { + "description": [], + "dependencies": [ + "qt5-webengine" + ] + }, + "webglplugin": { + "description": [], + "dependencies": [ + "qt5-webglplugin" + ] + }, + "websockets": { + "description": [], + "dependencies": [ + "qt5-websockets" + ] + }, + "webview": { + "description": [], + "dependencies": [ + "qt5-webview" + ] + }, + "xmlpatterns": { + "description": "(deprecated)", + "dependencies": [ + "qt5-xmlpatterns" + ] + } + } +} diff --git a/ports/qtkeychain/CONTROL b/ports/qtkeychain/CONTROL deleted file mode 100644 index a0a119f1c092f9..00000000000000 --- a/ports/qtkeychain/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qtkeychain -Version: 0.11.1 -Homepage: https://github.com/frankosterfeld/qtkeychain -Description: qtkeychain - Platform-independent Qt API for storing passwords securely -Build-Depends: qt5-base[core], qt5-tools \ No newline at end of file diff --git a/ports/qtkeychain/vcpkg.json b/ports/qtkeychain/vcpkg.json new file mode 100644 index 00000000000000..acf0e19985053a --- /dev/null +++ b/ports/qtkeychain/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "qtkeychain", + "version-string": "0.11.1", + "port-version": 1, + "description": "qtkeychain - Platform-independent Qt API for storing passwords securely", + "homepage": "https://github.com/frankosterfeld/qtkeychain", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + "qt5-tools" + ] +} diff --git a/ports/quadtree/CONTROL b/ports/quadtree/CONTROL deleted file mode 100644 index 320590bf3c1bce..00000000000000 --- a/ports/quadtree/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: quadtree -Version: 2020-04-13 -Description: A simple and modern C++ quadtree implementation -Homepage: https://github.com/pvigier/Quadtree \ No newline at end of file diff --git a/ports/quadtree/vcpkg.json b/ports/quadtree/vcpkg.json new file mode 100644 index 00000000000000..49004d6907960d --- /dev/null +++ b/ports/quadtree/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "quadtree", + "version-string": "2020-04-13", + "port-version": 1, + "description": "A simple and modern C++ quadtree implementation", + "homepage": "https://github.com/pvigier/Quadtree" +} diff --git a/ports/quaternions/CONTROL b/ports/quaternions/CONTROL deleted file mode 100644 index cc5fd6554975e9..00000000000000 --- a/ports/quaternions/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: quaternions -Version: 1.0.0 -Description: A C++11 library to work with quaternions, as a single header file. -Homepage: https://github.com/ferd36/quaternions -Build-Depends: boost-mpl diff --git a/ports/quaternions/vcpkg.json b/ports/quaternions/vcpkg.json new file mode 100644 index 00000000000000..b6d8b22e2c72ef --- /dev/null +++ b/ports/quaternions/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "quaternions", + "version-string": "1.0.0", + "port-version": 1, + "description": "A C++11 library to work with quaternions, as a single header file.", + "homepage": "https://github.com/ferd36/quaternions", + "dependencies": [ + "boost-mpl" + ] +} diff --git a/ports/quazip/CONTROL b/ports/quazip/CONTROL deleted file mode 100644 index 853be24c058248..00000000000000 --- a/ports/quazip/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: quazip -Version: 0.9.1 -Homepage: https://stachenov.github.io/quazip/ -Description: Qt/C++ wrapper over minizip -Build-Depends: qt5-base, zlib diff --git a/ports/quazip/vcpkg.json b/ports/quazip/vcpkg.json new file mode 100644 index 00000000000000..cf2a01f8a1e9d5 --- /dev/null +++ b/ports/quazip/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "quazip", + "version-string": "0.9.1", + "port-version": 1, + "description": "Qt/C++ wrapper over minizip", + "homepage": "https://stachenov.github.io/quazip/", + "dependencies": [ + "qt5-base", + "zlib" + ] +} diff --git a/ports/quickfast/CONTROL b/ports/quickfast/CONTROL deleted file mode 100644 index 6f0ff52778a388..00000000000000 --- a/ports/quickfast/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: quickfast -Version: 1.5 -Build-Depends: boost-asio, xerces-c -Homepage: https://github.com/objectcomputing/quickfast -Description: QuickFAST is an Open Source native C++ implementation of the FAST Protocol [SM]. diff --git a/ports/quickfast/vcpkg.json b/ports/quickfast/vcpkg.json new file mode 100644 index 00000000000000..143f16f99a02ed --- /dev/null +++ b/ports/quickfast/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "quickfast", + "version-string": "1.5", + "port-version": 1, + "description": "QuickFAST is an Open Source native C++ implementation of the FAST Protocol [SM].", + "homepage": "https://github.com/objectcomputing/quickfast", + "dependencies": [ + "boost-asio", + "xerces-c" + ] +} diff --git a/ports/quickfix/CONTROL b/ports/quickfix/CONTROL deleted file mode 100644 index 5a3fe30c21a073..00000000000000 --- a/ports/quickfix/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: quickfix -Version: 1.15.1-4 -Build-Depends: openssl -Homepage: https://github.com/quickfix/quickfix -Description: QuickFIX is a free and open source implementation of the FIX protocol. diff --git a/ports/quickfix/vcpkg.json b/ports/quickfix/vcpkg.json new file mode 100644 index 00000000000000..5a6e940a3b69bd --- /dev/null +++ b/ports/quickfix/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "quickfix", + "version-string": "1.15.1", + "port-version": 5, + "description": "QuickFIX is a free and open source implementation of the FIX protocol.", + "homepage": "https://github.com/quickfix/quickfix", + "dependencies": [ + "openssl" + ] +} diff --git a/ports/qwtw/CONTROL b/ports/qwtw/CONTROL deleted file mode 100644 index 6b60796cbef817..00000000000000 --- a/ports/qwtw/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: qwtw -Version: 3.1.0 -Homepage: https://github.com/ig-or/qwtw -Description: qwt-based 2D plotting library -Supports: windows & x64 & !static -Build-Depends: qt5-base, qt5-svg, qt5-networkauth, qwt, marble, boost-system, boost-filesystem, boost-date-time, boost-chrono, boost-regex, boost-thread, boost-circular-buffer, boost-asio diff --git a/ports/qwtw/vcpkg.json b/ports/qwtw/vcpkg.json new file mode 100644 index 00000000000000..2fa18ec80dcf15 --- /dev/null +++ b/ports/qwtw/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "qwtw", + "version-string": "3.1.0", + "port-version": 1, + "description": "qwt-based 2D plotting library", + "homepage": "https://github.com/ig-or/qwtw", + "supports": "windows & x64 & !static", + "dependencies": [ + "boost-asio", + "boost-chrono", + "boost-circular-buffer", + "boost-date-time", + "boost-filesystem", + "boost-regex", + "boost-system", + "boost-thread", + "marble", + "qt5-base", + "qt5-networkauth", + "qt5-svg", + "qwt" + ] +} diff --git a/ports/rabit/CONTROL b/ports/rabit/CONTROL deleted file mode 100644 index 64dd8ea8d8a877..00000000000000 --- a/ports/rabit/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: rabit -Version: 0.1-2 -Homepage: https://github.com/dmlc/rabit -Description: rabit is a light weight library that provides a fault tolerant interface of Allreduce and Broadcast. It is designed to support easy implementations of distributed machine learning programs, many of which fall naturally under the Allreduce abstraction. -Build-Depends: dmlc -Supports: !uwp diff --git a/ports/rabit/vcpkg.json b/ports/rabit/vcpkg.json new file mode 100644 index 00000000000000..a7635dfa667a1e --- /dev/null +++ b/ports/rabit/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "rabit", + "version-string": "0.1", + "port-version": 3, + "description": "rabit is a light weight library that provides a fault tolerant interface of Allreduce and Broadcast. It is designed to support easy implementations of distributed machine learning programs, many of which fall naturally under the Allreduce abstraction.", + "homepage": "https://github.com/dmlc/rabit", + "supports": "!uwp", + "dependencies": [ + "dmlc" + ] +} diff --git a/ports/ragel/CONTROL b/ports/ragel/CONTROL deleted file mode 100644 index abec9f49ab9517..00000000000000 --- a/ports/ragel/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: ragel -Version: 6.10-3 -Homepage: https://www.colm.net/files/ragel -Description: Ragel State Machine Compiler diff --git a/ports/ragel/vcpkg.json b/ports/ragel/vcpkg.json new file mode 100644 index 00000000000000..e55e333d8d5b8c --- /dev/null +++ b/ports/ragel/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "ragel", + "version-string": "6.10", + "port-version": 4, + "description": "Ragel State Machine Compiler", + "homepage": "https://www.colm.net/files/ragel" +} diff --git a/ports/rang/CONTROL b/ports/rang/CONTROL deleted file mode 100644 index 629bee4756fcb9..00000000000000 --- a/ports/rang/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: rang -Version: 3.1.0 -Description: Colors for your Terminal. \ No newline at end of file diff --git a/ports/rang/vcpkg.json b/ports/rang/vcpkg.json new file mode 100644 index 00000000000000..c388d10d47dafd --- /dev/null +++ b/ports/rang/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "rang", + "version-string": "3.1.0", + "port-version": 1, + "description": "Colors for your Terminal." +} diff --git a/ports/range-v3-vs2015/CONTROL b/ports/range-v3-vs2015/CONTROL deleted file mode 100644 index 34ce349e190d9a..00000000000000 --- a/ports/range-v3-vs2015/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: range-v3-vs2015 -Version: 20151130-vcpkg5 -Homepage: https://github.com/Microsoft/Range-V3-VS2015 -Description: Range library for C++11/14/17. diff --git a/ports/range-v3-vs2015/vcpkg.json b/ports/range-v3-vs2015/vcpkg.json new file mode 100644 index 00000000000000..289515dca67458 --- /dev/null +++ b/ports/range-v3-vs2015/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "range-v3-vs2015", + "version-string": "20151130-vcpkg5", + "port-version": 1, + "description": "Range library for C++11/14/17.", + "homepage": "https://github.com/Microsoft/Range-V3-VS2015" +} diff --git a/ports/range-v3/CONTROL b/ports/range-v3/CONTROL deleted file mode 100644 index cf5c574392c128..00000000000000 --- a/ports/range-v3/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: range-v3 -Version: 0.11.0 -Homepage: https://github.com/ericniebler/range-v3 -Description: Range library for C++11/14/17. diff --git a/ports/range-v3/vcpkg.json b/ports/range-v3/vcpkg.json new file mode 100644 index 00000000000000..6a5d15958936c6 --- /dev/null +++ b/ports/range-v3/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "range-v3", + "version-string": "0.11.0", + "port-version": 1, + "description": "Range library for C++11/14/17.", + "homepage": "https://github.com/ericniebler/range-v3" +} diff --git a/ports/rapidcheck/CONTROL b/ports/rapidcheck/CONTROL deleted file mode 100644 index 5f46ed702b842c..00000000000000 --- a/ports/rapidcheck/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: rapidcheck -Version: 2020-08-25 -Homepage: https://github.com/emil-e/rapidcheck -Description: A property-based testing library for C++ (a la QuickCheck) with the goal of being simple to use with as little boilerplate as possible. diff --git a/ports/rapidcheck/vcpkg.json b/ports/rapidcheck/vcpkg.json new file mode 100644 index 00000000000000..60570b545e09fe --- /dev/null +++ b/ports/rapidcheck/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rapidcheck", + "version-string": "2020-08-25", + "port-version": 1, + "description": "A property-based testing library for C++ (a la QuickCheck) with the goal of being simple to use with as little boilerplate as possible.", + "homepage": "https://github.com/emil-e/rapidcheck" +} diff --git a/ports/rapidxml-ns/CONTROL b/ports/rapidxml-ns/CONTROL deleted file mode 100644 index f932481e1bce9e..00000000000000 --- a/ports/rapidxml-ns/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: rapidxml-ns -Version: 1.13.2 -Description: RapidXML with added XML namespaces support. diff --git a/ports/rapidxml-ns/vcpkg.json b/ports/rapidxml-ns/vcpkg.json new file mode 100644 index 00000000000000..a0422d1eb69c65 --- /dev/null +++ b/ports/rapidxml-ns/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "rapidxml-ns", + "version-string": "1.13.2", + "port-version": 1, + "description": "RapidXML with added XML namespaces support." +} diff --git a/ports/rapidxml/CONTROL b/ports/rapidxml/CONTROL deleted file mode 100644 index 7e119fb705f2dc..00000000000000 --- a/ports/rapidxml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: rapidxml -Version: 1.13-4 -Homepage: https://sourceforge.net/projects/rapidxml -Description: RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility. diff --git a/ports/rapidxml/vcpkg.json b/ports/rapidxml/vcpkg.json new file mode 100644 index 00000000000000..d43ff6cf8cb603 --- /dev/null +++ b/ports/rapidxml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rapidxml", + "version-string": "1.13", + "port-version": 5, + "description": "RapidXml is an attempt to create the fastest XML parser possible, while retaining useability, portability and reasonable W3C compatibility.", + "homepage": "https://sourceforge.net/projects/rapidxml" +} diff --git a/ports/re2/CONTROL b/ports/re2/CONTROL deleted file mode 100644 index 44e2d702b613fc..00000000000000 --- a/ports/re2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: re2 -Version: 2020-10-01 -Homepage: https://github.com/google/re2 -Description: RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library. diff --git a/ports/re2/vcpkg.json b/ports/re2/vcpkg.json new file mode 100644 index 00000000000000..9e8765d197916c --- /dev/null +++ b/ports/re2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "re2", + "version-string": "2020-10-01", + "port-version": 1, + "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.", + "homepage": "https://github.com/google/re2" +} diff --git a/ports/readline-win32/CONTROL b/ports/readline-win32/CONTROL deleted file mode 100644 index f8beab3d931f1e..00000000000000 --- a/ports/readline-win32/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: readline-win32 -Version: 5.0-2 -Description: Implementation of readline for Windows Desktop -Homepage: https://github.com/lltcggie \ No newline at end of file diff --git a/ports/readline-win32/vcpkg.json b/ports/readline-win32/vcpkg.json new file mode 100644 index 00000000000000..86c8d73046ca32 --- /dev/null +++ b/ports/readline-win32/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "readline-win32", + "version-string": "5.0", + "port-version": 3, + "description": "Implementation of readline for Windows Desktop", + "homepage": "https://github.com/lltcggie" +} diff --git a/ports/readline/CONTROL b/ports/readline/CONTROL deleted file mode 100644 index c487f389b52ac3..00000000000000 --- a/ports/readline/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: readline -Version: 0 -Description: GNU readline and history libraries -Build-Depends: readline-win32 (windows) -Supports: !uwp \ No newline at end of file diff --git a/ports/readline/vcpkg.json b/ports/readline/vcpkg.json new file mode 100644 index 00000000000000..7dba01a74c9b3a --- /dev/null +++ b/ports/readline/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "readline", + "version-string": "0", + "port-version": 1, + "description": "GNU readline and history libraries", + "supports": "!uwp", + "dependencies": [ + { + "name": "readline-win32", + "platform": "windows" + } + ] +} diff --git a/ports/readosm/CONTROL b/ports/readosm/CONTROL deleted file mode 100644 index 686cc22c9c4797..00000000000000 --- a/ports/readosm/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: readosm -Version: 1.1.0a -Homepage: https://www.gaia-gis.it/gaia-sins/readosm-sources -Description: ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf) -Build-Depends: expat, zlib \ No newline at end of file diff --git a/ports/readosm/vcpkg.json b/ports/readosm/vcpkg.json new file mode 100644 index 00000000000000..f76990a8c98046 --- /dev/null +++ b/ports/readosm/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "readosm", + "version-string": "1.1.0a", + "port-version": 1, + "description": "ReadOSM is an open source library to extract valid data from within an Open Street Map input file (.osm or .osm.pbf)", + "homepage": "https://www.gaia-gis.it/gaia-sins/readosm-sources", + "dependencies": [ + "expat", + "zlib" + ] +} diff --git a/ports/refl-cpp/CONTROL b/ports/refl-cpp/CONTROL deleted file mode 100644 index 93bbcbd12161dd..00000000000000 --- a/ports/refl-cpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: refl-cpp -Version: 0.12.0 -Description: A compile-time reflection library for modern C++ with support for overloads, templates, attributes and proxies -Homepage: https://github.com/veselink1/refl-cpp diff --git a/ports/refl-cpp/vcpkg.json b/ports/refl-cpp/vcpkg.json new file mode 100644 index 00000000000000..4674807c923025 --- /dev/null +++ b/ports/refl-cpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "refl-cpp", + "version-string": "0.12.0", + "port-version": 1, + "description": "A compile-time reflection library for modern C++ with support for overloads, templates, attributes and proxies", + "homepage": "https://github.com/veselink1/refl-cpp" +} diff --git a/ports/refprop-headers/CONTROL b/ports/refprop-headers/CONTROL deleted file mode 100644 index 4ec002c38774ea..00000000000000 --- a/ports/refprop-headers/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: refprop-headers -Version: 2019-04-14 -Homepage: https://github.com/CoolProp/REFPROP-headers -Description: The REFPROP Headers diff --git a/ports/refprop-headers/vcpkg.json b/ports/refprop-headers/vcpkg.json new file mode 100644 index 00000000000000..f0b73813b5494e --- /dev/null +++ b/ports/refprop-headers/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "refprop-headers", + "version-string": "2019-04-14", + "port-version": 1, + "description": "The REFPROP Headers", + "homepage": "https://github.com/CoolProp/REFPROP-headers" +} diff --git a/ports/replxx/CONTROL b/ports/replxx/CONTROL deleted file mode 100644 index efc7b3391c3a45..00000000000000 --- a/ports/replxx/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: replxx -Version: 0.0.2-2 -Homepage: https://github.com/AmokHuginnsson/replxx -Description: A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters. -Supports: !uwp diff --git a/ports/replxx/vcpkg.json b/ports/replxx/vcpkg.json new file mode 100644 index 00000000000000..7e84aebc603db4 --- /dev/null +++ b/ports/replxx/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "replxx", + "version-string": "0.0.2", + "port-version": 3, + "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", + "homepage": "https://github.com/AmokHuginnsson/replxx", + "supports": "!uwp" +} diff --git a/ports/reproc/CONTROL b/ports/reproc/CONTROL deleted file mode 100644 index 550e629be2722a..00000000000000 --- a/ports/reproc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: reproc -Version: 14.2.1 -Description: Cross-platform (C99/C++11) process library -Homepage: https://github.com/DaanDeMeyer/reproc diff --git a/ports/reproc/vcpkg.json b/ports/reproc/vcpkg.json new file mode 100644 index 00000000000000..bf51252e324784 --- /dev/null +++ b/ports/reproc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "reproc", + "version-string": "14.2.1", + "port-version": 1, + "description": "Cross-platform (C99/C++11) process library", + "homepage": "https://github.com/DaanDeMeyer/reproc" +} diff --git a/ports/rest-rpc/CONTROL b/ports/rest-rpc/CONTROL deleted file mode 100644 index ed7023bb4ae4af..00000000000000 --- a/ports/rest-rpc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: rest-rpc -Version: 0.07 -Port-Version: 1 -Homepage: https://github.com/qicosmos/rest_rpc -Description: c++11, high performance, cross platform, easy to use rpc framework -Build-Depends: asio diff --git a/ports/rest-rpc/vcpkg.json b/ports/rest-rpc/vcpkg.json new file mode 100644 index 00000000000000..478198e72246ba --- /dev/null +++ b/ports/rest-rpc/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "rest-rpc", + "version-string": "0.07", + "port-version": 2, + "description": "c++11, high performance, cross platform, easy to use rpc framework", + "homepage": "https://github.com/qicosmos/rest_rpc", + "dependencies": [ + "asio" + ] +} diff --git a/ports/restclient-cpp/CONTROL b/ports/restclient-cpp/CONTROL deleted file mode 100644 index df8faa7b708f55..00000000000000 --- a/ports/restclient-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: restclient-cpp -Version: 0.5.2 -Build-Depends: curl -Homepage: https://code.mrtazz.com/restclient-cpp/ -Description: Simple REST client for C++. It wraps libcurl for HTTP requests. diff --git a/ports/restclient-cpp/vcpkg.json b/ports/restclient-cpp/vcpkg.json new file mode 100644 index 00000000000000..fcef3266a3895c --- /dev/null +++ b/ports/restclient-cpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "restclient-cpp", + "version-string": "0.5.2", + "port-version": 1, + "description": "Simple REST client for C++. It wraps libcurl for HTTP requests.", + "homepage": "https://code.mrtazz.com/restclient-cpp/", + "dependencies": [ + "curl" + ] +} diff --git a/ports/rhash/CONTROL b/ports/rhash/CONTROL deleted file mode 100644 index c8d0e5691ab43f..00000000000000 --- a/ports/rhash/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: rhash -Version: 1.4.0 -Homepage: https://github.com/rhash/RHash -Description: C library for computing a wide variety of hash sums -Supports: !uwp diff --git a/ports/rhash/vcpkg.json b/ports/rhash/vcpkg.json new file mode 100644 index 00000000000000..1cdb5fef020e94 --- /dev/null +++ b/ports/rhash/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "rhash", + "version-string": "1.4.0", + "port-version": 1, + "description": "C library for computing a wide variety of hash sums", + "homepage": "https://github.com/rhash/RHash", + "supports": "!uwp" +} diff --git a/ports/riffcpp/CONTROL b/ports/riffcpp/CONTROL deleted file mode 100644 index 2a872faa507a2b..00000000000000 --- a/ports/riffcpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: riffcpp -Version: 2.2.4 -Homepage: https://github.com/libdmusic/riffcpp -Description: Simple library for reading RIFF files diff --git a/ports/riffcpp/vcpkg.json b/ports/riffcpp/vcpkg.json new file mode 100644 index 00000000000000..13d88764720339 --- /dev/null +++ b/ports/riffcpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "riffcpp", + "version-string": "2.2.4", + "port-version": 1, + "description": "Simple library for reading RIFF files", + "homepage": "https://github.com/libdmusic/riffcpp" +} diff --git a/ports/ring-span-lite/CONTROL b/ports/ring-span-lite/CONTROL deleted file mode 100644 index 9d620b709d8e82..00000000000000 --- a/ports/ring-span-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: ring-span-lite -Version: 0.3.0 -Description: A C++yy-like ring_span type for C++98, C++11 and later in a single-file header-only library diff --git a/ports/ring-span-lite/vcpkg.json b/ports/ring-span-lite/vcpkg.json new file mode 100644 index 00000000000000..06121f35198126 --- /dev/null +++ b/ports/ring-span-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "ring-span-lite", + "version-string": "0.3.0", + "port-version": 1, + "description": "A C++yy-like ring_span type for C++98, C++11 and later in a single-file header-only library" +} diff --git a/ports/roaring/CONTROL b/ports/roaring/CONTROL deleted file mode 100644 index 0b1327da47815e..00000000000000 --- a/ports/roaring/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: roaring -Version: 2019-03-05-2 -Description: A better compressed bitset in C (and C++) diff --git a/ports/roaring/vcpkg.json b/ports/roaring/vcpkg.json new file mode 100644 index 00000000000000..598893916ee047 --- /dev/null +++ b/ports/roaring/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "roaring", + "version-string": "2019-03-05", + "port-version": 3, + "description": "A better compressed bitset in C (and C++)" +} diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL deleted file mode 100644 index b63c6774e2cdba..00000000000000 --- a/ports/rocksdb/CONTROL +++ /dev/null @@ -1,29 +0,0 @@ -Source: rocksdb -Version: 6.14.6 -Homepage: https://github.com/facebook/rocksdb -Description: A library that provides an embeddable, persistent key-value store for fast storage -Default-Features: zlib - -Feature: lz4 -Build-Depends: lz4 -Description: lz4 support in rocksdb - -Feature: snappy -Build-Depends: snappy -Description: snappy support in rocksdb - -Feature: zlib -Build-Depends: zlib -Description: zlib support in rocksdb - -Feature: tbb -Build-Depends: tbb -Description: tbb support in rocksdb - -Feature: zstd -Build-Depends: zstd -Description: zstd support in rocksdb - -Feature: bzip2 -Build-Depends: bzip2 -Description: bzip2 support in rocksdb diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json new file mode 100644 index 00000000000000..d1c4940f86657b --- /dev/null +++ b/ports/rocksdb/vcpkg.json @@ -0,0 +1,48 @@ +{ + "name": "rocksdb", + "version-string": "6.14.6", + "port-version": 1, + "description": "A library that provides an embeddable, persistent key-value store for fast storage", + "homepage": "https://github.com/facebook/rocksdb", + "default-features": [ + "zlib" + ], + "features": { + "bzip2": { + "description": "bzip2 support in rocksdb", + "dependencies": [ + "bzip2" + ] + }, + "lz4": { + "description": "lz4 support in rocksdb", + "dependencies": [ + "lz4" + ] + }, + "snappy": { + "description": "snappy support in rocksdb", + "dependencies": [ + "snappy" + ] + }, + "tbb": { + "description": "tbb support in rocksdb", + "dependencies": [ + "tbb" + ] + }, + "zlib": { + "description": "zlib support in rocksdb", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "zstd support in rocksdb", + "dependencies": [ + "zstd" + ] + } + } +} diff --git a/ports/rpclib/CONTROL b/ports/rpclib/CONTROL deleted file mode 100644 index 44d28780d97bbd..00000000000000 --- a/ports/rpclib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: rpclib -Version: 2.2.1 -Port-Version: 2 -Homepage: https://github.com/rpclib/rpclib -Description: a RPC library for C++, providing both a client and server implementation. It is built using modern C++14. diff --git a/ports/rpclib/vcpkg.json b/ports/rpclib/vcpkg.json new file mode 100644 index 00000000000000..7ac73846db17e9 --- /dev/null +++ b/ports/rpclib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rpclib", + "version-string": "2.2.1", + "port-version": 3, + "description": "a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.", + "homepage": "https://github.com/rpclib/rpclib" +} diff --git a/ports/rply/CONTROL b/ports/rply/CONTROL deleted file mode 100644 index 0caedadfbe9c4a..00000000000000 --- a/ports/rply/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: rply -Version: 1.1.4 -Homepage: http://w3.impa.br/~diego/software/rply -Description: ANSI C Library for PLY file format input and output diff --git a/ports/rply/vcpkg.json b/ports/rply/vcpkg.json new file mode 100644 index 00000000000000..100177a4190471 --- /dev/null +++ b/ports/rply/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rply", + "version-string": "1.1.4", + "port-version": 1, + "description": "ANSI C Library for PLY file format input and output", + "homepage": "http://w3.impa.br/~diego/software/rply" +} diff --git a/ports/rs-core-lib/CONTROL b/ports/rs-core-lib/CONTROL deleted file mode 100644 index 557b2dd2af7d15..00000000000000 --- a/ports/rs-core-lib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: rs-core-lib -Version: 2020-09-14 -Homepage: https://github.com/CaptainCrowbar/rs-core-lib -Description: Minimal common utilities by Ross Smith - diff --git a/ports/rs-core-lib/vcpkg.json b/ports/rs-core-lib/vcpkg.json new file mode 100644 index 00000000000000..8ee5959e020cba --- /dev/null +++ b/ports/rs-core-lib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rs-core-lib", + "version-string": "2020-09-14", + "port-version": 1, + "description": "Minimal common utilities by Ross Smith", + "homepage": "https://github.com/CaptainCrowbar/rs-core-lib" +} diff --git a/ports/rsocket/CONTROL b/ports/rsocket/CONTROL deleted file mode 100644 index 333fe0df395f43..00000000000000 --- a/ports/rsocket/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: rsocket -Version: 2020.05.04.00-1 -Homepage: https://github.com/rsocket/rsocket-cpp -Description: C++ implementation of RSocket http://rsocket.io -Build-Depends: folly, double-conversion, openssl, gflags, glog, fmt, boost-system, boost-thread, boost-filesystem, boost-regex, boost-context, boost-program-options, zlib -Supports: !(windows&x64) diff --git a/ports/rsocket/vcpkg.json b/ports/rsocket/vcpkg.json new file mode 100644 index 00000000000000..cbaa74eb8b0435 --- /dev/null +++ b/ports/rsocket/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "rsocket", + "version-string": "2020.05.04.00", + "port-version": 2, + "description": "C++ implementation of RSocket http://rsocket.io", + "homepage": "https://github.com/rsocket/rsocket-cpp", + "supports": "!(windows & x64)", + "dependencies": [ + "boost-context", + "boost-filesystem", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-thread", + "double-conversion", + "fmt", + "folly", + "gflags", + "glog", + "openssl", + "zlib" + ] +} diff --git a/ports/rtlsdr/CONTROL b/ports/rtlsdr/CONTROL deleted file mode 100644 index cbd10d653bf570..00000000000000 --- a/ports/rtlsdr/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: rtlsdr -Version: 2020-04-16-1 -Homepage: https://osmocom.org/projects/rtl-sdr -Description: rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver -Build-Depends: libusb, pthreads (windows) -Supports: windows&(x86|x64) diff --git a/ports/rtlsdr/vcpkg.json b/ports/rtlsdr/vcpkg.json new file mode 100644 index 00000000000000..1dbd2b0da36b13 --- /dev/null +++ b/ports/rtlsdr/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "rtlsdr", + "version-string": "2020-04-16", + "port-version": 2, + "description": "rtl-sdr is a library that turns your Realtek RTL2832 based DVB dongle into a SDR receiver", + "homepage": "https://osmocom.org/projects/rtl-sdr", + "supports": "windows & (x86 | x64)", + "dependencies": [ + "libusb", + { + "name": "pthreads", + "platform": "windows" + } + ] +} diff --git a/ports/rttr/CONTROL b/ports/rttr/CONTROL deleted file mode 100644 index 60a2a1a8d209a2..00000000000000 --- a/ports/rttr/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: rttr -Version: 0.9.6-2 -Homepage: https://github.com/rttrorg/rttr -Description: an easy and intuitive way to use reflection in C++ -Build-Depends: rapidjson diff --git a/ports/rttr/vcpkg.json b/ports/rttr/vcpkg.json new file mode 100644 index 00000000000000..fc7ff33bca8daa --- /dev/null +++ b/ports/rttr/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "rttr", + "version-string": "0.9.6", + "port-version": 3, + "description": "an easy and intuitive way to use reflection in C++", + "homepage": "https://github.com/rttrorg/rttr", + "dependencies": [ + "rapidjson" + ] +} diff --git a/ports/rxcpp/CONTROL b/ports/rxcpp/CONTROL deleted file mode 100644 index b34395f125d863..00000000000000 --- a/ports/rxcpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: rxcpp -Version: 4.1.0-1 -Homepage: https://github.com/Reactive-Extensions/RxCpp -Description: Reactive Extensions for C++ diff --git a/ports/rxcpp/vcpkg.json b/ports/rxcpp/vcpkg.json new file mode 100644 index 00000000000000..013aa46a3e6222 --- /dev/null +++ b/ports/rxcpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "rxcpp", + "version-string": "4.1.0", + "port-version": 2, + "description": "Reactive Extensions for C++", + "homepage": "https://github.com/Reactive-Extensions/RxCpp" +} diff --git a/ports/rxqt/CONTROL b/ports/rxqt/CONTROL deleted file mode 100644 index eeaab0986669a7..00000000000000 --- a/ports/rxqt/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: rxqt -Version: bb2138c -Description: The Reactive Extensions for Qt. -Homepage: https://github.com/tetsurom/rxqt -Build-Depends: rxcpp \ No newline at end of file diff --git a/ports/rxqt/vcpkg.json b/ports/rxqt/vcpkg.json new file mode 100644 index 00000000000000..71638f964408d2 --- /dev/null +++ b/ports/rxqt/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "rxqt", + "version-string": "bb2138c", + "port-version": 1, + "description": "The Reactive Extensions for Qt.", + "homepage": "https://github.com/tetsurom/rxqt", + "dependencies": [ + "rxcpp" + ] +} diff --git a/ports/sais/CONTROL b/ports/sais/CONTROL deleted file mode 100644 index a889a827f2a95a..00000000000000 --- a/ports/sais/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: sais -Version: 2.4.1-1 -Description: An implementation of the induced sorting algorithm diff --git a/ports/sais/vcpkg.json b/ports/sais/vcpkg.json new file mode 100644 index 00000000000000..59f2e9ad80d42e --- /dev/null +++ b/ports/sais/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sais", + "version-string": "2.4.1", + "port-version": 2, + "description": "An implementation of the induced sorting algorithm" +} diff --git a/ports/sajson/CONTROL b/ports/sajson/CONTROL deleted file mode 100644 index c990cd3dfdabfe..00000000000000 --- a/ports/sajson/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: sajson -Version: 2018-09-21 -Description: Lightweight, extremely high-performance JSON parser for C++11 diff --git a/ports/sajson/vcpkg.json b/ports/sajson/vcpkg.json new file mode 100644 index 00000000000000..2cde87c546ed8b --- /dev/null +++ b/ports/sajson/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sajson", + "version-string": "2018-09-21", + "port-version": 1, + "description": "Lightweight, extremely high-performance JSON parser for C++11" +} diff --git a/ports/sassc/CONTROL b/ports/sassc/CONTROL deleted file mode 100644 index b2fc8e63f7baa4..00000000000000 --- a/ports/sassc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: sassc -Version: 3.6.1 -Port-Version: 0 -Description: SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems. -Homepage: https://github.com/sass/sassc -Build-Depends: libsass, getopt diff --git a/ports/sassc/vcpkg.json b/ports/sassc/vcpkg.json new file mode 100644 index 00000000000000..8b89777bc1c1df --- /dev/null +++ b/ports/sassc/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sassc", + "version-string": "3.6.1", + "port-version": 1, + "description": "SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems.", + "homepage": "https://github.com/sass/sassc", + "dependencies": [ + "getopt", + "libsass" + ] +} diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL deleted file mode 100644 index 2790f56c4f227a..00000000000000 --- a/ports/sciter/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: sciter -Version: 4.4.8.3 -Homepage: https://github.com/c-smile/sciter-sdk -Description: Sciter is an embeddable HTML/CSS/scripting engine. -Supports: !uwp - -Feature: windowless -Description: Uses Sciter.Lite builds diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json new file mode 100644 index 00000000000000..de007100f69427 --- /dev/null +++ b/ports/sciter/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sciter", + "version-string": "4.4.8.3", + "port-version": 1, + "description": "Sciter is an embeddable HTML/CSS/scripting engine.", + "homepage": "https://github.com/c-smile/sciter-sdk", + "supports": "!uwp", + "features": { + "windowless": { + "description": "Uses Sciter.Lite builds" + } + } +} diff --git a/ports/scnlib/CONTROL b/ports/scnlib/CONTROL deleted file mode 100644 index 75f4230d9715a0..00000000000000 --- a/ports/scnlib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: scnlib -Version: 0.4 -Description: scnlib is a modern C++ library for replacing scanf and std::istream -Homepage: https://scnlib.dev/ diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json new file mode 100644 index 00000000000000..04f4bd5e059b67 --- /dev/null +++ b/ports/scnlib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "scnlib", + "version-string": "0.4", + "port-version": 1, + "description": "scnlib is a modern C++ library for replacing scanf and std::istream", + "homepage": "https://scnlib.dev/" +} diff --git a/ports/scylla-wrapper/CONTROL b/ports/scylla-wrapper/CONTROL deleted file mode 100644 index bbe37c1171e75b..00000000000000 --- a/ports/scylla-wrapper/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: scylla-wrapper -Version: 2018-08-26-16e6f435 -Build-Depends: distorm -Description: This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b). \ No newline at end of file diff --git a/ports/scylla-wrapper/vcpkg.json b/ports/scylla-wrapper/vcpkg.json new file mode 100644 index 00000000000000..6bceab9f7a8846 --- /dev/null +++ b/ports/scylla-wrapper/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "scylla-wrapper", + "version-string": "2018-08-26-16e6f435", + "port-version": 1, + "description": "This is a wrapper around Scylla. It exports functions for IAT fixing, dumping and PE rebuilding. based on https://github.com/NtQuery/Scylla commit 0f6b7198be (v0.9.6b).", + "dependencies": [ + "distorm" + ] +} diff --git a/ports/sdformat10/CONTROL b/ports/sdformat10/CONTROL deleted file mode 100644 index 9ec10952d67f9f..00000000000000 --- a/ports/sdformat10/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: sdformat10 -Version: 10.0.0 -Homepage: http://sdformat.org/ -Build-Depends: ignition-math6, urdfdom, tinyxml2 -Description: Simulation Description Format (SDF) parser and description files. -Supports: !(uwp) \ No newline at end of file diff --git a/ports/sdformat10/vcpkg.json b/ports/sdformat10/vcpkg.json new file mode 100644 index 00000000000000..d7d3d8f242c62e --- /dev/null +++ b/ports/sdformat10/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sdformat10", + "version-string": "10.0.0", + "port-version": 1, + "description": "Simulation Description Format (SDF) parser and description files.", + "homepage": "http://sdformat.org/", + "supports": "!uwp", + "dependencies": [ + "ignition-math6", + "tinyxml2", + "urdfdom" + ] +} diff --git a/ports/sdformat9/CONTROL b/ports/sdformat9/CONTROL deleted file mode 100644 index a83ec79bb12b1d..00000000000000 --- a/ports/sdformat9/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: sdformat9 -Version: 9.4.0 -Homepage: http://sdformat.org/ -Build-Depends: ignition-math6, urdfdom, tinyxml -Description: Simulation Description Format (SDF) parser and description files. -Supports: !(linux|uwp) diff --git a/ports/sdformat9/vcpkg.json b/ports/sdformat9/vcpkg.json new file mode 100644 index 00000000000000..40de724cad7ba9 --- /dev/null +++ b/ports/sdformat9/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sdformat9", + "version-string": "9.4.0", + "port-version": 1, + "description": "Simulation Description Format (SDF) parser and description files.", + "homepage": "http://sdformat.org/", + "supports": "!(linux | uwp)", + "dependencies": [ + "ignition-math6", + "tinyxml", + "urdfdom" + ] +} diff --git a/ports/sdl1-net/CONTROL b/ports/sdl1-net/CONTROL deleted file mode 100644 index 61544abec785cf..00000000000000 --- a/ports/sdl1-net/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: sdl1-net -Version: 1.2.8-3 -Description: Networking library for SDL -Build-Depends: sdl1 diff --git a/ports/sdl1-net/vcpkg.json b/ports/sdl1-net/vcpkg.json new file mode 100644 index 00000000000000..cd4e84a0300edc --- /dev/null +++ b/ports/sdl1-net/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "sdl1-net", + "version-string": "1.2.8", + "port-version": 4, + "description": "Networking library for SDL", + "dependencies": [ + "sdl1" + ] +} diff --git a/ports/sdl1/CONTROL b/ports/sdl1/CONTROL deleted file mode 100644 index 2579556501c43e..00000000000000 --- a/ports/sdl1/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sdl1 -Version: 1.2.15 -Port-Version: 13 -Homepage: https://www.libsdl.org -Description: Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D. diff --git a/ports/sdl1/vcpkg.json b/ports/sdl1/vcpkg.json new file mode 100644 index 00000000000000..e75f7a2179642d --- /dev/null +++ b/ports/sdl1/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sdl1", + "version-string": "1.2.15", + "port-version": 14, + "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", + "homepage": "https://www.libsdl.org" +} diff --git a/ports/sdl2-gfx/CONTROL b/ports/sdl2-gfx/CONTROL deleted file mode 100644 index 72dfb87ebca1f7..00000000000000 --- a/ports/sdl2-gfx/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sdl2-gfx -Version: 1.0.4 -Port-Version: 7 -Build-Depends: sdl2 -Description: Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer. \ No newline at end of file diff --git a/ports/sdl2-gfx/vcpkg.json b/ports/sdl2-gfx/vcpkg.json new file mode 100644 index 00000000000000..8818ca6a36aab9 --- /dev/null +++ b/ports/sdl2-gfx/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "sdl2-gfx", + "version-string": "1.0.4", + "port-version": 8, + "description": "Graphics primitives (line, circle, rectangle etc.) with AA support, rotozoomer and other drawing related support functions wrapped up in a C based add-on library for the Simple Direct Media (SDL) cross-platform API layer.", + "dependencies": [ + "sdl2" + ] +} diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL deleted file mode 100644 index db07f7630c8db5..00000000000000 --- a/ports/sdl2-image/CONTROL +++ /dev/null @@ -1,18 +0,0 @@ -Source: sdl2-image -Version: 2.0.5 -Port-Version: 1 -Build-Depends: sdl2, libpng -Homepage: https://www.libsdl.org/projects/SDL_image -Description: SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV - -Feature: libjpeg-turbo -Description: Support for JPEG image format -Build-Depends: libjpeg-turbo - -Feature: tiff -Description: Support for TIFF image format -Build-Depends: tiff - -Feature: libwebp -Description: Support for WEBP image format. -Build-Depends: libwebp diff --git a/ports/sdl2-image/vcpkg.json b/ports/sdl2-image/vcpkg.json new file mode 100644 index 00000000000000..eb6fe4f3387692 --- /dev/null +++ b/ports/sdl2-image/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "sdl2-image", + "version-string": "2.0.5", + "port-version": 2, + "description": "SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV", + "homepage": "https://www.libsdl.org/projects/SDL_image", + "dependencies": [ + "libpng", + "sdl2" + ], + "features": { + "libjpeg-turbo": { + "description": "Support for JPEG image format", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libwebp": { + "description": "Support for WEBP image format.", + "dependencies": [ + "libwebp" + ] + }, + "tiff": { + "description": "Support for TIFF image format", + "dependencies": [ + "tiff" + ] + } + } +} diff --git a/ports/sdl2-net/CONTROL b/ports/sdl2-net/CONTROL deleted file mode 100644 index 6b4d33ead58ec6..00000000000000 --- a/ports/sdl2-net/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sdl2-net -Version: 2.0.1-8 -Homepage: https://www.libsdl.org/projects/SDL_net -Description: Networking library for SDL -Build-Depends: sdl2 diff --git a/ports/sdl2-net/vcpkg.json b/ports/sdl2-net/vcpkg.json new file mode 100644 index 00000000000000..03aa452d8ed8d8 --- /dev/null +++ b/ports/sdl2-net/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sdl2-net", + "version-string": "2.0.1", + "port-version": 9, + "description": "Networking library for SDL", + "homepage": "https://www.libsdl.org/projects/SDL_net", + "dependencies": [ + "sdl2" + ] +} diff --git a/ports/sdl2-ttf/CONTROL b/ports/sdl2-ttf/CONTROL deleted file mode 100644 index 34d12bafd5ac7e..00000000000000 --- a/ports/sdl2-ttf/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sdl2-ttf -Version: 2.0.15-3 -Homepage: https://www.libsdl.org/projects/SDL_ttf/ -Description: A library for rendering TrueType fonts with SDL -Build-Depends: sdl2, freetype diff --git a/ports/sdl2-ttf/vcpkg.json b/ports/sdl2-ttf/vcpkg.json new file mode 100644 index 00000000000000..73035cb60d7102 --- /dev/null +++ b/ports/sdl2-ttf/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sdl2-ttf", + "version-string": "2.0.15", + "port-version": 4, + "description": "A library for rendering TrueType fonts with SDL", + "homepage": "https://www.libsdl.org/projects/SDL_ttf/", + "dependencies": [ + "freetype", + "sdl2" + ] +} diff --git a/ports/sdl2pp/CONTROL b/ports/sdl2pp/CONTROL deleted file mode 100644 index 63a150d5e65610..00000000000000 --- a/ports/sdl2pp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sdl2pp -Version: 0.16.1 -Description: C++11 bindings/wrapper for SDL2 -Homepage: https://sdl2pp.amdmi3.ru -Build-Depends: sdl2, sdl2-mixer, sdl2-image, sdl2-ttf diff --git a/ports/sdl2pp/vcpkg.json b/ports/sdl2pp/vcpkg.json new file mode 100644 index 00000000000000..814f0d3cf27642 --- /dev/null +++ b/ports/sdl2pp/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sdl2pp", + "version-string": "0.16.1", + "port-version": 1, + "description": "C++11 bindings/wrapper for SDL2", + "homepage": "https://sdl2pp.amdmi3.ru", + "dependencies": [ + "sdl2", + "sdl2-image", + "sdl2-mixer", + "sdl2-ttf" + ] +} diff --git a/ports/secp256k1/CONTROL b/ports/secp256k1/CONTROL deleted file mode 100644 index 10d73e4c08d73c..00000000000000 --- a/ports/secp256k1/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: secp256k1 -Version: 2017-19-10 -Port-Version: 3 -Homepage: https://github.com/bitcoin-core/secp256k1 -Description: Optimized C library for EC operations on curve diff --git a/ports/secp256k1/vcpkg.json b/ports/secp256k1/vcpkg.json new file mode 100644 index 00000000000000..43a10ad02447bc --- /dev/null +++ b/ports/secp256k1/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "secp256k1", + "version-string": "2017-19-10", + "port-version": 4, + "description": "Optimized C library for EC operations on curve", + "homepage": "https://github.com/bitcoin-core/secp256k1" +} diff --git a/ports/septag-sx/CONTROL b/ports/septag-sx/CONTROL deleted file mode 100644 index a41e214af566f4..00000000000000 --- a/ports/septag-sx/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: septag-sx -Version: 2019-05-07-2 -Description: Portable base library for C programmers, designed for performance and simplicity. -Supports: !(uwp|arm) \ No newline at end of file diff --git a/ports/septag-sx/vcpkg.json b/ports/septag-sx/vcpkg.json new file mode 100644 index 00000000000000..7348da8272fd48 --- /dev/null +++ b/ports/septag-sx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "septag-sx", + "version-string": "2019-05-07", + "port-version": 3, + "description": "Portable base library for C programmers, designed for performance and simplicity.", + "supports": "!(uwp | arm)" +} diff --git a/ports/seqan/CONTROL b/ports/seqan/CONTROL deleted file mode 100644 index 82b7aae8975009..00000000000000 --- a/ports/seqan/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: seqan -Version: 2.4.0-1 -Description: SeqAn is an open source C++ library of efficient algorithms and data structures for the analysis of sequences with the focus on biological data. diff --git a/ports/seqan/vcpkg.json b/ports/seqan/vcpkg.json new file mode 100644 index 00000000000000..e49b11d09f34b1 --- /dev/null +++ b/ports/seqan/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "seqan", + "version-string": "2.4.0", + "port-version": 2, + "description": "SeqAn is an open source C++ library of efficient algorithms and data structures for the analysis of sequences with the focus on biological data." +} diff --git a/ports/sf2cute/CONTROL b/ports/sf2cute/CONTROL deleted file mode 100644 index bdba56cc709ed6..00000000000000 --- a/ports/sf2cute/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: sf2cute -Version: 0.2.0-1 -Description: C++14 Library for SoundFont 2 - -Feature: example -Description: Installs an example application diff --git a/ports/sf2cute/vcpkg.json b/ports/sf2cute/vcpkg.json new file mode 100644 index 00000000000000..9db53abbc65b00 --- /dev/null +++ b/ports/sf2cute/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sf2cute", + "version-string": "0.2.0", + "port-version": 2, + "description": "C++14 Library for SoundFont 2", + "features": { + "example": { + "description": "Installs an example application" + } + } +} diff --git a/ports/sfgui/CONTROL b/ports/sfgui/CONTROL deleted file mode 100644 index b53bac2af22d7b..00000000000000 --- a/ports/sfgui/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sfgui -Version: 0.4.0-3 -Homepage: https://github.com/TankOs/SFGUI -Description: simple and fast graphical user interface library -Build-Depends: sfml diff --git a/ports/sfgui/vcpkg.json b/ports/sfgui/vcpkg.json new file mode 100644 index 00000000000000..aa4ea2c85d27bc --- /dev/null +++ b/ports/sfgui/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sfgui", + "version-string": "0.4.0", + "port-version": 4, + "description": "simple and fast graphical user interface library", + "homepage": "https://github.com/TankOs/SFGUI", + "dependencies": [ + "sfml" + ] +} diff --git a/ports/sfsexp/CONTROL b/ports/sfsexp/CONTROL deleted file mode 100644 index bb6d25a6a96277..00000000000000 --- a/ports/sfsexp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: sfsexp -Version: 1.3 -Homepage: https://github.com/mjsottile/sfsexp -Description: Small Fast S-Expression Library diff --git a/ports/sfsexp/vcpkg.json b/ports/sfsexp/vcpkg.json new file mode 100644 index 00000000000000..d47366b4fd5cca --- /dev/null +++ b/ports/sfsexp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sfsexp", + "version-string": "1.3", + "port-version": 1, + "description": "Small Fast S-Expression Library", + "homepage": "https://github.com/mjsottile/sfsexp" +} diff --git a/ports/shapelib/CONTROL b/ports/shapelib/CONTROL deleted file mode 100644 index e656682756f7b9..00000000000000 --- a/ports/shapelib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: shapelib -Version: 1.5.0 -Homepage: https://download.osgeo.org/shapelib -Description: Shapefile C Library is simple C API for reading and writing ESRI Shapefiles diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json new file mode 100644 index 00000000000000..1480abd4f745b5 --- /dev/null +++ b/ports/shapelib/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "shapelib", + "version-string": "1.5.0", + "port-version": 1, + "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", + "homepage": "https://download.osgeo.org/shapelib" +} diff --git a/ports/shiva-sfml/CONTROL b/ports/shiva-sfml/CONTROL deleted file mode 100644 index af5ad7b7a5dc60..00000000000000 --- a/ports/shiva-sfml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: shiva-sfml -Version: 1.0-1 -Description: shiva-sfml plugins of shiva C++ engine -Build-Depends: sfml (windows), shiva diff --git a/ports/shiva-sfml/vcpkg.json b/ports/shiva-sfml/vcpkg.json new file mode 100644 index 00000000000000..7fce5e80903ff8 --- /dev/null +++ b/ports/shiva-sfml/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "shiva-sfml", + "version-string": "1.0", + "port-version": 2, + "description": "shiva-sfml plugins of shiva C++ engine", + "dependencies": [ + { + "name": "sfml", + "platform": "windows" + }, + "shiva" + ] +} diff --git a/ports/shiva/CONTROL b/ports/shiva/CONTROL deleted file mode 100644 index 2c235fd632ff34..00000000000000 --- a/ports/shiva/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: shiva -Version: 1.0-3 -Homepage: https://github.com/Milerius/shiva -Description: Modern C++ Game Engine -Build-Depends: boost-stacktrace, boost-filesystem, boost-dll, entt, lua, luafilesystem (windows), sol2, pybind11, spdlog, nlohmann-json diff --git a/ports/shiva/vcpkg.json b/ports/shiva/vcpkg.json new file mode 100644 index 00000000000000..d080dd5a026c84 --- /dev/null +++ b/ports/shiva/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "shiva", + "version-string": "1.0", + "port-version": 4, + "description": "Modern C++ Game Engine", + "homepage": "https://github.com/Milerius/shiva", + "dependencies": [ + "boost-dll", + "boost-filesystem", + "boost-stacktrace", + "entt", + "lua", + { + "name": "luafilesystem", + "platform": "windows" + }, + "nlohmann-json", + "pybind11", + "sol2", + "spdlog" + ] +} diff --git a/ports/shogun/CONTROL b/ports/shogun/CONTROL deleted file mode 100644 index 485efd9dfdff81..00000000000000 --- a/ports/shogun/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: shogun -Version: 6.1.4 -Port-Version: 4 -Build-Depends: bzip2, eigen3, liblzma, libxml2, blas, nlopt, rxcpp, snappy, zlib, protobuf, curl, lzo, dirent -Homepage: https://github.com/shogun-toolbox/shogun -Description: Unified and efficient Machine Learning diff --git a/ports/shogun/vcpkg.json b/ports/shogun/vcpkg.json new file mode 100644 index 00000000000000..6711f2bfbf11cd --- /dev/null +++ b/ports/shogun/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "shogun", + "version-string": "6.1.4", + "port-version": 5, + "description": "Unified and efficient Machine Learning", + "homepage": "https://github.com/shogun-toolbox/shogun", + "dependencies": [ + "blas", + "bzip2", + "curl", + "dirent", + "eigen3", + "liblzma", + "libxml2", + "lzo", + "nlopt", + "protobuf", + "rxcpp", + "snappy", + "zlib" + ] +} diff --git a/ports/signalrclient/CONTROL b/ports/signalrclient/CONTROL deleted file mode 100644 index 3d3e85f806cab3..00000000000000 --- a/ports/signalrclient/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: signalrclient -Version: 1.0.0-beta1-9 -Port-Version: 1 -Build-Depends: cpprestsdk[default-features,websockets], openssl -Homepage: https://github.com/SignalR/SignalR-Client-Cpp -Description: C++ client for SignalR. diff --git a/ports/signalrclient/vcpkg.json b/ports/signalrclient/vcpkg.json new file mode 100644 index 00000000000000..e2faf07bc3d67e --- /dev/null +++ b/ports/signalrclient/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "signalrclient", + "version-string": "1.0.0-beta1-9", + "port-version": 2, + "description": "C++ client for SignalR.", + "homepage": "https://github.com/SignalR/SignalR-Client-Cpp", + "dependencies": [ + { + "name": "cpprestsdk", + "features": [ + "default-features", + "websockets" + ] + }, + "openssl" + ] +} diff --git a/ports/sigslot/CONTROL b/ports/sigslot/CONTROL deleted file mode 100644 index e785404ebbd12b..00000000000000 --- a/ports/sigslot/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: sigslot -Version: 1.0.0-3 -Description: Portable C++ type-safe, thread-safe signal/slot library for ISO C++, Unix/BSD/Linux and Win32. Sigslot allows C++ code to use the signal/slot paradigm made popular by, for example, Qt. diff --git a/ports/sigslot/vcpkg.json b/ports/sigslot/vcpkg.json new file mode 100644 index 00000000000000..20bf9b068a55d1 --- /dev/null +++ b/ports/sigslot/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sigslot", + "version-string": "1.0.0", + "port-version": 4, + "description": "Portable C++ type-safe, thread-safe signal/slot library for ISO C++, Unix/BSD/Linux and Win32. Sigslot allows C++ code to use the signal/slot paradigm made popular by, for example, Qt." +} diff --git a/ports/simde/CONTROL b/ports/simde/CONTROL deleted file mode 100644 index 1dfab7962a870f..00000000000000 --- a/ports/simde/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: simde -Version: 0.7.0 -Homepage: https://github.com/simd-everywhere/simde -Description: Implementations of SIMD instruction sets for systems which don't natively support them diff --git a/ports/simde/vcpkg.json b/ports/simde/vcpkg.json new file mode 100644 index 00000000000000..159e857688c42d --- /dev/null +++ b/ports/simde/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simde", + "version-string": "0.7.0", + "port-version": 1, + "description": "Implementations of SIMD instruction sets for systems which don't natively support them", + "homepage": "https://github.com/simd-everywhere/simde" +} diff --git a/ports/simple-fft/CONTROL b/ports/simple-fft/CONTROL deleted file mode 100644 index 6595558bbd83df..00000000000000 --- a/ports/simple-fft/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: simple-fft -Version: 2020-06-14 -Homepage: https://github.com/d1vanov/Simple-FFT -Description: Header-only C++ library implementing fast Fourier transform of 1D, 2D and 3D data diff --git a/ports/simple-fft/vcpkg.json b/ports/simple-fft/vcpkg.json new file mode 100644 index 00000000000000..76b399066048cd --- /dev/null +++ b/ports/simple-fft/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simple-fft", + "version-string": "2020-06-14", + "port-version": 1, + "description": "Header-only C++ library implementing fast Fourier transform of 1D, 2D and 3D data", + "homepage": "https://github.com/d1vanov/Simple-FFT" +} diff --git a/ports/simpleini/CONTROL b/ports/simpleini/CONTROL deleted file mode 100644 index 0b51f5268470de..00000000000000 --- a/ports/simpleini/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: simpleini -Version: 2018-08-31-4 -Homepage: https://github.com/brofield/simpleini -Description: Cross-platform C++ library providing a simple API to read and write INI-style configuration files diff --git a/ports/simpleini/vcpkg.json b/ports/simpleini/vcpkg.json new file mode 100644 index 00000000000000..020a8f5ddb14ab --- /dev/null +++ b/ports/simpleini/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "simpleini", + "version-string": "2018-08-31", + "port-version": 5, + "description": "Cross-platform C++ library providing a simple API to read and write INI-style configuration files", + "homepage": "https://github.com/brofield/simpleini" +} diff --git a/ports/skia/CONTROL b/ports/skia/CONTROL deleted file mode 100644 index e06605d1d0a946..00000000000000 --- a/ports/skia/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -Source: skia -Version: 2020-05-18 -Port-Version: 4 -Homepage: https://skia.org -Description: Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms. - It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products. - Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source. -Supports: x64 & (osx | windows) -Build-Depends: expat, freetype[core], icu, harfbuzz[icu], libjpeg-turbo, libpng, libwebp, zlib - -Feature: metal -Description: metal support for skia diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json new file mode 100644 index 00000000000000..46bcc003fdea47 --- /dev/null +++ b/ports/skia/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "skia", + "version-string": "2020-05-18", + "port-version": 5, + "description": [ + "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", + "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", + "Skia is sponsored and managed by Google, but is available for use by anyone under the BSD Free Software License. While engineering of the core components is done by the Skia development team, we consider contributions from any source." + ], + "homepage": "https://skia.org", + "supports": "x64 & (osx | windows)", + "dependencies": [ + "expat", + { + "name": "freetype", + "default-features": false + }, + { + "name": "harfbuzz", + "features": [ + "icu" + ] + }, + "icu", + "libjpeg-turbo", + "libpng", + "libwebp", + "zlib" + ], + "features": { + "metal": { + "description": "metal support for skia" + } + } +} diff --git a/ports/skyr-url/CONTROL b/ports/skyr-url/CONTROL deleted file mode 100644 index 97ab09e238c6c2..00000000000000 --- a/ports/skyr-url/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: skyr-url -Version: 1.13.0 -Build-Depends: tl-expected, range-v3, nlohmann-json -Homepage: https://github.com/cpp-netlib/url -Description: A C++ library that implements the WhatWG URL specification diff --git a/ports/skyr-url/vcpkg.json b/ports/skyr-url/vcpkg.json new file mode 100644 index 00000000000000..aff139261ab61d --- /dev/null +++ b/ports/skyr-url/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "skyr-url", + "version-string": "1.13.0", + "port-version": 1, + "description": "A C++ library that implements the WhatWG URL specification", + "homepage": "https://github.com/cpp-netlib/url", + "dependencies": [ + "nlohmann-json", + "range-v3", + "tl-expected" + ] +} diff --git a/ports/smpeg2/CONTROL b/ports/smpeg2/CONTROL deleted file mode 100644 index 3a761287ee730c..00000000000000 --- a/ports/smpeg2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: smpeg2 -Version: 2.0.0-6 -Homepage: https://www.libsdl.org/projects/smpeg/ -Description: SDL MPEG Player Library -Build-Depends: sdl2 diff --git a/ports/smpeg2/vcpkg.json b/ports/smpeg2/vcpkg.json new file mode 100644 index 00000000000000..24eb88e52e459f --- /dev/null +++ b/ports/smpeg2/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "smpeg2", + "version-string": "2.0.0", + "port-version": 7, + "description": "SDL MPEG Player Library", + "homepage": "https://www.libsdl.org/projects/smpeg/", + "dependencies": [ + "sdl2" + ] +} diff --git a/ports/snappy/CONTROL b/ports/snappy/CONTROL deleted file mode 100644 index add6e6c6a7b820..00000000000000 --- a/ports/snappy/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: snappy -Version: 1.1.8 -Homepage: https://github.com/google/snappy -Description: A fast compressor/decompressor. diff --git a/ports/snappy/vcpkg.json b/ports/snappy/vcpkg.json new file mode 100644 index 00000000000000..df302a6d6c604f --- /dev/null +++ b/ports/snappy/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "snappy", + "version-string": "1.1.8", + "port-version": 1, + "description": "A fast compressor/decompressor.", + "homepage": "https://github.com/google/snappy" +} diff --git a/ports/sndfile/CONTROL b/ports/sndfile/CONTROL deleted file mode 100644 index fb01b640840a31..00000000000000 --- a/ports/sndfile/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: sndfile -Version: 0 -Description:x Library to read, write and manipulate many soundfile types. -Build-Depends: libsndfile -Default-Features: external-libs - -Feature: external-libs -Description: Support Ogg Vorbis and FLAC audio files -Build-Depends: libsndfile[external-libs] diff --git a/ports/sndfile/vcpkg.json b/ports/sndfile/vcpkg.json new file mode 100644 index 00000000000000..2f91543bd334d0 --- /dev/null +++ b/ports/sndfile/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "sndfile", + "version-string": "0", + "port-version": 1, + "description": "x Library to read, write and manipulate many soundfile types.", + "dependencies": [ + "libsndfile" + ], + "default-features": [ + "external-libs" + ], + "features": { + "external-libs": { + "description": "Support Ogg Vorbis and FLAC audio files", + "dependencies": [ + { + "name": "libsndfile", + "features": [ + "external-libs" + ] + } + ] + } + } +} diff --git a/ports/snowhouse/CONTROL b/ports/snowhouse/CONTROL deleted file mode 100644 index aed2ab1893c404..00000000000000 --- a/ports/snowhouse/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: snowhouse -Version: 5.0.0 -Description: An assertion library for C++ diff --git a/ports/snowhouse/vcpkg.json b/ports/snowhouse/vcpkg.json new file mode 100644 index 00000000000000..f8d9a392febfd1 --- /dev/null +++ b/ports/snowhouse/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "snowhouse", + "version-string": "5.0.0", + "port-version": 1, + "description": "An assertion library for C++" +} diff --git a/ports/sockpp/CONTROL b/ports/sockpp/CONTROL deleted file mode 100644 index 90ad9f7871a834..00000000000000 --- a/ports/sockpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sockpp -Version: 0.7 -Homepage: https://github.com/fpagliughi/sockpp -Description: Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages. -Supports: !uwp diff --git a/ports/sockpp/vcpkg.json b/ports/sockpp/vcpkg.json new file mode 100644 index 00000000000000..d17daad6d06e20 --- /dev/null +++ b/ports/sockpp/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "sockpp", + "version-string": "0.7", + "port-version": 1, + "description": "Simple, modern, C++ socket library. This is a fairly low-level C++ wrapper around the Berkeley sockets library using socket, acceptor, and connector classes that are familiar concepts from other languages.", + "homepage": "https://github.com/fpagliughi/sockpp", + "supports": "!uwp" +} diff --git a/ports/sokol/CONTROL b/ports/sokol/CONTROL deleted file mode 100644 index 4caa796cc788a4..00000000000000 --- a/ports/sokol/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: sokol -Version: 2019-09-09 -Description: Minimal cross-platform standalone C headers -Homepage: https://github.com/floooh/sokol diff --git a/ports/sokol/vcpkg.json b/ports/sokol/vcpkg.json new file mode 100644 index 00000000000000..375455b943865e --- /dev/null +++ b/ports/sokol/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sokol", + "version-string": "2019-09-09", + "port-version": 1, + "description": "Minimal cross-platform standalone C headers", + "homepage": "https://github.com/floooh/sokol" +} diff --git a/ports/sol2/CONTROL b/ports/sol2/CONTROL deleted file mode 100644 index 60490e9da9ed4f..00000000000000 --- a/ports/sol2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sol2 -Version: 3.2.2 -Homepage: https://github.com/ThePhD/sol2 -Description: Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great -Build-Depends: lua (windows) diff --git a/ports/sol2/vcpkg.json b/ports/sol2/vcpkg.json new file mode 100644 index 00000000000000..22de87e461a3fa --- /dev/null +++ b/ports/sol2/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "sol2", + "version-string": "3.2.2", + "port-version": 1, + "description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great", + "homepage": "https://github.com/ThePhD/sol2", + "dependencies": [ + { + "name": "lua", + "platform": "windows" + } + ] +} diff --git a/ports/solid3/CONTROL b/ports/solid3/CONTROL deleted file mode 100644 index 7dce173ee840e7..00000000000000 --- a/ports/solid3/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: solid3 -Version: 3.5.8 -Description: Software Library for Interference Detection diff --git a/ports/solid3/vcpkg.json b/ports/solid3/vcpkg.json new file mode 100644 index 00000000000000..d8493859d87195 --- /dev/null +++ b/ports/solid3/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "solid3", + "version-string": "3.5.8", + "port-version": 1, + "description": "Software Library for Interference Detection" +} diff --git a/ports/soqt/CONTROL b/ports/soqt/CONTROL deleted file mode 100644 index 4e63de49d2df10..00000000000000 --- a/ports/soqt/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: soqt -Version: 1.6.0 -Port-Version: 2 -Description: A Qt Gui-toolkit binding for Coin -Build-Depends: coin, qt5-base[core] -Homepage: https://github.com/coin3d/soqt -Supports: !(arm|arm64|uwp) diff --git a/ports/soqt/vcpkg.json b/ports/soqt/vcpkg.json new file mode 100644 index 00000000000000..6a336879d131ae --- /dev/null +++ b/ports/soqt/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "soqt", + "version-string": "1.6.0", + "port-version": 3, + "description": "A Qt Gui-toolkit binding for Coin", + "homepage": "https://github.com/coin3d/soqt", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + "coin", + { + "name": "qt5-base", + "default-features": false + } + ] +} diff --git a/ports/soundtouch/CONTROL b/ports/soundtouch/CONTROL deleted file mode 100644 index 2d1757f8f7927a..00000000000000 --- a/ports/soundtouch/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: soundtouch -Version: 2.0.0-6 -Homepage: https://www.surina.net/soundtouch -Description: SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files. -Build-Depends: atlmfc (windows) -Supports: !uwp \ No newline at end of file diff --git a/ports/soundtouch/vcpkg.json b/ports/soundtouch/vcpkg.json new file mode 100644 index 00000000000000..f2d7f64aa5a4c2 --- /dev/null +++ b/ports/soundtouch/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "soundtouch", + "version-string": "2.0.0", + "port-version": 7, + "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.", + "homepage": "https://www.surina.net/soundtouch", + "supports": "!uwp", + "dependencies": [ + { + "name": "atlmfc", + "platform": "windows" + } + ] +} diff --git a/ports/soxr/CONTROL b/ports/soxr/CONTROL deleted file mode 100644 index cc920479cdcf3b..00000000000000 --- a/ports/soxr/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: soxr -Version: 0.1.3 -Port-Version: 3 -Homepage: https://sourceforge.net/projects/soxr/ -Description: High quality audio resampling diff --git a/ports/soxr/vcpkg.json b/ports/soxr/vcpkg.json new file mode 100644 index 00000000000000..acf2fc35ccc42b --- /dev/null +++ b/ports/soxr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "soxr", + "version-string": "0.1.3", + "port-version": 4, + "description": "High quality audio resampling", + "homepage": "https://sourceforge.net/projects/soxr/" +} diff --git a/ports/spaceland/CONTROL b/ports/spaceland/CONTROL deleted file mode 100644 index 183d9392c04954..00000000000000 --- a/ports/spaceland/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: spaceland -Version: 7.8.2-4 -Description: Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL. -Build-Depends: zlib diff --git a/ports/spaceland/vcpkg.json b/ports/spaceland/vcpkg.json new file mode 100644 index 00000000000000..ddcdb9fde1c7e4 --- /dev/null +++ b/ports/spaceland/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "spaceland", + "version-string": "7.8.2", + "port-version": 5, + "description": "Spaceland Lib (sl) is a suite for geometric computation, specifically adapted to OpenGL.", + "dependencies": [ + "zlib" + ] +} diff --git a/ports/sparsehash/CONTROL b/ports/sparsehash/CONTROL deleted file mode 100644 index 04c1d756be0917..00000000000000 --- a/ports/sparsehash/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: sparsehash -Version: 2.0.3 -Homepage: https://github.com/sparsehash/sparsehash -Description: The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient. diff --git a/ports/sparsehash/vcpkg.json b/ports/sparsehash/vcpkg.json new file mode 100644 index 00000000000000..697aa7b6461fe2 --- /dev/null +++ b/ports/sparsehash/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "sparsehash", + "version-string": "2.0.3", + "port-version": 1, + "description": "The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.", + "homepage": "https://github.com/sparsehash/sparsehash" +} diff --git a/ports/sparsepp/CONTROL b/ports/sparsepp/CONTROL deleted file mode 100644 index 86550179ac40b3..00000000000000 --- a/ports/sparsepp/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: sparsepp -Version: 1.22-1 -Description: A fast, memory efficient hash map for C++ diff --git a/ports/sparsepp/vcpkg.json b/ports/sparsepp/vcpkg.json new file mode 100644 index 00000000000000..9dda35239aa42e --- /dev/null +++ b/ports/sparsepp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "sparsepp", + "version-string": "1.22", + "port-version": 2, + "description": "A fast, memory efficient hash map for C++" +} diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL deleted file mode 100644 index 7f02ba5dda8882..00000000000000 --- a/ports/spatialite-tools/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: spatialite-tools -Version: 5.0.0 -Port-Version: 2 -Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index -Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries) -Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat, librttopo diff --git a/ports/spatialite-tools/vcpkg.json b/ports/spatialite-tools/vcpkg.json new file mode 100644 index 00000000000000..a1a5bc3bb28984 --- /dev/null +++ b/ports/spatialite-tools/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "spatialite-tools", + "version-string": "5.0.0", + "port-version": 3, + "description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)", + "homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index", + "dependencies": [ + "expat", + "geos", + "libiconv", + "librttopo", + "libspatialite", + "proj4", + "readosm", + "sqlite3", + "zlib" + ] +} diff --git a/ports/spdk-dpdk/CONTROL b/ports/spdk-dpdk/CONTROL deleted file mode 100644 index 61d1415cdd9b2e..00000000000000 --- a/ports/spdk-dpdk/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: spdk-dpdk -Version: 20181124 -Description: SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing -Supports: linux diff --git a/ports/spdk-dpdk/vcpkg.json b/ports/spdk-dpdk/vcpkg.json new file mode 100644 index 00000000000000..ec63984b9b438d --- /dev/null +++ b/ports/spdk-dpdk/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "spdk-dpdk", + "version-string": "20181124", + "port-version": 1, + "description": "SPDK mirror of DPDK. A set of libraries and drivers for fast packet processing", + "supports": "linux" +} diff --git a/ports/spdk-ipsec/CONTROL b/ports/spdk-ipsec/CONTROL deleted file mode 100644 index 3b8259451da803..00000000000000 --- a/ports/spdk-ipsec/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: spdk-ipsec -Version: 20180711 -Description: SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library -Supports: x64 & linux diff --git a/ports/spdk-ipsec/vcpkg.json b/ports/spdk-ipsec/vcpkg.json new file mode 100644 index 00000000000000..e41c9d957141d3 --- /dev/null +++ b/ports/spdk-ipsec/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "spdk-ipsec", + "version-string": "20180711", + "port-version": 1, + "description": "SPDK mirror of ipsec. Intel(R) Multi-Buffer Crypto for IPsec Library", + "supports": "x64 & linux" +} diff --git a/ports/spdk-isal/CONTROL b/ports/spdk-isal/CONTROL deleted file mode 100644 index 1a134ae14e08a6..00000000000000 --- a/ports/spdk-isal/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: spdk-isal -Version: 20181006 -Description: SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library -Supports: x64 diff --git a/ports/spdk-isal/vcpkg.json b/ports/spdk-isal/vcpkg.json new file mode 100644 index 00000000000000..eb857863cedc18 --- /dev/null +++ b/ports/spdk-isal/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "spdk-isal", + "version-string": "20181006", + "port-version": 1, + "description": "SPDK mirror of isa-l. Intel(R) Intelligent Storage Acceleration Library", + "supports": "x64" +} diff --git a/ports/spdk/CONTROL b/ports/spdk/CONTROL deleted file mode 100644 index a12729033690ac..00000000000000 --- a/ports/spdk/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: spdk -Version: 19.01.1 -Port-Version: 1 -Description: Storage Performance Development Kit -Build-Depends: spdk-dpdk, spdk-ipsec, spdk-isal -Supports: linux diff --git a/ports/spdk/vcpkg.json b/ports/spdk/vcpkg.json new file mode 100644 index 00000000000000..90a9c4940634cf --- /dev/null +++ b/ports/spdk/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "spdk", + "version-string": "19.01.1", + "port-version": 2, + "description": "Storage Performance Development Kit", + "supports": "linux", + "dependencies": [ + "spdk-dpdk", + "spdk-ipsec", + "spdk-isal" + ] +} diff --git a/ports/speex/CONTROL b/ports/speex/CONTROL deleted file mode 100644 index 41157ff237d203..00000000000000 --- a/ports/speex/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: speex -Version: 1.2.0 -Port-Version: 8 -Homepage: https://github.com/xiph/speex -Description: Speex is an Open Source/Free Software patent-free audio compression format designed for speech. diff --git a/ports/speex/vcpkg.json b/ports/speex/vcpkg.json new file mode 100644 index 00000000000000..5265e6ab0e5b5d --- /dev/null +++ b/ports/speex/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "speex", + "version-string": "1.2.0", + "port-version": 9, + "description": "Speex is an Open Source/Free Software patent-free audio compression format designed for speech.", + "homepage": "https://github.com/xiph/speex" +} diff --git a/ports/speexdsp/CONTROL b/ports/speexdsp/CONTROL deleted file mode 100644 index 89d842c471a7e8..00000000000000 --- a/ports/speexdsp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: speexdsp -Version: 1.2.0 -Port-Version: 5 -Homepage: https://speex.org/ -Description: A patent-free, Open Source/Free Software DSP library. diff --git a/ports/speexdsp/vcpkg.json b/ports/speexdsp/vcpkg.json new file mode 100644 index 00000000000000..8cbd9c54d510cd --- /dev/null +++ b/ports/speexdsp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "speexdsp", + "version-string": "1.2.0", + "port-version": 6, + "description": "A patent-free, Open Source/Free Software DSP library.", + "homepage": "https://speex.org/" +} diff --git a/ports/spirit-po/CONTROL b/ports/spirit-po/CONTROL deleted file mode 100644 index e31bdcb2e6229f..00000000000000 --- a/ports/spirit-po/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: spirit-po -Version: 1.1.2-1 -Homepage: https://github.com/cbeck88/spirit-po -Description: A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit. -Build-Depends: boost diff --git a/ports/spirit-po/vcpkg.json b/ports/spirit-po/vcpkg.json new file mode 100644 index 00000000000000..e088d9ebc5ad4b --- /dev/null +++ b/ports/spirit-po/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "spirit-po", + "version-string": "1.1.2", + "port-version": 2, + "description": "A header-only C++ library for localization using GNU gettext po files, based on Boost.Spirit.", + "homepage": "https://github.com/cbeck88/spirit-po", + "dependencies": [ + "boost" + ] +} diff --git a/ports/sprout/CONTROL b/ports/sprout/CONTROL deleted file mode 100644 index 67240a5e1c877b..00000000000000 --- a/ports/sprout/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sprout -Version: 2019-06-20 -Homepage: https://github.com/bolero-MURAKAMI/Sprout -Description: C++11/14 constexpr based Containers, Algorithms, Random numbers, Parsing, Ray tracing, Synthesizer, and others -Build-Depends: boost-array, boost-mpl diff --git a/ports/sprout/vcpkg.json b/ports/sprout/vcpkg.json new file mode 100644 index 00000000000000..22bab62af4b35c --- /dev/null +++ b/ports/sprout/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sprout", + "version-string": "2019-06-20", + "port-version": 1, + "description": "C++11/14 constexpr based Containers, Algorithms, Random numbers, Parsing, Ray tracing, Synthesizer, and others", + "homepage": "https://github.com/bolero-MURAKAMI/Sprout", + "dependencies": [ + "boost-array", + "boost-mpl" + ] +} diff --git a/ports/spscqueue/CONTROL b/ports/spscqueue/CONTROL deleted file mode 100644 index 03bf717258c414..00000000000000 --- a/ports/spscqueue/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: spscqueue -Version: 1.1 -Description: A bounded single-producer single-consumer wait-free and lock-free queue written in C++11 -Homepage: https://github.com/rigtorp/SPSCQueue diff --git a/ports/spscqueue/vcpkg.json b/ports/spscqueue/vcpkg.json new file mode 100644 index 00000000000000..9ed6879f330b4e --- /dev/null +++ b/ports/spscqueue/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "spscqueue", + "version-string": "1.1", + "port-version": 1, + "description": "A bounded single-producer single-consumer wait-free and lock-free queue written in C++11", + "homepage": "https://github.com/rigtorp/SPSCQueue" +} diff --git a/ports/sqlite-modern-cpp/CONTROL b/ports/sqlite-modern-cpp/CONTROL deleted file mode 100644 index c8e3ccb642d606..00000000000000 --- a/ports/sqlite-modern-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sqlite-modern-cpp -Version: 3.2-936cd0c8 -Build-Depends: sqlite3 -Homepage: https://github.com/aminroosta/sqlite_modern_cpp -Description: The C++14 wrapper around sqlite library diff --git a/ports/sqlite-modern-cpp/vcpkg.json b/ports/sqlite-modern-cpp/vcpkg.json new file mode 100644 index 00000000000000..39dbdc1d1fbb73 --- /dev/null +++ b/ports/sqlite-modern-cpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sqlite-modern-cpp", + "version-string": "3.2-936cd0c8", + "port-version": 1, + "description": "The C++14 wrapper around sqlite library", + "homepage": "https://github.com/aminroosta/sqlite_modern_cpp", + "dependencies": [ + "sqlite3" + ] +} diff --git a/ports/sqlite-orm/CONTROL b/ports/sqlite-orm/CONTROL deleted file mode 100644 index 3ae7f4611bb82f..00000000000000 --- a/ports/sqlite-orm/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -Source: sqlite-orm -Version: 1.6 -Homepage: https://github.com/fnc12/sqlite_orm -Build-Depends: sqlite3 -Description: SQLite ORM light header only library for modern C++ - -Feature: test -Description: Build sqlite_orm unit tests -Build-Depends: catch2 - -Feature: example -Description: Build examples diff --git a/ports/sqlite-orm/vcpkg.json b/ports/sqlite-orm/vcpkg.json new file mode 100644 index 00000000000000..ab5e89652e7d11 --- /dev/null +++ b/ports/sqlite-orm/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "sqlite-orm", + "version-string": "1.6", + "port-version": 1, + "description": "SQLite ORM light header only library for modern C++", + "homepage": "https://github.com/fnc12/sqlite_orm", + "dependencies": [ + "sqlite3" + ], + "features": { + "example": { + "description": "Build examples" + }, + "test": { + "description": "Build sqlite_orm unit tests", + "dependencies": [ + "catch2" + ] + } + } +} diff --git a/ports/sqlpp11-connector-mysql/CONTROL b/ports/sqlpp11-connector-mysql/CONTROL deleted file mode 100644 index cfed369d4f8dcc..00000000000000 --- a/ports/sqlpp11-connector-mysql/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: sqlpp11-connector-mysql -Version: 0.29-1 -Homepage: https://github.com/rbock/sqlpp11-connector-mysql -Description: A C++ wrapper for MySQL meant to be used in combination with sqlpp11. -Build-Depends: date, sqlpp11 -Default-Features: mariadb - -Feature: mariadb -Description: Use MariaDB connector -Build-Depends: libmariadb - -Feature: mysql -Description: Use MySQL connector -Build-Depends: libmysql diff --git a/ports/sqlpp11-connector-mysql/vcpkg.json b/ports/sqlpp11-connector-mysql/vcpkg.json new file mode 100644 index 00000000000000..8eb8e93f57f39f --- /dev/null +++ b/ports/sqlpp11-connector-mysql/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "sqlpp11-connector-mysql", + "version-string": "0.29", + "port-version": 2, + "description": "A C++ wrapper for MySQL meant to be used in combination with sqlpp11.", + "homepage": "https://github.com/rbock/sqlpp11-connector-mysql", + "dependencies": [ + "date", + "sqlpp11" + ], + "default-features": [ + "mariadb" + ], + "features": { + "mariadb": { + "description": "Use MariaDB connector", + "dependencies": [ + "libmariadb" + ] + }, + "mysql": { + "description": "Use MySQL connector", + "dependencies": [ + "libmysql" + ] + } + } +} diff --git a/ports/sqlpp11-connector-sqlite3/CONTROL b/ports/sqlpp11-connector-sqlite3/CONTROL deleted file mode 100644 index b968c52fb39600..00000000000000 --- a/ports/sqlpp11-connector-sqlite3/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: sqlpp11-connector-sqlite3 -Version: 0.30 -Description: A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11. -Build-Depends: date, sqlite3, sqlpp11 diff --git a/ports/sqlpp11-connector-sqlite3/vcpkg.json b/ports/sqlpp11-connector-sqlite3/vcpkg.json new file mode 100644 index 00000000000000..09ebb22b5171a4 --- /dev/null +++ b/ports/sqlpp11-connector-sqlite3/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "sqlpp11-connector-sqlite3", + "version-string": "0.30", + "port-version": 1, + "description": "A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11.", + "dependencies": [ + "date", + "sqlite3", + "sqlpp11" + ] +} diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL deleted file mode 100644 index d6b6ad860b62ef..00000000000000 --- a/ports/sqlpp11/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: sqlpp11 -Version: 0.60 -Homepage: https://github.com/rbock/sqlpp11 -Description: A type safe embedded domain specific language for SQL queries and results in C++. -Build-Depends: date diff --git a/ports/sqlpp11/vcpkg.json b/ports/sqlpp11/vcpkg.json new file mode 100644 index 00000000000000..63951d79747e2f --- /dev/null +++ b/ports/sqlpp11/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "sqlpp11", + "version-string": "0.60", + "port-version": 1, + "description": "A type safe embedded domain specific language for SQL queries and results in C++.", + "homepage": "https://github.com/rbock/sqlpp11", + "dependencies": [ + "date" + ] +} diff --git a/ports/status-code/CONTROL b/ports/status-code/CONTROL deleted file mode 100644 index ac86283bd5771f..00000000000000 --- a/ports/status-code/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: status-code -Version: 1.0.0-ab3cd821 -Homepage: https://github.com/ned14/status-code -Description: Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028). diff --git a/ports/status-code/vcpkg.json b/ports/status-code/vcpkg.json new file mode 100644 index 00000000000000..6a47ecd029f48c --- /dev/null +++ b/ports/status-code/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "status-code", + "version-string": "1.0.0-ab3cd821", + "port-version": 1, + "description": "Proposed SG14 status_code for the C++ standard (https://wg21.link/P1028).", + "homepage": "https://github.com/ned14/status-code" +} diff --git a/ports/status-value-lite/CONTROL b/ports/status-value-lite/CONTROL deleted file mode 100644 index bc7fa02cd36699..00000000000000 --- a/ports/status-value-lite/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: status-value-lite -Version: 1.1.0 -Homepage: https://github.com/martinmoene/status-value-lite -Description: status_value is a single-file header-only library for objects that represent a status and an optional value. It is intended for use with C++11 and later. - -Feature: test -Description: Build with test diff --git a/ports/status-value-lite/vcpkg.json b/ports/status-value-lite/vcpkg.json new file mode 100644 index 00000000000000..9850afb43046a6 --- /dev/null +++ b/ports/status-value-lite/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "status-value-lite", + "version-string": "1.1.0", + "port-version": 1, + "description": "status_value is a single-file header-only library for objects that represent a status and an optional value. It is intended for use with C++11 and later.", + "homepage": "https://github.com/martinmoene/status-value-lite", + "features": { + "test": { + "description": "Build with test" + } + } +} diff --git a/ports/stb/CONTROL b/ports/stb/CONTROL deleted file mode 100644 index c00515f78ed387..00000000000000 --- a/ports/stb/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: stb -Version: 2020-09-14 -Homepage: https://github.com/nothings/stb -Description: public domain header-only libraries diff --git a/ports/stb/vcpkg.json b/ports/stb/vcpkg.json new file mode 100644 index 00000000000000..f7dd85dac89ce6 --- /dev/null +++ b/ports/stb/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "stb", + "version-string": "2020-09-14", + "port-version": 1, + "description": "public domain header-only libraries", + "homepage": "https://github.com/nothings/stb" +} diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL deleted file mode 100644 index 1f6d6c8587b20e..00000000000000 --- a/ports/stlab/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: stlab -Version: 1.6.2 -Description: - stlab is the ongoing work of what was Adobe Software Technology Lab. - The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures. -Build-Depends: boost-variant (osx) \ No newline at end of file diff --git a/ports/stlab/vcpkg.json b/ports/stlab/vcpkg.json new file mode 100644 index 00000000000000..a3041dca71b1d7 --- /dev/null +++ b/ports/stlab/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "stlab", + "version-string": "1.6.2", + "port-version": 1, + "description": [ + "stlab is the ongoing work of what was Adobe Software Technology Lab.", + "The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures." + ], + "dependencies": [ + { + "name": "boost-variant", + "platform": "osx" + } + ] +} diff --git a/ports/stormlib/CONTROL b/ports/stormlib/CONTROL deleted file mode 100644 index 4a38c9f3d07651..00000000000000 --- a/ports/stormlib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: stormlib -Version: 2019-05-10 -Port-Version: 2 -Build-Depends: zlib, bzip2 -Description: StormLib is a library for opening and manipulating Blizzard MPQ files diff --git a/ports/stormlib/vcpkg.json b/ports/stormlib/vcpkg.json new file mode 100644 index 00000000000000..b293260eca7458 --- /dev/null +++ b/ports/stormlib/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "stormlib", + "version-string": "2019-05-10", + "port-version": 3, + "description": "StormLib is a library for opening and manipulating Blizzard MPQ files", + "dependencies": [ + "bzip2", + "zlib" + ] +} diff --git a/ports/strict-variant/CONTROL b/ports/strict-variant/CONTROL deleted file mode 100644 index 598dd376c0d76c..00000000000000 --- a/ports/strict-variant/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: strict-variant -Version: 0.5 -Description: Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves. diff --git a/ports/strict-variant/vcpkg.json b/ports/strict-variant/vcpkg.json new file mode 100644 index 00000000000000..f95e19258ca59c --- /dev/null +++ b/ports/strict-variant/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "strict-variant", + "version-string": "0.5", + "port-version": 1, + "description": "Tagged union implementation that will never throw an exception or make a dynamic allocation in the effort of supporting types that have throwing moves." +} diff --git a/ports/string-theory/CONTROL b/ports/string-theory/CONTROL deleted file mode 100644 index 2770632dc82587..00000000000000 --- a/ports/string-theory/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: string-theory -Version: 3.4 -Homepage: https://github.com/zrax/string_theory -Description: Flexible modern C++ string library with type-safe formatting. diff --git a/ports/string-theory/vcpkg.json b/ports/string-theory/vcpkg.json new file mode 100644 index 00000000000000..2a79ccb4f9c641 --- /dev/null +++ b/ports/string-theory/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "string-theory", + "version-string": "3.4", + "port-version": 1, + "description": "Flexible modern C++ string library with type-safe formatting.", + "homepage": "https://github.com/zrax/string_theory" +} diff --git a/ports/string-view-lite/CONTROL b/ports/string-view-lite/CONTROL deleted file mode 100644 index f14d36c97066e1..00000000000000 --- a/ports/string-view-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: string-view-lite -Version: 1.3.0 -Description: A C++17-like string_view for C++98, C++11 and later in a single-file header-only library diff --git a/ports/string-view-lite/vcpkg.json b/ports/string-view-lite/vcpkg.json new file mode 100644 index 00000000000000..1e15f0164572c8 --- /dev/null +++ b/ports/string-view-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "string-view-lite", + "version-string": "1.3.0", + "port-version": 1, + "description": "A C++17-like string_view for C++98, C++11 and later in a single-file header-only library" +} diff --git a/ports/strtk/CONTROL b/ports/strtk/CONTROL deleted file mode 100644 index 6ef7161c5dd1c7..00000000000000 --- a/ports/strtk/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: strtk -Version: 2020-09-14 -Homepage: https://github.com/ArashPartow/strtk -Description: robust, optimized and portable string processing algorithms for the C++ language -Build-Depends: boost diff --git a/ports/strtk/vcpkg.json b/ports/strtk/vcpkg.json new file mode 100644 index 00000000000000..41a303b3753a05 --- /dev/null +++ b/ports/strtk/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "strtk", + "version-string": "2020-09-14", + "port-version": 1, + "description": "robust, optimized and portable string processing algorithms for the C++ language", + "homepage": "https://github.com/ArashPartow/strtk", + "dependencies": [ + "boost" + ] +} diff --git a/ports/stx/CONTROL b/ports/stx/CONTROL deleted file mode 100644 index cd6886925d1d35..00000000000000 --- a/ports/stx/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: stx -Version: 1.0.1 -Homepage: https://github.com/lamarrr/STX -Description: C++17 & C++ 20 error-handling and utility extensions - -Feature: backtrace -Description: stacktrace support for STX -Build-Depends: abseil diff --git a/ports/stx/vcpkg.json b/ports/stx/vcpkg.json new file mode 100644 index 00000000000000..536f557519781e --- /dev/null +++ b/ports/stx/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "stx", + "version-string": "1.0.1", + "port-version": 1, + "description": "C++17 & C++ 20 error-handling and utility extensions", + "homepage": "https://github.com/lamarrr/STX", + "features": { + "backtrace": { + "description": "stacktrace support for STX", + "dependencies": [ + "abseil" + ] + } + } +} diff --git a/ports/stxxl/CONTROL b/ports/stxxl/CONTROL deleted file mode 100644 index 42609d34f35f57..00000000000000 --- a/ports/stxxl/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: stxxl -Version: 2018-11-15-2 -Description: Standard Template Library for Extra Large Data Sets diff --git a/ports/stxxl/vcpkg.json b/ports/stxxl/vcpkg.json new file mode 100644 index 00000000000000..1a3847d57b2d0a --- /dev/null +++ b/ports/stxxl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "stxxl", + "version-string": "2018-11-15", + "port-version": 3, + "description": "Standard Template Library for Extra Large Data Sets" +} diff --git a/ports/superlu/CONTROL b/ports/superlu/CONTROL deleted file mode 100644 index b498fdafc04d9e..00000000000000 --- a/ports/superlu/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: superlu -Version: 2020-01-07 -Port-Version: 2 -Build-Depends: blas -Description: Supernodal sparse direct solver. -Homepage: https://github.com/xiaoyeli/superlu -Supports: !(uwp|arm) diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json new file mode 100644 index 00000000000000..9de4be6746d655 --- /dev/null +++ b/ports/superlu/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "superlu", + "version-string": "2020-01-07", + "port-version": 3, + "description": "Supernodal sparse direct solver.", + "homepage": "https://github.com/xiaoyeli/superlu", + "supports": "!(uwp | arm)", + "dependencies": [ + "blas" + ] +} diff --git a/ports/systemc/CONTROL b/ports/systemc/CONTROL deleted file mode 100644 index c62d20c76bcc06..00000000000000 --- a/ports/systemc/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: systemc -Version: 2.3.3-4 -Description: A set of C++ classes and macros which provide an event-driven simulation kernel in C++ diff --git a/ports/systemc/vcpkg.json b/ports/systemc/vcpkg.json new file mode 100644 index 00000000000000..6c456295db39c6 --- /dev/null +++ b/ports/systemc/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "systemc", + "version-string": "2.3.3", + "port-version": 5, + "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++" +} diff --git a/ports/tabulate/CONTROL b/ports/tabulate/CONTROL deleted file mode 100644 index 85dc7adefa9619..00000000000000 --- a/ports/tabulate/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tabulate -Version: 2019-01-06 -Description: Table maker for modern C++ -Homepage: https://github.com/p-ranav/tabulate diff --git a/ports/tabulate/vcpkg.json b/ports/tabulate/vcpkg.json new file mode 100644 index 00000000000000..cdbb579bb19676 --- /dev/null +++ b/ports/tabulate/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tabulate", + "version-string": "2019-01-06", + "port-version": 1, + "description": "Table maker for modern C++", + "homepage": "https://github.com/p-ranav/tabulate" +} diff --git a/ports/tacopie/CONTROL b/ports/tacopie/CONTROL deleted file mode 100644 index 1707cc9efb7b5f..00000000000000 --- a/ports/tacopie/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tacopie -Version: 3.2.0-2 -Homepage: https://github.com/cpp-redis/tacopie -Description: Tacopie is a TCP Client & Server C++11 library diff --git a/ports/tacopie/vcpkg.json b/ports/tacopie/vcpkg.json new file mode 100644 index 00000000000000..4c1167a8a616c2 --- /dev/null +++ b/ports/tacopie/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tacopie", + "version-string": "3.2.0", + "port-version": 3, + "description": "Tacopie is a TCP Client & Server C++11 library", + "homepage": "https://github.com/cpp-redis/tacopie" +} diff --git a/ports/taocpp-json/CONTROL b/ports/taocpp-json/CONTROL deleted file mode 100644 index 2eb1d4fcca6e4b..00000000000000 --- a/ports/taocpp-json/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: taocpp-json -Version: 2020-09-14 -Description: C++ header-only JSON library diff --git a/ports/taocpp-json/vcpkg.json b/ports/taocpp-json/vcpkg.json new file mode 100644 index 00000000000000..b1e5f2fb91052e --- /dev/null +++ b/ports/taocpp-json/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "taocpp-json", + "version-string": "2020-09-14", + "port-version": 1, + "description": "C++ header-only JSON library" +} diff --git a/ports/tap-windows6/CONTROL b/ports/tap-windows6/CONTROL deleted file mode 100644 index 744247c323ce8f..00000000000000 --- a/ports/tap-windows6/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tap-windows6 -Version: 9.21.2-0e30f5c -Description: an NDIS 6 implementation of the TAP-Windows driver, used by OpenVPN and other apps. Note: This package only contains the headers for the driver. \ No newline at end of file diff --git a/ports/tap-windows6/vcpkg.json b/ports/tap-windows6/vcpkg.json new file mode 100644 index 00000000000000..777db703c20904 --- /dev/null +++ b/ports/tap-windows6/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tap-windows6", + "version-string": "9.21.2-0e30f5c", + "port-version": 1, + "description": "an NDIS 6 implementation of the TAP-Windows driver, used by OpenVPN and other apps. Note: This package only contains the headers for the driver." +} diff --git a/ports/tbb/CONTROL b/ports/tbb/CONTROL deleted file mode 100644 index b089a3e7d91707..00000000000000 --- a/ports/tbb/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: tbb -Version: 2020_U3 -Port-Version: 5 -Homepage: https://github.com/01org/tbb -Description: Intel's Threading Building Blocks. -Supports: !(uwp|arm|arm64) | linux | osx diff --git a/ports/tbb/vcpkg.json b/ports/tbb/vcpkg.json new file mode 100644 index 00000000000000..101e41bd7b5b17 --- /dev/null +++ b/ports/tbb/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "tbb", + "version-string": "2020_U3", + "port-version": 6, + "description": "Intel's Threading Building Blocks.", + "homepage": "https://github.com/01org/tbb", + "supports": "!(uwp | arm | arm64) | linux | osx" +} diff --git a/ports/tcl/CONTROL b/ports/tcl/CONTROL deleted file mode 100644 index 0d451b046ce739..00000000000000 --- a/ports/tcl/CONTROL +++ /dev/null @@ -1,17 +0,0 @@ -Source: tcl -Version: core-9-0-a1 -Port-Version: 1 -Homepage: https://github.com/tcltk/tcl -Description: Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications. - -Feature: thrdalloc -Description: Use the thread allocator (shared global free pool). - -Feature: profile -Description: Adds profiling hooks. Map file is assumed. - -Feature: unchecked -Description: Allows a symbols build to not use the debug enabled runtime (msvcrt.dll not msvcrtd.dll or libcmt.lib not libcmtd.lib). - -Feature: utfmax -Description: Forces Tcl_UniChar to be a 32-bit quantity in stead of 16-bits diff --git a/ports/tcl/vcpkg.json b/ports/tcl/vcpkg.json new file mode 100644 index 00000000000000..c4f28240fdb9c7 --- /dev/null +++ b/ports/tcl/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "tcl", + "version-string": "core-9-0-a1", + "port-version": 2, + "description": "Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.", + "homepage": "https://github.com/tcltk/tcl", + "features": { + "profile": { + "description": "Adds profiling hooks. Map file is assumed." + }, + "thrdalloc": { + "description": "Use the thread allocator (shared global free pool)." + }, + "unchecked": { + "description": "Allows a symbols build to not use the debug enabled runtime (msvcrt.dll not msvcrtd.dll or libcmt.lib not libcmtd.lib)." + }, + "utfmax": { + "description": "Forces Tcl_UniChar to be a 32-bit quantity in stead of 16-bits" + } + } +} diff --git a/ports/tclap/CONTROL b/ports/tclap/CONTROL deleted file mode 100644 index 277e26b6748dce..00000000000000 --- a/ports/tclap/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tclap -Version: 1.2.2-3 -Homepage: https://sourceforge.net/projects/tclap/ -Description: Templatized command-line argument parser for C++ diff --git a/ports/tclap/vcpkg.json b/ports/tclap/vcpkg.json new file mode 100644 index 00000000000000..c8ad1ac88de44f --- /dev/null +++ b/ports/tclap/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tclap", + "version-string": "1.2.2", + "port-version": 4, + "description": "Templatized command-line argument parser for C++", + "homepage": "https://sourceforge.net/projects/tclap/" +} diff --git a/ports/teemo/CONTROL b/ports/teemo/CONTROL deleted file mode 100644 index 223fd6e5adc335..00000000000000 --- a/ports/teemo/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: teemo -Version: 2.2 -Build-Depends: curl[core] -Description: C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed. -Homepage: https://github.com/winsoft666/teemo \ No newline at end of file diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json new file mode 100644 index 00000000000000..4905c32f965dec --- /dev/null +++ b/ports/teemo/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "teemo", + "version-string": "2.2", + "port-version": 1, + "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", + "homepage": "https://github.com/winsoft666/teemo", + "dependencies": [ + { + "name": "curl", + "default-features": false + } + ] +} diff --git a/ports/telnetpp/CONTROL b/ports/telnetpp/CONTROL deleted file mode 100644 index f768eb84d6cd07..00000000000000 --- a/ports/telnetpp/CONTROL +++ /dev/null @@ -1,11 +0,0 @@ -Source: telnetpp -Version: 2.1.2 -Homepage: https://github.com/KazDragon/telnetpp -Description: Telnet++ is an implementation of the Telnet Session Layer protocol using C++14 -Build-Depends: boost-range, boost-container, boost-signals2, boost-variant, gsl-lite, boost-exception -Default-Features: zlib -Supports: !uwp - -Feature: zlib -Description: Zlib support -Build-Depends: zlib diff --git a/ports/telnetpp/vcpkg.json b/ports/telnetpp/vcpkg.json new file mode 100644 index 00000000000000..b59fcde67ffceb --- /dev/null +++ b/ports/telnetpp/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "telnetpp", + "version-string": "2.1.2", + "port-version": 1, + "description": "Telnet++ is an implementation of the Telnet Session Layer protocol using C++14", + "homepage": "https://github.com/KazDragon/telnetpp", + "supports": "!uwp", + "dependencies": [ + "boost-container", + "boost-exception", + "boost-range", + "boost-signals2", + "boost-variant", + "gsl-lite" + ], + "default-features": [ + "zlib" + ], + "features": { + "zlib": { + "description": "Zlib support", + "dependencies": [ + "zlib" + ] + } + } +} diff --git a/ports/tgbot-cpp/CONTROL b/ports/tgbot-cpp/CONTROL deleted file mode 100644 index 3c83987838f7a3..00000000000000 --- a/ports/tgbot-cpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: tgbot-cpp -Version: 1.2.1 -Homepage: https://github.com/reo7sp/tgbot-cpp -Description: C++14 library for Telegram bot API. -Build-Depends: boost-algorithm, boost-asio, boost-lexical-cast, boost-property-tree, boost-system, boost-test, boost-variant, curl, openssl, zlib diff --git a/ports/tgbot-cpp/vcpkg.json b/ports/tgbot-cpp/vcpkg.json new file mode 100644 index 00000000000000..360b9c706d1351 --- /dev/null +++ b/ports/tgbot-cpp/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "tgbot-cpp", + "version-string": "1.2.1", + "port-version": 1, + "description": "C++14 library for Telegram bot API.", + "homepage": "https://github.com/reo7sp/tgbot-cpp", + "dependencies": [ + "boost-algorithm", + "boost-asio", + "boost-lexical-cast", + "boost-property-tree", + "boost-system", + "boost-test", + "boost-variant", + "curl", + "openssl", + "zlib" + ] +} diff --git a/ports/tgc/CONTROL b/ports/tgc/CONTROL deleted file mode 100644 index 7961312cbd01a2..00000000000000 --- a/ports/tgc/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tgc -Version: 2019-08-11-1 -Description: A tiny garbage collector for C -Homepage: https://github.com/orangeduck/tgc diff --git a/ports/tgc/vcpkg.json b/ports/tgc/vcpkg.json new file mode 100644 index 00000000000000..960f3fe19bbafd --- /dev/null +++ b/ports/tgc/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tgc", + "version-string": "2019-08-11", + "port-version": 2, + "description": "A tiny garbage collector for C", + "homepage": "https://github.com/orangeduck/tgc" +} diff --git a/ports/theia/CONTROL b/ports/theia/CONTROL deleted file mode 100644 index 521468056ad91c..00000000000000 --- a/ports/theia/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: theia -Version: 0.8 -Port-Version: 3 -Build-Depends: flann, cereal, ceres[suitesparse], openimageio, glew, freeglut (!osx) -Homepage: https://github.com/sweeneychris/TheiaSfM -Description: An open source library for multiview geometry and structure from motion diff --git a/ports/theia/vcpkg.json b/ports/theia/vcpkg.json new file mode 100644 index 00000000000000..adcfa7f40187cd --- /dev/null +++ b/ports/theia/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "theia", + "version-string": "0.8", + "port-version": 4, + "description": "An open source library for multiview geometry and structure from motion", + "homepage": "https://github.com/sweeneychris/TheiaSfM", + "dependencies": [ + "cereal", + { + "name": "ceres", + "features": [ + "suitesparse" + ] + }, + "flann", + { + "name": "freeglut", + "platform": "!osx" + }, + "glew", + "openimageio" + ] +} diff --git a/ports/think-cell-range/CONTROL b/ports/think-cell-range/CONTROL deleted file mode 100644 index 907280cf526b3b..00000000000000 --- a/ports/think-cell-range/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: think-cell-range -Version: 498839d-1 -Description: think-cell's range library -Homepage: https://github.com/think-cell/range -Build-Depends: boost diff --git a/ports/think-cell-range/vcpkg.json b/ports/think-cell-range/vcpkg.json new file mode 100644 index 00000000000000..3296cf65438623 --- /dev/null +++ b/ports/think-cell-range/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "think-cell-range", + "version-string": "498839d", + "port-version": 2, + "description": "think-cell's range library", + "homepage": "https://github.com/think-cell/range", + "dependencies": [ + "boost" + ] +} diff --git a/ports/threadpool/CONTROL b/ports/threadpool/CONTROL deleted file mode 100644 index df98da83a48c73..00000000000000 --- a/ports/threadpool/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: threadpool -Version: 0.2.5 -Port-Version: 1 -Homepage: http://threadpool.sourceforge.net/ -Description: threadpool is a cross-platform C++ thread pool library. It provides a convenient way for dispatching asynchronous tasks and can be easily customized. threadpool is based on the high-quality Boost source libraries. -Build-Depends: boost-thread diff --git a/ports/threadpool/vcpkg.json b/ports/threadpool/vcpkg.json new file mode 100644 index 00000000000000..3e16feecc429f1 --- /dev/null +++ b/ports/threadpool/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "threadpool", + "version-string": "0.2.5", + "port-version": 2, + "description": "threadpool is a cross-platform C++ thread pool library. It provides a convenient way for dispatching asynchronous tasks and can be easily customized. threadpool is based on the high-quality Boost source libraries.", + "homepage": "http://threadpool.sourceforge.net/", + "dependencies": [ + "boost-thread" + ] +} diff --git a/ports/thrift/CONTROL b/ports/thrift/CONTROL deleted file mode 100644 index 2916e3e33fe147..00000000000000 --- a/ports/thrift/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: thrift -Version: 0.13.0 -Build-Depends: zlib, libevent, openssl, boost-range, boost-smart-ptr, boost-date-time, boost-locale, boost-scope-exit -Homepage: https://github.com/apache/thrift -Description: Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible. diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json new file mode 100644 index 00000000000000..ebc179aa157edb --- /dev/null +++ b/ports/thrift/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "thrift", + "version-string": "0.13.0", + "port-version": 1, + "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.", + "homepage": "https://github.com/apache/thrift", + "dependencies": [ + "boost-date-time", + "boost-locale", + "boost-range", + "boost-scope-exit", + "boost-smart-ptr", + "libevent", + "openssl", + "zlib" + ] +} diff --git a/ports/tidy-html5/CONTROL b/ports/tidy-html5/CONTROL deleted file mode 100644 index b7ad75aea56f46..00000000000000 --- a/ports/tidy-html5/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tidy-html5 -Version: 5.7.28-2 -Homepage: https://github.com/htacg/tidy-html5 -Description: Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools. diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json new file mode 100644 index 00000000000000..f910fd5f571e18 --- /dev/null +++ b/ports/tidy-html5/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tidy-html5", + "version-string": "5.7.28", + "port-version": 3, + "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.", + "homepage": "https://github.com/htacg/tidy-html5" +} diff --git a/ports/tinkerforge/CONTROL b/ports/tinkerforge/CONTROL deleted file mode 100644 index da38ec368d10e1..00000000000000 --- a/ports/tinkerforge/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinkerforge -Version: 2.1.25 -Description: Tinkerforge C API bindings for bricks and bricklets -Supports: !uwp \ No newline at end of file diff --git a/ports/tinkerforge/vcpkg.json b/ports/tinkerforge/vcpkg.json new file mode 100644 index 00000000000000..6590a57f116195 --- /dev/null +++ b/ports/tinkerforge/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinkerforge", + "version-string": "2.1.25", + "port-version": 1, + "description": "Tinkerforge C API bindings for bricks and bricklets", + "supports": "!uwp" +} diff --git a/ports/tiny-aes-c/CONTROL b/ports/tiny-aes-c/CONTROL deleted file mode 100644 index e874990740b37b..00000000000000 --- a/ports/tiny-aes-c/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tiny-aes-c -Version: 2019-07-31 -Description: Small portable AES128/192/256 in C -Homepage: https://github.com/kokke/tiny-AES-c diff --git a/ports/tiny-aes-c/vcpkg.json b/ports/tiny-aes-c/vcpkg.json new file mode 100644 index 00000000000000..d4999595781088 --- /dev/null +++ b/ports/tiny-aes-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-aes-c", + "version-string": "2019-07-31", + "port-version": 1, + "description": "Small portable AES128/192/256 in C", + "homepage": "https://github.com/kokke/tiny-AES-c" +} diff --git a/ports/tiny-bignum-c/CONTROL b/ports/tiny-bignum-c/CONTROL deleted file mode 100644 index 5015bc2d07340f..00000000000000 --- a/ports/tiny-bignum-c/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tiny-bignum-c -Version: 2019-07-31 -Description: Small portable multiple-precision unsigned integer arithmetic in C -Homepage: https://github.com/kokke/tiny-bignum-c diff --git a/ports/tiny-bignum-c/vcpkg.json b/ports/tiny-bignum-c/vcpkg.json new file mode 100644 index 00000000000000..2d78d4dfd87d4f --- /dev/null +++ b/ports/tiny-bignum-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-bignum-c", + "version-string": "2019-07-31", + "port-version": 1, + "description": "Small portable multiple-precision unsigned integer arithmetic in C", + "homepage": "https://github.com/kokke/tiny-bignum-c" +} diff --git a/ports/tiny-dnn/CONTROL b/ports/tiny-dnn/CONTROL deleted file mode 100644 index 2a31c833a8ccc1..00000000000000 --- a/ports/tiny-dnn/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tiny-dnn -Version: 2018-10-25 -Homepage: https://github.com/tiny-dnn/tiny-dnn -Description: A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource. diff --git a/ports/tiny-dnn/vcpkg.json b/ports/tiny-dnn/vcpkg.json new file mode 100644 index 00000000000000..977ae26adf1669 --- /dev/null +++ b/ports/tiny-dnn/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-dnn", + "version-string": "2018-10-25", + "port-version": 1, + "description": "A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource.", + "homepage": "https://github.com/tiny-dnn/tiny-dnn" +} diff --git a/ports/tiny-process-library/CONTROL b/ports/tiny-process-library/CONTROL deleted file mode 100644 index 2a6ad9955b7666..00000000000000 --- a/ports/tiny-process-library/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tiny-process-library -Version: 2.0.4 -Description: A small platform independent library to create and stop new processes in C++ diff --git a/ports/tiny-process-library/vcpkg.json b/ports/tiny-process-library/vcpkg.json new file mode 100644 index 00000000000000..e6daaf3228eecf --- /dev/null +++ b/ports/tiny-process-library/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tiny-process-library", + "version-string": "2.0.4", + "port-version": 1, + "description": "A small platform independent library to create and stop new processes in C++" +} diff --git a/ports/tiny-regex-c/CONTROL b/ports/tiny-regex-c/CONTROL deleted file mode 100644 index 12b5ea0c5ec724..00000000000000 --- a/ports/tiny-regex-c/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tiny-regex-c -Version: 2019-07-31 -Description: A small regex implementation in C -Homepage: https://github.com/kokke/tiny-regex-c diff --git a/ports/tiny-regex-c/vcpkg.json b/ports/tiny-regex-c/vcpkg.json new file mode 100644 index 00000000000000..c9a39a6af66283 --- /dev/null +++ b/ports/tiny-regex-c/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tiny-regex-c", + "version-string": "2019-07-31", + "port-version": 1, + "description": "A small regex implementation in C", + "homepage": "https://github.com/kokke/tiny-regex-c" +} diff --git a/ports/tinycthread/CONTROL b/ports/tinycthread/CONTROL deleted file mode 100644 index da87db1411c33f..00000000000000 --- a/ports/tinycthread/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinycthread -Version: 2019-08-06 -Description: Small, portable implementation of the C11 threads API -Homepage: https://tinycthread.github.io/ diff --git a/ports/tinycthread/vcpkg.json b/ports/tinycthread/vcpkg.json new file mode 100644 index 00000000000000..d67a40f5368605 --- /dev/null +++ b/ports/tinycthread/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinycthread", + "version-string": "2019-08-06", + "port-version": 1, + "description": "Small, portable implementation of the C11 threads API", + "homepage": "https://tinycthread.github.io/" +} diff --git a/ports/tinydir/CONTROL b/ports/tinydir/CONTROL deleted file mode 100644 index 04a6b7b60b47a8..00000000000000 --- a/ports/tinydir/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinydir -Version: 1.2.4 -Homepage: https://github.com/cxong/tinydir -Description: Lightweight, portable and easy to integrate C directory and file reader diff --git a/ports/tinydir/vcpkg.json b/ports/tinydir/vcpkg.json new file mode 100644 index 00000000000000..7326cdd2008e06 --- /dev/null +++ b/ports/tinydir/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinydir", + "version-string": "1.2.4", + "port-version": 1, + "description": "Lightweight, portable and easy to integrate C directory and file reader", + "homepage": "https://github.com/cxong/tinydir" +} diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL deleted file mode 100644 index 7d2da6da0454fa..00000000000000 --- a/ports/tinyexif/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: tinyexif -Version: 1.0.2-6 -Build-Depends: tinyxml2 -Homepage: https://github.com/cdcseacave/TinyEXIF -Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images diff --git a/ports/tinyexif/vcpkg.json b/ports/tinyexif/vcpkg.json new file mode 100644 index 00000000000000..1d5a0f8cc2d930 --- /dev/null +++ b/ports/tinyexif/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "tinyexif", + "version-string": "1.0.2", + "port-version": 7, + "description": "tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images", + "homepage": "https://github.com/cdcseacave/TinyEXIF", + "dependencies": [ + "tinyxml2" + ] +} diff --git a/ports/tinyexr/CONTROL b/ports/tinyexr/CONTROL deleted file mode 100644 index c2be25a5f03e2c..00000000000000 --- a/ports/tinyexr/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinyexr -Version: 1.0.0 -Homepage: https://github.com/syoyo/tinyexr -Description: Library to load and save OpenEXR(.exr) images diff --git a/ports/tinyexr/vcpkg.json b/ports/tinyexr/vcpkg.json new file mode 100644 index 00000000000000..a1e89b42ae93c6 --- /dev/null +++ b/ports/tinyexr/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyexr", + "version-string": "1.0.0", + "port-version": 1, + "description": "Library to load and save OpenEXR(.exr) images", + "homepage": "https://github.com/syoyo/tinyexr" +} diff --git a/ports/tinygltf/CONTROL b/ports/tinygltf/CONTROL deleted file mode 100644 index c4581faa6af9de..00000000000000 --- a/ports/tinygltf/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: tinygltf -Version: 2020-07-28 -Port-Version: 1 -Homepage: https://github.com/syoyo/tinygltf -Description: A header only C++11 glTF 2.0 library. -Build-Depends: stb, nlohmann-json diff --git a/ports/tinygltf/vcpkg.json b/ports/tinygltf/vcpkg.json new file mode 100644 index 00000000000000..b18a092ad77a66 --- /dev/null +++ b/ports/tinygltf/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "tinygltf", + "version-string": "2020-07-28", + "port-version": 2, + "description": "A header only C++11 glTF 2.0 library.", + "homepage": "https://github.com/syoyo/tinygltf", + "dependencies": [ + "nlohmann-json", + "stb" + ] +} diff --git a/ports/tinynpy/CONTROL b/ports/tinynpy/CONTROL deleted file mode 100644 index cf05ef324f418c..00000000000000 --- a/ports/tinynpy/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinynpy -Version: 1.0.0-3 -Build-Depends: zlib -Description: tiny C++ loader/exporter of python numpy array NPY/NPZ files diff --git a/ports/tinynpy/vcpkg.json b/ports/tinynpy/vcpkg.json new file mode 100644 index 00000000000000..438863c4741bab --- /dev/null +++ b/ports/tinynpy/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "tinynpy", + "version-string": "1.0.0", + "port-version": 4, + "description": "tiny C++ loader/exporter of python numpy array NPY/NPZ files", + "dependencies": [ + "zlib" + ] +} diff --git a/ports/tinyobjloader/CONTROL b/ports/tinyobjloader/CONTROL deleted file mode 100644 index 8785e862bb6ec3..00000000000000 --- a/ports/tinyobjloader/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: tinyobjloader -Version: 2.0.0-rc2 -Description: Tiny but powerful single file wavefront obj loader - -Feature: double -Description: enable double(64bit) precision - diff --git a/ports/tinyobjloader/vcpkg.json b/ports/tinyobjloader/vcpkg.json new file mode 100644 index 00000000000000..45ed27c108b4ea --- /dev/null +++ b/ports/tinyobjloader/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "tinyobjloader", + "version-string": "2.0.0-rc2", + "port-version": 1, + "description": "Tiny but powerful single file wavefront obj loader", + "features": { + "double": { + "description": "enable double(64bit) precision" + } + } +} diff --git a/ports/tinyply/CONTROL b/ports/tinyply/CONTROL deleted file mode 100644 index a75e1fb9b9c0af..00000000000000 --- a/ports/tinyply/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinyply -Version: 2020-05-22 -Description: C++11 ply 3d mesh format importer & exporter -Homepage: https://github.com/ddiakopoulos/tinyply diff --git a/ports/tinyply/vcpkg.json b/ports/tinyply/vcpkg.json new file mode 100644 index 00000000000000..5cf3b739825e59 --- /dev/null +++ b/ports/tinyply/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyply", + "version-string": "2020-05-22", + "port-version": 1, + "description": "C++11 ply 3d mesh format importer & exporter", + "homepage": "https://github.com/ddiakopoulos/tinyply" +} diff --git a/ports/tinyspline/CONTROL b/ports/tinyspline/CONTROL deleted file mode 100644 index f1f4739c9d81e4..00000000000000 --- a/ports/tinyspline/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tinyspline -Version: 0.2.0-3 -Description: Library for NURBS, B-Splines, and B?zier curves, allowing you to handle splines with ease diff --git a/ports/tinyspline/vcpkg.json b/ports/tinyspline/vcpkg.json new file mode 100644 index 00000000000000..bd01f70b978f85 --- /dev/null +++ b/ports/tinyspline/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tinyspline", + "version-string": "0.2.0", + "port-version": 4, + "description": "Library for NURBS, B-Splines, and B?zier curves, allowing you to handle splines with ease" +} diff --git a/ports/tinythread/CONTROL b/ports/tinythread/CONTROL deleted file mode 100644 index d7c8112c71c49a..00000000000000 --- a/ports/tinythread/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinythread -Version: 1.1-3 -Homepage: https://tinythreadpp.bitsnbites.eu/ -Description: Implements a fairly compatible subset of the C++11 thread management classes diff --git a/ports/tinythread/vcpkg.json b/ports/tinythread/vcpkg.json new file mode 100644 index 00000000000000..3e45f68b012591 --- /dev/null +++ b/ports/tinythread/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinythread", + "version-string": "1.1", + "port-version": 4, + "description": "Implements a fairly compatible subset of the C++11 thread management classes", + "homepage": "https://tinythreadpp.bitsnbites.eu/" +} diff --git a/ports/tinytoml/CONTROL b/ports/tinytoml/CONTROL deleted file mode 100644 index ba262920f9dd73..00000000000000 --- a/ports/tinytoml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinytoml -Version: 20180219-1 -Homepage: https://github.com/mayah/tinytoml -Description: A header only C++11 library for parsing TOML. diff --git a/ports/tinytoml/vcpkg.json b/ports/tinytoml/vcpkg.json new file mode 100644 index 00000000000000..f7a894c86e93ea --- /dev/null +++ b/ports/tinytoml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinytoml", + "version-string": "20180219", + "port-version": 2, + "description": "A header only C++11 library for parsing TOML.", + "homepage": "https://github.com/mayah/tinytoml" +} diff --git a/ports/tinyutf8/CONTROL b/ports/tinyutf8/CONTROL deleted file mode 100644 index 77002cb98f6475..00000000000000 --- a/ports/tinyutf8/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tinyutf8 -Version: 4.0.2 -Description: TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project. diff --git a/ports/tinyutf8/vcpkg.json b/ports/tinyutf8/vcpkg.json new file mode 100644 index 00000000000000..008757cdd91ba7 --- /dev/null +++ b/ports/tinyutf8/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tinyutf8", + "version-string": "4.0.2", + "port-version": 1, + "description": "TINYUTF8 is a library for extremely easy integration of Unicode into an arbitrary C++11 project." +} diff --git a/ports/tinyxml/CONTROL b/ports/tinyxml/CONTROL deleted file mode 100644 index 3a83e411e08302..00000000000000 --- a/ports/tinyxml/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinyxml -Version: 2.6.2-7 -Homepage: https://sourceforge.net/projects/tinyxml -Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs. diff --git a/ports/tinyxml/vcpkg.json b/ports/tinyxml/vcpkg.json new file mode 100644 index 00000000000000..8ee2d5d2dd0047 --- /dev/null +++ b/ports/tinyxml/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyxml", + "version-string": "2.6.2", + "port-version": 8, + "description": "A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.", + "homepage": "https://sourceforge.net/projects/tinyxml" +} diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL deleted file mode 100644 index 3be0a859c7db6f..00000000000000 --- a/ports/tinyxml2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tinyxml2 -Version: 8.0.0-1 -Homepage: https://github.com/leethomason/tinyxml2 -Description: A simple, small, efficient, C++ XML parser diff --git a/ports/tinyxml2/vcpkg.json b/ports/tinyxml2/vcpkg.json new file mode 100644 index 00000000000000..83d8b3fc3782d3 --- /dev/null +++ b/ports/tinyxml2/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tinyxml2", + "version-string": "8.0.0", + "port-version": 2, + "description": "A simple, small, efficient, C++ XML parser", + "homepage": "https://github.com/leethomason/tinyxml2" +} diff --git a/ports/tl-expected/CONTROL b/ports/tl-expected/CONTROL deleted file mode 100644 index b07479595c910d..00000000000000 --- a/ports/tl-expected/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tl-expected -Version: 1.0.0-1 -Description: C++11/14/17 std::expected implementation with functional-style extensions diff --git a/ports/tl-expected/vcpkg.json b/ports/tl-expected/vcpkg.json new file mode 100644 index 00000000000000..1f27474b5310fe --- /dev/null +++ b/ports/tl-expected/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tl-expected", + "version-string": "1.0.0", + "port-version": 2, + "description": "C++11/14/17 std::expected implementation with functional-style extensions" +} diff --git a/ports/tl-function-ref/CONTROL b/ports/tl-function-ref/CONTROL deleted file mode 100644 index be89f774177183..00000000000000 --- a/ports/tl-function-ref/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tl-function-ref -Version: 1.0.0-1 -Description: A lightweight, non-owning reference to a callable. \ No newline at end of file diff --git a/ports/tl-function-ref/vcpkg.json b/ports/tl-function-ref/vcpkg.json new file mode 100644 index 00000000000000..e8cf323a4ba1c1 --- /dev/null +++ b/ports/tl-function-ref/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tl-function-ref", + "version-string": "1.0.0", + "port-version": 2, + "description": "A lightweight, non-owning reference to a callable." +} diff --git a/ports/tl-optional/CONTROL b/ports/tl-optional/CONTROL deleted file mode 100644 index 5464d80542df2d..00000000000000 --- a/ports/tl-optional/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tl-optional -Version: 1.0.0-1 -Description: C++11/14/17 std::optional implementation with functional-style extensions diff --git a/ports/tl-optional/vcpkg.json b/ports/tl-optional/vcpkg.json new file mode 100644 index 00000000000000..4dc6d13b75e548 --- /dev/null +++ b/ports/tl-optional/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tl-optional", + "version-string": "1.0.0", + "port-version": 2, + "description": "C++11/14/17 std::optional implementation with functional-style extensions" +} diff --git a/ports/tlx/CONTROL b/ports/tlx/CONTROL deleted file mode 100644 index b65af72604a4ca..00000000000000 --- a/ports/tlx/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tlx -Version: 0.5.20191212 -Homepage: https://github.com/tlx/tlx -Description: tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL diff --git a/ports/tlx/vcpkg.json b/ports/tlx/vcpkg.json new file mode 100644 index 00000000000000..072971f8f65a55 --- /dev/null +++ b/ports/tlx/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tlx", + "version-string": "0.5.20191212", + "port-version": 1, + "description": "tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL", + "homepage": "https://github.com/tlx/tlx" +} diff --git a/ports/tmx/CONTROL b/ports/tmx/CONTROL deleted file mode 100644 index 1f933b6f5065d0..00000000000000 --- a/ports/tmx/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tmx -Version: 1.1.0 -Description: A portable C library to load tiled maps in your games. -Build-Depends: zlib, libxml2 diff --git a/ports/tmx/vcpkg.json b/ports/tmx/vcpkg.json new file mode 100644 index 00000000000000..bad3ca97e2ea1d --- /dev/null +++ b/ports/tmx/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "tmx", + "version-string": "1.1.0", + "port-version": 1, + "description": "A portable C library to load tiled maps in your games.", + "dependencies": [ + "libxml2", + "zlib" + ] +} diff --git a/ports/tmxlite/CONTROL b/ports/tmxlite/CONTROL deleted file mode 100644 index eb3cfdd55c0330..00000000000000 --- a/ports/tmxlite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tmxlite -Version: 2019-03-05 -Description: A lightweight C++14 parsing library for tmx map files created with the Tiled map editor. \ No newline at end of file diff --git a/ports/tmxlite/vcpkg.json b/ports/tmxlite/vcpkg.json new file mode 100644 index 00000000000000..0b710f19d4c063 --- /dev/null +++ b/ports/tmxlite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tmxlite", + "version-string": "2019-03-05", + "port-version": 1, + "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor." +} diff --git a/ports/tmxparser/CONTROL b/ports/tmxparser/CONTROL deleted file mode 100644 index 52288b2db0dc70..00000000000000 --- a/ports/tmxparser/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tmxparser -Version: 2.1.0-4 -Description: C++11 library for parsing the maps generated by the Map Editor called Tiled. -Build-Depends: zlib, tinyxml2 diff --git a/ports/tmxparser/vcpkg.json b/ports/tmxparser/vcpkg.json new file mode 100644 index 00000000000000..769ae662bc8c95 --- /dev/null +++ b/ports/tmxparser/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "tmxparser", + "version-string": "2.1.0", + "port-version": 5, + "description": "C++11 library for parsing the maps generated by the Map Editor called Tiled.", + "dependencies": [ + "tinyxml2", + "zlib" + ] +} diff --git a/ports/toml11/CONTROL b/ports/toml11/CONTROL deleted file mode 100644 index ca3483011d5832..00000000000000 --- a/ports/toml11/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: toml11 -Version: 3.5.0 -Port-Version: 1 -Homepage: https://github.com/ToruNiina/toml11 -Description: A C++11 header-only toml parser/encoder depending only on C++ standard library. diff --git a/ports/toml11/vcpkg.json b/ports/toml11/vcpkg.json new file mode 100644 index 00000000000000..b6577aafd4e71e --- /dev/null +++ b/ports/toml11/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "toml11", + "version-string": "3.5.0", + "port-version": 2, + "description": "A C++11 header-only toml parser/encoder depending only on C++ standard library.", + "homepage": "https://github.com/ToruNiina/toml11" +} diff --git a/ports/tomlplusplus/CONTROL b/ports/tomlplusplus/CONTROL deleted file mode 100644 index 32fad5a75943b8..00000000000000 --- a/ports/tomlplusplus/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: tomlplusplus -Version: 2.4.0 -Homepage: https://marzer.github.io/tomlplusplus/ -Description: Header-only TOML config file parser and serializer for modern C++. -Supports: !(arm|uwp|osx) diff --git a/ports/tomlplusplus/vcpkg.json b/ports/tomlplusplus/vcpkg.json new file mode 100644 index 00000000000000..20c58326ead24b --- /dev/null +++ b/ports/tomlplusplus/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "tomlplusplus", + "version-string": "2.4.0", + "port-version": 1, + "description": "Header-only TOML config file parser and serializer for modern C++.", + "homepage": "https://marzer.github.io/tomlplusplus/", + "supports": "!(arm | uwp | osx)" +} diff --git a/ports/torch-th/CONTROL b/ports/torch-th/CONTROL deleted file mode 100644 index 906734f38a6e0b..00000000000000 --- a/ports/torch-th/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: torch-th -Version: 2019-04-19-2 -Homepage: https://github.com/torch/torch7 -Description: Torch's TH library diff --git a/ports/torch-th/vcpkg.json b/ports/torch-th/vcpkg.json new file mode 100644 index 00000000000000..81f500f820fe71 --- /dev/null +++ b/ports/torch-th/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "torch-th", + "version-string": "2019-04-19", + "port-version": 3, + "description": "Torch's TH library", + "homepage": "https://github.com/torch/torch7" +} diff --git a/ports/tre/CONTROL b/ports/tre/CONTROL deleted file mode 100644 index bccd0d6e6756a1..00000000000000 --- a/ports/tre/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: tre -Version: 0.8.0 -Port-Version: 2 -Homepage: https://github.com/laurikari/tre -Description: TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching. diff --git a/ports/tre/vcpkg.json b/ports/tre/vcpkg.json new file mode 100644 index 00000000000000..cada62daea61c1 --- /dev/null +++ b/ports/tre/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "tre", + "version-string": "0.8.0", + "port-version": 3, + "description": "TRE is a lightweight, robust, and efficient POSIX compliant regexp matching library with some exciting features such as approximate (fuzzy) matching.", + "homepage": "https://github.com/laurikari/tre" +} diff --git a/ports/treehopper/CONTROL b/ports/treehopper/CONTROL deleted file mode 100644 index b54e10dde0f5ad..00000000000000 --- a/ports/treehopper/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: treehopper -Version: 1.11.3-4 -Description: Treehopper connects the physical world to your computer, tablet, or smartphone. -Homepage: https://treehopper.io -Build-Depends: libusb diff --git a/ports/treehopper/vcpkg.json b/ports/treehopper/vcpkg.json new file mode 100644 index 00000000000000..822c8c949a4fe2 --- /dev/null +++ b/ports/treehopper/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "treehopper", + "version-string": "1.11.3", + "port-version": 5, + "description": "Treehopper connects the physical world to your computer, tablet, or smartphone.", + "homepage": "https://treehopper.io", + "dependencies": [ + "libusb" + ] +} diff --git a/ports/triangle/CONTROL b/ports/triangle/CONTROL deleted file mode 100644 index fd7ec2d0975d63..00000000000000 --- a/ports/triangle/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: triangle -Version: 1.6 -Homepage: http://www.cs.cmu.edu/~quake/triangle.html -Description: A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator. -Supports: !uwp diff --git a/ports/triangle/vcpkg.json b/ports/triangle/vcpkg.json new file mode 100644 index 00000000000000..816f5015221ca4 --- /dev/null +++ b/ports/triangle/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "triangle", + "version-string": "1.6", + "port-version": 1, + "description": "A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator.", + "homepage": "http://www.cs.cmu.edu/~quake/triangle.html", + "supports": "!uwp" +} diff --git a/ports/trompeloeil/CONTROL b/ports/trompeloeil/CONTROL deleted file mode 100644 index 17903d05feb25c..00000000000000 --- a/ports/trompeloeil/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: trompeloeil -Version: 38 -Description: A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0 -Homepage: https://github.com/rollbear/trompeloeil diff --git a/ports/trompeloeil/vcpkg.json b/ports/trompeloeil/vcpkg.json new file mode 100644 index 00000000000000..8084fce18c190d --- /dev/null +++ b/ports/trompeloeil/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "trompeloeil", + "version-string": "38", + "port-version": 1, + "description": "A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0", + "homepage": "https://github.com/rollbear/trompeloeil" +} diff --git a/ports/tsl-hopscotch-map/CONTROL b/ports/tsl-hopscotch-map/CONTROL deleted file mode 100644 index 4f1fa9e831f57b..00000000000000 --- a/ports/tsl-hopscotch-map/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tsl-hopscotch-map -Version: 2.3.0 -Description: C++ implementation of a fast hash map and hash set using hopscotch hashing diff --git a/ports/tsl-hopscotch-map/vcpkg.json b/ports/tsl-hopscotch-map/vcpkg.json new file mode 100644 index 00000000000000..b3d3792e24ec05 --- /dev/null +++ b/ports/tsl-hopscotch-map/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tsl-hopscotch-map", + "version-string": "2.3.0", + "port-version": 1, + "description": "C++ implementation of a fast hash map and hash set using hopscotch hashing" +} diff --git a/ports/tsl-ordered-map/CONTROL b/ports/tsl-ordered-map/CONTROL deleted file mode 100644 index ab223f451ec060..00000000000000 --- a/ports/tsl-ordered-map/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tsl-ordered-map -Version: 1.0.0 -Description: C++ hash map and hash set which preserve the order of insertion diff --git a/ports/tsl-ordered-map/vcpkg.json b/ports/tsl-ordered-map/vcpkg.json new file mode 100644 index 00000000000000..8ce8f079fa8802 --- /dev/null +++ b/ports/tsl-ordered-map/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tsl-ordered-map", + "version-string": "1.0.0", + "port-version": 1, + "description": "C++ hash map and hash set which preserve the order of insertion" +} diff --git a/ports/tsl-sparse-map/CONTROL b/ports/tsl-sparse-map/CONTROL deleted file mode 100644 index 2eea4f5b7d4bf5..00000000000000 --- a/ports/tsl-sparse-map/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: tsl-sparse-map -Version: 0.6.2 -Description: C++ implementation of a memory efficient hash map and hash set diff --git a/ports/tsl-sparse-map/vcpkg.json b/ports/tsl-sparse-map/vcpkg.json new file mode 100644 index 00000000000000..ff5229abcc09be --- /dev/null +++ b/ports/tsl-sparse-map/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tsl-sparse-map", + "version-string": "0.6.2", + "port-version": 1, + "description": "C++ implementation of a memory efficient hash map and hash set" +} diff --git a/ports/turbobase64/CONTROL b/ports/turbobase64/CONTROL deleted file mode 100644 index 2709230daede18..00000000000000 --- a/ports/turbobase64/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: turbobase64 -Version: 2020-01-12 -Description: Fastest Base64 SIMD/Neon library -Homepage: https://github.com/powturbo/Turbo-Base64 \ No newline at end of file diff --git a/ports/turbobase64/vcpkg.json b/ports/turbobase64/vcpkg.json new file mode 100644 index 00000000000000..dc418d68ba07c8 --- /dev/null +++ b/ports/turbobase64/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "turbobase64", + "version-string": "2020-01-12", + "port-version": 1, + "description": "Fastest Base64 SIMD/Neon library", + "homepage": "https://github.com/powturbo/Turbo-Base64" +} diff --git a/ports/type-lite/CONTROL b/ports/type-lite/CONTROL deleted file mode 100644 index 79f1e9fd691b1b..00000000000000 --- a/ports/type-lite/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: type-lite -Version: 0.1.0 -Homepage: https://github.com/martinmoene/type-lite -Description: Strong types for C++98, C++11 and later in a single-file header-only library. - -Feature: test -Description: Build with test - - diff --git a/ports/type-lite/vcpkg.json b/ports/type-lite/vcpkg.json new file mode 100644 index 00000000000000..9fa6607e1e39e9 --- /dev/null +++ b/ports/type-lite/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "type-lite", + "version-string": "0.1.0", + "port-version": 1, + "description": "Strong types for C++98, C++11 and later in a single-file header-only library.", + "homepage": "https://github.com/martinmoene/type-lite", + "features": { + "test": { + "description": "Build with test" + } + } +} diff --git a/ports/uchardet/CONTROL b/ports/uchardet/CONTROL deleted file mode 100644 index 587f25d6826809..00000000000000 --- a/ports/uchardet/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: uchardet -Version: 2020-04-26 -Description: An encoding detector library ported from Mozilla -Homepage: https://cgit.freedesktop.org/uchardet/uchardet/ - -Feature: tool -Description: Build uchardet CLI tool -Build-Depends: getopt diff --git a/ports/uchardet/vcpkg.json b/ports/uchardet/vcpkg.json new file mode 100644 index 00000000000000..c7b7cad8d2850a --- /dev/null +++ b/ports/uchardet/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "uchardet", + "version-string": "2020-04-26", + "port-version": 1, + "description": "An encoding detector library ported from Mozilla", + "homepage": "https://cgit.freedesktop.org/uchardet/uchardet/", + "features": { + "tool": { + "description": "Build uchardet CLI tool", + "dependencies": [ + "getopt" + ] + } + } +} diff --git a/ports/umock-c/CONTROL b/ports/umock-c/CONTROL deleted file mode 100644 index 44d5842b0eb56a..00000000000000 --- a/ports/umock-c/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: umock-c -Version: 2020-06-17-1 -Description: A pure C mocking library -Homepage: https://github.com/Azure/umock-c -Build-Depends: azure-macro-utils-c - -Feature: public-preview -Description: A pure C mocking library (public-preview) -Build-Depends: azure-macro-utils-c[public-preview] diff --git a/ports/umock-c/vcpkg.json b/ports/umock-c/vcpkg.json new file mode 100644 index 00000000000000..0456f2b9876d5d --- /dev/null +++ b/ports/umock-c/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "umock-c", + "version-string": "2020-06-17", + "port-version": 2, + "description": "A pure C mocking library", + "homepage": "https://github.com/Azure/umock-c", + "dependencies": [ + "azure-macro-utils-c" + ], + "features": { + "public-preview": { + "description": "A pure C mocking library (public-preview)", + "dependencies": [ + { + "name": "azure-macro-utils-c", + "features": [ + "public-preview" + ] + } + ] + } + } +} diff --git a/ports/unicorn-lib/CONTROL b/ports/unicorn-lib/CONTROL deleted file mode 100644 index d186705cff45bc..00000000000000 --- a/ports/unicorn-lib/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: unicorn-lib -Version: 2020-03-02 -Homepage: https://github.com/CaptainCrowbar/unicorn-lib -Description: Unicode library for C++ by Ross Smith -Build-Depends: rs-core-lib, pcre2, zlib, libiconv diff --git a/ports/unicorn-lib/vcpkg.json b/ports/unicorn-lib/vcpkg.json new file mode 100644 index 00000000000000..03b4dbaa4e2e11 --- /dev/null +++ b/ports/unicorn-lib/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "unicorn-lib", + "version-string": "2020-03-02", + "port-version": 1, + "description": "Unicode library for C++ by Ross Smith", + "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", + "dependencies": [ + "libiconv", + "pcre2", + "rs-core-lib", + "zlib" + ] +} diff --git a/ports/unicorn/CONTROL b/ports/unicorn/CONTROL deleted file mode 100644 index 78daeabad363e0..00000000000000 --- a/ports/unicorn/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: unicorn -Version: 2020-09-14 -Homepage: https://github.com/unicorn-engine/unicorn -Description: Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework -Supports: !uwp diff --git a/ports/unicorn/vcpkg.json b/ports/unicorn/vcpkg.json new file mode 100644 index 00000000000000..bc01677b816118 --- /dev/null +++ b/ports/unicorn/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "unicorn", + "version-string": "2020-09-14", + "port-version": 1, + "description": "Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework", + "homepage": "https://github.com/unicorn-engine/unicorn", + "supports": "!uwp" +} diff --git a/ports/units/CONTROL b/ports/units/CONTROL deleted file mode 100644 index b8d75b23099ce6..00000000000000 --- a/ports/units/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: units -Version: 2.3.1 -Homepage: https://github.com/nholthaus/units -Description: A compile-time, header-only, dimensional analysis and unit conversion library built on c++14 with no dependencies. diff --git a/ports/units/vcpkg.json b/ports/units/vcpkg.json new file mode 100644 index 00000000000000..3169b9319ce9d8 --- /dev/null +++ b/ports/units/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "units", + "version-string": "2.3.1", + "port-version": 1, + "description": "A compile-time, header-only, dimensional analysis and unit conversion library built on c++14 with no dependencies.", + "homepage": "https://github.com/nholthaus/units" +} diff --git a/ports/unixodbc/CONTROL b/ports/unixodbc/CONTROL deleted file mode 100644 index 6b3350532eea1b..00000000000000 --- a/ports/unixodbc/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: unixodbc -Version: 2.3.7 -Port-Version: 2 -Homepage: https://github.com/lurcher/unixODBC -Description: unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX -Supports: (osx|linux) diff --git a/ports/unixodbc/vcpkg.json b/ports/unixodbc/vcpkg.json new file mode 100644 index 00000000000000..0ceb1a24fa56d1 --- /dev/null +++ b/ports/unixodbc/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "unixodbc", + "version-string": "2.3.7", + "port-version": 3, + "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", + "homepage": "https://github.com/lurcher/unixODBC", + "supports": "osx | linux" +} diff --git a/ports/unrar/CONTROL b/ports/unrar/CONTROL deleted file mode 100644 index 1d3149fe52f7e4..00000000000000 --- a/ports/unrar/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: unrar -Version: 5.8.1 -Homepage: https://www.rarlab.com -Description: rarlab's unrar library diff --git a/ports/unrar/vcpkg.json b/ports/unrar/vcpkg.json new file mode 100644 index 00000000000000..5646a0190afb94 --- /dev/null +++ b/ports/unrar/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "unrar", + "version-string": "5.8.1", + "port-version": 1, + "description": "rarlab's unrar library", + "homepage": "https://www.rarlab.com" +} diff --git a/ports/urdfdom-headers/CONTROL b/ports/urdfdom-headers/CONTROL deleted file mode 100644 index 755c44c7e690a8..00000000000000 --- a/ports/urdfdom-headers/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: urdfdom-headers -Version: 1.0.5 -Port-Version: 1 -Homepage: https://github.com/ros/urdfdom_headers -Description: The URDF (U-Robot Description Format) headers provides core data structure headers for URDF. diff --git a/ports/urdfdom-headers/vcpkg.json b/ports/urdfdom-headers/vcpkg.json new file mode 100644 index 00000000000000..4326813b3d48b4 --- /dev/null +++ b/ports/urdfdom-headers/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "urdfdom-headers", + "version-string": "1.0.5", + "port-version": 2, + "description": "The URDF (U-Robot Description Format) headers provides core data structure headers for URDF.", + "homepage": "https://github.com/ros/urdfdom_headers" +} diff --git a/ports/urdfdom/CONTROL b/ports/urdfdom/CONTROL deleted file mode 100644 index 99e5a425706baa..00000000000000 --- a/ports/urdfdom/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: urdfdom -Version: 1.0.4 -Port-Version: 3 -Homepage: https://github.com/ros/urdfdom -Description: Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file. -Build-Depends: console-bridge, tinyxml, urdfdom-headers diff --git a/ports/urdfdom/vcpkg.json b/ports/urdfdom/vcpkg.json new file mode 100644 index 00000000000000..d235316bcb11e7 --- /dev/null +++ b/ports/urdfdom/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "urdfdom", + "version-string": "1.0.4", + "port-version": 4, + "description": "Provides core data structures and a simple XML parsers for populating the class data structures from an URDF file.", + "homepage": "https://github.com/ros/urdfdom", + "dependencies": [ + "console-bridge", + "tinyxml", + "urdfdom-headers" + ] +} diff --git a/ports/usbmuxd/CONTROL b/ports/usbmuxd/CONTROL deleted file mode 100644 index 9ad179c88e9c72..00000000000000 --- a/ports/usbmuxd/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: usbmuxd -Version: 1.2.235 -Homepage: http://www.libimobiledevice.org -Description: A socket daemon to multiplex connections from and to iOS devices -Build-Depends: libimobiledevice, libusb, libusb-win32, pthreads diff --git a/ports/usbmuxd/vcpkg.json b/ports/usbmuxd/vcpkg.json new file mode 100644 index 00000000000000..7f660afafd2324 --- /dev/null +++ b/ports/usbmuxd/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "usbmuxd", + "version-string": "1.2.235", + "port-version": 1, + "description": "A socket daemon to multiplex connections from and to iOS devices", + "homepage": "http://www.libimobiledevice.org", + "dependencies": [ + "libimobiledevice", + "libusb", + "libusb-win32", + "pthreads" + ] +} diff --git a/ports/usd/CONTROL b/ports/usd/CONTROL deleted file mode 100644 index 1d3225a0d8058c..00000000000000 --- a/ports/usd/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: usd -Version: 20.08 -Homepage: https://github.com/PixarAnimationStudios/USD -Build-Depends: boost-assign, boost-crc, boost-date-time, boost-filesystem, boost-format, boost-multi-index, boost-program-options, boost-regex, boost-system, boost-vmd, tbb, zlib -Description: Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications. -Supports: !x86 diff --git a/ports/usd/vcpkg.json b/ports/usd/vcpkg.json new file mode 100644 index 00000000000000..e284433ec8fbb2 --- /dev/null +++ b/ports/usd/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "usd", + "version-string": "20.08", + "port-version": 1, + "description": "Universal Scene Description (USD) is an efficient, scalable system for authoring, reading, and streaming time-sampled scene description for interchange between graphics applications.", + "homepage": "https://github.com/PixarAnimationStudios/USD", + "supports": "!x86", + "dependencies": [ + "boost-assign", + "boost-crc", + "boost-date-time", + "boost-filesystem", + "boost-format", + "boost-multi-index", + "boost-program-options", + "boost-regex", + "boost-system", + "boost-vmd", + "tbb", + "zlib" + ] +} diff --git a/ports/usrsctp/CONTROL b/ports/usrsctp/CONTROL deleted file mode 100644 index 822212be80fec9..00000000000000 --- a/ports/usrsctp/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: usrsctp -Version: 0db9691 -Description: This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows. diff --git a/ports/usrsctp/vcpkg.json b/ports/usrsctp/vcpkg.json new file mode 100644 index 00000000000000..8f8f6663e97a34 --- /dev/null +++ b/ports/usrsctp/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "usrsctp", + "version-string": "0db9691", + "port-version": 1, + "description": "This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows." +} diff --git a/ports/utf8h/CONTROL b/ports/utf8h/CONTROL deleted file mode 100644 index 31b21a88fa72e7..00000000000000 --- a/ports/utf8h/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: utf8h -Version: 2020-06-14 -Homepage: https://github.com/sheredom/utf8.h -Description: Single header utf8 string functions for C and C++ diff --git a/ports/utf8h/vcpkg.json b/ports/utf8h/vcpkg.json new file mode 100644 index 00000000000000..06b6c330ae3d69 --- /dev/null +++ b/ports/utf8h/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "utf8h", + "version-string": "2020-06-14", + "port-version": 1, + "description": "Single header utf8 string functions for C and C++", + "homepage": "https://github.com/sheredom/utf8.h" +} diff --git a/ports/utfz/CONTROL b/ports/utfz/CONTROL deleted file mode 100644 index 1212c4d6d8b83c..00000000000000 --- a/ports/utfz/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: utfz -Version: 1.2-1 -Homepage: https://github.com/IMQS/utfz -Description: A tiny C++ library for parsing and encoding utf-8 diff --git a/ports/utfz/vcpkg.json b/ports/utfz/vcpkg.json new file mode 100644 index 00000000000000..480e32b4d1e75a --- /dev/null +++ b/ports/utfz/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "utfz", + "version-string": "1.2", + "port-version": 2, + "description": "A tiny C++ library for parsing and encoding utf-8", + "homepage": "https://github.com/IMQS/utfz" +} diff --git a/ports/uthenticode/CONTROL b/ports/uthenticode/CONTROL deleted file mode 100644 index eeb4edfa00a031..00000000000000 --- a/ports/uthenticode/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: uthenticode -Version: 1.0.4 -Description: A cross-platform library for verifying Authenticode signatures -Homepage: https://github.com/trailofbits/uthenticode -Supports: !uwp -Build-Depends: pe-parse, openssl diff --git a/ports/uthenticode/vcpkg.json b/ports/uthenticode/vcpkg.json new file mode 100644 index 00000000000000..5bca1b7437e905 --- /dev/null +++ b/ports/uthenticode/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "uthenticode", + "version-string": "1.0.4", + "port-version": 1, + "description": "A cross-platform library for verifying Authenticode signatures", + "homepage": "https://github.com/trailofbits/uthenticode", + "supports": "!uwp", + "dependencies": [ + "openssl", + "pe-parse" + ] +} diff --git a/ports/uvw/CONTROL b/ports/uvw/CONTROL deleted file mode 100644 index 9099c1d6cc366c..00000000000000 --- a/ports/uvw/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: uvw -Version: 2.7.0 -Description: Header-only, event based, tiny and easy to use libuv wrapper in modern C++. -Homepage: https://github.com/skypjack/uvw -Build-Depends: libuv diff --git a/ports/uvw/vcpkg.json b/ports/uvw/vcpkg.json new file mode 100644 index 00000000000000..bd896d781bd00d --- /dev/null +++ b/ports/uvw/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "uvw", + "version-string": "2.7.0", + "port-version": 1, + "description": "Header-only, event based, tiny and easy to use libuv wrapper in modern C++.", + "homepage": "https://github.com/skypjack/uvw", + "dependencies": [ + "libuv" + ] +} diff --git a/ports/v-hacd/CONTROL b/ports/v-hacd/CONTROL deleted file mode 100644 index c642eae7ae7a19..00000000000000 --- a/ports/v-hacd/CONTROL +++ /dev/null @@ -1,13 +0,0 @@ -Source: v-hacd -Version: 3.2.0 -Port-Version: 1 -Homepage: https://github.com/kmammou/v-hacd -Description: The V-HACD library decomposes a 3D surface into a set of "near" convex parts. -Supports: !arm - -Feature: opencl -Description: Builds opencl enabled lib -Build-Depends: opencl - -Feature: openmp -Description: Builds openmp enabled lib diff --git a/ports/v-hacd/vcpkg.json b/ports/v-hacd/vcpkg.json new file mode 100644 index 00000000000000..338e0337be3fcf --- /dev/null +++ b/ports/v-hacd/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "v-hacd", + "version-string": "3.2.0", + "port-version": 2, + "description": "The V-HACD library decomposes a 3D surface into a set of \"near\" convex parts.", + "homepage": "https://github.com/kmammou/v-hacd", + "supports": "!arm", + "features": { + "opencl": { + "description": "Builds opencl enabled lib", + "dependencies": [ + "opencl" + ] + }, + "openmp": { + "description": "Builds openmp enabled lib" + } + } +} diff --git a/ports/valijson/CONTROL b/ports/valijson/CONTROL deleted file mode 100644 index c5394a48b4a1dd..00000000000000 --- a/ports/valijson/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: valijson -Version: 2018-11-17-1 -Description: Header-only C++ library for JSON Schema validation diff --git a/ports/valijson/vcpkg.json b/ports/valijson/vcpkg.json new file mode 100644 index 00000000000000..92fcdf98b157bb --- /dev/null +++ b/ports/valijson/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "valijson", + "version-string": "2018-11-17", + "port-version": 2, + "description": "Header-only C++ library for JSON Schema validation" +} diff --git a/ports/variant-lite/CONTROL b/ports/variant-lite/CONTROL deleted file mode 100644 index 8654b8a3447646..00000000000000 --- a/ports/variant-lite/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: variant-lite -Version: 1.2.2 -Description: A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library diff --git a/ports/variant-lite/vcpkg.json b/ports/variant-lite/vcpkg.json new file mode 100644 index 00000000000000..ad3bad903a56ae --- /dev/null +++ b/ports/variant-lite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "variant-lite", + "version-string": "1.2.2", + "port-version": 1, + "description": "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library" +} diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL deleted file mode 100644 index 8b905405668846..00000000000000 --- a/ports/vc/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: vc -Version: 1.4.2 -Homepage: https://github.com/VcDevel/Vc -Description: SIMD Vector Classes for C++ . -Supports: !arm64 diff --git a/ports/vc/vcpkg.json b/ports/vc/vcpkg.json new file mode 100644 index 00000000000000..d63975fbe86f8b --- /dev/null +++ b/ports/vc/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vc", + "version-string": "1.4.2", + "port-version": 1, + "description": "SIMD Vector Classes for C++ .", + "homepage": "https://github.com/VcDevel/Vc", + "supports": "!arm64" +} diff --git a/ports/vcglib/CONTROL b/ports/vcglib/CONTROL deleted file mode 100644 index 7f52548f4d0d31..00000000000000 --- a/ports/vcglib/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcglib -Version: 1.0.1 -Description: library for manipulation, processing, cleaning, simplifying triangle meshes. -Build-Depends: eigen3 \ No newline at end of file diff --git a/ports/vcglib/vcpkg.json b/ports/vcglib/vcpkg.json new file mode 100644 index 00000000000000..bde2be1d109475 --- /dev/null +++ b/ports/vcglib/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "vcglib", + "version-string": "1.0.1", + "port-version": 1, + "description": "library for manipulation, processing, cleaning, simplifying triangle meshes.", + "dependencies": [ + "eigen3" + ] +} diff --git a/ports/vcpkg-gfortran/CONTROL b/ports/vcpkg-gfortran/CONTROL deleted file mode 100644 index 24bf1ce87643c5..00000000000000 --- a/ports/vcpkg-gfortran/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vcpkg-gfortran -Version: 3 -Description: Metaport to install gfortran dependencies from msys if VCPKG_USE_EXTERNAL_Fortran is false -Supports: windows & !arm \ No newline at end of file diff --git a/ports/vcpkg-gfortran/vcpkg.json b/ports/vcpkg-gfortran/vcpkg.json new file mode 100644 index 00000000000000..604a1626d30cd0 --- /dev/null +++ b/ports/vcpkg-gfortran/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vcpkg-gfortran", + "version-string": "3", + "port-version": 1, + "description": "Metaport to install gfortran dependencies from msys if VCPKG_USE_EXTERNAL_Fortran is false", + "supports": "windows & !arm" +} diff --git a/ports/vectorclass/CONTROL b/ports/vectorclass/CONTROL deleted file mode 100644 index a5110d95c8d7e1..00000000000000 --- a/ports/vectorclass/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: vectorclass -Version: 2.00.01 -Homepage: https://github.com/vectorclass/version2 -Description: C++ class library for using the Single Instruction Multiple Data (SIMD) instructions in modern Microprocessors -Supports: !(arm|arm64) \ No newline at end of file diff --git a/ports/vectorclass/vcpkg.json b/ports/vectorclass/vcpkg.json new file mode 100644 index 00000000000000..ce2f69c8423b4e --- /dev/null +++ b/ports/vectorclass/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "vectorclass", + "version-string": "2.00.01", + "port-version": 1, + "description": "C++ class library for using the Single Instruction Multiple Data (SIMD) instructions in modern Microprocessors", + "homepage": "https://github.com/vectorclass/version2", + "supports": "!(arm | arm64)" +} diff --git a/ports/visit-struct/CONTROL b/ports/visit-struct/CONTROL deleted file mode 100644 index bf895349dc3901..00000000000000 --- a/ports/visit-struct/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: visit-struct -Version: 1.0-1 -Description: A header-only library providing structure visitors for C++11 and C++14 diff --git a/ports/visit-struct/vcpkg.json b/ports/visit-struct/vcpkg.json new file mode 100644 index 00000000000000..0227710a416278 --- /dev/null +++ b/ports/visit-struct/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "visit-struct", + "version-string": "1.0", + "port-version": 2, + "description": "A header-only library providing structure visitors for C++11 and C++14" +} diff --git a/ports/vlfeat/CONTROL b/ports/vlfeat/CONTROL deleted file mode 100644 index d700ed84573f0a..00000000000000 --- a/ports/vlfeat/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vlfeat -Version: 2020-07-10 -Homepage: https://www.vlfeat.org -Description: An open library of computer vision algorithms diff --git a/ports/vlfeat/vcpkg.json b/ports/vlfeat/vcpkg.json new file mode 100644 index 00000000000000..0e0c0d78bf9665 --- /dev/null +++ b/ports/vlfeat/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vlfeat", + "version-string": "2020-07-10", + "port-version": 1, + "description": "An open library of computer vision algorithms", + "homepage": "https://www.vlfeat.org" +} diff --git a/ports/vlpp/CONTROL b/ports/vlpp/CONTROL deleted file mode 100644 index 6f14fe0c5b35a9..00000000000000 --- a/ports/vlpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vlpp -Version: 0.11.0.0 -Homepage: https://github.com/vczh-libraries/Release -Description: Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc diff --git a/ports/vlpp/vcpkg.json b/ports/vlpp/vcpkg.json new file mode 100644 index 00000000000000..85650b62a2ee16 --- /dev/null +++ b/ports/vlpp/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "vlpp", + "version-string": "0.11.0.0", + "port-version": 1, + "description": "Common C++ construction, including string operation / generic container / linq / General-LR parser generator / multithreading / reflection for C++ / etc", + "homepage": "https://github.com/vczh-libraries/Release" +} diff --git a/ports/volk/CONTROL b/ports/volk/CONTROL deleted file mode 100644 index 13101eee8b76ec..00000000000000 --- a/ports/volk/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: volk -Version: 2019-09-26 -Description: Meta loader for Vulkan API. - Note that the static library target volk::volk is built without platform-specific defines. - Use the header-only target volk::volk_headers if you require platform-specific extensions. -Homepage: https://github.com/zeux/volk -Build-Depends: vulkan \ No newline at end of file diff --git a/ports/volk/vcpkg.json b/ports/volk/vcpkg.json new file mode 100644 index 00000000000000..3d3f4a1e64f8b0 --- /dev/null +++ b/ports/volk/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "volk", + "version-string": "2019-09-26", + "port-version": 1, + "description": [ + "Meta loader for Vulkan API.", + "Note that the static library target volk::volk is built without platform-specific defines.", + "Use the header-only target volk::volk_headers if you require platform-specific extensions." + ], + "homepage": "https://github.com/zeux/volk", + "dependencies": [ + "vulkan" + ] +} diff --git a/ports/vtk-dicom/CONTROL b/ports/vtk-dicom/CONTROL deleted file mode 100644 index e8e3494d8e6b6b..00000000000000 --- a/ports/vtk-dicom/CONTROL +++ /dev/null @@ -1,9 +0,0 @@ -Source: vtk-dicom -Version: 0.8.12-1 -Description: DICOM for VTK -Homepage: https://github.com/dgobbi/vtk-dicom -Build-Depends: vtk[core], zlib - -Feature: gdcm -Description: Use gdcm for decompressing DICOM files. -Build-Depends: gdcm diff --git a/ports/vtk-dicom/vcpkg.json b/ports/vtk-dicom/vcpkg.json new file mode 100644 index 00000000000000..097ecde742f4c7 --- /dev/null +++ b/ports/vtk-dicom/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "vtk-dicom", + "version-string": "0.8.12", + "port-version": 2, + "description": "DICOM for VTK", + "homepage": "https://github.com/dgobbi/vtk-dicom", + "dependencies": [ + { + "name": "vtk", + "default-features": false + }, + "zlib" + ], + "features": { + "gdcm": { + "description": "Use gdcm for decompressing DICOM files.", + "dependencies": [ + "gdcm" + ] + } + } +} diff --git a/ports/vulkan-hpp/CONTROL b/ports/vulkan-hpp/CONTROL deleted file mode 100644 index 05f88b6c224406..00000000000000 --- a/ports/vulkan-hpp/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: vulkan-hpp -Version: 1.2.184 -Description: Header only C++ bindings for the Vulkan C API -Build-Depends: vulkan diff --git a/ports/vulkan-hpp/vcpkg.json b/ports/vulkan-hpp/vcpkg.json new file mode 100644 index 00000000000000..b0e141774dc1cb --- /dev/null +++ b/ports/vulkan-hpp/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "vulkan-hpp", + "version-string": "1.2.184", + "port-version": 1, + "description": "Header only C++ bindings for the Vulkan C API", + "dependencies": [ + "vulkan" + ] +} diff --git a/ports/vulkan-memory-allocator/CONTROL b/ports/vulkan-memory-allocator/CONTROL deleted file mode 100644 index 97e2d9892e226b..00000000000000 --- a/ports/vulkan-memory-allocator/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: vulkan-memory-allocator -Version: 2021-07-07 -Description: Easy to integrate Vulkan memory allocation library from GPUOpen diff --git a/ports/vulkan-memory-allocator/vcpkg.json b/ports/vulkan-memory-allocator/vcpkg.json new file mode 100644 index 00000000000000..fe8efacdc1818c --- /dev/null +++ b/ports/vulkan-memory-allocator/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vulkan-memory-allocator", + "version-string": "2021-07-07", + "port-version": 1, + "description": "Easy to integrate Vulkan memory allocation library from GPUOpen" +} diff --git a/ports/vulkan/CONTROL b/ports/vulkan/CONTROL deleted file mode 100644 index 2d4947d31a3db5..00000000000000 --- a/ports/vulkan/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: vulkan -Version: 1.1.82.1-1 -Description: A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices. \ No newline at end of file diff --git a/ports/vulkan/vcpkg.json b/ports/vulkan/vcpkg.json new file mode 100644 index 00000000000000..fa84de0377a5ff --- /dev/null +++ b/ports/vulkan/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "vulkan", + "version-string": "1.1.82.1", + "port-version": 2, + "description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices." +} diff --git a/ports/vxl/CONTROL b/ports/vxl/CONTROL deleted file mode 100644 index 4e6ba9d27b76be..00000000000000 --- a/ports/vxl/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: vxl -Version: 2.0.2 -Port-Version: 2 -Build-Depends: bzip2, expat, libgeotiff, libjpeg-turbo, libpng, shapelib, tiff, zlib -Description: A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding. - -Feature: core-imaging -Description: core-imaging support for vxl diff --git a/ports/vxl/vcpkg.json b/ports/vxl/vcpkg.json new file mode 100644 index 00000000000000..c039f14ae26719 --- /dev/null +++ b/ports/vxl/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "vxl", + "version-string": "2.0.2", + "port-version": 3, + "description": "A multi-platform collection of C++ software libraries for Computer Vision and Image Understanding.", + "dependencies": [ + "bzip2", + "expat", + "libgeotiff", + "libjpeg-turbo", + "libpng", + "shapelib", + "tiff", + "zlib" + ], + "features": { + "core-imaging": { + "description": "core-imaging support for vxl" + } + } +} diff --git a/ports/wampcc/CONTROL b/ports/wampcc/CONTROL deleted file mode 100644 index 52311079d18ce7..00000000000000 --- a/ports/wampcc/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: wampcc -Build-Depends: openssl, libuv, jansson -Version: 2019-09-04 -Description: Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol. - -Feature: utils -Description: Build utility apps - -Feature: examples -Description: Build example apps \ No newline at end of file diff --git a/ports/wampcc/vcpkg.json b/ports/wampcc/vcpkg.json new file mode 100644 index 00000000000000..da8a456f1e77c2 --- /dev/null +++ b/ports/wampcc/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "wampcc", + "version-string": "2019-09-04", + "port-version": 1, + "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.", + "dependencies": [ + "jansson", + "libuv", + "openssl" + ], + "features": { + "examples": { + "description": "Build example apps" + }, + "utils": { + "description": "Build utility apps" + } + } +} diff --git a/ports/wavpack/CONTROL b/ports/wavpack/CONTROL deleted file mode 100644 index 0064da522795c3..00000000000000 --- a/ports/wavpack/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: wavpack -Version: 5.3.0 -Port-Version: 1 -Homepage: https://github.com/dbry/WavPack -Description: WavPack encode/decode library, command-line programs, and several plugins -Supports: !(arm|arm64) \ No newline at end of file diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json new file mode 100644 index 00000000000000..6812cdcd5b4cf9 --- /dev/null +++ b/ports/wavpack/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "wavpack", + "version-string": "5.3.0", + "port-version": 2, + "description": "WavPack encode/decode library, command-line programs, and several plugins", + "homepage": "https://github.com/dbry/WavPack", + "supports": "!(arm | arm64)" +} diff --git a/ports/wg21-sg14/CONTROL b/ports/wg21-sg14/CONTROL deleted file mode 100644 index e096972261daba..00000000000000 --- a/ports/wg21-sg14/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wg21-sg14 -Version: 2019-08-13 -Description: A library for Study Group 14 of Working Group 21 (C++) -Homepage: https://github.com/WG21-SG14/SG14 diff --git a/ports/wg21-sg14/vcpkg.json b/ports/wg21-sg14/vcpkg.json new file mode 100644 index 00000000000000..4999f444bd8d7d --- /dev/null +++ b/ports/wg21-sg14/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wg21-sg14", + "version-string": "2019-08-13", + "port-version": 1, + "description": "A library for Study Group 14 of Working Group 21 (C++)", + "homepage": "https://github.com/WG21-SG14/SG14" +} diff --git a/ports/wil/CONTROL b/ports/wil/CONTROL deleted file mode 100644 index 09540d3b896c55..00000000000000 --- a/ports/wil/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wil -Version: 2021-08-03 -Homepage: https://github.com/microsoft/wil -Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns. diff --git a/ports/wil/vcpkg.json b/ports/wil/vcpkg.json new file mode 100644 index 00000000000000..fca2add1144a16 --- /dev/null +++ b/ports/wil/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wil", + "version-string": "2021-08-03", + "port-version": 1, + "description": "The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.", + "homepage": "https://github.com/microsoft/wil" +} diff --git a/ports/wildmidi/CONTROL b/ports/wildmidi/CONTROL deleted file mode 100644 index 0c6b401ff19b9c..00000000000000 --- a/ports/wildmidi/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wildmidi -Version: 0.4.3-1 -Homepage: https://github.com/Mindwerks/wildmidi -Description: MIDI software synthesizer library. diff --git a/ports/wildmidi/vcpkg.json b/ports/wildmidi/vcpkg.json new file mode 100644 index 00000000000000..8831d91f0c1390 --- /dev/null +++ b/ports/wildmidi/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wildmidi", + "version-string": "0.4.3", + "port-version": 2, + "description": "MIDI software synthesizer library.", + "homepage": "https://github.com/Mindwerks/wildmidi" +} diff --git a/ports/wincrypt/CONTROL b/ports/wincrypt/CONTROL deleted file mode 100644 index 615d2c3d91c751..00000000000000 --- a/ports/wincrypt/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: wincrypt -Version: 0.0-2 -Description: Windows Cryptography. \ No newline at end of file diff --git a/ports/wincrypt/vcpkg.json b/ports/wincrypt/vcpkg.json new file mode 100644 index 00000000000000..02cad22f7c9d86 --- /dev/null +++ b/ports/wincrypt/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "wincrypt", + "version-string": "0.0", + "port-version": 3, + "description": "Windows Cryptography." +} diff --git a/ports/winpcap/CONTROL b/ports/winpcap/CONTROL deleted file mode 100644 index c745c2d96ae12f..00000000000000 --- a/ports/winpcap/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: winpcap -Version: 4.1.3 -Port-Version: 4 -Homepage: https://www.winpcap.org -Description: WinPcap is the industry-standard tool for link-layer network access in Windows environments. diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json new file mode 100644 index 00000000000000..b584c0f6bd6bd1 --- /dev/null +++ b/ports/winpcap/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "winpcap", + "version-string": "4.1.3", + "port-version": 5, + "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", + "homepage": "https://www.winpcap.org" +} diff --git a/ports/winreg/CONTROL b/ports/winreg/CONTROL deleted file mode 100644 index f512bdeaadb32f..00000000000000 --- a/ports/winreg/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: winreg -Version: 4.1.0 -Homepage: https://github.com/GiovanniDicanio/WinReg -Description: High-level C++ wrapper around the Windows Registry C API. -Supports: windows|uwp \ No newline at end of file diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json new file mode 100644 index 00000000000000..76836441ebb03b --- /dev/null +++ b/ports/winreg/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "winreg", + "version-string": "4.1.0", + "port-version": 1, + "description": "High-level C++ wrapper around the Windows Registry C API.", + "homepage": "https://github.com/GiovanniDicanio/WinReg", + "supports": "windows | uwp" +} diff --git a/ports/winsock2/CONTROL b/ports/winsock2/CONTROL deleted file mode 100644 index 1f8aff430cf0fa..00000000000000 --- a/ports/winsock2/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: winsock2 -Version: 0.0-2 -Description: Windows Sockets. \ No newline at end of file diff --git a/ports/winsock2/vcpkg.json b/ports/winsock2/vcpkg.json new file mode 100644 index 00000000000000..472dc00d27e74c --- /dev/null +++ b/ports/winsock2/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "winsock2", + "version-string": "0.0", + "port-version": 3, + "description": "Windows Sockets." +} diff --git a/ports/wintoast/CONTROL b/ports/wintoast/CONTROL deleted file mode 100644 index 033a5abdf2d8da..00000000000000 --- a/ports/wintoast/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wintoast -Version: 1.2.0 -Description: WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10. -Supports: !uwp \ No newline at end of file diff --git a/ports/wintoast/vcpkg.json b/ports/wintoast/vcpkg.json new file mode 100644 index 00000000000000..2d0a41de5d2fe4 --- /dev/null +++ b/ports/wintoast/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wintoast", + "version-string": "1.2.0", + "port-version": 1, + "description": "WinToast is a lightly library written in C++ which brings a complete integration of the modern toast notifications of Windows 8 & Windows 10.", + "supports": "!uwp" +} diff --git a/ports/woff2/CONTROL b/ports/woff2/CONTROL deleted file mode 100644 index 69a5c0ce25d94c..00000000000000 --- a/ports/woff2/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: woff2 -Version: 1.0.2 -Build-Depends: brotli -Port-Version: 1 -Description: font compression reference code diff --git a/ports/woff2/vcpkg.json b/ports/woff2/vcpkg.json new file mode 100644 index 00000000000000..122fc73cc10d32 --- /dev/null +++ b/ports/woff2/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "woff2", + "version-string": "1.0.2", + "port-version": 2, + "description": "font compression reference code", + "dependencies": [ + "brotli" + ] +} diff --git a/ports/wordnet/CONTROL b/ports/wordnet/CONTROL deleted file mode 100644 index 59aca0bf0aa0b8..00000000000000 --- a/ports/wordnet/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: wordnet -Version: 3.0 -Description: WordNet is a large lexical database of English - -Feature: dbfiles -Description: WordNet 3.1 database files diff --git a/ports/wordnet/vcpkg.json b/ports/wordnet/vcpkg.json new file mode 100644 index 00000000000000..ffa68c3f26bfc9 --- /dev/null +++ b/ports/wordnet/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "wordnet", + "version-string": "3.0", + "port-version": 1, + "description": "WordNet is a large lexical database of English", + "features": { + "dbfiles": { + "description": "WordNet 3.1 database files" + } + } +} diff --git a/ports/wpilib/CONTROL b/ports/wpilib/CONTROL deleted file mode 100644 index 913521505e8b5f..00000000000000 --- a/ports/wpilib/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: wpilib -Version: 2020.3.2 -Homepage: https://github.com/wpilibsuite/allwpilib -Build-Depends: eigen3, libuv -Description: WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library. -Supports: !osx - -Feature: cameraserver -Build-Depends: opencv -Description: Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams - -Feature: allwpilib -Build-Depends: wpilib[cameraserver], opencv -Description: Enables the simulation HAL, and the high level wpilibc library. diff --git a/ports/wpilib/vcpkg.json b/ports/wpilib/vcpkg.json new file mode 100644 index 00000000000000..c96157cc6ad224 --- /dev/null +++ b/ports/wpilib/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "wpilib", + "version-string": "2020.3.2", + "port-version": 1, + "description": "WPILib is the software library package for the FIRST Robotics Competition. The core install includes wpiutil, a common utilies library, and ntcore, the base NetworkTables library.", + "homepage": "https://github.com/wpilibsuite/allwpilib", + "supports": "!osx", + "dependencies": [ + "eigen3", + "libuv" + ], + "features": { + "allwpilib": { + "description": "Enables the simulation HAL, and the high level wpilibc library.", + "dependencies": [ + "opencv", + { + "name": "wpilib", + "features": [ + "cameraserver" + ] + } + ] + }, + "cameraserver": { + "description": "Enables the CameraServer and CSCore libraries for manipulating USB Cameras and HTTP Camera Streams", + "dependencies": [ + "opencv" + ] + } + } +} diff --git a/ports/wren/CONTROL b/ports/wren/CONTROL deleted file mode 100644 index 7ea85e1653faf1..00000000000000 --- a/ports/wren/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wren -Version: 2019-07-01 -Homepage: https://github.com/wren-lang/wren -Description: Wren is a small, fast, class-based concurrent scripting language. diff --git a/ports/wren/vcpkg.json b/ports/wren/vcpkg.json new file mode 100644 index 00000000000000..09f2b8aed7aece --- /dev/null +++ b/ports/wren/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wren", + "version-string": "2019-07-01", + "port-version": 1, + "description": "Wren is a small, fast, class-based concurrent scripting language.", + "homepage": "https://github.com/wren-lang/wren" +} diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL deleted file mode 100644 index 50ae4fbc78ae83..00000000000000 --- a/ports/wt/CONTROL +++ /dev/null @@ -1,29 +0,0 @@ -Source: wt -Version: 4.5.0 -Homepage: https://github.com/emweb/wt -Description: Wt is a C++ library for developing web applications -Build-Depends: zlib, libpng, pango (!windows), harfbuzz (!windows), libharu, glew, boost-algorithm, boost-array, boost-asio, boost-bind, boost-config, boost-container-hash, boost-filesystem, boost-fusion, boost-interprocess, boost-lexical-cast, boost-logic, boost-math, boost-multi-index, boost-optional, boost-phoenix, boost-pool, boost-program-options, boost-range, boost-serialization, boost-smart-ptr, boost-spirit, boost-system, boost-thread, boost-tokenizer, boost-tuple, boost-ublas, boost-variant -Default-Features: openssl - -Feature: dbo -Description: Wt::Dbo - -Feature: postgresql -Description: Wt::Dbo PostgreSQL backend -Build-Depends: libpq, wt[dbo] - -Feature: sqlite3 -Description: Wt::Dbo Sqlite 3 backend -Build-Depends: sqlite3, wt[dbo] - -Feature: sqlserver -Description: Wt::Dbo MS SQL Server backend -Build-Depends: unixodbc (!windows), wt[dbo] - -Feature: openssl -Description: TLS support -Build-Depends: openssl - -Feature: graphicsmagick -Description: WRasterImage support on non-Windows based on GraphicsMagick -Build-Depends: graphicsmagick diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json new file mode 100644 index 00000000000000..7a92d9228ed5f2 --- /dev/null +++ b/ports/wt/vcpkg.json @@ -0,0 +1,107 @@ +{ + "name": "wt", + "version-string": "4.5.0", + "port-version": 1, + "description": "Wt is a C++ library for developing web applications", + "homepage": "https://github.com/emweb/wt", + "dependencies": [ + "boost-algorithm", + "boost-array", + "boost-asio", + "boost-bind", + "boost-config", + "boost-container-hash", + "boost-filesystem", + "boost-fusion", + "boost-interprocess", + "boost-lexical-cast", + "boost-logic", + "boost-math", + "boost-multi-index", + "boost-optional", + "boost-phoenix", + "boost-pool", + "boost-program-options", + "boost-range", + "boost-serialization", + "boost-smart-ptr", + "boost-spirit", + "boost-system", + "boost-thread", + "boost-tokenizer", + "boost-tuple", + "boost-ublas", + "boost-variant", + "glew", + { + "name": "harfbuzz", + "platform": "!windows" + }, + "libharu", + "libpng", + { + "name": "pango", + "platform": "!windows" + }, + "zlib" + ], + "default-features": [ + "openssl" + ], + "features": { + "dbo": { + "description": "Wt::Dbo" + }, + "graphicsmagick": { + "description": "WRasterImage support on non-Windows based on GraphicsMagick", + "dependencies": [ + "graphicsmagick" + ] + }, + "openssl": { + "description": "TLS support", + "dependencies": [ + "openssl" + ] + }, + "postgresql": { + "description": "Wt::Dbo PostgreSQL backend", + "dependencies": [ + "libpq", + { + "name": "wt", + "features": [ + "dbo" + ] + } + ] + }, + "sqlite3": { + "description": "Wt::Dbo Sqlite 3 backend", + "dependencies": [ + "sqlite3", + { + "name": "wt", + "features": [ + "dbo" + ] + } + ] + }, + "sqlserver": { + "description": "Wt::Dbo MS SQL Server backend", + "dependencies": [ + { + "name": "unixodbc", + "platform": "!windows" + }, + { + "name": "wt", + "features": [ + "dbo" + ] + } + ] + } + } +} diff --git a/ports/wtl/CONTROL b/ports/wtl/CONTROL deleted file mode 100644 index f5c30a138c0d4f..00000000000000 --- a/ports/wtl/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: wtl -Version: 10.0.10320 -Homepage: https://sourceforge.net/projects/wtl/ -Description: Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components. diff --git a/ports/wtl/vcpkg.json b/ports/wtl/vcpkg.json new file mode 100644 index 00000000000000..733316f0d96575 --- /dev/null +++ b/ports/wtl/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "wtl", + "version-string": "10.0.10320", + "port-version": 1, + "description": "Windows Template Library (WTL) is a C++ library for developing Windows applications and UI components.", + "homepage": "https://sourceforge.net/projects/wtl/" +} diff --git a/ports/x265/CONTROL b/ports/x265/CONTROL deleted file mode 100644 index b848f47e99797a..00000000000000 --- a/ports/x265/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: x265 -Version: 3.4 -Port-Version: 4 -Homepage: https://github.com/videolan/x265 -Description: x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream. -Supports: !(uwp | arm) diff --git a/ports/x265/vcpkg.json b/ports/x265/vcpkg.json new file mode 100644 index 00000000000000..cc19a6f2b9ab02 --- /dev/null +++ b/ports/x265/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "x265", + "version-string": "3.4", + "port-version": 5, + "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.", + "homepage": "https://github.com/videolan/x265", + "supports": "!(uwp | arm)" +} diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL deleted file mode 100644 index 54032ce8cd9c86..00000000000000 --- a/ports/xerces-c/CONTROL +++ /dev/null @@ -1,12 +0,0 @@ -Source: xerces-c -Version: 3.2.3-1 -Homepage: https://github.com/apache/xerces-c -Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. - -Feature: icu -Description: ICU support -Build-Depends: icu - -Feature: xmlch-wchar -Description: XMLCh type uses wchar_t - diff --git a/ports/xerces-c/vcpkg.json b/ports/xerces-c/vcpkg.json new file mode 100644 index 00000000000000..fb3ff4cab6bed4 --- /dev/null +++ b/ports/xerces-c/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xerces-c", + "version-string": "3.2.3", + "port-version": 2, + "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.", + "homepage": "https://github.com/apache/xerces-c", + "features": { + "icu": { + "description": "ICU support", + "dependencies": [ + "icu" + ] + }, + "xmlch-wchar": { + "description": "XMLCh type uses wchar_t" + } + } +} diff --git a/ports/xeus/CONTROL b/ports/xeus/CONTROL deleted file mode 100644 index c190f9a62300bc..00000000000000 --- a/ports/xeus/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: xeus -Version: 0.24.3 -Homepage: https://github.com/jupyter-xeus/xeus -Description: C++ implementation of the Jupyter kernel protocol -Build-Depends: cppzmq, libuuid (linux), nlohmann-json, openssl, xtl, zeromq diff --git a/ports/xeus/vcpkg.json b/ports/xeus/vcpkg.json new file mode 100644 index 00000000000000..178c6e7163bf02 --- /dev/null +++ b/ports/xeus/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "xeus", + "version-string": "0.24.3", + "port-version": 1, + "description": "C++ implementation of the Jupyter kernel protocol", + "homepage": "https://github.com/jupyter-xeus/xeus", + "dependencies": [ + "cppzmq", + { + "name": "libuuid", + "platform": "linux" + }, + "nlohmann-json", + "openssl", + "xtl", + "zeromq" + ] +} diff --git a/ports/xframe/CONTROL b/ports/xframe/CONTROL deleted file mode 100644 index a9b7721c116cd3..00000000000000 --- a/ports/xframe/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: xframe -Version: 0.3.0 -Description: xframe is a dataframe for C++, based on xtensor and xtl. -Homepage: https://github.com/xtensor-stack/xframe -Build-Depends: xtensor, xtl diff --git a/ports/xframe/vcpkg.json b/ports/xframe/vcpkg.json new file mode 100644 index 00000000000000..663ca1f2a3084e --- /dev/null +++ b/ports/xframe/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "xframe", + "version-string": "0.3.0", + "port-version": 1, + "description": "xframe is a dataframe for C++, based on xtensor and xtl.", + "homepage": "https://github.com/xtensor-stack/xframe", + "dependencies": [ + "xtensor", + "xtl" + ] +} diff --git a/ports/xmsh/CONTROL b/ports/xmsh/CONTROL deleted file mode 100644 index 758a54ba3a1cca..00000000000000 --- a/ports/xmsh/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: xmsh -Version: 0.5.2-1 -Description: Reference Implementation of XMSH Library -Build-Depends: tl-expected, nlohmann-json -Homepage: https://gitlab.com/libxmsh/xmsh \ No newline at end of file diff --git a/ports/xmsh/vcpkg.json b/ports/xmsh/vcpkg.json new file mode 100644 index 00000000000000..fedee5f028236e --- /dev/null +++ b/ports/xmsh/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "xmsh", + "version-string": "0.5.2", + "port-version": 2, + "description": "Reference Implementation of XMSH Library", + "homepage": "https://gitlab.com/libxmsh/xmsh", + "dependencies": [ + "nlohmann-json", + "tl-expected" + ] +} diff --git a/ports/xproperty/CONTROL b/ports/xproperty/CONTROL deleted file mode 100644 index ba2ed12ab6f463..00000000000000 --- a/ports/xproperty/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: xproperty -Version: 0.8.1 -Build-Depends: xtl -Description: Traitlets-like C++ properties and implementation of the observer pattern diff --git a/ports/xproperty/vcpkg.json b/ports/xproperty/vcpkg.json new file mode 100644 index 00000000000000..31b7c10940884f --- /dev/null +++ b/ports/xproperty/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "xproperty", + "version-string": "0.8.1", + "port-version": 1, + "description": "Traitlets-like C++ properties and implementation of the observer pattern", + "dependencies": [ + "xtl" + ] +} diff --git a/ports/xsimd/CONTROL b/ports/xsimd/CONTROL deleted file mode 100644 index 5e4057b4bef89c..00000000000000 --- a/ports/xsimd/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: xsimd -Version: 7.4.9 -Description: Modern, portable C++ wrappers for SIMD intrinsics -Homepage: https://github.com/xtensor-stack/xsimd - -Feature: xcomplex -Description: xtl complex support -Build-Depends: xtl diff --git a/ports/xsimd/vcpkg.json b/ports/xsimd/vcpkg.json new file mode 100644 index 00000000000000..239aa1315044c8 --- /dev/null +++ b/ports/xsimd/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "xsimd", + "version-string": "7.4.9", + "port-version": 1, + "description": "Modern, portable C++ wrappers for SIMD intrinsics", + "homepage": "https://github.com/xtensor-stack/xsimd", + "features": { + "xcomplex": { + "description": "xtl complex support", + "dependencies": [ + "xtl" + ] + } + } +} diff --git a/ports/xtensor-blas/CONTROL b/ports/xtensor-blas/CONTROL deleted file mode 100644 index 63cce62a7d2fbb..00000000000000 --- a/ports/xtensor-blas/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: xtensor-blas -Version: 0.17.2 -Description: BLAS extension to xtensor -Homepage: https://github.com/xtensor-stack/xtensor-blas -Build-Depends: xtensor diff --git a/ports/xtensor-blas/vcpkg.json b/ports/xtensor-blas/vcpkg.json new file mode 100644 index 00000000000000..cdf9ce55ca7643 --- /dev/null +++ b/ports/xtensor-blas/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "xtensor-blas", + "version-string": "0.17.2", + "port-version": 1, + "description": "BLAS extension to xtensor", + "homepage": "https://github.com/xtensor-stack/xtensor-blas", + "dependencies": [ + "xtensor" + ] +} diff --git a/ports/xtensor-fftw/CONTROL b/ports/xtensor-fftw/CONTROL deleted file mode 100644 index c757db69b20cb8..00000000000000 --- a/ports/xtensor-fftw/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: xtensor-fftw -Version: 2019-11-30 -Description: FFTW bindings for the xtensor C++14 multi-dimensional array library -Homepage: https://github.com/xtensor-stack/xtensor-fftw -Build-Depends: fftw3, xtensor diff --git a/ports/xtensor-fftw/vcpkg.json b/ports/xtensor-fftw/vcpkg.json new file mode 100644 index 00000000000000..22d6e69a88e7e2 --- /dev/null +++ b/ports/xtensor-fftw/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "xtensor-fftw", + "version-string": "2019-11-30", + "port-version": 1, + "description": "FFTW bindings for the xtensor C++14 multi-dimensional array library", + "homepage": "https://github.com/xtensor-stack/xtensor-fftw", + "dependencies": [ + "fftw3", + "xtensor" + ] +} diff --git a/ports/xxhash/CONTROL b/ports/xxhash/CONTROL deleted file mode 100644 index e4be4cb27a876d..00000000000000 --- a/ports/xxhash/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: xxhash -Version: 0.8.0 -Port-Version: 1 -Homepage: https://github.com/Cyan4973/xxHash -Description: Extremely fast hash algorithm - -Feature: xxhsum -Description: Build the xxhsum binary diff --git a/ports/xxhash/vcpkg.json b/ports/xxhash/vcpkg.json new file mode 100644 index 00000000000000..3337184136eae1 --- /dev/null +++ b/ports/xxhash/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "xxhash", + "version-string": "0.8.0", + "port-version": 2, + "description": "Extremely fast hash algorithm", + "homepage": "https://github.com/Cyan4973/xxHash", + "features": { + "xxhsum": { + "description": "Build the xxhsum binary" + } + } +} diff --git a/ports/yajl/CONTROL b/ports/yajl/CONTROL deleted file mode 100644 index 6811dc84af43e9..00000000000000 --- a/ports/yajl/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: yajl -Version: 2.1.0-1 -Description: Yet Another JSON Library diff --git a/ports/yajl/vcpkg.json b/ports/yajl/vcpkg.json new file mode 100644 index 00000000000000..7d05045ab23362 --- /dev/null +++ b/ports/yajl/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "yajl", + "version-string": "2.1.0", + "port-version": 2, + "description": "Yet Another JSON Library" +} diff --git a/ports/yas/CONTROL b/ports/yas/CONTROL deleted file mode 100644 index 4dc65073608e69..00000000000000 --- a/ports/yas/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: yas -Version: 7.0.5 -Homepage: https://github.com/niXman/yas -Description: Yet Another Serialization is a header only serialization library diff --git a/ports/yas/vcpkg.json b/ports/yas/vcpkg.json new file mode 100644 index 00000000000000..13dd7c5addb9a5 --- /dev/null +++ b/ports/yas/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "yas", + "version-string": "7.0.5", + "port-version": 1, + "description": "Yet Another Serialization is a header only serialization library", + "homepage": "https://github.com/niXman/yas" +} diff --git a/ports/yasm/CONTROL b/ports/yasm/CONTROL deleted file mode 100644 index bdcaaea9f46e88..00000000000000 --- a/ports/yasm/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: yasm -Version: 1.3.0 -Homepage: https://github.com/yasm/yasm -Description: Yasm is a complete rewrite of the NASM assembler under the “new†BSD License. -Supports: windows & !uwp & !arm \ No newline at end of file diff --git a/ports/yasm/vcpkg.json b/ports/yasm/vcpkg.json new file mode 100644 index 00000000000000..6a0176dd8ff53a --- /dev/null +++ b/ports/yasm/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "yasm", + "version-string": "1.3.0", + "port-version": 1, + "description": "Yasm is a complete rewrite of the NASM assembler under the “new†BSD License.", + "homepage": "https://github.com/yasm/yasm", + "supports": "windows & !uwp & !arm" +} diff --git a/ports/yato/CONTROL b/ports/yato/CONTROL deleted file mode 100644 index 65546494d0e1e8..00000000000000 --- a/ports/yato/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: yato -Version: 1.0-2 -Description: Modern C++14 containers and utilities, actors system, typesafe config diff --git a/ports/yato/vcpkg.json b/ports/yato/vcpkg.json new file mode 100644 index 00000000000000..7a5840b6ffaaad --- /dev/null +++ b/ports/yato/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "yato", + "version-string": "1.0", + "port-version": 3, + "description": "Modern C++14 containers and utilities, actors system, typesafe config" +} diff --git a/ports/yoga/CONTROL b/ports/yoga/CONTROL deleted file mode 100644 index 5237aeed271954..00000000000000 --- a/ports/yoga/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: yoga -Version: 1.18.0-1 -Homepage: https://github.com/facebook/yoga -Description: Yoga is a cross-platform layout engine which implements Flexbox -Supports: !uwp diff --git a/ports/yoga/vcpkg.json b/ports/yoga/vcpkg.json new file mode 100644 index 00000000000000..03e86b78587536 --- /dev/null +++ b/ports/yoga/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "yoga", + "version-string": "1.18.0", + "port-version": 2, + "description": "Yoga is a cross-platform layout engine which implements Flexbox", + "homepage": "https://github.com/facebook/yoga", + "supports": "!uwp" +} diff --git a/ports/z85/CONTROL b/ports/z85/CONTROL deleted file mode 100644 index 24fc16050ced41..00000000000000 --- a/ports/z85/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: z85 -Version: 1.0 -Description: Z85 is a binary-to-text encoding library. It implements ZeroMQ Base-85 Encoding Algorithm and provides custom padding. \ No newline at end of file diff --git a/ports/z85/vcpkg.json b/ports/z85/vcpkg.json new file mode 100644 index 00000000000000..66f96178accb29 --- /dev/null +++ b/ports/z85/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "z85", + "version-string": "1.0", + "port-version": 1, + "description": "Z85 is a binary-to-text encoding library. It implements ZeroMQ Base-85 Encoding Algorithm and provides custom padding." +} diff --git a/ports/zfp/CONTROL b/ports/zfp/CONTROL deleted file mode 100644 index 164bade9d5b5f5..00000000000000 --- a/ports/zfp/CONTROL +++ /dev/null @@ -1,19 +0,0 @@ -Source: zfp -Version: 0.5.5-2 -Homepage: https://github.com/LLNL/zfp -Description: Zfp is an open source C/C++ library for compressed numerical arrays that support high throughput read and write random access. zfp also supports streaming compression of integer and floating-point data, e.g., for applications that read and write large data sets to and from disk. zfp is primarily written in C and C++ but also includes Python and Fortran bindings. - -Feature: all -Description: Build all components - -Feature: cfp -Description: cfp support for cfp - -Feature: test -Description: Build test - -Feature: example -Description: Build example - -Feature: utility -Description: Build utility \ No newline at end of file diff --git a/ports/zfp/vcpkg.json b/ports/zfp/vcpkg.json new file mode 100644 index 00000000000000..e0313dbf8493d4 --- /dev/null +++ b/ports/zfp/vcpkg.json @@ -0,0 +1,24 @@ +{ + "name": "zfp", + "version-string": "0.5.5", + "port-version": 3, + "description": "Zfp is an open source C/C++ library for compressed numerical arrays that support high throughput read and write random access. zfp also supports streaming compression of integer and floating-point data, e.g., for applications that read and write large data sets to and from disk. zfp is primarily written in C and C++ but also includes Python and Fortran bindings.", + "homepage": "https://github.com/LLNL/zfp", + "features": { + "all": { + "description": "Build all components" + }, + "cfp": { + "description": "cfp support for cfp" + }, + "example": { + "description": "Build example" + }, + "test": { + "description": "Build test" + }, + "utility": { + "description": "Build utility" + } + } +} diff --git a/ports/zkpp/CONTROL b/ports/zkpp/CONTROL deleted file mode 100644 index 5b8aab4277c0d7..00000000000000 --- a/ports/zkpp/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: zkpp -Version: 0.2.3 -Homepage: https://github.com/tgockel/zookeeper-cpp -Description: A ZooKeeper client for C++. -Build-Depends: zookeeper diff --git a/ports/zkpp/vcpkg.json b/ports/zkpp/vcpkg.json new file mode 100644 index 00000000000000..51000a32df1ff8 --- /dev/null +++ b/ports/zkpp/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "zkpp", + "version-string": "0.2.3", + "port-version": 1, + "description": "A ZooKeeper client for C++.", + "homepage": "https://github.com/tgockel/zookeeper-cpp", + "dependencies": [ + "zookeeper" + ] +} diff --git a/ports/zookeeper/CONTROL b/ports/zookeeper/CONTROL deleted file mode 100644 index 43c5407ff849c5..00000000000000 --- a/ports/zookeeper/CONTROL +++ /dev/null @@ -1,7 +0,0 @@ -Source: zookeeper -Version: 3.5.5-1 -Description: ZooKeeper C bindings -Default-Features: sync - -Feature: sync -Description: ZooKeeper with the sync API \ No newline at end of file diff --git a/ports/zookeeper/vcpkg.json b/ports/zookeeper/vcpkg.json new file mode 100644 index 00000000000000..20e655e5aa6ca1 --- /dev/null +++ b/ports/zookeeper/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "zookeeper", + "version-string": "3.5.5", + "port-version": 2, + "description": "ZooKeeper C bindings", + "default-features": [ + "sync" + ], + "features": { + "sync": { + "description": "ZooKeeper with the sync API" + } + } +} diff --git a/ports/zopfli/CONTROL b/ports/zopfli/CONTROL deleted file mode 100644 index 97261af029a17d..00000000000000 --- a/ports/zopfli/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: zopfli -Version: 1.0.3 -Homepage: https://github.com/google/zopfli -Description: Zopfli Compression Algorithm compression library programmed in C diff --git a/ports/zopfli/vcpkg.json b/ports/zopfli/vcpkg.json new file mode 100644 index 00000000000000..668234f532cbe7 --- /dev/null +++ b/ports/zopfli/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zopfli", + "version-string": "1.0.3", + "port-version": 1, + "description": "Zopfli Compression Algorithm compression library programmed in C", + "homepage": "https://github.com/google/zopfli" +} diff --git a/ports/zserge-webview/CONTROL b/ports/zserge-webview/CONTROL deleted file mode 100644 index a595bee399013a..00000000000000 --- a/ports/zserge-webview/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: zserge-webview -Version: 2019-04-27-2 -Description: Tiny cross-platform webview library for C/C++/Golang. diff --git a/ports/zserge-webview/vcpkg.json b/ports/zserge-webview/vcpkg.json new file mode 100644 index 00000000000000..dbdfa5bf12e410 --- /dev/null +++ b/ports/zserge-webview/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "zserge-webview", + "version-string": "2019-04-27", + "port-version": 3, + "description": "Tiny cross-platform webview library for C/C++/Golang." +} diff --git a/ports/zstr/CONTROL b/ports/zstr/CONTROL deleted file mode 100644 index 0dfa225228c357..00000000000000 --- a/ports/zstr/CONTROL +++ /dev/null @@ -1,3 +0,0 @@ -Source: zstr -Version: 1.0.4 -Description: This C++ header-only library enables the use of C++ standard iostreams to access ZLib-compressed streams. \ No newline at end of file diff --git a/ports/zstr/vcpkg.json b/ports/zstr/vcpkg.json new file mode 100644 index 00000000000000..d0f5f31b39f3fa --- /dev/null +++ b/ports/zstr/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "zstr", + "version-string": "1.0.4", + "port-version": 1, + "description": "This C++ header-only library enables the use of C++ standard iostreams to access ZLib-compressed streams." +} diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL deleted file mode 100644 index 73507fea17f7ef..00000000000000 --- a/ports/zxing-cpp/CONTROL +++ /dev/null @@ -1,14 +0,0 @@ -Source: zxing-cpp -Version: 2020-12-2 -Homepage: https://github.com/glassechidna/zxing-cpp -Description: Barcode detection and decoding library. -Build-Depends: bigint -Default-Features: opencv, iconv - -Feature: opencv -Build-Depends: opencv -Description: Build with opencv - -Feature: iconv -Build-Depends: libiconv -Description: Build with libiconv \ No newline at end of file diff --git a/ports/zxing-cpp/vcpkg.json b/ports/zxing-cpp/vcpkg.json new file mode 100644 index 00000000000000..feb43da34a559a --- /dev/null +++ b/ports/zxing-cpp/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "zxing-cpp", + "version-string": "2020-12", + "port-version": 3, + "description": "Barcode detection and decoding library.", + "homepage": "https://github.com/glassechidna/zxing-cpp", + "dependencies": [ + "bigint" + ], + "default-features": [ + "iconv", + "opencv" + ], + "features": { + "iconv": { + "description": "Build with libiconv", + "dependencies": [ + "libiconv" + ] + }, + "opencv": { + "description": "Build with opencv", + "dependencies": [ + "opencv" + ] + } + } +} diff --git a/ports/zydis/CONTROL b/ports/zydis/CONTROL deleted file mode 100644 index 4bb8dd70f4a6af..00000000000000 --- a/ports/zydis/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: zydis -Version: 3.1.0-1 -Homepage: https://zydis.re -Description: Fast and lightweight x86/x86-64 disassembler library. diff --git a/ports/zydis/vcpkg.json b/ports/zydis/vcpkg.json new file mode 100644 index 00000000000000..1a04f16a8731ee --- /dev/null +++ b/ports/zydis/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "zydis", + "version-string": "3.1.0", + "port-version": 2, + "description": "Fast and lightweight x86/x86-64 disassembler library.", + "homepage": "https://zydis.re" +} diff --git a/ports/zyre/CONTROL b/ports/zyre/CONTROL deleted file mode 100644 index 5351afb3e035a5..00000000000000 --- a/ports/zyre/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: zyre -Version: 2019-07-07-1 -Build-Depends: czmq -Description: An open-source framework for proximity-based peer-to-peer applications -Homepage: https://github.com/zeromq/zyre diff --git a/ports/zyre/vcpkg.json b/ports/zyre/vcpkg.json new file mode 100644 index 00000000000000..ca7068be0f19e3 --- /dev/null +++ b/ports/zyre/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "zyre", + "version-string": "2019-07-07", + "port-version": 2, + "description": "An open-source framework for proximity-based peer-to-peer applications", + "homepage": "https://github.com/zeromq/zyre", + "dependencies": [ + "czmq" + ] +} diff --git a/ports/zziplib/CONTROL b/ports/zziplib/CONTROL deleted file mode 100644 index 270b55eaaf80af..00000000000000 --- a/ports/zziplib/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: zziplib -Version: 0.13.71 -Port-Version: 1 -Build-Depends: zlib -Homepage: https://github.com/gdraheim/zziplib -Description: library providing read access on ZIP-archives diff --git a/ports/zziplib/vcpkg.json b/ports/zziplib/vcpkg.json new file mode 100644 index 00000000000000..95279853a3dac6 --- /dev/null +++ b/ports/zziplib/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "zziplib", + "version-string": "0.13.71", + "port-version": 2, + "description": "library providing read access on ZIP-archives", + "homepage": "https://github.com/gdraheim/zziplib", + "dependencies": [ + "zlib" + ] +} diff --git a/versions/7-/7zip.json b/versions/7-/7zip.json index 075175c5d053a7..f699a2885f4926 100644 --- a/versions/7-/7zip.json +++ b/versions/7-/7zip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c49050bcc9af0a2cbd9c572386e6a8b547ebd9f7", + "version-string": "19.00", + "port-version": 3 + }, { "git-tree": "64b14288536f6e4de77972a54ebf5277780ce222", "version-string": "19.00", diff --git a/versions/a-/absent.json b/versions/a-/absent.json index 9ff4e862c7b717..7d0a280eaa4bc1 100644 --- a/versions/a-/absent.json +++ b/versions/a-/absent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1f1f8e5f036e686e2a7881d4b8594f737196090", + "version-string": "0.3.1", + "port-version": 1 + }, { "git-tree": "872663f3498a2b8f0a6d0e0503c4c2838438b42d", "version-string": "0.3.1", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 44ad58124e6795..8451a8a8c191eb 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5001f42225c6e566471b02dcffeb45467368514a", + "version-string": "7.0.3", + "port-version": 1 + }, { "git-tree": "321d63a1abf3c6c213c8870bb658ee842a70ede7", "version-string": "7.0.3", diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 57e4db6478cf2d..2507ec7aa90b24 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13f5f938c4d12bf4a62061f9891f77e7fc03fc23", + "version-string": "3.9.5", + "port-version": 4 + }, { "git-tree": "edc82536f9d433e0f473a11a534b1e443e9ea3f4", "version-string": "3.9.5-3", diff --git a/versions/a-/ade.json b/versions/a-/ade.json index 734019c3c36e71..063198687b8a2d 100644 --- a/versions/a-/ade.json +++ b/versions/a-/ade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca6a81fb330a77f6aa4c58b63af7efcbe1643e62", + "version-string": "0.1.1f", + "port-version": 2 + }, { "git-tree": "91083eb87a39190e6c0296d72931a8d39edcc7cd", "version-string": "0.1.1f", diff --git a/versions/a-/akali.json b/versions/a-/akali.json index bc9b4339fea7e3..e960d28aafcfc6 100644 --- a/versions/a-/akali.json +++ b/versions/a-/akali.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b94b1623b0778525e405410cee7d6d069ac56ca", + "version-string": "1.42", + "port-version": 2 + }, { "git-tree": "29f022ed905404ee53af3197de0f01afb22c15dd", "version-string": "1.42", diff --git a/versions/a-/alac-decoder.json b/versions/a-/alac-decoder.json index 48110f6f97a1fb..2a58e747807467 100644 --- a/versions/a-/alac-decoder.json +++ b/versions/a-/alac-decoder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4bc6809ac5b52236ec0ea4d48cfa904f493ab21", + "version-string": "0.2", + "port-version": 5 + }, { "git-tree": "1ad081bc124fafdd099eca78f1a7f9a0ea99cc61", "version-string": "0.2", diff --git a/versions/a-/alac.json b/versions/a-/alac.json index ea974a8e3c1e51..df4158718327be 100644 --- a/versions/a-/alac.json +++ b/versions/a-/alac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b325e9f42af74eca82fae2a845a5108b06b44ce", + "version-string": "2017-11-03-c38887c5", + "port-version": 2 + }, { "git-tree": "2a3cdc11a3c1cdcfc947dfd0f3fa18c40e4091b6", "version-string": "2017-11-03-c38887c5-1", diff --git a/versions/a-/aliyun-oss-c-sdk.json b/versions/a-/aliyun-oss-c-sdk.json index 12cbb68be2ca3f..724871e0279317 100644 --- a/versions/a-/aliyun-oss-c-sdk.json +++ b/versions/a-/aliyun-oss-c-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52b0340f3b53966018738d256f74a64c0c90ee5e", + "version-string": "3.10.0", + "port-version": 1 + }, { "git-tree": "bae10b829d8e75fd53eb0027db88d2bab6caff5f", "version-string": "3.10.0", diff --git a/versions/a-/ampl-asl.json b/versions/a-/ampl-asl.json index ddcf5ec84f7b96..ace12ea0ae0b4e 100644 --- a/versions/a-/ampl-asl.json +++ b/versions/a-/ampl-asl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "823dcf0d7f897a92269faf1915322c012b281a2a", + "version-string": "2020-11-11", + "port-version": 1 + }, { "git-tree": "f8a838c084e07d088ca9dbe0b6c4d7da091482f1", "version-string": "2020-11-11", diff --git a/versions/a-/anax.json b/versions/a-/anax.json index ca7c7a7c47e7b4..99ff1a18737ba7 100644 --- a/versions/a-/anax.json +++ b/versions/a-/anax.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "347d15eb157a2bad09742ec97dfc417674936982", + "version-string": "2.1.0", + "port-version": 7 + }, { "git-tree": "561c057f2d0478df1e08b0e07247b8ddf5c8a04a", "version-string": "2.1.0-6", diff --git a/versions/a-/antlr4.json b/versions/a-/antlr4.json index fbf64088f79357..033e47010021e1 100644 --- a/versions/a-/antlr4.json +++ b/versions/a-/antlr4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b8591ea0b8692c0c2963c468ee5b9c2e260ace4", + "version-string": "4.9.1", + "port-version": 1 + }, { "git-tree": "846cffb150c26539ce36129c5a45d7ce54e6a1c8", "version-string": "4.9.1", diff --git a/versions/a-/apr-util.json b/versions/a-/apr-util.json index b5a3492ae501ee..a2629d38521bba 100644 --- a/versions/a-/apr-util.json +++ b/versions/a-/apr-util.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf1a0e97d00a5748dc58db7d0a5da0fd7d5efb66", + "version-string": "1.6.1", + "port-version": 4 + }, { "git-tree": "6f367c81a074fd156d7f054bcacbdae0b01a5f5c", "version-string": "1.6.1", diff --git a/versions/a-/arb.json b/versions/a-/arb.json index ec119cdbfb2c33..5e8084c8b37403 100644 --- a/versions/a-/arb.json +++ b/versions/a-/arb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ad21afd78955622e44098428fa7b8b7790f82d8", + "version-string": "2.18.1", + "port-version": 1 + }, { "git-tree": "7a1fad4344b58a4c70a15c0a2a890c011a52c75f", "version-string": "2.18.1", diff --git a/versions/a-/argagg.json b/versions/a-/argagg.json index b88418d4ef4d1f..94f1d5e2427f97 100644 --- a/versions/a-/argagg.json +++ b/versions/a-/argagg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ece15f0bd5649973a8384d7762b0b1aed0cb2fdc", + "version-string": "0.4.6", + "port-version": 1 + }, { "git-tree": "031214af5025d198e84dd9d21fe071199ad1623c", "version-string": "0.4.6", diff --git a/versions/a-/argh.json b/versions/a-/argh.json index 6258cc58f00113..a66b81ef4d92dc 100644 --- a/versions/a-/argh.json +++ b/versions/a-/argh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09027cc8017226ec7710f564346b5c0bff9e69aa", + "version-string": "2018-12-18", + "port-version": 3 + }, { "git-tree": "079af0048f435a7d950a29772462a553a80078f1", "version-string": "2018-12-18-2", diff --git a/versions/a-/argtable2.json b/versions/a-/argtable2.json index 63d2536bb39ce6..28c3358465b2de 100644 --- a/versions/a-/argtable2.json +++ b/versions/a-/argtable2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "406503ece7b3ab95af28c6871a6de7263731f829", + "version-string": "2.13", + "port-version": 9 + }, { "git-tree": "84477794d507fde26a891a7282b5322bb8d0e632", "version-string": "2.13", diff --git a/versions/a-/argumentum.json b/versions/a-/argumentum.json index 53ced38734fab0..bfd12408d6bc6a 100644 --- a/versions/a-/argumentum.json +++ b/versions/a-/argumentum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f89899e28a328451a1b31bbf2ba23df8ca87f69", + "version-string": "0.3.1", + "port-version": 1 + }, { "git-tree": "4ddbb18467acb4d4bcddb23e1ba6c956aeaee72f", "version-string": "0.3.1", diff --git a/versions/a-/asmjit.json b/versions/a-/asmjit.json index b37505fd41a83d..90ed6593f38ba9 100644 --- a/versions/a-/asmjit.json +++ b/versions/a-/asmjit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "beb9e328e4d8c0575319af439ec4f810cf0bfa40", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "ce18730abf423893475a9addc5c55cea38964e0b", "version-string": "2020-09-14", diff --git a/versions/a-/assimp.json b/versions/a-/assimp.json index a4af2a7874b1b9..a8986e751c308a 100644 --- a/versions/a-/assimp.json +++ b/versions/a-/assimp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cab54d6dedc48fcb9642f5fbe079e61105405543", + "version-string": "5.0.1", + "port-version": 5 + }, { "git-tree": "b0bd03f6677d06cc56fbcecb15ff205a9a43b66c", "version-string": "5.0.1", diff --git a/versions/a-/asynch.json b/versions/a-/asynch.json index 5be75524724315..629b9978a7a1b9 100644 --- a/versions/a-/asynch.json +++ b/versions/a-/asynch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e656692601ab76c652a9b09c98bb36ee8723f9c0", + "version-string": "2019-09-21", + "port-version": 2 + }, { "git-tree": "4955ffe2f2e53d427532418c0a77e9b5ec94b0aa", "version-string": "2019-09-21-1", diff --git a/versions/a-/asyncplusplus.json b/versions/a-/asyncplusplus.json index 14475c844a551c..4de790bf2bd830 100644 --- a/versions/a-/asyncplusplus.json +++ b/versions/a-/asyncplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15a66956fc29d87d60f48bfc7aa3ca823554734e", + "version-string": "1.1", + "port-version": 1 + }, { "git-tree": "87a28ca122377134fb51ad27cf2a4a800fbc6bd8", "version-string": "1.1", diff --git a/versions/a-/atlmfc.json b/versions/a-/atlmfc.json index 98a8ee82100802..7f6fcbf607d9dc 100644 --- a/versions/a-/atlmfc.json +++ b/versions/a-/atlmfc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "509a448c797ddb6cf67ba179b6edff02fee17865", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "bf15a689a8ab4c50dbf2e6eef2c3a7fff5e6dd8f", "version-string": "0", diff --git a/versions/a-/aurora.json b/versions/a-/aurora.json index b13e6ff311f93f..5fb067e57d13a9 100644 --- a/versions/a-/aurora.json +++ b/versions/a-/aurora.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a41f2335fd703ebb6a3dbd4eb20260754cff110c", + "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", + "port-version": 1 + }, { "git-tree": "027accab492d7272fdd2d70916fd97f2c36644a3", "version-string": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", diff --git a/versions/a-/autobahn.json b/versions/a-/autobahn.json index 5e82d66a3261b1..5aaa23e76ed97a 100644 --- a/versions/a-/autobahn.json +++ b/versions/a-/autobahn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d7687436a474abcf18dd1b5689437218f8f6d36", + "version-string": "20.8.1", + "port-version": 1 + }, { "git-tree": "0389b345f8b7cc5f7c4cfb7a461cee02a76e0034", "version-string": "20.8.1", diff --git a/versions/a-/avro-c.json b/versions/a-/avro-c.json index deecd119a1155e..ea6e6bfbbaef0d 100644 --- a/versions/a-/avro-c.json +++ b/versions/a-/avro-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0828484bab48f23c09e440f9df3d9d99dd3caaa0", + "version-string": "1.9.2", + "port-version": 2 + }, { "git-tree": "09783bc724dc91b8c456cbb060043ccb206e8595", "version-string": "1.9.2-1", diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 03e9c95be332af..9cf850621402c3 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da525f4c21c19e8eb2d81d6f352467395b55f354", + "version-string": "0.4.56", + "port-version": 2 + }, { "git-tree": "18178de87240278976fc659b52d8a86dbda31329", "version-string": "0.4.56", diff --git a/versions/a-/aws-c-event-stream.json b/versions/a-/aws-c-event-stream.json index 5314bd7c7614c9..2ed9b81382295c 100644 --- a/versions/a-/aws-c-event-stream.json +++ b/versions/a-/aws-c-event-stream.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2daec107d6c9d3077a4623d3cf341304a309852", + "version-string": "0.1.6", + "port-version": 1 + }, { "git-tree": "50134e5fe6fa4dd534238fd2a799722b918704a9", "version-string": "0.1.6", diff --git a/versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json index 7b8423c7ff6145..75e2d23aa5e312 100644 --- a/versions/a-/aws-checksums.json +++ b/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "faeacfa4356bdc71228a197676b7613cf369520c", + "version-string": "0.1.9", + "port-version": 1 + }, { "git-tree": "4be7a5832f122e6c98d235bd58c55ea2d83dcdea", "version-string": "0.1.9", diff --git a/versions/a-/aws-lambda-cpp.json b/versions/a-/aws-lambda-cpp.json index 28d2c64e8691e1..e269f0264dea6a 100644 --- a/versions/a-/aws-lambda-cpp.json +++ b/versions/a-/aws-lambda-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e586ea66476a0d9ce91ae630e1966724794ef2f", + "version-string": "0.2.6", + "port-version": 1 + }, { "git-tree": "bfe8b19021e8359832f5e32438cb988f4edf0fdf", "version-string": "0.2.6", diff --git a/versions/a-/azmq.json b/versions/a-/azmq.json index b2e502516cdc62..350ac34d51fb7d 100644 --- a/versions/a-/azmq.json +++ b/versions/a-/azmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a82754fa9f38845c88912eb424dbfc718a155fe7", + "version-string": "2020-03-03", + "port-version": 1 + }, { "git-tree": "528140b63c42e48f1bc4aaf93a40f2233d8a2547", "version-string": "2020-03-03", diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index e6558df34bf1fa..4c538da979e72b 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "004bb7eb46adf65294137426bfa60868a7a9be93", + "version-string": "2020-12-09", + "port-version": 2 + }, { "git-tree": "aeea4eb6de3e3db197e350ba3e8ebb6a9bfaa154", "version-string": "2020-12-09", diff --git a/versions/a-/azure-macro-utils-c.json b/versions/a-/azure-macro-utils-c.json index 1d44e91dd95ef9..9b9d201e11e7f2 100644 --- a/versions/a-/azure-macro-utils-c.json +++ b/versions/a-/azure-macro-utils-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a951ed2a9b24f8778b7c2fb2ff4e6a6577ac6472", + "version-string": "2020-06-17", + "port-version": 3 + }, { "git-tree": "5929e9b68ee080e5535eb12e48e182b04310ff0d", "version-string": "2020-06-17", diff --git a/versions/a-/azure-storage-cpp.json b/versions/a-/azure-storage-cpp.json index e0e8ff684c7384..34ceb4c76da1ab 100644 --- a/versions/a-/azure-storage-cpp.json +++ b/versions/a-/azure-storage-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "242bb84480e51b70b53dbd9b126f600e1ea39ef6", + "version-string": "7.5.0", + "port-version": 2 + }, { "git-tree": "2b3b868fab128f5e37adeffcde308124512d25e0", "version-string": "7.5.0", diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json index d1aeee8dc74664..b986526429b5c0 100644 --- a/versions/a-/azure-uamqp-c.json +++ b/versions/a-/azure-uamqp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ecbe4bc48e735cd1a3424ec77afac8aa807eaab", + "version-string": "2020-12-09", + "port-version": 1 + }, { "git-tree": "096e993556ef33559bb27d42edea1fa75175f784", "version-string": "2020-12-09", diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json index bb2a7115eaf1fd..a79af9921321a6 100644 --- a/versions/a-/azure-uhttp-c.json +++ b/versions/a-/azure-uhttp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7410a090286f0c65398cb9ce97c6d86120c7222d", + "version-string": "2020-12-09", + "port-version": 1 + }, { "git-tree": "9a13676c37e46791196a860835b8695c80359a8c", "version-string": "2020-12-09", diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json index c07bf2c5711741..190e1e568b3a37 100644 --- a/versions/a-/azure-umqtt-c.json +++ b/versions/a-/azure-umqtt-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8f3de5c5637d62c78e1a8934e9f8e7409dd36c4", + "version-string": "2020-12-09", + "port-version": 1 + }, { "git-tree": "c49491f7d067b2c52a2751941b3e335c0e04eebf", "version-string": "2020-12-09", diff --git a/versions/b-/basisu.json b/versions/b-/basisu.json index d09db0db58d42e..c9940a435a31b6 100644 --- a/versions/b-/basisu.json +++ b/versions/b-/basisu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70d762c5a7350879f47429ea6275ba34f1c0f449", + "version-string": "1.11", + "port-version": 5 + }, { "git-tree": "0645a595b0b20a3db1cd8fe19abc9e81c0c16714", "version-string": "1.11-4", diff --git a/versions/b-/bde.json b/versions/b-/bde.json index 39c7f3214a82a7..c37874aac45179 100644 --- a/versions/b-/bde.json +++ b/versions/b-/bde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b940e98efec0d1f48f2edfe2027d2bce251ec7a8", + "version-string": "3.2.0.0", + "port-version": 3 + }, { "git-tree": "b1182a3ba7b24edd58e7471796c1f157c9ff402c", "version-string": "3.2.0.0", diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 4382f9415c740a..4d06f17d3a68f3 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5777be074f852a1c7c5920d1cb8639b6fc1659be", + "version-string": "8.0.4", + "port-version": 2 + }, { "git-tree": "d3fb7b17d683581e6f34599e0cc0295a7d315bb2", "version-string": "8.0.4-1", diff --git a/versions/b-/beast.json b/versions/b-/beast.json index 318a6136a0a8b3..4b88457c2d3b42 100644 --- a/versions/b-/beast.json +++ b/versions/b-/beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eea4815ae315b38373961c8ff9a5be8556857b3f", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "17c08b9a2f5c67b9ab0fb3d231bb6d67af26a208", "version-string": "0", diff --git a/versions/b-/bento4.json b/versions/b-/bento4.json index 2ab6aa653349b9..a5d351761a194c 100644 --- a/versions/b-/bento4.json +++ b/versions/b-/bento4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfedfc70c05cececac8e23b744b43619e2ae3125", + "version-string": "1.5.1", + "port-version": 629 + }, { "git-tree": "176077782d332c5366ab2ad4055bc76c62633d7e", "version-string": "1.5.1-628", diff --git a/versions/b-/berkeleydb.json b/versions/b-/berkeleydb.json index 0d6a7c6376ab94..e21920be6a8adb 100644 --- a/versions/b-/berkeleydb.json +++ b/versions/b-/berkeleydb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdef7fa8068cc8b7443905db215bed2dcf378abf", + "version-string": "4.8.30", + "port-version": 6 + }, { "git-tree": "e0ed5491b8a0001f97470f65cc9addf2c403f658", "version-string": "4.8.30", diff --git a/versions/b-/bigint.json b/versions/b-/bigint.json index abca9e2ab1d8a7..48e25a21a93305 100644 --- a/versions/b-/bigint.json +++ b/versions/b-/bigint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae8921f17a82f01e5e68e494c8fe1823085eb496", + "version-string": "2010.04.30", + "port-version": 7 + }, { "git-tree": "00e038eff99864c2c73a807f0641c17e364547b0", "version-string": "2010.04.30", diff --git a/versions/b-/binn.json b/versions/b-/binn.json index 506fd316bd3388..fb32ec7dc07bb6 100644 --- a/versions/b-/binn.json +++ b/versions/b-/binn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b63ed963e5305d28e67ee04951cb907a483bca2", + "version-string": "3.0", + "port-version": 1 + }, { "git-tree": "f572fc1577b9e8176015a54393657dfdfb245b78", "version-string": "3.0", diff --git a/versions/b-/bitmagic.json b/versions/b-/bitmagic.json index c9ebe58590f987..4771281def0b31 100644 --- a/versions/b-/bitmagic.json +++ b/versions/b-/bitmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9854378bbae00f886710d80f38221368faf99547", + "version-string": "7.2.0", + "port-version": 1 + }, { "git-tree": "752ea75ea3ffa1341de3f427b9a9c51cdea3df17", "version-string": "7.2.0", diff --git a/versions/b-/bitserializer-cpprestjson.json b/versions/b-/bitserializer-cpprestjson.json index f3153a3f1cef0d..20e6cf747d0273 100644 --- a/versions/b-/bitserializer-cpprestjson.json +++ b/versions/b-/bitserializer-cpprestjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb2e0fef9d95a7f2bcd99cb537caf0570ee50866", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "af219f0644caccabb3d8fc0908c70c6f216c6c7e", "version-string": "alias", diff --git a/versions/b-/bitserializer-pugixml.json b/versions/b-/bitserializer-pugixml.json index 5eef4f3026ab03..1b1a08aeb5d4be 100644 --- a/versions/b-/bitserializer-pugixml.json +++ b/versions/b-/bitserializer-pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8379fe5b2d97c381221f455978920f44ab932ee", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "35575e8e78a65d2ebecd065cdae32ad51b03cee3", "version-string": "alias", diff --git a/versions/b-/bitserializer-rapidjson.json b/versions/b-/bitserializer-rapidjson.json index b78473a9d11730..f55c9cda889ae3 100644 --- a/versions/b-/bitserializer-rapidjson.json +++ b/versions/b-/bitserializer-rapidjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "990030f46f43de41fdb5ccd57d29de178edcb8c5", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "6039c5207e9aef672cb2d9250761419d2e937e8d", "version-string": "alias", diff --git a/versions/b-/bitserializer-rapidyaml.json b/versions/b-/bitserializer-rapidyaml.json index ca064dd7f10e00..0b0fe0398c2542 100644 --- a/versions/b-/bitserializer-rapidyaml.json +++ b/versions/b-/bitserializer-rapidyaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7680ebf3a5a68b67ce532cb52faae1c37535c69a", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "146cc1679c8fa5e740a3ef71cfbf2b3bf67e7647", "version-string": "alias", diff --git a/versions/b-/bitsery.json b/versions/b-/bitsery.json index 3b4b91e96c740b..ac1631a2a73324 100644 --- a/versions/b-/bitsery.json +++ b/versions/b-/bitsery.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adbbef892ab01c8b0c57b7be2684ae6bb1a29a99", + "version-string": "5.2.1", + "port-version": 1 + }, { "git-tree": "b7b53af2d59fe702bcbefc77e31745f2a916afc8", "version-string": "5.2.1", diff --git a/versions/b-/blas.json b/versions/b-/blas.json index 7fb01927b6b3e0..c8b3ade64a24bc 100644 --- a/versions/b-/blas.json +++ b/versions/b-/blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d105be9337f4a6f294a7eced2da18e8cdb99051", + "version-string": "1", + "port-version": 1 + }, { "git-tree": "2877c1693c63195d4edacfb42156c9d8874ad046", "version-string": "1", diff --git a/versions/b-/blaze.json b/versions/b-/blaze.json index 9181825c9be027..3a4a1c091d20c3 100644 --- a/versions/b-/blaze.json +++ b/versions/b-/blaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8795a94d25adbb75d3be0b191bc3c15321e9c686", + "version-string": "3.8", + "port-version": 2 + }, { "git-tree": "0929cccabaf3511161aa06789a414a2937629679", "version-string": "3.8", diff --git a/versions/b-/blitz.json b/versions/b-/blitz.json index 390f6e869b2189..b30b87f50efe51 100644 --- a/versions/b-/blitz.json +++ b/versions/b-/blitz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50cc7fc499a0dd0ea2d61de84ee5875327ffd255", + "version-string": "2020-03-25", + "port-version": 1 + }, { "git-tree": "5cd50e6a9001065a85965fd67c63304912ca902b", "version-string": "2020-03-25", diff --git a/versions/b-/blosc.json b/versions/b-/blosc.json index 4393dca06cfa9f..ee956cdfadfb46 100644 --- a/versions/b-/blosc.json +++ b/versions/b-/blosc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d29f4f5d2e2d2fd70c4489149d81cc548d31cc1", + "version-string": "1.18.1", + "port-version": 2 + }, { "git-tree": "117ae787801719558e153574030647da9fc16cf7", "version-string": "1.18.1-1", diff --git a/versions/b-/breakpad.json b/versions/b-/breakpad.json index 59cc406df23500..b60361ffe91f9b 100644 --- a/versions/b-/breakpad.json +++ b/versions/b-/breakpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be41998b0a407c10ae78d605264a2c0bb7d3f3ca", + "version-string": "2020-09-14", + "port-version": 3 + }, { "git-tree": "724ca1cc38bbb2414d1efe91f8a95353235ede58", "version-string": "2020-09-14", diff --git a/versions/b-/brigand.json b/versions/b-/brigand.json index 376882fafe5353..f43f2cf9259d34 100644 --- a/versions/b-/brigand.json +++ b/versions/b-/brigand.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99395d0e7569b8b32f76d99cf2183a2a92679a7d", + "version-string": "1.3.0", + "port-version": 1 + }, { "git-tree": "c43c5b02c14b89e55f9a85d9a7c835f3bf9ea582", "version-string": "1.3.0", diff --git a/versions/b-/brotli.json b/versions/b-/brotli.json index 248f9d41bc5429..e00f28e5204089 100644 --- a/versions/b-/brotli.json +++ b/versions/b-/brotli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73d0ed2fd7816c7a4958983b0b027c85b60eac15", + "version-string": "1.0.9", + "port-version": 2 + }, { "git-tree": "8f55fe158d8bd753a6e6908164e03ae4f0b73cea", "version-string": "1.0.9", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index f2cf910513742f..409ee55988099f 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d3ba620eff30244f2ca27af0814f78ce9049308", + "version-string": "0.9.7", + "port-version": 1 + }, { "git-tree": "d3461edb01babdda0886b7173a7fba194e30d149", "version-string": "0.9.7", diff --git a/versions/b-/brunocodutra-metal.json b/versions/b-/brunocodutra-metal.json index ada0576d55c0ce..8a1c75580ce790 100644 --- a/versions/b-/brunocodutra-metal.json +++ b/versions/b-/brunocodutra-metal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fbaac9587c177beb827afa12d74cd40005cc20a", + "version-string": "2.1.1", + "port-version": 1 + }, { "git-tree": "b96a170666d35da8f66b89c12c62699db55b269c", "version-string": "2.1.1", diff --git a/versions/b-/brynet.json b/versions/b-/brynet.json index 1b99ee9ba3e711..63b0a8bf79d029 100644 --- a/versions/b-/brynet.json +++ b/versions/b-/brynet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f164bb20f8c10203d2ab57ecf5a28b5891c5259a", + "version-string": "1.11.0", + "port-version": 1 + }, { "git-tree": "228bf2b9f13cdeb9c86f1bf43d9d487e87f78c6e", "version-string": "1.11.0", diff --git a/versions/b-/bustache.json b/versions/b-/bustache.json index d40ca8eb4ae0f3..6642c72b7a2fba 100644 --- a/versions/b-/bustache.json +++ b/versions/b-/bustache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "746808aa3bda8d2627ecc6da664cc58ebf57896e", + "version-string": "1.1.0", + "port-version": 1 + }, { "git-tree": "3844f9514372b696483caa83af21759c1ddf2c67", "version-string": "1.1.0", diff --git a/versions/b-/butteraugli.json b/versions/b-/butteraugli.json index 6451351f0e5581..1fee95296c761b 100644 --- a/versions/b-/butteraugli.json +++ b/versions/b-/butteraugli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "660959f50cba9f2fa2bc5d9cf775e268d746c7e9", + "version-string": "2019-05-08", + "port-version": 2 + }, { "git-tree": "b0a1f3b7adf27f8437a4d6af30ec5367a225341d", "version-string": "2019-05-08-1", diff --git a/versions/b-/byte-lite.json b/versions/b-/byte-lite.json index e0c162563c01dc..6fd79ba48f6648 100644 --- a/versions/b-/byte-lite.json +++ b/versions/b-/byte-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d83b7cf23d9a7b17c28fda5fcd36a25dd8a085ef", + "version-string": "0.2.0", + "port-version": 1 + }, { "git-tree": "b8ac7b847acca6724eb539674e7243b477163607", "version-string": "0.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6b066b815a9d4e..e2da5b296233cb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6,7 +6,7 @@ }, "7zip": { "baseline": "19.00", - "port-version": 2 + "port-version": 3 }, "abseil": { "baseline": "20210324.2", @@ -14,19 +14,19 @@ }, "absent": { "baseline": "0.3.1", - "port-version": 0 + "port-version": 1 }, "ace": { "baseline": "7.0.3", - "port-version": 0 + "port-version": 1 }, "activemq-cpp": { - "baseline": "3.9.5-3", - "port-version": 0 + "baseline": "3.9.5", + "port-version": 4 }, "ade": { "baseline": "0.1.1f", - "port-version": 1 + "port-version": 2 }, "advobfuscator": { "baseline": "2020-06-26", @@ -38,15 +38,15 @@ }, "akali": { "baseline": "1.42", - "port-version": 1 + "port-version": 2 }, "alac": { - "baseline": "2017-11-03-c38887c5-1", - "port-version": 0 + "baseline": "2017-11-03-c38887c5", + "port-version": 2 }, "alac-decoder": { "baseline": "0.2", - "port-version": 4 + "port-version": 5 }, "alembic": { "baseline": "1.7.16", @@ -54,7 +54,7 @@ }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", - "port-version": 0 + "port-version": 1 }, "allegro5": { "baseline": "5.2.6.0", @@ -62,7 +62,7 @@ }, "ampl-asl": { "baseline": "2020-11-11", - "port-version": 0 + "port-version": 1 }, "ampl-mp": { "baseline": "2020-11-11", @@ -73,8 +73,8 @@ "port-version": 0 }, "anax": { - "baseline": "2.1.0-6", - "port-version": 0 + "baseline": "2.1.0", + "port-version": 7 }, "angelscript": { "baseline": "2.35.0", @@ -86,7 +86,7 @@ }, "antlr4": { "baseline": "4.9.1", - "port-version": 0 + "port-version": 1 }, "any-lite": { "baseline": "0.4.0", @@ -110,7 +110,7 @@ }, "apr-util": { "baseline": "1.6.1", - "port-version": 3 + "port-version": 4 }, "apsi": { "baseline": "0.2.0", @@ -118,7 +118,7 @@ }, "arb": { "baseline": "2.18.1", - "port-version": 0 + "port-version": 1 }, "arcus": { "baseline": "4.10.0", @@ -126,11 +126,11 @@ }, "argagg": { "baseline": "0.4.6", - "port-version": 0 + "port-version": 1 }, "argh": { - "baseline": "2018-12-18-2", - "port-version": 0 + "baseline": "2018-12-18", + "port-version": 3 }, "argparse": { "baseline": "2021-03-04", @@ -142,7 +142,7 @@ }, "argtable2": { "baseline": "2.13", - "port-version": 8 + "port-version": 9 }, "argtable3": { "baseline": "3.2.1", @@ -150,7 +150,7 @@ }, "argumentum": { "baseline": "0.3.1", - "port-version": 0 + "port-version": 1 }, "aricpp": { "baseline": "1.1.1", @@ -182,19 +182,19 @@ }, "asmjit": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "assimp": { "baseline": "5.0.1", - "port-version": 4 + "port-version": 5 }, "asynch": { - "baseline": "2019-09-21-1", - "port-version": 0 + "baseline": "2019-09-21", + "port-version": 2 }, "asyncplusplus": { "baseline": "1.1", - "port-version": 0 + "port-version": 1 }, "atk": { "baseline": "2.36.0", @@ -206,7 +206,7 @@ }, "atlmfc": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "atomic-queue": { "baseline": "2021-05-03", @@ -222,11 +222,11 @@ }, "aurora": { "baseline": "2017-06-21-c75699d2a8caa726260c29b6d7a0fd35f8f28933", - "port-version": 0 + "port-version": 1 }, "autobahn": { "baseline": "20.8.1", - "port-version": 0 + "port-version": 1 }, "autodock-vina": { "baseline": "1.2.2", @@ -241,8 +241,8 @@ "port-version": 1 }, "avro-c": { - "baseline": "1.9.2-1", - "port-version": 0 + "baseline": "1.9.2", + "port-version": 2 }, "avro-cpp": { "baseline": "2021-06-01", @@ -250,19 +250,19 @@ }, "aws-c-common": { "baseline": "0.4.56", - "port-version": 1 + "port-version": 2 }, "aws-c-event-stream": { "baseline": "0.1.6", - "port-version": 0 + "port-version": 1 }, "aws-checksums": { "baseline": "0.1.9", - "port-version": 0 + "port-version": 1 }, "aws-lambda-cpp": { "baseline": "0.2.6", - "port-version": 0 + "port-version": 1 }, "aws-sdk-cpp": { "baseline": "1.8.126", @@ -270,11 +270,11 @@ }, "azmq": { "baseline": "2020-03-03", - "port-version": 0 + "port-version": 1 }, "azure-c-shared-utility": { "baseline": "2020-12-09", - "port-version": 1 + "port-version": 2 }, "azure-core-cpp": { "baseline": "1.2.1", @@ -294,7 +294,7 @@ }, "azure-macro-utils-c": { "baseline": "2020-06-17", - "port-version": 2 + "port-version": 3 }, "azure-security-keyvault-common-cpp": { "baseline": "4.0.0-beta.3", @@ -314,7 +314,7 @@ }, "azure-storage-cpp": { "baseline": "7.5.0", - "port-version": 1 + "port-version": 2 }, "azure-storage-files-datalake-cpp": { "baseline": "12.1.0", @@ -326,23 +326,23 @@ }, "azure-uamqp-c": { "baseline": "2020-12-09", - "port-version": 0 + "port-version": 1 }, "azure-uhttp-c": { "baseline": "2020-12-09", - "port-version": 0 + "port-version": 1 }, "azure-umqtt-c": { "baseline": "2020-12-09", - "port-version": 0 + "port-version": 1 }, "b64": { "baseline": "2.0.0.1", "port-version": 0 }, "basisu": { - "baseline": "1.11-4", - "port-version": 0 + "baseline": "1.11", + "port-version": 5 }, "bcg729": { "baseline": "1.1.1", @@ -354,15 +354,15 @@ }, "bde": { "baseline": "3.2.0.0", - "port-version": 2 + "port-version": 3 }, "bdwgc": { - "baseline": "8.0.4-1", - "port-version": 0 + "baseline": "8.0.4", + "port-version": 2 }, "beast": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "behaviortree-cpp": { "baseline": "3.5.6", @@ -373,12 +373,12 @@ "port-version": 0 }, "bento4": { - "baseline": "1.5.1-628", - "port-version": 0 + "baseline": "1.5.1", + "port-version": 629 }, "berkeleydb": { "baseline": "4.8.30", - "port-version": 5 + "port-version": 6 }, "bext-di": { "baseline": "1.2.0", @@ -394,15 +394,15 @@ }, "bigint": { "baseline": "2010.04.30", - "port-version": 6 + "port-version": 7 }, "binn": { "baseline": "3.0", - "port-version": 0 + "port-version": 1 }, "bitmagic": { "baseline": "7.2.0", - "port-version": 0 + "port-version": 1 }, "bitserializer": { "baseline": "0.10", @@ -410,31 +410,31 @@ }, "bitserializer-cpprestjson": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "bitserializer-pugixml": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "bitserializer-rapidjson": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "bitserializer-rapidyaml": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "bitsery": { "baseline": "5.2.1", - "port-version": 0 + "port-version": 1 }, "blas": { "baseline": "1", - "port-version": 0 + "port-version": 1 }, "blaze": { "baseline": "3.8", - "port-version": 1 + "port-version": 2 }, "blend2d": { "baseline": "2021-03-17", @@ -442,11 +442,11 @@ }, "blitz": { "baseline": "2020-03-25", - "port-version": 0 + "port-version": 1 }, "blosc": { - "baseline": "1.18.1-1", - "port-version": 0 + "baseline": "1.18.1", + "port-version": 2 }, "bond": { "baseline": "9.0.3", @@ -1062,27 +1062,27 @@ }, "breakpad": { "baseline": "2020-09-14", - "port-version": 2 + "port-version": 3 }, "brigand": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "brotli": { "baseline": "1.0.9", - "port-version": 1 + "port-version": 2 }, "brpc": { "baseline": "0.9.7", - "port-version": 0 + "port-version": 1 }, "brunocodutra-metal": { "baseline": "2.1.1", - "port-version": 0 + "port-version": 1 }, "brynet": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "bshoshany-thread-pool": { "baseline": "2.0.0", @@ -1102,15 +1102,15 @@ }, "bustache": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "butteraugli": { - "baseline": "2019-05-08-1", - "port-version": 0 + "baseline": "2019-05-08", + "port-version": 2 }, "byte-lite": { "baseline": "0.2.0", - "port-version": 0 + "port-version": 1 }, "bzip2": { "baseline": "1.0.8", @@ -1129,8 +1129,8 @@ "port-version": 2 }, "caffe2": { - "baseline": "0.8.1-3", - "port-version": 0 + "baseline": "0.8.1", + "port-version": 4 }, "cairo": { "baseline": "1.17.4", @@ -1142,11 +1142,11 @@ }, "camport3": { "baseline": "1.5.3", - "port-version": 0 + "port-version": 1 }, "capnproto": { "baseline": "0.8.0", - "port-version": 1 + "port-version": 2 }, "capstone": { "baseline": "4.0.2", @@ -1157,28 +1157,28 @@ "port-version": 4 }, "casclib": { - "baseline": "1.50b-1", - "port-version": 0 + "baseline": "1.50b", + "port-version": 2 }, "catch": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "catch-classic": { "baseline": "1.12.2", - "port-version": 0 + "port-version": 1 }, "catch2": { "baseline": "2.13.7", "port-version": 1 }, "cccapstone": { - "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", - "port-version": 0 + "baseline": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 2 }, "ccd": { "baseline": "2.1-4", - "port-version": 1 + "port-version": 2 }, "ccfits": { "baseline": "2.5", @@ -1189,20 +1189,20 @@ "port-version": 0 }, "cctz": { - "baseline": "2.3-2", - "port-version": 0 + "baseline": "2.3", + "port-version": 3 }, "celero": { "baseline": "2.8.2", - "port-version": 0 + "port-version": 1 }, "cello": { "baseline": "2019-07-23", - "port-version": 0 + "port-version": 1 }, "cereal": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "ceres": { "baseline": "2.0.0", @@ -1217,24 +1217,24 @@ "port-version": 0 }, "cgicc": { - "baseline": "3.2.19-4", - "port-version": 0 + "baseline": "3.2.19", + "port-version": 5 }, "cgl": { - "baseline": "0.60.2-2", - "port-version": 0 + "baseline": "0.60.2", + "port-version": 3 }, "cgltf": { "baseline": "1.8", - "port-version": 0 + "port-version": 1 }, "cgns": { "baseline": "4.2.0", "port-version": 0 }, "chaiscript": { - "baseline": "6.1.0-1", - "port-version": 0 + "baseline": "6.1.0", + "port-version": 2 }, "chakracore": { "baseline": "2021-04-22", @@ -1242,7 +1242,7 @@ }, "charls": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "chartdir": { "baseline": "7.0.0", @@ -1250,15 +1250,15 @@ }, "check": { "baseline": "0.15.2", - "port-version": 0 + "port-version": 1 }, "chipmunk": { "baseline": "7.0.3", - "port-version": 1 + "port-version": 2 }, "chmlib": { - "baseline": "0.40-4", - "port-version": 0 + "baseline": "0.40", + "port-version": 5 }, "chromaprint": { "baseline": "1.5.0", @@ -1266,15 +1266,15 @@ }, "chromium-base": { "baseline": "86.0.4199.1", - "port-version": 1 + "port-version": 2 }, "cimg": { "baseline": "2.9.4", - "port-version": 0 + "port-version": 1 }, "cityhash": { "baseline": "2013-01-08", - "port-version": 0 + "port-version": 1 }, "civetweb": { "baseline": "1.13", @@ -1294,19 +1294,19 @@ }, "clara": { "baseline": "1.1.5", - "port-version": 0 + "port-version": 1 }, "clblas": { - "baseline": "2.12-4", - "port-version": 0 + "baseline": "2.12", + "port-version": 5 }, "clblast": { "baseline": "1.5.1", - "port-version": 0 + "port-version": 1 }, "clfft": { - "baseline": "2.12.2-2", - "port-version": 0 + "baseline": "2.12.2", + "port-version": 3 }, "cli": { "baseline": "2.0.0", @@ -1318,23 +1318,23 @@ }, "clickhouse-cpp": { "baseline": "2019-05-22", - "port-version": 0 + "port-version": 1 }, "clipp": { "baseline": "2019-04-30", - "port-version": 0 + "port-version": 1 }, "clockutils": { - "baseline": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3", - "port-version": 0 + "baseline": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", + "port-version": 4 }, "clp": { "baseline": "1.17.6", - "port-version": 0 + "port-version": 1 }, "clrng": { "baseline": "2020-12-01", - "port-version": 0 + "port-version": 1 }, "clue": { "baseline": "1.0.0-alpha.7", @@ -1342,11 +1342,11 @@ }, "cmark": { "baseline": "0.29.0", - "port-version": 0 + "port-version": 1 }, "cmcstl2": { "baseline": "2019-07-20", - "port-version": 0 + "port-version": 1 }, "cmocka": { "baseline": "2020-08-01", @@ -1362,15 +1362,15 @@ }, "coin": { "baseline": "4.0.0", - "port-version": 2 + "port-version": 3 }, "coinutils": { "baseline": "2.11.4", - "port-version": 0 + "port-version": 1 }, "collada-dom": { "baseline": "2.5.0", - "port-version": 4 + "port-version": 5 }, "colmap": { "baseline": "3.6", @@ -1394,15 +1394,15 @@ }, "console-bridge": { "baseline": "1.0.1", - "port-version": 1 + "port-version": 2 }, "constexpr": { - "baseline": "1.0-1", - "port-version": 0 + "baseline": "1.0", + "port-version": 2 }, "constexpr-contracts": { "baseline": "2020-08-09", - "port-version": 0 + "port-version": 1 }, "continuable": { "baseline": "4.1.0", @@ -1434,39 +1434,39 @@ }, "cpp-netlib": { "baseline": "0.13.0", - "port-version": 4 + "port-version": 5 }, "cpp-peglib": { "baseline": "0.1.0", - "port-version": 0 + "port-version": 1 }, "cpp-redis": { - "baseline": "4.3.1-2", - "port-version": 0 + "baseline": "4.3.1", + "port-version": 3 }, "cpp-taskflow": { "baseline": "2.6.0", - "port-version": 0 + "port-version": 1 }, "cppad": { "baseline": "20200000.3", - "port-version": 0 + "port-version": 1 }, "cppcms": { "baseline": "1.2.1", - "port-version": 2 + "port-version": 3 }, "cppcodec": { "baseline": "0.2", - "port-version": 0 + "port-version": 1 }, "cppcoro": { - "baseline": "2020-2-28-1", - "port-version": 0 + "baseline": "2020-2-28", + "port-version": 2 }, "cppfs": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "cppgraphqlgen": { "baseline": "3.6.0", @@ -1474,15 +1474,15 @@ }, "cppitertools": { "baseline": "2.1", - "port-version": 0 + "port-version": 1 }, "cppkafka": { - "baseline": "0.3.1-2", - "port-version": 0 + "baseline": "0.3.1", + "port-version": 3 }, "cppmicroservices": { "baseline": "3.4.0", - "port-version": 2 + "port-version": 3 }, "cpprestsdk": { "baseline": "2.10.18", @@ -1490,15 +1490,15 @@ }, "cpptoml": { "baseline": "v0.1.1", - "port-version": 0 + "port-version": 1 }, "cppunit": { "baseline": "1.15.1", "port-version": 0 }, "cpputest": { - "baseline": "2019-9-16-1", - "port-version": 0 + "baseline": "2019-9-16", + "port-version": 2 }, "cppwinrt": { "baseline": "windows-sdk", @@ -1517,8 +1517,8 @@ "port-version": 0 }, "cpuid": { - "baseline": "0.4.1-1", - "port-version": 0 + "baseline": "0.4.1", + "port-version": 2 }, "cpuinfo": { "baseline": "2021-04-04", @@ -1526,11 +1526,11 @@ }, "cr": { "baseline": "2020-04-26", - "port-version": 0 + "port-version": 1 }, "crashpad": { "baseline": "2020-03-18", - "port-version": 0 + "port-version": 1 }, "crashrpt": { "baseline": "1.4.3", @@ -1538,7 +1538,7 @@ }, "crc32c": { "baseline": "1.1.1", - "port-version": 0 + "port-version": 1 }, "crfsuite": { "baseline": "2019-07-21", @@ -1546,11 +1546,11 @@ }, "croncpp": { "baseline": "2020-09-04", - "port-version": 1 + "port-version": 2 }, "crossguid": { - "baseline": "0.2.2-2018-06-16-1", - "port-version": 0 + "baseline": "0.2.2-2018-06-16", + "port-version": 2 }, "crow": { "baseline": "0.3.2", @@ -1558,23 +1558,23 @@ }, "cryptopp": { "baseline": "8.5.0", - "port-version": 0 + "port-version": 1 }, "cspice": { "baseline": "66", - "port-version": 4 + "port-version": 5 }, "ctbignum": { "baseline": "2019-08-02", - "port-version": 0 + "port-version": 1 }, "ctemplate": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "ctp": { "baseline": "6.6.1_P1_20210406_se", - "port-version": 0 + "port-version": 1 }, "ctre": { "baseline": "3.4.1", @@ -1586,31 +1586,31 @@ }, "cuda": { "baseline": "10.1", - "port-version": 7 + "port-version": 8 }, "cudnn": { "baseline": "7.6.5", "port-version": 4 }, "cunit": { - "baseline": "2.1.3-6", - "port-version": 0 + "baseline": "2.1.3", + "port-version": 7 }, "curl": { "baseline": "7.78.0", "port-version": 0 }, "curlpp": { - "baseline": "2018-06-15-3", - "port-version": 0 + "baseline": "2018-06-15", + "port-version": 4 }, "cute-headers": { "baseline": "2019-09-20", - "port-version": 0 + "port-version": 1 }, "cutelyst2": { "baseline": "2.12.0", - "port-version": 0 + "port-version": 1 }, "cwalk": { "baseline": "1.2.5", @@ -1618,7 +1618,7 @@ }, "cxxopts": { "baseline": "2.2.1", - "port-version": 0 + "port-version": 1 }, "czmq": { "baseline": "4.2.1", @@ -1637,8 +1637,8 @@ "port-version": 1 }, "darts-clone": { - "baseline": "1767ab87cffe-1", - "port-version": 0 + "baseline": "1767ab87cffe", + "port-version": 2 }, "dartsim": { "baseline": "6.9.4", @@ -1646,11 +1646,11 @@ }, "dataframe": { "baseline": "1.17.0", - "port-version": 0 + "port-version": 1 }, "date": { "baseline": "3.0.0", - "port-version": 2 + "port-version": 3 }, "dav1d": { "baseline": "0.8.2", @@ -1670,23 +1670,23 @@ }, "dbg-macro": { "baseline": "2019-07-11", - "port-version": 0 + "port-version": 1 }, "dbghelp": { "baseline": "0.0", - "port-version": 0 + "port-version": 1 }, "dbow2": { "baseline": "2019-08-05", - "port-version": 0 + "port-version": 1 }, "dbow3": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "dcmtk": { "baseline": "3.6.6", - "port-version": 0 + "port-version": 1 }, "debug-assert": { "baseline": "1.3.3", @@ -1694,15 +1694,15 @@ }, "decimal-for-cpp": { "baseline": "1.16", - "port-version": 1 + "port-version": 2 }, "detours": { "baseline": "4.0.1", - "port-version": 2 + "port-version": 3 }, "devicenameresolver": { - "baseline": "2016-06-26-0850d88fa6-1", - "port-version": 0 + "baseline": "2016-06-26-0850d88fa6", + "port-version": 2 }, "devil": { "baseline": "1.8.0", @@ -1710,7 +1710,7 @@ }, "dimcli": { "baseline": "5.0.2", - "port-version": 0 + "port-version": 1 }, "directx-headers": { "baseline": "1.4.9", @@ -1742,31 +1742,31 @@ }, "dirent": { "baseline": "1.23.2", - "port-version": 0 + "port-version": 1 }, "discord-game-sdk": { - "baseline": "2.5.6-1", - "port-version": 0 + "baseline": "2.5.6", + "port-version": 2 }, "discord-rpc": { "baseline": "3.4.0", - "port-version": 0 + "port-version": 1 }, "discount": { "baseline": "2.2.6", - "port-version": 0 + "port-version": 1 }, "discreture": { "baseline": "2020-01-29", - "port-version": 0 + "port-version": 1 }, "distorm": { "baseline": "3.4.1", - "port-version": 0 + "port-version": 1 }, "dlfcn-win32": { - "baseline": "1.1.1-4", - "port-version": 0 + "baseline": "1.1.1", + "port-version": 5 }, "dlib": { "baseline": "19.21", @@ -1778,19 +1778,19 @@ }, "docopt": { "baseline": "2018-11-01", - "port-version": 0 + "port-version": 1 }, "doctest": { "baseline": "2.4.5", - "port-version": 0 + "port-version": 1 }, "double-conversion": { "baseline": "3.1.5", - "port-version": 0 + "port-version": 1 }, "dpdk": { "baseline": "19.02", - "port-version": 0 + "port-version": 1 }, "draco": { "baseline": "1.3.6", @@ -1798,7 +1798,7 @@ }, "drlibs": { "baseline": "2019-08-12", - "port-version": 0 + "port-version": 1 }, "drogon": { "baseline": "1.7.1", @@ -1806,23 +1806,23 @@ }, "dtl": { "baseline": "1.19", - "port-version": 0 + "port-version": 1 }, "duckx": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "duilib": { "baseline": "2019-4-28", - "port-version": 3 + "port-version": 4 }, "duktape": { "baseline": "2.5.0", - "port-version": 1 + "port-version": 2 }, "dx": { - "baseline": "1.0.1-1", - "port-version": 0 + "baseline": "1.0.1", + "port-version": 2 }, "dxsdk-d3dx": { "baseline": "9.29.952.8", @@ -1842,23 +1842,23 @@ }, "easycl": { "baseline": "0.3", - "port-version": 0 + "port-version": 1 }, "easyhook": { "baseline": "2.7.6789.0", "port-version": 1 }, "easyloggingpp": { - "baseline": "9.96.7-1", - "port-version": 0 + "baseline": "9.96.7", + "port-version": 2 }, "eathread": { - "baseline": "1.32.09-1", - "port-version": 0 + "baseline": "1.32.09", + "port-version": 2 }, "ebml": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 1 }, "ecm": { "baseline": "5.84.0", @@ -1870,11 +1870,11 @@ }, "ecsutil": { "baseline": "1.0.7.15", - "port-version": 0 + "port-version": 1 }, "edlib": { "baseline": "1.2.6", - "port-version": 0 + "port-version": 1 }, "effects11": { "baseline": "11.26", @@ -1882,19 +1882,19 @@ }, "effolkronium-random": { "baseline": "1.3.1", - "port-version": 0 + "port-version": 1 }, "efsw": { "baseline": "2020-06-08", - "port-version": 1 + "port-version": 2 }, "egl-registry": { "baseline": "2020-02-20", - "port-version": 0 + "port-version": 1 }, "eigen3": { "baseline": "3.3.9", - "port-version": 0 + "port-version": 1 }, "elfio": { "baseline": "3.9", @@ -1902,7 +1902,7 @@ }, "elfutils": { "baseline": "0.182", - "port-version": 0 + "port-version": 1 }, "embree2": { "baseline": "2.17.7", @@ -1921,24 +1921,24 @@ "port-version": 0 }, "entityx": { - "baseline": "1.3.0-2", - "port-version": 0 + "baseline": "1.3.0", + "port-version": 3 }, "entt": { "baseline": "3.8.0", "port-version": 1 }, "epsilon": { - "baseline": "0.9.2-4", - "port-version": 0 + "baseline": "0.9.2", + "port-version": 5 }, "esaxx": { "baseline": "ca7cb332011ec37", - "port-version": 0 + "port-version": 1 }, "evpp": { "baseline": "0.7.0", - "port-version": 4 + "port-version": 5 }, "exiv2": { "baseline": "0.27.4", @@ -1950,11 +1950,11 @@ }, "expected-lite": { "baseline": "0.3.0", - "port-version": 0 + "port-version": 1 }, "exprtk": { "baseline": "2021-01-01", - "port-version": 0 + "port-version": 1 }, "ezc3d": { "baseline": "1.3.7", @@ -1962,11 +1962,11 @@ }, "faad2": { "baseline": "2.9.1", - "port-version": 2 + "port-version": 3 }, "fadbad": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "faiss": { "baseline": "1.7.1", @@ -1982,11 +1982,11 @@ }, "farmhash": { "baseline": "1.1", - "port-version": 2 + "port-version": 3 }, "fast-cpp-csv-parser": { "baseline": "2021-01-03", - "port-version": 0 + "port-version": 1 }, "fast-float": { "baseline": "0.8.0", @@ -1998,11 +1998,11 @@ }, "fastcgi": { "baseline": "2020-09-11", - "port-version": 0 + "port-version": 1 }, "fastfeat": { - "baseline": "391d5e9-1", - "port-version": 0 + "baseline": "391d5e9", + "port-version": 2 }, "fastlz": { "baseline": "2021-05-10", @@ -2010,7 +2010,7 @@ }, "fastrtps": { "baseline": "2.0.1", - "port-version": 0 + "port-version": 1 }, "fbgemm": { "baseline": "2021-03-18", @@ -2022,15 +2022,15 @@ }, "fcl": { "baseline": "0.6.1", - "port-version": 0 + "port-version": 1 }, "fdk-aac": { "baseline": "2.0.2", "port-version": 1 }, "fdlibm": { - "baseline": "5.3-4", - "port-version": 0 + "baseline": "5.3", + "port-version": 5 }, "ffmpeg": { "baseline": "4.4", @@ -2038,7 +2038,7 @@ }, "ffnvcodec": { "baseline": "10.0.26.0", - "port-version": 1 + "port-version": 2 }, "fftw3": { "baseline": "3.3.9", @@ -2046,15 +2046,15 @@ }, "fftwpp": { "baseline": "2019-12-19", - "port-version": 0 + "port-version": 1 }, "field3d": { "baseline": "1.7.3", - "port-version": 1 + "port-version": 2 }, "fixed-string": { "baseline": "0.1.0", - "port-version": 0 + "port-version": 1 }, "fizz": { "baseline": "2021.06.14.00", @@ -2074,11 +2074,11 @@ }, "flatbuffers": { "baseline": "2.0.0", - "port-version": 0 + "port-version": 1 }, "flint": { - "baseline": "2.5.2-4", - "port-version": 0 + "baseline": "2.5.2", + "port-version": 5 }, "fltk": { "baseline": "1.3.7", @@ -2086,7 +2086,7 @@ }, "fluidlite": { "baseline": "2020-08-27", - "port-version": 0 + "port-version": 1 }, "fluidsynth": { "baseline": "2.2.1", @@ -2094,15 +2094,15 @@ }, "fmem": { "baseline": "c-libs-2ccee3d2fb", - "port-version": 0 + "port-version": 1 }, "fmi4cpp": { - "baseline": "0.7.0-2", - "port-version": 0 + "baseline": "0.7.0", + "port-version": 3 }, "fmilib": { "baseline": "2.0.3", - "port-version": 3 + "port-version": 4 }, "fmt": { "baseline": "8.0.1", @@ -2114,15 +2114,15 @@ }, "font-chef": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "fontconfig": { "baseline": "2.13.1", - "port-version": 7 + "port-version": 8 }, "foonathan-memory": { - "baseline": "2019-07-21-1", - "port-version": 0 + "baseline": "2019-07-21", + "port-version": 2 }, "forest": { "baseline": "12.1.0", @@ -2146,15 +2146,15 @@ }, "freeglut": { "baseline": "3.2.1", - "port-version": 5 + "port-version": 6 }, "freeimage": { "baseline": "3.18.0", - "port-version": 19 + "port-version": 20 }, "freeopcua": { - "baseline": "20190125-3", - "port-version": 0 + "baseline": "20190125", + "port-version": 4 }, "freerdp": { "baseline": "2.4.0", @@ -2170,7 +2170,7 @@ }, "freetype-gl": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "freexl": { "baseline": "1.0.4", @@ -2178,7 +2178,7 @@ }, "fribidi": { "baseline": "1.0.10", - "port-version": 2 + "port-version": 3 }, "frozen": { "baseline": "2021-04-22", @@ -2190,11 +2190,11 @@ }, "fruit": { "baseline": "3.6.0", - "port-version": 0 + "port-version": 1 }, "ftgl": { - "baseline": "2.4.0-2", - "port-version": 0 + "baseline": "2.4.0", + "port-version": 3 }, "ftxui": { "baseline": "2021-06-17", @@ -2202,7 +2202,7 @@ }, "function2": { "baseline": "4.2.0", - "port-version": 0 + "port-version": 1 }, "functions-framework-cpp": { "baseline": "0.6.0", @@ -2210,7 +2210,7 @@ }, "fuzzylite": { "baseline": "6.0", - "port-version": 3 + "port-version": 4 }, "fxdiv": { "baseline": "2021-02-21", @@ -2218,15 +2218,15 @@ }, "g2o": { "baseline": "2020-02-07", - "port-version": 1 + "port-version": 2 }, "g3log": { "baseline": "1.3.4", "port-version": 1 }, "gainput": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "gamedev-framework": { "baseline": "0.20.0", @@ -2238,19 +2238,19 @@ }, "gamma": { "baseline": "gamma-2018-01-27", - "port-version": 2 + "port-version": 3 }, "gasol": { "baseline": "2018-01-04", - "port-version": 0 + "port-version": 1 }, "gaussianlib": { "baseline": "2019-08-04", - "port-version": 0 + "port-version": 1 }, "gcem": { "baseline": "1.13.1", - "port-version": 0 + "port-version": 1 }, "gdal": { "baseline": "3.2.2", @@ -2258,11 +2258,11 @@ }, "gdcm": { "baseline": "3.0.7", - "port-version": 1 + "port-version": 2 }, "gdcm2": { "baseline": "deprecated", - "port-version": 0 + "port-version": 1 }, "gdk-pixbuf": { "baseline": "2.42.2", @@ -2270,11 +2270,11 @@ }, "genann": { "baseline": "2019-07-10", - "port-version": 0 + "port-version": 1 }, "geogram": { "baseline": "1.7.5", - "port-version": 3 + "port-version": 4 }, "geographiclib": { "baseline": "1.52", @@ -2290,11 +2290,11 @@ }, "getdns": { "baseline": "1.6.0", - "port-version": 0 + "port-version": 1 }, "getopt": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "getopt-win32": { "baseline": "0.1", @@ -2305,20 +2305,20 @@ "port-version": 5 }, "gettimeofday": { - "baseline": "2017-10-14-3", - "port-version": 0 + "baseline": "2017-10-14", + "port-version": 4 }, "gflags": { "baseline": "2.2.2", - "port-version": 2 + "port-version": 3 }, "ghc-filesystem": { "baseline": "1.5.4", "port-version": 1 }, "gherkin-c": { - "baseline": "2019-10-07-1", - "port-version": 0 + "baseline": "2019-10-07", + "port-version": 2 }, "giflib": { "baseline": "5.2.1", @@ -2330,7 +2330,7 @@ }, "gl2ps": { "baseline": "1.4.2", - "port-version": 0 + "port-version": 1 }, "gl3w": { "baseline": "2018-05-31", @@ -2373,8 +2373,8 @@ "port-version": 4 }, "glog": { - "baseline": "0.4.0-3", - "port-version": 0 + "baseline": "0.4.0", + "port-version": 4 }, "gloo": { "baseline": "20201203", @@ -2386,7 +2386,7 @@ }, "glui": { "baseline": "2019-11-30", - "port-version": 0 + "port-version": 1 }, "gmime": { "baseline": "3.2.6", @@ -2394,7 +2394,7 @@ }, "gmmlib": { "baseline": "20.3.1", - "port-version": 0 + "port-version": 1 }, "gmp": { "baseline": "6.2.1", @@ -2406,27 +2406,27 @@ }, "google-cloud-cpp-common": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-spanner": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "googleapis": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "gperf": { - "baseline": "3.1-1", - "port-version": 0 + "baseline": "3.1", + "port-version": 2 }, "gperftools": { "baseline": "2019-09-02", - "port-version": 0 + "port-version": 1 }, "gpgme": { "baseline": "1.14.0", - "port-version": 0 + "port-version": 1 }, "gppanel": { "baseline": "2020-05-20", @@ -2438,11 +2438,11 @@ }, "graphicsmagick": { "baseline": "1.3.36", - "port-version": 0 + "port-version": 1 }, "graphite2": { "baseline": "1.3.14", - "port-version": 0 + "port-version": 1 }, "graphqlparser": { "baseline": "0.7.0", @@ -2450,7 +2450,7 @@ }, "greatest": { "baseline": "1.4.2", - "port-version": 0 + "port-version": 1 }, "grpc": { "baseline": "1.37.0", @@ -2458,11 +2458,11 @@ }, "grppi": { "baseline": "0.4.0", - "port-version": 0 + "port-version": 1 }, "gsl": { "baseline": "2.6", - "port-version": 1 + "port-version": 2 }, "gsl-lite": { "baseline": "0.38.1", @@ -2494,15 +2494,15 @@ }, "guetzli": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "gumbo": { - "baseline": "0.10.1-3", - "port-version": 0 + "baseline": "0.10.1", + "port-version": 4 }, "gzip-hpp": { "baseline": "0.1.0", - "port-version": 0 + "port-version": 1 }, "h3": { "baseline": "3.7.2", @@ -2510,7 +2510,7 @@ }, "h5py-lzf": { "baseline": "2019-12-04", - "port-version": 0 + "port-version": 1 }, "halide": { "baseline": "12.0.1", @@ -2526,7 +2526,7 @@ }, "hayai": { "baseline": "2019-08-10", - "port-version": 0 + "port-version": 1 }, "hazelcast-cpp-client": { "baseline": "4.2.0", @@ -2538,7 +2538,7 @@ }, "healpix": { "baseline": "1.12.10", - "port-version": 7 + "port-version": 8 }, "hedley": { "baseline": "15", @@ -2550,11 +2550,11 @@ }, "hffix": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "hfsm2": { "baseline": "beta7", - "port-version": 0 + "port-version": 1 }, "hidapi": { "baseline": "0.10.1", @@ -2574,11 +2574,11 @@ }, "http-parser": { "baseline": "2.9.4", - "port-version": 0 + "port-version": 1 }, "hungarian": { "baseline": "v0.1.3", - "port-version": 0 + "port-version": 1 }, "hunspell": { "baseline": "1.7.0", @@ -2586,11 +2586,11 @@ }, "hwloc": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "hyperscan": { "baseline": "5.3.0", - "port-version": 1 + "port-version": 2 }, "hypodermic": { "baseline": "2.5.2", @@ -2598,91 +2598,91 @@ }, "hypre": { "baseline": "2.19.0", - "port-version": 0 + "port-version": 1 }, "icu": { "baseline": "69.1", "port-version": 14 }, "ideviceinstaller": { - "baseline": "1.1.2.23-1", - "port-version": 0 + "baseline": "1.1.2.23", + "port-version": 2 }, "idevicerestore": { - "baseline": "1.0.12-4", - "port-version": 0 + "baseline": "1.0.12", + "port-version": 5 }, "if97": { "baseline": "2.1.2", - "port-version": 0 + "port-version": 1 }, "igloo": { "baseline": "1.1.1", - "port-version": 0 + "port-version": 1 }, "ignition-cmake0": { - "baseline": "0.6.2-2", - "port-version": 0 + "baseline": "0.6.2", + "port-version": 3 }, "ignition-cmake2": { "baseline": "2.5.0", "port-version": 1 }, "ignition-common1": { - "baseline": "1.1.1-1", - "port-version": 0 + "baseline": "1.1.1", + "port-version": 2 }, "ignition-common3": { "baseline": "3.9.0", - "port-version": 0 + "port-version": 1 }, "ignition-fuel-tools1": { - "baseline": "1.2.0-2", - "port-version": 0 + "baseline": "1.2.0", + "port-version": 3 }, "ignition-fuel-tools4": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "ignition-math4": { - "baseline": "4.0.0-1", - "port-version": 0 + "baseline": "4.0.0", + "port-version": 2 }, "ignition-math6": { "baseline": "6.6.0", - "port-version": 0 + "port-version": 1 }, "ignition-modularscripts": { "baseline": "2020-11-23", - "port-version": 0 + "port-version": 1 }, "ignition-msgs1": { "baseline": "1.0.0", - "port-version": 3 + "port-version": 4 }, "ignition-msgs5": { "baseline": "5.3.0", - "port-version": 2 + "port-version": 3 }, "ignition-msgs6": { "baseline": "6.0.0", - "port-version": 1 + "port-version": 2 }, "ignition-plugin1": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "ignition-transport4": { - "baseline": "4.0.0-2", - "port-version": 0 + "baseline": "4.0.0", + "port-version": 3 }, "ignition-transport8": { "baseline": "8.1.0", - "port-version": 0 + "port-version": 1 }, "ignition-transport9": { "baseline": "9.0.0", - "port-version": 0 + "port-version": 1 }, "igraph": { "baseline": "0.9.4", @@ -2698,15 +2698,15 @@ }, "ilmbase": { "baseline": "2.3.0", - "port-version": 0 + "port-version": 1 }, "imgui": { "baseline": "1.84.2", "port-version": 0 }, "imgui-sfml": { - "baseline": "2.1-2", - "port-version": 0 + "baseline": "2.1", + "port-version": 3 }, "imguizmo": { "baseline": "1.83", @@ -2734,27 +2734,27 @@ }, "inih": { "baseline": "51", - "port-version": 0 + "port-version": 1 }, "iniparser": { "baseline": "2020-04-06", - "port-version": 0 + "port-version": 1 }, "inja": { "baseline": "3.3.0", "port-version": 0 }, "intel-ipsec": { - "baseline": "0.52-1", - "port-version": 0 + "baseline": "0.52", + "port-version": 2 }, "intel-mkl": { "baseline": "2020.0.0", "port-version": 2 }, "intelrdfpmathlib": { - "baseline": "20U2-1", - "port-version": 0 + "baseline": "20U2", + "port-version": 2 }, "io2d": { "baseline": "2020-09-14", @@ -2762,7 +2762,7 @@ }, "irrlicht": { "baseline": "1.8.4", - "port-version": 11 + "port-version": 12 }, "irrxml": { "baseline": "0", @@ -2770,11 +2770,11 @@ }, "isal": { "baseline": "2.25.0", - "port-version": 0 + "port-version": 1 }, "ismrmrd": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "itk": { "baseline": "5.1.0", @@ -2798,7 +2798,7 @@ }, "jansson": { "baseline": "2.13.1", - "port-version": 0 + "port-version": 1 }, "jasper": { "baseline": "2.0.33", @@ -2806,31 +2806,31 @@ }, "jbig2dec": { "baseline": "0.19", - "port-version": 0 + "port-version": 1 }, "jbigkit": { - "baseline": "2.1-4", - "port-version": 0 + "baseline": "2.1", + "port-version": 5 }, "jemalloc": { - "baseline": "4.3.1-4", - "port-version": 0 + "baseline": "4.3.1", + "port-version": 5 }, "jinja2cpplight": { "baseline": "2018-05-08", - "port-version": 0 + "port-version": 1 }, "josuttis-jthread": { "baseline": "2020-07-21", - "port-version": 1 + "port-version": 2 }, "jsmn": { "baseline": "2019-04-27", - "port-version": 0 + "port-version": 1 }, "json-c": { "baseline": "2019-09-10", - "port-version": 1 + "port-version": 2 }, "json-dto": { "baseline": "0.2.13", @@ -2838,31 +2838,31 @@ }, "json-schema-validator": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "json-spirit": { - "baseline": "4.1.0-1", - "port-version": 0 + "baseline": "4.1.0", + "port-version": 2 }, "json11": { - "baseline": "2017-06-20-2", - "port-version": 0 + "baseline": "2017-06-20", + "port-version": 3 }, "json5-parser": { "baseline": "1.0.0", - "port-version": 2 + "port-version": 3 }, "jsoncons": { "baseline": "0.165.0", - "port-version": 0 + "port-version": 1 }, "jsoncpp": { "baseline": "1.9.4", - "port-version": 0 + "port-version": 1 }, "jsonnet": { "baseline": "0.16.0", - "port-version": 2 + "port-version": 3 }, "jwt-cpp": { "baseline": "0.5.1", @@ -2874,15 +2874,15 @@ }, "kangaru": { "baseline": "4.2.4", - "port-version": 0 + "port-version": 1 }, "kcp": { "baseline": "2019-09-20", - "port-version": 0 + "port-version": 1 }, "kd-soap": { "baseline": "1.9.0", - "port-version": 0 + "port-version": 1 }, "kealib": { "baseline": "1.4.14", @@ -2994,19 +2994,19 @@ }, "kfr": { "baseline": "2020-06-15", - "port-version": 0 + "port-version": 1 }, "kinectsdk1": { "baseline": "1.8", "port-version": 3 }, "kinectsdk2": { - "baseline": "2.0-2", - "port-version": 0 + "baseline": "2.0", + "port-version": 3 }, "kissfft": { "baseline": "2020-03-30", - "port-version": 0 + "port-version": 1 }, "klein": { "baseline": "2021-05-09", @@ -3026,15 +3026,15 @@ }, "kubazip": { "baseline": "0.1.19", - "port-version": 0 + "port-version": 1 }, "kuku": { "baseline": "2.1", - "port-version": 0 + "port-version": 1 }, "kvasir-mpl": { "baseline": "2019-08-06", - "port-version": 0 + "port-version": 1 }, "kwsys": { "baseline": "2021-08-06", @@ -3046,7 +3046,7 @@ }, "lapack": { "baseline": "3", - "port-version": 1 + "port-version": 2 }, "lapack-reference": { "baseline": "3.8.0", @@ -3054,7 +3054,7 @@ }, "lastools": { "baseline": "2020-05-09", - "port-version": 0 + "port-version": 1 }, "laszip": { "baseline": "3.4.3", @@ -3062,7 +3062,7 @@ }, "lazy-importer": { "baseline": "2019-08-10", - "port-version": 0 + "port-version": 1 }, "lcm": { "baseline": "1.4.0", @@ -3070,7 +3070,7 @@ }, "lcms": { "baseline": "2.12", - "port-version": 0 + "port-version": 1 }, "leaf": { "baseline": "0.2.2", @@ -3078,35 +3078,35 @@ }, "lemon": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "leptonica": { "baseline": "1.80.0", - "port-version": 2 + "port-version": 3 }, "lerc": { "baseline": "2.2", - "port-version": 1 + "port-version": 2 }, "lest": { "baseline": "1.35.1", - "port-version": 1 + "port-version": 2 }, "leveldb": { - "baseline": "1.22-1", - "port-version": 0 + "baseline": "1.22", + "port-version": 2 }, "levmar": { "baseline": "2.6", "port-version": 0 }, "libaaplus": { - "baseline": "2.12-1", - "port-version": 0 + "baseline": "2.12", + "port-version": 2 }, "libaiff": { - "baseline": "5.0-6", - "port-version": 0 + "baseline": "5.0", + "port-version": 7 }, "libarchive": { "baseline": "3.4.3", @@ -3118,7 +3118,7 @@ }, "libassuan": { "baseline": "2.5.3", - "port-version": 1 + "port-version": 2 }, "libavif": { "baseline": "0.9.2", @@ -3133,8 +3133,8 @@ "port-version": 0 }, "libbf": { - "baseline": "1.0.0-1", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 2 }, "libbson": { "baseline": "1.16.1", @@ -3146,19 +3146,19 @@ }, "libcds": { "baseline": "2.3.3", - "port-version": 0 + "port-version": 1 }, "libcerf": { "baseline": "1.13", - "port-version": 0 + "port-version": 1 }, "libconfig": { "baseline": "1.7.3", - "port-version": 0 + "port-version": 1 }, "libconfuse": { "baseline": "2019-07-14", - "port-version": 0 + "port-version": 1 }, "libcopp": { "baseline": "1.4.1", @@ -3174,35 +3174,35 @@ }, "libcuckoo": { "baseline": "0.3", - "port-version": 0 + "port-version": 1 }, "libdatachannel": { "baseline": "0.14.3", "port-version": 0 }, "libdatrie": { - "baseline": "0.2.10-3", - "port-version": 0 + "baseline": "0.2.10", + "port-version": 4 }, "libde265": { "baseline": "1.0.8", - "port-version": 0 + "port-version": 1 }, "libdisasm": { - "baseline": "0.23-7", - "port-version": 0 + "baseline": "0.23", + "port-version": 8 }, "libdivide": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 1 }, "libdjinterop": { "baseline": "0.14.6", "port-version": 0 }, "libdshowcapture": { - "baseline": "0.6.0-1", - "port-version": 0 + "baseline": "0.6.0", + "port-version": 2 }, "libe57": { "baseline": "1.1.312", @@ -3218,19 +3218,19 @@ }, "libevent": { "baseline": "2.1.12", - "port-version": 1 + "port-version": 2 }, "libevhtp": { "baseline": "1.2.18", - "port-version": 0 + "port-version": 1 }, "libexif": { "baseline": "0.6.22", - "port-version": 0 + "port-version": 1 }, "libfabric": { - "baseline": "1.8.1-1", - "port-version": 0 + "baseline": "1.8.1", + "port-version": 2 }, "libffi": { "baseline": "3.4.2", @@ -3242,7 +3242,7 @@ }, "libflac": { "baseline": "1.3.3", - "port-version": 5 + "port-version": 6 }, "libfort": { "baseline": "0.4.2", @@ -3250,11 +3250,11 @@ }, "libfreenect2": { "baseline": "0.2.0", - "port-version": 5 + "port-version": 6 }, "libftdi": { - "baseline": "0.20-1", - "port-version": 0 + "baseline": "0.20", + "port-version": 2 }, "libftdi1": { "baseline": "1.5", @@ -3262,15 +3262,15 @@ }, "libgcrypt": { "baseline": "1.8.7", - "port-version": 1 + "port-version": 2 }, "libgd": { - "baseline": "2.2.5-4", - "port-version": 0 + "baseline": "2.2.5", + "port-version": 5 }, "libgeotiff": { "baseline": "1.6.0", - "port-version": 3 + "port-version": 4 }, "libgit2": { "baseline": "1.2.0", @@ -3293,12 +3293,12 @@ "port-version": 3 }, "libgta": { - "baseline": "1.0.8-1", - "port-version": 0 + "baseline": "1.0.8", + "port-version": 2 }, "libguarded": { - "baseline": "2019-08-27-1", - "port-version": 0 + "baseline": "2019-08-27", + "port-version": 2 }, "libgwenhywfar": { "baseline": "5.6.0", @@ -3310,7 +3310,7 @@ }, "libhdfs3": { "baseline": "2019-11-05", - "port-version": 0 + "port-version": 1 }, "libheif": { "baseline": "1.10.0", @@ -3326,7 +3326,7 @@ }, "libhydrogen": { "baseline": "2019-08-11", - "port-version": 0 + "port-version": 1 }, "libiconv": { "baseline": "1.16", @@ -3338,7 +3338,7 @@ }, "libideviceactivation": { "baseline": "1.2.235", - "port-version": 0 + "port-version": 1 }, "libidn2": { "baseline": "2.3.0", @@ -3346,23 +3346,23 @@ }, "libigl": { "baseline": "2.2.0", - "port-version": 5 + "port-version": 6 }, "libilbc": { "baseline": "3.0.3", - "port-version": 0 + "port-version": 1 }, "libimobiledevice": { "baseline": "1.3.6", - "port-version": 1 + "port-version": 2 }, "libirecovery": { - "baseline": "1.0.25-2", - "port-version": 0 + "baseline": "1.0.25", + "port-version": 3 }, "libjpeg-turbo": { "baseline": "2.0.6", - "port-version": 1 + "port-version": 2 }, "libjuice": { "baseline": "0.8.4", @@ -3374,19 +3374,19 @@ }, "libkml": { "baseline": "1.3.0", - "port-version": 6 + "port-version": 7 }, "liblas": { "baseline": "1.8.1", - "port-version": 6 + "port-version": 7 }, "liblbfgs": { "baseline": "1.10", - "port-version": 0 + "port-version": 1 }, "liblemon": { - "baseline": "2019-06-13-1", - "port-version": 0 + "baseline": "2019-06-13", + "port-version": 2 }, "liblinear": { "baseline": "243", @@ -3398,15 +3398,15 @@ }, "liblsl": { "baseline": "1.14.0", - "port-version": 1 + "port-version": 2 }, "liblzma": { "baseline": "5.2.5", "port-version": 3 }, "libmad": { - "baseline": "0.15.1-8", - "port-version": 0 + "baseline": "0.15.1", + "port-version": 9 }, "libmagic": { "baseline": "5.40", @@ -3418,31 +3418,31 @@ }, "libmaxminddb": { "baseline": "1.4.3", - "port-version": 0 + "port-version": 1 }, "libmediainfo": { "baseline": "21.03", "port-version": 0 }, "libmesh": { - "baseline": "1.5.0-1", - "port-version": 0 + "baseline": "1.5.0", + "port-version": 2 }, "libmicrohttpd": { "baseline": "0.9.63", "port-version": 6 }, "libmikmod": { - "baseline": "3.3.11.1-8", - "port-version": 0 + "baseline": "3.3.11.1", + "port-version": 9 }, "libmodbus": { "baseline": "3.1.6", "port-version": 1 }, "libmodman": { - "baseline": "2.0.1-2", - "port-version": 0 + "baseline": "2.0.1", + "port-version": 3 }, "libmodplug": { "baseline": "0.8.9.0", @@ -3450,16 +3450,16 @@ }, "libmorton": { "baseline": "0.2", - "port-version": 0 + "port-version": 1 }, "libmpeg2": { "baseline": "0.5.1", - "port-version": 0 + "port-version": 1 }, "libmspack": { - "baseline": "0.10.1-3", - "port-version": 0 - }, + "baseline": "0.10.1", + "port-version": 4 + }, "libmt32emu": { "baseline": "2.5.3", "port-version": 0 @@ -3478,7 +3478,7 @@ }, "libnoise": { "baseline": "1.0.0", - "port-version": 1 + "port-version": 2 }, "libnop": { "baseline": "2021-03-01", @@ -3490,7 +3490,7 @@ }, "libodb-boost": { "baseline": "2.4.0", - "port-version": 4 + "port-version": 5 }, "libodb-mysql": { "baseline": "2.4.0", @@ -3498,11 +3498,11 @@ }, "libodb-pgsql": { "baseline": "2.4.0", - "port-version": 4 + "port-version": 5 }, "libodb-sqlite": { "baseline": "2.4.0", - "port-version": 8 + "port-version": 9 }, "libogg": { "baseline": "1.3.5", @@ -3530,19 +3530,19 @@ }, "libp7-baical": { "baseline": "replaced", - "port-version": 0 + "port-version": 1 }, "libp7client": { "baseline": "5.6", - "port-version": 0 + "port-version": 1 }, "libpcap": { "baseline": "1.10.1", "port-version": 0 }, "libpff": { - "baseline": "2018-07-14-1", - "port-version": 0 + "baseline": "2018-07-14", + "port-version": 2 }, "libplist": { "baseline": "1.3.6", @@ -3557,8 +3557,8 @@ "port-version": 15 }, "libpopt": { - "baseline": "1.16-13", - "port-version": 0 + "baseline": "1.16", + "port-version": 14 }, "libpq": { "baseline": "12.2", @@ -3573,16 +3573,16 @@ "port-version": 0 }, "libproxy": { - "baseline": "0.4.15-2", - "port-version": 0 + "baseline": "0.4.15", + "port-version": 3 }, "libqcow": { "baseline": "20210419", - "port-version": 0 + "port-version": 1 }, "libqglviewer": { - "baseline": "2.7.2-3", - "port-version": 0 + "baseline": "2.7.2", + "port-version": 4 }, "libqrencode": { "baseline": "4.1.1", @@ -3590,19 +3590,19 @@ }, "librabbitmq": { "baseline": "2020-06-03", - "port-version": 0 + "port-version": 1 }, "libraqm": { "baseline": "0.7.0", - "port-version": 2 + "port-version": 3 }, "libraw": { - "baseline": "201903-3", - "port-version": 0 + "baseline": "201903", + "port-version": 4 }, "librdkafka": { "baseline": "1.7.0", - "port-version": 0 + "port-version": 1 }, "libressl": { "baseline": "3.3.3", @@ -3630,11 +3630,11 @@ }, "libsass": { "baseline": "3.6.4", - "port-version": 0 + "port-version": 1 }, "libsbml": { "baseline": "5.18.0", - "port-version": 0 + "port-version": 1 }, "libsbsms": { "baseline": "2.3.0", @@ -3674,39 +3674,39 @@ }, "libspatialite": { "baseline": "5.0.0", - "port-version": 2 + "port-version": 3 }, "libspnav": { "baseline": "0.2.3", - "port-version": 0 + "port-version": 1 }, "libsquish": { - "baseline": "1.15-7", - "port-version": 0 + "baseline": "1.15", + "port-version": 8 }, "libsrt": { "baseline": "1.3.4", - "port-version": 0 + "port-version": 1 }, "libsrtp": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "libssh": { "baseline": "0.9.5", - "port-version": 5 + "port-version": 6 }, "libssh2": { "baseline": "1.9.0", - "port-version": 0 + "port-version": 1 }, "libstemmer": { - "baseline": "2017-9-5", - "port-version": 0 + "baseline": "2017-9", + "port-version": 6 }, "libstk": { "baseline": "4.6.1", - "port-version": 0 + "port-version": 1 }, "libsvm": { "baseline": "323", @@ -3722,19 +3722,19 @@ }, "libtheora": { "baseline": "1.2.0alpha1-20170719", - "port-version": 2 + "port-version": 3 }, "libtins": { "baseline": "4.3", - "port-version": 0 + "port-version": 1 }, "libtomcrypt": { - "baseline": "1.18.2-1", - "port-version": 0 + "baseline": "1.18.2", + "port-version": 2 }, "libtommath": { - "baseline": "1.2.0-1", - "port-version": 0 + "baseline": "1.2.0", + "port-version": 2 }, "libtorrent": { "baseline": "1.2.14", @@ -3742,23 +3742,23 @@ }, "libu2f-server": { "baseline": "1.1.0", - "port-version": 2 + "port-version": 3 }, "libudis86": { "baseline": "2018-01-28-56ff6c87", "port-version": 1 }, "libudns": { - "baseline": "0.4-2", - "port-version": 0 + "baseline": "0.4", + "port-version": 3 }, "libui": { "baseline": "2018-11-03", "port-version": 2 }, "libunibreak": { - "baseline": "4.3-0", - "port-version": 0 + "baseline": "4.3", + "port-version": 1 }, "libunifex": { "baseline": "2021-08-01", @@ -3777,12 +3777,12 @@ "port-version": 4 }, "libusb-win32": { - "baseline": "1.2.6.0-6", - "port-version": 0 + "baseline": "1.2.6.0", + "port-version": 7 }, "libusbmuxd": { "baseline": "1.2.219", - "port-version": 0 + "port-version": 1 }, "libuuid": { "baseline": "1.0.3", @@ -3794,11 +3794,11 @@ }, "libuvc": { "baseline": "2020-11-24", - "port-version": 0 + "port-version": 1 }, "libvmdk": { "baseline": "20200926", - "port-version": 0 + "port-version": 1 }, "libvorbis": { "baseline": "1.3.7", @@ -3810,15 +3810,15 @@ }, "libwandio": { "baseline": "4.2.1", - "port-version": 3 + "port-version": 4 }, "libwebm": { "baseline": "1.0.0.27", - "port-version": 6 + "port-version": 7 }, "libwebp": { "baseline": "1.1.0", - "port-version": 3 + "port-version": 4 }, "libwebsockets": { "baseline": "4.2.2", @@ -3826,7 +3826,7 @@ }, "libxdiff": { "baseline": "0.23", - "port-version": 0 + "port-version": 1 }, "libxlsxwriter": { "baseline": "1.1.3", @@ -3838,15 +3838,15 @@ }, "libxmlmm": { "baseline": "0.6.0", - "port-version": 0 + "port-version": 1 }, "libxmlpp": { "baseline": "5.0.0", "port-version": 0 }, "libxmp-lite": { - "baseline": "4.4.1-6", - "port-version": 0 + "baseline": "4.4.1", + "port-version": 7 }, "libxslt": { "baseline": "1.1.34", @@ -3854,7 +3854,7 @@ }, "libyaml": { "baseline": "0.2.5", - "port-version": 0 + "port-version": 1 }, "libyuv": { "baseline": "2021-04-15", @@ -3862,7 +3862,7 @@ }, "libzen": { "baseline": "0.4.38", - "port-version": 0 + "port-version": 1 }, "libzip": { "baseline": "1.7.3", @@ -3870,11 +3870,11 @@ }, "libzippp": { "baseline": "5.0-1.8.0", - "port-version": 0 + "port-version": 1 }, "licensepp": { "baseline": "2020-05-19", - "port-version": 1 + "port-version": 2 }, "lilv": { "baseline": "0.24.10", @@ -3882,23 +3882,23 @@ }, "linalg": { "baseline": "2.1", - "port-version": 0 + "port-version": 1 }, "linenoise-ng": { - "baseline": "4754bee2d8eb3-1", - "port-version": 0 + "baseline": "4754bee2d8eb3", + "port-version": 2 }, "live555": { - "baseline": "latest-1", - "port-version": 0 + "baseline": "latest", + "port-version": 2 }, "llfio": { - "baseline": "2.0-20210420", - "port-version": 0 + "baseline": "2.0", + "port-version": 20210421 }, "llgl": { "baseline": "2019-08-15", - "port-version": 1 + "port-version": 2 }, "llvm": { "baseline": "12.0.1", @@ -3906,7 +3906,7 @@ }, "lmdb": { "baseline": "0.9.24", - "port-version": 0 + "port-version": 1 }, "lodepng": { "baseline": "2020-03-15", @@ -3918,23 +3918,23 @@ }, "log4cplus": { "baseline": "2.0.5", - "port-version": 1 + "port-version": 2 }, "log4cpp": { "baseline": "2.9.1", - "port-version": 4 + "port-version": 5 }, "log4cxx": { "baseline": "0.11.0", - "port-version": 2 + "port-version": 3 }, "loguru": { - "baseline": "2.1.0-1", - "port-version": 0 + "baseline": "2.1.0", + "port-version": 2 }, "lpeg": { - "baseline": "1.0.2-1", - "port-version": 0 + "baseline": "1.0.2", + "port-version": 2 }, "lua": { "baseline": "5.4.3", @@ -3942,15 +3942,15 @@ }, "luabridge": { "baseline": "2.6", - "port-version": 0 + "port-version": 1 }, "luafilesystem": { - "baseline": "1.8.0-1", - "port-version": 0 + "baseline": "1.8.0", + "port-version": 2 }, "luajit": { - "baseline": "2.0.5-3", - "port-version": 0 + "baseline": "2.0.5", + "port-version": 4 }, "luasec": { "baseline": "1.0.1", @@ -3958,7 +3958,7 @@ }, "luasocket": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "lv2": { "baseline": "1.18.2", @@ -3966,15 +3966,15 @@ }, "lz4": { "baseline": "1.9.3", - "port-version": 0 + "port-version": 1 }, "lzfse": { - "baseline": "1.0-2", - "port-version": 0 + "baseline": "1.0", + "port-version": 3 }, "lzo": { "baseline": "2.10", - "port-version": 6 + "port-version": 7 }, "lzokay": { "baseline": "2020-07-30", @@ -3982,7 +3982,7 @@ }, "magic-enum": { "baseline": "0.7.3", - "port-version": 0 + "port-version": 1 }, "magic-get": { "baseline": "2019-09-02", @@ -3990,19 +3990,19 @@ }, "magnum": { "baseline": "2020.06", - "port-version": 6 + "port-version": 7 }, "magnum-extras": { "baseline": "2020.06", - "port-version": 0 + "port-version": 1 }, "magnum-integration": { "baseline": "2020.06", - "port-version": 0 + "port-version": 1 }, "magnum-plugins": { "baseline": "2020.06", - "port-version": 6 + "port-version": 7 }, "mailio": { "baseline": "0.20.0", @@ -4026,7 +4026,7 @@ }, "mapbox-variant": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "mapbox-wagyu": { "baseline": "0.5.0", @@ -4042,11 +4042,11 @@ }, "mathc": { "baseline": "2019-09-29", - "port-version": 0 + "port-version": 1 }, "mathgl": { - "baseline": "2.4.3-6", - "port-version": 0 + "baseline": "2.4.3", + "port-version": 7 }, "matio": { "baseline": "1.5.19", @@ -4054,7 +4054,7 @@ }, "matplotlib-cpp": { "baseline": "2020-08-27", - "port-version": 0 + "port-version": 1 }, "matplotplusplus": { "baseline": "2021-04-11", @@ -4062,15 +4062,15 @@ }, "matroska": { "baseline": "1.6.2", - "port-version": 0 + "port-version": 1 }, "mbedtls": { "baseline": "2.24.0", - "port-version": 2 + "port-version": 3 }, "mcpp": { "baseline": "2.7.2.14", - "port-version": 2 + "port-version": 3 }, "mdns": { "baseline": "1.1", @@ -4078,31 +4078,31 @@ }, "mdnsresponder": { "baseline": "765.30.11", - "port-version": 3 + "port-version": 4 }, "mecab": { "baseline": "2019-09-25", - "port-version": 1 + "port-version": 2 }, "memorymodule": { "baseline": "2019-12-31", - "port-version": 0 + "port-version": 1 }, "mesa": { "baseline": "21.2.0", "port-version": 0 }, "meschach": { - "baseline": "1.2b-3", - "port-version": 0 + "baseline": "1.2b", + "port-version": 4 }, "meshoptimizer": { "baseline": "0.14", - "port-version": 1 + "port-version": 2 }, "metis": { "baseline": "5.1.0", - "port-version": 7 + "port-version": 8 }, "metrohash": { "baseline": "1.1.3", @@ -4114,59 +4114,59 @@ }, "mgnlibs": { "baseline": "2019-09-29", - "port-version": 0 + "port-version": 1 }, "mhook": { - "baseline": "2.5.1-1", - "port-version": 0 + "baseline": "2.5.1", + "port-version": 2 }, "microsoft-signalr": { "baseline": "0.1.0-alpha3", - "port-version": 0 + "port-version": 1 }, "mikktspace": { "baseline": "2020-10-06", - "port-version": 0 + "port-version": 1 }, "milerius-sfml-imgui": { - "baseline": "1.1-2", - "port-version": 0 + "baseline": "1.1", + "port-version": 3 }, "mimalloc": { "baseline": "1.6.4", - "port-version": 0 + "port-version": 1 }, "minc": { "baseline": "2.4.03", - "port-version": 1 + "port-version": 2 }, "minhook": { "baseline": "1.3.3", - "port-version": 1 + "port-version": 2 }, "minifb": { - "baseline": "2019-08-20-1", - "port-version": 0 + "baseline": "2019-08-20", + "port-version": 2 }, "minimp3": { "baseline": "2020-12-25", - "port-version": 0 + "port-version": 1 }, "minisat-master-keying": { - "baseline": "2.2-mod-2", - "port-version": 0 + "baseline": "2.2-mod", + "port-version": 3 }, "minitrace": { "baseline": "2019.02.06", - "port-version": 0 + "port-version": 1 }, "miniupnpc": { - "baseline": "2.1-1", - "port-version": 0 + "baseline": "2.1", + "port-version": 2 }, "miniz": { - "baseline": "2.1.0-1", - "port-version": 0 + "baseline": "2.1.0", + "port-version": 2 }, "minizip": { "baseline": "1.2.11", @@ -4178,15 +4178,15 @@ }, "mio": { "baseline": "2019-02-10", - "port-version": 0 + "port-version": 1 }, "mlpack": { "baseline": "3.4.1", "port-version": 2 }, "mman": { - "baseline": "git-f5ff813-3", - "port-version": 0 + "baseline": "git-f5ff813", + "port-version": 4 }, "mmloader": { "baseline": "2020-05-15", @@ -4194,7 +4194,7 @@ }, "mmx": { "baseline": "2019-09-29", - "port-version": 0 + "port-version": 1 }, "mnn": { "baseline": "1.1.0", @@ -4202,7 +4202,7 @@ }, "modp-base64": { "baseline": "2020-09-26", - "port-version": 0 + "port-version": 1 }, "mongo-c-driver": { "baseline": "1.16.1", @@ -4210,7 +4210,7 @@ }, "mongo-cxx-driver": { "baseline": "3.4.0-5", - "port-version": 2 + "port-version": 3 }, "mongoose": { "baseline": "7.1", @@ -4218,23 +4218,23 @@ }, "monkeys-audio": { "baseline": "5.70", - "port-version": 0 + "port-version": 1 }, "moos-core": { "baseline": "10.4.0", - "port-version": 5 + "port-version": 6 }, "moos-essential": { - "baseline": "10.0.1-2", - "port-version": 0 + "baseline": "10.0.1", + "port-version": 3 }, "moos-ui": { - "baseline": "10.0.1-2", - "port-version": 0 + "baseline": "10.0.1", + "port-version": 3 }, "morton-nd": { "baseline": "4.0.0", - "port-version": 0 + "port-version": 1 }, "mosquitto": { "baseline": "1.6.8", @@ -4242,27 +4242,27 @@ }, "mozjpeg": { "baseline": "2020-06-02", - "port-version": 2 + "port-version": 3 }, "mp-units": { "baseline": "0.6.0", - "port-version": 0 + "port-version": 1 }, "mp3lame": { "baseline": "3.100", - "port-version": 6 + "port-version": 7 }, "mpark-variant": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 1 }, "mpc": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "mpfr": { "baseline": "4.1.0", - "port-version": 0 + "port-version": 1 }, "mpg123": { "baseline": "1.28.0", @@ -4270,7 +4270,7 @@ }, "mpi": { "baseline": "1", - "port-version": 0 + "port-version": 1 }, "mpir": { "baseline": "3.0.0", @@ -4278,15 +4278,15 @@ }, "mpmcqueue": { "baseline": "2019-07-26", - "port-version": 0 + "port-version": 1 }, "mqtt-cpp": { "baseline": "9.0.0", - "port-version": 0 + "port-version": 1 }, "ms-angle": { "baseline": "alias", - "port-version": 0 + "port-version": 1 }, "ms-gltf": { "baseline": "r1.9.5.4", @@ -4294,7 +4294,7 @@ }, "ms-gsl": { "baseline": "3.1.0", - "port-version": 0 + "port-version": 1 }, "ms-quic": { "baseline": "1.2.0", @@ -4306,7 +4306,7 @@ }, "msgpack": { "baseline": "3.3.0", - "port-version": 0 + "port-version": 1 }, "msgpack11": { "baseline": "0.0.10", @@ -4314,7 +4314,7 @@ }, "msinttypes": { "baseline": "2018-02-25", - "port-version": 0 + "port-version": 1 }, "msix": { "baseline": "1.7", @@ -4325,32 +4325,32 @@ "port-version": 1 }, "mstch": { - "baseline": "1.0.2-2", - "port-version": 0 + "baseline": "1.0.2", + "port-version": 3 }, "mujs": { - "baseline": "2018-07-30-1", - "port-version": 0 + "baseline": "2018-07-30", + "port-version": 2 }, "munit": { "baseline": "2019-04-06", - "port-version": 1 + "port-version": 2 }, "muparser": { "baseline": "2.3.2", - "port-version": 0 + "port-version": 1 }, "murmurhash": { - "baseline": "2016-01-09-3", - "port-version": 0 + "baseline": "2016-01-09", + "port-version": 4 }, "mygui": { "baseline": "2020-06-17", - "port-version": 0 + "port-version": 1 }, "nameof": { "baseline": "0.10.1", - "port-version": 0 + "port-version": 1 }, "nana": { "baseline": "1.7.4", @@ -4358,11 +4358,11 @@ }, "nano-signal-slot": { "baseline": "2.0.1", - "port-version": 0 + "port-version": 1 }, "nanobench": { "baseline": "4.3.0", - "port-version": 0 + "port-version": 1 }, "nanodbc": { "baseline": "2.13.0", @@ -4370,15 +4370,15 @@ }, "nanoflann": { "baseline": "1.3.1", - "port-version": 0 + "port-version": 1 }, "nanogui": { "baseline": "2019-09-23", - "port-version": 1 + "port-version": 2 }, "nanomsg": { - "baseline": "1.1.5-2", - "port-version": 0 + "baseline": "1.1.5", + "port-version": 3 }, "nanopb": { "baseline": "0.4.5", @@ -4386,19 +4386,19 @@ }, "nanoprintf": { "baseline": "2020-05-27", - "port-version": 0 + "port-version": 1 }, "nanorange": { "baseline": "0.0.0", - "port-version": 0 + "port-version": 1 }, "nanort": { - "baseline": "2019-08-20-1", - "port-version": 0 + "baseline": "2019-08-20", + "port-version": 2 }, "nanovg": { - "baseline": "2019-8-30-3", - "port-version": 0 + "baseline": "2019-8-30", + "port-version": 4 }, "nativefiledialog": { "baseline": "2019-08-28", @@ -4414,11 +4414,11 @@ }, "neargye-semver": { "baseline": "0.2.2", - "port-version": 0 + "port-version": 1 }, "ned14-internal-quickcpplib": { "baseline": "0.0.0-7cb75d4e", - "port-version": 0 + "port-version": 1 }, "netcdf-c": { "baseline": "4.7.4", @@ -4426,11 +4426,11 @@ }, "netcdf-cxx4": { "baseline": "4.3.1", - "port-version": 2 + "port-version": 3 }, "nethost": { "baseline": "2019-12-21", - "port-version": 0 + "port-version": 1 }, "nettle": { "baseline": "3.6", @@ -4438,7 +4438,7 @@ }, "networkdirect-sdk": { "baseline": "2.0.1", - "port-version": 1 + "port-version": 2 }, "nghttp2": { "baseline": "1.44.0", @@ -4450,11 +4450,11 @@ }, "nifticlib": { "baseline": "2020-04-30", - "port-version": 0 + "port-version": 1 }, "nlohmann-fifo-map": { - "baseline": "2018.05.07-1", - "port-version": 0 + "baseline": "2018.05.07", + "port-version": 2 }, "nlohmann-json": { "baseline": "3.10.2", @@ -4470,7 +4470,7 @@ }, "nmslib": { "baseline": "2.0.6", - "port-version": 0 + "port-version": 1 }, "nng": { "baseline": "1.4.0", @@ -4478,15 +4478,15 @@ }, "nngpp": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "nnpack": { "baseline": "2021-02-21", "port-version": 1 }, "nonius": { - "baseline": "2019-04-20-1", - "port-version": 0 + "baseline": "2019-04-20", + "port-version": 2 }, "nowide": { "baseline": "11.1.2", @@ -4494,7 +4494,7 @@ }, "nrf-ble-driver": { "baseline": "4.1.2", - "port-version": 0 + "port-version": 1 }, "nsync": { "baseline": "1.24.0", @@ -4502,7 +4502,7 @@ }, "nt-wrapper": { "baseline": "2019-08-10", - "port-version": 0 + "port-version": 1 }, "nuklear": { "baseline": "2021-03-18", @@ -4510,7 +4510,7 @@ }, "numactl": { "baseline": "2.0.12", - "port-version": 0 + "port-version": 1 }, "numcpp": { "baseline": "2.1.0", @@ -4522,7 +4522,7 @@ }, "nvtt": { "baseline": "2.1.2", - "port-version": 1 + "port-version": 2 }, "oatpp": { "baseline": "1.2.5", @@ -4574,7 +4574,7 @@ }, "observer-ptr-lite": { "baseline": "0.4.0", - "port-version": 0 + "port-version": 1 }, "ocilib": { "baseline": "4.7.1", @@ -4582,27 +4582,27 @@ }, "octomap": { "baseline": "1.9.5", - "port-version": 0 + "port-version": 1 }, "ode": { "baseline": "0.16.1", - "port-version": 0 + "port-version": 1 }, "offscale-libetcd-cpp": { - "baseline": "2019-07-10-1", - "port-version": 0 + "baseline": "2019-07-10", + "port-version": 2 }, "ogdf": { "baseline": "2019-08-23", - "port-version": 1 + "port-version": 2 }, "ogre": { "baseline": "1.12.9", "port-version": 5 }, "ogre-next": { - "baseline": "2019-10-20-1", - "port-version": 0 + "baseline": "2019-10-20", + "port-version": 2 }, "ois": { "baseline": "1.5", @@ -4610,7 +4610,7 @@ }, "ompl": { "baseline": "1.5.1", - "port-version": 1 + "port-version": 2 }, "omplapp": { "baseline": "1.5.1", @@ -4622,7 +4622,7 @@ }, "oniguruma": { "baseline": "6.9.4", - "port-version": 0 + "port-version": 1 }, "onnx": { "baseline": "1.9.0", @@ -4646,19 +4646,19 @@ }, "opencascade": { "baseline": "7.5.0", - "port-version": 1 + "port-version": 2 }, "opencc": { "baseline": "2020-04-26", - "port-version": 7 + "port-version": 8 }, "opencensus-cpp": { - "baseline": "0.4.0-1", - "port-version": 0 + "baseline": "0.4.0", + "port-version": 2 }, "opencl": { "baseline": "2.2", - "port-version": 7 + "port-version": 8 }, "opencolorio": { "baseline": "2.0.1", @@ -4669,8 +4669,8 @@ "port-version": 0 }, "opencsg": { - "baseline": "1.4.2-1", - "port-version": 0 + "baseline": "1.4.2", + "port-version": 2 }, "opencv": { "baseline": "4.5.3", @@ -4698,11 +4698,11 @@ }, "opengl": { "baseline": "0.0", - "port-version": 8 + "port-version": 9 }, "opengl-registry": { "baseline": "2020-03-25", - "port-version": 0 + "port-version": 1 }, "openh264": { "baseline": "2021-03-16", @@ -4710,7 +4710,7 @@ }, "openigtlink": { "baseline": "3.0", - "port-version": 1 + "port-version": 2 }, "openimageio": { "baseline": "2.3.7.2", @@ -4726,11 +4726,11 @@ }, "openmesh": { "baseline": "8.1", - "port-version": 0 + "port-version": 1 }, "openmpi": { "baseline": "4.1.0", - "port-version": 0 + "port-version": 1 }, "openmvg": { "baseline": "1.6", @@ -4738,15 +4738,15 @@ }, "openmvs": { "baseline": "1.1", - "port-version": 4 + "port-version": 5 }, "openni2": { - "baseline": "2.2.0.33-11", - "port-version": 0 + "baseline": "2.2.0.33", + "port-version": 12 }, "openscap": { "baseline": "1.3.1", - "port-version": 0 + "port-version": 1 }, "openssl": { "baseline": "1.1.1l", @@ -4754,15 +4754,15 @@ }, "openssl-unix": { "baseline": "1.1.1h", - "port-version": 1 + "port-version": 2 }, "openssl-uwp": { "baseline": "1.1.1h", - "port-version": 1 + "port-version": 2 }, "openssl-windows": { "baseline": "1.1.1h", - "port-version": 1 + "port-version": 2 }, "opensubdiv": { "baseline": "3.4.3", @@ -4781,36 +4781,36 @@ "port-version": 0 }, "openvpn3": { - "baseline": "3.4.1-1", - "port-version": 0 + "baseline": "3.4.1", + "port-version": 2 }, "openvr": { "baseline": "1.16.8", - "port-version": 0 + "port-version": 1 }, "openxr-loader": { "baseline": "1.0.18", - "port-version": 1 + "port-version": 2 }, "optional-bare": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "optional-lite": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "opus": { "baseline": "1.3.1", - "port-version": 5 + "port-version": 6 }, "opusfile": { "baseline": "0.12", - "port-version": 0 + "port-version": 1 }, "orc": { "baseline": "1.6.4", - "port-version": 1 + "port-version": 2 }, "orocos-kdl": { "baseline": "1.4", @@ -4818,11 +4818,11 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 7 + "port-version": 8 }, "osg-qt": { "baseline": "Qt5", - "port-version": 1 + "port-version": 2 }, "osgearth": { "baseline": "3.1", @@ -4830,7 +4830,7 @@ }, "osi": { "baseline": "0.108.6", - "port-version": 0 + "port-version": 1 }, "otl": { "baseline": "4.0.463", @@ -4838,15 +4838,15 @@ }, "outcome": { "baseline": "2.2.0-release", - "port-version": 0 + "port-version": 1 }, "p-ranav-csv": { "baseline": "2019-07-11", - "port-version": 0 + "port-version": 1 }, "p-ranav-csv2": { "baseline": "2020-12-14", - "port-version": 0 + "port-version": 1 }, "pagmo2": { "baseline": "2.16.1", @@ -4878,11 +4878,11 @@ }, "parallel-hashmap": { "baseline": "1.33", - "port-version": 0 + "port-version": 1 }, "parallelstl": { "baseline": "20200330", - "port-version": 0 + "port-version": 1 }, "paraview": { "baseline": "5.9.1", @@ -4890,19 +4890,19 @@ }, "parmetis": { "baseline": "4.0.3", - "port-version": 4 + "port-version": 5 }, "parquet": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "parson": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "pbc": { "baseline": "0.5.14", - "port-version": 4 + "port-version": 5 }, "pcapplusplus": { "baseline": "21.05", @@ -4910,7 +4910,7 @@ }, "pcg": { "baseline": "2021-04-06", - "port-version": 0 + "port-version": 1 }, "pcl": { "baseline": "1.11.1", @@ -4926,39 +4926,39 @@ }, "pdal": { "baseline": "1.7.1", - "port-version": 11 + "port-version": 12 }, "pdal-c": { - "baseline": "1.8-2", - "port-version": 0 + "baseline": "1.8", + "port-version": 3 }, "pdcurses": { "baseline": "3.9", - "port-version": 0 + "port-version": 1 }, "pdqsort": { "baseline": "2019-07-30", - "port-version": 0 + "port-version": 1 }, "pe-parse": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "pegtl": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "pegtl-2": { "baseline": "2.8.3", - "port-version": 0 + "port-version": 1 }, "pfring": { - "baseline": "2019-10-17-2", - "port-version": 0 + "baseline": "2019-10-17", + "port-version": 3 }, "pfultz2-linq": { "baseline": "2019-05-14", - "port-version": 0 + "port-version": 1 }, "phnt": { "baseline": "2020-12-21", @@ -4973,24 +4973,24 @@ "port-version": 0 }, "picojson": { - "baseline": "1.3.0-1", - "port-version": 0 + "baseline": "1.3.0", + "port-version": 2 }, "picosha2": { "baseline": "2018-07-30", - "port-version": 0 + "port-version": 1 }, "piex": { "baseline": "2019-07-11", - "port-version": 0 + "port-version": 1 }, "pistache": { "baseline": "2021-03-31", "port-version": 2 }, "pixel": { - "baseline": "0.3-1", - "port-version": 0 + "baseline": "0.3", + "port-version": 2 }, "pixman": { "baseline": "0.40.0", @@ -5002,7 +5002,7 @@ }, "platform-folders": { "baseline": "4.0.0", - "port-version": 6 + "port-version": 7 }, "plf-colony": { "baseline": "6.28", @@ -5010,35 +5010,35 @@ }, "plf-list": { "baseline": "2019-08-10", - "port-version": 0 + "port-version": 1 }, "plf-nanotimer": { "baseline": "2019-08-10", - "port-version": 0 + "port-version": 1 }, "plf-stack": { "baseline": "2019-08-10", - "port-version": 0 + "port-version": 1 }, "plib": { - "baseline": "1.8.5-4", - "port-version": 0 + "baseline": "1.8.5", + "port-version": 5 }, "plibsys": { "baseline": "0.0.4", - "port-version": 4 + "port-version": 5 }, "plog": { "baseline": "1.1.5", - "port-version": 0 + "port-version": 1 }, "plplot": { "baseline": "5.13.0", "port-version": 10 }, "plustache": { - "baseline": "0.4.0-1", - "port-version": 0 + "baseline": "0.4.0", + "port-version": 2 }, "pmdk": { "baseline": "1.11.0", @@ -5049,8 +5049,8 @@ "port-version": 0 }, "pngwriter": { - "baseline": "0.7.0-2", - "port-version": 0 + "baseline": "0.7.0", + "port-version": 3 }, "poco": { "baseline": "1.11.0", @@ -5066,23 +5066,23 @@ }, "poly2tri": { "baseline": "2020-07-21", - "port-version": 0 + "port-version": 1 }, "polyclipping": { "baseline": "6.4.2", - "port-version": 6 + "port-version": 7 }, "polyhook2": { "baseline": "2021-05-09", - "port-version": 0 + "port-version": 1 }, "polymorphic-value": { - "baseline": "1.3.0-1", - "port-version": 0 + "baseline": "1.3.0", + "port-version": 2 }, "ponder": { - "baseline": "3.0.0-1", - "port-version": 0 + "baseline": "3.0.0", + "port-version": 2 }, "poppler": { "baseline": "20.12.1", @@ -5094,7 +5094,7 @@ }, "portable-snippets": { "baseline": "2019-09-20", - "port-version": 0 + "port-version": 1 }, "portaudio": { "baseline": "19.7", @@ -5109,20 +5109,20 @@ "port-version": 0 }, "ppconsul": { - "baseline": "0.5-1", - "port-version": 0 + "baseline": "0.5", + "port-version": 2 }, "ppmagic": { "baseline": "2020-07-03", - "port-version": 0 + "port-version": 1 }, "pprint": { "baseline": "2019-07-19", - "port-version": 0 + "port-version": 1 }, "pqp": { - "baseline": "1.3-4", - "port-version": 0 + "baseline": "1.3", + "port-version": 5 }, "presentmon": { "baseline": "1.7.0", @@ -5130,7 +5130,7 @@ }, "proj": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "proj4": { "baseline": "7.2.1", @@ -5138,15 +5138,15 @@ }, "prometheus-cpp": { "baseline": "0.12.3", - "port-version": 0 + "port-version": 1 }, "protobuf": { "baseline": "3.15.8", "port-version": 4 }, "protobuf-c": { - "baseline": "1.3.2-2", - "port-version": 0 + "baseline": "1.3.2", + "port-version": 3 }, "protopuf": { "baseline": "2.1.0", @@ -5170,7 +5170,7 @@ }, "pthread": { "baseline": "3.0.0", - "port-version": 0 + "port-version": 1 }, "pthreadpool": { "baseline": "2020-04-10", @@ -5182,7 +5182,7 @@ }, "pugixml": { "baseline": "1.11.4", - "port-version": 0 + "port-version": 1 }, "pybind11": { "baseline": "2.7.1", @@ -5202,7 +5202,7 @@ }, "qca": { "baseline": "2.3.1", - "port-version": 2 + "port-version": 3 }, "qcustomplot": { "baseline": "2.0.1", @@ -5210,7 +5210,7 @@ }, "qhull": { "baseline": "8.0.2", - "port-version": 1 + "port-version": 2 }, "qnnpack": { "baseline": "2021-02-26", @@ -5218,7 +5218,7 @@ }, "qpid-proton": { "baseline": "0.32.0", - "port-version": 0 + "port-version": 1 }, "qscintilla": { "baseline": "2.12.0", @@ -5230,23 +5230,23 @@ }, "qt-advanced-docking-system": { "baseline": "3.6.3", - "port-version": 1 + "port-version": 2 }, "qt5": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-3d": { "baseline": "5.15.2", - "port-version": 1 + "port-version": 2 }, "qt5-activeqt": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-androidextras": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-base": { "baseline": "5.15.2", @@ -5254,51 +5254,51 @@ }, "qt5-canvas3d": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "qt5-charts": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-connectivity": { "baseline": "5.15.2", - "port-version": 1 + "port-version": 2 }, "qt5-datavis3d": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-declarative": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-doc": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-gamepad": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-graphicaleffects": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-imageformats": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-location": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-macextras": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-modularscripts": { "baseline": "deprecated", - "port-version": 0 + "port-version": 1 }, "qt5-mqtt": { "baseline": "5.15.2", @@ -5306,67 +5306,67 @@ }, "qt5-multimedia": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-networkauth": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-purchasing": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-quickcontrols": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-quickcontrols2": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-remoteobjects": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-script": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-scxml": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-sensors": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-serialbus": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-serialport": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-speech": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-svg": { "baseline": "5.15.2", - "port-version": 1 + "port-version": 2 }, "qt5-tools": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-translations": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-virtualkeyboard": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-wayland": { "baseline": "5.15.2", @@ -5374,35 +5374,35 @@ }, "qt5-webchannel": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-webengine": { "baseline": "5.15.2", - "port-version": 2 + "port-version": 3 }, "qt5-webglplugin": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-websockets": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-webview": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-winextras": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-x11extras": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5-xmlpatterns": { "baseline": "5.15.2", - "port-version": 0 + "port-version": 1 }, "qt5compat": { "baseline": "6.1.2", @@ -5446,7 +5446,7 @@ }, "qtkeychain": { "baseline": "0.11.1", - "port-version": 0 + "port-version": 1 }, "qtlottie": { "baseline": "6.1.2", @@ -5506,7 +5506,7 @@ }, "quadtree": { "baseline": "2020-04-13", - "port-version": 0 + "port-version": 1 }, "quantlib": { "baseline": "1.22", @@ -5514,19 +5514,19 @@ }, "quaternions": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "quazip": { "baseline": "0.9.1", - "port-version": 0 + "port-version": 1 }, "quickfast": { "baseline": "1.5", - "port-version": 0 + "port-version": 1 }, "quickfix": { - "baseline": "1.15.1-4", - "port-version": 0 + "baseline": "1.15.1", + "port-version": 5 }, "quill": { "baseline": "1.6.3", @@ -5542,31 +5542,31 @@ }, "qwtw": { "baseline": "3.1.0", - "port-version": 0 + "port-version": 1 }, "rabit": { - "baseline": "0.1-2", - "port-version": 0 + "baseline": "0.1", + "port-version": 3 }, "ragel": { - "baseline": "6.10-3", - "port-version": 0 + "baseline": "6.10", + "port-version": 4 }, "rang": { "baseline": "3.1.0", - "port-version": 0 + "port-version": 1 }, "range-v3": { "baseline": "0.11.0", - "port-version": 0 + "port-version": 1 }, "range-v3-vs2015": { "baseline": "20151130-vcpkg5", - "port-version": 0 + "port-version": 1 }, "rapidcheck": { "baseline": "2020-08-25", - "port-version": 0 + "port-version": 1 }, "rapidcsv": { "baseline": "8.50", @@ -5577,12 +5577,12 @@ "port-version": 1 }, "rapidxml": { - "baseline": "1.13-4", - "port-version": 0 + "baseline": "1.13", + "port-version": 5 }, "rapidxml-ns": { "baseline": "1.13.2", - "port-version": 0 + "port-version": 1 }, "rappture": { "baseline": "1.9", @@ -5602,7 +5602,7 @@ }, "re2": { "baseline": "2020-10-01", - "port-version": 0 + "port-version": 1 }, "readerwriterqueue": { "baseline": "1.0.5", @@ -5610,15 +5610,15 @@ }, "readline": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "readline-win32": { - "baseline": "5.0-2", - "port-version": 0 + "baseline": "5.0", + "port-version": 3 }, "readosm": { "baseline": "1.1.0a", - "port-version": 0 + "port-version": 1 }, "realsense2": { "baseline": "2.42.0", @@ -5634,23 +5634,23 @@ }, "refl-cpp": { "baseline": "0.12.0", - "port-version": 0 + "port-version": 1 }, "refprop-headers": { "baseline": "2019-04-14", - "port-version": 0 + "port-version": 1 }, "replxx": { - "baseline": "0.0.2-2", - "port-version": 0 + "baseline": "0.0.2", + "port-version": 3 }, "reproc": { "baseline": "14.2.1", - "port-version": 0 + "port-version": 1 }, "rest-rpc": { "baseline": "0.07", - "port-version": 1 + "port-version": 2 }, "restbed": { "baseline": "4.7", @@ -5662,7 +5662,7 @@ }, "restclient-cpp": { "baseline": "0.5.2", - "port-version": 0 + "port-version": 1 }, "restinio": { "baseline": "0.6.13", @@ -5670,23 +5670,23 @@ }, "rhash": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 1 }, "riffcpp": { "baseline": "2.2.4", - "port-version": 0 + "port-version": 1 }, "ring-span-lite": { "baseline": "0.3.0", - "port-version": 0 + "port-version": 1 }, "rmlui": { "baseline": "4.2", "port-version": 0 }, "roaring": { - "baseline": "2019-03-05-2", - "port-version": 0 + "baseline": "2019-03-05", + "port-version": 3 }, "robin-hood-hashing": { "baseline": "3.11.3", @@ -5698,27 +5698,27 @@ }, "rocksdb": { "baseline": "6.14.6", - "port-version": 0 + "port-version": 1 }, "rpclib": { "baseline": "2.2.1", - "port-version": 2 + "port-version": 3 }, "rply": { "baseline": "1.1.4", - "port-version": 0 + "port-version": 1 }, "rs-core-lib": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "rsasynccpp": { "baseline": "0.0.7", "port-version": 0 }, "rsocket": { - "baseline": "2020.05.04.00-1", - "port-version": 0 + "baseline": "2020.05.04.00", + "port-version": 2 }, "rtabmap": { "baseline": "0.20.3", @@ -5729,24 +5729,24 @@ "port-version": 0 }, "rtlsdr": { - "baseline": "2020-04-16-1", - "port-version": 0 + "baseline": "2020-04-16", + "port-version": 2 }, "rtmidi": { "baseline": "4.0.0", "port-version": 3 }, "rttr": { - "baseline": "0.9.6-2", - "port-version": 0 + "baseline": "0.9.6", + "port-version": 3 }, "rxcpp": { - "baseline": "4.1.0-1", - "port-version": 0 + "baseline": "4.1.0", + "port-version": 2 }, "rxqt": { "baseline": "bb2138c", - "port-version": 0 + "port-version": 1 }, "rxspencer": { "baseline": "3.9.0", @@ -5769,16 +5769,16 @@ "port-version": 0 }, "sais": { - "baseline": "2.4.1-1", - "port-version": 0 + "baseline": "2.4.1", + "port-version": 2 }, "sajson": { "baseline": "2018-09-21", - "port-version": 0 + "port-version": 1 }, "sassc": { "baseline": "3.6.1", - "port-version": 0 + "port-version": 1 }, "scintilla": { "baseline": "4.4.6", @@ -5790,19 +5790,19 @@ }, "sciter": { "baseline": "4.4.8.3", - "port-version": 0 + "port-version": 1 }, "scnlib": { "baseline": "0.4", - "port-version": 0 + "port-version": 1 }, "scylla-wrapper": { "baseline": "2018-08-26-16e6f435", - "port-version": 0 + "port-version": 1 }, "sdformat10": { "baseline": "10.0.0", - "port-version": 0 + "port-version": 1 }, "sdformat6": { "baseline": "6.2.0", @@ -5810,15 +5810,15 @@ }, "sdformat9": { "baseline": "9.4.0", - "port-version": 0 + "port-version": 1 }, "sdl1": { "baseline": "1.2.15", - "port-version": 13 + "port-version": 14 }, "sdl1-net": { - "baseline": "1.2.8-3", - "port-version": 0 + "baseline": "1.2.8", + "port-version": 4 }, "sdl2": { "baseline": "2.0.16", @@ -5826,27 +5826,27 @@ }, "sdl2-gfx": { "baseline": "1.0.4", - "port-version": 7 + "port-version": 8 }, "sdl2-image": { "baseline": "2.0.5", - "port-version": 1 + "port-version": 2 }, "sdl2-mixer": { "baseline": "2.0.4", "port-version": 12 }, "sdl2-net": { - "baseline": "2.0.1-8", - "port-version": 0 + "baseline": "2.0.1", + "port-version": 9 }, "sdl2-ttf": { - "baseline": "2.0.15-3", - "port-version": 0 + "baseline": "2.0.15", + "port-version": 4 }, "sdl2pp": { "baseline": "0.16.1", - "port-version": 0 + "port-version": 1 }, "seal": { "baseline": "3.6.6", @@ -5854,7 +5854,7 @@ }, "secp256k1": { "baseline": "2017-19-10", - "port-version": 3 + "port-version": 4 }, "selene": { "baseline": "0.3.1", @@ -5869,24 +5869,24 @@ "port-version": 1 }, "septag-sx": { - "baseline": "2019-05-07-2", - "port-version": 0 + "baseline": "2019-05-07", + "port-version": 3 }, "seqan": { - "baseline": "2.4.0-1", - "port-version": 0 + "baseline": "2.4.0", + "port-version": 2 }, "serd": { "baseline": "0.30.4", "port-version": 0 }, "sf2cute": { - "baseline": "0.2.0-1", - "port-version": 0 + "baseline": "0.2.0", + "port-version": 2 }, "sfgui": { - "baseline": "0.4.0-3", - "port-version": 0 + "baseline": "0.4.0", + "port-version": 4 }, "sfml": { "baseline": "2.5.1", @@ -5894,7 +5894,7 @@ }, "sfsexp": { "baseline": "1.3", - "port-version": 0 + "port-version": 1 }, "shaderc": { "baseline": "2021.1", @@ -5906,27 +5906,27 @@ }, "shapelib": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "shiva": { - "baseline": "1.0-3", - "port-version": 0 + "baseline": "1.0", + "port-version": 4 }, "shiva-sfml": { - "baseline": "1.0-1", - "port-version": 0 + "baseline": "1.0", + "port-version": 2 }, "shogun": { "baseline": "6.1.4", - "port-version": 4 + "port-version": 5 }, "signalrclient": { "baseline": "1.0.0-beta1-9", - "port-version": 1 + "port-version": 2 }, "sigslot": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "simage": { "baseline": "1.8.1", @@ -5934,7 +5934,7 @@ }, "simde": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "simdjson": { "baseline": "1.0.0", @@ -5946,19 +5946,19 @@ }, "simple-fft": { "baseline": "2020-06-14", - "port-version": 0 + "port-version": 1 }, "simpleini": { - "baseline": "2018-08-31-4", - "port-version": 0 + "baseline": "2018-08-31", + "port-version": 5 }, "skia": { "baseline": "2020-05-18", - "port-version": 4 + "port-version": 5 }, "skyr-url": { "baseline": "1.13.0", - "port-version": 0 + "port-version": 1 }, "sleef": { "baseline": "3.5.1", @@ -5977,20 +5977,20 @@ "port-version": 0 }, "smpeg2": { - "baseline": "2.0.0-6", - "port-version": 0 + "baseline": "2.0.0", + "port-version": 7 }, "snappy": { "baseline": "1.1.8", - "port-version": 0 + "port-version": 1 }, "sndfile": { "baseline": "0", - "port-version": 0 + "port-version": 1 }, "snowhouse": { "baseline": "5.0.0", - "port-version": 0 + "port-version": 1 }, "so5extra": { "baseline": "1.4.1.1", @@ -6010,7 +6010,7 @@ }, "sockpp": { "baseline": "0.7", - "port-version": 0 + "port-version": 1 }, "soem": { "baseline": "1.4.0", @@ -6026,15 +6026,15 @@ }, "sokol": { "baseline": "2019-09-09", - "port-version": 0 + "port-version": 1 }, "sol2": { "baseline": "3.2.2", - "port-version": 0 + "port-version": 1 }, "solid3": { "baseline": "3.5.8", - "port-version": 0 + "port-version": 1 }, "sophus": { "baseline": "1.0.0", @@ -6042,23 +6042,23 @@ }, "soqt": { "baseline": "1.6.0", - "port-version": 2 + "port-version": 3 }, "sord": { "baseline": "0.16.4", "port-version": 0 }, "soundtouch": { - "baseline": "2.0.0-6", - "port-version": 0 + "baseline": "2.0.0", + "port-version": 7 }, "soxr": { "baseline": "0.1.3", - "port-version": 3 + "port-version": 4 }, "spaceland": { - "baseline": "7.8.2-4", - "port-version": 0 + "baseline": "7.8.2", + "port-version": 5 }, "span-lite": { "baseline": "0.9.0", @@ -6066,31 +6066,31 @@ }, "sparsehash": { "baseline": "2.0.3", - "port-version": 0 + "port-version": 1 }, "sparsepp": { - "baseline": "1.22-1", - "port-version": 0 - }, + "baseline": "1.22", + "port-version": 2 + }, "spatialite-tools": { "baseline": "5.0.0", - "port-version": 2 + "port-version": 3 }, "spdk": { "baseline": "19.01.1", - "port-version": 1 + "port-version": 2 }, "spdk-dpdk": { "baseline": "20181124", - "port-version": 0 + "port-version": 1 }, "spdk-ipsec": { "baseline": "20180711", - "port-version": 0 + "port-version": 1 }, "spdk-isal": { "baseline": "20181006", - "port-version": 0 + "port-version": 1 }, "spdlog": { "baseline": "1.9.0", @@ -6102,15 +6102,15 @@ }, "speex": { "baseline": "1.2.0", - "port-version": 8 + "port-version": 9 }, "speexdsp": { "baseline": "1.2.0", - "port-version": 5 + "port-version": 6 }, "spirit-po": { - "baseline": "1.1.2-1", - "port-version": 0 + "baseline": "1.1.2", + "port-version": 2 }, "spirv-cross": { "baseline": "2021-01-15", @@ -6130,11 +6130,11 @@ }, "sprout": { "baseline": "2019-06-20", - "port-version": 0 + "port-version": 1 }, "spscqueue": { "baseline": "1.1", - "port-version": 0 + "port-version": 1 }, "sqlcipher": { "baseline": "4.4.3", @@ -6142,11 +6142,11 @@ }, "sqlite-modern-cpp": { "baseline": "3.2-936cd0c8", - "port-version": 0 + "port-version": 1 }, "sqlite-orm": { "baseline": "1.6", - "port-version": 0 + "port-version": 1 }, "sqlite3": { "baseline": "3.35.5", @@ -6158,15 +6158,15 @@ }, "sqlpp11": { "baseline": "0.60", - "port-version": 0 + "port-version": 1 }, "sqlpp11-connector-mysql": { - "baseline": "0.29-1", - "port-version": 0 + "baseline": "0.29", + "port-version": 2 }, "sqlpp11-connector-sqlite3": { "baseline": "0.30", - "port-version": 0 + "port-version": 1 }, "sratom": { "baseline": "0.6.4", @@ -6182,47 +6182,47 @@ }, "status-code": { "baseline": "1.0.0-ab3cd821", - "port-version": 0 + "port-version": 1 }, "status-value-lite": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "stb": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "stlab": { "baseline": "1.6.2", - "port-version": 0 + "port-version": 1 }, "stormlib": { "baseline": "2019-05-10", - "port-version": 2 + "port-version": 3 }, "strict-variant": { "baseline": "0.5", - "port-version": 0 + "port-version": 1 }, "string-theory": { "baseline": "3.4", - "port-version": 0 + "port-version": 1 }, "string-view-lite": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "strtk": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "stx": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "stxxl": { - "baseline": "2018-11-15-2", - "port-version": 0 + "baseline": "2018-11-15", + "port-version": 3 }, "suitesparse": { "baseline": "5.8.0", @@ -6234,15 +6234,15 @@ }, "superlu": { "baseline": "2020-01-07", - "port-version": 2 + "port-version": 3 }, "symengine": { "baseline": "0.7.0", "port-version": 0 }, "systemc": { - "baseline": "2.3.3-4", - "port-version": 0 + "baseline": "2.3.3", + "port-version": 5 }, "szip": { "baseline": "2.1.1", @@ -6250,11 +6250,11 @@ }, "tabulate": { "baseline": "2019-01-06", - "port-version": 0 + "port-version": 1 }, "tacopie": { - "baseline": "3.2.0-2", - "port-version": 0 + "baseline": "3.2.0", + "port-version": 3 }, "taglib": { "baseline": "1.12.0", @@ -6262,11 +6262,11 @@ }, "taocpp-json": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "tap-windows6": { "baseline": "9.21.2-0e30f5c", - "port-version": 0 + "port-version": 1 }, "taskflow": { "baseline": "3.1.0", @@ -6274,23 +6274,23 @@ }, "tbb": { "baseline": "2020_U3", - "port-version": 5 + "port-version": 6 }, "tcl": { "baseline": "core-9-0-a1", - "port-version": 1 + "port-version": 2 }, "tclap": { - "baseline": "1.2.2-3", - "port-version": 0 + "baseline": "1.2.2", + "port-version": 4 }, "teemo": { "baseline": "2.2", - "port-version": 0 + "port-version": 1 }, "telnetpp": { "baseline": "2.1.2", - "port-version": 0 + "port-version": 1 }, "tensorflow": { "baseline": "2.4.1", @@ -6322,11 +6322,11 @@ }, "tgbot-cpp": { "baseline": "1.2.1", - "port-version": 0 + "port-version": 1 }, "tgc": { - "baseline": "2019-08-11-1", - "port-version": 0 + "baseline": "2019-08-11", + "port-version": 2 }, "tgui": { "baseline": "2021-04-19", @@ -6334,11 +6334,11 @@ }, "theia": { "baseline": "0.8", - "port-version": 3 + "port-version": 4 }, "think-cell-range": { - "baseline": "498839d-1", - "port-version": 0 + "baseline": "498839d", + "port-version": 2 }, "thor": { "baseline": "2.0", @@ -6346,15 +6346,15 @@ }, "threadpool": { "baseline": "0.2.5", - "port-version": 1 + "port-version": 2 }, "thrift": { "baseline": "0.13.0", - "port-version": 0 + "port-version": 1 }, "tidy-html5": { - "baseline": "5.7.28-2", - "port-version": 0 + "baseline": "5.7.28", + "port-version": 3 }, "tiff": { "baseline": "4.3.0", @@ -6362,39 +6362,39 @@ }, "tinkerforge": { "baseline": "2.1.25", - "port-version": 0 + "port-version": 1 }, "tiny-aes-c": { "baseline": "2019-07-31", - "port-version": 0 + "port-version": 1 }, "tiny-bignum-c": { "baseline": "2019-07-31", - "port-version": 0 + "port-version": 1 }, "tiny-dnn": { "baseline": "2018-10-25", - "port-version": 0 + "port-version": 1 }, "tiny-process-library": { "baseline": "2.0.4", - "port-version": 0 + "port-version": 1 }, "tiny-regex-c": { "baseline": "2019-07-31", - "port-version": 0 + "port-version": 1 }, "tinycthread": { "baseline": "2019-08-06", - "port-version": 0 + "port-version": 1 }, "tinydir": { "baseline": "1.2.4", - "port-version": 0 + "port-version": 1 }, "tinyexif": { - "baseline": "1.0.2-6", - "port-version": 0 + "baseline": "1.0.2", + "port-version": 7 }, "tinyexpr": { "baseline": "2020-09-25", @@ -6402,7 +6402,7 @@ }, "tinyexr": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "tinyfiledialogs": { "baseline": "3.8.8", @@ -6410,87 +6410,87 @@ }, "tinygltf": { "baseline": "2020-07-28", - "port-version": 1 + "port-version": 2 }, "tinynpy": { - "baseline": "1.0.0-3", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 4 }, "tinyobjloader": { "baseline": "2.0.0-rc2", - "port-version": 0 + "port-version": 1 }, "tinyply": { "baseline": "2020-05-22", - "port-version": 0 + "port-version": 1 }, "tinyspline": { - "baseline": "0.2.0-3", - "port-version": 0 + "baseline": "0.2.0", + "port-version": 4 }, "tinythread": { - "baseline": "1.1-3", - "port-version": 0 + "baseline": "1.1", + "port-version": 4 }, "tinytoml": { - "baseline": "20180219-1", - "port-version": 0 + "baseline": "20180219", + "port-version": 2 }, "tinyutf8": { "baseline": "4.0.2", - "port-version": 0 + "port-version": 1 }, "tinyxml": { - "baseline": "2.6.2-7", - "port-version": 0 + "baseline": "2.6.2", + "port-version": 8 }, "tinyxml2": { - "baseline": "8.0.0-1", - "port-version": 0 + "baseline": "8.0.0", + "port-version": 2 }, "tl-expected": { - "baseline": "1.0.0-1", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 2 }, "tl-function-ref": { - "baseline": "1.0.0-1", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 2 }, "tl-optional": { - "baseline": "1.0.0-1", - "port-version": 0 + "baseline": "1.0.0", + "port-version": 2 }, "tlx": { "baseline": "0.5.20191212", - "port-version": 0 + "port-version": 1 }, "tmx": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "tmxlite": { "baseline": "2019-03-05", - "port-version": 0 + "port-version": 1 }, "tmxparser": { - "baseline": "2.1.0-4", - "port-version": 0 + "baseline": "2.1.0", + "port-version": 5 }, "toml11": { "baseline": "3.5.0", - "port-version": 1 + "port-version": 2 }, "tomlplusplus": { "baseline": "2.4.0", - "port-version": 0 + "port-version": 1 }, "tool-meson": { "baseline": "0.58.1", "port-version": 0 }, "torch-th": { - "baseline": "2019-04-19-2", - "port-version": 0 + "baseline": "2019-04-19", + "port-version": 3 }, "transwarp": { "baseline": "2.2.2", @@ -6502,31 +6502,31 @@ }, "tre": { "baseline": "0.8.0", - "port-version": 2 + "port-version": 3 }, "treehopper": { - "baseline": "1.11.3-4", - "port-version": 0 + "baseline": "1.11.3", + "port-version": 5 }, "triangle": { "baseline": "1.6", - "port-version": 0 + "port-version": 1 }, "trompeloeil": { "baseline": "38", - "port-version": 0 + "port-version": 1 }, "tsl-hopscotch-map": { "baseline": "2.3.0", - "port-version": 0 + "port-version": 1 }, "tsl-ordered-map": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "tsl-sparse-map": { "baseline": "0.6.2", - "port-version": 0 + "port-version": 1 }, "ttauri": { "baseline": "0.4.0", @@ -6534,7 +6534,7 @@ }, "turbobase64": { "baseline": "2020-01-12", - "port-version": 0 + "port-version": 1 }, "tvision": { "baseline": "2021-08-10", @@ -6546,7 +6546,7 @@ }, "type-lite": { "baseline": "0.1.0", - "port-version": 0 + "port-version": 1 }, "type-safe": { "baseline": "0.2.1", @@ -6554,23 +6554,23 @@ }, "uchardet": { "baseline": "2020-04-26", - "port-version": 0 + "port-version": 1 }, "umock-c": { - "baseline": "2020-06-17-1", - "port-version": 0 + "baseline": "2020-06-17", + "port-version": 2 }, "unicorn": { "baseline": "2020-09-14", - "port-version": 0 + "port-version": 1 }, "unicorn-lib": { "baseline": "2020-03-02", - "port-version": 0 + "port-version": 1 }, "units": { "baseline": "2.3.1", - "port-version": 0 + "port-version": 1 }, "unittest-cpp": { "baseline": "2.0.0", @@ -6578,7 +6578,7 @@ }, "unixodbc": { "baseline": "2.3.7", - "port-version": 2 + "port-version": 3 }, "unqlite": { "baseline": "1.1.9", @@ -6586,7 +6586,7 @@ }, "unrar": { "baseline": "5.8.1", - "port-version": 0 + "port-version": 1 }, "upb": { "baseline": "2020-12-19", @@ -6594,11 +6594,11 @@ }, "urdfdom": { "baseline": "1.0.4", - "port-version": 3 + "port-version": 4 }, "urdfdom-headers": { "baseline": "1.0.5", - "port-version": 1 + "port-version": 2 }, "urho3d": { "baseline": "2021-03-01", @@ -6610,11 +6610,11 @@ }, "usbmuxd": { "baseline": "1.2.235", - "port-version": 0 + "port-version": 1 }, "usd": { "baseline": "20.08", - "port-version": 0 + "port-version": 1 }, "usockets": { "baseline": "0.7.1", @@ -6622,11 +6622,11 @@ }, "usrsctp": { "baseline": "0db9691", - "port-version": 0 + "port-version": 1 }, "utf8h": { "baseline": "2020-06-14", - "port-version": 0 + "port-version": 1 }, "utf8proc": { "baseline": "2.6.1", @@ -6637,12 +6637,12 @@ "port-version": 0 }, "utfz": { - "baseline": "1.2-1", - "port-version": 0 + "baseline": "1.2", + "port-version": 2 }, "uthenticode": { "baseline": "1.0.4", - "port-version": 0 + "port-version": 1 }, "uvatlas": { "baseline": "jun2021b", @@ -6650,7 +6650,7 @@ }, "uvw": { "baseline": "2.7.0", - "port-version": 0 + "port-version": 1 }, "uwebsockets": { "baseline": "19.5.0", @@ -6658,15 +6658,15 @@ }, "v-hacd": { "baseline": "3.2.0", - "port-version": 1 + "port-version": 2 }, "v8": { "baseline": "9.1.269.39", "port-version": 0 }, "valijson": { - "baseline": "2018-11-17-1", - "port-version": 0 + "baseline": "2018-11-17", + "port-version": 2 }, "value-ptr-lite": { "baseline": "0.2.1", @@ -6678,15 +6678,15 @@ }, "variant-lite": { "baseline": "1.2.2", - "port-version": 0 + "port-version": 1 }, "vc": { "baseline": "1.4.2", - "port-version": 0 + "port-version": 1 }, "vcglib": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "vcpkg-cmake": { "baseline": "2021-07-30", @@ -6698,7 +6698,7 @@ }, "vcpkg-gfortran": { "baseline": "3", - "port-version": 0 + "port-version": 1 }, "vcpkg-pkgconfig-get-modules": { "baseline": "2021-04-02", @@ -6706,23 +6706,23 @@ }, "vectorclass": { "baseline": "2.00.01", - "port-version": 0 + "port-version": 1 }, "visit-struct": { - "baseline": "1.0-1", - "port-version": 0 + "baseline": "1.0", + "port-version": 2 }, "vlfeat": { "baseline": "2020-07-10", - "port-version": 0 + "port-version": 1 }, "vlpp": { "baseline": "0.11.0.0", - "port-version": 0 + "port-version": 1 }, "volk": { "baseline": "2019-09-26", - "port-version": 0 + "port-version": 1 }, "vs-yasm": { "baseline": "0.5.0", @@ -6733,16 +6733,16 @@ "port-version": 0 }, "vtk-dicom": { - "baseline": "0.8.12-1", - "port-version": 0 + "baseline": "0.8.12", + "port-version": 2 }, "vtk-m": { "baseline": "1.6.0", "port-version": 0 }, "vulkan": { - "baseline": "1.1.82.1-1", - "port-version": 0 + "baseline": "1.1.82.1", + "port-version": 2 }, "vulkan-headers": { "baseline": "1.2.184", @@ -6750,19 +6750,19 @@ }, "vulkan-hpp": { "baseline": "1.2.184", - "port-version": 0 + "port-version": 1 }, "vulkan-memory-allocator": { "baseline": "2021-07-07", - "port-version": 0 + "port-version": 1 }, "vxl": { "baseline": "2.0.2", - "port-version": 2 + "port-version": 3 }, "wampcc": { "baseline": "2019-09-04", - "port-version": 0 + "port-version": 1 }, "wangle": { "baseline": "2021.06.14.00", @@ -6774,7 +6774,7 @@ }, "wavpack": { "baseline": "5.3.0", - "port-version": 1 + "port-version": 2 }, "websocketpp": { "baseline": "0.8.2", @@ -6786,19 +6786,19 @@ }, "wg21-sg14": { "baseline": "2019-08-13", - "port-version": 0 + "port-version": 1 }, "wil": { "baseline": "2021-08-03", - "port-version": 0 + "port-version": 1 }, "wildmidi": { - "baseline": "0.4.3-1", - "port-version": 0 + "baseline": "0.4.3", + "port-version": 2 }, "wincrypt": { - "baseline": "0.0-2", - "port-version": 0 + "baseline": "0.0", + "port-version": 3 }, "winlamb": { "baseline": "2020-10-15", @@ -6806,27 +6806,27 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 4 + "port-version": 5 }, "winreg": { "baseline": "4.1.0", - "port-version": 0 + "port-version": 1 }, "winsock2": { - "baseline": "0.0-2", - "port-version": 0 + "baseline": "0.0", + "port-version": 3 }, "wintoast": { "baseline": "1.2.0", - "port-version": 0 + "port-version": 1 }, "woff2": { "baseline": "1.0.2", - "port-version": 1 + "port-version": 2 }, "wordnet": { "baseline": "3.0", - "port-version": 0 + "port-version": 1 }, "workflow": { "baseline": "0.9.6", @@ -6834,19 +6834,19 @@ }, "wpilib": { "baseline": "2020.3.2", - "port-version": 0 + "port-version": 1 }, "wren": { "baseline": "2019-07-01", - "port-version": 0 + "port-version": 1 }, "wt": { "baseline": "4.5.0", - "port-version": 0 + "port-version": 1 }, "wtl": { "baseline": "10.0.10320", - "port-version": 0 + "port-version": 1 }, "wxchartdir": { "baseline": "1.0.0", @@ -6866,7 +6866,7 @@ }, "x265": { "baseline": "3.4", - "port-version": 4 + "port-version": 5 }, "xalan-c": { "baseline": "1.12", @@ -6881,16 +6881,16 @@ "port-version": 0 }, "xerces-c": { - "baseline": "3.2.3-1", - "port-version": 0 + "baseline": "3.2.3", + "port-version": 2 }, "xeus": { "baseline": "0.24.3", - "port-version": 0 + "port-version": 1 }, "xframe": { "baseline": "0.3.0", - "port-version": 0 + "port-version": 1 }, "xlnt": { "baseline": "1.5.0", @@ -6905,8 +6905,8 @@ "port-version": 0 }, "xmsh": { - "baseline": "0.5.2-1", - "port-version": 0 + "baseline": "0.5.2", + "port-version": 2 }, "xnnpack": { "baseline": "2021-05-17", @@ -6918,11 +6918,11 @@ }, "xproperty": { "baseline": "0.8.1", - "port-version": 0 + "port-version": 1 }, "xsimd": { "baseline": "7.4.9", - "port-version": 0 + "port-version": 1 }, "xtensor": { "baseline": "0.23.10", @@ -6930,11 +6930,11 @@ }, "xtensor-blas": { "baseline": "0.17.2", - "port-version": 0 + "port-version": 1 }, "xtensor-fftw": { "baseline": "2019-11-30", - "port-version": 0 + "port-version": 1 }, "xtensor-io": { "baseline": "0.12.8", @@ -6946,11 +6946,11 @@ }, "xxhash": { "baseline": "0.8.0", - "port-version": 1 + "port-version": 2 }, "yajl": { - "baseline": "2.1.0-1", - "port-version": 0 + "baseline": "2.1.0", + "port-version": 2 }, "yaml-cpp": { "baseline": "0.7.0", @@ -6962,11 +6962,11 @@ }, "yas": { "baseline": "7.0.5", - "port-version": 0 + "port-version": 1 }, "yasm": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "yasm-tool": { "baseline": "1.3.0", @@ -6977,12 +6977,12 @@ "port-version": 0 }, "yato": { - "baseline": "1.0-2", - "port-version": 0 + "baseline": "1.0", + "port-version": 3 }, "yoga": { - "baseline": "1.18.0-1", - "port-version": 0 + "baseline": "1.18.0", + "port-version": 2 }, "yomm2": { "baseline": "1.1.2", @@ -6998,19 +6998,19 @@ }, "z85": { "baseline": "1.0", - "port-version": 0 + "port-version": 1 }, "zeromq": { "baseline": "4.3.4", "port-version": 1 }, "zfp": { - "baseline": "0.5.5-2", - "port-version": 0 + "baseline": "0.5.5", + "port-version": 3 }, "zkpp": { "baseline": "0.2.3", - "port-version": 0 + "port-version": 1 }, "zlib": { "baseline": "1.2.11", @@ -7021,16 +7021,16 @@ "port-version": 0 }, "zookeeper": { - "baseline": "3.5.5-1", - "port-version": 0 + "baseline": "3.5.5", + "port-version": 2 }, "zopfli": { "baseline": "1.0.3", - "port-version": 0 + "port-version": 1 }, "zserge-webview": { - "baseline": "2019-04-27-2", - "port-version": 0 + "baseline": "2019-04-27", + "port-version": 3 }, "zstd": { "baseline": "1.5.0", @@ -7038,27 +7038,27 @@ }, "zstr": { "baseline": "1.0.4", - "port-version": 0 + "port-version": 1 }, "zug": { "baseline": "2021-04-23", "port-version": 0 }, "zxing-cpp": { - "baseline": "2020-12-2", - "port-version": 0 + "baseline": "2020-12", + "port-version": 3 }, "zydis": { - "baseline": "3.1.0-1", - "port-version": 0 + "baseline": "3.1.0", + "port-version": 2 }, "zyre": { - "baseline": "2019-07-07-1", - "port-version": 0 + "baseline": "2019-07-07", + "port-version": 2 }, "zziplib": { "baseline": "0.13.71", - "port-version": 1 + "port-version": 2 } } } diff --git a/versions/c-/caffe2.json b/versions/c-/caffe2.json index bcf68a4876830c..60aff5c5b6527f 100644 --- a/versions/c-/caffe2.json +++ b/versions/c-/caffe2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e50097be149d80e1397e95280aecd5160961d286", + "version-string": "0.8.1", + "port-version": 4 + }, { "git-tree": "ffdaf1c10102d0ed5eb1c558420ade4ec6adb309", "version-string": "0.8.1-3", diff --git a/versions/c-/camport3.json b/versions/c-/camport3.json index 6fc79b2fc14172..6de0f201fb54b5 100644 --- a/versions/c-/camport3.json +++ b/versions/c-/camport3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da6cb57213a9c5e3e4877a1c2278524f6228a80b", + "version-string": "1.5.3", + "port-version": 1 + }, { "git-tree": "05713425b9fc380bcb6f2f016032e6fb1c8fc0b2", "version-string": "1.5.3", diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index 6c507d9db15c85..28f0e5e5a5da11 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e33e9cf7ec5a8166ea3e33801645d731d119e25", + "version-string": "0.8.0", + "port-version": 2 + }, { "git-tree": "5fcc22513f8ac440cd0d056c76ae35bcef96c787", "version-string": "0.8.0", diff --git a/versions/c-/casclib.json b/versions/c-/casclib.json index d617c969131429..c9e453d1bb2c85 100644 --- a/versions/c-/casclib.json +++ b/versions/c-/casclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0e61662e214e54008bdc8842b865a3f3fccb821", + "version-string": "1.50b", + "port-version": 2 + }, { "git-tree": "dcebf3fda8b82d3576cfd89cb27f55da9149d9e9", "version-string": "1.50b-1", diff --git a/versions/c-/catch-classic.json b/versions/c-/catch-classic.json index c818b0fac1b748..18bb78d6f8dd1d 100644 --- a/versions/c-/catch-classic.json +++ b/versions/c-/catch-classic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a85b3103dd134a7fadafe0c7c5d67042ab4c2b18", + "version-string": "1.12.2", + "port-version": 1 + }, { "git-tree": "21f00f9e0bf6d9338ca58abc3e761db376883285", "version-string": "1.12.2", diff --git a/versions/c-/catch.json b/versions/c-/catch.json index c6852fa1a0aac3..d378268d7adcfe 100644 --- a/versions/c-/catch.json +++ b/versions/c-/catch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f30153a939599e85b3098abf501d739f8ef88c2", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "1847097b1369a19c41e695e809a91923d95efd4d", "version-string": "alias", diff --git a/versions/c-/cccapstone.json b/versions/c-/cccapstone.json index 87c0040b6d727a..615e235d5a3f46 100644 --- a/versions/c-/cccapstone.json +++ b/versions/c-/cccapstone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8515ae9e25008fe4d8c04287aba45679d31eac5", + "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e", + "port-version": 2 + }, { "git-tree": "20a6a52cad8fb2db9aa7b023c09ce53eb2ed5343", "version-string": "9b4128ee1153e78288a1b5433e2c06a0d47a4c4e-1", diff --git a/versions/c-/ccd.json b/versions/c-/ccd.json index 51d2ec8dd1995d..58ea1931eebc9c 100644 --- a/versions/c-/ccd.json +++ b/versions/c-/ccd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a10df3929e80702a9e8c110612b1ecd8c32bee9", + "version-string": "2.1-4", + "port-version": 2 + }, { "git-tree": "a720cc123c190c6b68e57e356c4937685eeb2faa", "version-string": "2.1-4", diff --git a/versions/c-/cctz.json b/versions/c-/cctz.json index 1d2601c1e7db7b..d93ed179261034 100644 --- a/versions/c-/cctz.json +++ b/versions/c-/cctz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b61e635e32027714e10e682235c9f3c5b8b1b1e9", + "version-string": "2.3", + "port-version": 3 + }, { "git-tree": "8568acc72750187c3c08b29a6e273ce8508cd522", "version-string": "2.3-2", diff --git a/versions/c-/celero.json b/versions/c-/celero.json index 2a6b5c3d8d2404..ccc9cac516983c 100644 --- a/versions/c-/celero.json +++ b/versions/c-/celero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58fca5af8a14714f953c3d8a4653e90ac8d11e2f", + "version-string": "2.8.2", + "port-version": 1 + }, { "git-tree": "a170553c57f438bdab8cde9f4c6494e774763681", "version-string": "2.8.2", diff --git a/versions/c-/cello.json b/versions/c-/cello.json index 161b9021eeb142..1151051309026c 100644 --- a/versions/c-/cello.json +++ b/versions/c-/cello.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45d476438561ae8c8e7a8eb7871faadb1379e874", + "version-string": "2019-07-23", + "port-version": 1 + }, { "git-tree": "ee7bb8fff5e2b12f7c6ae5a2d435c8ce1638e103", "version-string": "2019-07-23", diff --git a/versions/c-/cereal.json b/versions/c-/cereal.json index 26bdad974199f4..e74d7fc264dcb0 100644 --- a/versions/c-/cereal.json +++ b/versions/c-/cereal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7229804bbf716bbefe8052d650fc94687b6dae42", + "version-string": "1.3.0", + "port-version": 1 + }, { "git-tree": "2df2d8bdb54e554795344bafe05bf0a1eaa28537", "version-string": "1.3.0", diff --git a/versions/c-/cgicc.json b/versions/c-/cgicc.json index a5831bbb833f1b..dadc9573594247 100644 --- a/versions/c-/cgicc.json +++ b/versions/c-/cgicc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6113e1a5fcadb00943ea3775b6978950b387903", + "version-string": "3.2.19", + "port-version": 5 + }, { "git-tree": "80b636f7c2459aaebfdaeade4f9f0c3892e785dd", "version-string": "3.2.19-4", diff --git a/versions/c-/cgl.json b/versions/c-/cgl.json index 42cb15681e8d98..39d0dabbda7386 100644 --- a/versions/c-/cgl.json +++ b/versions/c-/cgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08a6d5bffda4d5fe0b5891a225e7f3fa86cca8a6", + "version-string": "0.60.2", + "port-version": 3 + }, { "git-tree": "1842a39e0a0fa8b8d62fb875e750a07b5fe78709", "version-string": "0.60.2-2", diff --git a/versions/c-/cgltf.json b/versions/c-/cgltf.json index c703bfa9180d43..5cb89f98813de6 100644 --- a/versions/c-/cgltf.json +++ b/versions/c-/cgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "835b27ec3e0694edf605a79e0e7322dccd69d82f", + "version-string": "1.8", + "port-version": 1 + }, { "git-tree": "27d089cd8ef3a46c94daa6e90c4c2689052fe3c0", "version-string": "1.8", diff --git a/versions/c-/chaiscript.json b/versions/c-/chaiscript.json index 8b7b2694132168..39bb67f16cae50 100644 --- a/versions/c-/chaiscript.json +++ b/versions/c-/chaiscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e661b450987c9f41f4cda3faed9067e54fe65f62", + "version-string": "6.1.0", + "port-version": 2 + }, { "git-tree": "42a36da45b402e64b30d4292bf2ed49e029a4177", "version-string": "6.1.0-1", diff --git a/versions/c-/charls.json b/versions/c-/charls.json index 3f6d36b4993b64..02c4bd16ebac0a 100644 --- a/versions/c-/charls.json +++ b/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e9e71b04ec39396631b28e98175e4c862cb154d", + "version-string": "2.2.0", + "port-version": 1 + }, { "git-tree": "12553ab1c13943bb8295052c2965bdbcbfc7f57f", "version-string": "2.2.0", diff --git a/versions/c-/check.json b/versions/c-/check.json index f73f793e3c9992..e518c2ca13233f 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "889eae1f6ba0c9809e6718e6b15143b65dc6394f", + "version-string": "0.15.2", + "port-version": 1 + }, { "git-tree": "5495ef66bb5b37ceabf5ddd8b7ee534f1475f3c9", "version-string": "0.15.2", diff --git a/versions/c-/chipmunk.json b/versions/c-/chipmunk.json index 0c7fbf106bc906..f785d5eb8495bc 100644 --- a/versions/c-/chipmunk.json +++ b/versions/c-/chipmunk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d50838914429dd39c93a8d0974b4f786c53be83f", + "version-string": "7.0.3", + "port-version": 2 + }, { "git-tree": "4c12d64b4bc53958dce0a82a4ae41457ee6e2bc5", "version-string": "7.0.3", diff --git a/versions/c-/chmlib.json b/versions/c-/chmlib.json index 37557a6be90546..1986f3145af10e 100644 --- a/versions/c-/chmlib.json +++ b/versions/c-/chmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44371d51f30e27d0ccda47b2069b194c3c570ea4", + "version-string": "0.40", + "port-version": 5 + }, { "git-tree": "4801e25e62b144f41dfa8408351f1bab4d7c85b1", "version-string": "0.40-4", diff --git a/versions/c-/chromium-base.json b/versions/c-/chromium-base.json index c5acc843a63e56..d109033d439cfe 100644 --- a/versions/c-/chromium-base.json +++ b/versions/c-/chromium-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0ee4950d82a3613501a9647b688a451be6b187c", + "version-string": "86.0.4199.1", + "port-version": 2 + }, { "git-tree": "32032ff366c12fd25721222708291f36c9c7cc32", "version-string": "86.0.4199.1", diff --git a/versions/c-/cimg.json b/versions/c-/cimg.json index c08430c45f31d2..f5a8e298a4c320 100644 --- a/versions/c-/cimg.json +++ b/versions/c-/cimg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ec4b920b2c754563d9daf835412f1143c127e97", + "version-string": "2.9.4", + "port-version": 1 + }, { "git-tree": "eb83122db781cf448f7485bc5b55c7497c8941d9", "version-string": "2.9.4", diff --git a/versions/c-/cityhash.json b/versions/c-/cityhash.json index d32490641189cf..d185af2903be45 100644 --- a/versions/c-/cityhash.json +++ b/versions/c-/cityhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "423306e7029cfac62069d751bb612e10b3777c13", + "version-string": "2013-01-08", + "port-version": 1 + }, { "git-tree": "3976c756d432396374de92f20289f5e966d4109a", "version-string": "2013-01-08", diff --git a/versions/c-/clara.json b/versions/c-/clara.json index d2eae36cf7dddb..9b9ce7df35e6a1 100644 --- a/versions/c-/clara.json +++ b/versions/c-/clara.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd2473115d2b12883de5a00cdbb2aaa309702042", + "version-string": "1.1.5", + "port-version": 1 + }, { "git-tree": "7c34c7f065f811d99fe3aa30bbe84f9ac580c0f8", "version-string": "1.1.5", diff --git a/versions/c-/clblas.json b/versions/c-/clblas.json index 8a0314576f9609..edd860f87243b4 100644 --- a/versions/c-/clblas.json +++ b/versions/c-/clblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0972ab18d9864a174d8c9acb7cf1add27c6a4ce2", + "version-string": "2.12", + "port-version": 5 + }, { "git-tree": "e4744af3eaf0b0d24b2c60b7c3f85565e399961e", "version-string": "2.12-4", diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json index fd270fc6985980..74496d27ad5413 100644 --- a/versions/c-/clblast.json +++ b/versions/c-/clblast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcbde8693746ad43009a522210aed6794d6a0a58", + "version-string": "1.5.1", + "port-version": 1 + }, { "git-tree": "59011ea56f7531acf901ef6bc7f17ab6492f7b79", "version-string": "1.5.1", diff --git a/versions/c-/clfft.json b/versions/c-/clfft.json index 77cb894619dd98..95a6affc4cbc51 100644 --- a/versions/c-/clfft.json +++ b/versions/c-/clfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14ad34cc8ef68a5583c4f5f0b54f3c9a57ee2bc0", + "version-string": "2.12.2", + "port-version": 3 + }, { "git-tree": "e4985dd521a5d7e29a259339805619913c0e3876", "version-string": "2.12.2-2", diff --git a/versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json index 20039f22b9ebf0..3da06ee911871e 100644 --- a/versions/c-/clickhouse-cpp.json +++ b/versions/c-/clickhouse-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a748366b06afe85b514215e2d27832304581b811", + "version-string": "2019-05-22", + "port-version": 1 + }, { "git-tree": "bd61eb545cd11c0329de99de697ef0dd124cce60", "version-string": "2019-05-22", diff --git a/versions/c-/clipp.json b/versions/c-/clipp.json index 32c3d34cd72273..77eafa0236bf38 100644 --- a/versions/c-/clipp.json +++ b/versions/c-/clipp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8bced062fa89719dbb806838b968639f1ffcaf6", + "version-string": "2019-04-30", + "port-version": 1 + }, { "git-tree": "2f0d21d6f8ca2d0768b52fd43ee9beb771c291fd", "version-string": "2019-04-30", diff --git a/versions/c-/clockutils.json b/versions/c-/clockutils.json index 44cc18fa9f9352..0e658fecbe85aa 100644 --- a/versions/c-/clockutils.json +++ b/versions/c-/clockutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fb64c4ec3d5aced719df16f96e79be4bb64cee7", + "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5", + "port-version": 4 + }, { "git-tree": "cea253009dc17e485177d45dd2b67334db8fc7b4", "version-string": "1.1.1-3651f232c27074c4ceead169e223edf5f00247c5-3", diff --git a/versions/c-/clp.json b/versions/c-/clp.json index 80f6d525e3744c..6da6842791c10b 100644 --- a/versions/c-/clp.json +++ b/versions/c-/clp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba7ecebb114207f66009451eb56f4d778f46ef91", + "version-string": "1.17.6", + "port-version": 1 + }, { "git-tree": "a0176c86ad90803b7bbf0327edbbfc8c48d4407e", "version-string": "1.17.6", diff --git a/versions/c-/clrng.json b/versions/c-/clrng.json index 7769fa4742ee45..df9003660e0029 100644 --- a/versions/c-/clrng.json +++ b/versions/c-/clrng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b8475c5bb62206bf9ebdd82ba3f04467aee6e95", + "version-string": "2020-12-01", + "port-version": 1 + }, { "git-tree": "700b4cbcd0d99feefabf96621a5b217e56dc5a38", "version-string": "2020-12-01", diff --git a/versions/c-/cmark.json b/versions/c-/cmark.json index 3a6bd5ac98aa36..0a6e4b3753522b 100644 --- a/versions/c-/cmark.json +++ b/versions/c-/cmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cda97dbc7324b408739f53f493316af44dcaaf6", + "version-string": "0.29.0", + "port-version": 1 + }, { "git-tree": "64a4cd4c7db7d6aed511c8cdbac1b8339093ea4b", "version-string": "0.29.0", diff --git a/versions/c-/cmcstl2.json b/versions/c-/cmcstl2.json index b6f287606ceb9d..21a166007e1ed2 100644 --- a/versions/c-/cmcstl2.json +++ b/versions/c-/cmcstl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b42b47d62175c38caf3f6b8f31256bb316284734", + "version-string": "2019-07-20", + "port-version": 1 + }, { "git-tree": "bf1ca5917946395732a4553392212ddb0e4296c1", "version-string": "2019-07-20", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 462576cefc82e0..4f7ef31b880d28 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e30ae46d4c197521650caf4ca0b407d8f50655e9", + "version-string": "4.0.0", + "port-version": 3 + }, { "git-tree": "cb2008a3d6429f3ff34e3fd3b5e72153f29f36e6", "version-string": "4.0.0", diff --git a/versions/c-/coinutils.json b/versions/c-/coinutils.json index 0bfbb4119c5da8..5bcc434cec3f52 100644 --- a/versions/c-/coinutils.json +++ b/versions/c-/coinutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eee28965c61a5dae6407b3f93bbd945b7992537d", + "version-string": "2.11.4", + "port-version": 1 + }, { "git-tree": "18e68cecf80c5ee106b7e3819ea2a17bfb0a1b5a", "version-string": "2.11.4", diff --git a/versions/c-/collada-dom.json b/versions/c-/collada-dom.json index 456d74cea9b9f9..daa821db21dc2c 100644 --- a/versions/c-/collada-dom.json +++ b/versions/c-/collada-dom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "478639eba0f0d87ac17cf3b28a072edaeed35ca5", + "version-string": "2.5.0", + "port-version": 5 + }, { "git-tree": "f4daab646db5e1ac2332133fd45ef8dc98b0a017", "version-string": "2.5.0", diff --git a/versions/c-/console-bridge.json b/versions/c-/console-bridge.json index 2cb9379d9ddf85..ff15871ce43c55 100644 --- a/versions/c-/console-bridge.json +++ b/versions/c-/console-bridge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d73bd3ef8f9afac3c1f5957eda4ff760cea5b17c", + "version-string": "1.0.1", + "port-version": 2 + }, { "git-tree": "d6e04ef880522a8fedfe59bee4081441332fb937", "version-string": "1.0.1", diff --git a/versions/c-/constexpr-contracts.json b/versions/c-/constexpr-contracts.json index 846a6416c42d70..7a711ef7c2ab40 100644 --- a/versions/c-/constexpr-contracts.json +++ b/versions/c-/constexpr-contracts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fcdc4b7a9e49416833b834a6be2c17254a7e9c7", + "version-string": "2020-08-09", + "port-version": 1 + }, { "git-tree": "fd80e997ec7b9870af5d3872d02be03b36e1c50f", "version-string": "2020-08-09", diff --git a/versions/c-/constexpr.json b/versions/c-/constexpr.json index 8403348e1998a8..09ba13ef2e92c0 100644 --- a/versions/c-/constexpr.json +++ b/versions/c-/constexpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26c459ddb2becb06ea5c1fcb7a55e282b2aae704", + "version-string": "1.0", + "port-version": 2 + }, { "git-tree": "e9a01ad3c59cf253ec364331beb22ff697739f8e", "version-string": "1.0-1", diff --git a/versions/c-/cpp-netlib.json b/versions/c-/cpp-netlib.json index 6da07307368284..56e9912661d79b 100644 --- a/versions/c-/cpp-netlib.json +++ b/versions/c-/cpp-netlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28abab182be22ac70207027a6a7e206416bd28b0", + "version-string": "0.13.0", + "port-version": 5 + }, { "git-tree": "52deb7c24c307a3089b818d3b35bd7b19b1e4dc2", "version-string": "0.13.0", diff --git a/versions/c-/cpp-peglib.json b/versions/c-/cpp-peglib.json index c0b71a55b9e8a0..a88f89b8a89dc5 100644 --- a/versions/c-/cpp-peglib.json +++ b/versions/c-/cpp-peglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c276ee41b27be78ffa392f24e371e9893b43c93", + "version-string": "0.1.0", + "port-version": 1 + }, { "git-tree": "bd023f488fbfc178695bdab57978bf6fd8db5750", "version-string": "0.1.0", diff --git a/versions/c-/cpp-redis.json b/versions/c-/cpp-redis.json index c27088641093e5..bfe2327b22d821 100644 --- a/versions/c-/cpp-redis.json +++ b/versions/c-/cpp-redis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f412f0e14f585bccfec1add71fd23ad9ea8f1f9f", + "version-string": "4.3.1", + "port-version": 3 + }, { "git-tree": "6e73617915b055400da154a55b8c3682a0ace51c", "version-string": "4.3.1-2", diff --git a/versions/c-/cpp-taskflow.json b/versions/c-/cpp-taskflow.json index f0dfe81b4d8926..9e6d783e0e9c63 100644 --- a/versions/c-/cpp-taskflow.json +++ b/versions/c-/cpp-taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "edbd9a48db629e8b2c264cdd60fba4ca4e218f03", + "version-string": "2.6.0", + "port-version": 1 + }, { "git-tree": "b07021eb35b87c012df20b3720bf0ee2743eb5c8", "version-string": "2.6.0", diff --git a/versions/c-/cppad.json b/versions/c-/cppad.json index 0fb26ef232838a..739c86ddb6a90e 100644 --- a/versions/c-/cppad.json +++ b/versions/c-/cppad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f03801828709574ede2215d05d984764cc271a18", + "version-string": "20200000.3", + "port-version": 1 + }, { "git-tree": "b18a6d765c26ff523ffec8761974e16343935e79", "version-string": "20200000.3", diff --git a/versions/c-/cppcms.json b/versions/c-/cppcms.json index 36200c0b221456..ade141096f52c2 100644 --- a/versions/c-/cppcms.json +++ b/versions/c-/cppcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9582485ed72df7ad43d20b3680e13eaeb76f76e7", + "version-string": "1.2.1", + "port-version": 3 + }, { "git-tree": "d05a10e23b006a8c29e74810a7062f7f13bae6da", "version-string": "1.2.1", diff --git a/versions/c-/cppcodec.json b/versions/c-/cppcodec.json index 9f26ae355cd49e..8e5bae079ca74f 100644 --- a/versions/c-/cppcodec.json +++ b/versions/c-/cppcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9546342ff5d08d76abe6774215ae78778494eb55", + "version-string": "0.2", + "port-version": 1 + }, { "git-tree": "a31ff53a915e7fd45a3d7ada497f363ead024e71", "version-string": "0.2", diff --git a/versions/c-/cppcoro.json b/versions/c-/cppcoro.json index 5e0757162f9934..daf5da05e52067 100644 --- a/versions/c-/cppcoro.json +++ b/versions/c-/cppcoro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9788359b921d309c2982f3f190ac9cb8583f28a", + "version-string": "2020-2-28", + "port-version": 2 + }, { "git-tree": "3ef6ef3cc3d6a50556d72ff1cd2c9f29e72d9769", "version-string": "2020-2-28-1", diff --git a/versions/c-/cppfs.json b/versions/c-/cppfs.json index 7e7ce649917c19..f3ef26ddd8ec0a 100644 --- a/versions/c-/cppfs.json +++ b/versions/c-/cppfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b904f053fa80033ffa454148ff60a3504f8c57f", + "version-string": "1.3.0", + "port-version": 1 + }, { "git-tree": "9ba2e6a6be415048178367ecb17357c8c089fe76", "version-string": "1.3.0", diff --git a/versions/c-/cppitertools.json b/versions/c-/cppitertools.json index 1aaf44107e0604..a2ad3bc3b51904 100644 --- a/versions/c-/cppitertools.json +++ b/versions/c-/cppitertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee578d4182af8702a89a87b361e192d634055352", + "version-string": "2.1", + "port-version": 1 + }, { "git-tree": "9b4908a6183e914b33014a6b2f640df56e99d9f0", "version-string": "2.1", diff --git a/versions/c-/cppkafka.json b/versions/c-/cppkafka.json index 04aa49680219f6..c54ec8a4f9b5c2 100644 --- a/versions/c-/cppkafka.json +++ b/versions/c-/cppkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "749993fee4605134bbe7a5e9a451c959519f4dbf", + "version-string": "0.3.1", + "port-version": 3 + }, { "git-tree": "93a1c2dd03f298272dbb69df1920b9897adff338", "version-string": "0.3.1-2", diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index 1b19c277bcaca1..ed66434c184533 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0462f2f3f6c9bb3e3374b53eccc05adc00417bae", + "version-string": "3.4.0", + "port-version": 3 + }, { "git-tree": "70e0b19ff0c3df69f82cc8aed8eb6d4add67bec2", "version-string": "3.4.0", diff --git a/versions/c-/cpptoml.json b/versions/c-/cpptoml.json index 50deb74915ba83..9f1b4068775928 100644 --- a/versions/c-/cpptoml.json +++ b/versions/c-/cpptoml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f99a8c54489e45f171c05fa68d75f8cf5f6103cb", + "version-string": "v0.1.1", + "port-version": 1 + }, { "git-tree": "b0520fd38bc9993e9a30a85f703e1a8941375a6c", "version-string": "v0.1.1", diff --git a/versions/c-/cpputest.json b/versions/c-/cpputest.json index dd8ee292673bb4..750270e37afc4d 100644 --- a/versions/c-/cpputest.json +++ b/versions/c-/cpputest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e476f5c4b948489a33c704cbfc42d8ca60ac29e3", + "version-string": "2019-9-16", + "port-version": 2 + }, { "git-tree": "4c3ab93d9f7c45b366a5ec0cc1cc3e69d4ef1d5c", "version-string": "2019-9-16-1", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index 811c4be14f1d62..a7dc8451f0647b 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c85228de687c3b4748a8867c1fbf82f0b64c8d9c", + "version-string": "0.4.1", + "port-version": 2 + }, { "git-tree": "f802d870a436a93b77d88e007088880a41432dad", "version-string": "0.4.1-1", diff --git a/versions/c-/cr.json b/versions/c-/cr.json index fdfeff11c45490..eec55d22ad7398 100644 --- a/versions/c-/cr.json +++ b/versions/c-/cr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67c46561394de15aee2a56d57590eeef1060019d", + "version-string": "2020-04-26", + "port-version": 1 + }, { "git-tree": "2c71bf1df729facbf1f2ffcf77341ff901b00eda", "version-string": "2020-04-26", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 7d1a2201677504..8551c961a5a09d 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1968933546b1d1a71dbe8869f68f13d014fcb943", + "version-string": "2020-03-18", + "port-version": 1 + }, { "git-tree": "0de198199fe4c71142640bb10fd9fffe28a79349", "version-string": "2020-03-18", diff --git a/versions/c-/crc32c.json b/versions/c-/crc32c.json index 8cd7d7c4b021e6..7d5b91efaa05b9 100644 --- a/versions/c-/crc32c.json +++ b/versions/c-/crc32c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c170749f5731ca44674e241167fa0955a461256a", + "version-string": "1.1.1", + "port-version": 1 + }, { "git-tree": "0e0e15c0dc05913aa952e8d0ce68b145ce8cdfdf", "version-string": "1.1.1", diff --git a/versions/c-/croncpp.json b/versions/c-/croncpp.json index 6a60325c7b1dec..f1feb4ca48847a 100644 --- a/versions/c-/croncpp.json +++ b/versions/c-/croncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79f67dcb192287955f663db8cc36f73455f78990", + "version-string": "2020-09-04", + "port-version": 2 + }, { "git-tree": "efc67eae1ad2b9fa1c1655c977b0800ef2113313", "version-string": "2020-09-04", diff --git a/versions/c-/crossguid.json b/versions/c-/crossguid.json index 42806aa2fabea7..0bed5bcf10b1b0 100644 --- a/versions/c-/crossguid.json +++ b/versions/c-/crossguid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42cc44d6649705d3c104e9753f3ba1bb4217ebc8", + "version-string": "0.2.2-2018-06-16", + "port-version": 2 + }, { "git-tree": "4b44e01ccbe952e12c3be478e0d5bc4340f4c9df", "version-string": "0.2.2-2018-06-16-1", diff --git a/versions/c-/cryptopp.json b/versions/c-/cryptopp.json index 5549cf00653733..56bb041ddbb988 100644 --- a/versions/c-/cryptopp.json +++ b/versions/c-/cryptopp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2092d648b56a683bcd8b3e72f4adc3a966956c17", + "version-string": "8.5.0", + "port-version": 1 + }, { "git-tree": "c8aee6279ffed7e7e1f9037c15937643c315a999", "version-string": "8.5.0", diff --git a/versions/c-/cspice.json b/versions/c-/cspice.json index 23ae3688c03574..6586f30ebfaf08 100644 --- a/versions/c-/cspice.json +++ b/versions/c-/cspice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b03824386796440e0b529f4e29413686f0fc5d5", + "version-string": "66", + "port-version": 5 + }, { "git-tree": "de8a1c53f62f307ac805ace26e3b9c9ece91829a", "version-string": "66", diff --git a/versions/c-/ctbignum.json b/versions/c-/ctbignum.json index 90efde08d0e75c..676be5da86c34e 100644 --- a/versions/c-/ctbignum.json +++ b/versions/c-/ctbignum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88ce498c3810046ebfe6500157691bf21a85eb07", + "version-string": "2019-08-02", + "port-version": 1 + }, { "git-tree": "ff7d4b1e86ce05b4b86cf72977181f1173b68ba1", "version-string": "2019-08-02", diff --git a/versions/c-/ctemplate.json b/versions/c-/ctemplate.json index f51ec5cda446bf..cdd3ca2422dc97 100644 --- a/versions/c-/ctemplate.json +++ b/versions/c-/ctemplate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49845dc04f38d16b9c148162fc1457ed78608ae7", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "96aee13ec21957f5d9253a4e382f1896c312d7e8", "version-string": "2020-09-14", diff --git a/versions/c-/ctp.json b/versions/c-/ctp.json index ad91bff786ecd9..8be7ab0c0400f7 100644 --- a/versions/c-/ctp.json +++ b/versions/c-/ctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abd1e961a096126b01df7a0b3362d5e8223ea9d7", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 1 + }, { "git-tree": "253cd7c440e8e50fc940c7d2812a6d39b371dbf2", "version-string": "6.6.1_P1_20210406_se", diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 6b1b43323b8412..12a4ed37052bab 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43b8008115ab934b4cf1b36c38bb02ed845712bd", + "version-string": "10.1", + "port-version": 8 + }, { "git-tree": "f81f6321111048d45f0c5e41644ee26a0ccb9c13", "version-string": "10.1", diff --git a/versions/c-/cunit.json b/versions/c-/cunit.json index 78cf499eee03a0..7b15a6d376928d 100644 --- a/versions/c-/cunit.json +++ b/versions/c-/cunit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b108b8daeb1695db997a7ebc1b341e27d4d84ce7", + "version-string": "2.1.3", + "port-version": 7 + }, { "git-tree": "f534a55290d8bce0e7d8fd5f443550c4565a4b63", "version-string": "2.1.3-6", diff --git a/versions/c-/curlpp.json b/versions/c-/curlpp.json index 205c427040fbd7..f9f3404fba1693 100644 --- a/versions/c-/curlpp.json +++ b/versions/c-/curlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a764bda6f69b8e79e3f3734ceb420d4c814e9605", + "version-string": "2018-06-15", + "port-version": 4 + }, { "git-tree": "121083d20c3bd1cdb738697da5ae8ae1917ccee8", "version-string": "2018-06-15-3", diff --git a/versions/c-/cute-headers.json b/versions/c-/cute-headers.json index 066c59028aa478..a0d7ca06e7e2f8 100644 --- a/versions/c-/cute-headers.json +++ b/versions/c-/cute-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6eb7ff72e3cede19e1f8900fe715014b3fa6d81", + "version-string": "2019-09-20", + "port-version": 1 + }, { "git-tree": "c8b815cb53310c522b4789c34e1961c4a816beab", "version-string": "2019-09-20", diff --git a/versions/c-/cutelyst2.json b/versions/c-/cutelyst2.json index fa0c1847be0537..5fd0104ed44085 100644 --- a/versions/c-/cutelyst2.json +++ b/versions/c-/cutelyst2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ad13c203a854aeb411f66b4f8e083882d7415cd", + "version-string": "2.12.0", + "port-version": 1 + }, { "git-tree": "d451e8108a8ac3305fda61e441505d6244260329", "version-string": "2.12.0", diff --git a/versions/c-/cxxopts.json b/versions/c-/cxxopts.json index 78acabcd7d370f..26e43e99077c92 100644 --- a/versions/c-/cxxopts.json +++ b/versions/c-/cxxopts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68001132d5d7e495c5890f3cadfed62aba7185dd", + "version-string": "2.2.1", + "port-version": 1 + }, { "git-tree": "b366e598bbb99685f33563a0b224f710be2b5124", "version-string": "2.2.1", diff --git a/versions/d-/darts-clone.json b/versions/d-/darts-clone.json index 9cc1ad2c6c3bb8..40a98fec164cf6 100644 --- a/versions/d-/darts-clone.json +++ b/versions/d-/darts-clone.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d75f114575faaf58492d7eca28e5caa3768811a", + "version-string": "1767ab87cffe", + "port-version": 2 + }, { "git-tree": "b54d1af1ee2c42b0b298fa3d40c7e283b3da015c", "version-string": "1767ab87cffe-1", diff --git a/versions/d-/dataframe.json b/versions/d-/dataframe.json index 23cd4a1e0fa98b..b0a863e52dcd5e 100644 --- a/versions/d-/dataframe.json +++ b/versions/d-/dataframe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a7d6da55d37d2e7415aa8841b06660213e54743", + "version-string": "1.17.0", + "port-version": 1 + }, { "git-tree": "6ddb720c8221d354fd5ca2b18617758033459a69", "version-string": "1.17.0", diff --git a/versions/d-/date.json b/versions/d-/date.json index f739f8dbca3f87..05e4bbc9c2415c 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dc2054fe09235f06cd75f4acaf570145672a86a", + "version-string": "3.0.0", + "port-version": 3 + }, { "git-tree": "6223ca4908ce9896c0d17ac21dac600e7f4d54e1", "version-string": "3.0.0", diff --git a/versions/d-/dbg-macro.json b/versions/d-/dbg-macro.json index fbc08e0d9644c8..e17957f05cee1b 100644 --- a/versions/d-/dbg-macro.json +++ b/versions/d-/dbg-macro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "662589707f9cc76d56e9298457a07a267f43f8c4", + "version-string": "2019-07-11", + "port-version": 1 + }, { "git-tree": "0a78c2a06c6717eb7b5049c72b6529b7ce88942b", "version-string": "2019-07-11", diff --git a/versions/d-/dbghelp.json b/versions/d-/dbghelp.json index 21ea91a6bf374a..b279a5b45744c2 100644 --- a/versions/d-/dbghelp.json +++ b/versions/d-/dbghelp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70109bd0d38dce02dc4ee2258fc40a2df72559f8", + "version-string": "0.0", + "port-version": 1 + }, { "git-tree": "9a5b9a5962883da2ac82a87f9b0bf78c0c8b0f62", "version-string": "0.0", diff --git a/versions/d-/dbow2.json b/versions/d-/dbow2.json index 8fe2ec85ef0735..c37665c6b6bccf 100644 --- a/versions/d-/dbow2.json +++ b/versions/d-/dbow2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef7b9edee49702a3735f18624888b98d249a80ef", + "version-string": "2019-08-05", + "port-version": 1 + }, { "git-tree": "e26ed5627995f7e51f34cb8dfe2044397bb4e932", "version-string": "2019-08-05", diff --git a/versions/d-/dbow3.json b/versions/d-/dbow3.json index 4957cbed59f4c3..12758d201c156c 100644 --- a/versions/d-/dbow3.json +++ b/versions/d-/dbow3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0cbeaf64e4827fa69b0c07f21c6d0d689305559", + "version-string": "1.0.0", + "port-version": 1 + }, { "git-tree": "85a92409d590110eafbc10a26486a531749e9dd1", "version-string": "1.0.0", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index 9f9eb3d0f45fe6..cf145878ee6b83 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b830172b906fea2468685175d0ecca5f374217c", + "version-string": "3.6.6", + "port-version": 1 + }, { "git-tree": "0c53e59b36c487946025ebf3c2ea38ce5401d207", "version-string": "3.6.6", diff --git a/versions/d-/decimal-for-cpp.json b/versions/d-/decimal-for-cpp.json index 99b7bd5d62587a..9bc9ed12fca49a 100644 --- a/versions/d-/decimal-for-cpp.json +++ b/versions/d-/decimal-for-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0279d4ae637ef0b7380ad1193282a5f76b4d27f3", + "version-string": "1.16", + "port-version": 2 + }, { "git-tree": "9a7b8c44bcd4ee8396edbb03495d998169d4f292", "version-string": "1.16", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index bb2e73f0cc6c79..4dafbf79116062 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2b285f4028fc968bc2b4b04f7c3be5a9070d9df", + "version-string": "4.0.1", + "port-version": 3 + }, { "git-tree": "7400c2c8b63f9576a4b5e4464ad5d8e36d33e1d6", "version-string": "4.0.1", diff --git a/versions/d-/devicenameresolver.json b/versions/d-/devicenameresolver.json index d35668c1399cdf..f8eebb52fca416 100644 --- a/versions/d-/devicenameresolver.json +++ b/versions/d-/devicenameresolver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c24f08a86eef969a65c6acdd123edfe704c4c0c", + "version-string": "2016-06-26-0850d88fa6", + "port-version": 2 + }, { "git-tree": "a0053afe91272f44589a53a866a3bc766d9e9d09", "version-string": "2016-06-26-0850d88fa6-1", diff --git a/versions/d-/dimcli.json b/versions/d-/dimcli.json index 843a92705ba302..26e47bfd0dcaeb 100644 --- a/versions/d-/dimcli.json +++ b/versions/d-/dimcli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "025db5cad1969933359bac4047e0dea962fb692b", + "version-string": "5.0.2", + "port-version": 1 + }, { "git-tree": "da33c865acdf04845f77a46b89264544bfaf30cf", "version-string": "5.0.2", diff --git a/versions/d-/dirent.json b/versions/d-/dirent.json index 61f9899b39086d..7bd05e8910d23a 100644 --- a/versions/d-/dirent.json +++ b/versions/d-/dirent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75a51df9f74a0b771b858caf42d3111a6386945c", + "version-string": "1.23.2", + "port-version": 1 + }, { "git-tree": "b1ac2911c352ec0e8485c4cb49f544d0f05d749b", "version-string": "1.23.2", diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index 202d07f4f798e0..dd1408dd8064cb 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17cdcbe9e20da2ed085fc2de181ae426d62f2609", + "version-string": "2.5.6", + "port-version": 2 + }, { "git-tree": "b3144d3d155b301d8a23508ae75be2f630ede9f0", "version-string": "2.5.6-1", diff --git a/versions/d-/discord-rpc.json b/versions/d-/discord-rpc.json index 01aa0f70a957e6..330ebf037652fa 100644 --- a/versions/d-/discord-rpc.json +++ b/versions/d-/discord-rpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b2b68ae08dffdf7b990d40a34b1ea53621aa856", + "version-string": "3.4.0", + "port-version": 1 + }, { "git-tree": "161afe071b88dc53bff7dd5b13909872ee370f92", "version-string": "3.4.0", diff --git a/versions/d-/discount.json b/versions/d-/discount.json index 932b2400a92e95..f58d95ef1bfc74 100644 --- a/versions/d-/discount.json +++ b/versions/d-/discount.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28fe4ebbd4c5a94313b661b5ff5b0751ad186a69", + "version-string": "2.2.6", + "port-version": 1 + }, { "git-tree": "b5d813e867f3c5a663035c966b9259d20e21113d", "version-string": "2.2.6", diff --git a/versions/d-/discreture.json b/versions/d-/discreture.json index 61605c7408184e..42c62e2032d184 100644 --- a/versions/d-/discreture.json +++ b/versions/d-/discreture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff9bb91c1f3a20a851b95e33cba5f682c2f95fd4", + "version-string": "2020-01-29", + "port-version": 1 + }, { "git-tree": "7977d6135bba5e0648102988dc1a1f9ed422da8e", "version-string": "2020-01-29", diff --git a/versions/d-/distorm.json b/versions/d-/distorm.json index 05b03c4e4203a0..a4300671b067f6 100644 --- a/versions/d-/distorm.json +++ b/versions/d-/distorm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac14ace119d357f555286753afa0bbced4b643e7", + "version-string": "3.4.1", + "port-version": 1 + }, { "git-tree": "15c619603ae1ba21211e5dd32887461375dde046", "version-string": "3.4.1", diff --git a/versions/d-/dlfcn-win32.json b/versions/d-/dlfcn-win32.json index ca3194c11bd8c1..df182c5859b404 100644 --- a/versions/d-/dlfcn-win32.json +++ b/versions/d-/dlfcn-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37cc87e9f214e146c81fff2a8aa5ae018622674d", + "version-string": "1.1.1", + "port-version": 5 + }, { "git-tree": "1d930427c522c5e3e56535ee4739b0157b3f6592", "version-string": "1.1.1-4", diff --git a/versions/d-/docopt.json b/versions/d-/docopt.json index d16fa264439325..571cee5e28bbde 100644 --- a/versions/d-/docopt.json +++ b/versions/d-/docopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8af85233a92e8e8b249d61a56c50ef2c6704909b", + "version-string": "2018-11-01", + "port-version": 1 + }, { "git-tree": "e1556dd1eee1f9dcbef7040a36be5ea88cbfdc05", "version-string": "2018-11-01", diff --git a/versions/d-/doctest.json b/versions/d-/doctest.json index d8f20c69284c40..30a591ff0edb55 100644 --- a/versions/d-/doctest.json +++ b/versions/d-/doctest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e39ece916763931668299b3856bbbb8e41308cf", + "version-string": "2.4.5", + "port-version": 1 + }, { "git-tree": "77531913ab5554ea00ea412788ca2b003d0f436b", "version-string": "2.4.5", diff --git a/versions/d-/double-conversion.json b/versions/d-/double-conversion.json index 9b16fa857d433b..c6d5973e87ae14 100644 --- a/versions/d-/double-conversion.json +++ b/versions/d-/double-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d28a31601897003105b70c847d82a82cd5b5355a", + "version-string": "3.1.5", + "port-version": 1 + }, { "git-tree": "ce6fc681ae5017ab5c3a7b166ab4de2f62f8a78d", "version-string": "3.1.5", diff --git a/versions/d-/dpdk.json b/versions/d-/dpdk.json index 0aea03ec7fa1aa..913bf29120469c 100644 --- a/versions/d-/dpdk.json +++ b/versions/d-/dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c259e16015f4cedca26e9fa3cb1aaafa3b3e4955", + "version-string": "19.02", + "port-version": 1 + }, { "git-tree": "7ceb4ec08ceffd575220fb624ef996d4fd83a938", "version-string": "19.02", diff --git a/versions/d-/drlibs.json b/versions/d-/drlibs.json index 331bb147d101b1..51652ae9b83b05 100644 --- a/versions/d-/drlibs.json +++ b/versions/d-/drlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f82c3255ba101684781f57429f162b8f8528a972", + "version-string": "2019-08-12", + "port-version": 1 + }, { "git-tree": "503bcfa3a091377c8a53f52b12c463a1570b6af6", "version-string": "2019-08-12", diff --git a/versions/d-/dtl.json b/versions/d-/dtl.json index 12d9b2ade6e22d..ebed0a267a219c 100644 --- a/versions/d-/dtl.json +++ b/versions/d-/dtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67d6f73d3a78adeb42c9eee4c75d55c17ce1ea18", + "version-string": "1.19", + "port-version": 1 + }, { "git-tree": "d6fe181396229123090f09dcb6a9d7cff25f8045", "version-string": "1.19", diff --git a/versions/d-/duckx.json b/versions/d-/duckx.json index 6d50f35968067b..fdd584ea7b8df4 100644 --- a/versions/d-/duckx.json +++ b/versions/d-/duckx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f862e06f527a656f8bbe1133a0ba212833f6951", + "version-string": "1.0.0", + "port-version": 1 + }, { "git-tree": "b0d07b78faf406cedb00c24f66a546abc6492f6f", "version-string": "1.0.0", diff --git a/versions/d-/duilib.json b/versions/d-/duilib.json index 9faceb99097b8d..efe7ebaf06ba94 100644 --- a/versions/d-/duilib.json +++ b/versions/d-/duilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c23619497c06f6d2e22dae79e731c2a7da51208c", + "version-string": "2019-4-28", + "port-version": 4 + }, { "git-tree": "58b8c9eb93832387ea6efc1ae1071395cd4a22d2", "version-string": "2019-4-28", diff --git a/versions/d-/duktape.json b/versions/d-/duktape.json index 20bfc556e206a2..b1f2e3bb233837 100644 --- a/versions/d-/duktape.json +++ b/versions/d-/duktape.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1882f1d359d8c0463a3c7e9d41804a3a9df8f5f9", + "version-string": "2.5.0", + "port-version": 2 + }, { "git-tree": "bb94b30a10ff262e574d2824c503c0be67e09e80", "version-string": "2.5.0", diff --git a/versions/d-/dx.json b/versions/d-/dx.json index b4bbac9ee3122a..96dffa0a87d687 100644 --- a/versions/d-/dx.json +++ b/versions/d-/dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "684efcf0d9ea4c1a8b7ec6d9440e0097ab38d586", + "version-string": "1.0.1", + "port-version": 2 + }, { "git-tree": "e215daa609ec48fa696871c83ad6fac358898309", "version-string": "1.0.1-1", diff --git a/versions/e-/easycl.json b/versions/e-/easycl.json index 0b2db106486714..88f7e35dd53f6a 100644 --- a/versions/e-/easycl.json +++ b/versions/e-/easycl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f25251c36cd3423ca13cdf773e124ce01e7b08fe", + "version-string": "0.3", + "port-version": 1 + }, { "git-tree": "172a7b81ef634d827a5a1fb3eaf3beb10a0e3923", "version-string": "0.3", diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json index 9b1fa8f5b2f7db..3c076f8357a838 100644 --- a/versions/e-/easyloggingpp.json +++ b/versions/e-/easyloggingpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4dccf41488f050a70d3232a86296883b54533d2f", + "version-string": "9.96.7", + "port-version": 2 + }, { "git-tree": "22fde45fd8d035536d9d3bbb8b174649c037e831", "version-string": "9.96.7-1", diff --git a/versions/e-/eathread.json b/versions/e-/eathread.json index 0081edae0e7ece..b9ee874827df12 100644 --- a/versions/e-/eathread.json +++ b/versions/e-/eathread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "273dda3270d68ca1c465bb093cba07e71bd6a62f", + "version-string": "1.32.09", + "port-version": 2 + }, { "git-tree": "d184652fe784ad6994bb56ca562539fc0f4bb49a", "version-string": "1.32.09-1", diff --git a/versions/e-/ebml.json b/versions/e-/ebml.json index fc17b220c35451..9a4a7e43abc607 100644 --- a/versions/e-/ebml.json +++ b/versions/e-/ebml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92e5e7a92a8bd6a496911ea44a032088e776471f", + "version-string": "1.4.0", + "port-version": 1 + }, { "git-tree": "bcf2ed38acfba94d49dfe9f4c96559771d8032c8", "version-string": "1.4.0", diff --git a/versions/e-/ecsutil.json b/versions/e-/ecsutil.json index 9394deea721c81..65def84ff23eba 100644 --- a/versions/e-/ecsutil.json +++ b/versions/e-/ecsutil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fb65a14c061886745af3a158b7f2bc8b71184fc", + "version-string": "1.0.7.15", + "port-version": 1 + }, { "git-tree": "e6816d896c639acee9ea9aed9c4f6bfb3f9dbb1a", "version-string": "1.0.7.15", diff --git a/versions/e-/edlib.json b/versions/e-/edlib.json index d00bcfe8fc7439..4c87106f1854af 100644 --- a/versions/e-/edlib.json +++ b/versions/e-/edlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1c507cb59e800c53256b3722b862df4ff41dbd6", + "version-string": "1.2.6", + "port-version": 1 + }, { "git-tree": "a8e115424a7e2e54788cdda6bd0dad6a097f508d", "version-string": "1.2.6", diff --git a/versions/e-/effolkronium-random.json b/versions/e-/effolkronium-random.json index c0f3a35765a9a9..64d9d3602d81b5 100644 --- a/versions/e-/effolkronium-random.json +++ b/versions/e-/effolkronium-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c07bb6dd8e736bf6b970117efbdc2c329f7192f1", + "version-string": "1.3.1", + "port-version": 1 + }, { "git-tree": "8e1984293d7e95cdab2dff086ad58f639297a924", "version-string": "1.3.1", diff --git a/versions/e-/efsw.json b/versions/e-/efsw.json index 15bfab79884eaf..c58cd1f6db35ae 100644 --- a/versions/e-/efsw.json +++ b/versions/e-/efsw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67bb6e4495d7a98abb97ef8da9d7486508974042", + "version-string": "2020-06-08", + "port-version": 2 + }, { "git-tree": "6fec8b0d52b78fd74b35373e89ff32862ee4597c", "version-string": "2020-06-08", diff --git a/versions/e-/egl-registry.json b/versions/e-/egl-registry.json index de47f4d860434b..59de646f2aef69 100644 --- a/versions/e-/egl-registry.json +++ b/versions/e-/egl-registry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33252a782754c5b8595212530c1729d41bb78c19", + "version-string": "2020-02-20", + "port-version": 1 + }, { "git-tree": "3140fdc59c3d9481800dd9f9e3fbe75bd4595c6f", "version-string": "2020-02-20", diff --git a/versions/e-/eigen3.json b/versions/e-/eigen3.json index 0b5015f180f7ed..37649711cfff52 100644 --- a/versions/e-/eigen3.json +++ b/versions/e-/eigen3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b845a54aa220fa4099e97be4031cb63634665e3", + "version-string": "3.3.9", + "port-version": 1 + }, { "git-tree": "7a4f98a4624de567ff1bf9fa82668eae42e0f996", "version-string": "3.3.9", diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json index 2ebe9478fefc7e..6c9d614b27222a 100644 --- a/versions/e-/elfutils.json +++ b/versions/e-/elfutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa738c679581e92da4ec8a1662171ac5608e3744", + "version-string": "0.182", + "port-version": 1 + }, { "git-tree": "2695bb6d07358b642791808399b606fe52374572", "version-string": "0.182", diff --git a/versions/e-/entityx.json b/versions/e-/entityx.json index 15ab870b469222..2d7bb14ca30960 100644 --- a/versions/e-/entityx.json +++ b/versions/e-/entityx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "191e57655630e9862440dd860de69d4baa62b089", + "version-string": "1.3.0", + "port-version": 3 + }, { "git-tree": "1c855d1902c11d9ef82d873ae86ad70052082728", "version-string": "1.3.0-2", diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index 46cb2702df8965..e6828152b64290 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54824ec07afd73fa5bb369acc97e44f4754cc368", + "version-string": "0.9.2", + "port-version": 5 + }, { "git-tree": "9d0ee89af9a1cd0f574dac537598e33a1afddf74", "version-string": "0.9.2-4", diff --git a/versions/e-/esaxx.json b/versions/e-/esaxx.json index c6b3e3e99f7d82..5d905251537437 100644 --- a/versions/e-/esaxx.json +++ b/versions/e-/esaxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab1275b163482bc7140f4ca266183d1309d3dc42", + "version-string": "ca7cb332011ec37", + "port-version": 1 + }, { "git-tree": "2a5e4429567a9e4f0a5a23df2e097d6cb01d8175", "version-string": "ca7cb332011ec37", diff --git a/versions/e-/evpp.json b/versions/e-/evpp.json index 1183c6bd76d98b..7291e63111e520 100644 --- a/versions/e-/evpp.json +++ b/versions/e-/evpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b312644fb2498483feb3114cef2c8afaa44f45ed", + "version-string": "0.7.0", + "port-version": 5 + }, { "git-tree": "f460fd6d64355ccd3ed62d95e79485161aafba85", "version-string": "0.7.0", diff --git a/versions/e-/expected-lite.json b/versions/e-/expected-lite.json index 8d5270ddbfe0eb..4c59a26580c348 100644 --- a/versions/e-/expected-lite.json +++ b/versions/e-/expected-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "877f85638b2a3f618c48729a2e39149effbcb851", + "version-string": "0.3.0", + "port-version": 1 + }, { "git-tree": "a3d0c35d13d31b4ea4417e89cb3fd37bbc6fb9c4", "version-string": "0.3.0", diff --git a/versions/e-/exprtk.json b/versions/e-/exprtk.json index 4cc90df9844c12..0dd368f44ef3a1 100644 --- a/versions/e-/exprtk.json +++ b/versions/e-/exprtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f43789e8da0899715ef1d0544880baa13ce38d64", + "version-string": "2021-01-01", + "port-version": 1 + }, { "git-tree": "497f4b1dc2da32e75f934ba6d0e496a4dc0b01ae", "version-string": "2021-01-01", diff --git a/versions/f-/faad2.json b/versions/f-/faad2.json index db7b534e861113..dfd990a5664804 100644 --- a/versions/f-/faad2.json +++ b/versions/f-/faad2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b931758d2574476cbd463ac773b192746e2dc80d", + "version-string": "2.9.1", + "port-version": 3 + }, { "git-tree": "52205fadafc9f2d30a0a6d2a3f10407cf1275a3d", "version-string": "2.9.1", diff --git a/versions/f-/fadbad.json b/versions/f-/fadbad.json index 9d41c4803b6830..8c67fe49e2ed4b 100644 --- a/versions/f-/fadbad.json +++ b/versions/f-/fadbad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "508423e28f6d567501bcfe9e8733627dcb9df7ec", + "version-string": "2.1.0", + "port-version": 1 + }, { "git-tree": "468c63dfb708e90b78bc67241a9eafdd60a3b15d", "version-string": "2.1.0", diff --git a/versions/f-/farmhash.json b/versions/f-/farmhash.json index 9d3fa80f9fdcc6..b80cf8bcf1c84e 100644 --- a/versions/f-/farmhash.json +++ b/versions/f-/farmhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b4c6dc1b8fbb33fcca66dcb10c7186980e7058e", + "version-string": "1.1", + "port-version": 3 + }, { "git-tree": "905ec49a7fce57f5c28c60e858ccd443c343894a", "version-string": "1.1", diff --git a/versions/f-/fast-cpp-csv-parser.json b/versions/f-/fast-cpp-csv-parser.json index 3fa617b74c4910..22b6d28df67cf2 100644 --- a/versions/f-/fast-cpp-csv-parser.json +++ b/versions/f-/fast-cpp-csv-parser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2518da1e8879b97a01d6053fb61a8800bdbe3996", + "version-string": "2021-01-03", + "port-version": 1 + }, { "git-tree": "f1f6fcd862c655b0884eb40931852c6db8a938e4", "version-string": "2021-01-03", diff --git a/versions/f-/fastcgi.json b/versions/f-/fastcgi.json index ffe90a34527647..8469300ffc96bb 100644 --- a/versions/f-/fastcgi.json +++ b/versions/f-/fastcgi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fb1b55b9ff65061f7be351c53397dcbdca9fa2", + "version-string": "2020-09-11", + "port-version": 1 + }, { "git-tree": "4626d60c5ae870e59c3a1c04b38379e1be739889", "version-string": "2020-09-11", diff --git a/versions/f-/fastfeat.json b/versions/f-/fastfeat.json index b1a52c3bc8bf8c..7a85559db81658 100644 --- a/versions/f-/fastfeat.json +++ b/versions/f-/fastfeat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6df4d7e64a7c9cb69a300aa50f62e2fbb261138", + "version-string": "391d5e9", + "port-version": 2 + }, { "git-tree": "0e8001ec0aef17a819af7f25f4e490a3368ed677", "version-string": "391d5e9-1", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index 581d1043de4f8f..f137e607c7549d 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d48d4af7b7082b1a162b136643f6d51dd5b8beba", + "version-string": "2.0.1", + "port-version": 1 + }, { "git-tree": "e51ca9a6f1e9a2e3d838927fbf255a827e7d2014", "version-string": "2.0.1", diff --git a/versions/f-/fcl.json b/versions/f-/fcl.json index 01253d0f75820f..b59f28a041b139 100644 --- a/versions/f-/fcl.json +++ b/versions/f-/fcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "882ea9cab4a482db6b23eae2592a5f93f4f27035", + "version-string": "0.6.1", + "port-version": 1 + }, { "git-tree": "52a59e9f37b1e0db67ab735c29199f7eaf6ff1b8", "version-string": "0.6.1", diff --git a/versions/f-/fdlibm.json b/versions/f-/fdlibm.json index 7976217f4ba371..51bdc1f0d1187f 100644 --- a/versions/f-/fdlibm.json +++ b/versions/f-/fdlibm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7edc287bacd598a942ca6b29ed47329204b07faa", + "version-string": "5.3", + "port-version": 5 + }, { "git-tree": "46cc1958aab2e70eb861dc35c58b2e2942c50af7", "version-string": "5.3-4", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index 7c8d62c3554762..1543256ee92cd4 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f66cad42ef3e7749e345075f467f357ca061acd", + "version-string": "10.0.26.0", + "port-version": 2 + }, { "git-tree": "a8340b2c8379d1a6e0bbf5ae3ef2270074a2da2e", "version-string": "10.0.26.0", diff --git a/versions/f-/fftwpp.json b/versions/f-/fftwpp.json index c40df3388700cd..5427eaba1d2d48 100644 --- a/versions/f-/fftwpp.json +++ b/versions/f-/fftwpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9b689681032352f667f7335feed82d0260fe5bf", + "version-string": "2019-12-19", + "port-version": 1 + }, { "git-tree": "71459a57c6722279dc89288662bf2dd1b6612a58", "version-string": "2019-12-19", diff --git a/versions/f-/field3d.json b/versions/f-/field3d.json index 42693d2330784c..380afc32399615 100644 --- a/versions/f-/field3d.json +++ b/versions/f-/field3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54a68f2c7d892d5876ff65ad373907bdcfc1b17e", + "version-string": "1.7.3", + "port-version": 2 + }, { "git-tree": "12a46a3791ba70f5da571e9de8fdd6ac4be921f6", "version-string": "1.7.3", diff --git a/versions/f-/fixed-string.json b/versions/f-/fixed-string.json index b61727e2626ae0..9cf1230d9cca5c 100644 --- a/versions/f-/fixed-string.json +++ b/versions/f-/fixed-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e24d1c3d1692a06fa69dc12b65e4240a92db31bf", + "version-string": "0.1.0", + "port-version": 1 + }, { "git-tree": "5fadefa9a548c0a653cadda794513f9bcde94ceb", "version-string": "0.1.0", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 74e1d183f307a9..22bcf8a9f91537 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bfd2df96c7250148b6dee28e4cd5be2fa785b60", + "version-string": "2.0.0", + "port-version": 1 + }, { "git-tree": "15a2fc0a15331e81cd04a3aae0a8b1d70c002ee5", "version-string": "2.0.0", diff --git a/versions/f-/flint.json b/versions/f-/flint.json index 7e00ec8ad9e6bf..12e3bc893f6ed9 100644 --- a/versions/f-/flint.json +++ b/versions/f-/flint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aaa3d79bfb36d6c6280ab6aa2226e4edb8913d11", + "version-string": "2.5.2", + "port-version": 5 + }, { "git-tree": "a8b922c64296e22e3dcbd3d88e689c1ff4e8c046", "version-string": "2.5.2-4", diff --git a/versions/f-/fluidlite.json b/versions/f-/fluidlite.json index e223aa78db8a99..1598640a8bbbd9 100644 --- a/versions/f-/fluidlite.json +++ b/versions/f-/fluidlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b603d9cfa1d22dac6387ecff4bd32bc0ba8e5331", + "version-string": "2020-08-27", + "port-version": 1 + }, { "git-tree": "af618c785b8b72c9c9b4be2bee261fac2b86a604", "version-string": "2020-08-27", diff --git a/versions/f-/fmem.json b/versions/f-/fmem.json index 3a88bc60096139..7f4d3a6ae2e4bc 100644 --- a/versions/f-/fmem.json +++ b/versions/f-/fmem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eedcb4d269e8f834eaeaceb6fd3b3f477c46b8b4", + "version-string": "c-libs-2ccee3d2fb", + "port-version": 1 + }, { "git-tree": "bbb6f896858f86d8c7ec02b7e49236dba9ca6bc1", "version-string": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fmi4cpp.json b/versions/f-/fmi4cpp.json index ce6ab8640ae645..a6ebcdd4028f53 100644 --- a/versions/f-/fmi4cpp.json +++ b/versions/f-/fmi4cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "694ccc48c8fdade1beda9a7f87c923c8153a7735", + "version-string": "0.7.0", + "port-version": 3 + }, { "git-tree": "726b0dcda1a5a9040c6ee9088be9071a97380804", "version-string": "0.7.0-2", diff --git a/versions/f-/fmilib.json b/versions/f-/fmilib.json index 2f82459bb4665f..a2513cd660a11c 100644 --- a/versions/f-/fmilib.json +++ b/versions/f-/fmilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bf58761098e936528140d847911dab3613f5983", + "version-string": "2.0.3", + "port-version": 4 + }, { "git-tree": "13d2aaa0b4dedd6e8b1e7b47a91fd113f80dff87", "version-string": "2.0.3", diff --git a/versions/f-/font-chef.json b/versions/f-/font-chef.json index 02eb31ab1f6a13..0b81ddab76ff5f 100644 --- a/versions/f-/font-chef.json +++ b/versions/f-/font-chef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "907533e8f03e495fcddd47a6c0cd59cc73dfcc0b", + "version-string": "1.0.1", + "port-version": 1 + }, { "git-tree": "ce88b662a652a10ab2daa61073656a7e0659b91f", "version-string": "1.0.1", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 46a0f251a87182..23a85ac2e9ab17 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51b95a8e2dda5a9ffe083a8fc910ad9528597580", + "version-string": "2.13.1", + "port-version": 8 + }, { "git-tree": "e28c20718e723ea702e408f52f76343950b1a3f2", "version-string": "2.13.1", diff --git a/versions/f-/foonathan-memory.json b/versions/f-/foonathan-memory.json index 9e964cf7c85e1f..735e3eff8e2b7a 100644 --- a/versions/f-/foonathan-memory.json +++ b/versions/f-/foonathan-memory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e97aca605e065b0df1adaed316adc03d63b6334", + "version-string": "2019-07-21", + "port-version": 2 + }, { "git-tree": "fbb7ebb8d13d36b8ce0369dd801de6302f412512", "version-string": "2019-07-21-1", diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json index 4cf5987f1b4504..24bc7f74479cb0 100644 --- a/versions/f-/freeglut.json +++ b/versions/f-/freeglut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7907c76300594175b45a5fa05bacee2b91c9a65", + "version-string": "3.2.1", + "port-version": 6 + }, { "git-tree": "bfc1c37b44246e2a3c8bfead99af1d14a2103453", "version-string": "3.2.1", diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json index def7ee31402e31..ba162ca75391fd 100644 --- a/versions/f-/freeimage.json +++ b/versions/f-/freeimage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d223c6f4524784f9d87c7aa0815e5b99d2f66116", + "version-string": "3.18.0", + "port-version": 20 + }, { "git-tree": "100a12b0221593a3c5dae70231b7cd4145b73ca9", "version-string": "3.18.0", diff --git a/versions/f-/freeopcua.json b/versions/f-/freeopcua.json index abb625eef73222..35378c0eaeeb93 100644 --- a/versions/f-/freeopcua.json +++ b/versions/f-/freeopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffcfcd9ddd2551f8ca82752def0ff7a30b6bb2dc", + "version-string": "20190125", + "port-version": 4 + }, { "git-tree": "c111b437e30a05cded36f1994f24606c70c0c326", "version-string": "20190125-3", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index 1bdf8240cd28d9..8031162af13b5d 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e290ae7965dd6b7d333df5aa3a9a56df1bd8e24c", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "510adf88620e2f9d059d5fad33826148cd157957", "version-string": "2020-09-14", diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json index 7f6553ab7cb696..5a3f12f4a8cbdc 100644 --- a/versions/f-/fribidi.json +++ b/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88696509b4e846e3f04283bcf928db39800cc4eb", + "version-string": "1.0.10", + "port-version": 3 + }, { "git-tree": "197340b9f9db2c444b70c27b54cfbe0ce3601c0b", "version-string": "1.0.10", diff --git a/versions/f-/fruit.json b/versions/f-/fruit.json index 3a1ad775c68670..5c7fb90e9a3dd5 100644 --- a/versions/f-/fruit.json +++ b/versions/f-/fruit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "630ff582ea6cdbf31ba5eef0656e84018f901f1e", + "version-string": "3.6.0", + "port-version": 1 + }, { "git-tree": "e6dae7cd2c3f307a0cbc6d2a676ae582afea6cd8", "version-string": "3.6.0", diff --git a/versions/f-/ftgl.json b/versions/f-/ftgl.json index 132ff5f90a63e2..81c9e95987d4bd 100644 --- a/versions/f-/ftgl.json +++ b/versions/f-/ftgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01f15f385d7c8555935f011a8e32010212764279", + "version-string": "2.4.0", + "port-version": 3 + }, { "git-tree": "394f15ad9c241aec2909e3c28b2dc04a7b412e30", "version-string": "2.4.0-2", diff --git a/versions/f-/function2.json b/versions/f-/function2.json index edf1113f0bddf5..26943805c33ca9 100644 --- a/versions/f-/function2.json +++ b/versions/f-/function2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98e16b513e6457caf3edc8ac5dc1db7e62255797", + "version-string": "4.2.0", + "port-version": 1 + }, { "git-tree": "844aa89a1d4dabf3d084f060c7b8036b1ba69f06", "version-string": "4.2.0", diff --git a/versions/f-/fuzzylite.json b/versions/f-/fuzzylite.json index 55cb29b1bdfe20..735d20e80735ed 100644 --- a/versions/f-/fuzzylite.json +++ b/versions/f-/fuzzylite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df47396ca528792e73f67bb8f297a064b46ef21b", + "version-string": "6.0", + "port-version": 4 + }, { "git-tree": "374c4e29fa24184089d4622061f11481dae3ddf3", "version-string": "6.0", diff --git a/versions/g-/g2o.json b/versions/g-/g2o.json index 984acec6c68db0..34e9d0dfa836f5 100644 --- a/versions/g-/g2o.json +++ b/versions/g-/g2o.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fb8813de02bd243b25d9ed93065f9f9cba09e93", + "version-string": "2020-02-07", + "port-version": 2 + }, { "git-tree": "d0ac4605d18f07a2a3087a71be8c84f6ad0fbfa8", "version-string": "2020-02-07", diff --git a/versions/g-/gainput.json b/versions/g-/gainput.json index 8667f33e23d974..cbe403aa62a0f7 100644 --- a/versions/g-/gainput.json +++ b/versions/g-/gainput.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8751b5a093ee68d0273600efc1ecfcd23056aa47", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "db05d34018ddbbfb24d06d2f5afcd51f1def0820", "version-string": "1.0.0-3", diff --git a/versions/g-/gamma.json b/versions/g-/gamma.json index 238124214297e6..2c67cdc47146a9 100644 --- a/versions/g-/gamma.json +++ b/versions/g-/gamma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69d699310fe2e651e63668d194c19dfae5fd9376", + "version-string": "gamma-2018-01-27", + "port-version": 3 + }, { "git-tree": "5ce812228d6667a97bff96462c591eec32184cc9", "version-string": "gamma-2018-01-27", diff --git a/versions/g-/gasol.json b/versions/g-/gasol.json index ee0bf1e26c58d3..4318cd2e704666 100644 --- a/versions/g-/gasol.json +++ b/versions/g-/gasol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2425692b7bd94282d858e19c2a1360c274cb3e4c", + "version-string": "2018-01-04", + "port-version": 1 + }, { "git-tree": "e8163bf2d3dc55fc60058bccc216f37af6451796", "version-string": "2018-01-04", diff --git a/versions/g-/gaussianlib.json b/versions/g-/gaussianlib.json index 1bdf4e6492e0f7..231aa36b0dd7f1 100644 --- a/versions/g-/gaussianlib.json +++ b/versions/g-/gaussianlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cce82b2b2013b0ccc2b2f3e827cd5911f9a473d", + "version-string": "2019-08-04", + "port-version": 1 + }, { "git-tree": "521b395417590d5aa1cc0fa06cef081c5b14fc96", "version-string": "2019-08-04", diff --git a/versions/g-/gcem.json b/versions/g-/gcem.json index 2b4a627b0b8bd3..7753c48bdb961e 100644 --- a/versions/g-/gcem.json +++ b/versions/g-/gcem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5ffa19fc8b11179434020c69f6c998dd58268ee", + "version-string": "1.13.1", + "port-version": 1 + }, { "git-tree": "d65e2e2add7a84fdc29049058d9678c025783123", "version-string": "1.13.1", diff --git a/versions/g-/gdcm.json b/versions/g-/gdcm.json index e9ff1e45fd7359..038c05140b02ee 100644 --- a/versions/g-/gdcm.json +++ b/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c072a49eaff02bc7bf83c73a68be9d0f63533352", + "version-string": "3.0.7", + "port-version": 2 + }, { "git-tree": "151374d525077e7d8229b4ad2bf8f1630f36fbb5", "version-string": "3.0.7", diff --git a/versions/g-/gdcm2.json b/versions/g-/gdcm2.json index e337bc910da863..682ae81356887a 100644 --- a/versions/g-/gdcm2.json +++ b/versions/g-/gdcm2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47f14257c43fffb30109bab99c9ae594007f3617", + "version-string": "deprecated", + "port-version": 1 + }, { "git-tree": "dfe78f1df5d0fc56c69eeea5096e093cbd6499e5", "version-string": "deprecated", diff --git a/versions/g-/genann.json b/versions/g-/genann.json index dcb7ff340b74fe..84c36d720cc160 100644 --- a/versions/g-/genann.json +++ b/versions/g-/genann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74f4d685e744a09163c7bfcf502e3facc2d9bf95", + "version-string": "2019-07-10", + "port-version": 1 + }, { "git-tree": "bf7df34f8a169dd885b019d42aa0dd2db3d97178", "version-string": "2019-07-10", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index 20f81d74dd4ac2..9d665d3a16021d 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49ffd07c56bc8a0017e243bd36dfcbbb63230409", + "version-string": "1.7.5", + "port-version": 4 + }, { "git-tree": "178ba7fc99040231738fd282389038df5b032173", "version-string": "1.7.5", diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index 34370a5a7ff744..66e1f854141122 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b01f8f51c6a395b7a7d44f772bec78a0445e51d6", + "version-string": "1.6.0", + "port-version": 1 + }, { "git-tree": "2ad34d7694f942b2967d6c88acfde707c27f9bb5", "version-string": "1.6.0", diff --git a/versions/g-/getopt.json b/versions/g-/getopt.json index 5a0f80878f4bae..24d9652d4446a5 100644 --- a/versions/g-/getopt.json +++ b/versions/g-/getopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81815a8f433219e332659e07204f90df381a28a7", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "41acbc45d9d32b8e0dfdb758169e2184e18a8c04", "version-string": "0", diff --git a/versions/g-/gettimeofday.json b/versions/g-/gettimeofday.json index 46a5ef6f97c5de..3dc3c259ef98ae 100644 --- a/versions/g-/gettimeofday.json +++ b/versions/g-/gettimeofday.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c39979379abaf1ecee42cbae6e83d68cfb201f13", + "version-string": "2017-10-14", + "port-version": 4 + }, { "git-tree": "893c7107fc161346544c8b75340cb64e6b850798", "version-string": "2017-10-14-3", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index aa9065db094e7d..820a61a3b225b9 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e229646111622b3b08d98d42741e8c861487d18e", + "version-string": "2.2.2", + "port-version": 3 + }, { "git-tree": "1e2bb870b1e3592591d62f396378e25b2678d80c", "version-string": "2.2.2", diff --git a/versions/g-/gherkin-c.json b/versions/g-/gherkin-c.json index 61857344076a2a..a274ee39da2469 100644 --- a/versions/g-/gherkin-c.json +++ b/versions/g-/gherkin-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e59a73d00ecbf68ae14b61beec141128d8f94612", + "version-string": "2019-10-07", + "port-version": 2 + }, { "git-tree": "c411eed077ea98e771d2eda4f985dd4702b33ce2", "version-string": "2019-10-07-1", diff --git a/versions/g-/gl2ps.json b/versions/g-/gl2ps.json index 70a378c8bdc0d5..87cc00eaf6f538 100644 --- a/versions/g-/gl2ps.json +++ b/versions/g-/gl2ps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25f89a8ea4ae01f360444c1583dc6549d3857966", + "version-string": "1.4.2", + "port-version": 1 + }, { "git-tree": "4a2e08a33d47d51f58b41cd5659e632604ad560a", "version-string": "1.4.2", diff --git a/versions/g-/glog.json b/versions/g-/glog.json index 7cb107996df647..8a105b070e2cda 100644 --- a/versions/g-/glog.json +++ b/versions/g-/glog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27503732c21f2d6652d12d62b1e9c180c1d33c47", + "version-string": "0.4.0", + "port-version": 4 + }, { "git-tree": "ec7f01875b20c7145088d5ec7a1927a5faea5ca6", "version-string": "0.4.0-3", diff --git a/versions/g-/glui.json b/versions/g-/glui.json index aa39db51a51129..00a7d98d6a4fbd 100644 --- a/versions/g-/glui.json +++ b/versions/g-/glui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "435b850a183a1fe599f56df300530e81c107cdfa", + "version-string": "2019-11-30", + "port-version": 1 + }, { "git-tree": "83686597c999bba02534d78083a8c3ca4af831e0", "version-string": "2019-11-30", diff --git a/versions/g-/gmmlib.json b/versions/g-/gmmlib.json index 59bb4844e6db71..64ad7d7f5430c1 100644 --- a/versions/g-/gmmlib.json +++ b/versions/g-/gmmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d1a120fb9b513b005575b6324b9eaa13d900192", + "version-string": "20.3.1", + "port-version": 1 + }, { "git-tree": "7fc340ea71bdc0798d55f0e3df2069ae215a6acb", "version-string": "20.3.1", diff --git a/versions/g-/google-cloud-cpp-common.json b/versions/g-/google-cloud-cpp-common.json index 8c0565ec9ed328..82f077109e76e5 100644 --- a/versions/g-/google-cloud-cpp-common.json +++ b/versions/g-/google-cloud-cpp-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a208fcc136917aefe4e696aed7ce013d8ba9aa4", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "6e60e7b9b08e821b11e3e1512bbd1b3caffbc21b", "version-string": "alias", diff --git a/versions/g-/google-cloud-cpp-spanner.json b/versions/g-/google-cloud-cpp-spanner.json index 08b34ecc629a62..8b8c74fe4ed439 100644 --- a/versions/g-/google-cloud-cpp-spanner.json +++ b/versions/g-/google-cloud-cpp-spanner.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a6752681c05802deba72f718805a5b7ca9c4d3e", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "1dd73203e70438024236fa43f7454d160a16a8ce", "version-string": "alias", diff --git a/versions/g-/googleapis.json b/versions/g-/googleapis.json index 0fbc81e9eef248..31dd46db5a1988 100644 --- a/versions/g-/googleapis.json +++ b/versions/g-/googleapis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d1994c5a5daa97ce12d638f9be750ce2b63b5ef", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "732e1808e521305fa8f5210395976b9ed06f6ee1", "version-string": "alias", diff --git a/versions/g-/gperf.json b/versions/g-/gperf.json index ee9894dfd41ffc..173f43225a742e 100644 --- a/versions/g-/gperf.json +++ b/versions/g-/gperf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8854df263b141671e3463bb19ca258cf0c641d2", + "version-string": "3.1", + "port-version": 2 + }, { "git-tree": "a88953c10ae0ac1312b9bf79bf0bc4feaaf124fc", "version-string": "3.1-1", diff --git a/versions/g-/gperftools.json b/versions/g-/gperftools.json index a32f9eb6ac692c..1c0987e38ae4ad 100644 --- a/versions/g-/gperftools.json +++ b/versions/g-/gperftools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9062481bd1f6c7f7cac6bfabe0252f862730efc", + "version-string": "2019-09-02", + "port-version": 1 + }, { "git-tree": "ca64f86fb8b7ffd55e935d885d08f50d6271a755", "version-string": "2019-09-02", diff --git a/versions/g-/gpgme.json b/versions/g-/gpgme.json index 2c980c56c05008..1aa878cfc50528 100644 --- a/versions/g-/gpgme.json +++ b/versions/g-/gpgme.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e31d219a153f314d3c6ceedb7765ae30a2113daa", + "version-string": "1.14.0", + "port-version": 1 + }, { "git-tree": "e8114364d2581d57cd19f81da7e7581b3f803a5f", "version-string": "1.14.0", diff --git a/versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json index b7774529a3beb7..a370d7b85fa61d 100644 --- a/versions/g-/graphicsmagick.json +++ b/versions/g-/graphicsmagick.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6c8562f7ec58b04278fb8985f9c7bbd5143158e", + "version-string": "1.3.36", + "port-version": 1 + }, { "git-tree": "583006cf5cb77ea009d82d0b3226c3d2c4011ae4", "version-string": "1.3.36", diff --git a/versions/g-/graphite2.json b/versions/g-/graphite2.json index cbf5ced0b8334d..3d577c07c594da 100644 --- a/versions/g-/graphite2.json +++ b/versions/g-/graphite2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "544016171b9bf0c28449d96cfa9ccebdb3c1aecb", + "version-string": "1.3.14", + "port-version": 1 + }, { "git-tree": "e5e37f083538f0e7390369a399e8ce2a32810b00", "version-string": "1.3.14", diff --git a/versions/g-/greatest.json b/versions/g-/greatest.json index 394ef531104b0a..4c012f0fc9ad65 100644 --- a/versions/g-/greatest.json +++ b/versions/g-/greatest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a09c8e785b2d722b16c6e38ba4c8a3a4b46c20f", + "version-string": "1.4.2", + "port-version": 1 + }, { "git-tree": "046876099d8e773082ce18b0c85fab4174a4c89e", "version-string": "1.4.2", diff --git a/versions/g-/grppi.json b/versions/g-/grppi.json index 160e73345b418f..4b198a1769376e 100644 --- a/versions/g-/grppi.json +++ b/versions/g-/grppi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4149700fba5f680c7efae07383dc7d6cf6cfcef9", + "version-string": "0.4.0", + "port-version": 1 + }, { "git-tree": "379e8c8ba1f8f97532ae5c1c68f542e32b7e0a15", "version-string": "0.4.0", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index 27a15cd0836e4a..b8a0c154077f80 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4754262f449ca9f2d46d597c6b1da89504b7ac08", + "version-string": "2.6", + "port-version": 2 + }, { "git-tree": "da6e274c9febfeb37b716f136cbf43225c55d997", "version-string": "2.6", diff --git a/versions/g-/guetzli.json b/versions/g-/guetzli.json index ee70d13c38f206..dd15734c63ce17 100644 --- a/versions/g-/guetzli.json +++ b/versions/g-/guetzli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2adfb6dcd5eab92b258f45aaf4a494bed18eb687", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "6a8b09c3639cf50beb79315f87382cbbcf377e66", "version-string": "2020-09-14", diff --git a/versions/g-/gumbo.json b/versions/g-/gumbo.json index 71f81fd602ccd2..8c64b930010854 100644 --- a/versions/g-/gumbo.json +++ b/versions/g-/gumbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c80a646e227f1181f474077dbf80f356555f452", + "version-string": "0.10.1", + "port-version": 4 + }, { "git-tree": "997baf0b8c0cd0d7db6e3e991596c8f88d23d804", "version-string": "0.10.1-3", diff --git a/versions/g-/gzip-hpp.json b/versions/g-/gzip-hpp.json index c7ebae6673730d..c9f7c1d17a232e 100644 --- a/versions/g-/gzip-hpp.json +++ b/versions/g-/gzip-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa20c97f9bdf61c0adf326307bfeda1b24babfb1", + "version-string": "0.1.0", + "port-version": 1 + }, { "git-tree": "4d9fe13f9fc7b82f2adf374e3d8ff70a2759cccb", "version-string": "0.1.0", diff --git a/versions/h-/h5py-lzf.json b/versions/h-/h5py-lzf.json index 58140dbcf7440d..1339053f389e86 100644 --- a/versions/h-/h5py-lzf.json +++ b/versions/h-/h5py-lzf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9852b593ea75baeff7131615d49a46d32af54dfb", + "version-string": "2019-12-04", + "port-version": 1 + }, { "git-tree": "478e2b35b0c4964627b73d28f54798cd48f15872", "version-string": "2019-12-04", diff --git a/versions/h-/hayai.json b/versions/h-/hayai.json index 5c56dd44a7d67a..a5fa0b26bb053c 100644 --- a/versions/h-/hayai.json +++ b/versions/h-/hayai.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd5029e80c71cecda898075929dd64666be78885", + "version-string": "2019-08-10", + "port-version": 1 + }, { "git-tree": "0998208b524c86d2820be639403afb5f5763d62c", "version-string": "2019-08-10", diff --git a/versions/h-/healpix.json b/versions/h-/healpix.json index 37a3a76ddc26a6..a85f5293c2107b 100644 --- a/versions/h-/healpix.json +++ b/versions/h-/healpix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38bd9d397f3ba4e227f09a36ecb0af034f5f0c98", + "version-string": "1.12.10", + "port-version": 8 + }, { "git-tree": "8b4976feec333064ba50d96cfa8458afeb01783c", "version-string": "1.12.10", diff --git a/versions/h-/hffix.json b/versions/h-/hffix.json index 222e9e500f990b..0f10d1695d33b9 100644 --- a/versions/h-/hffix.json +++ b/versions/h-/hffix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75af034fee768fa49b06ad4b37a65374782e1033", + "version-string": "1.0.0", + "port-version": 1 + }, { "git-tree": "6e523c6f54e9afbd5a3626927a222ee4cfe7bdef", "version-string": "1.0.0", diff --git a/versions/h-/hfsm2.json b/versions/h-/hfsm2.json index b40fd24bb2c506..34bd8835420fab 100644 --- a/versions/h-/hfsm2.json +++ b/versions/h-/hfsm2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "278f7b5b00418376ce4e8777cd5fddb927ec3686", + "version-string": "beta7", + "port-version": 1 + }, { "git-tree": "911d9cf3b289887ec59c5ea175126c084c4c6254", "version-string": "beta7", diff --git a/versions/h-/http-parser.json b/versions/h-/http-parser.json index db21d8d0d04e3a..8ed21169510d93 100644 --- a/versions/h-/http-parser.json +++ b/versions/h-/http-parser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55d462cc4fb637891cc2d1dda24a9bd97c7d38f5", + "version-string": "2.9.4", + "port-version": 1 + }, { "git-tree": "ad1f223d4c2eaa1a904f08153ec3b09854c0e393", "version-string": "2.9.4", diff --git a/versions/h-/hungarian.json b/versions/h-/hungarian.json index 1600621647e4d3..116c8e8594bfa3 100644 --- a/versions/h-/hungarian.json +++ b/versions/h-/hungarian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4440d428d76082b3b8af21c5eda247a33794b4ef", + "version-string": "v0.1.3", + "port-version": 1 + }, { "git-tree": "66d26b2162c1337d91ce5047c412788a220bacee", "version-string": "v0.1.3", diff --git a/versions/h-/hwloc.json b/versions/h-/hwloc.json index 1b6c36b2792f6e..985c25776df017 100644 --- a/versions/h-/hwloc.json +++ b/versions/h-/hwloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "564b5a894249dd831dbb8ad8792fe30d12ac353a", + "version-string": "2.2.0", + "port-version": 1 + }, { "git-tree": "fdafa8b57a94773fa46c24d7a3bcdb3d75867825", "version-string": "2.2.0", diff --git a/versions/h-/hyperscan.json b/versions/h-/hyperscan.json index e0cd57f91a3abf..f8b74cab063a56 100644 --- a/versions/h-/hyperscan.json +++ b/versions/h-/hyperscan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "442b4a5b4350665bc7d9fb3b0f734f1fa088973a", + "version-string": "5.3.0", + "port-version": 2 + }, { "git-tree": "1a0f3d2c664a03ed56917c7eb127fa907e4c3386", "version-string": "5.3.0", diff --git a/versions/h-/hypre.json b/versions/h-/hypre.json index 82002f2984b45d..f304c44b254bb5 100644 --- a/versions/h-/hypre.json +++ b/versions/h-/hypre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35d58add9c09f800e2895bacf563de15f031f7be", + "version-string": "2.19.0", + "port-version": 1 + }, { "git-tree": "1643e99e1d689845a05bd360bed378965ce9c0cc", "version-string": "2.19.0", diff --git a/versions/i-/ideviceinstaller.json b/versions/i-/ideviceinstaller.json index 29d34c4afbb721..4ca28ad9092b04 100644 --- a/versions/i-/ideviceinstaller.json +++ b/versions/i-/ideviceinstaller.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f0f8f093c1597406cdf0695b26403a2ec969baa", + "version-string": "1.1.2.23", + "port-version": 2 + }, { "git-tree": "22efe10c7de92708548907150b4dd448de67150a", "version-string": "1.1.2.23-1", diff --git a/versions/i-/idevicerestore.json b/versions/i-/idevicerestore.json index 51bb0a547525b8..6eb9e529366341 100644 --- a/versions/i-/idevicerestore.json +++ b/versions/i-/idevicerestore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ba1b8951ed8c7f3ac7ba2b786c58e44ad322a86", + "version-string": "1.0.12", + "port-version": 5 + }, { "git-tree": "ca67e457702ccad00ebe9a49eb75221b86db6d96", "version-string": "1.0.12-4", diff --git a/versions/i-/if97.json b/versions/i-/if97.json index 84772ee6c316f3..77bf8ee1f27d1c 100644 --- a/versions/i-/if97.json +++ b/versions/i-/if97.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "417735fbf8343a340507ae62b2775cb95269769b", + "version-string": "2.1.2", + "port-version": 1 + }, { "git-tree": "eb85fac9729456ec259c779df99d16aa32dbe2ce", "version-string": "2.1.2", diff --git a/versions/i-/igloo.json b/versions/i-/igloo.json index 79c1d789f951db..928dbfd5ea1903 100644 --- a/versions/i-/igloo.json +++ b/versions/i-/igloo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ff1a6861322e6b0084c5f74a014a386a5e1040b", + "version-string": "1.1.1", + "port-version": 1 + }, { "git-tree": "5bbaba2a845fb358c0e65fb4f9bbb9d4b338f901", "version-string": "1.1.1", diff --git a/versions/i-/ignition-cmake0.json b/versions/i-/ignition-cmake0.json index 720e6e019f39b3..b2bb0cf30ca5d7 100644 --- a/versions/i-/ignition-cmake0.json +++ b/versions/i-/ignition-cmake0.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de484d582fc076a89f57fde7db6944eb57c006df", + "version-string": "0.6.2", + "port-version": 3 + }, { "git-tree": "2214c0356313bf4b9ac99a8554050e623ec9cb9a", "version-string": "0.6.2-2", diff --git a/versions/i-/ignition-common1.json b/versions/i-/ignition-common1.json index 5d898b2cdeb848..6dafbea52176df 100644 --- a/versions/i-/ignition-common1.json +++ b/versions/i-/ignition-common1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e4a5f2f998f4730002bd95e92251b77e757d6b2", + "version-string": "1.1.1", + "port-version": 2 + }, { "git-tree": "a79aa681c879a9e76a80df3ca14d228224bcd22c", "version-string": "1.1.1-1", diff --git a/versions/i-/ignition-common3.json b/versions/i-/ignition-common3.json index 3f5138ecc7231f..f0c55442621f17 100644 --- a/versions/i-/ignition-common3.json +++ b/versions/i-/ignition-common3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f576cb30e5369daf724e9465dd29ef496f327283", + "version-string": "3.9.0", + "port-version": 1 + }, { "git-tree": "87a639da8095ce4a421733485fa1104959ccfe02", "version-string": "3.9.0", diff --git a/versions/i-/ignition-fuel-tools1.json b/versions/i-/ignition-fuel-tools1.json index 62d4a57dbfd28e..539d737ff33852 100644 --- a/versions/i-/ignition-fuel-tools1.json +++ b/versions/i-/ignition-fuel-tools1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c9a312b5c09cc860b8cbc810d68ba5a17bd7afb", + "version-string": "1.2.0", + "port-version": 3 + }, { "git-tree": "d32162d2fdffea4d19a358e13e270a709940aa58", "version-string": "1.2.0-2", diff --git a/versions/i-/ignition-fuel-tools4.json b/versions/i-/ignition-fuel-tools4.json index 6d8911aa6d47b2..ecb8fd1c3ba043 100644 --- a/versions/i-/ignition-fuel-tools4.json +++ b/versions/i-/ignition-fuel-tools4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6f7783701420adbe90b861a5a96130bd87f114e", + "version-string": "4.3.0", + "port-version": 1 + }, { "git-tree": "f151bec5a2340e8531307d7b205f8d78f56a7513", "version-string": "4.3.0", diff --git a/versions/i-/ignition-math4.json b/versions/i-/ignition-math4.json index d83aaef76ca80a..0448bf757fe687 100644 --- a/versions/i-/ignition-math4.json +++ b/versions/i-/ignition-math4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0312d0e2b91d2e465a1464c83a17dfb5fbe57e4a", + "version-string": "4.0.0", + "port-version": 2 + }, { "git-tree": "c2cf4af319039b3f94554d71eafe3ba4554de06b", "version-string": "4.0.0-1", diff --git a/versions/i-/ignition-math6.json b/versions/i-/ignition-math6.json index 2553272a38eaf0..f536515f87b524 100644 --- a/versions/i-/ignition-math6.json +++ b/versions/i-/ignition-math6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20a34c6dd45c4cb0a5638ded5eb9b2dd8113a0ba", + "version-string": "6.6.0", + "port-version": 1 + }, { "git-tree": "d2f578e91ac205b450f5046e871c49fcdd5a4471", "version-string": "6.6.0", diff --git a/versions/i-/ignition-modularscripts.json b/versions/i-/ignition-modularscripts.json index fa7be1e105acef..2ee4650be26509 100644 --- a/versions/i-/ignition-modularscripts.json +++ b/versions/i-/ignition-modularscripts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b00233924c15f702784cb2342b469771125c3a5", + "version-string": "2020-11-23", + "port-version": 1 + }, { "git-tree": "29ded62ecf82daf0e42756ed617c38aa98fb215a", "version-string": "2020-11-23", diff --git a/versions/i-/ignition-msgs1.json b/versions/i-/ignition-msgs1.json index 4a7ec88692d985..d0a2b784451a65 100644 --- a/versions/i-/ignition-msgs1.json +++ b/versions/i-/ignition-msgs1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7155088669524bfd132aaab6af9f7257e8bfde54", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "6deeb37a3e78a86b0997ffe605e149b79c4ad224", "version-string": "1.0.0", diff --git a/versions/i-/ignition-msgs5.json b/versions/i-/ignition-msgs5.json index bb6e6344796d31..4665750430b636 100644 --- a/versions/i-/ignition-msgs5.json +++ b/versions/i-/ignition-msgs5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a9266bfbd56f0c547a7c02e8a416315ae226bf3", + "version-string": "5.3.0", + "port-version": 3 + }, { "git-tree": "e8619eab2a3fa0fa87af043ae46d7afb7629acc6", "version-string": "5.3.0", diff --git a/versions/i-/ignition-msgs6.json b/versions/i-/ignition-msgs6.json index 8c18547769b0b7..2c500d46f6eee7 100644 --- a/versions/i-/ignition-msgs6.json +++ b/versions/i-/ignition-msgs6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60d1f5a0cdcb7c9fcf7c5dc92f29d1d56a83fc67", + "version-string": "6.0.0", + "port-version": 2 + }, { "git-tree": "37ea9fd8ab03a9a1d836513a22fb81cb56b69c03", "version-string": "6.0.0", diff --git a/versions/i-/ignition-plugin1.json b/versions/i-/ignition-plugin1.json index e7130589635a83..5a8a0a6c15d00a 100644 --- a/versions/i-/ignition-plugin1.json +++ b/versions/i-/ignition-plugin1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71166ea18bf5f4d4de750b96836b780cd7395c0e", + "version-string": "1.1.0", + "port-version": 1 + }, { "git-tree": "2c0c2d15d4f71838cd518e9c9d09db5a34f93782", "version-string": "1.1.0", diff --git a/versions/i-/ignition-transport4.json b/versions/i-/ignition-transport4.json index 77218a0e9ba86a..0492b7b390d23a 100644 --- a/versions/i-/ignition-transport4.json +++ b/versions/i-/ignition-transport4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1df4d0fec30b796611ef0840f4b74a7008d6c1fb", + "version-string": "4.0.0", + "port-version": 3 + }, { "git-tree": "69f5299f9f0cc2c7206d086ee3424df68a90aaf2", "version-string": "4.0.0-2", diff --git a/versions/i-/ignition-transport8.json b/versions/i-/ignition-transport8.json index f8491eb7d6e9c7..5f68e579d69dba 100644 --- a/versions/i-/ignition-transport8.json +++ b/versions/i-/ignition-transport8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0841028ca6e8959f60f38c082d998b84dc273910", + "version-string": "8.1.0", + "port-version": 1 + }, { "git-tree": "049dc0f48ee619d631034d14674e94bac4317be1", "version-string": "8.1.0", diff --git a/versions/i-/ignition-transport9.json b/versions/i-/ignition-transport9.json index 736c43ffb1426e..ced65c2b3541b4 100644 --- a/versions/i-/ignition-transport9.json +++ b/versions/i-/ignition-transport9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "263d88cb08544cb6fc3ff459c24a12832c0fdcb0", + "version-string": "9.0.0", + "port-version": 1 + }, { "git-tree": "282fbad5eec25e8d6f6a7224101ad61556d89039", "version-string": "9.0.0", diff --git a/versions/i-/ilmbase.json b/versions/i-/ilmbase.json index 6a3d4163eb33e8..8c7c55b5616e1b 100644 --- a/versions/i-/ilmbase.json +++ b/versions/i-/ilmbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d1a248f37b30f491ebf4430ee294e1e9018ec44", + "version-string": "2.3.0", + "port-version": 1 + }, { "git-tree": "993cdd111c509def2dad3cb7ce7462414b671cbb", "version-string": "2.3.0", diff --git a/versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json index 8b186cb33f9248..e32995e675ad97 100644 --- a/versions/i-/imgui-sfml.json +++ b/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57e3ab9f08cd10a7d66717044636c02349ee2ea3", + "version-string": "2.1", + "port-version": 3 + }, { "git-tree": "3975d5a33116814ea022e63fc270fa440af46c66", "version-string": "2.1-2", diff --git a/versions/i-/inih.json b/versions/i-/inih.json index 8e72572d991600..ef0781ca21a585 100644 --- a/versions/i-/inih.json +++ b/versions/i-/inih.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de1d85a0ea62e95bd096ecff062115646742cf1e", + "version-string": "51", + "port-version": 1 + }, { "git-tree": "ca47d6341b0674f1473717bc8f6df7ce0922e8da", "version-string": "51", diff --git a/versions/i-/iniparser.json b/versions/i-/iniparser.json index 91e982caded816..3bd03f7bb2256f 100644 --- a/versions/i-/iniparser.json +++ b/versions/i-/iniparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "203982e2f00de4e77024c34486cae13d34c15779", + "version-string": "2020-04-06", + "port-version": 1 + }, { "git-tree": "81d9ca94f32e83d70012e4627f27f54d123a0a0b", "version-string": "2020-04-06", diff --git a/versions/i-/intel-ipsec.json b/versions/i-/intel-ipsec.json index 0215cd171e518c..81e930bb57a082 100644 --- a/versions/i-/intel-ipsec.json +++ b/versions/i-/intel-ipsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39c4caebc1d5e618dcc455c9b7accb7fb2693f39", + "version-string": "0.52", + "port-version": 2 + }, { "git-tree": "e6218e69e9ba8c71aecd1c41184edd4e0342120b", "version-string": "0.52-1", diff --git a/versions/i-/intelrdfpmathlib.json b/versions/i-/intelrdfpmathlib.json index 22c4ba7dd70c07..f1dd031cf43fe0 100644 --- a/versions/i-/intelrdfpmathlib.json +++ b/versions/i-/intelrdfpmathlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "089f42e2cae01699241dca4ebe6bbae95300d0f7", + "version-string": "20U2", + "port-version": 2 + }, { "git-tree": "5e8cca9f7fc31ea5bce8603c546c4b5953e666e3", "version-string": "20U2-1", diff --git a/versions/i-/irrlicht.json b/versions/i-/irrlicht.json index 6d884cfe326ed8..c3173156908aba 100644 --- a/versions/i-/irrlicht.json +++ b/versions/i-/irrlicht.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd24be00084e5387a0ae764c42621977340ec74b", + "version-string": "1.8.4", + "port-version": 12 + }, { "git-tree": "18ae08d6099b5457ccedbdb7209c79321a9e9027", "version-string": "1.8.4", diff --git a/versions/i-/isal.json b/versions/i-/isal.json index 9423eac297e14c..bb1ef772d5813c 100644 --- a/versions/i-/isal.json +++ b/versions/i-/isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35b65a5fbb2ff6cd6468e1c02565a4b999d2a442", + "version-string": "2.25.0", + "port-version": 1 + }, { "git-tree": "f9c47ffd781134319b28b1d671347fac65d5e1dc", "version-string": "2.25.0", diff --git a/versions/i-/ismrmrd.json b/versions/i-/ismrmrd.json index 9f6f0980f9ba43..013fd0902fb5bb 100644 --- a/versions/i-/ismrmrd.json +++ b/versions/i-/ismrmrd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ede8c3ffaae84ba2f4f68f495a23adedb60bd00", + "version-string": "1.5.0", + "port-version": 1 + }, { "git-tree": "b538acb7e61aa1697c9ccb7d415287807d5aa37c", "version-string": "1.5.0", diff --git a/versions/j-/jansson.json b/versions/j-/jansson.json index e35a31c1227a43..f01eec560765ae 100644 --- a/versions/j-/jansson.json +++ b/versions/j-/jansson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e03158776f244589d6af861b4ceefabd4cd9fd12", + "version-string": "2.13.1", + "port-version": 1 + }, { "git-tree": "73e4996b95f57b891a1c4a85cd579297a55ac148", "version-string": "2.13.1", diff --git a/versions/j-/jbig2dec.json b/versions/j-/jbig2dec.json index 95ec9bf7adb4c7..7fbff5da5fc449 100644 --- a/versions/j-/jbig2dec.json +++ b/versions/j-/jbig2dec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e60aa2c30fefe1269d1d8a6fede748cfa5736aed", + "version-string": "0.19", + "port-version": 1 + }, { "git-tree": "055013875225acf1e33c26a6c127f5d89ccb0583", "version-string": "0.19", diff --git a/versions/j-/jbigkit.json b/versions/j-/jbigkit.json index 0df8d2e26889d5..242ea13a09aeeb 100644 --- a/versions/j-/jbigkit.json +++ b/versions/j-/jbigkit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa2f967c15904877cd541d3c9d59f0c2f20f3fb4", + "version-string": "2.1", + "port-version": 5 + }, { "git-tree": "540956fe79520b0ffd46dea73e33d1dfe12da22a", "version-string": "2.1-4", diff --git a/versions/j-/jemalloc.json b/versions/j-/jemalloc.json index 8379bf58d7dd0f..a27e65c4c646a3 100644 --- a/versions/j-/jemalloc.json +++ b/versions/j-/jemalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ced62e7a268f8442b2e808df7b094afe8998c38", + "version-string": "4.3.1", + "port-version": 5 + }, { "git-tree": "4c72c8aa2b715c813c70850c504385afa6566fb1", "version-string": "4.3.1-4", diff --git a/versions/j-/jinja2cpplight.json b/versions/j-/jinja2cpplight.json index cbbb2f3fb24ca9..8adffeb623be78 100644 --- a/versions/j-/jinja2cpplight.json +++ b/versions/j-/jinja2cpplight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14ce844353cb5d4b2dbca4d36daf84c248208de2", + "version-string": "2018-05-08", + "port-version": 1 + }, { "git-tree": "4db482fab578e61193f3a03e4acc4086b23ae550", "version-string": "2018-05-08", diff --git a/versions/j-/josuttis-jthread.json b/versions/j-/josuttis-jthread.json index 565cfdf526c618..34c83ced96a1b8 100644 --- a/versions/j-/josuttis-jthread.json +++ b/versions/j-/josuttis-jthread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f37dd21a591e8f7ae566f16a085a10dbfe1ccbc", + "version-string": "2020-07-21", + "port-version": 2 + }, { "git-tree": "f262637ae76fc0ab9c01f475af0b7a87e552a512", "version-string": "2020-07-21", diff --git a/versions/j-/jsmn.json b/versions/j-/jsmn.json index 1e62f26d8f1d1b..9f3ba75beae905 100644 --- a/versions/j-/jsmn.json +++ b/versions/j-/jsmn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b05c2b522963eeacbcfcad169cf5ffc802bc7a42", + "version-string": "2019-04-27", + "port-version": 1 + }, { "git-tree": "3de21d0cde92d319d3f0638abed14af414a57cfe", "version-string": "2019-04-27", diff --git a/versions/j-/json-c.json b/versions/j-/json-c.json index 1d09e5ff62da5c..34a233e6d34b30 100644 --- a/versions/j-/json-c.json +++ b/versions/j-/json-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c8d00d59a40b54cc9400f045b62e439740c2909", + "version-string": "2019-09-10", + "port-version": 2 + }, { "git-tree": "46d6f0302fe2ee6649ade0a8ef9a17a88226bc73", "version-string": "2019-09-10", diff --git a/versions/j-/json-schema-validator.json b/versions/j-/json-schema-validator.json index 1b6520be1eefbb..fa7552a061a5f4 100644 --- a/versions/j-/json-schema-validator.json +++ b/versions/j-/json-schema-validator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "361dde90ee9e81d84ad0e87d75f16e4f9f662b88", + "version-string": "2.1.0", + "port-version": 1 + }, { "git-tree": "c29f43fd54762287049c24e4e38cd89a26a1a26a", "version-string": "2.1.0", diff --git a/versions/j-/json-spirit.json b/versions/j-/json-spirit.json index 0460b9a9380342..8fb1586f21a1d2 100644 --- a/versions/j-/json-spirit.json +++ b/versions/j-/json-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d219034cdee1f6237e4863a001aece539df2ce8c", + "version-string": "4.1.0", + "port-version": 2 + }, { "git-tree": "ab05cd4ea6726e65c8a2ab5a4c882d9e4f166418", "version-string": "4.1.0-1", diff --git a/versions/j-/json11.json b/versions/j-/json11.json index 4fc5c0bcbe2657..e745d3e6d4416e 100644 --- a/versions/j-/json11.json +++ b/versions/j-/json11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1c9cec8f84522bd1bb53aae81708000ef8952de", + "version-string": "2017-06-20", + "port-version": 3 + }, { "git-tree": "0acd544fac745b898132e7beda2ede37b0a7d9d4", "version-string": "2017-06-20-2", diff --git a/versions/j-/json5-parser.json b/versions/j-/json5-parser.json index 4beced40c2a5a1..4a67281942f827 100644 --- a/versions/j-/json5-parser.json +++ b/versions/j-/json5-parser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e874e19b4f9b56647b5be1537ed0792041e96c25", + "version-string": "1.0.0", + "port-version": 3 + }, { "git-tree": "a08cd167ddae3c10119b6b513accf0a2fa9d76fa", "version-string": "1.0.0", diff --git a/versions/j-/jsoncons.json b/versions/j-/jsoncons.json index b77f7525e766d7..b95f7df74f906b 100644 --- a/versions/j-/jsoncons.json +++ b/versions/j-/jsoncons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ace7d792691e3fadf81394f348f0dce587aa5293", + "version-string": "0.165.0", + "port-version": 1 + }, { "git-tree": "fd6b74f34a309e8750a04b5da6a3bf5800503434", "version-string": "0.165.0", diff --git a/versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json index bc8b583c8fb570..b96484d4635aa2 100644 --- a/versions/j-/jsoncpp.json +++ b/versions/j-/jsoncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "444e56d175225f268ea77433982e81ef131a6d1d", + "version-string": "1.9.4", + "port-version": 1 + }, { "git-tree": "cb9fceddf47584c7fda24180c7fd87f5e83728a5", "version-string": "1.9.4", diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index 29ee5da444a708..58d630609c0a20 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6d19c002863644237c3ac276db26c576664f56d", + "version-string": "0.16.0", + "port-version": 3 + }, { "git-tree": "53efaebae6e8131ee43960d0d58a5f110298a9c1", "version-string": "0.16.0", diff --git a/versions/k-/kangaru.json b/versions/k-/kangaru.json index 053137de6757ac..e0cf6d2f76cdb7 100644 --- a/versions/k-/kangaru.json +++ b/versions/k-/kangaru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e47bf7620670afbcbb349017d71275289fa9b6a9", + "version-string": "4.2.4", + "port-version": 1 + }, { "git-tree": "0e379bfb3b7cff7b0702b1118f491397482e2544", "version-string": "4.2.4", diff --git a/versions/k-/kcp.json b/versions/k-/kcp.json index 61445dee42a7a0..a8b4710910ce06 100644 --- a/versions/k-/kcp.json +++ b/versions/k-/kcp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f3475cb5c05e93e3309e51cb104653bab486eb4", + "version-string": "2019-09-20", + "port-version": 1 + }, { "git-tree": "1755ecb14823ef655bd41fa576baebe8ba531d7f", "version-string": "2019-09-20", diff --git a/versions/k-/kd-soap.json b/versions/k-/kd-soap.json index c1777ebaf1b0c9..f621fc50c27277 100644 --- a/versions/k-/kd-soap.json +++ b/versions/k-/kd-soap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64e16ff8d17d3cadb5a951b5b20e15f99b6d82b1", + "version-string": "1.9.0", + "port-version": 1 + }, { "git-tree": "c5e3acfc0e624bb672da3ff5681dd2612f676d1e", "version-string": "1.9.0", diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json index 29ce793140407e..e1f4ef71c1fac0 100644 --- a/versions/k-/kfr.json +++ b/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57db6ba7195ff44caabe75ab302cdc10629fb5f2", + "version-string": "2020-06-15", + "port-version": 1 + }, { "git-tree": "22401e7e0aafe0934b6eb6201b83283609fe5d81", "version-string": "2020-06-15", diff --git a/versions/k-/kinectsdk2.json b/versions/k-/kinectsdk2.json index 81b70fa8570ab8..0243bb1b496c7b 100644 --- a/versions/k-/kinectsdk2.json +++ b/versions/k-/kinectsdk2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0a13df11c972355370eef866bd266e2ae7c90d5", + "version-string": "2.0", + "port-version": 3 + }, { "git-tree": "1a0bfd98150a26b9a24903f78f8c24843e3f079f", "version-string": "2.0-2", diff --git a/versions/k-/kissfft.json b/versions/k-/kissfft.json index 346c666935dcff..ecd9591ab3f4cf 100644 --- a/versions/k-/kissfft.json +++ b/versions/k-/kissfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95aab04fc0758cad41ad4724c17490d54b5cb139", + "version-string": "2020-03-30", + "port-version": 1 + }, { "git-tree": "2779164487247422fc7e98e76eb55dff08f4a48d", "version-string": "2020-03-30", diff --git a/versions/k-/kubazip.json b/versions/k-/kubazip.json index f3ce149182642f..1286e2b6ffc6fb 100644 --- a/versions/k-/kubazip.json +++ b/versions/k-/kubazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "131416be9d3de3fccb254751a17cd78e1252b464", + "version-string": "0.1.19", + "port-version": 1 + }, { "git-tree": "4b47acada9e962b232d5a5a1cf1c7f9adf98530a", "version-string": "0.1.19", diff --git a/versions/k-/kuku.json b/versions/k-/kuku.json index f36455df090353..f12b159a3b303b 100644 --- a/versions/k-/kuku.json +++ b/versions/k-/kuku.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa4e0b6cf1ce1e5f0cd13fa2dba7953ddcfc3d6f", + "version-string": "2.1", + "port-version": 1 + }, { "git-tree": "e58629ddfc48942517bb6dfc2dc12151cfcd0b2a", "version-string": "2.1", diff --git a/versions/k-/kvasir-mpl.json b/versions/k-/kvasir-mpl.json index 20faadeb6aa309..042536ad3322cf 100644 --- a/versions/k-/kvasir-mpl.json +++ b/versions/k-/kvasir-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0eed1d5cd20c82b4cd2031f0fb21c2a5655b13d1", + "version-string": "2019-08-06", + "port-version": 1 + }, { "git-tree": "d07bf9f9e3380b5b9774152634b93bb308af0bd3", "version-string": "2019-08-06", diff --git a/versions/l-/lapack.json b/versions/l-/lapack.json index 5d618ffb530d51..a4c33261715d60 100644 --- a/versions/l-/lapack.json +++ b/versions/l-/lapack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e52f9dc39357e3e7224273a21c0efaf275f15ae6", + "version-string": "3", + "port-version": 2 + }, { "git-tree": "e3e10603a14f3b981ce689ba768d42a1a2ec07d4", "version-string": "3", diff --git a/versions/l-/lastools.json b/versions/l-/lastools.json index b59dd6ea8cb633..e32dc9925c45f6 100644 --- a/versions/l-/lastools.json +++ b/versions/l-/lastools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6401b05621966caf0aaebc6a4dedb0c696c6c53f", + "version-string": "2020-05-09", + "port-version": 1 + }, { "git-tree": "8a301426473ec3a9afb9a013ff3d04fd1197fba4", "version-string": "2020-05-09", diff --git a/versions/l-/lazy-importer.json b/versions/l-/lazy-importer.json index a9e16238407ec0..9cfa28dfcd2a4a 100644 --- a/versions/l-/lazy-importer.json +++ b/versions/l-/lazy-importer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a2748be94ccc349f17bf4c54af9f574a56e2613", + "version-string": "2019-08-10", + "port-version": 1 + }, { "git-tree": "eee592b2e30fb35bb1ca3f2aa8e0013037ef4ccc", "version-string": "2019-08-10", diff --git a/versions/l-/lcms.json b/versions/l-/lcms.json index 8155efcc4b00f9..0a537230d20a18 100644 --- a/versions/l-/lcms.json +++ b/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40c7773d4774034a567f4b9f5427e558afe66ebd", + "version-string": "2.12", + "port-version": 1 + }, { "git-tree": "0020f124dcd6fa36e8ab5edad1efc85c59c51a56", "version-string": "2.12", diff --git a/versions/l-/lemon.json b/versions/l-/lemon.json index 14be3b08f8d416..04d37dbe20e4ad 100644 --- a/versions/l-/lemon.json +++ b/versions/l-/lemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20bb9fd243449f9c1376ae916567331839375a90", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "1b9931e57629d344a0ea2b656008550604900452", "version-string": "0", diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json index 0d2aa88a2c2a6f..e315adc43c68b8 100644 --- a/versions/l-/leptonica.json +++ b/versions/l-/leptonica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5068586428e64792c526ff7192b26ca96f27a673", + "version-string": "1.80.0", + "port-version": 3 + }, { "git-tree": "620a94070633a9f786e0052d848c16632bd307b5", "version-string": "1.80.0", diff --git a/versions/l-/lerc.json b/versions/l-/lerc.json index 4ac33728ccde62..d414aab0e614f8 100644 --- a/versions/l-/lerc.json +++ b/versions/l-/lerc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81c91f19fa142f53370b1a7ecac53fd2ba10aaf6", + "version-string": "2.2", + "port-version": 2 + }, { "git-tree": "a35292098f9e9e64fe0326963ce31ae008df173b", "version-string": "2.2", diff --git a/versions/l-/lest.json b/versions/l-/lest.json index e6e12edb1b01a9..1eddbca5a65d5f 100644 --- a/versions/l-/lest.json +++ b/versions/l-/lest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94a9fb0d9b6b57287a652feea7268760986bb448", + "version-string": "1.35.1", + "port-version": 2 + }, { "git-tree": "6a10bd7bfa440dac6566183f709cf0d0c9d582ca", "version-string": "1.35.1", diff --git a/versions/l-/leveldb.json b/versions/l-/leveldb.json index 7c6eafd047180e..b119457f96a2a5 100644 --- a/versions/l-/leveldb.json +++ b/versions/l-/leveldb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d94e4685c15581a8e5740ee6061d8b608645fd31", + "version-string": "1.22", + "port-version": 2 + }, { "git-tree": "38da693d53b70286fe05028daf4fa5f3418455fb", "version-string": "1.22-1", diff --git a/versions/l-/libaaplus.json b/versions/l-/libaaplus.json index 763144ec891882..abfe02b34051bd 100644 --- a/versions/l-/libaaplus.json +++ b/versions/l-/libaaplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "350415271eff06157085854060050dcbc80448a9", + "version-string": "2.12", + "port-version": 2 + }, { "git-tree": "0d8f92d1cc3501ab9ce9cb87ab302acc29101847", "version-string": "2.12-1", diff --git a/versions/l-/libaiff.json b/versions/l-/libaiff.json index d8e7ee7a1644eb..0204fed5b4a549 100644 --- a/versions/l-/libaiff.json +++ b/versions/l-/libaiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bd67ed6002176c79933b7e4c237e06604e16b1d", + "version-string": "5.0", + "port-version": 7 + }, { "git-tree": "384dd657e0debf56e8be77ca82cdb724bb4d7ba3", "version-string": "5.0-6", diff --git a/versions/l-/libassuan.json b/versions/l-/libassuan.json index 90b1a9022e495a..92a790255d4303 100644 --- a/versions/l-/libassuan.json +++ b/versions/l-/libassuan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e6442db3e13636cd43910e945c5ab03656422dd", + "version-string": "2.5.3", + "port-version": 2 + }, { "git-tree": "c81f7935c5aeb61c86b14c014b4642436f8bac29", "version-string": "2.5.3", diff --git a/versions/l-/libbf.json b/versions/l-/libbf.json index e0833a626f12ba..d338b8248d5d60 100644 --- a/versions/l-/libbf.json +++ b/versions/l-/libbf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b44ae45673f953a9aa87a1df8bdc04c6a4201aef", + "version-string": "1.0.0", + "port-version": 2 + }, { "git-tree": "919ff0d06dfb5f74a4913cf7a8ad44c2e70035b4", "version-string": "1.0.0-1", diff --git a/versions/l-/libcds.json b/versions/l-/libcds.json index f4fe1dfe17fdb4..fcdaa2d5cdf4f9 100644 --- a/versions/l-/libcds.json +++ b/versions/l-/libcds.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c4f193efcb3e703332e10483b443570e1af5ae7", + "version-string": "2.3.3", + "port-version": 1 + }, { "git-tree": "fbfc5cffca8fb134abcceb5763a92ea1c90ffd5f", "version-string": "2.3.3", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 9d0d7ead2f9f17..254b6011a446b2 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9e514fd4a455016bc077fb0af7703a947868273", + "version-string": "1.13", + "port-version": 1 + }, { "git-tree": "46f542929aebafbe41f76a66e1073c94acf9936d", "version-string": "1.13", diff --git a/versions/l-/libconfig.json b/versions/l-/libconfig.json index 3a906d6881912e..9ec9af593e9ecc 100644 --- a/versions/l-/libconfig.json +++ b/versions/l-/libconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9149e9c9d7a08455647bcadb1f178b7ee6ff3d2", + "version-string": "1.7.3", + "port-version": 1 + }, { "git-tree": "0ef471f5497ea4d07f8282487141bcbe3ea9f319", "version-string": "1.7.3", diff --git a/versions/l-/libconfuse.json b/versions/l-/libconfuse.json index 232df060c14236..d0f3f205f5056f 100644 --- a/versions/l-/libconfuse.json +++ b/versions/l-/libconfuse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aacb676c2698728d17cb0540a3dd4f538bcc2d66", + "version-string": "2019-07-14", + "port-version": 1 + }, { "git-tree": "66e56f1e0968508363349e1905716df75faf4ea7", "version-string": "2019-07-14", diff --git a/versions/l-/libcuckoo.json b/versions/l-/libcuckoo.json index 22de57d1ec979f..35c71d5b6f5b87 100644 --- a/versions/l-/libcuckoo.json +++ b/versions/l-/libcuckoo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47bda50b4e599d0dc81a015e175d1510de0ca62d", + "version-string": "0.3", + "port-version": 1 + }, { "git-tree": "777ec458aadd3bff96b4e601b3830c5a3e3be61c", "version-string": "0.3", diff --git a/versions/l-/libdatrie.json b/versions/l-/libdatrie.json index e86f03c9baf83a..e67f74a58cc2d1 100644 --- a/versions/l-/libdatrie.json +++ b/versions/l-/libdatrie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55aab3566cc2c82313f67f484a411b28f53da90b", + "version-string": "0.2.10", + "port-version": 4 + }, { "git-tree": "5ce5ae0ac1e89557a8c353298a538d03967938a2", "version-string": "0.2.10-3", diff --git a/versions/l-/libde265.json b/versions/l-/libde265.json index befc7655f7f9e4..0aa815cd351a09 100644 --- a/versions/l-/libde265.json +++ b/versions/l-/libde265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e62a21fa7d1d31b6115cb99842ee2e0f54f2ff33", + "version-string": "1.0.8", + "port-version": 1 + }, { "git-tree": "857cfbdb4607f7799bc7beae422b3c244e5b8b3a", "version-string": "1.0.8", diff --git a/versions/l-/libdisasm.json b/versions/l-/libdisasm.json index 5c83514e5dfb81..5f2e114fde40ff 100644 --- a/versions/l-/libdisasm.json +++ b/versions/l-/libdisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a15a1eeb7daa3d47d553ba0b14a151462377c41f", + "version-string": "0.23", + "port-version": 8 + }, { "git-tree": "51daf85e8709cd28fab9f5ec16d87de3351e4a62", "version-string": "0.23-7", diff --git a/versions/l-/libdivide.json b/versions/l-/libdivide.json index 41cc336d3498bb..747b96345c5935 100644 --- a/versions/l-/libdivide.json +++ b/versions/l-/libdivide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a632ce1c591ebeff2d020222f9a7cac938d3a623", + "version-string": "4.0.0", + "port-version": 1 + }, { "git-tree": "df4f2fc30723e55ff1c7e1709b1c1e3d0156e310", "version-string": "4.0.0", diff --git a/versions/l-/libdshowcapture.json b/versions/l-/libdshowcapture.json index 96c88c18a6eb8e..e7353417503445 100644 --- a/versions/l-/libdshowcapture.json +++ b/versions/l-/libdshowcapture.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3573e5e73ce2e61477815f452a5d2cd4a96ec0c7", + "version-string": "0.6.0", + "port-version": 2 + }, { "git-tree": "0b16d08906d5a9a7b8fe8efbf43de3aa5050c24d", "version-string": "0.6.0-1", diff --git a/versions/l-/libevent.json b/versions/l-/libevent.json index 375fbbf4cdb590..8b985467980002 100644 --- a/versions/l-/libevent.json +++ b/versions/l-/libevent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16a3ac34416a0b208f97f9a0afdeecdcc60699e1", + "version-string": "2.1.12", + "port-version": 2 + }, { "git-tree": "27a15ae417cdf4fd4388ab02d2949632699ce004", "version-string": "2.1.12", diff --git a/versions/l-/libevhtp.json b/versions/l-/libevhtp.json index 136900f0cdc494..3324e7fd60607f 100644 --- a/versions/l-/libevhtp.json +++ b/versions/l-/libevhtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98227c0bbd789df044f349480c00378c5c56984c", + "version-string": "1.2.18", + "port-version": 1 + }, { "git-tree": "f4b43bbb672cdd75c87f028d5ae9f587070eb55b", "version-string": "1.2.18", diff --git a/versions/l-/libexif.json b/versions/l-/libexif.json index 645a45bd1d1c68..972e3bcf9889cc 100644 --- a/versions/l-/libexif.json +++ b/versions/l-/libexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b068504fa067776d51b304e0c28e23532957c4b6", + "version-string": "0.6.22", + "port-version": 1 + }, { "git-tree": "8db41ebcc42f9b3695ac489c3ea72abb738477f5", "version-string": "0.6.22", diff --git a/versions/l-/libfabric.json b/versions/l-/libfabric.json index d1bd0078ea2bf2..bfb2fb920adcfb 100644 --- a/versions/l-/libfabric.json +++ b/versions/l-/libfabric.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8eef6aae49aa30fcba5286829a5abc03c53a7580", + "version-string": "1.8.1", + "port-version": 2 + }, { "git-tree": "e0d8ee377354809a8031228a4a491f86beb73b81", "version-string": "1.8.1-1", diff --git a/versions/l-/libflac.json b/versions/l-/libflac.json index 8fb44f9fd1ae11..42a0867dc02cde 100644 --- a/versions/l-/libflac.json +++ b/versions/l-/libflac.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "682527a63d829627895d16e12759a08c26687db7", + "version-string": "1.3.3", + "port-version": 6 + }, { "git-tree": "2e34a0ed7543005386679cd20d4a6d13988c2492", "version-string": "1.3.3", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index 14772f6785cc2c..f0c0ee3b1ec8cc 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00c2b86114dcda5bd91f93d83e696b85148037a0", + "version-string": "0.2.0", + "port-version": 6 + }, { "git-tree": "84c6e844fcefbbce598025953699c7c536e1e783", "version-string": "0.2.0", diff --git a/versions/l-/libftdi.json b/versions/l-/libftdi.json index 7aa1df4de33437..e2fbf946ae18d3 100644 --- a/versions/l-/libftdi.json +++ b/versions/l-/libftdi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "432b2ffb3de6957b3569862e61d431171c916624", + "version-string": "0.20", + "port-version": 2 + }, { "git-tree": "f1c47411a9b3c7872cbeaf6bdc15e010662142c4", "version-string": "0.20-1", diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json index bdaa3c37bdda0d..75cf88e8707fa8 100644 --- a/versions/l-/libgcrypt.json +++ b/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e", + "version-string": "1.8.7", + "port-version": 2 + }, { "git-tree": "394e5b7b433e4b18e9276c48b7331fbea30034ba", "version-string": "1.8.7", diff --git a/versions/l-/libgd.json b/versions/l-/libgd.json index 3f72a0e89a061a..f0f46f146a2c1f 100644 --- a/versions/l-/libgd.json +++ b/versions/l-/libgd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40171bc92f5cead1423ede203de8ad2752cb16b8", + "version-string": "2.2.5", + "port-version": 5 + }, { "git-tree": "4b7ae023feb1082b88dfef98ddf7fe214e04f150", "version-string": "2.2.5-4", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index 2f03e9f4954293..2e1676ecd64f35 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2211c53755bff618e685ac712f96ee381d2ba6a6", + "version-string": "1.6.0", + "port-version": 4 + }, { "git-tree": "2776355ea4b59dd06ec5b231c5080cd9b2157a16", "version-string": "1.6.0", diff --git a/versions/l-/libgta.json b/versions/l-/libgta.json index c90ad2e9cf8e87..6db93eda974c9a 100644 --- a/versions/l-/libgta.json +++ b/versions/l-/libgta.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "876f40188d1fb98aa9e19123118134f2a58925da", + "version-string": "1.0.8", + "port-version": 2 + }, { "git-tree": "181fc8b0e69799143f50b56df17a83f630025eb2", "version-string": "1.0.8-1", diff --git a/versions/l-/libguarded.json b/versions/l-/libguarded.json index 72668d2b75ae83..2e1bb5fe2b5edf 100644 --- a/versions/l-/libguarded.json +++ b/versions/l-/libguarded.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3bf2a0dfd157d2505e5e992ec7c1fdc6a301198", + "version-string": "2019-08-27", + "port-version": 2 + }, { "git-tree": "7ccf839a39803f3527707b0bf00818d8fe58b904", "version-string": "2019-08-27-1", diff --git a/versions/l-/libhdfs3.json b/versions/l-/libhdfs3.json index 4066a10a51eaa6..452e12406481f4 100644 --- a/versions/l-/libhdfs3.json +++ b/versions/l-/libhdfs3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21db40c50744011ba13568f8e3a72dd97de84ea9", + "version-string": "2019-11-05", + "port-version": 1 + }, { "git-tree": "7073226fafe5505d37336317d3778e3b4fa5a4a5", "version-string": "2019-11-05", diff --git a/versions/l-/libhydrogen.json b/versions/l-/libhydrogen.json index fb48d4e633d2c5..087518ac50b139 100644 --- a/versions/l-/libhydrogen.json +++ b/versions/l-/libhydrogen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e4266b1fa81e86fcbf1968800e7df473b472fc1", + "version-string": "2019-08-11", + "port-version": 1 + }, { "git-tree": "b1a85fe7d99683c20079b9e91fbcf4e847b83828", "version-string": "2019-08-11", diff --git a/versions/l-/libideviceactivation.json b/versions/l-/libideviceactivation.json index 2e31cb314d4f52..8b94277fdd36eb 100644 --- a/versions/l-/libideviceactivation.json +++ b/versions/l-/libideviceactivation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c39284ebf51443f0dc6c3291bdb7cdca973a9d2", + "version-string": "1.2.235", + "port-version": 1 + }, { "git-tree": "43967cb5db0fb8ca318d04639a77ae89026605b6", "version-string": "1.2.235", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index b72f54b761d283..103341c9f3607d 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ced3bf6b1438690d7b1b3d1f0fa40eacbc78f1ca", + "version-string": "2.2.0", + "port-version": 6 + }, { "git-tree": "09f126e97a2f0d9e76a1109d6855bbdd4cab9c9d", "version-string": "2.2.0", diff --git a/versions/l-/libilbc.json b/versions/l-/libilbc.json index eb295e583971eb..03cd54d4b4242b 100644 --- a/versions/l-/libilbc.json +++ b/versions/l-/libilbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c86ad893279ccf359e6ee1b22ff5e2e3a935a42", + "version-string": "3.0.3", + "port-version": 1 + }, { "git-tree": "71c62e89d45d6ab7cfecf0027e3ba9c9fd0f4e89", "version-string": "3.0.3", diff --git a/versions/l-/libimobiledevice.json b/versions/l-/libimobiledevice.json index 1bb409b7ef1ad9..c8c340dca0bd25 100644 --- a/versions/l-/libimobiledevice.json +++ b/versions/l-/libimobiledevice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b4e580b28caaf03bbe46030bf612af191eb800a", + "version-string": "1.3.6", + "port-version": 2 + }, { "git-tree": "7af0cdbc3aa310e494be7c17efc198be75593e92", "version-string": "1.3.6", diff --git a/versions/l-/libirecovery.json b/versions/l-/libirecovery.json index fe8b272c55b566..fae92d1fef979e 100644 --- a/versions/l-/libirecovery.json +++ b/versions/l-/libirecovery.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e5ca128c3c62e747f3cc4beaeb0f5d74b263403", + "version-string": "1.0.25", + "port-version": 3 + }, { "git-tree": "9ea37c179cee88aa14450622ac673bbb7ce8eb88", "version-string": "1.0.25-2", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 2d771d855d6436..5314666f427224 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48423df98f8715a1f33c2abdfcfc0c0bf5cc5f92", + "version": "2.0.6", + "port-version": 2 + }, { "git-tree": "88d4315ae4daa0619554d0465564beee0a688d71", "version": "2.0.6", diff --git a/versions/l-/libkml.json b/versions/l-/libkml.json index eeeb7d30939399..3654170b971468 100644 --- a/versions/l-/libkml.json +++ b/versions/l-/libkml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2647d8b06542a475e0de99aedc3ce939a10b35d", + "version-string": "1.3.0", + "port-version": 7 + }, { "git-tree": "6c50197fe3bf38682b4e551e501834817990ad3e", "version-string": "1.3.0", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index 6059275c2d4f31..a230bd0f3d3560 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "508c56fc68703c0cf2b2c7fe99895fa6cfee5c6a", + "version-string": "1.8.1", + "port-version": 7 + }, { "git-tree": "98b46cc84b9efb95b95bfa0111c22e59a4d9e477", "version-string": "1.8.1", diff --git a/versions/l-/liblbfgs.json b/versions/l-/liblbfgs.json index 0b945332a104b8..e3c7174bb55b40 100644 --- a/versions/l-/liblbfgs.json +++ b/versions/l-/liblbfgs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9251e490103e48e6ba9a01c6c61468381f0c8f1", + "version-string": "1.10", + "port-version": 1 + }, { "git-tree": "4529e3e615f7e8db5dc69cafeec67c56eccc81b3", "version-string": "1.10", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index 55bf1c44edf552..9e3f9f8e5406f1 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbcfa0caff95b07142e28cd453690c26d62bc025", + "version-string": "2019-06-13", + "port-version": 2 + }, { "git-tree": "7539b1a880c2328db9aacdc9c8f5475abfbd1af2", "version-string": "2019-06-13-1", diff --git a/versions/l-/liblsl.json b/versions/l-/liblsl.json index 60945ffaf5021f..d62780f239e024 100644 --- a/versions/l-/liblsl.json +++ b/versions/l-/liblsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "451923eac66cd517eb01dbf297e207e0760c4414", + "version-string": "1.14.0", + "port-version": 2 + }, { "git-tree": "960eac893dd574369d79d40248bd91c38a8c3448", "version-string": "1.14.0", diff --git a/versions/l-/libmad.json b/versions/l-/libmad.json index 229ae83d2b425d..b05e2bd07a3c51 100644 --- a/versions/l-/libmad.json +++ b/versions/l-/libmad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "820bd670c6652cdb1b381f9c55390a261f11e842", + "version-string": "0.15.1", + "port-version": 9 + }, { "git-tree": "c26ef39816280a812e249d0af4ba2ce58a0cf19d", "version-string": "0.15.1-8", diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index d6d9a9c3eef9bc..b92f16aeca2159 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7da47031497942277e14b01feab9e6d7d1491443", + "version-string": "1.4.3", + "port-version": 1 + }, { "git-tree": "705c0ebe7b045c299e7222fd49afd7625e3e1aaf", "version-string": "1.4.3", diff --git a/versions/l-/libmesh.json b/versions/l-/libmesh.json index f46fc134c8507f..a8ebbf98af0841 100644 --- a/versions/l-/libmesh.json +++ b/versions/l-/libmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99d2914d8591e790d8d9e16eeb572b2dfa6776d7", + "version-string": "1.5.0", + "port-version": 2 + }, { "git-tree": "eed08886ca377bad4a4ad13c6683ddf547d705f0", "version-string": "1.5.0-1", diff --git a/versions/l-/libmikmod.json b/versions/l-/libmikmod.json index 3932f070d9b841..d096d0cb0e7383 100644 --- a/versions/l-/libmikmod.json +++ b/versions/l-/libmikmod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0dd535be8f9f4f477cc21a745724b2c42f93d01", + "version-string": "3.3.11.1", + "port-version": 9 + }, { "git-tree": "7eb5deb666796bf91d2429c28325aa738b9e8941", "version-string": "3.3.11.1-8", diff --git a/versions/l-/libmodman.json b/versions/l-/libmodman.json index e1e4f572c60b8d..54709c67a13f31 100644 --- a/versions/l-/libmodman.json +++ b/versions/l-/libmodman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "202e2ccfbf309183f222f9c849f92452bd8f3b48", + "version-string": "2.0.1", + "port-version": 3 + }, { "git-tree": "5ac70c470d670ed354de7816cd2bb9905a416dd4", "version-string": "2.0.1-2", diff --git a/versions/l-/libmorton.json b/versions/l-/libmorton.json index 801cbb5da486ab..50136e69ab6b6f 100644 --- a/versions/l-/libmorton.json +++ b/versions/l-/libmorton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c25c5cd76d1c395f24c0e22407673e2c88c6458", + "version-string": "0.2", + "port-version": 1 + }, { "git-tree": "fbd978aad91d4f85ec74e46325cf5773be1280a8", "version-string": "0.2", diff --git a/versions/l-/libmpeg2.json b/versions/l-/libmpeg2.json index b075a4aaf0a9f6..e13c81d623ac32 100644 --- a/versions/l-/libmpeg2.json +++ b/versions/l-/libmpeg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7325b83ac5b58747d2dc18859f771b641a0d76f", + "version-string": "0.5.1", + "port-version": 1 + }, { "git-tree": "aaea63d5784de13698d5ceb11cf787036bb59412", "version-string": "0.5.1", diff --git a/versions/l-/libmspack.json b/versions/l-/libmspack.json index 5e763927fa51c4..09d834c3dc5a8f 100644 --- a/versions/l-/libmspack.json +++ b/versions/l-/libmspack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8faa2bfe071a7711a21a54139b84779c0d7f2cbe", + "version-string": "0.10.1", + "port-version": 4 + }, { "git-tree": "88f3db0838dd22e6cfaa675e76bd95d056cc25c8", "version-string": "0.10.1-3", diff --git a/versions/l-/libnoise.json b/versions/l-/libnoise.json index 1f44114f12bdb2..1300aa98054509 100644 --- a/versions/l-/libnoise.json +++ b/versions/l-/libnoise.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9a3fa0e4772f2c11fe3d177dea6ec8a23b06b07", + "version-string": "1.0.0", + "port-version": 2 + }, { "git-tree": "9174e744d86273338a1e3c4a341329647730e19f", "version-string": "1.0.0", diff --git a/versions/l-/libodb-boost.json b/versions/l-/libodb-boost.json index 3bc2015e2d5ccc..268cc128ceb7fe 100644 --- a/versions/l-/libodb-boost.json +++ b/versions/l-/libodb-boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0aad9c51faa7aef72cf64a8c09fbdb08cf677dbd", + "version-string": "2.4.0", + "port-version": 5 + }, { "git-tree": "facc25e5e4f72028b75da7be4b88208615b172cb", "version-string": "2.4.0", diff --git a/versions/l-/libodb-pgsql.json b/versions/l-/libodb-pgsql.json index 0647a39493aade..27b572aa843581 100644 --- a/versions/l-/libodb-pgsql.json +++ b/versions/l-/libodb-pgsql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47c85efbe11253531c364b63debb914b44de579f", + "version-string": "2.4.0", + "port-version": 5 + }, { "git-tree": "dfe9698df72847f118144c93dbcc25e2f0e0b16d", "version-string": "2.4.0", diff --git a/versions/l-/libodb-sqlite.json b/versions/l-/libodb-sqlite.json index 10f0bb1b5d0860..7c6162ad804cb3 100644 --- a/versions/l-/libodb-sqlite.json +++ b/versions/l-/libodb-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4923ceb767ecc4c6f5efb7bcc80fafef19718bd2", + "version-string": "2.4.0", + "port-version": 9 + }, { "git-tree": "d24a8283229f618903b2d446e7e22e4a0cf3f69f", "version-string": "2.4.0", diff --git a/versions/l-/libp7-baical.json b/versions/l-/libp7-baical.json index 81d1d24ed4edfc..c89f57059b6812 100644 --- a/versions/l-/libp7-baical.json +++ b/versions/l-/libp7-baical.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cf85007fff76b915306c36ced6d3cf94c96e074", + "version-string": "replaced", + "port-version": 1 + }, { "git-tree": "38136f16ec4b0eacdb76d63a639fc20b8d6ef208", "version-string": "replaced", diff --git a/versions/l-/libp7client.json b/versions/l-/libp7client.json index ac7bd96160bf45..c8f285bd06be8c 100644 --- a/versions/l-/libp7client.json +++ b/versions/l-/libp7client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcb9500d0ef29115ec13c39c943ce85d2030ac56", + "version-string": "5.6", + "port-version": 1 + }, { "git-tree": "0a367ba74a92626d57ddcd5be0157e5dadc6e8bc", "version-string": "5.6", diff --git a/versions/l-/libpff.json b/versions/l-/libpff.json index 5098faa85a5424..ddaf67af575652 100644 --- a/versions/l-/libpff.json +++ b/versions/l-/libpff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc83ea1c4fe9bd9731134772ff7df1c1f3ff6ab9", + "version-string": "2018-07-14", + "port-version": 2 + }, { "git-tree": "3acb1ab0afd3a20d25756330e91c502263de05d3", "version-string": "2018-07-14-1", diff --git a/versions/l-/libpopt.json b/versions/l-/libpopt.json index 10609672025158..0e8704d40b5307 100644 --- a/versions/l-/libpopt.json +++ b/versions/l-/libpopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f86d53b62561f37ac20b8c66232b9d87e4a6750", + "version-string": "1.16", + "port-version": 14 + }, { "git-tree": "098127274eb41cbd97cdcc38028a7c2e8aafb0ba", "version-string": "1.16-13", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 0344ba5f7b13f2..7f15951dd3f816 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49aac7c55ac89c54daa7d91d8eed713a79ab2713", + "version-string": "0.4.15", + "port-version": 3 + }, { "git-tree": "7f8aa36e95779e7845d82f4bad6f300dae04b58d", "version-string": "0.4.15-2", diff --git a/versions/l-/libqcow.json b/versions/l-/libqcow.json index 8f8eee2e6bef15..2d4ce7f324f61e 100644 --- a/versions/l-/libqcow.json +++ b/versions/l-/libqcow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d32eac160d01f07c4918816493353b53375f7de", + "version-string": "20210419", + "port-version": 1 + }, { "git-tree": "de588945b39a3e022991df3289a71fab3162474d", "version-string": "20210419", diff --git a/versions/l-/libqglviewer.json b/versions/l-/libqglviewer.json index 0b3511b5a43b78..3d2e599516b2d8 100644 --- a/versions/l-/libqglviewer.json +++ b/versions/l-/libqglviewer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af8c797ea264a95603d8d825a75d73d5cc408d4d", + "version-string": "2.7.2", + "port-version": 4 + }, { "git-tree": "73dd8e7a3f427ca6033c3836fac52ca45c4218cb", "version-string": "2.7.2-3", diff --git a/versions/l-/librabbitmq.json b/versions/l-/librabbitmq.json index da093c5c8a481c..7b0b761a4a33c1 100644 --- a/versions/l-/librabbitmq.json +++ b/versions/l-/librabbitmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "002128f2677cfaa53843e36849ebcfef1f2c540e", + "version-string": "2020-06-03", + "port-version": 1 + }, { "git-tree": "130a756c21f59d35c26dc147d8af8216d9bdcf7f", "version-string": "2020-06-03", diff --git a/versions/l-/libraqm.json b/versions/l-/libraqm.json index d54df98fd5849c..12ac74fd869cbb 100644 --- a/versions/l-/libraqm.json +++ b/versions/l-/libraqm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c83ce59ebe48d25178c998704ba4559807288ba", + "version-string": "0.7.0", + "port-version": 3 + }, { "git-tree": "fa05347d4a56f608da568ea8041d259b959e8d9d", "version-string": "0.7.0", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index 7dc015ca23564a..aeddb40b290af6 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80a0638bcb03f5e4c53f4b35562da7b8485fda11", + "version-string": "201903", + "port-version": 4 + }, { "git-tree": "659d20658809488ab3cfccf30d85870ce06615e0", "version-string": "201903-3", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index 25a8e064fb5f96..2dfb0785b2287c 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a309365a3b06309b47543f15b421ecfe4421d6a", + "version-string": "1.7.0", + "port-version": 1 + }, { "git-tree": "d436f6df2863c1bf133c1f0efd53cb8281710b80", "version-string": "1.7.0", diff --git a/versions/l-/libsass.json b/versions/l-/libsass.json index 8927f4d2c8b01d..40ee99dd8e19d5 100644 --- a/versions/l-/libsass.json +++ b/versions/l-/libsass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "124a73deb4e0b7677411ab0285b70013c26782c8", + "version-string": "3.6.4", + "port-version": 1 + }, { "git-tree": "87bcd6907b761946cefe3ff059952f6649ce335c", "version-string": "3.6.4", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 91ef147d5509c8..3acc1b2467d4c7 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a609c8dc53ab3d8895e749d2361c9085084dfec", + "version-string": "5.18.0", + "port-version": 1 + }, { "git-tree": "1f88782ee0e10d3ac4f2604ffd6b9b2f78e9d946", "version-string": "5.18.0", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 1b0c0d5dfab782..e415f501fb2fc5 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7d124e4fcb212dba3d650817056ce23b6dc2a2f", + "version-string": "5.0.0", + "port-version": 3 + }, { "git-tree": "ac8547f60ac2cc08c65a907a84112e1256011a47", "version-string": "5.0.0", diff --git a/versions/l-/libspnav.json b/versions/l-/libspnav.json index 02facf184dfb77..33081a8b7df85d 100644 --- a/versions/l-/libspnav.json +++ b/versions/l-/libspnav.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c34294f2e748d1600ca87ed7086a0ddcedb1a7b9", + "version-string": "0.2.3", + "port-version": 1 + }, { "git-tree": "2afc1eb32f415070a057e5072132c16021cc7088", "version-string": "0.2.3", diff --git a/versions/l-/libsquish.json b/versions/l-/libsquish.json index ab5c5df8f67d6f..d1b63846048295 100644 --- a/versions/l-/libsquish.json +++ b/versions/l-/libsquish.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e7c8060fb2b0499a31df98ef1e8652081e18944", + "version-string": "1.15", + "port-version": 8 + }, { "git-tree": "89f022a7ab3d01ae25876f7dcaf84327f615ad87", "version-string": "1.15-7", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index 731cf4fd101ca1..be907099a9e105 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e446dfb7ecd2ec36c5b960c00bbc8ac9da43673", + "version-string": "1.3.4", + "port-version": 1 + }, { "git-tree": "cf78228426d0454712497d526abf031f6e6afd29", "version-string": "1.3.4", diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json index c1fd99f3b81243..4eab78d14805e6 100644 --- a/versions/l-/libsrtp.json +++ b/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fdf039be54c0a11434b8c923e808d6315b398082", + "version-string": "2.2.0", + "port-version": 1 + }, { "git-tree": "d19c02a581a94b808483ce127d731cee188e40b4", "version-string": "2.2.0", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 3f1e6ca4169764..2de41c959d9073 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0eb17d68736a224ca8ce341b1b84bbae2f2f43a5", + "version-string": "0.9.5", + "port-version": 6 + }, { "git-tree": "d49a7a228c1f082d7e86bfb443af3a063a692ac7", "version-string": "0.9.5", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 619f5f85d7fdd4..3dca2e58596e93 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d448a6d5c97053355abbfa84171fcc7624dcd509", + "version-string": "1.9.0", + "port-version": 1 + }, { "git-tree": "7c2f49406ae7f86a941bd7a23e7a40aad93e4c93", "version-string": "1.9.0", diff --git a/versions/l-/libstemmer.json b/versions/l-/libstemmer.json index 5d137ea55cc9bb..1c1e6f3d89b42f 100644 --- a/versions/l-/libstemmer.json +++ b/versions/l-/libstemmer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf316e67e451a6b08bb44ff11854f613f32c7484", + "version-string": "2017-9", + "port-version": 6 + }, { "git-tree": "77cdb68aa3749064891548794658a76eba09ded1", "version-string": "2017-9-5", diff --git a/versions/l-/libstk.json b/versions/l-/libstk.json index 8112992ac9b63c..ab2aaf6107cdc2 100644 --- a/versions/l-/libstk.json +++ b/versions/l-/libstk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "baa7a90e090c3793097d8368715e1e8f3b30a8ee", + "version-string": "4.6.1", + "port-version": 1 + }, { "git-tree": "f7c24bf692c711b1f10e030b37770addb3038a0e", "version-string": "4.6.1", diff --git a/versions/l-/libtheora.json b/versions/l-/libtheora.json index 5d651451fb93a6..3aa9a91bb98bf9 100644 --- a/versions/l-/libtheora.json +++ b/versions/l-/libtheora.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f54e2dbc66d96847b2b075baa7ae3a4cc032328d", + "version-string": "1.2.0alpha1-20170719", + "port-version": 3 + }, { "git-tree": "8a881f4b426f98ea87c67e6b5afadd57ed634a95", "version-string": "1.2.0alpha1-20170719", diff --git a/versions/l-/libtins.json b/versions/l-/libtins.json index 02c4f48f504abd..431224b36190f9 100644 --- a/versions/l-/libtins.json +++ b/versions/l-/libtins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd15852b2fb7471ef3eb99bb1fc827627f9643f8", + "version-string": "4.3", + "port-version": 1 + }, { "git-tree": "98c3e72c357331f07d1d0a15b22900018aa7087d", "version-string": "4.3", diff --git a/versions/l-/libtomcrypt.json b/versions/l-/libtomcrypt.json index 53dc2d8f132cb4..11775d9b224372 100644 --- a/versions/l-/libtomcrypt.json +++ b/versions/l-/libtomcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b339006b76f8211aa40e6d88fc6adc843d1048fa", + "version-string": "1.18.2", + "port-version": 2 + }, { "git-tree": "bcd3ad201eea34c01ad9b03be1d3e33f4ec11c33", "version-string": "1.18.2-1", diff --git a/versions/l-/libtommath.json b/versions/l-/libtommath.json index 5b7bec0167c182..f1a832ad50cde8 100644 --- a/versions/l-/libtommath.json +++ b/versions/l-/libtommath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "745f0ffe9bd56bb065e987124a7d0afebc445dc2", + "version-string": "1.2.0", + "port-version": 2 + }, { "git-tree": "f6af9971413dc51fb1068d59b266fbfd7105ae7a", "version-string": "1.2.0-1", diff --git a/versions/l-/libu2f-server.json b/versions/l-/libu2f-server.json index cdb8fd44febf57..cb3a974df37f3e 100644 --- a/versions/l-/libu2f-server.json +++ b/versions/l-/libu2f-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1939b985161f406db50f8e455a5b7c4ada800596", + "version-string": "1.1.0", + "port-version": 3 + }, { "git-tree": "8238718ea369e39970b6fd6aa1277b5441ba2c0b", "version-string": "1.1.0", diff --git a/versions/l-/libudns.json b/versions/l-/libudns.json index 417a4c59a252c2..79e72cc0662856 100644 --- a/versions/l-/libudns.json +++ b/versions/l-/libudns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a05d58223d5adb1f421bbde4a0ac44ce72a3a1c9", + "version-string": "0.4", + "port-version": 3 + }, { "git-tree": "5e21ce56ac3d56ad2db68602fbbb0278981823cd", "version-string": "0.4-2", diff --git a/versions/l-/libunibreak.json b/versions/l-/libunibreak.json index 0bdecfa46ed6f3..ebb9099296bdc9 100644 --- a/versions/l-/libunibreak.json +++ b/versions/l-/libunibreak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1fb2965625f4dc28c5ab3c4e0a8a128901a0f0e", + "version-string": "4.3", + "port-version": 1 + }, { "git-tree": "118bde1435b5cc73170ebaa8f17a93b6ea963bcd", "version-string": "4.3-0", diff --git a/versions/l-/libusb-win32.json b/versions/l-/libusb-win32.json index 1f933b420894a2..df798ee16f055d 100644 --- a/versions/l-/libusb-win32.json +++ b/versions/l-/libusb-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a75f1e3bedf1a31e8c812d07c24eb867fdd74a29", + "version-string": "1.2.6.0", + "port-version": 7 + }, { "git-tree": "2c3d66659ac4c41ca0d5436e3d74b99c3f141eac", "version-string": "1.2.6.0-6", diff --git a/versions/l-/libusbmuxd.json b/versions/l-/libusbmuxd.json index 76c8b5d4db4ead..c378816e63a7b2 100644 --- a/versions/l-/libusbmuxd.json +++ b/versions/l-/libusbmuxd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a50e755ad62ff56d5012dd84e0ccd196175a807c", + "version-string": "1.2.219", + "port-version": 1 + }, { "git-tree": "51dcfc0be39078d8d8d64dd51188a0ccae761667", "version-string": "1.2.219", diff --git a/versions/l-/libuvc.json b/versions/l-/libuvc.json index 08336e5842bc49..d1416c245377e4 100644 --- a/versions/l-/libuvc.json +++ b/versions/l-/libuvc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6a9ae104918d980729af70da17fed9849500504", + "version-string": "2020-11-24", + "port-version": 1 + }, { "git-tree": "8550f55866b4387d32614f7353dbb59cdc2e7bd9", "version-string": "2020-11-24", diff --git a/versions/l-/libvmdk.json b/versions/l-/libvmdk.json index b64701f158ec3c..d2569ca29137b2 100644 --- a/versions/l-/libvmdk.json +++ b/versions/l-/libvmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8efc63f616daad6af987a274eb292d2605bd8f4b", + "version-string": "20200926", + "port-version": 1 + }, { "git-tree": "6d461aee7ea9e99c29255ad611a2c03c00acd895", "version-string": "20200926", diff --git a/versions/l-/libwandio.json b/versions/l-/libwandio.json index 3ade461e037506..754697db3b589a 100644 --- a/versions/l-/libwandio.json +++ b/versions/l-/libwandio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffa2cfbc601c2a9a2fdcbc20f44b312597952ec6", + "version-string": "4.2.1", + "port-version": 4 + }, { "git-tree": "72e5776baa22eb1281309f6296699bde4636138b", "version-string": "4.2.1", diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index d24a3f5fe03adc..4a0f067fe134f9 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "551e2b3f3b67283a71c20088413de576c9dc55c2", + "version-string": "1.0.0.27", + "port-version": 7 + }, { "git-tree": "09eeb5a939e4dcb87f405fea40875b2a803cd381", "version-string": "1.0.0.27", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index 66eb510e539826..f032f533e00257 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fcb5d97e464c046b1f4c1a81b7d23a9cb63a615", + "version-string": "1.1.0", + "port-version": 4 + }, { "git-tree": "7a3bfc774b61126901f0f9524de41ef864918f35", "version-string": "1.1.0", diff --git a/versions/l-/libxdiff.json b/versions/l-/libxdiff.json index 1b310f842142bc..e475c8b978391e 100644 --- a/versions/l-/libxdiff.json +++ b/versions/l-/libxdiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfe80df2ce315833069e20c710acf1349b901e60", + "version-string": "0.23", + "port-version": 1 + }, { "git-tree": "1a71b6f2278ad8edbe64b1c03e338dd733ad8aa1", "version-string": "0.23", diff --git a/versions/l-/libxmlmm.json b/versions/l-/libxmlmm.json index edcb5e529bc95f..184f88ba9a9830 100644 --- a/versions/l-/libxmlmm.json +++ b/versions/l-/libxmlmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f34eb9988a27e6184d3271ca0e346793b30d836", + "version-string": "0.6.0", + "port-version": 1 + }, { "git-tree": "7c106adf45ac07c773738acf6d6e2e359ea1b402", "version-string": "0.6.0", diff --git a/versions/l-/libxmp-lite.json b/versions/l-/libxmp-lite.json index 59ffeb6796a408..2b2ca107544606 100644 --- a/versions/l-/libxmp-lite.json +++ b/versions/l-/libxmp-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dda1a742b2612d9d926fef9c804d5e5efd041777", + "version-string": "4.4.1", + "port-version": 7 + }, { "git-tree": "c69ae2b0e1c4730c75d66c8f842e0d8d3e4df116", "version-string": "4.4.1-6", diff --git a/versions/l-/libyaml.json b/versions/l-/libyaml.json index f475c7fad72f09..4172a231a91549 100644 --- a/versions/l-/libyaml.json +++ b/versions/l-/libyaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05217bc30337071036997a4d6152165823db9531", + "version-string": "0.2.5", + "port-version": 1 + }, { "git-tree": "63a0e7b0e6194ee90c9d2e5bf3ac2c10ec04cca3", "version-string": "0.2.5", diff --git a/versions/l-/libzen.json b/versions/l-/libzen.json index e5aef047addab9..e319313e040bbe 100644 --- a/versions/l-/libzen.json +++ b/versions/l-/libzen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1c1cb55badf91c09b70e7480ff5c763518f1f51", + "version-string": "0.4.38", + "port-version": 1 + }, { "git-tree": "53a1b657b1e2647f28f64618a7322b51ac85be93", "version-string": "0.4.38", diff --git a/versions/l-/libzippp.json b/versions/l-/libzippp.json index 04df66c4b79bae..2d17503c7c596e 100644 --- a/versions/l-/libzippp.json +++ b/versions/l-/libzippp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40f7e8d02ea29cb28b5c0c19257aebf97def3f8e", + "version-string": "5.0-1.8.0", + "port-version": 1 + }, { "git-tree": "841560e4b583cbf85a4aca0839aa881c4cda7258", "version-string": "5.0-1.8.0", diff --git a/versions/l-/licensepp.json b/versions/l-/licensepp.json index e41fa07bd386b2..20cd42e9e99034 100644 --- a/versions/l-/licensepp.json +++ b/versions/l-/licensepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7115621dbc8deb47ebd3a8ff8dc7eeaf26c80fd", + "version-string": "2020-05-19", + "port-version": 2 + }, { "git-tree": "277b066105603c5e9948957ac4abee99a7451051", "version-string": "2020-05-19", diff --git a/versions/l-/linalg.json b/versions/l-/linalg.json index c84554de22ea9b..10c2b9324b6872 100644 --- a/versions/l-/linalg.json +++ b/versions/l-/linalg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19b7c7f697dab441e8d16c883a66682f090fb0cf", + "version-string": "2.1", + "port-version": 1 + }, { "git-tree": "3691c3e21388afc6c584dfc8c212dbc2c5f7e286", "version-string": "2.1", diff --git a/versions/l-/linenoise-ng.json b/versions/l-/linenoise-ng.json index d3ed353c05e87c..e89496f6cc524b 100644 --- a/versions/l-/linenoise-ng.json +++ b/versions/l-/linenoise-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e6ff5a6494c1913a8bd1ced80cf7037af500d26", + "version-string": "4754bee2d8eb3", + "port-version": 2 + }, { "git-tree": "5ae9279d3acecf2c559de7b455c79cfde6460336", "version-string": "4754bee2d8eb3-1", diff --git a/versions/l-/live555.json b/versions/l-/live555.json index 60a6470727c981..76a502690a2a43 100644 --- a/versions/l-/live555.json +++ b/versions/l-/live555.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d349d264f7be8a8802b521fddaa5ad047b48720", + "version-string": "latest", + "port-version": 2 + }, { "git-tree": "4bf91c8f1e61a268699d63b10f1951f1cd679a99", "version-string": "latest-1", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index 720c1ab66711e9..d60f6ba93bb2cd 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ff2b8c721c107574a4a81aa219fe4c119eaa9e3", + "version-string": "2.0", + "port-version": 20210421 + }, { "git-tree": "ffb9aa3f751b213fd6bde4d06f1c694c489e08f0", "version-string": "2.0-20210420", diff --git a/versions/l-/llgl.json b/versions/l-/llgl.json index c6c77c05a5a19a..ab5066e49cc8d0 100644 --- a/versions/l-/llgl.json +++ b/versions/l-/llgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24edfe12a80c340467e19d18b731ca53ce9f3ac7", + "version-string": "2019-08-15", + "port-version": 2 + }, { "git-tree": "097f9348e4c5bd300cd86ccc67831cd1de9f499c", "version-string": "2019-08-15", diff --git a/versions/l-/lmdb.json b/versions/l-/lmdb.json index c9688a8e3ff4fb..e33bdad9827c25 100644 --- a/versions/l-/lmdb.json +++ b/versions/l-/lmdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3599ec6a6285945a3eeeac1f9b0db810855ec5a", + "version-string": "0.9.24", + "port-version": 1 + }, { "git-tree": "43467ce2a21ad30b6939a72fd6917e9a97209927", "version-string": "0.9.24", diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json index 58781d31991de3..ee2c67af403820 100644 --- a/versions/l-/log4cplus.json +++ b/versions/l-/log4cplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0fab754f152f45627bbebb4629e2f508eeccb690", + "version-string": "2.0.5", + "port-version": 2 + }, { "git-tree": "681e1dd7fc4ef251e55c2befa8e4872a97a81eba", "version-string": "2.0.5", diff --git a/versions/l-/log4cpp.json b/versions/l-/log4cpp.json index a0b2384f8c4312..a6201194383dbe 100644 --- a/versions/l-/log4cpp.json +++ b/versions/l-/log4cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0dcd61960233e62367f4944e294ae90300d82e4", + "version-string": "2.9.1", + "port-version": 5 + }, { "git-tree": "d9fe0e809653449b53363822d42a1db2c0ba6dd6", "version-string": "2.9.1", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 791767b1cc9019..7b2598b2a00898 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "406017355e07d94a41999c3db5e015be8bf0fbbd", + "version-string": "0.11.0", + "port-version": 3 + }, { "git-tree": "e84807f759e37781d7ce7bfc3b7485609a0feb7c", "version-string": "0.11.0", diff --git a/versions/l-/loguru.json b/versions/l-/loguru.json index 4ac2f12f5896fe..9eef71fbae71a9 100644 --- a/versions/l-/loguru.json +++ b/versions/l-/loguru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c429f674d828c20881f410892d633b483e9d30dd", + "version-string": "2.1.0", + "port-version": 2 + }, { "git-tree": "ef13e53a3840b20757d18f432ddc86568a5ea5ef", "version-string": "2.1.0-1", diff --git a/versions/l-/lpeg.json b/versions/l-/lpeg.json index 69dda304fcc978..d12e83dcc0797d 100644 --- a/versions/l-/lpeg.json +++ b/versions/l-/lpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "582d8581a1bfef351571e1ba8ea8910bdc8291fc", + "version-string": "1.0.2", + "port-version": 2 + }, { "git-tree": "453a5d8a428bfaf904e55a2178895e6d8a104ef9", "version-string": "1.0.2-1", diff --git a/versions/l-/luabridge.json b/versions/l-/luabridge.json index 8a13ae002b2b2f..448484500f22f3 100644 --- a/versions/l-/luabridge.json +++ b/versions/l-/luabridge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f3cd5355fe6097867cfc2aa6037d6089f26b0b6", + "version-string": "2.6", + "port-version": 1 + }, { "git-tree": "509a24ba9fa003e8052f9e9ab672532307354b46", "version-string": "2.6", diff --git a/versions/l-/luafilesystem.json b/versions/l-/luafilesystem.json index ddac969a94e74b..2625adb28797c4 100644 --- a/versions/l-/luafilesystem.json +++ b/versions/l-/luafilesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e23447662c7ca83b4d681a5a0d4a451a683ce923", + "version-string": "1.8.0", + "port-version": 2 + }, { "git-tree": "b20a650ae45dc96ce00231ffcc6762cdf9ad4d4a", "version-string": "1.8.0-1", diff --git a/versions/l-/luajit.json b/versions/l-/luajit.json index c4472466338cc7..9f519d788c1533 100644 --- a/versions/l-/luajit.json +++ b/versions/l-/luajit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10777e8d3827f33dd042ae2cee5d309f48a108c0", + "version-string": "2.0.5", + "port-version": 4 + }, { "git-tree": "e1f7e0b77492627b8233017be73bd7b4361b2510", "version-string": "2.0.5-3", diff --git a/versions/l-/luasocket.json b/versions/l-/luasocket.json index 9c8adfdc206886..40d0976fbc78d8 100644 --- a/versions/l-/luasocket.json +++ b/versions/l-/luasocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eefd1250090f0a85e48d86a1d25f226e1a978d3", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "f5c6cb1d6373706ec11daef580be154ef47e1bca", "version-string": "2020-09-14", diff --git a/versions/l-/lz4.json b/versions/l-/lz4.json index 4888fb21f51a96..273f8d948008ee 100644 --- a/versions/l-/lz4.json +++ b/versions/l-/lz4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05857030abda5345ee64ed534732f07147844de6", + "version-string": "1.9.3", + "port-version": 1 + }, { "git-tree": "d1303e53c110c86d844b41116cd872c8bc967300", "version-string": "1.9.3", diff --git a/versions/l-/lzfse.json b/versions/l-/lzfse.json index 8ad75ab4cbb0e5..f49ffa2bfd2aed 100644 --- a/versions/l-/lzfse.json +++ b/versions/l-/lzfse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cfd69474709e71cfd7aef5b4c7ee6a635435c51c", + "version-string": "1.0", + "port-version": 3 + }, { "git-tree": "f0e728a2522f00a38e81a3762d4face63389b053", "version-string": "1.0-2", diff --git a/versions/l-/lzo.json b/versions/l-/lzo.json index 186064c9b27990..b93eed6c075179 100644 --- a/versions/l-/lzo.json +++ b/versions/l-/lzo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53ad9cb3534a54fd11bd559932edb1b5c67cd8d0", + "version-string": "2.10", + "port-version": 7 + }, { "git-tree": "0386bfc83656abde700f2f99732a92e7fd6ac756", "version-string": "2.10", diff --git a/versions/m-/magic-enum.json b/versions/m-/magic-enum.json index 7dc3625bf62d27..26748e3dd32d83 100644 --- a/versions/m-/magic-enum.json +++ b/versions/m-/magic-enum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1962d2e544199e80b56432fb1bd1e28c12cca3ad", + "version-string": "0.7.3", + "port-version": 1 + }, { "git-tree": "5ddbd41c3a32fa08982b2cf8eb7f3c13c77354d4", "version-string": "0.7.3", diff --git a/versions/m-/magnum-extras.json b/versions/m-/magnum-extras.json index 73eab23384f2a5..5dd98a61650766 100644 --- a/versions/m-/magnum-extras.json +++ b/versions/m-/magnum-extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c71b90dfcd2a568ce69a0692c2cbb2bc3a6de80", + "version-string": "2020.06", + "port-version": 1 + }, { "git-tree": "5cf4f8d9e709a2381f87d14819ddbef910c7f19c", "version-string": "2020.06", diff --git a/versions/m-/magnum-integration.json b/versions/m-/magnum-integration.json index 81ab6cc8e9ec93..7ccab489ad199d 100644 --- a/versions/m-/magnum-integration.json +++ b/versions/m-/magnum-integration.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46daa4efd5932336efa902d59660690d139eaf86", + "version-string": "2020.06", + "port-version": 1 + }, { "git-tree": "c76db7d967d207135ca8652f7023a29a7dbd0acc", "version-string": "2020.06", diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json index c506406ff6fd97..87c471d0ccde04 100644 --- a/versions/m-/magnum-plugins.json +++ b/versions/m-/magnum-plugins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "241189f2a82d541c88b682f409518b5802dcb39e", + "version-string": "2020.06", + "port-version": 7 + }, { "git-tree": "3aedbba0e9e694651549ff34fba8d6eeeb3fdde6", "version-string": "2020.06", diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json index 006dae3e1f3546..813d71305e9a6e 100644 --- a/versions/m-/magnum.json +++ b/versions/m-/magnum.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02916da34e2db9343355653309cbab7d8ff85f21", + "version-string": "2020.06", + "port-version": 7 + }, { "git-tree": "f420e42c1b841b4f3b2f2cda488a35f68b0677d7", "version-string": "2020.06", diff --git a/versions/m-/mapbox-variant.json b/versions/m-/mapbox-variant.json index 5ea81adca1e144..99c66d7627d132 100644 --- a/versions/m-/mapbox-variant.json +++ b/versions/m-/mapbox-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33967b083c32aab183281126cde3fdab878e71be", + "version-string": "1.2.0", + "port-version": 1 + }, { "git-tree": "c81bffd9497b08091cff4be8db0d2ec378a2adc2", "version-string": "1.2.0", diff --git a/versions/m-/mathc.json b/versions/m-/mathc.json index 39513bf33d0620..1637430f0d4563 100644 --- a/versions/m-/mathc.json +++ b/versions/m-/mathc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48feea0350aedda2b2e7470bdb52e3c6b215688a", + "version-string": "2019-09-29", + "port-version": 1 + }, { "git-tree": "ce8f1f68bcb55109aabea4ccfb17c3a3cbde5ef2", "version-string": "2019-09-29", diff --git a/versions/m-/mathgl.json b/versions/m-/mathgl.json index 93e51a4fd543cc..0b819735941e2a 100644 --- a/versions/m-/mathgl.json +++ b/versions/m-/mathgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4af49c54047fc9b315b888d5f51aef8748aba132", + "version-string": "2.4.3", + "port-version": 7 + }, { "git-tree": "73c110a8763070c78749ce041eea862716bba72a", "version-string": "2.4.3-6", diff --git a/versions/m-/matplotlib-cpp.json b/versions/m-/matplotlib-cpp.json index 59fe1b2f16df65..f237470b3ecae7 100644 --- a/versions/m-/matplotlib-cpp.json +++ b/versions/m-/matplotlib-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "baade687391a8a12d426361c378e7c1ee31d1182", + "version-string": "2020-08-27", + "port-version": 1 + }, { "git-tree": "fc40bac37aa51944e6e4d1b63dbaaef56651adf7", "version-string": "2020-08-27", diff --git a/versions/m-/matroska.json b/versions/m-/matroska.json index 8fa4dce2582d4c..10fa7d2aa6244a 100644 --- a/versions/m-/matroska.json +++ b/versions/m-/matroska.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f1a45086676ff21d75b117b36ae0a3b75e88feb", + "version-string": "1.6.2", + "port-version": 1 + }, { "git-tree": "621952db117431abe06ab8ec62f509ab812d239d", "version-string": "1.6.2", diff --git a/versions/m-/mbedtls.json b/versions/m-/mbedtls.json index 6498c4d2c107a9..d9fdc8f6b618c2 100644 --- a/versions/m-/mbedtls.json +++ b/versions/m-/mbedtls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a68475211755b3999de8cb2ec1d2fdfe9bb8ab10", + "version-string": "2.24.0", + "port-version": 3 + }, { "git-tree": "f1591b930b769b43c14a193282eb85e9a7c51a47", "version-string": "2.24.0", diff --git a/versions/m-/mcpp.json b/versions/m-/mcpp.json index b31f958a9fd3ca..695c914c78bf2e 100644 --- a/versions/m-/mcpp.json +++ b/versions/m-/mcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "beca539b781c4a50d092a4b02e9b2af455f14b40", + "version-string": "2.7.2.14", + "port-version": 3 + }, { "git-tree": "b5a0f89ae5e856ba0a4f3289230f2df88c4a028c", "version-string": "2.7.2.14", diff --git a/versions/m-/mdnsresponder.json b/versions/m-/mdnsresponder.json index c1d0de6974e0b0..642d33b22cf28a 100644 --- a/versions/m-/mdnsresponder.json +++ b/versions/m-/mdnsresponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9fb04c2649c37b42f0566c79c795d874d053df6", + "version-string": "765.30.11", + "port-version": 4 + }, { "git-tree": "6e48b77ecbfe0e11101526c0ed9b7e798bf66055", "version-string": "765.30.11", diff --git a/versions/m-/mecab.json b/versions/m-/mecab.json index 07328d5d251b50..aabc6ec2c06356 100644 --- a/versions/m-/mecab.json +++ b/versions/m-/mecab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5a2f4cbcaaa4aac05dc3c6ab814cf8db0047aab", + "version-string": "2019-09-25", + "port-version": 2 + }, { "git-tree": "1b2b6811a11c4dfd156f3ebccb2c83660e93ce1a", "version-string": "2019-09-25", diff --git a/versions/m-/memorymodule.json b/versions/m-/memorymodule.json index fbacc9b506acd9..45da1309cbd53b 100644 --- a/versions/m-/memorymodule.json +++ b/versions/m-/memorymodule.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55a786b4bc6d55f353749c06afa40b809ff8c9c4", + "version-string": "2019-12-31", + "port-version": 1 + }, { "git-tree": "20dc022d60890deec31c30e530881cf972c15253", "version-string": "2019-12-31", diff --git a/versions/m-/meschach.json b/versions/m-/meschach.json index 92986789535de7..ed69f8e81746d0 100644 --- a/versions/m-/meschach.json +++ b/versions/m-/meschach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11c21ca45a95bf05d74344c2518e3a9d107da566", + "version-string": "1.2b", + "port-version": 4 + }, { "git-tree": "6eb1cef7299cd3f060fd21c526ab29a8553766c2", "version-string": "1.2b-3", diff --git a/versions/m-/meshoptimizer.json b/versions/m-/meshoptimizer.json index 34f55815e994cc..cb58f7af4c13d2 100644 --- a/versions/m-/meshoptimizer.json +++ b/versions/m-/meshoptimizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f565fc6b5cc9a3c133af9193a7d06915cf9b6845", + "version-string": "0.14", + "port-version": 2 + }, { "git-tree": "b1e3e0ab70cf603738e55b8725d7ec834e7abfa6", "version-string": "0.14", diff --git a/versions/m-/metis.json b/versions/m-/metis.json index 7808d0f2bd0a3c..82f7ccab1707db 100644 --- a/versions/m-/metis.json +++ b/versions/m-/metis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3670208e9dc0b726c3c009e37f2398b7f2acca3", + "version-string": "5.1.0", + "port-version": 8 + }, { "git-tree": "b3ad4e99935fca4e79b5df63fb7a055686b4cf42", "version-string": "5.1.0", diff --git a/versions/m-/mgnlibs.json b/versions/m-/mgnlibs.json index e0adf5cc7cc947..ae2cc30baaeb54 100644 --- a/versions/m-/mgnlibs.json +++ b/versions/m-/mgnlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a611255e7ec6133fd9167e7db71227a7da8dd22", + "version-string": "2019-09-29", + "port-version": 1 + }, { "git-tree": "8672ed7edb6bb28df31224f1ff62ea68bbb6abf2", "version-string": "2019-09-29", diff --git a/versions/m-/mhook.json b/versions/m-/mhook.json index db9730b4f971fb..f2e9587c398166 100644 --- a/versions/m-/mhook.json +++ b/versions/m-/mhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63acd5f7a94d6b86d9fb2b3642e0fbd253f21e47", + "version-string": "2.5.1", + "port-version": 2 + }, { "git-tree": "8f4768d6f5dfac779008faae0a807dd6f9c23129", "version-string": "2.5.1-1", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index dfe7643059fd8a..3a7cdf9a9e1e8a 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f95ed360cce7fb3a2acd3684ba74619ebc1d75a3", + "version-string": "0.1.0-alpha3", + "port-version": 1 + }, { "git-tree": "4d840951b02dde36c320872fb7e64c1e89e7aa7d", "version-string": "0.1.0-alpha3", diff --git a/versions/m-/mikktspace.json b/versions/m-/mikktspace.json index b2b196dfade2e3..7e703855426691 100644 --- a/versions/m-/mikktspace.json +++ b/versions/m-/mikktspace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28fd852185e2def3476be4d85d4643e1a90204ee", + "version-string": "2020-10-06", + "port-version": 1 + }, { "git-tree": "859afcd720d96f2d3eae712a4df2e87c7a0a7723", "version-string": "2020-10-06", diff --git a/versions/m-/milerius-sfml-imgui.json b/versions/m-/milerius-sfml-imgui.json index 0252af96dce2a6..581b42fad13f99 100644 --- a/versions/m-/milerius-sfml-imgui.json +++ b/versions/m-/milerius-sfml-imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecf4d9fd039390613094ab42564601f32f9982c3", + "version-string": "1.1", + "port-version": 3 + }, { "git-tree": "a4143f10f8cf6b5d8d25626961e56fec4cb3c706", "version-string": "1.1-2", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index 623a0e0b4716d1..02d1adf42b2428 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5dfd6d52634b3dc1e63c380de459322b8c17f0a8", + "version-string": "1.6.4", + "port-version": 1 + }, { "git-tree": "e56e85546183d42a9831a167651bd40f9e59edb1", "version-string": "1.6.4", diff --git a/versions/m-/minc.json b/versions/m-/minc.json index 5ad61aa206ed40..875fca8fe5a18a 100644 --- a/versions/m-/minc.json +++ b/versions/m-/minc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1f17dd915374b25e123d358f01990425f3e0e97", + "version-string": "2.4.03", + "port-version": 2 + }, { "git-tree": "acdeaea4e9ff6ac06a4349375f57cfe0e66aa241", "version-string": "2.4.03", diff --git a/versions/m-/minhook.json b/versions/m-/minhook.json index f8762b2deeb980..8e90429e48504d 100644 --- a/versions/m-/minhook.json +++ b/versions/m-/minhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dbdd0ae999b8929af5e9df0cbae321bb0d71cea", + "version-string": "1.3.3", + "port-version": 2 + }, { "git-tree": "6d518eb93f8f8327d4470dcb1df1e45a4e94ba32", "version-string": "1.3.3", diff --git a/versions/m-/minifb.json b/versions/m-/minifb.json index 2545f8115565d1..c0f7d85514fa20 100644 --- a/versions/m-/minifb.json +++ b/versions/m-/minifb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c290d7a60106f75b013b4efa6b4287aa91385aab", + "version-string": "2019-08-20", + "port-version": 2 + }, { "git-tree": "0d292f83153e9e6a842131c237852b1a580df705", "version-string": "2019-08-20-1", diff --git a/versions/m-/minimp3.json b/versions/m-/minimp3.json index 930bc6543399e6..415f3d8c8be1da 100644 --- a/versions/m-/minimp3.json +++ b/versions/m-/minimp3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ed9d5474095c5aaecd2fc4ccab507523dd98241", + "version-string": "2020-12-25", + "port-version": 1 + }, { "git-tree": "40803dea0d5152a008dead0dc49d928a4ec78494", "version-string": "2020-12-25", diff --git a/versions/m-/minisat-master-keying.json b/versions/m-/minisat-master-keying.json index ebaf095e8d4b2a..fe7d267fc09d57 100644 --- a/versions/m-/minisat-master-keying.json +++ b/versions/m-/minisat-master-keying.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "175ab6a87c6a80cbbd2ff26c976c17cab6e8fff6", + "version-string": "2.2-mod", + "port-version": 3 + }, { "git-tree": "e81450d91579aa1a04809cc891ed2c43cd26e86e", "version-string": "2.2-mod-2", diff --git a/versions/m-/minitrace.json b/versions/m-/minitrace.json index 67ddf7de510c52..589fa8bdc06fe7 100644 --- a/versions/m-/minitrace.json +++ b/versions/m-/minitrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "673b7749d7e3be0b8f86b2f8452c5f548068add8", + "version-string": "2019.02.06", + "port-version": 1 + }, { "git-tree": "b050ea8f545743febd0e79347ef3cf5d6fe92e12", "version-string": "2019.02.06", diff --git a/versions/m-/miniupnpc.json b/versions/m-/miniupnpc.json index dc595787d0b792..e32fe58e984e26 100644 --- a/versions/m-/miniupnpc.json +++ b/versions/m-/miniupnpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f623d60c7ff375be1f55daa12fb1fcf119bb5a6", + "version-string": "2.1", + "port-version": 2 + }, { "git-tree": "b3f428b80985396d6731cfccffdfcb1f399ec53d", "version-string": "2.1-1", diff --git a/versions/m-/miniz.json b/versions/m-/miniz.json index 33c2cde3de73b2..ab806223e6354f 100644 --- a/versions/m-/miniz.json +++ b/versions/m-/miniz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76f01b924fd6003cc4d2a12b8e849444a7bbdd6e", + "version-string": "2.1.0", + "port-version": 2 + }, { "git-tree": "849d35ab99423558e72a9bfa69ae95ae11635fda", "version-string": "2.1.0-1", diff --git a/versions/m-/mio.json b/versions/m-/mio.json index b65624083d3439..805b6ca4b54d81 100644 --- a/versions/m-/mio.json +++ b/versions/m-/mio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96f1f36bdbe5fe85f143d83f1018a21ddb420180", + "version-string": "2019-02-10", + "port-version": 1 + }, { "git-tree": "43906b044c359b7c123887287b1b40c0fc25b479", "version-string": "2019-02-10", diff --git a/versions/m-/mman.json b/versions/m-/mman.json index 3a501005742358..bf224236114eae 100644 --- a/versions/m-/mman.json +++ b/versions/m-/mman.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30ad8930ff3b29bd994587b1ff58e5205deb32bc", + "version-string": "git-f5ff813", + "port-version": 4 + }, { "git-tree": "a732b3f36cfe52db33d67435daf53f1cc522db8b", "version-string": "git-f5ff813-3", diff --git a/versions/m-/mmx.json b/versions/m-/mmx.json index d78ee021467851..b504b1fa96e557 100644 --- a/versions/m-/mmx.json +++ b/versions/m-/mmx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a84c6441a555fa4b0afa0bbe61488b1bc692138", + "version-string": "2019-09-29", + "port-version": 1 + }, { "git-tree": "de7f696bc3b559e2376ef5cd52295776e539a4c0", "version-string": "2019-09-29", diff --git a/versions/m-/modp-base64.json b/versions/m-/modp-base64.json index 48f72fef69bdf1..0ec134f0162a6f 100644 --- a/versions/m-/modp-base64.json +++ b/versions/m-/modp-base64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e39629dc5108d0e7dac7c91bea6e7fbdeaeee14", + "version-string": "2020-09-26", + "port-version": 1 + }, { "git-tree": "e4f4036da7adface3f64eae79654f6adec72ef82", "version-string": "2020-09-26", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index fcaa06c27ddb13..9382f6603d3ec4 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afde1764bdbdc03cc32ffcb580bb587faa36b0c5", + "version-string": "3.4.0-5", + "port-version": 3 + }, { "git-tree": "d0b0f339d4533201003aefd28a57efc827414434", "version-string": "3.4.0-5", diff --git a/versions/m-/monkeys-audio.json b/versions/m-/monkeys-audio.json index 391e59c86e7102..b1effe8c7b997b 100644 --- a/versions/m-/monkeys-audio.json +++ b/versions/m-/monkeys-audio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7058d11b081c99f9be409c3770e9d41b6487505", + "version-string": "5.70", + "port-version": 1 + }, { "git-tree": "1214c3471adf4b1257484fe2b5e93c68f2be0d2f", "version-string": "5.70", diff --git a/versions/m-/moos-core.json b/versions/m-/moos-core.json index 82f05f4cf713cf..16f32ea8643588 100644 --- a/versions/m-/moos-core.json +++ b/versions/m-/moos-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbdd0d3fb08ac68bdd5d73aedb783d5edf912845", + "version-string": "10.4.0", + "port-version": 6 + }, { "git-tree": "c3b7758f06ce33435ff4882aaf51095ef1e0628d", "version-string": "10.4.0", diff --git a/versions/m-/moos-essential.json b/versions/m-/moos-essential.json index 4b6f069cc381f9..0cd9326520bbd2 100644 --- a/versions/m-/moos-essential.json +++ b/versions/m-/moos-essential.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11b1cc83a6dfc1cafed531cc20618bb6e8c13f97", + "version-string": "10.0.1", + "port-version": 3 + }, { "git-tree": "544617bd9ccb5e12e900533d38c8ce2bb930a3f1", "version-string": "10.0.1-2", diff --git a/versions/m-/moos-ui.json b/versions/m-/moos-ui.json index d59a6ecfe68aad..9dae922ad74f2e 100644 --- a/versions/m-/moos-ui.json +++ b/versions/m-/moos-ui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1f77392ef5dd2171f4125afd48a6bf9a69e4983", + "version-string": "10.0.1", + "port-version": 3 + }, { "git-tree": "14e23eda28b53d1891f92cc006744ca67ee0c4fe", "version-string": "10.0.1-2", diff --git a/versions/m-/morton-nd.json b/versions/m-/morton-nd.json index d21bc7c5418717..2eb016e7b778cb 100644 --- a/versions/m-/morton-nd.json +++ b/versions/m-/morton-nd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "753c7a016925df0630d4d9014ae98cfe34c87c35", + "version-string": "4.0.0", + "port-version": 1 + }, { "git-tree": "949f90299960d91f4cfd457a093dd70c5e285782", "version-string": "4.0.0", diff --git a/versions/m-/mozjpeg.json b/versions/m-/mozjpeg.json index aeaa17117a1dfd..25217d56917ed8 100644 --- a/versions/m-/mozjpeg.json +++ b/versions/m-/mozjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d92e5b33e3b57bed654510b0562ac82c68019cf", + "version-string": "2020-06-02", + "port-version": 3 + }, { "git-tree": "edf9c537c7b19a49a2aac339e4cd4a96d6d0c774", "version-string": "2020-06-02", diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json index dc47cb0614e6a4..9319735f0b2a2e 100644 --- a/versions/m-/mp-units.json +++ b/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f39d5365e27cf32f149da1ef78f0ae6cd09e9039", + "version-string": "0.6.0", + "port-version": 1 + }, { "git-tree": "fd2c36c9ab20e2e27330592205b3e3851cab5ebc", "version-string": "0.6.0", diff --git a/versions/m-/mp3lame.json b/versions/m-/mp3lame.json index 067845d8211105..bcabc3520c1a28 100644 --- a/versions/m-/mp3lame.json +++ b/versions/m-/mp3lame.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ead40ed860e86cd8c3c5492b9bb3fcc7c8a2770e", + "version-string": "3.100", + "port-version": 7 + }, { "git-tree": "ea9ad10f5f14516799474a20ee31662f7de8d52a", "version-string": "3.100", diff --git a/versions/m-/mpark-variant.json b/versions/m-/mpark-variant.json index 271dbd2581beab..16039c5cb94517 100644 --- a/versions/m-/mpark-variant.json +++ b/versions/m-/mpark-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "baf25f3166e04b5ccadd946c9b8d5c93da74b8f0", + "version-string": "1.4.0", + "port-version": 1 + }, { "git-tree": "ce9cbdb149d5767262e26b62fbb9819a6459718f", "version-string": "1.4.0", diff --git a/versions/m-/mpc.json b/versions/m-/mpc.json index 240192016834bf..209ac786cb76a8 100644 --- a/versions/m-/mpc.json +++ b/versions/m-/mpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ef4f1423bd95ed6bbe514de46fc9f4c8884ae5e", + "version-string": "1.2.0", + "port-version": 1 + }, { "git-tree": "82cc965290366b6d4cbc8996a8b9e335769920c8", "version-string": "1.2.0", diff --git a/versions/m-/mpfr.json b/versions/m-/mpfr.json index 84a29abfe3772b..3db92fe86e01ee 100644 --- a/versions/m-/mpfr.json +++ b/versions/m-/mpfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54544af431b7f178bc7bbe6604f103c40b7aa93b", + "version-string": "4.1.0", + "port-version": 1 + }, { "git-tree": "6cb77c01fbda04c72b1767e3fbd79078bd29895e", "version-string": "4.1.0", diff --git a/versions/m-/mpi.json b/versions/m-/mpi.json index d4f35d8988e3e0..20b06883d1d623 100644 --- a/versions/m-/mpi.json +++ b/versions/m-/mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37ad8f71ce08f401038c2468f5776b0bd4265e4f", + "version-string": "1", + "port-version": 1 + }, { "git-tree": "71c3ebcd0d6f9b7b65d907ae5652a7fac3253775", "version-string": "1", diff --git a/versions/m-/mpmcqueue.json b/versions/m-/mpmcqueue.json index 072f77820ad3a3..7e226ceda34aa9 100644 --- a/versions/m-/mpmcqueue.json +++ b/versions/m-/mpmcqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1953040343e61f40deb621b5ca28aed36ebc2008", + "version-string": "2019-07-26", + "port-version": 1 + }, { "git-tree": "5d51c7ac12930b7a4b26c5cde81d5a0c92d3c56d", "version-string": "2019-07-26", diff --git a/versions/m-/mqtt-cpp.json b/versions/m-/mqtt-cpp.json index 5bb8b22af95063..24567c512f9a5b 100644 --- a/versions/m-/mqtt-cpp.json +++ b/versions/m-/mqtt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f27414bfee2919393dcfd5da41342fab9ba13ae", + "version-string": "9.0.0", + "port-version": 1 + }, { "git-tree": "076f74542bc427bf248bed66553c4ed0a941be8c", "version-string": "9.0.0", diff --git a/versions/m-/ms-angle.json b/versions/m-/ms-angle.json index f5fbfd41385381..492a7638c72b36 100644 --- a/versions/m-/ms-angle.json +++ b/versions/m-/ms-angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fd6a2ea2fbded3b2e1de5e98ee81b59beaa14d4", + "version-string": "alias", + "port-version": 1 + }, { "git-tree": "ca605f2187feef6d74eabacbdf7e83216b4241e5", "version-string": "alias", diff --git a/versions/m-/ms-gsl.json b/versions/m-/ms-gsl.json index c3c900d2abc1c4..a33d7ae4881c16 100644 --- a/versions/m-/ms-gsl.json +++ b/versions/m-/ms-gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d51947d40835a72b1728c68ca8587e04e3f8e1e2", + "version-string": "3.1.0", + "port-version": 1 + }, { "git-tree": "75aed40fd77dd1c0f123fe92df90d3aef55e7466", "version-string": "3.1.0", diff --git a/versions/m-/msgpack.json b/versions/m-/msgpack.json index 8f3c9618a44cf8..d21cc8c3e55921 100644 --- a/versions/m-/msgpack.json +++ b/versions/m-/msgpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed079e3006a28fcef3dc95c108e03d20027de40c", + "version-string": "3.3.0", + "port-version": 1 + }, { "git-tree": "61d9adf5fb7555558588762d38e34544c6a38e25", "version-string": "3.3.0", diff --git a/versions/m-/msinttypes.json b/versions/m-/msinttypes.json index f9e636dbde9e07..f59de2c3b00f95 100644 --- a/versions/m-/msinttypes.json +++ b/versions/m-/msinttypes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e912f42451c0d3a2563a68db50d96318bd277e40", + "version-string": "2018-02-25", + "port-version": 1 + }, { "git-tree": "1d44711d68afe966e4864bddf426de6d589b4d85", "version-string": "2018-02-25", diff --git a/versions/m-/mstch.json b/versions/m-/mstch.json index 8519ddfd263343..52ebb16974b720 100644 --- a/versions/m-/mstch.json +++ b/versions/m-/mstch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc5a6f09703a12b736263285c46ce9056b853dcb", + "version-string": "1.0.2", + "port-version": 3 + }, { "git-tree": "c30daa60881cea1db66414a17b0de32b3f76c5b1", "version-string": "1.0.2-2", diff --git a/versions/m-/mujs.json b/versions/m-/mujs.json index dcbd03b3128078..a500b6acf38dac 100644 --- a/versions/m-/mujs.json +++ b/versions/m-/mujs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b08453227e8770baadeb826bb3cd711815e6a865", + "version-string": "2018-07-30", + "port-version": 2 + }, { "git-tree": "4e3dc249bb1190e025b5189e9e8a7624b435fce5", "version-string": "2018-07-30-1", diff --git a/versions/m-/munit.json b/versions/m-/munit.json index 0af7e7542d0a66..05267b5019ddf2 100644 --- a/versions/m-/munit.json +++ b/versions/m-/munit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e73f59b95da8f7045c775a0fc263c5d2da26b320", + "version-string": "2019-04-06", + "port-version": 2 + }, { "git-tree": "45b3a29080b2b88733c00de98297e431917568ab", "version-string": "2019-04-06", diff --git a/versions/m-/muparser.json b/versions/m-/muparser.json index 11d28ef8752728..53f8dfd72541b8 100644 --- a/versions/m-/muparser.json +++ b/versions/m-/muparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60a779cc21e94cf9ef8a7df52a0177d79f298e2d", + "version-string": "2.3.2", + "port-version": 1 + }, { "git-tree": "88f24afa700f3c4e50ba65ab7b8a0e5ac32d2512", "version-string": "2.3.2", diff --git a/versions/m-/murmurhash.json b/versions/m-/murmurhash.json index 6b9205ee0049e9..a34122123adda8 100644 --- a/versions/m-/murmurhash.json +++ b/versions/m-/murmurhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c0ccc0561113eac6ab8881d62a94f31a4ab8d70", + "version-string": "2016-01-09", + "port-version": 4 + }, { "git-tree": "fb66af217c56447fa8a7d80988f461acafae4dfa", "version-string": "2016-01-09-3", diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json index afdd8bba511389..581c0b1ff438db 100644 --- a/versions/m-/mygui.json +++ b/versions/m-/mygui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d8226795430e83c733e936821400cf792265656", + "version-string": "2020-06-17", + "port-version": 1 + }, { "git-tree": "f66dcaf503832c67a615a560fe943cd5fba00c0d", "version-string": "2020-06-17", diff --git a/versions/n-/nameof.json b/versions/n-/nameof.json index adb621c0f8647e..2bce04d6369903 100644 --- a/versions/n-/nameof.json +++ b/versions/n-/nameof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73b076af7e5bb74d8531885c3172ccdea74bce80", + "version-string": "0.10.1", + "port-version": 1 + }, { "git-tree": "3a556c1feb836e7e35ec66c2c9879235827d45f7", "version-string": "0.10.1", diff --git a/versions/n-/nano-signal-slot.json b/versions/n-/nano-signal-slot.json index 59f2454562649c..c5ca118d7c8109 100644 --- a/versions/n-/nano-signal-slot.json +++ b/versions/n-/nano-signal-slot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b46cf4c106c7a062c72ff464ad172d52f9f2a642", + "version-string": "2.0.1", + "port-version": 1 + }, { "git-tree": "c6a06a1a383f174caa5a7559cee00b0a997ff482", "version-string": "2.0.1", diff --git a/versions/n-/nanobench.json b/versions/n-/nanobench.json index 5c6351f977c100..de8cc9db734318 100644 --- a/versions/n-/nanobench.json +++ b/versions/n-/nanobench.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7dea56e415792e4f5c3a2b80ba3731a2955fbf2", + "version-string": "4.3.0", + "port-version": 1 + }, { "git-tree": "92e0f95608004b243767ee74382095a2a087da58", "version-string": "4.3.0", diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index 2f53779affe5b7..df5aec220f3658 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "256c8df02e530498eeb951b7760d5988d22615eb", + "version-string": "1.3.1", + "port-version": 1 + }, { "git-tree": "d570a82d4db97264fa7c99bdbbea6f5d42d9e674", "version-string": "1.3.1", diff --git a/versions/n-/nanogui.json b/versions/n-/nanogui.json index 3c4780729ec1fc..96ea5ef6b79057 100644 --- a/versions/n-/nanogui.json +++ b/versions/n-/nanogui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb3bc286985c1be4bb92ab92e45617410726de3c", + "version-string": "2019-09-23", + "port-version": 2 + }, { "git-tree": "4d1fa22f0634b118230bfba869eff9c23ceecbc3", "version-string": "2019-09-23", diff --git a/versions/n-/nanomsg.json b/versions/n-/nanomsg.json index 35892464450e2b..6737ed193034e0 100644 --- a/versions/n-/nanomsg.json +++ b/versions/n-/nanomsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c34a4dcd9b1c045f989cc67c0dad5ac594696d4", + "version-string": "1.1.5", + "port-version": 3 + }, { "git-tree": "8d195243efc98f0bfed5942ebf226879fcf5d545", "version-string": "1.1.5-2", diff --git a/versions/n-/nanoprintf.json b/versions/n-/nanoprintf.json index 127be4ea4d4ef7..44d94b76f673c1 100644 --- a/versions/n-/nanoprintf.json +++ b/versions/n-/nanoprintf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb37eca3c4891582693eb5a769cf307c60b059ac", + "version-string": "2020-05-27", + "port-version": 1 + }, { "git-tree": "d46293c2d3548e9170ec8a0b30cef90cf9638a2c", "version-string": "2020-05-27", diff --git a/versions/n-/nanorange.json b/versions/n-/nanorange.json index c345de482990e6..308349280b8b95 100644 --- a/versions/n-/nanorange.json +++ b/versions/n-/nanorange.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9d8e3712ada3496381d4a9ec4d8b6eb638f65e8", + "version-string": "0.0.0", + "port-version": 1 + }, { "git-tree": "44197d1b2631aa3de246da4cf6e9546a225bf9c2", "version-string": "0.0.0", diff --git a/versions/n-/nanort.json b/versions/n-/nanort.json index c07b3ff82a86bf..54e855482ed27b 100644 --- a/versions/n-/nanort.json +++ b/versions/n-/nanort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fab3a6181cbaace8875990f9aab595cdad59956", + "version-string": "2019-08-20", + "port-version": 2 + }, { "git-tree": "a2635321561486b77f14251f44d1b3ce29ec1b24", "version-string": "2019-08-20-1", diff --git a/versions/n-/nanovg.json b/versions/n-/nanovg.json index d4db306d3f7fb8..3393bb25fd23aa 100644 --- a/versions/n-/nanovg.json +++ b/versions/n-/nanovg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "016ef1232ccb3f452530283711be418b33c28e17", + "version-string": "2019-8-30", + "port-version": 4 + }, { "git-tree": "9d02e60630da5a385a4f9fbdea0f0fcffae78ff9", "version-string": "2019-8-30-3", diff --git a/versions/n-/neargye-semver.json b/versions/n-/neargye-semver.json index 0a02048402d3b1..a4c61e9cc44d18 100644 --- a/versions/n-/neargye-semver.json +++ b/versions/n-/neargye-semver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cc7cede702d8dfd563701819a5e8ed3d0778236", + "version-string": "0.2.2", + "port-version": 1 + }, { "git-tree": "eccabb2b0f4df666dbb95a7c14c3f8f1b8e57cd4", "version-string": "0.2.2", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index f03c5b15f0ba28..b19151577b7405 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cd8528057f78bdbc43616bbe7349acd5cc41c77", + "version-string": "0.0.0-7cb75d4e", + "port-version": 1 + }, { "git-tree": "22e381237aadb997367803430ddb3f4290acc88c", "version-string": "0.0.0-7cb75d4e", diff --git a/versions/n-/netcdf-cxx4.json b/versions/n-/netcdf-cxx4.json index c7ab9a16b3981a..a98d4e510d1808 100644 --- a/versions/n-/netcdf-cxx4.json +++ b/versions/n-/netcdf-cxx4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e973009e3eb7bc949e546204441002d914aa8886", + "version-string": "4.3.1", + "port-version": 3 + }, { "git-tree": "17850b6ba47c047dc7e2e55bdb6b2956521d424c", "version-string": "4.3.1", diff --git a/versions/n-/nethost.json b/versions/n-/nethost.json index cb9f17b53fbcfc..c430d8a410950e 100644 --- a/versions/n-/nethost.json +++ b/versions/n-/nethost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15d7240f68194b95c97bdac0658a1ffce7015f34", + "version-string": "2019-12-21", + "port-version": 1 + }, { "git-tree": "ca0380ac4071317e01632a0af40ffacd2ab133fd", "version-string": "2019-12-21", diff --git a/versions/n-/networkdirect-sdk.json b/versions/n-/networkdirect-sdk.json index cc486c5d32a342..9032a3a6fc8905 100644 --- a/versions/n-/networkdirect-sdk.json +++ b/versions/n-/networkdirect-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38faf77539eb45a0336501ea8af5d63b9ca11c83", + "version-string": "2.0.1", + "port-version": 2 + }, { "git-tree": "33dae8e97560e2d4c72ea3d0e49e59a70ee3d979", "version-string": "2.0.1", diff --git a/versions/n-/nifticlib.json b/versions/n-/nifticlib.json index dc15a05763ec9b..b3f2e4843c370d 100644 --- a/versions/n-/nifticlib.json +++ b/versions/n-/nifticlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e27d9a2c6e8d4b8b00fc3d1adb0f54f06fa5adee", + "version-string": "2020-04-30", + "port-version": 1 + }, { "git-tree": "28adfbbaaf62ef125a255045592cd935532a6e2d", "version-string": "2020-04-30", diff --git a/versions/n-/nlohmann-fifo-map.json b/versions/n-/nlohmann-fifo-map.json index 11bf05e6dc8eb3..86d45ffcc9f325 100644 --- a/versions/n-/nlohmann-fifo-map.json +++ b/versions/n-/nlohmann-fifo-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de935008898a0cfdb6326baedb7781bcbd5df4e7", + "version-string": "2018.05.07", + "port-version": 2 + }, { "git-tree": "f9a56c0cc09fe04a1c98d9d37403c82718ba7e69", "version-string": "2018.05.07-1", diff --git a/versions/n-/nmslib.json b/versions/n-/nmslib.json index edacfb3c61b81a..e81d611bf6cabe 100644 --- a/versions/n-/nmslib.json +++ b/versions/n-/nmslib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc690326d2976978fc71bb8c0e5a631e6cec0064", + "version-string": "2.0.6", + "port-version": 1 + }, { "git-tree": "8aa3ecb4ff8364680fe15c756eb2e8a0fecbc167", "version-string": "2.0.6", diff --git a/versions/n-/nngpp.json b/versions/n-/nngpp.json index 3701dacc328ee8..d25213f47f2669 100644 --- a/versions/n-/nngpp.json +++ b/versions/n-/nngpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "810ec96450510773b75e29d42eb11792651b3e44", + "version-string": "1.3.0", + "port-version": 1 + }, { "git-tree": "492c863329effc469c9ac7cf6d5c18b6e968df94", "version-string": "1.3.0", diff --git a/versions/n-/nonius.json b/versions/n-/nonius.json index 2b0113eabc2f20..b9755e5eb52a2a 100644 --- a/versions/n-/nonius.json +++ b/versions/n-/nonius.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35083b1d3db802ef074b75da839d035ac965a420", + "version-string": "2019-04-20", + "port-version": 2 + }, { "git-tree": "57ab8e437a9552f2fc12a3854b4965912a8a1778", "version-string": "2019-04-20-1", diff --git a/versions/n-/nrf-ble-driver.json b/versions/n-/nrf-ble-driver.json index b8b581911675dd..e01064548fe8a9 100644 --- a/versions/n-/nrf-ble-driver.json +++ b/versions/n-/nrf-ble-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0f55511374a869316d374399923f94dc25c4150", + "version-string": "4.1.2", + "port-version": 1 + }, { "git-tree": "0fe2fd730090128aa5c3b528b5c4b6374be2019b", "version-string": "4.1.2", diff --git a/versions/n-/nt-wrapper.json b/versions/n-/nt-wrapper.json index 79907176fe50ad..fcac3ced0f6597 100644 --- a/versions/n-/nt-wrapper.json +++ b/versions/n-/nt-wrapper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60826cea5f3d16ff79fff864e3ad13239d78a193", + "version-string": "2019-08-10", + "port-version": 1 + }, { "git-tree": "25fbda0e2379901e9d90c04d4c11905d37b1fc77", "version-string": "2019-08-10", diff --git a/versions/n-/numactl.json b/versions/n-/numactl.json index 8cdc077c63613c..e934d4317e0e31 100644 --- a/versions/n-/numactl.json +++ b/versions/n-/numactl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b58d763ea0a2c64e755c647c115d6e63ea44617", + "version-string": "2.0.12", + "port-version": 1 + }, { "git-tree": "3539b8994b1dd0a661ed4a7fa69ef53feb4a1a58", "version-string": "2.0.12", diff --git a/versions/n-/nvtt.json b/versions/n-/nvtt.json index 6897ea6e79179f..6941d034b59355 100644 --- a/versions/n-/nvtt.json +++ b/versions/n-/nvtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80005bae9d45f506abd7b21dd09b246703381174", + "version-string": "2.1.2", + "port-version": 2 + }, { "git-tree": "3fa6fad1d67126e06c84897f1130e6d778f9e67f", "version-string": "2.1.2", diff --git a/versions/o-/observer-ptr-lite.json b/versions/o-/observer-ptr-lite.json index d5e996e9ce9e56..49d16f73d3390b 100644 --- a/versions/o-/observer-ptr-lite.json +++ b/versions/o-/observer-ptr-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b83218c276fe75db652651f2216faecc7aeb062e", + "version-string": "0.4.0", + "port-version": 1 + }, { "git-tree": "173708d071e8fa3482f39a722939da9c49d06517", "version-string": "0.4.0", diff --git a/versions/o-/octomap.json b/versions/o-/octomap.json index c9f30c315c0686..0e046deb987047 100644 --- a/versions/o-/octomap.json +++ b/versions/o-/octomap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "603822afeb335c9005956f3791668fb4a449d7b4", + "version-string": "1.9.5", + "port-version": 1 + }, { "git-tree": "88a9ea43b36cb364195d0c67fdf38a7b1fa447f8", "version-string": "1.9.5", diff --git a/versions/o-/ode.json b/versions/o-/ode.json index 168e83e573cac5..aecb5f5dbe5b92 100644 --- a/versions/o-/ode.json +++ b/versions/o-/ode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b4c24af36c99cf547f0a2026062a91d1d78f90a", + "version-string": "0.16.1", + "port-version": 1 + }, { "git-tree": "b8276cb76d86e838d84606657d6f37d5cde4a814", "version-string": "0.16.1", diff --git a/versions/o-/offscale-libetcd-cpp.json b/versions/o-/offscale-libetcd-cpp.json index cb47e97ccb6dbd..729cae973b9dde 100644 --- a/versions/o-/offscale-libetcd-cpp.json +++ b/versions/o-/offscale-libetcd-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58aea86d7da68c1cad8d684197c39e23945b8d91", + "version-string": "2019-07-10", + "port-version": 2 + }, { "git-tree": "4e25b14275c81e16195194a2dfd5058dd3522008", "version-string": "2019-07-10-1", diff --git a/versions/o-/ogdf.json b/versions/o-/ogdf.json index b9548058ba0bda..d7d605da07f9c5 100644 --- a/versions/o-/ogdf.json +++ b/versions/o-/ogdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a3d7f1e718f35843520add2d7e102b12586e401", + "version-string": "2019-08-23", + "port-version": 2 + }, { "git-tree": "babb8cfc3b4ac7c02a6221a4a4640ff63c39fd6a", "version-string": "2019-08-23", diff --git a/versions/o-/ogre-next.json b/versions/o-/ogre-next.json index c8a17059ae7a48..88181a1f30e37c 100644 --- a/versions/o-/ogre-next.json +++ b/versions/o-/ogre-next.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d2e2e06d0b21779df8bd6579387805dc06ca6ff", + "version-string": "2019-10-20", + "port-version": 2 + }, { "git-tree": "d8a84a70373caadf837280fe2873d5d286d2c770", "version-string": "2019-10-20-1", diff --git a/versions/o-/ompl.json b/versions/o-/ompl.json index 801fcdea68f274..7330973c5f509b 100644 --- a/versions/o-/ompl.json +++ b/versions/o-/ompl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "87e475355f626557d8762d014c7f0efa2d2d488e", + "version-string": "1.5.1", + "port-version": 2 + }, { "git-tree": "f3812117c1ed1d4080155284f12908236dd797f5", "version-string": "1.5.1", diff --git a/versions/o-/oniguruma.json b/versions/o-/oniguruma.json index c0aa1cee9eb049..c81566eec2c02a 100644 --- a/versions/o-/oniguruma.json +++ b/versions/o-/oniguruma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bdcd32cc762467cca4b13b2ed11e6dd5c515cf8", + "version-string": "6.9.4", + "port-version": 1 + }, { "git-tree": "b634145f43e8207123e82305f0b2d2be0b8ac65f", "version-string": "6.9.4", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 41455245125dd0..84d4ff52937b05 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7237c216387119d00fe5d113c6c666f1572b2f0", + "version-string": "7.5.0", + "port-version": 2 + }, { "git-tree": "1afbbcf0d6d85963a334b8ae8e95b4fe16a9ff5b", "version-string": "7.5.0", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index 38252a8b359e4b..2dff67ec4d53e1 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4236b23738ad59b661253bf3a449355d838cb7dc", + "version-string": "2020-04-26", + "port-version": 8 + }, { "git-tree": "cd8da026ffad42709da43cbbc8105ed1cdd01c70", "version-string": "2020-04-26", diff --git a/versions/o-/opencensus-cpp.json b/versions/o-/opencensus-cpp.json index 9fd0d45f608043..5954c8bfee1795 100644 --- a/versions/o-/opencensus-cpp.json +++ b/versions/o-/opencensus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd8e1133cda88028a939ad52bd047894959fc9fd", + "version-string": "0.4.0", + "port-version": 2 + }, { "git-tree": "761b1a467f5402007072e8f3282ec2e8801615d3", "version-string": "0.4.0-1", diff --git a/versions/o-/opencl.json b/versions/o-/opencl.json index 68c1b983fb2610..51e3609b1e3958 100644 --- a/versions/o-/opencl.json +++ b/versions/o-/opencl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d58793b575b614e5832f803d5e679b64e991a9", + "version-string": "2.2", + "port-version": 8 + }, { "git-tree": "9f93abeb8cc37eb7d67dc0c5f526ec264735de56", "version-string": "2.2", diff --git a/versions/o-/opencsg.json b/versions/o-/opencsg.json index 56f88742174ba3..def1e3736bc638 100644 --- a/versions/o-/opencsg.json +++ b/versions/o-/opencsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd3c126ac4b2377c60b3c005cd873825ca28f062", + "version-string": "1.4.2", + "port-version": 2 + }, { "git-tree": "cb2b61c16440cc89a39a8b4a6957a3489561cd37", "version-string": "1.4.2-1", diff --git a/versions/o-/opengl-registry.json b/versions/o-/opengl-registry.json index ff5e8418122f2c..8ce7ce57fcd99d 100644 --- a/versions/o-/opengl-registry.json +++ b/versions/o-/opengl-registry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d14f0786a99a87d5d429ba257674fb55e93ccae6", + "version-string": "2020-03-25", + "port-version": 1 + }, { "git-tree": "d23f8ad18109c3545ec5fd5e1475a312d9e656b5", "version-string": "2020-03-25", diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json index fa603e1e6bab1d..687d48943c8cf0 100644 --- a/versions/o-/opengl.json +++ b/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fa8ed2a1fb625613a32ee95d2413dbc921860f7", + "version-string": "0.0", + "port-version": 9 + }, { "git-tree": "5868fea6f867eb1c81cf269f9cd239aecf62fe70", "version-string": "0.0", diff --git a/versions/o-/openigtlink.json b/versions/o-/openigtlink.json index 50418027fb8bd4..cc11c722782799 100644 --- a/versions/o-/openigtlink.json +++ b/versions/o-/openigtlink.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f384eebd3c8103ad8b23aed6cda655217f091fd", + "version-string": "3.0", + "port-version": 2 + }, { "git-tree": "6f814a06b22cc250df4eb31553c6df7a803567b7", "version-string": "3.0", diff --git a/versions/o-/openmesh.json b/versions/o-/openmesh.json index 1933e9b0403044..28109452d75a1d 100644 --- a/versions/o-/openmesh.json +++ b/versions/o-/openmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c243179bd63b698826adde0be25dae93a9afd26a", + "version-string": "8.1", + "port-version": 1 + }, { "git-tree": "efdc08a5f186ff804bdcca5df533835bbe27965e", "version-string": "8.1", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index ab6a507912887d..aaa38297177631 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcc3284d0c3730ee4237efff0cd32df0be272d8e", + "version-string": "4.1.0", + "port-version": 1 + }, { "git-tree": "ada9b58df7928b49218b4b932e37b343a2047273", "version-string": "4.1.0", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 2e43a35ec9d410..813b4c71be4a37 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35e7c38229f3ddc1e59be044e8daa29afc650f99", + "version-string": "1.1", + "port-version": 5 + }, { "git-tree": "a14a8fbedb0cb071c7f6b3d97d3c12d6c27f678e", "version-string": "1.1", diff --git a/versions/o-/openni2.json b/versions/o-/openni2.json index 7f09cef1dee17e..2cfe48f9e33a25 100644 --- a/versions/o-/openni2.json +++ b/versions/o-/openni2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fd7382fff870dcc4920d0ff72e5ba00ad74fa6f", + "version-string": "2.2.0.33", + "port-version": 12 + }, { "git-tree": "b3f6a5b9e0580c4ca1437ca2251e8d370260b6c8", "version-string": "2.2.0.33-11", diff --git a/versions/o-/openscap.json b/versions/o-/openscap.json index 7949d83efb0c9f..7a5ee2f30ed460 100644 --- a/versions/o-/openscap.json +++ b/versions/o-/openscap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecbc2e72085ae6324948b52314de3b7e701376a5", + "version-string": "1.3.1", + "port-version": 1 + }, { "git-tree": "9c249b02fd6825acc7534912b280f31b941260bd", "version-string": "1.3.1", diff --git a/versions/o-/openssl-unix.json b/versions/o-/openssl-unix.json index 97920e709e69e3..069de9f8e6da30 100644 --- a/versions/o-/openssl-unix.json +++ b/versions/o-/openssl-unix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6084ac3842ee1641284254bffc3f01706a372eac", + "version-string": "1.1.1h", + "port-version": 2 + }, { "git-tree": "dda72388849087e4edb2be900f5448376a6f5215", "version-string": "1.1.1h", diff --git a/versions/o-/openssl-uwp.json b/versions/o-/openssl-uwp.json index f6dffeb926149f..787aa974c749a8 100644 --- a/versions/o-/openssl-uwp.json +++ b/versions/o-/openssl-uwp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a51fbd29a373e9c57ed233d581112359109a234", + "version-string": "1.1.1h", + "port-version": 2 + }, { "git-tree": "84398c4b851a28c5ca622c249d51c17d023518b7", "version-string": "1.1.1h", diff --git a/versions/o-/openssl-windows.json b/versions/o-/openssl-windows.json index 2d243a981778af..f2f14a2201fca3 100644 --- a/versions/o-/openssl-windows.json +++ b/versions/o-/openssl-windows.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a169239b58831cf291de837dc26a357585136d9", + "version-string": "1.1.1h", + "port-version": 2 + }, { "git-tree": "526d4688d5ca8cdcbac22b8ff18f9aac10a8c695", "version-string": "1.1.1h", diff --git a/versions/o-/openvpn3.json b/versions/o-/openvpn3.json index 8f479413901bf1..26f6e68e090304 100644 --- a/versions/o-/openvpn3.json +++ b/versions/o-/openvpn3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf20f11ad1fb64e74ebcfda5a3b3c19b8e4770ae", + "version-string": "3.4.1", + "port-version": 2 + }, { "git-tree": "4b177cc0bde1f1f8c6ca22ab10d7ab92657c8d3f", "version-string": "3.4.1-1", diff --git a/versions/o-/openvr.json b/versions/o-/openvr.json index 49b04bdc7f82d4..d26235515817ec 100644 --- a/versions/o-/openvr.json +++ b/versions/o-/openvr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd3839d56ad4263ecc52a94440b22333ab1d7bfe", + "version-string": "1.16.8", + "port-version": 1 + }, { "git-tree": "35ae9e20bdad47bb81e72b6ec792b6d15f6fba93", "version-string": "1.16.8", diff --git a/versions/o-/openxr-loader.json b/versions/o-/openxr-loader.json index 66251650cfd6f8..217c909c3aedbf 100644 --- a/versions/o-/openxr-loader.json +++ b/versions/o-/openxr-loader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d72d589a9281315c0e7ee4b9dd697b7147c0258", + "version-string": "1.0.18", + "port-version": 2 + }, { "git-tree": "6674369c2498960b44d097881c3573857a7da92e", "version-string": "1.0.18", diff --git a/versions/o-/optional-bare.json b/versions/o-/optional-bare.json index 9930bee82d8c11..2069cbf6df4e02 100644 --- a/versions/o-/optional-bare.json +++ b/versions/o-/optional-bare.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf4fb4b8c0afe5a0b8e475610a426221698f2513", + "version-string": "1.1.0", + "port-version": 1 + }, { "git-tree": "0b71c15d07ac746c0c5320aba788acca216c4f3c", "version-string": "1.1.0", diff --git a/versions/o-/optional-lite.json b/versions/o-/optional-lite.json index 6e52700bf88475..4f2c3b26030db5 100644 --- a/versions/o-/optional-lite.json +++ b/versions/o-/optional-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6434c7b71c70b8ce50c3a1cc38aa35afc9bdf73", + "version-string": "3.2.0", + "port-version": 1 + }, { "git-tree": "f95f2a06aec2297861f4a5e56dee34941a5898e9", "version-string": "3.2.0", diff --git a/versions/o-/opus.json b/versions/o-/opus.json index a0c0fee1d7c830..bdd667ec3e30a0 100644 --- a/versions/o-/opus.json +++ b/versions/o-/opus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e718de4be5f3dcb0e0c7922a9ef7ef13bf5148b3", + "version-string": "1.3.1", + "port-version": 6 + }, { "git-tree": "9aa015835678b6dec3bf2a5ee904d68a746fac0c", "version-string": "1.3.1", diff --git a/versions/o-/opusfile.json b/versions/o-/opusfile.json index 8102b4f83f6cbd..3555d2b863264e 100644 --- a/versions/o-/opusfile.json +++ b/versions/o-/opusfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9192001e60ba1f9d34e8f45ecde1139c5d40d474", + "version-string": "0.12", + "port-version": 1 + }, { "git-tree": "3c2a8c76974f548268451580c5e5599c7d435dc6", "version-string": "0.12", diff --git a/versions/o-/orc.json b/versions/o-/orc.json index a8d1276adc4bdb..23e58df0a4be31 100644 --- a/versions/o-/orc.json +++ b/versions/o-/orc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cd78baa4d8b7df9077f76b8f5d600aac6e09716", + "version-string": "1.6.4", + "port-version": 2 + }, { "git-tree": "80c6805ca7328eee7a8c27608e346274ff35baa1", "version-string": "1.6.4", diff --git a/versions/o-/osg-qt.json b/versions/o-/osg-qt.json index 293b592f040c38..699d474b75489f 100644 --- a/versions/o-/osg-qt.json +++ b/versions/o-/osg-qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "743cc988a45a861fc3de537f6e8720a38a4cf90f", + "version-string": "Qt5", + "port-version": 2 + }, { "git-tree": "a02ebd7a6494e03f4a70553af4a525e1b7e17643", "version-string": "Qt5", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 3a40b3ef90e7f0..c2199541729c70 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a5b4c77e1ac62bb98a0deb970fc39a4976cc528", + "version-string": "3.6.5", + "port-version": 8 + }, { "git-tree": "41c640888000654e84d2bf227b42973cc1ba15c9", "version-string": "3.6.5", diff --git a/versions/o-/osi.json b/versions/o-/osi.json index f83d2f6ebcc9c1..7f1d04ea79c971 100644 --- a/versions/o-/osi.json +++ b/versions/o-/osi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bca240e0ada50982cf8d3f202dc20a732bcffc4", + "version-string": "0.108.6", + "port-version": 1 + }, { "git-tree": "0430fc0a3bf8fd6e38563fb6c6b0f82d2f8159b3", "version-string": "0.108.6", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index d13e7d40b1072b..e6e8e2766594db 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "275bb74716bbeb4b09b1e97c442e0e085490c646", + "version-string": "2.2.0-release", + "port-version": 1 + }, { "git-tree": "e520721d50cf29957f37e793d28abff7544138d2", "version-string": "2.2.0-release", diff --git a/versions/p-/p-ranav-csv.json b/versions/p-/p-ranav-csv.json index ef7ffd2a2dddef..acfb507274188d 100644 --- a/versions/p-/p-ranav-csv.json +++ b/versions/p-/p-ranav-csv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77830f6c8500a71c59804029586c3a60c3335788", + "version-string": "2019-07-11", + "port-version": 1 + }, { "git-tree": "ab0aa66ce2b59b427451f135de81e0adaf3dd140", "version-string": "2019-07-11", diff --git a/versions/p-/p-ranav-csv2.json b/versions/p-/p-ranav-csv2.json index a1c501e1bd4209..6a6708f8ab96f0 100644 --- a/versions/p-/p-ranav-csv2.json +++ b/versions/p-/p-ranav-csv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64496087c54cb9b4fec4b566cbfc7f6182a753a2", + "version-string": "2020-12-14", + "port-version": 1 + }, { "git-tree": "ff75758935b7af155e42fac45ca52c8861bac4b2", "version-string": "2020-12-14", diff --git a/versions/p-/parallel-hashmap.json b/versions/p-/parallel-hashmap.json index c2141416e903a4..eb98c22e2cadb4 100644 --- a/versions/p-/parallel-hashmap.json +++ b/versions/p-/parallel-hashmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c8c5305bf3135855a29acfde1effc1f9897ea4d", + "version-string": "1.33", + "port-version": 1 + }, { "git-tree": "f4cfdf7841512d19a12c31705c75cbea341e5705", "version-string": "1.33", diff --git a/versions/p-/parallelstl.json b/versions/p-/parallelstl.json index 568501587d5404..03fd3de02ee3e2 100644 --- a/versions/p-/parallelstl.json +++ b/versions/p-/parallelstl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cfc36b104fb78856a7a5f6ec585f263a8c07924", + "version-string": "20200330", + "port-version": 1 + }, { "git-tree": "3e50eb9397c9a91ac5423d151f77c5fb4ae1ffac", "version-string": "20200330", diff --git a/versions/p-/parmetis.json b/versions/p-/parmetis.json index 73965feaa68e28..f47f478b85b5cf 100644 --- a/versions/p-/parmetis.json +++ b/versions/p-/parmetis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28d903df01ef4780a7b02c8a8437ec37be859aba", + "version-string": "4.0.3", + "port-version": 5 + }, { "git-tree": "b472eb73edfdb744f44ec306ebf05649c7f5fb70", "version-string": "4.0.3", diff --git a/versions/p-/parquet.json b/versions/p-/parquet.json index 85cd002bc42c0e..91b6e1e7f85c75 100644 --- a/versions/p-/parquet.json +++ b/versions/p-/parquet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35d3995589a5c775f1f64cb1f3f331fd38362fb9", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "f7ee13cfaf8047001763ce07b521e1a067242d31", "version-string": "0", diff --git a/versions/p-/parson.json b/versions/p-/parson.json index 87951239a0b627..1ef1231962cd10 100644 --- a/versions/p-/parson.json +++ b/versions/p-/parson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40671b05e30f32cdc83003036e882ed4b1f7b44d", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "33cc29e8ca91bd2f207c5c352345ce242251d9cb", "version-string": "2020-09-14", diff --git a/versions/p-/pbc.json b/versions/p-/pbc.json index d9c519f0e79673..8231fad8f66870 100644 --- a/versions/p-/pbc.json +++ b/versions/p-/pbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de531bdf83ba5c3a005655bde246d58074a28937", + "version-string": "0.5.14", + "port-version": 5 + }, { "git-tree": "b34d75a16c61743f6457040420ea6af43f29c9fe", "version-string": "0.5.14", diff --git a/versions/p-/pcg.json b/versions/p-/pcg.json index 92f469ace8268e..52b5f3c7c34f84 100644 --- a/versions/p-/pcg.json +++ b/versions/p-/pcg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfdbf3fad0c295b94b400509530d3642d5a6abcc", + "version-string": "2021-04-06", + "port-version": 1 + }, { "git-tree": "489a8b4653947b7688ed2bbfd3c9d9bf663ee3a9", "version-string": "2021-04-06", diff --git a/versions/p-/pdal-c.json b/versions/p-/pdal-c.json index f3de324aa98eb3..b989fb33fdff02 100644 --- a/versions/p-/pdal-c.json +++ b/versions/p-/pdal-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9319bb871924d143523c4e79ecc45bc9260360b5", + "version-string": "1.8", + "port-version": 3 + }, { "git-tree": "12db5babd9f9ed569721106476c71ef2cd50cb13", "version-string": "1.8-2", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index a05e1ec8acb9c7..72d421df34d342 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "836e512e2335367a76bc44197f3140c802897154", + "version-string": "1.7.1", + "port-version": 12 + }, { "git-tree": "b6a58e13d646cb435d82143c23a3e9e8f54f495e", "version-string": "1.7.1", diff --git a/versions/p-/pdcurses.json b/versions/p-/pdcurses.json index a16b170c191d15..ca56ad9d81f1de 100644 --- a/versions/p-/pdcurses.json +++ b/versions/p-/pdcurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba3df274e70a15b1df907d3f594ddc71b99c2ec1", + "version-string": "3.9", + "port-version": 1 + }, { "git-tree": "ffec138e0a9a3b2894c8a0ecf58a14734c340025", "version-string": "3.9", diff --git a/versions/p-/pdqsort.json b/versions/p-/pdqsort.json index 5a6d274f8e3fdd..cda3f3dc435fc0 100644 --- a/versions/p-/pdqsort.json +++ b/versions/p-/pdqsort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70783c2d8d848d78dd2d725fd1cf16d669b7c356", + "version-string": "2019-07-30", + "port-version": 1 + }, { "git-tree": "2aee3f0b215c924e6ba8c818fb8fb5258db6db66", "version-string": "2019-07-30", diff --git a/versions/p-/pe-parse.json b/versions/p-/pe-parse.json index 7417efac770132..2ca590326bf607 100644 --- a/versions/p-/pe-parse.json +++ b/versions/p-/pe-parse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10de7a27c9512d2267067cc442507ee91839fb07", + "version-string": "1.2.0", + "port-version": 1 + }, { "git-tree": "b26d3371c165c5888f2aca0c7c63107fa2ea1fdc", "version-string": "1.2.0", diff --git a/versions/p-/pegtl-2.json b/versions/p-/pegtl-2.json index 746bf066c9d60c..c9c69fc5c27245 100644 --- a/versions/p-/pegtl-2.json +++ b/versions/p-/pegtl-2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c7c1cd5779e8bf0ae828b94485817dce0710dba", + "version-string": "2.8.3", + "port-version": 1 + }, { "git-tree": "4791faebde499af884cdd281572c83779ba98834", "version-string": "2.8.3", diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index 2ffb8a0f9ad4a5..94ef7afee68a5b 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2e4a20284dace72d0591ae48e03087333c857991", + "version-string": "3.2.0", + "port-version": 1 + }, { "git-tree": "e9d21ac506ea50664bb2c18b94f02faf3067fbc1", "version-string": "3.2.0", diff --git a/versions/p-/pfring.json b/versions/p-/pfring.json index 358e78a9579338..a38584c0bad58e 100644 --- a/versions/p-/pfring.json +++ b/versions/p-/pfring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc03f1b404adc6a550e8d7b9d5d36795fac6b4b7", + "version-string": "2019-10-17", + "port-version": 3 + }, { "git-tree": "d6f178fb757726e3c9140f39ec0d74c49dded7ce", "version-string": "2019-10-17-2", diff --git a/versions/p-/pfultz2-linq.json b/versions/p-/pfultz2-linq.json index a62e341b638700..8bbbcc15fa16ee 100644 --- a/versions/p-/pfultz2-linq.json +++ b/versions/p-/pfultz2-linq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e242ac1b54aad9121c9f869c1c5db61910a7150", + "version-string": "2019-05-14", + "port-version": 1 + }, { "git-tree": "8d87cd259fa28073f259c3bf09f97870b2fa64a9", "version-string": "2019-05-14", diff --git a/versions/p-/picojson.json b/versions/p-/picojson.json index c0849c0253dd6b..05665cd4d0b2ed 100644 --- a/versions/p-/picojson.json +++ b/versions/p-/picojson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d186166bf75e9e77fce5e6a93440d5aa21fc830", + "version-string": "1.3.0", + "port-version": 2 + }, { "git-tree": "2b279f9df600324345fc6752960d63a176595168", "version-string": "1.3.0-1", diff --git a/versions/p-/picosha2.json b/versions/p-/picosha2.json index f004ba2ba0c615..57e22ab28a0c32 100644 --- a/versions/p-/picosha2.json +++ b/versions/p-/picosha2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8192d1108b62d31bcb879332175c994fa62878dc", + "version-string": "2018-07-30", + "port-version": 1 + }, { "git-tree": "eb0b4d7431fa28a8d61a52f014070d664b170992", "version-string": "2018-07-30", diff --git a/versions/p-/piex.json b/versions/p-/piex.json index 141d6c65668238..fcca063f2cdac4 100644 --- a/versions/p-/piex.json +++ b/versions/p-/piex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08ede8e9e8ed0d849edd62a316b407041cc8d4aa", + "version-string": "2019-07-11", + "port-version": 1 + }, { "git-tree": "df177c4ae73fb30b438f741d2a362199a3dbc735", "version-string": "2019-07-11", diff --git a/versions/p-/pixel.json b/versions/p-/pixel.json index b2d6da52c212d2..f3c7a0294c458e 100644 --- a/versions/p-/pixel.json +++ b/versions/p-/pixel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd45dec4585e8be40088a7017dcce546a009748f", + "version-string": "0.3", + "port-version": 2 + }, { "git-tree": "9c2f4ccc6c5ca30c268af6a115f7933ffb972deb", "version-string": "0.3-1", diff --git a/versions/p-/platform-folders.json b/versions/p-/platform-folders.json index c2dfa76fb10a49..54763549ee2e89 100644 --- a/versions/p-/platform-folders.json +++ b/versions/p-/platform-folders.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86a7b50a14bdd41de268fedb24601eeb94661ebb", + "version-string": "4.0.0", + "port-version": 7 + }, { "git-tree": "525005e82b0437cb956fb714916898603f37e570", "version-string": "4.0.0", diff --git a/versions/p-/plf-list.json b/versions/p-/plf-list.json index e208ba999fefea..27493b78790d66 100644 --- a/versions/p-/plf-list.json +++ b/versions/p-/plf-list.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91600934f8054e05c6716dbcb08f287c2ae22c44", + "version-string": "2019-08-10", + "port-version": 1 + }, { "git-tree": "6afb43e539d06a946299ba56ef6cbf5d72715acb", "version-string": "2019-08-10", diff --git a/versions/p-/plf-nanotimer.json b/versions/p-/plf-nanotimer.json index 45c74b407ad30d..c114c1a8a362fe 100644 --- a/versions/p-/plf-nanotimer.json +++ b/versions/p-/plf-nanotimer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f669e0df9a7af5bae94971f1b625143893f3ee72", + "version-string": "2019-08-10", + "port-version": 1 + }, { "git-tree": "49c347d28b6f25c49e1536f411339226b58c68c3", "version-string": "2019-08-10", diff --git a/versions/p-/plf-stack.json b/versions/p-/plf-stack.json index c77c8d4d0f6299..a047b9dfd075af 100644 --- a/versions/p-/plf-stack.json +++ b/versions/p-/plf-stack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4212c7276e8c1881b76e58ae6d20dafaec3628d", + "version-string": "2019-08-10", + "port-version": 1 + }, { "git-tree": "67b6827a13ddf2a0438a5dd372f02c5f6d9079cf", "version-string": "2019-08-10", diff --git a/versions/p-/plib.json b/versions/p-/plib.json index d0da07d07f73e7..03df101ad2ec54 100644 --- a/versions/p-/plib.json +++ b/versions/p-/plib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b00da126126e5e721ab3f6b1f931f7ec4df77f8", + "version-string": "1.8.5", + "port-version": 5 + }, { "git-tree": "94d884dc742498b586da39691d31cd6b22c7e236", "version-string": "1.8.5-4", diff --git a/versions/p-/plibsys.json b/versions/p-/plibsys.json index 7f3878cac2d73e..4f2ce556b13c5f 100644 --- a/versions/p-/plibsys.json +++ b/versions/p-/plibsys.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1af02f154f0a23e71a9547cf67f4dc7b0cab732d", + "version-string": "0.0.4", + "port-version": 5 + }, { "git-tree": "5f4a0abe78a0c1bd3e077d96141a1f2d541e0595", "version-string": "0.0.4", diff --git a/versions/p-/plog.json b/versions/p-/plog.json index d7bf798a5b3b15..640358487ecc56 100644 --- a/versions/p-/plog.json +++ b/versions/p-/plog.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cbf2ab91e484ee21e8c62316558e11b3a49f288", + "version-string": "1.1.5", + "port-version": 1 + }, { "git-tree": "4f4d184ac766682a2b337e2fb7cfaa0ebed61330", "version-string": "1.1.5", diff --git a/versions/p-/plustache.json b/versions/p-/plustache.json index 7bd232826ecffd..3149909b713ebc 100644 --- a/versions/p-/plustache.json +++ b/versions/p-/plustache.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba5590c5878b8241436ef45af401b5c3c8db5f9a", + "version-string": "0.4.0", + "port-version": 2 + }, { "git-tree": "a2646069857f5a6e1b34f479b8fbcdac5fd5daf7", "version-string": "0.4.0-1", diff --git a/versions/p-/pngwriter.json b/versions/p-/pngwriter.json index 5f63db865bb4ab..d0aa8635bd2e66 100644 --- a/versions/p-/pngwriter.json +++ b/versions/p-/pngwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "674b0ba608ae93553e633c598a6b04da5d5b7367", + "version-string": "0.7.0", + "port-version": 3 + }, { "git-tree": "8f5f1c653f1c9935bcf922a814d553318151e06f", "version-string": "0.7.0-2", diff --git a/versions/p-/poly2tri.json b/versions/p-/poly2tri.json index c3b8cc0d9f2598..520fe53a029b7b 100644 --- a/versions/p-/poly2tri.json +++ b/versions/p-/poly2tri.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5202b2e184ce5e7fff3bd268797addd62e9a23c6", + "version-string": "2020-07-21", + "port-version": 1 + }, { "git-tree": "94527e6f87fb6b8d1ebe5362689b03c12f32ab64", "version-string": "2020-07-21", diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json index 1cb725b528d519..4871d33c9e3e17 100644 --- a/versions/p-/polyclipping.json +++ b/versions/p-/polyclipping.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25fcf0404b9a7c414b238c0973b4aa43d7bbd6e2", + "version-string": "6.4.2", + "port-version": 7 + }, { "git-tree": "78ba6625af13a277933f9fabf45a755b9be3a43d", "version-string": "6.4.2", diff --git a/versions/p-/polyhook2.json b/versions/p-/polyhook2.json index e101424a2e1331..a86411d5f9d74e 100644 --- a/versions/p-/polyhook2.json +++ b/versions/p-/polyhook2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b4af767d959bb37711e474327acba689127749c", + "version-string": "2021-05-09", + "port-version": 1 + }, { "git-tree": "a7b98cc69b89dfd9f776ef1b95f26d784fd3b82b", "version-string": "2021-05-09", diff --git a/versions/p-/polymorphic-value.json b/versions/p-/polymorphic-value.json index b58b955ccf4c72..aa4f3ba72a9680 100644 --- a/versions/p-/polymorphic-value.json +++ b/versions/p-/polymorphic-value.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5eeefe34f5fbc12cbf9c7b1a6cd231bf0c455d6e", + "version-string": "1.3.0", + "port-version": 2 + }, { "git-tree": "e94e16bfe381140ba157f4e9224f12c273134f56", "version-string": "1.3.0-1", diff --git a/versions/p-/ponder.json b/versions/p-/ponder.json index 0377232ee8bdf7..117c9967dc4cae 100644 --- a/versions/p-/ponder.json +++ b/versions/p-/ponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07af14a9b06787eef8901b771c95aa0633f50c07", + "version-string": "3.0.0", + "port-version": 2 + }, { "git-tree": "2cb0155853b202ebf943fc6668096bd8aae75681", "version-string": "3.0.0-1", diff --git a/versions/p-/portable-snippets.json b/versions/p-/portable-snippets.json index a45b0d5b2dd3ba..18be8b9f5bd042 100644 --- a/versions/p-/portable-snippets.json +++ b/versions/p-/portable-snippets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a24a15b684910521e29c4b5e2c6660329f306c9", + "version-string": "2019-09-20", + "port-version": 1 + }, { "git-tree": "fa4d8c8fa1130e0dd575f168be6d47971a1b14be", "version-string": "2019-09-20", diff --git a/versions/p-/ppconsul.json b/versions/p-/ppconsul.json index 6a9072d167a47b..505d18a0dceed5 100644 --- a/versions/p-/ppconsul.json +++ b/versions/p-/ppconsul.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c7383164dcbe93141eb683eeeb362381ebbd4cd", + "version-string": "0.5", + "port-version": 2 + }, { "git-tree": "8d87f4681edc04101293dceede444307d3b3e4da", "version-string": "0.5-1", diff --git a/versions/p-/ppmagic.json b/versions/p-/ppmagic.json index 64c75d4b7ab140..e631a882675443 100644 --- a/versions/p-/ppmagic.json +++ b/versions/p-/ppmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b985dc0f03d5df0b9fb71e88c3a3a4ab0b05d56", + "version-string": "2020-07-03", + "port-version": 1 + }, { "git-tree": "0b75e26449d39ec184736dccbb705d6bf6339769", "version-string": "2020-07-03", diff --git a/versions/p-/pprint.json b/versions/p-/pprint.json index f2b765f0883338..68a353f4dedb9f 100644 --- a/versions/p-/pprint.json +++ b/versions/p-/pprint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6effdf4255c5de8d438a59353b24ec85eaa5999b", + "version-string": "2019-07-19", + "port-version": 1 + }, { "git-tree": "50e0ad722aa664d49e1591326bf0f1605c1e620c", "version-string": "2019-07-19", diff --git a/versions/p-/pqp.json b/versions/p-/pqp.json index d9bdf8f9493bea..c3573cdb7a9c8a 100644 --- a/versions/p-/pqp.json +++ b/versions/p-/pqp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a22b046882068cde7e310e6fcfdf73bbc1b154d5", + "version-string": "1.3", + "port-version": 5 + }, { "git-tree": "e44d9679087bf6c036f2d5c647369669f6d4d581", "version-string": "1.3-4", diff --git a/versions/p-/proj.json b/versions/p-/proj.json index 8369cda92a6b25..b4186059715e2f 100644 --- a/versions/p-/proj.json +++ b/versions/p-/proj.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a90853a886ef1a9425ad477bc996b99c0824ff33", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "759fac2f92b6fe903300aa2a91f4fd39b6c16911", "version-string": "0", diff --git a/versions/p-/prometheus-cpp.json b/versions/p-/prometheus-cpp.json index 0f2bb8bfeb72e7..639f6d64c1c8c4 100644 --- a/versions/p-/prometheus-cpp.json +++ b/versions/p-/prometheus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4656585ffca17e789395f30f4ee6a301cff7f34e", + "version-string": "0.12.3", + "port-version": 1 + }, { "git-tree": "78cf4d97293c0baf7ef735035944c6859d06c980", "version-string": "0.12.3", diff --git a/versions/p-/protobuf-c.json b/versions/p-/protobuf-c.json index cbdfc72276baa8..886b4ec8d5644f 100644 --- a/versions/p-/protobuf-c.json +++ b/versions/p-/protobuf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7786538f69991494262bd14f710e2dd8c6062bea", + "version-string": "1.3.2", + "port-version": 3 + }, { "git-tree": "7e0935e2eef085a194274de34e3ee9c39f4ba8d4", "version-string": "1.3.2-2", diff --git a/versions/p-/pthread.json b/versions/p-/pthread.json index 94b596431b8518..eacfe2e530735c 100644 --- a/versions/p-/pthread.json +++ b/versions/p-/pthread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22a35f55dc3993fb589e44781ae36dbdf1c625fa", + "version-string": "3.0.0", + "port-version": 1 + }, { "git-tree": "f26e38024e286875f1e954fb75bda82b3a3329f4", "version-string": "3.0.0", diff --git a/versions/p-/pugixml.json b/versions/p-/pugixml.json index 36215e5f84a9a1..a9e37f4b16b2d5 100644 --- a/versions/p-/pugixml.json +++ b/versions/p-/pugixml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2af3faa6e86d241d2d6845f27c21afa51741f391", + "version-string": "1.11.4", + "port-version": 1 + }, { "git-tree": "64fda47a7f4dd9fc10c60169c4f5e0b069481199", "version-string": "1.11.4", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index cc9f0544e7e127..a61062a7ee9ee2 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fae15039cc6567f087011f916a1dea07da520cf", + "version-string": "2.3.1", + "port-version": 3 + }, { "git-tree": "cda65d327fffdc14a09dee0bdcdf79d3bdad9edc", "version-string": "2.3.1", diff --git a/versions/q-/qhull.json b/versions/q-/qhull.json index 17746dbad06246..52eb5af94685cc 100644 --- a/versions/q-/qhull.json +++ b/versions/q-/qhull.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "574301a0f60d743f5ea7165dda5e45bd0f1082ba", + "version-string": "8.0.2", + "port-version": 2 + }, { "git-tree": "248e6da5d026e3d25975912d727d35612b32f5c1", "version-string": "8.0.2", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index 59d7bb6c28ff10..faf43e1c7966a8 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8fcc3b90edf020392d7fb1375c252b932a5e2be", + "version-string": "0.32.0", + "port-version": 1 + }, { "git-tree": "287e0a8a6edf82e89f66b9163dc3c9ba8dc46b3f", "version-string": "0.32.0", diff --git a/versions/q-/qt-advanced-docking-system.json b/versions/q-/qt-advanced-docking-system.json index adf54cea13f7a3..88a22840db1777 100644 --- a/versions/q-/qt-advanced-docking-system.json +++ b/versions/q-/qt-advanced-docking-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f19c23c1d05692cdf45c9876efc195412945dae", + "version-string": "3.6.3", + "port-version": 2 + }, { "git-tree": "fbda394a196627494c8b9f50362ebf0de3bf1be6", "version-string": "3.6.3", diff --git a/versions/q-/qt5-3d.json b/versions/q-/qt5-3d.json index ca2dd24e74b219..714056ab054bf1 100644 --- a/versions/q-/qt5-3d.json +++ b/versions/q-/qt5-3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f46ab15ed74e4680e16b61851b9eb41523a626f6", + "version-string": "5.15.2", + "port-version": 2 + }, { "git-tree": "6c3c15324a4764d3501798299c8ad8087905b136", "version-string": "5.15.2", diff --git a/versions/q-/qt5-activeqt.json b/versions/q-/qt5-activeqt.json index b91938ebcbdd8d..83332ee66ed0ee 100644 --- a/versions/q-/qt5-activeqt.json +++ b/versions/q-/qt5-activeqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bf9b51fd87d81531f301ee9060b76c829221afb", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "4485e0c45b055c36a8c8f2977dfc34b627ef89f7", "version-string": "5.15.2", diff --git a/versions/q-/qt5-androidextras.json b/versions/q-/qt5-androidextras.json index e8cf8ef427893e..a8f18ffd40df70 100644 --- a/versions/q-/qt5-androidextras.json +++ b/versions/q-/qt5-androidextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8ff6ba90c3b7046e2728056998ff79665353503", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "f94e5bbf1abb42df664f41fbbf652d8527058b57", "version-string": "5.15.2", diff --git a/versions/q-/qt5-canvas3d.json b/versions/q-/qt5-canvas3d.json index 41489f614cdbe3..c7ed4c73706e0f 100644 --- a/versions/q-/qt5-canvas3d.json +++ b/versions/q-/qt5-canvas3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c880f36024ca1fe697ebfa6bfe4b9ae47c9b33a", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "ab9dcd8f77c010f67ccd0177742f8f2b966814e6", "version-string": "0", diff --git a/versions/q-/qt5-charts.json b/versions/q-/qt5-charts.json index ffd72c6c1ba4a5..7e8eac197dc5fe 100644 --- a/versions/q-/qt5-charts.json +++ b/versions/q-/qt5-charts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d51381395f58fbcf7b9488c2e49708522d968ffb", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "a9ad7200153301c998c296ce7f33968057c0ed55", "version-string": "5.15.2", diff --git a/versions/q-/qt5-connectivity.json b/versions/q-/qt5-connectivity.json index 8848ab4e72937a..58a0903bbf4586 100644 --- a/versions/q-/qt5-connectivity.json +++ b/versions/q-/qt5-connectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f34765d100d517dc137a96aabc37ab5cb95ea13", + "version-string": "5.15.2", + "port-version": 2 + }, { "git-tree": "f8ee9769027623f431202ff66a23a044dd3e75ba", "version-string": "5.15.2", diff --git a/versions/q-/qt5-datavis3d.json b/versions/q-/qt5-datavis3d.json index f28b5ea55256cd..1bc9e97643bf10 100644 --- a/versions/q-/qt5-datavis3d.json +++ b/versions/q-/qt5-datavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a675679d46b85666ef053efb36a2bb70b40b8ee", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "a85ea3d22e31e21a063a9a9f1c88c53e8fe85a13", "version-string": "5.15.2", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index 59d37772cd6340..b8019324cdd4c7 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf4313e778b98d69d3e0e3b881069357c3ef8b76", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "b07a27c5aa8905b158c0f72f2b9e7977391191c1", "version-string": "5.15.2", diff --git a/versions/q-/qt5-doc.json b/versions/q-/qt5-doc.json index adf06ce103c4f7..7ccfe2d85ff214 100644 --- a/versions/q-/qt5-doc.json +++ b/versions/q-/qt5-doc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4cb09a0ee4bcb79b460c69a4e924cbe19538a2d1", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "223f161f59f60470ce059257c42646d4664b1bda", "version-string": "5.15.2", diff --git a/versions/q-/qt5-gamepad.json b/versions/q-/qt5-gamepad.json index 37cbfa1f5e56ea..5a9c6b8470fdf6 100644 --- a/versions/q-/qt5-gamepad.json +++ b/versions/q-/qt5-gamepad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d74a2774e03103111a4e73c990eb65e78416e784", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "c59f1d686877d4dc3944d5b1f6c9544b9e3fc3a5", "version-string": "5.15.2", diff --git a/versions/q-/qt5-graphicaleffects.json b/versions/q-/qt5-graphicaleffects.json index 5735323e298354..4f9f479b24006c 100644 --- a/versions/q-/qt5-graphicaleffects.json +++ b/versions/q-/qt5-graphicaleffects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7548a80471fd031625a4395776ea298e2737c280", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "f0d59c9b5c88380e1eb89cd7f47b31299ca2367b", "version-string": "5.15.2", diff --git a/versions/q-/qt5-imageformats.json b/versions/q-/qt5-imageformats.json index fc2df298118d0f..4b13e404f9cac7 100644 --- a/versions/q-/qt5-imageformats.json +++ b/versions/q-/qt5-imageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f6ca0b9e789dbfafa84ca02eec3da94f2728494", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "75366d3ba0a38fc7be899ea1a67c74e6adb379e1", "version-string": "5.15.2", diff --git a/versions/q-/qt5-location.json b/versions/q-/qt5-location.json index d5b452a076d6c7..cffd62afadc744 100644 --- a/versions/q-/qt5-location.json +++ b/versions/q-/qt5-location.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fb1b17892d53638ec4ada0a73b19ecef4062ec8", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "94f99955ff8d1ce62723d2af72d47a138aabb5d0", "version-string": "5.15.2", diff --git a/versions/q-/qt5-macextras.json b/versions/q-/qt5-macextras.json index 3ab418304ffc5c..fcd9001920232e 100644 --- a/versions/q-/qt5-macextras.json +++ b/versions/q-/qt5-macextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb1f68ce5b03012e9fa7ed0924bc2036c4d97edd", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "3fe45da1cf6d2e8b42bed80c7a362d7d9869f12b", "version-string": "5.15.2", diff --git a/versions/q-/qt5-modularscripts.json b/versions/q-/qt5-modularscripts.json index 5599802e99f0c5..ccb2ce1b32316f 100644 --- a/versions/q-/qt5-modularscripts.json +++ b/versions/q-/qt5-modularscripts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f2041fcbdcdce6efa2cf8033557fd9c2d68696f", + "version-string": "deprecated", + "port-version": 1 + }, { "git-tree": "966b7ad2de03f602396f7e9569a8881eace3d585", "version-string": "deprecated", diff --git a/versions/q-/qt5-multimedia.json b/versions/q-/qt5-multimedia.json index e61f949645440c..9f8782b6db6406 100644 --- a/versions/q-/qt5-multimedia.json +++ b/versions/q-/qt5-multimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b909b49f99e6080fdd74b20419ac9f1059d993f6", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "0aa2bee3cad289370d921410781cb478405528f7", "version-string": "5.15.2", diff --git a/versions/q-/qt5-networkauth.json b/versions/q-/qt5-networkauth.json index 36b71d5d2fecbb..dd41498330ac99 100644 --- a/versions/q-/qt5-networkauth.json +++ b/versions/q-/qt5-networkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6fcb48f7415ecf2a5f2f3966c48a08abd9b0355", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "f462d1340451f187f9f581eb33d48bb02325199e", "version-string": "5.15.2", diff --git a/versions/q-/qt5-purchasing.json b/versions/q-/qt5-purchasing.json index 04a38d85ff403c..b3a1c08491108c 100644 --- a/versions/q-/qt5-purchasing.json +++ b/versions/q-/qt5-purchasing.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e0745a65f393550ec04750071456604a5db72ba", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "a8cd09b86f4f66c28354c005ddc5c7050b3ab51e", "version-string": "5.15.2", diff --git a/versions/q-/qt5-quickcontrols.json b/versions/q-/qt5-quickcontrols.json index 29c91f3553fec2..ab5305153af009 100644 --- a/versions/q-/qt5-quickcontrols.json +++ b/versions/q-/qt5-quickcontrols.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49313a150ff19dacc9614849648f29c90e424cd3", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "b7a753736c9da0675d2c65b5f2fd0ba55243ed98", "version-string": "5.15.2", diff --git a/versions/q-/qt5-quickcontrols2.json b/versions/q-/qt5-quickcontrols2.json index 5ff4a19dd3c657..cea41fe2314540 100644 --- a/versions/q-/qt5-quickcontrols2.json +++ b/versions/q-/qt5-quickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0f3cb1b07b4ac8c05297fd8c438ba7e1ba97ed8", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "55332e79db24457e25edd53505c1ada54b6c8ff6", "version-string": "5.15.2", diff --git a/versions/q-/qt5-remoteobjects.json b/versions/q-/qt5-remoteobjects.json index 3bfac4e7421d4d..f148c990dba0cd 100644 --- a/versions/q-/qt5-remoteobjects.json +++ b/versions/q-/qt5-remoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73a19321158fe546f1469f290a83050fa6af14f1", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "56d2cccdc3153966bbdd95194d45ee1c3a6afaae", "version-string": "5.15.2", diff --git a/versions/q-/qt5-script.json b/versions/q-/qt5-script.json index 9f2873aed30f04..842001bcc98163 100644 --- a/versions/q-/qt5-script.json +++ b/versions/q-/qt5-script.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d412fb9a21bbf733e6e2e00c2015787a7c262c6a", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "e91ef09f428cef704bf255193747433972c73087", "version-string": "5.15.2", diff --git a/versions/q-/qt5-scxml.json b/versions/q-/qt5-scxml.json index 069c9f4ed40881..70cfc0bb7cd7ec 100644 --- a/versions/q-/qt5-scxml.json +++ b/versions/q-/qt5-scxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "657fa8e20641b75338667e14b696127b252fcfd5", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "78995a7e46afeac5fb6e5e5dfdc40a327f7dd9fe", "version-string": "5.15.2", diff --git a/versions/q-/qt5-sensors.json b/versions/q-/qt5-sensors.json index dd3fc27db88fee..87c3645756f1d4 100644 --- a/versions/q-/qt5-sensors.json +++ b/versions/q-/qt5-sensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ab7355283e60f00090972eafddf269519155344", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "21bce9a3ac2033ea3baf1c238c1f185be101a845", "version-string": "5.15.2", diff --git a/versions/q-/qt5-serialbus.json b/versions/q-/qt5-serialbus.json index 7d7fd46bb3635a..eefb33d0c43479 100644 --- a/versions/q-/qt5-serialbus.json +++ b/versions/q-/qt5-serialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23c4f38498a3eeaef1a0428cc0f9facb77c50bb5", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "9e47e507727344b2a2bf750e759b05c3cafeb086", "version-string": "5.15.2", diff --git a/versions/q-/qt5-serialport.json b/versions/q-/qt5-serialport.json index f37aede66fdcd5..17d9dae6dab929 100644 --- a/versions/q-/qt5-serialport.json +++ b/versions/q-/qt5-serialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6e0403e0e46d6b3aa07ea90da894a33589c3dde", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "316f45b69eb023ba69d08d8de7a6debbf84bb603", "version-string": "5.15.2", diff --git a/versions/q-/qt5-speech.json b/versions/q-/qt5-speech.json index 3a4201ad852325..86bfb420785bf9 100644 --- a/versions/q-/qt5-speech.json +++ b/versions/q-/qt5-speech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12c00b4bbf2206f8bb68ad44e8b44dbfd65fa6e4", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "21ea7868e82bc4457836c8a0b7ca918c47b8e804", "version-string": "5.15.2", diff --git a/versions/q-/qt5-svg.json b/versions/q-/qt5-svg.json index 385bc888290ea6..9954a1f1f996a1 100644 --- a/versions/q-/qt5-svg.json +++ b/versions/q-/qt5-svg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "75e1a170720117fcc34369aae8ab7ee4816974a3", + "version-string": "5.15.2", + "port-version": 2 + }, { "git-tree": "84778600522df34a9db6d62f0c217c5d29346492", "version-string": "5.15.2", diff --git a/versions/q-/qt5-tools.json b/versions/q-/qt5-tools.json index 4ad9f0945c58d0..f4df8a3489020c 100644 --- a/versions/q-/qt5-tools.json +++ b/versions/q-/qt5-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b28b98fb7bd66abe2c108d66c3a89c0e388d638f", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "de5a3def8c0cc8ae0055876f169e73562de14e4b", "version-string": "5.15.2", diff --git a/versions/q-/qt5-translations.json b/versions/q-/qt5-translations.json index 981f17598884d9..687f16bb80c0b0 100644 --- a/versions/q-/qt5-translations.json +++ b/versions/q-/qt5-translations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "195b59491201660e5c6299f6f3f78c446827e8d7", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "008afea16ec68c49b890f4ed8316ad3abfbcb71a", "version-string": "5.15.2", diff --git a/versions/q-/qt5-virtualkeyboard.json b/versions/q-/qt5-virtualkeyboard.json index 7c32344871bef8..1cabc7e949091e 100644 --- a/versions/q-/qt5-virtualkeyboard.json +++ b/versions/q-/qt5-virtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45281062a0b509d6c5f2cfce1f26e77e90fa6192", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "2693e87e70cccf2d3e7eab86266fb4d6531cc32d", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webchannel.json b/versions/q-/qt5-webchannel.json index 2b33f12b2737e7..361bfbd96ba0d4 100644 --- a/versions/q-/qt5-webchannel.json +++ b/versions/q-/qt5-webchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39e51839b2f67b03e0f72bf862dc44ad72bcc804", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "e8fed15c2b941a90c62729ed0ec87d09a65088f6", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webengine.json b/versions/q-/qt5-webengine.json index d3382ca0721799..a3228a8ba3b47b 100644 --- a/versions/q-/qt5-webengine.json +++ b/versions/q-/qt5-webengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "365537bee64190f604e1be03f0473ffe41067a82", + "version-string": "5.15.2", + "port-version": 3 + }, { "git-tree": "3a220ca2fe835251196c717e4f1df91516430d8b", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webglplugin.json b/versions/q-/qt5-webglplugin.json index 545843f53a6adf..94398229114124 100644 --- a/versions/q-/qt5-webglplugin.json +++ b/versions/q-/qt5-webglplugin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44c3faa9de1a6f18a9f496e828c4ee64f0fcc315", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "f0b9c3cfc7387db1f1ca1e1a31a92a445e0bfa0d", "version-string": "5.15.2", diff --git a/versions/q-/qt5-websockets.json b/versions/q-/qt5-websockets.json index 3680d79fc90596..671a9ca61d7a8d 100644 --- a/versions/q-/qt5-websockets.json +++ b/versions/q-/qt5-websockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ca77dc0c75bd411f1d1e51257c761e775ca341d", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "dda1270f825f0a962a46a2320eb0c07ab3792fe3", "version-string": "5.15.2", diff --git a/versions/q-/qt5-webview.json b/versions/q-/qt5-webview.json index 561b2644eb888b..f4e2014f7ea278 100644 --- a/versions/q-/qt5-webview.json +++ b/versions/q-/qt5-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c8a8916c8fda707b4c8096388ea7156bada9a4c", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "5299a2103e3367847b319980eea5db59b4ad0a58", "version-string": "5.15.2", diff --git a/versions/q-/qt5-winextras.json b/versions/q-/qt5-winextras.json index 2a958fe7e67eb4..1d4926a14ace17 100644 --- a/versions/q-/qt5-winextras.json +++ b/versions/q-/qt5-winextras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85a345a5fdc5a15584e6b2add00f1669e4099dbc", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "74a7ae6df8a4a7074f5defa9b74ec25140f91c6b", "version-string": "5.15.2", diff --git a/versions/q-/qt5-x11extras.json b/versions/q-/qt5-x11extras.json index 0b10d99efa1d76..1042604afb7acb 100644 --- a/versions/q-/qt5-x11extras.json +++ b/versions/q-/qt5-x11extras.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce0ca52833bf80d8bc958cd4428acd10ab397911", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "912abfb778fa66e9010962b68182e0366e54edb9", "version-string": "5.15.2", diff --git a/versions/q-/qt5-xmlpatterns.json b/versions/q-/qt5-xmlpatterns.json index 9279cfd46966b7..3777966f9887ee 100644 --- a/versions/q-/qt5-xmlpatterns.json +++ b/versions/q-/qt5-xmlpatterns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4531f24cddd2692989fac9e84a9eb09301ee180", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "afd90dc7576c45b74602e2d632e15bea59bfe38b", "version-string": "5.15.2", diff --git a/versions/q-/qt5.json b/versions/q-/qt5.json index 3e6689853331e8..39ad388946c300 100644 --- a/versions/q-/qt5.json +++ b/versions/q-/qt5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9810d811337a74ca11e032b94b52f4e4bed5d1b1", + "version-string": "5.15.2", + "port-version": 1 + }, { "git-tree": "3ab863fc125546487759d6672f0e459da27f5f41", "version-string": "5.15.2", diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json index c3f31362464cf5..37a40dd53b6705 100644 --- a/versions/q-/qtkeychain.json +++ b/versions/q-/qtkeychain.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "477977da90b66a24d95b42e3776d17fd8e2735e0", + "version-string": "0.11.1", + "port-version": 1 + }, { "git-tree": "576c3e09b3b4e3dfe7ad0d8e69fe6d003da2de89", "version-string": "0.11.1", diff --git a/versions/q-/quadtree.json b/versions/q-/quadtree.json index f6d1cf918a388f..683efa19d6cbd0 100644 --- a/versions/q-/quadtree.json +++ b/versions/q-/quadtree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c4c1d118e5fc939670bd38e92453cfd3f92e3c5", + "version-string": "2020-04-13", + "port-version": 1 + }, { "git-tree": "c7e53493b566954c3cb3148dfbd4b43f28b9be8c", "version-string": "2020-04-13", diff --git a/versions/q-/quaternions.json b/versions/q-/quaternions.json index 43eff793995c4f..045481f0561c4e 100644 --- a/versions/q-/quaternions.json +++ b/versions/q-/quaternions.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99b78fe0eae2a9ccdad34ba39bc165eccc547c3b", + "version-string": "1.0.0", + "port-version": 1 + }, { "git-tree": "a8226de2b0c3e81fa54c32961d117b9a3b7b0f3b", "version-string": "1.0.0", diff --git a/versions/q-/quazip.json b/versions/q-/quazip.json index e4cea0d9598199..ddd267561ca765 100644 --- a/versions/q-/quazip.json +++ b/versions/q-/quazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb05336d7d482b98ab3e83dbbc58116707f547d6", + "version-string": "0.9.1", + "port-version": 1 + }, { "git-tree": "27e10e01f2905c5274447470031f595c28e0eb39", "version-string": "0.9.1", diff --git a/versions/q-/quickfast.json b/versions/q-/quickfast.json index 78aa3b4695e28a..a446f3445f0b7a 100644 --- a/versions/q-/quickfast.json +++ b/versions/q-/quickfast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69093dff874378ce87be6b821000e058e5ab3452", + "version-string": "1.5", + "port-version": 1 + }, { "git-tree": "3a43c333af274beae43a15f7d734a4146426273c", "version-string": "1.5", diff --git a/versions/q-/quickfix.json b/versions/q-/quickfix.json index b4716ce41ab294..45666d9a0f4d95 100644 --- a/versions/q-/quickfix.json +++ b/versions/q-/quickfix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d374a1da06a6765ceeb510d6b65afd8ee97194ad", + "version-string": "1.15.1", + "port-version": 5 + }, { "git-tree": "bff808505ccbbce1357d1998e69fe4813e21177d", "version-string": "1.15.1-4", diff --git a/versions/q-/qwtw.json b/versions/q-/qwtw.json index aebb038707ddb1..81d0fd2cca70a1 100644 --- a/versions/q-/qwtw.json +++ b/versions/q-/qwtw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "debc8598b11213981d8489a27ca97894a72621c6", + "version-string": "3.1.0", + "port-version": 1 + }, { "git-tree": "167a4247049896bc2c098541c74322adb3b98852", "version-string": "3.1.0", diff --git a/versions/r-/rabit.json b/versions/r-/rabit.json index 4ceafb613a092d..8a176c7dbcdc68 100644 --- a/versions/r-/rabit.json +++ b/versions/r-/rabit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f9eebc8facd648396bcb224fbcad95893cdf5ce", + "version-string": "0.1", + "port-version": 3 + }, { "git-tree": "928c08f9223593bea452e7894a8aaa4f3a5bd13b", "version-string": "0.1-2", diff --git a/versions/r-/ragel.json b/versions/r-/ragel.json index 34d0d0226c2fc0..92947bb2b8f31f 100644 --- a/versions/r-/ragel.json +++ b/versions/r-/ragel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "364b93a4fe696a4002011aec3acf202aafb74a30", + "version-string": "6.10", + "port-version": 4 + }, { "git-tree": "a20473ef22c6b5a89d5771504287875cd2a36c96", "version-string": "6.10-3", diff --git a/versions/r-/rang.json b/versions/r-/rang.json index a17eee4b6970a5..91fc692420205a 100644 --- a/versions/r-/rang.json +++ b/versions/r-/rang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa33c08f090f08c0b6d4d1596384b92ccbaceeb6", + "version-string": "3.1.0", + "port-version": 1 + }, { "git-tree": "36461b54ab5f10f52e90b8b6781b705e79985321", "version-string": "3.1.0", diff --git a/versions/r-/range-v3-vs2015.json b/versions/r-/range-v3-vs2015.json index 39a257b3fb3309..49e74ab86c3f7b 100644 --- a/versions/r-/range-v3-vs2015.json +++ b/versions/r-/range-v3-vs2015.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7323da8a61ce8b5fc2e0cb3a59cff779c484e4e0", + "version-string": "20151130-vcpkg5", + "port-version": 1 + }, { "git-tree": "b135e301521d603130d2c80a01b39fbbce826518", "version-string": "20151130-vcpkg5", diff --git a/versions/r-/range-v3.json b/versions/r-/range-v3.json index 98aca3d7b1325c..4b82362f3aca76 100644 --- a/versions/r-/range-v3.json +++ b/versions/r-/range-v3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa8057ea7b4f44f684ce2e6178914dac0cafbe53", + "version-string": "0.11.0", + "port-version": 1 + }, { "git-tree": "21c30a70f1f205bec39020c41ace2a5e10a215fb", "version-string": "0.11.0", diff --git a/versions/r-/rapidcheck.json b/versions/r-/rapidcheck.json index e23f4cb4129074..d20603ebb17034 100644 --- a/versions/r-/rapidcheck.json +++ b/versions/r-/rapidcheck.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f583dcd38987b483ebe1f1b954cc7fb21cd08144", + "version-string": "2020-08-25", + "port-version": 1 + }, { "git-tree": "b6d707d1c504b3dc0b529ba674a748f700b29f61", "version-string": "2020-08-25", diff --git a/versions/r-/rapidxml-ns.json b/versions/r-/rapidxml-ns.json index 0222fb65328e68..ea933065d6f296 100644 --- a/versions/r-/rapidxml-ns.json +++ b/versions/r-/rapidxml-ns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "073f99111cb3bba2632117601ccc024e3f98b508", + "version-string": "1.13.2", + "port-version": 1 + }, { "git-tree": "9a3b56d3389af2902391bae4f837006546e7bc4a", "version-string": "1.13.2", diff --git a/versions/r-/rapidxml.json b/versions/r-/rapidxml.json index da8813a5384dfd..af020f2d70531a 100644 --- a/versions/r-/rapidxml.json +++ b/versions/r-/rapidxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "160f717432a1eed69af62a9eb7c724031609994a", + "version-string": "1.13", + "port-version": 5 + }, { "git-tree": "d229da572bb02e1aeb304654a6e25ad55038ad02", "version-string": "1.13-4", diff --git a/versions/r-/re2.json b/versions/r-/re2.json index 0dad20168f12c7..c8e43554ef3e82 100644 --- a/versions/r-/re2.json +++ b/versions/r-/re2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6cd6db642e5e56f83c6098da5d954a511b5b8f17", + "version-string": "2020-10-01", + "port-version": 1 + }, { "git-tree": "f64f9d63a95c27658c5c67753cf2ab9a9272858e", "version-string": "2020-10-01", diff --git a/versions/r-/readline-win32.json b/versions/r-/readline-win32.json index 357f27b3b5fadf..b2d5f3ac5c0e04 100644 --- a/versions/r-/readline-win32.json +++ b/versions/r-/readline-win32.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d2ea2655a570f6c0fd17689715d542336d531ea", + "version-string": "5.0", + "port-version": 3 + }, { "git-tree": "c548f83dcccce8ddf353d0e3710afd401a4e2304", "version-string": "5.0-2", diff --git a/versions/r-/readline.json b/versions/r-/readline.json index cb3915584accf5..672cc6f0c6b34a 100644 --- a/versions/r-/readline.json +++ b/versions/r-/readline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e0a62b3927f5b41e7861093dba7d2e2aa4de0b2", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "6c4ab7a05504e5d9de58c16a5d6e4014ad3c70cb", "version-string": "0", diff --git a/versions/r-/readosm.json b/versions/r-/readosm.json index 21e8fa6fa68974..57b34a2f5099a0 100644 --- a/versions/r-/readosm.json +++ b/versions/r-/readosm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32ab4a5c33cd4854b932547e791af28e39e4586e", + "version-string": "1.1.0a", + "port-version": 1 + }, { "git-tree": "8053400c918e6eb0fbde413936493a2824ae4a65", "version-string": "1.1.0a", diff --git a/versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json index 211d304dfd8a81..9e20fe4a91bf45 100644 --- a/versions/r-/refl-cpp.json +++ b/versions/r-/refl-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "393ab14793adcef501554fcd747eb3d68bf21500", + "version-string": "0.12.0", + "port-version": 1 + }, { "git-tree": "eb6b33b43e2f278a4ad750c19fe60bd38caee781", "version-string": "0.12.0", diff --git a/versions/r-/refprop-headers.json b/versions/r-/refprop-headers.json index 1d21d15d9ce460..a1f65398596b57 100644 --- a/versions/r-/refprop-headers.json +++ b/versions/r-/refprop-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8224d6d1e5b4d151c557a1055307624848ce8db", + "version-string": "2019-04-14", + "port-version": 1 + }, { "git-tree": "ad35ee67511cff7864369bdf20b166eaa2436468", "version-string": "2019-04-14", diff --git a/versions/r-/replxx.json b/versions/r-/replxx.json index d699718d176596..2e1901ca75f1ad 100644 --- a/versions/r-/replxx.json +++ b/versions/r-/replxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e56bb5dd211e60671da16308a06e0738b7854c2", + "version-string": "0.0.2", + "port-version": 3 + }, { "git-tree": "f2a461d74082c267d369a79ba0c263285e31d746", "version-string": "0.0.2-2", diff --git a/versions/r-/reproc.json b/versions/r-/reproc.json index b294755b4c3280..ce9b3ced9be469 100644 --- a/versions/r-/reproc.json +++ b/versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3173c9bf7aca150b6b7859a4c055ac778c157f58", + "version-string": "14.2.1", + "port-version": 1 + }, { "git-tree": "8f42086781fc869cc35be1abd9b64641c27028f7", "version-string": "14.2.1", diff --git a/versions/r-/rest-rpc.json b/versions/r-/rest-rpc.json index 15eb27d68368d9..8c2be0be3e808e 100644 --- a/versions/r-/rest-rpc.json +++ b/versions/r-/rest-rpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05fad9e9e4a1d76707fbcb7da2d06338eb9ff8ce", + "version-string": "0.07", + "port-version": 2 + }, { "git-tree": "4e7a4470abca942f238467ad7c610255ce03330d", "version-string": "0.07", diff --git a/versions/r-/restclient-cpp.json b/versions/r-/restclient-cpp.json index 68b0f505a50582..398b5ed52dfffb 100644 --- a/versions/r-/restclient-cpp.json +++ b/versions/r-/restclient-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab5e52242e8403aa8b9b26a60baead129e2a1798", + "version-string": "0.5.2", + "port-version": 1 + }, { "git-tree": "997a41f7096c82db4bb868ade39fc8d51aee3569", "version-string": "0.5.2", diff --git a/versions/r-/rhash.json b/versions/r-/rhash.json index 31b0b2071f00c1..32c38505f3e938 100644 --- a/versions/r-/rhash.json +++ b/versions/r-/rhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ade1e1726434d28ad58715f9b6a3c005a1f243bb", + "version-string": "1.4.0", + "port-version": 1 + }, { "git-tree": "46e3af79b0c1d8514a24cbb981fec5b68875b3e5", "version-string": "1.4.0", diff --git a/versions/r-/riffcpp.json b/versions/r-/riffcpp.json index dfa0501d68b213..c80ef8a96ab732 100644 --- a/versions/r-/riffcpp.json +++ b/versions/r-/riffcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdebe05ce8fe9f40915d3a17abfcd79cac90c21f", + "version-string": "2.2.4", + "port-version": 1 + }, { "git-tree": "ed25689be7a34edbfbf89b39d877b87d0d4c8b2d", "version-string": "2.2.4", diff --git a/versions/r-/ring-span-lite.json b/versions/r-/ring-span-lite.json index 8e8e7a1e1a78ad..8331b1f1378f05 100644 --- a/versions/r-/ring-span-lite.json +++ b/versions/r-/ring-span-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aac3ae1d9cfcd716c2faf213aa7ed81b6271ab82", + "version-string": "0.3.0", + "port-version": 1 + }, { "git-tree": "b38a843aef63a57f2a0054dbab27166f95124090", "version-string": "0.3.0", diff --git a/versions/r-/roaring.json b/versions/r-/roaring.json index 946033e205a145..4ec4c761658d62 100644 --- a/versions/r-/roaring.json +++ b/versions/r-/roaring.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd4d38440852b0d89e5bb4f1248f4090dcca5b8e", + "version-string": "2019-03-05", + "port-version": 3 + }, { "git-tree": "042f9916865df1c84ef9b48ccc9fe8802e945e94", "version-string": "2019-03-05-2", diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index 70ccfda1726775..b04903afad7e60 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d44549994de82c2029c4972e60c90e145bb9d40", + "version-string": "6.14.6", + "port-version": 1 + }, { "git-tree": "cf1be0926f4fd3d44f4c4031d1350bef2613c127", "version-string": "6.14.6", diff --git a/versions/r-/rpclib.json b/versions/r-/rpclib.json index 9cd2c8f42eb80e..ab7300a52be27d 100644 --- a/versions/r-/rpclib.json +++ b/versions/r-/rpclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b93584cf646f04baeffb45e6a185f6711192c164", + "version-string": "2.2.1", + "port-version": 3 + }, { "git-tree": "17aa69195415335b2b7ef28ebf3dda04d9fa99a0", "version-string": "2.2.1", diff --git a/versions/r-/rply.json b/versions/r-/rply.json index b7c0e1e4457a19..95424c74174718 100644 --- a/versions/r-/rply.json +++ b/versions/r-/rply.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c983b6df94d2d53f422e44c1b00ad033b5367781", + "version-string": "1.1.4", + "port-version": 1 + }, { "git-tree": "ba19464f45d20d65858ee505f02437f7a86d81e4", "version-string": "1.1.4", diff --git a/versions/r-/rs-core-lib.json b/versions/r-/rs-core-lib.json index 59616292226dc4..0b635def337615 100644 --- a/versions/r-/rs-core-lib.json +++ b/versions/r-/rs-core-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32e499733540c4e81d0059159497ebd645ffd11f", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "a7ce454c4b0c719031a5251cd4cc74d0e0376ec5", "version-string": "2020-09-14", diff --git a/versions/r-/rsocket.json b/versions/r-/rsocket.json index 1ae4810432f216..bccb827b42405f 100644 --- a/versions/r-/rsocket.json +++ b/versions/r-/rsocket.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7ad735194f400692ba373c493c23778cbfe2c79", + "version-string": "2020.05.04.00", + "port-version": 2 + }, { "git-tree": "adbdcdcb2c77bb53a1c00f41307308cfc8e7549f", "version-string": "2020.05.04.00-1", diff --git a/versions/r-/rtlsdr.json b/versions/r-/rtlsdr.json index 9eb63f544e9530..491572e70d4633 100644 --- a/versions/r-/rtlsdr.json +++ b/versions/r-/rtlsdr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ba19a6253c583cb9d97ea7ad3570c49284fadb1", + "version-string": "2020-04-16", + "port-version": 2 + }, { "git-tree": "bffd64982c9671e345a72feac3889c56504117a2", "version-string": "2020-04-16-1", diff --git a/versions/r-/rttr.json b/versions/r-/rttr.json index 5b8b22f5b7d558..ca08fdf0bc6108 100644 --- a/versions/r-/rttr.json +++ b/versions/r-/rttr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce9e17ebafad158458c38697b246601e00b61ae8", + "version-string": "0.9.6", + "port-version": 3 + }, { "git-tree": "7e0d800947d2f880f3dc3c286f8ce7d3c8b4abf1", "version-string": "0.9.6-2", diff --git a/versions/r-/rxcpp.json b/versions/r-/rxcpp.json index 01f061a68fff0a..d545b8340d2466 100644 --- a/versions/r-/rxcpp.json +++ b/versions/r-/rxcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69044b3fc33b35dab3f62471daf96a2a2b27dc0a", + "version-string": "4.1.0", + "port-version": 2 + }, { "git-tree": "87ea1e19430775f0ec9de9e6fb0375a53dc87d9a", "version-string": "4.1.0-1", diff --git a/versions/r-/rxqt.json b/versions/r-/rxqt.json index 1308684cce939b..5b12e817352039 100644 --- a/versions/r-/rxqt.json +++ b/versions/r-/rxqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dbea95b878f09cb9bca928af2be2d812b6dffc84", + "version-string": "bb2138c", + "port-version": 1 + }, { "git-tree": "ddf4c86333be5f5fa8c8aefab73d0fe77d89650b", "version-string": "bb2138c", diff --git a/versions/s-/sais.json b/versions/s-/sais.json index 222471a82fd616..4a74c9313f4c25 100644 --- a/versions/s-/sais.json +++ b/versions/s-/sais.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44efe5647de5509bb4073f3c03305a8bbf4c27f2", + "version-string": "2.4.1", + "port-version": 2 + }, { "git-tree": "f47db4f08a4e813d6df367d296914ea4d4af1b30", "version-string": "2.4.1-1", diff --git a/versions/s-/sajson.json b/versions/s-/sajson.json index f896e4fcb8a113..e454c8364a5e1a 100644 --- a/versions/s-/sajson.json +++ b/versions/s-/sajson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38334cbff736462ac7a903cf68c94002d26c2ab4", + "version-string": "2018-09-21", + "port-version": 1 + }, { "git-tree": "07ec451487f76976bb15a8e6dfefd0d373df6cee", "version-string": "2018-09-21", diff --git a/versions/s-/sassc.json b/versions/s-/sassc.json index 8e36e7defdc1cc..f407f5dc18b578 100644 --- a/versions/s-/sassc.json +++ b/versions/s-/sassc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0ba14a2c2014c843031b0c442627fce5710003b", + "version-string": "3.6.1", + "port-version": 1 + }, { "git-tree": "3c48d56954b3fc0cdefc34c3a2797840a95a976b", "version-string": "3.6.1", diff --git a/versions/s-/sciter.json b/versions/s-/sciter.json index 01058a39bf0bea..4f00a7e85093d7 100644 --- a/versions/s-/sciter.json +++ b/versions/s-/sciter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7508c766a2564096e3ca656f6b4a26d582dcf855", + "version-string": "4.4.8.3", + "port-version": 1 + }, { "git-tree": "07df67d641b4bdc057ee8a42a69552c24b381866", "version-string": "4.4.8.3", diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 2baee847486d29..abda95cf95d5e3 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3ec8f415e27c9ca79bcaf3580692d28c6cf3a14", + "version-string": "0.4", + "port-version": 1 + }, { "git-tree": "c46984f04e05003d72808d3c35f955e0d538a2e7", "version-string": "0.4", diff --git a/versions/s-/scylla-wrapper.json b/versions/s-/scylla-wrapper.json index 48518354d5d391..0093f06b340a17 100644 --- a/versions/s-/scylla-wrapper.json +++ b/versions/s-/scylla-wrapper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "358f082e98f164d3b0fdd5ef1a88dc2ec627610e", + "version-string": "2018-08-26-16e6f435", + "port-version": 1 + }, { "git-tree": "bad125e6ef50011bc279b6b56921c2e0def820c1", "version-string": "2018-08-26-16e6f435", diff --git a/versions/s-/sdformat10.json b/versions/s-/sdformat10.json index 34c0288b070829..20eadc1011dc6c 100644 --- a/versions/s-/sdformat10.json +++ b/versions/s-/sdformat10.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13fbbc3bb6bf9c38cb97d4e14af7c3a46ecba6e6", + "version-string": "10.0.0", + "port-version": 1 + }, { "git-tree": "84626baa34ef0c748149347fdc5f356d66debafd", "version-string": "10.0.0", diff --git a/versions/s-/sdformat9.json b/versions/s-/sdformat9.json index 40b840e897d7a8..adaa94b54ac14d 100644 --- a/versions/s-/sdformat9.json +++ b/versions/s-/sdformat9.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8e35870677a08dcb88753aa2ef446b75a9646f2", + "version-string": "9.4.0", + "port-version": 1 + }, { "git-tree": "750aebae0f740736affd93087026e0e344d81af2", "version-string": "9.4.0", diff --git a/versions/s-/sdl1-net.json b/versions/s-/sdl1-net.json index 6acfb1248f0d3a..efa05962d2721c 100644 --- a/versions/s-/sdl1-net.json +++ b/versions/s-/sdl1-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a90f68f29394a4b396760e605d8eb6128af811dc", + "version-string": "1.2.8", + "port-version": 4 + }, { "git-tree": "c0e1c52d034c8805d08bc443cabbe8cd13f850c9", "version-string": "1.2.8-3", diff --git a/versions/s-/sdl1.json b/versions/s-/sdl1.json index f675bb28ca256a..16a3f5827fba3b 100644 --- a/versions/s-/sdl1.json +++ b/versions/s-/sdl1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd8e1026af78ffd7bb4e9d6fa1455579367206e1", + "version-string": "1.2.15", + "port-version": 14 + }, { "git-tree": "3577dacfb219c514fb37b44ac83b8d9d379ec828", "version-string": "1.2.15", diff --git a/versions/s-/sdl2-gfx.json b/versions/s-/sdl2-gfx.json index a3db09d1768148..e07af1bbdd04f7 100644 --- a/versions/s-/sdl2-gfx.json +++ b/versions/s-/sdl2-gfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7654d7969a75b5402533dfbf7bec763dadbe949e", + "version-string": "1.0.4", + "port-version": 8 + }, { "git-tree": "5a375d8ccd902fab43eae263c2f9405f7224eeda", "version-string": "1.0.4", diff --git a/versions/s-/sdl2-image.json b/versions/s-/sdl2-image.json index 00a5853e6e9177..9ee7bc418c95c3 100644 --- a/versions/s-/sdl2-image.json +++ b/versions/s-/sdl2-image.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b1c139f382edc4b0e9e1e3ba7ecd25667583f36", + "version-string": "2.0.5", + "port-version": 2 + }, { "git-tree": "d0a9eecd26e5ba37e9827e8cfdbb85700c313f80", "version-string": "2.0.5", diff --git a/versions/s-/sdl2-net.json b/versions/s-/sdl2-net.json index ab2606bc4e6d4a..822436b19c1146 100644 --- a/versions/s-/sdl2-net.json +++ b/versions/s-/sdl2-net.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcebb3e918a41e08cc320cede3d15872c53ad204", + "version-string": "2.0.1", + "port-version": 9 + }, { "git-tree": "c315356fbaaafea6bbcc98aa1faa32355c5b4d9b", "version-string": "2.0.1-8", diff --git a/versions/s-/sdl2-ttf.json b/versions/s-/sdl2-ttf.json index 4a42056dd1730a..fb169118b2cdba 100644 --- a/versions/s-/sdl2-ttf.json +++ b/versions/s-/sdl2-ttf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "888938a2d639aaa04b3e79d2ea451a87b616541c", + "version-string": "2.0.15", + "port-version": 4 + }, { "git-tree": "669c213867cc020c758a2154f8d9fdb468f4c824", "version-string": "2.0.15-3", diff --git a/versions/s-/sdl2pp.json b/versions/s-/sdl2pp.json index 68737cae399ca0..9c0e00151fa529 100644 --- a/versions/s-/sdl2pp.json +++ b/versions/s-/sdl2pp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f63085c248f23dcc4acdf7d77c8ecab83387f45d", + "version-string": "0.16.1", + "port-version": 1 + }, { "git-tree": "d05210be37ddf262ae6599c41c16bb6204a232df", "version-string": "0.16.1", diff --git a/versions/s-/secp256k1.json b/versions/s-/secp256k1.json index 65306ac22fdae4..f6b28c37d4afa0 100644 --- a/versions/s-/secp256k1.json +++ b/versions/s-/secp256k1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0ba39af9284d60d41166c4f546975e9f2b2d9df", + "version-string": "2017-19-10", + "port-version": 4 + }, { "git-tree": "2ed3df183a68fa41ed68c2c4442804627946eb39", "version-string": "2017-19-10", diff --git a/versions/s-/septag-sx.json b/versions/s-/septag-sx.json index a47a2c6359690f..bb225d1682d229 100644 --- a/versions/s-/septag-sx.json +++ b/versions/s-/septag-sx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5132e30b4b29133a845eb8a90ad5e1a43bc9c0cd", + "version-string": "2019-05-07", + "port-version": 3 + }, { "git-tree": "cad2dce33d7fcb4c68d19e7500c528fbf9a0dee3", "version-string": "2019-05-07-2", diff --git a/versions/s-/seqan.json b/versions/s-/seqan.json index 7171aa895b7f6e..7fda5058fe763f 100644 --- a/versions/s-/seqan.json +++ b/versions/s-/seqan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "308d1d7ca45d981ec55da094763b72c2ffc062ca", + "version-string": "2.4.0", + "port-version": 2 + }, { "git-tree": "e4536d4ddc67fb220b162eae9ab38e284ae05243", "version-string": "2.4.0-1", diff --git a/versions/s-/sf2cute.json b/versions/s-/sf2cute.json index 56c8bfdb27b35e..7515996d0a1b0f 100644 --- a/versions/s-/sf2cute.json +++ b/versions/s-/sf2cute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "abd8af86e6de2707f8334d767ff543b6dfb3a703", + "version-string": "0.2.0", + "port-version": 2 + }, { "git-tree": "3e4e8518680f2bc5d3a5442eea14eefb7f73444e", "version-string": "0.2.0-1", diff --git a/versions/s-/sfgui.json b/versions/s-/sfgui.json index 46d5205e229265..979801a7229328 100644 --- a/versions/s-/sfgui.json +++ b/versions/s-/sfgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64f6f7ee9963a096a2b4260c55be6228a22846e5", + "version-string": "0.4.0", + "port-version": 4 + }, { "git-tree": "3ea13b41076aa915571ec9e65719a5088b70fd44", "version-string": "0.4.0-3", diff --git a/versions/s-/sfsexp.json b/versions/s-/sfsexp.json index a1d9a06c05081e..6396ea419d02d1 100644 --- a/versions/s-/sfsexp.json +++ b/versions/s-/sfsexp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5ca6aca4e64e303a37342534f85a1790ec3991e", + "version-string": "1.3", + "port-version": 1 + }, { "git-tree": "1e71d8f85094713149a3f09368f02c69e3f5f952", "version-string": "1.3", diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json index acf2babc49f391..cf6848474e2eab 100644 --- a/versions/s-/shapelib.json +++ b/versions/s-/shapelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e32017b2f39e66b09726e3207e85486a820b9930", + "version-string": "1.5.0", + "port-version": 1 + }, { "git-tree": "8f8ae7fafd81e822e81a86f16ae6b5cdf7109d0e", "version-string": "1.5.0", diff --git a/versions/s-/shiva-sfml.json b/versions/s-/shiva-sfml.json index 64c4d69b05aae9..e47011f28f62f3 100644 --- a/versions/s-/shiva-sfml.json +++ b/versions/s-/shiva-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7520a9c88dcd7ab8ba0234191221ae24e06d801", + "version-string": "1.0", + "port-version": 2 + }, { "git-tree": "ae1f4def605cd3f0212bf4ca1902450f45ecfa97", "version-string": "1.0-1", diff --git a/versions/s-/shiva.json b/versions/s-/shiva.json index 515c1eb93b843b..67c2c2a131ff78 100644 --- a/versions/s-/shiva.json +++ b/versions/s-/shiva.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ff8f81870f8963dc86da05ce330bbde585e940d", + "version-string": "1.0", + "port-version": 4 + }, { "git-tree": "012f601b9fa99d1f7ea32a3df809599863bbfa5b", "version-string": "1.0-3", diff --git a/versions/s-/shogun.json b/versions/s-/shogun.json index 51b8fa203bab7a..185412f8283ee2 100644 --- a/versions/s-/shogun.json +++ b/versions/s-/shogun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc5a003bcb8a42fc935726d0d8de55156318a3db", + "version-string": "6.1.4", + "port-version": 5 + }, { "git-tree": "c92d5a2ff87b2ffe3a78987e5c483abb537a0a21", "version-string": "6.1.4", diff --git a/versions/s-/signalrclient.json b/versions/s-/signalrclient.json index 3d00387669a7da..b77a0218bef7f8 100644 --- a/versions/s-/signalrclient.json +++ b/versions/s-/signalrclient.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "466bc1dd28c6b14346669c6fae30752db269d08a", + "version-string": "1.0.0-beta1-9", + "port-version": 2 + }, { "git-tree": "a1cf11834f81f78f10ff18bcec0d7f1c42309f62", "version-string": "1.0.0-beta1-9", diff --git a/versions/s-/sigslot.json b/versions/s-/sigslot.json index e7bf3ece3b6e5f..2ef6ef5f0f7074 100644 --- a/versions/s-/sigslot.json +++ b/versions/s-/sigslot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78e94753c09651ef7e2c09cbb134ae2cb786ade4", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "df12d3b00d8fc713d4d3f064d30df850fa0ddbb0", "version-string": "1.0.0-3", diff --git a/versions/s-/simde.json b/versions/s-/simde.json index c837501adf5fe9..8b4ab37bce8474 100644 --- a/versions/s-/simde.json +++ b/versions/s-/simde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0caa37f83bd1276d984e5ae1f67ce0cb47e1f62e", + "version-string": "0.7.0", + "port-version": 1 + }, { "git-tree": "49aade0bf4faf46635d58a453e71399f2d6c7412", "version-string": "0.7.0", diff --git a/versions/s-/simple-fft.json b/versions/s-/simple-fft.json index fbaffe5d8c533d..8ea28d2b174987 100644 --- a/versions/s-/simple-fft.json +++ b/versions/s-/simple-fft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8c90beba45454e3e497fb7ef62b20a188bee1c2", + "version-string": "2020-06-14", + "port-version": 1 + }, { "git-tree": "b15ee04ff2954c699af23a3a292a1d016f285ce7", "version-string": "2020-06-14", diff --git a/versions/s-/simpleini.json b/versions/s-/simpleini.json index 1a4ce25a200eda..90cba4bbbd40b2 100644 --- a/versions/s-/simpleini.json +++ b/versions/s-/simpleini.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da811f3fb2f252e4f1eff0f42047c539315b60dd", + "version-string": "2018-08-31", + "port-version": 5 + }, { "git-tree": "7c5b51650f86a58145cdcfd417d11cb6194f86c5", "version-string": "2018-08-31-4", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index f3ab3630a30d47..9fe32e77dc8b47 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19fcd9cfd0b0a27e87e04bf2d1f8f03c7b1e8ab0", + "version-string": "2020-05-18", + "port-version": 5 + }, { "git-tree": "eea166718304da2660d795937fe2528dbd2909cc", "version-string": "2020-05-18", diff --git a/versions/s-/skyr-url.json b/versions/s-/skyr-url.json index 5e6542f6d9edfb..3228ab10bca6ed 100644 --- a/versions/s-/skyr-url.json +++ b/versions/s-/skyr-url.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "174f5bc4cc8080f2cb34c7a1aad9b14bedaa2c9a", + "version-string": "1.13.0", + "port-version": 1 + }, { "git-tree": "f5e980fa829d4bd732381378c07ab88cb7b2c969", "version-string": "1.13.0", diff --git a/versions/s-/smpeg2.json b/versions/s-/smpeg2.json index 8e9223d0a53bd8..8b264b4ada4260 100644 --- a/versions/s-/smpeg2.json +++ b/versions/s-/smpeg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a42a5beba1ed982d3e6abb94ad6871f06f663d93", + "version-string": "2.0.0", + "port-version": 7 + }, { "git-tree": "11b7150cc88a598a42ce1467849d1138fb0540aa", "version-string": "2.0.0-6", diff --git a/versions/s-/snappy.json b/versions/s-/snappy.json index 39e9e0047c5223..121944067d6c1a 100644 --- a/versions/s-/snappy.json +++ b/versions/s-/snappy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1afd7c780a1ca8befbc3fbde0262d073afeee35", + "version-string": "1.1.8", + "port-version": 1 + }, { "git-tree": "2d47bf3d6ebccc84da5b32fadd900cf9b4b21fb7", "version-string": "1.1.8", diff --git a/versions/s-/sndfile.json b/versions/s-/sndfile.json index e46076f7409f72..0700452b2284df 100644 --- a/versions/s-/sndfile.json +++ b/versions/s-/sndfile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0706d70c299fbe9e9e32d80e5ba2cb910dfd294", + "version-string": "0", + "port-version": 1 + }, { "git-tree": "b4f6b73847fa1f16e3d628d0663354df7d579ffd", "version-string": "0", diff --git a/versions/s-/snowhouse.json b/versions/s-/snowhouse.json index 90f1b7fa68f09f..0031ac5844920f 100644 --- a/versions/s-/snowhouse.json +++ b/versions/s-/snowhouse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d49ba83122c461ba6d57aa2768241cc07ff3e32e", + "version-string": "5.0.0", + "port-version": 1 + }, { "git-tree": "c259e9c0f2dbd8f9b73871032ee553973636403e", "version-string": "5.0.0", diff --git a/versions/s-/sockpp.json b/versions/s-/sockpp.json index 6c1914647a87d5..12e5a5bd06a181 100644 --- a/versions/s-/sockpp.json +++ b/versions/s-/sockpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69d23d693d1ab8cfeeab35c6b2794d6f2a9ca748", + "version-string": "0.7", + "port-version": 1 + }, { "git-tree": "259ad7f13a8184478a6a94922385f06ff5a7a00b", "version-string": "0.7", diff --git a/versions/s-/sokol.json b/versions/s-/sokol.json index b90bd2943418ec..d1445dacefaa20 100644 --- a/versions/s-/sokol.json +++ b/versions/s-/sokol.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18b4da89731b9e7cf61e56fc72594049c420d2e1", + "version-string": "2019-09-09", + "port-version": 1 + }, { "git-tree": "5f96d00b385a476fa3a663833eca5055a07e3ec8", "version-string": "2019-09-09", diff --git a/versions/s-/sol2.json b/versions/s-/sol2.json index 674ac70ceffa1c..0a05b4a8c8f9a6 100644 --- a/versions/s-/sol2.json +++ b/versions/s-/sol2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dd17eacaccf75a326029df0e26ad1b20c940ad5", + "version-string": "3.2.2", + "port-version": 1 + }, { "git-tree": "6effd490f0dc787aec07e064241407658ace41ce", "version-string": "3.2.2", diff --git a/versions/s-/solid3.json b/versions/s-/solid3.json index 2b86fccd088edf..5f64fce649c8b1 100644 --- a/versions/s-/solid3.json +++ b/versions/s-/solid3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f494d1d6f610d9c26444a12f2b9952f7485601d", + "version-string": "3.5.8", + "port-version": 1 + }, { "git-tree": "6b6536f4343a96d0fc5ccebfa8c2c4c680841848", "version-string": "3.5.8", diff --git a/versions/s-/soqt.json b/versions/s-/soqt.json index 1577a71fba42d6..8db3fc4ff8888a 100644 --- a/versions/s-/soqt.json +++ b/versions/s-/soqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3bbb3ea4c3dff6485e3d04f6af1fbbe6e5a75be9", + "version-string": "1.6.0", + "port-version": 3 + }, { "git-tree": "db68c2677166ab693a6cef1084993f5da6af87e6", "version-string": "1.6.0", diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json index 027ed355a9abfe..a6952b726c3e44 100644 --- a/versions/s-/soundtouch.json +++ b/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47269f38d27248c1e52fd21c3a296d032e02ac01", + "version-string": "2.0.0", + "port-version": 7 + }, { "git-tree": "c70fc01038afbb6850538b0a4789b91c83113a8d", "version-string": "2.0.0-6", diff --git a/versions/s-/soxr.json b/versions/s-/soxr.json index 906ba69adc4a66..f0062178205ac6 100644 --- a/versions/s-/soxr.json +++ b/versions/s-/soxr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5719977bf7a0fcc0ac88151327dcddda23648594", + "version-string": "0.1.3", + "port-version": 4 + }, { "git-tree": "ab77ab3c75baa2a8d004321ce5ce237319c90f9e", "version-string": "0.1.3", diff --git a/versions/s-/spaceland.json b/versions/s-/spaceland.json index 0b942ddb7468e6..7d254b1f692be0 100644 --- a/versions/s-/spaceland.json +++ b/versions/s-/spaceland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56c00b345d98c60814bf7b00b7a0aea2d3f19852", + "version-string": "7.8.2", + "port-version": 5 + }, { "git-tree": "9640c7fea7a143c3c5616886eefa2144efe9e6ed", "version-string": "7.8.2-4", diff --git a/versions/s-/sparsehash.json b/versions/s-/sparsehash.json index d3778e74c2b3c8..9610c04549798f 100644 --- a/versions/s-/sparsehash.json +++ b/versions/s-/sparsehash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e862d4c31bee927f18b012bb062e9d5282f77733", + "version-string": "2.0.3", + "port-version": 1 + }, { "git-tree": "09caa54b75727ae88898c390e6146433af01a47e", "version-string": "2.0.3", diff --git a/versions/s-/sparsepp.json b/versions/s-/sparsepp.json index 970ae76d2140f2..7cf5810b81c3fe 100644 --- a/versions/s-/sparsepp.json +++ b/versions/s-/sparsepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c262fbb63f9655ba3d1759153e3dce5f502babe6", + "version-string": "1.22", + "port-version": 2 + }, { "git-tree": "4eb97e554a87e43fca8664e8a50de2e96b5d89a3", "version-string": "1.22-1", diff --git a/versions/s-/spatialite-tools.json b/versions/s-/spatialite-tools.json index 2251060f044e9d..c3e83a118b6cae 100644 --- a/versions/s-/spatialite-tools.json +++ b/versions/s-/spatialite-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9263bb3c351d6d5333538e6d22e29da6253a702", + "version-string": "5.0.0", + "port-version": 3 + }, { "git-tree": "a54d2d339b5eaf4d37fc125c49b939822fdaf3ba", "version-string": "5.0.0", diff --git a/versions/s-/spdk-dpdk.json b/versions/s-/spdk-dpdk.json index dd03ef3e10275e..1920b0d8f0bbbd 100644 --- a/versions/s-/spdk-dpdk.json +++ b/versions/s-/spdk-dpdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a67cfb564274aa985ef274b6f8a1fac8591b5445", + "version-string": "20181124", + "port-version": 1 + }, { "git-tree": "42582bec709b8c669cb6d6fb685be93eab83ac16", "version-string": "20181124", diff --git a/versions/s-/spdk-ipsec.json b/versions/s-/spdk-ipsec.json index 83d09372df77a0..f143fa07a4d0ea 100644 --- a/versions/s-/spdk-ipsec.json +++ b/versions/s-/spdk-ipsec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf8024ae19962088f98418e2487147aa14d4df95", + "version-string": "20180711", + "port-version": 1 + }, { "git-tree": "7588e57c159ab0bdf5dec13b27382fd43973e995", "version-string": "20180711", diff --git a/versions/s-/spdk-isal.json b/versions/s-/spdk-isal.json index 17ff0b01bbfbe3..09c4734880c431 100644 --- a/versions/s-/spdk-isal.json +++ b/versions/s-/spdk-isal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3b83f2844457a26c4f286c651a85ec6b5cc43e2", + "version-string": "20181006", + "port-version": 1 + }, { "git-tree": "965daf98d6079c34b5b0ca3386e4ad6df1b0006d", "version-string": "20181006", diff --git a/versions/s-/spdk.json b/versions/s-/spdk.json index 390d54399e6134..fe52ef1f23e784 100644 --- a/versions/s-/spdk.json +++ b/versions/s-/spdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5ea399f1e0b77d53593ee78e4f6574c2c53a68c", + "version-string": "19.01.1", + "port-version": 2 + }, { "git-tree": "5c375362bcf50097d43af5e5e3480c8b0eb2ce7c", "version-string": "19.01.1", diff --git a/versions/s-/speex.json b/versions/s-/speex.json index 2579e431086079..ea743307ec9b89 100644 --- a/versions/s-/speex.json +++ b/versions/s-/speex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8713e87cf40c60307dfdef2102392b97cb3b4c3d", + "version-string": "1.2.0", + "port-version": 9 + }, { "git-tree": "eaa4e7b1a075051d8ba02bc67a89ae035be1b28c", "version-string": "1.2.0", diff --git a/versions/s-/speexdsp.json b/versions/s-/speexdsp.json index 64c6eb054e0362..16ca82f1d03439 100644 --- a/versions/s-/speexdsp.json +++ b/versions/s-/speexdsp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "911ea65a3db9f26e595990e94ab4ec911cd8ef82", + "version-string": "1.2.0", + "port-version": 6 + }, { "git-tree": "dfc87aa20568189fc2493e46eeb6067c97fdc9b0", "version-string": "1.2.0", diff --git a/versions/s-/spirit-po.json b/versions/s-/spirit-po.json index 889ea76b543389..f1551b040a6116 100644 --- a/versions/s-/spirit-po.json +++ b/versions/s-/spirit-po.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cebcf471848bf1b121a7335d3af54c64a038a9e", + "version-string": "1.1.2", + "port-version": 2 + }, { "git-tree": "f209e0daa09e721fae054ff377284190bab3b28e", "version-string": "1.1.2-1", diff --git a/versions/s-/sprout.json b/versions/s-/sprout.json index 32c8a901d02d11..a8aff6295d7f5c 100644 --- a/versions/s-/sprout.json +++ b/versions/s-/sprout.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "614a0748fa2deac704af2170ab88ed64c7475e11", + "version-string": "2019-06-20", + "port-version": 1 + }, { "git-tree": "0b87b120bf0e49a1b22400f1fc4a0f5922b5c472", "version-string": "2019-06-20", diff --git a/versions/s-/spscqueue.json b/versions/s-/spscqueue.json index eea5708f3860f2..67404178c56224 100644 --- a/versions/s-/spscqueue.json +++ b/versions/s-/spscqueue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a8b323fdedb205fefac81e53240408ac7ece3ee", + "version-string": "1.1", + "port-version": 1 + }, { "git-tree": "13f8976debabfeccc71905c77cc24e746dd9c5d5", "version-string": "1.1", diff --git a/versions/s-/sqlite-modern-cpp.json b/versions/s-/sqlite-modern-cpp.json index 07b0d70fdb02cf..302e1a3edc0dda 100644 --- a/versions/s-/sqlite-modern-cpp.json +++ b/versions/s-/sqlite-modern-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac74c74504305a6929128356e348907745b01c11", + "version-string": "3.2-936cd0c8", + "port-version": 1 + }, { "git-tree": "76f96eb36e0647e5dabef65acc033bf563621704", "version-string": "3.2-936cd0c8", diff --git a/versions/s-/sqlite-orm.json b/versions/s-/sqlite-orm.json index 371fee92ce3b54..16d45a07cdde65 100644 --- a/versions/s-/sqlite-orm.json +++ b/versions/s-/sqlite-orm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be577f000372e4ae6d9675bdb10ff25dce38d90d", + "version-string": "1.6", + "port-version": 1 + }, { "git-tree": "62e09e58648e190b5e5a6c2bd15da05dffad439b", "version-string": "1.6", diff --git a/versions/s-/sqlpp11-connector-mysql.json b/versions/s-/sqlpp11-connector-mysql.json index 87a2496b2e1eca..5ecd3b6d4ec0e6 100644 --- a/versions/s-/sqlpp11-connector-mysql.json +++ b/versions/s-/sqlpp11-connector-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be46edaef7e1c02783398222e4e73f288848e537", + "version-string": "0.29", + "port-version": 2 + }, { "git-tree": "7a94d2413e27ed320a9ad41acf4e447b060cb5d4", "version-string": "0.29-1", diff --git a/versions/s-/sqlpp11-connector-sqlite3.json b/versions/s-/sqlpp11-connector-sqlite3.json index 8b2983240efa2d..ca49980d3330da 100644 --- a/versions/s-/sqlpp11-connector-sqlite3.json +++ b/versions/s-/sqlpp11-connector-sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "476b94c2a6be8d48ef3360793ed0b4569b4614d4", + "version-string": "0.30", + "port-version": 1 + }, { "git-tree": "5adcee3bd02dde26fc1ca6272162cc5005b0cadd", "version-string": "0.30", diff --git a/versions/s-/sqlpp11.json b/versions/s-/sqlpp11.json index 59b681f1056575..ee0e440c8d13f2 100644 --- a/versions/s-/sqlpp11.json +++ b/versions/s-/sqlpp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "572562b44cd15b26fd8cdf68dff2c53d6ec0619d", + "version-string": "0.60", + "port-version": 1 + }, { "git-tree": "96028362edb1da213edd2423d2c128e08ac6988d", "version-string": "0.60", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json index 9273d78c39a5d6..31210573bc5bdc 100644 --- a/versions/s-/status-code.json +++ b/versions/s-/status-code.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3acdd69c0d01a5041a2549a21a1d0d367efa7d53", + "version-string": "1.0.0-ab3cd821", + "port-version": 1 + }, { "git-tree": "a140621d67b58b39b6f3ab49cc0c4f1456e5a29f", "version-string": "1.0.0-ab3cd821", diff --git a/versions/s-/status-value-lite.json b/versions/s-/status-value-lite.json index 28330797bb80e2..19cdeaced1c886 100644 --- a/versions/s-/status-value-lite.json +++ b/versions/s-/status-value-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81415ecf90da612b36d970777850cfa47ba2e1e8", + "version-string": "1.1.0", + "port-version": 1 + }, { "git-tree": "0c2c7909015007afa15da14789dec8c16b5284ba", "version-string": "1.1.0", diff --git a/versions/s-/stb.json b/versions/s-/stb.json index 0ede63d298e70b..750f114e6438a7 100644 --- a/versions/s-/stb.json +++ b/versions/s-/stb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa6d7e998f98f122efa37f456ffa498d546185b9", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "079dbaa8fb1658d6508be38e224c79aeb99a0c46", "version-string": "2020-09-14", diff --git a/versions/s-/stlab.json b/versions/s-/stlab.json index 7e25811ac87401..a93c471e32ba86 100644 --- a/versions/s-/stlab.json +++ b/versions/s-/stlab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de92e484fbf56eff04270090cb06452cbe22431b", + "version-string": "1.6.2", + "port-version": 1 + }, { "git-tree": "69d76ab4d0a43c472e67688022dc3831399ee571", "version-string": "1.6.2", diff --git a/versions/s-/stormlib.json b/versions/s-/stormlib.json index 56da6a183c6096..24b12b98fd179d 100644 --- a/versions/s-/stormlib.json +++ b/versions/s-/stormlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "685e22a5716a953dece56ffccfd4b3102936d175", + "version-string": "2019-05-10", + "port-version": 3 + }, { "git-tree": "8c3dfecaec0cd4f296d1153e9b97a11be97e7677", "version-string": "2019-05-10", diff --git a/versions/s-/strict-variant.json b/versions/s-/strict-variant.json index f5a617b2a70c5b..df6be4fb3757aa 100644 --- a/versions/s-/strict-variant.json +++ b/versions/s-/strict-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4589b1df5892a4966987c9a6d856b76c7c2481d", + "version-string": "0.5", + "port-version": 1 + }, { "git-tree": "b289adfc580c77e7b542c709060fa80c26c78849", "version-string": "0.5", diff --git a/versions/s-/string-theory.json b/versions/s-/string-theory.json index 32ab0d11742be3..56e8c8cf6aeab9 100644 --- a/versions/s-/string-theory.json +++ b/versions/s-/string-theory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8af1cbe5e5d6b5d098b15f4e5548d4e315afb4b0", + "version-string": "3.4", + "port-version": 1 + }, { "git-tree": "021ea7daa5d0f6d63bfa2617811a68639e7f5964", "version-string": "3.4", diff --git a/versions/s-/string-view-lite.json b/versions/s-/string-view-lite.json index beecd7c0927667..8a706e55df7d6d 100644 --- a/versions/s-/string-view-lite.json +++ b/versions/s-/string-view-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca0acc44ac920ca460f95c75da6b05c2fa92447c", + "version-string": "1.3.0", + "port-version": 1 + }, { "git-tree": "d669e1a64927f0a008ed1e4e6179760f8696ca77", "version-string": "1.3.0", diff --git a/versions/s-/strtk.json b/versions/s-/strtk.json index 6b27690d97325a..111ce2ba6ec540 100644 --- a/versions/s-/strtk.json +++ b/versions/s-/strtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac754f80d0eec3321c07b9389b10ba93490ee148", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "15e912afd73f5656dfaae90459274f72ff3b7fee", "version-string": "2020-09-14", diff --git a/versions/s-/stx.json b/versions/s-/stx.json index 7e89caf2bc1d95..27c9f1ab72b9b4 100644 --- a/versions/s-/stx.json +++ b/versions/s-/stx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "700e84d6f57c5a4631d378525207a0265715e9c3", + "version-string": "1.0.1", + "port-version": 1 + }, { "git-tree": "3f6ca6895772efc8d75945a015596c0be4e4cc9b", "version-string": "1.0.1", diff --git a/versions/s-/stxxl.json b/versions/s-/stxxl.json index 86abe39a737ecd..dd71c34f60504a 100644 --- a/versions/s-/stxxl.json +++ b/versions/s-/stxxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc3442a34aeab30bf9b04d7d49775527303c8811", + "version-string": "2018-11-15", + "port-version": 3 + }, { "git-tree": "22aadda93429299d04a2c8424c20a70f577da220", "version-string": "2018-11-15-2", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index 0318f9a64655d0..b0fb8c288e5a41 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "610cdc3479021b9cf5608147a656469c0a8e7bf7", + "version-string": "2020-01-07", + "port-version": 3 + }, { "git-tree": "1899f59286e7b43ea4501c3bb20754ae728d1040", "version-string": "2020-01-07", diff --git a/versions/s-/systemc.json b/versions/s-/systemc.json index 9c323a672c5d1b..aff42b966da707 100644 --- a/versions/s-/systemc.json +++ b/versions/s-/systemc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f10aa24af3ad40a22d15a729df5d64695c141226", + "version-string": "2.3.3", + "port-version": 5 + }, { "git-tree": "9f6eda0d5b4ce0d9f620cae19df91a526ae18803", "version-string": "2.3.3-4", diff --git a/versions/t-/tabulate.json b/versions/t-/tabulate.json index b930dcf2b8cf28..dcdfc027bfda50 100644 --- a/versions/t-/tabulate.json +++ b/versions/t-/tabulate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "482538c4e4f465f113e0318f20cd18b6f2b17f17", + "version-string": "2019-01-06", + "port-version": 1 + }, { "git-tree": "f59225353a31f7ebaa180e0d35a59122b31ce1b9", "version-string": "2019-01-06", diff --git a/versions/t-/tacopie.json b/versions/t-/tacopie.json index 714a31e133cbd9..49d37a8fcc75c6 100644 --- a/versions/t-/tacopie.json +++ b/versions/t-/tacopie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d65f4f38c50754c208cb959e3d1b0c6956d2bf94", + "version-string": "3.2.0", + "port-version": 3 + }, { "git-tree": "4338494afcc9385f4e4fb804faaef19e96c11843", "version-string": "3.2.0-2", diff --git a/versions/t-/taocpp-json.json b/versions/t-/taocpp-json.json index 8cecc7cd72dad4..e4e789af9cb135 100644 --- a/versions/t-/taocpp-json.json +++ b/versions/t-/taocpp-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afe8907661864659e89e9fc421415b2687390c03", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "1f514b2100e6f510ec9fe39625c67e050f0910e0", "version-string": "2020-09-14", diff --git a/versions/t-/tap-windows6.json b/versions/t-/tap-windows6.json index 7efe428b18c06e..f22fe46ddb4d7c 100644 --- a/versions/t-/tap-windows6.json +++ b/versions/t-/tap-windows6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b35b39ca3996a529812b69654a194568127e4e1", + "version-string": "9.21.2-0e30f5c", + "port-version": 1 + }, { "git-tree": "56eae8063d4c595d6002e0a499258d853a55ff22", "version-string": "9.21.2-0e30f5c", diff --git a/versions/t-/tbb.json b/versions/t-/tbb.json index 71c441dbf8051e..9c56bf8a5a081b 100644 --- a/versions/t-/tbb.json +++ b/versions/t-/tbb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e168e03c2e5776bdee59accf5f643ae26b0ddd84", + "version-string": "2020_U3", + "port-version": 6 + }, { "git-tree": "475f44cf5033c6f3bfb5c69c5a301cddf18e7aa0", "version-string": "2020_U3", diff --git a/versions/t-/tcl.json b/versions/t-/tcl.json index 1cff326b2e58cf..39889c3789f155 100644 --- a/versions/t-/tcl.json +++ b/versions/t-/tcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1307e2d115e01cedde54662115ff363e46b6fe5", + "version-string": "core-9-0-a1", + "port-version": 2 + }, { "git-tree": "91acff42f01d650b56bc6a8377bca8c93f9e7408", "version-string": "core-9-0-a1", diff --git a/versions/t-/tclap.json b/versions/t-/tclap.json index a0a4dc9b546fab..b9991c21b20454 100644 --- a/versions/t-/tclap.json +++ b/versions/t-/tclap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "787d1698947778edfecc2aa104ca7d09fb7d7415", + "version-string": "1.2.2", + "port-version": 4 + }, { "git-tree": "c0fc7c229a3d40cbeb66f7f67856aa3115a70d3f", "version-string": "1.2.2-3", diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json index 647de20f5ef91e..6a711fa93f64b6 100644 --- a/versions/t-/teemo.json +++ b/versions/t-/teemo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ba6666678630113a8080448b6751fa3a2eacbef", + "version-string": "2.2", + "port-version": 1 + }, { "git-tree": "0ca1723ca09260ded55e97381d5ad169e775baa5", "version-string": "2.2", diff --git a/versions/t-/telnetpp.json b/versions/t-/telnetpp.json index 1ef742424fec16..0ac6ff7a513624 100644 --- a/versions/t-/telnetpp.json +++ b/versions/t-/telnetpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e90806a190428cbf53773ea93d5bdacb7f92f7c0", + "version-string": "2.1.2", + "port-version": 1 + }, { "git-tree": "904e2801ba11dae44b62c252e4b6193b50e63fd2", "version-string": "2.1.2", diff --git a/versions/t-/tgbot-cpp.json b/versions/t-/tgbot-cpp.json index b62f1d0a4ae414..221b6611c30d5f 100644 --- a/versions/t-/tgbot-cpp.json +++ b/versions/t-/tgbot-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a48e654a56a7017acf3d0f0b119a96e9235119f9", + "version-string": "1.2.1", + "port-version": 1 + }, { "git-tree": "ba88bbcbff36bc2411806249543cd4046d938ebd", "version-string": "1.2.1", diff --git a/versions/t-/tgc.json b/versions/t-/tgc.json index ad9806f121d44d..2ce1e70a8790bd 100644 --- a/versions/t-/tgc.json +++ b/versions/t-/tgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "753c07ac331209bf362c3818e462493ed6ac5ecb", + "version-string": "2019-08-11", + "port-version": 2 + }, { "git-tree": "b69aab3ec83aa87c6b297a75b4f02ee68d512921", "version-string": "2019-08-11-1", diff --git a/versions/t-/theia.json b/versions/t-/theia.json index ab84a7a4889a04..b3d5cc256a2be0 100644 --- a/versions/t-/theia.json +++ b/versions/t-/theia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e4f395b731d46fde09836e4ff9a23ace6c74a6a", + "version-string": "0.8", + "port-version": 4 + }, { "git-tree": "6d74e7de2d80d5f3675b381e39c5fedd34493531", "version-string": "0.8", diff --git a/versions/t-/think-cell-range.json b/versions/t-/think-cell-range.json index 80ca3c39e7d6fd..f3a34c739aebe1 100644 --- a/versions/t-/think-cell-range.json +++ b/versions/t-/think-cell-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e39d38661e62f2c36eaa0026eabfb21e827e8456", + "version-string": "498839d", + "port-version": 2 + }, { "git-tree": "b1c80aab0470d03d5f336f15283beec17f3a3bfc", "version-string": "498839d-1", diff --git a/versions/t-/threadpool.json b/versions/t-/threadpool.json index 3090b34f37816b..6af078b544a504 100644 --- a/versions/t-/threadpool.json +++ b/versions/t-/threadpool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "498f064539d36777494d54a9edcce63a012ac503", + "version-string": "0.2.5", + "port-version": 2 + }, { "git-tree": "4a34cd691a72f01753a152d484648d8bd885dfb8", "version-string": "0.2.5", diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json index ae23598c521e15..de82f925644785 100644 --- a/versions/t-/thrift.json +++ b/versions/t-/thrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7225d5805f82b8027c801f08d162bbd41b2b99f", + "version-string": "0.13.0", + "port-version": 1 + }, { "git-tree": "752af13152a5b5c98e64bc1beeec974befbbb5b9", "version-string": "0.13.0", diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json index 7b192ae1468a74..976625125f9a1e 100644 --- a/versions/t-/tidy-html5.json +++ b/versions/t-/tidy-html5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b446932540002cb1b664d7f5286fdb6c0f7af28", + "version-string": "5.7.28", + "port-version": 3 + }, { "git-tree": "b050c4d466a093f1322998c0c2c356698954bc40", "version-string": "5.7.28-2", diff --git a/versions/t-/tinkerforge.json b/versions/t-/tinkerforge.json index e34cd1cf1335a2..0969ff465c79bb 100644 --- a/versions/t-/tinkerforge.json +++ b/versions/t-/tinkerforge.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "684528ec07914569ba89b0d42230290cc55fdd4a", + "version-string": "2.1.25", + "port-version": 1 + }, { "git-tree": "89d1c3d2cdeef8dfd9d9a36a12461d1994094de0", "version-string": "2.1.25", diff --git a/versions/t-/tiny-aes-c.json b/versions/t-/tiny-aes-c.json index 44e769d773091a..1a915e78307771 100644 --- a/versions/t-/tiny-aes-c.json +++ b/versions/t-/tiny-aes-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0971fda4965a33a674a28b84035e71e42e57f135", + "version-string": "2019-07-31", + "port-version": 1 + }, { "git-tree": "b5a8d85f99c004b3a88f910e02cf53411fed45d8", "version-string": "2019-07-31", diff --git a/versions/t-/tiny-bignum-c.json b/versions/t-/tiny-bignum-c.json index 69ddcf56f88cda..010c784a05d91a 100644 --- a/versions/t-/tiny-bignum-c.json +++ b/versions/t-/tiny-bignum-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "645fb34f304ead370e2f4275b4e6c7120dcaed9e", + "version-string": "2019-07-31", + "port-version": 1 + }, { "git-tree": "46dd3471154a21dd430e36e7d0ab56c33f76211e", "version-string": "2019-07-31", diff --git a/versions/t-/tiny-dnn.json b/versions/t-/tiny-dnn.json index e0921f437d8a0d..ba07444159746b 100644 --- a/versions/t-/tiny-dnn.json +++ b/versions/t-/tiny-dnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6de81be7e06cac0652c8ffcc136ffdb889cb41f8", + "version-string": "2018-10-25", + "port-version": 1 + }, { "git-tree": "7640751d4d50df9abb088cd6de1b397694fd6478", "version-string": "2018-10-25", diff --git a/versions/t-/tiny-process-library.json b/versions/t-/tiny-process-library.json index b407472f3fdd0c..76a74605492773 100644 --- a/versions/t-/tiny-process-library.json +++ b/versions/t-/tiny-process-library.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdb3c92735776a800243c7cc38884357f3c743a5", + "version-string": "2.0.4", + "port-version": 1 + }, { "git-tree": "79863f6d064fb7200c1202261335bd5a131133c0", "version-string": "2.0.4", diff --git a/versions/t-/tiny-regex-c.json b/versions/t-/tiny-regex-c.json index 65f062c723c947..ddef0c8c06005b 100644 --- a/versions/t-/tiny-regex-c.json +++ b/versions/t-/tiny-regex-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "daa1326555febe3cba226d415bdad4a700f5c9f9", + "version-string": "2019-07-31", + "port-version": 1 + }, { "git-tree": "1086a34a4532ba8a47cd1d5514f9fddd83e52961", "version-string": "2019-07-31", diff --git a/versions/t-/tinycthread.json b/versions/t-/tinycthread.json index 2adeeac578df6f..435653d63961ee 100644 --- a/versions/t-/tinycthread.json +++ b/versions/t-/tinycthread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc723cd8de47e64e29d617806772f2fac2967e28", + "version-string": "2019-08-06", + "port-version": 1 + }, { "git-tree": "3957c392b150baa9436be2c25fa65af28dab3ee2", "version-string": "2019-08-06", diff --git a/versions/t-/tinydir.json b/versions/t-/tinydir.json index 6ac26f83acf4f7..61a10051e6f846 100644 --- a/versions/t-/tinydir.json +++ b/versions/t-/tinydir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce7697b2c8be56998fc7b97681fcd6e1d66cf49f", + "version-string": "1.2.4", + "port-version": 1 + }, { "git-tree": "713b509a8613d83a0b9a472896995f5b17e6c530", "version-string": "1.2.4", diff --git a/versions/t-/tinyexif.json b/versions/t-/tinyexif.json index a6777c6ebd29e8..70793522361ab6 100644 --- a/versions/t-/tinyexif.json +++ b/versions/t-/tinyexif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "350cf76237d8fc38f67cba9766e25b2f68d50d64", + "version-string": "1.0.2", + "port-version": 7 + }, { "git-tree": "c74a09bb37bbdd9e5228c6b694ec84bbd59d6d62", "version-string": "1.0.2-6", diff --git a/versions/t-/tinyexr.json b/versions/t-/tinyexr.json index 4bf4a7ad0bad1e..318b632098967d 100644 --- a/versions/t-/tinyexr.json +++ b/versions/t-/tinyexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81548356751317d12ff579d7c7749d073e5d0fb6", + "version-string": "1.0.0", + "port-version": 1 + }, { "git-tree": "b64261d4bf58c8ec08386f29bf15aaebd52ddc8d", "version-string": "1.0.0", diff --git a/versions/t-/tinygltf.json b/versions/t-/tinygltf.json index f0cdfb1d36acdc..dce2d89960f135 100644 --- a/versions/t-/tinygltf.json +++ b/versions/t-/tinygltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c5eabb454edeec3963a53675cc460732fe96a9c", + "version-string": "2020-07-28", + "port-version": 2 + }, { "git-tree": "a0991e25859335be940b034a0d5ec369cdb1f14c", "version-string": "2020-07-28", diff --git a/versions/t-/tinynpy.json b/versions/t-/tinynpy.json index 0d58d4baa57db4..2f243c632c1cf5 100644 --- a/versions/t-/tinynpy.json +++ b/versions/t-/tinynpy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "747ac11f43b296e46b01d17b69f04d0f782e33eb", + "version-string": "1.0.0", + "port-version": 4 + }, { "git-tree": "1aaad761b70ba86a1c925f1180afa3d10ca9e8b4", "version-string": "1.0.0-3", diff --git a/versions/t-/tinyobjloader.json b/versions/t-/tinyobjloader.json index ef53cfb9614935..a459ab3ab47f9d 100644 --- a/versions/t-/tinyobjloader.json +++ b/versions/t-/tinyobjloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42c09a92244dd67f0c8a1a92e688173413517dee", + "version-string": "2.0.0-rc2", + "port-version": 1 + }, { "git-tree": "2114ea39f1654e929f31def392889f0aee7fb3de", "version-string": "2.0.0-rc2", diff --git a/versions/t-/tinyply.json b/versions/t-/tinyply.json index b5c295d6f59a3d..9c7c4b10bab283 100644 --- a/versions/t-/tinyply.json +++ b/versions/t-/tinyply.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24e53b2ef803576808b7e5176301b979e01fcd1c", + "version-string": "2020-05-22", + "port-version": 1 + }, { "git-tree": "461112c3d4ddfe5ddb6cb05765454f3c457873f4", "version-string": "2020-05-22", diff --git a/versions/t-/tinyspline.json b/versions/t-/tinyspline.json index 952a43b5e984d0..5958c4062b5905 100644 --- a/versions/t-/tinyspline.json +++ b/versions/t-/tinyspline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "393f891a892f72ee95dde573dbc6ec87992e564a", + "version-string": "0.2.0", + "port-version": 4 + }, { "git-tree": "b75d189b7025f885588d489e83cd5b97eee35a5b", "version-string": "0.2.0-3", diff --git a/versions/t-/tinythread.json b/versions/t-/tinythread.json index 6181db6171bf4d..b446c0868a651c 100644 --- a/versions/t-/tinythread.json +++ b/versions/t-/tinythread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e6a5537675d6cdabb102cdba98a638e75bc3a03", + "version-string": "1.1", + "port-version": 4 + }, { "git-tree": "fcf55a788b7bc0d3067c726c3224bc5a3fc3c304", "version-string": "1.1-3", diff --git a/versions/t-/tinytoml.json b/versions/t-/tinytoml.json index 300473cc9b55dd..b7eb2bbda52fe8 100644 --- a/versions/t-/tinytoml.json +++ b/versions/t-/tinytoml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bc5fcab066d64cc4693428f2375e9232f17b7d0", + "version-string": "20180219", + "port-version": 2 + }, { "git-tree": "787ecedb400a621f68e63a6000aee5d0a4890a55", "version-string": "20180219-1", diff --git a/versions/t-/tinyutf8.json b/versions/t-/tinyutf8.json index 3eb83bdf44f05b..d0437bdce153dd 100644 --- a/versions/t-/tinyutf8.json +++ b/versions/t-/tinyutf8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2217decdd5160c93c9b4f92269b32a9d414670ee", + "version-string": "4.0.2", + "port-version": 1 + }, { "git-tree": "da8a71ca817c591c31df0c318f199c0056cbcc2c", "version-string": "4.0.2", diff --git a/versions/t-/tinyxml.json b/versions/t-/tinyxml.json index 601a618dfea05f..d4060a0ee97318 100644 --- a/versions/t-/tinyxml.json +++ b/versions/t-/tinyxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27f0b200c75054768b3c6ed538c8bb938083ab67", + "version-string": "2.6.2", + "port-version": 8 + }, { "git-tree": "3c0dd9fb8a99d226d863eba951e54d40449c3c84", "version-string": "2.6.2-7", diff --git a/versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json index 15bddec91edd6e..0d16235d08f056 100644 --- a/versions/t-/tinyxml2.json +++ b/versions/t-/tinyxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c434072d7cd45db70c50b5553673f174b981eee", + "version-string": "8.0.0", + "port-version": 2 + }, { "git-tree": "5bc723c583463d1e50ff6dcf0131328759371eeb", "version-string": "8.0.0-1", diff --git a/versions/t-/tl-expected.json b/versions/t-/tl-expected.json index 43f134c657a1ea..7cf4cd50c97ef9 100644 --- a/versions/t-/tl-expected.json +++ b/versions/t-/tl-expected.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "952f8ebe25660f2bf6a7091c338e4113691279dd", + "version-string": "1.0.0", + "port-version": 2 + }, { "git-tree": "3b51d7b17e6db2b606e1d070d6e8f32c07c1a903", "version-string": "1.0.0-1", diff --git a/versions/t-/tl-function-ref.json b/versions/t-/tl-function-ref.json index 5de1d679e328e9..3996e5af2d0cc4 100644 --- a/versions/t-/tl-function-ref.json +++ b/versions/t-/tl-function-ref.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40cb62e51ee41b386626b2f4bbcc8f86b6ad2a03", + "version-string": "1.0.0", + "port-version": 2 + }, { "git-tree": "848facd0f73b670581bf3e66e96dfeeb3248428c", "version-string": "1.0.0-1", diff --git a/versions/t-/tl-optional.json b/versions/t-/tl-optional.json index 7c0ed2a18630fc..73eba3885f18ec 100644 --- a/versions/t-/tl-optional.json +++ b/versions/t-/tl-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a88a1a6074c36dd4c7872c7a439c839da2a1e99d", + "version-string": "1.0.0", + "port-version": 2 + }, { "git-tree": "543d9b23441ec80d00a537705e03e4fb45af0334", "version-string": "1.0.0-1", diff --git a/versions/t-/tlx.json b/versions/t-/tlx.json index 95d1f149ec901f..be300c08c714bb 100644 --- a/versions/t-/tlx.json +++ b/versions/t-/tlx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b51b49c324771227a0c96e16b595496f1094cd9", + "version-string": "0.5.20191212", + "port-version": 1 + }, { "git-tree": "ccbe4ed982fe5878feba3a77569688cf7af552a2", "version-string": "0.5.20191212", diff --git a/versions/t-/tmx.json b/versions/t-/tmx.json index d08e772367a28a..5975ee2d58cf2e 100644 --- a/versions/t-/tmx.json +++ b/versions/t-/tmx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfe6a8ece200881d1c7e3a33b0fd14f4279c3d1b", + "version-string": "1.1.0", + "port-version": 1 + }, { "git-tree": "400a9748b46a05c705aa53ea5cd7147f0f95e6c7", "version-string": "1.1.0", diff --git a/versions/t-/tmxlite.json b/versions/t-/tmxlite.json index 7f85fdeb88ce9e..e66ad8161e047b 100644 --- a/versions/t-/tmxlite.json +++ b/versions/t-/tmxlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "177873f8c1357bfcc2a15954de053e949737dd30", + "version-string": "2019-03-05", + "port-version": 1 + }, { "git-tree": "ebc24944bd55409160b5fa863f69d59877e2d1a8", "version-string": "2019-03-05", diff --git a/versions/t-/tmxparser.json b/versions/t-/tmxparser.json index ad20779c633072..4c2c7eea850f9b 100644 --- a/versions/t-/tmxparser.json +++ b/versions/t-/tmxparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1d1d7f89ce4ee1ebb8eaea792da1ab3f21367e9", + "version-string": "2.1.0", + "port-version": 5 + }, { "git-tree": "481cfb5fee00fa7787dabbec0e77cbf884645816", "version-string": "2.1.0-4", diff --git a/versions/t-/toml11.json b/versions/t-/toml11.json index ed419f9bf858ff..1cc599ac7f0e29 100644 --- a/versions/t-/toml11.json +++ b/versions/t-/toml11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dabcb8338003184011c1b13e49561f9c112a9735", + "version-string": "3.5.0", + "port-version": 2 + }, { "git-tree": "5e58833d3ad983b69e8e0510e1bd3f27df685fbf", "version-string": "3.5.0", diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json index 62d98caad6f7e8..dfdbad7af692ab 100644 --- a/versions/t-/tomlplusplus.json +++ b/versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "adfbc0f365c9a2f1ea4f90cf4a199be6e3b10586", + "version-string": "2.4.0", + "port-version": 1 + }, { "git-tree": "95397531895566a6af15644be1ea9e228795c02d", "version-string": "2.4.0", diff --git a/versions/t-/torch-th.json b/versions/t-/torch-th.json index 207291d1776dce..6860040471c6df 100644 --- a/versions/t-/torch-th.json +++ b/versions/t-/torch-th.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd64f0dab429a6baf6dbb12119909ebd9caaa43a", + "version-string": "2019-04-19", + "port-version": 3 + }, { "git-tree": "803c42d38d110be4bdde22843088fca604e1879e", "version-string": "2019-04-19-2", diff --git a/versions/t-/tre.json b/versions/t-/tre.json index e41374c4d30f49..fcf4bef79288ab 100644 --- a/versions/t-/tre.json +++ b/versions/t-/tre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a43049be2abc5f27fa5b1f77eaeda7a3a63d4a0", + "version-string": "0.8.0", + "port-version": 3 + }, { "git-tree": "c6f1211065eff34d7d62934884cfbfe20af3c446", "version-string": "0.8.0", diff --git a/versions/t-/treehopper.json b/versions/t-/treehopper.json index 2328d72fe57a42..80c09bf69e6074 100644 --- a/versions/t-/treehopper.json +++ b/versions/t-/treehopper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4efe0662e17f2f340bd234604952d75a4d914aec", + "version-string": "1.11.3", + "port-version": 5 + }, { "git-tree": "a9746b7358065513f7f3ab827ab3c1c3723f194b", "version-string": "1.11.3-4", diff --git a/versions/t-/triangle.json b/versions/t-/triangle.json index 7d87168ae462a5..71a72f6da27f16 100644 --- a/versions/t-/triangle.json +++ b/versions/t-/triangle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b80b2815877547418bac0ed7ddba3fec7d0a2df", + "version-string": "1.6", + "port-version": 1 + }, { "git-tree": "818fe01f95013b057c24f63f037a102f58bcab4e", "version-string": "1.6", diff --git a/versions/t-/trompeloeil.json b/versions/t-/trompeloeil.json index 79b164edcfc16e..ebbcf0ce16ea6d 100644 --- a/versions/t-/trompeloeil.json +++ b/versions/t-/trompeloeil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5691d561cb4ae588d604882cd58539b406222cac", + "version-string": "38", + "port-version": 1 + }, { "git-tree": "494fa9278d6ca20444defeab2b2557998ec2d1d3", "version-string": "38", diff --git a/versions/t-/tsl-hopscotch-map.json b/versions/t-/tsl-hopscotch-map.json index db60c32b9edd59..eb07bc22c032d9 100644 --- a/versions/t-/tsl-hopscotch-map.json +++ b/versions/t-/tsl-hopscotch-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9aea6d276838589846f7f2741359c2ca29c49e4", + "version-string": "2.3.0", + "port-version": 1 + }, { "git-tree": "1f942fa0f46b5b793d8314e690a3b3c95152b2d8", "version-string": "2.3.0", diff --git a/versions/t-/tsl-ordered-map.json b/versions/t-/tsl-ordered-map.json index 26e07d0ce8f397..899b0a7e2cc82b 100644 --- a/versions/t-/tsl-ordered-map.json +++ b/versions/t-/tsl-ordered-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5daf2289228a2a7e03ce57d352e07cb8431184a1", + "version-string": "1.0.0", + "port-version": 1 + }, { "git-tree": "cdcfcb2f8f7444f23580a8784abfb42164fa9da0", "version-string": "1.0.0", diff --git a/versions/t-/tsl-sparse-map.json b/versions/t-/tsl-sparse-map.json index 2fd6de4058170a..5c6130a68ae9b6 100644 --- a/versions/t-/tsl-sparse-map.json +++ b/versions/t-/tsl-sparse-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fb06e7731b0c8231bc6e4807c71c38bee6b18ac", + "version-string": "0.6.2", + "port-version": 1 + }, { "git-tree": "00b67cecc2ffedf1fcbbc3fdbb388e4a26a6ee72", "version-string": "0.6.2", diff --git a/versions/t-/turbobase64.json b/versions/t-/turbobase64.json index f2d69c9669f560..c7e663d292e0fe 100644 --- a/versions/t-/turbobase64.json +++ b/versions/t-/turbobase64.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42e8e3b3a43b2170811c936708766470ad137cab", + "version-string": "2020-01-12", + "port-version": 1 + }, { "git-tree": "9520744942677bb6c18947e3a62d0750eae4f2dd", "version-string": "2020-01-12", diff --git a/versions/t-/type-lite.json b/versions/t-/type-lite.json index 6ad8b7cc7b67b0..8e317b7db83e36 100644 --- a/versions/t-/type-lite.json +++ b/versions/t-/type-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1393063d013016208c0f3e269034c2f664ea408f", + "version-string": "0.1.0", + "port-version": 1 + }, { "git-tree": "944df768435d61dedc05e968fce4ed1acaf295d4", "version-string": "0.1.0", diff --git a/versions/u-/uchardet.json b/versions/u-/uchardet.json index 40dc30d1b7657b..e773544adc4233 100644 --- a/versions/u-/uchardet.json +++ b/versions/u-/uchardet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "074fd1696e7c47ef9dce162bfad50572a8d766f1", + "version-string": "2020-04-26", + "port-version": 1 + }, { "git-tree": "1e9bdf5a783f1453fd1a4330f42e7e0ca1f07eb7", "version-string": "2020-04-26", diff --git a/versions/u-/umock-c.json b/versions/u-/umock-c.json index d9fc76fd5c8da5..ec6028e36886fe 100644 --- a/versions/u-/umock-c.json +++ b/versions/u-/umock-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b34153650a29eb81f88e48f53bd06ca05d4383c4", + "version-string": "2020-06-17", + "port-version": 2 + }, { "git-tree": "10a9af0e9e3e4d0a7ab3a5819943e4d609677c1a", "version-string": "2020-06-17-1", diff --git a/versions/u-/unicorn-lib.json b/versions/u-/unicorn-lib.json index 87c3daf48267cd..d37bc36cc22ea7 100644 --- a/versions/u-/unicorn-lib.json +++ b/versions/u-/unicorn-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a79eb0ae5746d8c2c2ebbd68557baf5975193ac8", + "version-string": "2020-03-02", + "port-version": 1 + }, { "git-tree": "f011cbffdfdd9b295141b51bb3da0a40af0d3848", "version-string": "2020-03-02", diff --git a/versions/u-/unicorn.json b/versions/u-/unicorn.json index aed2e3317d0daa..f71f2b6839d4ce 100644 --- a/versions/u-/unicorn.json +++ b/versions/u-/unicorn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5126bae583b1f4d7d512b4bc06d799da0cd664be", + "version-string": "2020-09-14", + "port-version": 1 + }, { "git-tree": "c7f12f98aceb87089db977ee201850fef601bc64", "version-string": "2020-09-14", diff --git a/versions/u-/units.json b/versions/u-/units.json index 57f7754e5564c6..9b8d38b2d4cf24 100644 --- a/versions/u-/units.json +++ b/versions/u-/units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b254a4139e2d70522a90a640601abdd97cdbce3", + "version-string": "2.3.1", + "port-version": 1 + }, { "git-tree": "2db2d9f6afa63b919c6112b56d39b4609370fa4e", "version-string": "2.3.1", diff --git a/versions/u-/unixodbc.json b/versions/u-/unixodbc.json index 26c23273cb220a..ba0873b1ea4dd3 100644 --- a/versions/u-/unixodbc.json +++ b/versions/u-/unixodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c08774000aaa495036e36835e7a473251718d82d", + "version-string": "2.3.7", + "port-version": 3 + }, { "git-tree": "10efe80ac302d39b15d3e8bd3755ff0386e413f6", "version-string": "2.3.7", diff --git a/versions/u-/unrar.json b/versions/u-/unrar.json index 21effa3baf0561..4d2dcb5c2147b2 100644 --- a/versions/u-/unrar.json +++ b/versions/u-/unrar.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31f7c1900da6148793b6b10c1b7be7b5e80d4172", + "version-string": "5.8.1", + "port-version": 1 + }, { "git-tree": "30b1a0167a19316d64249e79132098e02a8a4d3f", "version-string": "5.8.1", diff --git a/versions/u-/urdfdom-headers.json b/versions/u-/urdfdom-headers.json index 96dfb0ea263de6..149af41f3f0973 100644 --- a/versions/u-/urdfdom-headers.json +++ b/versions/u-/urdfdom-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "557188bd804b7c57c882f39710ca21deb1b91db5", + "version-string": "1.0.5", + "port-version": 2 + }, { "git-tree": "5dd339affc1eeaab090a5052621566424cee912e", "version-string": "1.0.5", diff --git a/versions/u-/urdfdom.json b/versions/u-/urdfdom.json index 0d9abef580ba8d..bcefd4e533ad4f 100644 --- a/versions/u-/urdfdom.json +++ b/versions/u-/urdfdom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1022fc5895356fb9cd1c37767cf2397e4edfd415", + "version-string": "1.0.4", + "port-version": 4 + }, { "git-tree": "c8509aadcb49f4193730203193f79f32d4176400", "version-string": "1.0.4", diff --git a/versions/u-/usbmuxd.json b/versions/u-/usbmuxd.json index 5e7bb417d2066f..04dc3433b1d637 100644 --- a/versions/u-/usbmuxd.json +++ b/versions/u-/usbmuxd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "072dd356dfeda50c73780a204db5f5f6224cd35c", + "version-string": "1.2.235", + "port-version": 1 + }, { "git-tree": "d48f5f4611e4a59ccafc8c4dbb9ec1db1344994c", "version-string": "1.2.235", diff --git a/versions/u-/usd.json b/versions/u-/usd.json index 0c0d12a5d8b96a..1c7e2f2ff09a7f 100644 --- a/versions/u-/usd.json +++ b/versions/u-/usd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44bef511fe3c249b1579ab696b8bd7e82147b788", + "version-string": "20.08", + "port-version": 1 + }, { "git-tree": "31c9d55a54024d0bc130a9f8547d1c64d4a3aed4", "version-string": "20.08", diff --git a/versions/u-/usrsctp.json b/versions/u-/usrsctp.json index dd87fe247d2251..4e7271e13bbf75 100644 --- a/versions/u-/usrsctp.json +++ b/versions/u-/usrsctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd25f487883b7ccbba50c32203eb96c18cd9338f", + "version-string": "0db9691", + "port-version": 1 + }, { "git-tree": "a2a0f34f91d797a31af55376db7524f3aed863dc", "version-string": "0db9691", diff --git a/versions/u-/utf8h.json b/versions/u-/utf8h.json index 9d5df795cda3cb..9551f2eea2c4e8 100644 --- a/versions/u-/utf8h.json +++ b/versions/u-/utf8h.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cb92a16c8bbfc76bc505b90f55d116ea789c49e", + "version-string": "2020-06-14", + "port-version": 1 + }, { "git-tree": "721728b5f4b4695d5cec09fc53b59d4f879142a9", "version-string": "2020-06-14", diff --git a/versions/u-/utfz.json b/versions/u-/utfz.json index 5a6a9e40dbfed6..db788b6ca68e12 100644 --- a/versions/u-/utfz.json +++ b/versions/u-/utfz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2897d5bfecd8b5fad871a476cfba4c24f45144cd", + "version-string": "1.2", + "port-version": 2 + }, { "git-tree": "b1c36a09a7ddb7b39b5136e2c2be1dc7974bea1a", "version-string": "1.2-1", diff --git a/versions/u-/uthenticode.json b/versions/u-/uthenticode.json index bc6b140be56311..bca2a57b820678 100644 --- a/versions/u-/uthenticode.json +++ b/versions/u-/uthenticode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c815664232505dde8a5dd299d4ad562f47b7d43", + "version-string": "1.0.4", + "port-version": 1 + }, { "git-tree": "be0c3da6f7d93aa3a5252b03adc09ffa8105eaf8", "version-string": "1.0.4", diff --git a/versions/u-/uvw.json b/versions/u-/uvw.json index 9d2629a517328c..95a51f9014739f 100644 --- a/versions/u-/uvw.json +++ b/versions/u-/uvw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc9230cd12ff7d556e700053798f20e07283954d", + "version-string": "2.7.0", + "port-version": 1 + }, { "git-tree": "b41eff8a3d196467693d35957280cad3be6a7f4b", "version-string": "2.7.0", diff --git a/versions/v-/v-hacd.json b/versions/v-/v-hacd.json index 0275c6dfc7e8f0..0be1cb57ba7062 100644 --- a/versions/v-/v-hacd.json +++ b/versions/v-/v-hacd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb52b4b2323057dd987225a70627ed40016756ee", + "version-string": "3.2.0", + "port-version": 2 + }, { "git-tree": "5a11f826da2ca5189f1b29e90299569e2ca94712", "version-string": "3.2.0", diff --git a/versions/v-/valijson.json b/versions/v-/valijson.json index 630d411240206a..211c2a0d9a875a 100644 --- a/versions/v-/valijson.json +++ b/versions/v-/valijson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c40f3039f56bbe5301d45b0bf0430b4852907608", + "version-string": "2018-11-17", + "port-version": 2 + }, { "git-tree": "56fb4ee7adbd616e60bc4a24eedd2755f25de001", "version-string": "2018-11-17-1", diff --git a/versions/v-/variant-lite.json b/versions/v-/variant-lite.json index 434e36f8845149..b77ba2b9690003 100644 --- a/versions/v-/variant-lite.json +++ b/versions/v-/variant-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a932d3f3a9d2390536663cefe804b881408cef11", + "version-string": "1.2.2", + "port-version": 1 + }, { "git-tree": "6d5d7208789ae75c456134c11e719adf8c2eb5bf", "version-string": "1.2.2", diff --git a/versions/v-/vc.json b/versions/v-/vc.json index 11a39281256508..03ffe16c1fa4d7 100644 --- a/versions/v-/vc.json +++ b/versions/v-/vc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "670b9bb5b2fe8a35ac2115b355d87995b1ee85b6", + "version-string": "1.4.2", + "port-version": 1 + }, { "git-tree": "510cde85ec14ef88187857247829183c1c275f63", "version-string": "1.4.2", diff --git a/versions/v-/vcglib.json b/versions/v-/vcglib.json index 737e3e658205c7..0fde71fa64c10c 100644 --- a/versions/v-/vcglib.json +++ b/versions/v-/vcglib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ed58c0ed176662ca418315c77fb0137c2cf7769", + "version-string": "1.0.1", + "port-version": 1 + }, { "git-tree": "18b77419728670df6316365979f59919168b9ee2", "version-string": "1.0.1", diff --git a/versions/v-/vcpkg-gfortran.json b/versions/v-/vcpkg-gfortran.json index 6caa3a2610e3e2..59725ac545af18 100644 --- a/versions/v-/vcpkg-gfortran.json +++ b/versions/v-/vcpkg-gfortran.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46d6be1a505fd008358fc3b426a74a0063661f68", + "version-string": "3", + "port-version": 1 + }, { "git-tree": "b8fe480cd1e0e1ac8779b8552a1c6a999ec67e39", "version-string": "3", diff --git a/versions/v-/vectorclass.json b/versions/v-/vectorclass.json index c0206893fa6656..02a9695eb21da0 100644 --- a/versions/v-/vectorclass.json +++ b/versions/v-/vectorclass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e6cebabfff6ad5300bf2fd306e48a7a7392abcb", + "version-string": "2.00.01", + "port-version": 1 + }, { "git-tree": "7b73ec26a0a35beecf8061f14a53ee961347dd67", "version-string": "2.00.01", diff --git a/versions/v-/visit-struct.json b/versions/v-/visit-struct.json index 24d13c83f1d5e0..2dc72172e5a91a 100644 --- a/versions/v-/visit-struct.json +++ b/versions/v-/visit-struct.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43d203cd2d29553c9f00cea2d08fe8dba4e6c7e1", + "version-string": "1.0", + "port-version": 2 + }, { "git-tree": "3e024a1126ec62c4f17e2a2d2a6a6367e24d45de", "version-string": "1.0-1", diff --git a/versions/v-/vlfeat.json b/versions/v-/vlfeat.json index d51d334252da18..1ebdeb861cd659 100644 --- a/versions/v-/vlfeat.json +++ b/versions/v-/vlfeat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ae1b6f9b25f1b72e71b824f995c521f71a6081b", + "version-string": "2020-07-10", + "port-version": 1 + }, { "git-tree": "be0ba46516781391acfb5a54ab75e085fa53e3a7", "version-string": "2020-07-10", diff --git a/versions/v-/vlpp.json b/versions/v-/vlpp.json index 2981835bd6f533..61c6b6577ee624 100644 --- a/versions/v-/vlpp.json +++ b/versions/v-/vlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0497f92c39e00928468399f96b7da4ef729b4c4f", + "version-string": "0.11.0.0", + "port-version": 1 + }, { "git-tree": "4463f001a84efe965dfea0530a6f71f753923103", "version-string": "0.11.0.0", diff --git a/versions/v-/volk.json b/versions/v-/volk.json index 736c802dc2ed22..774ef5f91c18b1 100644 --- a/versions/v-/volk.json +++ b/versions/v-/volk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0018a72c45ad8b5f9776d41ff067292b73cb7a31", + "version-string": "2019-09-26", + "port-version": 1 + }, { "git-tree": "9e40bb5aadc282b6738223dbddbe61fc2db964f9", "version-string": "2019-09-26", diff --git a/versions/v-/vtk-dicom.json b/versions/v-/vtk-dicom.json index 1cc5b2b4f8e20e..972f01f0c91cc8 100644 --- a/versions/v-/vtk-dicom.json +++ b/versions/v-/vtk-dicom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bb97d36a9f0ed9f7305bd51f904ba5c3f740565", + "version-string": "0.8.12", + "port-version": 2 + }, { "git-tree": "1364bedaaf40e2604fd87cfde2791a944343c5e6", "version-string": "0.8.12-1", diff --git a/versions/v-/vulkan-hpp.json b/versions/v-/vulkan-hpp.json index e0c53e7dde6374..db78e0da164c4b 100644 --- a/versions/v-/vulkan-hpp.json +++ b/versions/v-/vulkan-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3f04aeb70ff80b168cf4e86134c7c61f7d23d62", + "version-string": "1.2.184", + "port-version": 1 + }, { "git-tree": "f4ca1555372a398629a4bd1728b6870efb93d674", "version-string": "1.2.184", diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index 59669879981969..44e4393e1beefd 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d6994b1a6f6cbaba84a63a78b3d97784a0722f5", + "version-string": "2021-07-07", + "port-version": 1 + }, { "git-tree": "0b1560d8d5ccc9a903ed8159fccecd2bd29e2125", "version-string": "2021-07-07", diff --git a/versions/v-/vulkan.json b/versions/v-/vulkan.json index bf92c5612f1fff..dcd62d95bd888f 100644 --- a/versions/v-/vulkan.json +++ b/versions/v-/vulkan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "693b2d999097790fec95ae3dae5d3b9054052d57", + "version-string": "1.1.82.1", + "port-version": 2 + }, { "git-tree": "50baea2e993e948b8477929a7f600da93991224b", "version-string": "1.1.82.1-1", diff --git a/versions/v-/vxl.json b/versions/v-/vxl.json index 975c3e59e67a7e..b6a8542616ac85 100644 --- a/versions/v-/vxl.json +++ b/versions/v-/vxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd1be33b316bf4d081b89e1dd4a729ddfc09a8a6", + "version-string": "2.0.2", + "port-version": 3 + }, { "git-tree": "fefdd1e45140fa292b0f597ae2ef658731f95b18", "version-string": "2.0.2", diff --git a/versions/w-/wampcc.json b/versions/w-/wampcc.json index c69fa1dbb9decc..5d742fa5f6cc7f 100644 --- a/versions/w-/wampcc.json +++ b/versions/w-/wampcc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "720c45bd8d01b9d57a41cc41debd9858a7461654", + "version-string": "2019-09-04", + "port-version": 1 + }, { "git-tree": "dcbe9ebb2b68fdff8c45c54666ae1259452f19ac", "version-string": "2019-09-04", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index f52c3c1b82e2c4..5e8143ef47601f 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5a933ff5c3c9d43e3bf43beb816b458be6025d3", + "version-string": "5.3.0", + "port-version": 2 + }, { "git-tree": "73e8b55fed24b05b9c0b9f84d1bc85196c241ca3", "version-string": "5.3.0", diff --git a/versions/w-/wg21-sg14.json b/versions/w-/wg21-sg14.json index 0f311423bf5791..8b620cc22cc6f1 100644 --- a/versions/w-/wg21-sg14.json +++ b/versions/w-/wg21-sg14.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f11507c370b719e1a17ced7ab2dd0af19fe47d4", + "version-string": "2019-08-13", + "port-version": 1 + }, { "git-tree": "c8bc3803aac36c5ce3937ecb2a79bd10e697710e", "version-string": "2019-08-13", diff --git a/versions/w-/wil.json b/versions/w-/wil.json index 76362041b5a815..7ed0118fca0359 100644 --- a/versions/w-/wil.json +++ b/versions/w-/wil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe6538eb3c7260ca155c82808519426a280e42e5", + "version-string": "2021-08-03", + "port-version": 1 + }, { "git-tree": "cb04005b6c8503a0da843fc8f356748e0a0d3994", "version-string": "2021-08-03", diff --git a/versions/w-/wildmidi.json b/versions/w-/wildmidi.json index a1cc370fe5cdda..42a28b6c60e908 100644 --- a/versions/w-/wildmidi.json +++ b/versions/w-/wildmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4270f5e1f8fdb45bf562991ab9cf42e52fbc7437", + "version-string": "0.4.3", + "port-version": 2 + }, { "git-tree": "9bd12fa743e95153d652d59113ac56c28b2ccabe", "version-string": "0.4.3-1", diff --git a/versions/w-/wincrypt.json b/versions/w-/wincrypt.json index 56395acf062430..f6a6f6867d2527 100644 --- a/versions/w-/wincrypt.json +++ b/versions/w-/wincrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ab415a2d32d39cf7dd59d5fd3ca4bf544c42f51", + "version-string": "0.0", + "port-version": 3 + }, { "git-tree": "536c7b54d3100704557b0d8ff0fcc9218de5ff4f", "version-string": "0.0-2", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index 0461dec07bfb0a..aa9b2301abfee1 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf7d08eca18c0a361f4852847260da415a29fa29", + "version-string": "4.1.3", + "port-version": 5 + }, { "git-tree": "c30934172813869e2864463acb7b83cd8f4b2ee6", "version-string": "4.1.3", diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index 29b8fdb4e2e0d8..42d67959bdf954 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9aaa215768207c8c514a9a5f8be8e0ec6f5e8f02", + "version-string": "4.1.0", + "port-version": 1 + }, { "git-tree": "018dd4bf16d8a68e161eef8459458d2de47a125c", "version-string": "4.1.0", diff --git a/versions/w-/winsock2.json b/versions/w-/winsock2.json index 428c9e50bf399c..ca48a65da4d0d5 100644 --- a/versions/w-/winsock2.json +++ b/versions/w-/winsock2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64b2e9218e0f0a50655510451914a5e532613795", + "version-string": "0.0", + "port-version": 3 + }, { "git-tree": "31860d5a7d293703921a71466ed1f2bd656e1488", "version-string": "0.0-2", diff --git a/versions/w-/wintoast.json b/versions/w-/wintoast.json index b613784cb57d9e..712905b577b5be 100644 --- a/versions/w-/wintoast.json +++ b/versions/w-/wintoast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "186a3b60dc0a76ecb0b1a5a2147306dbfe734797", + "version-string": "1.2.0", + "port-version": 1 + }, { "git-tree": "44d6b242712ba6b9750b69ad5eac5c934c647d32", "version-string": "1.2.0", diff --git a/versions/w-/woff2.json b/versions/w-/woff2.json index 1cbece83e4727d..4f2db2e028bf60 100644 --- a/versions/w-/woff2.json +++ b/versions/w-/woff2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5055934b6226755b84d652776a1f0fa1d116b559", + "version-string": "1.0.2", + "port-version": 2 + }, { "git-tree": "1a8e802f8168798c4171f8384cd2e50b97af3a9b", "version-string": "1.0.2", diff --git a/versions/w-/wordnet.json b/versions/w-/wordnet.json index 3788bce9c7b81d..63963804eeb973 100644 --- a/versions/w-/wordnet.json +++ b/versions/w-/wordnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1302f457b9e1e102c1c3cf190c9fc92da9da1272", + "version-string": "3.0", + "port-version": 1 + }, { "git-tree": "bcfbc2d3ca45c84d875af3b123aa83c3b85b554c", "version-string": "3.0", diff --git a/versions/w-/wpilib.json b/versions/w-/wpilib.json index c362183b3e6fc1..9f7b2a523e28ea 100644 --- a/versions/w-/wpilib.json +++ b/versions/w-/wpilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f656633935224ac3005954533294babd766921b1", + "version-string": "2020.3.2", + "port-version": 1 + }, { "git-tree": "bbc7d5d8824b67d66409ff21f43ee414aa41261b", "version-string": "2020.3.2", diff --git a/versions/w-/wren.json b/versions/w-/wren.json index 9e47cdd2a8e76f..98fc8dfc4d6551 100644 --- a/versions/w-/wren.json +++ b/versions/w-/wren.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "558979dc3ff66a524b930d85fbf856679ebd0208", + "version-string": "2019-07-01", + "port-version": 1 + }, { "git-tree": "7cfd07176f4a552daec20b501b155da34acb7e63", "version-string": "2019-07-01", diff --git a/versions/w-/wt.json b/versions/w-/wt.json index 6a42741687a5f5..ed429e6bfc8d62 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d3b1c0ba6b473d5b5e77ca515e74e90567e2965", + "version-string": "4.5.0", + "port-version": 1 + }, { "git-tree": "4e770dbe450a78c88a5d607926eaf854e15cd546", "version-string": "4.5.0", diff --git a/versions/w-/wtl.json b/versions/w-/wtl.json index b5b2f6ab9e8595..394a38ef4992eb 100644 --- a/versions/w-/wtl.json +++ b/versions/w-/wtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d429012165553d38ea4ae45057ce85bb34deb96", + "version-string": "10.0.10320", + "port-version": 1 + }, { "git-tree": "f8a86cb0f5713c783df17553cf443c164d81c10d", "version-string": "10.0.10320", diff --git a/versions/x-/x265.json b/versions/x-/x265.json index 134c3bfc42200f..bd0e54ac10dd6b 100644 --- a/versions/x-/x265.json +++ b/versions/x-/x265.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3904d5293aad0e38ee7ca93b82182441bb1575ca", + "version-string": "3.4", + "port-version": 5 + }, { "git-tree": "39318069e894d5dd6ff63112fd707c31b13be88b", "version-string": "3.4", diff --git a/versions/x-/xerces-c.json b/versions/x-/xerces-c.json index 4f04f744d21937..a2a8d80a065ec7 100644 --- a/versions/x-/xerces-c.json +++ b/versions/x-/xerces-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f14ab8d047187d9621974f90d1981534ae7eb58a", + "version-string": "3.2.3", + "port-version": 2 + }, { "git-tree": "37d7c50f22be9c769e1c37f9bf12238ceb16b095", "version-string": "3.2.3-1", diff --git a/versions/x-/xeus.json b/versions/x-/xeus.json index bb5815f8e4583d..ddd6614a97d07b 100644 --- a/versions/x-/xeus.json +++ b/versions/x-/xeus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bb5d11153c9982aad5337c44d2f781918e8d991", + "version-string": "0.24.3", + "port-version": 1 + }, { "git-tree": "f35bb72c2cb6dfb85ca82106b31428762f82fc1c", "version-string": "0.24.3", diff --git a/versions/x-/xframe.json b/versions/x-/xframe.json index 36c86466382708..05a9a31ea7ed85 100644 --- a/versions/x-/xframe.json +++ b/versions/x-/xframe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7dc9d49f9de1237cea644f835be6631ba0c76c4a", + "version-string": "0.3.0", + "port-version": 1 + }, { "git-tree": "e46a9d8a02694ec336be6e73997faf69b5422525", "version-string": "0.3.0", diff --git a/versions/x-/xmsh.json b/versions/x-/xmsh.json index c0a06127307b42..0c12cb21309e25 100644 --- a/versions/x-/xmsh.json +++ b/versions/x-/xmsh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f08388b4f7fc367a02fd99bb1cefe9d04fb04f04", + "version-string": "0.5.2", + "port-version": 2 + }, { "git-tree": "c31519998bc1ccf0233cd893b16363e354721db4", "version-string": "0.5.2-1", diff --git a/versions/x-/xproperty.json b/versions/x-/xproperty.json index 88c2e2b13cff46..0d6ce4d943da02 100644 --- a/versions/x-/xproperty.json +++ b/versions/x-/xproperty.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1acf4b775a462fc93484010247364837b2ea8133", + "version-string": "0.8.1", + "port-version": 1 + }, { "git-tree": "da04206a148f3886f504922d68ee7bb6931bfb35", "version-string": "0.8.1", diff --git a/versions/x-/xsimd.json b/versions/x-/xsimd.json index 6bbca358e3b7fd..7983abea45d5ba 100644 --- a/versions/x-/xsimd.json +++ b/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9809d05e16b0047099b1c43c4d81f5f34efe6a8c", + "version-string": "7.4.9", + "port-version": 1 + }, { "git-tree": "6a90c6aea234c06968da8f6c48ea73ae7d95d28e", "version-string": "7.4.9", diff --git a/versions/x-/xtensor-blas.json b/versions/x-/xtensor-blas.json index e4318e0e401ea1..84e8e2bb356bd3 100644 --- a/versions/x-/xtensor-blas.json +++ b/versions/x-/xtensor-blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d046baeae79d8ce5a5c535ad3c60fe4e65db7366", + "version-string": "0.17.2", + "port-version": 1 + }, { "git-tree": "be4b0910ad2f14c7560353e570cd97f2c2919247", "version-string": "0.17.2", diff --git a/versions/x-/xtensor-fftw.json b/versions/x-/xtensor-fftw.json index daff4e651db5a5..340a6b42790756 100644 --- a/versions/x-/xtensor-fftw.json +++ b/versions/x-/xtensor-fftw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a83a72b6737956e551fe4ddbaa12564048141cec", + "version-string": "2019-11-30", + "port-version": 1 + }, { "git-tree": "507af996ff26bc000fd73761de24f58be61507bd", "version-string": "2019-11-30", diff --git a/versions/x-/xxhash.json b/versions/x-/xxhash.json index 6859d02fac9fef..202c4d9716d114 100644 --- a/versions/x-/xxhash.json +++ b/versions/x-/xxhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "427341c7e75df558fc7fe5ff69340387877bddf8", + "version-string": "0.8.0", + "port-version": 2 + }, { "git-tree": "b0513b38c64783f4c9fe001b995f62a10f2e6d8c", "version-string": "0.8.0", diff --git a/versions/y-/yajl.json b/versions/y-/yajl.json index c1761ec586170e..d51bb4bee74b78 100644 --- a/versions/y-/yajl.json +++ b/versions/y-/yajl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1f09d6c9effe9aa148fb4c659498c3dc82c61d8", + "version-string": "2.1.0", + "port-version": 2 + }, { "git-tree": "b91fee2584125e4f7eb17d16127db70c035164b1", "version-string": "2.1.0-1", diff --git a/versions/y-/yas.json b/versions/y-/yas.json index 6baadfd3375516..18187e169326bd 100644 --- a/versions/y-/yas.json +++ b/versions/y-/yas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65fcc49d8cf563755c7fab9116c57b4de9780d73", + "version-string": "7.0.5", + "port-version": 1 + }, { "git-tree": "1976b779d7006fcca2cbe8315c3cd88fd18badd0", "version-string": "7.0.5", diff --git a/versions/y-/yasm.json b/versions/y-/yasm.json index 4bf20e559ecf51..629197c55a304c 100644 --- a/versions/y-/yasm.json +++ b/versions/y-/yasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10778f3b98b275cbbc840e6a3c6d96465b2a20a9", + "version-string": "1.3.0", + "port-version": 1 + }, { "git-tree": "252cc74ece532436f42df78cfb8aaa3c2735673c", "version-string": "1.3.0", diff --git a/versions/y-/yato.json b/versions/y-/yato.json index 05742337206016..6a7e311f8ef73e 100644 --- a/versions/y-/yato.json +++ b/versions/y-/yato.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8605c052211c8394b3f3a524ffe071307582a941", + "version-string": "1.0", + "port-version": 3 + }, { "git-tree": "4ff4647e49ec1e98b49e1bc9d6b8cf236bce7831", "version-string": "1.0-2", diff --git a/versions/y-/yoga.json b/versions/y-/yoga.json index 76e397efee0ac0..ced362906dc044 100644 --- a/versions/y-/yoga.json +++ b/versions/y-/yoga.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00f17f608ffc20c70786f750aa66035b0f1f0ca4", + "version-string": "1.18.0", + "port-version": 2 + }, { "git-tree": "3052ea42237961392cbc1fab6d07160337919cdd", "version-string": "1.18.0-1", diff --git a/versions/z-/z85.json b/versions/z-/z85.json index 06a71818efb5da..1301a3972a18c4 100644 --- a/versions/z-/z85.json +++ b/versions/z-/z85.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb7115fc8b2a5c84c958196521ec5f6c5f502ca6", + "version-string": "1.0", + "port-version": 1 + }, { "git-tree": "b56d7eb36e5f53164b2f3dba37327a68fc98d378", "version-string": "1.0", diff --git a/versions/z-/zfp.json b/versions/z-/zfp.json index 22f59a9ea70f20..30b657231b643a 100644 --- a/versions/z-/zfp.json +++ b/versions/z-/zfp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9fdf34882de98a9ffaf9225f665b49176d7e97f", + "version-string": "0.5.5", + "port-version": 3 + }, { "git-tree": "bb74f3eda84b0d0a5426601889ae3bacb68e6b6f", "version-string": "0.5.5-2", diff --git a/versions/z-/zkpp.json b/versions/z-/zkpp.json index 4ff16665f7d6a2..7c366122c06265 100644 --- a/versions/z-/zkpp.json +++ b/versions/z-/zkpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d45cca2392d1a09d62bc9e2d53e1296f0bd49fc", + "version-string": "0.2.3", + "port-version": 1 + }, { "git-tree": "36ee3997fc686a009718566997f969892ae134bd", "version-string": "0.2.3", diff --git a/versions/z-/zookeeper.json b/versions/z-/zookeeper.json index fb188c1fe83975..ab8b9e6789acdd 100644 --- a/versions/z-/zookeeper.json +++ b/versions/z-/zookeeper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44fbecb403595fea598756cf946b00e0a2f21dad", + "version-string": "3.5.5", + "port-version": 2 + }, { "git-tree": "e9a48341219262a6519a4d1403db84e328426a08", "version-string": "3.5.5-1", diff --git a/versions/z-/zopfli.json b/versions/z-/zopfli.json index 28ae8360e07319..43770260268522 100644 --- a/versions/z-/zopfli.json +++ b/versions/z-/zopfli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e80818813d5dfa5b563c84485d4a0030ce90906a", + "version-string": "1.0.3", + "port-version": 1 + }, { "git-tree": "27c5f23197d8f38f23f64810b6a0ced0158b66cb", "version-string": "1.0.3", diff --git a/versions/z-/zserge-webview.json b/versions/z-/zserge-webview.json index 873ace071dc298..a25f30fe0f0c18 100644 --- a/versions/z-/zserge-webview.json +++ b/versions/z-/zserge-webview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e10cdad91c0d47a7dc03717d941254291abfd0eb", + "version-string": "2019-04-27", + "port-version": 3 + }, { "git-tree": "91f16a7320fcf8432fca4c071e0a9c1817f56cbd", "version-string": "2019-04-27-2", diff --git a/versions/z-/zstr.json b/versions/z-/zstr.json index 4e6aff72c37d41..d85da33f7b8e67 100644 --- a/versions/z-/zstr.json +++ b/versions/z-/zstr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "339a979f431eb74d38dbb731f60b89fd6cc2a43a", + "version-string": "1.0.4", + "port-version": 1 + }, { "git-tree": "9e180d152b886a9b45cc03c36fadaee8968d79d1", "version-string": "1.0.4", diff --git a/versions/z-/zxing-cpp.json b/versions/z-/zxing-cpp.json index d3cfdd84c4cd4b..7b9975f2631069 100644 --- a/versions/z-/zxing-cpp.json +++ b/versions/z-/zxing-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "242f57c2d8cbb10698ed8353b2efe1a716a5d177", + "version-string": "2020-12", + "port-version": 3 + }, { "git-tree": "4891ff3ded94308cdc3f4c3b73956b80317a4767", "version-string": "2020-12-2", diff --git a/versions/z-/zydis.json b/versions/z-/zydis.json index 9c7204fdb81ba5..dd303323889870 100644 --- a/versions/z-/zydis.json +++ b/versions/z-/zydis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1377782663be41b89898db78843a8e35417f90e9", + "version-string": "3.1.0", + "port-version": 2 + }, { "git-tree": "a27e395ffb6b0c8329228b3df9c3af8fd19c1b44", "version-string": "3.1.0-1", diff --git a/versions/z-/zyre.json b/versions/z-/zyre.json index 0819d9508aa85f..2ab1d8056cbe70 100644 --- a/versions/z-/zyre.json +++ b/versions/z-/zyre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "118b2285a26addbacaefb2f573f27e1a13bd4af3", + "version-string": "2019-07-07", + "port-version": 2 + }, { "git-tree": "b3300f003099d2e0597453a90fa1df903b6b5c56", "version-string": "2019-07-07-1", diff --git a/versions/z-/zziplib.json b/versions/z-/zziplib.json index 017e3328862c0e..b17a3621fe7978 100644 --- a/versions/z-/zziplib.json +++ b/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a83631e1e1b136f52e8367253ef162fb369f36a3", + "version-string": "0.13.71", + "port-version": 2 + }, { "git-tree": "7cdcdf231074be830e74ba4c498b9b34ba50b94a", "version-string": "0.13.71", From 373da55fb098bb34dfa7f3b6c1bce3d782da9dd4 Mon Sep 17 00:00:00 2001 From: Chris Djali <57094650+chrisdjali-wrld3d@users.noreply.github.com> Date: Thu, 9 Sep 2021 22:11:10 +0100 Subject: [PATCH 0493/1858] [angle] Enable ANGLE's desktop GL backend (#19891) * Enable ANGLE's desktop GL backend Only the D3D and GLES backends were available, but getting desktop GL to work is trivial. The Vulkan backend would be a much bigger task, unfortunately. * x-add-version Co-authored-by: Billy Robert O'Neal III --- ports/angle/CMakeLists.txt | 2 +- ports/angle/vcpkg.json | 2 +- versions/a-/angle.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/angle/CMakeLists.txt b/ports/angle/CMakeLists.txt index 24ab01d863aa9b..70a2e214361748 100644 --- a/ports/angle/CMakeLists.txt +++ b/ports/angle/CMakeLists.txt @@ -362,7 +362,7 @@ if(WINDOWS_DESKTOP OR LINUX OR APPLE) list(FILTER LIBANGLE_GL_SOURCES EXCLUDE REGEX "_unittest") add_library(angle_renderer_opengl INTERFACE) target_sources(angle_renderer_opengl INTERFACE "$") - target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL) + target_compile_definitions(angle_renderer_opengl INTERFACE -DANGLE_ENABLE_OPENGL -DANGLE_ENABLE_OPENGL_DESKTOP) add_library(angle::renderer::opengl ALIAS angle_renderer_opengl) endif() diff --git a/ports/angle/vcpkg.json b/ports/angle/vcpkg.json index 3dc8b17df8ea60..e51cf097890bf8 100644 --- a/ports/angle/vcpkg.json +++ b/ports/angle/vcpkg.json @@ -1,7 +1,7 @@ { "name": "angle", "version-string": "chromium_4472", - "port-version": 1, + "port-version": 2, "description": [ "A conformant OpenGL ES implementation for Windows, Mac and Linux.", "The goal of ANGLE is to allow users of multiple operating systems to seamlessly run WebGL and other OpenGL ES content by translating OpenGL ES API calls to one of the hardware-supported APIs available for that platform. ANGLE currently provides translation from OpenGL ES 2.0 and 3.0 to desktop OpenGL, OpenGL ES, Direct3D 9, and Direct3D 11. Support for translation from OpenGL ES to Vulkan is underway, and future plans include compute shader support (ES 3.1) and MacOS support." diff --git a/versions/a-/angle.json b/versions/a-/angle.json index 74633bb496d3ac..054aab9b90fde5 100644 --- a/versions/a-/angle.json +++ b/versions/a-/angle.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c4f08e40691d643044cf9319cef04b4289d4b6f", + "version-string": "chromium_4472", + "port-version": 2 + }, { "git-tree": "d59efcadc61eb7a7be987e4dcc03540490af89b8", "version-string": "chromium_4472", diff --git a/versions/baseline.json b/versions/baseline.json index e2da5b296233cb..66afb5eed21736 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -82,7 +82,7 @@ }, "angle": { "baseline": "chromium_4472", - "port-version": 1 + "port-version": 2 }, "antlr4": { "baseline": "4.9.1", From 840608e0400edb585623723f3ebbdc63bca79253 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 10 Sep 2021 05:41:01 +0200 Subject: [PATCH 0494/1858] [meson] fix cross compiling from linux to windows (#18927) * [meson] fix cross compiling from linux to windows * Fix mingw system name * Omit empty fields from standard libraries * Use VCPKG_CROSSCOMPILING * vcpkg_configure_meson: do not double escape include paths * vcpkg_configure_meson: set winres instead of rc * vcpkg_configure_meson: do not always cross build * Apply suggestions from code review * fix the issue I made * [meson] error when gcc uses a different linker executeable * [meson] apply code review from strega-nil * [meson] more verbose error messages * [meson] remove wrong check Co-authored-by: Kai Pastor Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca --- scripts/cmake/vcpkg_configure_meson.cmake | 32 +++++++++++++++++------ scripts/get_cmake_vars/CMakeLists.txt | 2 +- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 5bb34089c18dee..499d488252500c 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -54,13 +54,20 @@ function(vcpkg_internal_meson_generate_native_file _additional_binaries) #https: foreach(prog IN LISTS compiler) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) string(REPLACE "CXX" "CPP" mesonprog "${prog}") + string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html string(TOLOWER "${mesonprog}" proglower) string(APPEND NATIVE "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") endif() endforeach() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - string(APPEND NATIVE "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") - string(APPEND NATIVE "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + string(APPEND NATIVE "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() + endif() + if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) + if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + string(APPEND NATIVE "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() endif() string(APPEND NATIVE "cmake = '${CMAKE_COMMAND}'\n") foreach(_binary IN LISTS ${_additional_binaries}) @@ -79,12 +86,14 @@ function(vcpkg_internal_meson_generate_native_file _additional_binaries) #https: string(REGEX REPLACE "\\.lib " ".lib;" WIN_C_STANDARD_LIBRARIES "${WIN_C_STANDARD_LIBRARIES}") list(TRANSFORM WIN_C_STANDARD_LIBRARIES APPEND "'") list(TRANSFORM WIN_C_STANDARD_LIBRARIES PREPEND "'") + list(REMOVE_ITEM WIN_C_STANDARD_LIBRARIES "''") list(JOIN WIN_C_STANDARD_LIBRARIES ", " WIN_C_STANDARD_LIBRARIES) string(APPEND NATIVE "c_winlibs = [${WIN_C_STANDARD_LIBRARIES}]\n") string(REGEX REPLACE "( |^)(-|/)" ";\\2" WIN_CXX_STANDARD_LIBRARIES "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") string(REGEX REPLACE "\\.lib " ".lib;" WIN_CXX_STANDARD_LIBRARIES "${WIN_CXX_STANDARD_LIBRARIES}") list(TRANSFORM WIN_CXX_STANDARD_LIBRARIES APPEND "'") list(TRANSFORM WIN_CXX_STANDARD_LIBRARIES PREPEND "'") + list(REMOVE_ITEM WIN_CXX_STANDARD_LIBRARIES "''") list(JOIN WIN_CXX_STANDARD_LIBRARIES ", " WIN_CXX_STANDARD_LIBRARIES) string(APPEND NATIVE "cpp_winlibs = [${WIN_CXX_STANDARD_LIBRARIES}]\n") endif() @@ -121,11 +130,11 @@ function(vcpkg_internal_meson_generate_flags_properties_string _out_var _config) set(PATH_SUFFIX_DEBUG /debug) set(LIBPATH_${_config} "${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib") vcpkg_internal_meson_convert_compiler_flags_to_list(MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") - list(APPEND MESON_CFLAGS_${_config} "-I\"${CURRENT_INSTALLED_DIR}/include\"") + list(APPEND MESON_CFLAGS_${_config} "-I${CURRENT_INSTALLED_DIR}/include") vcpkg_internal_meson_convert_list_to_python_array(MESON_CFLAGS_${_config} ${MESON_CFLAGS_${_config}}) string(APPEND ${_out_var} "c_args = ${MESON_CFLAGS_${_config}}\n") vcpkg_internal_meson_convert_compiler_flags_to_list(MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") - list(APPEND MESON_CXXFLAGS_${_config} "-I\"${CURRENT_INSTALLED_DIR}/include\"") + list(APPEND MESON_CXXFLAGS_${_config} "-I${CURRENT_INSTALLED_DIR}/include") vcpkg_internal_meson_convert_list_to_python_array(MESON_CXXFLAGS_${_config} ${MESON_CXXFLAGS_${_config}}) string(APPEND ${_out_var} "cpp_args = ${MESON_CXXFLAGS_${_config}}\n") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -277,13 +286,20 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ foreach(prog IN LISTS compiler) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) string(REPLACE "CXX" "CPP" mesonprog "${prog}") + string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html string(TOLOWER "${mesonprog}" proglower) string(APPEND CROSS "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") endif() endforeach() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - string(APPEND CROSS "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") - string(APPEND CROSS "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + string(APPEND CROSS "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() + endif() + if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) + if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + string(APPEND CROSS "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + endif() endif() foreach(_binary IN LISTS ${_additional_binaries}) string(APPEND CROSS "${_binary}\n") @@ -293,7 +309,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ string(APPEND CROSS "[host_machine]\n") string(APPEND CROSS "endian = 'little'\n") - if(NOT VCPKG_CMAKE_SYSTEM_NAME) + if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW) set(MESON_SYSTEM_NAME "windows") else() string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" MESON_SYSTEM_NAME) @@ -319,7 +335,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ string(APPEND CROSS "cpu = '${BUILD_CPU}'\n") endif() - if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP) + if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_MINGW AND NOT WIN32)) set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") set(VCPKG_MESON_CROSS_FILE "${_file}" PARENT_SCOPE) file(WRITE "${_file}" "${CROSS}") diff --git a/scripts/get_cmake_vars/CMakeLists.txt b/scripts/get_cmake_vars/CMakeLists.txt index 1b2e1e561fb145..b6d5f0e4154d46 100644 --- a/scripts/get_cmake_vars/CMakeLists.txt +++ b/scripts/get_cmake_vars/CMakeLists.txt @@ -20,7 +20,7 @@ foreach(prog IN LISTS PROGLIST) endforeach() set(COMPILERS ${VCPKG_LANGUAGES} RC) foreach(prog IN LISTS COMPILERS) - list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER) + list(APPEND VCPKG_DEFAULT_VARS_TO_CHECK CMAKE_${prog}_COMPILER CMAKE_${prog}_COMPILER_ID) endforeach() # Variables to check foreach(_lang IN LISTS VCPKG_LANGUAGES) From 9dc7f9940f5a4a9e212bd0f2fb670abbdf8c8751 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 10 Sep 2021 11:41:22 +0800 Subject: [PATCH 0495/1858] [freeimage] Enable version information in FreeImage.dll (#19610) * [freeimage] Add version in FreeImage.dll * Add version files Co-authored-by: Billy Robert O'Neal III --- ports/freeimage/CMakeLists.txt | 2 +- ports/freeimage/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/f-/freeimage.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index 345c5d4d909b94..2c2fb129ee4931 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -79,7 +79,7 @@ else() endif() list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h) -add_library(FreeImage ${SRCS} ${PRIVATE_HEADERS} ${PUBLIC_HEADERS}) +add_library(FreeImage ${SRCS} ${PRIVATE_HEADERS} ${PUBLIC_HEADERS} ${CMAKE_CURRENT_SOURCE_DIR}/FreeImage.rc) if(BUILD_SHARED_LIBS) target_compile_definitions(FreeImage PRIVATE -DFREEIMAGE_EXPORTS) diff --git a/ports/freeimage/vcpkg.json b/ports/freeimage/vcpkg.json index 4f78fd876dc176..3d68598ad5da2f 100644 --- a/ports/freeimage/vcpkg.json +++ b/ports/freeimage/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeimage", - "version-string": "3.18.0", - "port-version": 20, + "version": "3.18.0", + "port-version": 21, "description": "Support library for graphics image formats", "homepage": "https://sourceforge.net/projects/freeimage/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 66afb5eed21736..598acc44776d7d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2150,7 +2150,7 @@ }, "freeimage": { "baseline": "3.18.0", - "port-version": 20 + "port-version": 21 }, "freeopcua": { "baseline": "20190125", diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json index ba162ca75391fd..bc867ec11d2651 100644 --- a/versions/f-/freeimage.json +++ b/versions/f-/freeimage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d0f28dd10d54f1f11d09875fbfafd1579e948c4", + "version": "3.18.0", + "port-version": 21 + }, { "git-tree": "d223c6f4524784f9d87c7aa0815e5b99d2f66116", "version-string": "3.18.0", From b09a361236e076ee8b510b2e4f5da5c1c551ecae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 10 Sep 2021 12:05:50 +0800 Subject: [PATCH 0496/1858] [openimageio] Fix find and use dependencies (#19916) * [openimageio] Fix find and use dependencies * version * Restore FindOpenEXR.cmake * version * Update ports/openimageio/portfile.cmake * Update versions/o-/openimageio.json * Re-make patch * version * Update versions/o-/openimageio.json * Update ports/openimageio/portfile.cmake * version --- ports/openimageio/fix-dependencies.patch | 75 +++++++++++++++++++++ ports/openimageio/portfile.cmake | 4 +- ports/openimageio/vcpkg-cmake-wrapper.cmake | 2 +- ports/openimageio/vcpkg.json | 2 + versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 ++ 6 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 ports/openimageio/fix-dependencies.patch diff --git a/ports/openimageio/fix-dependencies.patch b/ports/openimageio/fix-dependencies.patch new file mode 100644 index 00000000000000..81b95ff9c6f49f --- /dev/null +++ b/ports/openimageio/fix-dependencies.patch @@ -0,0 +1,75 @@ +diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in +index 740da06..1a326f7 100644 +--- a/src/cmake/Config.cmake.in ++++ b/src/cmake/Config.cmake.in +@@ -11,6 +11,9 @@ elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONF + HINTS @IlmBase_DIR@ @OpenEXR_DIR@) + find_dependency(OpenEXR @OpenEXR_VERSION@ + HINTS @OpenEXR_DIR@) ++ find_dependency(libpng CONFIG) ++ find_dependency(libheif CONFIG) ++ find_dependency(Libsquish) + find_dependency(ZLIB @ZLIB_VERSION@) # Because OpenEXR doesn't do it + find_dependency(Threads) # Because OpenEXR doesn't do it + endif () +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 21e18b5..badee4b 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -151,7 +151,7 @@ find_python() + # Dependencies for optional formats and features. If these are not found, + # we will continue building, but the related functionality will be disabled. + +-checked_find_package (PNG) ++checked_find_package (png PREFER_CONFIG) + + checked_find_package (BZip2) # Used by ffmpeg and freetype + if (NOT BZIP2_FOUND) +@@ -185,7 +185,8 @@ checked_find_package (GIF + RECOMMEND_MIN_REASON "for stability and thread safety") + + # For HEIF/HEIC/AVIF formats +-checked_find_package (Libheif VERSION_MIN 1.3 ++checked_find_package (libheif VERSION_MIN 1.3 ++ PREFER_CONFIG + RECOMMEND_MIN 1.7 + RECOMMEND_MIN_REASON "for AVIF support") + if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11) +diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt +index fed8001..15e87ae 100644 +--- a/src/heif.imageio/CMakeLists.txt ++++ b/src/heif.imageio/CMakeLists.txt +@@ -2,9 +2,9 @@ + # SPDX-License-Identifier: BSD-3-Clause + # https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md + +-if (Libheif_FOUND) ++if (libheif_FOUND) + add_oiio_plugin (heifinput.cpp heifoutput.cpp +- LINK_LIBRARIES Libheif::Libheif ++ LINK_LIBRARIES heif + DEFINITIONS "-DUSE_HEIF=1") + else () + message (WARNING "heif plugin will not be built") +diff --git a/src/ico.imageio/CMakeLists.txt b/src/ico.imageio/CMakeLists.txt +index 9ba76ac..13db4ac 100644 +--- a/src/ico.imageio/CMakeLists.txt ++++ b/src/ico.imageio/CMakeLists.txt +@@ -2,9 +2,15 @@ + # SPDX-License-Identifier: BSD-3-Clause + # https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md + +-if (TARGET PNG::PNG) ++if (libpng_FOUND) ++ if (TARGET png_static) ++ set(PNG_TARGET png_static) ++ elseif (TARGET png) ++ set(PNG_TARGET png) ++ endif() ++ + add_oiio_plugin (icoinput.cpp icooutput.cpp +- LINK_LIBRARIES PNG::PNG ZLIB::ZLIB) ++ LINK_LIBRARIES ${PNG_TARGET} ZLIB::ZLIB) + else () + message (WARNING "libpng not found, so ICO support will not work") + set (format_plugin_definitions ${format_plugin_definitions} DISABLE_ICO=1 PARENT_SCOPE) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 496ec5c437d688..cd4ce9c5258959 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( fix-config-cmake.patch fix_static_build.patch disable-test.patch + fix-dependencies.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -84,7 +85,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" "${CURRENT_PACKAGES_DIR}/debug/share") file(COPY "${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") +file(COPY "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/openimageio") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openimageio/vcpkg-cmake-wrapper.cmake b/ports/openimageio/vcpkg-cmake-wrapper.cmake index 688c83f3cc99d8..5976305769ad2c 100644 --- a/ports/openimageio/vcpkg-cmake-wrapper.cmake +++ b/ports/openimageio/vcpkg-cmake-wrapper.cmake @@ -1,5 +1,5 @@ set(OPENIMAGEIO_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../OpenImageIO") _find_package(${ARGS}) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 78ab842b92735d..cb30bf6f82f05f 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openimageio", "version": "2.3.7.2", + "port-version": 1, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ @@ -21,6 +22,7 @@ "libheif", "libjpeg-turbo", "libpng", + "libsquish", "openexr", "robin-map", "tiff", diff --git a/versions/baseline.json b/versions/baseline.json index 598acc44776d7d..ac2efba1cbeb9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4714,7 +4714,7 @@ }, "openimageio": { "baseline": "2.3.7.2", - "port-version": 0 + "port-version": 1 }, "openjpeg": { "baseline": "2.3.1", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index e68d13dda864e6..1ebf88c90a2816 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "799ea36f0486224257ecfea149b429d81e74a879", + "version": "2.3.7.2", + "port-version": 1 + }, { "git-tree": "6da138c7530d19649391636a660a06aac51db135", "version": "2.3.7.2", From f21e8d4f49ab2f84e298629d98346e2ea3b89def Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 10 Sep 2021 12:06:12 +0800 Subject: [PATCH 0497/1858] [sqlite3] update to 3.36.0 (#19847) * [sqlite3] update to 3.36.0 * update version --- ports/sqlite3/portfile.cmake | 33 ++++++++++++++++----------------- ports/sqlite3/vcpkg.json | 12 +++++++++++- versions/baseline.json | 2 +- versions/s-/sqlite3.json | 5 +++++ 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index 49322da59aa738..d843ee537b48ff 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,5 +1,5 @@ -set(SQLITE_VERSION 3350500) -set(SQLITE_HASH 9684fee89224f0c975c280cb6b2c64adb040334bc5517dfe0e354b0557459fa3ae642c4289a7a5265f65b3ad5b6747db8068a1e5172fbb8edec7f6d964ecbb20) +set(SQLITE_VERSION 3360000) +set(SQLITE_HASH 5c18f158a599b1e91d95c91de3aa5c5de52f986845ad0cb49dfd56b650587e55e24d469571b5b864229b870d0eaf85d78893f61ef950b95389cb41692be37f58) vcpkg_download_distfile(ARCHIVE URLS "https://sqlite.org/2021/sqlite-amalgamation-${SQLITE_VERSION}.zip" @@ -14,36 +14,35 @@ vcpkg_extract_source_archive_ex( PATCHES fix-arm-uwp.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - geopoly WITH_GEOPOLY - json1 WITH_JSON1 - INVERTED_FEATURES - tool SQLITE3_SKIP_TOOLS + geopoly WITH_GEOPOLY + json1 WITH_JSON1 + INVERTED_FEATURES + tool SQLITE3_SKIP_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DSQLITE3_SKIP_TOOLS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT} CONFIG_PATH share/unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -if(NOT SQLITE3_SKIP_TOOLS AND EXISTS ${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}) +if(NOT SQLITE3_SKIP_TOOLS AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/sqlite3-bin${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() configure_file( - ${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake - ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-sqlite3-config.cmake + "${CMAKE_CURRENT_LIST_DIR}/sqlite3-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-sqlite3-config.cmake" @ONLY ) diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index 60d162c85cf7c5..f5054f6f8a9420 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,8 +1,18 @@ { "name": "sqlite3", - "version": "3.35.5", + "version": "3.36.0", "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "geopoly": { "description": "enable geopoly functionality for sqlite3" diff --git a/versions/baseline.json b/versions/baseline.json index ac2efba1cbeb9e..5ad0793bd5e2de 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6149,7 +6149,7 @@ "port-version": 1 }, "sqlite3": { - "baseline": "3.35.5", + "baseline": "3.36.0", "port-version": 0 }, "sqlitecpp": { diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 3e7c2056343729..2154ae8688089e 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c23525b0204e11a56d40cbb0b7fa68861450df04", + "version": "3.36.0", + "port-version": 0 + }, { "git-tree": "2b5a7327445e4b113d53a988cc7b0619e5abc77f", "version": "3.35.5", From f50075658faf60b072e6f27dd4f053a2dbdd17e9 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 10 Sep 2021 12:11:53 +0800 Subject: [PATCH 0498/1858] [uthash] Add new port (#19823) * [uthash] Add new port * [uthash] Version stuffs --- ports/uthash/portfile.cmake | 13 +++++++++++++ ports/uthash/vcpkg.json | 7 +++++++ versions/baseline.json | 4 ++++ versions/u-/uthash.json | 9 +++++++++ 4 files changed, 33 insertions(+) create mode 100644 ports/uthash/portfile.cmake create mode 100644 ports/uthash/vcpkg.json create mode 100644 versions/u-/uthash.json diff --git a/ports/uthash/portfile.cmake b/ports/uthash/portfile.cmake new file mode 100644 index 00000000000000..c84a29b383cdcc --- /dev/null +++ b/ports/uthash/portfile.cmake @@ -0,0 +1,13 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO troydhanson/uthash + REF e493aa90a2833b4655927598f169c31cfcdf7861 + SHA512 a4a2cdee11b238f57bdc3104eee1b3d2014359b65ada896dd26c7f21dda13921f63b44d3d0e7b6fa03731f64b4b4013861d0a49df8b54d7e3726454cbfebaa39 + HEAD_REF master +) + +file(GLOB uthash_PUBLIC_HEADERS ${SOURCE_PATH}/src/*.h) +file(INSTALL ${uthash_PUBLIC_HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/uthash/vcpkg.json b/ports/uthash/vcpkg.json new file mode 100644 index 00000000000000..46e36906e3af56 --- /dev/null +++ b/ports/uthash/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "uthash", + "version-semver": "2.3.0", + "description": "C macros for hash tables and more.", + "homepage": "https://troydhanson.github.io/uthash/", + "license": "BSD-1-Clause" +} diff --git a/versions/baseline.json b/versions/baseline.json index 5ad0793bd5e2de..623227de8f92a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6640,6 +6640,10 @@ "baseline": "1.2", "port-version": 2 }, + "uthash": { + "baseline": "2.3.0", + "port-version": 0 + }, "uthenticode": { "baseline": "1.0.4", "port-version": 1 diff --git a/versions/u-/uthash.json b/versions/u-/uthash.json new file mode 100644 index 00000000000000..c3e86b129df28a --- /dev/null +++ b/versions/u-/uthash.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "031c9a8367a7683fb4cd9b022ebcf504a53a0bfd", + "version-semver": "2.3.0", + "port-version": 0 + } + ] +} From 9c86a855274eca184ddaca7708885f0749b906f9 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Fri, 10 Sep 2021 12:12:21 +0800 Subject: [PATCH 0499/1858] [nng] Update to v1.5.1 (#19478) * [nng] Update to v1.5.1 * [nng] Bump version * [nng] Quote source path * [nng] Bump version --- ports/nng/portfile.cmake | 24 ++++++++++++------------ ports/nng/vcpkg.json | 12 +++++++++++- versions/baseline.json | 2 +- versions/n-/nng.json | 5 +++++ 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ports/nng/portfile.cmake b/ports/nng/portfile.cmake index 770e4656d6e42e..60af4ca7e02a6c 100644 --- a/ports/nng/portfile.cmake +++ b/ports/nng/portfile.cmake @@ -1,33 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nanomsg/nng - REF d020adda8f0348d094790618703b8341a26007a3 # version 1.4.0 - SHA512 dbbbee25ddbfece77336b9be9e63ae331b2991cb94a7a71141faf519f02aa1f123f72f89b98964e24ebc5ced786034b6dac60d8ef905376b6fb5fb7dbff49bd6 + REF 9fcf039b573d153ba9bbc2beb5f11259ddacdcff # v1.5.1 + SHA512 3db2668c3f971dc54156df2a3520645224fbb55460957da35940889c3148cb2cbc67c10cd23b9614ece70235d1f6003618310129eb9c40ced42db058c140dd58 HEAD_REF master ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - mbedtls NNG_ENABLE_TLS - tools NNG_ENABLE_NNGCAT + FEATURES + mbedtls NNG_ENABLE_TLS + tools NNG_ENABLE_NNGCAT ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNNG_TESTS=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/nng) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/nng) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/nng/nng.h + "${CURRENT_PACKAGES_DIR}/include/nng/nng.h" "defined(NNG_SHARED_LIB)" "0 /* defined(NNG_SHARED_LIB) */" ) @@ -50,6 +50,6 @@ if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES nngcat AUTO_CLEAN) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/nng/vcpkg.json b/ports/nng/vcpkg.json index 54a88928af0bba..c89456dfd6237c 100644 --- a/ports/nng/vcpkg.json +++ b/ports/nng/vcpkg.json @@ -1,9 +1,19 @@ { "name": "nng", - "version-string": "1.4.0", + "version-semver": "1.5.1", "description": "nanomsg-next-gen, lightweight messaging library", "homepage": "https://nng.nanomsg.org", "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "mbedtls": { "description": "nng TLS support", diff --git a/versions/baseline.json b/versions/baseline.json index 623227de8f92a0..890e59c8b238cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4473,7 +4473,7 @@ "port-version": 1 }, "nng": { - "baseline": "1.4.0", + "baseline": "1.5.1", "port-version": 0 }, "nngpp": { diff --git a/versions/n-/nng.json b/versions/n-/nng.json index b8ffd04e9c25e6..a63b840915b9dc 100644 --- a/versions/n-/nng.json +++ b/versions/n-/nng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec4958fd8785c45084ce752f527ab7ef7acd69a7", + "version-semver": "1.5.1", + "port-version": 0 + }, { "git-tree": "6fce71079b3518a4449743fb055a45a8a881d4a5", "version-string": "1.4.0", From 3db1c20c165f38826a2e20550cafa1e7a70e1082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 10 Sep 2021 06:15:36 +0200 Subject: [PATCH 0500/1858] [kf5i18n] static builds fixes (#20016) * [kf5i18n] fix libiconv transient dependency * [kf5i18n] update versions --- ports/kf5i18n/fix_static_builds.patch | 30 +++++++++++++++++++++++++++ ports/kf5i18n/portfile.cmake | 5 +++++ ports/kf5i18n/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/k-/kf5i18n.json | 5 +++++ 5 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 ports/kf5i18n/fix_static_builds.patch diff --git a/ports/kf5i18n/fix_static_builds.patch b/ports/kf5i18n/fix_static_builds.patch new file mode 100644 index 00000000000000..541ce9f270fdf2 --- /dev/null +++ b/ports/kf5i18n/fix_static_builds.patch @@ -0,0 +1,30 @@ +diff --git a/KF5I18nConfig.cmake.in b/KF5I18nConfig.cmake.in +index 364cc43..af7cd3b 100644 +--- a/KF5I18nConfig.cmake.in ++++ b/KF5I18nConfig.cmake.in +@@ -8,3 +8,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ + include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nMacros.cmake") + ++find_dependency(Iconv) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c6b510c..0a25eca 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -38,12 +38,16 @@ ecm_generate_export_header(KF5I18n + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} + ) + ++find_package(Iconv REQUIRED) ++ + target_include_directories(KF5I18n INTERFACE "$") + target_include_directories(KF5I18n PRIVATE ${LibIntl_INCLUDE_DIRS}) ++target_include_directories(KF5I18n PRIVATE ${Iconv_INCLUDE_DIRS}) + + target_link_libraries(KF5I18n PUBLIC Qt5::Core) + # This is only required for platforms which don't use glibc (with glibc LibIntl_LIBRARIES will be empty) + target_link_libraries(KF5I18n PRIVATE ${LibIntl_LIBRARIES}) ++target_link_libraries(KF5I18n PRIVATE ${Iconv_LIBRARIES}) + target_compile_options(KF5I18n PRIVATE -DTRANSLATION_DOMAIN=\"ki18n5\") + + set_target_properties(KF5I18n PROPERTIES VERSION ${KI18N_VERSION} diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 21851c16393152..415530d1ea2368 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -1,8 +1,13 @@ +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND PATCHES fix_static_builds.patch) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ki18n REF v5.84.0 SHA512 611481b0d5f387b6e1201c1d38e050bd6c956607d059679c68f39d8560cdde666709f5aa1ae770e200fb81e902da85160eb3eeaf5c0bdb02c0ff13782df1d907 + PATCHES ${PATCHES} ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index fb1c47e8a3cb7b..149194bdb5ac56 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5i18n", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ @@ -14,6 +14,7 @@ "tools" ] }, + "libiconv", "qt5-declarative", "qt5-tools" ] diff --git a/versions/baseline.json b/versions/baseline.json index 890e59c8b238cf..c3072ce7d82242 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2950,7 +2950,7 @@ }, "kf5i18n": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5itemmodels": { "baseline": "5.84.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index b880dc638d13f1..1337933fc56ad5 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d34c7c3f38d55f93bc26d146fcf656f7eb4be3c", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "f0d01fec0fb56e9c2d95b743b0b13e544d5428a7", "version": "5.84.0", From 2a8b92a293f126eae1ffd02f5f73a2b25a2d6831 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 10 Sep 2021 06:16:23 +0200 Subject: [PATCH 0501/1858] [usrsctp] update to 0.9.5.0 (#20028) --- ports/usrsctp/portfile.cmake | 17 ++++++----------- ports/usrsctp/vcpkg.json | 11 ++++++++--- versions/baseline.json | 4 ++-- versions/u-/usrsctp.json | 5 +++++ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ports/usrsctp/portfile.cmake b/ports/usrsctp/portfile.cmake index d00896a24df7e9..f560279e5e8651 100644 --- a/ports/usrsctp/portfile.cmake +++ b/ports/usrsctp/portfile.cmake @@ -3,27 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sctplab/usrsctp - REF 0db969100094422d9ea74a08ae5e5d9a4cfdb06b - SHA512 53993d663b6899896409cb4cdbbb6d41a9eccba012b032773708be90c16e3d617b3c3256ea624dc3e984dc7099f69f3b7cd647c11e24abae4b77594e2cd64ef7 + REF 0.9.5.0 + SHA512 7b28706449f9365ba9750fd39925e7171516a1e3145d123ec69a12486637ae2393ad4c587b056403298dc13c149f0b01a262cbe4852abca42e425d7680c77ee3 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -Dsctp_werror=OFF -Dsctp_build_programs=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/usrsctp.dll - ${CURRENT_PACKAGES_DIR}/lib/usrsctp.dll -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/usrsctp/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/usrsctp/copyright" COPYONLY) vcpkg_copy_pdbs() diff --git a/ports/usrsctp/vcpkg.json b/ports/usrsctp/vcpkg.json index 8f8f6663e97a34..64d475e3bfda8d 100644 --- a/ports/usrsctp/vcpkg.json +++ b/ports/usrsctp/vcpkg.json @@ -1,6 +1,11 @@ { "name": "usrsctp", - "version-string": "0db9691", - "port-version": 1, - "description": "This is a userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows." + "version": "0.9.5.0", + "description": "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index c3072ce7d82242..52a4369e9da8a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6621,8 +6621,8 @@ "port-version": 0 }, "usrsctp": { - "baseline": "0db9691", - "port-version": 1 + "baseline": "0.9.5.0", + "port-version": 0 }, "utf8h": { "baseline": "2020-06-14", diff --git a/versions/u-/usrsctp.json b/versions/u-/usrsctp.json index 4e7271e13bbf75..f06592bfef660e 100644 --- a/versions/u-/usrsctp.json +++ b/versions/u-/usrsctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2af7adab77a27695756a783a27f5c602ded9082", + "version": "0.9.5.0", + "port-version": 0 + }, { "git-tree": "fd25f487883b7ccbba50c32203eb96c18cd9338f", "version-string": "0db9691", From 3a4665d0bac0d88cd8d428c9858a922f21f8848a Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 9 Sep 2021 21:17:15 -0700 Subject: [PATCH 0502/1858] [azure-sdk-for-cpp] Storage Sept Release (#20037) * [azure-storage-blobs-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Breaking Changes - `StartsOn` and `ExpiresOn` in `SignedIdentifier` were changed to nullable. ### Bugs Fixed - Fixed a bug where prefix cannot contain `&` when listing blobs. ### Other Changes - Create less threads if there isn't too much data to transfer. * [azure-storage-files-datalake-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Breaking Changes - `StartsOn` and `ExpiresOn` in `SignedIdentifier` were changed to nullable. ### Bugs Fixed - Fixed a bug where prefix cannot contain `&` when listing files. ### Other Changes - Create less threads if there isn't too much data to transfer. * [azure-storage-files-shares-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Breaking Changes - `AccessPolicy::StartsOn` and `AccessPolicy::ExpiresOn` are now nullable values. ### Bugs Fixed - Fixed a bug where prefix cannot contain `&` when listing files. ### Other Changes - Create less threads if there isn't too much data to transfer. * [azure-storage-queues-cpp] Update to 12.0.0-beta.1 ## 12.0.0-beta.1 (2021-09-08) ### New Features - Added support for Queue features: - QueueServiceClient::ListQueues - QueueServiceClient::SetProperties - QueueServiceClient::GetProperties - QueueServiceClient::GetStatistics - QueueServiceClient::CreateQueue - QueueServiceClient::DeleteQueue - QueueClient::Create - QueueClient::Delete - QueueClient::GetProperties - QueueClient::SetMetadata - QueueClient::GetAccessPolicy - QueueClient::SetAccessPolicy - QueueClient::EnqueueMessage - QueueClient::ReceiveMessages - QueueClient::PeekMessages - QueueClient::UpdateMessage - QueueClient::DeleteMessage - QueueClient::ClearMessages - Added support for queue SAS. * [azure-storage-common-cpp] Update to 12.2.0 ## 12.2.0 (2021-09-08) ### Features Added - Used new xml library on Windows, dropped dependency for libxml2. ### Bugs Fixed - Fixed a bug that may cause crash when parsing XML. --- ports/azure-storage-blobs-cpp/portfile.cmake | 4 +-- ports/azure-storage-blobs-cpp/vcpkg.json | 5 ++-- ports/azure-storage-common-cpp/portfile.cmake | 4 +-- ports/azure-storage-common-cpp/vcpkg.json | 10 +++++--- .../portfile.cmake | 4 +-- .../vcpkg.json | 5 ++-- .../portfile.cmake | 4 +-- .../azure-storage-files-shares-cpp/vcpkg.json | 5 ++-- ports/azure-storage-queues-cpp/portfile.cmake | 18 +++++++++++++ ports/azure-storage-queues-cpp/vcpkg.json | 25 +++++++++++++++++++ versions/a-/azure-storage-blobs-cpp.json | 5 ++++ versions/a-/azure-storage-common-cpp.json | 5 ++++ .../a-/azure-storage-files-datalake-cpp.json | 5 ++++ .../a-/azure-storage-files-shares-cpp.json | 5 ++++ versions/a-/azure-storage-queues-cpp.json | 9 +++++++ versions/baseline.json | 12 ++++++--- 16 files changed, 104 insertions(+), 21 deletions(-) create mode 100644 ports/azure-storage-queues-cpp/portfile.cmake create mode 100644 ports/azure-storage-queues-cpp/vcpkg.json create mode 100644 versions/a-/azure-storage-queues-cpp.json diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index e17b3484b62e5b..3d5acc48ab7764 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.1.0 - SHA512 4559d57f65dcd0e710e0240fcc33fb8e8ff2a516e405afb2c7768bbb91b8e253a906f3562249c29f8f9a674473fc17427566d6657a53c8cf8803703e1c989db6 + REF azure-storage-blobs_12.2.0 + SHA512 9e833b41b33b5889cc1b84edc64efc38341db3d9ea28e771968c1ed56686975d0b688ea48d7649845030f6c8a6327f136f5f8c1a584996bdf6ce83564c30c91f ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index 6de1f50ed81617..f806e967deadf6 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.1.0", + "version-semver": "12.2.0", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.2.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-common-cpp/portfile.cmake b/ports/azure-storage-common-cpp/portfile.cmake index ab556b364776d3..9843c83a34a6b7 100644 --- a/ports/azure-storage-common-cpp/portfile.cmake +++ b/ports/azure-storage-common-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-common_12.1.0 - SHA512 6f44ae7f6572810d550821a51af1e8c1f266ae356f70eddc7e6a3777f69ec5d06f9750fcbe2d021bd9154e5952ba2a73d13abdfa44ef3a1c7a5d3750dbeefbca + REF azure-storage-common_12.2.0 + SHA512 59d7c755c9aca09e49487765c5571da242bd6cbf426f6fd07a2d7235f4e5c894f6a36e209f08908d1e6fc97d64d60fd5e7f4dd87d88416e21b6591fc88674663 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-common-cpp/vcpkg.json b/ports/azure-storage-common-cpp/vcpkg.json index e547cafa95b0e3..d1729985a9654f 100644 --- a/ports/azure-storage-common-cpp/vcpkg.json +++ b/ports/azure-storage-common-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-common-cpp", - "version-semver": "12.1.0", + "version-semver": "12.2.0", "description": [ "Microsoft Azure Common Storage SDK for C++", "This library provides common Azure Storage-related abstractions for Azure SDK." @@ -10,9 +10,13 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.0.0" + }, + { + "name": "libxml2", + "platform": "!windows" }, - "libxml2", { "name": "openssl", "platform": "!windows" diff --git a/ports/azure-storage-files-datalake-cpp/portfile.cmake b/ports/azure-storage-files-datalake-cpp/portfile.cmake index c0fee9b8ce817d..fad24c17114d32 100644 --- a/ports/azure-storage-files-datalake-cpp/portfile.cmake +++ b/ports/azure-storage-files-datalake-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-datalake_12.1.0 - SHA512 fa0482b6862219787ba40adf7baa86779681d5a47da22056a4043a6f8765e5418bfaca1cfe4e451297fa56cdde9a30cbfb6fb66dc473fa57fc66eeda9e728cf5 + REF azure-storage-files-datalake_12.2.0 + SHA512 42e5fd30f76236cbe055ed51fdba3672421e9ad329addc665df1b2d29d5ea1df016932b5d4c28c7a0dd820bbab09d4b245711a7020d4b9a1e96d05657c05b94b ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-datalake-cpp/vcpkg.json b/ports/azure-storage-files-datalake-cpp/vcpkg.json index 0014b1ea066d78..b59f47fd39076a 100644 --- a/ports/azure-storage-files-datalake-cpp/vcpkg.json +++ b/ports/azure-storage-files-datalake-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-datalake-cpp", - "version-semver": "12.1.0", + "version-semver": "12.2.0", "description": [ "Microsoft Azure Storage Files Data Lake SDK for C++", "This library provides Azure Storage Files Data Lake SDK." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "azure-storage-blobs-cpp", - "default-features": false + "default-features": false, + "version>=": "12.2.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-files-shares-cpp/portfile.cmake b/ports/azure-storage-files-shares-cpp/portfile.cmake index 9a8f4b86498e53..420ee8925c841b 100644 --- a/ports/azure-storage-files-shares-cpp/portfile.cmake +++ b/ports/azure-storage-files-shares-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-files-shares_12.1.0 - SHA512 8d3fa6e13f731627e4644b79eb9761071539875b0b3988cd871721e68d7d3c5b7a0a067a890d6a8c2df53ba7c6ef97a86a8b02086f74682cccf6a5f919392573 + REF azure-storage-files-shares_12.2.0 + SHA512 b3e0c0a6b4ab11ff9d4c3318a56621d4d6c453b393f692f5d61118a18c571fbb5a1b259c44bb2ba7ac14e056d3a30bde66e36601139d704baeb9cbc865c43ecd ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-files-shares-cpp/vcpkg.json b/ports/azure-storage-files-shares-cpp/vcpkg.json index 8d2be437d35718..54807b9b469ca1 100644 --- a/ports/azure-storage-files-shares-cpp/vcpkg.json +++ b/ports/azure-storage-files-shares-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-files-shares-cpp", - "version-semver": "12.1.0", + "version-semver": "12.2.0", "description": [ "Microsoft Azure Storage Files Shares SDK for C++", "This library provides Azure Storage Files Shares SDK." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "azure-storage-common-cpp", - "default-features": false + "default-features": false, + "version>=": "12.2.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake new file mode 100644 index 00000000000000..8ede76b4e6a921 --- /dev/null +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-storage-queues_12.0.0-beta.1 + SHA512 22c59e6fd6838caeb7af476a4547815115d51b26145bbb3083cf4ae6bd15a6e43d5892c02f97cfa09c5e279c219c6f0b600f65d5dd742495f72775850b7ed6e2 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/storage/azure-storage-queues/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json new file mode 100644 index 00000000000000..ffedcc26b01970 --- /dev/null +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-storage-queues-cpp", + "version-semver": "12.0.0-beta.1", + "description": [ + "Microsoft Azure Storage Queues SDK for C++", + "This library provides Azure Storage Queues SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-queues", + "license": "MIT", + "dependencies": [ + { + "name": "azure-storage-common-cpp", + "default-features": false, + "version>=": "12.2.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index 033835e24bf5b1..b2d89ffc484fd6 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3775aa0aa8ad876fffa3d2f77b7c1e12b072a5b", + "version-semver": "12.2.0", + "port-version": 0 + }, { "git-tree": "eed3fb43fd0ab43bf99c91a084111c9d1e14f213", "version-semver": "12.1.0", diff --git a/versions/a-/azure-storage-common-cpp.json b/versions/a-/azure-storage-common-cpp.json index 9fa26071ef2c47..3ab70e9ed9d404 100644 --- a/versions/a-/azure-storage-common-cpp.json +++ b/versions/a-/azure-storage-common-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ef80d68150017530cb50581cd6f5f03bc607859", + "version-semver": "12.2.0", + "port-version": 0 + }, { "git-tree": "bb0e01a17ffaab119d6a67748a54d8b849fb569b", "version-semver": "12.1.0", diff --git a/versions/a-/azure-storage-files-datalake-cpp.json b/versions/a-/azure-storage-files-datalake-cpp.json index 06b2c6daf27019..a3472992ac248d 100644 --- a/versions/a-/azure-storage-files-datalake-cpp.json +++ b/versions/a-/azure-storage-files-datalake-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36837d18b946ad07bcb95c44450509f1d04ba4ec", + "version-semver": "12.2.0", + "port-version": 0 + }, { "git-tree": "2c8e48a165197468833b76c0825621ea408efb0a", "version-semver": "12.1.0", diff --git a/versions/a-/azure-storage-files-shares-cpp.json b/versions/a-/azure-storage-files-shares-cpp.json index af031d87aefdac..581aeff7f022d7 100644 --- a/versions/a-/azure-storage-files-shares-cpp.json +++ b/versions/a-/azure-storage-files-shares-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7c34584a28f09d204e8ab6cbcf23ea93e330653", + "version-semver": "12.2.0", + "port-version": 0 + }, { "git-tree": "3a7e7cf14be62755ee6a51fc0f8e88edd3a13d18", "version-semver": "12.1.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json new file mode 100644 index 00000000000000..e079b75c0b4b7e --- /dev/null +++ b/versions/a-/azure-storage-queues-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4826bb13d7feb69f3a64633d3a1ea4b4de173a71", + "version-semver": "12.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 52a4369e9da8a5..e5f04829def88f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -305,11 +305,11 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.1.0", + "baseline": "12.2.0", "port-version": 0 }, "azure-storage-common-cpp": { - "baseline": "12.1.0", + "baseline": "12.2.0", "port-version": 0 }, "azure-storage-cpp": { @@ -317,11 +317,15 @@ "port-version": 2 }, "azure-storage-files-datalake-cpp": { - "baseline": "12.1.0", + "baseline": "12.2.0", "port-version": 0 }, "azure-storage-files-shares-cpp": { - "baseline": "12.1.0", + "baseline": "12.2.0", + "port-version": 0 + }, + "azure-storage-queues-cpp": { + "baseline": "12.0.0-beta.1", "port-version": 0 }, "azure-uamqp-c": { From e7c32c6e8a03c442d931e6f7080df10c999c35a1 Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Fri, 10 Sep 2021 07:17:59 +0300 Subject: [PATCH 0503/1858] [sail] Update to 0.9.0-pre16 (#20046) * [sail] Update to v0.9.0-pre16 * [sail] vcpkg x-add-version --all * [sail] Update git REPO * [sail] vcpkg x-add-version --all --overwrite-version --- ports/sail/portfile.cmake | 6 +++--- ports/sail/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 0365adc900e864..5be00ca62fbeef 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO smoked-herring/sail - REF v0.9.0-pre15 - SHA512 7f587a3cc05dbcee2327953438e5605beab6622b0511eb2c8d4d433a0586c6589ea6cad8ab8b02726be613502c9cfd53dfa263a4878bde9f0138ff076aa24d61 + REPO HappySeaFox/sail + REF v0.9.0-pre16 + SHA512 dca4b930c78d0d330cde0a0255efae6042e11914eec37be35b1fc39eaf3855a47f5b2d07be17c8b4c67f569acfab2cfe7ff86aaeba60eed4bbf2be637b1bf192 HEAD_REF master ) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index aaa084e456e5e4..df5d694f2d81ea 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,8 +1,8 @@ { "name": "sail", - "version-semver": "0.9.0-pre15", + "version-semver": "0.9.0-pre16", "description": "The missing small and fast image decoding library for humans (not for machines)", - "homepage": "https://github.com/smoked-herring/sail", + "homepage": "https://github.com/HappySeaFox/sail", "supports": "!uwp", "dependencies": [ "giflib", diff --git a/versions/baseline.json b/versions/baseline.json index e5f04829def88f..412c262168c82f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5769,7 +5769,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre15", + "baseline": "0.9.0-pre16", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index ec475a198fc193..e4789877b31422 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a75976401bd0120fec82782d41c53d60fe525ca9", + "version-semver": "0.9.0-pre16", + "port-version": 0 + }, { "git-tree": "14ddeb70c44c70b4ca633ba9627b99ffd78686c7", "version-semver": "0.9.0-pre15", From ba456b1347c79f29a9996ce785f84ef3d4819f89 Mon Sep 17 00:00:00 2001 From: Llewellyn Falco Date: Fri, 10 Sep 2021 04:18:14 +0000 Subject: [PATCH 0504/1858] [approval-tests-cpp] Update to 10.12.0 (#20058) * [approval-tests-cpp] Update to 10.12.0 * [approval-tests-cpp] Update to 10.12.0 --- ports/approval-tests-cpp/portfile.cmake | 10 +++++----- ports/approval-tests-cpp/vcpkg.json | 2 +- versions/a-/approval-tests-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ports/approval-tests-cpp/portfile.cmake b/ports/approval-tests-cpp/portfile.cmake index bd16f3b09b2a30..b6b55b28e762dd 100644 --- a/ports/approval-tests-cpp/portfile.cmake +++ b/ports/approval-tests-cpp/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_download_distfile(single_header - URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.11.0/ApprovalTests.v.10.11.0.hpp - FILENAME ApprovalTests.v.10.11.0.hpp - SHA512 2b43792b28a1dd44d76584c4d3bb9cb99563f92fdeafefd747516a8cfe0baf118b27ad235e1b023b3f5f3a34ecf920c12ab8a6d337776efc036456f4277142ae + URLS https://github.com/approvals/ApprovalTests.cpp/releases/download/v.10.12.0/ApprovalTests.v.10.12.0.hpp + FILENAME ApprovalTests.v.10.12.0.hpp + SHA512 a6a5030cc4f438f218bb55c25124ed3df749d36a0f032ff21b3a68ee4334eb4562944a0f5f73d0c253d674517f8a819349371e248eca271ce5577236f1598b8c ) vcpkg_download_distfile(license_file - URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.11.0/LICENSE - FILENAME ApprovalTestsLicense.v.10.11.0 + URLS https://raw.githubusercontent.com/approvals/ApprovalTests.cpp/v.10.12.0/LICENSE + FILENAME ApprovalTestsLicense.v.10.12.0 SHA512 dc6b68d13b8cf959644b935f1192b02c71aa7a5cf653bd43b4480fa89eec8d4d3f16a2278ec8c3b40ab1fdb233b3173a78fd83590d6f739e0c9e8ff56c282557 ) diff --git a/ports/approval-tests-cpp/vcpkg.json b/ports/approval-tests-cpp/vcpkg.json index 32c085ca2bf624..1c6ad01bb0d61f 100644 --- a/ports/approval-tests-cpp/vcpkg.json +++ b/ports/approval-tests-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "approval-tests-cpp", - "version": "10.11.0", + "version": "10.12.0", "description": "Approval Tests allow you to verify a chunk of output (such as a file) in one operation as opposed to writing test assertions for each element.", "homepage": "https://github.com/approvals/ApprovalTests.cpp" } diff --git a/versions/a-/approval-tests-cpp.json b/versions/a-/approval-tests-cpp.json index 2ea2ad460b1cd6..05e8e5ad43939f 100644 --- a/versions/a-/approval-tests-cpp.json +++ b/versions/a-/approval-tests-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab883d6b40593e4e14a28110865e55745d7d5768", + "version": "10.12.0", + "port-version": 0 + }, { "git-tree": "42def472fd3039fb2e54a41a6980822a20518eff", "version": "10.11.0", diff --git a/versions/baseline.json b/versions/baseline.json index 412c262168c82f..fba9c524b8e1e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -101,7 +101,7 @@ "port-version": 0 }, "approval-tests-cpp": { - "baseline": "10.11.0", + "baseline": "10.12.0", "port-version": 0 }, "apr": { From 3054df08713c15982d94cd1dcf04580285665622 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 9 Sep 2021 21:18:37 -0700 Subject: [PATCH 0505/1858] [functions-framework-cpp] update to latest version (v1.0.0) (#20071) --- ports/functions-framework-cpp/portfile.cmake | 4 ++-- ports/functions-framework-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/functions-framework-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index 1e145de3aa3e95..73aff324cba56b 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GoogleCloudPlatform/functions-framework-cpp - REF v0.6.0 - SHA512 57d6ec2467d1f9e12c14c3d2c361be15e5c5cfa4a12f3a184a99b8b0e91b2224a9156bfd875c98e8ad0ea44b7f84524fac35c536718fa039941647616a9e8586 + REF v1.0.0 + SHA512 caaf39014cc651f0f929fce60059592ce17dfa67ac3d93104d97b96c7a1e06e85c0945dfdff6169ac5a5193be84631e27b35877a4d5b022a7319f6476efa17be HEAD_REF main ) diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json index 9028886bf1cf2f..9a11c01441d6bc 100644 --- a/ports/functions-framework-cpp/vcpkg.json +++ b/ports/functions-framework-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "functions-framework-cpp", - "version": "0.6.0", + "version": "1.0.0", "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index fba9c524b8e1e3..47e50c9f62e6dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2209,7 +2209,7 @@ "port-version": 1 }, "functions-framework-cpp": { - "baseline": "0.6.0", + "baseline": "1.0.0", "port-version": 0 }, "fuzzylite": { diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index 606fa351b06e5f..1ab6c47b7bef93 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea5cc9295e63419251720c34b2bbd02d710333c0", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "137edc9b4dd9a58f50ae9db1671d4608748088e7", "version": "0.6.0", From c4d422258d0957270b7dce40a02fc03cb118f900 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 10 Sep 2021 06:18:53 +0200 Subject: [PATCH 0506/1858] [civetweb] Update to version 1.15 (#20078) --- .../add-option-to-disable-debug-tools.patch | 36 ------------------- ports/civetweb/portfile.cmake | 8 ++--- ports/civetweb/vcpkg.json | 3 +- versions/baseline.json | 4 +-- versions/c-/civetweb.json | 5 +++ 5 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 ports/civetweb/add-option-to-disable-debug-tools.patch diff --git a/ports/civetweb/add-option-to-disable-debug-tools.patch b/ports/civetweb/add-option-to-disable-debug-tools.patch deleted file mode 100644 index 5cf276886ac426..00000000000000 --- a/ports/civetweb/add-option-to-disable-debug-tools.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 111672d5437a3c7f02b66d730be5000dade58bff Mon Sep 17 00:00:00 2001 -From: Gregor Jasny -Date: Tue, 15 Dec 2020 14:38:37 +0100 -Subject: [PATCH] CMake: Add option to disable Debug tools -Origin: https://github.com/civetweb/civetweb/pull/952 - -Sometimes one needs the CMake `Debug` build type -to select the Windows Debug runtime. But at the same -time the verbose logging output might be unwanted. - -This PR adds the `CIVETWEB_ENABLE_DEBUG_TOOLS` option -to disable extensive logging and assertion. ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 368e5640..000f7972 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -476,8 +476,11 @@ endif() - - - # Set up the definitions -+option(CIVETWEB_ENABLE_DEBUG_TOOLS "For Debug builds enable verbose logging and assertions" ON) - if (${CMAKE_BUILD_TYPE} MATCHES "[Dd]ebug") -- add_definitions(-DDEBUG) -+ if(CIVETWEB_ENABLE_DEBUG_TOOLS) -+ add_definitions(-DDEBUG) -+ endif() - add_definitions(-O0) - add_definitions(-g) - endif() --- -2.29.2 - diff --git a/ports/civetweb/portfile.cmake b/ports/civetweb/portfile.cmake index 8af5c6d764e370..7a0837a8bc657d 100644 --- a/ports/civetweb/portfile.cmake +++ b/ports/civetweb/portfile.cmake @@ -5,10 +5,9 @@ vcpkg_fail_port_install(MESSAGE "${PORT} does not currently support UWP" ON_TARG vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO civetweb/civetweb - REF 8e243456965c9be5212cb96519da69cd54550e3d # v1.13 - SHA512 6f9daf404975697c6b7a56cc71006aaf14442acf545e483d8a7b845f255d5e5d6e08194fe3350a667e0b737b6924c9d39b025b587af27e7f12cd7b64f314eb70 + REF eefb26f82b233268fc98577d265352720d477ba4 # v1.15 + SHA512 5ce962e31b3c07b7110cbc645458dba9c0e26e693fbe3b4a7ffe8a28563827049a22fc5596a911fbcea4d88a9adbef3f82000ff61027ff4387f40e4a4045c26d HEAD_REF master - PATCHES "add-option-to-disable-debug-tools.patch" ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -18,7 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + # PREFER_NINJA - See https://github.com/civetweb/civetweb/issues/1024 OPTIONS -DCIVETWEB_BUILD_TESTING=OFF -DCIVETWEB_ENABLE_DEBUG_TOOLS=OFF @@ -36,6 +35,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/civetweb) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/civetweb/vcpkg.json b/ports/civetweb/vcpkg.json index 77ac71bf079336..f39eea59c5374c 100644 --- a/ports/civetweb/vcpkg.json +++ b/ports/civetweb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "civetweb", - "version": "1.13", - "port-version": 2, + "version": "1.15", "description": "Easy to use, powerful, C/C++ embeddable web server.", "homepage": "https://github.com/civetweb/civetweb", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 47e50c9f62e6dc..4430ddd1e76661 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1281,8 +1281,8 @@ "port-version": 1 }, "civetweb": { - "baseline": "1.13", - "port-version": 2 + "baseline": "1.15", + "port-version": 0 }, "cjson": { "baseline": "2019-11-30", diff --git a/versions/c-/civetweb.json b/versions/c-/civetweb.json index 4a1f0f8274dc38..8c5b7c8e3068f7 100644 --- a/versions/c-/civetweb.json +++ b/versions/c-/civetweb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "536e2167b093981486715537c12a52d0696b3840", + "version": "1.15", + "port-version": 0 + }, { "git-tree": "ca6f80fd431dc0a13daa1509308d598700fbd763", "version": "1.13", From 36ef0d8bd5f8a98b619391918693766f0fd51207 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 10 Sep 2021 22:36:20 +0200 Subject: [PATCH 0507/1858] [fontconfig] update to 2.13.94 (#19285) --- ports/fontconfig/build.patch | 295 -------------------- ports/fontconfig/build2.patch | 35 --- ports/fontconfig/disable-install-data.patch | 14 - ports/fontconfig/fix_def_dll_name.patch | 13 - ports/fontconfig/macos_arm_fccache.patch | 34 --- ports/fontconfig/portfile.cmake | 50 +--- ports/fontconfig/remove_tests.patch | 13 - ports/fontconfig/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/f-/fontconfig.json | 5 + 10 files changed, 21 insertions(+), 445 deletions(-) delete mode 100644 ports/fontconfig/build.patch delete mode 100644 ports/fontconfig/build2.patch delete mode 100644 ports/fontconfig/disable-install-data.patch delete mode 100644 ports/fontconfig/fix_def_dll_name.patch delete mode 100644 ports/fontconfig/macos_arm_fccache.patch delete mode 100644 ports/fontconfig/remove_tests.patch diff --git a/ports/fontconfig/build.patch b/ports/fontconfig/build.patch deleted file mode 100644 index 5b8c1b3a9bfb04..00000000000000 --- a/ports/fontconfig/build.patch +++ /dev/null @@ -1,295 +0,0 @@ -diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am -index ff03fb2eb..769fc6005 100644 ---- a/conf.d/Makefile.am -+++ b/conf.d/Makefile.am -@@ -95,9 +95,9 @@ install-data-hook: - @(echo cd $(DESTDIR)$(configdir); \ - cd $(DESTDIR)$(configdir); \ - for i in $(CONF_LINKS); do \ -- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ -+ echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \ - $(RM) $$i; \ -- ln -s $(templatedir)/$$i .; \ -+ $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \ - done) - uninstall-local: - @(echo cd $(DESTDIR)$(configdir); \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 35e820d60..42bd7c5a2 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -33,7 +33,7 @@ fontconfig_def_dependency = fontconfig.def - - install-libtool-import-lib: libfontconfig.la - $(MKDIR_P) $(DESTDIR)$(libdir) -- $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a -+# $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a - $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def - - uninstall-libtool-import-lib: -@@ -58,7 +58,8 @@ fontconfig.lib : libfontconfig.la - lib -name:libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@ - - install-ms-import-lib: -- $(INSTALL) fontconfig.lib $(DESTDIR)$(libdir) -+ $(MKDIR_P) $(DESTDIR)$(libdir) -+ $(INSTALL) .libs/fontconfig.lib $(DESTDIR)$(libdir) - - uninstall-ms-import-lib: - $(RM) $(DESTDIR)$(libdir)/fontconfig.lib -diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c -index 87e302083..8b5012110 100644 ---- a/fc-cache/fc-cache.c -+++ b/fc-cache/fc-cache.c -@@ -34,11 +34,20 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include -+#if HAVE_SYS_STAT_H - #include -+#endif - #include -+#if HAVE_FCNTL_H - #include -+#endif - #include - #include - #include -diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c -index 69611bcc3..e7b0efbaa 100644 ---- a/fc-cat/fc-cat.c -+++ b/fc-cat/fc-cat.c -@@ -36,9 +36,16 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include -+#if HAVE_SYS_STAT_H - #include -+#endif - #include - #include - -diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c -index 5c40a0f09..affaca09e 100644 ---- a/fc-conflist/fc-conflist.c -+++ b/fc-conflist/fc-conflist.c -@@ -35,7 +35,12 @@ - - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #include -diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c -index 2039acd36..0e56b1c32 100644 ---- a/fc-list/fc-list.c -+++ b/fc-list/fc-list.c -@@ -24,7 +24,12 @@ - - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #include -diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c -index dee61479d..da8d820aa 100644 ---- a/fc-match/fc-match.c -+++ b/fc-match/fc-match.c -@@ -33,7 +33,12 @@ - - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #include -diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c -index 7989b816f..15b43e098 100644 ---- a/fc-pattern/fc-pattern.c -+++ b/fc-pattern/fc-pattern.c -@@ -33,7 +33,12 @@ - - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #include -diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c -index fbffb8415..58c251fe3 100644 ---- a/fc-query/fc-query.c -+++ b/fc-query/fc-query.c -@@ -36,7 +36,12 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #include -diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c -index 9302ac559..3a0ccf188 100644 ---- a/fc-scan/fc-scan.c -+++ b/fc-scan/fc-scan.c -@@ -36,7 +36,12 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #include -diff --git a/fc-validate/fc-validate.c b/fc-validate/fc-validate.c -index 2ceee2024..8f702f190 100644 ---- a/fc-validate/fc-validate.c -+++ b/fc-validate/fc-validate.c -@@ -36,7 +36,12 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #include -diff --git a/src/fcatomic.c b/src/fcatomic.c -index d12d32408..da7234934 100644 ---- a/src/fcatomic.c -+++ b/src/fcatomic.c -@@ -50,7 +50,9 @@ - #include "fcint.h" - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif - #include - #include - -diff --git a/src/fccache.c b/src/fccache.c -index 2b604014e..50fb742c6 100644 ---- a/src/fccache.c -+++ b/src/fccache.c -@@ -30,7 +30,9 @@ - #include - #include - #include -+#ifndef _MSC_VER - #include -+#endif - #include - #if defined(HAVE_MMAP) || defined(__CYGWIN__) - # include -diff --git a/src/fcint.h b/src/fcint.h -index de78cd8c9..4fb269ffa 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -40,7 +40,18 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#include -+#include -+#define ssize_t SSIZE_T -+#define F_OK 0 -+#define W_OK 2 -+typedef int mode_t; -+#endif - #include - #include - #include -diff --git a/test/test-migration.c b/test/test-migration.c -index b7d96dcce..7eac59dcc 100644 ---- a/test/test-migration.c -+++ b/test/test-migration.c -@@ -28,13 +28,16 @@ - #include - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - #ifndef HAVE_STRUCT_DIRENT_D_TYPE --#include - #include --#include - #endif - #include - -diff --git a/test/test-pthread.c b/test/test-pthread.c -index fbf397d4c..38d7dea35 100644 ---- a/test/test-pthread.c -+++ b/test/test-pthread.c -@@ -24,7 +24,12 @@ - */ - #include - #include -+#ifdef HAVE_UNISTD_H - #include -+#endif -+#ifdef _MSC_VER -+#include -+#endif - #include - #include - diff --git a/ports/fontconfig/build2.patch b/ports/fontconfig/build2.patch deleted file mode 100644 index 2b2780abb00cee..00000000000000 --- a/ports/fontconfig/build2.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/Tools.mk b/Tools.mk -index f0fa0ec50..24e5afd16 100644 ---- a/Tools.mk -+++ b/Tools.mk -@@ -43,7 +43,7 @@ AM_CPPFLAGS = \ - $(WARN_CFLAGS) - - $(TOOL): $(TSRC) $(ALIAS_FILES) -- $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) -+ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL) $(CFLAGS) - - $(TARG): $(TMPL) $(TSRC) $(DEPS) - $(AM_V_GEN) $(MAKE) $(TOOL) && \ -diff --git a/fc-case/fc-case.c b/fc-case/fc-case.c -index 236bff5f0..6fb21c855 100644 ---- a/fc-case/fc-case.c -+++ b/fc-case/fc-case.c -@@ -345,7 +345,7 @@ main (int argc, char **argv) - break; - fputs (line, stdout); - } -- -+ fflush (stdout); - /* - * Dump these tables - */ -@@ -354,7 +354,7 @@ main (int argc, char **argv) - /* - * And flush out the rest of the input file - */ -- -+ fflush (stdout); - while (fgets (line, sizeof (line), stdin)) - fputs (line, stdout); - diff --git a/ports/fontconfig/disable-install-data.patch b/ports/fontconfig/disable-install-data.patch deleted file mode 100644 index e15253264b4308..00000000000000 --- a/ports/fontconfig/disable-install-data.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/po-conf/LINGUAS b/po-conf/LINGUAS -index 0d5d97c..e7604c1 100644 ---- a/po-conf/LINGUAS -+++ b/po-conf/LINGUAS -@@ -1,2 +1 @@ - # Please keep this list sorted alphabetically. --zh_CN -diff --git a/po/LINGUAS b/po/LINGUAS -index 0d5d97c..e7604c1 100644 ---- a/po/LINGUAS -+++ b/po/LINGUAS -@@ -1,2 +1 @@ - # Please keep this list sorted alphabetically. --zh_CN diff --git a/ports/fontconfig/fix_def_dll_name.patch b/ports/fontconfig/fix_def_dll_name.patch deleted file mode 100644 index cae76fc93a14e0..00000000000000 --- a/ports/fontconfig/fix_def_dll_name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 3cf93a7f8..c80f4dd83 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -218,7 +218,7 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES) - (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \ - $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/ /' | \ - sort; \ -- echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ -+ echo LIBRARY fontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ - echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@ - @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false) - diff --git a/ports/fontconfig/macos_arm_fccache.patch b/ports/fontconfig/macos_arm_fccache.patch deleted file mode 100644 index 2cc0734fb20464..00000000000000 --- a/ports/fontconfig/macos_arm_fccache.patch +++ /dev/null @@ -1,34 +0,0 @@ - src/fcatomic.h | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/src/fcatomic.h b/src/fcatomic.h -index cc28a883c13fadf2ad9900586a9cae3097354671..657a5f551adfc37415231b7002746ad6cd031c78 100644 ---- a/src/fcatomic.h -+++ b/src/fcatomic.h -@@ -70,24 +70,16 @@ typedef LONG fc_atomic_int_t; - #elif !defined(FC_NO_MT) && defined(__APPLE__) - - #include --#ifdef __MAC_OS_X_MIN_REQUIRED - #include --#elif defined(__IPHONE_OS_MIN_REQUIRED) --#include --#endif - - typedef int fc_atomic_int_t; - #define fc_atomic_int_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V)) - - #define fc_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P)) --#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100) -+#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20100) - #define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) - #else --#if __ppc64__ || __x86_64__ --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P)) --#else --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P)) --#endif -+#error "Your macOS / iOS targets are too old" - #endif - - #elif !defined(FC_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 9635d185403353..78cb81111b2c47 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -1,50 +1,21 @@ -set(FONTCONFIG_VERSION 2.13.1) - -if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) - set(PATCHES fix_def_dll_name.patch) -endif() +set(FONTCONFIG_VERSION 2.13.94) vcpkg_from_gitlab( GITLAB_URL https://gitlab.freedesktop.org OUT_SOURCE_PATH SOURCE_PATH REPO fontconfig/fontconfig - REF 844d8709a1f3ecab45015b24b72dd775c13b2421 #v2.13.1 - SHA512 fed0cf46f5dca9cb1e03475d7a8d7efdab06c7180fe0c922fb30cadfa91e1efe1f6a6e36d2fdb742a479cb09c05b0aefb5da5658bf2e01a32b7ac88ee8ff0b58 - HEAD_REF master # branch name - PATCHES remove_tests.patch - build.patch - build2.patch - disable-install-data.patch - macos_arm_fccache.patch - ${PATCHES} + REF ${FONTCONFIG_VERSION} + SHA512 815f999146970c7f0e6c15a21f218d4b3f75b26d4ef14d36711bc0a1de19e59cc62d6a2c53993dd38b963ae30820c4db29f103380d5001886d55b6a7df361154 + HEAD_REF master ) vcpkg_find_acquire_program(GPERF) get_filename_component(GPERF_PATH ${GPERF} DIRECTORY) vcpkg_add_to_path(${GPERF_PATH}) -vcpkg_configure_make( - AUTOCONFIG - COPY_SOURCE - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - --disable-docs - ${OPTIONS} - ac_cv_type_pid_t=yes - --enable-iconv - "--with-libiconv=${CURRENT_INSTALLED_DIR}" - "--with-libiconv-includes=${CURRENT_INSTALLED_DIR}/include" - OPTIONS_DEBUG - "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/debug/lib" - ${OPT_DBG} - OPTIONS_RELEASE - "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/lib" - ${OPT_REL} - ADD_BIN_TO_PATH - ADDITIONAL_MSYS_PACKAGES xz findutils gettext gettext-devel # for autopoint -) +vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_install_meson(ADD_BIN_TO_PATH) -vcpkg_install_make(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() #Fix missing libintl static dependency if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) @@ -98,8 +69,8 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share if(NOT VCPKG_TARGET_IS_WINDOWS) set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts") set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") - vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose - WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" + vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin" LOGNAME fc-cache-${TARGET_TRIPLET}) endif() @@ -112,3 +83,8 @@ if(NOT VCPKG_TARGET_IS_LINUX) set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +vcpkg_copy_tools( + TOOL_NAMES fc-match fc-cat fc-list fc-pattern fc-query fc-scan fc-cache fc-validate fc-conflist + AUTO_CLEAN +) diff --git a/ports/fontconfig/remove_tests.patch b/ports/fontconfig/remove_tests.patch deleted file mode 100644 index 0f9e1b8fcd8f0c..00000000000000 --- a/ports/fontconfig/remove_tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index cc3024e68..e58f8688c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,7 +24,7 @@ - SUBDIRS=fontconfig fc-case fc-lang src \ - fc-cache fc-cat fc-conflist fc-list fc-match \ - fc-pattern fc-query fc-scan fc-validate conf.d \ -- its po po-conf test -+ its po po-conf - if ENABLE_DOCS - SUBDIRS += doc - endif diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index c8b827de9756d6..c0e13fdb83c94a 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fontconfig", - "version-string": "2.13.1", - "port-version": 8, + "version": "2.13.94", "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/software/fontconfig/front.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4430ddd1e76661..186204d702f5ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2121,8 +2121,8 @@ "port-version": 1 }, "fontconfig": { - "baseline": "2.13.1", - "port-version": 8 + "baseline": "2.13.94", + "port-version": 0 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 23a85ac2e9ab17..f484792148f928 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73929965b1d7992064fec1f69c6225a3d73a262b", + "version": "2.13.94", + "port-version": 0 + }, { "git-tree": "51b95a8e2dda5a9ffe083a8fc910ad9528597580", "version-string": "2.13.1", From b78dc6485d94edd713453b0c9d8c7ff517ffe875 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 10 Sep 2021 22:37:39 +0200 Subject: [PATCH 0508/1858] [boinc] Add new port (#19659) Signed-off-by: Vitalii Koshura --- ports/boinc/CMakeLists.txt | 233 +++++++++++++++++++++++++++++++++++++ ports/boinc/portfile.cmake | 49 ++++++++ ports/boinc/vcpkg.json | 18 +++ versions/b-/boinc.json | 9 ++ versions/baseline.json | 4 + 5 files changed, 313 insertions(+) create mode 100644 ports/boinc/CMakeLists.txt create mode 100644 ports/boinc/portfile.cmake create mode 100644 ports/boinc/vcpkg.json create mode 100644 versions/b-/boinc.json diff --git a/ports/boinc/CMakeLists.txt b/ports/boinc/CMakeLists.txt new file mode 100644 index 00000000000000..635aa9011ab098 --- /dev/null +++ b/ports/boinc/CMakeLists.txt @@ -0,0 +1,233 @@ +cmake_minimum_required(VERSION 3.20) +project(boinc) + +find_package(OpenSSL REQUIRED) + +set(LIBBOINC_HEADERS_WIN + lib/boinc_win.h + lib/diagnostics_win.h + lib/idlemon.h + lib/stackwalker_imports.h + lib/stackwalker_win.h +) + +set(LIBBOINC_HEADERS_UNIX + lib/synch.h + lib/unix_util.h +) + +set(LIBBOINC_HEADERS_APPLE + lib/mac/dyld_gdb.h + lib/mac/mac_backtrace.h + lib/mac/mac_spawn.h + lib/mac/QBacktrace.h + lib/mac/QCrashReport.h + lib/mac/QMachOImage.h + lib/mac/QMachOImageList.h + lib/mac/QSymbols.h + lib/mac/QTaskMemory.h + lib/mac/mac_branding.h +) + +set(LIBBOINC_HEADERS_GENERIC + lib/app_ipc.h + lib/base64.h + lib/cal_boinc.h + lib/cc_config.h + lib/cert_sig.h + lib/common_defs.h + lib/coproc.h + lib/crypt.h + lib/diagnostics.h + lib/error_numbers.h + lib/filesys.h + lib/hostinfo.h + lib/keyword.h + lib/md5.h + lib/md5_file.h + lib/mem_usage.h + lib/mfile.h + lib/miofile.h + lib/network.h + lib/notice.h + lib/opencl_boinc.h + lib/parse.h + lib/prefs.h + lib/proc_control.h + lib/procinfo.h + lib/project_init.h + lib/proxy_info.h + lib/std_fixes.h + lib/str_replace.h + lib/str_util.h + lib/url.h + lib/util.h + lib/win_util.h + lib/wslinfo.h +) + +set(LIBBOINC_SOURCES_WIN + lib/boinc_win.cpp + lib/diagnostics_win.cpp + lib/idlemon_win.cpp + lib/procinfo_win.cpp + lib/stackwalker_win.cpp + lib/win_util.cpp +) + +set(LIBBOINC_SOURCES_UNIX + lib/procinfo_unix.cpp + lib/synch.cpp + lib/unix_util.cpp +) + +set(LIBBOINC_SOURCES_APPLE + lib/procinfo_mac.cpp + lib/mac/mac_backtrace.cpp + lib/mac/mac_spawn.cpp + lib/mac/QBacktrace.c + lib/mac/QCrashReport.c + lib/mac/QMachOImage.c + lib/mac/QMachOImageList.c + lib/mac/QSymbols.c + lib/mac/QTaskMemory.c + lib/mac/mac_branding.cpp +) + +set(LIBBOINC_SOURCES_GENERIC + lib/app_ipc.cpp + lib/base64.cpp + lib/cc_config.cpp + lib/cert_sig.cpp + lib/coproc.cpp + lib/crypt.cpp + lib/diagnostics.cpp + lib/filesys.cpp + lib/hostinfo.cpp + lib/keyword.cpp + lib/md5.cpp + lib/md5_file.cpp + lib/mem_usage.cpp + lib/mfile.cpp + lib/miofile.cpp + lib/network.cpp + lib/notice.cpp + lib/opencl_boinc.cpp + lib/parse.cpp + lib/prefs.cpp + lib/proc_control.cpp + lib/procinfo.cpp + lib/project_init.cpp + lib/proxy_info.cpp + lib/shmem.cpp + lib/str_util.cpp + lib/url.cpp + lib/util.cpp + lib/wslinfo.cpp +) + +set(LIBBOINCAPI_HEADERS + api/boinc_api.h +) + +set(LIBBOINCAPI_SOURCES_WIN + lib/boinc_win.cpp +) + +set(LIBBOINCAPI_SOURCES_GENERIC + api/boinc_api.cpp +) + +if(APPLE) + set(LIBBOINC_HEADERS ${LIBBOINC_HEADERS_GENERIC} ${LIBBOINC_HEADERS_APPLE}) + set(LIBBOINC_SOURCES ${LIBBOINC_SOURCES_GENERIC} ${LIBBOINC_SOURCES_APPLE}) + + set(LIBBOINCAPI_SOURCES ${LIBBOINCAPI_SOURCES_GENERIC}) +elseif(WIN32) + set(LIBBOINC_HEADERS ${LIBBOINC_HEADERS_GENERIC} ${LIBBOINC_HEADERS_WIN}) + set(LIBBOINC_SOURCES ${LIBBOINC_SOURCES_GENERIC} ${LIBBOINC_SOURCES_WIN}) + + set(LIBBOINCAPI_SOURCES ${LIBBOINCAPI_SOURCES_GENERIC} ${LIBBOINCAPI_SOURCES_WIN}) +elseif(UNIX) + set(LIBBOINC_HEADERS ${LIBBOINC_HEADERS_GENERIC} ${LIBBOINC_HEADERS_UNIX}) + set(LIBBOINC_SOURCES ${LIBBOINC_SOURCES_GENERIC} ${LIBBOINC_SOURCES_UNIX}) + + set(LIBBOINCAPI_SOURCES ${LIBBOINCAPI_SOURCES_GENERIC}) +endif() + +add_library(boinc ${LIBBOINC_SOURCES}) +add_library(boincapi ${LIBBOINCAPI_SOURCES}) + +if(WIN32 OR APPLE) + set_target_properties(boinc PROPERTIES PREFIX "lib") + set_target_properties(boinc PROPERTIES IMPORT_PREFIX "lib") + + set_target_properties(boincapi PROPERTIES PREFIX "lib") + set_target_properties(boincapi PROPERTIES IMPORT_PREFIX "lib") +endif() + +if(APPLE) + target_include_directories(boinc PUBLIC + $ + $ + ) + + target_include_directories(boincapi PUBLIC + $ + $ + ) +elseif(WIN32) + target_compile_definitions(boinc PUBLIC + -D_CRT_SECURE_NO_WARNINGS + -DWIN32 + -D_CONSOLE + ) + + target_compile_definitions(boincapi PUBLIC + -D_CRT_SECURE_NO_WARNINGS + -DWIN32 + -D_CONSOLE + ) + + target_include_directories(boinc PUBLIC + $ + ) + + target_include_directories(boincapi PUBLIC + $ + ) +elseif(UNIX) + target_include_directories(boinc PUBLIC + $ + ) + + target_include_directories(boincapi PUBLIC + $ + ) +endif() + +target_include_directories(boinc PUBLIC + $ + $ + $ +) + +target_include_directories(boincapi PUBLIC + $ + $/lib + $ +) + +target_link_libraries(boinc PRIVATE + OpenSSL::SSL + OpenSSL::Crypto +) + +install(TARGETS boinc boincapi EXPORT boinc-config + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + ) + +install(FILES ${LIBBOINC_HEADERS} ${LIBBOINCAPI_HEADERS} DESTINATION include/boinc) +install(EXPORT boinc-config NAMESPACE unofficial::boinc:: DESTINATION share/boinc) diff --git a/ports/boinc/portfile.cmake b/ports/boinc/portfile.cmake new file mode 100644 index 00000000000000..d2e17db124eeb7 --- /dev/null +++ b/ports/boinc/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fail_port_install(ON_TARGET "UWP" ON_ARCH "arm") +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO BOINC/boinc + REF client_release/7.18/7.18.1 + SHA512 200587a0896aec6a7e7247132811141909aa333cb2bb9350c5ba016ffdf056413b1c5346361b311c087634b2d29cdbb204486385d8561a299b68739244c5a532 + HEAD_REF master +) + +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + +if(VCPKG_TARGET_IS_LINUX) + vcpkg_configure_make( + SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + NO_ADDITIONAL_PATHS + OPTIONS + ${OPTIONS} + --disable-server + --disable-client + --disable-manager + ) + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h DESTINATION ${SOURCE_PATH}/config-h-Release) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h DESTINATION ${SOURCE_PATH}/config-h-Debug) + endif() +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME license) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json new file mode 100644 index 00000000000000..126e73dbfde6cf --- /dev/null +++ b/ports/boinc/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "boinc", + "version": "7.18.1", + "description": "Open-source software for volunteer computing and grid computing.", + "homepage": "https://boinc.berkeley.edu/", + "supports": "!(windows & arm) & !uwp", + "dependencies": [ + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json new file mode 100644 index 00000000000000..63e7b8e24f348a --- /dev/null +++ b/versions/b-/boinc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9fcf80005012082801212b0761a61a53f92b6104", + "version": "7.18.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 186204d702f5ee..608ec44a4fcaee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -452,6 +452,10 @@ "baseline": "1.18.1", "port-version": 2 }, + "boinc": { + "baseline": "7.18.1", + "port-version": 0 + }, "bond": { "baseline": "9.0.3", "port-version": 2 From 93ad2cff3872a6540e184c4104e6c2de219498b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 11 Sep 2021 04:41:46 +0800 Subject: [PATCH 0509/1858] [vcpkg baseline][pangolin] Add features, fix dependency pybind11 (#20006) * [vcpkg baseline][pangolin] Add features, fix dependency pybind11 * Fix dependency name realsense2 * Remove default-feature gles * Re-generated patch, add MAYBE_UNUSED_VARIABLES, fix build with core * version * Fix desc, add more MAYBE_UNUSED_VARIABLES * version * more MAYBE_UNUSED_VARIABLES * version * Remove some CMAKE_DISABLE_FIND_PACKAGE_* * version * Remove more CMAKE_DISABLE_FIND_* since they are disabled * Remove BUILD_FOR_GLES_2 * version * Restore BUILD_FOR_GLES_2 * version * Fix more dependencies * [libuvc]Fix build type, fix usage * version * Re-make patch * version * Use libjpeg macros instead of target name to avoid use `find_dependency` * version * Fix usage on non-Windows * version * commit suggestions * version * Apply suggestion * version * Re-fix JPEG * version * typo * format * version Co-authored-by: Billy Robert O'Neal III --- ports/libusb/portfile.cmake | 2 +- ports/libusb/vcpkg-cmake-wrapper.cmake | 4 + ports/libusb/vcpkg.json | 2 +- ports/libuvc/build_fix.patch | 25 ++++- ports/libuvc/portfile.cmake | 29 +++--- ports/libuvc/vcpkg.json | 16 ++- ports/pangolin/add-definition.patch | 12 --- ports/pangolin/fix-dependencies.patch | 97 ++++++++++++++++++ ports/pangolin/fix-dependency-python.patch | 15 --- ports/pangolin/portfile.cmake | 49 ++++++--- ports/pangolin/vcpkg.json | 111 +++++++++++++++++++-- versions/baseline.json | 6 +- versions/l-/libusb.json | 5 + versions/l-/libuvc.json | 5 + versions/p-/pangolin.json | 5 + 15 files changed, 308 insertions(+), 75 deletions(-) delete mode 100644 ports/pangolin/add-definition.patch create mode 100644 ports/pangolin/fix-dependencies.patch delete mode 100644 ports/pangolin/fix-dependency-python.patch diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 153dedf13ba68c..3aed72d2a880f5 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -58,5 +58,5 @@ else() endif() configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) -file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +configure_file(${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libusb/vcpkg-cmake-wrapper.cmake b/ports/libusb/vcpkg-cmake-wrapper.cmake index 8f0f35811157ed..61f9d54bacf44a 100644 --- a/ports/libusb/vcpkg-cmake-wrapper.cmake +++ b/ports/libusb/vcpkg-cmake-wrapper.cmake @@ -8,3 +8,7 @@ select_library_configurations(LIBUSB) set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR}) set(LIBUSB_LIBRARIES ${LIBUSB_LIBRARY}) + +if (@VCPKG_TARGET_IS_LINUX@) + list(APPEND LIBUSB_LIBRARIES udev) +endif() diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 5649425e84f14e..07bbd2d8b4818a 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.24", - "port-version": 4, + "port-version": 5, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "supports": "!uwp" diff --git a/ports/libuvc/build_fix.patch b/ports/libuvc/build_fix.patch index 8ef3d9217b4ca4..3c5bfcd44cdac0 100644 --- a/ports/libuvc/build_fix.patch +++ b/ports/libuvc/build_fix.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3c8116..0da84a7 100644 +index f3c8116..b9a6d38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -39,7 +39,7 @@ set(SOURCES +@@ -39,10 +39,10 @@ set(SOURCES src/misc.c ) @@ -10,7 +10,11 @@ index f3c8116..0da84a7 100644 +find_package(libusb CONFIG REQUIRED) # JpegPkg name to differ from shipped with CMake - find_package(JpegPkg QUIET) +-find_package(JpegPkg QUIET) ++find_package(JPEG REQUIRED) + if(JPEG_FOUND) + message(STATUS "Building libuvc with JPEG support.") + set(LIBUVC_HAS_JPEG TRUE) @@ -107,9 +107,10 @@ foreach(target_name IN LISTS UVC_TARGETS) $ $ @@ -23,3 +27,18 @@ index f3c8116..0da84a7 100644 ) if(JPEG_FOUND) target_link_libraries(${target_name} +diff --git a/libuvcConfig.cmake b/libuvcConfig.cmake +index b9887ea..e8f09dc 100644 +--- a/libuvcConfig.cmake ++++ b/libuvcConfig.cmake +@@ -10,8 +10,8 @@ if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED) + list(APPEND extraArgs REQUIRED) + endif() + +-find_package(JpegPkg ${extraArgs}) +-find_package(LibUSB ${extraArgs}) ++include(CMakeFindDependencyMacro) ++find_dependency(JPEG ${extraArgs}) + include("${CMAKE_CURRENT_LIST_DIR}/libuvcTargets.cmake") + + set(libuvc_FOUND TRUE) diff --git a/ports/libuvc/portfile.cmake b/ports/libuvc/portfile.cmake index ab12966cdd9ffe..1e76adcd916a63 100644 --- a/ports/libuvc/portfile.cmake +++ b/ports/libuvc/portfile.cmake @@ -4,23 +4,28 @@ vcpkg_from_github( REF c612d4509eb0ff19ce414abc3dca18d0f6263a84 SHA512 df3f23463728e8ffd69dc52e251ea2610ea8df32b02f6d26dd2a6910cf217650245bb1a11e67be61df875c6992d592c9cb17675d914997bd72c9fe7eb5b65c32 HEAD_REF master - PATCHES - build_fix.patch + PATCHES build_fix.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_EXAMPLE=OFF -) -vcpkg_install_cmake() +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(BUILD_TARGET "Shared") +else() + set(BUILD_TARGET "Static") +endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libuvc) +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DCMAKE_BUILD_TARGET=${BUILD_TARGET} + -DBUILD_EXAMPLE=OFF +) +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_config_fixup(PACKAGE_NAME libuvc CONFIG_PATH lib/cmake/libuvc) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libuvc/vcpkg.json b/ports/libuvc/vcpkg.json index ce4a13b0a764be..ee9766b69ebff1 100644 --- a/ports/libuvc/vcpkg.json +++ b/ports/libuvc/vcpkg.json @@ -1,11 +1,21 @@ { "name": "libuvc", - "version-string": "2020-11-24", - "port-version": 1, + "version-date": "2020-11-24", + "port-version": 2, "description": "a cross-platform library for USB video devices", "homepage": "https://github.com/libuvc/libuvc", "supports": "linux", "dependencies": [ - "libusb" + "libjpeg-turbo", + "libusb", + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/pangolin/add-definition.patch b/ports/pangolin/add-definition.patch deleted file mode 100644 index ce27d4b33023b9..00000000000000 --- a/ports/pangolin/add-definition.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 49dcf02..d448928 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -384,6 +384,7 @@ endif() - - option(BUILD_PANGOLIN_FFMPEG "Build support for ffmpeg video input" ON) - if(BUILD_PANGOLIN_FFMPEG AND BUILD_PANGOLIN_VIDEO) -+ add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT) - find_package(FFMPEG QUIET) - if(FFMPEG_FOUND) - set(HAVE_FFMPEG 1) diff --git a/ports/pangolin/fix-dependencies.patch b/ports/pangolin/fix-dependencies.patch new file mode 100644 index 00000000000000..e3ced434ea2b4b --- /dev/null +++ b/ports/pangolin/fix-dependencies.patch @@ -0,0 +1,97 @@ +diff --git a/include/pangolin/gl/colour.h b/include/pangolin/gl/colour.h +index 92bedf4..8c3e542 100644 +--- a/include/pangolin/gl/colour.h ++++ b/include/pangolin/gl/colour.h +@@ -28,6 +28,7 @@ + #pragma once + + #include ++#include + + #include + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ddeb144..ee27d57 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -299,7 +299,9 @@ if(BUILD_PANGOLIN_PYTHON AND BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND NOT + + if(pybind11_FOUND) + set(HAVE_PYTHON 1) +- ++ if (UNIX) ++ set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util) ++ endif() + file(GLOB pypangolin_SRC "python/pypangolin/*.cpp" ) + file(GLOB pypangolin_HDR "python/pypangolin/*.hpp" ) + list(APPEND HEADERS +@@ -382,6 +384,7 @@ endif() + + option(BUILD_PANGOLIN_FFMPEG "Build support for ffmpeg video input" ON) + if(BUILD_PANGOLIN_FFMPEG AND BUILD_PANGOLIN_VIDEO) ++ add_definitions(-DHAVE_FFMPEG_AVPIXELFORMAT) + find_package(FFMPEG QUIET) + if(FFMPEG_FOUND) + set(HAVE_FFMPEG 1) +@@ -464,11 +467,14 @@ endif() + + option(BUILD_PANGOLIN_LIBUVC "Build support for libuvc video input" ON) + if(BUILD_PANGOLIN_LIBUVC AND BUILD_PANGOLIN_VIDEO) +- find_package(uvc QUIET) +- if(uvc_FOUND) ++ find_package(libuvc CONFIG QUIET) ++ if(libuvc_FOUND) + set(HAVE_UVC 1) +- list(APPEND INTERNAL_INC ${uvc_INCLUDE_DIRS} ) +- list(APPEND LINK_LIBS ${uvc_LIBRARIES} ) ++ if (TARGET LibUVC::UVCShared) ++ list(APPEND LINK_LIBS LibUVC::UVCShared ) ++ else() ++ list(APPEND LINK_LIBS LibUVC::UVCStatic ) ++ endif() + list(APPEND HEADERS ${INCDIR}/video/drivers/uvc.h ) + list(APPEND SOURCES video/drivers/uvc.cpp) + list(APPEND VIDEO_FACTORY_REG RegisterUvcVideoFactory ) +@@ -584,11 +590,10 @@ endif() + + option(BUILD_PANGOLIN_LIBOPENEXR "Build support for libopenexr image input" ON) + if(BUILD_PANGOLIN_LIBOPENEXR) +- find_package(OpenEXR QUIET) ++ find_package(OpenEXR CONFIG QUIET) + if(OpenEXR_FOUND) + set(HAVE_OPENEXR 1) +- list(APPEND INTERNAL_INC ${OpenEXR_INCLUDE_DIR} ) +- list(APPEND LINK_LIBS ${OpenEXR_LIBRARY} ) ++ list(APPEND LINK_LIBS OpenEXR::IlmImf OpenEXR::IlmImfUtil OpenEXR::IlmImfConfig ) + message(STATUS "libopenexr Found and Enabled") + endif() + endif() +@@ -630,6 +635,13 @@ endif() + + set(INSTALL_INCLUDE_DIR "include") + ++# Required by geometry ++if(NOT BUILD_EXTERN_GLEW) ++ find_package(GLEW REQUIRED) ++endif() ++list(APPEND USER_INC ${GLEW_INCLUDE_DIR}) ++list(APPEND LINK_LIBS ${GLEW_LIBRARY}) ++ + add_library(${LIBRARY_NAME} ${SOURCES} ${HEADERS}) + # 'System' includes shield us from warnings in those includes. + target_include_directories(${LIBRARY_NAME} SYSTEM PUBLIC ${USER_INC} PRIVATE ${INTERNAL_INC}) +@@ -692,7 +704,13 @@ CreateMethodCallFile( + option(BUILD_PYPANGOLIN_MODULE "Python wrapper for Pangolin" ON) + if(BUILD_PYPANGOLIN_MODULE AND HAVE_PYTHON ) + file(GLOB pypangolin_SRC "python/pypangolin/*.hpp" "python/pypangolin/*.cpp" "python/pypangolin_module.cpp") +- pybind11_add_module(pypangolin ${pypangolin_SRC}) ++ if (BUILD_SHARED_LIBS) ++ set(PYBIND11_MODULE_TYPE SHARED) ++ else() ++ set(PYBIND11_MODULE_TYPE STATIC) ++ endif() ++ ++ pybind11_add_module(pypangolin ${PYBIND11_MODULE_TYPE} ${pypangolin_SRC}) + target_link_libraries(pypangolin PRIVATE ${LIBRARY_NAME}) + target_include_directories(pypangolin PRIVATE "${USER_INC}") + endif() diff --git a/ports/pangolin/fix-dependency-python.patch b/ports/pangolin/fix-dependency-python.patch deleted file mode 100644 index 276e0f092fceaf..00000000000000 --- a/ports/pangolin/fix-dependency-python.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ddeb144..49dcf02 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -299,7 +299,9 @@ if(BUILD_PANGOLIN_PYTHON AND BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND NOT - - if(pybind11_FOUND) - set(HAVE_PYTHON 1) -- -+ if (UNIX) -+ set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util) -+ endif() - file(GLOB pypangolin_SRC "python/pypangolin/*.cpp" ) - file(GLOB pypangolin_HDR "python/pypangolin/*.hpp" ) - list(APPEND HEADERS diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index 410fe6a1420e74..a3c79858635935 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -12,17 +12,32 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-includepath-error.patch # include path has one more ../ - fix-dependency-python.patch - add-definition.patch fix-cmake-version.patch fix-build-error-in-vs2019.patch + fix-dependencies.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - test BUILD_TESTS - tools BUILD_TOOLS - examples BUILD_EXAMPLES + test BUILD_TESTS + tools BUILD_TOOLS + examples BUILD_EXAMPLES + gui BUILD_PANGOLIN_GUI + vars BUILD_PANGOLIN_VARS + video BUILD_PANGOLIN_VIDEO + pybind11 BUILD_PANGOLIN_PYTHON + eigen BUILD_PANGOLIN_EIGEN + ffmpeg BUILD_PANGOLIN_FFMPEG + realsense BUILD_PANGOLIN_LIBREALSENSE2 + openni2 BUILD_PANGOLIN_OPENNI2 + uvc BUILD_PANGOLIN_LIBUVC + png BUILD_PANGOLIN_LIBPNG + jpeg BUILD_PANGOLIN_LIBJPEG + tiff BUILD_PANGOLIN_LIBTIFF + openexr BUILD_PANGOLIN_LIBOPENEXR + zstd BUILD_PANGOLIN_ZSTD + lz4 BUILD_PANGOLIN_LZ4 + module BUILD_PYPANGOLIN_MODULE ) file(REMOVE "${SOURCE_PATH}/CMakeModules/FindGLEW.cmake") @@ -36,20 +51,22 @@ vcpkg_cmake_configure( -DBUILD_EXTERN_GLEW=OFF -DBUILD_EXTERN_LIBPNG=OFF -DBUILD_EXTERN_LIBJPEG=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_TooN=ON - -DCMAKE_DISABLE_FIND_PACKAGE_DC1394=ON - -DCMAKE_DISABLE_FIND_PACKAGE_LibRealSense=ON - -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI=ON - -DCMAKE_DISABLE_FIND_PACKAGE_OpenNI2=ON - -DCMAKE_DISABLE_FIND_PACKAGE_uvc=ON - -DCMAKE_DISABLE_FIND_PACKAGE_DepthSense=ON - -DCMAKE_DISABLE_FIND_PACKAGE_TeliCam=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Pleora=ON - -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=ON - -DCMAKE_DISABLE_FIND_PACKAGE_OpenEXR=ON + -DBUILD_PANGOLIN_PLEORA=OFF + -DBUILD_PANGOLIN_TELICAM=OFF + -DBUILD_PANGOLIN_DEPTHSENSE=OFF + -DBUILD_PANGOLIN_OPENNI=OFF + -DBUILD_PANGOLIN_UVC_MEDIAFOUNDATION=OFF + -DBUILD_PANGOLIN_LIBREALSENSE=OFF + -DBUILD_PANGOLIN_V4L=OFF + -DBUILD_PANGOLIN_LIBDC1394=OFF + -DBUILD_PANGOLIN_TOON=OFF + -DDISPLAY_WAYLAND=OFF + -DDISPLAY_X11=OFF + -DBUILD_FOR_GLES_2=OFF -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT} MAYBE_UNUSED_VARIABLES MSVC_USE_STATIC_CRT + BUILD_FOR_GLES_2 ) vcpkg_cmake_install() diff --git a/ports/pangolin/vcpkg.json b/ports/pangolin/vcpkg.json index 360eb2e0c4583e..b28451d10e978d 100644 --- a/ports/pangolin/vcpkg.json +++ b/ports/pangolin/vcpkg.json @@ -1,20 +1,12 @@ { "name": "pangolin", "version": "0.6", + "port-version": 1, "description": "Lightweight GUI Library", "homepage": "https://github.com/stevenlovegrove/Pangolin", "supports": "!uwp", "dependencies": [ - "eigen3", - { - "name": "ffmpeg", - "features": [ - "avformat" - ] - }, "glew", - "libjpeg-turbo", - "libpng", { "name": "vcpkg-cmake", "host": true @@ -24,15 +16,116 @@ "host": true } ], + "default-features": [ + "eigen", + "ffmpeg", + "gui", + "jpeg", + "png", + "vars", + "video" + ], "features": { + "eigen": { + "description": "Build support for Eigen matrix types", + "dependencies": [ + "eigen3" + ] + }, "examples": { "description": "Build Examples" }, + "ffmpeg": { + "description": "Build support for ffmpeg video input", + "dependencies": [ + { + "name": "ffmpeg", + "features": [ + "avformat" + ] + } + ] + }, + "gui": { + "description": "Build support for Pangolin GUI" + }, + "jpeg": { + "description": "Build support for libjpeg image input", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "lz4": { + "description": "Build support for liblz4 compression", + "dependencies": [ + "lz4" + ] + }, + "module": { + "description": "Python wrapper for Pangolin", + "dependencies": [ + "python3" + ] + }, + "openexr": { + "description": "Build support for libopenexr image input", + "dependencies": [ + "openexr" + ] + }, + "openni2": { + "description": "Build support for OpenNI2 video input", + "dependencies": [ + "openni2" + ] + }, + "png": { + "description": "Build support for libpng image input", + "dependencies": [ + "libpng" + ] + }, + "pybind11": { + "description": "Build support for Pangolin Interactive Console", + "dependencies": [ + "pybind11" + ] + }, + "realsense": { + "description": "Build support for LibRealSense2 video input", + "dependencies": [ + "realsense2" + ] + }, "test": { "description": "Build Tests" }, + "tiff": { + "description": "Build support for libtiff image input", + "dependencies": [ + "tiff" + ] + }, "tools": { "description": "Build Tools" + }, + "uvc": { + "description": "Build support for MediaFoundation UVC input", + "dependencies": [ + "libuvc" + ] + }, + "vars": { + "description": "Build support for Pangolin Vars" + }, + "video": { + "description": "Build support for Pangolin Video Utilities" + }, + "zstd": { + "description": "Build support for libzstd compression", + "dependencies": [ + "zstd" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 608ec44a4fcaee..ab646a3950c702 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3782,7 +3782,7 @@ }, "libusb": { "baseline": "1.0.24", - "port-version": 4 + "port-version": 5 }, "libusb-win32": { "baseline": "1.2.6.0", @@ -3802,7 +3802,7 @@ }, "libuvc": { "baseline": "2020-11-24", - "port-version": 1 + "port-version": 2 }, "libvmdk": { "baseline": "20200926", @@ -4878,7 +4878,7 @@ }, "pangolin": { "baseline": "0.6", - "port-version": 0 + "port-version": 1 }, "pangomm": { "baseline": "2.48.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 502a02100e744e..12878e1b7fee43 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76a5ebd046d669a93d2a467d87a80efbe85f8226", + "version": "1.0.24", + "port-version": 5 + }, { "git-tree": "0d77c2046af91be18e4af15b3a9b3e7f0024fa18", "version": "1.0.24", diff --git a/versions/l-/libuvc.json b/versions/l-/libuvc.json index d1416c245377e4..5aa43cece35808 100644 --- a/versions/l-/libuvc.json +++ b/versions/l-/libuvc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79ca2fc9bcce260bf39d630dcac5a2cc2cb7f486", + "version-date": "2020-11-24", + "port-version": 2 + }, { "git-tree": "c6a9ae104918d980729af70da17fed9849500504", "version-string": "2020-11-24", diff --git a/versions/p-/pangolin.json b/versions/p-/pangolin.json index f55cbf05e93ad8..2775d5adca244d 100644 --- a/versions/p-/pangolin.json +++ b/versions/p-/pangolin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6f7eff13d603463a77a637879929275ecff776e", + "version": "0.6", + "port-version": 1 + }, { "git-tree": "e28a4e1603d5ee1843787223a55dce439b579b94", "version": "0.6", From 91557623aa19354b1759b1d831c5b716ea089a8a Mon Sep 17 00:00:00 2001 From: Mollie Munoz Date: Fri, 10 Sep 2021 13:57:06 -0700 Subject: [PATCH 0510/1858] Azure-IoT-Sdk for C release for 08-30-2021 (#19809) * Release for 08-30-2021 * Update azure-iot-sdk-c vcpkg.json formatting * Update version database * Test commit. In progress. * bot actions * Update refs and hashes for main branch test * bot instructions * Add OpenSSL for uamqp, umqtt, uhttp * bot instructions * Update cmake build options 'warning_as_errors' to OFF; remove patch file * bot instructions * Update all REFs to current test commit in azure-iot-sdk-c momuno/curl-vcpkg-fix_20210831 * bot instructions * c-utility fix -- test * bot instructions * Update azure-iot-sdk-c REF and SHA512 for LTS release. Use version-date * Update version database * put back remove-werror.patch for LTS release. * Update versioning. bot instructions * bot instructions. * Adding back patch to portfile instructions. Removes warnings as errors * bot instructions Co-authored-by: Mollie Munoz --- ports/azure-c-shared-utility/portfile.cmake | 8 ++++---- ports/azure-c-shared-utility/vcpkg.json | 3 +-- ports/azure-iot-sdk-c/portfile.cmake | 5 +++-- ports/azure-iot-sdk-c/vcpkg.json | 3 +-- ports/azure-uamqp-c/portfile.cmake | 5 ++--- ports/azure-uamqp-c/vcpkg.json | 3 +-- ports/azure-uhttp-c/portfile.cmake | 5 ++--- ports/azure-uhttp-c/vcpkg.json | 3 +-- ports/azure-umqtt-c/portfile.cmake | 5 ++--- ports/azure-umqtt-c/vcpkg.json | 3 +-- versions/a-/azure-c-shared-utility.json | 5 +++++ versions/a-/azure-iot-sdk-c.json | 5 +++++ versions/a-/azure-uamqp-c.json | 5 +++++ versions/a-/azure-uhttp-c.json | 5 +++++ versions/a-/azure-umqtt-c.json | 5 +++++ versions/baseline.json | 20 ++++++++++---------- 16 files changed, 53 insertions(+), 35 deletions(-) diff --git a/ports/azure-c-shared-utility/portfile.cmake b/ports/azure-c-shared-utility/portfile.cmake index 98893392d98c57..7bdb50aa127ccd 100644 --- a/ports/azure-c-shared-utility/portfile.cmake +++ b/ports/azure-c-shared-utility/portfile.cmake @@ -9,7 +9,7 @@ if("public-preview" IN_LIST FEATURES) REF 42574842914591aadc77701aac72f18cc72319ad SHA512 dfe6ccede4bebdb3a39fbfea1dc55ddca57cced0d2656ee4bed1a5e5c9c434e1f2d892eb4e29bbb424cb9a02f2374a95fb9a020442bea580d39c242efad1b789 HEAD_REF master - PATCHES + PATCHES fix-utilityFunctions-conditions-preview.patch disable-error.patch ) @@ -17,10 +17,10 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-c-shared-utility - REF 6f7bbcd23b39481dc0cf93185555d2513beea1ea - SHA512 d1b77b155497e02f802e3f02d89ecbc4cb3d4507bc61f1feca8e6baad627e05e0f744dd5b4d0148a47021eb2308d9053d0fedbf95e40cff001250bca392fd5af + REF 73a2039cc0de5ececf5755ebe731a6b5b98f85da + SHA512 6374b7b175a5c0206bee148c35eb6a3a79f1b149e87d2b51981a9fd1446809134a1aa0f28f4acf1318719ac5554f7bd8de225a5dca63eb6537012aed6b10e4cc HEAD_REF master - PATCHES + PATCHES fix-utilityFunctions-conditions.patch disable-error.patch ) diff --git a/ports/azure-c-shared-utility/vcpkg.json b/ports/azure-c-shared-utility/vcpkg.json index c50f1061ff0685..7fa90c73e2cf17 100644 --- a/ports/azure-c-shared-utility/vcpkg.json +++ b/ports/azure-c-shared-utility/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-c-shared-utility", - "version-string": "2020-12-09", - "port-version": 2, + "version-date": "2021-09-09", "description": "Azure C SDKs common code", "homepage": "https://github.com/Azure/azure-c-shared-utility", "supports": "!uwp", diff --git a/ports/azure-iot-sdk-c/portfile.cmake b/ports/azure-iot-sdk-c/portfile.cmake index 79a0639075f610..8e6043d9283b29 100644 --- a/ports/azure-iot-sdk-c/portfile.cmake +++ b/ports/azure-iot-sdk-c/portfile.cmake @@ -16,8 +16,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-iot-sdk-c - REF f5da5a4138cee23f400971558784e3eff40b92ec - SHA512 f5aff4b185cde01ba9e4e57a8f9d696b4139162c040fcd464bd16b37364da0cc692fe148a842cc0c54018831b5874ee822f949a0fd6ea8f261a8155196d36404 + REF 808a5595f98853a5f2eae2c67dd9b3608a2338ea + SHA512 29cb04679b75a48a8a69713045465c7c416755764ec80781405c8528abd8225654c3262ed3816fb03a13f7505f6c811afbdc5dabc79b676b4f727feaf11e0583 HEAD_REF master PATCHES improve-external-deps.patch @@ -44,6 +44,7 @@ vcpkg_configure_cmake( -Duse_default_uuid=ON -Dbuild_as_dynamic=OFF -Duse_edge_modules=ON + -Dwarnings_as_errors=OFF ) vcpkg_install_cmake() diff --git a/ports/azure-iot-sdk-c/vcpkg.json b/ports/azure-iot-sdk-c/vcpkg.json index a574edf84f5f05..a04e188d8745c1 100644 --- a/ports/azure-iot-sdk-c/vcpkg.json +++ b/ports/azure-iot-sdk-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-iot-sdk-c", - "version-date": "2020-12-09", - "port-version": 2, + "version-date": "2021-09-09", "description": "A C99 SDK for connecting devices to Microsoft Azure IoT services", "homepage": "https://github.com/Azure/azure-iot-sdk-c", "dependencies": [ diff --git a/ports/azure-uamqp-c/portfile.cmake b/ports/azure-uamqp-c/portfile.cmake index 01145f8af0fddb..3b95f6447e6452 100644 --- a/ports/azure-uamqp-c/portfile.cmake +++ b/ports/azure-uamqp-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uamqp-c - REF c88abeab27ece7f13911d73202f44212c3e08953 - SHA512 befb7ad72ea61713b043a4a4bdf70f454aac5f4590ca84aa7f4d9b7c8447b643fb37028173774451cfbe00119937f857680cd827d90e676ee558a18a1b6442bb + REF b75cdb7e1736a388fe3e9fc2a99493aa1db6f43f + SHA512 a13da2bc8a471329cbcd63aaa6fb94265388f709bf8977d55017a6cdd5af21e3b08935498ff8bfebfa63791dfa04552806684fae82b664045a12d14a91df3183 HEAD_REF master ) endif() @@ -38,4 +38,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() - diff --git a/ports/azure-uamqp-c/vcpkg.json b/ports/azure-uamqp-c/vcpkg.json index ac72438c296390..52dfd75fad1c85 100644 --- a/ports/azure-uamqp-c/vcpkg.json +++ b/ports/azure-uamqp-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-uamqp-c", - "version-string": "2020-12-09", - "port-version": 1, + "version-date": "2021-09-09", "description": "AMQP library for C", "homepage": "https://github.com/Azure/azure-uamqp-c", "dependencies": [ diff --git a/ports/azure-uhttp-c/portfile.cmake b/ports/azure-uhttp-c/portfile.cmake index 4df75216c9478e..4a3105c021c8e1 100644 --- a/ports/azure-uhttp-c/portfile.cmake +++ b/ports/azure-uhttp-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-uhttp-c - REF c22177c4cae57992e45e2b0db3f624c31b0f4666 - SHA512 70c011486aaf3e5af81e781d5183dcb3b6da234f9b41af9138e726bea1fd19326979a95d59bcb4314781d7ee4ef0c7fdfa9b30928a0688024d3fd93cb4168217 + REF db8ac9c1353fe05cf6917e8ec8bcb866bf4a6f11 + SHA512 4c9b053bcdc1086dbba6883a887e5af1f6aa4572bfb1e36c3b07c9bb93c35b188cb31f510fca5c4b2a0557df446dd965eafda993eab7c04b4502ed07b269c148 HEAD_REF master ) endif() @@ -39,4 +39,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() - diff --git a/ports/azure-uhttp-c/vcpkg.json b/ports/azure-uhttp-c/vcpkg.json index ec8a12c57b0953..11f6fea12c3f02 100644 --- a/ports/azure-uhttp-c/vcpkg.json +++ b/ports/azure-uhttp-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-uhttp-c", - "version-string": "2020-12-09", - "port-version": 1, + "version-date": "2021-09-09", "description": "Azure HTTP Library written in C", "homepage": "https://github.com/Azure/azure-uhttp-c", "dependencies": [ diff --git a/ports/azure-umqtt-c/portfile.cmake b/ports/azure-umqtt-c/portfile.cmake index 084bc58bb1ab2d..a3e9246bb471f7 100644 --- a/ports/azure-umqtt-c/portfile.cmake +++ b/ports/azure-umqtt-c/portfile.cmake @@ -12,8 +12,8 @@ else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-umqtt-c - REF 478fd8e757dadfe2ca5fcd3953aeba24a14a98e1 - SHA512 bece2a30abb88dd97b97e399b8e63f6833b052c01c2f779070d52bbc916af604568bf5098d5f994d278d70591b11c45a5fcca9350226eb6e59b04e53c2780bc4 + REF 12cb55ee5a926a124f22ad737c7cec35f6af7165 + SHA512 ed7d5c5132cfaa46574e70a99ce0181208b772fa2dca9122c8d16918af29240a2060705a25b121785c210eb5a4b917588a1623aedfd0bf9a4cf39df601b05dea HEAD_REF master ) endif() @@ -38,4 +38,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() - diff --git a/ports/azure-umqtt-c/vcpkg.json b/ports/azure-umqtt-c/vcpkg.json index bb3de7eaa18774..1ccfb1699f46a8 100644 --- a/ports/azure-umqtt-c/vcpkg.json +++ b/ports/azure-umqtt-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "azure-umqtt-c", - "version-string": "2020-12-09", - "port-version": 1, + "version-date": "2021-09-09", "description": "General purpose library for communication over the mqtt protocol", "homepage": "https://github.com/Azure/azure-umqtt-c", "dependencies": [ diff --git a/versions/a-/azure-c-shared-utility.json b/versions/a-/azure-c-shared-utility.json index 4c538da979e72b..65623e3a38b194 100644 --- a/versions/a-/azure-c-shared-utility.json +++ b/versions/a-/azure-c-shared-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6898a05e54b88637fc5a42136facc194b84e71a1", + "version-date": "2021-09-09", + "port-version": 0 + }, { "git-tree": "004bb7eb46adf65294137426bfa60868a7a9be93", "version-string": "2020-12-09", diff --git a/versions/a-/azure-iot-sdk-c.json b/versions/a-/azure-iot-sdk-c.json index 21dd2f34a4d5d5..56fd640606232c 100644 --- a/versions/a-/azure-iot-sdk-c.json +++ b/versions/a-/azure-iot-sdk-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d6dc98460c69e8690f9b20f62cf75e9e3ef7f2d", + "version-date": "2021-09-09", + "port-version": 0 + }, { "git-tree": "07dbca4b72d51fb97f55b032e1b412add4054973", "version-date": "2020-12-09", diff --git a/versions/a-/azure-uamqp-c.json b/versions/a-/azure-uamqp-c.json index b986526429b5c0..d74b7af7a8eeff 100644 --- a/versions/a-/azure-uamqp-c.json +++ b/versions/a-/azure-uamqp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4748ea8df9903436ad4b2b6462ca3ffdf74465d4", + "version-date": "2021-09-09", + "port-version": 0 + }, { "git-tree": "0ecbe4bc48e735cd1a3424ec77afac8aa807eaab", "version-string": "2020-12-09", diff --git a/versions/a-/azure-uhttp-c.json b/versions/a-/azure-uhttp-c.json index a79af9921321a6..66a7e237404753 100644 --- a/versions/a-/azure-uhttp-c.json +++ b/versions/a-/azure-uhttp-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dfc1d65397c35c27df08f42b2f77caf27661a9b", + "version-date": "2021-09-09", + "port-version": 0 + }, { "git-tree": "7410a090286f0c65398cb9ce97c6d86120c7222d", "version-string": "2020-12-09", diff --git a/versions/a-/azure-umqtt-c.json b/versions/a-/azure-umqtt-c.json index 190e1e568b3a37..c877c9eaa1dd69 100644 --- a/versions/a-/azure-umqtt-c.json +++ b/versions/a-/azure-umqtt-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a208bf94bfaf91cc20716d7ba0caac0023324b0", + "version-date": "2021-09-09", + "port-version": 0 + }, { "git-tree": "f8f3de5c5637d62c78e1a8934e9f8e7409dd36c4", "version-string": "2020-12-09", diff --git a/versions/baseline.json b/versions/baseline.json index ab646a3950c702..b7955aa1b914d4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -273,8 +273,8 @@ "port-version": 1 }, "azure-c-shared-utility": { - "baseline": "2020-12-09", - "port-version": 2 + "baseline": "2021-09-09", + "port-version": 0 }, "azure-core-cpp": { "baseline": "1.2.1", @@ -285,8 +285,8 @@ "port-version": 0 }, "azure-iot-sdk-c": { - "baseline": "2020-12-09", - "port-version": 2 + "baseline": "2021-09-09", + "port-version": 0 }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", @@ -329,16 +329,16 @@ "port-version": 0 }, "azure-uamqp-c": { - "baseline": "2020-12-09", - "port-version": 1 + "baseline": "2021-09-09", + "port-version": 0 }, "azure-uhttp-c": { - "baseline": "2020-12-09", - "port-version": 1 + "baseline": "2021-09-09", + "port-version": 0 }, "azure-umqtt-c": { - "baseline": "2020-12-09", - "port-version": 1 + "baseline": "2021-09-09", + "port-version": 0 }, "b64": { "baseline": "2.0.0.1", From e8104f9aa3c009ac386eae613011f3e57553473c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 10 Sep 2021 23:18:06 +0200 Subject: [PATCH 0511/1858] [David-Haim/concurrencpp] Add new port (#19997) * [David-Haim/concurrencpp] Add new package * Format vcpkg.json * Add baseline * Fix version * Update CI baseline * Revert "Update CI baseline" This reverts commit 8e3ed430f239e50a94a4afaaaee47e0f15998b06. * Add patch to make linkage configurable * Update git-tree hash * Add patch to set -fcoroutines flag * Update git-tree hash * Revert "Update git-tree hash" This reverts commit b3ccdb2c61f705f7802da880fa0659ece5f1a723. * Revert "Add patch to set -fcoroutines flag" This reverts commit a23c736df9d2ca407204ea57bf977932c4704e41. * Revert "Revert "Update CI baseline"" This reverts commit a50ed32a97fb19311cb13807af70cb5a9aa4b793. * Add supports attribute to manifest, disallow dynamic linkage on Windows * Update git-tree hash * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Fix whitespace * Update git-tree hash * Add vcpkg-cmake dependencies to vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Adapt for version 0.1.3, address suggestions * Update git-tree hash Co-authored-by: chausner Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/concurrencpp/fix-include-path.patch | 13 +++++++++++++ ports/concurrencpp/portfile.cmake | 21 +++++++++++++++++++++ ports/concurrencpp/vcpkg.json | 17 +++++++++++++++++ scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 4 ++++ versions/c-/concurrencpp.json | 9 +++++++++ 6 files changed, 66 insertions(+) create mode 100644 ports/concurrencpp/fix-include-path.patch create mode 100644 ports/concurrencpp/portfile.cmake create mode 100644 ports/concurrencpp/vcpkg.json create mode 100644 versions/c-/concurrencpp.json diff --git a/ports/concurrencpp/fix-include-path.patch b/ports/concurrencpp/fix-include-path.patch new file mode 100644 index 00000000000000..7b2da192009a17 --- /dev/null +++ b/ports/concurrencpp/fix-include-path.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 351aa65..ab06584 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ include(CMakePackageConfigHelpers) + include(GNUInstallDirs) + + set(concurrencpp_directory "concurrencpp-${PROJECT_VERSION}") +-set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}/${concurrencpp_directory}") ++set(concurrencpp_include_directory "${CMAKE_INSTALL_INCLUDEDIR}") + + install(TARGETS concurrencpp + EXPORT concurrencppTargets diff --git a/ports/concurrencpp/portfile.cmake b/ports/concurrencpp/portfile.cmake new file mode 100644 index 00000000000000..43578ea8849048 --- /dev/null +++ b/ports/concurrencpp/portfile.cmake @@ -0,0 +1,21 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO David-Haim/concurrencpp + REF v.0.1.3 + SHA512 2f4530ba93d768a7a1ae14c532c8ef443745e48cceeca8a0e9da9f91633876ae4971caad70eeff9e18c7a45e8cf7c0b7bb79720a62026850244fb2377ad10df7 + HEAD_REF master + PATCHES + fix-include-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/concurrencpp-0.1.3) + +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/concurrencpp RENAME copyright) diff --git a/ports/concurrencpp/vcpkg.json b/ports/concurrencpp/vcpkg.json new file mode 100644 index 00000000000000..c4c8482f1de4b0 --- /dev/null +++ b/ports/concurrencpp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "concurrencpp", + "version-string": "0.1.3", + "description": "concurrencpp is a tasking library for C++ allowing developers to write highly concurrent applications easily and safely by using tasks, executors and coroutines.", + "homepage": "https://github.com/David-Haim/concurrencpp/", + "supports": "(windows & static) | linux | osx", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d6bdfcbc973975..73ed5b0034873b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -147,6 +147,8 @@ cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail +concurrencpp:x64-linux=fail +concurrencpp:x64-osx=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail coolprop:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index b7955aa1b914d4..b45104c5f37014 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1396,6 +1396,10 @@ "baseline": "3.6.4", "port-version": 0 }, + "concurrencpp": { + "baseline": "0.1.3", + "port-version": 0 + }, "concurrentqueue": { "baseline": "1.0.3", "port-version": 0 diff --git a/versions/c-/concurrencpp.json b/versions/c-/concurrencpp.json new file mode 100644 index 00000000000000..269d3c43f7bdd2 --- /dev/null +++ b/versions/c-/concurrencpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a6aa7450d44761622be41ef803ef3b92c6388f23", + "version-string": "0.1.3", + "port-version": 0 + } + ] +} From 0b0c6f281f6c2c7e7575be12ab87aaa11e2a1a65 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Fri, 10 Sep 2021 14:19:01 -0700 Subject: [PATCH 0512/1858] [Azure SDK Key Vault] Update to Sept Release Keys and Secrets (#20063) * [azure-security-keyvault-keys-cpp] Update to 4.1.0 ## 4.1.0 (2021-09-08) ### Features Added - Added `GetUrl()` to `KeyClient`. ### Bugs Fixed - [2750](https://github.com/Azure/azure-sdk-for-cpp/issues/2750) Support for Azure `managedhsm` cloud and any other non-public Azure cloud. * not-specified --- .../portfile.cmake | 4 +-- .../vcpkg.json | 5 ++-- .../portfile.cmake | 18 +++++++++++++ .../vcpkg.json | 25 +++++++++++++++++++ .../a-/azure-security-keyvault-keys-cpp.json | 5 ++++ .../azure-security-keyvault-secrets-cpp.json | 9 +++++++ versions/baseline.json | 6 ++++- 7 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 ports/azure-security-keyvault-secrets-cpp/portfile.cmake create mode 100644 ports/azure-security-keyvault-secrets-cpp/vcpkg.json create mode 100644 versions/a-/azure-security-keyvault-secrets-cpp.json diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 11488482cffc36..3852bb5ec4487d 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-keys_4.0.0 - SHA512 4f99bdc5a60e6ea1263812f47f6c61313b29adb241fb1372f5f601908d85291eb75e554a56722f43b6b2b38f03ecc113aa5f48304470add3b8d3416d141c5292 + REF azure-security-keyvault-keys_4.1.0 + SHA512 1292a7964a35ea97341f26e886f25a9ac11353105edcb45b074741564950f0bc7fcd4fc8be1cd9c68c645565c0248eb53cf7ca3d118bc3d32c29a32d7945a600 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index 6abacf3fc80194..edd5070d5dc492 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.0.0", + "version-semver": "4.1.0", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." @@ -10,7 +10,8 @@ "dependencies": [ { "name": "azure-core-cpp", - "default-features": false + "default-features": false, + "version>=": "1.2.0" }, { "name": "vcpkg-cmake", diff --git a/ports/azure-security-keyvault-secrets-cpp/portfile.cmake b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake new file mode 100644 index 00000000000000..3e6b1c84faa044 --- /dev/null +++ b/ports/azure-security-keyvault-secrets-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-security-keyvault-secrets_4.0.0-beta.1 + SHA512 dc40606fdd5f0c6934f9720fc9722346a5bff02093cd9a1805ca6a2356854a8648fcdf689e3456162b0b93dc85bea916ca1532547a4937113067deb5abdb3ff7 +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-secrets/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/ports/azure-security-keyvault-secrets-cpp/vcpkg.json b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json new file mode 100644 index 00000000000000..f95d098002d357 --- /dev/null +++ b/ports/azure-security-keyvault-secrets-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-security-keyvault-secrets-cpp", + "version-semver": "4.0.0-beta.1", + "description": [ + "Microsoft Azure Key Vault Secrets SDK for C++", + "This library provides Azure Key Vault Secrets SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-secrets", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.2.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 2505c7ec7c0a4c..81bbdc973386c9 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee627e15fc96740b6d7d89fea0ef9bae6f24da5c", + "version-semver": "4.1.0", + "port-version": 0 + }, { "git-tree": "b710e9d89ef00e649c793f46ce7c67af63fa3611", "version-semver": "4.0.0", diff --git a/versions/a-/azure-security-keyvault-secrets-cpp.json b/versions/a-/azure-security-keyvault-secrets-cpp.json new file mode 100644 index 00000000000000..70bd3973ec8d0f --- /dev/null +++ b/versions/a-/azure-security-keyvault-secrets-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e0a2ec6fd19019aaf9f485eea66c5b660b1bc7a4", + "version-semver": "4.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b45104c5f37014..5df92fd2b34a19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -301,7 +301,11 @@ "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.0.0", + "baseline": "4.1.0", + "port-version": 0 + }, + "azure-security-keyvault-secrets-cpp": { + "baseline": "4.0.0-beta.1", "port-version": 0 }, "azure-storage-blobs-cpp": { From 6029f7f3fd9f44a501597d90a8e7a00559a7ddd2 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 10 Sep 2021 18:28:18 -0700 Subject: [PATCH 0513/1858] [vcpkg] Update tool to 2021-09-10. (#20105) Resolves: * https://github.com/microsoft/vcpkg/issues/19552 * https://github.com/microsoft/vcpkg/issues/18217 * https://github.com/microsoft/vcpkg/issues/16631 See https://github.com/microsoft/vcpkg-tool/releases/tag/2021-09-10 for more details. --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index e7835b32752637..e6f841647349d8 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-08-12/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-09-10/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 3e07762725cce7..ef8138c9908b55 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -279,8 +279,8 @@ else fi # Do the build -vcpkgToolReleaseTag="2021-08-12" -vcpkgToolReleaseSha="a8b64125fb065129f7db48b299d8868a0394aa8a5c45e7c6076773d4bab9ca4b4d6cc4459df0df3399a7241fa0d168cdd2ab6169e4d8b7e6f708a52f003265b1" +vcpkgToolReleaseTag="2021-09-10" +vcpkgToolReleaseSha="0bea4c7bdd91933d44a0214e2202eb5ef988826d32ae7a00a8868e510710e7de0b336b1cc6aa1ea20af2f6e24d92f2ab665046089bb4ec43bc2add94a901d5fc" vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" From a80dbb57b2803b610dc701b968c64cbde3b18a68 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Sat, 11 Sep 2021 09:29:46 +0800 Subject: [PATCH 0514/1858] [libpqxx] Fix build issue with vs2017 (#20095) --- ports/libpqxx/fix_build_with_vs2017.patch | 103 ++++++++++++++++++++++ ports/libpqxx/portfile.cmake | 27 +++--- ports/libpqxx/vcpkg.json | 11 ++- versions/baseline.json | 2 +- versions/l-/libpqxx.json | 5 ++ 5 files changed, 131 insertions(+), 17 deletions(-) create mode 100644 ports/libpqxx/fix_build_with_vs2017.patch diff --git a/ports/libpqxx/fix_build_with_vs2017.patch b/ports/libpqxx/fix_build_with_vs2017.patch new file mode 100644 index 00000000000000..a10b8d161c9126 --- /dev/null +++ b/ports/libpqxx/fix_build_with_vs2017.patch @@ -0,0 +1,103 @@ +diff --git a/include/pqxx/compiler-public.hxx b/include/pqxx/compiler-public.hxx +index 5d24c7e..8087191 100644 +--- a/include/pqxx/compiler-public.hxx ++++ b/include/pqxx/compiler-public.hxx +@@ -43,6 +43,11 @@ + // Workarounds for Microsoft Visual C++ + # ifdef _MSC_VER + ++// Workarounds for deprecated attribute syntax error in Visual Studio 2017. ++# if _MSC_VER < 1920 ++# define PQXX_DEPRECATED(MESSAGE) __declspec(deprecated( #MESSAGE )) ++# endif ++ + // Suppress vtables on abstract classes. + # define PQXX_NOVTABLE __declspec(novtable) + +@@ -112,6 +117,10 @@ + # define PQXX_NOVTABLE /* novtable */ + #endif + ++#ifndef PQXX_DEPRECATED ++# define PQXX_DEPRECATED(MESSAGE) [[deprecated( #MESSAGE )]] ++#endif ++ + // TODO: Assume support once we're on C++20. + #if defined(PQXX_HAVE_LIKELY) + # define PQXX_LIKELY [[likely]] +diff --git a/include/pqxx/stream_from.hxx b/include/pqxx/stream_from.hxx +index f2dcc31..6a74b55 100644 +--- a/include/pqxx/stream_from.hxx ++++ b/include/pqxx/stream_from.hxx +@@ -148,7 +148,7 @@ public: + /** @deprecated Use factory function @c table() or @c raw_table() instead. + */ + template +- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( ++ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( + transaction_base &, from_table_t, std::string_view table, + Iter columns_begin, Iter columns_end); + +@@ -156,13 +156,13 @@ public: + /** @deprecated Use factory function @c query() instead. + */ + template +- [[deprecated("Use table() or raw_table() factory instead.")]] stream_from( ++ PQXX_DEPRECATED("Use table() or raw_table() factory instead.") stream_from( + transaction_base &tx, from_table_t, std::string_view table, + Columns const &columns); + + #include "pqxx/internal/ignore-deprecated-pre.hxx" + /// @deprecated Use factory function @c table() or @c raw_table() instead. +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( + transaction_base &tx, std::string_view table) : + stream_from{tx, from_table, table} + {} +@@ -170,14 +170,14 @@ public: + + /// @deprecated Use factory function @c table() or @c raw_table() instead. + template +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( + transaction_base &tx, std::string_view table, Columns const &columns) : + stream_from{tx, from_table, table, columns} + {} + + /// @deprecated Use factory function @c table() or @c raw_table() instead. + template +- [[deprecated("Use the from_table_t overload instead.")]] stream_from( ++ PQXX_DEPRECATED("Use the from_table_t overload instead.") stream_from( + transaction_base &, std::string_view table, Iter columns_begin, + Iter columns_end); + +diff --git a/include/pqxx/stream_to.hxx b/include/pqxx/stream_to.hxx +index 3ad0292..4b52e31 100644 +--- a/include/pqxx/stream_to.hxx ++++ b/include/pqxx/stream_to.hxx +@@ -168,7 +168,7 @@ public: + * your data fields and the table is explicit in your code, and not hidden + * in an "implicit contract" between your code and your schema. + */ +- [[deprecated("Use table() or raw_table() factory.")]] stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( + transaction_base &tx, std::string_view table_name) : + stream_to{tx, table_name, ""sv} + {} +@@ -177,14 +177,14 @@ public: + /** @deprecated Use @c table() or @c raw_table() as a factory. + */ + template +- [[deprecated("Use table() or raw_table() factory.")]] stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( + transaction_base &, std::string_view table_name, Columns const &columns); + + /// Create a stream, specifying column names as a sequence of strings. + /** @deprecated Use @c table() or @c raw_table() as a factory. + */ + template +- [[deprecated("Use table() or raw_table() factory.")]] stream_to( ++ PQXX_DEPRECATED("Use table() or raw_table() factory.") stream_to( + transaction_base &, std::string_view table_name, Iter columns_begin, + Iter columns_end); + diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index e2610bb8821f5e..a8bb2c2db9fd47 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -4,26 +4,23 @@ vcpkg_from_github( REF 221ddc8be329bafb376a3d83b9cd257fd52fc7b7 # 7.6.0 SHA512 32a673bbae2f26fbc41bdcba007d9a5ded29680cb49ba434d1913cd5007bc1c1443bf38c88d9c5a6abe0a3ee519c0f691464c8d2b144cd3f16652447d644e400 HEAD_REF master - #PATCHES - # fix-build-with-vs2017.patch #https://github.com/jtv/libpqxx/pull/406 + PATCHES + fix_build_with_vs2017.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config-internal-compiler.h.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-public-compiler.h.in" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config-internal-compiler.h.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DSKIP_BUILD_TEST=ON +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSKIP_BUILD_TEST=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libpqxx) -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share -) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json index 7ba550d5037f5c..3f493980a4253f 100644 --- a/ports/libpqxx/vcpkg.json +++ b/ports/libpqxx/vcpkg.json @@ -1,9 +1,18 @@ { "name": "libpqxx", "version-semver": "7.6.0", + "port-version": 1, "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", "dependencies": [ - "libpq" + "libpq", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5df92fd2b34a19..476e25956d073d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3582,7 +3582,7 @@ }, "libpqxx": { "baseline": "7.6.0", - "port-version": 0 + "port-version": 1 }, "libprotobuf-mutator": { "baseline": "1.0", diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index e58233f97c4517..37d3671b44c72c 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37cce5f0124f6f870793a650937ca978c1fc4750", + "version-semver": "7.6.0", + "port-version": 1 + }, { "git-tree": "bbbc587d55d5d1ee059e417b045dfc82ca4897c2", "version-semver": "7.6.0", From 4a29b5eb87bb335e625cb012381033c123a454f2 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Sat, 11 Sep 2021 13:43:19 -0700 Subject: [PATCH 0515/1858] Update pwsh to 7.1.14, separate image minting from vmss minting, and update VMs. (#20064) * Update Powershell-Core to 7.1.4. * Add deployment of .NET 4.7.2 targeting pack, extracted from https://github.com/microsoft/vcpkg/pull/19320 * Separate image minting from vmss minting. * Update pools. * Fix image minting typo on Windows. --- scripts/azure-pipelines/azure-pipelines.yml | 4 +- .../azure-pipelines/create-vmss-helpers.psm1 | 182 +++++++ .../azure-pipelines/linux/create-image.ps1 | 161 ++++++ scripts/azure-pipelines/linux/create-vmss.ps1 | 348 ++----------- .../azure-pipelines/linux/provision-image.sh | 14 - .../azure-pipelines/windows/create-image.ps1 | 271 ++++++++++ .../azure-pipelines/windows/create-vmss.ps1 | 487 +----------------- .../azure-pipelines/windows/deploy-pwsh.ps1 | 2 +- .../windows/deploy-visual-studio.ps1 | 1 + scripts/vcpkgTools.xml | 8 +- 10 files changed, 670 insertions(+), 808 deletions(-) create mode 100644 scripts/azure-pipelines/linux/create-image.ps1 create mode 100644 scripts/azure-pipelines/windows/create-image.ps1 diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 474dbd254ee1b3..e5102c32cdbf4e 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-08-12' - linux-pool: 'PrLin-2021-08-11' + windows-pool: 'PrWin-2021-09-08' + linux-pool: 'PrLin-2021-09-08' osx-pool: 'PrOsx-2021-07-27' stages: diff --git a/scripts/azure-pipelines/create-vmss-helpers.psm1 b/scripts/azure-pipelines/create-vmss-helpers.psm1 index 1e83100368fbaa..b7d862cf80e8d7 100755 --- a/scripts/azure-pipelines/create-vmss-helpers.psm1 +++ b/scripts/azure-pipelines/create-vmss-helpers.psm1 @@ -55,6 +55,60 @@ function Find-ResourceGroupName { return $result } +<# +.SYNOPSIS +Returns whether there's a name collision for an image in the resource group. + +.DESCRIPTION +Find-ImageNameCollision takes a list of images, and checks if $Test +collides names with any of the image names. + +.PARAMETER Test +The name to test. + +.PARAMETER Images +The list of images. +#> +function Find-ImageNameCollision { + [CmdletBinding()] + Param([string]$Test, $Images) + + foreach ($resource in $Images) { + if ($resource.Name -eq $Test) { + return $true + } + } + + return $false +} + +<# +.SYNOPSIS +Attempts to find a name that does not collide with any images in the resource group. + +.DESCRIPTION +Find-ResourceGroupName takes a set of resources from Get-AzResourceGroup, and finds the +first name in {$Prefix, $Prefix-1, $Prefix-2, ...} such that the name doesn't collide with +any of the resources in the resource group. + +.PARAMETER Prefix +The prefix of the final name; the returned name will be of the form "$Prefix(-[1-9][0-9]*)?" +#> +function Find-ImageName { + [CmdLetBinding()] + Param([string]$ResourceGroupName, [string]$Prefix) + + $images = Get-AzImage -ResourceGroupName $ResourceGroupName + $result = $Prefix + $suffix = 0 + while (Find-ImageNameCollision -Test $result -Images $images) { + $suffix++ + $result = "$Prefix-$suffix" + } + + return $result +} + <# .SYNOPSIS Generates a random password. @@ -160,7 +214,135 @@ function Sanitize-Name { return $result } +<# +.SYNOPSIS +Creates a new Azure virtual network with locked down firewall rules. + +.PARAMETER ResourceGroupName +The name of the resource group in which the virtual network should be created. + +.PARAMETER Location +The location (region) where the network is to be created. +#> +function Create-LockedDownNetwork { + [CmdletBinding()] + Param( + [parameter(Mandatory=$true)] + [string]$ResourceGroupName, + [parameter(Mandatory=$true)] + [string]$Location + ) + + $allFirewallRules = @() + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowHTTP ` + -Description 'Allow HTTP(S)' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1008 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange @(80, 443) + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowSFTP ` + -Description 'Allow (S)FTP' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1009 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange @(21, 22) + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowDNS ` + -Description 'Allow DNS' ` + -Access Allow ` + -Protocol * ` + -Direction Outbound ` + -Priority 1010 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange 53 + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name AllowGit ` + -Description 'Allow git' ` + -Access Allow ` + -Protocol Tcp ` + -Direction Outbound ` + -Priority 1011 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange 9418 + + $allFirewallRules += New-AzNetworkSecurityRuleConfig ` + -Name DenyElse ` + -Description 'Deny everything else' ` + -Access Deny ` + -Protocol * ` + -Direction Outbound ` + -Priority 1013 ` + -SourceAddressPrefix * ` + -SourcePortRange * ` + -DestinationAddressPrefix * ` + -DestinationPortRange * + + $NetworkSecurityGroupName = $ResourceGroupName + 'NetworkSecurity' + $NetworkSecurityGroup = New-AzNetworkSecurityGroup ` + -Name $NetworkSecurityGroupName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -SecurityRules $allFirewallRules + + $SubnetName = $ResourceGroupName + 'Subnet' + $Subnet = New-AzVirtualNetworkSubnetConfig ` + -Name $SubnetName ` + -AddressPrefix "10.0.0.0/16" ` + -NetworkSecurityGroup $NetworkSecurityGroup ` + -ServiceEndpoint "Microsoft.Storage" + + $VirtualNetworkName = $ResourceGroupName + 'Network' + $VirtualNetwork = New-AzVirtualNetwork ` + -Name $VirtualNetworkName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -AddressPrefix "10.0.0.0/16" ` + -Subnet $Subnet + + return $VirtualNetwork +} + +function Invoke-AzVMRunCommandWithRetries { + try { + return Invoke-AzVMRunCommand @args + } catch { + for ($idx = 0; $idx -lt 5; $idx++) { + Write-Host "Running command failed. $_ Retrying after 10 seconds..." + Start-Sleep -Seconds 10 + try { + return Invoke-AzVMRunCommand @args + } catch { + # ignore + } + } + + Write-Host "Running command failed too many times. Giving up!" + throw $_ + } +} + Export-ModuleMember -Function Find-ResourceGroupName +Export-ModuleMember -Function Find-ImageName Export-ModuleMember -Function New-Password Export-ModuleMember -Function Wait-Shutdown Export-ModuleMember -Function Sanitize-Name +Export-ModuleMember -Function Create-LockedDownNetwork +Export-ModuleMember -Function Invoke-AzVMRunCommandWithRetries diff --git a/scripts/azure-pipelines/linux/create-image.ps1 b/scripts/azure-pipelines/linux/create-image.ps1 new file mode 100644 index 00000000000000..5eacd2b8c01970 --- /dev/null +++ b/scripts/azure-pipelines/linux/create-image.ps1 @@ -0,0 +1,161 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Creates a Linux virtual machine image, set up for vcpkg's CI. + +.DESCRIPTION +create-image.ps1 creates an Azure Linux VM image, set up for vcpkg's CI system. +This script assumes you have installed Azure tools into PowerShell by following the instructions +at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 +or are running from Azure Cloud Shell. + +This script assumes you have installed the OpenSSH Client optional Windows component. +#> + +$Location = 'westus2' +$Prefix = 'Lin-' +$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$VMSize = 'Standard_D32as_v4' +$ProtoVMName = 'PROTOTYPE' +$ErrorActionPreference = 'Stop' + +$ProgressActivity = 'Creating Linux Image' +$TotalProgress = 9 +$CurrentProgress = 1 + +Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating SSH key' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$sshDir = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() +mkdir $sshDir +try { + ssh-keygen.exe -q -b 2048 -t rsa -f "$sshDir/key" -P [string]::Empty + $sshPublicKey = Get-Content "$sshDir/key.pub" +} finally { + Remove-Item $sshDir -Recurse -Force +} + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating resource group' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ResourceGroupName = Find-ResourceGroupName $Prefix +$AdminPW = New-Password +New-AzResourceGroup -Name $ResourceGroupName -Location $Location +$AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force +$Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure) + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating virtual network' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating prototype VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$NicName = $ResourceGroupName + 'NIC' +$Nic = New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + +$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -Priority 'Spot' -MaxPrice -1 +$VM = Set-AzVMOperatingSystem ` + -VM $VM ` + -Linux ` + -ComputerName $ProtoVMName ` + -Credential $Credential ` + -DisablePasswordAuthentication + +$VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id +$VM = Set-AzVMSourceImage ` + -VM $VM ` + -PublisherName 'Canonical' ` + -Offer '0001-com-ubuntu-server-focal' ` + -Skus '20_04-lts-gen2' ` + -Version latest + +$VM = Set-AzVMBootDiagnostic -VM $VM -Disable + +$VM = Add-AzVMSshPublicKey ` + -VM $VM ` + -KeyData $sshPublicKey ` + -Path "/home/AdminUser/.ssh/authorized_keys" + +New-AzVm ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -VM $VM + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script provision-image.sh in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunShellScript' ` + -ScriptPath "$PSScriptRoot\provision-image.sh" + +Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)" + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Restarting VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Converting VM to Image' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Stop-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Force + +Set-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Generalized + +$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -HyperVGeneration 'V2' +$ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix +New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Deleting unused temporary resources' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Remove-AzResourceGroup $ResourceGroupName -Force + +#################################################################################################### +Write-Progress -Activity $ProgressActivity -Completed +Write-Host "Generated Image: $ImageName" +Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/linux/create-vmss.ps1 b/scripts/azure-pipelines/linux/create-vmss.ps1 index d5651bd8e39a8a..08210cc0d18765 100755 --- a/scripts/azure-pipelines/linux/create-vmss.ps1 +++ b/scripts/azure-pipelines/linux/create-vmss.ps1 @@ -16,29 +16,27 @@ at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6 or are running from Azure Cloud Shell. This script assumes you have installed the OpenSSH Client optional Windows component. + + +.PARAMETER ImageName +The name of the image to deploy into the scale set. #> +[CmdLetBinding()] +Param( + [parameter(Mandatory=$true)] + [string]$ImageName +) + $Location = 'westus2' -$Prefix = 'PrLin-' + (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32ds_v4' -$ProtoVMName = 'PROTOTYPE' +$Prefix = 'PrLin-' +$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$VMSize = 'Standard_D32a_v4' $LiveVMPrefix = 'BUILD' -$MakeInstalledDisk = $false -$InstalledDiskSizeInGB = 1024 $ErrorActionPreference = 'Stop' -$ProgressActivity = 'Creating Scale Set' -$TotalProgress = 11 -$CurrentProgress = 1 - Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating SSH key' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - $sshDir = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() mkdir $sshDir try { @@ -47,279 +45,15 @@ try { } finally { Remove-Item $sshDir -Recurse -Force } - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating resource group' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - $ResourceGroupName = Find-ResourceGroupName $Prefix $AdminPW = New-Password -New-AzResourceGroup -Name $ResourceGroupName -Location $Location -$AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force -$Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure) - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating virtual network' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$allFirewallRules = @() - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowHTTP ` - -Description 'Allow HTTP(S)' ` - -Access Allow ` - -Protocol Tcp ` - -Direction Outbound ` - -Priority 1008 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange @(80, 443) - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowSFTP ` - -Description 'Allow (S)FTP' ` - -Access Allow ` - -Protocol Tcp ` - -Direction Outbound ` - -Priority 1009 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange @(21, 22) - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowDNS ` - -Description 'Allow DNS' ` - -Access Allow ` - -Protocol * ` - -Direction Outbound ` - -Priority 1010 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange 53 - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowGit ` - -Description 'Allow git' ` - -Access Allow ` - -Protocol Tcp ` - -Direction Outbound ` - -Priority 1011 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange 9418 - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name DenyElse ` - -Description 'Deny everything else' ` - -Access Deny ` - -Protocol * ` - -Direction Outbound ` - -Priority 1013 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange * - -$NetworkSecurityGroupName = $ResourceGroupName + 'NetworkSecurity' -$NetworkSecurityGroup = New-AzNetworkSecurityGroup ` - -Name $NetworkSecurityGroupName ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -SecurityRules $allFirewallRules - -$SubnetName = $ResourceGroupName + 'Subnet' -$Subnet = New-AzVirtualNetworkSubnetConfig ` - -Name $SubnetName ` - -AddressPrefix "10.0.0.0/16" ` - -NetworkSecurityGroup $NetworkSecurityGroup ` - -ServiceEndpoint "Microsoft.Storage" - -$VirtualNetworkName = $ResourceGroupName + 'Network' -$VirtualNetwork = New-AzVirtualNetwork ` - -Name $VirtualNetworkName ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -AddressPrefix "10.0.0.0/16" ` - -Subnet $Subnet - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating archives storage account' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$StorageAccountName = Sanitize-Name $ResourceGroupName - -New-AzStorageAccount ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -Name $StorageAccountName ` - -SkuName 'Standard_LRS' ` - -Kind StorageV2 ` - -MinimumTlsVersion TLS1_2 - -$StorageAccountKeys = Get-AzStorageAccountKey ` - -ResourceGroupName $ResourceGroupName ` - -Name $StorageAccountName - -$StorageAccountKey = $StorageAccountKeys[0].Value +$Image = Get-AzImage -ResourceGroupName 'vcpkg-image-minting' -ImageName $ImageName -$StorageContext = New-AzStorageContext ` - -StorageAccountName $StorageAccountName ` - -StorageAccountKey $StorageAccountKey - -New-AzStorageContainer -Name archives -Context $StorageContext -Permission Off -$StartTime = [DateTime]::Now -$ExpiryTime = $StartTime.AddMonths(6) - -$SasToken = New-AzStorageAccountSASToken ` - -Service Blob ` - -Permission "racwdlup" ` - -Context $StorageContext ` - -StartTime $StartTime ` - -ExpiryTime $ExpiryTime ` - -ResourceType Service,Container,Object ` - -Protocol HttpsOnly - -$SasToken = $SasToken.Substring(1) # strip leading ? - -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating storage account' ` - -CurrentOperation 'Locking down network' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress) # note no ++ - -# Note that we put the storage account into the firewall after creating the above SAS token or we -# would be denied since the person running this script isn't one of the VMs we're creating here. -Set-AzStorageAccount ` - -ResourceGroupName $ResourceGroupName ` - -AccountName $StorageAccountName ` - -NetworkRuleSet ( ` - @{bypass="AzureServices"; ` - virtualNetworkRules=( ` - @{VirtualNetworkResourceId=$VirtualNetwork.Subnets[0].Id;Action="allow"}); ` - defaultAction="Deny"}) - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating prototype VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$NicName = $ResourceGroupName + 'NIC' -$Nic = New-AzNetworkInterface ` - -Name $NicName ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -Subnet $VirtualNetwork.Subnets[0] - -$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -Priority 'Spot' -MaxPrice -1 -$VM = Set-AzVMOperatingSystem ` - -VM $VM ` - -Linux ` - -ComputerName $ProtoVMName ` - -Credential $Credential ` - -DisablePasswordAuthentication - -$VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id -$VM = Set-AzVMSourceImage ` - -VM $VM ` - -PublisherName 'Canonical' ` - -Offer '0001-com-ubuntu-server-focal' ` - -Skus '20_04-lts' ` - -Version latest - -$VM = Set-AzVMBootDiagnostic -VM $VM -Disable - -$VM = Add-AzVMSshPublicKey ` - -VM $VM ` - -KeyData $sshPublicKey ` - -Path "/home/AdminUser/.ssh/authorized_keys" - -New-AzVm ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -VM $VM - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Running provisioning script provision-image.sh in VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$tempScript = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + ".sh" -try { - $script = Get-Content "$PSScriptRoot\provision-image.sh" -Encoding utf8NoBOM - $script += "echo `"PROVISIONED_AZURE_STORAGE_NAME=\`"$StorageAccountName\`"`" | sudo tee -a /etc/environment" - $script += "echo `"PROVISIONED_AZURE_STORAGE_SAS_TOKEN=\`"$SasToken\`"`" | sudo tee -a /etc/environment" - Set-Content -Path $tempScript -Value $script -Encoding utf8NoBOM - - $ProvisionImageResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunShellScript' ` - -ScriptPath $tempScript - - Write-Host "provision-image.sh output: $($ProvisionImageResult.value.Message)" -} finally { - Remove-Item $tempScript -Recurse -Force -} - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Restarting VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Converting VM to Image' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -Stop-AzVM ` - -ResourceGroupName $ResourceGroupName ` - -Name $ProtoVMName ` - -Force - -Set-AzVM ` - -ResourceGroupName $ResourceGroupName ` - -Name $ProtoVMName ` - -Generalized - -$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -$PrototypeOSDiskName = $VM.StorageProfile.OsDisk.Name -$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -$ImageName = "$Prefix-BaseImage" -$Image = New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName $ResourceGroupName - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Deleting unused VM and disk' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -Remove-AzVM -Id $VM.ID -Force -Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $PrototypeOSDiskName -Force - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating scale set' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) +New-AzResourceGroup -Name $ResourceGroupName -Location $Location +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location $VmssIpConfigName = $ResourceGroupName + 'VmssIpConfig' -$VmssIpConfig = New-AzVmssIpConfig -SubnetId $Nic.IpConfigurations[0].Subnet.Id -Primary -Name $VmssIpConfigName +$VmssIpConfig = New-AzVmssIpConfig -SubnetId $VirtualNetwork.Subnets[0].Id -Primary -Name $VmssIpConfigName $VmssName = $ResourceGroupName + 'Vmss' $Vmss = New-AzVmssConfig ` -Location $Location ` @@ -332,34 +66,30 @@ $Vmss = New-AzVmssConfig ` -Priority Spot ` -MaxPrice -1 +$NicName = $ResourceGroupName + 'NIC' +New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + $Vmss = Add-AzVmssNetworkInterfaceConfiguration ` -VirtualMachineScaleSet $Vmss ` -Primary $true ` -IpConfiguration $VmssIpConfig ` - -NetworkSecurityGroupId $NetworkSecurityGroup.Id ` + -NetworkSecurityGroupId $VirtualNetwork.Subnets[0].NetworkSecurityGroup.Id ` -Name $NicName $VmssPublicKey = New-Object -TypeName 'Microsoft.Azure.Management.Compute.Models.SshPublicKey' ` -ArgumentList @('/home/AdminUser/.ssh/authorized_keys', $sshPublicKey) -if ($MakeInstalledDisk) { - $Vmss = Set-AzVmssOsProfile ` - -VirtualMachineScaleSet $Vmss ` - -ComputerNamePrefix $LiveVMPrefix ` - -AdminUsername AdminUser ` - -AdminPassword $AdminPW ` - -LinuxConfigurationDisablePasswordAuthentication $true ` - -PublicKey @($VmssPublicKey) ` - -CustomData ([Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes("#!/bin/bash`n/etc/provision-disks.sh`n"))) -} else { - $Vmss = Set-AzVmssOsProfile ` - -VirtualMachineScaleSet $Vmss ` - -ComputerNamePrefix $LiveVMPrefix ` - -AdminUsername AdminUser ` - -AdminPassword $AdminPW ` - -LinuxConfigurationDisablePasswordAuthentication $true ` - -PublicKey @($VmssPublicKey) -} +$Vmss = Set-AzVmssOsProfile ` + -VirtualMachineScaleSet $Vmss ` + -ComputerNamePrefix $LiveVMPrefix ` + -AdminUsername AdminUser ` + -AdminPassword $AdminPW ` + -LinuxConfigurationDisablePasswordAuthentication $true ` + -PublicKey @($VmssPublicKey) $Vmss = Set-AzVmssStorageProfile ` -VirtualMachineScaleSet $Vmss ` @@ -368,25 +98,11 @@ $Vmss = Set-AzVmssStorageProfile ` -DiffDiskSetting Local ` -ImageReferenceId $Image.Id -if ($MakeInstalledDisk) { - $Vmss = Add-AzVmssDataDisk ` - -VirtualMachineScaleSet $Vmss ` - -Lun 0 ` - -Caching 'ReadWrite' ` - -CreateOption Empty ` - -DiskSizeGB $InstalledDiskSizeInGB ` - -StorageAccountType 'StandardSSD_LRS' -} - New-AzVmss ` -ResourceGroupName $ResourceGroupName ` -Name $VmssName ` -VirtualMachineScaleSet $Vmss -#################################################################################################### -Write-Progress -Activity $ProgressActivity -Completed Write-Host "Location: $Location" Write-Host "Resource group name: $ResourceGroupName" -Write-Host "User name: AdminUser" -Write-Host "Using generated password: $AdminPW" Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 66d8fe9321d2c3..942952f0997fe4 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -81,17 +81,3 @@ sudo dpkg -i packages-microsoft-prod.deb sudo apt update sudo add-apt-repository universe sudo apt install -y powershell - -# Write script to provision disks used by cloud-init -echo "if [ ! -d \"/mnt/vcpkg-ci\" ]; then" > /etc/provision-disks.sh -echo "sudo parted /dev/sdb mklabel gpt" >> /etc/provision-disks.sh -echo "sudo parted /dev/sdb mkpart cidisk ext4 0% 100%" >> /etc/provision-disks.sh -echo "sudo mkfs -t ext4 /dev/sdb1" >> /etc/provision-disks.sh -echo "sudo mkdir /mnt/vcpkg-ci -m=777" >> /etc/provision-disks.sh -echo "echo \"/dev/sdb1 /mnt/vcpkg-ci ext4 barrier=0 0 0\" | sudo tee -a /etc/fstab" >> /etc/provision-disks.sh -echo "sudo mount -a" >> /etc/provision-disks.sh -echo "sudo chmod 777 /mnt/vcpkg-ci" >> /etc/provision-disks.sh -echo "fi" >> /etc/provision-disks.sh -sudo chmod 700 /etc/provision-disks.sh - -# provision-image.ps1 will append installation of the SAS token here diff --git a/scripts/azure-pipelines/windows/create-image.ps1 b/scripts/azure-pipelines/windows/create-image.ps1 new file mode 100644 index 00000000000000..9a03fe8ed60ccd --- /dev/null +++ b/scripts/azure-pipelines/windows/create-image.ps1 @@ -0,0 +1,271 @@ +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: MIT +# + +<# +.SYNOPSIS +Creates a Windows virtual machine image, set up for vcpkg's CI. + +.DESCRIPTION +create-image.ps1 creates an Azure Windows VM image, set up for vcpkg's CI system. + +This script assumes you have installed Azure tools into PowerShell by following the instructions +at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 +or are running from Azure Cloud Shell. +#> + +$Location = 'westus2' +$Prefix = 'Win-' +$Prefix += (Get-Date -Format 'yyyy-MM-dd') +$VMSize = 'Standard_D32as_v4' +$ProtoVMName = 'PROTOTYPE' +$WindowsServerSku = '2019-datacenter-gensecond' +$ErrorActionPreference = 'Stop' +$CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-11.2-windows-x64-v8.1.1.33.zip' + +$ProgressActivity = 'Creating Windows Image' +$TotalProgress = 18 +$CurrentProgress = 1 + +Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating resource group' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ResourceGroupName = Find-ResourceGroupName $Prefix +$AdminPW = New-Password +New-AzResourceGroup -Name $ResourceGroupName -Location $Location +$AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force +$Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure) + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating virtual network' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Creating prototype VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$NicName = $ResourceGroupName + 'NIC' +$Nic = New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + +$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -Priority 'Spot' -MaxPrice -1 +$VM = Set-AzVMOperatingSystem ` + -VM $VM ` + -Windows ` + -ComputerName $ProtoVMName ` + -Credential $Credential ` + -ProvisionVMAgent + +$VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id +$VM = Set-AzVMSourceImage ` + -VM $VM ` + -PublisherName 'MicrosoftWindowsServer' ` + -Offer 'WindowsServer' ` + -Skus $WindowsServerSku ` + -Version latest + +$VM = Set-AzVMBootDiagnostic -VM $VM -Disable +New-AzVm ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -VM $VM + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script deploy-tlssettings.ps1 in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\deploy-tlssettings.ps1" + +Write-Host "deploy-tlssettings.ps1 output: $($ProvisionImageResult.value.Message)" +Write-Host 'Waiting 1 minute for VM to reboot...' +Start-Sleep -Seconds 60 + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script deploy-psexec.ps1 in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$DeployPsExecResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\deploy-psexec.ps1" + +Write-Host "deploy-psexec.ps1 output: $($DeployPsExecResult.value.Message)" + +#################################################################################################### +function Invoke-ScriptWithPrefix { + param( + [string]$ScriptName, + [switch]$AddAdminPw, + [string]$CudnnUrl + ) + + Write-Progress ` + -Activity $ProgressActivity ` + -Status "Running provisioning script $ScriptName in VM" ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + + $DropToAdminUserPrefix = Get-Content "$PSScriptRoot\drop-to-admin-user-prefix.ps1" -Encoding utf8NoBOM -Raw + $UtilityPrefixContent = Get-Content "$PSScriptRoot\utility-prefix.ps1" -Encoding utf8NoBOM -Raw + + $tempScriptFilename = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + ".txt" + try { + $script = Get-Content "$PSScriptRoot\$ScriptName" -Encoding utf8NoBOM -Raw + if ($AddAdminPw) { + $script = $script.Replace('# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1', $DropToAdminUserPrefix) + } + + if (-Not ([string]::IsNullOrWhiteSpace($CudnnUrl))) { + $script = $script.Replace('# REPLACE WITH $CudnnUrl', "`$CudnnUrl = '$CudnnUrl'") + } + + $script = $script.Replace('# REPLACE WITH UTILITY-PREFIX.ps1', $UtilityPrefixContent); + Set-Content -Path $tempScriptFilename -Value $script -Encoding utf8NoBOM + + $parameter = $null + if ($AddAdminPw) { + $parameter = @{AdminUserPassword = $AdminPW;} + } + + $InvokeResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath $tempScriptFilename ` + -Parameter $parameter + + Write-Host "$ScriptName output: $($InvokeResult.value.Message)" + } finally { + Remove-Item $tempScriptFilename -Force + } +} + +Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-mpi.ps1' -AddAdminPw + +#################################################################################################### +$StorageAccountKeys = Get-AzStorageAccountKey ` + -ResourceGroupName 'vcpkg-image-minting' ` + -Name 'vcpkgimageminting' + +$StorageContext = New-AzStorageContext ` + -StorageAccountName 'vcpkgimageminting' ` + -StorageAccountKey $StorageAccountKeys[0].Value + +$StartTime = [DateTime]::Now +$ExpiryTime = $StartTime.AddDays(1) + +$SetupSasToken = New-AzStorageAccountSASToken ` + -Service Blob ` + -Permission "r" ` + -Context $StorageContext ` + -StartTime $StartTime ` + -ExpiryTime $ExpiryTime ` + -ResourceType Object ` + -Protocol HttpsOnly + +Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw -CudnnUrl ($CudnnBaseUrl + $SetupSasToken) + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-inteloneapi.ps1' -AddAdminPw + +#################################################################################################### +Invoke-ScriptWithPrefix -ScriptName 'deploy-pwsh.ps1' -AddAdminPw + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script deploy-settings.txt (as a .ps1) in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$ProvisionImageResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\deploy-settings.txt" + +Write-Host "deploy-settings.txt output: $($ProvisionImageResult.value.Message)" +Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Running provisioning script sysprep.ps1 in VM' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +$SysprepResult = Invoke-AzVMRunCommandWithRetries ` + -ResourceGroupName $ResourceGroupName ` + -VMName $ProtoVMName ` + -CommandId 'RunPowerShellScript' ` + -ScriptPath "$PSScriptRoot\sysprep.ps1" + +Write-Host "sysprep.ps1 output: $($SysprepResult.value.Message)" + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Waiting for VM to shut down' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Wait-Shutdown -ResourceGroupName $ResourceGroupName -Name $ProtoVMName + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Converting VM to Image' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Stop-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Force + +Set-AzVM ` + -ResourceGroupName $ResourceGroupName ` + -Name $ProtoVMName ` + -Generalized + +$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName +$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -HyperVGeneration 'V2' +$ImageName = Find-ImageName -ResourceGroupName 'vcpkg-image-minting' -Prefix $Prefix +New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName 'vcpkg-image-minting' + +#################################################################################################### +Write-Progress ` + -Activity $ProgressActivity ` + -Status 'Deleting unused temporary resources' ` + -PercentComplete (100 / $TotalProgress * $CurrentProgress++) + +Remove-AzResourceGroup $ResourceGroupName -Force + +#################################################################################################### +Write-Progress -Activity $ProgressActivity -Completed +Write-Host "Generated Image: $ImageName" +Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/windows/create-vmss.ps1 b/scripts/azure-pipelines/windows/create-vmss.ps1 index c9f29922504546..96135831f1f36b 100644 --- a/scripts/azure-pipelines/windows/create-vmss.ps1 +++ b/scripts/azure-pipelines/windows/create-vmss.ps1 @@ -15,492 +15,34 @@ This script assumes you have installed Azure tools into PowerShell by following at https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1 or are running from Azure Cloud Shell. -.PARAMETER CudnnPath -The path to a CUDNN zip file downloaded from NVidia official sources -(e.g. https://developer.nvidia.com/compute/machine-learning/cudnn/secure/8.1.1.33/11.2_20210301/cudnn-11.2-windows-x64-v8.1.1.33.zip -downloaded in a browser with an NVidia account logged in.) +.PARAMETER ImageName +The name of the image to deploy into the scale set. #> [CmdLetBinding()] Param( [parameter(Mandatory=$true)] - [string]$CudnnPath + [string]$ImageName ) $Location = 'westus2' $Prefix = 'PrWin-' - $Prefix += (Get-Date -Format 'yyyy-MM-dd') -$VMSize = 'Standard_D32ds_v4' -$ProtoVMName = 'PROTOTYPE' +$VMSize = 'Standard_D32a_v4' $LiveVMPrefix = 'BUILD' -$WindowsServerSku = '2019-Datacenter' -$MakeInstalledDisk = $false -$InstalledDiskSizeInGB = 1024 $ErrorActionPreference = 'Stop' -$ProgressActivity = 'Creating Scale Set' -$TotalProgress = 20 -if ($MakeInstalledDisk) { - $TotalProgress++ -} - -$CurrentProgress = 1 - Import-Module "$PSScriptRoot/../create-vmss-helpers.psm1" -DisableNameChecking -if (-Not $CudnnPath.EndsWith('.zip')) { - Write-Error 'Expected CudnnPath to be a zip file.' - return -} - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating resource group' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - $ResourceGroupName = Find-ResourceGroupName $Prefix $AdminPW = New-Password -New-AzResourceGroup -Name $ResourceGroupName -Location $Location -$AdminPWSecure = ConvertTo-SecureString $AdminPW -AsPlainText -Force -$Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPWSecure) - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating virtual network' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$allFirewallRules = @() - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowHTTP ` - -Description 'Allow HTTP(S)' ` - -Access Allow ` - -Protocol Tcp ` - -Direction Outbound ` - -Priority 1008 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange @(80, 443) - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowSFTP ` - -Description 'Allow (S)FTP' ` - -Access Allow ` - -Protocol Tcp ` - -Direction Outbound ` - -Priority 1009 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange @(21, 22) - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowDNS ` - -Description 'Allow DNS' ` - -Access Allow ` - -Protocol * ` - -Direction Outbound ` - -Priority 1010 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange 53 - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name AllowGit ` - -Description 'Allow git' ` - -Access Allow ` - -Protocol Tcp ` - -Direction Outbound ` - -Priority 1011 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange 9418 - -$allFirewallRules += New-AzNetworkSecurityRuleConfig ` - -Name DenyElse ` - -Description 'Deny everything else' ` - -Access Deny ` - -Protocol * ` - -Direction Outbound ` - -Priority 1013 ` - -SourceAddressPrefix * ` - -SourcePortRange * ` - -DestinationAddressPrefix * ` - -DestinationPortRange * - -$NetworkSecurityGroupName = $ResourceGroupName + 'NetworkSecurity' -$NetworkSecurityGroup = New-AzNetworkSecurityGroup ` - -Name $NetworkSecurityGroupName ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -SecurityRules $allFirewallRules - -$SubnetName = $ResourceGroupName + 'Subnet' -$Subnet = New-AzVirtualNetworkSubnetConfig ` - -Name $SubnetName ` - -AddressPrefix "10.0.0.0/16" ` - -NetworkSecurityGroup $NetworkSecurityGroup ` - -ServiceEndpoint "Microsoft.Storage" - -$VirtualNetworkName = $ResourceGroupName + 'Network' -$VirtualNetwork = New-AzVirtualNetwork ` - -Name $VirtualNetworkName ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -AddressPrefix "10.0.0.0/16" ` - -Subnet $Subnet - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating storage account' ` - -CurrentOperation 'Initial setup' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$StorageAccountName = Sanitize-Name $ResourceGroupName - -New-AzStorageAccount ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -Name $StorageAccountName ` - -SkuName 'Standard_LRS' ` - -Kind StorageV2 ` - -MinimumTlsVersion TLS1_2 - -$StorageAccountKeys = Get-AzStorageAccountKey ` - -ResourceGroupName $ResourceGroupName ` - -Name $StorageAccountName - -$StorageAccountKey = $StorageAccountKeys[0].Value - -$StorageContext = New-AzStorageContext ` - -StorageAccountName $StorageAccountName ` - -StorageAccountKey $StorageAccountKey - -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating storage account' ` - -CurrentOperation 'Uploading cudnn.zip' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress) # note no ++ - -New-AzStorageContainer -Name setup -Context $storageContext -Permission blob - -Set-AzStorageBlobContent -File $CudnnPath ` - -Container 'setup' ` - -Blob 'cudnn.zip' ` - -Context $StorageContext - -$CudnnBlobUrl = "https://$StorageAccountName.blob.core.windows.net/setup/cudnn.zip" - -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating storage account' ` - -CurrentOperation 'Creating archives container' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress) # note no ++ - -New-AzStorageContainer -Name archives -Context $StorageContext -Permission Off - -$StartTime = [DateTime]::Now -$ExpiryTime = $StartTime.AddMonths(6) - -$SasToken = New-AzStorageAccountSASToken ` - -Service Blob ` - -Permission "racwdlup" ` - -Context $StorageContext ` - -StartTime $StartTime ` - -ExpiryTime $ExpiryTime ` - -ResourceType Service,Container,Object ` - -Protocol HttpsOnly - -$SasToken = $SasToken.Substring(1) # strip leading ? - -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating storage account' ` - -CurrentOperation 'Locking down network' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress) # note no ++ - -# Note that we put the storage account into the firewall after creating the above SAS token or we -# would be denied since the person running this script isn't one of the VMs we're creating here. -Set-AzStorageAccount ` - -ResourceGroupName $ResourceGroupName ` - -AccountName $StorageAccountName ` - -NetworkRuleSet ( ` - @{bypass="AzureServices"; ` - virtualNetworkRules=( ` - @{VirtualNetworkResourceId=$VirtualNetwork.Subnets[0].Id;Action="allow"}); ` - defaultAction="Deny"}) - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating prototype VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$NicName = $ResourceGroupName + 'NIC' -$Nic = New-AzNetworkInterface ` - -Name $NicName ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -Subnet $VirtualNetwork.Subnets[0] - -$VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -Priority 'Spot' -MaxPrice -1 -$VM = Set-AzVMOperatingSystem ` - -VM $VM ` - -Windows ` - -ComputerName $ProtoVMName ` - -Credential $Credential ` - -ProvisionVMAgent - -$VM = Add-AzVMNetworkInterface -VM $VM -Id $Nic.Id -$VM = Set-AzVMSourceImage ` - -VM $VM ` - -PublisherName 'MicrosoftWindowsServer' ` - -Offer 'WindowsServer' ` - -Skus $WindowsServerSku ` - -Version latest - -$InstallDiskName = $ProtoVMName + "InstallDisk" -if ($MakeInstalledDisk) { - $VM = Add-AzVMDataDisk ` - -Vm $VM ` - -Name $InstallDiskName ` - -Lun 0 ` - -Caching ReadWrite ` - -CreateOption Empty ` - -DiskSizeInGB $InstalledDiskSizeInGB ` - -StorageAccountType 'StandardSSD_LRS' -} - -$VM = Set-AzVMBootDiagnostic -VM $VM -Disable -New-AzVm ` - -ResourceGroupName $ResourceGroupName ` - -Location $Location ` - -VM $VM - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Running provisioning script deploy-tlssettings.ps1 in VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) +$Image = Get-AzImage -ResourceGroupName 'vcpkg-image-minting' -ImageName $ImageName -$ProvisionImageResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\deploy-tlssettings.ps1" - -Write-Host "deploy-tlssettings.ps1 output: $($ProvisionImageResult.value.Message)" -Write-Host 'Waiting 1 minute for VM to reboot...' -Start-Sleep -Seconds 60 - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Running provisioning script deploy-psexec.ps1 in VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$DeployPsExecResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\deploy-psexec.ps1" - -Write-Host "deploy-psexec.ps1 output: $($DeployPsExecResult.value.Message)" - -#################################################################################################### -function Invoke-ScriptWithPrefix { - param( - [string]$ScriptName, - [switch]$AddAdminPw, - [switch]$AddCudnnUrl - ) - - Write-Progress ` - -Activity $ProgressActivity ` - -Status "Running provisioning script $ScriptName in VM" ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - - $DropToAdminUserPrefix = Get-Content "$PSScriptRoot\drop-to-admin-user-prefix.ps1" -Encoding utf8NoBOM -Raw - $UtilityPrefixContent = Get-Content "$PSScriptRoot\utility-prefix.ps1" -Encoding utf8NoBOM -Raw - - $tempScriptFilename = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + ".txt" - try { - $script = Get-Content "$PSScriptRoot\$ScriptName" -Encoding utf8NoBOM -Raw - if ($AddAdminPw) { - $script = $script.Replace('# REPLACE WITH DROP-TO-ADMIN-USER-PREFIX.ps1', $DropToAdminUserPrefix) - } - - if ($AddCudnnUrl) { - $script = $script.Replace('# REPLACE WITH $CudnnUrl', "`$CudnnUrl = '$CudnnBlobUrl'") - } - - $script = $script.Replace('# REPLACE WITH UTILITY-PREFIX.ps1', $UtilityPrefixContent); - Set-Content -Path $tempScriptFilename -Value $script -Encoding utf8NoBOM - - $parameter = $null - if ($AddAdminPw) { - $parameter = @{AdminUserPassword = $AdminPW;} - } - - $InvokeResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunPowerShellScript' ` - -ScriptPath $tempScriptFilename ` - -Parameter $parameter - - Write-Host "$ScriptName output: $($InvokeResult.value.Message)" - } finally { - Remove-Item $tempScriptFilename -Force - } -} - -Invoke-ScriptWithPrefix -ScriptName 'deploy-windows-sdks.ps1' -AddAdminPw -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Invoke-ScriptWithPrefix -ScriptName 'deploy-visual-studio.ps1' -AddAdminPw -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Invoke-ScriptWithPrefix -ScriptName 'deploy-mpi.ps1' -AddAdminPw -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Invoke-ScriptWithPrefix -ScriptName 'deploy-cuda.ps1' -AddAdminPw -AddCudnnUrl -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Invoke-ScriptWithPrefix -ScriptName 'deploy-inteloneapi.ps1' -AddAdminPw -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Invoke-ScriptWithPrefix -ScriptName 'deploy-pwsh.ps1' -AddAdminPw -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Running provisioning script deploy-settings.txt (as a .ps1) in VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$ProvisionImageResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\deploy-settings.txt" - -Write-Host "deploy-settings.txt output: $($ProvisionImageResult.value.Message)" - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Deploying SAS token into VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$tempScriptFilename = [System.IO.Path]::GetTempPath() + [System.IO.Path]::GetRandomFileName() + ".txt" -try { - $script = "Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' " ` - + "-Name PROVISIONED_AZURE_STORAGE_NAME " ` - + "-Value '$StorageAccountName'`r`n" ` - + "Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' " ` - + "-Name PROVISIONED_AZURE_STORAGE_SAS_TOKEN " ` - + "-Value '$SasToken'`r`n" - - Write-Host "Script content is:" - Write-Host $script - - Set-Content -Path $tempScriptFilename -Value $script -Encoding utf8NoBOM - $InvokeResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunPowerShellScript' ` - -ScriptPath $tempScriptFilename - - Write-Host "Deploy SAS token output: $($InvokeResult.value.Message)" -} finally { - Remove-Item $tempScriptFilename -Force -} - -Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -if ($MakeInstalledDisk) { - Invoke-ScriptWithPrefix -ScriptName 'deploy-install-disk.ps1' - Restart-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -} - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Running provisioning script sysprep.ps1 in VM' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -$SysprepResult = Invoke-AzVMRunCommand ` - -ResourceGroupName $ResourceGroupName ` - -VMName $ProtoVMName ` - -CommandId 'RunPowerShellScript' ` - -ScriptPath "$PSScriptRoot\sysprep.ps1" - -Write-Host "sysprep.ps1 output: $($SysprepResult.value.Message)" - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Waiting for VM to shut down' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -Wait-Shutdown -ResourceGroupName $ResourceGroupName -Name $ProtoVMName - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Converting VM to Image' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -Stop-AzVM ` - -ResourceGroupName $ResourceGroupName ` - -Name $ProtoVMName ` - -Force - -Set-AzVM ` - -ResourceGroupName $ResourceGroupName ` - -Name $ProtoVMName ` - -Generalized - -$VM = Get-AzVM -ResourceGroupName $ResourceGroupName -Name $ProtoVMName -$PrototypeOSDiskName = $VM.StorageProfile.OsDisk.Name -$ImageConfig = New-AzImageConfig -Location $Location -SourceVirtualMachineId $VM.ID -$ImageName = "$Prefix-BaseImage" -$Image = New-AzImage -Image $ImageConfig -ImageName $ImageName -ResourceGroupName $ResourceGroupName - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Deleting unused VM and disk' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) - -Remove-AzVM -Id $VM.ID -Force -Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $PrototypeOSDiskName -Force -if ($MakeInstalledDisk) { - Remove-AzDisk -ResourceGroupName $ResourceGroupName -DiskName $InstallDiskName -Force -} - -#################################################################################################### -Write-Progress ` - -Activity $ProgressActivity ` - -Status 'Creating scale set' ` - -PercentComplete (100 / $TotalProgress * $CurrentProgress++) +New-AzResourceGroup -Name $ResourceGroupName -Location $Location +$VirtualNetwork = Create-LockedDownNetwork -ResourceGroupName $ResourceGroupName -Location $Location $VmssIpConfigName = $ResourceGroupName + 'VmssIpConfig' -$VmssIpConfig = New-AzVmssIpConfig -SubnetId $Nic.IpConfigurations[0].Subnet.Id -Primary -Name $VmssIpConfigName +$VmssIpConfig = New-AzVmssIpConfig -SubnetId $VirtualNetwork.Subnets[0].Id -Primary -Name $VmssIpConfigName $VmssName = $ResourceGroupName + 'Vmss' $Vmss = New-AzVmssConfig ` -Location $Location ` @@ -513,11 +55,18 @@ $Vmss = New-AzVmssConfig ` -Priority Spot ` -MaxPrice -1 +$NicName = $ResourceGroupName + 'NIC' +New-AzNetworkInterface ` + -Name $NicName ` + -ResourceGroupName $ResourceGroupName ` + -Location $Location ` + -Subnet $VirtualNetwork.Subnets[0] + $Vmss = Add-AzVmssNetworkInterfaceConfiguration ` -VirtualMachineScaleSet $Vmss ` -Primary $true ` -IpConfiguration $VmssIpConfig ` - -NetworkSecurityGroupId $NetworkSecurityGroup.Id ` + -NetworkSecurityGroupId $VirtualNetwork.Subnets[0].NetworkSecurityGroup.Id ` -Name $NicName $Vmss = Set-AzVmssOsProfile ` @@ -540,10 +89,6 @@ New-AzVmss ` -Name $VmssName ` -VirtualMachineScaleSet $Vmss -#################################################################################################### -Write-Progress -Activity $ProgressActivity -Completed Write-Host "Location: $Location" Write-Host "Resource group name: $ResourceGroupName" -Write-Host "User name: AdminUser" -Write-Host "Using generated password: $AdminPW" Write-Host 'Finished!' diff --git a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 index b766385a308511..d500745840a1b9 100644 --- a/scripts/azure-pipelines/windows/deploy-pwsh.ps1 +++ b/scripts/azure-pipelines/windows/deploy-pwsh.ps1 @@ -5,5 +5,5 @@ # REPLACE WITH UTILITY-PREFIX.ps1 -$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.1.3/PowerShell-7.1.3-win-x64.msi' +$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x64.msi' InstallMSI -Url $PwshUrl -Name 'PowerShell Core' diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 index 2de2de919556ca..0ec5ff7110688c 100644 --- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 +++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 @@ -18,6 +18,7 @@ $Workloads = @( 'Microsoft.VisualStudio.Component.Windows10SDK.18362', 'Microsoft.VisualStudio.Component.Windows10SDK.19041', 'Microsoft.Net.Component.4.8.SDK', + 'Microsoft.Net.Component.4.7.2.TargetingPack', 'Microsoft.Component.NetFX.Native', 'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset', 'Microsoft.VisualStudio.Component.VC.Llvm.Clang', diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 3691de2980b907..ea5c221d99f845 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -155,10 +155,10 @@ ninja-freebsd-1.8.2.zip - 7.1.3 + 7.1.4 pwsh.exe - https://github.com/PowerShell/PowerShell/releases/download/v7.1.3/PowerShell-7.1.3-win-x86.zip - 8c2ce510b5c641aad2da6adefc92d47e09bc842d47db3b5d15e14859555a74fe13ad52eaeabf1b2954ca9af737e628b567731c8a3db9bbf0e4aad05279bc1fd8 - PowerShell-7.1.3-win-x86.zip + https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x86.zip + cf30f80edb57f37501c4a380a8ddd8adf016a51a988a315e15ef517fdae42313ddf5260d8374db65ef12808ec980118bc8b543256df0c1d641a5b8355a80ba7b + PowerShell-7.1.4-win-x86.zip From 67dfb12bd0ad82a39449dcbb56d066c8397133b5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 13 Sep 2021 22:25:29 +0200 Subject: [PATCH 0516/1858] [lz4] Install pc file, cleanup (#20108) * Drop unused xxhash dependency * Modernize portfile * Install pc file * x-add-version * Switch to 'version' field * Update versions * Fix liblz4 pc file name * Update versions --- ports/lz4/CMakeLists.txt | 8 ++++++++ ports/lz4/portfile.cmake | 35 ++++++++++++++++++++--------------- ports/lz4/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 2 +- versions/l-/lz4.json | 5 +++++ 5 files changed, 44 insertions(+), 19 deletions(-) diff --git a/ports/lz4/CMakeLists.txt b/ports/lz4/CMakeLists.txt index 1e272dd4563911..142a229006f7c2 100644 --- a/ports/lz4/CMakeLists.txt +++ b/ports/lz4/CMakeLists.txt @@ -47,3 +47,11 @@ install(EXPORT lz4Config # Export the package for use from the build-tree (this registers the build-tree with a global CMake-registry) export(PACKAGE lz4) + +# Create pkgconfig module file +file(STRINGS "lib/lz4.h" LZ4_H REGEX "^#define LZ4_VERSION_(MAJOR|MINOR|RELEASE) ") +string(REGEX REPLACE "^.*MAJOR +([0-9]+).*MINOR +([0-9]+).*RELEASE +([0-9]+).*$" "\\1.\\2.\\3" VERSION "${LZ4_H}") +set(INCLUDEDIR [[${prefix}/include]]) +set(LIBDIR [[${prefix}/lib]]) +configure_file(lib/liblz4.pc.in lib/liblz4.pc) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lib/liblz4.pc" DESTINATION "lib/pkgconfig") diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake index 9b035c8ae5d4db..63e858ba8bf9c1 100644 --- a/ports/lz4/portfile.cmake +++ b/ports/lz4/portfile.cmake @@ -6,30 +6,35 @@ vcpkg_from_github( HEAD_REF dev ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + set(DLL_IMPORT "1 && defined(_MSC_VER)") +else() + set(DLL_IMPORT "0") +endif() foreach(FILE lz4.h lz4frame.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/${FILE} LZ4_HEADER) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "1 && defined(_MSC_VER)" LZ4_HEADER "${LZ4_HEADER}") - else() - string(REPLACE "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" "0" LZ4_HEADER "${LZ4_HEADER}") - endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/${FILE} "${LZ4_HEADER}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${FILE}" + "defined(LZ4_DLL_IMPORT) && (LZ4_DLL_IMPORT==1)" + "${DLL_IMPORT}" + ) endforeach() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lz4.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lz4.pc" " -llz4" " -llz4d") +endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/lib/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/lib/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lz4/vcpkg.json b/ports/lz4/vcpkg.json index f38d5defb7284e..0faa4629100c6d 100644 --- a/ports/lz4/vcpkg.json +++ b/ports/lz4/vcpkg.json @@ -1,10 +1,17 @@ { "name": "lz4", - "version-string": "1.9.3", - "port-version": 1, + "version": "1.9.3", + "port-version": 2, "description": "Lossless compression algorithm, providing compression speed at 400 MB/s per core.", "homepage": "https://github.com/lz4/lz4", "dependencies": [ - "xxhash" + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 476e25956d073d..63373ccf35af00 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3982,7 +3982,7 @@ }, "lz4": { "baseline": "1.9.3", - "port-version": 1 + "port-version": 2 }, "lzfse": { "baseline": "1.0", diff --git a/versions/l-/lz4.json b/versions/l-/lz4.json index 273f8d948008ee..b8801b1d59c11b 100644 --- a/versions/l-/lz4.json +++ b/versions/l-/lz4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c73172e611edeb3ef440fd1ea7ef4fe746237cfc", + "version": "1.9.3", + "port-version": 2 + }, { "git-tree": "05857030abda5345ee64ed534732f07147844de6", "version-string": "1.9.3", From 3ea691ac1965a00ae8564d313e7969c1483d5157 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 13 Sep 2021 23:32:56 +0200 Subject: [PATCH 0517/1858] re-enable qt5-activeqt (#20083) * remove qt5-activeqt from baseline * add colmap as baseline fail --- scripts/ci.baseline.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 73ed5b0034873b..f3ee0b4f5f2b4a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -147,6 +147,7 @@ cmcstl2:x86-windows = skip coin:arm64-windows=fail coin:arm-uwp=fail coin:x64-uwp=fail +colmap:x64-windows-static=fail concurrencpp:x64-linux=fail concurrencpp:x64-osx=fail constexpr-contracts:x64-linux=fail @@ -1282,14 +1283,6 @@ qt5-x11extras:x86-windows=fail qt5-x11extras:x64-windows=fail qt5-x11extras:x64-windows-static=fail qt5-x11extras:x64-windows-static-md=fail -# Conflicts with qt5-declarative, see https://github.com/microsoft/vcpkg/issues/19922 -qt5-activeqt:arm-uwp=skip -qt5-activeqt:arm64-windows=skip -qt5-activeqt:x64-uwp=skip -qt5-activeqt:x64-windows-static-md=skip -qt5-activeqt:x64-windows-static=skip -qt5-activeqt:x64-windows=skip -qt5-activeqt:x86-windows=skip quickfix:arm-uwp=fail quickfix:arm64-windows=fail quickfix:x64-uwp=fail From 39f1054df15d0a54649c9cee3b17bd756d27e9e1 Mon Sep 17 00:00:00 2001 From: Matthieu Penant Date: Mon, 13 Sep 2021 17:39:54 -0400 Subject: [PATCH 0518/1858] [libarchive] update to 3.5.2 (#16845) * libarchive 3.5.1 attempt to create package - error on libiconv. * update sha based on build error * Turn off the CMAKE_USE_SYSTEM_LIBARCHIVE option * remove unused patches * remove empty patches * Update scripts/test_ports/cmake/portfile.cmake Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> * revisit control file -> vcpkg.json * recover patch files * remove port version per auto-review * restore INCLUDE(CreatePkgConfigFile) * update git-tree after merge * patches not referenced #facepalm * Update libarchive.json * added missing FEATURES keyword * update git-tree + merge fix * Update libarchive.json * Update libarchive.json * Update libarchive.json * libarchive 3.5.2 * formatting + git-tree * Update libarchive.json * should not remove wrapper ? * Update libarchive.json * revert patch original EOF * update version Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Seika --- ports/libarchive/portfile.cmake | 14 +++++++++----- ports/libarchive/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libarchive.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 02c44a603bee25..11d5e984252e60 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -3,14 +3,14 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libarchive/libarchive - REF fc6563f5130d8a7ee1fc27c0e55baef35119f26c #v3.4.3 - SHA512 54ca4f3cc3b38dcf6588b2369ce43109c4a57a04061348ab8bf046c5c13ace0c4f42c9f3961288542cb5fe12c05359d572b39fe7cec32a10151dbac78e8a3707 + REF 1b2c437b99b361c7692538fa373e99955e9b93ae #v3.5.2 + SHA512 df527dd333b01ed85f07831ba0bd4b1d0b5384fe12cfa53474ad39c04509105a3c8574a2d21a430e3584a931c8f6ae923bca95df83945f0c593c1ffaed3f62da HEAD_REF master - PATCHES + PATCHES + disable-warnings.patch fix-buildsystem.patch - fix-dependencies.patch fix-cpu-set.patch - disable-warnings.patch + fix-dependencies.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -77,6 +77,10 @@ configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRE file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR}/include/archive_entry.h) file(READ ${HEADER} CONTENTS) string(REPLACE "(!defined LIBARCHIVE_STATIC)" "0" CONTENTS "${CONTENTS}") diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 53650dc2d8fe20..2f36a138583471 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libarchive", - "version-semver": "3.4.3", - "port-version": 8, + "version-semver": "3.5.2", "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 63373ccf35af00..01a9c09aaebb72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3125,8 +3125,8 @@ "port-version": 7 }, "libarchive": { - "baseline": "3.4.3", - "port-version": 8 + "baseline": "3.5.2", + "port-version": 0 }, "libass": { "baseline": "0.15.1", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index 689a49eec5fb17..dc2c72e0e40416 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ce798873a82e4562c34189ec77f1dec3dea047d", + "version-semver": "3.5.2", + "port-version": 0 + }, { "git-tree": "576d8d60f06c8b4c616fd55559f3da94b9a8ae27", "version-semver": "3.4.3", From c6697394dbeee661ea08ee1cc66b760f57f48171 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 13 Sep 2021 23:41:20 +0200 Subject: [PATCH 0519/1858] [gdal] Make building executables optional (#19243) * [gdal] Optional "tool" feature to build executables Fixes #19189 * x-add-version * Fix remove of tools * Always delete the debug tools * Add patch to make tools build optional (non-windows) * Update patch to make tools build optional (windows) * Update git-tree * Update tools patch * Update git-tree * Revise windows tools handling * x-add-version * Remove empty bin dir * Update git-tree * Remove obsolete static tools patch * Update git-tree * update * reindent * x-add-version * restore version Co-authored-by: Kai Pastor --- ports/gdal/0003-Fix-static-build.patch | 22 -- ports/gdal/0007-Control-tools.patch | 83 ++++++ ports/gdal/portfile.cmake | 346 +++++++++++++------------ ports/gdal/vcpkg.json | 5 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 + 6 files changed, 273 insertions(+), 190 deletions(-) delete mode 100644 ports/gdal/0003-Fix-static-build.patch create mode 100644 ports/gdal/0007-Control-tools.patch diff --git a/ports/gdal/0003-Fix-static-build.patch b/ports/gdal/0003-Fix-static-build.patch deleted file mode 100644 index 42f76d205cf471..00000000000000 --- a/ports/gdal/0003-Fix-static-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/makefile.vc b/makefile.vc -index 8559f79..87f8fc9 100644 ---- a/makefile.vc -+++ b/makefile.vc -@@ -61,7 +61,7 @@ TARGET_LIB = staticlib - - DEFAULT_TARGETS = - --default: $(TARGET_LIB) $(PLUGIN_TARGET) apps_dir -+default: $(TARGET_LIB) $(PLUGIN_TARGET) - - # Batch commands to clean main build output are stored in a macro so they can be reused by different - # targets in an inline temporary batch file. -@@ -230,8 +230,6 @@ install: default docs - if exist $(GDAL_DLL) $(INSTALL) $(GDAL_DLL) $(BINDIR) - cd frmts - $(MAKE) /f makefile.vc plugins-install -- cd ..\apps -- $(MAKE) /f makefile.vc install - cd .. - $(INSTALL) data\*.* "$(DATADIR)" - $(INSTALL) LICENSE.TXT "$(DATADIR)" diff --git a/ports/gdal/0007-Control-tools.patch b/ports/gdal/0007-Control-tools.patch new file mode 100644 index 00000000000000..7c2b8ce7243e2a --- /dev/null +++ b/ports/gdal/0007-Control-tools.patch @@ -0,0 +1,83 @@ +diff --git a/GDALmake.opt.in b/GDALmake.opt.in +index 07955b2..0d79ac3 100644 +--- a/GDALmake.opt.in ++++ b/GDALmake.opt.in +@@ -660,3 +660,6 @@ O_OBJ = $(foreach file,$(OBJ),../o/$(file)) + + %-clean: + $(MAKE) -C $* clean ++ ++ ++BUILD_TOOLS = @BUILD_TOOLS@ +\ No newline at end of file +diff --git a/apps/GNUmakefile b/apps/GNUmakefile +index 9624cf7..f91403d 100644 +--- a/apps/GNUmakefile ++++ b/apps/GNUmakefile +@@ -43,6 +43,11 @@ NON_DEFAULT_LIST = multireadtest$(EXE) dumpoverviews$(EXE) \ + gdaltorture$(EXE) gdal2ogr$(EXE) test_ogrsf$(EXE) \ + gdalasyncread$(EXE) testreprojmulti$(EXE) + ++ifeq ($(BUILD_TOOLS),no) ++BIN_LIST = ++NON_DEFAULT_LIST = ++endif ++ + default: gdal-config-inst gdal-config $(BIN_LIST) + + all: default $(NON_DEFAULT_LIST) +diff --git a/apps/makefile.vc b/apps/makefile.vc +index 6e1fc9b..66f9b29 100644 +--- a/apps/makefile.vc ++++ b/apps/makefile.vc +@@ -20,6 +20,7 @@ GNM_PROGRAMS = gnmmanage.exe gnmanalyse.exe + !ENDIF + + ++!IF "$(BUILD_TOOLS)" == "1" + default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ + nearblack.exe gdalmanage.exe gdalenhance.exe gdaltransform.exe\ + gdaldem.exe gdallocationinfo.exe gdalsrsinfo.exe gdalmdiminfo.exe \ +@@ -28,6 +29,10 @@ default: gdal_translate.exe gdalinfo.exe gdaladdo.exe gdalwarp.exe \ + all: default multireadtest.exe \ + dumpoverviews.exe gdalwarpsimple.exe gdalflattenmask.exe \ + gdaltorture.exe gdal2ogr.exe test_ogrsf.exe ++!ELSE ++default: ++all: ++!ENDIF + OBJ = commonutils.obj gdalinfo_lib.obj gdal_translate_lib.obj gdalwarp_lib.obj ogr2ogr_lib.obj \ + gdaldem_lib.obj nearblack_lib.obj gdal_grid_lib.obj gdal_rasterize_lib.obj gdalbuildvrt_lib.obj \ + gdalmdiminfo_lib.obj gdalmdimtranslate_lib.obj +@@ -223,5 +228,9 @@ clean: + -del *.manifest + -del *.exp + ++!IF "$(BUILD_TOOLS)" == "1" + install: default + copy *.exe $(BINDIR) ++!ELSE ++install: ++!ENDIF +\ No newline at end of file +diff --git a/configure.ac b/configure.ac +index b88676a..0a46a9c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6150,6 +6150,16 @@ case "${host_os}" in + ;; + esac + ++BUILD_TOOLS=yes ++AC_ARG_WITH([tools], AS_HELP_STRING([--with-tools], [Build the tools]),,) ++if test "$with_tools" = "yes"; then ++ AC_MSG_RESULT([enabled]) ++else ++ BUILD_TOOLS=no ++ AC_MSG_RESULT([disabled by user]) ++fi ++AC_SUBST(BUILD_TOOLS,$BUILD_TOOLS) ++ + AC_OUTPUT(GDALmake.opt) + + dnl --------------------------------------------------------------------------- diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index fc46f224d9ad6b..10d1e42fca12a7 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -9,17 +9,16 @@ vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/gdal/${GDAL_VERSION_STR}/gdal${GDAL_VERSION_PKG}.zip" FILENAME "gdal${GDAL_VERSION_PKG}.zip" SHA512 ${GDAL_PACKAGE_SUM} -) + ) set(GDAL_PATCHES 0001-Fix-debug-crt-flags.patch 0002-Fix-build.patch 0004-Fix-cfitsio.patch 0005-Fix-configure.patch -) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND GDAL_PATCHES 0003-Fix-static-build.patch) -else() + 0007-Control-tools.patch + ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch) endif() @@ -27,171 +26,179 @@ vcpkg_extract_source_archive_ex( ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES ${GDAL_PATCHES} -) + ) if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") - set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") - - include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") - find_dependency_win() - - set(NMAKE_OPTIONS "") - set(NMAKE_OPTIONS_REL "") - set(NMAKE_OPTIONS_DBG "") - - if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) - list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}") - list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${MYSQL_LIBRARY_REL}") - list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${MYSQL_LIBRARY_DBG}") - endif() - - list(APPEND NMAKE_OPTIONS - "DATADIR=${NATIVE_DATA_DIR}" - "HTMLDIR=${NATIVE_HTML_DIR}" - "GEOS_DIR=${GEOS_INCLUDE_DIR}" - "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS" - "PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}" - "EXPAT_DIR=${EXPAT_INCLUDE_DIR}" - "EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}" - "CURL_INC=-I${CURL_INCLUDE_DIR}" - "SQLITE_INC=-I${SQLITE_INCLUDE_DIR} ${HAVE_SPATIALITE}" - "PG_INC_DIR=${PGSQL_INCLUDE_DIR}" - OPENJPEG_ENABLED=YES - "OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}" - OPENJPEG_VERSION=20100 - WEBP_ENABLED=YES - "WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}" - "LIBXML2_INC=-I${XML2_INCLUDE_DIR}" - PNG_EXTERNAL_LIB=1 - "PNGDIR=${PNG_INCLUDE_DIR}" - "ZLIB_INC=-I${ZLIB_INCLUDE_DIR}" - ZLIB_EXTERNAL_LIB=1 - ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 - MSVC_VER=1900 - ) - - if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") - list(APPEND NMAKE_OPTIONS WIN64=YES) - endif() - - if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB) - list(APPEND NMAKE_OPTIONS DLLBUILD=0) - list(APPEND NMAKE_OPTIONS "PROJ_FLAGS=-DPROJ_STATIC -DPROJ_VERSION=5") - else() - # Enables PDBs for release and debug builds - list(APPEND NMAKE_OPTIONS WITH_PDB=1) - list(APPEND NMAKE_OPTIONS DLLBUILD=1) - endif() - - if (VCPKG_CRT_LINKAGE STREQUAL "static") - set(LINKAGE_FLAGS "/MT") - else() - set(LINKAGE_FLAGS "/MD") - endif() - - list(APPEND NMAKE_OPTIONS_REL - ${NMAKE_OPTIONS} - "GDAL_HOME=${CURRENT_PACKAGES_DIR}" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" - "PROJ_LIBRARY=${PROJ_LIBRARY_REL}" - "PNG_LIB=${PNG_LIBRARY_REL}" - "GEOS_LIB=${GEOS_LIBRARY_REL}" - "EXPAT_LIB=${EXPAT_LIBRARY_REL}" - "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib" - "SQLITE_LIB=${SQLITE_LIBRARY_REL} ${SPATIALITE_LIBRARY_REL}" - "OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}" - "WEBP_LIBS=${WEBP_LIBRARY_REL}" - "LIBXML2_LIB=${XML2_LIBRARY_REL} ${ICONV_LIBRARY_REL} ${LZMA_LIBRARY_REL}" - "ZLIB_LIB=${ZLIB_LIBRARY_REL}" - "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_REL}" - ) - - list(APPEND NMAKE_OPTIONS_DBG - ${NMAKE_OPTIONS} - "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" - "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" - "PROJ_LIBRARY=${PROJ_LIBRARY_DBG}" - "PNG_LIB=${PNG_LIBRARY_DBG}" - "GEOS_LIB=${GEOS_LIBRARY_DBG}" - "EXPAT_LIB=${EXPAT_LIBRARY_DBG}" - "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib" - "SQLITE_LIB=${SQLITE_LIBRARY_DBG} ${SPATIALITE_LIBRARY_DBG}" - "OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}" - "WEBP_LIBS=${WEBP_LIBRARY_DBG}" - "LIBXML2_LIB=${XML2_LIBRARY_DBG} ${ICONV_LIBRARY_DBG} ${LZMA_LIBRARY_DBG}" - "ZLIB_LIB=${ZLIB_LIBRARY_DBG}" - "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_DBG}" - DEBUG=1 - ) - - # Begin build process - vcpkg_install_nmake( - SOURCE_PATH "${SOURCE_PATH}" - TARGET devinstall - OPTIONS_RELEASE + set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") + set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") + + include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") + find_dependency_win() + + set(NMAKE_OPTIONS "") + set(NMAKE_OPTIONS_REL "") + set(NMAKE_OPTIONS_DBG "") + + if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}") + list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${MYSQL_LIBRARY_REL}") + list(APPEND NMAKE_OPTIONS_DBG "MYSQL_LIB=${MYSQL_LIBRARY_DBG}") + endif() + + list(APPEND NMAKE_OPTIONS + "DATADIR=${NATIVE_DATA_DIR}" + "HTMLDIR=${NATIVE_HTML_DIR}" + "GEOS_DIR=${GEOS_INCLUDE_DIR}" + "GEOS_CFLAGS=-I${GEOS_INCLUDE_DIR} -DHAVE_GEOS" + "PROJ_INCLUDE=-I${PROJ_INCLUDE_DIR}" + "EXPAT_DIR=${EXPAT_INCLUDE_DIR}" + "EXPAT_INCLUDE=-I${EXPAT_INCLUDE_DIR}" + "CURL_INC=-I${CURL_INCLUDE_DIR}" + "SQLITE_INC=-I${SQLITE_INCLUDE_DIR} ${HAVE_SPATIALITE}" + "PG_INC_DIR=${PGSQL_INCLUDE_DIR}" + OPENJPEG_ENABLED=YES + "OPENJPEG_CFLAGS=-I${OPENJPEG_INCLUDE_DIR}" + OPENJPEG_VERSION=20100 + WEBP_ENABLED=YES + "WEBP_CFLAGS=-I${WEBP_INCLUDE_DIR}" + "LIBXML2_INC=-I${XML2_INCLUDE_DIR}" + PNG_EXTERNAL_LIB=1 + "PNGDIR=${PNG_INCLUDE_DIR}" + "ZLIB_INC=-I${ZLIB_INCLUDE_DIR}" + ZLIB_EXTERNAL_LIB=1 + ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 + MSVC_VER=1900 + ) + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + list(APPEND NMAKE_OPTIONS WIN64=YES) + endif() + + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND NMAKE_OPTIONS CURL_CFLAGS=-DCURL_STATICLIB) + list(APPEND NMAKE_OPTIONS DLLBUILD=0) + list(APPEND NMAKE_OPTIONS "PROJ_FLAGS=-DPROJ_STATIC -DPROJ_VERSION=5") + else() + # Enables PDBs for release and debug builds + list(APPEND NMAKE_OPTIONS WITH_PDB=1) + list(APPEND NMAKE_OPTIONS DLLBUILD=1) + endif() + + if (VCPKG_CRT_LINKAGE STREQUAL "static") + set(LINKAGE_FLAGS "/MT") + else() + set(LINKAGE_FLAGS "/MD") + endif() + + list(APPEND NMAKE_OPTIONS_REL + ${NMAKE_OPTIONS} + "GDAL_HOME=${CURRENT_PACKAGES_DIR}" + "CXX_CRT_FLAGS=${LINKAGE_FLAGS}" + "PROJ_LIBRARY=${PROJ_LIBRARY_REL}" + "PNG_LIB=${PNG_LIBRARY_REL}" + "GEOS_LIB=${GEOS_LIBRARY_REL}" + "EXPAT_LIB=${EXPAT_LIBRARY_REL}" + "CURL_LIB=${CURL_LIBRARY_REL} wsock32.lib wldap32.lib winmm.lib" + "SQLITE_LIB=${SQLITE_LIBRARY_REL} ${SPATIALITE_LIBRARY_REL}" + "OPENJPEG_LIB=${OPENJPEG_LIBRARY_REL}" + "WEBP_LIBS=${WEBP_LIBRARY_REL}" + "LIBXML2_LIB=${XML2_LIBRARY_REL} ${ICONV_LIBRARY_REL} ${LZMA_LIBRARY_REL}" + "ZLIB_LIB=${ZLIB_LIBRARY_REL}" + "PG_LIB=${PGSQL_LIBRARY_REL} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_REL}" + ) + + list(APPEND NMAKE_OPTIONS_DBG + ${NMAKE_OPTIONS} + "GDAL_HOME=${CURRENT_PACKAGES_DIR}/debug" + "CXX_CRT_FLAGS=${LINKAGE_FLAGS}d" + "PROJ_LIBRARY=${PROJ_LIBRARY_DBG}" + "PNG_LIB=${PNG_LIBRARY_DBG}" + "GEOS_LIB=${GEOS_LIBRARY_DBG}" + "EXPAT_LIB=${EXPAT_LIBRARY_DBG}" + "CURL_LIB=${CURL_LIBRARY_DBG} wsock32.lib wldap32.lib winmm.lib" + "SQLITE_LIB=${SQLITE_LIBRARY_DBG} ${SPATIALITE_LIBRARY_DBG}" + "OPENJPEG_LIB=${OPENJPEG_LIBRARY_DBG}" + "WEBP_LIBS=${WEBP_LIBRARY_DBG}" + "LIBXML2_LIB=${XML2_LIBRARY_DBG} ${ICONV_LIBRARY_DBG} ${LZMA_LIBRARY_DBG}" + "ZLIB_LIB=${ZLIB_LIBRARY_DBG}" + "PG_LIB=${PGSQL_LIBRARY_DBG} Secur32.lib Shell32.lib Advapi32.lib Crypt32.lib Gdi32.lib ${OPENSSL_LIBRARY_DBG}" + DEBUG=1 + ) + + if("tools" IN_LIST FEATURES) + list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=1") + else() + list(APPEND NMAKE_OPTIONS_REL "BUILD_TOOLS=0") + endif() + list(APPEND NMAKE_OPTIONS_DBG "BUILD_TOOLS=0") + + # Begin build process + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + TARGET devinstall + OPTIONS_RELEASE "${NMAKE_OPTIONS_REL}" - OPTIONS_DEBUG + OPTIONS_DEBUG "${NMAKE_OPTIONS_DBG}" - ) - - if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/gdal/html") - endif() - - if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(GDAL_EXES - gdal_contour - gdal_create - gdal_grid - gdal_rasterize - gdal_translate - gdal_viewshed - gdaladdo - gdalbuildvrt - gdaldem - gdalenhance - gdalinfo - gdallocationinfo - gdalmanage - gdalmdiminfo - gdalmdimtranslate - gdalsrsinfo - gdaltindex - gdaltransform - gdalwarp - gnmanalyse - gnmmanage - nearblack - ogr2ogr - ogrinfo - ogrlineref - ogrtindex - testepsg - ) - vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) - else() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/share/gdal/html") - - vcpkg_copy_pdbs() - - if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb") - endif() + ) + + if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/gdal/html") + endif() + + if("tools" IN_LIST FEATURES) + set(GDAL_EXES + gdal_contour + gdal_create + gdal_grid + gdal_rasterize + gdal_translate + gdal_viewshed + gdaladdo + gdalbuildvrt + gdaldem + gdalenhance + gdalinfo + gdallocationinfo + gdalmanage + gdalmdiminfo + gdalmdimtranslate + gdalsrsinfo + gdaltindex + gdaltransform + gdalwarp + gnmanalyse + gnmmanage + nearblack + ogr2ogr + ogrinfo + ogrlineref + ogrtindex + testepsg + ) + # vcpkg_copy_tools removed the bin directories for us so no need to remove again + vcpkg_copy_tools(TOOL_NAMES ${GDAL_EXES} AUTO_CLEAN) + elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/share/gdal/html") + + vcpkg_copy_pdbs() + + if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/gdal204.pdb") + endif() else() # See https://github.com/microsoft/vcpkg/issues/16990 file(TOUCH "${SOURCE_PATH}/config.rpath") - + set(CONF_OPTS --with-hide-internal-symbols=yes --with-perl=no --with-python=no --with-java=no - ) + ) set(CONF_CHECKS "") function(add_config option check) list(APPEND CONF_OPTS "${option}") @@ -299,7 +306,7 @@ else() --with-teigha=no --with-tiledb=no --with-xerces=no - ) + ) endif() # proj needs a C++ runtime library @@ -309,15 +316,22 @@ else() list(APPEND CONF_OPTS "--with-proj-extra-lib-for-test=-lstdc++") endif() + if("tools" IN_LIST FEATURES) + list(APPEND CONF_OPTS "--with-tools=yes") + else() + list(APPEND CONF_OPTS "--with-tools=no") + endif() + vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG COPY_SOURCE OPTIONS - ${CONF_OPTS} + ${CONF_OPTS} OPTIONS_DEBUG - --enable-debug - ) + --enable-debug + --with-tools=no + ) # Verify configuration results (tightly coupled to vcpkg_configure_make) function(check_config logfile) @@ -341,12 +355,12 @@ else() endforeach() vcpkg_install_make(MAKEFILE GNUmakefile) - + file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/lib/gdalplugins" - "${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins" - "${CURRENT_PACKAGES_DIR}/debug/share" - ) + "${CURRENT_PACKAGES_DIR}/lib/gdalplugins" + "${CURRENT_PACKAGES_DIR}/debug/lib/gdalplugins" + "${CURRENT_PACKAGES_DIR}/debug/share" + ) vcpkg_fixup_pkgconfig() set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdal.pc") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 2bb7b63b114c34..12e83cb84d850b 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 4, + "port-version": 5, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", @@ -47,6 +47,9 @@ "system-libraries": { "$supports": "!windows", "description": "Include drivers which need additional libraries" + }, + "tools": { + "description": "Builds gdal and ogr executables" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 01a9c09aaebb72..654cbe96b6b052 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2270,7 +2270,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 4 + "port-version": 5 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 762f3061eeb770..bf73dab76cd942 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f821ae473a38c3ceac861552f560da4a9109ff8", + "version-semver": "3.2.2", + "port-version": 5 + }, { "git-tree": "b87df6a4a70bb9afb31992195a8ccc6e04d59663", "version-semver": "3.2.2", From 61f88eb7f437356617e3fdfff7fd88e1cf2e0882 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 13 Sep 2021 23:43:59 +0200 Subject: [PATCH 0520/1858] [Taskflow] update to 3.2.0 (#20122) * Update taskflow to 3.2.0 * Update CI baseline Co-authored-by: chausner --- ports/taskflow/portfile.cmake | 4 ++-- ports/taskflow/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/taskflow.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/taskflow/portfile.cmake b/ports/taskflow/portfile.cmake index 67fff78f023b7b..56e6564a3cfeff 100644 --- a/ports/taskflow/portfile.cmake +++ b/ports/taskflow/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taskflow/taskflow - REF 86460588739bc15205e491ed3ef35030f6bec040 #v3.1.0 - SHA512 c52952795f233f1e13d6d4f6e473bc8cfcfb6d245ba268874cb2fcb51766b2d57fc8a445a059ea215727f6f621c3fa95d1654223d21a6771a27a02048f904f5d + REF cbcf750895259d1e01089d4cc4535dc962bc7848 #v3.2.0 + SHA512 584f81a8c9d314fbd5bc3497cead659488e17ded90cca9144e867ea5d18f50bd8bc554eaefc21ed82e73b5c92a89c5502434e214b0543b65442a2c261d2ef396 HEAD_REF master ) diff --git a/ports/taskflow/vcpkg.json b/ports/taskflow/vcpkg.json index bf4d7f9052f63c..a71f3220841c39 100644 --- a/ports/taskflow/vcpkg.json +++ b/ports/taskflow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "taskflow", - "version": "3.1.0", + "version": "3.2.0", "description": "Fast Parallel Tasking Programming Library using Modern C++", "homepage": "https://github.com/taskflow/taskflow" } diff --git a/versions/baseline.json b/versions/baseline.json index 654cbe96b6b052..f2b47b35e962c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6285,7 +6285,7 @@ "port-version": 1 }, "taskflow": { - "baseline": "3.1.0", + "baseline": "3.2.0", "port-version": 0 }, "tbb": { diff --git a/versions/t-/taskflow.json b/versions/t-/taskflow.json index 2fc31899f783b9..4d3bfdb830fd2b 100644 --- a/versions/t-/taskflow.json +++ b/versions/t-/taskflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49d827de9e8309cb0f16fbb84ec611a1a44d18ec", + "version": "3.2.0", + "port-version": 0 + }, { "git-tree": "0cdd85bb7b520cb75c0bf6f89cf01bb65cb53fd2", "version": "3.1.0", From f39322eafabbb2a51ac1e74aa1069d678f338937 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Mon, 13 Sep 2021 18:44:22 -0300 Subject: [PATCH 0521/1858] [Libuv] Fix iOS Build (#20117) * Use MacOS (Darwin) source files for building iOS version * Update version * Update version Co-authored-by: Ahmed Yarub Hani Al Nuaimi --- ports/libuv/CMakeLists.txt | 2 +- ports/libuv/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libuv/CMakeLists.txt b/ports/libuv/CMakeLists.txt index d400b60ba76e94..7d2c38bdbb307b 100644 --- a/ports/libuv/CMakeLists.txt +++ b/ports/libuv/CMakeLists.txt @@ -55,7 +55,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsSt add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_WIN}) target_compile_definitions(libuv PRIVATE WIN32_LEAN_AND_MEAN "_WIN32_WINNT=0x0600") target_link_libraries(libuv PRIVATE iphlpapi psapi shell32 userenv ws2_32) -elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") +elseif(APPLE) add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_DARWIN}) elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") add_library(libuv ${UV_SOURCES_COMMON} ${UV_SOURCES_UNIX} ${UV_SOURCES_FREEBSD}) diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 44b67b26cc168b..5033ece2a1009e 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libuv", "version-semver": "1.42.0", + "port-version": 1, "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f2b47b35e962c5..7b43aff30050bf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3806,7 +3806,7 @@ }, "libuv": { "baseline": "1.42.0", - "port-version": 0 + "port-version": 1 }, "libuvc": { "baseline": "2020-11-24", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 2faee63522eb0a..349c6570946795 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41003bf038eb10b7fd29029954d42a05fb3c1a86", + "version-semver": "1.42.0", + "port-version": 1 + }, { "git-tree": "cf96a59d9d41035fe89515464b3f93bcb9b84f27", "version-semver": "1.42.0", From 9a0f20ac66443a11a5b8dd4d9f63f2520d050eac Mon Sep 17 00:00:00 2001 From: ithewei Date: Tue, 14 Sep 2021 05:55:05 +0800 Subject: [PATCH 0522/1858] [libhv] update to v1.2.1 (#19794) * [libhv] update to v1.2.1 * vcpkg x-add-version libhv * [libhv] move dlls from lib to bin * vcpkg x-add-version --overwrite-version libhv * [libhv] mkdir bin * vcpkg x-add-version --overwrite-version libhv * Don't protect `file(MAKE_DIRECTORY` Co-authored-by: hewei.it Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III --- ports/libhv/portfile.cmake | 14 ++++++++++++-- ports/libhv/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libhv.json | 5 +++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake index f54897107b1452..2661a45667ef26 100644 --- a/ports/libhv/portfile.cmake +++ b/ports/libhv/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ithewei/libhv - REF v1.0.0 - SHA512 49d9e93444667ff143048abc05f88aab23ec5c543c58d0494bac9c29ac8216760220f19828bde6b84a5864bc8c5ec280ee4a72cc5ba888a4f02734240243cb07 + REF v1.2.1 + SHA512 c917b50a2def643b808782631cae33289b62193b9ccb95f4f7736f4d1256de72358931263d5cc06f4581950d91656e700941cb0b929d2f73f650f5297d358b38 HEAD_REF master ) @@ -27,3 +27,13 @@ vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hv.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/bin/hv.dll") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/hv.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/hv.dll") +endif() diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json index d16fbeccfb6a52..80978ea7de2599 100644 --- a/ports/libhv/vcpkg.json +++ b/ports/libhv/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libhv", - "version": "1.0.0", - "port-version": 2, + "version": "1.2.1", "description": "Libhv is a C/C++ network library similar to libevent/libuv.", "homepage": "https://github.com/ithewei/libhv", "supports": "!(arm | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index 7b43aff30050bf..be64ffb905ee44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3337,8 +3337,8 @@ "port-version": 0 }, "libhv": { - "baseline": "1.0.0", - "port-version": 2 + "baseline": "1.2.1", + "port-version": 0 }, "libhydrogen": { "baseline": "2019-08-11", diff --git a/versions/l-/libhv.json b/versions/l-/libhv.json index 9fae80665216e1..a291410e7a0ec6 100644 --- a/versions/l-/libhv.json +++ b/versions/l-/libhv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70132ddc099b347cfea66a4ed2de435abafb9c6f", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "3a460f29d525c6c1ce8154593238960415a24d80", "version": "1.0.0", From c7fa3fc07064054a2e36a452c7b51866906c4ab7 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 13 Sep 2021 23:56:51 +0200 Subject: [PATCH 0523/1858] [libgo] fix baseline issue (#19773) * [libgo] fix baseline issue * [libgo] fix references * [libgo] fail fast on unsupported archs * [libgo] fix references * [libgo] fixes for macOS * [libgo] fix references * Minimize the patch Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/libgo/cmake.patch | 127 +++++++++++++++++++++++++++++---- ports/libgo/libgo-config.cmake | 25 ------- ports/libgo/portfile.cmake | 10 ++- ports/libgo/usage | 5 -- ports/libgo/vcpkg.json | 6 +- scripts/ci.baseline.txt | 3 - versions/baseline.json | 2 +- versions/l-/libgo.json | 5 ++ 8 files changed, 129 insertions(+), 54 deletions(-) delete mode 100644 ports/libgo/libgo-config.cmake delete mode 100644 ports/libgo/usage diff --git a/ports/libgo/cmake.patch b/ports/libgo/cmake.patch index 54a7e739f68366..4f1a018d7307f6 100644 --- a/ports/libgo/cmake.patch +++ b/ports/libgo/cmake.patch @@ -1,13 +1,114 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dfa9b72..ff9827e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -152,6 +152,8 @@ if (UNIX) - - elseif (WIN32) - set_target_properties("${STATIC_T}" PROPERTIES COMPILE_FLAGS "/wd4819 /wd4267") -+ install(TARGETS ${STATIC_T} LIBRARY DESTINATION "lib" ARCHIVE DESTINATION "lib") -+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/libgo/ DESTINATION "include/libgo" FILES_MATCHING PATTERN "*.h") - endif() - - if (WIN32) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dfa9b72..e21eee0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,8 +1,9 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.0) + + ################################################################################### + project(libgo) + ++if(0) + enable_language(C ASM) + + if (CMAKE_BUILD_TYPE) +@@ -43,34 +44,38 @@ message("-------------- Env ---------------") + message(" CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}") + message(" CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") + message("----------------------------------") ++endif() ++ ++enable_language(C CXX ASM) ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++ ++set(INSTALL_BIN_DIR "bin" CACHE PATH "Path where exe and dll will be installed") ++set(INSTALL_LIB_DIR "lib" CACHE PATH "Path where lib will be installed") ++set(INSTALL_INCLUDE_DIR "include/${PROJECT_NAME}" CACHE PATH "Path where headers will be installed") ++set(INSTALL_CMAKE_DIR "share/${PROJECT_NAME}" CACHE PATH "Path where cmake configs will be installed") ++set(RELATIVE_INSTALL_INCLUDE_DIR ${INSTALL_INCLUDE_DIR}) ++foreach(p LIB BIN INCLUDE CMAKE) ++ set(var INSTALL_${p}_DIR) ++ if(NOT IS_ABSOLUTE "${${var}}") ++ set(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}") ++ endif() ++endforeach() ++ ++set(ENABLE_DEBUGGER 0) ++set(ENABLE_HOOK 0) + + configure_file(${PROJECT_SOURCE_DIR}/libgo/common/cmake_config.h.in ${PROJECT_SOURCE_DIR}/libgo/common/cmake_config.h) + message("----------------------------------") + + if (UNIX) +- set(CMAKE_CXX_FLAGS "-std=c++11 -fPIC -Wall ${CMAKE_CXX_FLAGS}") +- set(CMAKE_CXX_FLAGS_DEBUG "-g") +- set(CMAKE_CXX_FLAGS_RELEASE "-g -O3 -DNDEBUG") +- + set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS S) +- message("--> select asm source file, please wait about 5 seconds ...") + execute_process(COMMAND "${PROJECT_SOURCE_DIR}/third_party/select_asm.sh" "${PROJECT_SOURCE_DIR}" "jump" OUTPUT_VARIABLE jump_asm_file) + execute_process(COMMAND "${PROJECT_SOURCE_DIR}/third_party/select_asm.sh" "${PROJECT_SOURCE_DIR}" "make" OUTPUT_VARIABLE make_asm_file) + elseif (WIN32) +- # windows platform + add_definitions(-D_CRT_SECURE_NO_WARNINGS) +- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /EHsc") +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /EHsc") +- +- #set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS asm) +- #file(COPY ${PROJECT_SOURCE_DIR}/third_party/boost.context/libs/context/src/asm/make_x86_64_ms_pe_masm.asm DESTINATION ${PROJECT_SOURCE_DIR}/libgo/context) +- #file(COPY ${PROJECT_SOURCE_DIR}/third_party/boost.context/libs/context/src/asm/jump_x86_64_ms_pe_masm.asm DESTINATION ${PROJECT_SOURCE_DIR}/libgo/context) + endif() + +-message("------------ Cxx flags -------------") +-message(" CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}: ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}") +-message("------------------------------------") +- + include_directories(${PROJECT_SOURCE_DIR}) + aux_source_directory(${PROJECT_SOURCE_DIR}/libgo CO_SRC_LIST) + aux_source_directory(${PROJECT_SOURCE_DIR}/libgo/common CO_SRC_LIST) +@@ -97,6 +102,7 @@ else() + aux_source_directory(${PROJECT_SOURCE_DIR}/libgo/netio/disable_hook CO_SRC_LIST) + endif() + ++if(0) + set(TARGET "libgo") + set(STATIC_T "libgo_static") + set(STATIC_HOOK "static_hook") +@@ -136,7 +142,6 @@ if (UNIX) + ) + + set(PROFILE_FLAGS "-pg ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}}") +- + #message("PROFILE_FLAGS: ${PROFILE_FLAGS}") + add_custom_target(profile + COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=PROFILE -DCMAKE_CXX_FLAGS_PROFILE=\\'${PROFILE_FLAGS}\\' ${CMAKE_SOURCE_DIR} +@@ -160,3 +165,27 @@ if (WIN32) + add_subdirectory(${PROJECT_SOURCE_DIR}/tutorial) + endif() + endif() ++endif() ++ ++list(APPEND CO_SRC_LIST ${jump_asm_file}) ++list(APPEND CO_SRC_LIST ${make_asm_file}) ++add_library(${PROJECT_NAME} ${CO_SRC_LIST}) ++target_link_libraries(${PROJECT_NAME} ${CMAKE_DL_LIBS}) ++if (WIN32) ++ target_link_libraries(${PROJECT_NAME} ws2_32) ++ set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4819 /wd4267") ++endif() ++ ++install(TARGETS ${PROJECT_NAME} ++ EXPORT "${PROJECT_NAME}Config" ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib ++ RUNTIME DESTINATION bin) ++ ++install(DIRECTORY ${PROJECT_SOURCE_DIR}/libgo/ ++ DESTINATION ${INSTALL_INCLUDE_DIR} ++ FILES_MATCHING PATTERN "*.h") ++ ++install(EXPORT "${PROJECT_NAME}Config" ++ NAMESPACE libgo:: ++ DESTINATION "${INSTALL_CMAKE_DIR}") diff --git a/ports/libgo/libgo-config.cmake b/ports/libgo/libgo-config.cmake deleted file mode 100644 index fd52f8dd3cc8e8..00000000000000 --- a/ports/libgo/libgo-config.cmake +++ /dev/null @@ -1,25 +0,0 @@ -get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - -if(NOT LIBGO_FIND_COMPONENTS) - set(LIBGO_FIND_COMPONENTS libgo libgo) - if(LIBGO_FIND_REQUIRED) - set(LIBGO_FIND_REQUIRED_libgo TRUE) - endif() - - set(LIBGO_FOUND TRUE) -endif() - -set(LIBGO_INCLUDE_DIRS ${_DIR}/../../include) -set(LIBGO_LIBRARIES) -if (EXISTS ${_DIR}/../../lib/liblibgo.a) - list(APPEND LIBGO_LIBRARIES optimized ${_DIR}/../../lib/liblibgo.a) -endif() -if (EXISTS ${_DIR}/../../debug/lib/liblibgo.a) - list(APPEND LIBGO_LIBRARIES debug ${_DIR}/../../debug/lib/liblibgo.a) -endif() -if (EXISTS ${_DIR}/../../lib/libgo.lib) - list(APPEND LIBGO_LIBRARIES optimized ${_DIR}/../../lib/libgo.lib) -endif() -if (EXISTS ${_DIR}/../../debug/lib/libgo.lib) - list(APPEND LIBGO_LIBRARIES debug ${_DIR}/../../debug/lib/libgo.lib) -endif() diff --git a/ports/libgo/portfile.cmake b/ports/libgo/portfile.cmake index fdb028123f7e10..e365ee3a118321 100644 --- a/ports/libgo/portfile.cmake +++ b/ports/libgo/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( @@ -7,7 +7,8 @@ vcpkg_from_github( REF 5d4f36508e8eb2d5aa17cf37cd951dc91da23096 #v3.1 SHA512 0f281f58116148ba1dd3904febbc391d47190f8e148b70bed7c4b7e6cb3efa5e41e2b7be4832ceeb805996e085f4c2d89fd0cf3b0651e037b32758d6a441411b HEAD_REF master - PATCHES cmake.patch + PATCHES + cmake.patch ) vcpkg_from_github( @@ -28,6 +29,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/disable_hook") @@ -39,8 +41,4 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/libgo/netio/unix") endif() -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${CURRENT_PORT_DIR}/libgo-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libgo/usage b/ports/libgo/usage deleted file mode 100644 index a8f0729476a98b..00000000000000 --- a/ports/libgo/usage +++ /dev/null @@ -1,5 +0,0 @@ -The package libgo provides CMake integration: - - find_package(libgo REQUIRED) - target_include_directories(main PRIVATE ${LIBGO_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${LIBGO_LIBRARIES}) diff --git a/ports/libgo/vcpkg.json b/ports/libgo/vcpkg.json index b9d85cc606a357..47377a3e87b270 100644 --- a/ports/libgo/vcpkg.json +++ b/ports/libgo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgo", "version": "3.1", - "port-version": 2, + "port-version": 3, "description": "The best stackful coroutine by c++11.", "homepage": "https://github.com/yyzybb537/libgo", "supports": "!(arm | uwp)", @@ -9,6 +9,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f3ee0b4f5f2b4a..77a1d1a93a5f4d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -586,8 +586,6 @@ libgit2:x64-uwp=fail libgo:arm-uwp=fail libgo:x64-uwp=fail libgo:arm64-windows=fail -libgo:x64-windows=fail -libgo:x86-windows=fail libgpod:arm64-windows=fail libgpod:arm-uwp=fail libgpod:x64-uwp=fail @@ -1711,7 +1709,6 @@ fastcgi:x64-windows-static-md=fail gmp:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail -libgo:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail libspatialite:x64-windows-static-md=fail linenoise-ng:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index be64ffb905ee44..120d923356e61e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3298,7 +3298,7 @@ }, "libgo": { "baseline": "3.1", - "port-version": 2 + "port-version": 3 }, "libgpg-error": { "baseline": "1.42", diff --git a/versions/l-/libgo.json b/versions/l-/libgo.json index 976f87c31ed1eb..0b0b0d40f2d1bb 100644 --- a/versions/l-/libgo.json +++ b/versions/l-/libgo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "120510985335ea4bd1b8a91982d0f95842e43ba3", + "version": "3.1", + "port-version": 3 + }, { "git-tree": "1158e6c06fa6cb413bf12c04065ff58b8930c474", "version": "3.1", From cd656b3cdfcc46372269c87bc3f942311a9faa3e Mon Sep 17 00:00:00 2001 From: myd7349 Date: Tue, 14 Sep 2021 05:58:13 +0800 Subject: [PATCH 0524/1858] [uchardet] Update to 2021-09-03 (#19980) * [uchardet] Update to 2021-09-03 * [uchardet] Bump version * [uchardet] Fix UWP build * [uchardet] Overwrite version * [uchardet] Add version Co-authored-by: Billy Robert O'Neal III --- ports/uchardet/fix-uwp-build.patch | 15 +++++++++++ ports/uchardet/portfile.cmake | 41 ++++++++++-------------------- ports/uchardet/vcpkg.json | 13 +++++++--- versions/baseline.json | 4 +-- versions/u-/uchardet.json | 5 ++++ 5 files changed, 44 insertions(+), 34 deletions(-) create mode 100644 ports/uchardet/fix-uwp-build.patch diff --git a/ports/uchardet/fix-uwp-build.patch b/ports/uchardet/fix-uwp-build.patch new file mode 100644 index 00000000000000..d08ba9e7927cab --- /dev/null +++ b/ports/uchardet/fix-uwp-build.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50a11e8..3a93c83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,6 +54,10 @@ if (TARGET_ARCHITECTURE MATCHES ".*(x86|amd|i686).*") + endif (CHECK_SSE2 AND SUPPORTS_CFLAG_SSE2 AND SUPPORTS_CFLAG_SSE_MATH) + endif (TARGET_ARCHITECTURE MATCHES ".*(x86|amd|i686).*") + ++if (MSVC) ++ add_compile_options(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE) ++endif (MSVC) ++ + configure_file( + uchardet.pc.in + uchardet.pc diff --git a/ports/uchardet/portfile.cmake b/ports/uchardet/portfile.cmake index 281dec77dad354..a407fd7831a55f 100644 --- a/ports/uchardet/portfile.cmake +++ b/ports/uchardet/portfile.cmake @@ -1,25 +1,21 @@ vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://gitlab.freedesktop.org/uchardet/uchardet - REF 8681fc060ea07f646434cd2d324e4a5aa7c495c4 + REF 6f38ab95f55afd45ee6ccefcb92d21034b4a2521 + PATCHES + fix-uwp-build.patch ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tool BUILD_BINARY + FEATURES + tool BUILD_BINARY ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) -if(VCPKG_TARGET_IS_UWP) - # uchardet calls `fopen` and `strdup`, which makes UWP unhappy. - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE") - set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE") -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DBUILD_BINARY=OFF OPTIONS_RELEASE @@ -28,29 +24,18 @@ vcpkg_configure_cmake( -DBUILD_STATIC=${BUILD_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(tool IN_LIST FEATURES) - file(COPY - ${CURRENT_PACKAGES_DIR}/bin/uchardet${VCPKG_TARGET_EXECUTABLE_SUFFIX} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT} - ) - - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/uchardet${VCPKG_TARGET_EXECUTABLE_SUFFIX}) + vcpkg_copy_tools(TOOL_NAMES uchardet AUTO_CLEAN) endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/share/man + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" ) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/uchardet/vcpkg.json b/ports/uchardet/vcpkg.json index c7b7cad8d2850a..41a2bbe78438e8 100644 --- a/ports/uchardet/vcpkg.json +++ b/ports/uchardet/vcpkg.json @@ -1,12 +1,17 @@ { "name": "uchardet", - "version-string": "2020-04-26", - "port-version": 1, - "description": "An encoding detector library ported from Mozilla", + "version-date": "2021-09-03", + "description": "An encoding detector library ported from Mozilla.", "homepage": "https://cgit.freedesktop.org/uchardet/uchardet/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "tool": { - "description": "Build uchardet CLI tool", + "description": "Build uchardet CLI tool.", "dependencies": [ "getopt" ] diff --git a/versions/baseline.json b/versions/baseline.json index 120d923356e61e..deb8ee639d07ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6569,8 +6569,8 @@ "port-version": 0 }, "uchardet": { - "baseline": "2020-04-26", - "port-version": 1 + "baseline": "2021-09-03", + "port-version": 0 }, "umock-c": { "baseline": "2020-06-17", diff --git a/versions/u-/uchardet.json b/versions/u-/uchardet.json index e773544adc4233..11892e0a289352 100644 --- a/versions/u-/uchardet.json +++ b/versions/u-/uchardet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46d56e5d20654b04eb3b97cc2ae46b1ae7c07eb9", + "version-date": "2021-09-03", + "port-version": 0 + }, { "git-tree": "074fd1696e7c47ef9dce162bfad50572a8d766f1", "version-string": "2020-04-26", From 912a06cfc6227fa7907ae4532e6c642ea85b726b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 14 Sep 2021 00:18:29 +0200 Subject: [PATCH 0525/1858] [Qt] update to 6.1.3 (#19918) * [skip actions] update to 6.1.3 * remove wrong -D prefix from variables in qttools * change to https * version stuff Co-authored-by: Billy Robert O'Neal III --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtbase/cmake/qt_install_submodule.cmake | 113 ++++++++++++------ ports/qtbase/cmake/qt_port_details.cmake | 53 ++++---- ports/qtbase/vcpkg.json | 3 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquickcontrols2/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/portfile.cmake | 4 +- ports/qttools/vcpkg.json | 2 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- versions/baseline.json | 50 ++++---- versions/q-/qt.json | 5 + versions/q-/qt5compat.json | 5 + versions/q-/qtactiveqt.json | 5 + versions/q-/qtbase.json | 5 + versions/q-/qtcharts.json | 5 + versions/q-/qtcoap.json | 5 + versions/q-/qtdatavis3d.json | 5 + versions/q-/qtdeclarative.json | 5 + versions/q-/qtdoc.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtlottie.json | 5 + versions/q-/qtmqtt.json | 5 + versions/q-/qtnetworkauth.json | 5 + versions/q-/qtopcua.json | 5 + versions/q-/qtquick3d.json | 5 + versions/q-/qtquickcontrols2.json | 5 + versions/q-/qtquicktimeline.json | 5 + versions/q-/qtscxml.json | 5 + versions/q-/qtshadertools.json | 5 + versions/q-/qtsvg.json | 5 + versions/q-/qttools.json | 5 + versions/q-/qttranslations.json | 5 + versions/q-/qtvirtualkeyboard.json | 5 + versions/q-/qtwayland.json | 5 + 52 files changed, 276 insertions(+), 113 deletions(-) diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index ffe756fdd5d668..a0baa9d187e86d 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 5397492fdbd16b..0bb1654fbada93 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index ac68a5c1ee2270..bd8bcf93bb69dc 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 41f82d169d4561..ed497a13e59ca7 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -18,65 +18,73 @@ macro(qt_stop_on_update) endif() endmacro() -function(qt_install_submodule) - cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA" - "" - "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE") - - vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt - get_filename_component(PERL_PATH ${PERL} DIRECTORY) - vcpkg_add_to_path(${PERL_PATH}) - vcpkg_find_acquire_program(PYTHON3) # Python is required by some qt ports - get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) - vcpkg_add_to_path(${PYTHON3_PATH}) +function(qt_download_submodule) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" + "" + "PATCHES") if(QT_UPDATE_VERSION) + set(VCPKG_USE_HEAD_VERSION ON) set(UPDATE_PORT_GIT_OPTIONS - X_OUT_REF NEW_REF) + HEAD_REF "${QT_GIT_TAG}") endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - URL https://code.qt.io/qt/${PORT}.git - TAG ${${PORT}_TAG} - REF ${${PORT}_REF} + URL "https://code.qt.io/qt/${PORT}.git" + #TAG ${${PORT}_TAG} + REF "${${PORT}_REF}" ${UPDATE_PORT_GIT_OPTIONS} - PATCHES ${_qis_PATCHES} + PATCHES ${_qarg_PATCHES} ) if(QT_UPDATE_VERSION) set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "") - file(APPEND "${VCPKG_ROOT_DIR}/ports/qtbase/cmake/qt_new_refs.cmake" "set(${PORT}_REF ${NEW_REF})\n") - return() + message(STATUS "VCPKG_HEAD_VERSION:${VCPKG_HEAD_VERSION}") + file(APPEND "${VCPKG_ROOT_DIR}/ports/qtbase/cmake/qt_new_refs.cmake" "set(${PORT}_REF ${VCPKG_HEAD_VERSION})\n") + endif() + set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) +endfunction() + + +function(qt_cmake_configure) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA" + "" + "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE") + + vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt + get_filename_component(PERL_PATH ${PERL} DIRECTORY) + vcpkg_add_to_path(${PERL_PATH}) + if(NOT PORT STREQUAL "qtwebengine") # qtwebengine requires python2 + vcpkg_find_acquire_program(PYTHON3) # Python is required by some qt ports + get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY) + vcpkg_add_to_path(${PYTHON3_PATH}) endif() - if(VCPKG_TARGET_IS_WINDOWS) + if(CMAKE_HOST_WIN32) if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") + list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl") endif() set(PERL_OPTION -DHOST_PERL:PATH="${PERL}") else() if(NOT ${PORT} MATCHES "qtbase") - list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl) + list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl) endif() set(PERL_OPTION -DHOST_PERL:PATH=${PERL}) endif() - if(NOT _qis_DISABLE_NINJA) + if(NOT _qarg_DISABLE_NINJA) set(NINJA_OPTION PREFER_NINJA) endif() if(VCPKG_CROSSCOMPILING) - list(APPEND _qis_CONFIGURE_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}) - list(APPEND _qis_CONFIGURE_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share) + list(APPEND _qarg_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}) + list(APPEND _qarg_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share) if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged - list(APPEND _qis_CONFIGURE_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) + list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) endif() endif() - set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) - set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) - vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" ${NINJA_OPTION} @@ -92,9 +100,9 @@ function(qt_install_submodule) -DINSTALL_LIBEXECDIR:STRING=bin -DINSTALL_PLUGINSDIR:STRING=${qt_plugindir} -DINSTALL_QMLDIR:STRING=${qt_qmldir} - ${_qis_CONFIGURE_OPTIONS} + ${_qarg_OPTIONS} OPTIONS_RELEASE - ${_qis_CONFIGURE_OPTIONS_RELEASE} + ${_qarg_OPTIONS_RELEASE} -DINSTALL_DOCDIR:STRING=doc/${QT6_DIRECTORY_PREFIX} -DINSTALL_INCLUDEDIR:STRING=include/${QT6_DIRECTORY_PREFIX} -DINSTALL_DESCRIPTIONSDIR:STRING=share/Qt6/modules @@ -109,7 +117,13 @@ function(qt_install_submodule) -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs ${_qis_CONFIGURE_OPTIONS_DEBUG} ) - vcpkg_install_cmake(ADD_BIN_TO_PATH) + set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) +endfunction() + +function(qt_fixup_and_cleanup) + cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" + "" + "TOOL_NAMES") vcpkg_copy_pdbs() ## Handle CMake files. @@ -153,14 +167,14 @@ function(qt_install_submodule) set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") set(qt_searchdir "${CURRENT_PACKAGES_DIR}/bin") ## Handle Tools - foreach(_tool IN LISTS _qis_TOOL_NAMES) + foreach(_tool IN LISTS _qarg_TOOL_NAMES) if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") debug_message("Removed '${_tool}' from copy tools list since it was not found!") - list(REMOVE_ITEM _qis_TOOL_NAMES ${_tool}) + list(REMOVE_ITEM _qarg_TOOL_NAMES ${_tool}) endif() endforeach() - if(_qis_TOOL_NAMES) - set(tool_names ${_qis_TOOL_NAMES}) + if(_qarg_TOOL_NAMES) + set(tool_names ${_qarg_TOOL_NAMES}) vcpkg_copy_tools(TOOL_NAMES ${tool_names} SEARCH_DIR "${qt_searchdir}" DESTINATION "${qt_tooldest}" AUTO_CLEAN) if(EXISTS "${CURRENT_PACKAGES_DIR}/${qt_plugindir}") file(COPY "${CURRENT_PACKAGES_DIR}/${qt_plugindir}/" DESTINATION "${qt_tooldest}") @@ -202,6 +216,33 @@ function(qt_install_submodule) endif() endif() +endfunction() + +function(qt_install_submodule) + cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA" + "" + "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE") + + set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) + set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) + + qt_download_submodule(PATCHES ${_qis_PATCHES}) + if(QT_UPDATE_VERSION) + return() + endif() + + if(_qis_DISABLE_NINJA) + set(_opt DISABLE_NINJA) + endif() + qt_cmake_configure(${_opt} + OPTIONS ${_qis_CONFIGURE_OPTIONS} + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + + vcpkg_install_cmake(ADD_BIN_TO_PATH) + + qt_fixup_and_cleanup(TOOL_NAMES ${_qis_TOOL_NAMES}) + qt_install_copyright("${SOURCE_PATH}") set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) -endfunction() +endfunction() \ No newline at end of file diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index ac9fab8f4fad92..7d44bf87e9954d 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,7 +1,10 @@ -set(QT_VERSION 6.1.2) +set(QT_VERSION 6.1.3) set(QT_GIT_TAG v${QT_VERSION}) #set(QT_UPDATE_VERSION TRUE) - +if(QT_UPDATE_VERSION) + function(vcpkg_extract_source_archive) + endfunction() +endif() # List of added an removed modules https://doc-snapshots.qt.io/qt6-dev/whatsnew60.html#changes-to-supported-modules #https://wiki.qt.io/Get_the_Source #TODO:qtknx? @@ -37,30 +40,30 @@ foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF c7c05ab0610ca521a7fcbfdd8d063358d62531b0) -set(qttools_REF 304bae0d5acdee4313405c25dcd259db92dff23d) -set(qtdeclarative_REF bfe2822fb615fb9264c19cebc07994c7a719d159) -set(qtsvg_REF e4950cbb5810fb9e0fd1c42ba888e6d77c21d4b6) -set(qt5compat_REF ff070674ce05e580f023634d5c0fb33c27bb95fd) -set(qtshadertools_REF 2e4aae72dad87eb6d32aa505d6fdcc51b7be057a) -set(qtquicktimeline_REF 72f2f03964068d7a66f878949e739fa933d12246) -set(qtquick3d_REF 261ad084def2fb0147a9def96a55d9ca2c469268) -set(qttranslations_REF caa1100446f659ab992585aecd647612df1d0755) -set(qtwayland_REF 549e6892a0932b76ff7f4004057644980445df36) -set(qtdoc_REF 5a1cc893a66e84155924a94d538ab9401aa02976) -set(qtimageformats_REF 99a0ff33dc46582235363f5ca64a01ce3c1b9fe3) -set(qtmqtt_REF cef4c58c9b60248ab4fb0ae60815efb906a20f2a) -set(qtquickcontrols2_REF 2d2e99d44337867585fa0dba8de5bd7ecd7ad6e7) -set(qtnetworkauth_REF b3e45d0dad36a0ec402bb6e3e85459546378ed22) -set(qtcoap_REF aa40b3cd7d699c926c8527fe7708436cc47eeced) -set(qtopcua_REF 615ea73989fa5b2a7f560a292d3054af5d0663ed) -set(qtactiveqt_REF 020d8da4e22be449846eefcfaa805cd8309cac20) -set(qtdatavis3d_REF a4ea8afeba164d2dc8229e693c541d364e99f3de) +set(qtbase_REF 3ff48409ed14c7a63010b14e053a7201a61391c5) +set(qttools_REF a69e290e25fd145a8b02223130192555f7962ea2) +set(qtdeclarative_REF 38845e18ef11ac2f1a1db82377b30f1649fdc499) +set(qtsvg_REF 24d635154689be46aaaf2ba0e3538d2f8fafeb3d) +set(qt5compat_REF fcacd7f544b496420db485187aa55d76898ce73d) +set(qtshadertools_REF 06fc3c49b7b8cba80e6b6ff31ac5d703e3a2abcb) +set(qtquicktimeline_REF be6321dc5164657072ff7069a7132d44222a503c) +set(qtquick3d_REF ccd45eb39ec1fb88d62438c9dd0007e26c0ccc18) +set(qttranslations_REF 2d30ad16d90abfc0806d28e3504348df84b1e62b) +set(qtwayland_REF 501c287f34a66ec89e3e49da218feb4bc69c9c5e) +set(qtdoc_REF 13fa00e32307bae90884a608880a542f6ed90646) +set(qtimageformats_REF 8d6e8efc1afbd5e9cf793fbf0507e1d332c45d1f) +set(qtmqtt_REF a6213a104f65dccb13508b58b0f07a249d9922c8) +set(qtquickcontrols2_REF 6d62c0677d60e42a19bb72d641129933770f7723) +set(qtnetworkauth_REF 7ce9e47b469141f9bace9661d07999dcc120e7f6) +set(qtcoap_REF 83b5b7e8e2c6afa9d5ab69123c40993c48b30970) +set(qtopcua_REF bda48fd7729fb65a7504a1bada496489ee15d245) +set(qtactiveqt_REF 32cad4a02f78205e85490f6b8cbde82ecb1b5f2f) +set(qtdatavis3d_REF 8d6c15fa8daa68a4d48368b8ceb8c517e973eac7) #set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF 35e46e52d8849caf84269f92701a5b342824582c) -set(qtscxml_REF d92013adb0a4ad0a80e94a265ec13b5c1730ee05) -set(qtvirtualkeyboard_REF 4e71c9ae1ef8bfe1d9193cd14d11a4e1cf9ea7bc) -set(qtcharts_REF 68a5725a5c97adad88a9d7a6318b06547f7bf1a3) +set(qtlottie_REF 266531117ba6646893d3806566144aff19d5e309) +set(qtscxml_REF aa27d28e302f3529940172ab2782c2d7e28fb532) +set(qtvirtualkeyboard_REF eb26e2af30e6cbb2c4b9224d8e9f489f198c82f0) +set(qtcharts_REF 3e0d6ffa572efe8a09774ac6c6263b6df5eaf718) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 55401d71a0c836..72b43da6821318 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version-semver": "6.1.2", - "port-version": 1, + "version-semver": "6.1.3", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index f95150d161a0be..75ba14445ff8d7 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index b35622815042eb..011cf9ea684c59 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 9f31e8fb5426b1..f998b145b98d54 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 63ef0793508f17..b8249ab253ad19 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 12196eae89e65b..7391fc2d899138 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index ef42be64d9f8ee..998de3faa66cf9 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index d0e7964840c22d..1f8731f9389d6a 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index e54eb9bbae5730..cd0f253cd1051e 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index bbfb1d0d9a0d3e..43565da8a873da 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index dc096d20e4c378..89b264c53f05a0 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 980faf4759bb9e..cc432867a2aa0f 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index 139b2a8289f208..8de3a63c5d2e3f 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickcontrols2", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Quick Controls 2", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index aec0718bd95983..9ca9a302012195 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index c6d3ac8a89392b..72af5b0121aeef 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 5810e64f779a1c..534162d740fa80 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 9b1a0bd7dd0794..97ab747c96917c 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index c621e0c9363967..77b2787d688cd4 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -34,8 +34,8 @@ set(${PORT}_PATCHES )#fix_static_build.patch) # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - "qdoc" -DCMAKE_DISABLE_FIND_PACKAGE_Clang - "qdoc" -DCMAKE_DISABLE_FIND_PACKAGE_WrapLibClang + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang ) set(TOOL_NAMES diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 2ec5a91edf5ff7..e9bd7dd30be3b8 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index d4fb9d8c46d9e2..fec110b00ae896 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index fca230939277ef..533af68a162002 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index ae2d9d17b4f352..cfe7d278f77061 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "port-version": 2, "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", diff --git a/versions/baseline.json b/versions/baseline.json index deb8ee639d07ac..b5c4af3b9b9bfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5241,7 +5241,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5421,7 +5421,7 @@ "port-version": 1 }, "qt5compat": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qt6betablock": { @@ -5429,35 +5429,35 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtbase": { - "baseline": "6.1.2", - "port-version": 1 + "baseline": "6.1.3", + "port-version": 0 }, "qtcharts": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtcoap": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtdoc": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtimageformats": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtkeychain": { @@ -5465,59 +5465,59 @@ "port-version": 1 }, "qtlottie": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtmqtt": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtopcua": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtquick3d": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtscxml": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtshadertools": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtsvg": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qttools": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qttranslations": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtwayland": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 2 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 0f5fca8a6aa584..922dbedaf5ea40 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7af9212716c1c55de883178c890121a7d804cc48", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "6744ad0c2da924c58372492b96d9ea9b43747440", "version-semver": "6.1.2", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 6933b9db0ba8e5..322b3247c4e550 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "215bfc596de54c9c4b5c83e1d8d4ab53ddfaba72", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "d3d8792b65b0a5f83423ed425d01bf77759c33d0", "version-semver": "6.1.2", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index e0a42c7e938f6e..0e6ef81b0002b5 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "925f4777d7eb69e9fa1d6de9af0fdf3e4511799f", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "746af755dc6d69853c6a369b2fa61aad7ec33c45", "version-semver": "6.1.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 19399498927912..16a8e0e8a2989b 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23812ecb279c5ae29a26e99f2ccc605bbe17f45a", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "ed0018dce35e4246be83589358400a7617a8933f", "version-semver": "6.1.2", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index e65901685f8605..b9bb06eea5e549 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f40ae8925f5dc6cf6947fd0a14f607eff3c0438a", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "74995a3fee551bc872bd44d0a0592a67cc20f3bb", "version-semver": "6.1.2", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 0b674f5e105615..221ffa02882ca7 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e51f03a5c9c142390aea35d1a6389383c245414f", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "10c8de5683f1878cdee669c101dcbf50fefaf10e", "version-semver": "6.1.2", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 8ff8df3dddb62a..c5af866972cfd7 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30c282e8438df69e77b4e2a6935addb778bc761c", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "b25e2c719ecc3c1476ceb68579e97f3562eb9899", "version-semver": "6.1.2", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index f995b8a92007d7..febd23d2e70680 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a4c4e942686e20cc25f4f608c7f423b295a11830", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "b283ef4063b4040b652dcfe42bf37006cded85a5", "version-semver": "6.1.2", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 0d5ec5fa97826a..ba6bbcab959631 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c393da11dd6c6cbdbc01b32e123327a9971fa353", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "8a74cb89e81a66827639d45083efcc0e19260f70", "version-semver": "6.1.2", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index a0a9ca9d6224da..61b96a2f15150f 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37b1ff899c20c104a1987dff249c7b51755e4fc4", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "4e3d92605b4a236be559ec0bfb55a5a282de0fe7", "version-semver": "6.1.2", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 86d633bc8bc9f1..2f4f9eafa02f8b 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c9e0cf0663bfb60c9f99f44302e0934c2e325bb", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "7d8b35dbd8e41a85097752ce057623380ae023f2", "version-semver": "6.1.2", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index da47891ded765b..4c7ddf6564c6f2 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fffa3edc4b989f223176e6c5fd37692361b3b713", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "7c21f77ae949388eb4787d5abc8e3a94667ee584", "version-semver": "6.1.2", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 1d69784b3a2d02..bb670085f714d1 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9793619e1a8167daa86e50d533b0ec3d1a843568", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "d3dbdc5974015e8c9e41087a13cd2d83b5f33394", "version-semver": "6.1.2", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 03ca84289fef7e..ee450490ce5ab6 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3112bdb7d0ff9c2e023dd15446975806ffc9a87a", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "477ed1c8be16624d2d7ca9b548aea3d733c30c5e", "version-semver": "6.1.2", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index ee1d8c034212a8..ebbfd3d557f0d6 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c9871c8665ce287463902e6aa56b6f8b5836cd46", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "5f9db44634b543a34b525ffc1444f764afe0241e", "version-semver": "6.1.2", diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index 0c5c05551768f7..aa3dec9bada057 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdf33560d3def651acf48341ea6dc0447c270c5b", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "f7a3f18e05756732c1344a336558851d7f1adafc", "version-semver": "6.1.2", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 140017053cd854..2b7fd5af4ec5e3 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "664a251eb795ac206c32b87e39060db32922fe4d", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "cd4994e897733cbbdab700567854117998f2986a", "version-semver": "6.1.2", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 53261ba801b86b..a47fea30e607cc 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8e642305ce89691d07946081ac77aa3216dc418", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "12a020d23caf6939a8b10c126bd6dd5230f3c5bf", "version-semver": "6.1.2", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index df6dd8f4845f8e..4003afb9171cba 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4796eb58b411235a7f1b5e45728a9d1ca2c4f944", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "ef324b3fad33f5340cc707700c6666663ca94de2", "version-semver": "6.1.2", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index dfa7c1ea33157a..2f889f064eec3e 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffffd840205636ee1ce99e623679ae7c0159872c", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "7fafae2d0f01bb61cff47d039ea5fa28f1f17967", "version-semver": "6.1.2", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 4f9682210a1d73..e7b68e22ab5ac6 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aeacc8ed34e798f5d73df932e09b1b619d89910b", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "f09d833f7ce9934bcc02650cd9c580b84932f6bc", "version-semver": "6.1.2", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 72e6c3bfc3e3f4..cb8e674cf5d033 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "754d6279d7b7c6f7a3b976d90cba153fb12d036e", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "899f3c456dd7aad0a3680083ef8d0f118b6c6761", "version-semver": "6.1.2", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 71bfc82866b0ca..b635eb73d61a91 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09bccb97807efe784799cac5346a90fcc16d5517", + "version-semver": "6.1.3", + "port-version": 0 + }, { "git-tree": "f1ed3185f1204d32b530464acdd1f843e5edbf95", "version-semver": "6.1.2", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index b688f4d87b0865..744432382ab179 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2e96d86ddc71f8fe862d70d4c685416cfb3479d", + "version-semver": "6.1.3", + "port-version": 2 + }, { "git-tree": "c520a4f068d807c3ec5bc04accf5af463007a1b8", "version-semver": "6.1.2", From 730ab105d60cf6e33d35728ac7a72caa15a29e3a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 13 Sep 2021 15:57:41 -0700 Subject: [PATCH 0526/1858] [Docs] Document the unique port attribution rule. (#20087) * Document the unique port attribution rule. * Remove reference to #19922 * @strega-nil suggestions :D Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- docs/maintainers/maintainer-guide.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index c2dd9cb72502fb..185d3d15bbed66 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -52,6 +52,28 @@ At this time, the following helpers are deprecated: Ideally, portfiles should be short, simple, and as declarative as possible. Remove any boiler plate comments introduced by the `create` command before submitting a PR. +### Ports must not be path dependent + +Ports must not change their behavior based on which ports are already installed in a form that would change which contents that port installs. For example, given: + +``` +> vcpkg install a +> vcpkg install b +> vcpkg remove a +``` + +and + +``` +> vcpkg install b +``` + +the files installed by `b` must be the same, regardless of influence by the previous installation of `a`. This means that ports must not try to detect whether something is provided in the installed tree by another port before taking some action. A specific and common cause of such "path dependent" behavior is described below in "When defining features, explicitly control dependencies." + +### Unique port attribution rule + +In the entire vcpkg system, no two ports a user is expected to use concurrently may provide the same file. If a port tries to install a file already provided by another file, installation will fail. If a port wants to use an extremely common name for a header, for example, it should place those headers in a subdirectory rather than in `include`. + ## Features ### Do not use features to implement alternatives From 4affb775330118878536f4b10363ce410932b1f0 Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Mon, 13 Sep 2021 17:57:56 -0500 Subject: [PATCH 0527/1858] [cpp-httplib] Update library to 0.9.4 (#20116) * Update cpp-httplib to version 0.9.4 * Run x-add-version --- ports/cpp-httplib/portfile.cmake | 4 ++-- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 8448ef853eb446..966e7189bbd662 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF v0.9.1 - SHA512 164812075ad516a0a0ad587d7a479e0272fc5eecdbbf4522532dc3039a5282cc120b5b7d75eea3764d21acf203dc1bfccfb9e4f1dfe2515ca4ced546735c28fc + REF v0.9.4 + SHA512 472f4ce4ff5ba4b2e175120deb0a3ccc4c7b124e9349fd7709e1439fcdcfbc83ff0fb71d58367f38e042c4a64600936755432bd4de3e0065b2810dc5bc7d3c86 HEAD_REF master ) diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 6e83cc3f0f42ac..9b1f01585eb0f4 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.9.1", + "version": "0.9.4", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib" } diff --git a/versions/baseline.json b/versions/baseline.json index b5c4af3b9b9bfa..4fb2581598df59 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1441,7 +1441,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.9.1", + "baseline": "0.9.4", "port-version": 0 }, "cpp-ipc": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index 629750a5af0432..db6568e7244178 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46525b4cf2481e5bd66df0899c0c1fd4f05a0c33", + "version": "0.9.4", + "port-version": 0 + }, { "git-tree": "9554bdd56e3c787d40e20b63582d3b5efbaf4f2f", "version": "0.9.1", From 82bf90fbce7df2497efc521c0b217dffec54c469 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 14 Sep 2021 08:31:55 +0800 Subject: [PATCH 0528/1858] Fix compile error in internal version of Visual Studio (#20127) --- ports/quill/fix-c4189-warning.patch | 15 +++++++++++++++ ports/quill/portfile.cmake | 15 ++++++++------- ports/quill/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/q-/quill.json | 5 +++++ 5 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 ports/quill/fix-c4189-warning.patch diff --git a/ports/quill/fix-c4189-warning.patch b/ports/quill/fix-c4189-warning.patch new file mode 100644 index 00000000000000..55ae52fc3e3de4 --- /dev/null +++ b/ports/quill/fix-c4189-warning.patch @@ -0,0 +1,15 @@ +diff --git a/quill/CMakeLists.txt b/quill/CMakeLists.txt +index 76872c2..c173804 100644 +--- a/quill/CMakeLists.txt ++++ b/quill/CMakeLists.txt +@@ -148,6 +148,10 @@ if (QUILL_NO_EXCEPTIONS) + endif () + endif () + ++if (MSVC) ++ add_definitions(/wd4189) ++endif() ++ + # Add target sources + target_sources(${TARGET_NAME} PRIVATE ${SOURCE_FILES} ${HEADER_FILES}) + diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index c0893aa8fa3ad8..2902e76edd29c7 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -8,19 +8,20 @@ vcpkg_from_github( REF v1.6.3 SHA512 e75aca827fe0833422da0d38df482cbc39db0e43dcc3cb791f3e2649f7022dcc448831a5ede85daf6feada60a2d5eaf312a3411abbba92fb9d76466336a7244d HEAD_REF master + PATCHES + fix-c4189-warning.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DQUILL_FMT_EXTERNAL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/quill) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index a3441a033aa28a..b180656a73cf98 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,10 +1,19 @@ { "name": "quill", "version-semver": "1.6.3", + "port-version": 1, "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "supports": "!(uwp | android)", "dependencies": [ - "fmt" + "fmt", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4fb2581598df59..b59fd80b36512d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5546,7 +5546,7 @@ }, "quill": { "baseline": "1.6.3", - "port-version": 0 + "port-version": 1 }, "quirc": { "baseline": "1.1", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index 027adcae43b2a3..d2cbe00bffa2e9 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "53bbd43b741956bcb2d1e74cb34bca27b51b7d11", + "version-semver": "1.6.3", + "port-version": 1 + }, { "git-tree": "e6ee8372d06d69dda719c955d24baa1f61924f86", "version-semver": "1.6.3", From 9da9fcb96143045a84b63babd39eaaa56c93f13a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 14 Sep 2021 04:34:11 +0200 Subject: [PATCH 0529/1858] [VTK] fix cmake patches not recycling targets already defined (#20074) * [VTK] recycle alias targets if already defined * [VTK] bump port version * [VTK] fix references * [VTK] fix other patches for target recycling * [VTK] fix references Co-authored-by: Billy Robert O'Neal III --- ports/vtk/FindHDF5.cmake | 17 ++++++++++++----- ports/vtk/FindLZ4.patch | 4 +++- ports/vtk/pegtl.patch | 4 +++- ports/vtk/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 6 files changed, 25 insertions(+), 8 deletions(-) diff --git a/ports/vtk/FindHDF5.cmake b/ports/vtk/FindHDF5.cmake index 1be15731bf41b9..27d8a8c74c8247 100644 --- a/ports/vtk/FindHDF5.cmake +++ b/ports/vtk/FindHDF5.cmake @@ -1,20 +1,27 @@ -#The original VTK file is overdoing it and still prdouces errors that the target hdf5::hdf5_hl-shared cannot be found in dynamic builds find_package(hdf5 QUIET NO_MODULE) if(TARGET hdf5::hdf5-shared) set_target_properties(hdf5::hdf5-shared PROPERTIES IMPORTED_GLOBAL TRUE) - add_library(hdf5::hdf5 ALIAS hdf5::hdf5-shared) + if(NOT TARGET hdf5::hdf5) + add_library(hdf5::hdf5 ALIAS hdf5::hdf5-shared) + endif() elseif(TARGET hdf5::hdf5-static) set_target_properties(hdf5::hdf5-static PROPERTIES IMPORTED_GLOBAL TRUE) - add_library(hdf5::hdf5 ALIAS hdf5::hdf5-static) + if(NOT TARGET hdf5::hdf5) + add_library(hdf5::hdf5 ALIAS hdf5::hdf5-static) + endif() else() message(FATAL_ERROR "HDF5 target not found") endif() if(TARGET hdf5::hdf5_hl-shared) set_target_properties(hdf5::hdf5_hl-shared PROPERTIES IMPORTED_GLOBAL TRUE) - add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-shared) + if(NOT TARGET hdf5::hdf5_hl) + add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-shared) + endif() elseif(TARGET hdf5::hdf5_hl-static) set_target_properties(hdf5::hdf5_hl-static PROPERTIES IMPORTED_GLOBAL TRUE) - add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-static) + if(NOT TARGET hdf5::hdf5_hl) + add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-static) + endif() else() message(FATAL_ERROR "HDF5 HL target not found") endif() diff --git a/ports/vtk/FindLZ4.patch b/ports/vtk/FindLZ4.patch index dced8bf56ffd56..7f65de529cd788 100644 --- a/ports/vtk/FindLZ4.patch +++ b/ports/vtk/FindLZ4.patch @@ -2,7 +2,7 @@ diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake index 8c94e3bcd..ade3f9451 100644 --- a/CMake/FindLZ4.cmake +++ b/CMake/FindLZ4.cmake -@@ -1,38 +1,3 @@ +@@ -1,38 +1,5 @@ -find_path(LZ4_INCLUDE_DIR - NAMES lz4.h - DOC "lz4 include directory") @@ -43,5 +43,7 @@ index 8c94e3bcd..ade3f9451 100644 -endif () +find_package(LZ4 CONFIG REQUIRED) +set_target_properties(lz4::lz4 PROPERTIES IMPORTED_GLOBAL TRUE) ++if(NOT TARGET LZ4::LZ4) +add_library(LZ4::LZ4 ALIAS lz4::lz4) ++endif() \ No newline at end of file diff --git a/ports/vtk/pegtl.patch b/ports/vtk/pegtl.patch index 6374bb3a842307..cbd1d86930c86f 100644 --- a/ports/vtk/pegtl.patch +++ b/ports/vtk/pegtl.patch @@ -2,7 +2,7 @@ diff --git a/CMake/FindPEGTL.cmake b/CMake/FindPEGTL.cmake index 73eee02f7..22d8bc159 100644 --- a/CMake/FindPEGTL.cmake +++ b/CMake/FindPEGTL.cmake -@@ -19,31 +19,40 @@ +@@ -19,31 +19,42 @@ # Copyright (c) 2009 Benoit Jacob # Redistribution and use is allowed according to the terms of the 2-clause BSD license. @@ -16,7 +16,9 @@ index 73eee02f7..22d8bc159 100644 +if(TARGET taocpp::pegtl) + message(STATUS "Searching for PEGTL - found target taocpp::pegtl") + set_target_properties(taocpp::pegtl PROPERTIES IMPORTED_GLOBAL TRUE) ++ if(NOT TARGET PEGTL::PEGTL) + add_library(PEGTL::PEGTL ALIAS taocpp::pegtl) ++ endif() +else() + find_path(PEGTL_INCLUDE_DIR + NAMES pegtl/version.hpp diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 725ace01db526e..a22785db36c0dd 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", + "port-version": 1, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b59fd80b36512d..20a4ccf5655409 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6750,7 +6750,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 0 + "port-version": 1 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 7cb9e0621b196d..5b674191725d7a 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "413d7fcbff9b50e57e486d1249c841a5e25c0def", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 1 + }, { "git-tree": "87526609113852b1b1c4a1fdc40c96a61b7c0b47", "version-semver": "9.0.3-pv5.9.1", From e27bc1d28b45555edd3f73ee03f609fec21e1a85 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Mon, 13 Sep 2021 22:42:24 -0400 Subject: [PATCH 0530/1858] [New port] Rexo (#18895) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [ports/rexo] New port * `vcpkg x-add-version --all` * [ports/rexo/portfile.cmake] Update version; use vcpkg_configure_cmake * `vcpkg x-add-version --all` * [versions/r-/rexo.json] Manually remove first iteration * vcpkg_cmake_install() Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update ports/rexo/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/rexo/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/rexo/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [rexo] Upgrade to 0.2.1; use new vcpkg cmake function names * ./vcpkg x-add-version --all --overwrite-version; remove 0.2.0 from versions/r-/rexo.json * [rexo] Upgrade to 0.2.2 * ./vcpkg x-add-version --all --overwrite-version * [rexo] Upgrade to 0.2.2 SHA hash * ./vcpkg x-add-version --all --overwrite-version * [rexo] CONTROL -> vcpkg.json * ./vcpkg x-add-version --all --overwrite-version * [ports/rexo] Use new format * [ports/rexo/vcpkg.json] Remove trailing comma * [versions/r-/rexo.json] ./vcpkg x-add-version rexo --overwrite-version Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/rexo/portfile.cmake | 19 +++++++++++++++++++ ports/rexo/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/r-/rexo.json | 9 +++++++++ 4 files changed, 48 insertions(+) create mode 100644 ports/rexo/portfile.cmake create mode 100644 ports/rexo/vcpkg.json create mode 100644 versions/r-/rexo.json diff --git a/ports/rexo/portfile.cmake b/ports/rexo/portfile.cmake new file mode 100644 index 00000000000000..9fdf507744275b --- /dev/null +++ b/ports/rexo/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "christophercrouzet/rexo" + REF "v0.2.2" + SHA512 "c7b093920bb23d1b8ecb905c8d3eb281e46607890c071c079df4c194215fc007d672ce3524848a1f0376188869f51fd9955e3fe027c10f3d286a003adfd78d09" + HEAD_REF "main" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DREXO_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Rexo) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +configure_file("${SOURCE_PATH}/UNLICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/rexo/vcpkg.json b/ports/rexo/vcpkg.json new file mode 100644 index 00000000000000..5971ea422f424a --- /dev/null +++ b/ports/rexo/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "rexo", + "version-semver": "0.2.2", + "description": "Rexo is a neat single-file cross-platform unit testing framework for C/C++", + "homepage": "https://github.com/christophercrouzet/rexo", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 20a4ccf5655409..c818d93d3ab539 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5684,6 +5684,10 @@ "baseline": "0.6.13", "port-version": 0 }, + "rexo": { + "baseline": "0.2.2", + "port-version": 0 + }, "rhash": { "baseline": "1.4.0", "port-version": 1 diff --git a/versions/r-/rexo.json b/versions/r-/rexo.json new file mode 100644 index 00000000000000..74465b5fad2ea5 --- /dev/null +++ b/versions/r-/rexo.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "baf2bfcbd402fbf0f66d810edfff4d7fbd7d1583", + "version-semver": "0.2.2", + "port-version": 0 + } + ] +} From bcd2a45546c0dcea0e6e4b5387cb0f6e5e1cf6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 14 Sep 2021 03:46:09 +0100 Subject: [PATCH 0531/1858] [kf5service] new port (#19180) * Add kf5service port * Add kf5service port * [kf5service] update to 5.75.0 * [kf5service] update to 5.84.0 * [kf5service] update versions * [kf5service] update to current spec Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5service] use semVer Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5service] wrap paths in quotes Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [kf5service] update versions * [kf5package] only remove what's needed * [kf5package] phrasing, other cleanups * [kf5service] update versions * [kf5service] DISABLE_PARALLEL_CONFIGURE * [kf5service] update versions * [kf5service] add gettext tools dependency * [kf5service] update versions * [kf5service] upstream requires bison >= 3.0 * [kf5service] remove unused dependencies * [kf5service] update versions * [kf5service] remove redundant options * [kf5service] update versions * [kf5service] copy kbuildsycoca5 tool * [kf5service] update versions * [kf5service] fix Windows static builds * [kf5service] update versions * [kf5service] cleanup, iconv was fixed in kf5i18n * [kf5service] update versions * [kf5service] use generic, non-semver versioning * [kf5service] update versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/kf5service/portfile.cmake | 56 +++++++++++++++++++++++++++++++++ ports/kf5service/vcpkg.json | 37 ++++++++++++++++++++++ versions/baseline.json | 4 +++ versions/k-/kf5service.json | 9 ++++++ 4 files changed, 106 insertions(+) create mode 100644 ports/kf5service/portfile.cmake create mode 100644 ports/kf5service/vcpkg.json create mode 100644 versions/k-/kf5service.json diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake new file mode 100644 index 00000000000000..71077a8f54c430 --- /dev/null +++ b/ports/kf5service/portfile.cmake @@ -0,0 +1,56 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kservice + REF v5.84.0 + SHA512 3867da989c8f70fccba63d91aeb0038ad6345e66ca7df6003f968628e4a54e076e9686acb501940ef8f540c39d5f1a70a949cbfdd1caa34e6c4d51daebff418d + HEAD_REF master +) + +if(VCPKG_TARGET_IS_OSX) + # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0). + vcpkg_find_acquire_program(BISON) + execute_process( + COMMAND ${BISON} --version + OUTPUT_VARIABLE BISON_OUTPUT + ) + string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}") + set(BISON_MAJOR ${CMAKE_MATCH_1}) + set(BISON_MINOR ${CMAKE_MATCH_2}) + message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}") + if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0)) + message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.") + endif() +endif() + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) + +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) +get_filename_component(BISON_DIR "${BISON}" DIRECTORY) + +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +vcpkg_add_to_path(PREPEND "${BISON_DIR}") + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Service) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kbuildsycoca5 + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json new file mode 100644 index 00000000000000..69f73cd9c35646 --- /dev/null +++ b/ports/kf5service/vcpkg.json @@ -0,0 +1,37 @@ +{ + "name": "kf5service", + "version": "5.84.0", + "description": "Plugin framework for desktop services", + "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5coreaddons", + { + "name": "kf5crash", + "platform": "!android" + }, + { + "name": "kf5dbusaddons", + "platform": "!android" + }, + "kf5i18n", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c818d93d3ab539..0fb4aa43ec1195 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2984,6 +2984,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5service": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5solid": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json new file mode 100644 index 00000000000000..cbc9e49c2913c8 --- /dev/null +++ b/versions/k-/kf5service.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "13315cd7dbaa61af6c16276f83a15ceaab5a1235", + "version": "5.84.0", + "port-version": 0 + } + ] +} From d1cb8a742bfc2298fe414d32e33508894041cf79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 14 Sep 2021 03:46:21 +0100 Subject: [PATCH 0532/1858] [kf5package] new port (#19195) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add kf5package port * [kf5package] remove vcpkg-cmake-wrapper block * [kf5package] more fixes * Fixed kf5package for windows * Fixed kf5package for windows (by Kuntal Majumder) * [kf5package] use PORT variable where applicable * [kf5package] update to 5.75.0 * [kf5package] fix macOS libiconv * [kf5package] update to 5.84.0 * [kf5package] update versions * [kf5package] use vcpkg_copy_tools() to copy kpackagetool5 * [kf5package] update versions * [kf5package] use semVer * [kf5package] remove redundant options, wrap paths in quotes * [kf5package] update to current spec * [kf5package] update versions * [kf5package] fix configure options * [kf5package] update versions * [kf5package] fix vcpkg_cmake_config_fixup() usage Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [kf5package] update versions * [kf5package] libiconv patches only for windows static builds * [kf5package] update versions * [kf5package] libiconv patches also on osx * [kf5package] update versions * [kf5package] cleanup, iconv was fixed in kf5i18n * [kf5package] update versions * [kf5package] use generic, non-semver versioning * [kf5package] update versions Co-authored-by: Kuntal Majumder Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/kf5package/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/kf5package/vcpkg.json | 29 +++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5package.json | 9 +++++++++ 4 files changed, 71 insertions(+) create mode 100644 ports/kf5package/portfile.cmake create mode 100644 ports/kf5package/vcpkg.json create mode 100644 versions/k-/kf5package.json diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake new file mode 100644 index 00000000000000..f67cfb8525f489 --- /dev/null +++ b/ports/kf5package/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kpackage + REF v5.84.0 + SHA512 ad6a7083d461b2e782c612a544a8f6c0493c68c98a915e3f8fd4fd7de4ce636002383869476f877ace407fdc5013ad58e297ed3fd46dcac055ce79251704bf95 + HEAD_REF master +) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Package CONFIG_PATH lib/cmake/KF5Package) +vcpkg_copy_pdbs() + +vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json new file mode 100644 index 00000000000000..086ffbdfb711c8 --- /dev/null +++ b/ports/kf5package/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "kf5package", + "version": "5.84.0", + "description": "Installation and loading of additional content (ex: scripts, images...) as packages", + "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5coreaddons", + "kf5i18n", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0fb4aa43ec1195..9c34e9a7526c51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2980,6 +2980,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5package": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5plotting": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json new file mode 100644 index 00000000000000..8f7ea21f785703 --- /dev/null +++ b/versions/k-/kf5package.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aeff67d2d07a017d69a853037a12371683c5aa97", + "version": "5.84.0", + "port-version": 0 + } + ] +} From 574b99ce226146ee9744b2faf6f3fcb32b06bbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 14 Sep 2021 03:46:28 +0100 Subject: [PATCH 0533/1858] [kf5textwidgets] new port (#19766) * Add kf5textwidgets port * Fixed kf5textwidgets for windows * [kf5*] update to 5.75.0 * [kf5textwidgets] convert manifest to JSON * [kf5textwidgets] use gettext port tools * [kf5textwidgets] use current spec syntax * [kf5textwidgets] remove redundant options * [kf5textwidgets] update to 5.84 * [kf5textwidgets] only remove what's needed * [kf5textwidgets] wrap paths in quotes * [kf5textwidgets] default data location is OK * [kf5textwidgets] update versions * [kf5textwidgets] DISABLE_PARALLEL_CONFIGURE * [kf5textwidgets] update versions * [kf5textwidgets] fix Windows static builds * [kf5textwidgets] update versions * [kf5textwidgets] remove /bin when building static * [kf5textwidgets] update versions * [kf5textwidgets] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5textwidgets] update versions * [kf5textwidgets] libiconv patches only for windows static builds * [kf5textwidgets] update versions * [kf5textwidgets] cleanup, iconv was fixed in kf5i18n * [kf5textwidgets] update versions * [kf5textwidgets] use generic, non-semver versioning * [kf5textwidgets] update versions Co-authored-by: Kuntal Majumder --- ports/kf5textwidgets/portfile.cmake | 28 +++++++++++++++++++++++++ ports/kf5textwidgets/vcpkg.json | 32 +++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5textwidgets.json | 9 ++++++++ 4 files changed, 73 insertions(+) create mode 100644 ports/kf5textwidgets/portfile.cmake create mode 100644 ports/kf5textwidgets/vcpkg.json create mode 100644 versions/k-/kf5textwidgets.json diff --git a/ports/kf5textwidgets/portfile.cmake b/ports/kf5textwidgets/portfile.cmake new file mode 100644 index 00000000000000..09a63f7b5deae1 --- /dev/null +++ b/ports/kf5textwidgets/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/ktextwidgets + REF v5.84.0 + SHA512 39afc3265c8aed26f78c836691548cafca05f31238e11f6d29e497c78b6e809d9dba5d3f6cbb9425cfe84d2a1d0910165e77c7841d833cccee3c7398e39bfc68 + HEAD_REF master +) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QTPLUGINDIR=plugins +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5TextWidgets CONFIG_PATH lib/cmake/KF5TextWidgets) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json new file mode 100644 index 00000000000000..49c0a45792dd51 --- /dev/null +++ b/ports/kf5textwidgets/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "kf5textwidgets", + "version": "5.84.0", + "description": "Text editing widgets", + "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5i18n", + "kf5sonnet", + "kf5widgetsaddons", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 9c34e9a7526c51..c848cb7340752a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3004,6 +3004,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5textwidgets": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5wallet": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5textwidgets.json b/versions/k-/kf5textwidgets.json new file mode 100644 index 00000000000000..4bfc99aa6dff80 --- /dev/null +++ b/versions/k-/kf5textwidgets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "bdc98a609f6b939514630fb39de377fdb09560c0", + "version": "5.84.0", + "port-version": 0 + } + ] +} From 9d06357f9b03521b5ed26b3125fbb68b5f86f002 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:00:44 +0800 Subject: [PATCH 0534/1858] [Python3] update to 3.9.7 (#19851) * [Python3] update to 3.9.7 * update version * update vcpkg tool python3 to 3.9.7 * update hash to lowercase * update portifile.cmake * update version --- ports/python3/portfile.cmake | 16 ++++++++-------- ports/python3/vcpkg.json | 10 +++++++++- scripts/cmake/vcpkg_find_acquire_program.cmake | 6 +++--- scripts/vcpkgTools.xml | 8 ++++---- versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 6 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 2765b6a196daa2..069008408025c4 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -5,7 +5,7 @@ endif() set(PYTHON_VERSION_MAJOR 3) set(PYTHON_VERSION_MINOR 9) -set(PYTHON_VERSION_PATCH 6) +set(PYTHON_VERSION_PATCH 7) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -32,7 +32,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 a484de98044d180c3494ccf199f146516650cf7bc917b7d4a85f1e9b42b3938c2540f82298cb3f59332ae41c927e2335b4d91265de3496db4a14693a25a6a772 + SHA512 05de4e485fb6f5f21e4e48fb4d7ec0e9a420fab243cba08663e52b8062f86df3e4f57b8afd49ad94d363ca0972ab85efe132b980a7f84188c82814b6df0ba191 HEAD_REF master PATCHES ${PATCHES} ) @@ -62,10 +62,10 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) find_library(ZLIB_RELEASE NAMES zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) find_library(ZLIB_DEBUG NAMES zlib zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) - configure_file(${SOURCE_PATH}/PC/pyconfig.h ${SOURCE_PATH}/PC/pyconfig.h) - configure_file(${CMAKE_CURRENT_LIST_DIR}/python_vcpkg.props.in ${SOURCE_PATH}/PCbuild/python_vcpkg.props) - configure_file(${CMAKE_CURRENT_LIST_DIR}/openssl.props.in ${SOURCE_PATH}/PCbuild/openssl.props) - file(WRITE ${SOURCE_PATH}/PCbuild/libffi.props + configure_file("${SOURCE_PATH}/PC/pyconfig.h" "${SOURCE_PATH}/PC/pyconfig.h") + configure_file("${CMAKE_CURRENT_LIST_DIR}/python_vcpkg.props.in" "${SOURCE_PATH}/PCbuild/python_vcpkg.props") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.props.in" "${SOURCE_PATH}/PCbuild/openssl.props") + file(WRITE "${SOURCE_PATH}/PCbuild/libffi.props" " " ) @@ -113,7 +113,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) endif() vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "PCbuild/pcbuild.proj" OPTIONS ${OPTIONS} LICENSE_SUBPATH "LICENSE" @@ -166,7 +166,7 @@ else() endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} OPTIONS_DEBUG "--with-pydebug" ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 84aec1b9a3afbb..5803414a87dad0 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "python3", - "version-semver": "3.9.6", + "version-semver": "3.9.7", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", @@ -34,6 +34,14 @@ "name": "sqlite3", "platform": "!(windows & static)" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 7740f5dec3f363..a75e3c6be81310 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -149,17 +149,17 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "PYTHON3") if(CMAKE_HOST_WIN32) set(PROGNAME python) - set(PYTHON_VERSION 3.9.6) + set(PYTHON_VERSION 3.9.7) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(SUBDIR "python-${PYTHON_VERSION}-x86") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip") - set(HASH 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c) + set(HASH 5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870) else() set(SUBDIR "python-${PYTHON_VERSION}-x64") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip") - set(HASH f8946471ed7dbc8cbffc72298f99330794b127ce6aa60abc87e80b31bd26099a2f637db85af88ce78c06dcf6e19064184ef3768edf4b1a0f97c25898e379d121) + set(HASH 482765de165863f86637591d57141930e2c4ca6e210d0c2569bd0e5fe63157966fb44dea0d5adf249ff15ec9c50cb2dddb704c4ea79369d598f348ee5406f160) endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index ea5c221d99f845..fc07adeb51206c 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,11 +1,11 @@ - 3.9.6 + 3.9.7 python.exe - https://www.python.org/ftp/python/3.9.6/python-3.9.6-embed-win32.zip - 4b2a0670094e639dcb2b762a02de8cdadd0af3657c463d9ff45af2541c0306496b991ae5402f119443ca891e918685bb57d18f13975f0493d349d864ff3e3a2c - python-3.9.6-embed-win32.zip + https://www.python.org/ftp/python/3.9.7/python-3.9.7-embed-win32.zip + 5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870 + python-3.9.7-embed-win32.zip 3.21.1 diff --git a/versions/baseline.json b/versions/baseline.json index c848cb7340752a..79447f57aed220 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5225,7 +5225,7 @@ "port-version": 1 }, "python3": { - "baseline": "3.9.6", + "baseline": "3.9.7", "port-version": 0 }, "qca": { diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 6b75aa7fcf7a3e..34194e0abba275 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3a545b39c982b7f0a12891765dd9909e364ebc6", + "version-semver": "3.9.7", + "port-version": 0 + }, { "git-tree": "0628d684afd26b15be6a1a6bb162e56744a442a7", "version-semver": "3.9.6", From 48a637ba5091c6e18b33698359dec61182d45d6a Mon Sep 17 00:00:00 2001 From: John Vandenberg Date: Tue, 14 Sep 2021 11:03:28 +0800 Subject: [PATCH 0535/1858] [sbp] new port (#19335) * [sbp] new port Closes https://github.com/microsoft/vcpkg/issues/19218 * update portfile.cmake * update version * add vcpkg_fail_port_install for portifile * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/sbp/portfile.cmake | 47 +++++++++++++++++++++++++++++++ ports/sbp/vcpkg.json | 18 ++++++++++++ ports/sbp/win32-install-fix.patch | 27 ++++++++++++++++++ versions/baseline.json | 4 +++ versions/s-/sbp.json | 9 ++++++ 5 files changed, 105 insertions(+) create mode 100644 ports/sbp/portfile.cmake create mode 100644 ports/sbp/vcpkg.json create mode 100644 ports/sbp/win32-install-fix.patch create mode 100644 versions/s-/sbp.json diff --git a/ports/sbp/portfile.cmake b/ports/sbp/portfile.cmake new file mode 100644 index 00000000000000..219a548793bbaf --- /dev/null +++ b/ports/sbp/portfile.cmake @@ -0,0 +1,47 @@ +# Windows shared libraries are not supported yet +# See https://github.com/swift-nav/libsbp/issues/1062 +vcpkg_fail_port_install(ON_TARGET "uwp") + +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO swift-nav/libsbp + REF v3.4.10 + SHA512 bbdcefad9ff8995759b577790bcffb94355bd0ee29f259fa8d51f54907e252b55871dc5a841e21d23e661fd5b33109761eb20b66c2fb73e9e7de8a34cc8d6528 + HEAD_REF master + PATCHES + "win32-install-fix.patch" +) + +vcpkg_from_github( + OUT_SOURCE_PATH CMAKE_EXTRA_MODS + REPO swift-nav/cmake + REF 373d4fcafbbc0c208dc9ecb278d36ed8c9448eda + SHA512 afefc8c7a3fb43ee65b9b8733968a5836938460abbf1bc9e8330f83c3ac4a5819f71a36dcb034004296161c592f4d61545ba10016d6666e7eaf1dca556d99e2e + HEAD_REF master +) + +# Copy cmake files to expected location +file(INSTALL "${CMAKE_EXTRA_MODS}/CCache.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/SwiftCmakeOptions.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/CompileOptions.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/LanguageStandards.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/ClangFormat.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/ClangTidy.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/CodeCoverage.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") +file(INSTALL "${CMAKE_EXTRA_MODS}/TestTargets.cmake" DESTINATION "${SOURCE_PATH}/c/cmake/common") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/c" + OPTIONS + -Dlibsbp_ENABLE_TESTS=OFF + -Dlibsbp_ENABLE_DOCS=OFF +) + +vcpkg_cmake_install() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/sbp/vcpkg.json b/ports/sbp/vcpkg.json new file mode 100644 index 00000000000000..248dc3139e1ca0 --- /dev/null +++ b/ports/sbp/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "sbp", + "version-semver": "3.4.10", + "description": "Swift Navigation Binary Protocol (SBP) is a binary protocol for communicating GNSS data used by Piksi devices.", + "homepage": "https://github.com/swift-nav/libsbp", + "documentation": "https://support.swiftnav.com/support/solutions/articles/44001850782-swift-binary-protocol", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/sbp/win32-install-fix.patch b/ports/sbp/win32-install-fix.patch new file mode 100644 index 00000000000000..5c880d3810ce14 --- /dev/null +++ b/ports/sbp/win32-install-fix.patch @@ -0,0 +1,27 @@ +commit 6023d12ca2df861b134b345151d2463a963e50c4 +Author: Rodrigo Reichert +Date: Wed Aug 4 13:24:43 2021 +1000 + + ESD-2166 Fix windows install dll directory (#1061) + +diff --git a/c/src/CMakeLists.txt b/c/src/CMakeLists.txt +index b00fa523..1019683f 100644 +--- a/c/src/CMakeLists.txt ++++ b/c/src/CMakeLists.txt +@@ -27,9 +27,13 @@ if (MINGW) + endif() + endif() + +-install(TARGETS sbp +- EXPORT sbp-export +- DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) ++install( ++ TARGETS sbp ++ EXPORT sbp-export ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) + install(DIRECTORY "${PROJECT_SOURCE_DIR}/include/libsbp/" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/libsbp") + + export(EXPORT sbp-export diff --git a/versions/baseline.json b/versions/baseline.json index 79447f57aed220..42af23cce04813 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5812,6 +5812,10 @@ "baseline": "3.6.1", "port-version": 1 }, + "sbp": { + "baseline": "3.4.10", + "port-version": 0 + }, "scintilla": { "baseline": "4.4.6", "port-version": 0 diff --git a/versions/s-/sbp.json b/versions/s-/sbp.json new file mode 100644 index 00000000000000..cd9ea4056dec52 --- /dev/null +++ b/versions/s-/sbp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d3d3511804be8ef1277c4bce734379748ee615f4", + "version-semver": "3.4.10", + "port-version": 0 + } + ] +} From 756ad0a00e2f64757ccb505087e3b779d7385e5a Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Tue, 14 Sep 2021 12:04:23 +0900 Subject: [PATCH 0536/1858] [fbgemm] fix find_package (#20111) * [fbgemm] fix find_package * install internal header for pytorch * [fbgemm] remove GPU feature * The source requires ATen and some other libraries ... --- ports/fbgemm/portfile.cmake | 16 +++++++++------- ports/fbgemm/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/f-/fbgemm.json | 5 +++++ 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ports/fbgemm/portfile.cmake b/ports/fbgemm/portfile.cmake index b61db3979b2504..ee0da8e8081363 100644 --- a/ports/fbgemm/portfile.cmake +++ b/ports/fbgemm/portfile.cmake @@ -12,18 +12,20 @@ vcpkg_from_github( fix-cmakelists.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_SANITIZER=OFF -DFBGEMM_BUILD_TESTS=OFF -DFBGEMM_BUILD_BENCHMARKS=OFF -DPYTHON_EXECUTABLE=${PYTHON3} # inject the path instead of find_package(Python) ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME fbgemmLibrary CONFIG_PATH share/cmake/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +# this internal header is required by pytorch +file(INSTALL "${SOURCE_PATH}/src/RefImplementations.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/fbgemm/src") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/fbgemm/vcpkg.json b/ports/fbgemm/vcpkg.json index 3d1de8260ae805..aeddbfe0dc1f91 100644 --- a/ports/fbgemm/vcpkg.json +++ b/ports/fbgemm/vcpkg.json @@ -1,12 +1,20 @@ { "name": "fbgemm", "version-date": "2021-03-18", - "port-version": 1, + "port-version": 2, "description": "FB (Facebook) + GEMM (General Matrix-Matrix Multiplication)", "homepage": "https://code.fb.com/ml-applications/fbgemm/", "supports": "!(x86 | uwp)", "dependencies": [ "asmjit", - "cpuinfo" + "cpuinfo", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 42af23cce04813..f6c7eda8a48a0b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2030,7 +2030,7 @@ }, "fbgemm": { "baseline": "2021-03-18", - "port-version": 1 + "port-version": 2 }, "fbthrift": { "baseline": "2021.06.14.00", diff --git a/versions/f-/fbgemm.json b/versions/f-/fbgemm.json index ae67aa19008670..2308259e2dce2f 100644 --- a/versions/f-/fbgemm.json +++ b/versions/f-/fbgemm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8707b988ad38aae04720ce3494ef09603bd67954", + "version-date": "2021-03-18", + "port-version": 2 + }, { "git-tree": "6f3e815d3e806243cddff7b0e262d130ef702e98", "version-date": "2021-03-18", From ae02f4e7ca7e7b0b0c066b49577d5741de818895 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Sep 2021 05:05:43 +0200 Subject: [PATCH 0537/1858] [vcpkg-ci] Request conversion of CONTROL files (#19698) --- .github/workflows/untrustedPR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 77e7df1eb433bc..ca8f99ea58dfd2 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -38,7 +38,7 @@ jobs: git config user.email github-actions git config user.name github-actions@github.com - ./vcpkg format-manifest ports/*/vcpkg.json + ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u git commit -m "tmp" --allow-empty From 8b3b5cda609782c310d479e4e53ca3d43ed9e209 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:10:12 +0800 Subject: [PATCH 0538/1858] [vcpkg_cmake_configure/vcpkg_configure_cmake] Support VS2022 17.0 (#19088) * [vcpkg] Support VS2022 17.0 * small changes * Update vcpkg.cmake * Update the baseline version * Update the baseline version * Update the baselin version * Adress the review suggestions Co-authored-by: Billy Robert O'Neal III --- ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 13 +++++++++++++ scripts/buildsystems/vcpkg.cmake | 2 ++ scripts/cmake/vcpkg_configure_cmake.cmake | 12 ++++++++++++ versions/baseline.json | 2 +- versions/v-/vcpkg-cmake.json | 5 +++++ 6 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index 96134a85035daa..49b1387178e8c5 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-07-30" + "version-date": "2021-09-13" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 801db016640505..c9657bfa9a0941 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -207,6 +207,19 @@ function(vcpkg_cmake_configure) else() set(generator) endif() + elseif(VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(generator "Visual Studio 17 2022") + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(arch "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(arch "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + set(arch "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + set(arch "ARM64") + else() + set(generator) + endif() endif() else() set(generator "Ninja") diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b385476395b5be..9769b611328b20 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -268,6 +268,8 @@ else() set(Z_VCPKG_TARGET_TRIPLET_ARCH x86) elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 16 2019$") set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) + elseif(CMAKE_GENERATOR MATCHES "^Visual Studio 17 2022$") + set(Z_VCPKG_TARGET_TRIPLET_ARCH x64) else() find_program(Z_VCPKG_CL cl) if(Z_VCPKG_CL MATCHES "amd64/cl.exe$" OR Z_VCPKG_CL MATCHES "x64/cl.exe$") diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 0377ae5dd8c56b..1e0a1100d5fb7f 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -187,6 +187,18 @@ function(vcpkg_configure_cmake) set(GENERATOR "Visual Studio 16 2019") set(ARCH "ARM64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "Win32") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "x64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "ARM") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") + set(GENERATOR "Visual Studio 17 2022") + set(ARCH "ARM64") else() if(NOT VCPKG_CMAKE_SYSTEM_NAME) set(VCPKG_CMAKE_SYSTEM_NAME Windows) diff --git a/versions/baseline.json b/versions/baseline.json index f6c7eda8a48a0b..6558eecb54255a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6729,7 +6729,7 @@ "port-version": 1 }, "vcpkg-cmake": { - "baseline": "2021-07-30", + "baseline": "2021-09-13", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 086edd0208cb20..6c05751fd73036 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc4d9fcc5b8d2b97c083c6b70dd06df5174bd97b", + "version-date": "2021-09-13", + "port-version": 0 + }, { "git-tree": "c6df7e0faeda9e783175746c7c440c9bc2bdb111", "version-date": "2021-07-30", From c64032e34e9c734d0b3230a1dc4dc320ad356498 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:17:25 +0800 Subject: [PATCH 0539/1858] [armadillo]update to 10.6.2 (#19648) * [armadillo]update to 10.6.2 * update version * update portifile.cmake * update version --- ports/armadillo/portfile.cmake | 33 +++++++++++++++------------------ ports/armadillo/vcpkg.json | 12 ++++++++++-- versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 4f52e9d7462d2e..757065f6068047 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -3,46 +3,43 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO arma - FILENAME "armadillo-10.4.0.tar.xz" - SHA512 72cf8a493e86c51c4c875076d0a9dd7c21fbfbd639064fa7a96daf4a5df02b36c93440bbae471f30d368547c6856c91fef97ce8ed2ec0526b0060588b71cd28a + FILENAME "armadillo-10.6.2.tar.xz" + SHA512 ae04e993830ca04e7eddfaf9c40a50fb9139b10b9667412f5a18707ac73ee529b8e3a5a91337782e4e01bae61207b44f24bdd8a77c6c2404011a06006d849aba PATCHES remove_custom_modules.patch fix-CMakePath.patch add-disable-find-package.patch ) -file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake) -file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake) -file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake) +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindBLAS.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindLAPACK.cmake") +file(REMOVE "${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DDETECT_HDF5=false -DCMAKE_DISABLE_FIND_PACKAGE_SuperLU=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ACML=ON - -DCMAKE_DISABLE_FIND_PACKAGE_ACMLMP=ON -DCMAKE_DISABLE_FIND_PACKAGE_ARPACK=ON -DCMAKE_DISABLE_FIND_PACKAGE_ATLAS=ON -DCMAKE_DISABLE_FIND_PACKAGE_MKL=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/Armadillo/CMake TARGET_PATH share/Armadillo) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/Armadillo/CMake) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(GLOB SHARE_CONTENT ${CURRENT_PACKAGES_DIR}/share/Armadillo) +file(GLOB SHARE_CONTENT "${CURRENT_PACKAGES_DIR}/share/Armadillo") list(LENGTH SHARE_CONTENT SHARE_LEN) if(SHARE_LEN EQUAL 0) # On case sensitive file system there is an extra empty directory created that should be removed - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Armadillo) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Armadillo") endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index 19daff8097e064..bf9db01cb4cf65 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,10 +1,18 @@ { "name": "armadillo", - "version": "10.4.0", + "version": "10.6.2", "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", "dependencies": [ "blas", - "lapack" + "lapack", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 036696041a4237..54a94c6a80393d 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66b31fe832e9322876f427f1fec7836bb71c082c", + "version": "10.6.2", + "port-version": 0 + }, { "git-tree": "3925824cd7eed2d9fcaa092a9a543eb538d9a558", "version": "10.4.0", diff --git a/versions/baseline.json b/versions/baseline.json index 6558eecb54255a..e313e7af808cbc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -157,7 +157,7 @@ "port-version": 0 }, "armadillo": { - "baseline": "10.4.0", + "baseline": "10.6.2", "port-version": 0 }, "arrayfire": { From 67d1f0cab258f9ae20d47187b3177a9af5d66f4b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Tue, 14 Sep 2021 05:18:37 +0200 Subject: [PATCH 0540/1858] update some msys components (#19654) --- scripts/cmake/vcpkg_acquire_msys.cmake | 33 +++++++++++--------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index fa00016129645f..c07fe7d62c1ca0 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -211,14 +211,14 @@ function(vcpkg_acquire_msys out_msys_root) DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/autoconf-2.69-5-any.pkg.tar.xz" - SHA512 66b9c97bd3d1dfe2a2ab576235b6b8c204a9e4c099ba14cf5d0139e564bba1e735e3b1083354b4cac8c6c42233cbdd5e1e277e32cadfe24017b94d2fbdeb5617 - DEPS m4 + URL "https://repo.msys2.org/msys/x86_64/autoconf-2.71-1-any.pkg.tar.zst" + SHA512 c5683bdf72bb3ba28ec0cb6a211ae1f9eebc79d03f17fc8a55d78a35dc6499209936e099d3725573255a48578b71fac6b7b17afb933fd22fe1204daf50689609 + DEPS m4 perl ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/autoconf-archive-2019.01.06-1-any.pkg.tar.xz" SHA512 77540d3d3644d94a52ade1f5db27b7b4b5910bbcd6995195d511378ca6d394a1dd8d606d57161c744699e6c63c5e55dfe6e8664d032cc8c650af9fdbb2db08b0 - DEPS m4 + DEPS m4 perl ) z_vcpkg_acquire_msys_declare_package( URL "https://repo.msys2.org/msys/x86_64/diffutils-3.7-1-x86_64.pkg.tar.xz" @@ -276,8 +276,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/m4-1.4.18-2-x86_64.pkg.tar.xz" - SHA512 061e9243c1e013aa093546e3872984ad47b7fc9d64d4c39dcce62e750ed632645df00be3fe382a2f55f3bf623dd0d649e2092be23e8f22f921f582e41893e36a + URL "https://repo.msys2.org/msys/x86_64/m4-1.4.19-1-x86_64.pkg.tar.zst" + SHA512 8f100fef907ae6668af68538cae559a531761b51bb556d345b752c698fee938a503818cbd2003722d449f6c9a080c7ddabe12dddbee4d407377ca1e96e7d08b1 DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( @@ -319,23 +319,18 @@ function(vcpkg_acquire_msys out_msys_root) DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.2-2-any.pkg.tar.zst" - SHA512 b837ec70fce700fc6415f1e73287911cbdf665628b63dcffac4cad1b3a3a23efeabacd950d6757567cbcc4c9cedb120e06d2a7dd5cad028434063cab936e03ae + URL "https://repo.msys2.org/msys/x86_64/automake1.16-1.16.3-1-any.pkg.tar.zst" + SHA512 174e6b9d1512eb710d48cda5bb4fef2b5d9b32071f425c76ea32c48081da0281f9fde1aa185845fa68a881233937f8cfd3ebda640d55764c1d48ec50e4de3390 DEPS perl ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/automake1.15-1.15.1-2-any.pkg.tar.zst" - SHA512 aed269720344948d50965354e35d640a8db1589bb9e98d21427a3cc47a8e8dfd2a6e4828b1ca109a4010eb808bdf9a627383c302a0713efcb6ab3be1f887d930 - DEPS perl - ) - z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/perl-5.32.0-2-x86_64.pkg.tar.zst" - SHA512 d8397c64cf9d8deb43904f705e6263b8086773a64c2feb4eb8f36921e4115fc1230267a18c0ef2ca9726fbcce6ed22125f3c7c2472042bf1279b423b2088d3df + URL "https://repo.msys2.org/msys/x86_64/perl-5.32.1-1-x86_64.pkg.tar.zst" + SHA512 600b919c7299566aa6abf9a432c166fdd81be5ed052ad4062cc54ee952ea556992e8aba25a44757965d66827dc6e98fddb492867399be3bbed44803e17367cb8 DEPS libcrypt ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-2-x86_64.pkg.tar.xz" - SHA512 59a13f79f560934f880d68209a58a3c39ee4a1d24500035bde90d7a6f6ab0d4f72fe14edea6f19a8eb54d4d53b0b6ad4589b388f1521a07ab24a0f8307619cab + URL "https://repo.msys2.org/msys/x86_64/libcrypt-2.1-3-x86_64.pkg.tar.zst" + SHA512 15cee333a82b55ff6072b7be30bf1c33c926d8ac21a0a91bc4cbf655b6f547bc29496df5fa288eb47ca2f88af2a4696f9b718394437b65dd06e3d6669ca0c2e5 DEPS gcc-libs ) z_vcpkg_acquire_msys_declare_package( @@ -394,8 +389,8 @@ function(vcpkg_acquire_msys out_msys_root) DEPS msys2-runtime ) z_vcpkg_acquire_msys_declare_package( - URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.1.6-3-x86_64.pkg.tar.xz" - SHA512 f094a7f4926195ef7ba015f0c5c56587b1faa94d85530f07aaaa5557a1494c3bd75257d4687c8401cbf1328d23e5586a92b05f0a872caebb1a7e941a07829776 + URL "https://repo.msys2.org/msys/x86_64/msys2-runtime-3.2.0-8-x86_64.pkg.tar.zst" + SHA512 fdd86f4ffa6e274d6fef1676a4987971b1f2e1ec556eee947adcb4240dc562180afc4914c2bdecba284012967d3d3cf4d1a392f798a3b32a3668d6678a86e8d3 ) z_vcpkg_acquire_msys_declare_package( From 4e0d44829cca54a37f0b193fff230385599689c8 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 14 Sep 2021 06:19:32 +0300 Subject: [PATCH 0541/1858] [netcdf-c] Fix build under Linux with dynamic linkage (#19981) * [netcdf-c] Fix build under Linux with dynamic linkage * Add delete bin on *nix comment. * Don't mark semver for unverified-semver port. Co-authored-by: Billy Robert O'Neal III --- ports/netcdf-c/portfile.cmake | 3 ++- ports/netcdf-c/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/n-/netcdf-c.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 468237d2cbffc5..f51081d8be893b 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -60,7 +60,8 @@ if("tools" IN_LIST FEATURES) TOOL_NAMES nccopy ncdump ncgen ncgen3 AUTO_CLEAN ) -elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) + # delete bin under non-windows because the dynamic libraries get put in lib file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index 6e65236081bedb..256a401b46b678 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "netcdf-c", - "version-string": "4.7.4", - "port-version": 3, + "version": "4.7.4", + "port-version": 4, "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e313e7af808cbc..f0f9883a0df376 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4450,7 +4450,7 @@ }, "netcdf-c": { "baseline": "4.7.4", - "port-version": 3 + "port-version": 4 }, "netcdf-cxx4": { "baseline": "4.3.1", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index 75fcc46b1f377d..4b1157b9a26e00 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6af71c6bbdb51d1cbbade70010ccf9c628938ac2", + "version": "4.7.4", + "port-version": 4 + }, { "git-tree": "069ccb40f8ce75d6ec88b8fe31966c11fcf6906b", "version-string": "4.7.4", From dca41bcc5c8add31065bb3312b0d6d6fb7d541ff Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:20:15 +0800 Subject: [PATCH 0542/1858] [audiofile/cgltf/libsbml] Update to the latest version (#20066) * [audiofile/cgltf/libsbml] Update to the latest version * Format manifests * [libsbml] Update branch from stable to development * Update versions/l-/libsbml.json * [audiofile] Add options to vcpkg_cmake_configure --- ports/audiofile/fix-cmakeLists.patch | 38 ++++++++++++++++ ports/audiofile/portfile.cmake | 21 +++++++-- ports/audiofile/vcpkg.json | 14 +++++- ports/cgltf/portfile.cmake | 10 ++-- ports/cgltf/vcpkg.json | 3 +- ports/libsbml/fix-linkage-type.patch | 22 --------- ports/libsbml/portfile.cmake | 68 +++++++++++++++------------- ports/libsbml/vcpkg.json | 13 +++++- versions/a-/audiofile.json | 5 ++ versions/baseline.json | 10 ++-- versions/c-/cgltf.json | 5 ++ versions/l-/libsbml.json | 5 ++ 12 files changed, 141 insertions(+), 73 deletions(-) create mode 100644 ports/audiofile/fix-cmakeLists.patch delete mode 100644 ports/libsbml/fix-linkage-type.patch diff --git a/ports/audiofile/fix-cmakeLists.patch b/ports/audiofile/fix-cmakeLists.patch new file mode 100644 index 00000000000000..a7551d6ade776f --- /dev/null +++ b/ports/audiofile/fix-cmakeLists.patch @@ -0,0 +1,38 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d43c0c7..1bf21cf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,8 @@ cmake_minimum_required (VERSION 3.12) + project ("AudioFile" VERSION 1.0.9 + DESCRIPTION "A simple C++ library for reading and writing audio files." + HOMEPAGE_URL "https://github.com/adamstark/AudioFile") ++option(BUILD_EXAMPLES "Build examples" OFF) ++option(BUILD_TESTS "Build tests" OFF) + + #=============================================================================== + include (GNUInstallDirs) +@@ -21,10 +23,20 @@ target_include_directories ( + target_compile_features (${PROJECT_NAME} INTERFACE cxx_std_11) + + #=============================================================================== ++if(BUILD_EXAMPLES) + add_subdirectory (examples) ++endif() + ++if(BUILD_TESTS) + enable_testing() + add_subdirectory (tests) +- ++endif() + #=============================================================================== +-set (CMAKE_SUPPRESS_REGENERATION true) +\ No newline at end of file ++set (CMAKE_SUPPRESS_REGENERATION true) ++ ++#install and export targets ++install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config) ++export(TARGETS ${PROJECT_NAME} FILE ${PROJECT_NAME}Config.cmake) ++install(EXPORT ${PROJECT_NAME}Config DESTINATION share/AudioFile FILE ${PROJECT_NAME}Config.cmake) ++#install headers ++install(FILES AudioFile.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +\ No newline at end of file diff --git a/ports/audiofile/portfile.cmake b/ports/audiofile/portfile.cmake index 49f9a67d279426..df0fff37426b00 100644 --- a/ports/audiofile/portfile.cmake +++ b/ports/audiofile/portfile.cmake @@ -3,11 +3,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adamstark/AudioFile - REF ccb64bd86881099e65a329f104733679ae03f63e # 1.0.7 - SHA512 f172f9df95a028c9c3da29cd530dd4b55acad76ee7503000f96ba10c5d014abd219fcd145cea4b7ca7a902c38d968518b39de285d25f7e3ccc56d1ba3769d7b8 + REF b7dd84abd5763f64fcf74e58499c4b5d779a396d # 1.0.9 + SHA512 daadbf7badadee4a189453af137b1ea5a5ba3486780d02664d1516f379c3705155b1036a9f8f7acd49b6a82269a07e510edcd5e9de55c73f47250244a510ccbb HEAD_REF master + PATCHES + fix-cmakeLists.patch ) -file(COPY ${SOURCE_PATH}/AudioFile.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME AudioFile) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/audiofile/vcpkg.json b/ports/audiofile/vcpkg.json index d779642030d20b..8d982a697255a3 100644 --- a/ports/audiofile/vcpkg.json +++ b/ports/audiofile/vcpkg.json @@ -1,7 +1,17 @@ { "name": "audiofile", - "version-string": "1.0.7", + "version": "1.0.9", "description": "A simple header-only C++ library for reading and writing audio files.", "homepage": "https://github.com/adamstark/AudioFile", - "license": "GPL-3.0" + "license": "GPL-3.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake index de7e6ad32ca844..54b8dade60c78a 100644 --- a/ports/cgltf/portfile.cmake +++ b/ports/cgltf/portfile.cmake @@ -3,13 +3,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/cgltf - REF v1.8 - SHA512 d77064bf333b7d1cbc91e261f375f1fdd60934aeb3cf87f1121cf4c4ae294532885381a265f4380c79d6bc75de72ed5f3e57153c5d0d0db98a65ee14f8b1bbfe + REF 1bdc84d3bb81fa69bcf71ed5cafe63e58df1448a #v1.10 + SHA512 d7f06912a2654633e6d596805e09dbb315453837d066189091c78f7eb837a2caff1768d79f15e8b0536105ffeb67a46e7093e2d6b61091301754f4722c494ada HEAD_REF master ) -file(COPY ${SOURCE_PATH}/cgltf.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(COPY ${SOURCE_PATH}/cgltf_write.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/cgltf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/cgltf_write.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) \ No newline at end of file diff --git a/ports/cgltf/vcpkg.json b/ports/cgltf/vcpkg.json index 14e732885192b1..aa9ebec52890df 100644 --- a/ports/cgltf/vcpkg.json +++ b/ports/cgltf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cgltf", - "version-string": "1.8", - "port-version": 1, + "version": "1.10", "description": "Single-file glTF 2.0 loader and writer written in C99", "homepage": "https://github.com/jkuhlmann/cgltf" } diff --git a/ports/libsbml/fix-linkage-type.patch b/ports/libsbml/fix-linkage-type.patch deleted file mode 100644 index 08186357ad360c..00000000000000 --- a/ports/libsbml/fix-linkage-type.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index eb692cf..11158db 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -524,7 +524,7 @@ INSTALL( - endif() - - --endif() -+else() - - add_library (${LIBSBML_LIBRARY}-static STATIC ${LIBSBML_SOURCES} ) - -@@ -560,7 +560,7 @@ INSTALL(FILES - DESTINATION ${PACKAGE_CONFIG_DIR} - ) - endif() -- -+endif() - ############################################################################## - # - # add native tests diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake index ed7749daa979b7..47a1cc601e3ee0 100644 --- a/ports/libsbml/portfile.cmake +++ b/ports/libsbml/portfile.cmake @@ -1,31 +1,30 @@ -vcpkg_download_distfile(ARCHIVE - URLS "https://sourceforge.net/projects/sbml/files/libsbml/5.18.0/stable/libSBML-5.18.0-core-plus-packages-src.tar.gz/download" - FILENAME "libSBML-5.18.0.zip" - SHA512 49dedaa2fcd2077e7389a8f940adf931d80aa7a8f9d57330328372d2ac8ebcaeb03a20524df2fe0f1c6933587904613754585076c46e6cb5d6f7a001f427185b -) +vcpkg_fail_port_install(ON_TARGET "uwp") -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES fix-linkage-type.patch + REPO sbmlteam/libsbml + REF 118ffbf11f1a5245cc544c1eac71019d979ecb20 #libSBML-5.19.0 + SHA512 7fe8b4d594876c6408e01c646187cb1587d0b4e12707a43286150d4e4646841e547bde971de917de1cdfbbb9365172aeac43c8e02f7d354400f9166f0f1c2c3d + HEAD_REF development ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LIBRARY) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - comp ENABLE_COMP - fbc ENABLE_FBC - groups ENABLE_GROUPS - layout ENABLE_LAYOUT - multi ENABLE_MULTI - qual ENABLE_QUAL - render ENABLE_RENDER - render ENABLE_LAYOUT - bzip2 WITH_BZIP2 - zlib WITH_ZLIB - test WITH_CHECK - namespace WITH_CPP_NAMESPACE + FEATURES + comp ENABLE_COMP + fbc ENABLE_FBC + groups ENABLE_GROUPS + layout ENABLE_LAYOUT + multi ENABLE_MULTI + qual ENABLE_QUAL + render ENABLE_RENDER + render ENABLE_LAYOUT + bzip2 WITH_BZIP2 + zlib WITH_ZLIB + test WITH_CHECK + namespace WITH_CPP_NAMESPACE ) # Handle conflict features @@ -48,9 +47,8 @@ if ("test" IN_LIST FEATURES AND WIN32) message(FATAL_ERROR "Feature test only support UNIX.") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DWITH_EXPAT=${WITH_EXPAT} -DWITH_LIBXML=${WITH_LIBXML} @@ -59,25 +57,33 @@ vcpkg_configure_cmake( -DLIBSBML_SKIP_SHARED_LIBRARY=${STATIC_LIBRARY} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(GLOB TXT_FILES ${CURRENT_PACKAGES_DIR}/debug/*.txt) +file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/debug/*.txt") if (TXT_FILES) file(REMOVE ${TXT_FILES}) endif() -file(GLOB TXT_FILES ${CURRENT_PACKAGES_DIR}/*.txt) +file(GLOB TXT_FILES "${CURRENT_PACKAGES_DIR}/*.txt") if (TXT_FILES) file(REMOVE ${TXT_FILES}) endif() -if (EXISTS ${CURRENT_PACKAGES_DIR}/debug/share) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +if (EXISTS "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/README.md") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/README.md") +endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index b675427212a281..aeb7318e60d237 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,9 +1,18 @@ { "name": "libsbml", - "version-string": "5.18.0", - "port-version": 1, + "version": "5.19.0", "description": "A library for reading / writing SBML files", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "comp", "expat", diff --git a/versions/a-/audiofile.json b/versions/a-/audiofile.json index 44ce155fb6ef96..cc7517be6aa7a4 100644 --- a/versions/a-/audiofile.json +++ b/versions/a-/audiofile.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73a1d7555de8baaf7a1b34ca1410d7e9978bf75f", + "version": "1.0.9", + "port-version": 0 + }, { "git-tree": "3bf2b19891a915f88803b1fa079c525e4d253ba0", "version-string": "1.0.7", diff --git a/versions/baseline.json b/versions/baseline.json index f0f9883a0df376..6ea64c553d0a85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -217,7 +217,7 @@ "port-version": 7 }, "audiofile": { - "baseline": "1.0.7", + "baseline": "1.0.9", "port-version": 0 }, "aurora": { @@ -1237,8 +1237,8 @@ "port-version": 3 }, "cgltf": { - "baseline": "1.8", - "port-version": 1 + "baseline": "1.10", + "port-version": 0 }, "cgns": { "baseline": "4.2.0", @@ -3661,8 +3661,8 @@ "port-version": 1 }, "libsbml": { - "baseline": "5.18.0", - "port-version": 1 + "baseline": "5.19.0", + "port-version": 0 }, "libsbsms": { "baseline": "2.3.0", diff --git a/versions/c-/cgltf.json b/versions/c-/cgltf.json index 5cb89f98813de6..6d241058830e03 100644 --- a/versions/c-/cgltf.json +++ b/versions/c-/cgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3fc2cb13947f1e5bdabb4333fbc2a4f5ec3128f7", + "version": "1.10", + "port-version": 0 + }, { "git-tree": "835b27ec3e0694edf605a79e0e7322dccd69d82f", "version-string": "1.8", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 3acc1b2467d4c7..7faeb17e46b5f0 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b31fe78dcb93a9935119d5b9bcefbb1f3950d6a", + "version": "5.19.0", + "port-version": 0 + }, { "git-tree": "1a609c8dc53ab3d8895e749d2361c9085084dfec", "version-string": "5.18.0", From 23f1ceed0b940abe6a4db111bdd610256f49e199 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Tue, 14 Sep 2021 05:21:41 +0200 Subject: [PATCH 0543/1858] [prometheus-cpp] Update to version 0.13.0 (#20077) --- ports/prometheus-cpp/portfile.cmake | 4 ++-- ports/prometheus-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/p-/prometheus-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index 1f29abf0f2a491..ce2c018fff765a 100644 --- a/ports/prometheus-cpp/portfile.cmake +++ b/ports/prometheus-cpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jupp0r/prometheus-cpp - REF 84388828ae80556f57e11249dbd0063043991fb4 # v0.12.3 - SHA512 3d8c42b7fa15b5ccc5684a590cadb09cc9adf76a66f3fa0f8b791d9ee1f1442687c554215a21ff932b62d7aac8a6e5dd6e581d2de4faae3aa9ab02e73a60533f + REF 342de5e93bd0cbafde77ec801f9dd35a03bceb3f # v0.13.0 + SHA512 2edd093dff57109f4e7050f7d870010e696642f0445a8d50f689a9a7e8f4704e74659846c1afcdfcd700ceeb64b48ea83159e87ca00ca58de4866dd39975590b HEAD_REF master ) diff --git a/ports/prometheus-cpp/vcpkg.json b/ports/prometheus-cpp/vcpkg.json index 246c7e4517747b..371b1e7380deb0 100644 --- a/ports/prometheus-cpp/vcpkg.json +++ b/ports/prometheus-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "prometheus-cpp", - "version-string": "0.12.3", - "port-version": 1, + "version-semver": "0.13.0", "description": "Prometheus Client Library for Modern C++", "default-features": [ "compression", diff --git a/versions/baseline.json b/versions/baseline.json index 6ea64c553d0a85..dde7de7a237132 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5165,8 +5165,8 @@ "port-version": 5 }, "prometheus-cpp": { - "baseline": "0.12.3", - "port-version": 1 + "baseline": "0.13.0", + "port-version": 0 }, "protobuf": { "baseline": "3.15.8", diff --git a/versions/p-/prometheus-cpp.json b/versions/p-/prometheus-cpp.json index 639f6d64c1c8c4..5b58285a32b923 100644 --- a/versions/p-/prometheus-cpp.json +++ b/versions/p-/prometheus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ae46bbdb51c6ff3e330c607e46b911b79e0ce7e3", + "version-semver": "0.13.0", + "port-version": 0 + }, { "git-tree": "4656585ffca17e789395f30f4ee6a301cff7f34e", "version-string": "0.12.3", From dede45763ac57a398b7077139b4bcde5ce1a3fb2 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 14 Sep 2021 05:22:04 +0200 Subject: [PATCH 0544/1858] Don't touch mingw static lib .a suffix (#20096) --- scripts/cmake/vcpkg_install_meson.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 6310a96cd0284d..3e89b457e20769 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -65,8 +65,8 @@ function(vcpkg_install_meson) endif() endforeach() - set(RENAMED_LIBS) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(RENAMED_LIBS "") + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static AND NOT VCPKG_TARGET_IS_MINGW) # Meson names all static libraries lib.a which basically breaks the world file(GLOB_RECURSE LIBRARIES "${CURRENT_PACKAGES_DIR}*/**/lib*.a") foreach(_library IN LISTS LIBRARIES) From 13ef84916bc3ba7c26173eb00f6d00dc98610067 Mon Sep 17 00:00:00 2001 From: Dominic Clark Date: Tue, 14 Sep 2021 04:22:42 +0100 Subject: [PATCH 0545/1858] [lv2] Fix installation of headers to legacy paths (#20102) * Fix LV2 old header path mapping * Update version files --- ports/lv2/CMakeLists.txt | 4 ++-- ports/lv2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/lv2.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/lv2/CMakeLists.txt b/ports/lv2/CMakeLists.txt index 6e17095e90a5d5..a1d3d13cceeea4 100644 --- a/ports/lv2/CMakeLists.txt +++ b/ports/lv2/CMakeLists.txt @@ -18,9 +18,9 @@ install(FILES lv2/core/lv2.h DESTINATION include) # Install headers to old URI-style paths, using mapping from wscript file(READ wscript WSCRIPT) -string(REGEX MATCHALL "'[^']+' *: 'lv2/[^']+'" SPEC_MAP "${WSCRIPT}") +string(REGEX MATCHALL "'[^']+' *: *'lv2/[^']+'" SPEC_MAP "${WSCRIPT}") foreach(PAIR ${SPEC_MAP}) - string(REGEX MATCH "'([^']+)' *: '([^']+)'" _ "${PAIR}") + string(REGEX MATCH "'([^']+)' *: *'([^']+)'" _ "${PAIR}") install( DIRECTORY "lv2/${CMAKE_MATCH_1}/" DESTINATION "include/${CMAKE_MATCH_2}" diff --git a/ports/lv2/vcpkg.json b/ports/lv2/vcpkg.json index 14ff65d9a572ec..8d0b0cda349489 100644 --- a/ports/lv2/vcpkg.json +++ b/ports/lv2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lv2", "version-semver": "1.18.2", + "port-version": 1, "description": "LV2 is a plugin standard for audio systems. It defines a minimal yet extensible C API for plugin code and a format for plugin \"bundles\".", "homepage": "https://lv2plug.in", "license": "ISC", diff --git a/versions/baseline.json b/versions/baseline.json index dde7de7a237132..9303aaef3f5481 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3990,7 +3990,7 @@ }, "lv2": { "baseline": "1.18.2", - "port-version": 0 + "port-version": 1 }, "lz4": { "baseline": "1.9.3", diff --git a/versions/l-/lv2.json b/versions/l-/lv2.json index 039be1d3c8243a..d9206bb148be2e 100644 --- a/versions/l-/lv2.json +++ b/versions/l-/lv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f78e5138684d16deb9657062f3c28606853f9919", + "version-semver": "1.18.2", + "port-version": 1 + }, { "git-tree": "3a811ec51d55cce1d5eaf4a430a8e274f1916bb9", "version-semver": "1.18.2", From 3bc96b84e1688d29a52dd0bafc7d71d01dbae037 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:24:22 +0800 Subject: [PATCH 0546/1858] [botan/bitsery/cgl] Update to latest release (#20132) --- ports/bitsery/portfile.cmake | 25 +++++++------- ports/bitsery/vcpkg.json | 15 ++++++-- ports/botan/fix-generate-build-path.patch | 26 +++++++------- ports/botan/portfile.cmake | 42 +++++++++-------------- ports/botan/vcpkg.json | 3 +- ports/cgl/portfile.cmake | 23 ++++++------- ports/cgl/vcpkg.json | 13 +++++-- versions/b-/bitsery.json | 5 +++ versions/b-/botan.json | 5 +++ versions/baseline.json | 12 +++---- versions/c-/cgl.json | 5 +++ 11 files changed, 96 insertions(+), 78 deletions(-) diff --git a/ports/bitsery/portfile.cmake b/ports/bitsery/portfile.cmake index 146f6f75d5a7a8..16fec4c35efa16 100644 --- a/ports/bitsery/portfile.cmake +++ b/ports/bitsery/portfile.cmake @@ -1,21 +1,20 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO fraillt/bitsery - REF db884a0656a3aabb87da1ae6edf12629507f76a7 - SHA512 7c94a09ed7cf07aa6c347d2960de622c5d69a25c7af501d10224b02f9db1bb191e8a5f7f096de488650f5a164e554b20f950fcdde423afced0ebfed249cb1c3d - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO fraillt/bitsery + REF c0fc083c9de805e5825d7553507569febf6a6f93 # v5.2.2 + SHA512 a4c8660f6e8dcb5162f6f75e0f1e4716032b8403e9461f42e0628955eb07dc7c17aec9f774f45c2c15cce28a231699a71815d3d6d7d0f34a1367ee1e2d944305 + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bitsery/vcpkg.json b/ports/bitsery/vcpkg.json index dfad4f5c580f4f..4fad8826041445 100644 --- a/ports/bitsery/vcpkg.json +++ b/ports/bitsery/vcpkg.json @@ -1,7 +1,16 @@ { "name": "bitsery", - "version-string": "5.2.1", - "port-version": 1, + "version": "5.2.2", "description": "Header only C++ binary serialization library", - "homepage": "https://github.com/fraillt/bitsery" + "homepage": "https://github.com/fraillt/bitsery", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/botan/fix-generate-build-path.patch b/ports/botan/fix-generate-build-path.patch index 11c3dc0afd4873..455c1f1391897c 100644 --- a/ports/botan/fix-generate-build-path.patch +++ b/ports/botan/fix-generate-build-path.patch @@ -1,13 +1,13 @@ -diff --git a/configure.py b/configure.py -index 00baa0c..cfec5bb 100644 ---- a/configure.py -+++ b/configure.py -@@ -2035,7 +2035,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, - 'maintainer_mode': options.maintainer_mode, - - 'out_dir': build_dir, -- 'build_dir': build_paths.build_dir, -+ 'build_dir': os.path.abspath(build_paths.build_dir), - - 'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'), - 'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'), +diff --git a/configure.py b/configure.py +index 89f87d4..ba7914f 100644 +--- a/configure.py ++++ b/configure.py +@@ -2076,7 +2076,7 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, + 'maintainer_mode': options.maintainer_mode, + + 'out_dir': build_dir, +- 'build_dir': build_paths.build_dir, ++ 'build_dir': os.path.abspath(build_paths.build_dir), + + 'doc_stamp_file': os.path.join(build_paths.build_dir, 'doc.stamp'), + 'makefile_path': os.path.join(build_paths.build_dir, '..', 'Makefile'), diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 6d04e1e93cbd84..4351791f3f1c15 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -1,10 +1,8 @@ -set(BOTAN_VERSION 2.16.0) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO randombit/botan - REF 82a20c67bd54b8c6c75f32bd31dea5b12f3d7e67 # 2.16.0 - SHA512 42b8dac0a6b44afee14e8ba928b323790b8d90395ba70b4919b3d033e5b9073706355c2263c2a9e66357fa6d4af4c85430c93a65cfdaa79f1c83c89940619a66 + REF d4bd416702a65eddcc14ee06b9c1b674631e6ae3 # 2.18.1 + SHA512 6c8a8a772ff926402aa77ea1156e8a6b8fcaa18514107c94e9d2c7c76daaf9a02ef8c5c249d1ddf56655bab0ecd0d91490d907fc2239259689662533089b09ad HEAD_REF master PATCHES fix-generate-build-path.patch @@ -58,13 +56,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS function(BOTAN_BUILD BOTAN_BUILD_TYPE) if(BOTAN_BUILD_TYPE STREQUAL "dbg") - set(BOTAN_FLAG_PREFIX ${CURRENT_PACKAGES_DIR}/debug) + set(BOTAN_FLAG_PREFIX "${CURRENT_PACKAGES_DIR}/debug") set(BOTAN_FLAG_DEBUGMODE --debug-mode) set(BOTAN_DEBUG_SUFFIX "") set(BOTAN_MSVC_RUNTIME_SUFFIX "d") else() set(BOTAN_FLAG_DEBUGMODE) - set(BOTAN_FLAG_PREFIX ${CURRENT_PACKAGES_DIR}) + set(BOTAN_FLAG_PREFIX "${CURRENT_PACKAGES_DIR}") set(BOTAN_MSVC_RUNTIME_SUFFIX "") endif() @@ -113,7 +111,6 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) --libdir=${BOTAN_FLAG_PREFIX}/lib --pkgconfigdir=${BOTAN_FLAG_PREFIX}/lib --includedir=${BOTAN_FLAG_PREFIX}/include - --docdir=${BOTAN_FLAG_PREFIX}/share WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}" LOGNAME install-${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE}) @@ -123,31 +120,24 @@ endfunction() BOTAN_BUILD(rel) BOTAN_BUILD(dbg) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/botan) +file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") + +vcpkg_copy_pdbs() -set(cli_exe_name "botan") if(CMAKE_HOST_WIN32) - set(cli_exe_name "botan-cli.exe") + vcpkg_copy_tools(TOOL_NAMES botan-cli AUTO_CLEAN) +else() + vcpkg_copy_tools(TOOL_NAMES botan AUTO_CLEAN) endif() -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${cli_exe_name} ${CURRENT_PACKAGES_DIR}/tools/botan/${cli_exe_name}) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${cli_exe_name}) - -file(RENAME ${CURRENT_PACKAGES_DIR}/include/botan-2/botan ${CURRENT_PACKAGES_DIR}/include/botan) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/include/botan-2 - ${CURRENT_PACKAGES_DIR}/share/botan-${BOTAN_VERSION}/manual) + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/botan-2" + "${CURRENT_PACKAGES_DIR}/share/doc") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/botan) - -file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan-${BOTAN_VERSION}/ ${CURRENT_PACKAGES_DIR}/share/botan/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/botan/license.txt ${CURRENT_PACKAGES_DIR}/share/botan/copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 0dbf7567dcaba4..939b8399010a78 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,6 @@ { "name": "botan", - "version": "2.16.0", - "port-version": 2, + "version": "2.18.1", "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/ports/cgl/portfile.cmake b/ports/cgl/portfile.cmake index 8969d813192e22..97583b09701940 100644 --- a/ports/cgl/portfile.cmake +++ b/ports/cgl/portfile.cmake @@ -3,26 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO coin-or/Cgl - REF 6377b88754fafacf24baac28bb27c0623cc14457 - SHA512 7579a89f945fd3b88cc1f0dd95906c385b5c730b58bd620ea8b820926096256f9083f50dd4e70f71d69432e4d0ffc60b4ec8fa517893a549621d8373f944a1bb + REF 31797b2997219934db02a40d501c4b6d8efa7398 # 0.60.3 + SHA512 33e01acdfd2057541492f4e83c0554ed74489995c47cef0b954529d4603090d03457fdababb331132b3fd286c985e46a3c8e3abbdb2eed36e7eaa8102acd095e PATCHES fix-c1083-error.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cgl/vcpkg.json b/ports/cgl/vcpkg.json index 3e59231a838027..7b72af7618fbfa 100644 --- a/ports/cgl/vcpkg.json +++ b/ports/cgl/vcpkg.json @@ -1,12 +1,19 @@ { "name": "cgl", - "version-string": "0.60.2", - "port-version": 3, + "version": "0.60.3", "description": "The COIN-OR Cut Generation Library (Cgl) is a collection of cut generators that can be used with other COIN-OR packages that make use of cuts, such as, among others, the linear solver Clp or the mixed integer linear programming solvers Cbc or BCP.", "homepage": "https://github.com/coin-or/Cgl", "dependencies": [ "clp", "coinutils", - "osi" + "osi", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/b-/bitsery.json b/versions/b-/bitsery.json index ac1631a2a73324..bff5f7ba57e453 100644 --- a/versions/b-/bitsery.json +++ b/versions/b-/bitsery.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fdd20d510ccb63049b899419af07461f42097e5", + "version": "5.2.2", + "port-version": 0 + }, { "git-tree": "adbbef892ab01c8b0c57b7be2684ae6bb1a29a99", "version-string": "5.2.1", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index fec275a65f2f4a..d4bca81679e5df 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5233d2cda62be282a698410ebf3f70f5f2cda8cf", + "version": "2.18.1", + "port-version": 0 + }, { "git-tree": "8a0618dd4e015d7a0ae5339e6758c5f1fd4754a6", "version": "2.16.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9303aaef3f5481..e519cf727ba537 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -433,8 +433,8 @@ "port-version": 1 }, "bitsery": { - "baseline": "5.2.1", - "port-version": 1 + "baseline": "5.2.2", + "port-version": 0 }, "blas": { "baseline": "1", @@ -1065,8 +1065,8 @@ "port-version": 0 }, "botan": { - "baseline": "2.16.0", - "port-version": 2 + "baseline": "2.18.1", + "port-version": 0 }, "box2d": { "baseline": "2.4.1", @@ -1233,8 +1233,8 @@ "port-version": 5 }, "cgl": { - "baseline": "0.60.2", - "port-version": 3 + "baseline": "0.60.3", + "port-version": 0 }, "cgltf": { "baseline": "1.10", diff --git a/versions/c-/cgl.json b/versions/c-/cgl.json index 39d0dabbda7386..15745b7053c3ab 100644 --- a/versions/c-/cgl.json +++ b/versions/c-/cgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3104cbc44a135a7d7b75e0929571dc0aa314033", + "version": "0.60.3", + "port-version": 0 + }, { "git-tree": "08a6d5bffda4d5fe0b5891a225e7f3fa86cca8a6", "version-string": "0.60.2", From b24ca9dfd3fbd626e1c98a30ec29611e1de7c9df Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 14 Sep 2021 11:25:53 +0800 Subject: [PATCH 0547/1858] [sdl2-mixer] Fix link error building with features fluidsynth and libvorbis (#20089) --- ports/sdl2-mixer/CMakeLists.txt | 2 ++ ports/sdl2-mixer/portfile.cmake | 32 ++++++++++++++++---------------- ports/sdl2-mixer/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/s-/sdl2-mixer.json | 5 +++++ 5 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt index b350d5bc332b34..b6d0dbb92ac67c 100644 --- a/ports/sdl2-mixer/CMakeLists.txt +++ b/ports/sdl2-mixer/CMakeLists.txt @@ -55,6 +55,7 @@ if(SDL_MIXER_ENABLE_OGGVORBIS) find_library(VORBISFILE_LIBRARY vorbisfile) list(APPEND SDL_MIXER_INCLUDES ${VORBIS_INCLUDE_DIR}) list(APPEND SDL_MIXER_DEFINES MUSIC_OGG) + list(APPEND SDL_MIXER_LIBRARIES ${VORBISFILE_LIBRARY}) if (SDL_DYNAMIC_LOAD) get_filename_component(VORBISFILE_LIBRARY_NAME "${VORBISFILE_LIBRARY}" NAME_WE) list(APPEND SDL_MIXER_LOAD_DEFINES -DOGG_DYNAMIC="${VORBISFILE_LIBRARY_NAME}${LIBRARY_SUFFIX}") @@ -80,6 +81,7 @@ if(SDL_MIXER_ENABLE_FLUIDSYNTH) find_library(FLUIDSYNTH_LIBRARY fluidsynth) list(APPEND SDL_MIXER_INCLUDES ${FLUIDSYNTH_INCLUDE_DIR}) list(APPEND SDL_MIXER_DEFINES MUSIC_MID_FLUIDSYNTH) + list(APPEND SDL_MIXER_LIBRARIES ${FLUIDSYNTH_LIBRARY}) if (SDL_DYNAMIC_LOAD) get_filename_component(FLUIDSYNTH_LIBRARY_NAME "${FLUIDSYNTH_LIBRARY}" NAME_WE) list(APPEND SDL_MIXER_LOAD_DEFINES -DFLUIDSYNTH_DYNAMIC="${FLUIDSYNTH_LIBRARY_NAME}${LIBRARY_SUFFIX}") diff --git a/ports/sdl2-mixer/portfile.cmake b/ports/sdl2-mixer/portfile.cmake index 122df61e183d2f..aa89f98e7a5d36 100644 --- a/ports/sdl2-mixer/portfile.cmake +++ b/ports/sdl2-mixer/portfile.cmake @@ -25,22 +25,22 @@ if ("dynamic-load" IN_LIST FEATURES) endif() endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - dynamic-load SDL_DYNAMIC_LOAD - mpg123 SDL_MIXER_ENABLE_MP3 - libflac SDL_MIXER_ENABLE_FLAC - libmodplug SDL_MIXER_ENABLE_MOD - libvorbis SDL_MIXER_ENABLE_OGGVORBIS - opusfile SDL_MIXER_ENABLE_OPUS - nativemidi SDL_MIXER_ENABLE_NATIVEMIDI - fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH + FEATURES + dynamic-load SDL_DYNAMIC_LOAD + mpg123 SDL_MIXER_ENABLE_MP3 + libflac SDL_MIXER_ENABLE_FLAC + libmodplug SDL_MIXER_ENABLE_MOD + libvorbis SDL_MIXER_ENABLE_OGGVORBIS + opusfile SDL_MIXER_ENABLE_OPUS + nativemidi SDL_MIXER_ENABLE_NATIVEMIDI + fluidsynth SDL_MIXER_ENABLE_FLUIDSYNTH ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIBRARY_SUFFIX=${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX} # It should always be dynamic suffix @@ -48,10 +48,10 @@ vcpkg_configure_cmake( -DSDL_MIXER_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json index 4ea851c9e42a8b..02013acf1a11db 100644 --- a/ports/sdl2-mixer/vcpkg.json +++ b/ports/sdl2-mixer/vcpkg.json @@ -1,11 +1,19 @@ { "name": "sdl2-mixer", "version": "2.0.4", - "port-version": 12, + "port-version": 13, "description": "Multi-channel audio mixer library for SDL.", "homepage": "https://www.libsdl.org/projects/SDL_mixer", "dependencies": [ - "sdl2" + "sdl2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "nativemidi" diff --git a/versions/baseline.json b/versions/baseline.json index e519cf727ba537..16508a0ac0ed18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5870,7 +5870,7 @@ }, "sdl2-mixer": { "baseline": "2.0.4", - "port-version": 12 + "port-version": 13 }, "sdl2-net": { "baseline": "2.0.1", diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json index 2828ed5b13fbe6..61bf611548c538 100644 --- a/versions/s-/sdl2-mixer.json +++ b/versions/s-/sdl2-mixer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6338ed4f079dda0759ac18a4dcc5f04448e56cc3", + "version": "2.0.4", + "port-version": 13 + }, { "git-tree": "fe2777f2acc7962d9d08092e4778221468e212cd", "version": "2.0.4", From e5557e1405529c14bed6935edd284aed7bf4c7d9 Mon Sep 17 00:00:00 2001 From: dave-juicelabs <70105130+dave-juicelabs@users.noreply.github.com> Date: Mon, 13 Sep 2021 23:33:09 -0400 Subject: [PATCH 0548/1858] [stduuid] Adding new port stduuid (#16382) * [stduuid] Adding new port stduuid * [stduuid] Making changes requested in pull request #16382. * [stduuid] Changes from vcpkg x-add-version * Update versions/s-/stduuid.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/stduuid/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [stduuid] Changes from .\vcpkg.exe x-add-version stduuid --overwrite-version. * [stduuid] Changes requested from https://github.com/microsoft/vcpkg/pull/16382. * [stduuid] Adding changes requested during PR. * [stduuid] Updating version. Co-authored-by: David McCloskey Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/stduuid/portfile.cmake | 30 ++++++++++++++++++++++++++++++ ports/stduuid/vcpkg.json | 28 ++++++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/stduuid.json | 9 +++++++++ 4 files changed, 71 insertions(+) create mode 100644 ports/stduuid/portfile.cmake create mode 100644 ports/stduuid/vcpkg.json create mode 100644 versions/s-/stduuid.json diff --git a/ports/stduuid/portfile.cmake b/ports/stduuid/portfile.cmake new file mode 100644 index 00000000000000..ca21c5f9f08ca3 --- /dev/null +++ b/ports/stduuid/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mariusbancila/stduuid + REF 5890c94bfac2f00f22a1c1481e5839c51d6a6f3f + SHA512 82c5dc652c5c7cf0a51d4ec5d61203df1f55498d31b1a1812603391a09c95908d2cb3db396bd2e28c9ed42913cbc4c66b514fb5381bafdf50f6e32cbf545c3b9 + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + test UUID_BUILD_TESTS + system-gen UUID_SYSTEM_GENERATOR + cxx20-span UUID_USING_CXX20_SPAN +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/stduuid/vcpkg.json b/ports/stduuid/vcpkg.json new file mode 100644 index 00000000000000..3646fbd87357bd --- /dev/null +++ b/ports/stduuid/vcpkg.json @@ -0,0 +1,28 @@ +{ + "name": "stduuid", + "version-date": "2021-08-30", + "description": "A C++17 cross-platform single-header library implementation for universally unique identifiers, simply know as either UUID or GUID (mostly on Windows)", + "homepage": "https://github.com/mariusbancila/stduuid", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "cxx20-span": { + "description": "Using span from std instead of gsl" + }, + "system-gen": { + "description": "Enable operating system uuid generator" + }, + "test": { + "description": "Build the unit tests" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 16508a0ac0ed18..03050a42de3eb9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6228,6 +6228,10 @@ "baseline": "2020-09-14", "port-version": 1 }, + "stduuid": { + "baseline": "2021-08-30", + "port-version": 0 + }, "stlab": { "baseline": "1.6.2", "port-version": 1 diff --git a/versions/s-/stduuid.json b/versions/s-/stduuid.json new file mode 100644 index 00000000000000..430b96954a4098 --- /dev/null +++ b/versions/s-/stduuid.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "012e2fe37e183a722bedb2e469fb08daa3864f52", + "version-date": "2021-08-30", + "port-version": 0 + } + ] +} From d46c8d45263b815b85657cff8a5e1cef060fca7f Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 15 Sep 2021 03:01:57 +0800 Subject: [PATCH 0549/1858] [cimg/libgd/libfabric] Update to latest release version (#20068) * [cimg/libgd/libfabric] Update to latest release version * Remove empty line * [libgd] Update the patch * Small changes * [libgd] Update to version semver --- ports/cimg/portfile.cmake | 24 +-- ports/cimg/vcpkg.json | 11 +- ports/libfabric/add_additional_includes.patch | 116 ++++++------ ports/libfabric/portfile.cmake | 19 +- ports/libfabric/vcpkg.json | 3 +- ports/libgd/0001-fix-cmake.patch | 169 ++++-------------- ports/libgd/fix_msvc_build.patch | 61 +++++++ ports/libgd/intrin.patch | 4 +- ports/libgd/no-write-source-dir.patch | 28 +-- ports/libgd/portfile.cmake | 81 ++++----- ports/libgd/vcpkg.json | 9 +- versions/baseline.json | 12 +- versions/c-/cimg.json | 5 + versions/l-/libfabric.json | 5 + versions/l-/libgd.json | 5 + 15 files changed, 258 insertions(+), 294 deletions(-) create mode 100644 ports/libgd/fix_msvc_build.patch diff --git a/ports/cimg/portfile.cmake b/ports/cimg/portfile.cmake index 98b9c25d6b0d58..8e128a33e64244 100644 --- a/ports/cimg/portfile.cmake +++ b/ports/cimg/portfile.cmake @@ -1,21 +1,21 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH - REPO "dtschump/CImg" - REF a0e7ecb55130bdf90756033c1e1470eae4b88c1a #v2.9.4 + REPO dtschump/CImg + REF b33dcc8f9f1acf1f276ded92c04f8231f6c23fcd # v2.9.9 + SHA512 327c72320e7cac386ba72d417c45b9e8b40df34650370c34e687c362731919af1b447b2ee498f21278d4af155f0d9dbfabd222856d5f18c2e05569fa638a5909 HEAD_REF master - SHA512 0fc814b67ce9f035a68308850117b40cb54d731cb559bf1b6f46e1ec1e29d473e805818018ac411529b51510468cfbe4427aa52a354f919d7f1ce84bd285a47d) +) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Move cmake files, ensuring they will be 3 directories up the import prefix -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/Licence_CeCILL_V2-en.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright2) +file(INSTALL "${SOURCE_PATH}/Licence_CeCILL-C_V1-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/Licence_CeCILL_V2-en.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright2) diff --git a/ports/cimg/vcpkg.json b/ports/cimg/vcpkg.json index c7e58a67c0917f..cc1c448bd89e83 100644 --- a/ports/cimg/vcpkg.json +++ b/ports/cimg/vcpkg.json @@ -1,7 +1,12 @@ { "name": "cimg", - "version-string": "2.9.4", - "port-version": 1, + "version": "2.9.9", "description": "The CImg Library is a small, open-source, and modern C++ toolkit for image processing", - "homepage": "https://github.com/dtschump/CImg" + "homepage": "https://github.com/dtschump/CImg", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libfabric/add_additional_includes.patch b/ports/libfabric/add_additional_includes.patch index da3d3254c52c2e..80c49d44d93a01 100644 --- a/ports/libfabric/add_additional_includes.patch +++ b/ports/libfabric/add_additional_includes.patch @@ -1,58 +1,58 @@ -diff --git a/libfabric.vcxproj b/libfabric.vcxproj -index 43a05e7..ceb596f 100644 ---- a/libfabric.vcxproj -+++ b/libfabric.vcxproj -@@ -125,7 +125,7 @@ - Disabled - WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions) - true -- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include -+ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); - CompileAsC - 4127;4200;4204;4221;4115;4201;4100 - true -@@ -148,7 +148,7 @@ - Disabled - WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions) - true -- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; -+ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); - CompileAsC - 4127;4200;4204;4221;4115;4201;4100 - true -@@ -171,7 +171,7 @@ - Disabled - WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions) - true -- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include -+ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); - CompileAsC - 4127;4200;94;4204;4221;869 - true -@@ -195,7 +195,7 @@ - true - WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true -- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include -+ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); - 4127;4200;4204;4221;4115;4201;4100 - true - false -@@ -220,7 +220,7 @@ - true - WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true -- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; -+ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); - 4127;4200;4204;4221;4115;4201;4100 - true - false -@@ -245,7 +245,7 @@ - true - WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) - true -- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; -+ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); - 4127;4200;94;4204;4221;869 - true - false +diff --git a/libfabric.vcxproj b/libfabric.vcxproj +index c1e1792..3acbc81 100644 +--- a/libfabric.vcxproj ++++ b/libfabric.vcxproj +@@ -187,7 +187,7 @@ + Disabled + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + CompileAsC + 4127;4200;4204;4221;4115;4201;4100 + true +@@ -215,7 +215,7 @@ + Disabled + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;ENABLE_DEBUG;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + CompileAsC + 4127;4200;94;4204;4221;869 + true +@@ -239,7 +239,7 @@ + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;4204;4221;4115;4201;4100 + true + false +@@ -265,7 +265,7 @@ + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;4204;4221;4115;4201;4100 + true + false +@@ -285,7 +285,7 @@ + true + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;4204;4221;4115;4201;4100 + true + true +@@ -307,7 +307,7 @@ + true + WIN32;_WINSOCKAPI_=;_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;_WINDOWS;_USRDLL;LIBFABRIC_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true +- $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include; ++ $(ProjectDir)include;$(ProjectDir)include\windows;$(ProjectDir)prov\netdir\NetDirect;$(ProjectDir)prov\hook\src;$(ProjectDir)prov\hook\include;$(ProjectDir)prov\hook\perf\include;$(AdditionalIncludeDirectories); + 4127;4200;94;4204;4221;869 + true + false diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake index a5bfffc661d267..b965173d456eaf 100644 --- a/ports/libfabric/portfile.cmake +++ b/ports/libfabric/portfile.cmake @@ -5,15 +5,15 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ofiwg/libfabric - REF v1.8.1 + REF 9682913a72c982b4a872b6b18cf2889e158a029b # v1.13.1 HEAD_REF master - SHA512 7c3879af3ad7dbda9e9bf9f43a2d213a8e41d50212008f29e912d3d0946efc381e6833c08206106e9f486c37eaef16103198247b328297209ef80dc66ca1b6e5 + SHA512 a484126d5f2b6ada1a081af4ae4b60ca00da84814f485cd39746f2ab82948dc68fac5fb47cda39510996e61765d3cf07c409f7a8646f33922d2486b6fb7ee2ab PATCHES - add_additional_includes.patch + add_additional_includes.patch ) -set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v141") -set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v141") +set(LIBFABRIC_RELEASE_CONFIGURATION "Release-v142") +set(LIBFABRIC_DEBUG_CONFIGURATION "Debug-v142") vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} @@ -31,9 +31,8 @@ vcpkg_install_msbuild( ) #Move includes under subdirectory to avoid colisions with other libraries -file(RENAME ${CURRENT_PACKAGES_DIR}/include ${CURRENT_PACKAGES_DIR}/includetemp) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/includetemp ${CURRENT_PACKAGES_DIR}/include/libfabric) +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/includetemp") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/includetemp" "${CURRENT_PACKAGES_DIR}/include/libfabric") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libfabric/vcpkg.json b/ports/libfabric/vcpkg.json index c482a6ea69862f..0a3eb02494c2a1 100644 --- a/ports/libfabric/vcpkg.json +++ b/ports/libfabric/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libfabric", - "version-string": "1.8.1", - "port-version": 2, + "version-semver": "1.13.1", "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.", "homepage": "https://github.com/ofiwg/libfabric", "supports": "windows & x64 & !static", diff --git a/ports/libgd/0001-fix-cmake.patch b/ports/libgd/0001-fix-cmake.patch index a1a31663999b56..4446eb60dd87d4 100644 --- a/ports/libgd/0001-fix-cmake.patch +++ b/ports/libgd/0001-fix-cmake.patch @@ -1,173 +1,77 @@ -From 26fdb0f43b2d994de9a3d62f85fc650e8c495f18 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Sat, 1 Apr 2017 23:16:18 +0300 -Subject: [PATCH] fix cmake - ---- - CMakeLists.txt | 53 +++++++++++++++++++++++---------------------- - src/CMakeLists.txt | 63 +++++++++++++++++++++++++++++------------------------- - 2 files changed, 62 insertions(+), 54 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 42934d0..796fa47 100644 +index 57cd95d..50d5b9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -223,8 +223,10 @@ else (USE_EXT_GD) +@@ -280,8 +280,10 @@ else (USE_EXT_GD) add_subdirectory(src) endif (USE_EXT_GD) -add_subdirectory(tests) -add_subdirectory(examples) +if(BUILD_TEST) -+ add_subdirectory(tests) -+ add_subdirectory(examples) ++ add_subdirectory(tests) ++ add_subdirectory(examples) +endif() add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh) -@@ -246,29 +248,30 @@ IF (ENABLE_LIQ AND LIQ_BUILD) - ADD_DEPENDENCIES(${GD_LIB_STATIC} libimagequant) - ENDIF(ENABLE_LIQ AND LIQ_BUILD) +@@ -298,7 +300,7 @@ else(WIN32) + set(CPACK_GENERATOR TGZ) + endif(WIN32) - --INSTALL(FILES docs/INSTALL DESTINATION share/docs) --INSTALL(FILES docs/README.JPN DESTINATION share/docs) --INSTALL(FILES docs/README.CMAKE DESTINATION share/docs) --INSTALL(FILES docs/README.TESTING DESTINATION share/docs) --INSTALL(FILES docs/README.TXT DESTINATION share/docs) ++if(0) + INSTALL(FILES docs/INSTALL DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES docs/README.JPN DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES docs/README.CMAKE DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) +@@ -320,7 +322,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_ + INSTALL(FILES examples/tgaread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES examples/tiffread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) + INSTALL(FILES examples/windows.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) - -- --INSTALL(FILES examples/arc.c DESTINATION share/docs) --INSTALL(FILES examples/copyrotated.c DESTINATION share/docs) --INSTALL(FILES examples/crop.c DESTINATION share/docs) --INSTALL(FILES examples/flip.c DESTINATION share/docs) --INSTALL(FILES examples/gif.c DESTINATION share/docs) --INSTALL(FILES examples/nnquant.c DESTINATION share/docs) --INSTALL(FILES examples/noIcon.pic DESTINATION share/docs) --INSTALL(FILES examples/noIcon.sgi DESTINATION share/docs) --INSTALL(FILES examples/noIcon.tga DESTINATION share/docs) --INSTALL(FILES examples/noIconAlpha.tga DESTINATION share/docs) --INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/docs) --INSTALL(FILES examples/tgaread.c DESTINATION share/docs) --INSTALL(FILES examples/tiffread.c DESTINATION share/docs) --INSTALL(FILES examples/windows.c DESTINATION share/docs) -- -+if(BUILD_DOCS) -+ INSTALL(FILES docs/INSTALL DESTINATION share/docs) -+ INSTALL(FILES docs/README.JPN DESTINATION share/docs) -+ INSTALL(FILES docs/README.CMAKE DESTINATION share/docs) -+ INSTALL(FILES docs/README.TESTING DESTINATION share/docs) -+ INSTALL(FILES docs/README.TXT DESTINATION share/docs) -+endif() -+ -+if(BUILD_EXAMPLES) -+ INSTALL(FILES examples/arc.c DESTINATION share/docs) -+ INSTALL(FILES examples/copyrotated.c DESTINATION share/docs) -+ INSTALL(FILES examples/crop.c DESTINATION share/docs) -+ INSTALL(FILES examples/flip.c DESTINATION share/docs) -+ INSTALL(FILES examples/gif.c DESTINATION share/docs) -+ INSTALL(FILES examples/nnquant.c DESTINATION share/docs) -+ INSTALL(FILES examples/noIcon.pic DESTINATION share/docs) -+ INSTALL(FILES examples/noIcon.sgi DESTINATION share/docs) -+ INSTALL(FILES examples/noIcon.tga DESTINATION share/docs) -+ INSTALL(FILES examples/noIconAlpha.tga DESTINATION share/docs) -+ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/docs) -+ INSTALL(FILES examples/tgaread.c DESTINATION share/docs) -+ INSTALL(FILES examples/tiffread.c DESTINATION share/docs) -+ INSTALL(FILES examples/windows.c DESTINATION share/docs) +endif() set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 08fd699..497dd93 100644 +index 509c422..97a2976 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -90,17 +90,17 @@ if (BUILD_STATIC_LIBS) +@@ -96,7 +96,6 @@ if (BUILD_STATIC_LIBS) if (UNIX) set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) endif() -endif() --if (WIN32 AND NOT MINGW AND NOT MSYS) -- # SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib") -- SET_PROPERTY(TARGET ${GD_LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS NONDLL=1) --ENDIF(WIN32 AND NOT MINGW AND NOT MSYS) -+ if (WIN32 AND NOT MINGW AND NOT MSYS) -+ # SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib") -+ SET_PROPERTY(TARGET ${GD_LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS NONDLL=1) -+ ENDIF(WIN32 AND NOT MINGW AND NOT MSYS) - --if (MINGW OR MSYS) -- ADD_DEFINITIONS("-mms-bitfields") -- set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) --endif (MINGW OR MSYS) -+ if (MINGW OR MSYS) -+ ADD_DEFINITIONS("-mms-bitfields") -+ set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) -+ endif (MINGW OR MSYS) + if (NOT "${GD_PROGRAMS_LIB_SRC_FILES}" STREQUAL "") + add_library(gd_programs_lib STATIC ${GD_PROGRAMS_LIB_SRC_FILES}) +@@ -117,6 +116,7 @@ if (MINGW OR MSYS) + set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) + endif() + endif (MINGW OR MSYS) +endif() INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src") -@@ -123,32 +123,37 @@ if (BUILD_STATIC_LIBS) - target_link_libraries(${GD_LIB_STATIC} ${LIBGD_DEP_LIBS}) - endif() - --set(GD_PROGRAMS gdcmpgif) +@@ -148,6 +148,7 @@ SET(LIBS_PRIVATES + ${WEBP_LIBRARIES} + ) --if (PNG_FOUND) -- set(GD_PROGRAMS ${GD_PROGRAMS} gdtopng pngtogd webpng) +if(BUILD_PROGRAMS) -+ set(GD_PROGRAMS gdcmpgif) -+ -+ if (PNG_FOUND) -+ set(GD_PROGRAMS ${GD_PROGRAMS} gdtopng pngtogd webpng) -+ if (ZLIB_FOUND) -+ set(GD_PROGRAMS ${GD_PROGRAMS} gdparttopng gd2topng pngtogd2) -+ endif() -+ endif() -+ -+ if (FREETYPE_FOUND) -+ set(GD_PROGRAMS ${GD_PROGRAMS} annotate) -+ endif() -+ - if (ZLIB_FOUND) -- set(GD_PROGRAMS ${GD_PROGRAMS} gdparttopng gd2topng pngtogd2) -+ set(GD_PROGRAMS ${GD_PROGRAMS} gd2copypal gd2togif giftogd2) - endif() --endif() - --if (FREETYPE_FOUND) -- set(GD_PROGRAMS ${GD_PROGRAMS} annotate) --endif() -+ foreach(program ${GD_PROGRAMS}) -+ add_executable(${program} ${program}.c) -+ if (BUILD_SHARED_LIBS) -+ target_link_libraries(${program} ${GD_LIB}) -+ else() -+ target_link_libraries(${program} ${GD_LIB_STATIC}) -+ endif() -+ endforeach(program) + set(GD_PROGRAMS gdcmpgif) --if (ZLIB_FOUND) -- set(GD_PROGRAMS ${GD_PROGRAMS} gd2copypal gd2togif giftogd2) -+ install(PROGRAMS bdftogd DESTINATION bin) - endif() + if (PNG_FOUND) +@@ -177,6 +178,9 @@ foreach(program ${GD_PROGRAMS}) + endif() + endforeach(program) --foreach(program ${GD_PROGRAMS}) -- add_executable(${program} ${program}.c) -- if (BUILD_SHARED_LIBS) -- target_link_libraries(${program} ${GD_LIB}) -- else() -- target_link_libraries(${program} ${GD_LIB_STATIC}) -- endif() --endforeach(program) -- ++install(PROGRAMS bdftogd DESTINATION bin) ++endif() ++ set(GD_INSTALL_TARGETS ${GD_PROGRAMS}) if (BUILD_SHARED_LIBS) set(GD_INSTALL_TARGETS ${GD_INSTALL_TARGETS} ${GD_LIB}) -@@ -161,7 +166,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} +@@ -189,7 +193,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -176,6 +80,3 @@ index 08fd699..497dd93 100644 install(FILES entities.h gd.h --- -2.11.0.windows.1 - diff --git a/ports/libgd/fix_msvc_build.patch b/ports/libgd/fix_msvc_build.patch new file mode 100644 index 00000000000000..e46a81f8965966 --- /dev/null +++ b/ports/libgd/fix_msvc_build.patch @@ -0,0 +1,61 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17ddf6b..7fe1e6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,7 @@ else (USE_EXT_GD) + endif (ENABLE_ICONV) + + IF (ENABLE_WEBP) +- FIND_PACKAGE(WEBP REQUIRED) ++ FIND_PACKAGE(WebP CONFIG REQUIRED) + ENDIF (ENABLE_WEBP) + + IF (ENABLE_HEIF) +diff --git a/src/config.h.cmake b/src/config.h.cmake +index 2b46a17..af98d23 100644 +--- a/src/config.h.cmake ++++ b/src/config.h.cmake +@@ -139,3 +139,8 @@ + + /* Version number of package */ + #cmakedefine VERSION ++ ++#ifdef _MSC_VER ++ #define ssize_t SSIZE_T ++ #define SSIZE_MAX MAXSSIZE_T ++#endif +\ No newline at end of file +diff --git a/src/gd_intern.h b/src/gd_intern.h +index f8f3b5d..380f4db 100644 +--- a/src/gd_intern.h ++++ b/src/gd_intern.h +@@ -29,6 +29,14 @@ + # endif + #endif + ++#ifdef _MSC_VER ++#define ssize_t SSIZE_T ++#define MAXSIZE_T ((SIZE_T)~ ((SIZE_T)0)) ++#define MAXSSIZE_T ((SSIZE_T) (MAXSIZE_T >> 1)) ++#define MINSSIZE_T ((SSIZE_T)~MAXSSIZE_T) ++#define SSIZE_MAX MAXSSIZE_T ++#endif ++ + #include "gd.h" + + #define MIN(a,b) ((a)<(b)?(a):(b)) +diff --git a/src/getopt.c b/src/getopt.c +index 8651b87..00bccde 100644 +--- a/src/getopt.c ++++ b/src/getopt.c +@@ -33,7 +33,10 @@ + #include + #include + #include ++ ++#ifndef _WIN32 + #include ++#endif + + int opterr = 1, /* if error message should be printed */ + optind = 1, /* index into parent argv vector */ diff --git a/ports/libgd/intrin.patch b/ports/libgd/intrin.patch index 1f1db8eb23ebc2..b228773f0b0a3d 100644 --- a/ports/libgd/intrin.patch +++ b/ports/libgd/intrin.patch @@ -1,5 +1,5 @@ diff --git a/src/gd_interpolation.c b/src/gd_interpolation.c -index b9a206551..f75469329 100644 +index ce27220..8895072 100644 --- a/src/gd_interpolation.c +++ b/src/gd_interpolation.c @@ -75,7 +75,7 @@ TODO: @@ -10,4 +10,4 @@ index b9a206551..f75469329 100644 +# include #endif - static gdImagePtr gdImageScaleBilinear(gdImagePtr im, + static gdImagePtr gdImageScaleBilinear(gdImagePtr im, diff --git a/ports/libgd/no-write-source-dir.patch b/ports/libgd/no-write-source-dir.patch index 3017e7ee4a0831..4cc17dbef092ad 100644 --- a/ports/libgd/no-write-source-dir.patch +++ b/ports/libgd/no-write-source-dir.patch @@ -1,14 +1,14 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b16d4a4..5126085 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -191,7 +191,8 @@ else (USE_EXT_GD) - CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) - CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) - -- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES) -+ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES) -+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) - - option(BUILD_SHARED_LIBS "Build shared libs" ON) - option(BUILD_STATIC_LIBS "Build static libs" OFF) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 50d5b9a..17ddf6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -248,7 +248,8 @@ else (USE_EXT_GD) + CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) + CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) + +- CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES) ++ CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h ESCAPE_QUOTES) ++ include_directories(${CMAKE_CURRENT_BINARY_DIR}/src) + + option(BUILD_SHARED_LIBS "Build shared libs" ON) + option(BUILD_STATIC_LIBS "Build static libs" OFF) diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index a297c54fb1e164..aa5d9deb322fb1 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -1,51 +1,34 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgd/libgd - REF gd-2.2.5 - SHA512 e4ee4c0d1064c93640c29b5741f710872297f42bcc883026a63124807b6ff23bd79ae66bb9148a30811907756c4566ba8f1c0560673ccafc20fee38d82ca838f + REF 2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e # gd-2.3.2 + SHA512 c3f2db40f774b44e3fd3fbc743efe70916a71ecd948bf8cb4aeb8a9b9fefd9f17e02d82a9481bac6fcc3624f057b5a308925b4196fb612b65bb7304747d33ffa HEAD_REF master PATCHES 0001-fix-cmake.patch no-write-source-dir.patch intrin.patch + fix_msvc_build.patch ) #delete CMake builtins modules -file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake) -file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindFreetype.cmake) -file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindJPEG.cmake) -file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPackageHandleStandardArgs.cmake) -file(REMOVE_RECURSE ${SOURCE_PATH}/cmake/modules/FindPNG.cmake) - -set(ENABLE_PNG OFF) -if("png" IN_LIST FEATURES) - set(ENABLE_PNG ON) -endif() - -set(ENABLE_JPEG OFF) -if("jpeg" IN_LIST FEATURES) - set(ENABLE_JPEG ON) -endif() - -set(ENABLE_TIFF OFF) -if("tiff" IN_LIST FEATURES) - set(ENABLE_TIFF ON) -endif() - -set(ENABLE_FREETYPE OFF) -if("freetype" IN_LIST FEATURES) - set(ENABLE_FREETYPE ON) -endif() - -set(ENABLE_WEBP OFF) -if("webp" IN_LIST FEATURES) - set(ENABLE_WEBP ON) -endif() - -set(ENABLE_FONTCONFIG OFF) -if("fontconfig" IN_LIST FEATURES) - set(ENABLE_FONTCONFIG ON) -endif() +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/CMakeParseArguments.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindFreetype.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindJPEG.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindPackageHandleStandardArgs.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindPNG.cmake") +file(REMOVE_RECURSE "${SOURCE_PATH}/cmake/modules/FindWEBP.cmake") + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + png ENABLE_PNG + jpeg ENABLE_JPEG + tiff ENABLE_TIFF + freetype ENABLE_FREETYPE + webp ENABLE_WEBP + fontconfig ENABLE_FONTCONFIG +) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(LIBGD_SHARED_LIBS ON) @@ -55,22 +38,18 @@ else() set(LIBGD_STATIC_LIBS ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DENABLE_PNG=${ENABLE_PNG} - -DENABLE_JPEG=${ENABLE_JPEG} - -DENABLE_TIFF=${ENABLE_TIFF} - -DENABLE_FREETYPE=${ENABLE_FREETYPE} - -DENABLE_WEBP=${ENABLE_WEBP} - -DENABLE_FONTCONFIG=${ENABLE_FONTCONFIG} - -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBGD_SHARED_LIBS=${LIBGD_SHARED_LIBS} + -DBUILD_STATIC_LIBS=${LIBGD_STATIC_LIBS} + -DBUILD_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgd) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgd/COPYING ${CURRENT_PACKAGES_DIR}/share/libgd/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libgd/vcpkg.json b/ports/libgd/vcpkg.json index 901a3eb62b793b..e87ee5bc75cb9e 100644 --- a/ports/libgd/vcpkg.json +++ b/ports/libgd/vcpkg.json @@ -1,9 +1,14 @@ { "name": "libgd", - "version-string": "2.2.5", - "port-version": 5, + "version-semver": "2.3.2", "description": "Open source code library for the dynamic creation of images by programmers.", "homepage": "https://github.com/libgd/libgd", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "default-features": [ "fontconfig", "freetype", diff --git a/versions/baseline.json b/versions/baseline.json index 03050a42de3eb9..8915c42d097dee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1281,8 +1281,8 @@ "port-version": 2 }, "cimg": { - "baseline": "2.9.4", - "port-version": 1 + "baseline": "2.9.9", + "port-version": 0 }, "cityhash": { "baseline": "2013-01-08", @@ -3257,8 +3257,8 @@ "port-version": 1 }, "libfabric": { - "baseline": "1.8.1", - "port-version": 2 + "baseline": "1.13.1", + "port-version": 0 }, "libffi": { "baseline": "3.4.2", @@ -3293,8 +3293,8 @@ "port-version": 2 }, "libgd": { - "baseline": "2.2.5", - "port-version": 5 + "baseline": "2.3.2", + "port-version": 0 }, "libgeotiff": { "baseline": "1.6.0", diff --git a/versions/c-/cimg.json b/versions/c-/cimg.json index f5a8e298a4c320..7f900ec6171836 100644 --- a/versions/c-/cimg.json +++ b/versions/c-/cimg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2eac332b873f6a2b9108c3e71e59feec8efe5026", + "version": "2.9.9", + "port-version": 0 + }, { "git-tree": "4ec4b920b2c754563d9daf835412f1143c127e97", "version-string": "2.9.4", diff --git a/versions/l-/libfabric.json b/versions/l-/libfabric.json index bfb2fb920adcfb..3b3ef9239f5fb3 100644 --- a/versions/l-/libfabric.json +++ b/versions/l-/libfabric.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98605d765b6373e091da7f21b3d43667a9fc9da3", + "version-semver": "1.13.1", + "port-version": 0 + }, { "git-tree": "8eef6aae49aa30fcba5286829a5abc03c53a7580", "version-string": "1.8.1", diff --git a/versions/l-/libgd.json b/versions/l-/libgd.json index f0f46f146a2c1f..1a4733a9317849 100644 --- a/versions/l-/libgd.json +++ b/versions/l-/libgd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1e99522d139bf2f72dc030d433117e8f430885f", + "version-semver": "2.3.2", + "port-version": 0 + }, { "git-tree": "40171bc92f5cead1423ede203de8ad2752cb16b8", "version-string": "2.2.5", From 8e99a432ee7bfd113deb745857de7c08d250ad8d Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 14 Sep 2021 13:41:56 -0700 Subject: [PATCH 0550/1858] Revert "[stduuid] Adding new port stduuid (#16382)" (#20161) This reverts commit e201002b4f4827d7b7b672f0c5c672a77fc3b77d. --- ports/stduuid/portfile.cmake | 30 ------------------------------ ports/stduuid/vcpkg.json | 28 ---------------------------- versions/baseline.json | 4 ---- versions/s-/stduuid.json | 9 --------- 4 files changed, 71 deletions(-) delete mode 100644 ports/stduuid/portfile.cmake delete mode 100644 ports/stduuid/vcpkg.json delete mode 100644 versions/s-/stduuid.json diff --git a/ports/stduuid/portfile.cmake b/ports/stduuid/portfile.cmake deleted file mode 100644 index ca21c5f9f08ca3..00000000000000 --- a/ports/stduuid/portfile.cmake +++ /dev/null @@ -1,30 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mariusbancila/stduuid - REF 5890c94bfac2f00f22a1c1481e5839c51d6a6f3f - SHA512 82c5dc652c5c7cf0a51d4ec5d61203df1f55498d31b1a1812603391a09c95908d2cb3db396bd2e28c9ed42913cbc4c66b514fb5381bafdf50f6e32cbf545c3b9 - HEAD_REF master -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - test UUID_BUILD_TESTS - system-gen UUID_SYSTEM_GENERATOR - cxx20-span UUID_USING_CXX20_SPAN -) - -vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${FEATURE_OPTIONS} -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") - -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/stduuid/vcpkg.json b/ports/stduuid/vcpkg.json deleted file mode 100644 index 3646fbd87357bd..00000000000000 --- a/ports/stduuid/vcpkg.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "stduuid", - "version-date": "2021-08-30", - "description": "A C++17 cross-platform single-header library implementation for universally unique identifiers, simply know as either UUID or GUID (mostly on Windows)", - "homepage": "https://github.com/mariusbancila/stduuid", - "license": "MIT", - "dependencies": [ - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ], - "features": { - "cxx20-span": { - "description": "Using span from std instead of gsl" - }, - "system-gen": { - "description": "Enable operating system uuid generator" - }, - "test": { - "description": "Build the unit tests" - } - } -} diff --git a/versions/baseline.json b/versions/baseline.json index 8915c42d097dee..d272013f6af3cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6228,10 +6228,6 @@ "baseline": "2020-09-14", "port-version": 1 }, - "stduuid": { - "baseline": "2021-08-30", - "port-version": 0 - }, "stlab": { "baseline": "1.6.2", "port-version": 1 diff --git a/versions/s-/stduuid.json b/versions/s-/stduuid.json deleted file mode 100644 index 430b96954a4098..00000000000000 --- a/versions/s-/stduuid.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "012e2fe37e183a722bedb2e469fb08daa3864f52", - "version-date": "2021-08-30", - "port-version": 0 - } - ] -} From 98a218a6eb8ee419efe9bbb46a185d08463d5122 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 14 Sep 2021 23:26:31 +0200 Subject: [PATCH 0551/1858] docs: Improve docs for vcpkg_build_nmake (#20139) --- docs/maintainers/vcpkg_build_nmake.md | 2 +- scripts/cmake/vcpkg_build_nmake.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/maintainers/vcpkg_build_nmake.md b/docs/maintainers/vcpkg_build_nmake.md index a1e44a09358df9..97145b5c28cb3d 100644 --- a/docs/maintainers/vcpkg_build_nmake.md +++ b/docs/maintainers/vcpkg_build_nmake.md @@ -9,6 +9,7 @@ Build a msvc makefile project. vcpkg_build_nmake( SOURCE_PATH <${SOURCE_PATH}> [NO_DEBUG] + [ENABLE_INSTALL] [TARGET ] [PROJECT_SUBPATH <${SUBPATH}>] [PROJECT_NAME <${MAKEFILE_NAME}>] @@ -65,7 +66,6 @@ be passed. Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. ## Notes: -This command should be preceded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md). You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the "install" target diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 47c68ecfdeab0a..06fb93a6a09453 100755 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -8,6 +8,7 @@ Build a msvc makefile project. vcpkg_build_nmake( SOURCE_PATH <${SOURCE_PATH}> [NO_DEBUG] + [ENABLE_INSTALL] [TARGET ] [PROJECT_SUBPATH <${SUBPATH}>] [PROJECT_NAME <${MAKEFILE_NAME}>] @@ -64,7 +65,6 @@ be passed. Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. ## Notes: -This command should be preceded by a call to [`vcpkg_configure_nmake()`](vcpkg_configure_nmake.md). You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the "install" target From f86a36649d2a34f3100e041045e5c75dfc080c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 14 Sep 2021 22:31:05 +0100 Subject: [PATCH 0552/1858] [kf5iconthemes] new port (#16567) * Add kf5iconthemes port * kf5iconthemes: add missing PATCH directive * Fix Kf5Iconthemes for windows: * [kf5*] update to 5.75.0 * [kf5iconthemes] convert CONTROL to manifest * [kf5iconthemes] update to current spec * [kf5iconthemes] use semVer * [kf5iconthemes] remove extraneous options * [kf5iconthemes] update to 5.84 * [kf5iconthemes] use vcpkg_copy_tools() * [kf5iconthemes] only remove what's needed * [kf5iconthemes] wrap paths in quotes * [kf5iconthemes] update versions * [kf5iconthemes] DISABLE_PARALLEL_CONFIGURE * [kf5iconthemes] update versions * [kf5iconthemes] Add support for static builds * [kf5iconthemes] update versions * [kf5iconthemes] reformat vcpkg.json * [kf5iconthemes] update versions * [kf5iconthemes] add Qt Designer plugin feature * [kf5iconthemes] update versions * [kf5iconthemes] add libiconv dependency * [kf5iconthemes] update versions * [kf5iconthemes] fix Windows Static builds * [kf5iconthemes] update versions * [kf5iconthemes] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5iconthemes] update versions * [kf5iconthemes] rename patch files * [kf5iconthemes] libiconv patches only for windows static builds * [kf5iconthemes] update versions * [kf5iconthemes] fix identation * [kf5iconthemes] update versions * [kf5iconthemes] cleanup, iconv was fixed in kf5i18n * [kf5iconthemes] update versions * [kf5iconthemes] use generic, non-semver versioning Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5iconthemes] update versions Co-authored-by: Kuntal Majumder Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/kf5iconthemes/fix_config_cmake.patch | 38 +++++++++++++++++ ports/kf5iconthemes/portfile.cmake | 49 ++++++++++++++++++++++ ports/kf5iconthemes/vcpkg.json | 40 ++++++++++++++++++ versions/baseline.json | 4 ++ versions/k-/kf5iconthemes.json | 9 ++++ 5 files changed, 140 insertions(+) create mode 100644 ports/kf5iconthemes/fix_config_cmake.patch create mode 100644 ports/kf5iconthemes/portfile.cmake create mode 100644 ports/kf5iconthemes/vcpkg.json create mode 100644 versions/k-/kf5iconthemes.json diff --git a/ports/kf5iconthemes/fix_config_cmake.patch b/ports/kf5iconthemes/fix_config_cmake.patch new file mode 100644 index 00000000000000..6fa107c37b2860 --- /dev/null +++ b/ports/kf5iconthemes/fix_config_cmake.patch @@ -0,0 +1,38 @@ +From 2d9a393978ff6ae9c5577a3595cd761b199dc4fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Thu, 26 Aug 2021 12:06:54 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5IconThemesConfig.cmake.in | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/KF5IconThemesConfig.cmake.in b/KF5IconThemesConfig.cmake.in +index 79688bb..d91f546 100644 +--- a/KF5IconThemesConfig.cmake.in ++++ b/KF5IconThemesConfig.cmake.in +@@ -3,6 +3,21 @@ + include(CMakeFindDependencyMacro) + find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") ++ find_dependency(Qt5Svg "@REQUIRED_QT_VERSION@") ++ ++ if (NOT ANDROID) ++ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") ++ endif() ++ ++ find_dependency(KF5Archive "@KF_DEP_VERSION@") ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") ++ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") ++endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5IconThemesTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake new file mode 100644 index 00000000000000..807c70528974ab --- /dev/null +++ b/ports/kf5iconthemes/portfile.cmake @@ -0,0 +1,49 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kiconthemes + REF v5.84.0 + SHA512 ca5645d6e4fde4f60c6f16c911539f4056060cc22afae275459632bc7069352b068b1727eb75b898d319e6eef3df9ddc35d8e22d4c1d05a657b112378e56731e + HEAD_REF master + PATCHES + fix_config_cmake.patch +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN + ) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5IconThemes CONFIG_PATH lib/cmake/KF5IconThemes) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kiconfinder5 + AUTO_CLEAN +) + +if(VCPKG_TARGET_IS_OSX) + vcpkg_copy_tools( + TOOL_NAMES ksvg2icns + AUTO_CLEAN + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json new file mode 100644 index 00000000000000..d3ba8975e8ece8 --- /dev/null +++ b/ports/kf5iconthemes/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "kf5iconthemes", + "version": "5.84.0", + "description": "Icon GUI utilities", + "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", + "dependencies": [ + "ecm", + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5configwidgets", + "kf5coreaddons", + "kf5guiaddons", + "kf5i18n", + "kf5itemviews", + "kf5widgetsaddons", + "qt5-base", + "qt5-svg", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "designerplugin": { + "description": "Enables a Qt Designer plugin" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index d272013f6af3cf..e0cdfdbabcbe6a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2968,6 +2968,10 @@ "baseline": "5.84.0", "port-version": 2 }, + "kf5iconthemes": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5itemmodels": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json new file mode 100644 index 00000000000000..427e272eadd0f8 --- /dev/null +++ b/versions/k-/kf5iconthemes.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "969df4c5b4230e480fcffa7d71a312e869a3660d", + "version": "5.84.0", + "port-version": 0 + } + ] +} From 1353fe4725083c645655e4bf6b0f33e14b07767e Mon Sep 17 00:00:00 2001 From: Guekka <39066502+Guekka@users.noreply.github.com> Date: Tue, 14 Sep 2021 22:02:27 +0000 Subject: [PATCH 0553/1858] [rsm-bsa] new port (#19496) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bsa] new port * [bsa] Update version file * [bsa] Update ci baseline * [bsa] Update version database * [bsa] Add patch for minimum cmake version * [bsa] Update ci baseline * Update version database * Try more CI * Fix merge typo * [bsa] Update library version * Update versions database * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update versions/b-/bsa.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * Update versions database * [bsa] Add warning instead of fail on Linux * Update versions database * Update ports/bsa/vcpkg.json Co-authored-by: Robert Schumacher * Update version database * Rename to rsm-bsa * Update versions database * Update versions/baseline.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Fix typo * Update versions * Update ci.baseline.txt * Remove rsm-bsa:x64-linux=fail in ci.baseline.txt now that VMs have G++10. * Revert "Remove rsm-bsa:x64-linux=fail in ci.baseline.txt now that VMs have G++10." because we actually are on gcc 9.x :( This reverts commit 781289dc26d5c018a2486581fb89fc00d60198ee. Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Robert Schumacher Co-authored-by: Billy Robert O'Neal III --- ports/rsm-bsa/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/rsm-bsa/vcpkg.json | 20 ++++++++++++++++++++ scripts/ci.baseline.txt | 2 ++ versions/b-/bsa.json | 9 +++++++++ versions/baseline.json | 4 ++++ versions/r-/rsm-bsa.json | 9 +++++++++ 6 files changed, 72 insertions(+) create mode 100644 ports/rsm-bsa/portfile.cmake create mode 100644 ports/rsm-bsa/vcpkg.json create mode 100644 versions/b-/bsa.json create mode 100644 versions/r-/rsm-bsa.json diff --git a/ports/rsm-bsa/portfile.cmake b/ports/rsm-bsa/portfile.cmake new file mode 100644 index 00000000000000..9d94ff11f70ee2 --- /dev/null +++ b/ports/rsm-bsa/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_fail_port_install(ON_TARGET "OSX" "UWP" ON_ARCH "x86") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ryan-rsm-McKenzie/bsa + REF 2.0.3 + SHA512 b54f1cbc88e55b98b0c25ee81007dc42df736836784b2a1e2e91652b46a73054671d798cc0007ea79b7cf0c8181021bb0cbc95ae407d4a538298d668b4c8fe69 + HEAD_REF master +) + +if (VCPKG_TARGET_IS_LINUX) + message(WARNING "Build ${PORT} requires at least gcc 10.") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/bsa") + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rsm-bsa/vcpkg.json b/ports/rsm-bsa/vcpkg.json new file mode 100644 index 00000000000000..a586e25659550b --- /dev/null +++ b/ports/rsm-bsa/vcpkg.json @@ -0,0 +1,20 @@ +{ + "name": "rsm-bsa", + "version-semver": "2.0.3", + "description": "A C++ library for working with the Bethesda archive file format", + "homepage": "https://github.com/Ryan-rsm-McKenzie/bsa", + "documentation": "https://ryan-rsm-mckenzie.github.io/bsa/", + "supports": "!x86 & !osx & !uwp", + "dependencies": [ + "lz4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 77a1d1a93a5f4d..3e7d0dc250e8d0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1357,6 +1357,8 @@ rsasynccpp:arm64-windows=fail rsasynccpp:arm-uwp=fail rsasynccpp:x64-linux=fail rsasynccpp:x64-osx=fail +# Requires g++10 but CI compiler only has g++9 +rsm-bsa:x64-linux=fail rsocket:x64-windows=fail rsocket:x64-windows-static=fail rsocket:x64-windows-static-md=fail diff --git a/versions/b-/bsa.json b/versions/b-/bsa.json new file mode 100644 index 00000000000000..ca5ea3cd9f26bd --- /dev/null +++ b/versions/b-/bsa.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b7c19adba6583acb02361b53ab1d4ab66b8189ab", + "version-semver": "2.0.3", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e0cdfdbabcbe6a..dddcdf52c74eb2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5752,6 +5752,10 @@ "baseline": "0.0.7", "port-version": 0 }, + "rsm-bsa": { + "baseline": "2.0.3", + "port-version": 0 + }, "rsocket": { "baseline": "2020.05.04.00", "port-version": 2 diff --git a/versions/r-/rsm-bsa.json b/versions/r-/rsm-bsa.json new file mode 100644 index 00000000000000..08b84e996a592f --- /dev/null +++ b/versions/r-/rsm-bsa.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "465b19a5d463c1a9b54041b30600599ad0d5ac96", + "version-semver": "2.0.3", + "port-version": 0 + } + ] +} From 560ab9455fe2d4cb86fcc0281787ade6ed18f69e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 14 Sep 2021 16:02:45 -0700 Subject: [PATCH 0554/1858] [vcpkg] ci.baseline.txt updates for 2021-09-13 (#20144) Most recent CI build: https://dev.azure.com/vcpkg/public/_build/results?buildId=59428 REGRESSION: poppler:arm64-windows. If expected, add poppler:arm64-windows=fail to .\scripts\ci.baseline.txt. PASSING, REMOVE FROM FAIL LIST: fontconfig:arm64-windows (.\scripts\ci.baseline.txt) poppler depends on fontconfig, so this isn't actually a regression. PASSING, REMOVE FROM FAIL LIST: libfreenect2:x64-linux --- scripts/ci.baseline.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 3e7d0dc250e8d0..1982ba0a8c8d26 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -321,7 +321,6 @@ fmilib:x64-linux=fail fmilib:x64-uwp=fail fontconfig:x64-uwp=fail fontconfig:arm-uwp=fail -fontconfig:arm64-windows=fail foonathan-memory:arm64-windows=fail foonathan-memory:arm-uwp=fail foonathan-memory:x64-uwp=fail @@ -579,7 +578,6 @@ libfabric:x64-uwp=fail libfabric:x64-windows-static=fail libfabric:x64-windows-static-md=fail libfreenect2:arm64-windows=fail -libfreenect2:x64-linux=fail libfreenect2:x64-osx=fail libgit2:arm-uwp=fail libgit2:x64-uwp=fail @@ -1222,6 +1220,7 @@ pmdk:x86-windows=fail pngwriter:arm-uwp=fail pngwriter:x64-uwp=fail popsift:x64-windows-static-md=fail +poppler:arm64-windows=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail pqp:x64-uwp=fail From 21be153229a34148b7a181d6faecf61a40b9b94a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 14 Sep 2021 17:46:38 -0700 Subject: [PATCH 0555/1858] Add "cascades" enforcement (#20140) * Add "cascades" enforcement as requested by https://github.com/microsoft/vcpkg/pull/20074#issuecomment-916565430 * Add counts. * Fix arm-uwp count. * Update counts. * Update counts --- .../azure-pipelines/linux/azure-pipelines.yml | 2 +- .../azure-pipelines/osx/azure-pipelines.yml | 2 +- .../azure-pipelines/test-modified-ports.ps1 | 49 +++++++++++++++++-- .../windows/azure-pipelines.yml | 2 +- 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index f68f971e5a3219..530dba67726c56 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -45,7 +45,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades' pwsh: true - bash: | df -h diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 154247da47481b..dc0ae7c46648fc 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -39,7 +39,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades' pwsh: true - bash: | df -h diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index b7d5036b518d65..b1b7e14da68e45 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -30,6 +30,9 @@ not, binary caching will default to read-write mode. .PARAMETER PassingIsPassing Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used when using vcpkg to test a prerelease MSVC++ compiler) + +.PARAMETER EnforceCascades +Enforces that the cascade count from ci.baseline.txt and "supports" is consistent with last known values. #> [CmdletBinding(DefaultParameterSetName="ArchivesRoot")] @@ -48,7 +51,9 @@ Param( $BinarySourceStub = $null, $BuildReason = $null, [switch] - $PassingIsPassing = $false + $PassingIsPassing = $false, + [switch] + $EnforceCascades = $false ) if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { @@ -116,21 +121,59 @@ $xmlFile = Join-Path $xmlResults "$Triplet.xml" $failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' & "./vcpkg$executableExtension" x-ci-clean @commonArgs +if ($LASTEXITCODE -ne 0) +{ + throw "vcpkg clean failed" +} + $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` -Triplet $Triplet ` -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` -SkipFailures:$skipFailures +$ciArgs = $commonArgs +if ($EnforceCascades) { + if ($Triplet -eq 'x86-windows') { + $cascades = 28 + } elseif ($Triplet -eq 'x64-windows') { + $cascades = 21 + } elseif ($Triplet -eq 'x64-windows-static') { + $cascades = 59 + } elseif ($Triplet -eq 'x64-windows-static-md') { + $cascades = 53 + } elseif ($Triplet -eq 'x64-uwp') { + $cascades = 345 + } elseif ($Triplet -eq 'arm64-windows') { + $cascades = 228 + } elseif ($Triplet -eq 'arm-uwp') { + $cascades = 345 + } elseif ($Triplet -eq 'x64-osx') { + $cascades = 61 + } elseif ($Triplet -eq 'x64-linux') { + $cascades = 31 + } else { + throw "Unknown triplet ($Triplet); could not determine expected cascade count. Update test-modified-ports.ps1." + } + + $ciArgs += @("--x-skipped-cascade-count=$cascades") +} + if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) { # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. # The workaround is to pass the skip list as host-excludes as well. - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @ciArgs } else { - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @ciArgs +} + +if ($LASTEXITCODE -ne 0) +{ + throw "vcpkg ci failed" } + & "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` -triplet $Triplet ` -baselineFile .\scripts\ci.baseline.txt ` diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index b88a5f12036372..2a1402297c6d72 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -39,7 +39,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades' pwsh: true - task: PowerShell@2 displayName: 'Validate version files' From 757d40a42477a6e8dde48664e7e9b54c4aebe772 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Tue, 14 Sep 2021 22:06:34 -0400 Subject: [PATCH 0556/1858] [aws-sdk-cpp] update to 1.9.96 (#20033) * [aws-c-common] Update to 0.6.9 * [aws-checksums] Update to 0.1.11 * [aws-c-event-stream] Upgrade to 0.2.7 * Add aws-c-cal port * Add s2n port * Add port aws-c-io * [aws-c-event-stream] Update port to 0.2.7 * Update aws-sdk-cpp port * Add aws-c-compression port * Add aws-c-auth port * Add aws-c-http port * Add aws-c-mqtt port * Add aws-c-s3 port * Add aws-crt-cpp port * [aws-sdk-cpp] Update port to 1.9.91 version * Fix port issues. * Upgrade aws-sdk-cpp to 1.9.96 Upgrade aws-crt-cpp to 0.15.1 * Support x64-windows * Fix format issues * Specify supported triplets for aws libs * Specify platforms for more aws libs * Support x64-windows-static triplet. * Fix format issue for aws-c-common * Update port versions file * Use new vcpkg cmake methods and format * Use new vcpkg cmake methods and format * update version * Fix s2n port typo * Fix s2n port typo Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III --- ports/aws-c-auth/fix-cmake-target-path.patch | 28 +++++++++ ports/aws-c-auth/portfile.cmake | 39 ++++++++++++ ports/aws-c-auth/vcpkg.json | 23 +++++++ ports/aws-c-cal/fix-cmake-target-path.patch | 28 +++++++++ ports/aws-c-cal/portfile.cmake | 44 +++++++++++++ ports/aws-c-cal/vcpkg.json | 18 ++++++ ports/aws-c-common/disable-error-4068.patch | 15 ----- .../disable_outline_atomics.patch | 18 ------ .../disable_warnings_as_errors.patch | 12 ---- ports/aws-c-common/portfile.cmake | 27 ++++---- ports/aws-c-common/vcpkg.json | 15 ++++- .../fix-cmake-target-path.patch | 28 +++++++++ ports/aws-c-compression/portfile.cmake | 32 ++++++++++ ports/aws-c-compression/vcpkg.json | 18 ++++++ .../fix-cmake-target-path.patch | 8 +-- ports/aws-c-event-stream/portfile.cmake | 22 +++---- ports/aws-c-event-stream/vcpkg.json | 17 ++++- ports/aws-c-http/fix-cmake-target-path.patch | 28 +++++++++ ports/aws-c-http/portfile.cmake | 44 +++++++++++++ ports/aws-c-http/vcpkg.json | 21 +++++++ ports/aws-c-io/fix-cmake-target-path.patch | 27 ++++++++ ports/aws-c-io/portfile.cmake | 32 ++++++++++ ports/aws-c-io/vcpkg.json | 23 +++++++ ports/aws-c-mqtt/fix-cmake-target-path.patch | 28 +++++++++ ports/aws-c-mqtt/portfile.cmake | 44 +++++++++++++ ports/aws-c-mqtt/vcpkg.json | 21 +++++++ ports/aws-c-s3/fix-cmake-target-path.patch | 28 +++++++++ ports/aws-c-s3/portfile.cmake | 39 ++++++++++++ ports/aws-c-s3/vcpkg.json | 27 ++++++++ ports/aws-checksums/portfile.cmake | 26 ++++---- ports/aws-checksums/vcpkg.json | 16 +++-- ports/aws-crt-cpp/fix-cmake-target-path.patch | 28 +++++++++ ports/aws-crt-cpp/portfile.cmake | 48 ++++++++++++++ ports/aws-crt-cpp/vcpkg.json | 31 +++++++++ ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch | 31 --------- .../aws-sdk-cpp/patch-relocatable-rpath.patch | 4 +- ports/aws-sdk-cpp/portfile.cmake | 63 +++++++++---------- ports/aws-sdk-cpp/vcpkg.in.json | 24 ------- ports/aws-sdk-cpp/vcpkg.json | 14 ++++- ports/s2n/fix-cmake-target-path.patch | 28 +++++++++ ports/s2n/portfile.cmake | 31 +++++++++ ports/s2n/vcpkg.json | 17 +++++ versions/a-/aws-c-auth.json | 9 +++ versions/a-/aws-c-cal.json | 9 +++ versions/a-/aws-c-common.json | 5 ++ versions/a-/aws-c-compression.json | 9 +++ versions/a-/aws-c-event-stream.json | 5 ++ versions/a-/aws-c-http.json | 9 +++ versions/a-/aws-c-io.json | 9 +++ versions/a-/aws-c-mqtt.json | 9 +++ versions/a-/aws-c-s3.json | 9 +++ versions/a-/aws-checksums.json | 5 ++ versions/a-/aws-crt-cpp.json | 9 +++ versions/a-/aws-sdk-cpp.json | 5 ++ versions/baseline.json | 52 ++++++++++++--- versions/s-/s2n.json | 9 +++ 56 files changed, 1069 insertions(+), 199 deletions(-) create mode 100644 ports/aws-c-auth/fix-cmake-target-path.patch create mode 100644 ports/aws-c-auth/portfile.cmake create mode 100644 ports/aws-c-auth/vcpkg.json create mode 100644 ports/aws-c-cal/fix-cmake-target-path.patch create mode 100644 ports/aws-c-cal/portfile.cmake create mode 100644 ports/aws-c-cal/vcpkg.json delete mode 100644 ports/aws-c-common/disable-error-4068.patch delete mode 100644 ports/aws-c-common/disable_outline_atomics.patch delete mode 100644 ports/aws-c-common/disable_warnings_as_errors.patch create mode 100644 ports/aws-c-compression/fix-cmake-target-path.patch create mode 100644 ports/aws-c-compression/portfile.cmake create mode 100644 ports/aws-c-compression/vcpkg.json create mode 100644 ports/aws-c-http/fix-cmake-target-path.patch create mode 100644 ports/aws-c-http/portfile.cmake create mode 100644 ports/aws-c-http/vcpkg.json create mode 100644 ports/aws-c-io/fix-cmake-target-path.patch create mode 100644 ports/aws-c-io/portfile.cmake create mode 100644 ports/aws-c-io/vcpkg.json create mode 100644 ports/aws-c-mqtt/fix-cmake-target-path.patch create mode 100644 ports/aws-c-mqtt/portfile.cmake create mode 100644 ports/aws-c-mqtt/vcpkg.json create mode 100644 ports/aws-c-s3/fix-cmake-target-path.patch create mode 100644 ports/aws-c-s3/portfile.cmake create mode 100644 ports/aws-c-s3/vcpkg.json create mode 100644 ports/aws-crt-cpp/fix-cmake-target-path.patch create mode 100644 ports/aws-crt-cpp/portfile.cmake create mode 100644 ports/aws-crt-cpp/vcpkg.json delete mode 100644 ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch delete mode 100644 ports/aws-sdk-cpp/vcpkg.in.json create mode 100644 ports/s2n/fix-cmake-target-path.patch create mode 100644 ports/s2n/portfile.cmake create mode 100644 ports/s2n/vcpkg.json create mode 100644 versions/a-/aws-c-auth.json create mode 100644 versions/a-/aws-c-cal.json create mode 100644 versions/a-/aws-c-compression.json create mode 100644 versions/a-/aws-c-http.json create mode 100644 versions/a-/aws-c-io.json create mode 100644 versions/a-/aws-c-mqtt.json create mode 100644 versions/a-/aws-c-s3.json create mode 100644 versions/a-/aws-crt-cpp.json create mode 100644 versions/s-/s2n.json diff --git a/ports/aws-c-auth/fix-cmake-target-path.patch b/ports/aws-c-auth/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..4eb3068a5b8a9c --- /dev/null +++ b/ports/aws-c-auth/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6a00afa..eba3d43 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -118,7 +118,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-auth-config.cmake b/cmake/aws-c-auth-config.cmake +index 430c1d7..6adbe53 100644 +--- a/cmake/aws-c-auth-config.cmake ++++ b/cmake/aws-c-auth-config.cmake +@@ -5,9 +5,5 @@ find_dependency(aws-c-cal) + find_dependency(aws-c-io) + find_dependency(aws-c-http) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake new file mode 100644 index 00000000000000..c304bad4d04491 --- /dev/null +++ b/ports/aws-c-auth/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-auth + REF 61b6524960ad5e0c7aa2e38b343425d5941781bf # v0.6.3 + SHA512 b5dda92e4a8796f3f1b8e2d326f57979a673f57325c921cdbc9c44273ada2f2a8eb6723f0292d223175ba4cca24508d2b635fad2af5ec7dd9e7b06db9588ede6 + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-auth/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-auth" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-auth" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json new file mode 100644 index 00000000000000..1190e5ea9546ed --- /dev/null +++ b/ports/aws-c-auth/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "aws-c-auth", + "version": "0.6.3", + "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.", + "homepage": "https://github.com/awslabs/aws-c-auth", + "supports": "!arm & !uwp", + "dependencies": [ + "aws-c-common", + "aws-c-http", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-c-cal/fix-cmake-target-path.patch b/ports/aws-c-cal/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..25d6749b873012 --- /dev/null +++ b/ports/aws-c-cal/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6039819..b74b65c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -158,7 +158,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-cal-config.cmake b/cmake/aws-c-cal-config.cmake +index 73e7311..e87c43a 100644 +--- a/cmake/aws-c-cal-config.cmake ++++ b/cmake/aws-c-cal-config.cmake +@@ -7,9 +7,5 @@ if (NOT BYO_CRYPTO AND NOT WIN32 AND NOT APPLE) + find_dependency(LibCrypto) + endif() + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake new file mode 100644 index 00000000000000..20da8a95623321 --- /dev/null +++ b/ports/aws-c-cal/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-cal + REF aa89aa4950074babe84762413f39bd364ecaf944 # v0.5.11 + SHA512 b92ae3cb14d26dfe48cb903df56f7df91a4dc0ab2e5ea4f095c72b0b7e0a2582f1324c73eb42c080bcb0a59a3dfc37cd2912037fc8e5f7df8433899749fca63c + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-cal/cmake) + +vcpkg_copy_tools( + TOOL_NAMES sha256_profile + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-cal" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-cal" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json new file mode 100644 index 00000000000000..1045509244475d --- /dev/null +++ b/ports/aws-c-cal/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "aws-c-cal", + "version": "0.5.11", + "description": "C99 wrapper for cryptography primitives.", + "homepage": "https://github.com/awslabs/aws-c-cal", + "supports": "!arm & !uwp", + "dependencies": [ + "aws-c-common", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-c-common/disable-error-4068.patch b/ports/aws-c-common/disable-error-4068.patch deleted file mode 100644 index d031581748d317..00000000000000 --- a/ports/aws-c-common/disable-error-4068.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f8a7328..9b01f56 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -163,6 +163,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD) - target_compile_definitions(${PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500) - endif() - -+if (WIN32) -+ add_compile_options(/wd4068) -+endif() -+ - aws_add_sanitizers(${PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt") - target_link_libraries(${PROJECT_NAME} PUBLIC ${PLATFORM_LIBS}) - target_compile_definitions(${PROJECT_NAME} PRIVATE ${PLATFORM_DEFINES}) diff --git a/ports/aws-c-common/disable_outline_atomics.patch b/ports/aws-c-common/disable_outline_atomics.patch deleted file mode 100644 index b3c9e109f2154c..00000000000000 --- a/ports/aws-c-common/disable_outline_atomics.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake ---- a/cmake/AwsCFlags.cmake (revision 4a21a1c0757083a16497fea27886f5f20ccdf334) -+++ b/cmake/AwsCFlags.cmake (date 1618758078727) -@@ -70,9 +70,11 @@ - - # -moutline-atomics generates code for both older load/store exclusive atomics and also - # Arm's Large System Extensions (LSE) which scale substantially better on large core count systems -- check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS) -- if (HAS_MOUTLINE_ATOMICS) -- list(APPEND AWS_C_FLAGS -moutline-atomics) -+ if(NOT EMSCRIPTEN AND NOT ANDROID) -+ check_c_compiler_flag(-moutline-atomics HAS_MOUTLINE_ATOMICS) -+ if (HAS_MOUTLINE_ATOMICS) -+ list(APPEND AWS_C_FLAGS -moutline-atomics) -+ endif() - endif() - endif() - diff --git a/ports/aws-c-common/disable_warnings_as_errors.patch b/ports/aws-c-common/disable_warnings_as_errors.patch deleted file mode 100644 index 0d8605dee1cd98..00000000000000 --- a/ports/aws-c-common/disable_warnings_as_errors.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake ---- a/cmake/AwsCFlags.cmake (revision 4a21a1c0757083a16497fea27886f5f20ccdf334) -+++ b/cmake/AwsCFlags.cmake (date 1622068907622) -@@ -48,7 +48,7 @@ - list(APPEND AWS_C_FLAGS "${_FLAGS}") - - else() -- list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes) -+ list(APPEND AWS_C_FLAGS -Wall -Wstrict-prototypes) - - if(NOT SET_PROPERTIES_NO_WEXTRA) - list(APPEND AWS_C_FLAGS -Wextra) diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake index f7dd6c42626417..a6463c21e72f7c 100644 --- a/ports/aws-c-common/portfile.cmake +++ b/ports/aws-c-common/portfile.cmake @@ -1,36 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-common - REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56 - SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e + REF fdd4a10243903260f412f587cc748f0ac79629b4 # v0.6.9 + SHA512 969c9b85af58fc144480f6548e78126cf3fe758951ecbdffb579163b9a505a7ea58c32430390102ff620e828bf241dd24c0167f205306949d36dcf4504efa09a HEAD_REF master PATCHES - disable-error-4068.patch # This patch fixes dependency port compilation failure - disable_warnings_as_errors.patch # Ref https://github.com/awslabs/aws-c-common/pull/798 disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time - disable_outline_atomics.patch # Disables -moutline-atomics flag which is not supported for wasm32 and Android ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-common/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common - ${CURRENT_PACKAGES_DIR}/lib/aws-c-common + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-common" ) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json index 21a7142e11dca6..4b629754e30a87 100644 --- a/ports/aws-c-common/vcpkg.json +++ b/ports/aws-c-common/vcpkg.json @@ -1,8 +1,17 @@ { "name": "aws-c-common", - "version-string": "0.4.56", - "port-version": 2, + "version": "0.6.9", "description": "AWS common library for C", "homepage": "https://github.com/awslabs/aws-c-common", - "supports": "!(arm | uwp)" + "supports": "!arm & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/aws-c-compression/fix-cmake-target-path.patch b/ports/aws-c-compression/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..035b96cae06245 --- /dev/null +++ b/ports/aws-c-compression/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e70e013..0639229 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,7 +88,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-compression-config.cmake b/cmake/aws-c-compression-config.cmake +index d919e90..707ce3a 100644 +--- a/cmake/aws-c-compression-config.cmake ++++ b/cmake/aws-c-compression-config.cmake +@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro) + + find_dependency(aws-c-common) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-compression/portfile.cmake b/ports/aws-c-compression/portfile.cmake new file mode 100644 index 00000000000000..53c9d1e002248f --- /dev/null +++ b/ports/aws-c-compression/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-compression + REF 5fab8bc5ab5321d86f6d153b06062419080820ec # v0.2.14 + SHA512 0063d0d644824d858211840115c17a33bfc2b67799e886c530ea8a42071b7bfc67bb6cf8135c538a292b8a7a6276b1d24bb7649f37ce335bc16938f2fca5cb7d + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-compression/cmake) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-compression" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-compression" +) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json new file mode 100644 index 00000000000000..1a9c1573543807 --- /dev/null +++ b/ports/aws-c-compression/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "aws-c-compression", + "version": "0.2.14", + "description": "C99 implementation of huffman encoding/decoding", + "homepage": "https://github.com/awslabs/aws-c-compression", + "supports": "!arm & !uwp", + "dependencies": [ + "aws-c-common", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-c-event-stream/fix-cmake-target-path.patch b/ports/aws-c-event-stream/fix-cmake-target-path.patch index 7b310ad0dee736..37d28ca9bc5015 100644 --- a/ports/aws-c-event-stream/fix-cmake-target-path.patch +++ b/ports/aws-c-event-stream/fix-cmake-target-path.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index dddcc5d..55ff45f 100644 +index daf434c..32d7851 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() +@@ -91,7 +91,7 @@ else() endif() install(EXPORT "${PROJECT_NAME}-targets" @@ -12,11 +12,11 @@ index dddcc5d..55ff45f 100644 COMPONENT Development) diff --git a/cmake/aws-c-event-stream-config.cmake b/cmake/aws-c-event-stream-config.cmake -index e881cb8..cb817e4 100644 +index 76adb84..7884368 100644 --- a/cmake/aws-c-event-stream-config.cmake +++ b/cmake/aws-c-event-stream-config.cmake @@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro) - find_dependency(aws-c-common) + find_dependency(aws-c-io) find_dependency(aws-checksums) -if (BUILD_SHARED_LIBS) diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake index 186253a456f412..c1c307aa9e9d8e 100644 --- a/ports/aws-c-event-stream/portfile.cmake +++ b/ports/aws-c-event-stream/portfile.cmake @@ -1,32 +1,32 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-event-stream - REF 873f1c035a5b6b4698280ee3798d1db5cc9ce86c # v0.1.6 - SHA512 1d043b6915046498f5b94f9c23e0256ab780b11a75ad9ba3c608e26129567482a58787f4e69c4df3c21a29a6d13ed7dddc46869f695bb268e6867298b73edf30 + REF e87537be561d753ec82e783bc0929b1979c585f8 # v0.2.7 + SHA512 651b05ba6d87ad8f65f6cf7e8940b7ea500722848f3e65c2de0bf84d2e6321d0aa1631d4f64a78cf5ed5ed5adac6805a4e91e5c31b3ae86e8c37afb38da4c786 HEAD_REF master PATCHES fix-cmake-target-path.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-event-stream/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-event-stream/cmake) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-event-stream - ${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-event-stream" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-event-stream" ) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json index 8ab115237b2234..de4c3296beea8e 100644 --- a/ports/aws-c-event-stream/vcpkg.json +++ b/ports/aws-c-event-stream/vcpkg.json @@ -1,10 +1,21 @@ { "name": "aws-c-event-stream", - "version-string": "0.1.6", - "port-version": 1, + "version": "0.2.7", "description": "C99 implementation of the vnd.amazon.event-stream content-type.", + "homepage": "https://github.com/awslabs/aws-c-event-stream", + "supports": "!arm & !uwp", "dependencies": [ + "aws-c-cal", "aws-c-common", - "aws-checksums" + "aws-c-io", + "aws-checksums", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/aws-c-http/fix-cmake-target-path.patch b/ports/aws-c-http/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..1e2f4020913c51 --- /dev/null +++ b/ports/aws-c-http/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b0d8e5..d46b498 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,7 +83,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-http-config.cmake b/cmake/aws-c-http-config.cmake +index 8633305..eb7f364 100644 +--- a/cmake/aws-c-http-config.cmake ++++ b/cmake/aws-c-http-config.cmake +@@ -3,9 +3,5 @@ include(CMakeFindDependencyMacro) + find_dependency(aws-c-io) + find_dependency(aws-c-compression) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake new file mode 100644 index 00000000000000..032f9a22481de2 --- /dev/null +++ b/ports/aws-c-http/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-http + REF 6ff61d621c374ab763f94584d26b1d29baa81c2e # v0.6.5 + SHA512 91a5f3c18e6c8d14368ad2b7275a1ebcc6398758f6b1f87ba6199998390a26e768e25c16b27f589e35371f7304b6784cfc21699ff724c811135f2f73732fe85b + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-http/cmake) + +vcpkg_copy_tools( + TOOL_NAMES elasticurl + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-http" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-http" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json new file mode 100644 index 00000000000000..af730c155b7974 --- /dev/null +++ b/ports/aws-c-http/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "aws-c-http", + "version": "0.6.5", + "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications", + "homepage": "https://github.com/awslabs/aws-c-http", + "supports": "!arm & !uwp", + "dependencies": [ + "aws-c-cal", + "aws-c-common", + "aws-c-compression", + "aws-c-io", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-c-io/fix-cmake-target-path.patch b/ports/aws-c-io/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..ca5d575e443e71 --- /dev/null +++ b/ports/aws-c-io/fix-cmake-target-path.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8a9099..a657782 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -215,7 +215,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-io-config.cmake b/cmake/aws-c-io-config.cmake +index d4bc525..72a78ec 100644 +--- a/cmake/aws-c-io-config.cmake ++++ b/cmake/aws-c-io-config.cmake +@@ -7,8 +7,4 @@ endif() + find_dependency(aws-c-common) + find_dependency(aws-c-cal) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake new file mode 100644 index 00000000000000..6b9e7eba4975c7 --- /dev/null +++ b/ports/aws-c-io/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-io + REF 57b00febac48e78f8bf8cff4c82a249e6648842a # v0.10.7 + SHA512 ffcf5ba4ccdff23ca390fc4eb935f88040447589886348234aa1c24b531401521df99a6ac578c1679a3c1a06dfcef6deb833a0b9d53e31d42576a3ad03ade6fc + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-io/cmake) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-io" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-io" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json new file mode 100644 index 00000000000000..411589807e7367 --- /dev/null +++ b/ports/aws-c-io/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "aws-c-io", + "version": "0.10.7", + "description": "Handles all IO and TLS work for application protocols.", + "homepage": "https://github.com/awslabs/aws-c-io", + "supports": "!arm & !uwp", + "dependencies": [ + "aws-c-cal", + "aws-c-common", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-c-mqtt/fix-cmake-target-path.patch b/ports/aws-c-mqtt/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..9490f42b90c38c --- /dev/null +++ b/ports/aws-c-mqtt/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3d80abb..36c027f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-mqtt-config.cmake b/cmake/aws-c-mqtt-config.cmake +index 4a4dcbb..2ad48d2 100644 +--- a/cmake/aws-c-mqtt-config.cmake ++++ b/cmake/aws-c-mqtt-config.cmake +@@ -6,9 +6,5 @@ if (@MQTT_WITH_WEBSOCKETS@) + find_dependency(aws-c-http) + endif() + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake new file mode 100644 index 00000000000000..1df85966aa42fb --- /dev/null +++ b/ports/aws-c-mqtt/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-mqtt + REF 0a70bf814845e487b7e4862af7ad9e4a1199b5f4 # v0.7.6 + SHA512 9c8719004e9e4c56f270c5c5dcb41b5ecacb050dadf2a548ab2119a1a8f223c9117829346e2e86c8c77f6efe3502019085344fe4f470ccdd646dc87a3d4f4c3f + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-mqtt/cmake) + +vcpkg_copy_tools( + TOOL_NAMES elastipubsub + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-mqtt" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-mqtt" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json new file mode 100644 index 00000000000000..540a2c32d91b63 --- /dev/null +++ b/ports/aws-c-mqtt/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "aws-c-mqtt", + "version": "0.7.6", + "description": "C99 implementation of the MQTT 3.1.1 specification.", + "homepage": "https://github.com/awslabs/aws-c-mqtt", + "supports": "!arm & !uwp", + "dependencies": [ + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-c-s3/fix-cmake-target-path.patch b/ports/aws-c-s3/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..cedeca96a9f7b7 --- /dev/null +++ b/ports/aws-c-s3/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 318b299..43f6d31 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,7 +104,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-c-s3-config.cmake b/cmake/aws-c-s3-config.cmake +index eb62a4b..24debd9 100644 +--- a/cmake/aws-c-s3-config.cmake ++++ b/cmake/aws-c-s3-config.cmake +@@ -3,8 +3,4 @@ include(CMakeFindDependencyMacro) + find_dependency(aws-c-auth) + find_dependency(aws-c-http) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) +\ No newline at end of file diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake new file mode 100644 index 00000000000000..e6193fa6501a78 --- /dev/null +++ b/ports/aws-c-s3/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-c-s3 + REF e38bdad12bd4c618e8d10489374d87e6ae3f7a19 # v0.1.25 + SHA512 1ed3313419416ce28373968cb692cf67230b1efced4e187cd5047b146db3bc769dc283dff1af2e41b05ad6f50cbeea58718a34945a93645abacca2515f2a6cf1 + HEAD_REF master + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-s3/cmake) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-s3" + "${CURRENT_PACKAGES_DIR}/lib/aws-c-s3" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json new file mode 100644 index 00000000000000..041c095d1458c7 --- /dev/null +++ b/ports/aws-c-s3/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "aws-c-s3", + "version": "0.1.25", + "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.", + "homepage": "https://github.com/awslabs/aws-c-s3", + "supports": "!arm & !uwp", + "dependencies": [ + "aws-c-auth", + "aws-c-cal", + "aws-c-common", + "aws-c-compression", + "aws-c-http", + "aws-c-io", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake index 86ed6f24fc2318..eaeab3ea9d39e2 100644 --- a/ports/aws-checksums/portfile.cmake +++ b/ports/aws-checksums/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-checksums - REF fb96b3e964fe9bde2625c3ac9547e54d6c802211 # v0.1.9 - SHA512 2cf63a462c900fae8ad101ecac8be6fd6ce3f796e3cecc1b3d19ffba364030d7468a7c7beab91594d2521cab5e99765c7b67fa2fef6f772457e04f75f59962cc + REF 99bb0ad4b89d335d638536694352c45e0d2188f5 # v0.1.11 + SHA512 cb9c249496fd41fda1efb9330e823d8b965adca6c8f372a50fe97eda821e277780bf9af8f5977102c44121568993cca55edbb750967b41f323e07e06a93c50a8 HEAD_REF master PATCHES fix-cmake-target-path.patch ) @@ -13,27 +13,27 @@ else() set(STATIC_CRT_LNK OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - -DSTATIC_CRT=${STATIC_CRT_LNK} - -DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common # use extra cmake files + "-DSTATIC_CRT=${STATIC_CRT_LNK}" + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-checksums/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-checksums/cmake) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/aws-checksums - ${CURRENT_PACKAGES_DIR}/lib/aws-checksums + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-checksums" + "${CURRENT_PACKAGES_DIR}/lib/aws-checksums" ) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json index f68022c4e26618..57f6ecc106d7b6 100644 --- a/ports/aws-checksums/vcpkg.json +++ b/ports/aws-checksums/vcpkg.json @@ -1,10 +1,18 @@ { "name": "aws-checksums", - "version-string": "0.1.9", - "port-version": 1, + "version": "0.1.11", "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", - "supports": "!(arm & windows)", + "homepage": "https://github.com/awslabs/aws-checksums", + "supports": "!arm & !windows", "dependencies": [ - "aws-c-common" + "aws-c-common", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/aws-crt-cpp/fix-cmake-target-path.patch b/ports/aws-crt-cpp/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..69158ef742fb2a --- /dev/null +++ b/ports/aws-crt-cpp/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4d935e2..7b0501c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -338,7 +338,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/aws-crt-cpp-config.cmake b/cmake/aws-crt-cpp-config.cmake +index 4b20a07..faac626 100644 +--- a/cmake/aws-crt-cpp-config.cmake ++++ b/cmake/aws-crt-cpp-config.cmake +@@ -7,8 +7,4 @@ find_dependency(aws-c-auth) + find_dependency(aws-c-event-stream) + find_dependency(aws-c-s3) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else () +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) +\ No newline at end of file diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake new file mode 100644 index 00000000000000..7dc30421a70a51 --- /dev/null +++ b/ports/aws-crt-cpp/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO awslabs/aws-crt-cpp + REF 9ef58ff20df19e613c91c5f761e381c763da6810 # v0.15.1 + SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463 + PATCHES + fix-cmake-target-path.patch +) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + "-DSTATIC_CRT=${STATIC_CRT}" + "-DBUILD_DEPS=OFF" + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-crt-cpp/cmake) + +vcpkg_copy_tools( + TOOL_NAMES elasticurl_cpp + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp" + "${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp" +) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json new file mode 100644 index 00000000000000..6112538dbd4264 --- /dev/null +++ b/ports/aws-crt-cpp/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "aws-crt-cpp", + "version": "0.15.1", + "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", + "homepage": "https://github.com/awslabs/aws-crt-cpp", + "supports": "!arm & !uwp", + "dependencies": [ + "aws-c-auth", + "aws-c-cal", + "aws-c-common", + "aws-c-compression", + "aws-c-event-stream", + "aws-c-http", + "aws-c-io", + "aws-c-mqtt", + "aws-c-s3", + "aws-checksums", + { + "name": "s2n", + "platform": "!uwp & !windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch b/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch deleted file mode 100644 index f35d1be1c45936..00000000000000 --- a/ports/aws-sdk-cpp/fix-AWSSDKCONFIG.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake -index c2f643e..4fb4a2f 100644 ---- a/cmake/AWSSDKConfig.cmake -+++ b/cmake/AWSSDKConfig.cmake -@@ -24,6 +24,10 @@ if(AWSSDK_FOUND) - return() - endif() - -+include(CMakeFindDependencyMacro) -+find_dependency(OpenSSL) -+find_dependency(ZLIB) -+ - include(${CMAKE_CURRENT_LIST_DIR}/AWSSDKConfigVersion.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/sdksCommon.cmake) - include(${CMAKE_CURRENT_LIST_DIR}/platformDeps.cmake) -@@ -43,7 +47,6 @@ endif() - - # On Windows, dlls are treated as runtime target and installed in bindir - if (WIN32 AND AWSSDK_INSTALL_AS_SHARED_LIBS) -- set(AWSSDK_INSTALL_LIBDIR "${AWSSDK_INSTALL_BINDIR}") - # If installed CMake scripts are associated with dll library, define USE_IMPORT_EXPORT for customers - add_definitions(-DUSE_IMPORT_EXPORT) - endif() -@@ -54,7 +57,6 @@ endif() - get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) - get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) - get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) --get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) - get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE) - - set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.") diff --git a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch index 9c5a5a2c5d0b08..828647cc4365ce 100644 --- a/ports/aws-sdk-cpp/patch-relocatable-rpath.patch +++ b/ports/aws-sdk-cpp/patch-relocatable-rpath.patch @@ -8,5 +8,5 @@ index a653e38628..76d6067646 100644 # Add Linker search paths to RPATH so as to fix the problem where some linkers can't find cross-compiled dependent libraries in customer paths when linking executables. -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) - # build third-party targets - if (BUILD_DEPS) + # build the sdk targets + project("aws-cpp-sdk-all" VERSION "${PROJECT_VERSION}" LANGUAGES CXX) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 2ef408d7af4ccb..c9c44a800529c5 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -3,20 +3,14 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/aws-sdk-cpp - REF b11ed430fa6a574cc842532192dfeb9bb09e62b4 # 1.8.126 - SHA512 39e71f85d977b183df6f0d6d61a028db33573026f6abb8856f35e0e71398e2749db6dbdd033818a2c045ec42076fb23cdbae92608117db0a08ca88a05c825683 - HEAD_REF master + REF b0204a7b6a33211f533a175e987a755f714bf7f3 # 1.9.96 + SHA512 456d3fc256a5a26843ecf16014242514b165ae5fa35f088d57aa54a744d19e2c38bd0bed9b6a4b76948c8a49cf87a06a4c722be5a910ed41dfd9c9b9a66b398d PATCHES patch-relocatable-rpath.patch - fix-AWSSDKCONFIG.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) -set(BUILD_ONLY core) - -include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) - set(EXTRA_ARGS) if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS) set(rpath "@loader_path") @@ -43,26 +37,29 @@ elseif (VCPKG_TARGET_IS_ANDROID) else() set(rpath "\$ORIGIN") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA - OPTIONS - ${EXTRA_ARGS} - -DENABLE_UNITY_BUILD=ON - -DENABLE_TESTING=OFF - -DFORCE_SHARED_CRT=${FORCE_SHARED_CRT} - -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE - "-DBUILD_ONLY=${BUILD_ONLY}" - -DBUILD_DEPS=OFF - -DCMAKE_INSTALL_RPATH=${rpath} -) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +set(BUILD_ONLY core) +include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) -vcpkg_copy_pdbs() +foreach(TARGET IN LISTS BUILD_ONLY) + message(STATUS "Building ${TARGET}") + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS + ${EXTRA_ARGS} + "-DENABLE_UNITY_BUILD=ON" + "-DENABLE_TESTING=OFF" + "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" + "-DBUILD_ONLY=${TARGET}" + "-DBUILD_DEPS=OFF" + "-DCMAKE_INSTALL_RPATH=${rpath}" + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files + ) + vcpkg_cmake_install() + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + vcpkg_copy_pdbs() +endforeach() file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") foreach(AWS_TARGET IN LISTS AWS_TARGETS) @@ -82,12 +79,12 @@ foreach(AWS_CONFIG IN LISTS AWS_CONFIGS) endforeach() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/lib/pkgconfig - ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig - ${CURRENT_PACKAGES_DIR}/nuget - ${CURRENT_PACKAGES_DIR}/debug/nuget + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/nuget" + "${CURRENT_PACKAGES_DIR}/debug/nuget" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -108,4 +105,4 @@ endif() configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-sdk-cpp/vcpkg.in.json b/ports/aws-sdk-cpp/vcpkg.in.json deleted file mode 100644 index fdca6ae1e5da4a..00000000000000 --- a/ports/aws-sdk-cpp/vcpkg.in.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "aws-sdk-cpp", - "version": "1.8.126", - "port-version": 10, - "description": "AWS SDK for C++", - "homepage": "https://github.com/aws/aws-sdk-cpp", - "dependencies": [ - "aws-c-event-stream", - { - "name": "curl", - "platform": "!uwp & !windows" - }, - { - "name": "openssl", - "platform": "!uwp & !windows" - }, - "zlib" - ], - "default-features": [ - "dynamodb", - "kinesis", - "s3" - ] -} diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 6446f89ea29a38..cc17dfcb3d83b5 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -1,12 +1,12 @@ { "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", - "version": "1.8.126", - "port-version": 10, + "version": "1.9.96", "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", + "supports": "!arm & !uwp", "dependencies": [ - "aws-c-event-stream", + "aws-crt-cpp", { "name": "curl", "platform": "!uwp & !windows" @@ -15,6 +15,14 @@ "name": "openssl", "platform": "!uwp & !windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ diff --git a/ports/s2n/fix-cmake-target-path.patch b/ports/s2n/fix-cmake-target-path.patch new file mode 100644 index 00000000000000..f83ac21e62b253 --- /dev/null +++ b/ports/s2n/fix-cmake-target-path.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 132f414..c7cfb5f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -503,7 +503,7 @@ else() + endif() + + install(EXPORT "${PROJECT_NAME}-targets" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/${TARGET_DIR}" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake/" + NAMESPACE AWS:: + COMPONENT Development) + +diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake +index 09d1c3a..4e76ed6 100644 +--- a/cmake/s2n-config.cmake ++++ b/cmake/s2n-config.cmake +@@ -8,9 +8,5 @@ endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules") + find_dependency(LibCrypto) + +-if (BUILD_SHARED_LIBS) +- include(${CMAKE_CURRENT_LIST_DIR}/shared/@PROJECT_NAME@-targets.cmake) +-else() +- include(${CMAKE_CURRENT_LIST_DIR}/static/@PROJECT_NAME@-targets.cmake) +-endif() ++include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake) + diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake new file mode 100644 index 00000000000000..ee7d239069b40f --- /dev/null +++ b/ports/s2n/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO aws/s2n-tls + REF b5b313b9ccddf268b30c642798f1d2a58d49ecd6 # v1.0.17 + SHA512 59750c9a3c9330e2b26b84d45665b222d23475090736d8299f81352c839a09af10be0d49d34ced1dadae65ca255e819df45b648387e26b7dca31d74782fdb834 + PATCHES fix-cmake-target-path.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA +) + +vcpkg_cmake_install() + +file(GLOB SHARED_CMAKE_FILES + "${CURRENT_PACKAGES_DIR}/debug/lib/s2n" + ) +file(COPY "${SHARED_CMAKE_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib/s2n" + ) + +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json new file mode 100644 index 00000000000000..d1fda96cae8494 --- /dev/null +++ b/ports/s2n/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "s2n", + "version": "1.0.17", + "description": "C99 implementation of the TLS/SSL protocols.", + "homepage": "https://github.com/aws/s2n-tls", + "supports": "!uwp & !windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/aws-c-auth.json b/versions/a-/aws-c-auth.json new file mode 100644 index 00000000000000..52941c35cad5ab --- /dev/null +++ b/versions/a-/aws-c-auth.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "09b8dcb5acc3e1f83c8b5e3f8b242db3d85f468b", + "version": "0.6.3", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-c-cal.json b/versions/a-/aws-c-cal.json new file mode 100644 index 00000000000000..4f0b9810c2090c --- /dev/null +++ b/versions/a-/aws-c-cal.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7495a338fdd1313d3cdfb67e69406eb4ecea02e9", + "version": "0.5.11", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-c-common.json b/versions/a-/aws-c-common.json index 9cf850621402c3..daaf60b0e5a405 100644 --- a/versions/a-/aws-c-common.json +++ b/versions/a-/aws-c-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0cf8500b71dc430f8d688db62f277b6c20a2a74", + "version": "0.6.9", + "port-version": 0 + }, { "git-tree": "da525f4c21c19e8eb2d81d6f352467395b55f354", "version-string": "0.4.56", diff --git a/versions/a-/aws-c-compression.json b/versions/a-/aws-c-compression.json new file mode 100644 index 00000000000000..b4a3c8c9c8d737 --- /dev/null +++ b/versions/a-/aws-c-compression.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e9dd3757cfe02e9e9d6d4d0bf772507c1be3794e", + "version": "0.2.14", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-c-event-stream.json b/versions/a-/aws-c-event-stream.json index 2ed9b81382295c..440856d05daf6d 100644 --- a/versions/a-/aws-c-event-stream.json +++ b/versions/a-/aws-c-event-stream.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0556f6ff7d7a2e270825de650d84e97c1ed2cf9b", + "version": "0.2.7", + "port-version": 0 + }, { "git-tree": "d2daec107d6c9d3077a4623d3cf341304a309852", "version-string": "0.1.6", diff --git a/versions/a-/aws-c-http.json b/versions/a-/aws-c-http.json new file mode 100644 index 00000000000000..70add24812ab84 --- /dev/null +++ b/versions/a-/aws-c-http.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "21701228d8dca8d718f990273734749288100cdd", + "version": "0.6.5", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-c-io.json b/versions/a-/aws-c-io.json new file mode 100644 index 00000000000000..f68065ec45f4b3 --- /dev/null +++ b/versions/a-/aws-c-io.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fd430ec2c2c43582b0765a48e0a724d17747ae36", + "version": "0.10.7", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-c-mqtt.json b/versions/a-/aws-c-mqtt.json new file mode 100644 index 00000000000000..d2c2a46dbaa8bc --- /dev/null +++ b/versions/a-/aws-c-mqtt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a7ac0c5bddb07cc6ef49fe32f845efb230d28059", + "version": "0.7.6", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-c-s3.json b/versions/a-/aws-c-s3.json new file mode 100644 index 00000000000000..b277cd836cc038 --- /dev/null +++ b/versions/a-/aws-c-s3.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "074cd08f0a073d8b1bfc551bd47435aa50ea96da", + "version": "0.1.25", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json index 75e2d23aa5e312..b0c8fc77d83c72 100644 --- a/versions/a-/aws-checksums.json +++ b/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60a67f9776bc5957aa27bf0cd2ad36fb10a7bc04", + "version": "0.1.11", + "port-version": 0 + }, { "git-tree": "faeacfa4356bdc71228a197676b7613cf369520c", "version-string": "0.1.9", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json new file mode 100644 index 00000000000000..e525f20116ce56 --- /dev/null +++ b/versions/a-/aws-crt-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5bd5acd0aefeed0bbf56945c6b299644f3ad6af0", + "version": "0.15.1", + "port-version": 0 + } + ] +} diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 23fbba43d82632..7b1adb482aa37d 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e407a52a177c37acd340209b0c00d1dd1355d2aa", + "version": "1.9.96", + "port-version": 0 + }, { "git-tree": "13f162ba967b3eaa61320e2062eabd924e1f7a65", "version": "1.8.126", diff --git a/versions/baseline.json b/versions/baseline.json index dddcdf52c74eb2..4e7378ce5d3975 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -248,25 +248,57 @@ "baseline": "2021-06-01", "port-version": 0 }, + "aws-c-auth": { + "baseline": "0.6.3", + "port-version": 0 + }, + "aws-c-cal": { + "baseline": "0.5.11", + "port-version": 0 + }, "aws-c-common": { - "baseline": "0.4.56", - "port-version": 2 + "baseline": "0.6.9", + "port-version": 0 + }, + "aws-c-compression": { + "baseline": "0.2.14", + "port-version": 0 }, "aws-c-event-stream": { - "baseline": "0.1.6", - "port-version": 1 + "baseline": "0.2.7", + "port-version": 0 + }, + "aws-c-http": { + "baseline": "0.6.5", + "port-version": 0 + }, + "aws-c-io": { + "baseline": "0.10.7", + "port-version": 0 + }, + "aws-c-mqtt": { + "baseline": "0.7.6", + "port-version": 0 + }, + "aws-c-s3": { + "baseline": "0.1.25", + "port-version": 0 }, "aws-checksums": { - "baseline": "0.1.9", - "port-version": 1 + "baseline": "0.1.11", + "port-version": 0 + }, + "aws-crt-cpp": { + "baseline": "0.15.1", + "port-version": 0 }, "aws-lambda-cpp": { "baseline": "0.2.6", "port-version": 1 }, "aws-sdk-cpp": { - "baseline": "1.8.126", - "port-version": 10 + "baseline": "1.9.96", + "port-version": 0 }, "azmq": { "baseline": "2020-03-03", @@ -5800,6 +5832,10 @@ "baseline": "2.0", "port-version": 5 }, + "s2n": { + "baseline": "1.0.17", + "port-version": 0 + }, "safeint": { "baseline": "3.0.26", "port-version": 0 diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json new file mode 100644 index 00000000000000..422be50ca76a48 --- /dev/null +++ b/versions/s-/s2n.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "10a083844c389053abc2f6ca624f9080712b6b34", + "version": "1.0.17", + "port-version": 0 + } + ] +} \ No newline at end of file From 1fc0e549034bf309e9ef094d96961618986de9a6 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 15 Sep 2021 11:39:39 -0700 Subject: [PATCH 0557/1858] Back out "cascades" enforcement because it caused too many stealth merge conflicts. (#20181) Mostly reverts https://github.com/microsoft/vcpkg/pull/20140 See https://github.com/microsoft/vcpkg/discussions/20180 for further discussion. --- .../azure-pipelines/linux/azure-pipelines.yml | 2 +- .../azure-pipelines/osx/azure-pipelines.yml | 2 +- .../azure-pipelines/test-modified-ports.ps1 | 38 ++----------------- .../windows/azure-pipelines.yml | 2 +- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index 530dba67726c56..f68f971e5a3219 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -45,7 +45,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades' + arguments: '-Triplet x64-linux -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - bash: | df -h diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index dc0ae7c46648fc..154247da47481b 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -39,7 +39,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades' + arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - bash: | df -h diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index b1b7e14da68e45..8212509d0134b2 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -30,9 +30,6 @@ not, binary caching will default to read-write mode. .PARAMETER PassingIsPassing Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used when using vcpkg to test a prerelease MSVC++ compiler) - -.PARAMETER EnforceCascades -Enforces that the cascade count from ci.baseline.txt and "supports" is consistent with last known values. #> [CmdletBinding(DefaultParameterSetName="ArchivesRoot")] @@ -51,9 +48,7 @@ Param( $BinarySourceStub = $null, $BuildReason = $null, [switch] - $PassingIsPassing = $false, - [switch] - $EnforceCascades = $false + $PassingIsPassing = $false ) if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { @@ -131,42 +126,15 @@ $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` -SkipFailures:$skipFailures -$ciArgs = $commonArgs -if ($EnforceCascades) { - if ($Triplet -eq 'x86-windows') { - $cascades = 28 - } elseif ($Triplet -eq 'x64-windows') { - $cascades = 21 - } elseif ($Triplet -eq 'x64-windows-static') { - $cascades = 59 - } elseif ($Triplet -eq 'x64-windows-static-md') { - $cascades = 53 - } elseif ($Triplet -eq 'x64-uwp') { - $cascades = 345 - } elseif ($Triplet -eq 'arm64-windows') { - $cascades = 228 - } elseif ($Triplet -eq 'arm-uwp') { - $cascades = 345 - } elseif ($Triplet -eq 'x64-osx') { - $cascades = 61 - } elseif ($Triplet -eq 'x64-linux') { - $cascades = 31 - } else { - throw "Unknown triplet ($Triplet); could not determine expected cascade count. Update test-modified-ports.ps1." - } - - $ciArgs += @("--x-skipped-cascade-count=$cascades") -} - if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) { # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. # The workaround is to pass the skip list as host-excludes as well. - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @ciArgs + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs } else { - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @ciArgs + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs } if ($LASTEXITCODE -ne 0) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index 2a1402297c6d72..b88a5f12036372 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -39,7 +39,7 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory) -EnforceCascades' + arguments: '-Triplet ${{ parameters.triplet }} -BuildReason $(Build.Reason) -BinarySourceStub "$(X_VCPKG_BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' pwsh: true - task: PowerShell@2 displayName: 'Validate version files' From 7375ef8749f96af5a639bbf71d91884bc070c6ee Mon Sep 17 00:00:00 2001 From: myd7349 Date: Thu, 16 Sep 2021 04:26:33 +0800 Subject: [PATCH 0558/1858] [kfr] Update to 4.2.1 (#19978) * [kfr] Update to 4.2.1 * [kfr] Update version file * [kfr] Tab -> Space * [kfr] Overwrite version * [kfr] Overwrite version --- ports/kfr/portfile.cmake | 24 +++++++++++++----------- ports/kfr/vcpkg.json | 19 +++++++++++++------ versions/baseline.json | 4 ++-- versions/k-/kfr.json | 5 +++++ 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/ports/kfr/portfile.cmake b/ports/kfr/portfile.cmake index 2cd702e2f90ae2..ca8f4a0fd7b8a0 100644 --- a/ports/kfr/portfile.cmake +++ b/ports/kfr/portfile.cmake @@ -1,23 +1,25 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "Linux") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kfrlib/kfr - REF 1f9706197abfcd4b4ec19ded3ce37b70ebd9a223 - SHA512 901c6984a46a7abcc28adf9397759156a9e8d173e028c236ab423568ed20b3a3efe207be9660c961539c73a2767afaedcd76133304f542d3299353942cf13f5e + REF 9fc73247f43b303617329294ae264613df4dce71 # 4.2.1 + SHA512 c7dd4b1a0be436460973fb8a48bc6f2264a0f7d8d034ce88ccfd8328135f1492eab155023103a1461c2058eb6c79a6019b62d023dc5bc390ab4d2b43eac9c2d4 HEAD_REF master ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - capi ENABLE_CAPI_BUILD - dft ENABLE_DFT - dft-np ENABLE_DFT_NP + FEATURES + capi ENABLE_CAPI_BUILD + dft ENABLE_DFT + dft-np ENABLE_DFT_NP ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_TESTS=OFF -DENABLE_ASMTEST=OFF @@ -27,8 +29,8 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kfr/vcpkg.json b/ports/kfr/vcpkg.json index 25d8c74bd4f37d..ecf2ac02d0f308 100644 --- a/ports/kfr/vcpkg.json +++ b/ports/kfr/vcpkg.json @@ -1,16 +1,23 @@ { "name": "kfr", - "version-string": "2020-06-15", - "port-version": 1, - "description": "Fast, modern C++ DSP framework", + "version-semver": "4.2.1", + "description": "Fast, modern C++ DSP framework.", "homepage": "https://www.kfr.dev/", + "license": "GPL-2.0", "supports": "!(arm | linux)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "capi": { - "description": "Enable C API build", + "description": "Enable C API build.", "dependencies": [ { "name": "kfr", + "default-features": false, "features": [ "dft" ] @@ -18,10 +25,10 @@ ] }, "dft": { - "description": "Enable DFT and related algorithms" + "description": "Enable DFT and related algorithms." }, "dft-np": { - "description": "Enable Non-power of 2 DFT" + "description": "Enable non-power of 2 DFT." } } } diff --git a/versions/baseline.json b/versions/baseline.json index 4e7378ce5d3975..cb6c26d86c090b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3057,8 +3057,8 @@ "port-version": 2 }, "kfr": { - "baseline": "2020-06-15", - "port-version": 1 + "baseline": "4.2.1", + "port-version": 0 }, "kinectsdk1": { "baseline": "1.8", diff --git a/versions/k-/kfr.json b/versions/k-/kfr.json index e1f4ef71c1fac0..00a6e7aa49fb14 100644 --- a/versions/k-/kfr.json +++ b/versions/k-/kfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c67a5df3f480154a5f3472c58952566b55b688c", + "version-semver": "4.2.1", + "port-version": 0 + }, { "git-tree": "57db6ba7195ff44caabe75ab302cdc10629fb5f2", "version-string": "2020-06-15", From 7964919d4af480906cc502f49cd0fb982117a340 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 16 Sep 2021 05:12:57 +0800 Subject: [PATCH 0559/1858] [cmark] update to 0.30.1 (#18938) * [cmark] update to 0.30.0 * update version * update portfile.cmake * update version * add patch * update version * fix-uwp-APPX0703 * update version * [cmark] update to 0.30.1 * update version * update portfile.cmake * update version * update version * Add feature tools * version stuff * Add feature tools and remove the old unnecessary patch * version * delete outdate option * update version Co-authored-by: Billy Robert O'Neal III Co-authored-by: JackBoosY --- ports/cmark/add-feature-tools.patch | 54 +++++++++++++++++++++++++++++ ports/cmark/portfile.cmake | 44 +++++++++++++---------- ports/cmark/rename-shared-lib.patch | 12 ------- ports/cmark/vcpkg.json | 21 +++++++++-- versions/baseline.json | 4 +-- versions/c-/cmark.json | 5 +++ 6 files changed, 104 insertions(+), 36 deletions(-) create mode 100644 ports/cmark/add-feature-tools.patch delete mode 100644 ports/cmark/rename-shared-lib.patch diff --git a/ports/cmark/add-feature-tools.patch b/ports/cmark/add-feature-tools.patch new file mode 100644 index 00000000000000..5410ff68b58dac --- /dev/null +++ b/ports/cmark/add-feature-tools.patch @@ -0,0 +1,54 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3a78d0b..7065c89 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -52,6 +52,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmark_version.h.in + include(GNUInstallDirs) + include (GenerateExportHeader) + ++if (BUILD_TOOLS) + add_executable(${PROGRAM} ${PROGRAM_SOURCES}) + cmark_add_compile_options(${PROGRAM}) + set_target_properties(${PROGRAM} PROPERTIES +@@ -65,6 +66,7 @@ if (CMARK_STATIC) + elseif (CMARK_SHARED) + target_link_libraries(${PROGRAM} ${LIBRARY}) + endif() ++endif() + + # -fvisibility=hidden + set(CMAKE_C_VISIBILITY_PRESET hidden) +@@ -114,23 +116,30 @@ if (CMARK_STATIC) + list(APPEND CMARK_INSTALL ${STATICLIBRARY}) + endif() + +-if (MSVC) ++if (MSVC AND BUILD_TOOLS) + set_property(TARGET ${PROGRAM} + APPEND PROPERTY LINK_FLAGS /INCREMENTAL:NO) +-endif(MSVC) ++endif(MSVC AND BUILD_TOOLS) + + if(NOT MSVC OR CMAKE_HOST_SYSTEM_NAME STREQUAL Windows) + set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) + include(InstallRequiredSystemLibraries) + endif() + +-install(TARGETS ${PROGRAM} ${CMARK_INSTALL} ++install(TARGETS ${CMARK_INSTALL} + EXPORT cmark-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + ++if (BUILD_TOOLS) ++ install(TARGETS ${PROGRAM} ++ EXPORT cmark-targets ++ RUNTIME DESTINATION tools/cmark ++ ) ++endif() ++ + if(CMARK_SHARED OR CMARK_STATIC) + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcmark.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libcmark.pc @ONLY) diff --git a/ports/cmark/portfile.cmake b/ports/cmark/portfile.cmake index 73044e5da2efcc..b263deaca9e5ac 100644 --- a/ports/cmark/portfile.cmake +++ b/ports/cmark/portfile.cmake @@ -1,42 +1,48 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO commonmark/cmark - REF 0.29.0 - SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112 + REF 977b128291c0cf6c5053cdcf2ac72e627f09c105 #0.30.1 + SHA512 ff8139fbb45549d6bea70e11c35ae1d8cf6108d0141688cc2b878afa6247147e0c15ac885e6ed8fa2263534dc79e88e398b30d3d3ae800f13dcdd878114adac8 HEAD_REF master PATCHES - "${CMAKE_CURRENT_LIST_DIR}/rename-shared-lib.patch" + add-feature-tools.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CMARK_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CMARK_SHARED) -vcpkg_configure_cmake( +if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "${PORT} does no support to build tools on UWP") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS + ${FEATURE_OPTIONS} -DCMARK_TESTS=OFF -DCMARK_SHARED=${CMARK_SHARED} -DCMARK_STATIC=${CMARK_STATIC} ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/cmark RENAME copyright) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cmark) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_fixup_pkgconfig() -if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark.exe) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/cmark.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/cmark/) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cmark) +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES cmark SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/cmark" AUTO_CLEAN) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT EXISTS ${CURRENT_PACKAGES_DIR}/bin/cmark) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/cmark.exe ${CURRENT_PACKAGES_DIR}/debug/bin/cmark.exe) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cmark/rename-shared-lib.patch b/ports/cmark/rename-shared-lib.patch deleted file mode 100644 index 79439aae128aa0..00000000000000 --- a/ports/cmark/rename-shared-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d5a1936..acff569 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -83,7 +83,6 @@ if (CMARK_SHARED) - add_library(${LIBRARY} SHARED ${LIBRARY_SOURCES}) - # Include minor version and patch level in soname for now. - set_target_properties(${LIBRARY} PROPERTIES -- OUTPUT_NAME "cmark" - SOVERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} - VERSION ${PROJECT_VERSION}) - diff --git a/ports/cmark/vcpkg.json b/ports/cmark/vcpkg.json index 8ada6339c4bd4c..bfb1999a602bcd 100644 --- a/ports/cmark/vcpkg.json +++ b/ports/cmark/vcpkg.json @@ -1,6 +1,21 @@ { "name": "cmark", - "version-string": "0.29.0", - "port-version": 1, - "description": "CommonMark parsing and rendering library" + "version-semver": "0.30.1", + "description": "CommonMark parsing and rendering library", + "homepage": "https://github.com/commonmark/cmark", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Build tools" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index cb6c26d86c090b..6d60fc2e57ee22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1385,8 +1385,8 @@ "port-version": 1 }, "cmark": { - "baseline": "0.29.0", - "port-version": 1 + "baseline": "0.30.1", + "port-version": 0 }, "cmcstl2": { "baseline": "2019-07-20", diff --git a/versions/c-/cmark.json b/versions/c-/cmark.json index 0a6e4b3753522b..2ae2ccef7e268a 100644 --- a/versions/c-/cmark.json +++ b/versions/c-/cmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63d8e9056589a885ec4a36ba739903199206fff1", + "version-semver": "0.30.1", + "port-version": 0 + }, { "git-tree": "0cda97dbc7324b408739f53f493316af44dcaaf6", "version-string": "0.29.0", From 6f3e69c8fdcb122876e7d11f563d6b1164cc437a Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Wed, 15 Sep 2021 19:49:49 -0500 Subject: [PATCH 0560/1858] [tomlplusplus] Update to 2.5.0 (#20164) * Update to 2.5.0 * Update baseline * version-string -> version * Update baseline Co-authored-by: Billy Robert O'Neal III --- ports/tomlplusplus/portfile.cmake | 6 +++--- ports/tomlplusplus/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/t-/tomlplusplus.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/tomlplusplus/portfile.cmake b/ports/tomlplusplus/portfile.cmake index f98d9f332c4c2e..406224e8df632d 100644 --- a/ports/tomlplusplus/portfile.cmake +++ b/ports/tomlplusplus/portfile.cmake @@ -3,14 +3,14 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "osx" "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO marzer/tomlplusplus - REF v2.4.0 - SHA512 cfb8a1eeaed3350f8b5341b6893527c9571ee71416c0dc2d680d8739003cd5de85aad8efc0bdbf06e4ed7d3da0a942939509a86c035b551773df3e1b77afacbe + REF v2.5.0 + SHA512 7394cda2009b37e88f9028ee5d1887120bed7042833c7cb218d7705cdc92273c81a84163ff0be034d3f23c8dd93e63b7615134a4b0e1c580e1e945fae45c7d35 HEAD_REF master ) vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - OPTIONS + OPTIONS -Dgenerate_cmake_config=true -Dbuild_tests=false -Dbuild_examples=false diff --git a/ports/tomlplusplus/vcpkg.json b/ports/tomlplusplus/vcpkg.json index 20c58326ead24b..08d6aeb2908b15 100644 --- a/ports/tomlplusplus/vcpkg.json +++ b/ports/tomlplusplus/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tomlplusplus", - "version-string": "2.4.0", - "port-version": 1, + "version": "2.5.0", "description": "Header-only TOML config file parser and serializer for modern C++.", "homepage": "https://marzer.github.io/tomlplusplus/", "supports": "!(arm | uwp | osx)" diff --git a/versions/baseline.json b/versions/baseline.json index 6d60fc2e57ee22..686c24a0ffcdca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6561,8 +6561,8 @@ "port-version": 2 }, "tomlplusplus": { - "baseline": "2.4.0", - "port-version": 1 + "baseline": "2.5.0", + "port-version": 0 }, "tool-meson": { "baseline": "0.58.1", diff --git a/versions/t-/tomlplusplus.json b/versions/t-/tomlplusplus.json index dfdbad7af692ab..441c25dffbbda7 100644 --- a/versions/t-/tomlplusplus.json +++ b/versions/t-/tomlplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f28a45d07d6ff9059a273ab730c9bc36a57ef7aa", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "adfbc0f365c9a2f1ea4f90cf4a199be6e3b10586", "version-string": "2.4.0", From 3ea5987ed79dd3b37ffcb6d2ab0597804befb183 Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Thu, 16 Sep 2021 00:21:41 -0400 Subject: [PATCH 0561/1858] [curl] Update to 7.79.0 (#20175) * [curl] Update to 7.79.0 * Run x-add-version curl --- ports/curl/0010_fix_othertests_cmake.patch | 12 ------------ ports/curl/portfile.cmake | 5 ++--- ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 5 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 ports/curl/0010_fix_othertests_cmake.patch diff --git a/ports/curl/0010_fix_othertests_cmake.patch b/ports/curl/0010_fix_othertests_cmake.patch deleted file mode 100644 index e54d33333e3179..00000000000000 --- a/ports/curl/0010_fix_othertests_cmake.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMake/OtherTests.cmake b/CMake/OtherTests.cmake -index 7cec6da..c836fc9 100644 ---- a/CMake/OtherTests.cmake -+++ b/CMake/OtherTests.cmake -@@ -212,6 +212,7 @@ if(HAVE_SIGNAL_H) - set(CMAKE_REQUIRED_FLAGS "-DHAVE_SIGNAL_H") - set(CMAKE_EXTRA_INCLUDE_FILES "signal.h") - endif() -+unset(CMAKE_TRY_COMPILE_TARGET_TYPE) - check_type_size("sig_atomic_t" SIZEOF_SIG_ATOMIC_T) - if(HAVE_SIZEOF_SIG_ATOMIC_T) - check_c_source_compiles(" diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index 8080bda06effb9..c92abb39e7b915 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,15 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF bfbde883af33397943df68a3ae01847a634d33bf #curl-7_78_0 - SHA512 72c2d0daedbd1e0610f507f637c5725cb0769befe5205f613260217b692e27ec135711974f85660f863a49b415c1457d2d29960158758e232caa89f972f7045e + REF 8e82f2a04a238c54ba91e553e9a8452e6d405965 #curl-7_79_0 + SHA512 0a13bc9bf85ddbf958661f7f197aff9b57c4218ce9fa81cf419f97f2cebf7df0ded9f47b55b5e9b1615065145c5f5059c2e7d986240297cb5970b3b4a39fa031 HEAD_REF master PATCHES 0002_fix_uwp.patch 0005_remove_imp_suffix.patch 0006_fix_tool_depends.patch 0007_disable_tool_export_curl_target.patch - 0010_fix_othertests_cmake.patch 0011_fix_static_build.patch 0012-fix-dependency-idn2.patch 0020-fix-pc-file.patch diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index 281d77f4fba904..bb65d74acc9709 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "curl", - "version": "7.78.0", + "version": "7.79.0", "description": "A library for transferring data with URLs", "homepage": "https://github.com/curl/curl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 686c24a0ffcdca..2340b4354c05aa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1645,7 +1645,7 @@ "port-version": 7 }, "curl": { - "baseline": "7.78.0", + "baseline": "7.79.0", "port-version": 0 }, "curlpp": { diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 7c9b97571943f5..38985c555e7a02 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b6c1c3766b64c163ddabf8312214a23e2a7b8f5", + "version": "7.79.0", + "port-version": 0 + }, { "git-tree": "0be4cff4d8e1d37a9ddf9ab264682771c69c0d72", "version": "7.78.0", From ccf3d53f65f5ea177e8e4086cc932cfb501b1f94 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 17 Sep 2021 01:34:09 +0800 Subject: [PATCH 0562/1858] [soci] update to 4.0.2 (#18526) * [soci] update to 4.0.2 * update version * update portfile.cmake * update version * fix ci error * update version * fix-mysql-feature * update version * Add comment explaining fix-mysql-feature-error.patch Co-authored-by: Billy Robert O'Neal III --- ports/soci/export-include-dirs.patch | 33 ++++++------------------ ports/soci/fix-mysql-feature-error.patch | 12 +++++++++ ports/soci/portfile.cmake | 27 +++++++------------ ports/soci/vcpkg.json | 13 ++++++++-- versions/baseline.json | 4 +-- versions/s-/soci.json | 5 ++++ 6 files changed, 48 insertions(+), 46 deletions(-) create mode 100644 ports/soci/fix-mysql-feature-error.patch diff --git a/ports/soci/export-include-dirs.patch b/ports/soci/export-include-dirs.patch index 907b54e77001e2..e141363fc2e894 100644 --- a/ports/soci/export-include-dirs.patch +++ b/ports/soci/export-include-dirs.patch @@ -1,8 +1,8 @@ diff --git a/cmake/SociBackend.cmake b/cmake/SociBackend.cmake -index 442d81d..ef56422 100644 +index 5d4ef0d..bb0edf2 100644 --- a/cmake/SociBackend.cmake +++ b/cmake/SociBackend.cmake -@@ -159,8 +159,13 @@ macro(soci_backend NAME) +@@ -159,8 +159,14 @@ macro(soci_backend NAME) ${THIS_BACKEND_HEADERS}) target_link_libraries(${THIS_BACKEND_TARGET} @@ -12,42 +12,25 @@ index 442d81d..ef56422 100644 + + target_include_directories(${THIS_BACKEND_TARGET} + PUBLIC -+ ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS}) ++ ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} ++ ) if(WIN32) set_target_properties(${THIS_BACKEND_TARGET} -@@ -197,8 +202,14 @@ macro(soci_backend NAME) +@@ -197,9 +203,15 @@ macro(soci_backend NAME) # Still need to link the libraries for tests to work target_link_libraries (${THIS_BACKEND_TARGET_STATIC} + PUBLIC ${THIS_BACKEND_DEPENDS_LIBRARIES} ) +- + + target_include_directories(${THIS_BACKEND_TARGET_STATIC} + PUBLIC + ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS} + ) - ++ set_target_properties(${THIS_BACKEND_TARGET_STATIC} PROPERTIES -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 3916cce..d537613 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -64,6 +64,7 @@ if (SOCI_SHARED) - target_include_directories(${SOCI_CORE_TARGET} - PUBLIC - $ -+ $ - ) - - endif() -@@ -96,6 +97,7 @@ if (SOCI_STATIC) - target_include_directories(${SOCI_CORE_TARGET_STATIC} - PUBLIC - $ -+ $ - ) - - endif() + OUTPUT_NAME ${THIS_BACKEND_OUTPUT_NAME} diff --git a/ports/soci/fix-mysql-feature-error.patch b/ports/soci/fix-mysql-feature-error.patch new file mode 100644 index 00000000000000..05e9c4bfe04a23 --- /dev/null +++ b/ports/soci/fix-mysql-feature-error.patch @@ -0,0 +1,12 @@ +diff --git a/src/backends/mysql/session.cpp b/src/backends/mysql/session.cpp +index 383248c..86a5bfd 100644 +--- a/src/backends/mysql/session.cpp ++++ b/src/backends/mysql/session.cpp +@@ -5,6 +5,7 @@ + // (See accompanying file LICENSE_1_0.txt or copy at + // http://www.boost.org/LICENSE_1_0.txt) + // ++typedef bool my_bool; + + #define SOCI_MYSQL_SOURCE + #include "soci/mysql/soci-mysql.h" diff --git a/ports/soci/portfile.cmake b/ports/soci/portfile.cmake index 153fc6887243f8..b852d6da79af7f 100644 --- a/ports/soci/portfile.cmake +++ b/ports/soci/portfile.cmake @@ -1,12 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO SOCI/soci - REF 334cc55d9fa7b42d7214a8533a246d637bc92899 #version 4.0.1 commit on 2020.10.19 - SHA512 b300b13f68347d78252812e09efffb1735072cf5019940da53366a5cdee997f4b8b03a584a87a95ba764b0a78640ad6eb4966b53f9156280cb452465607afbc7 + REF 99e2d567161a302de4f99832af76e6d3b75b68e6 #version 4.0.2 + SHA512 d08d2383808d46d5e9550e9c7d93fb405d9e336eb38d974ba429e5b9446d3af53d4e702b90e80c67e298333da0145457fa1146d9773322676030be69de4ec4f4 HEAD_REF master PATCHES fix-dependency-libmysql.patch export-include-dirs.patch + fix-mysql-feature-error.patch # https://bugs.mysql.com/bug.php?id=85131 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SOCI_DYNAMIC) @@ -32,37 +33,29 @@ foreach(_feature IN LISTS ALL_FEATURES) endif() endforeach() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSOCI_TESTS=OFF -DSOCI_CXX11=ON - -DSOCI_LIBDIR:STRING=lib # This is to always have output in the lib folder and not lib64 for 64-bit builds - -DLIBDIR:STRING=lib -DSOCI_STATIC=${SOCI_STATIC} -DSOCI_SHARED=${SOCI_DYNAMIC} ${_COMPONENT_FLAGS} ${MYSQL_OPT} - -DWITH_ORACLE=OFF - -DWITH_FIREBIRD=OFF - -DWITH_DB2=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -# Correct the config file name -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCI.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SOCI) if ("mysql" IN_LIST FEATURES) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake" "# Create imported target SOCI::soci_mysql" "\ninclude(CMakeFindDependencyMacro)\nfind_dependency(libmysql)\n# Create imported target SOCI::soci_mysql" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/soci/vcpkg.json b/ports/soci/vcpkg.json index bb63ee5fc6c1d9..03c3294448743a 100644 --- a/ports/soci/vcpkg.json +++ b/ports/soci/vcpkg.json @@ -1,9 +1,18 @@ { "name": "soci", - "version": "4.0.1", - "port-version": 3, + "version": "4.0.2", "description": "SOCI database access library", "homepage": "https://github.com/SOCI/soci", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "boost": { "description": "Integration with Boost", diff --git a/versions/baseline.json b/versions/baseline.json index 2340b4354c05aa..6abcae8f71589b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6081,8 +6081,8 @@ "port-version": 0 }, "soci": { - "baseline": "4.0.1", - "port-version": 3 + "baseline": "4.0.2", + "port-version": 0 }, "socket-io-client": { "baseline": "3.0.0", diff --git a/versions/s-/soci.json b/versions/s-/soci.json index 2d9a73a00246cf..1d6dbc1cad28c1 100644 --- a/versions/s-/soci.json +++ b/versions/s-/soci.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "885023b9eb3db14a25a785e0f67e3a1585f07a02", + "version": "4.0.2", + "port-version": 0 + }, { "git-tree": "05767aa636348d9fb5a2507a2c348091cc9d7782", "version": "4.0.1", From 94a1b4c72686b05b3013b1b924031974dcf228ff Mon Sep 17 00:00:00 2001 From: Nicolas Fella <6377822+nicolasfella@users.noreply.github.com> Date: Thu, 16 Sep 2021 19:34:42 +0200 Subject: [PATCH 0563/1858] [qt] Add patches to fix missing includes (#19668) * [qt] Add patches to fix missing includes This is needed to build with GCC11 Fixes #19226 * bump version * version Co-authored-by: JackBoosY --- ports/qt5-base/patches/limits_include.patch | 51 +++++++++++++++++++++ ports/qt5-base/portfile.cmake | 1 + ports/qt5-base/vcpkg.json | 2 +- ports/qt5-declarative/limits_include.patch | 24 ++++++++++ ports/qt5-declarative/portfile.cmake | 2 +- ports/qt5-declarative/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/q-/qt5-base.json | 5 ++ versions/q-/qt5-declarative.json | 5 ++ 9 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 ports/qt5-base/patches/limits_include.patch create mode 100644 ports/qt5-declarative/limits_include.patch diff --git a/ports/qt5-base/patches/limits_include.patch b/ports/qt5-base/patches/limits_include.patch new file mode 100644 index 00000000000000..0ed514b7633d2d --- /dev/null +++ b/ports/qt5-base/patches/limits_include.patch @@ -0,0 +1,51 @@ +From 61325e4547225b8b2ecefda4ca328a38c075c909 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Wed, 11 Aug 2021 15:35:05 +0200 +Subject: [PATCH] Add missing limits include + +--- + src/corelib/global/qendian.h | 1 + + src/corelib/global/qfloat16.h | 1 + + src/corelib/text/qbytearraymatcher.h | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h +index 257efbbdbe..05f11d6f81 100644 +--- a/src/corelib/global/qendian.h ++++ b/src/corelib/global/qendian.h +@@ -47,6 +47,7 @@ + // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems + #include + #include ++#include + + #ifdef min // MSVC + #undef min +diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h +index c7a9c87af3..3287d7cbf2 100644 +--- a/src/corelib/global/qfloat16.h ++++ b/src/corelib/global/qfloat16.h +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + + #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) + // All processors that support AVX2 do support F16C too. That doesn't mean +diff --git a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h +index 0eedfc1d20..f5f9bef7b8 100644 +--- a/src/corelib/text/qbytearraymatcher.h ++++ b/src/corelib/text/qbytearraymatcher.h +@@ -42,6 +42,8 @@ + + #include + ++#include ++ + QT_BEGIN_NAMESPACE + + +-- +2.32.0 + diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 25eeb2e5c819e5..2bd8475c9cfe9d 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -87,6 +87,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH #CMake fixes ${PATCHES} patches/Qt5GuiConfigExtras.patch # Patches the library search behavior for EGL since angle is not build with Qt + patches/limits_include.patch # Add missing includes to build with gcc 11 ) # Remove vendored dependencies to ensure they are not picked up by the build diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 6dd639243e4c32..6115a5e4fd4afa 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 10, + "port-version": 11, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qt5-declarative/limits_include.patch b/ports/qt5-declarative/limits_include.patch new file mode 100644 index 00000000000000..b4580dd217bf18 --- /dev/null +++ b/ports/qt5-declarative/limits_include.patch @@ -0,0 +1,24 @@ +From 2dfb893c130a9f9195805fcc81d7e5e242bc558d Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Wed, 11 Aug 2021 17:03:06 +0200 +Subject: [PATCH] Add missing limits include + +--- + src/qmldebug/qqmlprofilerevent_p.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h +index a7e37d1964..01b2f58f16 100644 +--- a/src/qmldebug/qqmlprofilerevent_p.h ++++ b/src/qmldebug/qqmlprofilerevent_p.h +@@ -48,6 +48,7 @@ + #include + + #include ++#include + #include + + // +-- +2.32.0 + diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 2cd1cf47965fa3..8b4ab0e9abca44 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -1,2 +1,2 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation() \ No newline at end of file +qt_submodule_installation(PATCHES limits_include.patch) diff --git a/ports/qt5-declarative/vcpkg.json b/ports/qt5-declarative/vcpkg.json index c6716a208f17f7..9ac0dead3cbb68 100644 --- a/ports/qt5-declarative/vcpkg.json +++ b/ports/qt5-declarative/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-declarative", "version-string": "5.15.2", - "port-version": 1, + "port-version": 2, "description": "Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol.", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 6abcae8f71589b..333dd7e7d278e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5314,7 +5314,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 10 + "port-version": 11 }, "qt5-canvas3d": { "baseline": "0", @@ -5334,7 +5334,7 @@ }, "qt5-declarative": { "baseline": "5.15.2", - "port-version": 1 + "port-version": 2 }, "qt5-doc": { "baseline": "5.15.2", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 8df1a943528664..ad6aee5fd36913 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72ca286ac98e08f2fef35f85a6e393795428d033", + "version-semver": "5.15.2", + "port-version": 11 + }, { "git-tree": "13593d8640bdca2663ba5bd497243274e51c4dc3", "version-semver": "5.15.2", diff --git a/versions/q-/qt5-declarative.json b/versions/q-/qt5-declarative.json index b8019324cdd4c7..8877e0bae93d61 100644 --- a/versions/q-/qt5-declarative.json +++ b/versions/q-/qt5-declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0cef09afb36f9debf22319dc4adccf478c611885", + "version-string": "5.15.2", + "port-version": 2 + }, { "git-tree": "bf4313e778b98d69d3e0e3b881069357c3ef8b76", "version-string": "5.15.2", From 0afd19d8a6ed7e64eaf931f168303213a17a9973 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 17 Sep 2021 01:35:18 +0800 Subject: [PATCH 0564/1858] [aws-crt-cpp/aws-sdk-cpp] Disable parallel configure (#20189) --- ports/aws-crt-cpp/portfile.cmake | 11 +++++------ ports/aws-crt-cpp/vcpkg.json | 1 + ports/aws-sdk-cpp/portfile.cmake | 7 +++---- ports/aws-sdk-cpp/vcpkg.json | 1 + versions/a-/aws-crt-cpp.json | 5 +++++ versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 22 insertions(+), 12 deletions(-) diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake index 7dc30421a70a51..ffef30e943ad6c 100644 --- a/ports/aws-crt-cpp/portfile.cmake +++ b/ports/aws-crt-cpp/portfile.cmake @@ -4,14 +4,14 @@ vcpkg_from_github( REF 9ef58ff20df19e613c91c5f761e381c763da6810 # v0.15.1 SHA512 3409b3e6a546ed585b90180807383e8731b36b0db149b5ff92701a43164c4282b1cea4a551bf4c7b1edec7b264098575cf919faee8a2520bb10bbae62258d463 PATCHES - fix-cmake-target-path.patch + fix-cmake-target-path.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS "-DSTATIC_CRT=${STATIC_CRT}" "-DBUILD_DEPS=OFF" @@ -35,14 +35,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp" - "${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/aws-crt-cpp" + "${CURRENT_PACKAGES_DIR}/lib/aws-crt-cpp" ) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json index 6112538dbd4264..fb109b1a441178 100644 --- a/ports/aws-crt-cpp/vcpkg.json +++ b/ports/aws-crt-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "aws-crt-cpp", "version": "0.15.1", + "port-version": 1, "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-crt-cpp", "supports": "!arm & !uwp", diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index c9c44a800529c5..66cc714a668c82 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -45,7 +45,7 @@ foreach(TARGET IN LISTS BUILD_ONLY) message(STATUS "Building ${TARGET}") vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS ${EXTRA_ARGS} "-DENABLE_UNITY_BUILD=ON" @@ -99,10 +99,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${DEBUG_LIB_FILES}) endif() - file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") + file(APPEND "${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h" "#ifndef USE_IMPORT_EXPORT\n#define USE_IMPORT_EXPORT\n#endif") endif() -configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) +configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY) -# Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index cc17dfcb3d83b5..3007b888bb69e8 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.9.96", + "port-version": 1, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "supports": "!arm & !uwp", diff --git a/versions/a-/aws-crt-cpp.json b/versions/a-/aws-crt-cpp.json index e525f20116ce56..d8c239816fa52e 100644 --- a/versions/a-/aws-crt-cpp.json +++ b/versions/a-/aws-crt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60880034065d31bf96ac71028dab62955a77ba55", + "version": "0.15.1", + "port-version": 1 + }, { "git-tree": "5bd5acd0aefeed0bbf56945c6b299644f3ad6af0", "version": "0.15.1", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 7b1adb482aa37d..43f797703aba89 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5989ba8996df75b9195ef2f429191b48602236c9", + "version": "1.9.96", + "port-version": 1 + }, { "git-tree": "e407a52a177c37acd340209b0c00d1dd1355d2aa", "version": "1.9.96", diff --git a/versions/baseline.json b/versions/baseline.json index 333dd7e7d278e3..b49a8129ef89e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -290,7 +290,7 @@ }, "aws-crt-cpp": { "baseline": "0.15.1", - "port-version": 0 + "port-version": 1 }, "aws-lambda-cpp": { "baseline": "0.2.6", @@ -298,7 +298,7 @@ }, "aws-sdk-cpp": { "baseline": "1.9.96", - "port-version": 0 + "port-version": 1 }, "azmq": { "baseline": "2020-03-03", From ffaf7fdd7c9f753889df02374bd9da61aef2bc0f Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 16 Sep 2021 20:44:01 +0300 Subject: [PATCH 0565/1858] [sobjectizer] Update to 5.7.2.6 (#20191) * SObjectizer updated to 5.7.2.6. * Baseline updated with sobjectizer-5.7.2.6. --- ports/sobjectizer/portfile.cmake | 4 ++-- ports/sobjectizer/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sobjectizer.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/sobjectizer/portfile.cmake b/ports/sobjectizer/portfile.cmake index 1a1cd2f8d03441..b6932058ecb32f 100644 --- a/ports/sobjectizer/portfile.cmake +++ b/ports/sobjectizer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/sobjectizer - REF 99c1fd14903f6190e1e4cdcc6855e34f11c93353 # v.5.7.2.5 - SHA512 48ac886699b875ac8666b8d709bcf3c8cee2e543b34172a343f535755481294fec9795c284b4ff3bd249c9af4a859270f7b91510e878f52655d5f0d639cb6c9f + REF 972b5310b7a486dd4d4322ffb46f1c7e15c47ef6 # v.5.7.2.6 + SHA512 0e5160981218d49beda3ed367ed34fa05c706104f68b6b06619f62a9b2a1ef92b08ddfd3ae14451e51e41bb7742789da4536289ec9d2d23dce13cdf6284108c9 ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SOBJECTIZER_BUILD_STATIC ) diff --git a/ports/sobjectizer/vcpkg.json b/ports/sobjectizer/vcpkg.json index 1bb4b23e44a5c2..82297030b5793f 100644 --- a/ports/sobjectizer/vcpkg.json +++ b/ports/sobjectizer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sobjectizer", - "version": "5.7.2.5", + "version": "5.7.2.6", "description": "SObjectizer is a C++ in-process message dispatching framework with implementation of Actor Model, Publish-Subscribe Model and CSP-like channels.", "homepage": "https://github.com/Stiffstream/sobjectizer", "license": "BSD-3-Clause" diff --git a/versions/baseline.json b/versions/baseline.json index b49a8129ef89e2..2a64bf51351e3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6077,7 +6077,7 @@ "port-version": 0 }, "sobjectizer": { - "baseline": "5.7.2.5", + "baseline": "5.7.2.6", "port-version": 0 }, "soci": { diff --git a/versions/s-/sobjectizer.json b/versions/s-/sobjectizer.json index 381d2c883828b4..8de7b3de08718a 100644 --- a/versions/s-/sobjectizer.json +++ b/versions/s-/sobjectizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9d077353078063b67cad355ccb7546a0b4bfcac", + "version": "5.7.2.6", + "port-version": 0 + }, { "git-tree": "21a89cfcbe5096e303ef5b0c2d5ab7194687891f", "version": "5.7.2.5", From 217eea42f5d4af278869019cecd32a03e47ccab3 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 16 Sep 2021 10:45:05 -0700 Subject: [PATCH 0566/1858] [cppad/cpuid] Update to latest version (#20187) * [cppad/cpuid] Update to latest version * Add quotes to SOURCE_PATH Co-authored-by: Cheney-Wang --- ports/cppad/portfile.cmake | 18 +++++------ ports/cppad/vcpkg.json | 15 +++++++-- ports/cppad/windows-fix.patch | 57 ----------------------------------- ports/cpuid/portfile.cmake | 20 ++++++------ ports/cpuid/vcpkg.json | 15 +++++++-- versions/baseline.json | 8 ++--- versions/c-/cppad.json | 5 +++ versions/c-/cpuid.json | 5 +++ 8 files changed, 55 insertions(+), 88 deletions(-) diff --git a/ports/cppad/portfile.cmake b/ports/cppad/portfile.cmake index 1c9fc8ddf4e45e..1a041d48f4c86e 100644 --- a/ports/cppad/portfile.cmake +++ b/ports/cppad/portfile.cmake @@ -5,17 +5,15 @@ vcpkg_fail_port_install(ON_TARGET "uwp" and "arm") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO coin-or/CppAD - REF 20200000.3 - SHA512 4e980665a21c76cf355d1c5597c65fbfba7ac3e15c43a88ccfe3ba0267b85b4e9aa7c6e8a0ed7a728f8cf2c6e1424625d5cbcdd295a6c0a08b47b4b121572d13 + REF 90c510458b61049c51f937fc6ed2e611fbb17b8b #20210000.7 + SHA512 112a4663a3e13f2d852c4ce4e57f6bee2dc7584915fcbab75972568258faab0d4a5761c4eaa4c664543cb8674e8e70c0623054c07dff933f9513a47f1c7d6261 HEAD_REF master PATCHES windows-fix.patch - pkgconfig-fix.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -Dcppad_prefix=${CURRENT_PACKAGES_DIR} @@ -26,17 +24,17 @@ vcpkg_configure_cmake( -Dcmake_install_libdirs=debug/lib ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Install the pkgconfig file if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/pkgconfig/cppad.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/pkgconfig/cppad.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() vcpkg_fixup_pkgconfig() # Add the copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppad/vcpkg.json b/ports/cppad/vcpkg.json index a2108bcec9c264..fdc3cad7a44d2f 100644 --- a/ports/cppad/vcpkg.json +++ b/ports/cppad/vcpkg.json @@ -1,8 +1,17 @@ { "name": "cppad", - "version-string": "20200000.3", - "port-version": 1, + "version-string": "20210000.7", "description": "CppAD: A Package for Differentiation of C++ Algorithms", "homepage": "https://github.com/coin-or/CppAD", - "supports": "!(arm | uwp)" + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/cppad/windows-fix.patch b/ports/cppad/windows-fix.patch index 50c38ca12307e6..585e3294e08426 100644 --- a/ports/cppad/windows-fix.patch +++ b/ports/cppad/windows-fix.patch @@ -1,60 +1,3 @@ -diff --git a/cppad_lib/cppad_colpack.cpp b/cppad_lib/cppad_colpack.cpp -index dc3327053..739363292 100644 ---- a/cppad_lib/cppad_colpack.cpp -+++ b/cppad_lib/cppad_colpack.cpp -@@ -17,7 +17,7 @@ in the Eclipse Public License, Version 2.0 are satisfied: - - # if CPPAD_HAS_COLPACK == 0 - namespace CppAD { namespace local { -- CPPAD_LIB_EXPORT void this_routine_should_never_get_called(void) -+ void this_routine_should_never_get_called(void) - { CPPAD_ASSERT_UNKNOWN(false); } - } } - # else // CPPAD_HAS_COLPACK -@@ -52,7 +52,7 @@ the entry with index (i, adolc_pattern[i][k]) is a non-zero - in the sparsity pattern for the matrix. - */ - // ---------------------------------------------------------------------- --CPPAD_LIB_EXPORT void cppad_colpack_general( -+void cppad_colpack_general( - CppAD::vector& color , - size_t m , - size_t n , -@@ -164,7 +164,7 @@ For i = 0 , ... , m-1, and for k = 1, ... ,adolc_pattern[i][0], - the entry with index (i, adolc_pattern[i][k]) is - in the sparsity pattern for the symmetric matrix. - */ --CPPAD_LIB_EXPORT void cppad_colpack_symmetric( -+void cppad_colpack_symmetric( - CppAD::vector& color , - size_t m , - const CppAD::vector& adolc_pattern ) -diff --git a/cppad_lib/json_parser.cpp b/cppad_lib/json_parser.cpp -index fac417d9f..ac0910cee 100644 ---- a/cppad_lib/json_parser.cpp -+++ b/cppad_lib/json_parser.cpp -@@ -20,7 +20,7 @@ in the Eclipse Public License, Version 2.0 are satisfied: - // documentation for this routine is in the file below - # include - --CPPAD_LIB_EXPORT void CppAD::local::graph::json_parser( -+void CppAD::local::graph::json_parser( - const std::string& json , - cpp_graph& graph_obj ) - { using std::string; -diff --git a/cppad_lib/json_writer.cpp b/cppad_lib/json_writer.cpp -index 250345c6e..add4b20a9 100644 ---- a/cppad_lib/json_writer.cpp -+++ b/cppad_lib/json_writer.cpp -@@ -17,7 +17,7 @@ in the Eclipse Public License, Version 2.0 are satisfied: - // documentation for this routine is in the file below - # include - --CPPAD_LIB_EXPORT void CppAD::local::graph::json_writer( -+void CppAD::local::graph::json_writer( - std::string& json , - const cpp_graph& graph_obj ) - { using std::string; diff --git a/include/cppad/local/cppad_colpack.hpp b/include/cppad/local/cppad_colpack.hpp index ee96ab5fe..6dd022180 100644 --- a/include/cppad/local/cppad_colpack.hpp diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index 48849dc0f07825..00f374a928fedd 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -4,25 +4,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO anrieff/libcpuid - REF f2ab8b7ef2c286f619d96c3ce8902cb76b801bf0 - SHA512 fcd2d35994554eed80c04315f1cf3bc91f272a5051dde040fe2266d71af902b60ecfd74b6f9dc8284a22f222208c6789bfb94cc12d61de17d605265d3cd2c43d + REF 179fbcb713566c2084a1903729b6eebba68a4424 #0.5.1 + SHA512 76eef8147a9ed2f116ddfd07ab95f76126bee0e23d0e6b5be54d157a1456b769fb698a4799a43c5f81ac12368d76fe8904bff735a698342ad8ee41d43e72645b HEAD_REF master - PATCHES fix-install-headers.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DENABLE_DOCS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpuid) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpuid) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index 6c63a4c7723c43..7e8a6aa4eef397 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,8 +1,17 @@ { "name": "cpuid", - "version-string": "0.4.1", - "port-version": 2, + "version": "0.5.1", "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", - "supports": "x86 | x64" + "supports": "x86 | x64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 2a64bf51351e3c..2f3903a29e7877 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1497,8 +1497,8 @@ "port-version": 1 }, "cppad": { - "baseline": "20200000.3", - "port-version": 1 + "baseline": "20210000.7", + "port-version": 0 }, "cppcms": { "baseline": "1.2.1", @@ -1565,8 +1565,8 @@ "port-version": 0 }, "cpuid": { - "baseline": "0.4.1", - "port-version": 2 + "baseline": "0.5.1", + "port-version": 0 }, "cpuinfo": { "baseline": "2021-04-04", diff --git a/versions/c-/cppad.json b/versions/c-/cppad.json index 739c86ddb6a90e..bfe05de38ce429 100644 --- a/versions/c-/cppad.json +++ b/versions/c-/cppad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00e184c8de4368f8ee0b6b5dd0c16034d7a99a8f", + "version-string": "20210000.7", + "port-version": 0 + }, { "git-tree": "f03801828709574ede2215d05d984764cc271a18", "version-string": "20200000.3", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index a7dc8451f0647b..4ba992173808f6 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65cb7ff3fc46a78367e4c700b587e8093386e4b3", + "version": "0.5.1", + "port-version": 0 + }, { "git-tree": "c85228de687c3b4748a8867c1fbf82f0b64c8d9c", "version-string": "0.4.1", From f3689675205b830c728484b7e1cdf1675af81827 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 16 Sep 2021 10:50:15 -0700 Subject: [PATCH 0567/1858] [amqpcpp/leptonica/glibmm] Update to latest version (#20069) * [amqpcpp/leptonica/glibmm] Update to latest version * Modify the include dir path * Modify version schemes Co-authored-by: Cheney-Wang --- ports/amqpcpp/portfile.cmake | 19 +++++++++---------- ports/amqpcpp/vcpkg.json | 12 ++++++++++-- ports/glibmm/portfile.cmake | 10 +++++----- ports/glibmm/vcpkg.json | 2 +- ports/leptonica/Modify-include-dir.patch | 13 +++++++++++++ ports/leptonica/portfile.cmake | 21 +++++++++++++-------- ports/leptonica/vcpkg.json | 11 +++++++++-- versions/a-/amqpcpp.json | 5 +++++ versions/baseline.json | 8 ++++---- versions/g-/glibmm.json | 5 +++++ versions/l-/leptonica.json | 5 +++++ 11 files changed, 79 insertions(+), 32 deletions(-) create mode 100644 ports/leptonica/Modify-include-dir.patch diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake index 95317afa3c657b..e8c634342fc344 100644 --- a/ports/amqpcpp/portfile.cmake +++ b/ports/amqpcpp/portfile.cmake @@ -5,30 +5,29 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CopernicaMarketingSoftware/AMQP-CPP - REF 9fa05100f43686f617722aaba7a500cd54b9804a #v4.3.11 - SHA512 f4d311d3f430579deb0ff9d820d9c6160dce775622afe28731ed4e6abd6b827bf20afb5bdf52d246d0fb5afc469005cc34469f57063e197375b6be8ed93afe8b + REF 2749d36a9cf9def86fc8a30eceb0e3a11d85815d #v4.3.14 + SHA512 ee6df360963bb5714c7503e27a9ed0682d704a267ef615fa922bd1cb637d1c0867c9074d5aeef084621840ef39f495a4103f22bfd80b6b1dd325bc6061e9c2ca HEAD_REF master PATCHES find-openssl.patch ) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(VCPKG_TARGET_IS_LINUX) set(LINUX_TCP ON) else() set(LINUX_TCP OFF) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DAMQP-CPP_BUILD_SHARED=OFF -DAMQP-CPP_LINUX_TCP=${LINUX_TCP} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json index 18cca30fd5dab8..e248db9cc10765 100644 --- a/ports/amqpcpp/vcpkg.json +++ b/ports/amqpcpp/vcpkg.json @@ -1,10 +1,18 @@ { "name": "amqpcpp", - "version-string": "4.3.11", + "version": "4.3.14", "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker", "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP", "supports": "!uwp", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/glibmm/portfile.cmake b/ports/glibmm/portfile.cmake index 5e0dd354318e76..a6a4307dde3075 100644 --- a/ports/glibmm/portfile.cmake +++ b/ports/glibmm/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.0.tar.xz" - FILENAME "glibmm-2.68.0.tar.xz" - SHA512 a13121052315e949acf2528e226079f1a2cf7853080aec770dcb269e422997e5515ed767c7a549231fb3fa5f913b3fd9ef083080589283824b6a218d066b253e + URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.68/glibmm-2.68.1.tar.xz" + FILENAME "glibmm-2.68.1.tar.xz" + SHA512 ca164f986da651e66bb5b98a760853e73d57ff84e035809d4c3b2c0a1b6ddf8ca68ffc49a71d0e0b2e14eca1c00e2e727e3bf3821e0b2b3a808397c3d33c6d5c ) vcpkg_extract_source_archive_ex( @@ -24,5 +24,5 @@ vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() # Handle copyright and readme -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME readme.txt) diff --git a/ports/glibmm/vcpkg.json b/ports/glibmm/vcpkg.json index ddd4b7ef69b0ad..feb01216f9a978 100644 --- a/ports/glibmm/vcpkg.json +++ b/ports/glibmm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glibmm", - "version": "2.68.0", + "version": "2.68.1", "description": "This is glibmm, a C++ API for parts of glib that are useful for C++.", "homepage": "https://www.gtkmm.org.", "supports": "!uwp", diff --git a/ports/leptonica/Modify-include-dir.patch b/ports/leptonica/Modify-include-dir.patch new file mode 100644 index 00000000000000..59486c6e266b49 --- /dev/null +++ b/ports/leptonica/Modify-include-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5aed94f..9bfcff9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -212,7 +212,7 @@ include(Configure) + + configure_file(${AUTOCONFIG_SRC} ${AUTOCONFIG} @ONLY) + +-set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include" "${CMAKE_INSTALL_PREFIX}/include/leptonica") ++set(INCLUDE_DIR "\${CMAKE_CURRENT_LIST_DIR}/../../include" "\${CMAKE_CURRENT_LIST_DIR}/../../include/leptonica") + + ############################################################################### + # diff --git a/ports/leptonica/portfile.cmake b/ports/leptonica/portfile.cmake index 5cb5aa88219652..11dfb396769659 100644 --- a/ports/leptonica/portfile.cmake +++ b/ports/leptonica/portfile.cmake @@ -1,32 +1,37 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DanBloomberg/leptonica - REF 1ac72c93fef1a5eb76b76d6723d2aee843dd6e51 # 1.80.0 - SHA512 d6d1af744691b70601b9f3d292d4593c36d392bcfd9e4c190fd533c2df40fcedfc226868429c25fad9b54c8ed68b61750832c9984c47ff72fc702dd3c3f438d6 + REF 2ff4313a85427ceb272540c570106b2f893da097 # 1.81.1 + SHA512 0e35538f1407e7220e68d635e5fd4c82219b58fb4b6ca8132d72892f52853e13451a2a160644a122c47598f77d2e87046cfb072be261be9a941342f476dc6376 HEAD_REF master PATCHES fix-cmakelists.patch find-dependency.patch fix-find-libwebp.patch + Modify-include-dir.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DSW_BUILD=OFF + -DCPPAN_BUILD=OFF -DSTATIC=${STATIC} -DCMAKE_REQUIRED_INCLUDES=${CURRENT_INSTALLED_DIR}/include # for check_include_file() + MAYBE_UNUSED_VARIABLES + STATIC ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_fixup_pkgconfig() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/leptonica-license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/leptonica-license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/leptonica/vcpkg.json b/ports/leptonica/vcpkg.json index 3a84db22a4b280..b70a8332d10620 100644 --- a/ports/leptonica/vcpkg.json +++ b/ports/leptonica/vcpkg.json @@ -1,7 +1,6 @@ { "name": "leptonica", - "version-string": "1.80.0", - "port-version": 3, + "version": "1.81.1", "description": "An open source library containing software that is broadly useful for image processing and image analysis applications", "homepage": "https://github.com/DanBloomberg/leptonica", "dependencies": [ @@ -11,6 +10,14 @@ "libwebp", "openjpeg", "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json index 433990e23f50b5..fa976f7d1ad2fb 100644 --- a/versions/a-/amqpcpp.json +++ b/versions/a-/amqpcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e17952ad85007dbc08e20711b8f5bd462712e4e0", + "version": "4.3.14", + "port-version": 0 + }, { "git-tree": "7f99b7612476d68b1cd6a026696741da9b90c230", "version-string": "4.3.11", diff --git a/versions/baseline.json b/versions/baseline.json index 2f3903a29e7877..7935c64058d22b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -69,7 +69,7 @@ "port-version": 1 }, "amqpcpp": { - "baseline": "4.3.11", + "baseline": "4.3.14", "port-version": 0 }, "anax": { @@ -2409,7 +2409,7 @@ "port-version": 0 }, "glibmm": { - "baseline": "2.68.0", + "baseline": "2.68.1", "port-version": 0 }, "glm": { @@ -3145,8 +3145,8 @@ "port-version": 1 }, "leptonica": { - "baseline": "1.80.0", - "port-version": 3 + "baseline": "1.81.1", + "port-version": 0 }, "lerc": { "baseline": "2.2", diff --git a/versions/g-/glibmm.json b/versions/g-/glibmm.json index d2a5d666801d5e..f6c30ddb9e4236 100644 --- a/versions/g-/glibmm.json +++ b/versions/g-/glibmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e43bb60b861fbd9469297581a968e3a647537b4d", + "version": "2.68.1", + "port-version": 0 + }, { "git-tree": "6074f2bdadef39758cbfc1238b03dc5051bf774d", "version": "2.68.0", diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json index e315adc43c68b8..6e1143686b29a9 100644 --- a/versions/l-/leptonica.json +++ b/versions/l-/leptonica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "215a8a32b41e1561998ac840c3c35404707186a2", + "version": "1.81.1", + "port-version": 0 + }, { "git-tree": "5068586428e64792c526ff7192b26ca96f27a673", "version-string": "1.80.0", From f1cd4f91f4a88c9bb6384916616e7b0d3c593853 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 16 Sep 2021 20:33:07 +0200 Subject: [PATCH 0568/1858] ci: suggest vcpkg_*_cmake -> vcpkg_cmake_* migration (#20142) --- .github/workflows/untrustedPR.yml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index ca8f99ea58dfd2..895cd999efd68e 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -14,8 +14,8 @@ jobs: steps: - uses: actions/checkout@v2 with: - # fetch-depth 2 ensures we capture both parents of the merge commit - fetch-depth: 2 + # fetch-depth 50 tries to ensure we capture the whole history of the branch + fetch-depth: 50 - uses: actions/cache@v2 id: cache @@ -38,6 +38,8 @@ jobs: git config user.email github-actions git config user.name github-actions@github.com + # HEAD^^ refers to the second parent of the merge commit + git diff --name-status --merge-base HEAD^^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -s '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" || echo " - \`$filename\`"; done > .github-pr.deprecated-cmake ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u @@ -56,7 +58,9 @@ jobs: const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim() const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim() const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim() + const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim() + let approve = true; var output = '' if (format !== "") { output += "
All manifest files must be formatted\n\n" @@ -64,11 +68,13 @@ jobs: output += "
Diff\n\n" output += "```diff\n" + format + "\n```\n" output += "
\n\n" + approve = false; } if (add_version_out !== "") { output += "
PRs must add only one version and must not modify any published versions\n\n" output += "When making any changes to a library, the version or port-version in `vcpkg.json` or `CONTROL` must be modified.\n" output += "```\n" + add_version_out + "\n```\n
\n" + approve = false; } if (add_version !== "") { output += "
After committing all other changes, the version database must be updated\n\n" @@ -80,9 +86,27 @@ jobs: output += "
Diff\n\n" output += "```diff\n" + add_version + "\n```\n" output += "
\n\n" + approve = false; + } + if (cmake !== "") { + output += "You have modified or added at least one portfile where deprecated functions are used.\n" + output += "
\n\n" + output += "If you feel able to do so, please consider migrating them to the new functions:\n" + output += " `vcpkg_install_cmake` -> `vcpkg_cmake_install` (from port `vcpkg-cmake`)\n" + output += " `vcpkg_build_cmake` -> `vcpkg_cmake_build` (from port `vcpkg-cmake`)\n" + output += " `vcpkg_configure_cmake` -> `vcpkg_cmake_configure` (Please remove the option `PREFER_NINJA`) (from port `vcpkg-cmake`)\n" + output += " `vcpkg_fixup_cmake_targets` -> `vcpkg_cmake_config_fixup` (from port `vcpkg-cmake-config`)\n" + output += "\n" + output += "In the ports that use the new function, you have to add the corresponding dependencies:\n" + output += "```json\n" + output += '{\n "name": "vcpkg-cmake",\n "host": true\n},\n' + output += '{\n "name": "vcpkg-cmake-config",\n "host": true\n}\n' + output += "```\n" + output += `The following files are affected:\n${cmake}\n` + output += "
\n" } - if (output === "") { + if (approve) { await fs.writeFile("pr/event", "APPROVE") } else { output = "_This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!_\n\n" + output From ebf0ac4cb0d59d8ec91ca51f77a4b2041d49a3e8 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 17 Sep 2021 01:16:18 +0200 Subject: [PATCH 0569/1858] [Mapnik] new port (#18849) * add mapnik * version * update to latest ref * overwrite version * latest ref * fix hash * verison * update to latest upstream * version * false jpeg lib * version * update to latest ref * verssion * proj not needed * versioon * fix proj patch * version * actually the linkage is already checked in `supports`. Apply latest policies. Added default features * version * update to original ref * enable dynamic again * version * use date version * update version * do not add a second version * fix linux installing * version * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * do not use port var * version * drop mapnik::core from general usage info. * version * don't add a new version * add comment to trigger ci * version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mapnik/portfile.cmake | 113 ++++++++++++++++++ ports/mapnik/usage | 9 ++ ports/mapnik/use-proj.patch | 28 +++++ ports/mapnik/vcpkg.json | 227 ++++++++++++++++++++++++++++++++++++ versions/baseline.json | 4 + versions/m-/mapnik.json | 9 ++ 6 files changed, 390 insertions(+) create mode 100644 ports/mapnik/portfile.cmake create mode 100644 ports/mapnik/usage create mode 100644 ports/mapnik/use-proj.patch create mode 100644 ports/mapnik/vcpkg.json create mode 100644 versions/m-/mapnik.json diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake new file mode 100644 index 00000000000000..bc19d4ab9641b7 --- /dev/null +++ b/ports/mapnik/portfile.cmake @@ -0,0 +1,113 @@ +# test application for this port: https://github.com/mathisloge/mapnik-vcpkg-test + +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapnik/mapnik + REF 1ccbbf95b5e7bf254ab5b4dc21bdc373978c36a1 + SHA512 21b4fc6e64d9b53550a046c5c9bcc32524324d7df39816b74b23a7ce2a64c4eeb291ad1c1aa09a3d5d79158f889ba8b7182cd0bf3435c39d1f17f33e4ffdce05 + HEAD_REF master + PATCHES + use-proj.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "jpeg" USE_JPEG + "png" USE_PNG + "tiff" USE_TIFF + "webp" USE_WEBP + "libxml2" USE_LIBXML2 + "cairo" USE_CAIRO + "proj" USE_PROJ + "grid-renderer" USE_GRID_RENDERER + "svg-renderer" USE_SVG_RENDERER + "input-csv" USE_PLUGIN_INPUT_CSV + "input-gdal" USE_PLUGIN_INPUT_GDAL + "input-geobuf" USE_PLUGIN_INPUT_GEOBUF + "input-geojson" USE_PLUGIN_INPUT_GEOJSON + "input-ogr" USE_PLUGIN_INPUT_OGR + "input-pgraster" USE_PLUGIN_INPUT_PGRASTER + "input-postgis" USE_PLUGIN_INPUT_POSTGIS + "input-raster" USE_PLUGIN_INPUT_RASTER + "input-shape" USE_PLUGIN_INPUT_SHAPE + "input-sqlite" USE_PLUGIN_INPUT_SQLITE + "input-topojson" USE_PLUGIN_INPUT_TOPOJSON + "viewer" BUILD_DEMO_VIEWER + "demo" BUILD_DEMO_CPP + "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB + "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX + "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER + "utility-ogrindex" BUILD_UTILITY_OGRINDEX + "utility-pgsql2sqlite" BUILD_UTILITY_PGSQL2SQLITE + "utility-shapeindex" BUILD_UTILITY_SHAPEINDEX + "utility-svg2png" BUILD_UTILITY_SVG2PNG +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DCOPY_LIBRARIES_FOR_EXECUTABLES=OFF + -DCOPY_FONTS_AND_PLUGINS_FOR_EXECUTABLES=OFF + -DINSTALL_DEPENDENCIES=OFF + -DBUILD_TEST=OFF + -DBUILD_BENCHMARK=OFF + -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON + -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON + -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON + -DUSE_EXTERNAL_MAPBOX_VARIANT=ON + -DINSTALL_CMAKE_DIR=share/mapnik/cmake + -DFONTS_INSTALL_DIR=share/mapnik/fonts +) + +vcpkg_cmake_install() + +# copy plugins into tool path, if any plugin is installed +if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin/plugins") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/plugins" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") +endif() +vcpkg_copy_pdbs() + +if("demo" IN_LIST FEATURES) + file(COPY "${SOURCE_PATH}/demo/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/demo") + vcpkg_copy_tools(TOOL_NAMES mapnik-demo AUTO_CLEAN) +endif() + +if("viewer" IN_LIST FEATURES) + # copy the ini file to reference the plugins correctly + file(COPY "${CURRENT_PACKAGES_DIR}/bin/viewer.ini" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) +endif() + +if("utility-geometry-to-wkb" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES geometry_to_wkb AUTO_CLEAN) +endif() + +if("utility-mapnik-index" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-index AUTO_CLEAN) +endif() +if("utility-mapnik-render" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES mapnik-render AUTO_CLEAN) +endif() +if("utility-ogrindex" IN_LIST FEATURES) + # build is currently not supported + # vcpkg_copy_tools(TOOL_NAMES ogrindex AUTO_CLEAN) +endif() +if("utility-pgsql2sqlite" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES pgsql2sqlite AUTO_CLEAN) +endif() +if("utility-shapeindex" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES shapeindex AUTO_CLEAN) +endif() +if("utility-svg2png" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/mapnik/cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/fonts/unifont_license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME fonts_copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mapnik/usage b/ports/mapnik/usage new file mode 100644 index 00000000000000..3bd0f4a014c75d --- /dev/null +++ b/ports/mapnik/usage @@ -0,0 +1,9 @@ +The package mapnik provides CMake targets: + + find_package(mapnik CONFIG REQUIRED) + target_link_libraries(main PRIVATE mapnik::mapnik mapnik::json mapnik::wkt) + +If you only need the compile definitions without any sources, use target mapnik::core. + +If any plugins were installed, the variable ${MAPNIK_PLUGINS_DIR} contains the plugin directory +Fonts are available with the variable ${MAPNIK_FONTS_DIR} diff --git a/ports/mapnik/use-proj.patch b/ports/mapnik/use-proj.patch new file mode 100644 index 00000000000000..35e588e37fc494 --- /dev/null +++ b/ports/mapnik/use-proj.patch @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 54dda37..e82a817 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -254,21 +254,21 @@ endif() + + if(USE_PROJ) + #https://proj.org/development/cmake.html + mapnik_find_package(PROJ QUIET) + # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config + if(NOT PROJ_FOUND) + message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...") + pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj) + string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}") + set(PROJ_VERSION_MAJOR "${CMAKE_MATCH_1}") + set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}") + set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}") + endif() + math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) + message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}") + list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION}) +- list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) +- list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) ++ list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) ++ # list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) # this adds some non existent directory when building with vcpgk -> commented out + endif() + + if(USE_GRID_RENDERER) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json new file mode 100644 index 00000000000000..c6aebcc527709d --- /dev/null +++ b/ports/mapnik/vcpkg.json @@ -0,0 +1,227 @@ +{ + "name": "mapnik", + "version-date": "2021-09-15", + "description": "Mapnik is an open source toolkit for developing mapping applications.", + "homepage": "https://github.com/mapnik/mapnik", + "supports": "!(static & windows)", + "dependencies": [ + "boost-assign", + "boost-bimap", + "boost-filesystem", + "boost-geometry", + "boost-gil", + "boost-interprocess", + { + "name": "boost-locale", + "features": [ + "icu" + ] + }, + "boost-msm", + "boost-property-tree", + { + "name": "boost-regex", + "features": [ + "icu" + ] + }, + "boost-spirit", + "boost-system", + { + "name": "freetype", + "features": [ + "bzip2", + "png" + ] + }, + { + "name": "harfbuzz", + "features": [ + "icu" + ] + }, + "icu", + "mapbox-geometry", + "mapbox-polylabel", + "mapbox-variant", + "protozero", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "default-features": [ + "grid-renderer", + "jpeg", + "png", + "proj", + "svg-renderer", + "tiff", + "webp" + ], + "features": { + "cairo": { + "description": "Cairo renderer", + "dependencies": [ + "cairo", + "cairomm" + ] + }, + "demo": { + "description": "Make demo application" + }, + "grid-renderer": { + "description": "Grid renderer" + }, + "input-csv": { + "description": "CSV input plugin" + }, + "input-gdal": { + "description": "GDAL input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-geobuf": { + "description": "GEOBUF input plugin", + "dependencies": [ + "protozero" + ] + }, + "input-geojson": { + "description": "GEOJSON input plugin" + }, + "input-ogr": { + "description": "OGR input plugin", + "dependencies": [ + "gdal" + ] + }, + "input-pgraster": { + "description": "PGRASTER input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-postgis": { + "description": "POSTGIS input plugin", + "dependencies": [ + "libodb-pgsql", + "libpq" + ] + }, + "input-raster": { + "description": "RASTER input plugin" + }, + "input-shape": { + "description": "SHAPE input plugin" + }, + "input-sqlite": { + "description": "SQLITE input plugin", + "dependencies": [ + "sqlite3" + ] + }, + "input-topojson": { + "description": "TOPOJSON input plugin" + }, + "jpeg": { + "description": "add jpeg support", + "dependencies": [ + "libjpeg-turbo" + ] + }, + "libxml2": { + "description": "use libxml2 instead of rapidxml", + "dependencies": [ + "libxml2" + ] + }, + "png": { + "description": "add png support", + "dependencies": [ + "libpng" + ] + }, + "proj": { + "description": "PROJ Functionalities", + "dependencies": [ + { + "name": "proj4", + "features": [ + "database" + ] + } + ] + }, + "svg-renderer": { + "description": "SVG renderer" + }, + "tiff": { + "description": "add tiff support", + "dependencies": [ + "tiff" + ] + }, + "utility-geometry-to-wkb": { + "description": "utility application geometry-to-wkb", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-mapnik-index": { + "description": "utility application mapnik-index", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-mapnik-render": { + "description": "utility application mapnik-render", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-ogrindex": { + "description": "utility application ogrindex" + }, + "utility-pgsql2sqlite": { + "description": "utility application pgsql2sqlite", + "dependencies": [ + "boost-program-options", + "libodb-pgsql", + "libpq", + "sqlite3" + ] + }, + "utility-shapeindex": { + "description": "utility application shapeindex", + "dependencies": [ + "boost-program-options" + ] + }, + "utility-svg2png": { + "description": "utility application svg2png", + "dependencies": [ + "boost-program-options" + ] + }, + "viewer": { + "description": "Make demo viewer application", + "dependencies": [ + "qt5-base" + ] + }, + "webp": { + "description": "add webp support", + "dependencies": [ + "libwebp" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 7935c64058d22b..900bb45e1bb485 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4096,6 +4096,10 @@ "baseline": "0.5.0", "port-version": 0 }, + "mapnik": { + "baseline": "2021-09-15", + "port-version": 0 + }, "marble": { "baseline": "19.08.2", "port-version": 2 diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json new file mode 100644 index 00000000000000..7924f1250b7be4 --- /dev/null +++ b/versions/m-/mapnik.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "794329d32e3af221bb8751cf747f354d087fceab", + "version-date": "2021-09-15", + "port-version": 0 + } + ] +} From 4db59aae2f26841b2a32f1b1cd44c25ffd62b2d4 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Fri, 17 Sep 2021 08:19:50 +0900 Subject: [PATCH 0570/1858] [onnx-optimizer] create a new port (#19258) * [onnx-optimizer] create a new port * migrate changes to new branch * [onnx-optimizer] specify maybe unused * ONNX_USE_PROTOBUF_SHARED_LIBS is for Windows * [onnx-optimizer] update baseline * [onnx-optimizer] make protobuf option constant --- ports/onnx-optimizer/fix-cmakelists.patch | 56 +++++++++++++++++++++++ ports/onnx-optimizer/portfile.cmake | 43 +++++++++++++++++ ports/onnx-optimizer/vcpkg.json | 31 +++++++++++++ versions/baseline.json | 4 ++ versions/o-/onnx-optimizer.json | 9 ++++ 5 files changed, 143 insertions(+) create mode 100644 ports/onnx-optimizer/fix-cmakelists.patch create mode 100644 ports/onnx-optimizer/portfile.cmake create mode 100644 ports/onnx-optimizer/vcpkg.json create mode 100644 versions/o-/onnx-optimizer.json diff --git a/ports/onnx-optimizer/fix-cmakelists.patch b/ports/onnx-optimizer/fix-cmakelists.patch new file mode 100644 index 00000000000000..4c54d77e057957 --- /dev/null +++ b/ports/onnx-optimizer/fix-cmakelists.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c2e48b3..5716fbb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,10 +7,18 @@ if(NOT MSVC) + set(CMAKE_CXX_STANDARD 11) + endif(NOT MSVC) + ++# Add MSVC RunTime Flag ++function(add_msvc_runtime_flag lib) ++ if(${ONNX_USE_MSVC_STATIC_RUNTIME}) ++ target_compile_options(${lib} PRIVATE $<$>:/MT> $<$:/MTd>) ++ else() ++ target_compile_options(${lib} PRIVATE $<$>:/MD> $<$:/MDd>) ++ endif() ++endfunction() + set(CMAKE_POSITION_INDEPENDENT_CODE ON) + +-set(ONNX_ROOT ${PROJECT_SOURCE_DIR}/third_party/onnx) +-add_subdirectory(${ONNX_ROOT}) ++find_package(protobuf CONFIG REQUIRED) ++find_package(ONNX CONFIG REQUIRED) + + file(READ "${PROJECT_SOURCE_DIR}/VERSION_NUMBER" ONNX_OPTIMIZER_VERSION) + string(STRIP "${ONNX_OPTIMIZER_VERSION}" ONNX_OPTIMIZER_VERSION) +@@ -31,6 +39,7 @@ add_executable(onnx_optimizer_exec examples/onnx_optimizer_exec.cpp) + target_link_libraries(onnx_optimizer_exec onnx_optimizer) + + if(BUILD_ONNX_PYTHON) ++ find_package(Python3 COMPONENTS Development REQUIRED) + if("${PY_EXT_SUFFIX}" STREQUAL "") + if(MSVC) + set(PY_EXT_SUFFIX ".pyd") +@@ -51,7 +60,7 @@ if(BUILD_ONNX_PYTHON) + $ + ${PYTHON_INCLUDE_DIR}) + # pybind11 is a header only lib +- find_package(pybind11 2.2) ++ find_package(pybind11 2.2 CONFIG REQUIRED) + if(pybind11_FOUND) + target_include_directories(onnx_opt_cpp2py_export PUBLIC + ${pybind11_INCLUDE_DIRS}) +@@ -87,11 +96,9 @@ if(BUILD_ONNX_PYTHON) + endif() + + target_link_libraries(onnx_opt_cpp2py_export PRIVATE onnx_optimizer) +- ++ target_link_directories(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARY_DIRS}) ++ target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${Python3_LIBRARIES}) + if(MSVC) +- find_package(PythonInterp ${PY_VERSION} REQUIRED) +- find_package(PythonLibs ${PY_VERSION} REQUIRED) +- target_link_libraries(onnx_opt_cpp2py_export PRIVATE ${PYTHON_LIBRARIES}) + target_compile_options(onnx_opt_cpp2py_export + PRIVATE /MP + /WX diff --git a/ports/onnx-optimizer/portfile.cmake b/ports/onnx-optimizer/portfile.cmake new file mode 100644 index 00000000000000..fe62f0304d12a5 --- /dev/null +++ b/ports/onnx-optimizer/portfile.cmake @@ -0,0 +1,43 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO onnx/optimizer + REF v0.2.6 + SHA512 cc6373781f04bc6fafd3282d248e26eaf93556b86acbb0dee44b4aa7a5d59c634905c1a05d035e31a50fc0f06cfc686fa483b79a324dd973faa421747d4a681b + HEAD_REF master + PATCHES + fix-cmakelists.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pybind11 BUILD_ONNX_PYTHON +) +if("pybind11" IN_LIST FEATURES) + vcpkg_find_acquire_program(PYTHON3) + list(APPEND FEATURE_OPTIONS + -DPython3_EXECUTABLE=${PYTHON3} + -DONNX_USE_PROTOBUF_SHARED_LIBS=ON # /wd4251 + ) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} +) +if("pybind11" IN_LIST FEATURES) + # This target is not in install/export + vcpkg_cmake_build(TARGET onnx_opt_cpp2py_export) +endif() +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME ONNXOptimizer CONFIG_PATH lib/cmake/ONNXOptimizer) + +file(INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/include/onnxoptimizer/test" +) diff --git a/ports/onnx-optimizer/vcpkg.json b/ports/onnx-optimizer/vcpkg.json new file mode 100644 index 00000000000000..f38496eb083255 --- /dev/null +++ b/ports/onnx-optimizer/vcpkg.json @@ -0,0 +1,31 @@ +{ + "name": "onnx-optimizer", + "version-semver": "0.2.6", + "description": "Actively maintained ONNX Optimizer", + "homepage": "https://github.com/onnx/optimizer", + "license": "Apache-2.0", + "dependencies": [ + "onnx", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "pybind11": { + "description": "Build Python binaries", + "dependencies": [ + { + "name": "onnx", + "features": [ + "pybind11" + ] + } + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 900bb45e1bb485..703135f58fc82d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4696,6 +4696,10 @@ "baseline": "1.9.0", "port-version": 0 }, + "onnx-optimizer": { + "baseline": "0.2.6", + "port-version": 0 + }, "onnxruntime-gpu": { "baseline": "1.5.1", "port-version": 0 diff --git a/versions/o-/onnx-optimizer.json b/versions/o-/onnx-optimizer.json new file mode 100644 index 00000000000000..3a6bc01dcb3945 --- /dev/null +++ b/versions/o-/onnx-optimizer.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "e98d775d36ccb84c9ffa20e2cf6f8ef1b7ab0461", + "version-semver": "0.2.6", + "port-version": 0 + } + ] +} From ea63a4520f15139779f1c87223675c7394e44aca Mon Sep 17 00:00:00 2001 From: Jafar Abdi Date: Fri, 17 Sep 2021 02:20:26 +0300 Subject: [PATCH 0571/1858] [gflags]: Fix targets gflags::* not being globally visible (#20011) * [gflags]: Fix targets gflags::* not globally visible * Add the target as interface * vcpkg x-add-version --all Co-authored-by: Billy Robert O'Neal III --- ports/gflags/vcpkg-cmake-wrapper.cmake | 3 ++- ports/gflags/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gflags.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/gflags/vcpkg-cmake-wrapper.cmake b/ports/gflags/vcpkg-cmake-wrapper.cmake index f401356da39bfb..55b3fc8dc54aa5 100644 --- a/ports/gflags/vcpkg-cmake-wrapper.cmake +++ b/ports/gflags/vcpkg-cmake-wrapper.cmake @@ -4,6 +4,7 @@ _find_package(${ARGS}) foreach(tgt gflags gflags_shared gflags_static) if (NOT TARGET ${tgt} AND TARGET "gflags::${tgt}") - add_library(${tgt} ALIAS "gflags::${tgt}") + add_library(${tgt} INTERFACE IMPORTED) + target_link_libraries(${tgt} INTERFACE "gflags::${tgt}") endif() endforeach(tgt) diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json index 695ab6a922139f..5b020a81eb4c65 100644 --- a/ports/gflags/vcpkg.json +++ b/ports/gflags/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gflags", "version-string": "2.2.2", - "port-version": 3, + "port-version": 4, "description": "A C++ library that implements commandline flags processing", "homepage": "https://github.com/gflags/gflags", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 703135f58fc82d..fbdad9a6be512b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2358,7 +2358,7 @@ }, "gflags": { "baseline": "2.2.2", - "port-version": 3 + "port-version": 4 }, "ghc-filesystem": { "baseline": "1.5.4", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index 820a61a3b225b9..e1530e30903bde 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16da9eec785be4c0d0ad3e32cc3b39698d0611b1", + "version-string": "2.2.2", + "port-version": 4 + }, { "git-tree": "e229646111622b3b08d98d42741e8c861487d18e", "version-string": "2.2.2", From 761ac163661c270f233b43c459c81a85e7b9a53a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 17 Sep 2021 01:24:13 +0200 Subject: [PATCH 0572/1858] [gettext] Remove `SUBPATH`, add iconv linking info (#20090) * Replace SUBPATH argument * Add iconv to libintl link libraries * x-add-version * Fix tools build on mingw-dynamic * Update versions * [skip actions] Trigger CI --- ports/gettext/Makefile | 5 +++++ ...ttext-tools_woe32dll_gettextsrc-exports.c.patch | 14 ++++++++++++++ ports/gettext/portfile.cmake | 7 ++++++- ports/gettext/vcpkg-cmake-wrapper.cmake | 6 +++++- ports/gettext/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gettext.json | 5 +++++ 7 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch diff --git a/ports/gettext/Makefile b/ports/gettext/Makefile index 1c9a294c218c1b..b2b36d2ab5658c 100644 --- a/ports/gettext/Makefile +++ b/ports/gettext/Makefile @@ -6,6 +6,11 @@ install: install-gettext-runtime-intl install-gettext-runtime-po install-gettext install: install-gettext-tools install-gettext-tools-gnulib install-gettext-tools-its install-gettext-tools-m4 install-gettext-tools-misc install-gettext-tools-po install-gettext-tools-projects install-gettext-tools-styles install: install-libtextstyle +build-intl: + $(MAKE) -C intl all +install-intl: + $(MAKE) -C intl install + build-gettext-runtime-gnulib: build-gettext-runtime-intl $(MAKE) -C gettext-runtime/gnulib-lib all build-gettext-runtime-intl: diff --git a/ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch b/ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch new file mode 100644 index 00000000000000..1eedbecd2b290f --- /dev/null +++ b/ports/gettext/gettext-tools_woe32dll_gettextsrc-exports.c.patch @@ -0,0 +1,14 @@ +X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blobdiff_plain;f=gettext-tools%2Fwoe32dll%2Fgettextsrc-exports.c;h=6d760895961db57e013552b6b3f248bfa8eb17c2;hp=4477ae8d4b2e887592d4019432b91ea31b84ba59;hb=7cf68dffb2adb76375bfb0781e277510523a1f3e;hpb=3564f5f885544514bd2e345c36b74e5d91cad3e8 + +diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c +index 4477ae8..6d76089 100644 +--- a/gettext-tools/woe32dll/gettextsrc-exports.c ++++ b/gettext-tools/woe32dll/gettextsrc-exports.c +@@ -50,6 +50,7 @@ VARIABLE(formatstring_python) + VARIABLE(formatstring_python_brace) + VARIABLE(formatstring_qt) + VARIABLE(formatstring_qt_plural) ++VARIABLE(formatstring_ruby) + VARIABLE(formatstring_scheme) + VARIABLE(formatstring_sh) + VARIABLE(formatstring_smalltalk) diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index b4f7f845fd3126..0c351d73505490 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_extract_source_archive_ex( 0003-Fix-win-unicode-paths.patch rel_path.patch android.patch + gettext-tools_woe32dll_gettextsrc-exports.c.patch ${PATCHES} ) vcpkg_find_acquire_program(BISON) @@ -87,7 +88,11 @@ function(build_libintl_only) OPTIONS ${OPTIONS} ) - vcpkg_install_make(SUBPATH "/intl") + vcpkg_install_make( + MAKEFILE "${CMAKE_CURRENT_LIST_DIR}/Makefile" + BUILD_TARGET build-intl + INSTALL_TARGET install-intl + ) endfunction() if("tools" IN_LIST FEATURES) diff --git a/ports/gettext/vcpkg-cmake-wrapper.cmake b/ports/gettext/vcpkg-cmake-wrapper.cmake index c231bfee692a73..03bcb0569defbc 100644 --- a/ports/gettext/vcpkg-cmake-wrapper.cmake +++ b/ports/gettext/vcpkg-cmake-wrapper.cmake @@ -7,4 +7,8 @@ if(Intl_FOUND AND Intl_LIBRARIES) unset(Intl_LIBRARIES) unset(Intl_LIBRARIES CACHE) select_library_configurations(Intl) -endif() \ No newline at end of file + find_package(Iconv) # Since CMake 3.11 + if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN) + list(APPEND Intl_LIBRARIES ${Iconv_LIBRARIES}) + endif() +endif() diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index dc1cefc4eabcc1..bd1f1d4b6c9857 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21", - "port-version": 5, + "port-version": 6, "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fbdad9a6be512b..b78df9febfe733 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2350,7 +2350,7 @@ }, "gettext": { "baseline": "0.21", - "port-version": 5 + "port-version": 6 }, "gettimeofday": { "baseline": "2017-10-14", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index afcf5f51359e0a..adb7fea987cdb4 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "72394a1e7b0ea6333d78849f864c4b7bc8c7e8dc", + "version": "0.21", + "port-version": 6 + }, { "git-tree": "d1089dfcf335a94ca47c5b918c56a7ab6fc0ae92", "version": "0.21", From 458e42e1b8433d2c5de344db81fc3292364a60da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 17 Sep 2021 08:25:52 +0800 Subject: [PATCH 0573/1858] [openimageio] Re-fix the usage (#20092) * [openimageio] Re-fix the usage * version --- ports/openimageio/portfile.cmake | 5 ++--- ports/openimageio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index cd4ce9c5258959..124c7183b84bc5 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -21,7 +21,6 @@ vcpkg_from_github( file(REMOVE_RECURSE "${SOURCE_PATH}/ext") file(REMOVE "${SOURCE_PATH}/src/cmake/modules/FindLibRaw.cmake" - "${SOURCE_PATH}/src/cmake/modules/FindOpenEXR.cmake" "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake" "${SOURCE_PATH}/src/cmake/modules/FindFFmpeg.cmake") @@ -85,8 +84,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" "${CURRENT_PACKAGES_DIR}/debug/share") file(COPY "${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") -file(COPY "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/openimageio") +file(COPY "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index cb30bf6f82f05f..35ac6101109e12 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.3.7.2", - "port-version": 1, + "port-version": 2, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b78df9febfe733..6b6b5f0f8840fc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4786,7 +4786,7 @@ }, "openimageio": { "baseline": "2.3.7.2", - "port-version": 1 + "port-version": 2 }, "openjpeg": { "baseline": "2.3.1", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 1ebf88c90a2816..827012dfdb8015 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6084a6398514fc24fd450a7b9290937b1274d7b6", + "version": "2.3.7.2", + "port-version": 2 + }, { "git-tree": "799ea36f0486224257ecfea149b429d81e74a879", "version": "2.3.7.2", From 9c69d7ed81d3ce4a4126a51f628f6c0da21bb0d8 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 17 Sep 2021 09:31:30 +0800 Subject: [PATCH 0574/1858] [ffnvcodec/libproxy] Update to latest release version (#20169) * [ffnvcodec/libproxy] Update to latest release version * Small changes * [ffnvcodec] Use version instead of version-string. Co-authored-by: Billy Robert O'Neal III --- ports/ffnvcodec/portfile.cmake | 19 +++--- ports/ffnvcodec/vcpkg.json | 3 +- ports/libproxy/fix-arm-build.patch | 7 +-- ports/libproxy/fix-dependency-libmodman.patch | 59 +++++++++++++----- ports/libproxy/fix-module-lib-name.patch | 26 ++++---- ports/libproxy/portfile.cmake | 39 ++++++------ ports/libproxy/support-windows.patch | 62 ++----------------- ports/libproxy/vcpkg.json | 13 +++- versions/baseline.json | 8 +-- versions/f-/ffnvcodec.json | 5 ++ versions/l-/libproxy.json | 5 ++ 11 files changed, 119 insertions(+), 127 deletions(-) diff --git a/ports/ffnvcodec/portfile.cmake b/ports/ffnvcodec/portfile.cmake index 31c6c9137167e3..1b67cba6fa5520 100644 --- a/ports/ffnvcodec/portfile.cmake +++ b/ports/ffnvcodec/portfile.cmake @@ -1,9 +1,8 @@ -# Get nvcodec vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO FFmpeg/nv-codec-headers - REF 5ee2ae591f74f53bd6028344f8690f1558a1f17a # 10.0.26.0 - SHA512 f9d40a44f85016f0f76c7f630c3defb2e94858b43ae714adae546842c2801f51358b7c2b3326952e7aeb25f5b1611af4eee3024f495eaaaecbfd31851cc7edca + REF b641a195edbe3ac9788e681e22c2e2fad8aacddb # 11.1.5.0 + SHA512 e8b4c21ddc9c39dadd9b69ebdfcf38cf1e61f19ffb88d0a4d9086ddbf69285d2c8c946bb02bde3ee943accae559a72468f096718ad69ac03a43746c1eb0ed483 HEAD_REF master ) @@ -30,7 +29,7 @@ if(VCPKG_TARGET_IS_WINDOWS) LOGNAME build-${TARGET_TRIPLET} ) - file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") # Linux, etc. else() @@ -47,12 +46,12 @@ else() # FFmpeg uses pkgconfig to find ffnvcodec.pc, so install it where # FFMpeg's call to pkgconfig expects to find it. - file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) - file(INSTALL ${SOURCE_PATH}/ffnvcodec.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(INSTALL "${SOURCE_PATH}/ffnvcodec.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() -# Install the files to their default vcpkg locations -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) -file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - vcpkg_fixup_pkgconfig() + +# Install the files to their default vcpkg locations +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/ffnvcodec/vcpkg.json b/ports/ffnvcodec/vcpkg.json index f21ec1e945ccd0..7ef678a4b8095c 100644 --- a/ports/ffnvcodec/vcpkg.json +++ b/ports/ffnvcodec/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffnvcodec", - "version-string": "10.0.26.0", - "port-version": 2, + "version": "11.1.5.0", "description": "FFmpeg version of Nvidia Codec SDK headers.", "homepage": "https://github.com/FFmpeg/nv-codec-headers", "supports": "(windows | linux) & !uwp" diff --git a/ports/libproxy/fix-arm-build.patch b/ports/libproxy/fix-arm-build.patch index ad898c835567c2..c334b8b99a6476 100644 --- a/ports/libproxy/fix-arm-build.patch +++ b/ports/libproxy/fix-arm-build.patch @@ -1,15 +1,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 51b0e5e..aa94b87 100644 +index 1c68939..9ef6895 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,6 +51,10 @@ else() - endif() +@@ -42,6 +42,9 @@ else() + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) endif() +if (WIN32) + link_libraries(Advapi32) +endif() -+ # Conditionally build bindings if(NOT WIN32) add_subdirectory(bindings) diff --git a/ports/libproxy/fix-dependency-libmodman.patch b/ports/libproxy/fix-dependency-libmodman.patch index c84b86d01b4859..84a17411bc56c0 100644 --- a/ports/libproxy/fix-dependency-libmodman.patch +++ b/ports/libproxy/fix-dependency-libmodman.patch @@ -1,21 +1,52 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 451e7a6..b6782fb 100644 +index 4f51e38..32a0319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -32,13 +32,15 @@ option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) - ### Subdirectories - # Conditionally build bundled libmodman - option(FORCE_SYSTEM_LIBMODMAN "Force using system libmodman" OFF) --find_package(libmodman QUIET) +@@ -31,11 +31,15 @@ include(cmake/ctest.cmk) + include(cmake/paths.cmk) + + option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) +- +-### Subdirectories +- +-add_subdirectory(libmodman) +-include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +find_package(libmodman REQUIRED) - if(LIBMODMAN_FOUND) - if("${LIBMODMAN_VERSION_MAJOR}" STREQUAL "2") - message(STATUS "Building with system libmodman") - else() - message(FATAL_ERROR "Found incompatible libmodman on your system (libmodman 2.X is needed)") - endif() ++if(LIBMODMAN_FOUND) + include_directories(${LIBMODMAN_INCLUDE_DIR}) + link_libraries(${LIBMODMAN_LIBRARIES}) ++else() ++ ### Subdirectories ++ add_subdirectory(libmodman) ++ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ++endif() + + # Conditionally build bindings + if(NOT WIN32) +diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk +index 9356486..f9eed2c 100644 +--- a/libproxy/cmake/libproxy.cmk ++++ b/libproxy/cmake/libproxy.cmk +@@ -1,8 +1,8 @@ + add_library(libproxy SHARED extension_config.cpp extension_pacrunner.cpp extension_wpad.cpp proxy.cpp url.cpp ${LIBPROXY_SOURCES}) + if(WIN32) +- target_link_libraries(libproxy modman;ws2_32;${LIBPROXY_LIBRARIES}) ++ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};ws2_32;${LIBPROXY_LIBRARIES}) else() - if(FORCE_SYSTEM_LIBMODMAN) - message(FATAL_ERROR "Libmodman could not be found on your system") +- target_link_libraries(libproxy modman;m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) ++ target_link_libraries(libproxy ${LIBMODMAN_LIBRARIES};m;pthread;${CMAKE_DL_LIBS};${LIBPROXY_LIBRARIES}) + endif() + file(TO_NATIVE_PATH ${MODULE_INSTALL_DIR} MODULE_INSTALL_DIR) + if(WIN32) +@@ -21,8 +21,8 @@ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp + set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) + set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") + set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") +-if(NOT APPLE) +- set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") +-endif() ++#if(NOT APPLE) ++# set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") ++#endif() + install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) + install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff --git a/ports/libproxy/fix-module-lib-name.patch b/ports/libproxy/fix-module-lib-name.patch index a4d8cb29b58093..2a8790afed1c93 100644 --- a/ports/libproxy/fix-module-lib-name.patch +++ b/ports/libproxy/fix-module-lib-name.patch @@ -1,13 +1,13 @@ -diff --git a/libproxy/Findlibproxy.cmake.in b/libproxy/Findlibproxy.cmake.in -index ef44489..c0bd2ae 100644 ---- a/libproxy/Findlibproxy.cmake.in -+++ b/libproxy/Findlibproxy.cmake.in -@@ -12,7 +12,7 @@ - - # Find proxy.h and the corresponding library (libproxy.so) - FIND_PATH(LIBPROXY_INCLUDE_DIR proxy.h ) --FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy ) -+FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy libproxy) - - # Set library version - SET(LIBPROXY_VERSION @PROJECT_VERSION@) +diff --git a/libproxy/Findlibproxy.cmake.in b/libproxy/Findlibproxy.cmake.in +index ef44489..c0bd2ae 100644 +--- a/libproxy/Findlibproxy.cmake.in ++++ b/libproxy/Findlibproxy.cmake.in +@@ -12,7 +12,7 @@ + + # Find proxy.h and the corresponding library (libproxy.so) + FIND_PATH(LIBPROXY_INCLUDE_DIR proxy.h ) +-FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy ) ++FIND_LIBRARY(LIBPROXY_LIBRARIES NAMES proxy libproxy) + + # Set library version + SET(LIBPROXY_VERSION @PROJECT_VERSION@) diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 214e946753f321..94c3ecda3f817e 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -8,8 +8,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libproxy/libproxy - REF 5924d4223e2b7238607749d977c0a878fe33cdbc #0.4.15 - SHA512 3c3be46e1ccd7e25a9b6e5fd71bfac5c1075bc9230a9a7ca94ee5e82bdbf090ab08dd53d8c6946db1353024409b234b35822d22f95a02cfb48bb54705b07d478 + REF e78a5ccfe0a2340f2c73e419767f8492ffc2787a #0.4.17 + SHA512 b22251f73f7a94dade5dcdcd9d5510170038b0d101ee98ab427106c20a3d9979c2b16c57d6cf8d8ae59c3a28ccffcecafc0bed399926dc2416a27837fd2f043c HEAD_REF master PATCHES fix-tools-path.patch @@ -21,30 +21,29 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - bindings-csharp WITH_DOTNET - bindings-python WITH_PYTHON2 - bindings-python WITH_PYTHON3 - bindings-perl WITH_PERL - bindings-vala WITH_VALA - tools BUILD_TOOLS - tests BUILD_TESTING + FEATURES + bindings-csharp WITH_DOTNET + bindings-python WITH_PYTHON2 + bindings-python WITH_PYTHON3 + bindings-perl WITH_PERL + bindings-vala WITH_VALA + tools BUILD_TOOLS + tests BUILD_TESTING ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DWITH_WEBKIT3=OFF - -DFORCE_SYSTEM_LIBMODMAN=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/Modules) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules) vcpkg_copy_pdbs() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - ${CMAKE_CURRENT_LIST_DIR}/usage - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(REMOVE_RECURSE ${LIBPROXY_TOOLS} ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CMAKE_CURRENT_LIST_DIR}/usage" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(REMOVE_RECURSE "${LIBPROXY_TOOLS}" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libproxy/support-windows.patch b/ports/libproxy/support-windows.patch index fdbe801a0b79a2..1cad01ff412fe2 100644 --- a/ports/libproxy/support-windows.patch +++ b/ports/libproxy/support-windows.patch @@ -19,65 +19,13 @@ index 0301dce..0eb5f83 100644 set (PKGCONFIG_PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/libproxy/cmake/libproxy.cmk b/libproxy/cmake/libproxy.cmk -index aab7593..465685f 100644 +index de68e5c..9356486 100644 --- a/libproxy/cmake/libproxy.cmk +++ b/libproxy/cmake/libproxy.cmk -@@ -21,5 +21,5 @@ set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp - set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) - set_target_properties(libproxy PROPERTIES INTERFACE_LINK_LIBRARIES "") - set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") +@@ -24,5 +24,5 @@ set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") + if(NOT APPLE) + set_target_properties(libproxy PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/libproxy.map") + endif() -install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS libproxy RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) -diff --git a/libproxy/modules/config_kde.cpp b/libproxy/modules/config_kde.cpp -index b9bd241..73b978e 100644 ---- a/libproxy/modules/config_kde.cpp -+++ b/libproxy/modules/config_kde.cpp -@@ -19,7 +19,9 @@ - ******************************************************************************/ - - #include -+#if !defined(WIN32) - #include -+#endif - - #include - #include -@@ -137,7 +139,11 @@ private: - string command_output(const string &cmdline) throw (runtime_error) { - // Capture stderr as well - const string command = "(" + cmdline + ")2>&1"; -+#if !defined(WIN32) - FILE *pipe = popen(command.c_str(), "r"); -+#else -+ FILE *pipe = _popen(command.c_str(), "r"); -+#endif - if (!pipe) - throw runtime_error("Unable to run command"); - -@@ -148,7 +154,11 @@ private: - result += buffer; // TODO: If this throws bad_alloc, pipe is leaked - } - -+#if !defined(WIN32) - if(pclose(pipe) != 0) -+#else -+ if(_pclose(pipe) != 0) -+#endif - throw runtime_error("Command failed"); - - // Trim newlines and whitespace at end -diff --git a/libproxy/url.cpp b/libproxy/url.cpp -index b61a9bc..021763e 100644 ---- a/libproxy/url.cpp -+++ b/libproxy/url.cpp -@@ -33,7 +33,9 @@ - #include // For atoi() - #include // For stat() - #include // For transform() -+#if !defined(WIN32) - #include // For read() close() -+#endif - - #ifdef WIN32 - #include diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index 8f396510474156..15e72c018e6b1a 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,11 +1,18 @@ { "name": "libproxy", - "version-string": "0.4.15", - "port-version": 3, + "version": "0.4.17", "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "dependencies": [ - "libmodman" + "libmodman", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "bindings-csharp": { diff --git a/versions/baseline.json b/versions/baseline.json index 6b6b5f0f8840fc..0caa9284f8c059 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2085,8 +2085,8 @@ "port-version": 14 }, "ffnvcodec": { - "baseline": "10.0.26.0", - "port-version": 2 + "baseline": "11.1.5.0", + "port-version": 0 }, "fftw3": { "baseline": "3.3.9", @@ -3637,8 +3637,8 @@ "port-version": 0 }, "libproxy": { - "baseline": "0.4.15", - "port-version": 3 + "baseline": "0.4.17", + "port-version": 0 }, "libqcow": { "baseline": "20210419", diff --git a/versions/f-/ffnvcodec.json b/versions/f-/ffnvcodec.json index 1543256ee92cd4..c249b192e93062 100644 --- a/versions/f-/ffnvcodec.json +++ b/versions/f-/ffnvcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b86f38b94c28605c5f3b2bc060b8e43e26e0ad42", + "version": "11.1.5.0", + "port-version": 0 + }, { "git-tree": "8f66cad42ef3e7749e345075f467f357ca061acd", "version-string": "10.0.26.0", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 7f15951dd3f816..7dbd18fd981531 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab650ac3327ba4cd214ca5de79a626574594c63f", + "version": "0.4.17", + "port-version": 0 + }, { "git-tree": "49aac7c55ac89c54daa7d91d8eed713a79ab2713", "version-string": "0.4.15", From 513b56f8d845a697886b6e6f6c17f720ba491e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 17 Sep 2021 22:51:19 +0800 Subject: [PATCH 0575/1858] [portmidi] Add non-Windows support, refactory install process (#19710) * [portmidi] Add *inx support, refactory install process * update support * version * Re-fix dynamic build and use * version * Fix build on *inx * version * Re-fix installation * version * Add MAYBE_UNUSED_VARIABLES * version * Change macro judgment value and macro value * version stuff * Update versions/p-/portmidi.json Co-authored-by: Billy Robert O'Neal III --- ports/portmidi/add-feature-options.patch | 50 ++++++++ ports/portmidi/fix-build-install.patch | 148 +++++++++++++++++++++++ ports/portmidi/portfile.cmake | 67 +++------- ports/portmidi/vcpkg.json | 10 +- versions/baseline.json | 2 +- versions/p-/portmidi.json | 5 + 6 files changed, 230 insertions(+), 52 deletions(-) create mode 100644 ports/portmidi/add-feature-options.patch create mode 100644 ports/portmidi/fix-build-install.patch diff --git a/ports/portmidi/add-feature-options.patch b/ports/portmidi/add-feature-options.patch new file mode 100644 index 00000000000000..605dfcd35bcccd --- /dev/null +++ b/ports/portmidi/add-feature-options.patch @@ -0,0 +1,50 @@ +diff --git a/portmidi/trunk/CMakeLists.txt b/portmidi/trunk/CMakeLists.txt +index e5e01b6..483b900 100644 +--- a/portmidi/trunk/CMakeLists.txt ++++ b/portmidi/trunk/CMakeLists.txt +@@ -72,10 +72,14 @@ endif(0) + include_directories(pm_common porttime) + add_subdirectory(pm_common) + ++if (0) + add_subdirectory(pm_test) ++endif() + + add_subdirectory(pm_dylib) + + # Cannot figure out how to make an xcode Java application with CMake ++if (JAVA_SUPPORT) + add_subdirectory(pm_java) ++endif() + +diff --git a/portmidi/trunk/pm_common/CMakeLists.txt b/portmidi/trunk/pm_common/CMakeLists.txt +index c829063..2597bea 100644 +--- a/portmidi/trunk/pm_common/CMakeLists.txt ++++ b/portmidi/trunk/pm_common/CMakeLists.txt +@@ -111,17 +111,25 @@ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) + # define the jni library + include_directories(${JAVA_INCLUDE_PATHS}) + ++if (JAVA_SUPPORT) + set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c) + add_library(pmjni SHARED ${JNISRC}) + target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) + set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") ++endif() + + # install the libraries (Linux and Mac OS X command line) + if(1) +- INSTALL(TARGETS portmidi-static pmjni ++ INSTALL(TARGETS portmidi-static + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) ++ if (JAVA_SUPPORT) ++ INSTALL(TARGETS pmjni ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) ++ endif() + # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here + INSTALL(FILES portmidi.h ../porttime/porttime.h + DESTINATION include) diff --git a/ports/portmidi/fix-build-install.patch b/ports/portmidi/fix-build-install.patch new file mode 100644 index 00000000000000..76f0f92bf215b2 --- /dev/null +++ b/ports/portmidi/fix-build-install.patch @@ -0,0 +1,148 @@ +diff --git a/portmidi/trunk/CMakeLists.txt b/portmidi/trunk/CMakeLists.txt +index 4919b78..e5e01b6 100644 +--- a/portmidi/trunk/CMakeLists.txt ++++ b/portmidi/trunk/CMakeLists.txt +@@ -4,6 +4,7 @@ + + cmake_minimum_required(VERSION 2.6) + ++if (0) + if(UNIX) + # allow user to set Release or Debug + set(CMAKE_BUILD_TYPE Release CACHE STRING +@@ -22,11 +23,13 @@ else(UNIX) + set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING + "Semicolon-separate list of supported configuration types") + endif(UNIX) ++endif() + + #set(CMAKE_RELATIVE_PATHS ON CACHE STRING "avoid absolute paths" FORCE) + + # Clear out the built-in C++ compiler and link flags for each of the + # unused configurations. ++if (0) + set(CMAKE_CXX_FLAGS_MINSIZEREL "" CACHE INTERNAL "Unused") + set(CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL "" CACHE INTERNAL "Unused") + set(CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL "" CACHE INTERNAL "Unused") +@@ -37,10 +40,11 @@ set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") + set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "Unused") + + set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING "change to needed architecture for a smaller library" FORCE) ++endif() + + PROJECT(portmidi) + +-if(UNIX) ++if(0) + # Problem: if there was an old Debug build and you change + # CMAKE_BUILD_TYPE to Release, then the OUTPUT_DIRECTORY's will + # still be Debug. Try to fix this by checking if the DIRECTORY's +@@ -63,7 +67,7 @@ if(UNIX) + ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} + CACHE STRING "libraries go here" FORCE) + endif(CMAKE_LIBRARY_OUTPUT_DIRECTORY MATCHES ${BAD_DIR}) +-endif(UNIX) ++endif(0) + + include_directories(pm_common porttime) + add_subdirectory(pm_common) +diff --git a/portmidi/trunk/pm_common/CMakeLists.txt b/portmidi/trunk/pm_common/CMakeLists.txt +index cbeeade..c829063 100644 +--- a/portmidi/trunk/pm_common/CMakeLists.txt ++++ b/portmidi/trunk/pm_common/CMakeLists.txt +@@ -5,8 +5,6 @@ + if(APPLE OR WIN32) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + # set the build directory for .dylib libraries +- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + + # the first time CMake configures, save off CMake's built-in flags + if(NOT DEFAULT_DEBUG_FLAGS) +@@ -104,8 +102,9 @@ set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY}) + # this completes the list of library sources by adding shared code + list(APPEND LIBSRC pmutil portmidi) + ++if (NOT BUILD_SHARED_LIBS) + # now add the shared files to make the complete list of library sources +-add_library(portmidi-static ${LIBSRC}) ++add_library(portmidi-static STATIC ${LIBSRC}) + set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s") + target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) + +@@ -118,11 +117,13 @@ target_link_libraries(pmjni ${JNI_EXTRA_LIBS}) + set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib") + + # install the libraries (Linux and Mac OS X command line) +-if(UNIX) ++if(1) + INSTALL(TARGETS portmidi-static pmjni +- LIBRARY DESTINATION /usr/local/lib +- ARCHIVE DESTINATION /usr/local/lib) ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here +-# INSTALL(FILES portmidi.h ../porttime/porttime.h +-# DESTINATION /usr/local/include) +-endif(UNIX) ++ INSTALL(FILES portmidi.h ../porttime/porttime.h ++ DESTINATION include) ++endif(1) ++endif() +diff --git a/portmidi/trunk/pm_common/portmidi.h b/portmidi/trunk/pm_common/portmidi.h +index e07991e..6f48927 100644 +--- a/portmidi/trunk/pm_common/portmidi.h ++++ b/portmidi/trunk/pm_common/portmidi.h +@@ -108,6 +108,8 @@ typedef unsigned int uint32_t; + + #ifdef _WINDLL + #define PMEXPORT __declspec(dllexport) ++#elif defined _PM_USEDLL ++#define PMEXPORT __declspec(dllimport) + #else + #define PMEXPORT + #endif +diff --git a/portmidi/trunk/pm_dylib/CMakeLists.txt b/portmidi/trunk/pm_dylib/CMakeLists.txt +index f693dd6..69d4d24 100644 +--- a/portmidi/trunk/pm_dylib/CMakeLists.txt ++++ b/portmidi/trunk/pm_dylib/CMakeLists.txt +@@ -4,11 +4,8 @@ + # portmidi/pm_dylib + if(APPLE OR WIN32) + # set the build directory for .dylib libraries +- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + # the "archive" output directory says where to put portmidi.lib, the + # static part of the lib/dll pair: +- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + + # the first time CMake configures, save off CMake's built-in flags + if(NOT DEFAULT_DEBUG_FLAGS) +@@ -113,15 +110,21 @@ set(SHARED_FILES pmutil portmidi) + prepend_path(SHARED_PATHS ../pm_common/ ${SHARED_FILES}) + list(APPEND LIBSRC ${SHARED_PATHS}) + ++if (BUILD_SHARED_LIBS) + add_library(portmidi-dynamic SHARED ${LIBSRC}) + set_target_properties(portmidi-dynamic PROPERTIES OUTPUT_NAME "portmidi") + target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS}) ++if (MSVC) ++ target_compile_definitions(portmidi-dynamic PRIVATE _WINDLL) ++endif() + + # install the libraries (Linux and Mac OS X command line) +-if(UNIX) ++if(1) + INSTALL(TARGETS portmidi-dynamic +- LIBRARY DESTINATION /usr/local/lib +- ARCHIVE DESTINATION /usr/local/lib) ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h +- DESTINATION /usr/local/include) +-endif(UNIX) ++ DESTINATION include) ++endif(1) ++endif() diff --git a/ports/portmidi/portfile.cmake b/ports/portmidi/portfile.cmake index 5fc9d62e39cbd0..45e15ab0520f82 100644 --- a/ports/portmidi/portfile.cmake +++ b/ports/portmidi/portfile.cmake @@ -1,66 +1,35 @@ -vcpkg_fail_port_install(ON_TARGET "linux" "uwp" ON_ARCH "arm") +vcpkg_fail_port_install(ON_TARGET "uwp" ON_ARCH "arm") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH REPO portmedia FILENAME "portmedia-code-r234.zip" SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794 + PATCHES + fix-build-install.patch + add-feature-options.patch ) -# Alter path to main portmidi root -set(SOURCE_PATH "${SOURCE_PATH}/portmidi/trunk") - -file(READ "${SOURCE_PATH}/CMakeLists.txt" PM_CMAKE) -string(REPLACE - "set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING \"change to needed architecture for a smaller library\" FORCE)" - "# Removed preconfigured CMAKE_OSX_ARCHITECTURES" PM_CMAKE "${PM_CMAKE}") -file(WRITE "${SOURCE_PATH}/CMakeLists.txt" "${PM_CMAKE}") - -# Mark portmidi-static as static, disable pmjni library depending on the Java SDK -file(READ "${SOURCE_PATH}/pm_common/CMakeLists.txt" PM_CMAKE) -string(REPLACE "add_library(portmidi-static \${LIBSRC})" "add_library(portmidi-static STATIC \${LIBSRC})" PM_CMAKE "${PM_CMAKE}") -string(REPLACE "add_library(pmjni SHARED \${JNISRC})" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") -string(REPLACE "target_link_libraries(pmjni \${JNI_EXTRA_LIBS})" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") -string(REPLACE "set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION \"jnilib\")" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") -string(REPLACE "INSTALL(TARGETS portmidi-static pmjni" "INSTALL(TARGETS portmidi-static" PM_CMAKE "${PM_CMAKE}") -file(WRITE "${SOURCE_PATH}/pm_common/CMakeLists.txt" "${PM_CMAKE}") - -# Run cmake configure step -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/portmidi/trunk" OPTIONS + -DJAVA_SUPPORT=OFF -DJAVA_INCLUDE_PATH= -DJAVA_INCLUDE_PATH2= -DJAVA_JVM_LIBRARY= - -DCMAKE_CACHEFILE_DIR=.. + MAYBE_UNUSED_VARIABLES + JAVA_INCLUDE_PATH + JAVA_INCLUDE_PATH2 ) -# Run cmake build step, nothing is installed on Windows -vcpkg_build_cmake() +vcpkg_cmake_install() -file(INSTALL "${SOURCE_PATH}/pm_common/portmidi.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL "${SOURCE_PATH}/porttime/porttime.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/portmidi.h" + "#elif defined _PM_USEDLL" "#elif 1" + ) +endif() -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi_s.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi_s.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - else() - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - endif() -else() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi_s.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi_s.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - else() - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") - file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") - endif() -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +file(INSTALL "${SOURCE_PATH}/portmidi/trunk/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/portmidi/vcpkg.json b/ports/portmidi/vcpkg.json index 5d95f2ef974be4..4486f5bfeba5d4 100644 --- a/ports/portmidi/vcpkg.json +++ b/ports/portmidi/vcpkg.json @@ -1,8 +1,14 @@ { "name": "portmidi", "version-string": "0.234", - "port-version": 1, + "port-version": 2, "description": "Free, cross-platform, open-source I/O library for MIDI", "homepage": "https://sourceforge.net/projects/portmedia/", - "supports": "windows & osx & !uwp & !arm" + "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0caa9284f8c059..09e0c72cda7cc1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5174,7 +5174,7 @@ }, "portmidi": { "baseline": "0.234", - "port-version": 1 + "port-version": 2 }, "portsmf": { "baseline": "0.238", diff --git a/versions/p-/portmidi.json b/versions/p-/portmidi.json index 5e1b3dd93a498a..1205e0376be6e8 100644 --- a/versions/p-/portmidi.json +++ b/versions/p-/portmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70a85d5a9ddc162df4c7296caf7ac8633089d50c", + "version-string": "0.234", + "port-version": 2 + }, { "git-tree": "74273108463488d1c268248429a06de79521506b", "version-string": "0.234", From fdf3157c8260c45cb7a156b2d0b638216fde3bf7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 17 Sep 2021 16:51:38 +0200 Subject: [PATCH 0576/1858] fix ci: suggest vcpkg_*_cmake -> vcpkg_cmake_* migration (#20218) --- .github/workflows/untrustedPR.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 895cd999efd68e..22ba597ddd6c97 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -38,8 +38,7 @@ jobs: git config user.email github-actions git config user.name github-actions@github.com - # HEAD^^ refers to the second parent of the merge commit - git diff --name-status --merge-base HEAD^^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -s '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" || echo " - \`$filename\`"; done > .github-pr.deprecated-cmake + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`"; done > .github-pr.deprecated-cmake ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u From 2a80bef6593e60f8da1502b75c7f96d1b1757cbc Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 17 Sep 2021 22:53:30 +0800 Subject: [PATCH 0577/1858] [clickhouse-cpp] update to 1.5.0 (#18330) * [clickhouse-cpp] update to 1.2.2 * update version * [clickhouse-cpp] update to 1.5.0 * update version * fix error c4996 * update version * merge baseline.json * update baseline.json * add Add patch description * update version * Add patch comment * update version --- ports/clickhouse-cpp/00001-fix-build.patch | 42 ---------------------- ports/clickhouse-cpp/CMakeLists.txt | 40 --------------------- ports/clickhouse-cpp/fix-error-C4996.patch | 15 ++++++++ ports/clickhouse-cpp/fix-error-c2668.patch | 13 +++++++ ports/clickhouse-cpp/portfile.cmake | 24 ++++++------- ports/clickhouse-cpp/vcpkg.json | 17 ++++++--- versions/baseline.json | 4 +-- versions/c-/clickhouse-cpp.json | 5 +++ 8 files changed, 58 insertions(+), 102 deletions(-) delete mode 100644 ports/clickhouse-cpp/00001-fix-build.patch delete mode 100644 ports/clickhouse-cpp/CMakeLists.txt create mode 100644 ports/clickhouse-cpp/fix-error-C4996.patch create mode 100644 ports/clickhouse-cpp/fix-error-c2668.patch diff --git a/ports/clickhouse-cpp/00001-fix-build.patch b/ports/clickhouse-cpp/00001-fix-build.patch deleted file mode 100644 index 8fb57d50edbca9..00000000000000 --- a/ports/clickhouse-cpp/00001-fix-build.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/clickhouse/base/compressed.cpp b/clickhouse/base/compressed.cpp -index 6b7af08..c3a6449 100644 ---- a/clickhouse/base/compressed.cpp -+++ b/clickhouse/base/compressed.cpp -@@ -1,8 +1,8 @@ - #include "compressed.h" - #include "wire_format.h" - --#include --#include -+#include -+#include - - #include - -diff --git a/clickhouse/client.cpp b/clickhouse/client.cpp -index 1053006..59950ab 100644 ---- a/clickhouse/client.cpp -+++ b/clickhouse/client.cpp -@@ -8,8 +8,8 @@ - - #include "columns/factory.h" - --#include --#include -+#include -+#include - - #include - #include -diff --git a/clickhouse/types/types.h b/clickhouse/types/types.h -index 8d453cd..69aa6a4 100644 ---- a/clickhouse/types/types.h -+++ b/clickhouse/types/types.h -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - namespace clickhouse { - diff --git a/ports/clickhouse-cpp/CMakeLists.txt b/ports/clickhouse-cpp/CMakeLists.txt deleted file mode 100644 index 08a597b395ce5d..00000000000000 --- a/ports/clickhouse-cpp/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -cmake_minimum_required(VERSION 3.13) -project(clickhouse-cpp CXX) - -find_package(lz4 CONFIG REQUIRED) -find_package(cityhash CONFIG REQUIRED) - -file(GLOB_RECURSE SOURCES "clickhouse/*.cpp") -file(GLOB_RECURSE HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "clickhouse/*.h") - -add_library(clickhouse-cpp STATIC ${SOURCES}) - -target_compile_definitions(clickhouse-cpp PRIVATE LZ4_DISABLE_DEPRECATE_WARNINGS) - -set_target_properties(clickhouse-cpp PROPERTIES - CXX_STANDARD 11 - CXX_STANDARD_REQUIRED ON -) - -target_include_directories(clickhouse-cpp PUBLIC - $ - $ -) - -target_link_libraries(clickhouse-cpp - PRIVATE lz4::lz4 - PRIVATE cityhash -) - -install(TARGETS clickhouse-cpp EXPORT clickhouse-cpp-config - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -install(EXPORT clickhouse-cpp-config DESTINATION share/cmake/clickhouse-cpp) - -foreach (HEADER ${HEADERS} ) - get_filename_component(HEADER_DIR ${HEADER} DIRECTORY) - install(FILES ${HEADER} DESTINATION include/${HEADER_DIR}) -endforeach() diff --git a/ports/clickhouse-cpp/fix-error-C4996.patch b/ports/clickhouse-cpp/fix-error-C4996.patch new file mode 100644 index 00000000000000..8da054b57f4994 --- /dev/null +++ b/ports/clickhouse-cpp/fix-error-C4996.patch @@ -0,0 +1,15 @@ +diff --git a/clickhouse/CMakeLists.txt b/clickhouse/CMakeLists.txt +index 7e10ffd..cbbffdc 100644 +--- a/clickhouse/CMakeLists.txt ++++ b/clickhouse/CMakeLists.txt +@@ -31,6 +31,10 @@ SET ( clickhouse-cpp-lib-src + query.cpp + ) + ++if (MSVC) ++ add_compile_options(/wd4996) ++endif() ++ + ADD_LIBRARY (clickhouse-cpp-lib SHARED ${clickhouse-cpp-lib-src}) + SET_TARGET_PROPERTIES(clickhouse-cpp-lib PROPERTIES LINKER_LANGUAGE CXX) + TARGET_LINK_LIBRARIES (clickhouse-cpp-lib diff --git a/ports/clickhouse-cpp/fix-error-c2668.patch b/ports/clickhouse-cpp/fix-error-c2668.patch new file mode 100644 index 00000000000000..4ad1df95364850 --- /dev/null +++ b/ports/clickhouse-cpp/fix-error-c2668.patch @@ -0,0 +1,13 @@ +diff --git a/clickhouse/columns/decimal.cpp b/clickhouse/columns/decimal.cpp +index 7334bb1..41d43b6 100644 +--- a/clickhouse/columns/decimal.cpp ++++ b/clickhouse/columns/decimal.cpp +@@ -27,7 +27,7 @@ inline bool mulOverflow(const Int128 & l, const T & r, Int128 * result) + + #else + template +-inline bool getSignBit(const T & v) ++inline bool getSignBit(const T & (long double v)) + { + return std::signbit(v); + } diff --git a/ports/clickhouse-cpp/portfile.cmake b/ports/clickhouse-cpp/portfile.cmake index d6ccf177b15307..5837fb88f9d546 100644 --- a/ports/clickhouse-cpp/portfile.cmake +++ b/ports/clickhouse-cpp/portfile.cmake @@ -2,25 +2,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO artpaul/clickhouse-cpp - REF 1634d8b9e2f3183de1574344563d90557be3b305 - SHA512 bef74f624c2a777f8ec6b7e87ac3cc564e914bcecc639b3889695da56be4c90531309a8fd87054c2777580c36bc3b2d6e9c5690a6345018bf65a5294eeeb3390 + REPO ClickHouse/clickhouse-cpp + REF 1415b5936a2ac2f084850b09057e05fb5798b2f1 #v1.5.0 + SHA512 222b31b16744af64f0a874ec956568adcecb553e43f8d4a2d16c00d55b31015d917a4dc7bb30d5430a894459b1be5e05b292e2d0918bf6f5609046a60539f80f HEAD_REF master - PATCHES 00001-fix-build.patch + PATCHES + fix-error-c2668.patch + fix-error-C4996.patch #fix x64-uwp error:std::uncaught_exception() is deprecated in C++17 ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/clickhouse-cpp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/clickhouse-cpp/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/clickhouse-cpp/vcpkg.json b/ports/clickhouse-cpp/vcpkg.json index 2c5d6a4f3f61e3..e3a5b37f190989 100644 --- a/ports/clickhouse-cpp/vcpkg.json +++ b/ports/clickhouse-cpp/vcpkg.json @@ -1,11 +1,18 @@ { "name": "clickhouse-cpp", - "version-string": "2019-05-22", - "port-version": 1, - "description": "C++ client for Yandex ClickHouse.", - "homepage": "https://github.com/artpaul/clickhouse-cpp", + "version": "1.5.0", + "description": "C++ client for Yandex ClickHouse", + "homepage": "https://github.com/ClickHouse/clickhouse-cpp", "dependencies": [ "cityhash", - "lz4" + "lz4", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 09e0c72cda7cc1..1e8fd9aac7e7d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1361,8 +1361,8 @@ "port-version": 0 }, "clickhouse-cpp": { - "baseline": "2019-05-22", - "port-version": 1 + "baseline": "1.5.0", + "port-version": 0 }, "clipp": { "baseline": "2019-04-30", diff --git a/versions/c-/clickhouse-cpp.json b/versions/c-/clickhouse-cpp.json index 3da06ee911871e..12cd74ccb40cd0 100644 --- a/versions/c-/clickhouse-cpp.json +++ b/versions/c-/clickhouse-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14c4074d1a59fbe8b01ebe934698519c63885b8b", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "a748366b06afe85b514215e2d27832304581b811", "version-string": "2019-05-22", From 9f1eb1a15235609982c579f85985dba4796256a7 Mon Sep 17 00:00:00 2001 From: J-Human Date: Fri, 17 Sep 2021 23:03:41 +0800 Subject: [PATCH 0578/1858] [discord-game-sdk] use updated domain name (#20153) * [discord-game-sdk] use updated domain name for copyright notice * [discord-game-sdk] use new domain name for JSON data * [discord-game-sdk] update version sha * [discord-game-sdk] update JSON field and port version * [discord-game-sdk] update versions * [discord-game-sdk] update port git tree sha * [discord-game-sdk] remove unneeded version increment * [discord-game-sdk] remove the other commit sha Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/discord-game-sdk/copyright | 2 +- ports/discord-game-sdk/vcpkg.json | 6 +++--- versions/baseline.json | 2 +- versions/d-/discord-game-sdk.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/discord-game-sdk/copyright b/ports/discord-game-sdk/copyright index 6e0e2e9140ad61..78b9e4fbff85fe 100644 --- a/ports/discord-game-sdk/copyright +++ b/ports/discord-game-sdk/copyright @@ -1 +1 @@ -Your use of the GameSDK is bound by the Discord Developer Terms of Service, whose text is available online at https://discordapp.com/developers/docs/legal. +Your use of the GameSDK is bound by the Discord Developer Terms of Service, whose text is available online at https://discord.com/developers/docs/legal. diff --git a/ports/discord-game-sdk/vcpkg.json b/ports/discord-game-sdk/vcpkg.json index 0532cec36868fb..3a35dc4592c66e 100644 --- a/ports/discord-game-sdk/vcpkg.json +++ b/ports/discord-game-sdk/vcpkg.json @@ -1,8 +1,8 @@ { "name": "discord-game-sdk", - "version-string": "2.5.6", - "port-version": 2, + "version": "2.5.6", + "port-version": 3, "description": "The Discord GameSDK is an easy drop-in SDK to help you manage all the hard things that come with making a game.", - "homepage": "https://discordapp.com/developers/docs/game-sdk/sdk-starter-guide", + "homepage": "https://discord.com/developers/docs/game-sdk/sdk-starter-guide", "supports": "((x64 & (windows | osx | linux)) | (x86 & windows)) & !uwp & !static" } diff --git a/versions/baseline.json b/versions/baseline.json index 1e8fd9aac7e7d7..141a6ac4cf280d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1794,7 +1794,7 @@ }, "discord-game-sdk": { "baseline": "2.5.6", - "port-version": 2 + "port-version": 3 }, "discord-rpc": { "baseline": "3.4.0", diff --git a/versions/d-/discord-game-sdk.json b/versions/d-/discord-game-sdk.json index dd1408dd8064cb..d1768f1706d256 100644 --- a/versions/d-/discord-game-sdk.json +++ b/versions/d-/discord-game-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ddd26248ed26eb2676c96330e8ae5a0c3f82a3d", + "version": "2.5.6", + "port-version": 3 + }, { "git-tree": "17cdcbe9e20da2ed085fc2de181ae426d62f2609", "version-string": "2.5.6", From f29546bbf55d8b6717997aa088560b6f5e64128b Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Fri, 17 Sep 2021 08:04:12 -0700 Subject: [PATCH 0579/1858] [seal] Updated SEAL to version 3.7.0 (#20166) * Updated ports/seal and ports/apsi. * Updated versioning. --- ports/apsi/portfile.cmake | 6 +++--- ports/apsi/vcpkg.json | 2 +- ports/seal/portfile.cmake | 12 ++++-------- ports/seal/vcpkg.json | 3 +-- versions/a-/apsi.json | 5 +++++ versions/baseline.json | 6 +++--- versions/s-/seal.json | 5 +++++ 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index d13a9e38891854..95f63b17bd0323 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI - REF 2eba8a245872755a76282c4f1b14aefd67b1a199 - SHA512 fd21e41b9a3241dc3454fadb54feb7843d9d4d4563da26d0f4a29b67ea22ead24ff6d89029050f5c54225cb95cb181f346f381b98873d3c55173444c0650d581 + REF 7fbeefbd42f4884da95073d40de22ba46fc0f1f5 + SHA512 dfa4b7571b355646004d5b8823f250b56cda6e84d348a6a013f45fbf5c119e49bda28ac8a75f8ec06738814c50e34e66805994c7bc780ddfd57cc2067ffa745a HEAD_REF main ) @@ -29,7 +29,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.2") +vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index 01926f583ed55c..e3416047304d22 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "apsi", - "version-semver": "0.2.0", + "version-semver": "0.3.1", "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", "supports": "static", diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index b458c9067f7209..bea3e7af227084 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF d045f1beff96dff0fccc7fa0c5acb1493a65338c - SHA512 9b5d3c4342608d8e3d9826d3b52cbefc1c21eb0094d0cae4add8bb0960f931e9080f248eb8ad8385fc0a08e2a1da10020185148ffd2ef02e7a4fac879e27aa69 + REF 2d2a25c916047d2f356d45ad50c98f0a9695905a + SHA512 81b2be39fca39dbd3a1246d0a1b8474d27eb6b1f3205f2107243bcd883b95814d2b642fa6807ed1f272d321233c2ec7992a256866ae1700c1203575594b42559 HEAD_REF main ) @@ -31,13 +31,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/SEAL-3.6") +vcpkg_cmake_config_fixup(PACKAGE_NAME "SEAL" CONFIG_PATH "lib/cmake/SEAL-3.7") -if("hexl" IN_LIST FEATURES) - vcpkg_fixup_pkgconfig(SKIP_CHECK) -else() - vcpkg_fixup_pkgconfig() -endif() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index f7a7928dd8e3ee..daafafc275e6d2 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "seal", - "version-semver": "3.6.6", - "port-version": 1, + "version-semver": "3.7.0", "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "supports": "!windows | (windows & static)", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index 30b4da13216533..30ac0723370d6b 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cfe8c41e42a7aa179511d6f6ead1c47bb8f3327", + "version-semver": "0.3.1", + "port-version": 0 + }, { "git-tree": "2de75d2b02f3a434d3b95f53ca60b71598d9f8b5", "version-semver": "0.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 141a6ac4cf280d..bbddf80eee9968 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -113,7 +113,7 @@ "port-version": 4 }, "apsi": { - "baseline": "0.2.0", + "baseline": "0.3.1", "port-version": 0 }, "arb": { @@ -5937,8 +5937,8 @@ "port-version": 1 }, "seal": { - "baseline": "3.6.6", - "port-version": 1 + "baseline": "3.7.0", + "port-version": 0 }, "secp256k1": { "baseline": "2017-19-10", diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 56f081d64ba5ed..61c01bb81dcdf3 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e0c0c7900d62643f5e83af3a18401d9116d2696", + "version-semver": "3.7.0", + "port-version": 0 + }, { "git-tree": "89d120a6c3ac5306d90e29913048b518dc5a2c9b", "version-semver": "3.6.6", From d59b4223a6d616c0ca7a0ee932eefff8fd8e2c1a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 17 Sep 2021 23:05:23 +0800 Subject: [PATCH 0580/1858] [mimalloc] update to v1.7.2 (#20188) * [mimalloc] update to v1.7.2 * update version * update suggestion review * update version * update patch EOF * update version --- ports/mimalloc/fix-cmake.patch | 54 +++++++++++----------------------- ports/mimalloc/portfile.cmake | 49 ++++++++++++------------------ ports/mimalloc/vcpkg.json | 13 ++++++-- versions/baseline.json | 4 +-- versions/m-/mimalloc.json | 5 ++++ 5 files changed, 53 insertions(+), 72 deletions(-) diff --git a/ports/mimalloc/fix-cmake.patch b/ports/mimalloc/fix-cmake.patch index 42d74f8c2ec759..2824055a5a25ab 100644 --- a/ports/mimalloc/fix-cmake.patch +++ b/ports/mimalloc/fix-cmake.patch @@ -1,58 +1,38 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 37616eb..4c81e6a 100644 +index b56953c..d7ad3e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -251,14 +251,28 @@ if(MI_BUILD_SHARED) - ) - if(WIN32) - # On windows copy the mimalloc redirection dll too. -+ if(CMAKE_SIZEOF_VOID_P EQUAL 8) - target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.lib) +@@ -279,10 +279,12 @@ if(MI_BUILD_SHARED) add_custom_command(TARGET mimalloc POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect.dll" $ - COMMENT "Copy mimalloc-redirect.dll to output directory") -- endif() + COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll" $ + COMMENT "Copy mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll to output directory") + install ( -+ FILES $/mimalloc-redirect.dll ++ FILES $/mimalloc-redirect${MIMALLOC_REDIRECT_SUFFIX}.dll + DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) -+ elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) -+ target_link_libraries(mimalloc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect32.lib) -+ add_custom_command(TARGET mimalloc POST_BUILD -+ COMMAND "${CMAKE_COMMAND}" -E copy "${CMAKE_CURRENT_SOURCE_DIR}/bin/mimalloc-redirect32.dll" $ -+ COMMENT "Copy mimalloc-redirect32.dll to output directory") -+ install ( -+ FILES $/mimalloc-redirect32.dll -+ DESTINATION ${CMAKE_INSTALL_BINDIR} -+ ) -+ endif() -+endif() - -- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_dir} LIBRARY) -- install(EXPORT mimalloc DESTINATION ${mi_install_dir}/cmake) ++ ) + endif() +- +- install(TARGETS mimalloc EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) +- install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + install(TARGETS mimalloc EXPORT mimalloc ARCHIVE DESTINATION lib RUNTIME DESTINATION bin LIBRARY DESTINATION lib NAMELINK_SKIP) endif() # static library -@@ -281,9 +295,11 @@ if (MI_BUILD_STATIC) - set_target_properties(mimalloc-static PROPERTIES OUTPUT_NAME ${mi_basename}) - endif() - -- install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_dir}) -+ install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION lib) +@@ -308,6 +310,8 @@ if (MI_BUILD_STATIC) + install(TARGETS mimalloc-static EXPORT mimalloc DESTINATION ${mi_install_libdir} LIBRARY) endif() -+install(EXPORT mimalloc DESTINATION ${mi_install_dir}/cmake) ++install(EXPORT mimalloc DESTINATION ${mi_install_cmakedir}) + # install include files - install(FILES include/mimalloc.h DESTINATION ${mi_install_dir}/include) - install(FILES include/mimalloc-override.h DESTINATION ${mi_install_dir}/include) -@@ -315,9 +331,6 @@ if (MI_BUILD_OBJECT) + install(FILES include/mimalloc.h DESTINATION ${mi_install_incdir}) + install(FILES include/mimalloc-override.h DESTINATION ${mi_install_incdir}) +@@ -342,9 +346,6 @@ if (MI_BUILD_OBJECT) # the FILES expression can also be: $ # but that fails cmake versions less than 3.10 so we leave it as is for now - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/mimalloc-obj.dir/src/static.c${CMAKE_C_OUTPUT_EXTENSION} -- DESTINATION ${mi_install_dir} +- DESTINATION ${mi_install_libdir} - RENAME ${mi_basename}${CMAKE_C_OUTPUT_EXTENSION} ) endif() diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index 154fa3c2ad4ce6..b334bcad6dec06 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -3,23 +3,24 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF a9686d6ecf00e4467e772f7c0b4ef76a15f325f6 # v1.6.4 - SHA512 a1bda1b31d1bb3a4680fec91f180a988cf5ff486dcb8848fefd9245907f7986e4c4f10ce33133a3d796a7409ba38328bd156c47eba4f19368a2226a43b1ad298 + REF 752594e76423526e108413731518a26e3322b9ca # v1.7.2 + SHA512 fc96f6aa6972c167a956d8f928d9becd546689356d86e800df0f54c9c46cedf74d686168f44566fb4d0aa9cddf7a9444327acd2180cc91386c53658c6a5018f1 HEAD_REF master PATCHES fix-cmake.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - asm MI_SEE_ASM - secure MI_SECURE - override MI_OVERRIDE + FEATURES + asm MI_SEE_ASM + secure MI_SECURE + override MI_OVERRIDE ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MI_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DMI_CHECK_FULL=ON OPTIONS_RELEASE @@ -31,41 +32,27 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} -DMI_BUILD_STATIC=${MI_BUILD_STATIC} -DMI_BUILD_SHARED=${MI_BUILD_SHARED} + -DMI_INSTALL_TOPLEVEL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(GLOB lib_directories RELATIVE ${CURRENT_PACKAGES_DIR}/lib "${CURRENT_PACKAGES_DIR}/lib/${PORT}-*") -list(GET lib_directories 0 lib_install_dir) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/${lib_install_dir}/cmake) - -vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/${PORT}/mimalloc.cmake - "lib/${lib_install_dir}/" - "" -) - file(COPY - ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} -) - -file(COPY ${CURRENT_PACKAGES_DIR}/lib/${lib_install_dir}/include DESTINATION ${CURRENT_PACKAGES_DIR}) - -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/lib/${lib_install_dir} - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/lib/${lib_install_dir} + "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/mimalloc.h + "${CURRENT_PACKAGES_DIR}/include/mimalloc.h" "!defined(MI_SHARED_LIB)" "0 // !defined(MI_SHARED_LIB)" ) endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index 09a5065e804b68..ecb642a739d576 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,10 +1,19 @@ { "name": "mimalloc", - "version-string": "1.6.4", - "port-version": 1, + "version": "1.7.2", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "asm": { "description": "Generate assembly files" diff --git a/versions/baseline.json b/versions/baseline.json index bbddf80eee9968..f7cb5e5c369219 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4201,8 +4201,8 @@ "port-version": 3 }, "mimalloc": { - "baseline": "1.6.4", - "port-version": 1 + "baseline": "1.7.2", + "port-version": 0 }, "minc": { "baseline": "2.4.03", diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index 02d1adf42b2428..be6c7a4785aaf1 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "180bb46f618db60da2f6aa4accca24cdb90570e8", + "version": "1.7.2", + "port-version": 0 + }, { "git-tree": "5dfd6d52634b3dc1e63c380de459322b8c17f0a8", "version-string": "1.6.4", From 6bd9a85b8118a34b677b4d8b11a511903eac4c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 17 Sep 2021 17:20:35 +0200 Subject: [PATCH 0581/1858] [kf5*] re-enable parallel configure, speed up compilation (#20202) * [kf5*] re-enable parallel configure * [kf5*] update versions --- ports/kf5archive/portfile.cmake | 4 +- ports/kf5archive/vcpkg.json | 2 +- ports/kf5attica/portfile.cmake | 4 +- ports/kf5attica/vcpkg.json | 1 + ports/kf5auth/portfile.cmake | 4 +- ports/kf5auth/vcpkg.json | 2 +- ports/kf5codecs/portfile.cmake | 4 +- ports/kf5codecs/vcpkg.json | 2 +- ports/kf5completion/portfile.cmake | 4 +- ports/kf5completion/vcpkg.json | 2 +- ports/kf5config/portfile.cmake | 4 +- ports/kf5config/vcpkg.json | 2 +- ports/kf5configwidgets/portfile.cmake | 4 +- ports/kf5configwidgets/vcpkg.json | 1 + ports/kf5coreaddons/portfile.cmake | 4 +- ports/kf5coreaddons/vcpkg.json | 2 +- ports/kf5crash/portfile.cmake | 4 +- ports/kf5crash/vcpkg.json | 2 +- ports/kf5dbusaddons/portfile.cmake | 4 +- ports/kf5dbusaddons/vcpkg.json | 2 +- ports/kf5globalaccel/portfile.cmake | 4 +- ports/kf5globalaccel/vcpkg.json | 1 + ports/kf5guiaddons/portfile.cmake | 4 +- ports/kf5guiaddons/vcpkg.json | 2 +- ports/kf5holidays/portfile.cmake | 4 +- ports/kf5holidays/vcpkg.json | 2 +- ports/kf5i18n/portfile.cmake | 4 +- ports/kf5i18n/vcpkg.json | 2 +- ports/kf5iconthemes/portfile.cmake | 4 +- ports/kf5iconthemes/vcpkg.json | 1 + ports/kf5itemmodels/portfile.cmake | 4 +- ports/kf5itemmodels/vcpkg.json | 2 +- ports/kf5itemviews/portfile.cmake | 4 +- ports/kf5itemviews/vcpkg.json | 2 +- ports/kf5jobwidgets/portfile.cmake | 4 +- ports/kf5jobwidgets/vcpkg.json | 1 + ports/kf5package/portfile.cmake | 4 +- ports/kf5package/vcpkg.json | 1 + ports/kf5plotting/portfile.cmake | 4 +- ports/kf5plotting/vcpkg.json | 2 +- ports/kf5service/portfile.cmake | 4 +- ports/kf5service/vcpkg.json | 1 + ports/kf5solid/portfile.cmake | 4 +- ports/kf5solid/vcpkg.json | 2 +- ports/kf5sonnet/portfile.cmake | 4 +- ports/kf5sonnet/vcpkg.json | 2 +- ports/kf5syntaxhighlighting/portfile.cmake | 4 +- ports/kf5syntaxhighlighting/vcpkg.json | 2 +- ports/kf5textwidgets/portfile.cmake | 4 +- ports/kf5textwidgets/vcpkg.json | 1 + ports/kf5wallet/portfile.cmake | 4 +- ports/kf5wallet/vcpkg.json | 1 + ports/kf5widgetsaddons/portfile.cmake | 4 +- ports/kf5widgetsaddons/vcpkg.json | 2 +- ports/kf5windowsystem/portfile.cmake | 4 +- ports/kf5windowsystem/vcpkg.json | 2 +- versions/baseline.json | 56 +++++++++++----------- versions/k-/kf5archive.json | 5 ++ versions/k-/kf5attica.json | 5 ++ versions/k-/kf5auth.json | 5 ++ versions/k-/kf5codecs.json | 5 ++ versions/k-/kf5completion.json | 5 ++ versions/k-/kf5config.json | 5 ++ versions/k-/kf5configwidgets.json | 5 ++ versions/k-/kf5coreaddons.json | 5 ++ versions/k-/kf5crash.json | 5 ++ versions/k-/kf5dbusaddons.json | 5 ++ versions/k-/kf5globalaccel.json | 5 ++ versions/k-/kf5guiaddons.json | 5 ++ versions/k-/kf5holidays.json | 5 ++ versions/k-/kf5i18n.json | 5 ++ versions/k-/kf5iconthemes.json | 5 ++ versions/k-/kf5itemmodels.json | 5 ++ versions/k-/kf5itemviews.json | 5 ++ versions/k-/kf5jobwidgets.json | 5 ++ versions/k-/kf5package.json | 5 ++ versions/k-/kf5plotting.json | 5 ++ versions/k-/kf5service.json | 5 ++ versions/k-/kf5solid.json | 5 ++ versions/k-/kf5sonnet.json | 5 ++ versions/k-/kf5syntaxhighlighting.json | 5 ++ versions/k-/kf5textwidgets.json | 5 ++ versions/k-/kf5wallet.json | 5 ++ versions/k-/kf5widgetsaddons.json | 5 ++ versions/k-/kf5windowsystem.json | 5 ++ 85 files changed, 280 insertions(+), 75 deletions(-) diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index 479b4496f04c28..ef1582bc03dfcd 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -17,8 +17,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index 2ece7aa506eebe..227be8c662f83f 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5archive", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "dependencies": [ diff --git a/ports/kf5attica/portfile.cmake b/ports/kf5attica/portfile.cmake index 30b4b281a59dbe..ed6183e4bc7efb 100644 --- a/ports/kf5attica/portfile.cmake +++ b/ports/kf5attica/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5attica/vcpkg.json b/ports/kf5attica/vcpkg.json index 83ab52cd285892..4234fb9a886373 100644 --- a/ports/kf5attica/vcpkg.json +++ b/ports/kf5attica/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5attica", "version-semver": "5.84.0", + "port-version": 1, "description": "A Qt library that implements the Open Collaboration Services API", "homepage": "https://api.kde.org/frameworks/attica/html/index.html", "dependencies": [ diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index da48a9c9d46c67..806e81226ca4c7 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index 3b15b73bd52af3..2942db273a2b86 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5auth", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 9690c58f252b99..6637557aa80113 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -10,8 +10,10 @@ vcpkg_find_acquire_program(GPERF) get_filename_component(GPERF_EXE_PATH ${GPERF} DIRECTORY) vcpkg_add_to_path(${GPERF_EXE_PATH}) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index de0042d38218f2..94958f804bd5eb 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5codecs", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 4bb886a3677e8f..a24e0c803b4421 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index 2849f7867f8a3c..9a185f1a139621 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5completion", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 3e831a2b98b1cc..ddd842766235f4 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -6,10 +6,12 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index a2e0f26a14d4d1..cccf3ac82a1c84 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5config", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake index cb7282ada6d4f9..2f1a73a5f3d72a 100644 --- a/ports/kf5configwidgets/portfile.cmake +++ b/ports/kf5configwidgets/portfile.cmake @@ -14,8 +14,10 @@ vcpkg_check_features( designerplugin BUILD_DESIGNERPLUGIN ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json index bab6562d502220..4950f72f9118f7 100644 --- a/ports/kf5configwidgets/vcpkg.json +++ b/ports/kf5configwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5configwidgets", "version-semver": "5.84.0", + "port-version": 1, "description": "Widgets for configuration dialogs", "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 24f1d78414b183..e137973256c600 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -8,9 +8,11 @@ vcpkg_from_github( fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 7d81987f0debf7..22373698211bbe 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5coreaddons", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 32dc7ff8e70882..b6382e19c02f07 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -8,9 +8,11 @@ vcpkg_from_github( support_static_builds.patch # https://invent.kde.org/frameworks/kcrash/-/merge_requests/23 ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 6976bb5d41d5f3..9b6b62bc918295 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5crash", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index 372773c44d6284..73aab78ae3a1a8 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index c545dc94a4acfe..dd485ad52e0f9c 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5dbusaddons", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake index dbdbbdf8f03ba7..decf668c1d3415 100644 --- a/ports/kf5globalaccel/portfile.cmake +++ b/ports/kf5globalaccel/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json index c6afe6043fb12a..25aefeecae284b 100644 --- a/ports/kf5globalaccel/vcpkg.json +++ b/ports/kf5globalaccel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5globalaccel", "version-semver": "5.84.0", + "port-version": 1, "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index a298210c3a533d..f6da2d131ae184 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -18,8 +18,10 @@ if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) message(FATAL_ERROR "Feature wayland is only supported on Linux.") endif() +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 369ff2f1079f5f..c152961a8ff902 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5guiaddons", "version-semver": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 765d752300d0ac..ee0ae5f4462832 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -6,10 +6,12 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 1d79a711193015..1993091f78c0be 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5holidays", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 415530d1ea2368..e7825c86efb9c8 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -12,9 +12,11 @@ vcpkg_from_github( vcpkg_find_acquire_program(PYTHON3) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 149194bdb5ac56..bab7f151de3354 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5i18n", "version": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake index 807c70528974ab..03d00588beda11 100644 --- a/ports/kf5iconthemes/portfile.cmake +++ b/ports/kf5iconthemes/portfile.cmake @@ -14,8 +14,10 @@ vcpkg_check_features( designerplugin BUILD_DESIGNERPLUGIN ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json index d3ba8975e8ece8..3c7db55beb4b81 100644 --- a/ports/kf5iconthemes/vcpkg.json +++ b/ports/kf5iconthemes/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5iconthemes", "version": "5.84.0", + "port-version": 1, "description": "Icon GUI utilities", "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index a45b13bbba4291..5e9616cb7243d9 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_from_github( SHA512 1fd6a6194a718184dcbed0131a2b93575382b3ef7620049cb7a1ac2e55f271113c880d90b76fd6967b720fc44762f10119e8629bda30e6dea10f61ce22f9e02c ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index 5022b2142c9391..5e628b41a744c7 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5itemmodels", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index 51707dd62caeed..567e8f7708bba3 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -5,9 +5,11 @@ vcpkg_from_github( SHA512 d6a16ebbe57b6ac1b766d77b8b262b0ec72a5e256e5b3fbf7b95d901b4e45300eda2933f74a5a66cb6b2fec062fb4a6c9253e3376b13ab889f0bfd52c23cf5d4 ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index f7e41014927681..d80af211cb5cb2 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5itemviews", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5jobwidgets/portfile.cmake b/ports/kf5jobwidgets/portfile.cmake index 92caa0db710960..f285c8a50d8cb6 100644 --- a/ports/kf5jobwidgets/portfile.cmake +++ b/ports/kf5jobwidgets/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json index 9e4e82e6f64791..b02a341d0b72d0 100644 --- a/ports/kf5jobwidgets/vcpkg.json +++ b/ports/kf5jobwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5jobwidgets", "version-semver": "5.84.0", + "port-version": 1, "description": "Widgets for showing progress of asynchronous jobs", "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index f67cfb8525f489..a9661cf07e28df 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index 086ffbdfb711c8..a874e8db7abf61 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5package", "version": "5.84.0", + "port-version": 1, "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index 9897fb89b79cc4..f2d8ac8778252c 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 7a99dc14549110..7513e48fe48a50 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5plotting", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index 71077a8f54c430..acb0876ed43ff2 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -31,8 +31,10 @@ get_filename_component(BISON_DIR "${BISON}" DIRECTORY) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") vcpkg_add_to_path(PREPEND "${BISON_DIR}") +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index 69f73cd9c35646..72136bf204085e 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5service", "version": "5.84.0", + "port-version": 1, "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 849281621f3998..9474f1c001b37d 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -33,9 +33,11 @@ get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) vcpkg_add_to_path(PREPEND "${FLEX_DIR}") vcpkg_add_to_path(PREPEND "${BISON_DIR}") +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF ) diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index fa67c524da94b8..c825d05b8df875 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5solid", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index 2cdff734d2aad1..1cda95d5ca39cf 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json index d9d0f1173a98bc..52cb029d96149c 100644 --- a/ports/kf5sonnet/vcpkg.json +++ b/ports/kf5sonnet/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5sonnet", "version-semver": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 1453c26d8c4b29..9003e60f5e4d49 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -10,8 +10,10 @@ vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) vcpkg_add_to_path("${PERL_EXE_PATH}") +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index 5c4cb98a72b04d..d50b0e71395854 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5syntaxhighlighting", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/ports/kf5textwidgets/portfile.cmake b/ports/kf5textwidgets/portfile.cmake index 09a63f7b5deae1..eb3cced28e2258 100644 --- a/ports/kf5textwidgets/portfile.cmake +++ b/ports/kf5textwidgets/portfile.cmake @@ -6,8 +6,10 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json index 49c0a45792dd51..dfb7e271de067f 100644 --- a/ports/kf5textwidgets/vcpkg.json +++ b/ports/kf5textwidgets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5textwidgets", "version": "5.84.0", + "port-version": 1, "description": "Text editing widgets", "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5wallet/portfile.cmake b/ports/kf5wallet/portfile.cmake index fb58b065c33324..e7300f744df6d4 100644 --- a/ports/kf5wallet/portfile.cmake +++ b/ports/kf5wallet/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF -DBUILD_KWALLETD=OFF diff --git a/ports/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json index 964136b210ce83..0d4876849a7117 100644 --- a/ports/kf5wallet/vcpkg.json +++ b/ports/kf5wallet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5wallet", "version-semver": "5.84.0", + "port-version": 1, "description": "Safe desktop-wide storage for passwords", "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 453397dadf7676..dcf65ec6b23092 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -6,9 +6,11 @@ vcpkg_from_github( HEAD_REF master ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - DISABLE_PARALLEL_CONFIGURE PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index 23429f98328508..4b98e7c004bb11 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5widgetsaddons", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 59244479cd0519..45173fe113ba69 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -12,8 +12,10 @@ if (VCPKG_TARGET_IS_LINUX) message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev") endif() +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index 18f247e644e46f..ab42649adad54b 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5windowsystem", "version-semver": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f7cb5e5c369219..2b0fe702c003ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2946,115 +2946,115 @@ }, "kf5archive": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5attica": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5auth": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5codecs": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5completion": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5config": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5configwidgets": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5coreaddons": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5crash": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5dbusaddons": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5globalaccel": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5guiaddons": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5holidays": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5i18n": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5iconthemes": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5itemmodels": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5itemviews": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5jobwidgets": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5package": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5plotting": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5service": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5solid": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5sonnet": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5syntaxhighlighting": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5textwidgets": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5wallet": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5widgetsaddons": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "kf5windowsystem": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kfr": { "baseline": "4.2.1", diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index 068b74c7a533ca..3dd22de1ae9e1d 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1476ac82c0b38d83211053e22afbac2091dab2e3", + "version-semver": "5.84.0", + "port-version": 2 + }, { "git-tree": "03f6943556e1d7600443c1f30445560de3f9b2f7", "version-semver": "5.84.0", diff --git a/versions/k-/kf5attica.json b/versions/k-/kf5attica.json index d37e925f6f83f6..51344eb3f24e85 100644 --- a/versions/k-/kf5attica.json +++ b/versions/k-/kf5attica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d1c8f2256f2e831a4ba82551de6a55ee4565a6", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "196f1ae93b85efd88bb9fa4a245ed9e8cf044a4a", "version-semver": "5.84.0", diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index acaa00c199a4f6..c3154d0264ad85 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54c38c08e5c5af0745650a385a5cea5926748545", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "5f1399e14100a7c100bc55f8d436224c680a7f52", "version": "5.84.0", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index 544d164b30cc02..532248c9352187 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0997fde9753e1e3c745eca599c116ef3a511bece", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "cc839f57cba8b67ed071d5dc3a472b605033cd7a", "version": "5.84.0", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index 6192590e9f46f3..aea864f52f470d 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a184552295179e5f414d3166d8f6f40ce9c66347", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "b32643e981f1d9bab04fd3526e9c6c4499d35d1f", "version": "5.84.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 69d611da1f990c..13e4c607d6a530 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f36f1f5a124bd2f3123e0dfd9f4d350f1f69e757", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "67fa669df81328489ba66231cef84fc17ae4f434", "version": "5.84.0", diff --git a/versions/k-/kf5configwidgets.json b/versions/k-/kf5configwidgets.json index c2f9808d6256ef..db4391585d0aee 100644 --- a/versions/k-/kf5configwidgets.json +++ b/versions/k-/kf5configwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eca836d8da743409afa20dfc372145a7a7e68d6", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "99dcbe4e7cb84be45f9869e441c274e44309291d", "version-semver": "5.84.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 3527c22e7cfb69..5783b0d9936a18 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca84b488ea7914b621bf49006f03f4ce8221052c", + "version-semver": "5.84.0", + "port-version": 2 + }, { "git-tree": "001ac94bfbadcc7b05c30448bff3adc9e2dc08dd", "version-semver": "5.84.0", diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index 6260690df55dc8..cf1ac87e2a6f89 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e30fa89728c784663526f9ff9332021507b9ee8e", + "version-semver": "5.84.0", + "port-version": 2 + }, { "git-tree": "9b4122c60d561d232fbd5294a304be12509b736d", "version-semver": "5.84.0", diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json index 1c4e812e83f781..f5cfeade985a9c 100644 --- a/versions/k-/kf5dbusaddons.json +++ b/versions/k-/kf5dbusaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "497be7e1959fac395884422632328485883fd433", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "417fdf58b130c7e24794cf4d1d29336cb946f9fa", "version": "5.84.0", diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json index 32bfc0d44c71d7..da94a064dd0e1d 100644 --- a/versions/k-/kf5globalaccel.json +++ b/versions/k-/kf5globalaccel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "541f3c0b90027dcb3837dec812f896dbc4786f46", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "de0672be2e76751be304b4856466b9df6deaa29f", "version-semver": "5.84.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 0a1b25073fa08c..c9d4b6fad6c659 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dfe4575612c8d7d2bff1d4b1ecf2d5601915060", + "version-semver": "5.84.0", + "port-version": 3 + }, { "git-tree": "3ecd4e54210c93a999c1cf4ddc24aded8c0d7437", "version-semver": "5.84.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index b2fca6bd61108f..d79071a556b961 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8b6fefbcb219e7f1de19ffc4b30bc8fd199abc0", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "b969d43d406c095970b4e98cc3b19c27567b557c", "version": "5.84.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 1337933fc56ad5..637789dffac6d0 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c866e11343fd709f33dba23075f00f64b62813b5", + "version": "5.84.0", + "port-version": 3 + }, { "git-tree": "3d34c7c3f38d55f93bc26d146fcf656f7eb4be3c", "version": "5.84.0", diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json index 427e272eadd0f8..6108d3d85e5f67 100644 --- a/versions/k-/kf5iconthemes.json +++ b/versions/k-/kf5iconthemes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dff2467b2980412adb042e6a9e2474eb5efba9f4", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "969df4c5b4230e480fcffa7d71a312e869a3660d", "version": "5.84.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index b498ce49793dc7..129da014643f6d 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ccd18253fc31dab2afa493a6150711036138da63", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "b222a404755239053edfac06ee63bf3710719fe9", "version": "5.84.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 3e9fe71355712a..00e2cb2031ad0e 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a89dde646ac62a41ece78c8757964cdd4ceaed60", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "164cc5f1d9ccfdf89ef60c4b718b8f6777162ea5", "version": "5.84.0", diff --git a/versions/k-/kf5jobwidgets.json b/versions/k-/kf5jobwidgets.json index 15adaa10d4284a..55544975ea186f 100644 --- a/versions/k-/kf5jobwidgets.json +++ b/versions/k-/kf5jobwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6772f49b473e205b1f3dadfe97705b178f8e0ef2", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "7405290b40e00636f2db4aa51f0ebfa24bfe0589", "version-semver": "5.84.0", diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 8f7ea21f785703..5ad9f60201bf85 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41b59faf036cdcc4d430a8bee7b4f87c4fa4e42f", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "aeff67d2d07a017d69a853037a12371683c5aa97", "version": "5.84.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 7a594e4f98edd3..65073a0b340794 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "866d1f84848c54a924a542fc101895588ff895b0", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "39f28709c5b4d6e1c706c7e15617b7c052830122", "version": "5.84.0", diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index cbc9e49c2913c8..eed2af76481143 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f6fb4f263f0fff296515f569565550c9805e65d", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "13315cd7dbaa61af6c16276f83a15ceaab5a1235", "version": "5.84.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index e449cf69991886..332603a1b8a377 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0a82387f00cd2a61e6f1751bb1c94c9d706fddb", + "version-semver": "5.84.0", + "port-version": 2 + }, { "git-tree": "1f726a86d2961fd90661f27469d1e77b2b75c612", "version-semver": "5.84.0", diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json index c5cd6b7ebd0409..147aa3e8d61ac4 100644 --- a/versions/k-/kf5sonnet.json +++ b/versions/k-/kf5sonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dab7f45858de89e5cb13bd31875d2ba99bf94365", + "version-semver": "5.84.0", + "port-version": 2 + }, { "git-tree": "de4fdcac67da4df0962414b4b1f71d98753d4c4e", "version-semver": "5.84.0", diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index 706ca85fb99369..e72b1b31f3eeb4 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f86af1e17c47fb99ff1f4a662d2cf5c022408025", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "0bec703b0c5345b456bdbddf6e043d1c31dd2906", "version": "5.84.0", diff --git a/versions/k-/kf5textwidgets.json b/versions/k-/kf5textwidgets.json index 4bfc99aa6dff80..d5d356c9ad766c 100644 --- a/versions/k-/kf5textwidgets.json +++ b/versions/k-/kf5textwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6c8dad63ee1e48b572b94623152569b1443c20c", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "bdc98a609f6b939514630fb39de377fdb09560c0", "version": "5.84.0", diff --git a/versions/k-/kf5wallet.json b/versions/k-/kf5wallet.json index 560cd98914a1c5..6209cf6cfec59d 100644 --- a/versions/k-/kf5wallet.json +++ b/versions/k-/kf5wallet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e8401b12a23caa46bffec87b7f583771a55170d", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "c954ed1f4277c1c7fef03a9736d83d1a2da5ee63", "version-semver": "5.84.0", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index 77880f2902c8b9..589de92c8eb70c 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8ce78de33b2176f98f97f865494b520cdc37032", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "de99d19b892fe1551e87c6dd3a1c2d353bfc3f76", "version": "5.84.0", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index df764af21925c0..56fe8c32c24ffe 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce30fb964e57b95c0a6afe4cacff6a28447c7649", + "version-semver": "5.84.0", + "port-version": 3 + }, { "git-tree": "e8ec0d393c0ccf286aab3bbe310dd5c09eaecf88", "version-semver": "5.84.0", From 6d7fd0ce733f110cc7e8b4082fd9d3b3a419bcde Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 17 Sep 2021 17:20:57 +0200 Subject: [PATCH 0582/1858] many-ports: Update supports field (#20053) * many-ports: Update supports field * Fix several "version-string"s. Co-authored-by: Billy Robert O'Neal III --- ports/atk/vcpkg.json | 3 ++- ports/atkmm/vcpkg.json | 2 +- ports/azure-kinect-sensor-sdk/vcpkg.json | 4 +-- ports/behaviortree-cpp/vcpkg.json | 3 ++- ports/bitserializer/vcpkg.json | 3 +-- ports/directxsdk/vcpkg.json | 4 +-- ports/embree2/portfile.cmake | 7 +++--- ports/embree2/vcpkg.json | 9 ++++--- ports/freealut/vcpkg.json | 5 ++-- ports/geotrans/portfile.cmake | 5 +--- ports/geotrans/vcpkg.json | 5 ++-- ports/iir1/vcpkg.json | 3 ++- ports/libcbor/vcpkg.json | 6 ++--- ports/libunifex/vcpkg.json | 2 +- ports/libxmlpp/vcpkg.json | 1 + ports/matplotplusplus/vcpkg.json | 4 +-- ports/portmidi/vcpkg.json | 6 ++--- ports/xnnpack/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 3 +++ versions/a-/atk.json | 5 ++++ versions/a-/atkmm.json | 5 ++++ versions/a-/azure-kinect-sensor-sdk.json | 5 ++++ versions/b-/behaviortree-cpp.json | 5 ++++ versions/b-/bitserializer.json | 5 ++++ versions/baseline.json | 32 ++++++++++++------------ versions/d-/directxsdk.json | 5 ++++ versions/e-/embree2.json | 5 ++++ versions/f-/freealut.json | 5 ++++ versions/g-/geotrans.json | 5 ++++ versions/i-/iir1.json | 5 ++++ versions/l-/libcbor.json | 5 ++++ versions/l-/libunifex.json | 5 ++++ versions/l-/libxmlpp.json | 5 ++++ versions/m-/matplotplusplus.json | 5 ++++ versions/p-/portmidi.json | 5 ++++ versions/x-/xnnpack.json | 5 ++++ 36 files changed, 140 insertions(+), 50 deletions(-) diff --git a/ports/atk/vcpkg.json b/ports/atk/vcpkg.json index 7cbda67be2c68a..d0a2e1f735a0ab 100644 --- a/ports/atk/vcpkg.json +++ b/ports/atk/vcpkg.json @@ -1,9 +1,10 @@ { "name": "atk", "version": "2.36.0", + "port-version": 1, "description": "GNOME Accessibility Toolkit", "homepage": "https://developer.gnome.org/atk/", - "supports": "!(osx | arm)", + "supports": "!arm", "dependencies": [ "gettext", "glib", diff --git a/ports/atkmm/vcpkg.json b/ports/atkmm/vcpkg.json index 832fa3b98da9c1..c173ce9cee760d 100644 --- a/ports/atkmm/vcpkg.json +++ b/ports/atkmm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "atkmm", "version": "2.36.0", + "port-version": 1, "description": "atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.", "homepage": "https://www.gtkmm.org", - "supports": "!osx", "dependencies": [ "atk", "gettext", diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index d54e59d4faefbd..f20bbe2af61bf3 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/ports/azure-kinect-sensor-sdk/vcpkg.json @@ -1,10 +1,10 @@ { "name": "azure-kinect-sensor-sdk", "version": "1.4.1", - "port-version": 2, + "port-version": 3, "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.", "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK", - "supports": "!osx", + "supports": "linux & windows", "dependencies": [ "azure-c-shared-utility", "cjson", diff --git a/ports/behaviortree-cpp/vcpkg.json b/ports/behaviortree-cpp/vcpkg.json index 5e06c5124fc56c..4632b9786ab203 100644 --- a/ports/behaviortree-cpp/vcpkg.json +++ b/ports/behaviortree-cpp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "behaviortree-cpp", "version": "3.5.6", + "port-version": 1, "description": "Behavior Trees Library in C++.", "homepage": "https://www.behaviortree.dev", - "supports": "!uwp & !osx", + "supports": "!uwp", "dependencies": [ "boost-coroutine2", "cppzmq" diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json index 4866a2dc8d3509..7bf83a25ea77f2 100644 --- a/ports/bitserializer/vcpkg.json +++ b/ports/bitserializer/vcpkg.json @@ -1,10 +1,9 @@ { "name": "bitserializer", "version": "0.10", - "port-version": 1, + "port-version": 2, "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML", "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", - "supports": "!(arm | osx)", "default-features": [ "cpprestjson-archive", "pugixml-archive", diff --git a/ports/directxsdk/vcpkg.json b/ports/directxsdk/vcpkg.json index fd58e7b39b4d63..b43961e7ce9981 100644 --- a/ports/directxsdk/vcpkg.json +++ b/ports/directxsdk/vcpkg.json @@ -1,10 +1,10 @@ { "name": "directxsdk", "version-string": "jun10", - "port-version": 2, + "port-version": 3, "description": "Legacy DirectX SDK", "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", - "supports": "windows & !windows", + "supports": "windows & !uwp & !arm", "features": { "xaudio2-7": { "description": "Include headers/libs for legacy XAudio 2.7 (prefer use of XAudio2Redist)" diff --git a/ports/embree2/portfile.cmake b/ports/embree2/portfile.cmake index 3c38547f85b434..fc1e8384ea7745 100644 --- a/ports/embree2/portfile.cmake +++ b/ports/embree2/portfile.cmake @@ -13,10 +13,9 @@ file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake") string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DEMBREE_ISPC_SUPPORT=OFF -DEMBREE_TUTORIALS=OFF @@ -28,7 +27,7 @@ vcpkg_configure_cmake( # just wait, the release build of embree is insanely slow in MSVC # a single file will took about 2-10 min -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # these cmake files do not seem to contain helpful configuration for find libs, just remove them @@ -36,6 +35,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/uninstall.command" "${CURRENT_PACKAGES_DIR}/debug/uninstall.command") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/embree2/vcpkg.json b/ports/embree2/vcpkg.json index 2ca3509644d32a..e7fdad98dc3a0f 100644 --- a/ports/embree2/vcpkg.json +++ b/ports/embree2/vcpkg.json @@ -1,11 +1,14 @@ { "name": "embree2", "version-semver": "2.17.7", - "port-version": 2, + "port-version": 3, "description": "High Performance Ray Tracing Kernels.", "homepage": "https://github.com/embree/embree", - "supports": "windows", "dependencies": [ - "tbb" + "tbb", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/freealut/vcpkg.json b/ports/freealut/vcpkg.json index fe3830674cbd8b..81739956c98f74 100644 --- a/ports/freealut/vcpkg.json +++ b/ports/freealut/vcpkg.json @@ -1,12 +1,13 @@ { "name": "freealut", - "version-string": "1.1.0", + "version": "1.1.0", + "port-version": 1, "description": [ "FreeALUT is a free implementation of OpenAL's ALUT standard.", "ALUT is a set of portable functions which remove the annoying details of getting an audio application started. It is the OpenAL counterpart of what GLUT is for OpenGL. " ], "homepage": "https://github.com/vancegroup/freealut", - "supports": "!uwp & !arm & !arm64", + "supports": "!uwp", "dependencies": [ "openal-soft", { diff --git a/ports/geotrans/portfile.cmake b/ports/geotrans/portfile.cmake index 930452baa4f2a7..6b56785bcc7ab8 100644 --- a/ports/geotrans/portfile.cmake +++ b/ports/geotrans/portfile.cmake @@ -1,12 +1,9 @@ set(VCPKG_LIBRARY_LINKAGE "dynamic") -message(WARNING "Download ${PORT} may take a several hours to complete!") -message(WARNING "Port ${PORT} source resides NGA US Government military ftp server with an extremely slow connection.") - # We specify the Linux URL, but the only difference between the Windows/Linux packages are the included libraries # which we re-build anyway. There is no source only package provided or it would be preferred (and smaller). vcpkg_download_distfile(ARCHIVE - URLS "ftp://ftp.nga.mil/pub2/gandg/website/wgs84/apps/geotrans/current-version/sw/master_version/master.tgz" + URLS "https://earth-info.nga.mil/php/download.php?file=wgs-mastertgz" FILENAME "geotrans-3.8-master.tgz" SHA512 359704ee9700762111006d126872feab9f644af0cebd433a657473347ea48f4eb172681f5f564fbca171bbf58fe0e8fb0829597403958770b7d22ad380afeac3 ) diff --git a/ports/geotrans/vcpkg.json b/ports/geotrans/vcpkg.json index 788e2307309403..ba21e7c0503cd5 100644 --- a/ports/geotrans/vcpkg.json +++ b/ports/geotrans/vcpkg.json @@ -1,7 +1,8 @@ { "name": "geotrans", - "version-string": "3.8", + "version": "3.8", + "port-version": 1, "description": "GEOTRANS is an application that allows you to convert geographic coordinates among a wide variety of coordinate systems, map projections, grids, and datums. GEOTRANS runs in Microsoft Windows and LINUX environments.", "homepage": "https://earth-info.nga.mil/GandG/update/index.php?action=home", - "supports": "(((x86 | x64) & windows & !static) | ((x86 | x64) & linux)) & !uwp & !arm & !arm64 & !osx & !android" + "supports": "!uwp" } diff --git a/ports/iir1/vcpkg.json b/ports/iir1/vcpkg.json index c99eb9018a1861..3b79f3d6f3c5f1 100644 --- a/ports/iir1/vcpkg.json +++ b/ports/iir1/vcpkg.json @@ -1,8 +1,9 @@ { "name": "iir1", "version": "1.8.0", + "port-version": 1, "description": "Realtime C++ filter library", "homepage": "https://github.com/berndporr/iir1", "license": "MIT", - "supports": "!uwp & !osx" + "supports": "!uwp" } diff --git a/ports/libcbor/vcpkg.json b/ports/libcbor/vcpkg.json index 3a546ab3514bd3..90c54499d8e1cc 100644 --- a/ports/libcbor/vcpkg.json +++ b/ports/libcbor/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcbor", - "version-string": "0.8.0", + "version": "0.8.0", + "port-version": 1, "description": "libcbor is a C library for parsing and generating CBOR, the general-purpose schema-less binary data format", - "homepage": "https://github.com/PJK/libcbor", - "supports": "(x86 | x64) & windows" + "homepage": "https://github.com/PJK/libcbor" } diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json index c42782e1c0bff9..82101d6b975265 100644 --- a/ports/libunifex/vcpkg.json +++ b/ports/libunifex/vcpkg.json @@ -1,9 +1,9 @@ { "name": "libunifex", "version-date": "2021-08-01", + "port-version": 1, "description": "Unified Executors", "homepage": "https://github.com/facebookexperimental/libunifex", - "supports": "!osx", "dependencies": [ { "name": "liburing", diff --git a/ports/libxmlpp/vcpkg.json b/ports/libxmlpp/vcpkg.json index ca45f1bc5041bf..c5f74dfbff22b9 100644 --- a/ports/libxmlpp/vcpkg.json +++ b/ports/libxmlpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxmlpp", "version": "5.0.0", + "port-version": 1, "description": "a C++ wrapper for the libxml XML parser library.", "supports": "!(windows & static)", "dependencies": [ diff --git a/ports/matplotplusplus/vcpkg.json b/ports/matplotplusplus/vcpkg.json index 5650ae9f5e2b5e..296b6f8802b0f7 100644 --- a/ports/matplotplusplus/vcpkg.json +++ b/ports/matplotplusplus/vcpkg.json @@ -1,11 +1,11 @@ { "name": "matplotplusplus", "version-date": "2021-04-11", - "port-version": 4, + "port-version": 5, "description": "A C++ graphics library for data visualization", "homepage": "https://alandefreitas.github.io/matplotplusplus/", "license": "MIT", - "supports": "!(arm | uwp)", + "supports": "!uwp & !(windows & arm)", "dependencies": [ "cimg", { diff --git a/ports/portmidi/vcpkg.json b/ports/portmidi/vcpkg.json index 4486f5bfeba5d4..91d162c4f11365 100644 --- a/ports/portmidi/vcpkg.json +++ b/ports/portmidi/vcpkg.json @@ -1,10 +1,10 @@ { "name": "portmidi", - "version-string": "0.234", - "port-version": 2, + "version": "0.234", + "port-version": 3, "description": "Free, cross-platform, open-source I/O library for MIDI", "homepage": "https://sourceforge.net/projects/portmedia/", - "supports": "!(uwp | arm)", + "supports": "!uwp & !linux", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/xnnpack/vcpkg.json b/ports/xnnpack/vcpkg.json index f3d46ad9416673..cb0339e2829053 100644 --- a/ports/xnnpack/vcpkg.json +++ b/ports/xnnpack/vcpkg.json @@ -1,9 +1,10 @@ { "name": "xnnpack", "version-date": "2021-05-17", + "port-version": 1, "description": "High-efficiency floating-point neural network inference operators for mobile, server, and Web", "homepage": "https://github.com/google/XNNPACK", - "supports": "!arm & !uwp", + "supports": "!(arm & windows) & !uwp", "dependencies": [ "cpuinfo", "fp16", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1982ba0a8c8d26..c705080ad34bef 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -54,6 +54,9 @@ aubio:arm-uwp=fail aubio:x64-uwp=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail +bitserializer:x64-osx=fail +bitserializer:arm64-windows=fail +bitserializer:arm-uwp=fail blend2d:arm64-windows=fail blend2d:arm-uwp=fail blend2d:x64-uwp=fail diff --git a/versions/a-/atk.json b/versions/a-/atk.json index 996b6367fb9d97..f7de501e725763 100644 --- a/versions/a-/atk.json +++ b/versions/a-/atk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf5656ae96a202ad1846f5cb233cc4daf4f3336d", + "version": "2.36.0", + "port-version": 1 + }, { "git-tree": "b8ace143cf9715262f419c85a5840fa15a4cf0ce", "version": "2.36.0", diff --git a/versions/a-/atkmm.json b/versions/a-/atkmm.json index 2f5195231d040e..d338170a691fad 100644 --- a/versions/a-/atkmm.json +++ b/versions/a-/atkmm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "340ce8d9ccb6154374ecbe6bf6c9a70b83442578", + "version": "2.36.0", + "port-version": 1 + }, { "git-tree": "1feae8dc89c99e89b47bb8a028cca2e77d9d4352", "version": "2.36.0", diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 53b81468fc402f..86b1661606da7d 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11fbd98a9560da0ad96abf61d8731778db6e5b8b", + "version": "1.4.1", + "port-version": 3 + }, { "git-tree": "012a033caf02486f3079b0c42036a807f3a7c4d7", "version": "1.4.1", diff --git a/versions/b-/behaviortree-cpp.json b/versions/b-/behaviortree-cpp.json index 6f1a827f0117ea..642a0062397942 100644 --- a/versions/b-/behaviortree-cpp.json +++ b/versions/b-/behaviortree-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96c8331bb642e665bd66a9aa82797d4db84b86fa", + "version": "3.5.6", + "port-version": 1 + }, { "git-tree": "32f97d9bfd43e38949f858a9ce271117b0380c85", "version": "3.5.6", diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index 7e1ce41a5bba9c..15487c81d4dffe 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea63e330fbf462f7d5ab3fa119d105501366ea9c", + "version": "0.10", + "port-version": 2 + }, { "git-tree": "a840c1d638565cbc8c4fd9a4200c0f54136275d7", "version": "0.10", diff --git a/versions/baseline.json b/versions/baseline.json index 2b0fe702c003ff..e2ee6155de30c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -198,11 +198,11 @@ }, "atk": { "baseline": "2.36.0", - "port-version": 0 + "port-version": 1 }, "atkmm": { "baseline": "2.36.0", - "port-version": 0 + "port-version": 1 }, "atlmfc": { "baseline": "0", @@ -322,7 +322,7 @@ }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 2 + "port-version": 3 }, "azure-macro-utils-c": { "baseline": "2020-06-17", @@ -406,7 +406,7 @@ }, "behaviortree-cpp": { "baseline": "3.5.6", - "port-version": 0 + "port-version": 1 }, "benchmark": { "baseline": "1.5.5", @@ -446,7 +446,7 @@ }, "bitserializer": { "baseline": "0.10", - "port-version": 1 + "port-version": 2 }, "bitserializer-cpprestjson": { "baseline": "alias", @@ -1774,7 +1774,7 @@ }, "directxsdk": { "baseline": "jun10", - "port-version": 2 + "port-version": 3 }, "directxtex": { "baseline": "aug2021", @@ -1954,7 +1954,7 @@ }, "embree2": { "baseline": "2.17.7", - "port-version": 2 + "port-version": 3 }, "embree3": { "baseline": "3.12.2", @@ -2190,7 +2190,7 @@ }, "freealut": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "freeglut": { "baseline": "3.2.1", @@ -2334,7 +2334,7 @@ }, "geotrans": { "baseline": "3.8", - "port-version": 0 + "port-version": 1 }, "getdns": { "baseline": "1.6.0", @@ -2738,7 +2738,7 @@ }, "iir1": { "baseline": "1.8.0", - "port-version": 0 + "port-version": 1 }, "ijg-libjpeg": { "baseline": "9d", @@ -3206,7 +3206,7 @@ }, "libcbor": { "baseline": "0.8.0", - "port-version": 0 + "port-version": 1 }, "libcds": { "baseline": "2.3.3", @@ -3826,7 +3826,7 @@ }, "libunifex": { "baseline": "2021-08-01", - "port-version": 0 + "port-version": 1 }, "libunistring": { "baseline": "0.9.10", @@ -3906,7 +3906,7 @@ }, "libxmlpp": { "baseline": "5.0.0", - "port-version": 0 + "port-version": 1 }, "libxmp-lite": { "baseline": "4.4.1", @@ -4126,7 +4126,7 @@ }, "matplotplusplus": { "baseline": "2021-04-11", - "port-version": 4 + "port-version": 5 }, "matroska": { "baseline": "1.6.2", @@ -5174,7 +5174,7 @@ }, "portmidi": { "baseline": "0.234", - "port-version": 2 + "port-version": 3 }, "portsmf": { "baseline": "0.238", @@ -7002,7 +7002,7 @@ }, "xnnpack": { "baseline": "2021-05-17", - "port-version": 0 + "port-version": 1 }, "xorstr": { "baseline": "2020-11-29", diff --git a/versions/d-/directxsdk.json b/versions/d-/directxsdk.json index f75c32c7957422..361bb976f62915 100644 --- a/versions/d-/directxsdk.json +++ b/versions/d-/directxsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49dc911dc7c69f6e0eee0279afcf53187d547ae5", + "version-string": "jun10", + "port-version": 3 + }, { "git-tree": "1bc75766eb1ace518c8c85f8ffda0c627d714edd", "version-string": "jun10", diff --git a/versions/e-/embree2.json b/versions/e-/embree2.json index 2502c3c01abcb3..668cfc9cc572c1 100644 --- a/versions/e-/embree2.json +++ b/versions/e-/embree2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4048eb6da97d8a23b849a1b5fba7ba93f9c33bf", + "version-semver": "2.17.7", + "port-version": 3 + }, { "git-tree": "cc259bcc8185631761c55b23d95afba48e8bae70", "version-semver": "2.17.7", diff --git a/versions/f-/freealut.json b/versions/f-/freealut.json index 595bb98d3df4f5..6bc300bb798ce0 100644 --- a/versions/f-/freealut.json +++ b/versions/f-/freealut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba650aae9b1cf7a21c83ad0303f1bc520a82740b", + "version": "1.1.0", + "port-version": 1 + }, { "git-tree": "d4108f61eb91e67aacdfd186074e835f0541676b", "version-string": "1.1.0", diff --git a/versions/g-/geotrans.json b/versions/g-/geotrans.json index b9668b6ab5b8d7..f4cf084b0fff87 100644 --- a/versions/g-/geotrans.json +++ b/versions/g-/geotrans.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9b1a18f0cadf69936ab62911f4d86fdb565c693", + "version": "3.8", + "port-version": 1 + }, { "git-tree": "c49a4b2acb6f902afde98571c97ef6c8358d2c89", "version-string": "3.8", diff --git a/versions/i-/iir1.json b/versions/i-/iir1.json index a6a963b458bdf4..ae15bbc5fa9ddf 100644 --- a/versions/i-/iir1.json +++ b/versions/i-/iir1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cab65e09816beaca2cdc9688f4d61ae448f6877", + "version": "1.8.0", + "port-version": 1 + }, { "git-tree": "e41ac2805b2adb0c3e32eba808d75284e8f8c376", "version": "1.8.0", diff --git a/versions/l-/libcbor.json b/versions/l-/libcbor.json index 6e26aa711df3a5..105e60aae4cbe5 100644 --- a/versions/l-/libcbor.json +++ b/versions/l-/libcbor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02d970a2dac8b0abb941a5b445f7e14afc9c1e49", + "version": "0.8.0", + "port-version": 1 + }, { "git-tree": "ef3f79d600e1f00656e522591c6ff7beed247e3a", "version-string": "0.8.0", diff --git a/versions/l-/libunifex.json b/versions/l-/libunifex.json index 621c7b834c04e6..2eb60baac970a1 100644 --- a/versions/l-/libunifex.json +++ b/versions/l-/libunifex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c98590771b98cb8c31e49867e78983853307a1f", + "version-date": "2021-08-01", + "port-version": 1 + }, { "git-tree": "150573588108677bf5bbcb832d1249bd73f76e36", "version-date": "2021-08-01", diff --git a/versions/l-/libxmlpp.json b/versions/l-/libxmlpp.json index 843b85447034a5..9db123f9e0e9f7 100644 --- a/versions/l-/libxmlpp.json +++ b/versions/l-/libxmlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d3b0562bb045d23c33e6c01ed6d418c8f20f2358", + "version": "5.0.0", + "port-version": 1 + }, { "git-tree": "f70632020762c80c63290e7f627e00a0614c0d06", "version": "5.0.0", diff --git a/versions/m-/matplotplusplus.json b/versions/m-/matplotplusplus.json index a1a7f045919ca2..6d730f39d3ef62 100644 --- a/versions/m-/matplotplusplus.json +++ b/versions/m-/matplotplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0496a49614d3fc1f77f20f230b3168720140c3b", + "version-date": "2021-04-11", + "port-version": 5 + }, { "git-tree": "ee89d0f23b11e362fb9e65670377c47b35ffea6c", "version-date": "2021-04-11", diff --git a/versions/p-/portmidi.json b/versions/p-/portmidi.json index 1205e0376be6e8..1cb7102a414a63 100644 --- a/versions/p-/portmidi.json +++ b/versions/p-/portmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4d17cd16212900720faf6d5895734341e5b269d", + "version": "0.234", + "port-version": 3 + }, { "git-tree": "70a85d5a9ddc162df4c7296caf7ac8633089d50c", "version-string": "0.234", diff --git a/versions/x-/xnnpack.json b/versions/x-/xnnpack.json index df28faff737e8d..b5261f4f60f613 100644 --- a/versions/x-/xnnpack.json +++ b/versions/x-/xnnpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d998602ed266e9cf140fb6740fea8625276a48f5", + "version-date": "2021-05-17", + "port-version": 1 + }, { "git-tree": "a35b56ac05249424cfcc4ad4727e34d7e1216f25", "version-date": "2021-05-17", From e62fd2634e6774be7c00474fd8f4e6c18b35ffc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 17 Sep 2021 17:21:33 +0200 Subject: [PATCH 0583/1858] [ECM] fix FindCanberra for static builds (#20213) * [ECM] fix FindCanberra for static builds Also remove dangling do-not-override-custom-clang-format-files.patch * [ECM] use current spec * [ECM] wrap paths in quotes * [ECM] update versions --- ...t-override-custom-clang-format-files.patch | 33 ---------------- ports/ecm/fix_canberra.patch | 39 +++++++++++++++++++ ports/ecm/portfile.cmake | 15 +++---- ports/ecm/vcpkg.json | 13 ++++++- versions/baseline.json | 2 +- versions/e-/ecm.json | 5 +++ 6 files changed, 65 insertions(+), 42 deletions(-) delete mode 100644 ports/ecm/do-not-override-custom-clang-format-files.patch create mode 100644 ports/ecm/fix_canberra.patch diff --git a/ports/ecm/do-not-override-custom-clang-format-files.patch b/ports/ecm/do-not-override-custom-clang-format-files.patch deleted file mode 100644 index 4e7f4e286de30a..00000000000000 --- a/ports/ecm/do-not-override-custom-clang-format-files.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0d5ed9bb9117f6526691b3572bf85090efbeed4a Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau -Date: Sat, 30 Jan 2021 13:44:07 +0100 -Subject: [PATCH] KDEClangFormat: Do not override custom clang-format files - ---- - kde-modules/KDEClangFormat.cmake | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/kde-modules/KDEClangFormat.cmake b/kde-modules/KDEClangFormat.cmake -index 6cdbd2b5..995f03ad 100644 ---- a/kde-modules/KDEClangFormat.cmake -+++ b/kde-modules/KDEClangFormat.cmake -@@ -35,7 +35,18 @@ find_program(KDE_CLANG_FORMAT_EXECUTABLE clang-format) - - # instantiate our clang-format file, must be in source directory for tooling if we have the tool - if(KDE_CLANG_FORMAT_EXECUTABLE) -- configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format @ONLY) -+ set(CLANG_FORMAT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/.clang-format) -+ if (EXISTS ${CLANG_FORMAT_FILE}) -+ file(READ ${CLANG_FORMAT_FILE} CLANG_FORMAT_CONTENTS LIMIT 128) -+ string(FIND "${CLANG_FORMAT_CONTENTS}" "SPDX-FileCopyrightText: 2019 Christoph Cullmann" matchres) -+ if(${matchres} EQUAL -1) -+ message(WARNING "The .clang-format file already exists. Please remove it in order to use the file provided by ECM") -+ else() -+ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) -+ endif() -+ else() -+ configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) -+ endif() - endif() - - # formatting target diff --git a/ports/ecm/fix_canberra.patch b/ports/ecm/fix_canberra.patch new file mode 100644 index 00000000000000..dcfcaba6f0a40e --- /dev/null +++ b/ports/ecm/fix_canberra.patch @@ -0,0 +1,39 @@ +From 203c65c562453385e3ffc4485844b15e80b93107 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Fri, 17 Sep 2021 00:07:08 +0200 +Subject: [PATCH] FindCanberra: link against target provided by pkgconfig + +target_link_libraries() against the target generated by +pkg_check_modules() so that the additional linker options are not +lost, such as the additional libraries to link against when +building statically. + +BUG: 442555 +--- + find-modules/FindCanberra.cmake | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/find-modules/FindCanberra.cmake b/find-modules/FindCanberra.cmake +index c54adf99..f9561118 100644 +--- a/find-modules/FindCanberra.cmake ++++ b/find-modules/FindCanberra.cmake +@@ -34,7 +34,7 @@ Since 5.56.0. + #]=======================================================================] + + find_package(PkgConfig QUIET) +-pkg_check_modules(PC_Canberra libcanberra QUIET) ++pkg_check_modules(PC_Canberra REQUIRED IMPORTED_TARGET libcanberra QUIET) + + find_library(Canberra_LIBRARIES + NAMES canberra +@@ -66,6 +66,7 @@ if(Canberra_FOUND AND NOT TARGET Canberra::Canberra) + INTERFACE_COMPILE_OPTIONS "${PC_Canberra_CFLAGS}" + INTERFACE_INCLUDE_DIRECTORIES "${Canberra_INCLUDE_DIRS}" + ) ++ target_link_libraries(Canberra::Canberra INTERFACE PkgConfig::PC_Canberra) + endif() + + mark_as_advanced(Canberra_LIBRARIES Canberra_INCLUDE_DIRS Canberra_VERSION) +-- +GitLab + diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 5d07071eba9378..53acd4d8dd1d43 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -4,11 +4,12 @@ vcpkg_from_github( REF v5.84.0 SHA512 d49397bcf0d49a95c86c9d9a4e653015ee8b3ef1261b2842439bba7ff3363ac06351fa2df4035c2cb36397d2fc64375a14966ada29f231df51ba26d8e196d6ef HEAD_REF master + PATCHES + fix_canberra.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF @@ -16,14 +17,14 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Remove debug files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(COPY ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json index 3f081e37a894ec..bc120806eed8cb 100644 --- a/ports/ecm/vcpkg.json +++ b/ports/ecm/vcpkg.json @@ -1,6 +1,17 @@ { "name": "ecm", "version": "5.84.0", + "port-version": 1, "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", - "homepage": "https://github.com/KDE/extra-cmake-modules" + "homepage": "https://github.com/KDE/extra-cmake-modules", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index e2ee6155de30c2..2905c3109c9d55 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1910,7 +1910,7 @@ }, "ecm": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "ecos": { "baseline": "2.0.8", diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index 4befe9d8fdebb3..5ce5bb02b05c1e 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5832b19b778f60eb0fb24654e0c8b665f0f8fb20", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "9cd1bc0ab97889acb8839e22ec43d13bc7c97ed0", "version": "5.84.0", From f712bf9dc418ef4c8aa0aaf4292fc6f8548e0b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 17 Sep 2021 23:22:11 +0800 Subject: [PATCH 0584/1858] [libdatachannel] Export the include path to cmake configure file (#20225) * [libdatachannel] Export the include path to cmake configure file * version * Convert deprecated functions * version * Format * version --- .../0002-fix-export-include.patch | 66 +++++++++++++++++++ ports/libdatachannel/portfile.cmake | 18 ++--- ports/libdatachannel/vcpkg.json | 11 +++- versions/baseline.json | 2 +- versions/l-/libdatachannel.json | 5 ++ 5 files changed, 91 insertions(+), 11 deletions(-) create mode 100644 ports/libdatachannel/0002-fix-export-include.patch diff --git a/ports/libdatachannel/0002-fix-export-include.patch b/ports/libdatachannel/0002-fix-export-include.patch new file mode 100644 index 00000000000000..980f242b937b37 --- /dev/null +++ b/ports/libdatachannel/0002-fix-export-include.patch @@ -0,0 +1,66 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c01184..0adff6f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -217,18 +217,22 @@ set_target_properties(datachannel-static PROPERTIES + VERSION ${PROJECT_VERSION} + CXX_STANDARD 17) + +-target_include_directories(datachannel PUBLIC $) ++target_include_directories(datachannel PUBLIC ++ $ ++ $) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) + target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) +-target_link_libraries(datachannel PUBLIC Threads::Threads) ++target_link_libraries(datachannel PRIVATE Threads::Threads) + target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) + +-target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) ++target_include_directories(datachannel-static PUBLIC ++ $ ++ $) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) + target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) + target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) +-target_link_libraries(datachannel-static PUBLIC Threads::Threads) ++target_link_libraries(datachannel-static PRIVATE Threads::Threads) + target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) + + if(WIN32) +diff --git a/examples/client-benchmark/CMakeLists.txt b/examples/client-benchmark/CMakeLists.txt +index ad0024c..a734db6 100644 +--- a/examples/client-benchmark/CMakeLists.txt ++++ b/examples/client-benchmark/CMakeLists.txt +@@ -3,6 +3,7 @@ if(POLICY CMP0079) + cmake_policy(SET CMP0079 NEW) + endif() + ++find_package(Threads) + if(WIN32) + add_executable(datachannel-client-benchmark main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h) + target_compile_definitions(datachannel-client-benchmark PUBLIC STATIC_GETOPT) +@@ -15,7 +16,7 @@ set_target_properties(datachannel-client-benchmark PROPERTIES + OUTPUT_NAME client-benchmark) + set_target_properties(datachannel-client-benchmark PROPERTIES + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.github.paullouisageneau.libdatachannel.examples.client.benchmark) +-target_link_libraries(datachannel-client-benchmark datachannel nlohmann_json) ++target_link_libraries(datachannel-client-benchmark datachannel nlohmann_json Threads::Threads) + + if(WIN32) + add_custom_command(TARGET datachannel-client-benchmark POST_BUILD +diff --git a/examples/streamer/CMakeLists.txt b/examples/streamer/CMakeLists.txt +index cebec95..3e73160 100644 +--- a/examples/streamer/CMakeLists.txt ++++ b/examples/streamer/CMakeLists.txt +@@ -47,7 +47,8 @@ set_target_properties(streamer PROPERTIES + set_target_properties(streamer PROPERTIES + XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.github.paullouisageneau.libdatachannel.examples.streamer) + +-target_link_libraries(streamer datachannel nlohmann_json) ++find_package(Threads) ++target_link_libraries(streamer datachannel nlohmann_json Threads::Threads) + + if(WIN32) + add_custom_command(TARGET streamer POST_BUILD diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 0f8b15881b7d67..96033b72334efd 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES 0001-fix-for-vcpkg.patch + 0002-fix-export-include.patch # Remove this patch in the next update ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -16,9 +17,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS srtp NO_MEDIA ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DUSE_SYSTEM_SRTP=ON @@ -26,19 +26,19 @@ vcpkg_configure_cmake( -DNO_TESTS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libdatachannel) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libdatachannel) vcpkg_fixup_pkgconfig() -file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake DATACHANNEL_CONFIG) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake " +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake" DATACHANNEL_CONFIG) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake" " include(CMakeFindDependencyMacro) find_dependency(Threads) find_dependency(OpenSSL) find_dependency(libjuice) ${DATACHANNEL_CONFIG}") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index cccbf06e11a6dc..4c34b761847ed8 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,13 +1,22 @@ { "name": "libdatachannel", "version-semver": "0.14.3", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ "libjuice", "openssl", "plog", - "usrsctp" + "usrsctp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "ws" diff --git a/versions/baseline.json b/versions/baseline.json index 2905c3109c9d55..5668931d107bdd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3242,7 +3242,7 @@ }, "libdatachannel": { "baseline": "0.14.3", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.10", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index 2b7b41a6f67fd3..b351d9f3b31946 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e6c861ece23dfcb6f777b4a63dd97592cd578db", + "version-semver": "0.14.3", + "port-version": 1 + }, { "git-tree": "9cb7fedbd9d94190697740000539fb124d2b57d4", "version-semver": "0.14.3", From 00add0bbdc6a00dd5c05f92d2732182cb0a22d01 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Sat, 18 Sep 2021 01:18:36 +0900 Subject: [PATCH 0585/1858] [neon2sse] create a new port (#20200) * [neon2sse] create a new port * [neon2sse] update baseline JSON * [neon2sse] use package name NEON2_S_SE --- ports/neon2sse/portfile.cmake | 18 ++++++++++++++++++ ports/neon2sse/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/n-/neon2sse.json | 9 +++++++++ 4 files changed, 47 insertions(+) create mode 100644 ports/neon2sse/portfile.cmake create mode 100644 ports/neon2sse/vcpkg.json create mode 100644 versions/n-/neon2sse.json diff --git a/ports/neon2sse/portfile.cmake b/ports/neon2sse/portfile.cmake new file mode 100644 index 00000000000000..477e109a016913 --- /dev/null +++ b/ports/neon2sse/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO intel/ARM_NEON_2_x86_SSE + REF a1652fd5253afbf3e39357b012974f93511f6108 + SHA512 9f8aa283e48eb3b615da3d89ec4165d1ec9599e8e181059c2b9acb2921ce753ce0f29b8c321d7d6661f10eb67e234c629df75853b87c4139a9bb137dbb3f4fc1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME NEON_2_SSE CONFIG_PATH lib/cmake/NEON_2_SSE) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" +) diff --git a/ports/neon2sse/vcpkg.json b/ports/neon2sse/vcpkg.json new file mode 100644 index 00000000000000..c705b9ededdee8 --- /dev/null +++ b/ports/neon2sse/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "neon2sse", + "version-date": "2021-09-16", + "description": "Open standard for machine learning interoperability", + "homepage": "https://github.com/intel/ARM_NEON_2_x86_SSE", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5668931d107bdd..0c3cce9c26ace3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4488,6 +4488,10 @@ "baseline": "0.0.0-7cb75d4e", "port-version": 1 }, + "neon2sse": { + "baseline": "2021-09-16", + "port-version": 0 + }, "netcdf-c": { "baseline": "4.7.4", "port-version": 4 diff --git a/versions/n-/neon2sse.json b/versions/n-/neon2sse.json new file mode 100644 index 00000000000000..e3590ae1a1671d --- /dev/null +++ b/versions/n-/neon2sse.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "02bae7681d6c8c026a5f49dd3b4b37a430ea6878", + "version-date": "2021-09-16", + "port-version": 0 + } + ] +} From 038c98476379cca901ed2b8a2c3c05d517158953 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 20 Sep 2021 08:56:51 -0700 Subject: [PATCH 0586/1858] Unskip cmark:x64-windows-static in ci.baseline.txt. (#20216) In last night's CI run: https://dev.azure.com/vcpkg/public/_build/results?buildId=59667 PASSING, REMOVE FROM FAIL LIST: cmark:x64-windows-static --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c705080ad34bef..9793facf03aa55 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -137,7 +137,6 @@ clblast:x64-windows-static=fail clblast:x64-windows-static-md=fail clockutils:x64-linux=fail clockutils:x64-osx=fail -cmark:x64-windows-static=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip From f2a97b66be5c5737cf7fb33d44f2e2377311b503 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 20 Sep 2021 17:57:30 +0200 Subject: [PATCH 0587/1858] vcpkg ci: grep returns -1 when it finds nothing, use || true so that the term returns 0 (#20236) --- .github/workflows/untrustedPR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml index 22ba597ddd6c97..cb77b745f8a2fb 100644 --- a/.github/workflows/untrustedPR.yml +++ b/.github/workflows/untrustedPR.yml @@ -38,7 +38,7 @@ jobs: git config user.email github-actions git config user.name github-actions@github.com - git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`"; done > .github-pr.deprecated-cmake + git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake ./vcpkg format-manifest --all --convert-control git diff > .github-pr.format-manifest git add -u From 107580d0f59f8ddfc6608a5a6b2c4fda9c0d0bc9 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 20 Sep 2021 09:07:26 -0700 Subject: [PATCH 0588/1858] [docs] Document deprecated functions from #20142 in the maintainer guide. (#20217) * Document deprecated functions from #20142 in the maintainer guide. See discussion at https://github.com/microsoft/vcpkg/pull/20142#issuecomment-921146572 * Reorder list to match natural `portfile.cmake` order, as suggested by @dg0yt --- docs/maintainers/maintainer-guide.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 185d3d15bbed66..2bd8f61f5a80d7 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -46,6 +46,25 @@ At this time, the following helpers are deprecated: 2. `vcpkg_apply_patches()` should be replaced by the `PATCHES` arguments to the "extract" helpers (e.g. [`vcpkg_from_github()`](vcpkg_from_github.md)) 3. `vcpkg_build_msbuild()` should be replaced by [`vcpkg_install_msbuild()`](vcpkg_install_msbuild.md) 4. `vcpkg_copy_tool_dependencies()` should be replaced by [`vcpkg_copy_tools()`](vcpkg_copy_tools.md) +5. `vcpkg_configure_cmake` should be replaced by [`vcpkg_cmake_configure()`](vcpkg_cmake_configure.md) after removing `PREFER_NINJA` (from port `vcpkg-cmake`) +6. `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](vcpkg_cmake_build.md) (from port `vcpkg-cmake`) +7. `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](vcpkg_cmake_install.md) (from port `vcpkg-cmake`) +8. `vcpkg_fixup_cmake_targets` should be replaced by [`vcpkg_cmake_config_fixup`](vcpkg_cmake_config_fixup.md) (from port `vcpkg-cmake-config`) + +Some of the replacement helper functions are in "tools ports" to allow consumers to pin their +behavior at specific versions, to allow locking the behavior of the helpers at a particular +version. Tools ports need to be added to your port's `"dependencies"`, like so: + +```json +{ + "name": "vcpkg-cmake", + "host": true +}, +{ + "name": "vcpkg-cmake-config", + "host": true +} +``` ### Avoid excessive comments in portfiles From 940550846f497dc4dcebb79b5d74cf7f12f50165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 20 Sep 2021 18:31:13 +0200 Subject: [PATCH 0589/1858] [gmp] Enable C++ support on Unix (#20205) * [gmp] enable C++ support * [gmp] update versions --- ports/gmp/portfile.cmake | 3 ++- ports/gmp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gmp.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake index 5356098f429d1f..6007ad9c60dd3b 100644 --- a/ports/gmp/portfile.cmake +++ b/ports/gmp/portfile.cmake @@ -103,7 +103,8 @@ else() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG - OPTIONS ${OPTIONS} + OPTIONS + --enable-cxx ) vcpkg_install_make() diff --git a/ports/gmp/vcpkg.json b/ports/gmp/vcpkg.json index 3f9b609b33b19b..f907a9babdb175 100644 --- a/ports/gmp/vcpkg.json +++ b/ports/gmp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gmp", "version-string": "6.2.1", - "port-version": 6, + "port-version": 7, "description": "The GNU Multiple Precision Arithmetic Library", "homepage": "https://gmplib.org", "supports": "!(windows & (arm | arm64))", diff --git a/versions/baseline.json b/versions/baseline.json index 0c3cce9c26ace3..764d04d4ec2bc3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2446,7 +2446,7 @@ }, "gmp": { "baseline": "6.2.1", - "port-version": 6 + "port-version": 7 }, "google-cloud-cpp": { "baseline": "1.31.1", diff --git a/versions/g-/gmp.json b/versions/g-/gmp.json index 3b9358d4d7ccdf..52dbc389f06f3d 100644 --- a/versions/g-/gmp.json +++ b/versions/g-/gmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d207c0d8a6481f96f2277fd3245f2a80456a706", + "version-string": "6.2.1", + "port-version": 7 + }, { "git-tree": "645878e32f8ab4e926f605107c761433515a17dd", "version-string": "6.2.1", From fa7995afe433f611014c7f62dc076fd23b13a964 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Mon, 20 Sep 2021 13:01:46 -0400 Subject: [PATCH 0590/1858] [aws-sdk-cpp] Fix targets for aws-sdk-cpp components (#20222) * [s2n] Add missing release target * [aws-sdk-cpp] Fix targets --- ports/aws-sdk-cpp/portfile.cmake | 38 +++++++++++++++++--------------- ports/aws-sdk-cpp/vcpkg.json | 2 +- ports/s2n/portfile.cmake | 7 ++++-- ports/s2n/vcpkg.json | 1 + versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- versions/s-/s2n.json | 7 +++++- 7 files changed, 40 insertions(+), 24 deletions(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 66cc714a668c82..eb22b3aa748f42 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -40,26 +40,28 @@ endif() set(BUILD_ONLY core) include(${CMAKE_CURRENT_LIST_DIR}/compute_build_only.cmake) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${EXTRA_ARGS} + "-DENABLE_UNITY_BUILD=ON" + "-DENABLE_TESTING=OFF" + "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" + "-DBUILD_ONLY=${BUILD_ONLY}" + "-DBUILD_DEPS=OFF" + "-DBUILD_SHARED_LIBS=OFF" + "-DCMAKE_INSTALL_RPATH=${rpath}" + "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files +) +vcpkg_cmake_install() foreach(TARGET IN LISTS BUILD_ONLY) - message(STATUS "Building ${TARGET}") - vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - DISABLE_PARALLEL_CONFIGURE - OPTIONS - ${EXTRA_ARGS} - "-DENABLE_UNITY_BUILD=ON" - "-DENABLE_TESTING=OFF" - "-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}" - "-DBUILD_ONLY=${TARGET}" - "-DBUILD_DEPS=OFF" - "-DCMAKE_INSTALL_RPATH=${rpath}" - "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files - ) - vcpkg_cmake_install() - vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) - vcpkg_copy_pdbs() -endforeach() + vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK") + +vcpkg_copy_pdbs() file(GLOB_RECURSE AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/*/*-targets-*.cmake") foreach(AWS_TARGET IN LISTS AWS_TARGETS) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 3007b888bb69e8..211e80e6ddd747 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,7 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.9.96", - "port-version": 1, + "port-version": 2, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "supports": "!arm & !uwp", diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake index ee7d239069b40f..151ba028192d6f 100644 --- a/ports/s2n/portfile.cmake +++ b/ports/s2n/portfile.cmake @@ -8,15 +8,18 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) vcpkg_cmake_install() file(GLOB SHARED_CMAKE_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/s2n" + "${CURRENT_PACKAGES_DIR}/lib/s2n" ) -file(COPY "${SHARED_CMAKE_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") + +foreach(FILE ${SHARED_CMAKE_FILES}) + file(COPY "${FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") +endforeach() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json index d1fda96cae8494..51359206ebd847 100644 --- a/ports/s2n/vcpkg.json +++ b/ports/s2n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "s2n", "version": "1.0.17", + "port-version": 1, "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "supports": "!uwp & !windows", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index 43f797703aba89..e3c650d03934cd 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c6b4335305034bea75f07f368e51142abddb789", + "version": "1.9.96", + "port-version": 2 + }, { "git-tree": "5989ba8996df75b9195ef2f429191b48602236c9", "version": "1.9.96", diff --git a/versions/baseline.json b/versions/baseline.json index 764d04d4ec2bc3..a86bafbdafe960 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -298,7 +298,7 @@ }, "aws-sdk-cpp": { "baseline": "1.9.96", - "port-version": 1 + "port-version": 2 }, "azmq": { "baseline": "2020-03-03", @@ -5846,7 +5846,7 @@ }, "s2n": { "baseline": "1.0.17", - "port-version": 0 + "port-version": 1 }, "safeint": { "baseline": "3.0.26", diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json index 422be50ca76a48..95229e705a18d8 100644 --- a/versions/s-/s2n.json +++ b/versions/s-/s2n.json @@ -1,9 +1,14 @@ { "versions": [ + { + "git-tree": "8df5dce6a28decc5f853d2efd6d657374709d1b2", + "version": "1.0.17", + "port-version": 1 + }, { "git-tree": "10a083844c389053abc2f6ca624f9080712b6b34", "version": "1.0.17", "port-version": 0 } ] -} \ No newline at end of file +} From 84ff763e11308dae52a088081e3d47f1f4bb74ba Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 20 Sep 2021 10:02:13 -0700 Subject: [PATCH 0591/1858] [mDNSResponder] Update to 878.270.2 (#20226) Co-authored-by: Cheney-Wang --- ports/mdnsresponder/portfile.cmake | 40 +++++++++++++++--------------- ports/mdnsresponder/vcpkg.json | 3 +-- versions/baseline.json | 4 +-- versions/m-/mdnsresponder.json | 5 ++++ 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/ports/mdnsresponder/portfile.cmake b/ports/mdnsresponder/portfile.cmake index 337cf0bdc24b91..99dbbdd2d18694 100644 --- a/ports/mdnsresponder/portfile.cmake +++ b/ports/mdnsresponder/portfile.cmake @@ -1,7 +1,9 @@ +vcpkg_fail_port_install(ON_ARCH "arm") + vcpkg_download_distfile(ARCHIVE - URLS https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-765.30.11.tar.gz - FILENAME mDNSResponder-765.30.11.tar.gz - SHA512 dfdea663ec1089058c2225ede13d70241dfec8311ff7fb8d29c8d386f5077a4104455d78f8777496cce96b8ff289b73ed1aec2bf65c52154b866fc1b7675ef90 + URLS https://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-878.270.2.tar.gz + FILENAME mDNSResponder-878.270.2.tar.gz + SHA512 dbc1805c757fceb2b37165ad2575e4084447c10f47ddc871f5476e25affd91f5f759662c17843e30857a9ea1ffd25132bc8012737cf22700ac329713e6a3ac0a ) vcpkg_extract_source_archive_ex( @@ -11,8 +13,6 @@ vcpkg_extract_source_archive_ex( IF (TRIPLET_SYSTEM_ARCH MATCHES "x86") SET(BUILD_ARCH "Win32") -ELSEIF(TRIPLET_SYSTEM_ARCH MATCHES "arm") - MESSAGE(FATAL_ERROR " ARM is currently not supported.") ELSE() SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) ENDIF() @@ -57,39 +57,39 @@ function(FIX_VCXPROJ VCXPROJ_PATH) file(WRITE ${VCXPROJ_PATH} "${ORIG}") endfunction() -FIX_VCXPROJ(${SOURCE_PATH}/mDNSWindows/DLL/dnssd.vcxproj) -FIX_VCXPROJ(${SOURCE_PATH}/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj) +FIX_VCXPROJ("${SOURCE_PATH}/mDNSWindows/DLL/dnssd.vcxproj") +FIX_VCXPROJ("${SOURCE_PATH}/Clients/DNS-SD.VisualStudio/dns-sd.vcxproj") vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/mDNSResponder.sln + PROJECT_PATH "${SOURCE_PATH}/mDNSResponder.sln" PLATFORM ${BUILD_ARCH} TARGET dns-sd ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(INSTALL - ${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Release/dnssd.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Release/dnssd.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" ) file(INSTALL - ${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Debug/dnssd.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Debug/dnssd.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" ) endif() file(INSTALL - ${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Release/dnssd.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Release/dnssd.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Debug/dnssd.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + "${SOURCE_PATH}/mDNSWindows/DLL/${BUILD_ARCH}/Debug/dnssd.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) file(INSTALL - ${SOURCE_PATH}/mDNSShared/dns_sd.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include + "${SOURCE_PATH}/mDNSShared/dns_sd.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" ) file(INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/mdnsresponder/copyright + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" ) vcpkg_copy_pdbs() diff --git a/ports/mdnsresponder/vcpkg.json b/ports/mdnsresponder/vcpkg.json index 0cdef4cb732300..86839bd05993e7 100644 --- a/ports/mdnsresponder/vcpkg.json +++ b/ports/mdnsresponder/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mdnsresponder", - "version-string": "765.30.11", - "port-version": 4, + "version": "878.270.2", "description": "The mDNSResponder project is a component of Bonjour, Apple's ease-of-use IP networking initiative.", "homepage": "https://developer.apple.com/bonjour/", "supports": "!arm" diff --git a/versions/baseline.json b/versions/baseline.json index a86bafbdafe960..11436c8c120c64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4145,8 +4145,8 @@ "port-version": 0 }, "mdnsresponder": { - "baseline": "765.30.11", - "port-version": 4 + "baseline": "878.270.2", + "port-version": 0 }, "mecab": { "baseline": "2019-09-25", diff --git a/versions/m-/mdnsresponder.json b/versions/m-/mdnsresponder.json index 642d33b22cf28a..1503ea66832e5f 100644 --- a/versions/m-/mdnsresponder.json +++ b/versions/m-/mdnsresponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0feece31cd1ade61b7f16a0a23880d3b29ad3eb4", + "version": "878.270.2", + "port-version": 0 + }, { "git-tree": "a9fb04c2649c37b42f0566c79c795d874d053df6", "version-string": "765.30.11", From 7760238ffe486d829f729f7e949ab0e14488d0b6 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 20 Sep 2021 10:52:36 -0700 Subject: [PATCH 0592/1858] [ci] Skip directxsdk:...windows and embree2:x64-linux in CI. (#20265) Looked at most recent build https://dev.azure.com/vcpkg/public/_build/results?buildId=59859 REGRESSION: dxsdk-d3dx:x86-windows REGRESSION: dxsdk-d3dx:x64-windows ``` The following files are already installed in D:/installed/x86-windows and are in conflict with dxsdk-d3dx:x86-windows Installed by directxsdk:x86-windows debug/lib/d3dx10d.lib debug/lib/d3dx11d.lib debug/lib/d3dx9d.lib lib/d3dx10.lib lib/d3dx11.lib lib/d3dx9.lib ``` Probably caused by https://github.com/microsoft/vcpkg/pull/20053/ which removed windows & !windows from the directxsdk supports field. PASSING, REMOVE FROM FAIL LIST: cmark:x64-windows-static Already filed https://github.com/microsoft/vcpkg/pull/20216 last week about this. ARM: vcpkg crashed. Reported to team chat. OSX: agent died: ##[error]We stopped hearing from agent vcpkg-eg-mac-02. Looks to be the same outstanding tensorflow problem :( REGRESSION: embree3:x64-linux ``` Starting package 640/1653: embree3:x64-linux Building package embree3[avx,avx2,core,sse2,sse42]:x64-linux... -- Downloading https://github.com/embree/embree/archive/v3.12.2.tar.gz -> embree-embree-v3.12.2.tar.gz... -- Extracting source /mnt/vcpkg-ci/downloads/embree-embree-v3.12.2.tar.gz -- Applying patch fix-path.patch -- Applying patch fix-static-usage.patch -- Applying patch cmake_policy.patch -- Applying patch fix-targets-file-not-found.patch -- Using source at /mnt/vcpkg-ci/buildtrees/embree3/src/v3.12.2-cbae4ce8b1.clean -- Configuring x64-linux-dbg -- Configuring x64-linux-rel CMake Warning at scripts/cmake/vcpkg_configure_cmake.cmake:433 (message): The following variables are not used in CMakeLists.txt: EMBREE_STATIC_RUNTIME Please recheck them and remove the unnecessary options from the `vcpkg_configure_cmake` call. If these options should still be passed for whatever reason, please use the `MAYBE_UNUSED_VARIABLES` argument. Call Stack (most recent call first): ports/embree3/portfile.cmake:50 (vcpkg_configure_cmake) scripts/ports.cmake:140 (include) -- Building x64-linux-dbg -- Building x64-linux-rel -- Installing: /mnt/vcpkg-ci/packages/embree3_x64-linux/share/embree3/copyright -- Performing post-build validation ``` Probably caused by https://github.com/microsoft/vcpkg/pull/20053 which removed supports:windows from embree2. --- scripts/ci.baseline.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 9793facf03aa55..8bdb71d556de25 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -214,6 +214,9 @@ devicenameresolver:x64-windows-static=fail dimcli:arm-uwp=fail dimcli:x64-osx=fail dimcli:x64-uwp=fail +# legacy directxsdk which conflicts with dxsdk-d3dx +directxsdk:x86-windows=skip +directxsdk:x64-windows=skip discord-game-sdk:x64-windows-static=fail discord-game-sdk:x64-windows-static-md=fail discord-rpc:arm-uwp=fail @@ -271,6 +274,8 @@ elfutils:x64-osx=fail # https://github.com/embree/embree/issues/331 embree2:x64-windows-static=skip embree2:x64-windows-static-md=skip +# embree2 conflicts with embree3 on Linux +embree2:x64-linux=skip enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail From 62fc3036b16356581c1dd152273c733aa4f1bee3 Mon Sep 17 00:00:00 2001 From: gastineau Date: Mon, 20 Sep 2021 19:53:19 +0200 Subject: [PATCH 0593/1858] [calceph] Add new port (#19759) * initial port of calceph * apply correct format on vcpkg.json * add quotes in portfile * Update version database * add url to the documentation * Update version database * update vcpkg.json * update version * delete error version * remove useless on operating system * update database version * Apply suggestions from code review applied suggested changes about versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update port number * update database version * format vcpkg.json * update version * update portfile.cmake error * update version * update portfile.cmake error * update portfile.cmake error * fix clflags in debug mode * update database version * add the debug flags * update version database * add space to avoid single quote for cflags in Makefile.vc * update version database * Update version database. Co-authored-by: Gastineau Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/calceph/makefilevc.patch | 56 ++++++++++++++++++++++++++++++++++ ports/calceph/portfile.cmake | 51 +++++++++++++++++++++++++++++++ ports/calceph/vcpkg.json | 8 +++++ versions/baseline.json | 4 +++ versions/c-/calceph.json | 9 ++++++ 5 files changed, 128 insertions(+) create mode 100755 ports/calceph/makefilevc.patch create mode 100755 ports/calceph/portfile.cmake create mode 100755 ports/calceph/vcpkg.json create mode 100644 versions/c-/calceph.json diff --git a/ports/calceph/makefilevc.patch b/ports/calceph/makefilevc.patch new file mode 100755 index 00000000000000..796eeb2026c506 --- /dev/null +++ b/ports/calceph/makefilevc.patch @@ -0,0 +1,56 @@ +diff --git a/doc/Makefile.vc b/doc/Makefile.vc +index 60c7eee..1e783a0 100644 +--- a/doc/Makefile.vc ++++ b/doc/Makefile.vc +@@ -62,7 +62,7 @@ + # + + install: +- copy calceph_c.pdf $(DESTDIR)\doc +- copy calceph_fortran2003.pdf $(DESTDIR)\doc +- copy calceph_fortran77.pdf $(DESTDIR)\doc +- copy calceph_python.pdf $(DESTDIR)\doc ++ copy calceph_c.pdf "$(DESTDIR)"\doc ++ copy calceph_fortran2003.pdf "$(DESTDIR)"\doc ++ copy calceph_fortran77.pdf "$(DESTDIR)"\doc ++ copy calceph_python.pdf "$(DESTDIR)"\doc +diff --git a/mexapi/src/Makefile.vc b/mexapi/src/Makefile.vc +index 68e5d45..803c12f 100644 +--- a/mexapi/src/Makefile.vc ++++ b/mexapi/src/Makefile.vc +@@ -62,10 +62,10 @@ + # + + install: +- copy interfacemex.c $(DESTDIR)\libexec\calceph\mex +- copy CalcephBin.m $(DESTDIR)\libexec\calceph\mex +- copy calceph_compilemex.m $(DESTDIR)\libexec\calceph\mex +- copy Constants.m $(DESTDIR)\libexec\calceph\mex +- copy calceph_getversion_str.m $(DESTDIR)\libexec\calceph\mex +- copy NaifId.m $(DESTDIR)\libexec\calceph\mex +- copy calceph_seterrorhandler.m $(DESTDIR)\libexec\calceph\mex ++ copy interfacemex.c "$(DESTDIR)"\libexec\calceph\mex ++ copy CalcephBin.m "$(DESTDIR)"\libexec\calceph\mex ++ copy calceph_compilemex.m "$(DESTDIR)"\libexec\calceph\mex ++ copy Constants.m "$(DESTDIR)"\libexec\calceph\mex ++ copy calceph_getversion_str.m "$(DESTDIR)"\libexec\calceph\mex ++ copy NaifId.m "$(DESTDIR)"\libexec\calceph\mex ++ copy calceph_seterrorhandler.m "$(DESTDIR)"\libexec\calceph\mex +diff --git a/src/Makefile.vc b/src/Makefile.vc +index 730b4a7..9e790b1 100644 +--- a/src/Makefile.vc ++++ b/src/Makefile.vc +@@ -111,9 +111,9 @@ clean: + # install target: "nmake /f Makefile.vc install DESTDIR=xxx" to perform the installation. + # + install: all $(F2003INSTALL) +- copy f90calceph.h $(DESTDIR)\include +- copy calceph.h $(DESTDIR)\include +- copy $(LIBRARY) $(DESTDIR)\lib ++ copy f90calceph.h "$(DESTDIR)"\include ++ copy calceph.h "$(DESTDIR)"\include ++ copy $(LIBRARY) "$(DESTDIR)"\lib + + f2003install : +- copy f2003calceph.mod $(DESTDIR)\include ++ copy f2003calceph.mod "$(DESTDIR)"\include diff --git a/ports/calceph/portfile.cmake b/ports/calceph/portfile.cmake new file mode 100755 index 00000000000000..42acc5e59a4f13 --- /dev/null +++ b/ports/calceph/portfile.cmake @@ -0,0 +1,51 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + +set(CALCEPH_VERSION "3.5.0") +set(CALCEPH_HASH 12bb269d846aab93799656919cd9ca5a995248fb806727ea95667374b9380ca8f52c57dc6a5930c6995c13749bff1459c430eb2908b1533a8804fcb6b95c3de9) + +vcpkg_download_distfile(ARCHIVE + URLS "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/calceph-${CALCEPH_VERSION}.tar.gz" + FILENAME "calceph-${CALCEPH_VERSION}.tar.gz" + SHA512 ${CALCEPH_HASH} +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES makefilevc.patch +) + +if (VCPKG_TARGET_IS_WINDOWS) + + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + OPTIONS_DEBUG + DESTDIR="${CURRENT_INSTALLED_DIR}/calceph/debug" + CFLAGS="${VCPKG_C_FLAGS_DEBUG} " + OPTIONS_RELEASE + DESTDIR="${CURRENT_INSTALLED_DIR}/calceph" + CFLAGS="${VCPKG_C_FLAGS_RELEASE} " + ) + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/include/calceph.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_INSTALLED_DIR}/calceph/debug/lib/libcalceph.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(REMOVE_RECURSE "${CURRENT_INSTALLED_DIR}/calceph") + +else() # Build in UNIX + vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + --enable-fortran=no + --enable-thread=yes + ) + + vcpkg_install_make() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +endif() + + file(INSTALL "${SOURCE_PATH}/README.rst" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME readme.rst) + file(INSTALL "${SOURCE_PATH}/COPYING_CECILL_B.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME copyright) + file(INSTALL "${SOURCE_PATH}/doc/calceph_c.pdf" DESTINATION "${CURRENT_PACKAGES_DIR}/share/calceph" RENAME calceph_c.pdf) diff --git a/ports/calceph/vcpkg.json b/ports/calceph/vcpkg.json new file mode 100755 index 00000000000000..72c91d1d9a79d8 --- /dev/null +++ b/ports/calceph/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "calceph", + "version": "3.5.0", + "description": "C library to access the binary planetary ephemeris files.", + "homepage": "https://www.imcce.fr/inpop/calceph/", + "documentation": "https://www.imcce.fr/content/medias/recherche/equipes/asd/calceph/html/c/index.html", + "supports": "!uwp" +} diff --git a/versions/baseline.json b/versions/baseline.json index 11436c8c120c64..ac64e014d182e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1184,6 +1184,10 @@ "baseline": "1.16.0", "port-version": 0 }, + "calceph": { + "baseline": "3.5.0", + "port-version": 0 + }, "camport3": { "baseline": "1.5.3", "port-version": 1 diff --git a/versions/c-/calceph.json b/versions/c-/calceph.json new file mode 100644 index 00000000000000..d415cc1bda3926 --- /dev/null +++ b/versions/c-/calceph.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d2665db7558ef66aa086f95b155e61b15bd56848", + "version": "3.5.0", + "port-version": 0 + } + ] +} From 9e6848244df225fd5d2bb856ef7230f241a453a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 20 Sep 2021 19:55:40 +0200 Subject: [PATCH 0594/1858] [libsnoretoast] fix absolute include paths (#20229) * [libsnoretoast] fix absolute include paths * [libsnoretoast] fix versioning scheme * [libsnoretoast] update versions * Fix damage to previous version in the version database. Co-authored-by: Billy Robert O'Neal III --- ports/libsnoretoast/include_fix.patch | 28 +++++++++++++++++++++++++++ ports/libsnoretoast/portfile.cmake | 4 +++- ports/libsnoretoast/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/l-/libsnoretoast.json | 5 +++++ 5 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 ports/libsnoretoast/include_fix.patch diff --git a/ports/libsnoretoast/include_fix.patch b/ports/libsnoretoast/include_fix.patch new file mode 100644 index 00000000000000..e18860368acb06 --- /dev/null +++ b/ports/libsnoretoast/include_fix.patch @@ -0,0 +1,28 @@ +From 7564823f8f0bc4d647bf3470ab7a2d8612418f32 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= +Date: Fri, 17 Sep 2021 12:30:41 +0000 +Subject: [PATCH] Use relative INTERFACE_INCLUDE location + +Using ${CMAKE_INSTALL_PREFIX} hardcodes the installation location, +instead of having CMake +use ${_IMPORT_PREFIX} +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eef57f7..6c35b71 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,7 +1,7 @@ + add_library(SnoreToastActions INTERFACE) + target_include_directories(SnoreToastActions INTERFACE + $ +- $ ++ $ + ) + add_library(SnoreToast::SnoreToastActions ALIAS SnoreToastActions) + +-- +GitLab + diff --git a/ports/libsnoretoast/portfile.cmake b/ports/libsnoretoast/portfile.cmake index a9159e3c3ae02d..e97d5f637d20ec 100644 --- a/ports/libsnoretoast/portfile.cmake +++ b/ports/libsnoretoast/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v0.8.0 SHA512 233751b6cc3f8099c742e4412a3c9ba8707a2f3c69b57bab93dd83b028aa0c0656cade8de1ece563843ace576fd0d8e5f3a29c254a07ed939d0a69cd2d4f6c2a HEAD_REF master + PATCHES + include_fix.patch # https://invent.kde.org/libraries/snoretoast/-/merge_requests/1 ) vcpkg_cmake_configure( @@ -16,7 +18,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libsnoretoast") +vcpkg_cmake_config_fixup(PACKAGE_NAME LibSnoreToast CONFIG_PATH "lib/cmake/libsnoretoast") vcpkg_copy_tools( TOOL_NAMES "snoretoast" AUTO_CLEAN diff --git a/ports/libsnoretoast/vcpkg.json b/ports/libsnoretoast/vcpkg.json index bfc244ad545526..eb0c3838bc7b39 100644 --- a/ports/libsnoretoast/vcpkg.json +++ b/ports/libsnoretoast/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsnoretoast", - "version-semver": "0.8.0", + "version": "0.8.0", + "port-version": 1, "description": "A tool to create Windows Toast notifications and parse them on Windows 8 or later.", "homepage": "https://invent.kde.org/libraries/snoretoast", "supports": "windows & !uwp", diff --git a/versions/baseline.json b/versions/baseline.json index ac64e014d182e3..45d2395fd8ec8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3726,7 +3726,7 @@ }, "libsnoretoast": { "baseline": "0.8.0", - "port-version": 0 + "port-version": 1 }, "libsodium": { "baseline": "1.0.18", diff --git a/versions/l-/libsnoretoast.json b/versions/l-/libsnoretoast.json index 609c6e70e5aafe..513047f33c5864 100644 --- a/versions/l-/libsnoretoast.json +++ b/versions/l-/libsnoretoast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66d0c5615dc55a5a5201e6de21d5a7acbaa4bd9b", + "version": "0.8.0", + "port-version": 1 + }, { "git-tree": "7ddd1b84089de293b4a9d74af6b7593d089084a9", "version-semver": "0.8.0", From 775ed9ce972250634c1a7a77d50bddcf7cb01c9c Mon Sep 17 00:00:00 2001 From: Sergii Baitala Date: Mon, 20 Sep 2021 22:29:40 +0300 Subject: [PATCH 0595/1858] [opentelemetry-cpp] Update to v1.0.0 (#20260) --- ports/opentelemetry-cpp/portfile.cmake | 4 ++-- ports/opentelemetry-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 63ccb500bf07bd..9025212b49fbaa 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.0.0-rc4 - SHA512 93de3e61b6bd0a9237cf81dedbcdb078fb92c1dc562975c82134d791ad911d4d3c0e717f390a0a993fbeda5d5c90206c0e7a0c7085e58d9cfefbc9fd4ff209d2 + REF v1.0.0 + SHA512 283090b24494caeb148a791b107c4bba2c4891492d3c3df6b1b9b5c3141c5b9e3aaf86f5d80b1ee7737988bcd3e92ff991a48a234503aa63f8cbd43d0f0fe1a6 HEAD_REF main ) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index d8d6a0dd3507d6..bf127127aed867 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.0.0-rc4", + "version-semver": "1.0.0", "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." diff --git a/versions/baseline.json b/versions/baseline.json index 45d2395fd8ec8c..b5baf0ad159d5a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4849,7 +4849,7 @@ "port-version": 2 }, "opentelemetry-cpp": { - "baseline": "1.0.0-rc4", + "baseline": "1.0.0", "port-version": 0 }, "opentracing": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index daf0f0edffd513..cbc1e6bebf9f7b 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "929c881d18d9a55eba5985b788fbf8d409fb62c1", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "987820e81233d904abda334100303e2d11469499", "version-semver": "1.0.0-rc4", From 05fd863b29a3eca8c38f8e9da223c4de41268c3d Mon Sep 17 00:00:00 2001 From: ras0219 <533828+ras0219@users.noreply.github.com> Date: Tue, 21 Sep 2021 15:07:46 -0700 Subject: [PATCH 0596/1858] [boost-modular-build-helper] Unify boost builds across OS's (#20220) * [boost-modular-build-helper] Unify boost builds across OS's * [boost-modular-build-helper] Update version * [boost-modular-build-helper] Cleanup Co-authored-by: Robert Schumacher --- .../boost-modular-build-helper/CMakeLists.txt | 177 +++++++--- .../boost-modular-build.cmake | 317 +----------------- .../user-config.jam | 5 +- ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 + versions/baseline.json | 2 +- 6 files changed, 161 insertions(+), 347 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index b38b0e3137fdef..54fdfe16c91956 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -1,13 +1,25 @@ cmake_minimum_required(VERSION 3.9) project(boost CXX) -find_path(ZLIB_INCLUDE zlib.h) -find_path(BZIP2_INCLUDE bzlib.h) -find_path(ICU_PATH include/unicode/utf.h) +set(B2_OPTIONS) -set(VCPKG_PLATFORM_TOOLSET external) +if(MSVC) + if(MSVC_VERSION LESS 1900) + math(EXPR BOOST_MSVC_VERSION "${MSVC_VERSION} / 10 - 60") + else() + math(EXPR BOOST_MSVC_VERSION "${MSVC_VERSION} / 10 - 50") + endif() +else() + set(VCPKG_PLATFORM_TOOLSET external) +endif() -set(B2_OPTIONS) +#### Handle ICU +if(WIN32) + list(APPEND B2_OPTIONS "--disable-icu") +else() + find_path(ICU_PATH include/unicode/utf.h) + list(APPEND B2_OPTIONS "-sICU_PATH=\"${ICU_PATH}\"") +endif() if(DEFINED BOOST_CMAKE_FRAGMENT) message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") @@ -15,7 +27,7 @@ if(DEFINED BOOST_CMAKE_FRAGMENT) endif() # Add build type specific options -if(BUILD_SHARED_LIBS) +if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") list(APPEND B2_OPTIONS runtime-link=shared) set(LIB_RUNTIME_LINK "shared") else() @@ -45,7 +57,16 @@ else() list(APPEND B2_OPTIONS architecture=x86) endif() -if(APPLE) +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32) + list(APPEND B2_OPTIONS "asmflags=/safeseh") +endif() + +file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) + +if(MSVC) + set(B2_TOOLSET msvc) + list(APPEND B2_OPTIONS target-os=windows) +elseif(APPLE) set(B2_TOOLSET clang) list(APPEND B2_OPTIONS target-os=darwin) elseif(WIN32) @@ -120,57 +141,115 @@ if(NOT LDFLAGS STREQUAL "") string(REPLACE " " " " LDFLAGS "${LDFLAGS}") endif() -#set(CXXFLAGS "${CXXFLAGS} -Wno-error=unused-command-line-argument") if(CMAKE_CXX_COMPILER_TARGET AND CMAKE_CXX_COMPILE_OPTIONS_TARGET) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") - set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") + string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") + string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET}${CMAKE_CXX_COMPILER_TARGET}") else() - set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") - set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") + string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") + string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_TARGET} ${CMAKE_CXX_COMPILER_TARGET}") endif() endif() + if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN) if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") + string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") + string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN}${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") else() - set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") - set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") + string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") + string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN} ${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}") endif() endif() + if(CMAKE_SYSROOT AND CMAKE_CXX_COMPILE_OPTIONS_SYSROOT) - set(CXXFLAGS "${CXXFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") - set(LDFLAGS "${LDFLAGS} ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") + string(APPEND CXXFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") + string(APPEND LDFLAGS " ${CMAKE_CXX_COMPILE_OPTIONS_SYSROOT}${CMAKE_SYSROOT}") endif() -foreach(INCDIR ${CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES}) - set(CXXFLAGS "${CXXFLAGS} ${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}") +foreach(INCDIR IN LISTS CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES) + string(APPEND CXXFLAGS " ${CMAKE_INCLUDE_FLAG_C}${CMAKE_INCLUDE_FLAG_C_SEP}${INCDIR}") endforeach() if(APPLE) - set(CXXFLAGS "${CXXFLAGS} -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") - set(LDFLAGS "${LDFLAGS} -stdlib=libc++") + string(APPEND CXXFLAGS " -D_DARWIN_C_SOURCE -std=c++11 -stdlib=libc++") + string(APPEND LDFLAGS " -stdlib=libc++") endif() -find_library(ZLIB_LIBPATH z) -list(APPEND B2_OPTIONS - -sZLIB_BINARY=z - -sZLIB_LIBPATH="${ZLIB_LIBPATH}" -) -if(CMAKE_BUILD_TYPE STREQUAL "Release") - find_library(BZIP2_LIBPATH bz2) - list(APPEND B2_OPTIONS - -sBZIP2_BINARY=bz2 - -sBZIP2_LIBPATH="${BZIP2_LIBPATH}" - variant=release - ) -elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") - find_library(BZIP2_LIBPATH bz2d) +set(TOOLSET_OPTIONS) +if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + # cl in b2 appears to not receive `LIBPATH` for finding winmd files, so we transform them to `/AI` options. + set(libpath_args "$ENV{LIBPATH}") + # Apply: {x -> /AI"x"} + list(TRANSFORM libpath_args PREPEND "/AI\"") + list(TRANSFORM libpath_args APPEND "\"") + # Apply: {\ -> \\} + list(TRANSFORM libpath_args REPLACE "\\\\" "\\\\\\\\") + # Apply: {" -> \"} + list(TRANSFORM libpath_args REPLACE "\\\"" "\\\\\"") + list(JOIN libpath_args " " libpath_arg) + + set(TOOLSET_OPTIONS "-Zl \"${libpath_arg}\" WindowsApp.lib /ZW -DVirtualAlloc=VirtualAllocFromApp -D_WIN32_WINNT=0x0A00") + list(APPEND B2_OPTIONS windows-api=store) +endif() + +find_path(ZLIB_INCLUDE zlib.h) +list(APPEND B2_OPTIONS -sZLIB_INCLUDE="${ZLIB_INCLUDE}") + +find_path(BZIP2_INCLUDE bzlib.h) +list(APPEND B2_OPTIONS -sBZIP2_INCLUDE="${BZIP2_INCLUDE}") + +if(WIN32) + if(CMAKE_BUILD_TYPE STREQUAL "Release") + list(APPEND B2_OPTIONS + -sZLIB_BINARY=zlib + "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" + -sBZIP2_BINARY=bz2 + "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" + -sLZMA_BINARY=lzma + "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" + -sZSTD_BINARY=zstd + "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" + ) + else() + list(APPEND B2_OPTIONS + -sZLIB_BINARY=zlibd + "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" + -sBZIP2_BINARY=bz2d + "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" + -sLZMA_BINARY=lzmad + "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" + -sZSTD_BINARY=zstdd + "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" + ) + endif() +else() + find_library(ZLIB_LIBPATH z) list(APPEND B2_OPTIONS - -sBZIP2_BINARY=bz2d - -sBZIP2_LIBPATH="${BZIP2_LIBPATH}" - variant=debug + -sZLIB_BINARY=z + -sZLIB_LIBPATH="${ZLIB_LIBPATH}" ) + if(CMAKE_BUILD_TYPE STREQUAL "Release") + find_library(BZIP2_LIBPATH bz2) + list(APPEND B2_OPTIONS + -sBZIP2_BINARY=bz2 + -sBZIP2_LIBPATH="${BZIP2_LIBPATH}" + ) + elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") + find_library(BZIP2_LIBPATH bz2d) + list(APPEND B2_OPTIONS + -sBZIP2_BINARY=bz2d + -sBZIP2_LIBPATH="${BZIP2_LIBPATH}" + ) + endif() +endif() + +if(CMAKE_BUILD_TYPE STREQUAL "Release") + list(APPEND B2_OPTIONS variant=release) +else() + list(APPEND B2_OPTIONS variant=debug) +endif() + +if(NOT WIN32) + list(APPEND B2_OPTIONS "--layout=system") endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam ${CMAKE_CURRENT_BINARY_DIR}/user-config.jam @ONLY) @@ -188,7 +267,6 @@ add_custom_target(boost ALL --stagedir=${CMAKE_CURRENT_BINARY_DIR}/stage --build-dir=${CMAKE_CURRENT_BINARY_DIR} ${B2_OPTIONS} - --layout=system --with-atomic --with-random --with-date_time @@ -196,19 +274,19 @@ add_custom_target(boost ALL --with-system --with-thread --with-chrono - -sZLIB_INCLUDE="${ZLIB_INCLUDE}" - -sBZIP2_INCLUDE="${BZIP2_INCLUDE}" - -sICU_PATH="${ICU_PATH}" -j${NUMBER_OF_PROCESSORS} -sBOOST_ROOT=${BOOST_BUILD_PATH} -sBOOST_BUILD_PATH=${BOOST_BUILD_PATH} --debug-configuration + --debug-building + --debug-generators --ignore-site-config --hash -q + debug-symbols=on + -d +2 threading=multi - debug-symbols=on stage WORKING_DIRECTORY ${SOURCE_PATH}/build @@ -216,5 +294,14 @@ add_custom_target(boost ALL set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib) install( - CODE "file(GLOB LIBS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.*)\nif(LIBS)\nfile(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\")\nendif()" + CODE " +file(GLOB LIBS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.* ${SUBDIR}/*.lib) +if(LIBS) + file(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\") +endif() +file(GLOB DLLS ${SUBDIR}/*.dll) +if(DLLS) + file(INSTALL \${DLLS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\") +endif() +" ) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index f8a35a207af4f5..373a9a44d5e7ec 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -95,318 +95,34 @@ function(boost_modular_build) "-DB2_EXE=${B2_EXE}" "-DSOURCE_PATH=${_bm_SOURCE_PATH}" "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}" + "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" ${configure_option} ) vcpkg_install_cmake() - endfunction() - - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(build_flag 0) - if(NOT DEFINED VCPKG_BUILD_TYPE) - set(build_flag 1) - set(VCPKG_BUILD_TYPE "release") - endif() - - if(VCPKG_BUILD_TYPE STREQUAL "release") - unix_build(${BOOST_LIB_RELEASE_SUFFIX} "release" "lib/") - endif() - - if(build_flag) - set(VCPKG_BUILD_TYPE "debug") - endif() - - if(VCPKG_BUILD_TYPE STREQUAL "debug") - unix_build(${BOOST_LIB_DEBUG_SUFFIX} "debug" "debug/lib/") - endif() - - if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib) - message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.") - endif() - - configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) - return() - endif() - - ##################### - # Cleanup previous builds - ###################### - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - # It is possible for a file in this folder to be locked due to antivirus or vctip - execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel\n Files are likely in use.") - endif() - endif() - - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - # It is possible for a file in this folder to be locked due to antivirus or vctip - execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - message(FATAL_ERROR "Unable to remove directory: ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg\n Files are likely in use.") - endif() - endif() - - if(EXISTS ${CURRENT_PACKAGES_DIR}/debug) - message(FATAL_ERROR "Error: directory exists: ${CURRENT_PACKAGES_DIR}/debug\n The previous package was not fully cleared. This is an internal error.") - endif() - file(MAKE_DIRECTORY - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - ) - - include(ProcessorCount) - ProcessorCount(NUMBER_OF_PROCESSORS) - if(NOT NUMBER_OF_PROCESSORS) - set(NUMBER_OF_PROCESSORS 1) - endif() - - ###################### - # Generate configuration - ###################### - list(APPEND B2_OPTIONS - -j${NUMBER_OF_PROCESSORS} - --debug-configuration - --debug-building - --debug-generators - --disable-icu - --ignore-site-config - --hash - -q - "-sZLIB_INCLUDE=${CURRENT_INSTALLED_DIR}/include" - "-sBZIP2_INCLUDE=${CURRENT_INSTALLED_DIR}/include" - "-sLZMA_INCLUDE=${CURRENT_INSTALLED_DIR}/include" - "-sZSTD_INCLUDE=${CURRENT_INSTALLED_DIR}/include" - threading=multi - ) - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - list(APPEND B2_OPTIONS threadapi=win32) - else() - list(APPEND B2_OPTIONS threadapi=pthread) - endif() - list(APPEND B2_OPTIONS_DBG - -sZLIB_BINARY=zlibd - "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - -sBZIP2_BINARY=bz2d - "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - -sLZMA_BINARY=lzmad - "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - -sZSTD_BINARY=zstdd - "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - ) - - list(APPEND B2_OPTIONS_REL - -sZLIB_BINARY=zlib - "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - -sBZIP2_BINARY=bz2 - "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - -sLZMA_BINARY=lzma - "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - -sZSTD_BINARY=zstd - "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - ) - - # Properly handle compiler and linker flags passed by VCPKG - if(VCPKG_CXX_FLAGS) - list(APPEND B2_OPTIONS "cxxflags=${VCPKG_CXX_FLAGS}") - endif() - - if(VCPKG_CXX_FLAGS_RELEASE) - list(APPEND B2_OPTIONS_REL "cxxflags=${VCPKG_CXX_FLAGS_RELEASE}") - endif() - - if(VCPKG_CXX_FLAGS_DEBUG) - list(APPEND B2_OPTIONS_DBG "cxxflags=${VCPKG_CXX_FLAGS_DEBUG}") - endif() - - if(VCPKG_C_FLAGS) - list(APPEND B2_OPTIONS "cflags=${VCPKG_C_FLAGS}") - endif() - - if(VCPKG_C_FLAGS_RELEASE) - list(APPEND B2_OPTIONS_REL "cflags=${VCPKG_C_FLAGS_RELEASE}") - endif() - - if(VCPKG_C_FLAGS_DEBUG) - list(APPEND B2_OPTIONS_DBG "cflags=${VCPKG_C_FLAGS_DEBUG}") - endif() - - if(VCPKG_LINKER_FLAGS) - list(APPEND B2_OPTIONS "linkflags=${VCPKG_LINKER_FLAGS}") - endif() - - if(VCPKG_LINKER_FLAGS_RELEASE) - list(APPEND B2_OPTIONS_REL "linkflags=${VCPKG_LINKER_FLAGS_RELEASE}") - endif() - - if(VCPKG_LINKER_FLAGS_DEBUG) - list(APPEND B2_OPTIONS_DBG "linkflags=${VCPKG_LINKER_FLAGS_DEBUG}") - endif() - - # Add build type specific options - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - list(APPEND B2_OPTIONS runtime-link=shared) - else() - list(APPEND B2_OPTIONS runtime-link=static) - endif() - if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND B2_OPTIONS link=shared) - else() - list(APPEND B2_OPTIONS link=static) - endif() - - if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64") - list(APPEND B2_OPTIONS address-model=64 architecture=x86) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") - list(APPEND B2_OPTIONS address-model=32 architecture=arm) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") - list(APPEND B2_OPTIONS address-model=64 architecture=arm) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "s390x") - list(APPEND B2_OPTIONS address-model=64 architecture=s390x) - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") - list(APPEND B2_OPTIONS address-model=64 architecture=power) - else() - list(APPEND B2_OPTIONS address-model=32 architecture=x86) - - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - list(APPEND B2_OPTIONS "asmflags=/safeseh") - endif() - - endif() - - file(TO_CMAKE_PATH "${_bm_DIR}/nothing.bat" NOTHING_BAT) - set(TOOLSET_OPTIONS "/EHsc -Zm800 -nologo") - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - if(NOT VCPKG_PLATFORM_TOOLSET MATCHES "v140") - find_path(PATH_TO_CL cl.exe) - find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH) - if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND") - message(FATAL_ERROR "Could not find `platform.winmd` in VS. Do you have the Universal Windows Platform development workload installed?") - endif() - else() - find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "$ENV{VS140COMNTOOLS}/../../VC/LIB/store/references") - if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND") - message(FATAL_ERROR "Could not find `platform.winmd` in VS2015.") - endif() - endif() - file(TO_NATIVE_PATH "${PLATFORM_WINMD_DIR}" PLATFORM_WINMD_DIR) - string(REPLACE "\\" "/" PLATFORM_WINMD_DIR ${PLATFORM_WINMD_DIR}) # escape backslashes + vcpkg_copy_pdbs() + endfunction() - set(TOOLSET_OPTIONS "${TOOLSET_OPTIONS} -Zl /AI\"${PLATFORM_WINMD_DIR}\" WindowsApp.lib /ZW -DVirtualAlloc=VirtualAllocFromApp -D_WIN32_WINNT=0x0A00") + set(build_flag 0) + if(NOT DEFINED VCPKG_BUILD_TYPE) + set(build_flag 1) + set(VCPKG_BUILD_TYPE "release") endif() - set(MSVC_VERSION) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v143") - list(APPEND _bm_OPTIONS toolset=msvc) - set(MSVC_VERSION 14.3) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142") - list(APPEND _bm_OPTIONS toolset=msvc) - set(MSVC_VERSION 14.2) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") - list(APPEND _bm_OPTIONS toolset=msvc) - set(MSVC_VERSION 14.1) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140") - list(APPEND _bm_OPTIONS toolset=msvc) - set(MSVC_VERSION 14.0) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") - list(APPEND _bm_OPTIONS toolset=msvc) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external") - list(APPEND B2_OPTIONS toolset=gcc) - else() - message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'") + if(VCPKG_BUILD_TYPE STREQUAL "release") + unix_build(${BOOST_LIB_RELEASE_SUFFIX} "release" "lib/") endif() - configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY) - configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY) - - ###################### - # Perform build + Package - ###################### - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - message(STATUS "Building ${TARGET_TRIPLET}-rel") - set(BOOST_LIB_SUFFIX ${BOOST_LIB_RELEASE_SUFFIX}) - set(VARIANT "release") - set(BUILD_LIB_PATH "lib/") - configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) - set(ENV{BOOST_BUILD_PATH} "${BOOST_BUILD_PATH}") - vcpkg_execute_required_process( - COMMAND "${B2_EXE}" - --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/stage - --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam - ${B2_OPTIONS} - ${B2_OPTIONS_REL} - variant=release - debug-symbols=on - WORKING_DIRECTORY ${_bm_SOURCE_PATH}/build - LOGNAME build-${TARGET_TRIPLET}-rel - ) - message(STATUS "Building ${TARGET_TRIPLET}-rel done") + if(build_flag) + set(VCPKG_BUILD_TYPE "debug") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Building ${TARGET_TRIPLET}-dbg") - set(BOOST_LIB_SUFFIX ${BOOST_LIB_DEBUG_SUFFIX}) - set(VARIANT debug) - set(BUILD_LIB_PATH "debug/lib/") - configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) - set(ENV{BOOST_BUILD_PATH} "${BOOST_BUILD_PATH}") - vcpkg_execute_required_process( - COMMAND "${B2_EXE}" - --stagedir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/stage - --build-dir=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - --user-config=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam - ${B2_OPTIONS} - ${B2_OPTIONS_DBG} - variant=debug - WORKING_DIRECTORY ${_bm_SOURCE_PATH}/build - LOGNAME build-${TARGET_TRIPLET}-dbg - ) - message(STATUS "Building ${TARGET_TRIPLET}-dbg done") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - message(STATUS "Packaging ${TARGET_TRIPLET}-rel") - file(GLOB REL_LIBS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/boost/build/*/*.lib - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/boost/build/*/*.a - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/boost/build/*/*.so - ) - file(COPY ${REL_LIBS} - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB REL_DLLS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/boost/build/*/*.dll) - file(COPY ${REL_DLLS} - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - FILES_MATCHING PATTERN "*.dll") - endif() - message(STATUS "Packaging ${TARGET_TRIPLET}-rel done") - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") - file(GLOB DBG_LIBS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/boost/build/*/*.lib - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/boost/build/*/*.a - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/boost/build/*/*.so - ) - file(COPY ${DBG_LIBS} - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB DBG_DLLS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/boost/build/*/*.dll) - file(COPY ${DBG_DLLS} - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - FILES_MATCHING PATTERN "*.dll") - endif() - message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done") + if(VCPKG_BUILD_TYPE STREQUAL "debug") + unix_build(${BOOST_LIB_DEBUG_SUFFIX} "debug" "debug/lib/") endif() file(GLOB INSTALLED_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib ${CURRENT_PACKAGES_DIR}/lib/*.lib) - foreach(LIB ${INSTALLED_LIBS}) + foreach(LIB IN LISTS INSTALLED_LIBS) get_filename_component(OLD_FILENAME ${LIB} NAME) get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY) string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME}) @@ -438,6 +154,9 @@ function(boost_modular_build) file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/has_icu.lib") endif() - vcpkg_copy_pdbs() + if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/lib) + message(FATAL_ERROR "No libraries were produced. This indicates a failure while building the boost library.") + endif() + configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage COPYONLY) endfunction() diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index afd1d7dc6ac06c..8111494700de66 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -2,9 +2,12 @@ import toolset ; if "@VCPKG_PLATFORM_TOOLSET@" != "external" { - using msvc : @MSVC_VERSION@ : cl.exe + using msvc : @BOOST_MSVC_VERSION@ : cl.exe : "@NOTHING_BAT@" + @CXXFLAGS@ + @CFLAGS@ + @LDFLAGS@ @TOOLSET_OPTIONS@ ; } diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 192b420666ce5d..78d6efa372e5be 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version-string": "1.76.0", - "port-version": 1, + "port-version": 2, "dependencies": [ "boost-build", "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 95199b6d3023cf..2b37412e7e63c7 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd1c08c606cabfe31c22e2677c383f8b5119fba6", + "version-string": "1.76.0", + "port-version": 2 + }, { "git-tree": "f9cf6243049bf0abf8526fba57702a2122665549", "version-string": "1.76.0", diff --git a/versions/baseline.json b/versions/baseline.json index b5baf0ad159d5a..5307c8cc285464 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -798,7 +798,7 @@ }, "boost-modular-build-helper": { "baseline": "1.76.0", - "port-version": 1 + "port-version": 2 }, "boost-move": { "baseline": "1.76.0", From 0155512c2bcdb9d49797b9dd3bd7ccf01b2a6369 Mon Sep 17 00:00:00 2001 From: Be Date: Wed, 22 Sep 2021 15:00:06 -0500 Subject: [PATCH 0597/1858] [libdjinterop] update to 0.16.0 (#20136) * [libdjinterop] update to 0.16.0 * [sqlite3] add pkgconfig file Linux distributions typically use the SQLite autoconf package, but this port uses the SQLite amalgamation package with a custom CMakeLists.txt so the port needs to take care of installing the pkgconfig file. --- ports/libdjinterop/portfile.cmake | 16 ++++++++-------- ports/libdjinterop/vcpkg.json | 10 +++++++++- ports/sqlite3/CMakeLists.txt | 8 ++++++++ ports/sqlite3/portfile.cmake | 9 ++++++++- ports/sqlite3/sqlite3.pc.in | 11 +++++++++++ ports/sqlite3/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/l-/libdjinterop.json | 5 +++++ versions/s-/sqlite3.json | 5 +++++ 9 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 ports/sqlite3/sqlite3.pc.in diff --git a/ports/libdjinterop/portfile.cmake b/ports/libdjinterop/portfile.cmake index 484238b84bf254..9f5981d25a3b5c 100644 --- a/ports/libdjinterop/portfile.cmake +++ b/ports/libdjinterop/portfile.cmake @@ -1,18 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xsco/libdjinterop - REF 0.14.6 - SHA512 3d05bc882ddc309a1b0d5e97572ede1aa826b662a19ffd8ee874c13ead668d1c3f14d59bf861ae3880588e1a9b94e4a92ccdbb5df71bfb7ffe28f57a1b123f18 + REF 0.16.0 + SHA512 7653e3752b8d597a967fb5f83f8b14c0db5d9cdb05a9bb22f6d9f34a890327fafdbd81996ce9af09552b69da4b9f7f0b41d631b1704b11e46e335f205c6886bf HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) -vcpkg_install_cmake() +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DjInterop) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdjinterop/vcpkg.json b/ports/libdjinterop/vcpkg.json index 533f90d86191b8..7ccfa916e551be 100644 --- a/ports/libdjinterop/vcpkg.json +++ b/ports/libdjinterop/vcpkg.json @@ -1,11 +1,19 @@ { "name": "libdjinterop", - "version-string": "0.14.6", + "version": "0.16.0", "description": "C++ library for access to DJ record libraries. Currently only supports Denon Engine Prime databases", "homepage": "https://github.com/xsco/libdjinterop", "license": "LGPL-3.0-or-later", "dependencies": [ "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/sqlite3/CMakeLists.txt b/ports/sqlite3/CMakeLists.txt index 6250eb7111b979..7c1099bdbb5eb5 100644 --- a/ports/sqlite3/CMakeLists.txt +++ b/ports/sqlite3/CMakeLists.txt @@ -63,3 +63,11 @@ install( install(FILES sqlite3.h sqlite3ext.h DESTINATION include CONFIGURATIONS Release) install(EXPORT unofficial-sqlite3-targets NAMESPACE unofficial::sqlite3:: FILE unofficial-sqlite3-targets.cmake DESTINATION share/unofficial-sqlite3) + +if(UNIX) + set(PKGCONFIG_LIBS_PRIVATE "-lm -ldl -lpthread") +else() + set(PKGCONFIG_LIBS_PRIVATE "") +endif() +configure_file(sqlite3.pc.in sqlite3.pc @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sqlite3.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/ports/sqlite3/portfile.cmake b/ports/sqlite3/portfile.cmake index d843ee537b48ff..329b1dbd5c60e1 100644 --- a/ports/sqlite3/portfile.cmake +++ b/ports/sqlite3/portfile.cmake @@ -1,4 +1,6 @@ +# Be sure to update both of these versions together. set(SQLITE_VERSION 3360000) +set(PKGCONFIG_VERSION 3.36.0) set(SQLITE_HASH 5c18f158a599b1e91d95c91de3aa5c5de52f986845ad0cb49dfd56b650587e55e24d469571b5b864229b870d0eaf85d78893f61ef950b95389cb41692be37f58) vcpkg_download_distfile(ARCHIVE @@ -15,6 +17,7 @@ vcpkg_extract_source_archive_ex( ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/sqlite3.pc.in" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -26,7 +29,9 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DPKGCONFIG_VERSION=${PKGCONFIG_VERSION} OPTIONS_DEBUG -DSQLITE3_SKIP_TOOLS=ON ) @@ -46,6 +51,8 @@ configure_file( @ONLY ) +vcpkg_fixup_pkgconfig() + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sqlite3.h" "# define SQLITE_API\n" "# define SQLITE_API __declspec(dllimport)\n") endif() diff --git a/ports/sqlite3/sqlite3.pc.in b/ports/sqlite3/sqlite3.pc.in new file mode 100644 index 00000000000000..d265632d119930 --- /dev/null +++ b/ports/sqlite3/sqlite3.pc.in @@ -0,0 +1,11 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=${prefix} +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: SQLite +Description: SQL database engine +Version: @PKGCONFIG_VERSION@ +Libs: -L${libdir} -lsqlite3 +Libs.private: @PKGCONFIG_LIBS_PRIVATE@ +Cflags: -I${includedir} diff --git a/ports/sqlite3/vcpkg.json b/ports/sqlite3/vcpkg.json index f5054f6f8a9420..d998070e041d64 100644 --- a/ports/sqlite3/vcpkg.json +++ b/ports/sqlite3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sqlite3", "version": "3.36.0", + "port-version": 1, "description": "SQLite is a software library that implements a self-contained, serverless, zero-configuration, transactional SQL database engine.", "homepage": "https://sqlite.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5307c8cc285464..9e66a9973a4115 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3265,7 +3265,7 @@ "port-version": 1 }, "libdjinterop": { - "baseline": "0.14.6", + "baseline": "0.16.0", "port-version": 0 }, "libdshowcapture": { @@ -6246,7 +6246,7 @@ }, "sqlite3": { "baseline": "3.36.0", - "port-version": 0 + "port-version": 1 }, "sqlitecpp": { "baseline": "3.1.1", diff --git a/versions/l-/libdjinterop.json b/versions/l-/libdjinterop.json index 02fe1f1f78d753..324976efb84c43 100644 --- a/versions/l-/libdjinterop.json +++ b/versions/l-/libdjinterop.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1c63ff4c5483425a19992ddefa98a3c1e2fabf3", + "version": "0.16.0", + "port-version": 0 + }, { "git-tree": "f880d97fbd6043537231fcd201e5df71dc8b51f6", "version-string": "0.14.6", diff --git a/versions/s-/sqlite3.json b/versions/s-/sqlite3.json index 2154ae8688089e..664d54a350ab4b 100644 --- a/versions/s-/sqlite3.json +++ b/versions/s-/sqlite3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0395ce17570ddb92d952ca5f8be1953ec4c8325", + "version": "3.36.0", + "port-version": 1 + }, { "git-tree": "c23525b0204e11a56d40cbb0b7fa68861450df04", "version": "3.36.0", From 71246b590350e58d3fe2b2c2e113fce674d1d97e Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 22 Sep 2021 13:09:55 -0700 Subject: [PATCH 0598/1858] [protobuf] upgrade to latest release (v3.18.0) (#20208) * [protobuf] upgrade to latest release (v3.18.0) This requires patching OpenCV as it uses a function removed in the latest version of protobuf (FWIW, upstream OpenCV has a similar patch). * The arcus port also needs a patch * The caffe2 port also needs a patch * The brpc port also needs a patch --- .../arcus/0001-fix-protobuf-deprecated.patch | 13 ++++++++++ ports/arcus/portfile.cmake | 2 ++ ports/arcus/vcpkg.json | 1 + ports/brpc/fix-protobuf-deprecated.patch | 13 ++++++++++ ports/brpc/portfile.cmake | 1 + ports/brpc/vcpkg.json | 2 +- ports/caffe2/fix-protobuf-deprecated.patch | 26 +++++++++++++++++++ ports/caffe2/portfile.cmake | 1 + ports/caffe2/vcpkg.json | 2 +- ports/opencv4/0011-fix-caffe-io.patch | 13 ++++++++++ ports/opencv4/portfile.cmake | 1 + ports/opencv4/vcpkg.json | 2 +- ports/protobuf/fix-static-build.patch | 10 +++---- ports/protobuf/fix-uwp-build.patch | 13 ++++++++++ ports/protobuf/port_def.patch | 14 ---------- ports/protobuf/portfile.cmake | 8 +++--- ports/protobuf/vcpkg.json | 3 +-- versions/a-/arcus.json | 5 ++++ versions/b-/brpc.json | 5 ++++ versions/baseline.json | 12 ++++----- versions/c-/caffe2.json | 5 ++++ versions/o-/opencv4.json | 5 ++++ versions/p-/protobuf.json | 5 ++++ 23 files changed, 128 insertions(+), 34 deletions(-) create mode 100644 ports/arcus/0001-fix-protobuf-deprecated.patch create mode 100644 ports/brpc/fix-protobuf-deprecated.patch create mode 100644 ports/caffe2/fix-protobuf-deprecated.patch create mode 100644 ports/opencv4/0011-fix-caffe-io.patch create mode 100644 ports/protobuf/fix-uwp-build.patch delete mode 100644 ports/protobuf/port_def.patch diff --git a/ports/arcus/0001-fix-protobuf-deprecated.patch b/ports/arcus/0001-fix-protobuf-deprecated.patch new file mode 100644 index 00000000000000..a40da846dc496c --- /dev/null +++ b/ports/arcus/0001-fix-protobuf-deprecated.patch @@ -0,0 +1,13 @@ +diff --git a/src/Socket_p.h b/src/Socket_p.h +index 9c3c084..9ccabda 100644 +--- a/src/Socket_p.h ++++ b/src/Socket_p.h +@@ -548,7 +548,7 @@ namespace Arcus + + google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size); + google::protobuf::io::CodedInputStream stream(&array); +- stream.SetTotalBytesLimit(message_size_maximum, message_size_warning); ++ stream.SetTotalBytesLimit(message_size_maximum); + if(!message->ParseFromCodedStream(&stream)) + { + error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data)); diff --git a/ports/arcus/portfile.cmake b/ports/arcus/portfile.cmake index d22a64d30bd114..d2777742ba946f 100644 --- a/ports/arcus/portfile.cmake +++ b/ports/arcus/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF 617f6f71572090f73cb44592b12f49567b539e5b #v4.10.0 SHA512 cf0954d8b10d9f94165aa5c086d0e58c2925464f9fbe4252535c36d7e6bb12b767d89efb816c9e642f9cd7f0ec0d66d61ca21c5121a05340499d38d5d851f73b HEAD_REF master + PATCHES + 0001-fix-protobuf-deprecated.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) diff --git a/ports/arcus/vcpkg.json b/ports/arcus/vcpkg.json index bb3d46b35c32b2..bf7b6b4db1d42b 100644 --- a/ports/arcus/vcpkg.json +++ b/ports/arcus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arcus", "version-semver": "4.10.0", + "port-version": 1, "description": "This library contains C++ bindings for creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library.", "homepage": "https://github.com/Ultimaker/libArcus", "supports": "!uwp", diff --git a/ports/brpc/fix-protobuf-deprecated.patch b/ports/brpc/fix-protobuf-deprecated.patch new file mode 100644 index 00000000000000..564724c63bbf6f --- /dev/null +++ b/ports/brpc/fix-protobuf-deprecated.patch @@ -0,0 +1,13 @@ +diff --git a/src/brpc/protocol.cpp b/src/brpc/protocol.cpp +index 11297ea..c998edb 100644 +--- a/src/brpc/protocol.cpp ++++ b/src/brpc/protocol.cpp +@@ -203,7 +203,7 @@ BUTIL_FORCE_INLINE bool ParsePbFromZeroCopyStreamInlined( + // According to source code of pb, SetTotalBytesLimit is not a simple set, + // avoid calling the function when the limit is definitely unreached. + if (PB_TOTAL_BYETS_LIMITS < FLAGS_max_body_size) { +- decoder.SetTotalBytesLimit(INT_MAX, -1); ++ decoder.SetTotalBytesLimit(INT_MAX); + } + return msg->ParseFromCodedStream(&decoder) && decoder.ConsumedEntireMessage(); + } diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index 3a1c1dce73eb00..3547c642337e70 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix_boost_ptr.patch fix_thrift.patch + fix-protobuf-deprecated.patch ) vcpkg_configure_cmake( diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 61c1d27a3f32a9..2b2e1568916597 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "brpc", "version-string": "0.9.7", - "port-version": 1, + "port-version": 2, "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "supports": "!windows", diff --git a/ports/caffe2/fix-protobuf-deprecated.patch b/ports/caffe2/fix-protobuf-deprecated.patch new file mode 100644 index 00000000000000..4f594d4302caab --- /dev/null +++ b/ports/caffe2/fix-protobuf-deprecated.patch @@ -0,0 +1,26 @@ +diff --git a/caffe2/utils/proto_utils.cc b/caffe2/utils/proto_utils.cc +index ab2d756..2c36ec4 100644 +--- a/caffe2/utils/proto_utils.cc ++++ b/caffe2/utils/proto_utils.cc +@@ -102,10 +102,9 @@ bool ReadProtoFromBinaryFile(const char* filename, MessageLite* proto) { + ::google::protobuf::io::CopyingInputStreamAdaptor stream( + new IfstreamInputStream(filename)); + stream.SetOwnsCopyingStream(true); +- // Total bytes hard limit / warning limit are set to 1GB and 512MB +- // respectively. ++ // Total bytes hard limit is set to 1GB. + ::google::protobuf::io::CodedInputStream coded_stream(&stream); +- coded_stream.SetTotalBytesLimit(1024LL << 20, 512LL << 20); ++ coded_stream.SetTotalBytesLimit(1024LL << 20); + return proto->ParseFromCodedStream(&coded_stream); + } + +@@ -155,7 +154,7 @@ bool ReadProtoFromBinaryFile(const char* filename, MessageLite* proto) { + std::unique_ptr coded_input( + new CodedInputStream(raw_input.get())); + // A hack to manually allow using very large protocol buffers. +- coded_input->SetTotalBytesLimit(1073741824, 536870912); ++ coded_input->SetTotalBytesLimit(1073741824); + bool success = proto->ParseFromCodedStream(coded_input.get()); + coded_input.reset(); + raw_input.reset(); diff --git a/ports/caffe2/portfile.cmake b/ports/caffe2/portfile.cmake index 0b19b9eb994ece..d7ec68e6a55912 100644 --- a/ports/caffe2/portfile.cmake +++ b/ports/caffe2/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( PATCHES msvc-fixes.patch fix-space.patch + fix-protobuf-deprecated.patch ) if(VCPKG_CRT_LINKAGE STREQUAL static) diff --git a/ports/caffe2/vcpkg.json b/ports/caffe2/vcpkg.json index 1f4f34d63e1045..eeecad53132972 100644 --- a/ports/caffe2/vcpkg.json +++ b/ports/caffe2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "caffe2", "version-string": "0.8.1", - "port-version": 4, + "port-version": 5, "description": "Caffe2 is a lightweight, modular, and scalable deep learning framework.", "homepage": "https://github.com/caffe2/caffe2", "supports": "!x86", diff --git a/ports/opencv4/0011-fix-caffe-io.patch b/ports/opencv4/0011-fix-caffe-io.patch new file mode 100644 index 00000000000000..ee33ea63f93bc8 --- /dev/null +++ b/ports/opencv4/0011-fix-caffe-io.patch @@ -0,0 +1,13 @@ +diff --git a/modules/dnn/src/caffe/caffe_io.cpp b/modules/dnn/src/caffe/caffe_io.cpp +index 2fc4d84..779d0dd 100644 +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -1111,7 +1111,7 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by + + bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { + CodedInputStream coded_input(input); +- coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); ++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); + + return proto->ParseFromCodedStream(&coded_input); + } diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index e965dd2a07a461..760cfbea7efa09 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_from_github( 0008-devendor-quirc.patch 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch + 0011-fix-caffe-io.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index dce331bf1de4e9..54ae370087f6a2 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.3", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/protobuf/fix-static-build.patch b/ports/protobuf/fix-static-build.patch index 0ba4982fe6f84e..fec980a9319860 100644 --- a/ports/protobuf/fix-static-build.patch +++ b/ports/protobuf/fix-static-build.patch @@ -1,11 +1,11 @@ diff --git a/cmake/install.cmake b/cmake/install.cmake -index 4091bc8..9850018 100644 +index ef5bb13..e2d4acb 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake -@@ -31,7 +31,7 @@ endforeach() - if (protobuf_BUILD_PROTOC_BINARIES) - install(TARGETS protoc EXPORT protobuf-targets - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc) +@@ -33,7 +33,7 @@ if (protobuf_BUILD_PROTOC_BINARIES) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} + COMPONENT protoc) - if (UNIX AND NOT APPLE) + if (UNIX AND NOT APPLE AND NOT protobuf_MSVC_STATIC_RUNTIME) set_property(TARGET protoc diff --git a/ports/protobuf/fix-uwp-build.patch b/ports/protobuf/fix-uwp-build.patch new file mode 100644 index 00000000000000..ca806ebd1540cc --- /dev/null +++ b/ports/protobuf/fix-uwp-build.patch @@ -0,0 +1,13 @@ +diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc +index b6c31fd..8b77c3d 100644 +--- a/src/google/protobuf/descriptor.cc ++++ b/src/google/protobuf/descriptor.cc +@@ -794,7 +794,7 @@ class TableArena { + size = RoundUp(size); + + Block* to_relocate = nullptr; +- Block* to_use; ++ Block* to_use = nullptr; + + for (size_t i = 0; i < kSmallSizes.size(); ++i) { + if (small_size_blocks_[i] != nullptr && size <= kSmallSizes[i]) { diff --git a/ports/protobuf/port_def.patch b/ports/protobuf/port_def.patch deleted file mode 100644 index 31d71531d0aeaa..00000000000000 --- a/ports/protobuf/port_def.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc -index f7b64a080..3493d9082 100644 ---- a/src/google/protobuf/port_def.inc -+++ b/src/google/protobuf/port_def.inc -@@ -564,7 +564,8 @@ - - // Our use of constinit does not yet work with GCC: - // https://github.com/protocolbuffers/protobuf/issues/8310 --#if defined(__cpp_constinit) && !defined(__GNUC__) -+// Does not work yet with Visual Studio 2019 Update 16.10 -+#if defined(__cpp_constinit) && !defined(__GNUC__) && !defined(_MSC_VER) - #define PROTOBUF_CONSTINIT constinit - #elif defined(__has_cpp_attribute) - #if __has_cpp_attribute(clang::require_constant_initialization) diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake index a645866c94aba2..8395eeae5dd3c4 100644 --- a/ports/protobuf/portfile.cmake +++ b/ports/protobuf/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/protobuf - REF 436bd7880e458532901c58f4d9d1ea23fa7edd52 #v3.15.8 - SHA512 88bb9a965bccfe11a07aee2c0c16eb9cc1845ea2d7500ef6def3e1c0a8155ac4eadd0ceef4b12552960dffe95a0fc82549d1abba71ca073ab86ec5de57d9cafb + REF v3.18.0 + SHA512 2c8ff451b54120e4670f7ea8c92c0c7d70f4bb781979f74f59ddcb7c9cc74fe3e8910fc579d2686fb0e1aafa35fb9548ccab667accf2358c71cfd17ba38d7826 HEAD_REF master PATCHES fix-static-build.patch fix-default-proto-file-path.patch - port_def.patch + fix-uwp-build.patch ) string(COMPARE EQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" protobuf_BUILD_PROTOC_BINARIES) @@ -79,7 +79,7 @@ if(protobuf_BUILD_PROTOC_BINARIES) if(VCPKG_TARGET_IS_WINDOWS) vcpkg_copy_tools(TOOL_NAMES protoc AUTO_CLEAN) else() - vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.15.8.0 AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES protoc protoc-3.18.0.0 AUTO_CLEAN) endif() else() file(COPY ${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) diff --git a/ports/protobuf/vcpkg.json b/ports/protobuf/vcpkg.json index 40b557dd3c30b7..c75206275c098f 100644 --- a/ports/protobuf/vcpkg.json +++ b/ports/protobuf/vcpkg.json @@ -1,7 +1,6 @@ { "name": "protobuf", - "version-semver": "3.15.8", - "port-version": 4, + "version-semver": "3.18.0", "description": "Protocol Buffers - Google's data interchange format", "homepage": "https://github.com/protocolbuffers/protobuf", "dependencies": [ diff --git a/versions/a-/arcus.json b/versions/a-/arcus.json index c222d1ef0e3f8f..47d36bb4d1a79e 100644 --- a/versions/a-/arcus.json +++ b/versions/a-/arcus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0aeec8ed7245362e90ef531d8ecaf4ca315e85e5", + "version-semver": "4.10.0", + "port-version": 1 + }, { "git-tree": "76f86c7d5993d59f58a0863b9e2ca439db88efba", "version-semver": "4.10.0", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index 409ee55988099f..d625bae51605ad 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b89b1bee5f50f8bdb551ae2373feb51b144fbc2", + "version-string": "0.9.7", + "port-version": 2 + }, { "git-tree": "8d3ba620eff30244f2ca27af0814f78ce9049308", "version-string": "0.9.7", diff --git a/versions/baseline.json b/versions/baseline.json index 9e66a9973a4115..1b5c1145ec3f28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -122,7 +122,7 @@ }, "arcus": { "baseline": "4.10.0", - "port-version": 0 + "port-version": 1 }, "argagg": { "baseline": "0.4.6", @@ -1118,7 +1118,7 @@ }, "brpc": { "baseline": "0.9.7", - "port-version": 1 + "port-version": 2 }, "brunocodutra-metal": { "baseline": "2.1.1", @@ -1174,7 +1174,7 @@ }, "caffe2": { "baseline": "0.8.1", - "port-version": 4 + "port-version": 5 }, "cairo": { "baseline": "1.17.4", @@ -4766,7 +4766,7 @@ }, "opencv4": { "baseline": "4.5.3", - "port-version": 1 + "port-version": 2 }, "opendnp3": { "baseline": "3.1.0", @@ -5221,8 +5221,8 @@ "port-version": 0 }, "protobuf": { - "baseline": "3.15.8", - "port-version": 4 + "baseline": "3.18.0", + "port-version": 0 }, "protobuf-c": { "baseline": "1.3.2", diff --git a/versions/c-/caffe2.json b/versions/c-/caffe2.json index 60aff5c5b6527f..53fb0108464a2f 100644 --- a/versions/c-/caffe2.json +++ b/versions/c-/caffe2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4ebcedb57e572959c4f8e30c2885cda2367e0a7", + "version-string": "0.8.1", + "port-version": 5 + }, { "git-tree": "e50097be149d80e1397e95280aecd5160961d286", "version-string": "0.8.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 2b404d7c4f9e63..9493353a53dcc4 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b5539ab3cd468944f8d46698c610285319bf0f7", + "version": "4.5.3", + "port-version": 2 + }, { "git-tree": "9d18da7f0c17619f7912a5d53b0316c7a18d625a", "version": "4.5.3", diff --git a/versions/p-/protobuf.json b/versions/p-/protobuf.json index bc2dcdeadbe6c9..a91d6210ae5768 100644 --- a/versions/p-/protobuf.json +++ b/versions/p-/protobuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19c2bf45c235e6126161bae36aa7ff7e1fcda479", + "version-semver": "3.18.0", + "port-version": 0 + }, { "git-tree": "6204194eaf9d8ff0fe78d498f77fee57cd19ce59", "version-semver": "3.15.8", From c3143ace9d0029bb46e834e841534363fe83b2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 22 Sep 2021 23:15:26 +0300 Subject: [PATCH 0599/1858] [kf5diagram] new port (#20234) * [kf5diagram] new port * [kf5diagram] update versions Co-authored-by: Billy Robert O'Neal III --- ports/kf5diagram/portfile.cmake | 29 +++++++++++++++++++++++++++++ ports/kf5diagram/vcpkg.json | 19 +++++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kf5diagram.json | 9 +++++++++ 4 files changed, 61 insertions(+) create mode 100644 ports/kf5diagram/portfile.cmake create mode 100644 ports/kf5diagram/vcpkg.json create mode 100644 versions/k-/kf5diagram.json diff --git a/ports/kf5diagram/portfile.cmake b/ports/kf5diagram/portfile.cmake new file mode 100644 index 00000000000000..06278643cfb4d4 --- /dev/null +++ b/ports/kf5diagram/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kdiagram + REF v2.8.0 + SHA512 5a3b958aaf386b1cde3c840963521306ded5b1975cc293dbb36c60cacd52a62badaf64a6c5f3cd63fc65f02d0ba181d318496d665f08140299720cd022a855e7 + HEAD_REF master +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KChart CONFIG_PATH lib/cmake/KChart DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KGantt CONFIG_PATH lib/cmake/KGantt) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE.GPL.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5diagram/vcpkg.json b/ports/kf5diagram/vcpkg.json new file mode 100644 index 00000000000000..0388001e540368 --- /dev/null +++ b/ports/kf5diagram/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "kf5diagram", + "version": "2.8.0", + "description": "Powerful libraries (KChart, KGantt) for creating business diagrams", + "homepage": "https://api.kde.org/kdiagram/index.html", + "dependencies": [ + "ecm", + "qt5-base", + "qt5-svg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1b5c1145ec3f28..ee24d26b171749 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2988,6 +2988,10 @@ "baseline": "5.84.0", "port-version": 2 }, + "kf5diagram": { + "baseline": "2.8.0", + "port-version": 0 + }, "kf5globalaccel": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5diagram.json b/versions/k-/kf5diagram.json new file mode 100644 index 00000000000000..1dbe7533665a35 --- /dev/null +++ b/versions/k-/kf5diagram.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "934ea388abb43f4946b4473a2b74cba0bf6b1e5c", + "version": "2.8.0", + "port-version": 0 + } + ] +} From 0a7944626220083c2e534b054b559215e086de51 Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Wed, 22 Sep 2021 15:21:58 -0500 Subject: [PATCH 0600/1858] [gsl] Update to 2.7 (#20268) * Update gsl to version 2.7 * Updating portfile to remove deprecated functions These were the github-actions bot recommendations * Quoting string parameters, fixing version * Run x-add-version --- ports/gsl/0001-configure.patch | 37 ++++++++++++++-------------------- ports/gsl/portfile.cmake | 17 ++++++++-------- ports/gsl/vcpkg.json | 15 +++++++++++--- versions/baseline.json | 4 ++-- versions/g-/gsl.json | 5 +++++ 5 files changed, 42 insertions(+), 36 deletions(-) diff --git a/ports/gsl/0001-configure.patch b/ports/gsl/0001-configure.patch index 7f80e2e55ad8e4..404ae879b57ae9 100644 --- a/ports/gsl/0001-configure.patch +++ b/ports/gsl/0001-configure.patch @@ -1,16 +1,9 @@ --- - config.h.in => config.h | 50 ++++++++++++++++++++++++------------------------- - 1 file changed, 25 insertions(+), 25 deletions(-) - rename config.h.in => config.h (92%) - diff --git a/config.h.in b/config.h -similarity index 92% -rename from config.h.in -rename to config.h -index d39c766..c650f5b 100644 +index adab7a58d..f6dc2278e 100644 --- a/config.h.in +++ b/config.h -@@ -8,19 +8,19 @@ +@@ -11,19 +11,19 @@ /* Define to 1 if you have the declaration of `acosh', and to 0 if you don't. */ @@ -34,7 +27,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the declaration of `feenableexcept', and to 0 if you don't. */ -@@ -40,31 +40,31 @@ +@@ -43,31 +43,31 @@ /* Define to 1 if you have the declaration of `frexp', and to 0 if you don't. */ @@ -73,7 +66,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -@@ -73,13 +73,13 @@ +@@ -76,13 +76,13 @@ #undef HAVE_DOPRNT /* Defined if you have ansi EXIT_SUCCESS and EXIT_FAILURE in stdlib.h */ @@ -89,7 +82,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the header file. */ #undef HAVE_IEEEFP_H -@@ -94,43 +94,43 @@ +@@ -97,43 +97,43 @@ #undef HAVE_INLINE /* Define to 1 if you have the header file. */ @@ -107,10 +100,6 @@ index d39c766..c650f5b 100644 -#undef HAVE_MEMMOVE +#define HAVE_MEMMOVE 1 - /* Define to 1 if you have the header file. */ --#undef HAVE_MEMORY_H -+#define HAVE_MEMORY_H 1 - /* Define this if printf can handle %Lf for long double */ #undef HAVE_PRINTF_LONGDOUBLE @@ -118,6 +107,10 @@ index d39c766..c650f5b 100644 -#undef HAVE_STDINT_H +#define HAVE_STDINT_H 1 + /* Define to 1 if you have the header file. */ +-#undef HAVE_STDIO_H ++#define HAVE_STDIO_H 1 + /* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H +#define HAVE_STDLIB_H 1 @@ -143,7 +136,7 @@ index d39c766..c650f5b 100644 /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H -@@ -142,7 +142,7 @@ +@@ -145,7 +145,7 @@ #undef HAVE_UNISTD_H /* Define to 1 if you have the `vprintf' function. */ @@ -152,14 +145,14 @@ index d39c766..c650f5b 100644 /* Define if you need to hide the static definitions of inline functions */ #undef HIDE_INLINE_STATIC -@@ -176,7 +176,7 @@ - #undef RELEASED - - /* Define to 1 if you have the ANSI C header files. */ +@@ -180,7 +180,7 @@ + /* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ -#undef STDC_HEADERS +#define STDC_HEADERS 1 /* Version number of package */ #undef VERSION --- +--- diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake index b722393fe80a17..5e1358ca2872db 100644 --- a/ports/gsl/portfile.cmake +++ b/ports/gsl/portfile.cmake @@ -1,9 +1,9 @@ -set(GSL_VERSION 2.6) +set(GSL_VERSION 2.7) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gsl/gsl-${GSL_VERSION}.tar.gz" FILENAME "gsl-${GSL_VERSION}.tar.gz" - SHA512 0be8240715f0b86aba2c63d9f12da4dba4719d4e350e9308d279e0dd3b2f0519ea26fd2e38a17f3e8cf43aacbaa2455207a7ca0d6c305f3b8725e8ece2250a74 + SHA512 a14ac5400acaf4884620430dbeb6f0b28eafe946923b792ab0eccc2a2abc9113d8ce342f4b1e5396f05247649f7d6f953944a8e6bdbf9ee1adb9e67b7c3df2b5 ) vcpkg_extract_source_archive_ex( @@ -14,17 +14,16 @@ vcpkg_extract_source_archive_ex( 0002-add-fp-control.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) \ No newline at end of file diff --git a/ports/gsl/vcpkg.json b/ports/gsl/vcpkg.json index 092f208c2d61c4..e09fe1f11bedb2 100644 --- a/ports/gsl/vcpkg.json +++ b/ports/gsl/vcpkg.json @@ -1,7 +1,16 @@ { "name": "gsl", - "version-string": "2.6", - "port-version": 2, + "version": "2.7", "description": "The GNU Scientific Library is a numerical library for C and C++ programmers", - "homepage": "https://www.gnu.org/software/gsl/" + "homepage": "https://www.gnu.org/software/gsl/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ee24d26b171749..6e394c072817eb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2513,8 +2513,8 @@ "port-version": 1 }, "gsl": { - "baseline": "2.6", - "port-version": 2 + "baseline": "2.7", + "port-version": 0 }, "gsl-lite": { "baseline": "0.38.1", diff --git a/versions/g-/gsl.json b/versions/g-/gsl.json index b8a0c154077f80..864c4d49189015 100644 --- a/versions/g-/gsl.json +++ b/versions/g-/gsl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "535ee015f7dee11404cf4a708a7f7f45e1b74383", + "version": "2.7", + "port-version": 0 + }, { "git-tree": "4754262f449ca9f2d46d597c6b1da89504b7ac08", "version-string": "2.6", From 089d4d1bdac91bad8fedb805de2f8ea764ce0901 Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Wed, 22 Sep 2021 15:23:22 -0500 Subject: [PATCH 0601/1858] [valijson] Update to version 0.6 (#20269) * Update varijson to version 0.6 Removing fix-nlohmann-json.patch, this patch is no longer needed * Run x-add-version --- ports/valijson/fix-nlohmann-json.patch | 26 ------------------------ ports/valijson/fix-optional.patch | 5 ++--- ports/valijson/fix-picojson.patch | 28 +++++++++++++++++--------- ports/valijson/portfile.cmake | 7 +++---- ports/valijson/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/v-/valijson.json | 5 +++++ 7 files changed, 31 insertions(+), 47 deletions(-) delete mode 100644 ports/valijson/fix-nlohmann-json.patch diff --git a/ports/valijson/fix-nlohmann-json.patch b/ports/valijson/fix-nlohmann-json.patch deleted file mode 100644 index 7465837d523c71..00000000000000 --- a/ports/valijson/fix-nlohmann-json.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/valijson/adapters/nlohmann_json_adapter.hpp b/include/valijson/adapters/nlohmann_json_adapter.hpp -index f77a2bf..3f6fb5f 100644 ---- a/include/valijson/adapters/nlohmann_json_adapter.hpp -+++ b/include/valijson/adapters/nlohmann_json_adapter.hpp -@@ -28,7 +28,7 @@ - #define __VALIJSON_ADAPTERS_NLOHMANN_JSON_ADAPTER_HPP - - #include --#include -+#include - - #include - #include -diff --git a/include/valijson/utils/nlohmann_json_utils.hpp b/include/valijson/utils/nlohmann_json_utils.hpp -index 01838d8..4a5b5e4 100644 ---- a/include/valijson/utils/nlohmann_json_utils.hpp -+++ b/include/valijson/utils/nlohmann_json_utils.hpp -@@ -4,7 +4,7 @@ - - #include - --#include -+#include - #include - - namespace valijson { diff --git a/ports/valijson/fix-optional.patch b/ports/valijson/fix-optional.patch index 5ce75843cc1960..307d630a57574c 100644 --- a/ports/valijson/fix-optional.patch +++ b/ports/valijson/fix-optional.patch @@ -1,8 +1,8 @@ diff --git a/include/valijson/internal/optional.hpp b/include/valijson/internal/optional.hpp -index 8ff285c..84e9fd6 100644 +index c9bc47b..c73c7fb 100644 --- a/include/valijson/internal/optional.hpp +++ b/include/valijson/internal/optional.hpp -@@ -11,7 +11,7 @@ namespace opt = std; +@@ -9,6 +9,6 @@ namespace opt = std; # endif # endif #else @@ -10,4 +10,3 @@ index 8ff285c..84e9fd6 100644 +# include namespace opt = std::experimental; #endif - diff --git a/ports/valijson/fix-picojson.patch b/ports/valijson/fix-picojson.patch index bb1b4d51b907d6..ae276f8ebec948 100644 --- a/ports/valijson/fix-picojson.patch +++ b/ports/valijson/fix-picojson.patch @@ -1,26 +1,34 @@ diff --git a/include/valijson/adapters/picojson_adapter.hpp b/include/valijson/adapters/picojson_adapter.hpp -index b6d17c9..6d04c52 100644 +index 4f5e5b6..0da2bf2 100644 --- a/include/valijson/adapters/picojson_adapter.hpp +++ b/include/valijson/adapters/picojson_adapter.hpp -@@ -29,7 +29,7 @@ - - #include +@@ -29,10 +29,10 @@ + #ifdef _MSC_VER + #pragma warning(disable: 4706) +-#include ++#include + #pragma warning(default: 4706) + #else -#include +#include + #endif #include - #include diff --git a/include/valijson/utils/picojson_utils.hpp b/include/valijson/utils/picojson_utils.hpp -index 2ca4d46..b983648 100644 +index 36420d2..8660c30 100644 --- a/include/valijson/utils/picojson_utils.hpp +++ b/include/valijson/utils/picojson_utils.hpp -@@ -4,7 +4,7 @@ - - #include +@@ -4,10 +4,10 @@ + #ifdef _MSC_VER + #pragma warning(disable: 4706) -#include +#include + #pragma warning(default: 4706) + #else +-#include ++#include + #endif #include - diff --git a/ports/valijson/portfile.cmake b/ports/valijson/portfile.cmake index ec32fa10082b33..3481d8678f51a7 100644 --- a/ports/valijson/portfile.cmake +++ b/ports/valijson/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tristanpenman/valijson - REF dd084d747448bb56ddfeab5946b4f2f4617b99c4 - SHA512 ee241eefc816360608f86792a4c25abadea79cbffc94d7e31a2dbd0a483ed4d7a303b6d2410b99ab7694e58a3d299f0df0baa52fa16f89e9233d90b190a4d799 + REF v0.6 + SHA512 a493d17159e479be7fe29d45c610c7d4fdd2c2f9ba897923129734fb07257dbb41fddde4c4263dbf0aa5c7101cd1555568a048beba2f60d2b32e625dd9690749 HEAD_REF master - PATCHES fix-nlohmann-json.patch - fix-picojson.patch + PATCHES fix-picojson.patch fix-optional.patch ) diff --git a/ports/valijson/vcpkg.json b/ports/valijson/vcpkg.json index 92fcdf98b157bb..f78a85c401e423 100644 --- a/ports/valijson/vcpkg.json +++ b/ports/valijson/vcpkg.json @@ -1,6 +1,5 @@ { "name": "valijson", - "version-string": "2018-11-17", - "port-version": 2, + "version": "0.6", "description": "Header-only C++ library for JSON Schema validation" } diff --git a/versions/baseline.json b/versions/baseline.json index 6e394c072817eb..dfae0f45fcb2a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6769,8 +6769,8 @@ "port-version": 0 }, "valijson": { - "baseline": "2018-11-17", - "port-version": 2 + "baseline": "0.6", + "port-version": 0 }, "value-ptr-lite": { "baseline": "0.2.1", diff --git a/versions/v-/valijson.json b/versions/v-/valijson.json index 211c2a0d9a875a..e63eb9a9d3dc7d 100644 --- a/versions/v-/valijson.json +++ b/versions/v-/valijson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7edd27211e0ef58ea307fe1fc4f34aea18cb8529", + "version": "0.6", + "port-version": 0 + }, { "git-tree": "c40f3039f56bbe5301d45b0bf0430b4852907608", "version-string": "2018-11-17", From 7fbc4da9f53dfaf342e8b871e80b2a405112dcb9 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Wed, 22 Sep 2021 16:28:14 -0400 Subject: [PATCH 0602/1858] [s2n] update to 1.1.0 (#20277) --- ports/s2n/portfile.cmake | 17 +++++------------ ports/s2n/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/s2n.json | 5 +++++ 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake index 151ba028192d6f..e3cdaf142d16af 100644 --- a/ports/s2n/portfile.cmake +++ b/ports/s2n/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/s2n-tls - REF b5b313b9ccddf268b30c642798f1d2a58d49ecd6 # v1.0.17 - SHA512 59750c9a3c9330e2b26b84d45665b222d23475090736d8299f81352c839a09af10be0d49d34ced1dadae65ca255e819df45b648387e26b7dca31d74782fdb834 + REF 4de98dcf20c476519c15241f92122b99fd2a9297 # v1.1.0 + SHA512 99c973912dc1a4db5ef36c24aa69134bf901101ce2ef749f7492f965f65f62b76c0e3935075881530f0828025ce20caa392afd9ad3bbdba157173dd5bb9f8163 PATCHES fix-cmake-target-path.patch ) @@ -11,18 +11,11 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - -file(GLOB SHARED_CMAKE_FILES - "${CURRENT_PACKAGES_DIR}/debug/lib/s2n" - "${CURRENT_PACKAGES_DIR}/lib/s2n" - ) - -foreach(FILE ${SHARED_CMAKE_FILES}) - file(COPY "${FILE}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/") -endforeach() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/s2n/cmake) file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/s2n" "${CURRENT_PACKAGES_DIR}/lib/s2n" ) diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json index 51359206ebd847..4ee7f70834032a 100644 --- a/ports/s2n/vcpkg.json +++ b/ports/s2n/vcpkg.json @@ -1,7 +1,6 @@ { "name": "s2n", - "version": "1.0.17", - "port-version": 1, + "version": "1.1.0", "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "supports": "!uwp & !windows", diff --git a/versions/baseline.json b/versions/baseline.json index dfae0f45fcb2a9..d3ab30baadee38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5853,8 +5853,8 @@ "port-version": 5 }, "s2n": { - "baseline": "1.0.17", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "safeint": { "baseline": "3.0.26", diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json index 95229e705a18d8..1e0fd9003ab096 100644 --- a/versions/s-/s2n.json +++ b/versions/s-/s2n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13b9d04cbee992cf866560de89551ceaf7dfc277", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "8df5dce6a28decc5f853d2efd6d657374709d1b2", "version": "1.0.17", From 3e8940ea0578ba14e70f92a707f899ed06495315 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Wed, 22 Sep 2021 22:34:14 +0200 Subject: [PATCH 0603/1858] [pdcurses] metadata: fix homepage (#20284) * pdcurses: fixed homepage * add port version * update version * revert 3.9 version hash Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/pdcurses/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/p-/pdcurses.json | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/pdcurses/vcpkg.json b/ports/pdcurses/vcpkg.json index 55ae1a1d9e7a2d..59398f2fe49937 100644 --- a/ports/pdcurses/vcpkg.json +++ b/ports/pdcurses/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdcurses", "version-string": "3.9", - "port-version": 1, + "port-version": 2, "description": "Public Domain Curses - a curses library for environments that don't fit the termcap/terminfo model.", - "homepage": "https://sourceforge.net/projects/pdcurses/" + "homepage": "https://pdcurses.org/" } diff --git a/versions/baseline.json b/versions/baseline.json index d3ab30baadee38..8c5c87a9aeefd0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5018,7 +5018,7 @@ }, "pdcurses": { "baseline": "3.9", - "port-version": 1 + "port-version": 2 }, "pdqsort": { "baseline": "2019-07-30", diff --git a/versions/p-/pdcurses.json b/versions/p-/pdcurses.json index ca56ad9d81f1de..28588339065bf0 100644 --- a/versions/p-/pdcurses.json +++ b/versions/p-/pdcurses.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "190eafb5554bf1f484edff1aa94598bac3ff9830", + "version-string": "3.9", + "port-version": 2 + }, { "git-tree": "ba3df274e70a15b1df907d3f594ddc71b99c2ec1", "version-string": "3.9", From 37e29d972e0d3e6e7d39b3a8735470b2c052fba9 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Wed, 22 Sep 2021 17:35:24 -0300 Subject: [PATCH 0604/1858] [kubernetes] Kubernetes C Client (#20255) * Kubernetes C Client's port * Kubernetes C Client's port * Replace deprecated methods * Add version file * Remove extra include directories * Fix version * Use vcpkg_from_github with a valid hash Remove usage file * Fix Aws Crypto Abstraction Layer and S2N builds * Update library version * Update library version * Update ports/kubernetes/vcpkg.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/kubernetes/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/kubernetes/vcpkg.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update version Co-authored-by: Ahmed Yarub Hani Al Nuaimi Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/kubernetes/001-fix-destination.patch | 12 ++++++++++ ports/kubernetes/portfile.cmake | 27 ++++++++++++++++++++++ ports/kubernetes/vcpkg.json | 21 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kubernetes.json | 9 ++++++++ 5 files changed, 73 insertions(+) create mode 100644 ports/kubernetes/001-fix-destination.patch create mode 100644 ports/kubernetes/portfile.cmake create mode 100644 ports/kubernetes/vcpkg.json create mode 100644 versions/k-/kubernetes.json diff --git a/ports/kubernetes/001-fix-destination.patch b/ports/kubernetes/001-fix-destination.patch new file mode 100644 index 00000000000000..00e7919d586c7c --- /dev/null +++ b/ports/kubernetes/001-fix-destination.patch @@ -0,0 +1,12 @@ +diff --git a/kubernetes/CMakeLists.txt b/kubernetes/CMakeLists.txt +--- a/kubernetes/CMakeLists.txt (revision 6b98698c92c59d8c63815f74ed4183fc36cde37b) ++++ b/kubernetes/CMakeLists.txt (date 1632055519986) +@@ -1563,7 +1563,7 @@ + install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX}) + else() + include(GNUInstallDirs) +- install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX} EXPORT ${pkgName}Targets) ++ install(TARGETS ${pkgName} EXPORT ${pkgName}Targets) + + foreach(HDR_FILE ${HDRS}) + get_filename_component(HDR_DIRECTORY ${HDR_FILE} DIRECTORY) diff --git a/ports/kubernetes/portfile.cmake b/ports/kubernetes/portfile.cmake new file mode 100644 index 00000000000000..8e9f36c9355b20 --- /dev/null +++ b/ports/kubernetes/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kubernetes-client/c + REF ecc9efc23656e747e97f86fbe2810f7e8471990f + SHA512 e9bb1b6f68aacd82df2b33fcb432fdfee5fb56e0426835f8480afff1c2545f483eb0f4edeafb2e866ea74918d748aa48655b5819909c13a88f693e371047e8b7 + HEAD_REF master + PATCHES + 001-fix-destination.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/kubernetes +) + +vcpkg_cmake_install() + +if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/kubernetes/vcpkg.json b/ports/kubernetes/vcpkg.json new file mode 100644 index 00000000000000..351c86073acd13 --- /dev/null +++ b/ports/kubernetes/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "kubernetes", + "version": "0.0.1", + "description": "Kubernetes C client", + "homepage": "https://github.com/kubernetes-client/c/", + "supports": "!uwp", + "dependencies": [ + "curl", + "libwebsockets", + "libyaml", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8c5c87a9aeefd0..6f5a2a5f925068 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3100,6 +3100,10 @@ "baseline": "0.1.19", "port-version": 1 }, + "kubernetes": { + "baseline": "0.0.1", + "port-version": 0 + }, "kuku": { "baseline": "2.1", "port-version": 1 diff --git a/versions/k-/kubernetes.json b/versions/k-/kubernetes.json new file mode 100644 index 00000000000000..8ef4fa381b03f4 --- /dev/null +++ b/versions/k-/kubernetes.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d52624c3f3a26d3ad801cca6af68e7bd8273b29b", + "version": "0.0.1", + "port-version": 0 + } + ] +} From b9a6214126bf337e63345d5737028dcb1d4278bd Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Wed, 22 Sep 2021 17:35:59 -0300 Subject: [PATCH 0605/1858] [libwebsockets] Enable separate debug and release builds (#20251) * Enable separate release and debug builds for libwebsockets * Update libwebsockets's port version * Refactoring * Refactoring Co-authored-by: Ahmed Yarub Hani Al Nuaimi Co-authored-by: Billy Robert O'Neal III --- ports/libwebsockets/portfile.cmake | 14 ++++++++------ ports/libwebsockets/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libwebsockets.json | 5 +++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 4bbaefbb82b25d..d99a2ed19cc6ee 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -163,12 +163,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libwebsockets-test-server") file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" LIBWEBSOCKETSCONFIG_CMAKE) string(REPLACE "/../include" "/../../include" LIBWEBSOCKETSCONFIG_CMAKE "${LIBWEBSOCKETSCONFIG_CMAKE}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/libwebsockets-config.cmake" "${LIBWEBSOCKETSCONFIG_CMAKE}") -file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" LIBWEBSOCKETSTARGETSDEBUG_CMAKE) -string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSDEBUG_CMAKE "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" "${LIBWEBSOCKETSTARGETSDEBUG_CMAKE}") -file(READ "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" LIBWEBSOCKETSTARGETSRELEASE_CMAKE) -string(REPLACE "websockets_static.lib" "websockets.lib" LIBWEBSOCKETSTARGETSRELEASE_CMAKE "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" "${LIBWEBSOCKETSTARGETSRELEASE_CMAKE}") + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-debug.cmake" "websockets_static.lib" "websockets.lib") +endif() + +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/share/libwebsockets/LibwebsocketsTargets-release.cmake" "websockets_static.lib" "websockets.lib") +endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL static) if (VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index e33c30a2ec43d1..677e02c2e54785 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libwebsockets", "version-semver": "4.2.2", + "port-version": 1, "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 6f5a2a5f925068..c977d55ca6fcb1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3898,7 +3898,7 @@ }, "libwebsockets": { "baseline": "4.2.2", - "port-version": 0 + "port-version": 1 }, "libxdiff": { "baseline": "0.23", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index 50ea7bdaa0c370..6ececa656f4e63 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f861f30fa2d88ebb0547f48940266517b015cc3", + "version-semver": "4.2.2", + "port-version": 1 + }, { "git-tree": "d3336ccb948156f48c50ee15980a5bb56374d3b3", "version-semver": "4.2.2", From e2a21551fa3cd4f537781965609984fd25db9e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 23 Sep 2021 19:41:52 +0200 Subject: [PATCH 0606/1858] [benchmark] Update port to v1.6.0 (#20302) Also replaced deprecated helpers with their new versions. --- ports/benchmark/portfile.cmake | 16 +++++++--------- ports/benchmark/vcpkg.json | 14 ++++++++++++-- versions/b-/benchmark.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index 096641a5785a9e..f1b79a6ca79b38 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -1,28 +1,26 @@ #https://github.com/google/benchmark/issues/661 -vcpkg_fail_port_install(ON_TARGET "uwp") +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF e991355c02b93fe17713efe04cbc2e278e00fdbd # v1.5.5 - SHA512 aa4455fa0f8546ec5762f14065e0be6667b5874e6991ca6dd21dc7b29e38c7c74cfddb2c99c7a1ed2f7636aa7bdec8fc0fc1523967b179f5642c2dc2e968089c + REF f91b6b42b1b9854772a90ae9501464a161707d1e # v1.6.0 + SHA512 5e3db75fcaa86b766d33e368f58cec5c5b2b9ba7fde658d13868d577679c13069756e68e86323b972daccc4f7d5e392d24d2d42e5308c1ae7e9955e651d45866 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBENCHMARK_ENABLE_TESTING=OFF ) -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/benchmark) vcpkg_fixup_pkgconfig() @@ -30,4 +28,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index bc666955193d94..713f0fa31669b1 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,7 +1,17 @@ { "name": "benchmark", - "version-semver": "1.5.5", + "version-semver": "1.6.0", "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index 0edc1ab45cf6a3..8832810570aa34 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a77547715562fcaa95568226f79af88d859d2c1", + "version-semver": "1.6.0", + "port-version": 0 + }, { "git-tree": "e47bb1810fa9570b6b87eba79bb95c749763e1e0", "version-semver": "1.5.5", diff --git a/versions/baseline.json b/versions/baseline.json index c977d55ca6fcb1..542a1f28a8feb2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -409,7 +409,7 @@ "port-version": 1 }, "benchmark": { - "baseline": "1.5.5", + "baseline": "1.6.0", "port-version": 0 }, "bento4": { From d1fcc2f0ec30c137044dae16c25b342f2c254a63 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 23 Sep 2021 11:00:41 -0700 Subject: [PATCH 0607/1858] [lcms] Backfill compat for lcms::lcms (#20034) * [lcms] Backfill compat for lcms::lcms * Remove :@TARGET_TRIPLET@ * Add comment for duplicate vcpkg_cmake_config_fixup. * [lcms] Update version db Co-authored-by: Billy Robert O'Neal III --- ports/lcms/CMakeLists.txt | 61 +++++++++------------------------------ ports/lcms/portfile.cmake | 16 ++++++---- ports/lcms/usage | 4 +++ ports/lcms/vcpkg.json | 16 ++++++++-- versions/baseline.json | 2 +- versions/l-/lcms.json | 5 ++++ 6 files changed, 47 insertions(+), 57 deletions(-) create mode 100644 ports/lcms/usage diff --git a/ports/lcms/CMakeLists.txt b/ports/lcms/CMakeLists.txt index d45ed2e8c77007..4852f8c4e0def0 100644 --- a/ports/lcms/CMakeLists.txt +++ b/ports/lcms/CMakeLists.txt @@ -1,42 +1,10 @@ cmake_minimum_required(VERSION 3.5) -option(CMAKE_VERBOSE_MAKEFILE "Create verbose makefile" OFF) -option(BUILD_SHARED_LIBS "Create lcms2 as a shared library" ON) - project(little-cms) -set(CMAKE_DEBUG_POSTFIX d) +file(GLOB SRCS src/*.c) -add_library(lcms2 - "${CMAKE_CURRENT_LIST_DIR}/src/cmstypes.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsvirt.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmswtpnt.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsxform.c" - "${CMAKE_CURRENT_LIST_DIR}/src/lcms2.def" - "${CMAKE_CURRENT_LIST_DIR}/src/lcms2_internal.h" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsalpha.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmscam02.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmscgats.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmscnvrt.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmserr.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsgamma.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsgmt.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmshalf.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsintrp.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsio0.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsio1.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmslut.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsmd5.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsmtrx.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsnamed.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsopt.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmspack.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmspcs.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsplugin.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmsps2.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmssamp.c" - "${CMAKE_CURRENT_LIST_DIR}/src/cmssm.c" -) +add_library(lcms2 ${SRCS} src/lcms2.def) if(BUILD_SHARED_LIBS) target_compile_options(lcms2 PRIVATE -DCMS_DLL_BUILD) @@ -44,7 +12,7 @@ if(BUILD_SHARED_LIBS) endif() target_compile_options(lcms2 PRIVATE -DUNICODE -D_UNICODE) -target_include_directories(lcms2 PRIVATE "${CMAKE_CURRENT_LIST_DIR}/include") +target_include_directories(lcms2 PUBLIC $) set_target_properties(lcms2 PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/include/lcms2.h;${CMAKE_CURRENT_LIST_DIR}/include/lcms2_plugin.h") # Generate pkg-config file @@ -58,30 +26,29 @@ SET(exec_prefix "\${prefix}") SET(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") SET(includedir "\${prefix}/include") CONFIGURE_FILE(lcms2.pc.in "${PROJECT_BINARY_DIR}/lcms2.pc" @ONLY) -IF(CMAKE_BUILD_TYPE MATCHES Debug) - # Add CMAKE_DEBUG_POSTFIX - file(READ "${PROJECT_BINARY_DIR}/lcms2.pc" LCMS2_PC) - string(REPLACE "-llcms2" "-llcms2${CMAKE_DEBUG_POSTFIX}" LCMS2_PC "${LCMS2_PC}") - file(WRITE "${PROJECT_BINARY_DIR}/lcms2.pc" "${LCMS2_PC}") -ENDIF() install(TARGETS lcms2 - EXPORT lcmsConfig + EXPORT lcms2Config RUNTIME DESTINATION "bin" LIBRARY DESTINATION "lib" ARCHIVE DESTINATION "lib" PUBLIC_HEADER DESTINATION "include" - COMPONENT dev ) INSTALL(FILES ${PROJECT_BINARY_DIR}/lcms2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -export(TARGETS lcms2 +install(EXPORT lcms2Config + DESTINATION "share/lcms2" NAMESPACE lcms2:: - FILE "share/lcms/lcmsConfig.cmake" ) -install(EXPORT lcmsConfig +# Backwards compatibility for previous vcpkg users +add_library(lcms INTERFACE) +target_link_libraries(lcms INTERFACE lcms2) + + +install(TARGETS lcms EXPORT lcms-targets) +install(EXPORT lcms-targets DESTINATION "share/lcms" - NAMESPACE lcms2:: + NAMESPACE lcms:: ) diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 2a2d2deae23fc8..78b8409ce0d8f0 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -15,15 +15,19 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() -vcpkg_install_cmake() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup(PACKAGE_NAME lcms2) +vcpkg_cmake_config_fixup() # provides old PACKAGE_NAME lcms vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/lcms/lcms-config.cmake" [[ +include(CMakeFindDependencyMacro) +find_dependency(lcms2 CONFIG) +include(${CMAKE_CURRENT_LIST_DIR}/lcms-targets.cmake) +]]) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/lcms/usage b/ports/lcms/usage new file mode 100644 index 00000000000000..1b37c7f74304db --- /dev/null +++ b/ports/lcms/usage @@ -0,0 +1,4 @@ +The package lcms provides CMake targets: + + find_package(lcms2 CONFIG REQUIRED) + target_link_libraries(main PRIVATE lcms2::lcms2) diff --git a/ports/lcms/vcpkg.json b/ports/lcms/vcpkg.json index 0618ac8479d455..6dca15372ea624 100644 --- a/ports/lcms/vcpkg.json +++ b/ports/lcms/vcpkg.json @@ -1,7 +1,17 @@ { "name": "lcms", - "version-string": "2.12", - "port-version": 1, + "version": "2.12", + "port-version": 2, "description": "Little CMS.", - "homepage": "https://github.com/mm2/Little-CMS" + "homepage": "https://github.com/mm2/Little-CMS", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 542a1f28a8feb2..25432541ec4f21 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3146,7 +3146,7 @@ }, "lcms": { "baseline": "2.12", - "port-version": 1 + "port-version": 2 }, "leaf": { "baseline": "0.2.2", diff --git a/versions/l-/lcms.json b/versions/l-/lcms.json index 0a537230d20a18..02e5a2edae2bbd 100644 --- a/versions/l-/lcms.json +++ b/versions/l-/lcms.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27ea0f07f8132e37a1e265ee54216eb0abc185dd", + "version": "2.12", + "port-version": 2 + }, { "git-tree": "40c7773d4774034a567f4b9f5427e558afe66ebd", "version-string": "2.12", From ce7c217f2e56c2b23c4b3a386caabb70bcb4e54e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Thu, 23 Sep 2021 21:32:02 +0200 Subject: [PATCH 0608/1858] [docs] Fix (some) broken links in documentation (#20303) * Fix broken links to nondeprecated portfile helpers * Also link through to maintainers cmake ports --- docs/maintainers/maintainer-guide.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 2bd8f61f5a80d7..855a3a36c4dfc1 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -46,10 +46,10 @@ At this time, the following helpers are deprecated: 2. `vcpkg_apply_patches()` should be replaced by the `PATCHES` arguments to the "extract" helpers (e.g. [`vcpkg_from_github()`](vcpkg_from_github.md)) 3. `vcpkg_build_msbuild()` should be replaced by [`vcpkg_install_msbuild()`](vcpkg_install_msbuild.md) 4. `vcpkg_copy_tool_dependencies()` should be replaced by [`vcpkg_copy_tools()`](vcpkg_copy_tools.md) -5. `vcpkg_configure_cmake` should be replaced by [`vcpkg_cmake_configure()`](vcpkg_cmake_configure.md) after removing `PREFER_NINJA` (from port `vcpkg-cmake`) -6. `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](vcpkg_cmake_build.md) (from port `vcpkg-cmake`) -7. `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](vcpkg_cmake_install.md) (from port `vcpkg-cmake`) -8. `vcpkg_fixup_cmake_targets` should be replaced by [`vcpkg_cmake_config_fixup`](vcpkg_cmake_config_fixup.md) (from port `vcpkg-cmake-config`) +5. `vcpkg_configure_cmake` should be replaced by [`vcpkg_cmake_configure()`](ports/vcpkg-cmake/vcpkg_cmake_configure.md#vcpkg_cmake_configure) after removing `PREFER_NINJA` (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) +6. `vcpkg_build_cmake` should be replaced by [`vcpkg_cmake_build()`](ports/vcpkg-cmake/vcpkg_cmake_build.md#vcpkg_cmake_build) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) +7. `vcpkg_install_cmake` should be replaced by [`vcpkg_cmake_install()`](ports/vcpkg-cmake/vcpkg_cmake_install.md#vcpkg_cmake_install) (from port [`vcpkg-cmake`](ports/vcpkg-cmake.md#vcpkg-cmake)) +8. `vcpkg_fixup_cmake_targets` should be replaced by [`vcpkg_cmake_config_fixup`](ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.md#vcpkg_cmake_config_fixup) (from port [`vcpkg-cmake-config`](ports/vcpkg-cmake-config.md#vcpkg-cmake-config)) Some of the replacement helper functions are in "tools ports" to allow consumers to pin their behavior at specific versions, to allow locking the behavior of the helpers at a particular From 60dfd20465cd132befe5e606d6a16f80b602be8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 24 Sep 2021 02:04:46 +0300 Subject: [PATCH 0609/1858] [vcpkg_fixup_pkgconfig] Add support for Cflags.private (#19852) --- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 3f37099a71c3df..7557b5b1b5d519 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -168,6 +168,12 @@ function(vcpkg_fixup_pkgconfig) string(REGEX REPLACE "(^|\n)Libs.private:( *[^\n]*)(.*\nLibs: *[^\n]*)" "\\3\\2" _contents "${_contents}") # Only Libs.private string(REGEX REPLACE "(^|\n)Libs.private: *" "\\1Libs: " _contents "${_contents}") + # Cflags comes before Cflags.private + string(REGEX REPLACE "(^|\n)(Cflags: *[^\n]*)(.*)\nCflags.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") + # Cflags.private comes before Cflags + string(REGEX REPLACE "(^|\n)Cflags.private:( *[^\n]*)(.*\nCflags: *[^\n]*)" "\\3\\2" _contents "${_contents}") + # Only Cflags.private + string(REGEX REPLACE "(^|\n)Cflags.private: *" "\\1Cflags: " _contents "${_contents}") # Requires comes before Requires.private string(REGEX REPLACE "(^|\n)(Requires: *[^\n]*)(.*)\nRequires.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") # Requires.private comes before Requires From f95470fa338c67376f5b49cb31facb95f6ebc51e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 24 Sep 2021 03:03:13 +0300 Subject: [PATCH 0610/1858] [kf5xmlgui] New port (#19756) * Add kf5xmlgui port * Fixed kf5xmlgui for windows * [kf5*] update to 5.75.0 * [kf5xmlgui] update to current spec * [kf5xmlgui] update to 5.84 * [kf5xmlgui] remove extra build options * [kf5xmlgui] don't remove ksendbugmail, use vcpkg_copy_tools() instead * [kf5xmlgui] only remove what's needed * [kf5xmlgui] wrap paths in quotes * [kf5xmlgui] update versions * [kf5xmlgui] ksendbugmail is only built on Windows * [kf5xmlgui] update versions * [kf5xmlgui] add Qt Designer plugin feature * [kf5xmlgui] update versions * [kf5xmlgui] restore non-optional kglobalaccel dependency * [kf5xmlgui] update versions * [kf5xmlgui] DISABLE_PARALLEL_CONFIGURE * [kf5xmlgui] update versions * [kf5xmlgui] fix Windows static builds * [kf5xmlgui] update versions * [kf5xmlgui] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5xmlgui] update versions * [kf5xmlgui] fix Windows static build * [kf5xmlgui] update versions * [kf5xmlgui] add support for static builds to config.cmake * [kf5xmlgui] update versions * [kf5xmlgui] libiconv patches only for windows static builds * [kf5xmlgui] update versions * [kf5xmlgui] use semver * [kf5xmlgui] update versions * [kf5xmlgui] cleanup, iconv was fixed in kf5i18n * [kf5xmlgui] use generic, non-semver versioning * [kf5xmlgui] update versions * [kf5xmlgui] re-enable parallel configure * [kf5xmlgui] update versions * [kf5xmlgui] remove meta info from patches * [kf5xmlgui] update versions Co-authored-by: Kuntal Majumder --- .../add_support_for_static_builds.patch | 29 +++++++++++ ports/kf5xmlgui/portfile.cmake | 47 +++++++++++++++++ .../remove_explicit_shared_argument.patch | 15 ++++++ ports/kf5xmlgui/vcpkg.json | 50 +++++++++++++++++++ versions/baseline.json | 4 ++ versions/k-/kf5xmlgui.json | 9 ++++ 6 files changed, 154 insertions(+) create mode 100644 ports/kf5xmlgui/add_support_for_static_builds.patch create mode 100644 ports/kf5xmlgui/portfile.cmake create mode 100644 ports/kf5xmlgui/remove_explicit_shared_argument.patch create mode 100644 ports/kf5xmlgui/vcpkg.json create mode 100644 versions/k-/kf5xmlgui.json diff --git a/ports/kf5xmlgui/add_support_for_static_builds.patch b/ports/kf5xmlgui/add_support_for_static_builds.patch new file mode 100644 index 00000000000000..fd1aeac66e571f --- /dev/null +++ b/ports/kf5xmlgui/add_support_for_static_builds.patch @@ -0,0 +1,29 @@ +diff --git a/KF5XmlGuiConfig.cmake.in b/KF5XmlGuiConfig.cmake.in +index 6238ab5f..8c249eb1 100644 +--- a/KF5XmlGuiConfig.cmake.in ++++ b/KF5XmlGuiConfig.cmake.in +@@ -12,5 +12,21 @@ find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) + find_dependency(KF5Config "@KF_DEP_VERSION@") + find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") ++ find_dependency(Qt5PrintSupport "@REQUIRED_QT_VERSION@") ++ ++ if (@KF5GlobalAccel_FOUND@) ++ find_dependency(KF5GlobalAccel "@KF_DEP_VERSION@") ++ endif() ++ ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5XmlGuiTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5xmlgui/portfile.cmake b/ports/kf5xmlgui/portfile.cmake new file mode 100644 index 00000000000000..57f519f11f8b61 --- /dev/null +++ b/ports/kf5xmlgui/portfile.cmake @@ -0,0 +1,47 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kxmlgui + REF v5.84.0 + SHA512 39657ec545c1463cadec719e7c6dc546fb6d1804b5c2b86904bfffd01be173c3ead1533ec33f749343f5575785394fe659ca0be51af706911e5176d485ef7f20 + HEAD_REF master + PATCHES + remove_explicit_shared_argument.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/d12e8f6266188ce7e221dc014a56071b8a5ef706 + add_support_for_static_builds.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/2f1b948ad690942d4ec208c5676c11218f29181a +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + designerplugin BUILD_DESIGNERPLUGIN + ) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QTPLUGINDIR=plugins + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5XmlGui CONFIG_PATH lib/cmake/KF5XmlGui) +vcpkg_copy_pdbs() + +if (VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools( + TOOL_NAMES ksendbugmail + AUTO_CLEAN + ) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5xmlgui/remove_explicit_shared_argument.patch b/ports/kf5xmlgui/remove_explicit_shared_argument.patch new file mode 100644 index 00000000000000..9d70ea3dbdd24e --- /dev/null +++ b/ports/kf5xmlgui/remove_explicit_shared_argument.patch @@ -0,0 +1,15 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2fac31b7..2f4fc881 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_subdirectory(ksendbugmail) + +-add_library(KF5XmlGui SHARED) ++add_library(KF5XmlGui) + add_library(KF5::XmlGui ALIAS KF5XmlGui) + + if (HAVE_GLOBALACCEL) +-- +GitLab + diff --git a/ports/kf5xmlgui/vcpkg.json b/ports/kf5xmlgui/vcpkg.json new file mode 100644 index 00000000000000..3c57d2955c0041 --- /dev/null +++ b/ports/kf5xmlgui/vcpkg.json @@ -0,0 +1,50 @@ +{ + "name": "kf5xmlgui", + "version": "5.84.0", + "description": "Framework for managing menu and toolbar actions", + "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", + "dependencies": [ + "ecm", + "gettext", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + { + "name": "kf5globalaccel", + "platform": "!windows & !osx & !android" + }, + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5widgetsaddons", + "kf5windowsystem", + { + "name": "libiconv", + "platform": "windows & static" + }, + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "designerplugin": { + "description": "Enables a Qt Designer plugin" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 25432541ec4f21..4b8322eadd269b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3064,6 +3064,10 @@ "baseline": "5.84.0", "port-version": 3 }, + "kf5xmlgui": { + "baseline": "5.84.0", + "port-version": 0 + }, "kfr": { "baseline": "4.2.1", "port-version": 0 diff --git a/versions/k-/kf5xmlgui.json b/versions/k-/kf5xmlgui.json new file mode 100644 index 00000000000000..a8c8191448e329 --- /dev/null +++ b/versions/k-/kf5xmlgui.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5cecdc03d8c8a9d399ef6aae83e26a9cd32d2f28", + "version": "5.84.0", + "port-version": 0 + } + ] +} From 106677aa031d6513756750a61596b9dbcab4675c Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 24 Sep 2021 08:04:17 +0800 Subject: [PATCH 0611/1858] [libimobiledevice/libideviceactivation] update to latest version (#19962) * [libimobiledevice/libideviceactivation/libzen] update to latest version * update version * update vcpkg.json format * update version * fix export target * update version * update version * revert port libzen * update version * handle libzen conflict files * delete vcpkg_cmake_config_fixup * update version --- ports/libideviceactivation/portfile.cmake | 15 +++++++-------- ports/libideviceactivation/vcpkg.json | 9 ++++++--- ports/libimobiledevice/portfile.cmake | 17 ++++++++--------- ports/libimobiledevice/vcpkg.json | 9 ++++++--- versions/baseline.json | 8 ++++---- versions/l-/libideviceactivation.json | 5 +++++ versions/l-/libimobiledevice.json | 5 +++++ 7 files changed, 41 insertions(+), 27 deletions(-) diff --git a/ports/libideviceactivation/portfile.cmake b/ports/libideviceactivation/portfile.cmake index ad5bbfbcb25dfe..e438cba37ed8f1 100644 --- a/ports/libideviceactivation/portfile.cmake +++ b/ports/libideviceactivation/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libideviceactivation - REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.2.235 + REF fbe0476cfeddc2fc317ceb900eec12302c1d4c11 # v1.3.17 SHA512 18fdf1b42744da33e0f0f037e83a72b76cc0b63a0b712e78d9736adcde113582327f3712bc2bfa7b6fdb692465700a9106286f383fd7d11f9351ca7939b20e24 HEAD_REF msvc-master ) -configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libideviceactivation/vcpkg.json b/ports/libideviceactivation/vcpkg.json index 6a864bd005a584..7eadb89a3f17cb 100644 --- a/ports/libideviceactivation/vcpkg.json +++ b/ports/libideviceactivation/vcpkg.json @@ -1,12 +1,15 @@ { "name": "libideviceactivation", - "version-string": "1.2.235", - "port-version": 1, + "version": "1.3.17", "description": "A library to handle the activation process of iOS devices", "dependencies": [ "curl", "libimobiledevice", "libplist", - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/libimobiledevice/portfile.cmake b/ports/libimobiledevice/portfile.cmake index cfba47859d26f5..b063154bccb9f1 100644 --- a/ports/libimobiledevice/portfile.cmake +++ b/ports/libimobiledevice/portfile.cmake @@ -1,23 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libimobiledevice-win32/libimobiledevice - REF 348aec1f714f77c717141f70869ac7c996c3c6fb # v1.3.6 + patches - SHA512 fc7924667c3cb07025fd25ff94610ae57a90a8fd4502393e89993bfcd13c5e0c609efbf0343f344f59a8520ba4f7805925fea4c06d20ac1680f63f16aac12542 + REF 0d4a7e905baeadafa098e629a5241fac6fbf7d24 # v1.3.7 + SHA512 db6369b2fa8e7b659948602ac8c4cd568bf37c0f73e58150f61f1af7000de95aa1a6a9ae546d6a37de4cb08a8059127fe5ed067351c4092c01a45350586f755a HEAD_REF msvc-master ) -configure_file(${CURRENT_PORT_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) +configure_file("${CURRENT_PORT_DIR}/CMakeLists.txt" "${SOURCE_PATH}/CMakeLists.txt" COPYONLY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libimobiledevice/vcpkg.json b/ports/libimobiledevice/vcpkg.json index 2bef3413703104..48e63449b7d530 100644 --- a/ports/libimobiledevice/vcpkg.json +++ b/ports/libimobiledevice/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libimobiledevice", - "version-string": "1.3.6", - "port-version": 2, + "version": "1.3.17", "description": "A cross-platform protocol library to communicate with iOS devices", "homepage": "http://www.libimobiledevice.org", "dependencies": [ @@ -9,6 +8,10 @@ "getopt", "libplist", "libusbmuxd", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4b8322eadd269b..cc17ee37f0419e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3417,8 +3417,8 @@ "port-version": 0 }, "libideviceactivation": { - "baseline": "1.2.235", - "port-version": 1 + "baseline": "1.3.17", + "port-version": 0 }, "libidn2": { "baseline": "2.3.0", @@ -3433,8 +3433,8 @@ "port-version": 1 }, "libimobiledevice": { - "baseline": "1.3.6", - "port-version": 2 + "baseline": "1.3.17", + "port-version": 0 }, "libirecovery": { "baseline": "1.0.25", diff --git a/versions/l-/libideviceactivation.json b/versions/l-/libideviceactivation.json index 8b94277fdd36eb..8d33991d9cc59d 100644 --- a/versions/l-/libideviceactivation.json +++ b/versions/l-/libideviceactivation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ff1d3dc1c70954efdb1b56ea38660c8e2817a68", + "version": "1.3.17", + "port-version": 0 + }, { "git-tree": "9c39284ebf51443f0dc6c3291bdb7cdca973a9d2", "version-string": "1.2.235", diff --git a/versions/l-/libimobiledevice.json b/versions/l-/libimobiledevice.json index c8c340dca0bd25..c249e19627911b 100644 --- a/versions/l-/libimobiledevice.json +++ b/versions/l-/libimobiledevice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bf3d6cdc93021dcc048d73d7153aebecd91c47e", + "version": "1.3.17", + "port-version": 0 + }, { "git-tree": "5b4e580b28caaf03bbe46030bf612af191eb800a", "version-string": "1.3.6", From 7e4586552f06db6927f72289b81b5c03713e4328 Mon Sep 17 00:00:00 2001 From: Alberto Luaces Date: Fri, 24 Sep 2021 02:37:57 +0200 Subject: [PATCH 0612/1858] [openmvg] Fix for building with eigen 3.4.0. (#20056) * [openmvg] Fix for building with eigen 3.4.0. * Bump port version. * Convert "version-string" field into "version" Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update vcpkg_check_features call * [openmvg] x-add-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/openmvg/0001-eigen_3.4.0.patch | 25 +++++++++++++++++++++++++ ports/openmvg/portfile.cmake | 10 ++++++---- ports/openmvg/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/o-/openmvg.json | 5 +++++ 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 ports/openmvg/0001-eigen_3.4.0.patch diff --git a/ports/openmvg/0001-eigen_3.4.0.patch b/ports/openmvg/0001-eigen_3.4.0.patch new file mode 100644 index 00000000000000..be81355dd4e5c1 --- /dev/null +++ b/ports/openmvg/0001-eigen_3.4.0.patch @@ -0,0 +1,25 @@ +From 7be28dca0403660e721d66de954f27b92897163e Mon Sep 17 00:00:00 2001 +From: Alberto Luaces +Date: Wed, 8 Sep 2021 18:00:53 +0200 +Subject: [PATCH] eigen_3.4.0 + +--- + src/openMVG/multiview/solver_fundamental_kernel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/openMVG/multiview/solver_fundamental_kernel.cpp b/src/openMVG/multiview/solver_fundamental_kernel.cpp +index 5e0c12eb..fa025198 100644 +--- a/src/openMVG/multiview/solver_fundamental_kernel.cpp ++++ b/src/openMVG/multiview/solver_fundamental_kernel.cpp +@@ -134,7 +134,7 @@ void EightPointSolver::Solve + MatX9 epipolar_constraint(x1.cols(), 9); + epipolar_constraint.fill(0.0); + EncodeEpipolarEquation(x1, x2, &epipolar_constraint); +- Eigen::SelfAdjointEigenSolver solver ++ Eigen::SelfAdjointEigenSolver> solver + (epipolar_constraint.transpose() * epipolar_constraint); + f = solver.eigenvectors().leftCols<1>(); + } +-- +2.30.2 + diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake index b8301a3c90e29b..bb8d115ee8f553 100644 --- a/ports/openmvg/portfile.cmake +++ b/ports/openmvg/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github( SHA512 6e74effbc66f5d5e7c2d5edd7dacf3c0fa7eec1cb666244db8e4147c08d2e6faca98c1164ca1305a5013d247d479184742e5156232d4d8430615af31811e216e PATCHES build_fixes.patch + 0001-eigen_3.4.0.patch ) set(OpenMVG_USE_OPENMP OFF) @@ -26,10 +27,11 @@ if("openmp" IN_LIST FEATURES) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - opencv OpenMVG_USE_OPENCV - opencv OpenMVG_USE_OCVSIFT - software OpenMVG_BUILD_SOFTWARES - software OpenMVG_BUILD_GUI_SOFTWARES + FEATURES + opencv OpenMVG_USE_OPENCV + opencv OpenMVG_USE_OCVSIFT + software OpenMVG_BUILD_SOFTWARES + software OpenMVG_BUILD_GUI_SOFTWARES ) # remove some deps to prevent conflict diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json index e766b9606bcb29..42686e60a0b712 100644 --- a/ports/openmvg/vcpkg.json +++ b/ports/openmvg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvg", - "version-string": "1.6", - "port-version": 2, + "version": "1.6", + "port-version": 3, "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.", "dependencies": [ "cereal", diff --git a/versions/baseline.json b/versions/baseline.json index cc17ee37f0419e..ca2756718c1f04 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4826,7 +4826,7 @@ }, "openmvg": { "baseline": "1.6", - "port-version": 2 + "port-version": 3 }, "openmvs": { "baseline": "1.1", diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index bced436429ab5d..1731c064e518f9 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f3087d8d002d7f226e77427ce363e2b20371485", + "version": "1.6", + "port-version": 3 + }, { "git-tree": "f62103b28735c9e72b9a866e6530c52629e77295", "version-string": "1.6", From f89bb7974feab071fa77e38a7b7fe8e1416c4b42 Mon Sep 17 00:00:00 2001 From: Marco Correia Date: Fri, 24 Sep 2021 01:43:43 +0100 Subject: [PATCH 0613/1858] [argparse] Bumps argparse to version v2.2. (#20261) * Bumps argparse to version v2.2. * Adds version. * Replaced deprecated functions. * Update ports/argparse/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update ports/argparse/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Updates version. * Updates version. * Update ports/argparse/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/argparse/vcpkg.json Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Updates version. Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/argparse/portfile.cmake | 15 +++++++-------- ports/argparse/vcpkg.json | 14 ++++++++++++-- versions/a-/argparse.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ports/argparse/portfile.cmake b/ports/argparse/portfile.cmake index a313a920ed4526..82142c63eea73a 100644 --- a/ports/argparse/portfile.cmake +++ b/ports/argparse/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/argparse - REF 9903a22904fed8176c4a1f69c4b691304b23c78e #2021-03-04 - SHA512 da50761471341d558ed0c336bf78f80a704ec25c15ace23fb3a92d81ddbf2e4c2fd4f6c4226f088382f41418d58d5ef9b57cdd6e9689be5d83dba6adb2ac0aba + REF b0cb28ab177cdbd19d439c02cdc217bdfc508ba9 # v2.2 + SHA512 247f27aa45994ee4629b947e3fe1b1df8fae4e773992c740a7c3d544e45ce83a68ecdcfdedf38c461ccb81cf93d88dfee21dc4f7d027677a3c7d930170446971 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARGPARSE_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/argparse/vcpkg.json b/ports/argparse/vcpkg.json index 7e6be41e7d5a5f..ca94bbc8b9ae68 100644 --- a/ports/argparse/vcpkg.json +++ b/ports/argparse/vcpkg.json @@ -1,7 +1,17 @@ { "name": "argparse", - "version-date": "2021-03-04", + "version": "2.2", "description": "Argument parser for modern C++", "homepage": "https://github.com/p-ranav/argparse", - "license": "MIT" + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/argparse.json b/versions/a-/argparse.json index 1ecb76e58136d9..accdedbe5cd01e 100644 --- a/versions/a-/argparse.json +++ b/versions/a-/argparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "928e03159c73294a2e6623d330ea1567190d753f", + "version": "2.2", + "port-version": 0 + }, { "git-tree": "b16b0a340e04d56e4a736b57eafa5fc352abfc58", "version-date": "2021-03-04", diff --git a/versions/baseline.json b/versions/baseline.json index ca2756718c1f04..37cb6d6ff63c71 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -133,7 +133,7 @@ "port-version": 3 }, "argparse": { - "baseline": "2021-03-04", + "baseline": "2.2", "port-version": 0 }, "args": { From fa1af1bc44dc823b2aad014b950fd65a51c93543 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 24 Sep 2021 02:45:11 +0200 Subject: [PATCH 0614/1858] [icu] Fix mingw builds (#20253) * Fix mingw dll installation * Patch static lib naming * Update icu homepage * Fix mingw builds on windows triplet host * Update versions Co-authored-by: Billy Robert O'Neal III --- ports/icu/disable-static-prefix.patch | 20 ++++++++++ ports/icu/mingw-dll-install.patch | 13 +++++++ ports/icu/portfile.cmake | 54 +++++++-------------------- ports/icu/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 +++ 6 files changed, 54 insertions(+), 44 deletions(-) create mode 100644 ports/icu/disable-static-prefix.patch create mode 100644 ports/icu/mingw-dll-install.patch diff --git a/ports/icu/disable-static-prefix.patch b/ports/icu/disable-static-prefix.patch new file mode 100644 index 00000000000000..4e63e3375b1a27 --- /dev/null +++ b/ports/icu/disable-static-prefix.patch @@ -0,0 +1,20 @@ +diff --git a/source/icudefs.mk.in b/source/icudefs.mk.in +index 24bd97a..33169de 100644 +--- a/source/icudefs.mk.in ++++ b/source/icudefs.mk.in +@@ -213,13 +213,13 @@ LIBICU = $(LIBPREFIX)$(ICUPREFIX) + + ## If we can't use the shared libraries, use the static libraries + ifneq ($(ENABLE_SHARED),YES) +-STATIC_PREFIX_WHEN_USED = s ++STATIC_PREFIX_WHEN_USED = + else + STATIC_PREFIX_WHEN_USED = + endif + + # Static library prefix and file extension +-STATIC_PREFIX = s ++STATIC_PREFIX = + LIBSICU = $(LIBPREFIX)$(STATIC_PREFIX)$(ICUPREFIX) + A = a + SOBJ = $(SO) diff --git a/ports/icu/mingw-dll-install.patch b/ports/icu/mingw-dll-install.patch new file mode 100644 index 00000000000000..26c7783652f151 --- /dev/null +++ b/ports/icu/mingw-dll-install.patch @@ -0,0 +1,13 @@ +diff --git a/source/config/mh-mingw64 b/source/config/mh-mingw64 +index fb64c56..a43cc4d 100644 +--- a/source/config/mh-mingw64 ++++ b/source/config/mh-mingw64 +@@ -10,7 +10,7 @@ + # On Windows we generally have the DLLs in the bin directory rather than the lib directory. + # This setting moves the ICU DLLs into the bin folder for MinGW/MSYS2 when "make install" is run. + # If you prefer to have the DLLs in the lib folder, then set this to NO instead. +-MINGW_MOVEDLLSTOBINDIR = YES ++MINGW_MOVEDLLSTOBINDIR = NO + + # This file is similar to mh-mingw + # Any changes made here may also need to be made in mh-mingw diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 9731bf5b4b2138..66905dd70ea125 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -16,10 +16,12 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/disable-escapestr-tool.patch - ${CMAKE_CURRENT_LIST_DIR}/remove-MD-from-configure.patch - ${CMAKE_CURRENT_LIST_DIR}/fix_parallel_build_on_windows.patch - ${CMAKE_CURRENT_LIST_DIR}/fix-extra.patch + disable-escapestr-tool.patch + remove-MD-from-configure.patch + fix_parallel_build_on_windows.patch + fix-extra.patch + mingw-dll-install.patch + disable-static-prefix.patch # https://gitlab.kitware.com/cmake/cmake/-/issues/16617; also mingw. ) vcpkg_find_acquire_program(PYTHON3) @@ -33,8 +35,10 @@ list(APPEND CONFIGURE_OPTIONS_DEBUG --enable-debug --disable-release) set(RELEASE_TRIPLET ${TARGET_TRIPLET}-rel) set(DEBUG_TRIPLET ${TARGET_TRIPLET}-dbg) -if(NOT "${TARGET_TRIPLET}" STREQUAL "${HOST_TRIPLET}") - # cross compiling +if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_IS_MINGW AND NOT HOST_TRIPLET MATCHES "mingw") + # Assuming no cross compiling because the host (windows) pkgdata tool doesn't + # use the '/' path separator when creating compiler commands for mingw bash. +elseif(VCPKG_CROSSCOMPILING) set(TOOL_PATH "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") # convert to unix path string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" _VCPKG_TOOL_PATH "${TOOL_PATH}") @@ -123,15 +127,6 @@ endif() vcpkg_install_make() -if(VCPKG_TARGET_IS_MINGW) - file(GLOB ICU_TOOLS - ${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_HOST_EXECUTABLE_SUFFIX} - ${CURRENT_PACKAGES_DIR}/bin/icu-config - ${CURRENT_PACKAGES_DIR}/debug/bin/icu-config) - file(REMOVE ${ICU_TOOLS}) -endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/debug/share @@ -147,29 +142,6 @@ if(TEST_LIBS) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(VCPKG_TARGET_IS_WINDOWS) - # rename static libraries to match import libs - # see https://gitlab.kitware.com/cmake/cmake/issues/16617 - foreach(MODULE dt in io tu uc) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sicu${MODULE}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/icu${MODULE}${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sicu${MODULE}d${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/icu${MODULE}d${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - endif() - endforeach() - - file(GLOB_RECURSE pkg_files LIST_DIRECTORIES false ${CURRENT_PACKAGES_DIR}/*.pc) - message(STATUS "${pkg_files}") - foreach(pkg_file IN LISTS pkg_files) - message(STATUS "${pkg_file}") - file(READ ${pkg_file} PKG_FILE) - string(REGEX REPLACE "-ls([^ \\t\\n]+)" "-l\\1" PKG_FILE "${PKG_FILE}" ) - file(WRITE ${pkg_file} "${PKG_FILE}") - endforeach() - endif() - # force U_STATIC_IMPLEMENTATION macro foreach(HEADER utypes.h utf_old.h platform.h) file(READ ${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER} HEADER_CONTENTS) @@ -196,17 +168,17 @@ file(GLOB CROSS_COMPILE_DEFS ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/config file(INSTALL ${CROSS_COMPILE_DEFS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/config) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll) + file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll) file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) endif() # copy dlls if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/icu*${ICU_VERSION_MAJOR}.dll) + file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll) file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/icu*${ICU_VERSION_MAJOR}.dll) + file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*icu*${ICU_VERSION_MAJOR}.dll) file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) endif() diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index c1e80e53057806..37d08e43dc1924 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,9 +1,9 @@ { "name": "icu", "version": "69.1", - "port-version": 14, + "port-version": 15, "description": "Mature and widely used Unicode and localization library.", - "homepage": "http://icu-project.org/apiref/icu4c/", + "homepage": "https://icu.unicode.org/home", "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index 37cb6d6ff63c71..20a439be8f874d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2654,7 +2654,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 14 + "port-version": 15 }, "ideviceinstaller": { "baseline": "1.1.2.23", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index bac44faa4692fc..17f2df336b4293 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d08c0ceb1777074f3b31fe51e386c9ece0ca8cd", + "version": "69.1", + "port-version": 15 + }, { "git-tree": "2632dd55c20f6830027ae1e167524817b1a9d7ec", "version": "69.1", From fa8b931f500af52f55874c1ccff1222c59600e96 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 24 Sep 2021 02:48:42 +0200 Subject: [PATCH 0615/1858] [New port] Add cpp-TimSort 2.1.0 (#20275) * Add new port cpp-timesort 2.1.0 * Update CI baseline * Resolve conversation * update version * add dquotes Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: nicole mazzuca --- ports/cpp-timsort/portfile.cmake | 22 ++++++++++++++++++++++ ports/cpp-timsort/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/cpp-timsort.json | 9 +++++++++ 4 files changed, 51 insertions(+) create mode 100644 ports/cpp-timsort/portfile.cmake create mode 100644 ports/cpp-timsort/vcpkg.json create mode 100644 versions/c-/cpp-timsort.json diff --git a/ports/cpp-timsort/portfile.cmake b/ports/cpp-timsort/portfile.cmake new file mode 100644 index 00000000000000..b5a5e47be87240 --- /dev/null +++ b/ports/cpp-timsort/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO timsort/cpp-TimSort + REF v2.1.0 + SHA512 57fe79d3174d9939a3212282cf64f4fdd90586eba806f57df65eb42c2b4783a68f39bd2b6709830b1688ae15f1a83f554468059b2ddf52b31805bfd23efc7db1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/gfx PACKAGE_NAME gfx-timsort) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpp-timsort/vcpkg.json b/ports/cpp-timsort/vcpkg.json new file mode 100644 index 00000000000000..334f1d78be4f50 --- /dev/null +++ b/ports/cpp-timsort/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "cpp-timsort", + "version": "2.1.0", + "description": "A C++ implementation of timsort", + "homepage": "https://github.com/timsort/cpp-TimSort", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 20a439be8f874d..e944bcd352e49c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1500,6 +1500,10 @@ "baseline": "2.6.0", "port-version": 1 }, + "cpp-timsort": { + "baseline": "2.1.0", + "port-version": 0 + }, "cppad": { "baseline": "20210000.7", "port-version": 0 diff --git a/versions/c-/cpp-timsort.json b/versions/c-/cpp-timsort.json new file mode 100644 index 00000000000000..9dc9431e1302e2 --- /dev/null +++ b/versions/c-/cpp-timsort.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f04e9f0c24e916697a6451b43cf16a2423019635", + "version": "2.1.0", + "port-version": 0 + } + ] +} From 6f60872768cedc1e2719c8e009f27e951d4559b2 Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Thu, 23 Sep 2021 19:50:15 -0500 Subject: [PATCH 0616/1858] [scottt-debugbreak] New port (#20276) * [scottt-debugbreak] Adding new port * Run x-add-version --- ports/scottt-debugbreak/portfile.cmake | 16 ++++++++++++++++ ports/scottt-debugbreak/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/s-/scottt-debugbreak.json | 9 +++++++++ 4 files changed, 35 insertions(+) create mode 100644 ports/scottt-debugbreak/portfile.cmake create mode 100644 ports/scottt-debugbreak/vcpkg.json create mode 100644 versions/s-/scottt-debugbreak.json diff --git a/ports/scottt-debugbreak/portfile.cmake b/ports/scottt-debugbreak/portfile.cmake new file mode 100644 index 00000000000000..95bb180be9ef4d --- /dev/null +++ b/ports/scottt-debugbreak/portfile.cmake @@ -0,0 +1,16 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO scottt/debugbreak + REF v1.0 + SHA512 bf8c43d42d9b19c9a3cb1fa5955a24efb48c2c21f0d89685f23702c3e2644637f2e8c6ec599024866138519b107787baef838b6d981779e2484e30d20a7386b9 + HEAD_REF master +) + +file( + COPY "${SOURCE_PATH}/debugbreak.h" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/scottt-debugbreak/vcpkg.json b/ports/scottt-debugbreak/vcpkg.json new file mode 100644 index 00000000000000..599aa158a35640 --- /dev/null +++ b/ports/scottt-debugbreak/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "scottt-debugbreak", + "version": "1.0", + "description": "Break into the debugger programmatically", + "homepage": "https://github.com/scottt/debugbreak" +} diff --git a/versions/baseline.json b/versions/baseline.json index e944bcd352e49c..a3e0d96f2a8b9d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5908,6 +5908,10 @@ "baseline": "0.4", "port-version": 1 }, + "scottt-debugbreak": { + "baseline": "1.0", + "port-version": 0 + }, "scylla-wrapper": { "baseline": "2018-08-26-16e6f435", "port-version": 1 diff --git a/versions/s-/scottt-debugbreak.json b/versions/s-/scottt-debugbreak.json new file mode 100644 index 00000000000000..2d481e07bf298a --- /dev/null +++ b/versions/s-/scottt-debugbreak.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1b34b54dc87166ea5894f05536a17ea403a64e79", + "version": "1.0", + "port-version": 0 + } + ] +} From ab5ac75299cc3ab3d3e0ef91de11ec04dd233c05 Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Thu, 23 Sep 2021 19:50:47 -0500 Subject: [PATCH 0617/1858] [cjson] Updating to 1.7.15 (#20279) * Update cjson to 1.7.15 Also removing deprecated cmake functions, quoting paths * Run x-add-version * Update ports/cjson/portfile.cmake * Run x-add-version after latest commit Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- ports/cjson/portfile.cmake | 23 +++++++++++------------ ports/cjson/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/c-/cjson.json | 5 +++++ 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake index 52e84654a91386..f960d83f2fce85 100644 --- a/ports/cjson/portfile.cmake +++ b/ports/cjson/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaveGamble/cJSON - REF 95368da1a13c1ced5507bb5b0a457729af34837c - SHA512 e50fb7857573fac39bc9659004bd71483156677b4b1c7dd801470469162d1af2b1e3803fb4f1291b2b5defefb005ddd78b0efb01965626eecc00bc78b5f98c72 + REF v1.7.15 + SHA512 0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124 HEAD_REF master ) @@ -20,9 +20,8 @@ else() set(DENABLE_HIDDEN_SYMBOLS OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_SHARED_AND_STATIC_LIBS=OFF -DCJSON_OVERRIDE_BUILD_SHARED_LIBS=OFF @@ -34,18 +33,18 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cJSON) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cJSON) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -file(READ ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h _contents) +file(READ "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" _contents) if(ENABLE_PUBLIC_SYMBOLS) string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "0 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}") string(REPLACE "defined(CJSON_EXPORT_SYMBOLS)" "0 /* defined(CJSON_EXPORT_SYMBOLS) */" _contents "${_contents}") @@ -53,7 +52,7 @@ if(ENABLE_PUBLIC_SYMBOLS) else() string(REPLACE "defined(CJSON_HIDE_SYMBOLS)" "1 /* defined(CJSON_HIDE_SYMBOLS) */" _contents "${_contents}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" "${_contents}") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json index 92bec5fb2db973..e32c54aed3e663 100644 --- a/ports/cjson/vcpkg.json +++ b/ports/cjson/vcpkg.json @@ -1,9 +1,18 @@ { "name": "cjson", - "version-date": "2019-11-30", - "port-version": 2, + "version": "1.7.15", "description": "Ultralightweight JSON parser in ANSI C", "homepage": "https://github.com/DaveGamble/cJSON", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "utils": { "description": "Enable building the cJSON_Utils library" diff --git a/versions/baseline.json b/versions/baseline.json index a3e0d96f2a8b9d..97d5af122c8338 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1329,8 +1329,8 @@ "port-version": 0 }, "cjson": { - "baseline": "2019-11-30", - "port-version": 2 + "baseline": "1.7.15", + "port-version": 0 }, "clamav": { "baseline": "0.103.0", diff --git a/versions/c-/cjson.json b/versions/c-/cjson.json index 65804958af0dd7..8e9a453126e082 100644 --- a/versions/c-/cjson.json +++ b/versions/c-/cjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a0cbb7810d1e9fda06ff7da2f8deb5249401267", + "version": "1.7.15", + "port-version": 0 + }, { "git-tree": "c8997bd75a1e40cf8ac7f7d77a942afd84f01d2e", "version-date": "2019-11-30", From 93b28b442db832c5f64b180c472fc0ec6e24b5ad Mon Sep 17 00:00:00 2001 From: pastdue <30942300+past-due@users.noreply.github.com> Date: Thu, 23 Sep 2021 20:51:23 -0400 Subject: [PATCH 0618/1858] [curl] Update to 7.79.1 (#20291) * [curl] Update to 7.79.1 * Run x-add-version curl --- ports/curl/portfile.cmake | 4 ++-- ports/curl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/curl.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index c92abb39e7b915..02977602ed2c1c 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl - REF 8e82f2a04a238c54ba91e553e9a8452e6d405965 #curl-7_79_0 - SHA512 0a13bc9bf85ddbf958661f7f197aff9b57c4218ce9fa81cf419f97f2cebf7df0ded9f47b55b5e9b1615065145c5f5059c2e7d986240297cb5970b3b4a39fa031 + REF c7aef0a945f9b6fb6d3f91716a21dfe2f4ea635f #curl-7_79_1 + SHA512 105e945e0acb47950d756382c7e45abbf0d0b12526eb0170af23e68653c1b7e3be27d547d537c4f36d099ebcb04870e8cd571d2baec996373b2032f8451b63e0 HEAD_REF master PATCHES 0002_fix_uwp.patch diff --git a/ports/curl/vcpkg.json b/ports/curl/vcpkg.json index bb65d74acc9709..aafc6cccd97694 100644 --- a/ports/curl/vcpkg.json +++ b/ports/curl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "curl", - "version": "7.79.0", + "version": "7.79.1", "description": "A library for transferring data with URLs", "homepage": "https://github.com/curl/curl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 97d5af122c8338..72daec0b3171a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1653,7 +1653,7 @@ "port-version": 7 }, "curl": { - "baseline": "7.79.0", + "baseline": "7.79.1", "port-version": 0 }, "curlpp": { diff --git a/versions/c-/curl.json b/versions/c-/curl.json index 38985c555e7a02..ab5343e1f2c974 100644 --- a/versions/c-/curl.json +++ b/versions/c-/curl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2d22bb78a3e3d9d2775d98bf37580e8819ee8c3", + "version": "7.79.1", + "port-version": 0 + }, { "git-tree": "5b6c1c3766b64c163ddabf8312214a23e2a7b8f5", "version": "7.79.0", From 1409a2bba5c5260d583eb5791f45c0e219c2c99b Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 23 Sep 2021 17:53:29 -0700 Subject: [PATCH 0619/1858] [dxsdk-d3dx/directxsdk] Add message to handle the conflicts between these two ports (#20286) * [dxsdk-d3dx] Modify the destination path * [dxsdk-d3dx/directxsdk] Add message to handle the conflicts between these two ports Co-authored-by: Cheney-Wang --- ports/directxsdk/portfile.cmake | 4 ++++ ports/directxsdk/vcpkg.json | 2 +- ports/dxsdk-d3dx/portfile.cmake | 42 +++++++++++++++------------------ ports/dxsdk-d3dx/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/d-/directxsdk.json | 5 ++++ versions/d-/dxsdk-d3dx.json | 5 ++++ 7 files changed, 37 insertions(+), 26 deletions(-) diff --git a/ports/directxsdk/portfile.cmake b/ports/directxsdk/portfile.cmake index f684800f49d36b..67551cffa3b045 100644 --- a/ports/directxsdk/portfile.cmake +++ b/ports/directxsdk/portfile.cmake @@ -1,5 +1,9 @@ vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm") +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/dxsdk-d3dx/copyright") + message(FATAL_ERROR "Can't build ${PORT} if dxsdk-d3dx is installed. Please remove dxsdk-d3dx, and try to install ${PORT} again if you need it.") +endif() + message(WARNING "Build ${PORT} is deprecated, untested in CI, and requires the use of the DirectSetup legacy REDIST solution. See https://aka.ms/dxsdk for more information.") vcpkg_download_distfile(ARCHIVE diff --git a/ports/directxsdk/vcpkg.json b/ports/directxsdk/vcpkg.json index b43961e7ce9981..0d093e5bb658ca 100644 --- a/ports/directxsdk/vcpkg.json +++ b/ports/directxsdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directxsdk", "version-string": "jun10", - "port-version": 3, + "port-version": 4, "description": "Legacy DirectX SDK", "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", "supports": "windows & !uwp & !arm", diff --git a/ports/dxsdk-d3dx/portfile.cmake b/ports/dxsdk-d3dx/portfile.cmake index 7061c52db61719..71ff4d33249c5f 100644 --- a/ports/dxsdk-d3dx/portfile.cmake +++ b/ports/dxsdk-d3dx/portfile.cmake @@ -1,7 +1,7 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") +vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm") -if(NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "${PORT} only supports Windows.") +if(EXISTS "${CURRENT_INSTALLED_DIR}/share/directxsdk/copyright") + message(FATAL_ERROR "Can't build ${PORT} if directxsdk is installed. Please remove directxsdk, and try to install ${PORT} again if you need it.") endif() message(WARNING "Use of ${PORT} is not recommended for new projects. See https://aka.ms/dxsdk for more information.") @@ -22,23 +22,19 @@ vcpkg_extract_source_archive_ex( NO_REMOVE_ONE_LEVEL ) -file(GLOB HEADER_FILES ${PACKAGE_PATH}/build/native/include/*.h ${PACKAGE_PATH}/build/native/include/*.inl) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) - -file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/d3dx9.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) -file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/d3dx10.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) -file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/d3dx11.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) -file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/d3dx9d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/d3dx10d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/d3dx11d.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) - -file(COPY ${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/D3DCompiler_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) -file(COPY ${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/D3DX9_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) -file(COPY ${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/d3dx10_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) -file(COPY ${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/d3dx11_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) -file(COPY ${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/D3DCompiler_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) -file(COPY ${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/D3DX9d_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) -file(COPY ${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/D3DX10d_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) -file(COPY ${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/D3DX11d_43.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) - -file(INSTALL ${PACKAGE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h" "${PACKAGE_PATH}/build/native/include/*.inl") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") + +file(GLOB RELEASE_LIB_FILES "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib") +file(INSTALL ${RELEASE_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/lib/") + +file(GLOB DEBUG_LIB_FILES "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/*.lib") +file(INSTALL ${DEBUG_LIB_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/") + +file(GLOB RELEASE_DLL_FILES "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll") +file(INSTALL ${RELEASE_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/") + +file(GLOB DEBUG_DLL_FILES "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/*.dll") +file(INSTALL ${DEBUG_DLL_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") + +file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index 93a3ccaa3667f9..bc50df96521c5f 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", + "port-version": 1, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "supports": "windows & !arm & !uwp & !static" diff --git a/versions/baseline.json b/versions/baseline.json index 72daec0b3171a9..c6ff66583ab49d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1782,7 +1782,7 @@ }, "directxsdk": { "baseline": "jun10", - "port-version": 3 + "port-version": 4 }, "directxtex": { "baseline": "aug2021", @@ -1882,7 +1882,7 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 0 + "port-version": 1 }, "dxut": { "baseline": "11.26", diff --git a/versions/d-/directxsdk.json b/versions/d-/directxsdk.json index 361bb976f62915..c40d1fad2adb82 100644 --- a/versions/d-/directxsdk.json +++ b/versions/d-/directxsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "440a5b43febdcc709d9ae1d768371c0b184ca92e", + "version-string": "jun10", + "port-version": 4 + }, { "git-tree": "49dc911dc7c69f6e0eee0279afcf53187d547ae5", "version-string": "jun10", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index 9c5b277d6e5131..f6594d45f62cf9 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81aeb21cd027336b00f758ece5371f0c4930be2e", + "version": "9.29.952.8", + "port-version": 1 + }, { "git-tree": "38ff04dcf269c835a7f5c03d50a1a457350bde49", "version": "9.29.952.8", From 13f9c5d25190d4d75be5ac4dd4d2a3fa191d0570 Mon Sep 17 00:00:00 2001 From: HrOokami <4591995+faserg1@users.noreply.github.com> Date: Fri, 24 Sep 2021 03:53:54 +0300 Subject: [PATCH 0620/1858] [pangomm] Update to 2.48.1 (#20293) * Update pangomm port to 2.48.1 This update should fix #18824 * Updating version in vcpkg.json * Updating version database --- ports/pangomm/portfile.cmake | 6 +++--- ports/pangomm/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pangomm.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/pangomm/portfile.cmake b/ports/pangomm/portfile.cmake index 85580c78ca5909..b7a59711964e43 100644 --- a/ports/pangomm/portfile.cmake +++ b/ports/pangomm/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64") vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.48/pangomm-2.48.0.tar.xz" - FILENAME "pangomm-2.48.0.tar.xz" - SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3 + URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.48/pangomm-2.48.1.tar.xz" + FILENAME "pangomm-2.48.1.tar.xz" + SHA512 c204a1cb7a404f055d62880a760716c5567a835ca495cc5e01589ed59fabb332490e529de716c3438cefbc4428c025d6d01c71e4412b2843e3ab3a3175ccc2f4 ) vcpkg_extract_source_archive_ex( diff --git a/ports/pangomm/vcpkg.json b/ports/pangomm/vcpkg.json index 9260a460fb91fd..f0e36aa4eb7bcf 100644 --- a/ports/pangomm/vcpkg.json +++ b/ports/pangomm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pangomm", - "version": "2.48.0", + "version": "2.48.1", "description": "pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.", "homepage": "https://ftp.gnome.org/pub/GNOME/sources/pangomm", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c6ff66583ab49d..ce1711e3b3dc70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4969,7 +4969,7 @@ "port-version": 1 }, "pangomm": { - "baseline": "2.48.0", + "baseline": "2.48.1", "port-version": 0 }, "parallel-hashmap": { diff --git a/versions/p-/pangomm.json b/versions/p-/pangomm.json index 58e56d91347bca..2634add9c57646 100644 --- a/versions/p-/pangomm.json +++ b/versions/p-/pangomm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ff0b71c742896ffb9da84638f7e20b2960aff80", + "version": "2.48.1", + "port-version": 0 + }, { "git-tree": "d751b0dbf773ade4811729e3a55a8828dac8a78a", "version": "2.48.0", From 2acbe939e5344480b1c371a834377bab7ce4199e Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Fri, 24 Sep 2021 08:54:30 +0800 Subject: [PATCH 0621/1858] [openmpi] Disable fortran mpi bindings explicitly (#20300) --- ports/openmpi/portfile.cmake | 5 +++-- ports/openmpi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openmpi.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index 3b926e6d1b594d..43533348089c1d 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - keep_isystem.patch + keep_isystem.patch ) vcpkg_find_acquire_program(PERL) @@ -28,6 +28,7 @@ vcpkg_configure_make( OPTIONS --with-hwloc=internal --with-libevent=internal + --disable-mpi-fortran OPTIONS_DEBUG --enable-debug ) @@ -37,4 +38,4 @@ vcpkg_install_make(DISABLE_PARALLEL) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index 96fae3a06df50e..fe5d44c181c8bf 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmpi", "version-string": "4.1.0", - "port-version": 1, + "port-version": 2, "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index ce1711e3b3dc70..101be86ce22b0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4826,7 +4826,7 @@ }, "openmpi": { "baseline": "4.1.0", - "port-version": 1 + "port-version": 2 }, "openmvg": { "baseline": "1.6", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index aaa38297177631..836cc592ba7a32 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c4b5b526fe4b6a8de9fa88eea30d3a1ddc7878e", + "version-string": "4.1.0", + "port-version": 2 + }, { "git-tree": "bcc3284d0c3730ee4237efff0cd32df0be272d8e", "version-string": "4.1.0", From 5a24091a75008f1a92d2417f985184a8432a0044 Mon Sep 17 00:00:00 2001 From: Spirrwell Date: Thu, 23 Sep 2021 20:57:27 -0400 Subject: [PATCH 0622/1858] [enet] Export config, support BUILD_SHARED_LIBS, and add usage (#20282) * [enet] Export config, support BUILD_SHARED_LIBS, and add usage * [enet] Update with requested changes * Update the port version * Update the deprecated funcutions Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- ports/enet/CMakeLists.txt | 32 +++++++++++++++++++++++++++----- ports/enet/portfile.cmake | 14 +++++++------- ports/enet/vcpkg.json | 13 ++++++++++++- versions/baseline.json | 2 +- versions/e-/enet.json | 5 +++++ 5 files changed, 52 insertions(+), 14 deletions(-) diff --git a/ports/enet/CMakeLists.txt b/ports/enet/CMakeLists.txt index 012e21d64556a6..a82e7aa4a7427a 100644 --- a/ports/enet/CMakeLists.txt +++ b/ports/enet/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 3.0.2) project(enet) @@ -55,9 +55,7 @@ if(HAS_SOCKLEN_T) add_definitions(-DHAS_SOCKLEN_T=1) endif() -include_directories(${PROJECT_SOURCE_DIR}/include) - -add_library(enet STATIC +add_library(enet callbacks.c compress.c host.c @@ -69,13 +67,37 @@ add_library(enet STATIC win32.c ) +add_library(enet::enet ALIAS enet) + +target_include_directories(enet PUBLIC + $ + $ +) + +if (BUILD_SHARED_LIBS) + target_compile_definitions(enet + PUBLIC ENET_DLL + PRIVATE ENET_BUILDING_LIB + ) +endif() + + if (WIN32) target_link_libraries(enet winmm ws2_32) endif() -install(TARGETS enet ARCHIVE DESTINATION lib +set(ENET_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/enet) + +install(TARGETS enet EXPORT unofficial-enet-config + ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin) +INSTALL(EXPORT unofficial-enet-config + NAMESPACE unofficial::enet:: + FILE unofficial-enet-config.cmake + DESTINATION share/unofficial-enet +) + install(DIRECTORY include/ DESTINATION include) \ No newline at end of file diff --git a/ports/enet/portfile.cmake b/ports/enet/portfile.cmake index 065a00ba9e4e3b..ad4d17374c24a5 100644 --- a/ports/enet/portfile.cmake +++ b/ports/enet/portfile.cmake @@ -5,20 +5,20 @@ vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH SHA512 006a78edcc2059d8cee47a163d308dd02120a54f9c203401b83eb6cb4ab3e56cf09988d3c35b436a1e9f74c01296995ae6fdd46f6d354fe8261cf19cdde3df5d ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2 # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-enet CONFIG_PATH share/unofficial-enet) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/enet/vcpkg.json b/ports/enet/vcpkg.json index 3b920e909a7425..7d2a4289af6ba7 100644 --- a/ports/enet/vcpkg.json +++ b/ports/enet/vcpkg.json @@ -1,6 +1,17 @@ { "name": "enet", "version": "1.3.17", + "port-version": 1, "description": "Reliable UDP networking library", - "homepage": "https://github.com/lsalzman/enet" + "homepage": "https://github.com/lsalzman/enet", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 101be86ce22b0f..cc14fd577b9d7f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1970,7 +1970,7 @@ }, "enet": { "baseline": "1.3.17", - "port-version": 0 + "port-version": 1 }, "ensmallen": { "baseline": "2.17.0", diff --git a/versions/e-/enet.json b/versions/e-/enet.json index 373fd575ae69b5..b2f8a6fee12635 100644 --- a/versions/e-/enet.json +++ b/versions/e-/enet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a31699670612c88cdf69dd80af975d44c10ac1f6", + "version": "1.3.17", + "port-version": 1 + }, { "git-tree": "004a06d1e158f14059f597a1848b8f4a8d0a42f8", "version": "1.3.17", From 6ee14d4a9886f80135e6dc750102d7cd5270d934 Mon Sep 17 00:00:00 2001 From: boriskro Date: Thu, 23 Sep 2021 17:58:28 -0700 Subject: [PATCH 0623/1858] Fix build issues on OSX when these flags are enabled: osx-bindings, metal-bindings (#20281) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [imgui] Fix build issues on OSX * bump required cmake version because OBJCXX support has been introduced in 3.16 * set C++ standard to c++11 on Apple. Imgui own examples use c++14, however c++11 was found to be sufficient * enable Objective-C++ mode for *.mm sources * add `-fobjc-weak` flag for imgui_impl_metal.mm to fix compile error * [imgui] Fix build issues on OSX * bump required cmake version because OBJCXX support has been introduced in 3.16 * set C++ standard to c++11 on Apple. Imgui own examples use c++14, however c++11 was found to be sufficient * enable Objective-C++ mode for *.mm sources * add `-fobjc-weak` flag for imgui_impl_metal.mm to fix compile error * Update ports/imgui/vcpkg.json Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [imgui] Fix manifest format * Ran `vcpkg x-add-version imgui` Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/imgui/CMakeLists.txt | 8 +++++++- ports/imgui/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/imgui.json | 5 +++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index b049fdd43de6b6..61f9cb8ee510a3 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -1,8 +1,13 @@ -cmake_minimum_required(VERSION 3.8) +cmake_minimum_required(VERSION 3.16) project(imgui CXX) set(CMAKE_DEBUG_POSTFIX d) +if(APPLE) + set(CMAKE_CXX_STANDARD 11) + enable_language(OBJCXX) +endif() + add_library(${PROJECT_NAME} "") add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) target_include_directories( @@ -59,6 +64,7 @@ endif() if(IMGUI_BUILD_METAL_BINDING) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.mm) + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_metal.mm PROPERTIES COMPILE_FLAGS -fobjc-weak) endif() if(IMGUI_BUILD_OPENGL2_BINDING) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index e58bf6b945507a..c41b330b944437 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imgui", "version": "1.84.2", + "port-version": 1, "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index cc14fd577b9d7f..b543f83bbe3351 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2758,7 +2758,7 @@ }, "imgui": { "baseline": "1.84.2", - "port-version": 0 + "port-version": 1 }, "imgui-sfml": { "baseline": "2.1", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 28772d0043bec4..7ca2d71226f743 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d0f402c97029e9c2021ca776e2bebc645cc5ecc", + "version": "1.84.2", + "port-version": 1 + }, { "git-tree": "c07b221daf49a22fc9e8e7571bb329485f618a7f", "version": "1.84.2", From 17a73a7f089b9fd87aed40827fbb32eefcb6b8dd Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 23 Sep 2021 18:04:24 -0700 Subject: [PATCH 0624/1858] [tensorflow-common] Shutdown server after 1 second. (#20273) * [tensorflow-common] Shutdown server after 1 second. Attempts to reduce the probability of failures like https://dev.azure.com/vcpkg/public/_build/results?buildId=59950 * Version database --- ports/tensorflow-common/tensorflow-common.cmake | 8 ++++---- ports/tensorflow-common/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tensorflow-common.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 403f32c6cb8f0e..55387eb0d411f4 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -238,13 +238,13 @@ foreach(BUILD_TYPE dbg rel) list(JOIN LINKOPTS " " LINKOPTS) # use --output_user_root to work-around too-long-path-names issue and username-with-spaces issue vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "'${BAZEL}' --output_user_root='${CURRENT_BUILDTREES_DIR}/.bzl' build --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" + COMMAND ${BASH} --noprofile --norc -c "'${BAZEL}' --output_user_root='${CURRENT_BUILDTREES_DIR}/.bzl' --max_idle_secs=1 build --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} ) else() vcpkg_execute_build_process( - COMMAND ${BAZEL} --output_user_root=${CURRENT_BUILDTREES_DIR}/.bzl build --verbose_failures ${BUILD_OPTS} --python_path=${PYTHON3} ${COPTS} ${CXXOPTS} ${LINKOPTS} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers + COMMAND ${BAZEL} --output_user_root=${CURRENT_BUILDTREES_DIR}/.bzl --max_idle_secs=1 build --verbose_failures ${BUILD_OPTS} --python_path=${PYTHON3} ${COPTS} ${CXXOPTS} ${LINKOPTS} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} ) @@ -263,13 +263,13 @@ foreach(BUILD_TYPE dbg rel) list(JOIN LINKOPTS " " LINKOPTS) # use --output_user_root to work-around too-long-path-names issue and username-with-spaces issue vcpkg_execute_build_process( - COMMAND ${BASH} --noprofile --norc -c "${BAZEL} --output_user_root='${CURRENT_BUILDTREES_DIR}/.bzl' build -s --verbose_failures ${BUILD_OPTS} --features=fully_static_link ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" + COMMAND ${BASH} --noprofile --norc -c "${BAZEL} --output_user_root='${CURRENT_BUILDTREES_DIR}/.bzl' --max_idle_secs=1 build -s --verbose_failures ${BUILD_OPTS} --features=fully_static_link ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path='${PYTHON3}' --define=no_tensorflow_py_deps=true ///tensorflow:${BAZEL_LIB_NAME} ///tensorflow:install_headers" WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} ) else() vcpkg_execute_build_process( - COMMAND ${BAZEL} --output_user_root=${CURRENT_BUILDTREES_DIR}/.bzl build -s --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path=${PYTHON3} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers + COMMAND ${BAZEL} --output_user_root=${CURRENT_BUILDTREES_DIR}/.bzl --max_idle_secs=1 build -s --verbose_failures ${BUILD_OPTS} ${COPTS} ${CXXOPTS} ${LINKOPTS} --python_path=${PYTHON3} --define=no_tensorflow_py_deps=true //tensorflow:${BAZEL_LIB_NAME} //tensorflow:install_headers WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE} LOGNAME build-${TARGET_TRIPLET}-${BUILD_TYPE} ) diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index b0dfa7959bea25..51d3fa8558abcd 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tensorflow-common", "version-semver": "2.4.1", - "port-version": 4, + "port-version": 5, "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } diff --git a/versions/baseline.json b/versions/baseline.json index b543f83bbe3351..22e0a1d2fd7a1b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6418,7 +6418,7 @@ }, "tensorflow-common": { "baseline": "2.4.1", - "port-version": 4 + "port-version": 5 }, "tensorpipe": { "baseline": "2021-04-26", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index 59c201491da010..a647b39e35f863 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2160d070413af839dbe9da331350e34c91352e11", + "version-semver": "2.4.1", + "port-version": 5 + }, { "git-tree": "3d84b641f07ef269a213e0382e719a0c338f4ed7", "version-semver": "2.4.1", From ecdc82613d78b72df9434e414303fa3d1bff2ad7 Mon Sep 17 00:00:00 2001 From: AndrewDeanMS <45858683+AndrewDeanMS@users.noreply.github.com> Date: Fri, 24 Sep 2021 10:07:26 -0700 Subject: [PATCH 0625/1858] Remove unnecessary that races (#20313) When VcpkgInstallManifestDependencies runs in parallel, the Delete in one task causes the touch in another to fail. The Delete isn't actually necessary to accomplish the goal here, so remove it. --- scripts/buildsystems/msbuild/vcpkg.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 36fd347648160d..7a5bb3c9824934 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -150,7 +150,6 @@ - Date: Fri, 24 Sep 2021 19:47:08 +0200 Subject: [PATCH 0626/1858] [spdlog] Update to 1.9.2 (#20294) * Update spdlog to 1.9.2 * Update CI baseline * Fix git-tree hash Co-authored-by: chausner --- ports/spdlog/portfile.cmake | 4 ++-- ports/spdlog/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/spdlog.json | 7 ++++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/spdlog/portfile.cmake b/ports/spdlog/portfile.cmake index 89651a6c9e2f06..77909960b2052a 100644 --- a/ports/spdlog/portfile.cmake +++ b/ports/spdlog/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gabime/spdlog - REF v1.9.0 - SHA512 df023847e49b2ad8e5dc4cb681d31515bb7f87644a4baa946836cf3cb4114bb95ad603b746969e0e7f8220d3bfa453220c00dfde812f1e610801a5cc62e1f0f2 + REF v1.9.2 + SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c HEAD_REF v1.x PATCHES fix-mingw-build.patch ) diff --git a/ports/spdlog/vcpkg.json b/ports/spdlog/vcpkg.json index b545e191d4caa6..46c4202b74dbba 100644 --- a/ports/spdlog/vcpkg.json +++ b/ports/spdlog/vcpkg.json @@ -1,7 +1,6 @@ { "name": "spdlog", - "version-semver": "1.9.0", - "port-version": 1, + "version-semver": "1.9.2", "description": "Very fast, header only, C++ logging library", "homepage": "https://github.com/gabime/spdlog", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 22e0a1d2fd7a1b..778b838280ae37 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6209,8 +6209,8 @@ "port-version": 1 }, "spdlog": { - "baseline": "1.9.0", - "port-version": 1 + "baseline": "1.9.2", + "port-version": 0 }, "spectra": { "baseline": "0.9.0", diff --git a/versions/s-/spdlog.json b/versions/s-/spdlog.json index e296b262aa0b7f..3dac5575c42a07 100644 --- a/versions/s-/spdlog.json +++ b/versions/s-/spdlog.json @@ -1,10 +1,15 @@ { "versions": [ + { + "git-tree": "1f4916f57dae6db50491857c063970d811beb33a", + "version-semver": "1.9.2", + "port-version": 0 + }, { "git-tree": "580c9da088d8545f17b4b5753b4216ddb2ea977f", "version-semver": "1.9.0", "port-version": 1 - }, + }, { "git-tree": "ac601a8d86ea3edc831933ad7e12eee11ac6e6db", "version-semver": "1.8.5", From 5d5a7a7dba02176db9c028bb63f1d57fb9f1bd21 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 24 Sep 2021 19:48:01 +0200 Subject: [PATCH 0627/1858] [OpenCV3] fix build with latest protobuf (#20301) * [OpenCV3] fix compatibility with latest protobuf * [OpenCV3] fix references --- ports/opencv3/0011-fix-caffe-io.patch | 11 +++++++++++ ports/opencv3/portfile.cmake | 1 + ports/opencv3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencv3.json | 5 +++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/opencv3/0011-fix-caffe-io.patch diff --git a/ports/opencv3/0011-fix-caffe-io.patch b/ports/opencv3/0011-fix-caffe-io.patch new file mode 100644 index 00000000000000..1c0941adbadb85 --- /dev/null +++ b/ports/opencv3/0011-fix-caffe-io.patch @@ -0,0 +1,11 @@ +--- a/modules/dnn/src/caffe/caffe_io.cpp ++++ b/modules/dnn/src/caffe/caffe_io.cpp +@@ -1111,7 +1111,7 @@ static const int kProtoReadBytesLimit = INT_MAX; // Max size of 2 GB minus 1 by + + bool ReadProtoFromBinary(ZeroCopyInputStream* input, Message *proto) { + CodedInputStream coded_input(input); +- coded_input.SetTotalBytesLimit(kProtoReadBytesLimit, 536870912); ++ coded_input.SetTotalBytesLimit(kProtoReadBytesLimit); + + return proto->ParseFromCodedStream(&coded_input); + } diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 751f6423e69d74..36d012663f37a5 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_from_github( 0008-devendor-quirc.patch 0009-fix-protobuf.patch 0010-fix-uwp-tiff-imgcodecs.patch + 0011-fix-caffe-io.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index 6ed1d5032bcdae..f750ae57b19b05 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.15", - "port-version": 1, + "port-version": 2, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 778b838280ae37..93072449dff734 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4778,7 +4778,7 @@ }, "opencv3": { "baseline": "3.4.15", - "port-version": 1 + "port-version": 2 }, "opencv4": { "baseline": "4.5.3", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 281f9897008b1b..0e9d565c6c91d0 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27a6a94907d72955e9d473dfbce89ae851ee1bda", + "version": "3.4.15", + "port-version": 2 + }, { "git-tree": "47b6ae97aeb00ba20b231fdbb2fa043cdc5de2c5", "version": "3.4.15", From cbca8846dde5c0824cf1f58f5047d2315e6f459d Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 24 Sep 2021 10:48:46 -0700 Subject: [PATCH 0628/1858] [grpc] yet another library missing in pkg-config files (#20308) --- ports/grpc/00014-pkgconfig-upbdefs.patch | 2 +- ports/grpc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/grpc.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index fd5a8356396a12..af4299acc43b47 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -7,7 +7,7 @@ index 3808016..059a16b 100644 "${gRPC_CORE_VERSION}" "gpr openssl" - "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" -+ "-lgrpc -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" ++ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" "" "grpc.pc") diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 1b7dfac45b0fc0..5d85d18445cbed 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "grpc", "version-semver": "1.37.0", - "port-version": 3, + "port-version": 4, "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 93072449dff734..97e7698e10724e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2510,7 +2510,7 @@ }, "grpc": { "baseline": "1.37.0", - "port-version": 3 + "port-version": 4 }, "grppi": { "baseline": "0.4.0", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 4d56acdef73262..0be49e1e154c65 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad418bfacbcb3e9e82440612ad66104f6692cae4", + "version-semver": "1.37.0", + "port-version": 4 + }, { "git-tree": "38a2b1bc9dd5fca170489b616d33efae6dd43158", "version-semver": "1.37.0", From a9cf61b2541fb2a674cd22d146d315ce613d9f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Szab=C3=B3?= Date: Fri, 24 Sep 2021 21:02:48 +0200 Subject: [PATCH 0629/1858] CMake binary is now supplied to Meson in cross-compile configurations. (#19727) Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- scripts/cmake/vcpkg_configure_meson.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 499d488252500c..ecbefab97b301f 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -301,6 +301,7 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ string(APPEND CROSS "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() endif() + string(APPEND CROSS "cmake = '${CMAKE_COMMAND}'\n") foreach(_binary IN LISTS ${_additional_binaries}) string(APPEND CROSS "${_binary}\n") endforeach() From cab3c13796c01e2c51e0db9dffe86647191aaf38 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 24 Sep 2021 21:06:17 +0200 Subject: [PATCH 0630/1858] [libarchive,lz4] Fix pc file, modernize portfile (#20146) * Fix pc file * Modernize portfile * OpenSSL unused on 'Darwin' * x-add-version * More port cleanup (CR requests) * Revise wrapper, using find_package * Don't use pkgconfig modules for windows openssl * Update versions * Use namespaced variables for custom lzo lookup * Wrapper needs CMP0012 * Skip dependencies if not LibArchive_FOUND * Update versions * Fix liblz4.pc debug lib fixup * Update versions Co-authored-by: NancyLi1013 --- ports/libarchive/pkgconfig-modules.patch | 238 ++++++++++++++++++ ports/libarchive/portfile.cmake | 46 +--- ports/libarchive/vcpkg-cmake-wrapper.cmake.in | 140 +++-------- ports/libarchive/vcpkg.json | 12 +- ports/lz4/portfile.cmake | 4 +- ports/lz4/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/l-/libarchive.json | 5 + versions/l-/lz4.json | 5 + 9 files changed, 316 insertions(+), 140 deletions(-) create mode 100644 ports/libarchive/pkgconfig-modules.patch diff --git a/ports/libarchive/pkgconfig-modules.patch b/ports/libarchive/pkgconfig-modules.patch new file mode 100644 index 00000000000000..d8e6f4cf759f41 --- /dev/null +++ b/ports/libarchive/pkgconfig-modules.patch @@ -0,0 +1,238 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b6f0ad..18cf15c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -397,6 +397,8 @@ IF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + ENDIF(DEFINED __GNUWIN32PATH AND EXISTS "${__GNUWIN32PATH}") + + SET(ADDITIONAL_LIBS "") ++SET(LIBARCHIVE_LIBS_PRIVATE "") # additional libs for which the pc module is unknown ++SET(LIBARCHIVE_REQUIRES_PRIVATE "") # pc modules for additonal libs + # + # Find ZLIB + # +@@ -410,6 +412,7 @@ IF(ZLIB_FOUND) + SET(HAVE_ZLIB_H 1) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " zlib") + IF(WIN32 AND NOT CYGWIN) + SET(ZLIB_WINAPI OFF) # skip following test, it crashes with weird message box + IF(ZLIB_WINAPI) +@@ -442,6 +445,7 @@ IF(BZIP2_FOUND) + SET(HAVE_BZLIB_H 1) + INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${BZIP2_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " bzip2") + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${BZIP2_INCLUDE_DIR}" "${BZIP2_LIBRARIES}" +@@ -471,6 +475,7 @@ IF(LibLZMA_FOUND) + SET(HAVE_LIBLZMA 1) + SET(HAVE_LZMA_H 1) + LIST(APPEND ADDITIONAL_LIBS LibLZMA::LibLZMA) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " liblzma") + ELSE(LIBLZMA_FOUND) + # LZMA not found and will not be used. + ENDIF(LIBLZMA_FOUND) +@@ -499,6 +504,7 @@ IF(LZO2_FOUND) + SET(HAVE_LZO_LZO1X_H 1) + INCLUDE_DIRECTORIES(${LZO2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LZO2_LIBRARY}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " lzo2") + # + # TODO: test for static library. + # +@@ -526,6 +532,7 @@ IF(LIBB2_FOUND) + SET(HAVE_BLAKE2_H 1) + SET(ARCHIVE_BLAKE2 FALSE) + LIST(APPEND ADDITIONAL_LIBS ${LIBB2_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBB2_LIBRARY}) + CMAKE_PUSH_CHECK_STATE() + SET(CMAKE_REQUIRED_LIBRARIES ${LIBB2_LIBRARY}) + SET(CMAKE_REQUIRED_INCLUDES ${LIBB2_INCLUDE_DIR}) +@@ -552,6 +559,7 @@ IF(lz4_FOUND) + SET(HAVE_LIBLZ4 1) + SET(HAVE_LZ4_H 1) + LIST(APPEND ADDITIONAL_LIBS lz4::lz4) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " liblz4") + # + # TODO: test for static library. + # +@@ -581,6 +589,7 @@ IF(zstd_FOUND) + LIST(APPEND ADDITIONAL_LIBS zstd::libzstd_static) + SET(CMAKE_REQUIRED_LIBRARIES zstd::libzstd_static) + ENDIF(TARGET zstd::libzstd_shared) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libzstd") + ENDIF(ZSTD_FOUND) + MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR) + MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY) +@@ -678,6 +687,7 @@ IF(ENABLE_CNG) + LA_CHECK_INCLUDE_FILE("Bcrypt.h" HAVE_BCRYPT_H) + IF(HAVE_BCRYPT_H) + LIST(APPEND ADDITIONAL_LIBS "Bcrypt") ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "Bcrypt") + ENDIF(HAVE_BCRYPT_H) + ELSE(ENABLE_CNG) + UNSET(HAVE_BCRYPT_H CACHE) +@@ -709,6 +719,7 @@ IF(ENABLE_MBEDTLS) + IF(MBEDTLS_FOUND) + SET(HAVE_LIBMBEDCRYPTO 1) + LIST(APPEND ADDITIONAL_LIBS ${MBEDCRYPTO_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${MBEDCRYPTO_LIBRARY}) + INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIRS}) + + LIST(APPEND CMAKE_REQUIRED_INCLUDES ${MBEDTLS_INCLUDE_DIRS}) +@@ -729,6 +740,7 @@ IF(ENABLE_NETTLE) + IF(NETTLE_FOUND) + SET(HAVE_LIBNETTLE 1) + LIST(APPEND ADDITIONAL_LIBS ${NETTLE_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " nettle") + INCLUDE_DIRECTORIES(${NETTLE_INCLUDE_DIR}) + + LIST(APPEND CMAKE_REQUIRED_INCLUDES ${NETTLE_INCLUDE_DIR}) +@@ -753,6 +765,11 @@ IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + IF(OpenSSL_FOUND) + SET(HAVE_LIBCRYPTO 1) + LIST(APPEND ADDITIONAL_LIBS OpenSSL::Crypto) ++ IF(WIN32 AND NOT MINGW) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "libcrypto") ++ ELSE() ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libcrypto") ++ ENDIF() + message("OPENSSL_CRYPTO_LIBRARY: OpenSSL::Crypto") + ENDIF(OPENSSL_FOUND) + ELSE() +@@ -767,6 +780,7 @@ IF(NOT OPENSSL_FOUND) + SET(CMAKE_REQUIRED_LIBRARIES "md") + FIND_LIBRARY(LIBMD_LIBRARY NAMES md) + LIST(APPEND ADDITIONAL_LIBS ${LIBMD_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBMD_LIBRARY}) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables + ENDIF(LIBMD_FOUND) + ENDIF(NOT OPENSSL_FOUND) +@@ -872,6 +886,11 @@ main(int argc, char **argv) + IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES}) ++ IF(WIN32 AND NOT MINGW) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE "libssl") ++ ELSE() ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libssl") ++ ENDIF() + ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND) + ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION}) + ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM}) +@@ -1045,6 +1060,7 @@ IF(ENABLE_ICONV) + CHECK_ICONV("libiconv" "") + IF (HAVE_ICONV) + LIST(APPEND ADDITIONAL_LIBS ${LIBICONV_PATH}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBICONV_PATH}) + ENDIF(HAVE_ICONV) + ENDIF(NOT HAVE_ICONV AND LIBICONV_PATH) + ENDIF(ICONV_INCLUDE_DIR) +@@ -1078,6 +1094,7 @@ IF(ENABLE_ICONV) + ENDIF(WIN32 AND NOT CYGWIN) + IF(HAVE_LOCALE_CHARSET) + LIST(APPEND ADDITIONAL_LIBS ${LIBCHARSET_PATH}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBCHARSET_PATH}) + ENDIF(HAVE_LOCALE_CHARSET) + ENDIF(LIBCHARSET_PATH) + ENDIF(LIBICONV_PATH) +@@ -1111,6 +1128,7 @@ IF(LIBXML2_FOUND) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${LIBXML2_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " libxml-2.0") + SET(HAVE_LIBXML2 1) + # libxml2's include files use iconv.h + SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) +@@ -1140,6 +1158,7 @@ ELSE(LIBXML2_FOUND) + CMAKE_PUSH_CHECK_STATE() # Save the state of the variables + INCLUDE_DIRECTORIES(${EXPAT_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${EXPAT_LIBRARIES}) ++ STRING(APPEND LIBARCHIVE_REQUIRES_PRIVATE " expat") + SET(HAVE_LIBEXPAT 1) + LA_CHECK_INCLUDE_FILE("expat.h" HAVE_EXPAT_H) + CMAKE_POP_CHECK_STATE() # Restore the state of the variables +@@ -1170,6 +1189,7 @@ IF(POSIX_REGEX_LIB MATCHES "^(AUTO|LIBC|LIBREGEX)$") + CHECK_FUNCTION_EXISTS_GLIBC(regcomp HAVE_REGCOMP_LIBREGEX) + IF(HAVE_REGCOMP_LIBREGEX) + LIST(APPEND ADDITIONAL_LIBS ${REGEX_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${REGEX_LIBRARY}) + # + # If regex.h is not found, retry looking for regex.h at + # REGEX_INCLUDE_DIR +@@ -1218,6 +1238,7 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$" + IF(PCREPOSIX_FOUND) + INCLUDE_DIRECTORIES(${PCRE_INCLUDE_DIR}) + LIST(APPEND ADDITIONAL_LIBS ${PCREPOSIX_LIBRARIES}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${PCREPOSIX_LIBRARIES}) + # Test if a macro is needed for the library. + TRY_MACRO_FOR_LIBRARY( + "${PCRE_INCLUDE_DIR}" "${PCREPOSIX_LIBRARIES}" +@@ -1229,6 +1250,7 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$" + ELSEIF(NOT WITHOUT_PCRE_STATIC AND NOT PCRE_STATIC AND PCRE_FOUND) + # Determine if pcre static libraries are to be used. + LIST(APPEND ADDITIONAL_LIBS ${PCRE_LIBRARIES}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${PCRE_LIBRARIES}) + SET(TMP_LIBRARIES ${PCREPOSIX_LIBRARIES} ${PCRE_LIBRARIES}) + MESSAGE(STATUS "trying again with -lpcre included") + TRY_MACRO_FOR_LIBRARY( +@@ -1244,6 +1266,7 @@ IF(NOT FOUND_POSIX_REGEX_LIB AND POSIX_REGEX_LIB MATCHES "^(AUTO|LIBPCREPOSIX)$" + # ___chkstk_ms. + MESSAGE(STATUS "Visual Studio build detected, trying again with -lgcc included") + LIST(APPEND ADDITIONAL_LIBS ${LIBGCC_LIBRARIES}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${LIBGCC_LIBRARIES}) + SET(TMP_LIBRARIES ${PCREPOSIX_LIBRARIES} ${PCRE_LIBRARIES} ${LIBGCC_LIBRARIES}) + TRY_MACRO_FOR_LIBRARY( + "${PCRE_INCLUDE_DIR}" "${TMP_LIBRARIES}" +@@ -1762,6 +1785,7 @@ IF(ENABLE_ACL) + SET(CMAKE_REQUIRED_LIBRARIES "acl") + FIND_LIBRARY(ACL_LIBRARY NAMES acl) + LIST(APPEND ADDITIONAL_LIBS ${ACL_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${ACL_LIBRARY}) + ENDIF(HAVE_LIBACL) + + CHECK_TYPE_EXISTS(acl_t "sys/types.h;sys/acl.h" HAVE_ACL_T) +@@ -1901,6 +1925,7 @@ int main(void) { return ACL_SYNCHRONIZE; }" HAVE_DECL_ACL_SYNCHRONIZE) + SET(CMAKE_REQUIRED_LIBRARIES "richacl") + FIND_LIBRARY(RICHACL_LIBRARY NAMES richacl) + LIST(APPEND ADDITIONAL_LIBS ${RICHACL_LIBRARY}) ++ LIST(APPEND LIBARCHIVE_LIBS_PRIVATE ${RICHACL_LIBRARY}) + ENDIF(HAVE_LIBRICHACL) + + CHECK_STRUCT_HAS_MEMBER("struct richace" e_type "sys/richacl.h" +diff --git a/build/cmake/CreatePkgConfigFile.cmake b/build/cmake/CreatePkgConfigFile.cmake +index bc5a43f..422b83b 100644 +--- a/build/cmake/CreatePkgConfigFile.cmake ++++ b/build/cmake/CreatePkgConfigFile.cmake +@@ -8,7 +8,7 @@ SET(libdir \${exec_prefix}/lib) + SET(includedir \${prefix}/include) + # Now, this is not particularly pretty, nor is it terribly accurate... + # Loop over all our additional libs +-FOREACH(mylib ${ADDITIONAL_LIBS}) ++FOREACH(mylib ${LIBARCHIVE_LIBS_PRIVATE}) + # Extract the filename from the absolute path + GET_FILENAME_COMPONENT(mylib_name ${mylib} NAME_WE) + # Strip the lib prefix +@@ -16,10 +16,6 @@ FOREACH(mylib ${ADDITIONAL_LIBS}) + # Append it to our LIBS string + SET(LIBS "${LIBS} -l${mylib_name}") + ENDFOREACH() +-# libxml2 is easier, since it's already using pkg-config +-FOREACH(mylib ${PC_LIBXML_STATIC_LDFLAGS}) +- SET(LIBS "${LIBS} ${mylib}") +-ENDFOREACH() + # FIXME: The order of the libraries doesn't take dependencies into account, + # thus there's a good chance it'll make some binutils versions unhappy... + # This only affects Libs.private (looked up for static builds) though. +diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in +index 4b631e6..80198f1 100644 +--- a/build/pkgconfig/libarchive.pc.in ++++ b/build/pkgconfig/libarchive.pc.in +@@ -10,3 +10,4 @@ Cflags: -I${includedir} + Cflags.private: -DLIBARCHIVE_STATIC + Libs: -L${libdir} -larchive + Libs.private: @LIBS@ ++Requires.private: @LIBARCHIVE_REQUIRES_PRIVATE@ diff --git a/ports/libarchive/portfile.cmake b/ports/libarchive/portfile.cmake index 11d5e984252e60..71cdde2376474e 100644 --- a/ports/libarchive/portfile.cmake +++ b/ports/libarchive/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( fix-buildsystem.patch fix-cpu-set.patch fix-dependencies.patch + pkgconfig-modules.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -22,36 +23,15 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS lzo ENABLE_LZO openssl ENABLE_OPENSSL zstd ENABLE_ZSTD - # The below features should be added to CONTROL - #pcre ENABLE_PCREPOSIX - #nettle ENABLE_NETTLE - #expat ENABLE_EXPAT - #libgcc ENABLE_LibGCC - #cng ENABLE_CNG - #tar ENABLE_TAR # Tool build option? - #cpio ENABLE_CPIO # Tool build option? - #cat ENABLE_CAT # Tool build option? - #xattr ENABLE_XATTR # Tool support option? - #acl ENABLE_ACL # Tool support option? - #iconv ENABLE_ICONV # iconv support option? - #libb2 ENABLE_LIBB2 ) -if(FEATURES MATCHES "pcre") -else() - list(APPEND FEATURE_OPTIONS -DPOSIX_REGEX_LIB=NONE) -endif() - -list(APPEND FEATURE_OPTIONS -DENABLE_ZLIB=ON) -# Needed for configure_file -set(ENABLE_ZLIB ON) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DENABLE_ZLIB=ON -DENABLE_PCREPOSIX=OFF + -DPOSIX_REGEX_LIB=NONE -DENABLE_NETTLE=OFF -DENABLE_EXPAT=OFF -DENABLE_LibGCC=OFF @@ -67,7 +47,7 @@ vcpkg_configure_cmake( -DENABLE_WERROR=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() @@ -75,17 +55,15 @@ vcpkg_copy_pdbs() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -foreach(HEADER ${CURRENT_PACKAGES_DIR}/include/archive.h ${CURRENT_PACKAGES_DIR}/include/archive_entry.h) - file(READ ${HEADER} CONTENTS) - string(REPLACE "(!defined LIBARCHIVE_STATIC)" "0" CONTENTS "${CONTENTS}") - file(WRITE ${HEADER} "${CONTENTS}") +foreach(header "${CURRENT_PACKAGES_DIR}/include/archive.h" "${CURRENT_PACKAGES_DIR}/include/archive_entry.h") + vcpkg_replace_string("${header}" "(!defined LIBARCHIVE_STATIC)" "0") endforeach() -file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in index 81cc39e39b30b3..5f00aad95cbf62 100644 --- a/ports/libarchive/vcpkg-cmake-wrapper.cmake.in +++ b/ports/libarchive/vcpkg-cmake-wrapper.cmake.in @@ -1,123 +1,65 @@ -_find_package(${ARGS}) - -include(CMakeFindDependencyMacro) - -if(@ENABLE_ZLIB@) - find_dependency(ZLIB) -endif() -if(@ENABLE_BZip2@) - find_dependency(BZip2) -endif() -if(@ENABLE_LIBXML2@) - find_dependency(LibXml2) -endif() -if(@ENABLE_LZ4@) - find_dependency(lz4) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_libarchive_args "") +if("REQUIRED" IN_LIST ARGS) + list(APPEND z_vcpkg_libarchive_args "REQUIRED") endif() -if(@ENABLE_LZMA@) - find_dependency(LibLZMA) -endif() -if(@ENABLE_ZSTD@) - find_dependency(zstd) -endif() -if(@ENABLE_OPENSSL@) - find_dependency(OpenSSL) -endif() -if(@ENABLE_LZO@) - find_library(LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH) - find_library(LZO_LIBRARY_RELEASE NAMES lzo2 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH) +if("QUIET" IN_LIST ARGS) + list(APPEND z_vcpkg_libarchive_args "QUIET") endif() -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") - if(@ENABLE_ZLIB@) - list(APPEND LibArchive_LIBRARIES ZLIB::ZLIB) - endif() +_find_package(${ARGS}) + +if(LibArchive_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(z_vcpkg_libarchive_libs "") + find_package(ZLIB ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs ZLIB::ZLIB) if(@ENABLE_BZip2@) - list(APPEND LibArchive_LIBRARIES BZip2::BZip2) + find_package(BZip2 ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs BZip2::BZip2) endif() if(@ENABLE_LIBXML2@) - list(APPEND LibArchive_LIBRARIES LibXml2::LibXml2) + find_package(LibXml2 ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs LibXml2::LibXml2) endif() if(@ENABLE_LZ4@) - list(APPEND LibArchive_LIBRARIES lz4::lz4) + find_package(lz4 CONFIG ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs lz4::lz4) endif() if(@ENABLE_LZMA@) - list(APPEND LibArchive_LIBRARIES LibLZMA::LibLZMA) + find_package(LibLZMA ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs LibLZMA::LibLZMA) endif() if(@ENABLE_LZO@) - if(LZO_LIBRARY_RELEASE) - list(APPEND LibArchive_LIBRARIES optimized ${LZO_LIBRARY_RELEASE}) - endif() - if(LZO_LIBRARY_DEBUG) - list(APPEND LibArchive_LIBRARIES debug ${LZO_LIBRARY_DEBUG}) + include(SelectLibraryConfigurations) + find_library(Z_VCPKG_LZO_LIBRARY_DEBUG NAMES lzo2d lzo2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) + find_library(Z_VCPKG_LZO_LIBRARY_RELEASE NAMES lzo2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) + select_library_configurations(Z_VCPKG_LZO) + if(Z_VCPKG_LZO_LIBRARY) + list(APPEND z_vcpkg_libarchive_libs ${Z_VCPKG_LZO_LIBRARY}) + else() + set(LibArchive_FOUND FALSE) endif() endif() if(@ENABLE_ZSTD@) + find_package(zstd ${z_vcpkg_libarchive_args}) if(TARGET zstd::libzstd_shared) - list(APPEND LibArchive_LIBRARIES zstd::libzstd_shared) + list(APPEND z_vcpkg_libarchive_libs zstd::libzstd_shared) else(TARGET zstd::libzstd_shared) - list(APPEND LibArchive_LIBRARIES zstd::libzstd_static) + list(APPEND z_vcpkg_libarchive_libs zstd::libzstd_static) endif(TARGET zstd::libzstd_shared) endif() - if(@ENABLE_OPENSSL@) - list(APPEND LibArchive_LIBRARIES OpenSSL::Crypto) + if(@ENABLE_OPENSSL@ AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") + find_package(OpenSSL ${z_vcpkg_libarchive_args}) + list(APPEND z_vcpkg_libarchive_libs OpenSSL::Crypto) endif() + list(APPEND LibArchive_LIBRARIES ${z_vcpkg_libarchive_libs}) if(TARGET LibArchive::LibArchive) - if(@ENABLE_BZip2@) - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES BZip2::BZip2) - endif() - if(@ENABLE_ZLIB@) - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB) - endif() - if(@ENABLE_LIBXML2@) - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibXml2::LibXml2) - endif() - if(@ENABLE_LZ4@) - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES lz4::lz4) - endif() - if(@ENABLE_LZMA@) - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES LibLZMA::LibLZMA) - endif() - if(@ENABLE_LZO@) - if(LZO_LIBRARY_RELEASE) - list(APPEND interface_lib \$<\$>:${LZO_LIBRARY_RELEASE}>) - endif() - if(LZO_LIBRARY_DEBUG) - list(APPEND interface_lib \$<\$:${LZO_LIBRARY_DEBUG}>) - endif() - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${interface_lib}) - endif() - if(@ENABLE_ZSTD@) - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES zstd::libzstd_static) - endif() - if(@ENABLE_OPENSSL@) - set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES OpenSSL::Crypto) - endif() + set_property(TARGET LibArchive::LibArchive APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_libarchive_libs}) endif() + unset(z_vcpkg_libarchive_libs) endif() - - -# TODO in some future -# if(@ENABLE_PCREPOSIX@) -# endif() -# if(@ENABLE_NETTLE@) -# endif() -# if(@ENABLE_EXPAT@) -# endif() -# if(@ENABLE_LibGCC@) -# endif() -# if(@ENABLE_CNG@) -# endif() -# if(@ENABLE_TAR@) -# endif() -# if(@ENABLE_CPIO@) -# endif() -# if(@ENABLE_CAT@) -# endif() -# if(@ENABLE_XATTR@) -# endif() -# if(@ENABLE_ACL@) -# endif() -# if(@ENABLE_ICONV@) -# endif() +unset(z_vcpkg_libarchive_args) +cmake_policy(POP) diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index 2f36a138583471..c8060441126495 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,10 +1,15 @@ { "name": "libarchive", "version-semver": "3.5.2", + "port-version": 1, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "supports": "!uwp", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ], "default-features": [ @@ -47,9 +52,12 @@ ] }, "openssl": { - "description": "Openssl support", + "description": "OpenSSL support (not available on macOS)", "dependencies": [ - "openssl" + { + "name": "openssl", + "platform": "!osx" + } ] }, "zstd": { diff --git a/ports/lz4/portfile.cmake b/ports/lz4/portfile.cmake index 63e858ba8bf9c1..80bcecc38bfa3c 100644 --- a/ports/lz4/portfile.cmake +++ b/ports/lz4/portfile.cmake @@ -31,8 +31,8 @@ endforeach() vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lz4.pc") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/lz4.pc" " -llz4" " -llz4d") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/liblz4.pc" " -llz4" " -llz4d") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/lz4/vcpkg.json b/ports/lz4/vcpkg.json index 0faa4629100c6d..5167b44adedbab 100644 --- a/ports/lz4/vcpkg.json +++ b/ports/lz4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lz4", "version": "1.9.3", - "port-version": 2, + "port-version": 3, "description": "Lossless compression algorithm, providing compression speed at 400 MB/s per core.", "homepage": "https://github.com/lz4/lz4", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 97e7698e10724e..9d8c57f723f1d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3194,7 +3194,7 @@ }, "libarchive": { "baseline": "3.5.2", - "port-version": 0 + "port-version": 1 }, "libass": { "baseline": "0.15.1", @@ -4050,7 +4050,7 @@ }, "lz4": { "baseline": "1.9.3", - "port-version": 2 + "port-version": 3 }, "lzfse": { "baseline": "1.0", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index dc2c72e0e40416..02943237824672 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fb5fbe606242275316a4368c88327e123ab01ad", + "version-semver": "3.5.2", + "port-version": 1 + }, { "git-tree": "4ce798873a82e4562c34189ec77f1dec3dea047d", "version-semver": "3.5.2", diff --git a/versions/l-/lz4.json b/versions/l-/lz4.json index b8801b1d59c11b..bfb6a07c4989f5 100644 --- a/versions/l-/lz4.json +++ b/versions/l-/lz4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "43957fa49e865966b52c6729db11aa067f790d49", + "version": "1.9.3", + "port-version": 3 + }, { "git-tree": "c73172e611edeb3ef440fd1ea7ef4fe746237cfc", "version": "1.9.3", From 3d6e8795d3e3de92beeece18997c099d91b5675c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 24 Sep 2021 21:11:38 +0200 Subject: [PATCH 0631/1858] [pkgconf] Update to 1.8 (and a few extras; world rebuild) (#20243) * [vcpkg/script/meson] add option NO_PKG_CONFIG to skip pkg-config setup * [vcpkg/script/pkgconfig] move vcpkg_find_acquire_program(PKGCONFIG) into the check section where it is used * [pkgconf] Update to 1.8.0 * version stuff * remove unused patch. * (CR) quote string * version update. --- docs/maintainers/vcpkg_configure_meson.md | 4 ++ ports/pkgconf/fix-static-builds.patch | 54 ----------------------- ports/pkgconf/portfile.cmake | 18 +++++--- ports/pkgconf/vcpkg.json | 2 +- scripts/cmake/vcpkg_configure_meson.cmake | 50 ++++++++++++--------- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 5 +-- versions/baseline.json | 2 +- versions/p-/pkgconf.json | 5 +++ 8 files changed, 54 insertions(+), 86 deletions(-) delete mode 100644 ports/pkgconf/fix-static-builds.patch diff --git a/docs/maintainers/vcpkg_configure_meson.md b/docs/maintainers/vcpkg_configure_meson.md index a0bfc8a99df1bf..ae8a07d87d6876 100644 --- a/docs/maintainers/vcpkg_configure_meson.md +++ b/docs/maintainers/vcpkg_configure_meson.md @@ -8,6 +8,7 @@ Configure Meson for Debug and Release builds of a project. ```cmake vcpkg_configure_meson( SOURCE_PATH <${SOURCE_PATH}> + [NO_PKG_CONFIG] [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] @@ -28,6 +29,9 @@ Additional options passed to Meson during the Release configuration. These are i ### OPTIONS_DEBUG Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. +### NO_PKG_CONFIG +Disable pkg-config setup + ## Notes This command supplies many common arguments to Meson. To see the full list, examine the source. diff --git a/ports/pkgconf/fix-static-builds.patch b/ports/pkgconf/fix-static-builds.patch deleted file mode 100644 index 88a0b375c9bcdd..00000000000000 --- a/ports/pkgconf/fix-static-builds.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/libpkgconf.pc.in b/libpkgconf.pc.in -index d278136e3..ef0c7db5f 100644 ---- a/libpkgconf.pc.in -+++ b/libpkgconf.pc.in -@@ -8,4 +8,4 @@ Description: a library for accessing and manipulating development framework conf - URL: http://github.com/pkgconf/pkgconf - Version: @PACKAGE_VERSION@ - CFlags: -I${includedir}/pkgconf --Libs: -L${libdir} -lpkgconf -+Libs: -L${libdir} -lpkgconf @build_static@ -diff --git a/meson.build b/meson.build -index e7822b8da..8f7aa0075 100644 ---- a/meson.build -+++ b/meson.build -@@ -45,6 +45,13 @@ cdata.set('abs_top_builddir', meson.build_root()) - - subdir('libpkgconf') - -+libtype = get_option('default_library') -+if libtype == 'static' -+ build_static = '-DPKGCONFIG_IS_STATIC' -+else -+ build_static = '' -+endif -+ - libpkgconf = library('pkgconf', - 'libpkgconf/argvsplit.c', - 'libpkgconf/audit.c', -@@ -60,7 +67,7 @@ libpkgconf = library('pkgconf', - 'libpkgconf/pkg.c', - 'libpkgconf/queue.c', - 'libpkgconf/tuple.c', -- c_args: '-DLIBPKGCONF_EXPORT', -+ c_args: ['-DLIBPKGCONF_EXPORT', build_static], - install : true, - version : '3.0.0', - soversion : '3', -@@ -73,13 +80,16 @@ pkg.generate(libpkgconf, - url: 'http://github.com/pkgconf/pkgconf', - filebase : 'libpkgconf', - subdirs: ['pkgconf'], -+ extra_cflags : build_static - ) - -+ - pkgconf_exe = executable('pkgconf', - 'cli/main.c', - 'cli/getopt_long.c', - 'cli/renderer-msvc.c', - link_with : libpkgconf, -+ c_args: build_static, - install : true) - - if get_option('tests') diff --git a/ports/pkgconf/portfile.cmake b/ports/pkgconf/portfile.cmake index 5daa05b65b4869..1d8dda8dd16f0b 100644 --- a/ports/pkgconf/portfile.cmake +++ b/ports/pkgconf/portfile.cmake @@ -1,23 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pkgconf/pkgconf - REF 458101e787a47378d2fc74c64f649fd3a5f75e55 - SHA512 36a68c7f452752ddfa7f4740f77277bcea0c1c2c70d36d48e74ac3f77d082771253eb9b78fcd097f55cac425cecabab163123103452ddf16bff7280254c6a715 + REF cef30268e1a3f79efd607c26abcf556aa314c9c4 + SHA512 ea03b81d01521201bdc471a39cdc8b13f9452f7cc78706d5c57056595f3e4e8a3562c022ebb72ce6444f2c7a8dfc778114814ef5064eaef770a70cc294c7f7ee HEAD_REF master - PATCHES fix-static-builds.patch ) vcpkg_configure_meson( SOURCE_PATH "${SOURCE_PATH}" + NO_PKG_CONFIG OPTIONS -Dtests=false ) vcpkg_install_meson() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig(SKIP_CHECK) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pkgconf/libpkgconf/libpkgconf-api.h" "#if defined(PKGCONFIG_IS_STATIC)" "#if 1") +endif() vcpkg_copy_tools(TOOL_NAMES pkgconf AUTO_CLEAN) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pkgconf/vcpkg.json b/ports/pkgconf/vcpkg.json index 247c50300ea0c3..8d544f1023b6d3 100644 --- a/ports/pkgconf/vcpkg.json +++ b/ports/pkgconf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pkgconf", - "version": "1.7.4", + "version": "1.8.0", "description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.", "homepage": "https://github.com/pkgconf/pkgconf", "supports": "!uwp" diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index ecbefab97b301f..943631757fa4a9 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -7,6 +7,7 @@ Configure Meson for Debug and Release builds of a project. ```cmake vcpkg_configure_meson( SOURCE_PATH <${SOURCE_PATH}> + [NO_PKG_CONFIG] [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] @@ -27,6 +28,9 @@ Additional options passed to Meson during the Release configuration. These are i ### OPTIONS_DEBUG Additional options passed to Meson during the Debug configuration. These are in addition to `OPTIONS`. +### NO_PKG_CONFIG +Disable pkg-config setup + ## Notes This command supplies many common arguments to Meson. To see the full list, examine the source. @@ -368,7 +372,7 @@ endfunction() function(vcpkg_configure_meson) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vcm "" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES") + cmake_parse_arguments(PARSE_ARGV 0 _vcm "NO_PKG_CONFIG" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -448,12 +452,14 @@ function(vcpkg_configure_meson) list(APPEND _vcm_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") list(APPEND _vcm_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") endif() - - vcpkg_find_acquire_program(PKGCONFIG) - get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) - vcpkg_add_to_path("${PKGCONFIG_PATH}") - set(PKGCONFIG_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig/") - + + if(NOT _vcm_NO_PKG_CONFIG) + vcpkg_find_acquire_program(PKGCONFIG) + get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) + vcpkg_add_to_path("${PKGCONFIG_PATH}") + set(PKGCONFIG_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig/") + endif() + set(buildtypes) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") set(BUILDNAME DEBUG) @@ -492,13 +498,15 @@ function(vcpkg_configure_meson) message(STATUS "Configuring ${TARGET_TRIPLET}-${SUFFIX_${buildtype}}") file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}") #setting up PKGCONFIG - set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}/${PATH_SUFFIX_${buildtype}}lib/pkgconfig/") - if(DEFINED ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") - else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}") + if(NOT _vcm_NO_PKG_CONFIG) + set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? + set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}/${PATH_SUFFIX_${buildtype}}lib/pkgconfig/") + if(DEFINED ENV{PKG_CONFIG_PATH}) + set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") + else() + set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}") + endif() endif() vcpkg_execute_required_process( @@ -518,12 +526,14 @@ function(vcpkg_configure_meson) endif() message(STATUS "Configuring ${TARGET_TRIPLET}-${SUFFIX_${buildtype}} done") - #Restore PKG_CONFIG_PATH - if(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}}") - unset(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) - else() - unset(ENV{PKG_CONFIG_PATH}) + if(NOT _vcm_NO_PKG_CONFIG) + #Restore PKG_CONFIG_PATH + if(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) + set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}}") + unset(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) + else() + unset(ENV{PKG_CONFIG_PATH}) + endif() endif() endforeach() diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index 7557b5b1b5d519..afa7e554812159 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -113,9 +113,6 @@ function(vcpkg_fixup_pkgconfig) endif() endif() - vcpkg_find_acquire_program(PKGCONFIG) - debug_message("Using pkg-config from: ${PKGCONFIG}") - #Absolute Unix like paths string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") @@ -186,6 +183,8 @@ function(vcpkg_fixup_pkgconfig) endforeach() if(NOT _vfpkg_SKIP_CHECK) # The check can only run after all files have been corrected! + vcpkg_find_acquire_program(PKGCONFIG) + debug_message("Using pkg-config from: ${PKGCONFIG}") foreach(_file ${_vfpkg_${CONFIG}_FILES}) vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${_file}" "${CONFIG}") endforeach() diff --git a/versions/baseline.json b/versions/baseline.json index 9d8c57f723f1d8..1252bd05254d8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5093,7 +5093,7 @@ "port-version": 0 }, "pkgconf": { - "baseline": "1.7.4", + "baseline": "1.8.0", "port-version": 0 }, "platform-folders": { diff --git a/versions/p-/pkgconf.json b/versions/p-/pkgconf.json index 6b14e2c55eb710..44a48125a8f1b4 100644 --- a/versions/p-/pkgconf.json +++ b/versions/p-/pkgconf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a56de4007c52482253b4e052bc5551655711034c", + "version": "1.8.0", + "port-version": 0 + }, { "git-tree": "75fe71378e6521fe0e14a82218a9430c831b9809", "version": "1.7.4", From 4b8e696d43ff537654762f52daa67f2bd0f6b945 Mon Sep 17 00:00:00 2001 From: Nicolas Fella <6377822+nicolasfella@users.noreply.github.com> Date: Fri, 24 Sep 2021 21:41:20 +0200 Subject: [PATCH 0632/1858] [vcpkg_configure_make] Force libdir to lib (#19666) Some Linux distributions (e.g. the OpenSUSE family) defaults to lib64 instead of lib, which breaks vcpkg's assumtion that libraries are in lib. Use the --libdir option of autotools to force the directory to be lib --- scripts/cmake/vcpkg_configure_make.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 067bf4da011f8c..a806415126062a 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -491,7 +491,7 @@ function(vcpkg_configure_make) # Important: These should all be relative to prefix! "--bindir=${prefix_var}/tools/${PORT}/bin" "--sbindir=${prefix_var}/tools/${PORT}/sbin" - #"--libdir='\${prefix}'/lib" # already the default! + "--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default #"--includedir='\${prefix}'/include" # already the default! "--mandir=${prefix_var}/share/${PORT}" "--docdir=${prefix_var}/share/${PORT}" @@ -500,7 +500,7 @@ function(vcpkg_configure_make) # Important: These should all be relative to prefix! "--bindir=${prefix_var}/../tools/${PORT}/debug/bin" "--sbindir=${prefix_var}/../tools/${PORT}/debug/sbin" - #"--libdir='\${prefix}'/lib" # already the default! + "--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default "--includedir=${prefix_var}/../include" "--datarootdir=${prefix_var}/share/${PORT}") endif() From 8d2a4a215ecf7b2cabbc9af301646520096a22da Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Mon, 27 Sep 2021 11:47:43 -0700 Subject: [PATCH 0633/1858] fix regex in json schema (#20386) thanks @SoftdriveFelix! Co-authored-by: nicole mazzuca --- scripts/vcpkg.schema.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vcpkg.schema.json b/scripts/vcpkg.schema.json index 14848f00c8e89e..7ee7a27aac89aa 100644 --- a/scripts/vcpkg.schema.json +++ b/scripts/vcpkg.schema.json @@ -16,7 +16,7 @@ "not": { "description": "Identifiers must not be a Windows filesystem or vcpkg reserved name.", "type": "string", - "pattern": "^prn|aux|nul|con|lpt[1-9]|com[1-9]|core|default$" + "pattern": "^(prn|aux|nul|con|lpt[1-9]|com[1-9]|core|default)$" } } ] From f54049b8b02970d7f1388baa2e7bfa9652a238db Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 27 Sep 2021 11:48:53 -0700 Subject: [PATCH 0634/1858] Actually remove policheck sensitive term. (#20332) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f44ad778efaeb8..e0f9eba5fbae88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7085,7 +7085,7 @@ vcpkg (2020.04.20 - 2020.06.15) - [(#11205)](https://github.com/microsoft/vcpkg/pull/11205) [vcpkg] Hopefully fix build on macOS 10.13/10.14 (by @strega-nil) - [(#11093)](https://github.com/microsoft/vcpkg/pull/11093) [vcpkg] Fix nuget package import failed. (by @shihaonan369) - [(#11239)](https://github.com/microsoft/vcpkg/pull/11239) [vcpkg] Turn on tests in CI. (by @BillyONeal) -- [(#11339)](https://github.com/microsoft/vcpkg/pull/11339) [vcpkg] Avoid naming Policheck sensitive term 'Virgin Islands' (by @BillyONeal) +- [(#11339)](https://github.com/microsoft/vcpkg/pull/11339) [vcpkg] Avoid naming Policheck sensitive term (by @BillyONeal) - [(#11368)](https://github.com/microsoft/vcpkg/pull/11368) [vcpkg] Do not build the metrics uploader with MSBuild when metrics are disabled (by @rickertm) - [(#11315)](https://github.com/microsoft/vcpkg/pull/11315) [vcpkg] Harden expand environment strings path with explicit integer overflow checks and resistance to CP_ACP. (by @BillyONeal) - [(#11450)](https://github.com/microsoft/vcpkg/pull/11450) [vcpkg CI] Clean git directory before clone (by @strega-nil) From dedc7816e14decba1954f0085862c32fe12bb2fe Mon Sep 17 00:00:00 2001 From: Niall Douglas Date: Mon, 27 Sep 2021 20:42:44 +0100 Subject: [PATCH 0635/1858] [ned14-internal-quickcpplib/llfio/outcome] Update to latest release (#20171) * Update ned14-internal-quickcpplib and LLFIO to latest matching Outcome v2.2.1 (bugfixed) release. * Implement suggested changes during review. Update Outcome and LLFIO to latest. * Re x-add-version. * Fix version database. Co-authored-by: Billy Robert O'Neal III --- ports/llfio/portfile.cmake | 4 ++-- ports/llfio/vcpkg.json | 3 +-- ports/ned14-internal-quickcpplib/portfile.cmake | 6 +++--- .../quicklib-depheaders.patch | 6 +++--- ports/ned14-internal-quickcpplib/sha_manifest.cmake | 4 ++-- ports/ned14-internal-quickcpplib/vcpkg.json | 3 +-- ports/outcome/portfile.cmake | 4 ++-- ports/outcome/vcpkg.json | 3 +-- versions/baseline.json | 12 ++++++------ versions/l-/llfio.json | 5 +++++ versions/n-/ned14-internal-quickcpplib.json | 5 +++++ versions/o-/outcome.json | 5 +++++ 12 files changed, 36 insertions(+), 24 deletions(-) diff --git a/ports/llfio/portfile.cmake b/ports/llfio/portfile.cmake index 03844f75e902cf..569af09f8d6b2a 100644 --- a/ports/llfio/portfile.cmake +++ b/ports/llfio/portfile.cmake @@ -6,8 +6,8 @@ LLFIO depends on Outcome which depends on QuickCppLib which uses the vcpkg versi vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/llfio - REF 565f27555d13ce2a37346d838f32e03e1972aac1 - SHA512 386007d03c3923e79bb1b80b1b750ae738bbc22aa5124c606cc5e7818f57a4b819bb920257c9aca39765a4a8b93d2528b4a956c53b96bd8db3b8d4a54a851e41 + REF 721503d32fe35dbaa93bde0214ae8cd3799d14b8 + SHA512 b017a0fddcd3e53c22d9863454e7ad4ce364d9e4fa46cd909ceb395df57052b5d4334081a3405e1248452863c451c3174dc7eaab70907dc8d22f4db67930cbd5 HEAD_REF develop ) diff --git a/ports/llfio/vcpkg.json b/ports/llfio/vcpkg.json index 8f343387c5f731..318b32816d583c 100644 --- a/ports/llfio/vcpkg.json +++ b/ports/llfio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "llfio", - "version-string": "2.0", - "port-version": 20210421, + "version-string": "2.0-20210922", "description": "P1031 low level file i/o and filesystem library for the C++ standard", "homepage": "https://github.com/ned14/llfio", "supports": "!(uwp | static)", diff --git a/ports/ned14-internal-quickcpplib/portfile.cmake b/ports/ned14-internal-quickcpplib/portfile.cmake index 57cb70c7fb6aaa..124fa3157030ab 100644 --- a/ports/ned14-internal-quickcpplib/portfile.cmake +++ b/ports/ned14-internal-quickcpplib/portfile.cmake @@ -11,10 +11,10 @@ include(${CURRENT_PORT_DIR}/sha_manifest.cmake) message(WARNING [=[ -QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.37.0 and byte-lite version 0.2.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: +QuickCppLib and its downstream dependencies Outcome and LLFIO were tested against gsl-lite version 0.38.1 and byte-lite version 0.3.0. They are not guaranteed to work with newer versions, with failures experienced in the past up-to-and-including runtime crashes. You can pin the versions as verified to work in QuickCppLib's CI in your manifest file by adding: "overrides": [ - { "name": "gsl-lite", "version": "0.37.0" }, - { "name": "byte-lite", "version": "0.2.0" } + { "name": "gsl-lite", "version": "0.38.1" }, + { "name": "byte-lite", "version": "0.3.0" } ] Do not report issues to upstream without first pinning these previous versions. ]=]) diff --git a/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch index 6e7ea0a5d543f1..7ad3c3b9a77f75 100644 --- a/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch +++ b/ports/ned14-internal-quickcpplib/quicklib-depheaders.patch @@ -2,16 +2,16 @@ diff --git a/cmake/headers.cmake b/cmake/headers.cmake index 1aad359..e5053ed 100644 --- a/cmake/headers.cmake +++ b/cmake/headers.cmake -@@ -13,8 +13,6 @@ set(quickcpplib_HEADERS +@@ -15,8 +15,6 @@ set(quickcpplib_HEADERS "include/quickcpplib/boost/test/unit_test.hpp" "include/quickcpplib/byte.hpp" "include/quickcpplib/byte/include/nonstd/byte.hpp" - "include/quickcpplib/byte/test/byte-main.t.hpp" -- "include/quickcpplib/byte/test/lest_cpp03.hpp" +- "include/quickcpplib/byte/test/lest/lest_cpp03.hpp" "include/quickcpplib/config.hpp" "include/quickcpplib/console_colours.hpp" "include/quickcpplib/cpp_feature.h" -@@ -25,15 +23,8 @@ set(quickcpplib_HEADERS +@@ -27,15 +25,8 @@ set(quickcpplib_HEADERS "include/quickcpplib/erasure_cast.hpp" "include/quickcpplib/execinfo_win64.h" "include/quickcpplib/function_ptr.hpp" diff --git a/ports/ned14-internal-quickcpplib/sha_manifest.cmake b/ports/ned14-internal-quickcpplib/sha_manifest.cmake index 383b8b85334e18..78b7c36ee8cbb4 100644 --- a/ports/ned14-internal-quickcpplib/sha_manifest.cmake +++ b/ports/ned14-internal-quickcpplib/sha_manifest.cmake @@ -1,5 +1,5 @@ -set(QUICKCPPLIB_REF 7cb75d4e190fec886a655fd50d3fe80d933e0efb) -set(QUICKCPPLIB_SHA512 891b1620485119545f28528d3407d5d896e0da7530224a684cd7201581ea45871761bef8b9e3914fd2a104ecac3d35c50a049893ef32b1ef95d871e63371d6f3) +set(QUICKCPPLIB_REF e691a6dc0358c1091d59022af06a97d68fcc074d) +set(QUICKCPPLIB_SHA512 8e3213a4d730a3db842fcb61da970badf82a42bd169c8d65f64f1edc1098d1103513f901081ee004395437ae90cb8536040ccb8e44dea764646cb27274caaa6a) set(OPTIONAL_REF 2b43315458a99fc5de1da6e7bc0ddd364b26d643) set(OPTIONAL_SHA512 1952386cd3c7b963861f9634055e1baa4181d398d6f1b068a8a3f411368432bdcd42e47aadfa856584ed9a7c724a1c83369243ccb653e650af5c9155b42a84f4) diff --git a/ports/ned14-internal-quickcpplib/vcpkg.json b/ports/ned14-internal-quickcpplib/vcpkg.json index b201b5fdcc6daa..a0e89d5941f7f7 100644 --- a/ports/ned14-internal-quickcpplib/vcpkg.json +++ b/ports/ned14-internal-quickcpplib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ned14-internal-quickcpplib", - "version-string": "0.0.0-7cb75d4e", - "port-version": 1, + "version-string": "0.0.0-e691a6dc", "description": "NOT FOR EXTERNAL CONSUMPTION, a set of internal scripts used by ned14's libraries.", "homepage": "https://github.com/ned14/quickcpplib", "dependencies": [ diff --git a/ports/outcome/portfile.cmake b/ports/outcome/portfile.cmake index 79dc21b8e669ff..38cf26bf10cc40 100644 --- a/ports/outcome/portfile.cmake +++ b/ports/outcome/portfile.cmake @@ -22,8 +22,8 @@ Outcome depends on QuickCppLib which uses the vcpkg versions of gsl-lite and byt vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ned14/outcome - REF v2.2.0 - SHA512 2391667304c0160b7c753df157c948fa7d7f362c9f7f238fc53b0dcbdabe23f6d481909bb8e267c749af8c5c1a1c5083e91c12365fe1beb9bc70e6287f526879 + REF a86c6b053b86e4fc5d920907b0afb3234bec9336 + SHA512 c282afd7b335fef37ec4c2011bf591d3ffd56872515e8fcbd95714020ab99d141a87a064ecda44bf9308cb4bd1f39977b62303f2cc297918be2f257a36ff5832 HEAD_REF develop PATCHES outcome-prune-sources.patch diff --git a/ports/outcome/vcpkg.json b/ports/outcome/vcpkg.json index 6c0a4e93ad307e..0735c5d090d689 100644 --- a/ports/outcome/vcpkg.json +++ b/ports/outcome/vcpkg.json @@ -1,7 +1,6 @@ { "name": "outcome", - "version-string": "2.2.0-release", - "port-version": 1, + "version-string": "2.2.2-20210922", "description": "Provides very lightweight outcome and result (non-Boost edition)", "homepage": "https://github.com/ned14/outcome", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 1252bd05254d8e..1c645daba51957 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3977,8 +3977,8 @@ "port-version": 2 }, "llfio": { - "baseline": "2.0", - "port-version": 20210421 + "baseline": "2.0-20210922", + "port-version": 0 }, "llgl": { "baseline": "2019-08-15", @@ -4505,8 +4505,8 @@ "port-version": 1 }, "ned14-internal-quickcpplib": { - "baseline": "0.0.0-7cb75d4e", - "port-version": 1 + "baseline": "0.0.0-e691a6dc", + "port-version": 0 }, "neon2sse": { "baseline": "2021-09-16", @@ -4933,8 +4933,8 @@ "port-version": 0 }, "outcome": { - "baseline": "2.2.0-release", - "port-version": 1 + "baseline": "2.2.2-20210922", + "port-version": 0 }, "p-ranav-csv": { "baseline": "2019-07-11", diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json index d60f6ba93bb2cd..fa6953fb264016 100644 --- a/versions/l-/llfio.json +++ b/versions/l-/llfio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "208ec7684366cb893eeeeb9f86b4b6c92fab7e28", + "version-string": "2.0-20210922", + "port-version": 0 + }, { "git-tree": "3ff2b8c721c107574a4a81aa219fe4c119eaa9e3", "version-string": "2.0", diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json index b19151577b7405..2c4ad5ca6881a0 100644 --- a/versions/n-/ned14-internal-quickcpplib.json +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "801be68901e5e7e84e4069015346fc457e72953c", + "version-string": "0.0.0-e691a6dc", + "port-version": 0 + }, { "git-tree": "3cd8528057f78bdbc43616bbe7349acd5cc41c77", "version-string": "0.0.0-7cb75d4e", diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index e6e8e2766594db..6c50899e89db1e 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31aada521fafc8169a891338a3af04fa4f658327", + "version-string": "2.2.2-20210922", + "port-version": 0 + }, { "git-tree": "275bb74716bbeb4b09b1e97c442e0e085490c646", "version-string": "2.2.0-release", From 6b218a2fe77e4f97042a907dcddd2e41676015aa Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Mon, 27 Sep 2021 13:27:44 -0700 Subject: [PATCH 0636/1858] [scripts-audit] vcpkg_fixup_pkgconfig (#19658) * [scripts-audit] vcpkg_fixup_pkgconfig * Neumann-A CR, fix docs * vcpkg_fixup_pkgconfig bugs * fix group * moar fixing * be more clever around pkg_config_path * add `vcpkg_host_path_list` so that we can unit test * move stuff around a bit * fix bug in vcpkg_host_path_list.cmake * ras0219 CRs --- docs/maintainers/portfile-functions.md | 1 + docs/maintainers/vcpkg_host_path_list.md | 26 ++ scripts/cmake/vcpkg_add_to_path.cmake | 11 +- scripts/cmake/vcpkg_fixup_pkgconfig.cmake | 216 +++++++------- scripts/cmake/vcpkg_host_path_list.cmake | 81 ++++++ scripts/ports.cmake | 1 + .../test_ports/unit-test-cmake/portfile.cmake | 72 ++++- .../test-vcpkg_host_path_list.cmake | 263 ++++++++++++++++++ scripts/test_ports/unit-test-cmake/vcpkg.json | 3 + 9 files changed, 563 insertions(+), 111 deletions(-) create mode 100644 docs/maintainers/vcpkg_host_path_list.md create mode 100644 scripts/cmake/vcpkg_host_path_list.cmake create mode 100644 scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 45aa4589bc481b..6527d8e0bbbf14 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -44,6 +44,7 @@ - [vcpkg\_from\_sourceforge](vcpkg_from_sourceforge.md) - [vcpkg\_get\_program\_files\_platform\_bitness](vcpkg_get_program_files_platform_bitness.md) - [vcpkg\_get\_windows\_sdk](vcpkg_get_windows_sdk.md) +- [vcpkg\_host\_path\_list](vcpkg_host_path_list.md) - [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md)) - [vcpkg\_install\_gn](vcpkg_install_gn.md) - [vcpkg\_install\_make](vcpkg_install_make.md) diff --git a/docs/maintainers/vcpkg_host_path_list.md b/docs/maintainers/vcpkg_host_path_list.md new file mode 100644 index 00000000000000..8517e7f56e1e7f --- /dev/null +++ b/docs/maintainers/vcpkg_host_path_list.md @@ -0,0 +1,26 @@ +# vcpkg_host_path_list + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_host_path_list.md). + +Modify a host path list variable (PATH, INCLUDE, LIBPATH, etc.) + +```cmake +vcpkg_host_path_list(PREPEND [...]) +vcpkg_host_path_list(APPEND [...]) +``` + +`` may be either a regular variable name, or `ENV{variable-name}`, +in which case `vcpkg_host_path_list` will modify the environment. + +`vcpkg_host_path_list` adds all of the paths passed to it to ``; +`PREPEND` puts them before the existing list, so that they are searched first; +`APPEND` places them after the existing list, +so they would be searched after the paths which are already in the variable. + +For both `APPEND` and `PREPEND`, +the paths are added (and thus searched) in the order received. + +If no paths are passed, then nothing will be done. + +## Source +[scripts/cmake/vcpkg\_host\_path\_list.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_host_path_list.cmake) diff --git a/scripts/cmake/vcpkg_add_to_path.cmake b/scripts/cmake/vcpkg_add_to_path.cmake index fe780c72a8d131..b17aca36803edb 100644 --- a/scripts/cmake/vcpkg_add_to_path.cmake +++ b/scripts/cmake/vcpkg_add_to_path.cmake @@ -24,14 +24,11 @@ If no paths are passed, then nothing will be done. #]===] function(vcpkg_add_to_path) cmake_parse_arguments(PARSE_ARGV 0 "arg" "PREPEND" "" "") - if(NOT DEFINED arg_UNPARSED_ARGUMENTS) - return() - endif() - - list(JOIN arg_UNPARSED_ARGUMENTS "${VCPKG_HOST_PATH_SEPARATOR}" add_to_path) if(arg_PREPEND) - set(ENV{PATH} "${add_to_path}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PATH}") + set(operation PREPEND) else() - set(ENV{PATH} "$ENV{PATH}${VCPKG_HOST_PATH_SEPARATOR}${add_to_path}") + set(operation APPEND) endif() + + vcpkg_host_path_list("${operation}" ENV{PATH} ${arg_UNPARSED_ARGUMENTS}) endfunction() diff --git a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake index afa7e554812159..9cb35b7b24870a 100644 --- a/scripts/cmake/vcpkg_fixup_pkgconfig.cmake +++ b/scripts/cmake/vcpkg_fixup_pkgconfig.cmake @@ -45,112 +45,121 @@ Still work in progress. If there are more cases which can be handled here feel f * [brotli](https://github.com/Microsoft/vcpkg/blob/master/ports/brotli/portfile.cmake) #]===] -function(vcpkg_fixup_pkgconfig_check_files pkg_cfg_cmd _file _config) - set(PATH_SUFFIX_DEBUG /debug) - set(PATH_SUFFIX_RELEASE) - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_INSTALLED_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig") - set(PKGCONFIG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_PACKAGES_SHARE_DIR "${CURRENT_PACKAGES_DIR}/share/pkgconfig") +function(z_vcpkg_fixup_pkgconfig_check_files file config) + set(path_suffix_DEBUG /debug) + set(path_suffix_RELEASE "") if(DEFINED ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}") + set(backup_env_pkg_config_path "$ENV{PKG_CONFIG_PATH}") else() - unset(BACKUP_ENV_PKG_CONFIG_PATH) - endif() - if(DEFINED ENV{PKG_CONFIG_PATH} AND NOT ENV{PKG_CONFIG_PATH} STREQUAL "") - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") - else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") + unset(backup_env_pkg_config_path) endif() + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} + "${CURRENT_PACKAGES_DIR}${path_suffix_${config}}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/share/pkgconfig" + "${CURRENT_INSTALLED_DIR}${path_suffix_${config}}/lib/pkgconfig" + "${CURRENT_INSTALLED_DIR}/share/pkgconfig" + ) + # First make sure everything is ok with the package and its deps - get_filename_component(_package_name "${_file}" NAME_WLE) - debug_message("Checking package (${_config}): ${_package_name}") - execute_process(COMMAND "${pkg_cfg_cmd}" --print-errors --exists ${_package_name} - WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" - RESULT_VARIABLE _pkg_error_var - OUTPUT_VARIABLE _pkg_output - ERROR_VARIABLE _pkg_error_out - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if(NOT _pkg_error_var EQUAL 0) - message(STATUS "pkg_cfg_cmd call with:${pkg_cfg_cmd} --exists ${_package_name} failed") - message(STATUS "ENV{PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}") - message(STATUS "pkg-config call failed with error code:${_pkg_error_var}") - message(STATUS "pkg-config output:${_pkg_output}") - message(FATAL_ERROR "pkg-config error output:${_pkg_error_out}") + cmake_path(GET file STEM LAST_ONLY package_name) + debug_message("Checking package (${config}): ${package_name}") + execute_process( + COMMAND "${PKGCONFIG}" --print-errors --exists "${package_name}" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" + RESULT_VARIABLE error_var + OUTPUT_VARIABLE output + ERROR_VARIABLE output + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE + ) + if(NOT "${error_var}" EQUAL "0") + message(FATAL_ERROR "${PKGCONFIG} --exists ${package_name} failed with error code: ${error_var} + ENV{PKG_CONFIG_PATH}: \"$ENV{PKG_CONFIG_PATH}\" + output: ${output}" + ) else() - debug_message("pkg-config returned:${_pkg_error_var}") - debug_message("pkg-config output:${_pkg_output}") - debug_message("pkg-config error output:${_pkg_error_out}") + debug_message("pkg-config --exists ${package_name} output: ${output}") endif() - if(DEFINED BACKUP_ENV_PKG_CONFIG_PATH) - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH}") + if(DEFINED backup_env_pkg_config_path) + set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path}") else() unset(ENV{PKG_CONFIG_PATH}) endif() endfunction() function(vcpkg_fixup_pkgconfig) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vfpkg "SKIP_CHECK" "" "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS") - - if(_vfpkg_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "vcpkg_fixup_pkgconfig() was passed extra arguments: ${_vfct_UNPARSED_ARGUMENTS}") + cmake_parse_arguments(PARSE_ARGV 0 arg + "SKIP_CHECK" + "" + "RELEASE_FILES;DEBUG_FILES;SYSTEM_LIBRARIES;SYSTEM_PACKAGES;IGNORE_FLAGS" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - if((DEFINED _vfpkg_RELEASE_FILES AND NOT DEFINED _vfpkg_DEBUG_FILES) OR (NOT DEFINED _vfpkg_RELEASE_FILES AND DEFINED _vfpkg_DEBUG_FILES)) - message(FATAL_ERROR "vcpkg_fixup_pkgconfig() requires both or neither of DEBUG_FILES and RELEASE_FILES") + if(DEFINED arg_RELEASE_FILES AND NOT DEFINED arg_DEBUG_FILES) + message(FATAL_ERROR "DEBUG_FILES must be specified if RELEASE_FILES was specified.") + endif() + if(NOT DEFINED arg_RELEASE_FILES AND DEFINED arg_DEBUG_FILES) + message(FATAL_ERROR "RELEASE_FILES must be specified if DEBUG_FILES was specified.") endif() - if(NOT DEFINED _vfpkg_RELEASE_FILES) - file(GLOB_RECURSE _vfpkg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") - file(GLOB_RECURSE _vfpkg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") - if(_vfpkg_DEBUG_FILES) - list(REMOVE_ITEM _vfpkg_RELEASE_FILES ${_vfpkg_DEBUG_FILES}) - endif() + if(NOT DEFINED arg_RELEASE_FILES) + file(GLOB_RECURSE arg_RELEASE_FILES "${CURRENT_PACKAGES_DIR}/**/*.pc") + file(GLOB_RECURSE arg_DEBUG_FILES "${CURRENT_PACKAGES_DIR}/debug/**/*.pc") + foreach(debug_file IN LISTS arg_DEBUG_FILES) + vcpkg_list(REMOVE_ITEM arg_RELEASE_FILES "${debug_file}") + endforeach() endif() - #Absolute Unix like paths - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PACKAGES_DIR "${CURRENT_PACKAGES_DIR}") - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}") + string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_packages_dir "${CURRENT_PACKAGES_DIR}") + string(REGEX REPLACE "^([a-zA-Z]):/" [[/\1/]] unix_installed_dir "${CURRENT_INSTALLED_DIR}") - foreach(CONFIG RELEASE DEBUG) - debug_message("${CONFIG} Files: ${_vfpkg_${CONFIG}_FILES}") - if(VCPKG_BUILD_TYPE STREQUAL "debug" AND CONFIG STREQUAL "RELEASE") + foreach(config IN ITEMS RELEASE DEBUG) + debug_message("${config} Files: ${arg_${config}_FILES}") + if("${VCPKG_BUILD_TYPE}" STREQUAL "debug" AND "${config}" STREQUAL "RELEASE") continue() endif() - if(VCPKG_BUILD_TYPE STREQUAL "release" AND CONFIG STREQUAL "DEBUG") + if("${VCPKG_BUILD_TYPE}" STREQUAL "release" AND "${config}" STREQUAL "DEBUG") continue() endif() - foreach(_file ${_vfpkg_${CONFIG}_FILES}) - message(STATUS "Fixing pkgconfig file: ${_file}") - get_filename_component(PKG_LIB_SEARCH_PATH "${_file}" DIRECTORY) - if(CONFIG STREQUAL "DEBUG") - file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}/debug/") + foreach(file IN LISTS "arg_${config}_FILES") + message(STATUS "Fixing pkgconfig file: ${file}") + cmake_path(GET file PARENT_PATH pkg_lib_search_path) + if("${config}" STREQUAL "DEBUG") + set(relative_pc_path "${CURRENT_PACKAGES_DIR}/debug") + cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") else() - file(RELATIVE_PATH RELATIVE_PC_PATH "${PKG_LIB_SEARCH_PATH}" "${CURRENT_PACKAGES_DIR}") + set(relative_pc_path "${CURRENT_PACKAGES_DIR}") + cmake_path(RELATIVE_PATH relative_pc_path BASE_DIRECTORY "${pkg_lib_search_path}") endif() - # strip trailing slash - string(REGEX REPLACE "/$" "" RELATIVE_PC_PATH "${RELATIVE_PC_PATH}") #Correct *.pc file - file(READ "${_file}" _contents) - string(REPLACE "${CURRENT_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_PACKAGES_DIR}" "\${prefix}" _contents "${_contents}") - string(REPLACE "${_VCPKG_INSTALLED_DIR}" "\${prefix}" _contents "${_contents}") - string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" _contents "${_contents}") - if(CONFIG STREQUAL "DEBUG") - string(REPLACE "}/debug" "}" _contents "${_contents}") - # Prefix points at the debug subfolder - string(REPLACE "\${prefix}/include" "\${prefix}/../include" _contents "${_contents}") - string(REPLACE "\${prefix}/share" "\${prefix}/../share" _contents "${_contents}") + file(READ "${file}" contents) + + # this normalizes all files to end with a newline, and use LF instead of CRLF; + # this allows us to use regex matches easier to modify these files. + if(NOT "${contents}" MATCHES "\n$") + string(APPEND contents "\n") + endif() + string(REPLACE "\r\n" "\n" contents "${contents}") + + string(REPLACE "${CURRENT_PACKAGES_DIR}" [[${prefix}]] contents "${contents}") + string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${prefix}]] contents "${contents}") + string(REPLACE "${unix_packages_dir}" [[${prefix}]] contents "${contents}") + string(REPLACE "${unix_installed_dir}" [[${prefix}]] contents "${contents}") + + string(REGEX REPLACE "(^|\n)prefix[\t ]*=[^\n]*" "" contents "${contents}") + if("${config}" STREQUAL "DEBUG") + # prefix points at the debug subfolder + string(REPLACE [[${prefix}/debug]] [[${prefix}]] contents "${contents}") + string(REPLACE [[${prefix}/include]] [[${prefix}/../include]] contents "${contents}") + string(REPLACE [[${prefix}/share]] [[${prefix}/../share]] contents "${contents}") endif() - string(REGEX REPLACE " -L(\\\${[^}]*}[^ \n\t]*)" " -L\"\\1\"" _contents "${_contents}") - string(REGEX REPLACE " -I(\\\${[^}]*}[^ \n\t]*)" " -I\"\\1\"" _contents "${_contents}") - string(REGEX REPLACE " -l(\\\${[^}]*}[^ \n\t]*)" " -l\"\\1\"" _contents "${_contents}") + # quote -L, -I, and -l paths starting with `${blah}` + string(REGEX REPLACE " -([LIl])(\\\${[^}]*}[^ \n\t]*)" [[ -\1"\2"]] contents "${contents}") # This section fuses XYZ.private and XYZ according to VCPKG_LIBRARY_LINKAGE # # Pkgconfig searches Requires.private transitively for Cflags in the dynamic case, @@ -158,41 +167,44 @@ function(vcpkg_fixup_pkgconfig) # # Once this transformation is complete, users of vcpkg should never need to pass # --static. - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - # Libs comes before Libs.private - string(REGEX REPLACE "(^|\n)(Libs: *[^\n]*)(.*)\nLibs.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") - # Libs.private comes before Libs - string(REGEX REPLACE "(^|\n)Libs.private:( *[^\n]*)(.*\nLibs: *[^\n]*)" "\\3\\2" _contents "${_contents}") - # Only Libs.private - string(REGEX REPLACE "(^|\n)Libs.private: *" "\\1Libs: " _contents "${_contents}") - # Cflags comes before Cflags.private - string(REGEX REPLACE "(^|\n)(Cflags: *[^\n]*)(.*)\nCflags.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") - # Cflags.private comes before Cflags - string(REGEX REPLACE "(^|\n)Cflags.private:( *[^\n]*)(.*\nCflags: *[^\n]*)" "\\3\\2" _contents "${_contents}") - # Only Cflags.private - string(REGEX REPLACE "(^|\n)Cflags.private: *" "\\1Cflags: " _contents "${_contents}") - # Requires comes before Requires.private - string(REGEX REPLACE "(^|\n)(Requires: *[^\n]*)(.*)\nRequires.private:( *[^\n]*)" "\\1\\2\\4\\3" _contents "${_contents}") - # Requires.private comes before Requires - string(REGEX REPLACE "(^|\n)Requires.private:( *[^\n]*)(.*\nRequires: *[^\n]*)" "\\3\\2" _contents "${_contents}") - # Only Requires.private - string(REGEX REPLACE "(^|\n)Requires.private: *" "\\1Requires: " _contents "${_contents}") + if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + # how this works: + # we want to transform: + # Libs: $1 + # Libs.private: $2 + # into + # Libs: $1 $2 + # and the same thing for Requires and Requires.private + + foreach(item IN ITEMS "Libs" "Requires" "Cflags") + set(line "") + if("${contents}" MATCHES "(^|\n)${item}: *([^\n]*)") + string(APPEND line " ${CMAKE_MATCH_2}") + endif() + if("${contents}" MATCHES "(^|\n)${item}\\.private: *([^\n]*)") + string(APPEND line " ${CMAKE_MATCH_2}") + endif() + + string(REGEX REPLACE "(^|\n)${item}(\\.private)?:[^\n]*\n" [[\1]] contents "${contents}") + if(NOT "${line}" STREQUAL "") + string(APPEND contents "${item}:${line}\n") + endif() + endforeach() endif() - file(WRITE "${_file}" "prefix=\${pcfiledir}/${RELATIVE_PC_PATH}\n${_contents}") - unset(PKG_LIB_SEARCH_PATH) + file(WRITE "${file}" "prefix=\${pcfiledir}/${relative_pc_path}\n${contents}") endforeach() - if(NOT _vfpkg_SKIP_CHECK) # The check can only run after all files have been corrected! + if(NOT arg_SKIP_CHECK) # The check can only run after all files have been corrected! vcpkg_find_acquire_program(PKGCONFIG) debug_message("Using pkg-config from: ${PKGCONFIG}") - foreach(_file ${_vfpkg_${CONFIG}_FILES}) - vcpkg_fixup_pkgconfig_check_files("${PKGCONFIG}" "${_file}" "${CONFIG}") + foreach(file IN LISTS "arg_${config}_FILES") + z_vcpkg_fixup_pkgconfig_check_files("${file}" "${config}") endforeach() endif() endforeach() debug_message("Fixing pkgconfig --- finished") - set(VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) + set(Z_VCPKG_FIXUP_PKGCONFIG_CALLED TRUE CACHE INTERNAL "See below" FORCE) # Variable to check if this function has been called! # Theoreotically vcpkg could look for *.pc files and automatically call this function # or check if this function has been called if *.pc files are detected. diff --git a/scripts/cmake/vcpkg_host_path_list.cmake b/scripts/cmake/vcpkg_host_path_list.cmake new file mode 100644 index 00000000000000..d849cd42d35867 --- /dev/null +++ b/scripts/cmake/vcpkg_host_path_list.cmake @@ -0,0 +1,81 @@ +#[===[ +# vcpkg_host_path_list + +Modify a host path list variable (PATH, INCLUDE, LIBPATH, etc.) + +```cmake +vcpkg_host_path_list(PREPEND [...]) +vcpkg_host_path_list(APPEND [...]) +``` + +`` may be either a regular variable name, or `ENV{variable-name}`, +in which case `vcpkg_host_path_list` will modify the environment. + +`vcpkg_host_path_list` adds all of the paths passed to it to ``; +`PREPEND` puts them before the existing list, so that they are searched first; +`APPEND` places them after the existing list, +so they would be searched after the paths which are already in the variable. + +For both `APPEND` and `PREPEND`, +the paths are added (and thus searched) in the order received. + +If no paths are passed, then nothing will be done. +#]===] +function(vcpkg_host_path_list) + if("${ARGC}" LESS "2") + message(FATAL_ERROR "vcpkg_host_path_list requires at least two arguments.") + endif() + + if("${ARGV1}" MATCHES "^ARGV([0-9]*)$|^ARG[CN]$|^CMAKE_CURRENT_FUNCTION|^CMAKE_MATCH_") + message(FATAL_ERROR "vcpkg_host_path_list does not support the list_var being ${ARGV1}. + Please use a different variable name.") + endif() + + if("${ARGV1}" MATCHES [[^ENV\{(.*)\}$]]) + set(list "$ENV{${CMAKE_MATCH_1}}") + set(env_var ON) + elseif("${ARGV1}" MATCHES [[^([A-Z]+)\{.*\}$]]) + message(FATAL_ERROR "vcpkg_host_path_list does not support ${CMAKE_MATCH_1} variables; + only ENV{} and regular variables are supported.") + else() + set(list "${${ARGV1}}") + set(env_var OFF) + endif() + set(operation "${ARGV0}") + set(list_var "${ARGV1}") + + if("${operation}" MATCHES "^(APPEND|PREPEND)$") + cmake_parse_arguments(PARSE_ARGV 2 arg "" "" "") + if(NOT DEFINED arg_UNPARSED_ARGUMENTS) + return() + endif() + + if("${VCPKG_HOST_PATH_SEPARATOR}" STREQUAL ";") + set(to_add "${arg_UNPARSED_ARGUMENTS}") + string(FIND "${arg_UNPARSED_ARGUMENTS}" [[\;]] index_of_host_path_separator) + else() + vcpkg_list(JOIN arg_UNPARSED_ARGUMENTS "${VCPKG_HOST_PATH_SEPARATOR}" to_add) + string(FIND "${arg_UNPARSED_ARGUMENTS}" "${VCPKG_HOST_PATH_SEPARATOR}" index_of_host_path_separator) + endif() + + if(NOT "${index_of_host_path_separator}" EQUAL "-1") + message(FATAL_ERROR "Host path separator (${VCPKG_HOST_PATH_SEPARATOR}) in path; this is unsupported.") + endif() + + if("${list}" STREQUAL "") + set(list "${to_add}") + elseif(arg_PREPEND) + set(list "${to_add}${VCPKG_HOST_PATH_SEPARATOR}${list}") + else() + set(list "${list}${VCPKG_HOST_PATH_SEPARATOR}${to_add}") + endif() + else() + message(FATAL_ERROR "Operation ${operation} not recognized.") + endif() + + if(env_var) + set("${list_var}" "${list}") + else() + set("${list_var}" "${list}" PARENT_SCOPE) + endif() +endfunction() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index e33fa58657ea7a..914c47cae9c5b8 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -42,6 +42,7 @@ include("${SCRIPTS}/cmake/vcpkg_from_gitlab.cmake") include("${SCRIPTS}/cmake/vcpkg_from_sourceforge.cmake") include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake") include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake") +include("${SCRIPTS}/cmake/vcpkg_host_path_list.cmake") include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake") include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake") include("${SCRIPTS}/cmake/vcpkg_install_make.cmake") diff --git a/scripts/test_ports/unit-test-cmake/portfile.cmake b/scripts/test_ports/unit-test-cmake/portfile.cmake index a567c11dec0f76..497cb18a383b09 100644 --- a/scripts/test_ports/unit-test-cmake/portfile.cmake +++ b/scripts/test_ports/unit-test-cmake/portfile.cmake @@ -23,6 +23,56 @@ endmacro() set(Z_VCPKG_UNIT_TEST_HAS_ERROR OFF CACHE BOOL "" FORCE) unset_fatal_error() +# in order to allow namespacing +function(unit_test_match namespace value regex) + if("${value}" MATCHES "${regex}") + set("${namespace}_MATCHED" ON PARENT_SCOPE) + if("${CMAKE_MATCH_COUNT}" EQUAL "0") + return() + endif() + + foreach(match RANGE 1 "${CMAKE_MATCH_COUNT}") + set("${namespace}_CMAKE_MATCH_${match}" "${CMAKE_MATCH_${match}}" PARENT_SCOPE) + endforeach() + else() + set("${namespace}_MATCHED" OFF PARENT_SCOPE) + endif() +endfunction() + +function(unit_test_check_variable_unset utcvu_test utcvu_variable) + cmake_language(EVAL CODE "${utcvu_test}") + if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) + unset_fatal_error() + set_has_error() + message(STATUS "${utcvu_test} had an unexpected FATAL_ERROR; + expected: \"${utcvu_value}\"") + message(STATUS "FATAL_ERROR: ${Z_VCPKG_UNIT_TEST_FATAL_ERROR}") + return() + endif() + + unit_test_match(utcvu "${utcvu_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) + if(utcvu_MATCHED) + message(STATUS "utcvu_variable: ${utcvu_CMAKE_MATCH_2}") + if("${utcvu_CMAKE_MATCH_1}" STREQUAL "ENV") + set(utcvu_actual_value "$ENV{${utcvu_CMAKE_MATCH_2}}") + elseif("${utcvu_CMAKE_MATCH_1}" STREQUAL "CACHE") + set(utcvu_actual_value "$CACHE{${utcvu_CMAKE_MATCH_2}}") + else() + _message(FATAL_ERROR "unexpected value for CMAKE_MATCH_1: ${utcvu_CMAKE_MATCH_1}") + endif() + else() + set(utcvu_actual_value "${${utcvu_variable}}") + endif() + + if(DEFINED "${utcvu_variable}") + message(STATUS "${utcvu_test} set ${utcvu_variable}; + expected: \"${utcvu_variable}\" unset + actual : \"${utcvu_actual_value}\"") + set_has_error() + return() + endif() +endfunction() + function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) cmake_language(EVAL CODE "${utcve_test}") if(Z_VCPKG_UNIT_TEST_HAS_FATAL_ERROR) @@ -40,10 +90,25 @@ function(unit_test_check_variable_equal utcve_test utcve_variable utcve_value) set_has_error() return() endif() - if(NOT "${${utcve_variable}}" STREQUAL "${utcve_value}") + + unit_test_match(utcve "${utcve_variable}" [[^(ENV|CACHE)\{(.*)\}$]]) + if(utcve_MATCHED) + message(STATUS "utcve_variable: ${utcve_CMAKE_MATCH_2}") + if("${utcve_CMAKE_MATCH_1}" STREQUAL "ENV") + set(utcve_actual_value "$ENV{${utcve_CMAKE_MATCH_2}}") + elseif("${utcve_CMAKE_MATCH_1}" STREQUAL "CACHE") + set(utcve_actual_value "$CACHE{${utcve_CMAKE_MATCH_2}}") + else() + _message(FATAL_ERROR "unexpected value for CMAKE_MATCH_1: ${utcve_CMAKE_MATCH_1}") + endif() + else() + set(utcve_actual_value "${${utcve_variable}}") + endif() + + if(NOT "${utcve_actual_value}" STREQUAL "${utcve_value}") message(STATUS "${utcve_test} resulted in the wrong value for ${utcve_variable}; expected: \"${utcve_value}\" - actual : \"${${utcve_variable}}\"") + actual : \"${utcve_actual_value}\"") set_has_error() return() endif() @@ -74,6 +139,9 @@ endif() if("list" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_list.cmake") endif() +if("add-to-path" IN_LIST FEATURES) + include("${CMAKE_CURRENT_LIST_DIR}/test-vcpkg_host_path_list.cmake") +endif() if("function-arguments" IN_LIST FEATURES) include("${CMAKE_CURRENT_LIST_DIR}/test-z_vcpkg_function_arguments.cmake") endif() diff --git a/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake b/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake new file mode 100644 index 00000000000000..a6322d37556747 --- /dev/null +++ b/scripts/test_ports/unit-test-cmake/test-vcpkg_host_path_list.cmake @@ -0,0 +1,263 @@ +# CACHE{var} is a fatal error +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND CACHE{var})]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND CACHE{var})]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND CACHE{var} c d)]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND CACHE{var} c d)]]) + +# regular variable, HOST_PATH_SEPARATOR = ';' +set(VCPKG_HOST_PATH_SEPARATOR ";") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND var "a;b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND var "a;b")]]) + +set(var "a;b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var d e)]] + var "a;b;d;e" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var)]] + var "a;b" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var d e)]] + var "d;e;a;b" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var)]] + var "a;b" +) + +set(var "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var d e)]] + var "d;e" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var)]] + var "" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var d e)]] + var "d;e" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var)]] + var "" +) + +unset(var) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var d e)]] + var "d;e" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND var)]] + var "" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var d e)]] + var "d;e" +) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND var)]] + var "" +) + +# regular variable, HOST_PATH_SEPARATOR = ':' +set(VCPKG_HOST_PATH_SEPARATOR ":") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND var "a:b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND var "a:b")]]) + +set(ENV{var} "a:b") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "a:b:d:e" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "a:b" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e:a:b" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "a:b" +) + +set(ENV{var} "") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) + +unset(ENV{var}) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) + +# environment ENV{var}iable, HOST_PATH_SEPARATOR = ';' +set(VCPKG_HOST_PATH_SEPARATOR ";") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND ENV{ENV{var}} "a;b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND ENV{ENV{var}} "a;b")]]) + +set(ENV{ENV{var}} "a;b") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "a;b;d;e" +) +set(ENV{ENV{var}} "a;b") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] + ENV{ENV{var}} "a;b" +) +set(ENV{ENV{var}} "a;b") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e;a;b" +) +set(ENV{ENV{var}} "a;b") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] + ENV{ENV{var}} "a;b" +) + +set(ENV{ENV{var}} "") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +set(ENV{ENV{var}} "") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] + ENV{ENV{var}} "" +) +set(ENV{ENV{var}} "") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +set(ENV{ENV{var}} "") +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{ENV{var}} "" +) + +unset(ENV{ENV{var}}) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +unset(ENV{ENV{var}}) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(APPEND ENV{ENV{var}})]] + ENV{ENV{var}} "" +) +unset(ENV{ENV{var}}) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}} d e)]] + ENV{ENV{var}} "d;e" +) +unset(ENV{ENV{var}}) +unit_test_check_ENV{var}iable_equal( + [[vcpkg_host_path_list(PREPEND ENV{ENV{var}})]] + ENV{ENV{var}} "" +) + +# regular ENV{var}iable, HOST_PATH_SEPARATOR = ':' +set(VCPKG_HOST_PATH_SEPARATOR ":") + +unit_test_ensure_fatal_error([[vcpkg_host_path_list(APPEND ENV{var} "a:b")]]) +unit_test_ensure_fatal_error([[vcpkg_host_path_list(PREPEND ENV{var} "a:b")]]) + +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "a:b:d:e" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "a:b" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e:a:b" +) +set(ENV{var} "a:b") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "a:b" +) + +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +set(ENV{var} "") +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) + +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(APPEND ENV{var})]] + ENV{var} "" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var} d e)]] + ENV{var} "d:e" +) +unset(ENV{var}) +unit_test_check_variable_equal( + [[vcpkg_host_path_list(PREPEND ENV{var})]] + ENV{var} "" +) diff --git a/scripts/test_ports/unit-test-cmake/vcpkg.json b/scripts/test_ports/unit-test-cmake/vcpkg.json index c20cf2c6cb8f41..366d1d7a93fb7c 100644 --- a/scripts/test_ports/unit-test-cmake/vcpkg.json +++ b/scripts/test_ports/unit-test-cmake/vcpkg.json @@ -9,6 +9,9 @@ "minimum-required" ], "features": { + "host-path-list": { + "description": "Test the vcpkg_host_path_list function" + }, "function-arguments": { "description": "Test the z_vcpkg_function_arguments function" }, From bded50145d35742670816d59728908dae7f0fe7e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 27 Sep 2021 13:59:30 -0700 Subject: [PATCH 0637/1858] Add workaround suggested by Robert in #18098 (#20310) --- ports/openal-soft/portfile.cmake | 5 ++++- ports/openal-soft/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openal-soft.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/openal-soft/portfile.cmake b/ports/openal-soft/portfile.cmake index 79ea4a0c7cc51f..30c413ff43df8b 100644 --- a/ports/openal-soft/portfile.cmake +++ b/ports/openal-soft/portfile.cmake @@ -80,7 +80,10 @@ foreach(HEADER al.h alc.h) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined(AL_LIBTYPE_STATIC)" "1" AL_H "${AL_H}") else() - string(REPLACE "defined(AL_LIBTYPE_STATIC)" "0" AL_H "${AL_H}") + # Normally we would say: + # string(REPLACE "defined(AL_LIBTYPE_STATIC)" "0" AL_H "${AL_H}") + # but we are leaving these undefined macros alone in support of + # https://github.com/microsoft/vcpkg/issues/18098 endif() file(WRITE "${CURRENT_PACKAGES_DIR}/include/AL/${HEADER}" "${AL_H}") endforeach() diff --git a/ports/openal-soft/vcpkg.json b/ports/openal-soft/vcpkg.json index c96c68a3c6ea18..8f86e6bd5946ac 100644 --- a/ports/openal-soft/vcpkg.json +++ b/ports/openal-soft/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openal-soft", "version-semver": "1.21.1", - "port-version": 2, + "port-version": 3, "description": "OpenAL Soft is an LGPL-licensed, cross-platform, software implementation of the OpenAL 3D audio API.", "homepage": "https://github.com/kcat/openal-soft", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 1c645daba51957..b126d2bfa66f18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4734,7 +4734,7 @@ }, "openal-soft": { "baseline": "1.21.1", - "port-version": 2 + "port-version": 3 }, "openblas": { "baseline": "0.3.15", diff --git a/versions/o-/openal-soft.json b/versions/o-/openal-soft.json index 9a6e6a3edd9317..fe1afc014d0049 100644 --- a/versions/o-/openal-soft.json +++ b/versions/o-/openal-soft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6672158f9eda4512b07d89ba193c51ef2802641", + "version-semver": "1.21.1", + "port-version": 3 + }, { "git-tree": "9b1e7ccf10631bcb24825e8742bf18de9c561e71", "version-semver": "1.21.1", From 88fc9640a975c27c0cb189b5de9ba148939c2eca Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Tue, 28 Sep 2021 03:12:39 +0300 Subject: [PATCH 0638/1858] [boost] update to 1.77.0 (#19556) --- ports/avro-cpp/vcpkg.json | 2 + ports/boost-accumulators/portfile.cmake | 4 +- ports/boost-accumulators/vcpkg.json | 6 +- ports/boost-algorithm/portfile.cmake | 4 +- ports/boost-algorithm/vcpkg.json | 4 +- ports/boost-align/portfile.cmake | 4 +- ports/boost-align/vcpkg.json | 2 +- ports/boost-any/portfile.cmake | 4 +- ports/boost-any/vcpkg.json | 4 +- ports/boost-array/portfile.cmake | 4 +- ports/boost-array/vcpkg.json | 3 +- ports/boost-asio/portfile.cmake | 4 +- ports/boost-asio/vcpkg.json | 5 +- ports/boost-assert/portfile.cmake | 4 +- ports/boost-assert/vcpkg.json | 2 +- ports/boost-assign/portfile.cmake | 4 +- ports/boost-assign/vcpkg.json | 5 +- ports/boost-atomic/portfile.cmake | 4 +- ports/boost-atomic/vcpkg.json | 8 +- ports/boost-beast/portfile.cmake | 4 +- ports/boost-beast/vcpkg.json | 2 +- ports/boost-bimap/portfile.cmake | 4 +- ports/boost-bimap/vcpkg.json | 4 +- ports/boost-bind/portfile.cmake | 4 +- ports/boost-bind/vcpkg.json | 3 +- ports/boost-build/fix_options.patch | 236 ------- ports/boost-build/portfile.cmake | 8 +- ports/boost-build/vcpkg.json | 2 +- ports/boost-callable-traits/portfile.cmake | 4 +- ports/boost-callable-traits/vcpkg.json | 2 +- ports/boost-chrono/portfile.cmake | 4 +- ports/boost-chrono/vcpkg.json | 10 +- ports/boost-circular-buffer/portfile.cmake | 4 +- ports/boost-circular-buffer/vcpkg.json | 2 +- ports/boost-compatibility/portfile.cmake | 4 +- ports/boost-compatibility/vcpkg.json | 2 +- ports/boost-compute/portfile.cmake | 4 +- ports/boost-compute/vcpkg.json | 3 +- ports/boost-concept-check/portfile.cmake | 4 +- ports/boost-concept-check/vcpkg.json | 2 +- ports/boost-config/portfile.cmake | 4 +- ports/boost-config/vcpkg.json | 2 +- ports/boost-container-hash/portfile.cmake | 4 +- ports/boost-container-hash/vcpkg.json | 2 +- ports/boost-container/portfile.cmake | 4 +- ports/boost-container/vcpkg.json | 9 +- ports/boost-context/portfile.cmake | 10 +- ports/boost-context/vcpkg.json | 12 +- ports/boost-contract/portfile.cmake | 4 +- ports/boost-contract/vcpkg.json | 9 +- ports/boost-conversion/portfile.cmake | 4 +- ports/boost-conversion/vcpkg.json | 3 +- ports/boost-convert/portfile.cmake | 4 +- ports/boost-convert/vcpkg.json | 2 +- ports/boost-core/portfile.cmake | 4 +- ports/boost-core/vcpkg.json | 3 +- ports/boost-coroutine/portfile.cmake | 4 +- ports/boost-coroutine/vcpkg.json | 9 +- ports/boost-coroutine2/portfile.cmake | 4 +- ports/boost-coroutine2/vcpkg.json | 3 +- ports/boost-crc/portfile.cmake | 4 +- ports/boost-crc/vcpkg.json | 2 +- ports/boost-date-time/portfile.cmake | 4 +- ports/boost-date-time/vcpkg.json | 10 +- ports/boost-describe/portfile.cmake | 12 + ports/boost-describe/vcpkg.json | 10 + ports/boost-detail/portfile.cmake | 4 +- ports/boost-detail/vcpkg.json | 5 +- ports/boost-dll/portfile.cmake | 4 +- ports/boost-dll/vcpkg.json | 2 +- ports/boost-dynamic-bitset/portfile.cmake | 4 +- ports/boost-dynamic-bitset/vcpkg.json | 5 +- ports/boost-endian/portfile.cmake | 4 +- ports/boost-endian/vcpkg.json | 2 +- ports/boost-exception/portfile.cmake | 7 +- ports/boost-exception/vcpkg.json | 9 +- ports/boost-fiber/portfile.cmake | 4 +- ports/boost-fiber/vcpkg.json | 9 +- ports/boost-filesystem/portfile.cmake | 4 +- ports/boost-filesystem/vcpkg.json | 11 +- ports/boost-flyweight/portfile.cmake | 4 +- ports/boost-flyweight/vcpkg.json | 6 +- ports/boost-foreach/portfile.cmake | 4 +- ports/boost-foreach/vcpkg.json | 4 +- ports/boost-format/portfile.cmake | 4 +- ports/boost-format/vcpkg.json | 3 +- ports/boost-function-types/portfile.cmake | 4 +- ports/boost-function-types/vcpkg.json | 2 +- ports/boost-function/portfile.cmake | 4 +- ports/boost-function/vcpkg.json | 2 +- ports/boost-functional/portfile.cmake | 4 +- ports/boost-functional/vcpkg.json | 4 +- ports/boost-fusion/portfile.cmake | 4 +- ports/boost-fusion/vcpkg.json | 3 +- ports/boost-geometry/portfile.cmake | 4 +- ports/boost-geometry/vcpkg.json | 4 +- ports/boost-gil/portfile.cmake | 4 +- ports/boost-gil/vcpkg.json | 3 +- ports/boost-graph-parallel/portfile.cmake | 9 +- ports/boost-graph-parallel/vcpkg.json | 27 +- ports/boost-graph/portfile.cmake | 4 +- ports/boost-graph/vcpkg.json | 12 +- ports/boost-hana/portfile.cmake | 4 +- ports/boost-hana/vcpkg.json | 2 +- ports/boost-heap/portfile.cmake | 4 +- ports/boost-heap/vcpkg.json | 2 +- ports/boost-histogram/portfile.cmake | 4 +- ports/boost-histogram/vcpkg.json | 2 +- ports/boost-hof/portfile.cmake | 4 +- ports/boost-hof/vcpkg.json | 2 +- ports/boost-icl/portfile.cmake | 4 +- ports/boost-icl/vcpkg.json | 3 +- ports/boost-integer/portfile.cmake | 4 +- ports/boost-integer/vcpkg.json | 3 +- ports/boost-interprocess/portfile.cmake | 4 +- ports/boost-interprocess/vcpkg.json | 5 +- ports/boost-interval/portfile.cmake | 4 +- ports/boost-interval/vcpkg.json | 2 +- ports/boost-intrusive/portfile.cmake | 4 +- ports/boost-intrusive/vcpkg.json | 2 +- ports/boost-io/portfile.cmake | 4 +- ports/boost-io/vcpkg.json | 2 +- ports/boost-iostreams/CMakeLists.txt | 40 -- ports/boost-iostreams/b2-options.cmake | 30 + ports/boost-iostreams/portfile.cmake | 9 +- ports/boost-iostreams/vcpkg.json | 8 +- ports/boost-iterator/portfile.cmake | 4 +- ports/boost-iterator/vcpkg.json | 2 +- ports/boost-json/001-remove-checks.patch | 30 + ports/boost-json/portfile.cmake | 13 +- ports/boost-json/vcpkg.json | 9 +- ports/boost-lambda/portfile.cmake | 4 +- ports/boost-lambda/vcpkg.json | 3 +- ports/boost-lambda2/portfile.cmake | 12 + ports/boost-lambda2/vcpkg.json | 9 + ports/boost-leaf/portfile.cmake | 4 +- ports/boost-leaf/vcpkg.json | 2 +- ports/boost-lexical-cast/portfile.cmake | 4 +- ports/boost-lexical-cast/vcpkg.json | 3 +- ports/boost-local-function/portfile.cmake | 4 +- ports/boost-local-function/vcpkg.json | 2 +- ports/boost-locale/b2-options.cmake.in | 55 +- ports/boost-locale/portfile.cmake | 4 +- ports/boost-locale/vcpkg.json | 7 +- ports/boost-lockfree/portfile.cmake | 4 +- ports/boost-lockfree/vcpkg.json | 3 +- ports/boost-log/portfile.cmake | 4 +- ports/boost-log/vcpkg.json | 14 +- ports/boost-logic/portfile.cmake | 4 +- ports/boost-logic/vcpkg.json | 3 +- ports/boost-math/001-remove-checks.patch | 23 + ports/boost-math/portfile.cmake | 11 +- ports/boost-math/vcpkg.json | 18 +- ports/boost-metaparse/portfile.cmake | 4 +- ports/boost-metaparse/vcpkg.json | 2 +- .../boost-modular-build-helper/CMakeLists.txt | 67 +- ports/boost-modular-build-helper/Jamroot.jam | 55 +- .../boost-modular-build.cmake | 90 +-- .../user-config.jam | 7 +- ports/boost-modular-build-helper/vcpkg.json | 5 +- ports/boost-move/portfile.cmake | 4 +- ports/boost-move/vcpkg.json | 2 +- ports/boost-mp11/portfile.cmake | 4 +- ports/boost-mp11/vcpkg.json | 2 +- ports/boost-mpi/portfile.cmake | 4 +- ports/boost-mpi/vcpkg.json | 10 +- ports/boost-mpl/portfile.cmake | 4 +- ports/boost-mpl/vcpkg.json | 4 +- ports/boost-msm/portfile.cmake | 4 +- ports/boost-msm/vcpkg.json | 3 +- ports/boost-multi-array/portfile.cmake | 4 +- ports/boost-multi-array/vcpkg.json | 3 +- ports/boost-multi-index/portfile.cmake | 4 +- ports/boost-multi-index/vcpkg.json | 5 +- ports/boost-multiprecision/portfile.cmake | 4 +- ports/boost-multiprecision/vcpkg.json | 8 +- ports/boost-nowide/001-remove-checks.patch | 16 + ports/boost-nowide/b2-options.cmake | 2 +- ports/boost-nowide/portfile.cmake | 12 +- ports/boost-nowide/vcpkg.json | 8 +- ports/boost-numeric-conversion/portfile.cmake | 4 +- ports/boost-numeric-conversion/vcpkg.json | 3 +- ports/boost-odeint/portfile.cmake | 4 +- ports/boost-odeint/vcpkg.json | 7 +- ports/boost-optional/portfile.cmake | 4 +- ports/boost-optional/vcpkg.json | 2 +- ports/boost-outcome/portfile.cmake | 4 +- ports/boost-outcome/vcpkg.json | 2 +- ports/boost-parameter-python/portfile.cmake | 4 +- ports/boost-parameter-python/vcpkg.json | 2 +- ports/boost-parameter/portfile.cmake | 4 +- ports/boost-parameter/vcpkg.json | 2 +- ports/boost-pfr/portfile.cmake | 4 +- ports/boost-pfr/vcpkg.json | 2 +- ports/boost-phoenix/portfile.cmake | 4 +- ports/boost-phoenix/vcpkg.json | 3 +- ports/boost-poly-collection/portfile.cmake | 4 +- ports/boost-poly-collection/vcpkg.json | 3 +- ports/boost-polygon/portfile.cmake | 4 +- ports/boost-polygon/vcpkg.json | 2 +- ports/boost-pool/portfile.cmake | 4 +- ports/boost-pool/vcpkg.json | 3 +- ports/boost-predef/portfile.cmake | 4 +- ports/boost-predef/vcpkg.json | 2 +- ports/boost-preprocessor/portfile.cmake | 4 +- ports/boost-preprocessor/vcpkg.json | 2 +- ports/boost-process/portfile.cmake | 4 +- ports/boost-process/vcpkg.json | 2 +- ports/boost-program-options/portfile.cmake | 4 +- ports/boost-program-options/vcpkg.json | 9 +- .../portfile.cmake | 12 + ports/boost-property-map-parallel/vcpkg.json | 26 + ports/boost-property-map/portfile.cmake | 4 +- ports/boost-property-map/vcpkg.json | 7 +- ports/boost-property-tree/portfile.cmake | 4 +- ports/boost-property-tree/vcpkg.json | 3 +- ports/boost-proto/portfile.cmake | 4 +- ports/boost-proto/vcpkg.json | 3 +- ports/boost-ptr-container/portfile.cmake | 4 +- ports/boost-ptr-container/vcpkg.json | 2 +- ports/boost-python/portfile.cmake | 4 +- ports/boost-python/vcpkg.json | 11 +- ports/boost-qvm/portfile.cmake | 4 +- ports/boost-qvm/vcpkg.json | 2 +- ports/boost-random/portfile.cmake | 4 +- ports/boost-random/vcpkg.json | 9 +- ports/boost-range/portfile.cmake | 4 +- ports/boost-range/vcpkg.json | 3 +- ports/boost-ratio/portfile.cmake | 4 +- ports/boost-ratio/vcpkg.json | 2 +- ports/boost-rational/portfile.cmake | 4 +- ports/boost-rational/vcpkg.json | 3 +- ports/boost-regex/portfile.cmake | 4 +- ports/boost-regex/vcpkg.json | 11 +- ports/boost-safe-numerics/portfile.cmake | 4 +- ports/boost-safe-numerics/vcpkg.json | 2 +- ports/boost-scope-exit/portfile.cmake | 4 +- ports/boost-scope-exit/vcpkg.json | 3 +- ports/boost-serialization/portfile.cmake | 4 +- ports/boost-serialization/vcpkg.json | 8 +- ports/boost-signals2/portfile.cmake | 4 +- ports/boost-signals2/vcpkg.json | 4 +- ports/boost-smart-ptr/portfile.cmake | 4 +- ports/boost-smart-ptr/vcpkg.json | 2 +- ports/boost-sort/portfile.cmake | 4 +- ports/boost-sort/vcpkg.json | 4 +- ports/boost-spirit/portfile.cmake | 4 +- ports/boost-spirit/vcpkg.json | 3 +- ports/boost-stacktrace/portfile.cmake | 4 +- ports/boost-stacktrace/vcpkg.json | 8 +- ports/boost-statechart/portfile.cmake | 4 +- ports/boost-statechart/vcpkg.json | 2 +- ports/boost-static-assert/portfile.cmake | 4 +- ports/boost-static-assert/vcpkg.json | 3 +- ports/boost-static-string/portfile.cmake | 4 +- ports/boost-static-string/vcpkg.json | 2 +- ports/boost-stl-interfaces/portfile.cmake | 4 +- ports/boost-stl-interfaces/vcpkg.json | 2 +- ports/boost-system/portfile.cmake | 4 +- ports/boost-system/vcpkg.json | 8 +- ports/boost-test/portfile.cmake | 4 +- ports/boost-test/vcpkg.json | 8 +- ports/boost-thread/portfile.cmake | 4 +- ports/boost-thread/vcpkg.json | 11 +- ports/boost-throw-exception/portfile.cmake | 4 +- ports/boost-throw-exception/vcpkg.json | 2 +- ports/boost-timer/portfile.cmake | 4 +- ports/boost-timer/vcpkg.json | 8 +- ports/boost-tokenizer/portfile.cmake | 4 +- ports/boost-tokenizer/vcpkg.json | 4 +- ports/boost-tti/portfile.cmake | 4 +- ports/boost-tti/vcpkg.json | 3 +- ports/boost-tuple/portfile.cmake | 4 +- ports/boost-tuple/vcpkg.json | 3 +- ports/boost-type-erasure/portfile.cmake | 4 +- ports/boost-type-erasure/vcpkg.json | 11 +- ports/boost-type-index/portfile.cmake | 4 +- ports/boost-type-index/vcpkg.json | 2 +- ports/boost-type-traits/portfile.cmake | 4 +- ports/boost-type-traits/vcpkg.json | 3 +- ports/boost-typeof/portfile.cmake | 4 +- ports/boost-typeof/vcpkg.json | 2 +- ports/boost-ublas/portfile.cmake | 4 +- ports/boost-ublas/vcpkg.json | 4 +- ports/boost-uninstall/vcpkg.json | 6 +- ports/boost-units/portfile.cmake | 4 +- ports/boost-units/vcpkg.json | 4 +- ports/boost-unordered/portfile.cmake | 4 +- ports/boost-unordered/vcpkg.json | 4 +- ports/boost-utility/portfile.cmake | 4 +- ports/boost-utility/vcpkg.json | 4 +- ports/boost-uuid/portfile.cmake | 4 +- ports/boost-uuid/vcpkg.json | 3 +- ports/boost-variant/portfile.cmake | 4 +- ports/boost-variant/vcpkg.json | 4 +- ports/boost-variant2/portfile.cmake | 4 +- ports/boost-variant2/vcpkg.json | 3 +- .../boost-modular-headers.cmake | 4 +- ports/boost-vcpkg-helpers/vcpkg.json | 5 +- ports/boost-vmd/portfile.cmake | 4 +- ports/boost-vmd/vcpkg.json | 2 +- ports/boost-wave/portfile.cmake | 4 +- ports/boost-wave/vcpkg.json | 10 +- ports/boost-winapi/portfile.cmake | 4 +- ports/boost-winapi/vcpkg.json | 2 +- ports/boost-xpressive/portfile.cmake | 4 +- ports/boost-xpressive/vcpkg.json | 4 +- ports/boost-yap/portfile.cmake | 4 +- ports/boost-yap/vcpkg.json | 2 +- ports/boost/0001-Fix-boost-ICU-support.patch | 166 ----- ports/boost/desktop/user-config.jam | 38 -- ports/boost/portfile.cmake | 1 - ports/boost/uwp/user-config.jam | 23 - ports/boost/vcpkg.json | 20 +- ports/libe57/vcpkg.json | 2 + ports/mpi/vcpkg.json | 3 +- ports/msmpi/vcpkg.json | 4 +- ports/openmvs/fix-build-boost-1_77_0.patch | 19 + ports/openmvs/portfile.cmake | 14 +- ports/openmvs/vcpkg.json | 11 +- ports/wt/0007-boost_1_77_0.patch | 15 + ports/wt/portfile.cmake | 24 +- ports/wt/vcpkg.json | 11 +- scripts/boost/generate-ports.ps1 | 616 ++++++++++-------- scripts/boost/post-build-stubs/context.cmake | 6 - .../boost/post-build-stubs/exception.cmake | 3 - scripts/boost/post-source-stubs/json.cmake | 8 - scripts/boost/post-source-stubs/math.cmake | 6 - scripts/boost/post-source-stubs/nowide.cmake | 7 - scripts/ci.baseline.txt | 1 + versions/a-/avro-cpp.json | 5 + versions/b-/boost-accumulators.json | 5 + versions/b-/boost-algorithm.json | 5 + versions/b-/boost-align.json | 5 + versions/b-/boost-any.json | 5 + versions/b-/boost-array.json | 5 + versions/b-/boost-asio.json | 5 + versions/b-/boost-assert.json | 5 + versions/b-/boost-assign.json | 5 + versions/b-/boost-atomic.json | 5 + versions/b-/boost-beast.json | 5 + versions/b-/boost-bimap.json | 5 + versions/b-/boost-bind.json | 5 + versions/b-/boost-build.json | 5 + versions/b-/boost-callable-traits.json | 5 + versions/b-/boost-chrono.json | 5 + versions/b-/boost-circular-buffer.json | 5 + versions/b-/boost-compatibility.json | 5 + versions/b-/boost-compute.json | 5 + versions/b-/boost-concept-check.json | 5 + versions/b-/boost-config.json | 5 + versions/b-/boost-container-hash.json | 5 + versions/b-/boost-container.json | 5 + versions/b-/boost-context.json | 5 + versions/b-/boost-contract.json | 5 + versions/b-/boost-conversion.json | 5 + versions/b-/boost-convert.json | 5 + versions/b-/boost-core.json | 5 + versions/b-/boost-coroutine.json | 5 + versions/b-/boost-coroutine2.json | 5 + versions/b-/boost-crc.json | 5 + versions/b-/boost-date-time.json | 5 + versions/b-/boost-describe.json | 9 + versions/b-/boost-detail.json | 5 + versions/b-/boost-dll.json | 5 + versions/b-/boost-dynamic-bitset.json | 5 + versions/b-/boost-endian.json | 5 + versions/b-/boost-exception.json | 5 + versions/b-/boost-fiber.json | 5 + versions/b-/boost-filesystem.json | 5 + versions/b-/boost-flyweight.json | 5 + versions/b-/boost-foreach.json | 5 + versions/b-/boost-format.json | 5 + versions/b-/boost-function-types.json | 5 + versions/b-/boost-function.json | 5 + versions/b-/boost-functional.json | 5 + versions/b-/boost-fusion.json | 5 + versions/b-/boost-geometry.json | 5 + versions/b-/boost-gil.json | 5 + versions/b-/boost-graph-parallel.json | 5 + versions/b-/boost-graph.json | 5 + versions/b-/boost-hana.json | 5 + versions/b-/boost-heap.json | 5 + versions/b-/boost-histogram.json | 5 + versions/b-/boost-hof.json | 5 + versions/b-/boost-icl.json | 5 + versions/b-/boost-integer.json | 5 + versions/b-/boost-interprocess.json | 5 + versions/b-/boost-interval.json | 5 + versions/b-/boost-intrusive.json | 5 + versions/b-/boost-io.json | 5 + versions/b-/boost-iostreams.json | 5 + versions/b-/boost-iterator.json | 5 + versions/b-/boost-json.json | 5 + versions/b-/boost-lambda.json | 5 + versions/b-/boost-lambda2.json | 9 + versions/b-/boost-leaf.json | 5 + versions/b-/boost-lexical-cast.json | 5 + versions/b-/boost-local-function.json | 5 + versions/b-/boost-locale.json | 5 + versions/b-/boost-lockfree.json | 5 + versions/b-/boost-log.json | 5 + versions/b-/boost-logic.json | 5 + versions/b-/boost-math.json | 5 + versions/b-/boost-metaparse.json | 5 + versions/b-/boost-modular-build-helper.json | 5 + versions/b-/boost-move.json | 5 + versions/b-/boost-mp11.json | 5 + versions/b-/boost-mpi.json | 5 + versions/b-/boost-mpl.json | 5 + versions/b-/boost-msm.json | 5 + versions/b-/boost-multi-array.json | 5 + versions/b-/boost-multi-index.json | 5 + versions/b-/boost-multiprecision.json | 5 + versions/b-/boost-nowide.json | 5 + versions/b-/boost-numeric-conversion.json | 5 + versions/b-/boost-odeint.json | 5 + versions/b-/boost-optional.json | 5 + versions/b-/boost-outcome.json | 5 + versions/b-/boost-parameter-python.json | 5 + versions/b-/boost-parameter.json | 5 + versions/b-/boost-pfr.json | 5 + versions/b-/boost-phoenix.json | 5 + versions/b-/boost-poly-collection.json | 5 + versions/b-/boost-polygon.json | 5 + versions/b-/boost-pool.json | 5 + versions/b-/boost-predef.json | 5 + versions/b-/boost-preprocessor.json | 5 + versions/b-/boost-process.json | 5 + versions/b-/boost-program-options.json | 5 + versions/b-/boost-property-map-parallel.json | 9 + versions/b-/boost-property-map.json | 5 + versions/b-/boost-property-tree.json | 5 + versions/b-/boost-proto.json | 5 + versions/b-/boost-ptr-container.json | 5 + versions/b-/boost-python.json | 5 + versions/b-/boost-qvm.json | 5 + versions/b-/boost-random.json | 5 + versions/b-/boost-range.json | 5 + versions/b-/boost-ratio.json | 5 + versions/b-/boost-rational.json | 5 + versions/b-/boost-regex.json | 5 + versions/b-/boost-safe-numerics.json | 5 + versions/b-/boost-scope-exit.json | 5 + versions/b-/boost-serialization.json | 5 + versions/b-/boost-signals2.json | 5 + versions/b-/boost-smart-ptr.json | 5 + versions/b-/boost-sort.json | 5 + versions/b-/boost-spirit.json | 5 + versions/b-/boost-stacktrace.json | 5 + versions/b-/boost-statechart.json | 5 + versions/b-/boost-static-assert.json | 5 + versions/b-/boost-static-string.json | 5 + versions/b-/boost-stl-interfaces.json | 5 + versions/b-/boost-system.json | 5 + versions/b-/boost-test.json | 5 + versions/b-/boost-thread.json | 5 + versions/b-/boost-throw-exception.json | 5 + versions/b-/boost-timer.json | 5 + versions/b-/boost-tokenizer.json | 5 + versions/b-/boost-tti.json | 5 + versions/b-/boost-tuple.json | 5 + versions/b-/boost-type-erasure.json | 5 + versions/b-/boost-type-index.json | 5 + versions/b-/boost-type-traits.json | 5 + versions/b-/boost-typeof.json | 5 + versions/b-/boost-ublas.json | 5 + versions/b-/boost-uninstall.json | 5 + versions/b-/boost-units.json | 5 + versions/b-/boost-unordered.json | 5 + versions/b-/boost-utility.json | 5 + versions/b-/boost-uuid.json | 5 + versions/b-/boost-variant.json | 5 + versions/b-/boost-variant2.json | 5 + versions/b-/boost-vcpkg-helpers.json | 5 + versions/b-/boost-vmd.json | 5 + versions/b-/boost-wave.json | 5 + versions/b-/boost-winapi.json | 5 + versions/b-/boost-xpressive.json | 5 + versions/b-/boost-yap.json | 5 + versions/b-/boost.json | 5 + versions/baseline.json | 328 +++++----- versions/l-/libe57.json | 5 + versions/m-/mpi.json | 5 + versions/m-/msmpi.json | 5 + versions/o-/openmvs.json | 5 + versions/w-/wt.json | 5 + 487 files changed, 2351 insertions(+), 1792 deletions(-) delete mode 100644 ports/boost-build/fix_options.patch create mode 100644 ports/boost-describe/portfile.cmake create mode 100644 ports/boost-describe/vcpkg.json delete mode 100644 ports/boost-iostreams/CMakeLists.txt create mode 100644 ports/boost-iostreams/b2-options.cmake create mode 100644 ports/boost-json/001-remove-checks.patch create mode 100644 ports/boost-lambda2/portfile.cmake create mode 100644 ports/boost-lambda2/vcpkg.json create mode 100644 ports/boost-math/001-remove-checks.patch create mode 100644 ports/boost-nowide/001-remove-checks.patch create mode 100644 ports/boost-property-map-parallel/portfile.cmake create mode 100644 ports/boost-property-map-parallel/vcpkg.json delete mode 100644 ports/boost/0001-Fix-boost-ICU-support.patch delete mode 100644 ports/boost/desktop/user-config.jam delete mode 100644 ports/boost/uwp/user-config.jam create mode 100644 ports/openmvs/fix-build-boost-1_77_0.patch create mode 100644 ports/wt/0007-boost_1_77_0.patch delete mode 100644 scripts/boost/post-build-stubs/context.cmake delete mode 100644 scripts/boost/post-build-stubs/exception.cmake delete mode 100644 scripts/boost/post-source-stubs/json.cmake delete mode 100644 scripts/boost/post-source-stubs/math.cmake delete mode 100644 scripts/boost/post-source-stubs/nowide.cmake create mode 100644 versions/b-/boost-describe.json create mode 100644 versions/b-/boost-lambda2.json create mode 100644 versions/b-/boost-property-map-parallel.json diff --git a/ports/avro-cpp/vcpkg.json b/ports/avro-cpp/vcpkg.json index 72cf168bc81c4f..88c00cf79d421b 100644 --- a/ports/avro-cpp/vcpkg.json +++ b/ports/avro-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "avro-cpp", "version-date": "2021-06-01", + "port-version": 1, "description": "Apache Avro is a data serialization system", "homepage": "https://github.com/apache/avro", "supports": "!(windows & static)", @@ -9,6 +10,7 @@ "boost-filesystem", "boost-format", "boost-iostreams", + "boost-math", "boost-program-options", "boost-random", "boost-test", diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake index c89e31181c5280..117343e2c90605 100644 --- a/ports/boost-accumulators/portfile.cmake +++ b/ports/boost-accumulators/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/accumulators - REF boost-1.76.0 - SHA512 51c5a64ec68274c77a674dfa15b106df2a341018498501a882d1fbeddcdee40944422184cf102986ce5c5fb1e7e5bf388566f94893a2bb6da98ec666fa20287d + REF boost-1.77.0 + SHA512 6d742d26ae382a753274d0c2055653d5b6368f939c0ccbd0e79283e993736a5369cdaacac648361730937dab8e5b412f265abf9f99de3c42de60baa34afe7029 HEAD_REF master ) diff --git a/ports/boost-accumulators/vcpkg.json b/ports/boost-accumulators/vcpkg.json index b0d7a0cc1e4e53..204f6cf7e2b3ac 100644 --- a/ports/boost-accumulators/vcpkg.json +++ b/ports/boost-accumulators/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-accumulators", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost accumulators module", "homepage": "https://github.com/boostorg/accumulators", "dependencies": [ @@ -10,13 +10,10 @@ "boost-concept-check", "boost-config", "boost-core", - "boost-detail", "boost-fusion", - "boost-interval", "boost-iterator", "boost-mpl", "boost-numeric-conversion", - "boost-odeint", "boost-parameter", "boost-preprocessor", "boost-range", @@ -27,7 +24,6 @@ "boost-type-traits", "boost-typeof", "boost-ublas", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-algorithm/portfile.cmake b/ports/boost-algorithm/portfile.cmake index 056fdcd511d43a..35a3148e1abfcd 100644 --- a/ports/boost-algorithm/portfile.cmake +++ b/ports/boost-algorithm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/algorithm - REF boost-1.76.0 - SHA512 1a421f88244e07de254ea8f050e74ed0b0de889ea7a39d95daaf1f55ec5455d9dc7bcb3ae55970885dc6cd5ac6b5f9637146420eadcc59a12fc2753c842207c3 + REF boost-1.77.0 + SHA512 1be1d06c3233d2dad2941696ecbbd77ff2d0cb3304e7a9fee4aa59bd8209ca858520d45bc67148e20defe98bf2c49ac79acf39c07bcc2b2262c1a812514d568b HEAD_REF master ) diff --git a/ports/boost-algorithm/vcpkg.json b/ports/boost-algorithm/vcpkg.json index 98aa477b93bf89..42fff1f9f09b2b 100644 --- a/ports/boost-algorithm/vcpkg.json +++ b/ports/boost-algorithm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-algorithm", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost algorithm module", "homepage": "https://github.com/boostorg/algorithm", "dependencies": [ @@ -10,7 +10,6 @@ "boost-concept-check", "boost-config", "boost-core", - "boost-detail", "boost-exception", "boost-function", "boost-iterator", @@ -22,7 +21,6 @@ "boost-tuple", "boost-type-traits", "boost-unordered", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-align/portfile.cmake b/ports/boost-align/portfile.cmake index c19f35cb6fe74c..811ce936c13b8a 100644 --- a/ports/boost-align/portfile.cmake +++ b/ports/boost-align/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/align - REF boost-1.76.0 - SHA512 5b9f646512a79c7848989b5d9c2d1e67b3db86cc751d2e1034969412715c7d27a7558ecfececcad3db3ddb49a9b4ca664c9ae844f3e57b32d443549968e2ac9b + REF boost-1.77.0 + SHA512 786c63da7d5593282356dc0010a63b46b5f50236890228481c9676f543ab2d56cb5418d913bce2daad8c5bbad3feded7068ac2ab6d68481be9c25401b22ff7f6 HEAD_REF master ) diff --git a/ports/boost-align/vcpkg.json b/ports/boost-align/vcpkg.json index 6556e1dafdf306..9c1b7167fbcc4b 100644 --- a/ports/boost-align/vcpkg.json +++ b/ports/boost-align/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-align", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost align module", "homepage": "https://github.com/boostorg/align", "dependencies": [ diff --git a/ports/boost-any/portfile.cmake b/ports/boost-any/portfile.cmake index cbfc500920d099..9719e5136294cf 100644 --- a/ports/boost-any/portfile.cmake +++ b/ports/boost-any/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/any - REF boost-1.76.0 - SHA512 38f0bf6dddcdf5ce5527d068057de1ce9594605d51dde8f1591decb6423a912be2047fd2ed1b77acf42eb22d5e44a29276db9e9a24fad1596c589a58354307ba + REF boost-1.77.0 + SHA512 cfb7987b7dbbc959012786ded23f6241640cc5b308656318e3125d5903af61f3da2dc16a8cfe811b651f65eec0455f75c8cf31426267babd344c500e20869878 HEAD_REF master ) diff --git a/ports/boost-any/vcpkg.json b/ports/boost-any/vcpkg.json index ccddcf0a54d520..3f15578da984c9 100644 --- a/ports/boost-any/vcpkg.json +++ b/ports/boost-any/vcpkg.json @@ -1,16 +1,16 @@ { "name": "boost-any", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost any module", "homepage": "https://github.com/boostorg/any", "dependencies": [ + "boost-assert", "boost-config", "boost-core", "boost-static-assert", "boost-throw-exception", "boost-type-index", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-array/portfile.cmake b/ports/boost-array/portfile.cmake index 9dbcd35278b178..c175b2962c3e28 100644 --- a/ports/boost-array/portfile.cmake +++ b/ports/boost-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/array - REF boost-1.76.0 - SHA512 76109a4c45ba9ec880fd419cb6287ffc7f78b141c3b42f8ac934317093fbb632376381895863fa874187252e3047cd9cf4501f3fef04b559fb90a66e3b6acb50 + REF boost-1.77.0 + SHA512 e34d8e46ccb3d1efad8863a6babe59762c6cd7c5eaf45bd85402a68e445bde3202cd13c86d1ecef62d5b1855b4d32aa5d5bc62010213da38ee69b7c796669a53 HEAD_REF master ) diff --git a/ports/boost-array/vcpkg.json b/ports/boost-array/vcpkg.json index dd907b0d824ab4..c1e222945bae4d 100644 --- a/ports/boost-array/vcpkg.json +++ b/ports/boost-array/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-array", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost array module", "homepage": "https://github.com/boostorg/array", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-detail", "boost-static-assert", "boost-throw-exception", "boost-vcpkg-helpers" diff --git a/ports/boost-asio/portfile.cmake b/ports/boost-asio/portfile.cmake index a2da348041f418..0a56245fb079ff 100644 --- a/ports/boost-asio/portfile.cmake +++ b/ports/boost-asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/asio - REF boost-1.76.0 - SHA512 d9706045510dc65dfb5d84fded39cb7bbbf44d9f1ba079efc3802962f30ba36ceb7b1610d47822348a910bbca857d0fee8ffef767921a9a75ee9565f9eb63a79 + REF boost-1.77.0 + SHA512 b7387f03994ecb22c545ed162c9622676a806cb7434e29303a72ee91e776034626cc125271439e7fa5983c76c06a887472dc3843e2a8ffca3a6ff3caee763641 HEAD_REF master PATCHES windows_alloca_header.patch ) diff --git a/ports/boost-asio/vcpkg.json b/ports/boost-asio/vcpkg.json index 8effa61df868a9..907244a5ff5eef 100644 --- a/ports/boost-asio/vcpkg.json +++ b/ports/boost-asio/vcpkg.json @@ -1,21 +1,22 @@ { "name": "boost-asio", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost asio module", "homepage": "https://github.com/boostorg/asio", "supports": "!emscripten", "dependencies": [ + "boost-align", "boost-array", "boost-assert", "boost-bind", "boost-chrono", "boost-config", + "boost-core", { "name": "boost-coroutine", "platform": "!arm & !uwp & !emscripten" }, "boost-date-time", - "boost-detail", "boost-function", "boost-regex", "boost-smart-ptr", diff --git a/ports/boost-assert/portfile.cmake b/ports/boost-assert/portfile.cmake index b50ec9f1b11da2..e029a48ec5b718 100644 --- a/ports/boost-assert/portfile.cmake +++ b/ports/boost-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assert - REF boost-1.76.0 - SHA512 bcd8d1fea358916d4ac8a707edee13bdc4b269a05f1456c3780fa525a2fe1438e8af1ca8689171da8bb3bb7ea2b02f0ed10ddc1204a5b52a885e2eebd1ba4f23 + REF boost-1.77.0 + SHA512 90116861cd0457ffa61b4b2ebecc978252f74196ad87d1f756702b28b4010fe366b4dd1e6a5b3726c6926b4fb1821d9f997a758fd02f8d3be5a45ef64e104e27 HEAD_REF master ) diff --git a/ports/boost-assert/vcpkg.json b/ports/boost-assert/vcpkg.json index 9e92a39cac3a48..568a16df39ecb2 100644 --- a/ports/boost-assert/vcpkg.json +++ b/ports/boost-assert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-assert", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost assert module", "homepage": "https://github.com/boostorg/assert", "dependencies": [ diff --git a/ports/boost-assign/portfile.cmake b/ports/boost-assign/portfile.cmake index 3628044ae12d88..1e31ee9061c240 100644 --- a/ports/boost-assign/portfile.cmake +++ b/ports/boost-assign/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/assign - REF boost-1.76.0 - SHA512 fce24fed1b909d108176ed9c52e9c8dfd53aa7eab063f99d83bf7b0d37db64494c5d47fe60bcade57d59afb4da53c50c0101c4a14316b043e5a018444ed4e34a + REF boost-1.77.0 + SHA512 5c72f5637f0c456a060a4204533798ceea39f95a7d96e4f9e05cdd25d178244b8a3a596a7387228df5929b1e3141724503b2579db9b546fadbb0e70648fc99e1 HEAD_REF master ) diff --git a/ports/boost-assign/vcpkg.json b/ports/boost-assign/vcpkg.json index 512d9b55aa7412..528dab79dfad9e 100644 --- a/ports/boost-assign/vcpkg.json +++ b/ports/boost-assign/vcpkg.json @@ -1,12 +1,12 @@ { "name": "boost-assign", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost assign module", "homepage": "https://github.com/boostorg/assign", "dependencies": [ "boost-array", "boost-config", - "boost-detail", + "boost-core", "boost-move", "boost-mpl", "boost-preprocessor", @@ -16,7 +16,6 @@ "boost-throw-exception", "boost-tuple", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-atomic/portfile.cmake b/ports/boost-atomic/portfile.cmake index 2c5f291955f93a..331e57ee5d80bc 100644 --- a/ports/boost-atomic/portfile.cmake +++ b/ports/boost-atomic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/atomic - REF boost-1.76.0 - SHA512 8677c5bd03f089b75f8fac891f9d0383510096c64490936b766a94fdbfd984cd550f41e3e7dbed76372ca81ab8264d2d5fc2dcaadb87a52b4ebb7b0aa3b6feeb + REF boost-1.77.0 + SHA512 fb3c0469e75eda40fd0d2a32bdc005fb0645cb52306468681a76c6ba4eaae608a5c4ad72a9363fdee6ecf432759667a850856b54500f5a4577ab34c701cf5c6a HEAD_REF master ) diff --git a/ports/boost-atomic/vcpkg.json b/ports/boost-atomic/vcpkg.json index 4a684f35575602..9eaa56e1b1e92e 100644 --- a/ports/boost-atomic/vcpkg.json +++ b/ports/boost-atomic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-atomic", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost atomic module", "homepage": "https://github.com/boostorg/atomic", "dependencies": [ @@ -20,6 +20,10 @@ "boost-static-assert", "boost-type-traits", "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-beast/portfile.cmake b/ports/boost-beast/portfile.cmake index b4d0f94efa4041..a72efbe96c1ad8 100644 --- a/ports/boost-beast/portfile.cmake +++ b/ports/boost-beast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/beast - REF boost-1.76.0 - SHA512 8fca87bdbd17ba7701fab6527043ff33c15b0c544b62448a2c269e4c0baab51fcedaf7f4bce746eb7a8d9390a37234aa96d0519fba7507d34656f20097a60c9e + REF boost-1.77.0 + SHA512 e4176ff221f99e43c54b39d8e0626931941b13813374a5302dd65797745f740a791c7a22bb713d1af2e7a9a4d0d6100c0aabf4b2af2c0fa1903dc35fb5c3d0d8 HEAD_REF master ) diff --git a/ports/boost-beast/vcpkg.json b/ports/boost-beast/vcpkg.json index 1373359a59f865..919ee0e83bc187 100644 --- a/ports/boost-beast/vcpkg.json +++ b/ports/boost-beast/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-beast", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost beast module", "homepage": "https://github.com/boostorg/beast", "supports": "!emscripten", diff --git a/ports/boost-bimap/portfile.cmake b/ports/boost-bimap/portfile.cmake index cbd7bd71f1ec4a..94b16bc5b174b2 100644 --- a/ports/boost-bimap/portfile.cmake +++ b/ports/boost-bimap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bimap - REF boost-1.76.0 - SHA512 efa156483c4b696bf88e1f752f1810916699254cb22038d7ea2f3399938dcaebf14795572a2a42558bed356e19d0be154443282bdadc20c8235a057ac5a72fb6 + REF boost-1.77.0 + SHA512 bbb6c21d7678f49dcba4ad27d873a02a026751385a0e98633b17651183b2b25c541d18fc6ad703d8b1298137b770bdf4cc46e808c45083650f3c2db2a2d1bb28 HEAD_REF master ) diff --git a/ports/boost-bimap/vcpkg.json b/ports/boost-bimap/vcpkg.json index fc9dcd3c69a6c9..ac133a1e8ab044 100644 --- a/ports/boost-bimap/vcpkg.json +++ b/ports/boost-bimap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-bimap", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost bimap module", "homepage": "https://github.com/boostorg/bimap", "dependencies": [ @@ -8,13 +8,11 @@ "boost-config", "boost-container-hash", "boost-core", - "boost-functional", "boost-iterator", "boost-lambda", "boost-mpl", "boost-multi-index", "boost-preprocessor", - "boost-property-map", "boost-serialization", "boost-static-assert", "boost-throw-exception", diff --git a/ports/boost-bind/portfile.cmake b/ports/boost-bind/portfile.cmake index 9ce296fe9fe9ba..1dd362b89aff5b 100644 --- a/ports/boost-bind/portfile.cmake +++ b/ports/boost-bind/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/bind - REF boost-1.76.0 - SHA512 a2e40c56d5092818bcddd22b90c6fe6705e2d322b9d96e5abb3524fa166e1d7fc6e5a9c98acf14409663a639c77274d12f9e9840eaa4c963b872c7363caa54ba + REF boost-1.77.0 + SHA512 ad765f5ceb327ead0c2858f0c6b3d85c3e6de2a287edecd5be8410ae8a248528c3389f78c0b37efd0eb18e5dc41492eff2b5f939c75aeeacfd1ea3745697eb57 HEAD_REF master ) diff --git a/ports/boost-bind/vcpkg.json b/ports/boost-bind/vcpkg.json index f39026aa03363e..020db9f5fc2171 100644 --- a/ports/boost-bind/vcpkg.json +++ b/ports/boost-bind/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-bind", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost bind module", "homepage": "https://github.com/boostorg/bind", "dependencies": [ "boost-config", "boost-core", - "boost-detail", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-build/fix_options.patch b/ports/boost-build/fix_options.patch deleted file mode 100644 index b63641b9e5b162..00000000000000 --- a/ports/boost-build/fix_options.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam -index bf07a93..cf04eba 100644 ---- a/src/tools/msvc.jam -+++ b/src/tools/msvc.jam -@@ -450,19 +450,19 @@ rule configure-version-specific ( toolset : version : conditions ) - # version 7.* explicitly or if we auto-detected the version ourselves. - if ! [ MATCH ^(6\\.) : $(version) ] - { -- toolset.flags $(toolset).compile CFLAGS $(conditions) : "/Zc:forScope" "/Zc:wchar_t" ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions) : "/Zc:forScope" "/Zc:wchar_t" ; - toolset.flags $(toolset).compile.c++ C++FLAGS $(conditions) : /wd4675 ; - - # Explicitly disable the 'function is deprecated' warning. Some msvc - # versions have a bug, causing them to emit the deprecation warning even - # with /W0. -- toolset.flags $(toolset).compile CFLAGS $(conditions)/off : /wd4996 ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/off : /wd4996 ; - - if [ MATCH "^([78]\\.)" : $(version) ] - { - # 64-bit compatibility warning deprecated since 9.0, see - # http://msdn.microsoft.com/en-us/library/yt4xw8fh.aspx -- toolset.flags $(toolset).compile CFLAGS $(conditions)/all : /Wp64 ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/all : /Wp64 ; - } - } - -@@ -471,17 +471,17 @@ rule configure-version-specific ( toolset : version : conditions ) - # variables and functions that have internal linkage - if ! [ version.version-less [ SPLIT_BY_CHARACTERS [ MATCH "^([0123456789.]+)" : $(version) ] : . ] : 12 ] - { -- toolset.flags $(toolset).compile CFLAGS $(conditions) : "/Zc:inline" ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions) : "/Zc:inline" ; - - # /Gy analog for variables: https://devblogs.microsoft.com/cppblog/introducing-gw-compiler-switch/ -- toolset.flags $(toolset).compile CFLAGS $(conditions)/speed $(conditions)/space : /Gw ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/speed $(conditions)/space : /Gw ; - } - - # 14.0 introduced /Zc:throwingNew opt-in flag that disables a workaround - # for not throwing operator new in VC up to 6.0 - if ! [ version.version-less [ SPLIT_BY_CHARACTERS [ MATCH "^([0123456789.]+)" : $(version) ] : . ] : 14 ] - { -- toolset.flags $(toolset).compile CFLAGS $(conditions) : "/Zc:throwingNew" ; -+ toolset.flags $(toolset).compile C++FLAGS $(conditions) : "/Zc:throwingNew" ; - } - - # -@@ -491,34 +491,34 @@ rule configure-version-specific ( toolset : version : conditions ) - if [ MATCH "^([67])" : $(version) ] - { - # 8.0 deprecates some of the options. -- toolset.flags $(toolset).compile CFLAGS $(conditions)/speed $(conditions)/space : /Ogiy /Gs ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/speed : /Ot ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/space : /Os ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/speed $(conditions)/space : /Ogiy /Gs ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/speed : /Ot ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/space : /Os ; - -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/ : /GB ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/i486 : /G4 ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g5) : /G5 ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g6) : /G6 ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g7) : /G7 ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/ : /GB ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/i486 : /G4 ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g5) : /G5 ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g6) : /G6 ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-i386)/$(.cpu-type-g7) : /G7 ; - - # Improve floating-point accuracy. Otherwise, some of C++ Boost's "math" - # tests will fail. -- toolset.flags $(toolset).compile CFLAGS $(conditions) : /Op ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions) : /Op ; - - # 7.1 and below have single-threaded static RTL. -- toolset.flags $(toolset).compile CFLAGS $(conditions)/off/static/single : /ML ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/on/static/single : /MLd ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/off/static/single : /ML ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/on/static/single : /MLd ; - } - else - { - # 8.0 and above adds some more options. -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-amd64)/ : "/favor:blend" ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-em64t) : "/favor:EM64T" ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-amd64) : "/favor:AMD64" ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-amd64)/ : "/favor:blend" ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-em64t) : "/favor:EM64T" ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/$(.cpu-arch-amd64)/$(.cpu-type-amd64) : "/favor:AMD64" ; - - # 8.0 and above only has multi-threaded static RTL. -- toolset.flags $(toolset).compile CFLAGS $(conditions)/off/static/single : /MT ; -- toolset.flags $(toolset).compile CFLAGS $(conditions)/on/static/single : /MTd ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/off/static/single : /MT ; -+ toolset.flags $(toolset).compile OPTIONS $(conditions)/on/static/single : /MTd ; - - # Specify target machine type so the linker will not need to guess. - toolset.flags $(toolset).link LINKFLAGS $(conditions)/$(.cpu-arch-amd64) : "/MACHINE:X64" ; -@@ -614,7 +614,7 @@ rule compile.c ( targets + : sources * : properties * ) - { - set-setup-command $(targets) : $(properties) ; - C++FLAGS on $(targets[1]) = ; -- get-rspline $(targets) : -TC ; -+ get-rspline $(targets) : -TC CFLAGS ; - compile-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; - } - -@@ -623,7 +623,7 @@ rule compile.c.preprocess ( targets + : sources * : properties * ) - { - set-setup-command $(targets) : $(properties) ; - C++FLAGS on $(targets[1]) = ; -- get-rspline $(targets) : -TC ; -+ get-rspline $(targets) : -TC CFLAGS ; - preprocess-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; - } - -@@ -632,8 +632,8 @@ rule compile.c.pch ( targets + : sources * : properties * ) - { - set-setup-command $(targets) : $(properties) ; - C++FLAGS on $(targets[1]) = ; -- get-rspline $(targets[1]) : -TC ; -- get-rspline $(targets[2]) : -TC ; -+ get-rspline $(targets[1]) : -TC CFLAGS ; -+ get-rspline $(targets[2]) : -TC CFLAGS ; - local pch-source = [ on $(<) return $(PCH_SOURCE) ] ; - if $(pch-source) - { -@@ -716,14 +716,14 @@ actions compile-c-c++-pch-s - rule compile.c++ ( targets + : sources * : properties * ) - { - set-setup-command $(targets) : $(properties) ; -- get-rspline $(targets) : -TP ; -+ get-rspline $(targets) : -TP C++FLAGS ; - compile-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; - } - - rule compile.c++.preprocess ( targets + : sources * : properties * ) - { - set-setup-command $(targets) : $(properties) ; -- get-rspline $(targets) : -TP ; -+ get-rspline $(targets) : -TP C++FLAGS ; - preprocess-c-c++ $(<) : $(>) [ on $(<) return $(PCH_FILE) ] [ on $(<) return $(PCH_HEADER) ] ; - } - -@@ -731,8 +731,8 @@ rule compile.c++.preprocess ( targets + : sources * : properties * ) - rule compile.c++.pch ( targets + : sources * : properties * ) - { - set-setup-command $(targets) : $(properties) ; -- get-rspline $(targets[1]) : -TP ; -- get-rspline $(targets[2]) : -TP ; -+ get-rspline $(targets[1]) : -TP C++FLAGS ; -+ get-rspline $(targets[2]) : -TP C++FLAGS ; - local pch-source = [ on $(<) return $(PCH_SOURCE) ] ; - if $(pch-source) - { -@@ -1691,10 +1691,10 @@ local rule default-path ( version ) - - - --rule get-rspline ( target : lang-opt ) -+rule get-rspline ( target : lang-opt lang-flags ) - { - CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS) -- $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(.nl)-D$(DEFINES) -+ $($(lang-flags)) $(OPTIONS) -c $(.nl)-D$(DEFINES) - $(.nl)\"-I$(INCLUDES:W)\" $(.nl)\"-FI$(FORCE_INCLUDES:W)\" ] ; - } - -@@ -1830,25 +1830,25 @@ local rule register-toolset-really ( ) - # Declare flags for compilation. - # - -- toolset.flags msvc.compile CFLAGS speed : /O2 ; -- toolset.flags msvc.compile CFLAGS space : /O1 ; -+ toolset.flags msvc.compile OPTIONS speed : /O2 ; -+ toolset.flags msvc.compile OPTIONS space : /O1 ; - -- toolset.flags msvc.compile CFLAGS $(.cpu-arch-ia64)/$(.cpu-type-itanium) : /G1 ; -- toolset.flags msvc.compile CFLAGS $(.cpu-arch-ia64)/$(.cpu-type-itanium2) : /G2 ; -+ toolset.flags msvc.compile OPTIONS $(.cpu-arch-ia64)/$(.cpu-type-itanium) : /G1 ; -+ toolset.flags msvc.compile OPTIONS $(.cpu-arch-ia64)/$(.cpu-type-itanium2) : /G2 ; - -- toolset.flags msvc.compile CFLAGS on/object : /Z7 ; -- toolset.flags msvc.compile CFLAGS on/database : /Zi ; -- toolset.flags msvc.compile CFLAGS off : /Od ; -- toolset.flags msvc.compile CFLAGS off : /Ob0 ; -- toolset.flags msvc.compile CFLAGS on : /Ob1 ; -- toolset.flags msvc.compile CFLAGS full : /Ob2 ; -+ toolset.flags msvc.compile OPTIONS on/object : /Z7 ; -+ toolset.flags msvc.compile OPTIONS on/database : /Zi ; -+ toolset.flags msvc.compile OPTIONS off : /Od ; -+ toolset.flags msvc.compile OPTIONS off : /Ob0 ; -+ toolset.flags msvc.compile OPTIONS on : /Ob1 ; -+ toolset.flags msvc.compile OPTIONS full : /Ob2 ; - -- toolset.flags msvc.compile CFLAGS on : /W3 ; -- toolset.flags msvc.compile CFLAGS off : /W0 ; -- toolset.flags msvc.compile CFLAGS all : /W4 ; -- toolset.flags msvc.compile CFLAGS extra : /W4 ; -- toolset.flags msvc.compile CFLAGS pedantic : /W4 ; -- toolset.flags msvc.compile CFLAGS on : /WX ; -+ toolset.flags msvc.compile OPTIONS on : /W3 ; -+ toolset.flags msvc.compile OPTIONS off : /W0 ; -+ toolset.flags msvc.compile OPTIONS all : /W4 ; -+ toolset.flags msvc.compile OPTIONS extra : /W4 ; -+ toolset.flags msvc.compile OPTIONS pedantic : /W4 ; -+ toolset.flags msvc.compile OPTIONS on : /WX ; - - toolset.flags msvc.compile C++FLAGS on/off/off : /EHs ; - toolset.flags msvc.compile C++FLAGS on/off/on : /EHsc ; -@@ -1862,16 +1862,16 @@ local rule register-toolset-really ( ) - # By default 8.0 enables rtti support while prior versions disabled it. We - # simply enable or disable it explicitly so we do not have to depend on this - # default behaviour. -- toolset.flags msvc.compile CFLAGS on : /GR ; -- toolset.flags msvc.compile CFLAGS off : /GR- ; -- toolset.flags msvc.compile CFLAGS off/shared : /MD ; -- toolset.flags msvc.compile CFLAGS on/shared : /MDd ; -+ toolset.flags msvc.compile C++FLAGS on : /GR ; -+ toolset.flags msvc.compile C++FLAGS off : /GR- ; -+ toolset.flags msvc.compile OPTIONS off/shared : /MD ; -+ toolset.flags msvc.compile OPTIONS on/shared : /MDd ; - -- toolset.flags msvc.compile CFLAGS off/static/multi : /MT ; -- toolset.flags msvc.compile CFLAGS on/static/multi : /MTd ; -+ toolset.flags msvc.compile OPTIONS off/static/multi : /MT ; -+ toolset.flags msvc.compile OPTIONS on/static/multi : /MTd ; - -- toolset.flags msvc.compile OPTIONS : ; -- toolset.flags msvc.compile.c++ OPTIONS : ; -+ toolset.flags msvc.compile CFLAGS : ; -+ toolset.flags msvc.compile.c++ C++FLAGS : ; - - toolset.flags msvc.compile PDB_CFLAG on/database : /Fd ; - diff --git a/ports/boost-build/portfile.cmake b/ports/boost-build/portfile.cmake index 9bee6a0b09625b..c0016203b07814 100644 --- a/ports/boost-build/portfile.cmake +++ b/ports/boost-build/portfile.cmake @@ -4,16 +4,14 @@ if(CMAKE_HOST_WIN32 AND VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME return() endif() -set(BOOST_VERSION 1.75.0) +set(BOOST_VERSION 1.77.0) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/build REF boost-${BOOST_VERSION} - SHA512 dc5784cdcc908591a8c8814dac32849fb00b5f5b2d48de963d51a0571fd9f5a0419d6bb569f3375bf8fbfae28d680db4ce869604667b717023e76869836534f4 + SHA512 35352daaa31b54ee0bfce764dda0863931ac0e90aa8e3facde26a7ba472ddd2d799fced7cfcca8fc3ffd7a0a7f7e7d095337ba28f200da10e5187b7ef39bb88b HEAD_REF master - PATCHES - fix_options.patch ) vcpkg_download_distfile(ARCHIVE @@ -25,7 +23,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(BOOSTCPP_ARCHIVE URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/boostcpp.jam" FILENAME "boost-${BOOST_VERSION}-boostcpp.jam" - SHA512 8cf929fa4a602342c859a6bbd5f9dda783ac29431d951bcf6cae4cb14377c1b3aed90bacd902b0f7d1807591cf5e1a244cf8fc3c6cc6e0a4056db145b58f51df + SHA512 0daa0dd315f7e426e7b9ada9cc4dad03da2eb257456e551de3fb3b2a8244f0117ed41d9d1ff77b5a3eee7a3c5fb466d345b9bb2af46004fc630209043d4862e3 ) # https://github.com/boostorg/boost/pull/206 diff --git a/ports/boost-build/vcpkg.json b/ports/boost-build/vcpkg.json index 0abab074fa2417..420e86f76d482f 100644 --- a/ports/boost-build/vcpkg.json +++ b/ports/boost-build/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-build", - "version-string": "1.75.0", + "version-string": "1.77.0", "description": "Boost.Build", "homepage": "https://github.com/boostorg/build", "dependencies": [ diff --git a/ports/boost-callable-traits/portfile.cmake b/ports/boost-callable-traits/portfile.cmake index 80cd42a75da807..923c94793baed9 100644 --- a/ports/boost-callable-traits/portfile.cmake +++ b/ports/boost-callable-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/callable_traits - REF boost-1.76.0 - SHA512 9ccc62f33001179b9ab6576cc6ac9a3e1a8117a557fbdd65c7eec0b522aa1b7e5e4f31601205819d1e3507afa4e327cfd56d58589974404c8f9c14f970bad79f + REF boost-1.77.0 + SHA512 ad0e266c219dba57048b4f3010a5740c7b6f914564123ba73c64b89952a2edf5b7e275d2bc4c8c456a7bc54abb736dc05ab4bc95b644f5ea724160671ebd95cf HEAD_REF master ) diff --git a/ports/boost-callable-traits/vcpkg.json b/ports/boost-callable-traits/vcpkg.json index 83bdb17a423aeb..9467c92e1f4a01 100644 --- a/ports/boost-callable-traits/vcpkg.json +++ b/ports/boost-callable-traits/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-callable-traits", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost callable_traits module", "homepage": "https://github.com/boostorg/callable_traits", "dependencies": [ diff --git a/ports/boost-chrono/portfile.cmake b/ports/boost-chrono/portfile.cmake index a02bebd10822eb..9253abf4e2a2a5 100644 --- a/ports/boost-chrono/portfile.cmake +++ b/ports/boost-chrono/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/chrono - REF boost-1.76.0 - SHA512 ebfea42589e69152256fb175175d753fbb86f96d988fd2678e0df82d6bf7c2e226c8223280ab044cbb1533a690692e23134ee09f665db38a5d1a7e10dd79da22 + REF boost-1.77.0 + SHA512 df6f3ebb5995b8cec0d0964625e3fd5c3a139178a6676c27a28163e2c1559fdb2289e05c4f4eaff94ee04dd1a01afbb30d99c1f7a0e09660c9d5bfe7414a4f51 HEAD_REF master ) diff --git a/ports/boost-chrono/vcpkg.json b/ports/boost-chrono/vcpkg.json index 234f656ddfe149..dd8dca5c83cbf2 100644 --- a/ports/boost-chrono/vcpkg.json +++ b/ports/boost-chrono/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-chrono", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost chrono module", "homepage": "https://github.com/boostorg/chrono", "dependencies": [ @@ -10,7 +10,7 @@ "host": true }, "boost-config", - "boost-detail", + "boost-core", "boost-integer", { "name": "boost-modular-build-helper", @@ -27,6 +27,10 @@ "boost-typeof", "boost-utility", "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-circular-buffer/portfile.cmake b/ports/boost-circular-buffer/portfile.cmake index 25afaf23f36b33..09a265da2fcc33 100644 --- a/ports/boost-circular-buffer/portfile.cmake +++ b/ports/boost-circular-buffer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/circular_buffer - REF boost-1.76.0 - SHA512 0e85b0cd8d66552f8cbf2c90dcd3685d4666b2d4608f5352c68e3f1e03e68cdaf368777235b0cc6a17420e07c767c61ca026f753d1d1d6e35c6d7c3a11deac9f + REF boost-1.77.0 + SHA512 ffa84cd072a1ba9d9b88681558f4c9f8e62bf41a3003a68d33e69fe124e428f1f6c46cad6af7907fcefc6caedf548d525ea2b5474981db5e9f58285523ef6fb9 HEAD_REF master ) diff --git a/ports/boost-circular-buffer/vcpkg.json b/ports/boost-circular-buffer/vcpkg.json index 0edf67d872b34c..1959cc56d41cae 100644 --- a/ports/boost-circular-buffer/vcpkg.json +++ b/ports/boost-circular-buffer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-circular-buffer", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost circular_buffer module", "homepage": "https://github.com/boostorg/circular_buffer", "dependencies": [ diff --git a/ports/boost-compatibility/portfile.cmake b/ports/boost-compatibility/portfile.cmake index 562fa62a5871ac..af9f20a0e01b36 100644 --- a/ports/boost-compatibility/portfile.cmake +++ b/ports/boost-compatibility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compatibility - REF boost-1.76.0 - SHA512 ca17b6a6021d7f87692a37aa8e558b76235095f6e7850432ebc3c945afe25c01ce0b7d26e8d239636ff38d2d697ba057b9109f8c06b7d70ae154a4b8223733ce + REF boost-1.77.0 + SHA512 427d8c3f8fad551942b5003aefeea805ffd1a6bea7b6d9ad834e8814474b7168ac9040675c59fa4808d3389ac436a90d508dbbe0576dbb4b4b16bd479dd96538 HEAD_REF master ) diff --git a/ports/boost-compatibility/vcpkg.json b/ports/boost-compatibility/vcpkg.json index cd59ff838f2a04..db5c4ac84e3fb6 100644 --- a/ports/boost-compatibility/vcpkg.json +++ b/ports/boost-compatibility/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compatibility", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost compatibility module", "homepage": "https://github.com/boostorg/compatibility", "dependencies": [ diff --git a/ports/boost-compute/portfile.cmake b/ports/boost-compute/portfile.cmake index 7b85fd92a17a9c..d461a5f9be738d 100644 --- a/ports/boost-compute/portfile.cmake +++ b/ports/boost-compute/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/compute - REF boost-1.76.0 - SHA512 93f20c281e71ba205fdfc458a40f437cec09c2c9593e41ccf59e927b2f9e6c2f31b89389605c5a1f5b4893097928f16ded38b794dccf95adbdfac68f4e016ad9 + REF boost-1.77.0 + SHA512 1ca1ed9fdb87ea5c848bdac6e1a941b85927c31454143d06d98e214469fa1b902f1bc722c0a3e99acdc184b966789cb02d1ad2502aebd83315c3b54959dc79c0 HEAD_REF master ) diff --git a/ports/boost-compute/vcpkg.json b/ports/boost-compute/vcpkg.json index a994479bc81440..72e700266808a1 100644 --- a/ports/boost-compute/vcpkg.json +++ b/ports/boost-compute/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-compute", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost compute module", "homepage": "https://github.com/boostorg/compute", "dependencies": [ @@ -19,7 +19,6 @@ "boost-fusion", "boost-iterator", "boost-lexical-cast", - "boost-math", "boost-mpl", "boost-optional", "boost-preprocessor", diff --git a/ports/boost-concept-check/portfile.cmake b/ports/boost-concept-check/portfile.cmake index 3b1b2373fc5174..87184c7c618894 100644 --- a/ports/boost-concept-check/portfile.cmake +++ b/ports/boost-concept-check/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/concept_check - REF boost-1.76.0 - SHA512 f10bcd81ed88a036078188647a0b8aa2245d0c343fe29d4c13c16fe8dc551d843281bbe1fb903c71026c8183f02f57bbad2cbbf3eb6c3f4f885ec8773afb8bde + REF boost-1.77.0 + SHA512 83963c83de619c7078fd174f7c64b9ab7d4bb831fdfdceb78eae7fd406dc44e0877c1a985e55134026173dee295430f4b223bdd8bbd3bf5c3c48f99d7319090f HEAD_REF master ) diff --git a/ports/boost-concept-check/vcpkg.json b/ports/boost-concept-check/vcpkg.json index 4017b24b9ee32a..b25c16d80b49b7 100644 --- a/ports/boost-concept-check/vcpkg.json +++ b/ports/boost-concept-check/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-concept-check", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost concept_check module", "homepage": "https://github.com/boostorg/concept_check", "dependencies": [ diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 31de221d14d9d3..3576a717b10e7f 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/config - REF boost-1.76.0 - SHA512 cef30b35f4d791c9220aad28b347acb28ed87e58ecf319c9fe7dfdb0c36d8c2a1ba7f996fbf2da201a2c4fae8cf2ca1b45224754482c7ecb074cee382f33e7ab + REF boost-1.77.0 + SHA512 c6df16825b7bb27412667e00b6b6cdecbf56ee0707aa1df3505637c7de5c39c87335fabd7cd4361b29625d71c7664e6af865fc271ad0b3e70cc8872825f6155e HEAD_REF master ) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index dd1e63c10f1274..d8e52641dad4d1 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-config", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "dependencies": [ diff --git a/ports/boost-container-hash/portfile.cmake b/ports/boost-container-hash/portfile.cmake index 7fd29b82f630e8..d8e4da4118ed66 100644 --- a/ports/boost-container-hash/portfile.cmake +++ b/ports/boost-container-hash/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container_hash - REF boost-1.76.0 - SHA512 59dbd3028e65ff5a499ebf316354eb4e46dcefa736d07954b9f99471cf0195b080821180925923814fad50f44e21f93e0a90b2d86ef3a6cf1b7d478a6d1122bf + REF boost-1.77.0 + SHA512 e7963ffdb8ca7a2eb35af104e44975f775c1f71a869835f4aedce2a19c484097dbbe83221f3680c9d9a0288ec35e12983de2abac0334cb3c7d1de429f9edd765 HEAD_REF master ) diff --git a/ports/boost-container-hash/vcpkg.json b/ports/boost-container-hash/vcpkg.json index 48f987d51f8fb8..a422b05355796a 100644 --- a/ports/boost-container-hash/vcpkg.json +++ b/ports/boost-container-hash/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-container-hash", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost container_hash module", "homepage": "https://github.com/boostorg/container_hash", "dependencies": [ diff --git a/ports/boost-container/portfile.cmake b/ports/boost-container/portfile.cmake index 133d7aecdbab2b..b52ba2406f520f 100644 --- a/ports/boost-container/portfile.cmake +++ b/ports/boost-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/container - REF boost-1.76.0 - SHA512 5e73508ea1bb67ccbb83785c1f7db4a92d0cf9435a6383394dd1aecd83f88697a16b054c762bdd4d06c3ec92629d1f4b89cf32d2fafefa0a0702318bc01d5dd4 + REF boost-1.77.0 + SHA512 dec03159614a3d3017b2fae56b3c4ff5d6b3e0396490ea1b1015e54d3be1ec1c2c525ec6f410c2d94575025459d9053b9c29b9aa45d3a7a89656a82240fcfcda HEAD_REF master ) diff --git a/ports/boost-container/vcpkg.json b/ports/boost-container/vcpkg.json index c63d37c106d63f..c5dde650183ed5 100644 --- a/ports/boost-container/vcpkg.json +++ b/ports/boost-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-container", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost container module", "homepage": "https://github.com/boostorg/container", "dependencies": [ @@ -11,7 +11,6 @@ }, "boost-config", "boost-core", - "boost-detail", "boost-intrusive", { "name": "boost-modular-build-helper", @@ -21,6 +20,10 @@ "boost-static-assert", "boost-type-traits", "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-context/portfile.cmake b/ports/boost-context/portfile.cmake index df48741264584c..56ecba686ebe5f 100644 --- a/ports/boost-context/portfile.cmake +++ b/ports/boost-context/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/context - REF boost-1.76.0 - SHA512 f004e38d63b73e96492ab7267a2e4c3b9993eebc7df6e17fbc5daeb4feb002ee8be815ad8db26ec954471678eefd3609d12a81a34adab3115032209002b663eb + REF boost-1.77.0 + SHA512 a65c27fe09bddfc1398331414f88f8fe2606ee147b2db2c5690dad8af860c03c6a4e61ecd750f43243bdcee5e5217cee77d469deb57b9ea0b181161e82b7a5cf HEAD_REF master ) @@ -28,9 +28,3 @@ boost_modular_build( ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) - -# boost-context removed all.hpp, which is used by FindBoost to determine that context is installed -if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp) - file(WRITE ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp - "#error \"#include is no longer supported by boost_context.\"") -endif() diff --git a/ports/boost-context/vcpkg.json b/ports/boost-context/vcpkg.json index 22ccf155d784e9..cd4d54f195abbf 100644 --- a/ports/boost-context/vcpkg.json +++ b/ports/boost-context/vcpkg.json @@ -1,7 +1,6 @@ { "name": "boost-context", - "version": "1.76.0", - "port-version": 1, + "version": "1.77.0", "description": "Boost context module", "homepage": "https://github.com/boostorg/context", "supports": "!uwp & !emscripten", @@ -13,15 +12,18 @@ }, "boost-config", "boost-core", - "boost-detail", { "name": "boost-modular-build-helper", "host": true }, + "boost-mp11", "boost-pool", "boost-predef", "boost-smart-ptr", - "boost-thread", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-contract/portfile.cmake b/ports/boost-contract/portfile.cmake index 2317a74e0a88d2..3ade7be44a9ea8 100644 --- a/ports/boost-contract/portfile.cmake +++ b/ports/boost-contract/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/contract - REF boost-1.76.0 - SHA512 964290bd77ca345330e50ee76af6e976aba2190bf2186a5376f4fd4b581d2a62f4e5bf6d74938e36f9f06179471ba434721948e1190dd07e41b6b3b0deb9258f + REF boost-1.77.0 + SHA512 f7d26121200a3e3f5f693423b50ae313477749446ba0c89b2e47ce26007a0f7dd636c2ab47a83b120412d9fe09f3b905ca4a4ce93550be1ae4acb9c23f1892de HEAD_REF master ) diff --git a/ports/boost-contract/vcpkg.json b/ports/boost-contract/vcpkg.json index 369eacd3266cb7..8d0fed3e433957 100644 --- a/ports/boost-contract/vcpkg.json +++ b/ports/boost-contract/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-contract", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost contract module", "homepage": "https://github.com/boostorg/contract", "dependencies": [ @@ -12,7 +12,6 @@ }, "boost-config", "boost-core", - "boost-detail", "boost-exception", "boost-function", "boost-function-types", @@ -29,6 +28,10 @@ "boost-type-traits", "boost-typeof", "boost-utility", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-conversion/portfile.cmake b/ports/boost-conversion/portfile.cmake index 1e22924881a47c..fdb6ada69b3e76 100644 --- a/ports/boost-conversion/portfile.cmake +++ b/ports/boost-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/conversion - REF boost-1.76.0 - SHA512 2f14ad44d8fc8645704c1f9aeca7a824747c35422ee795faedc6ae78341d28f38f7100b063107a25fc62cb84a5cdedbe4a6308607168196322cde4abb1453bdd + REF boost-1.77.0 + SHA512 d0c866f7cf01be8bd98903a5ea92f678eb119f767b97caa8a2e5edaafd2cfbe838ee02c50301de0a9cf8082db95e3379f2fb1cd2b7ed835288c89171b2753da2 HEAD_REF master ) diff --git a/ports/boost-conversion/vcpkg.json b/ports/boost-conversion/vcpkg.json index 790eff2c6536bb..1bd0be804435b2 100644 --- a/ports/boost-conversion/vcpkg.json +++ b/ports/boost-conversion/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-conversion", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost conversion module", "homepage": "https://github.com/boostorg/conversion", "dependencies": [ @@ -11,7 +11,6 @@ "boost-throw-exception", "boost-type-traits", "boost-typeof", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-convert/portfile.cmake b/ports/boost-convert/portfile.cmake index 693fca09a64832..3331ec10bedc67 100644 --- a/ports/boost-convert/portfile.cmake +++ b/ports/boost-convert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/convert - REF boost-1.76.0 - SHA512 104a220d275b16654f53edcd7048ef78123b38ac820d7bb3d76a0493fc31714d55706a61d0a1f7097daa5190b27c666c22beb19024bb15c52a365cd0cfcfd603 + REF boost-1.77.0 + SHA512 5c682d0ebe3a23484beca5ae920351e29a8914f0f16bf4296569c03271466d7d2f1818e1674070d41994cf6ef7aa70560883f878c8108873932fdf1a15835f8b HEAD_REF master ) diff --git a/ports/boost-convert/vcpkg.json b/ports/boost-convert/vcpkg.json index 20bf35943bbe40..f771279e7b0ba7 100644 --- a/ports/boost-convert/vcpkg.json +++ b/ports/boost-convert/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-convert", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost convert module", "homepage": "https://github.com/boostorg/convert", "dependencies": [ diff --git a/ports/boost-core/portfile.cmake b/ports/boost-core/portfile.cmake index fa1e14078d150c..2c2ed7653fc73c 100644 --- a/ports/boost-core/portfile.cmake +++ b/ports/boost-core/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/core - REF boost-1.76.0 - SHA512 95fc5db2580ebd4d8de1a377c7b006e3f89e99c3613620334caa2747b82e28356bb8e023a79f53fca9425a6a9aa9af28b53eefc2cb7222f0f5c5447f448c0143 + REF boost-1.77.0 + SHA512 2414c3ad43f7d1a2b6ded729a26825faaf69eb016b831be659f462e0e1f399e1e36a37ef46ea2f270423c409c5c40666b8516f30011b9094d679122da86436e9 HEAD_REF master ) diff --git a/ports/boost-core/vcpkg.json b/ports/boost-core/vcpkg.json index 74767a24ee593b..578f83aaea3a74 100644 --- a/ports/boost-core/vcpkg.json +++ b/ports/boost-core/vcpkg.json @@ -1,9 +1,10 @@ { "name": "boost-core", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost core module", "homepage": "https://github.com/boostorg/core", "dependencies": [ + "boost-assert", "boost-config", "boost-static-assert", "boost-vcpkg-helpers" diff --git a/ports/boost-coroutine/portfile.cmake b/ports/boost-coroutine/portfile.cmake index 6df9c62ce3a974..77e4b8ac4598cc 100644 --- a/ports/boost-coroutine/portfile.cmake +++ b/ports/boost-coroutine/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine - REF boost-1.76.0 - SHA512 9554ef6a3200b7bd79d6ca953af65ae229e2c8649b2f4e67f911d0844924856163e0eb88fdce03e2c1cb120737e1a9f6cb8bf326ae0b44f161aac213b11b1640 + REF boost-1.77.0 + SHA512 f586cc1e96115341b396b4750e1bf99a0f40a353c219bf0d7a1c3926935d632f880394e1b06e39ce53fc416fa71b7850d8ce894880ad66cde8307606eb1dece4 HEAD_REF master ) diff --git a/ports/boost-coroutine/vcpkg.json b/ports/boost-coroutine/vcpkg.json index 9fb993438be750..57f4afa936f43d 100644 --- a/ports/boost-coroutine/vcpkg.json +++ b/ports/boost-coroutine/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost coroutine module", "homepage": "https://github.com/boostorg/coroutine", "supports": "!arm & !uwp & !emscripten", @@ -16,7 +16,6 @@ "platform": "!uwp & !emscripten" }, "boost-core", - "boost-detail", "boost-exception", { "name": "boost-modular-build-helper", @@ -28,6 +27,10 @@ "boost-throw-exception", "boost-type-traits", "boost-utility", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-coroutine2/portfile.cmake b/ports/boost-coroutine2/portfile.cmake index b2d9b451ba8a62..9e32f0e5fc1d39 100644 --- a/ports/boost-coroutine2/portfile.cmake +++ b/ports/boost-coroutine2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/coroutine2 - REF boost-1.76.0 - SHA512 746f03de8f9b2108d95eca2d940462c16660db2021b0612966f0f3e46a5a0d16708a3ef19c605ee56574a5427a93d435597c7dc7a411c2ffbba117afd660b291 + REF boost-1.77.0 + SHA512 6e44ff880f2eca082e9f95bc5ecd79b4e17ddf22351a8d6ec3c20ca4eb967c23581e861d81c5516b8b88a4b6ad854dbb3cfe5af80f892d71eaef11d0a1558bfd HEAD_REF master ) diff --git a/ports/boost-coroutine2/vcpkg.json b/ports/boost-coroutine2/vcpkg.json index ff9ecae6219e3e..5fe146960b888d 100644 --- a/ports/boost-coroutine2/vcpkg.json +++ b/ports/boost-coroutine2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-coroutine2", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost coroutine2 module", "homepage": "https://github.com/boostorg/coroutine2", "supports": "!emscripten", @@ -11,7 +11,6 @@ "name": "boost-context", "platform": "!uwp & !emscripten" }, - "boost-detail", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-crc/portfile.cmake b/ports/boost-crc/portfile.cmake index 1685331f55e4f8..71cf71dd1c1ca8 100644 --- a/ports/boost-crc/portfile.cmake +++ b/ports/boost-crc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/crc - REF boost-1.76.0 - SHA512 714041c7525dff54ca47d61482d691a06fbb8bf65c93cf87a34f522798657d2d4a01633c2d23c9688626b13e37e4f9f18ab66dccf1499518ba9927499f59e8b2 + REF boost-1.77.0 + SHA512 f82a3a89208d10f29eae521eb11ce81316351b4b75f882ce8af4e981966b2798a94ea4825a80b854bef1fcb29bb712f094da7481061f376d9bac593ac2085cf3 HEAD_REF master ) diff --git a/ports/boost-crc/vcpkg.json b/ports/boost-crc/vcpkg.json index e87e147c25eb77..98c8a2e7958837 100644 --- a/ports/boost-crc/vcpkg.json +++ b/ports/boost-crc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-crc", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost crc module", "homepage": "https://github.com/boostorg/crc", "dependencies": [ diff --git a/ports/boost-date-time/portfile.cmake b/ports/boost-date-time/portfile.cmake index 91971f2cc51e57..9e6ebe6ec012b3 100644 --- a/ports/boost-date-time/portfile.cmake +++ b/ports/boost-date-time/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/date_time - REF boost-1.76.0 - SHA512 f3d2f78e595762b9d31241d3df3d89a54520557d9cbea945c85a0604ad4a1499382dcb7e55e2c33e45908cbca71d9eb36c9bf72ce1392b7dc24ee34e3b18ba02 + REF boost-1.77.0 + SHA512 dc560858d38bae7be8fe70ced75f26fbb59b9b8f32ae5ae88cae9a6246db3f20ff3ab9d6b6e03d54ae4e93477801045891e6314d1bcca55ce97626da3c75191d HEAD_REF master ) diff --git a/ports/boost-date-time/vcpkg.json b/ports/boost-date-time/vcpkg.json index 36be9680caa6e8..d195fda68d76a0 100644 --- a/ports/boost-date-time/vcpkg.json +++ b/ports/boost-date-time/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-date-time", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost date_time module", "homepage": "https://github.com/boostorg/date_time", "dependencies": [ @@ -12,10 +12,8 @@ }, "boost-config", "boost-core", - "boost-detail", "boost-io", "boost-lexical-cast", - "boost-math", { "name": "boost-modular-build-helper", "host": true @@ -29,6 +27,10 @@ "boost-type-traits", "boost-utility", "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-describe/portfile.cmake b/ports/boost-describe/portfile.cmake new file mode 100644 index 00000000000000..745fd29833c35c --- /dev/null +++ b/ports/boost-describe/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/describe + REF boost-1.77.0 + SHA512 70b9283fb106ec99fea1cf72400f813abf92b44e74f1bd18411201e96ddd78b0f244bc445bf304a2259da28a2a119d20bc89e50b19852cf2fd8c45d2ba99a302 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-describe/vcpkg.json b/ports/boost-describe/vcpkg.json new file mode 100644 index 00000000000000..4ced74c0e0696c --- /dev/null +++ b/ports/boost-describe/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "boost-describe", + "version": "1.77.0", + "description": "Boost describe module", + "homepage": "https://github.com/boostorg/describe", + "dependencies": [ + "boost-mp11", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-detail/portfile.cmake b/ports/boost-detail/portfile.cmake index eff68f8902aa4f..7383a737410bb7 100644 --- a/ports/boost-detail/portfile.cmake +++ b/ports/boost-detail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/detail - REF boost-1.76.0 - SHA512 c1958a1ef6ab2fd9fbf2a16d6a0a4a8e49237e66b36c1f8f515d4c84386c1e98bac6d519f1395628441b9a7cdf01b479ebd28dd203835992e99f614dee5b609b + REF boost-1.77.0 + SHA512 c65810121889ba39e149b120b69a682f62aadb9a660100bb7009e5f27ad36e645cfa7b0d98a0fbaef12cd3c15738660aa9b9d6ef9cd5e91cb5cddfa3b171fd03 HEAD_REF master ) diff --git a/ports/boost-detail/vcpkg.json b/ports/boost-detail/vcpkg.json index 39db2d8557dcea..a5280c098de151 100644 --- a/ports/boost-detail/vcpkg.json +++ b/ports/boost-detail/vcpkg.json @@ -1,11 +1,14 @@ { "name": "boost-detail", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost detail module", "homepage": "https://github.com/boostorg/detail", "dependencies": [ "boost-config", + "boost-core", "boost-preprocessor", + "boost-static-assert", + "boost-type-traits", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-dll/portfile.cmake b/ports/boost-dll/portfile.cmake index c626a92c5950ef..247ea4b8f5ccdf 100644 --- a/ports/boost-dll/portfile.cmake +++ b/ports/boost-dll/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dll - REF boost-1.76.0 - SHA512 df41f44a89d1f661b87f1863b0dc551a44040ccd002c9eab6728dc4ad4cc789853ab29c04ce6b17f0d94303cbd9f06ba53521c54f7ec614a061e2cb02db1462a + REF boost-1.77.0 + SHA512 051de508ad1a0c635692845732ea12e2b3872599af9fbe70ed0183e8278292d3e9f5920ef851a052ca9ee7c8967c8486d894254b862ec379e36790536bd076dd HEAD_REF master ) diff --git a/ports/boost-dll/vcpkg.json b/ports/boost-dll/vcpkg.json index cbf24031081932..27d027222ee719 100644 --- a/ports/boost-dll/vcpkg.json +++ b/ports/boost-dll/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-dll", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost dll module", "homepage": "https://github.com/boostorg/dll", "dependencies": [ diff --git a/ports/boost-dynamic-bitset/portfile.cmake b/ports/boost-dynamic-bitset/portfile.cmake index 9f02f766e3fbec..a3ebd00693d2e1 100644 --- a/ports/boost-dynamic-bitset/portfile.cmake +++ b/ports/boost-dynamic-bitset/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/dynamic_bitset - REF boost-1.76.0 - SHA512 5ca3153b18b2a57574c158e09af1bc3e79b769f73988de8d16fc16d4fddb375ce9aaebbee3204a8b5afaaafe6ca484d8a2d85162dec6a576c6bc52674c9d4a3f + REF boost-1.77.0 + SHA512 dcabd09d66003a7ff306d26f37399281bb2516021f76a1bc1960ef3bbfcf89767d1638fe69b237108aab165d45887468c5a34bb1016852f7277397ca965b6a3b HEAD_REF master ) diff --git a/ports/boost-dynamic-bitset/vcpkg.json b/ports/boost-dynamic-bitset/vcpkg.json index 46a5834bd4b039..1de96a61d4aa90 100644 --- a/ports/boost-dynamic-bitset/vcpkg.json +++ b/ports/boost-dynamic-bitset/vcpkg.json @@ -1,14 +1,13 @@ { "name": "boost-dynamic-bitset", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost dynamic_bitset module", "homepage": "https://github.com/boostorg/dynamic_bitset", "dependencies": [ "boost-assert", "boost-config", + "boost-container-hash", "boost-core", - "boost-detail", - "boost-functional", "boost-integer", "boost-move", "boost-static-assert", diff --git a/ports/boost-endian/portfile.cmake b/ports/boost-endian/portfile.cmake index b7451f6aa5e2f8..bb3ff853a59f85 100644 --- a/ports/boost-endian/portfile.cmake +++ b/ports/boost-endian/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/endian - REF boost-1.76.0 - SHA512 8075e7127872d134954708287aef372f872937ecec50db91fd78cc9de33056ba732519a8f7f76ce9bbcfbec0894416b3f3738259ba93ad2cc47702e58366516f + REF boost-1.77.0 + SHA512 f7ed33602a5d9860fa460bca51f9576a3d0c90b703b5e833e106ccf7e28b1449e86f230b353823578a669fcd65922d206ba03a390bfed258dd37edd8435736cd HEAD_REF master ) diff --git a/ports/boost-endian/vcpkg.json b/ports/boost-endian/vcpkg.json index 209e7119b5cc62..a759a4a445e4d3 100644 --- a/ports/boost-endian/vcpkg.json +++ b/ports/boost-endian/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-endian", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost endian module", "homepage": "https://github.com/boostorg/endian", "dependencies": [ diff --git a/ports/boost-exception/portfile.cmake b/ports/boost-exception/portfile.cmake index 4414015ea2904f..e5f34243d58313 100644 --- a/ports/boost-exception/portfile.cmake +++ b/ports/boost-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/exception - REF boost-1.76.0 - SHA512 e77b6c6088ad7a5443b635d2336605eb5c04fa97849fae7150df2b2521fe47916bf5c17fead55eefa3aa278eb826ca22058c4145d01e09ccc41c0a7ccf961506 + REF boost-1.77.0 + SHA512 90af6443bed8114466bce41b43c7d1d439f0b62dee4e1609da84f60c41313aa94e4a6d7bf82e448d612e2521450cfd59cb34cf85f5962718ea33aa7027f5c84f HEAD_REF master ) @@ -15,6 +15,3 @@ include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmak boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) - -set(VCPKG_LIBRARY_LINKAGE static) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/ports/boost-exception/vcpkg.json b/ports/boost-exception/vcpkg.json index aadce7d0c7c6f6..bca330a0a5d9b6 100644 --- a/ports/boost-exception/vcpkg.json +++ b/ports/boost-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-exception", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost exception module", "homepage": "https://github.com/boostorg/exception", "dependencies": [ @@ -16,8 +16,13 @@ "host": true }, "boost-smart-ptr", + "boost-throw-exception", "boost-tuple", "boost-type-traits", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-fiber/portfile.cmake b/ports/boost-fiber/portfile.cmake index c9fbc34da7065e..bfde32a75a4941 100644 --- a/ports/boost-fiber/portfile.cmake +++ b/ports/boost-fiber/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fiber - REF boost-1.76.0 - SHA512 b7994427313de7959144b929806a947fae20087c7215df25e2925dbd553e2aa88d8f1c39a70cbbde61f111c005cded7a664961bf633f0251be4b204e42f1fcbb + REF boost-1.77.0 + SHA512 f5ee6acc30902b2e68861a194f478a6a0a9ea8de096465fcb48c27756718fe6493c8c4d8e08b0473edd45162106061de735a95ff8679d54862cc3a62968aaa94 HEAD_REF master ) diff --git a/ports/boost-fiber/vcpkg.json b/ports/boost-fiber/vcpkg.json index 97cace4b1d4093..f7654c22f9e16b 100644 --- a/ports/boost-fiber/vcpkg.json +++ b/ports/boost-fiber/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-fiber", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost fiber module", "homepage": "https://github.com/boostorg/fiber", "supports": "!osx & !uwp & !arm & !emscripten", @@ -17,7 +17,6 @@ "platform": "!uwp & !emscripten" }, "boost-core", - "boost-detail", { "name": "boost-filesystem", "platform": "!uwp" @@ -30,6 +29,10 @@ }, "boost-predef", "boost-smart-ptr", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-filesystem/portfile.cmake b/ports/boost-filesystem/portfile.cmake index 55241314a0567b..0e1a1d02fe3bba 100644 --- a/ports/boost-filesystem/portfile.cmake +++ b/ports/boost-filesystem/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/filesystem - REF boost-1.76.0 - SHA512 1df89b441c2528844218e447e420c7c9aea0d72f8563ff20f86acebbc7d0d69ed9661422b3625e51005b975d73d7fac3efb69692e21ee13dd92fc1855f119088 + REF boost-1.77.0 + SHA512 ce63c951db9052bcc57f453628088791970245313f78af9131908731065b6fc906b885c05fd05bb8b902f52c191766858183f52a6954afe3cd4062c51b0592fd HEAD_REF master ) diff --git a/ports/boost-filesystem/vcpkg.json b/ports/boost-filesystem/vcpkg.json index d5f6438d160daa..9218ed31c7f174 100644 --- a/ports/boost-filesystem/vcpkg.json +++ b/ports/boost-filesystem/vcpkg.json @@ -1,19 +1,20 @@ { "name": "boost-filesystem", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost filesystem module", "homepage": "https://github.com/boostorg/filesystem", "supports": "!uwp", "dependencies": [ "boost-assert", + "boost-atomic", { "name": "boost-build", "host": true }, "boost-config", + "boost-container-hash", "boost-core", "boost-detail", - "boost-functional", "boost-io", "boost-iterator", { @@ -25,6 +26,10 @@ "boost-system", "boost-type-traits", "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-flyweight/portfile.cmake b/ports/boost-flyweight/portfile.cmake index 9d14c96eee7fd5..64f9ed3f80e596 100644 --- a/ports/boost-flyweight/portfile.cmake +++ b/ports/boost-flyweight/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/flyweight - REF boost-1.76.0 - SHA512 f772c0e7c3efd66c191383c6490ace32294b34f67af569c885abb375c2afdbfeb64de810b50096a902d90bc9f05bae19323a8ec9546f0cc3b9021cdbc497e97a + REF boost-1.77.0 + SHA512 6175d43913ec8e9b96042dbc3babe4ab565bee97a3e87dc08282e624861f54b959dda61e73166f3b2d3aadec50c7cc100b3d32fa777083e90692cdcf89ef9fb9 HEAD_REF master ) diff --git a/ports/boost-flyweight/vcpkg.json b/ports/boost-flyweight/vcpkg.json index 39b9f8965d383b..9654c5c6b23e4f 100644 --- a/ports/boost-flyweight/vcpkg.json +++ b/ports/boost-flyweight/vcpkg.json @@ -1,23 +1,23 @@ { "name": "boost-flyweight", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost flyweight module", "homepage": "https://github.com/boostorg/flyweight", "dependencies": [ "boost-assert", "boost-config", + "boost-container-hash", "boost-core", "boost-detail", - "boost-functional", "boost-interprocess", "boost-mpl", "boost-multi-index", "boost-parameter", "boost-preprocessor", "boost-serialization", + "boost-smart-ptr", "boost-throw-exception", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-foreach/portfile.cmake b/ports/boost-foreach/portfile.cmake index 1c2ded7100758c..f16a626a9a7729 100644 --- a/ports/boost-foreach/portfile.cmake +++ b/ports/boost-foreach/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/foreach - REF boost-1.76.0 - SHA512 b2d82918147aa9e22fba6ad798479fc4fca6a437a73c005cde715c5d19adf7320f986637a270742783d0d40bcadb11ae1cc7abbec4358363496d08b8c8d908e0 + REF boost-1.77.0 + SHA512 45a4bfb69ea3524c69de90e1b3495d1a5972110dec37f3d8fd623cb223484b076f54a1d6c4245925722b8c263077c6e461b16b8c53d2d264e01386722f502c83 HEAD_REF master ) diff --git a/ports/boost-foreach/vcpkg.json b/ports/boost-foreach/vcpkg.json index 2f117a39234b5b..5304250e401477 100644 --- a/ports/boost-foreach/vcpkg.json +++ b/ports/boost-foreach/vcpkg.json @@ -1,17 +1,15 @@ { "name": "boost-foreach", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost foreach module", "homepage": "https://github.com/boostorg/foreach", "dependencies": [ "boost-config", "boost-core", - "boost-detail", "boost-iterator", "boost-mpl", "boost-range", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-format/portfile.cmake b/ports/boost-format/portfile.cmake index 33456281ba9e64..b2c0651aef1c7b 100644 --- a/ports/boost-format/portfile.cmake +++ b/ports/boost-format/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/format - REF boost-1.76.0 - SHA512 7f988f0a3bf2e483d09edc7eb698128286b5c19bb9c4e39e9947ec4d1457b5c3d0b6d7b6f656dd9a2f96e4d372745d62843cd2836b12b96624059576c1905e3b + REF boost-1.77.0 + SHA512 b83dd71f3b76773f852b5f680c5cdc62105b616b6343e87320eea718f13932ba4098f47b17a67f096855cbb0a717b01552c292c49397a093b3bacb009a48e675 HEAD_REF master ) diff --git a/ports/boost-format/vcpkg.json b/ports/boost-format/vcpkg.json index e824cf9d2ba28c..c383b31c9abf64 100644 --- a/ports/boost-format/vcpkg.json +++ b/ports/boost-format/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-format", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost format module", "homepage": "https://github.com/boostorg/format", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-detail", "boost-optional", "boost-smart-ptr", "boost-throw-exception", diff --git a/ports/boost-function-types/portfile.cmake b/ports/boost-function-types/portfile.cmake index c0486271721c1d..a017e85c88b830 100644 --- a/ports/boost-function-types/portfile.cmake +++ b/ports/boost-function-types/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function_types - REF boost-1.76.0 - SHA512 d95ffacc507baf0bedb495f1ea7e0639a19db45b1d55f212dee1eea1e0a9de932e4b74da623200666eef5ead3aea60b66bf7f73cda845b95e54d26714dcdc2e6 + REF boost-1.77.0 + SHA512 7a530e9505daf5c67c14a01476c0317f3f85b9976082eb02a90cc79fc7c1b9a26d9d23740c1324e4df00cf4e85b1e1b2a2a9638eee74f85193ae3b3bfb936f92 HEAD_REF master ) diff --git a/ports/boost-function-types/vcpkg.json b/ports/boost-function-types/vcpkg.json index 539544f2f816ff..8f49bf9df71c7d 100644 --- a/ports/boost-function-types/vcpkg.json +++ b/ports/boost-function-types/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function-types", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost function_types module", "homepage": "https://github.com/boostorg/function_types", "dependencies": [ diff --git a/ports/boost-function/portfile.cmake b/ports/boost-function/portfile.cmake index afce6022126d4d..d86bc5aea726be 100644 --- a/ports/boost-function/portfile.cmake +++ b/ports/boost-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/function - REF boost-1.76.0 - SHA512 d8ad636b47fc77208b3b438494c8bfc286938fd310e91adb9a55a099b552f70a86dfde263fcf100c77fe43b300050dd19c289802366beaa9bd36f38a8539b34e + REF boost-1.77.0 + SHA512 637f6d436614a805bb7d8e5dac0fc154896f4e77a51e1bf2d4509779bc412eaff1756dedcc9937490ca21d5bc15c8df6d911cfe9eebce51f80b5ec42a85d4155 HEAD_REF master ) diff --git a/ports/boost-function/vcpkg.json b/ports/boost-function/vcpkg.json index 4d760713048b5b..00181a35f653db 100644 --- a/ports/boost-function/vcpkg.json +++ b/ports/boost-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-function", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost function module", "homepage": "https://github.com/boostorg/function", "dependencies": [ diff --git a/ports/boost-functional/portfile.cmake b/ports/boost-functional/portfile.cmake index dba5df091fbffd..844ccd4fff26db 100644 --- a/ports/boost-functional/portfile.cmake +++ b/ports/boost-functional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/functional - REF boost-1.76.0 - SHA512 9b63cdbba4a997c04a887775dd4d351eb3fce55ebc6f620865f88f696d969cc56d47675c21ed7a976f19b64eee4875b0e47dd0949e56a576f19fb1a6c59fe31a + REF boost-1.77.0 + SHA512 0b0d675482ccaa0ca2eff5c2a9d4ffe4ec2374320a8a0766e791b57eb16be661422727c5d55f3bce2113d6410e07b05b29369e1ed551545e9ad427b92fd44c83 HEAD_REF master ) diff --git a/ports/boost-functional/vcpkg.json b/ports/boost-functional/vcpkg.json index df76a7e8763af7..a00b0dc30355e2 100644 --- a/ports/boost-functional/vcpkg.json +++ b/ports/boost-functional/vcpkg.json @@ -1,11 +1,13 @@ { "name": "boost-functional", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost functional module", "homepage": "https://github.com/boostorg/functional", "dependencies": [ "boost-config", "boost-core", + "boost-function", + "boost-function-types", "boost-mpl", "boost-preprocessor", "boost-type-traits", diff --git a/ports/boost-fusion/portfile.cmake b/ports/boost-fusion/portfile.cmake index 707ca68e867574..bcbbb77464a9d1 100644 --- a/ports/boost-fusion/portfile.cmake +++ b/ports/boost-fusion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/fusion - REF boost-1.76.0 - SHA512 4e8244962d5f165de9953f7669248002d36c82c213ae3e6374c2b997a3a39f151cf1bee2a5e5e45ae06f9ee7eb0322aeeb0ef7e4215d0829e9aa94f9000ee4b9 + REF boost-1.77.0 + SHA512 c8ff639af2fe04a9a97d087ffdb023ca5530b6de0228f8f87150e6c18100aac6b500698fdfb2a431688be351b7d10e09f58006c9bf84660efe02fdd0c969446c HEAD_REF master ) diff --git a/ports/boost-fusion/vcpkg.json b/ports/boost-fusion/vcpkg.json index c32b2d333df5fb..3b28a6b665ea7d 100644 --- a/ports/boost-fusion/vcpkg.json +++ b/ports/boost-fusion/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-fusion", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost fusion module", "homepage": "https://github.com/boostorg/fusion", "dependencies": [ "boost-config", "boost-container-hash", "boost-core", - "boost-detail", "boost-function-types", "boost-mpl", "boost-preprocessor", diff --git a/ports/boost-geometry/portfile.cmake b/ports/boost-geometry/portfile.cmake index 0bba9bc932b396..9530fbff3df15e 100644 --- a/ports/boost-geometry/portfile.cmake +++ b/ports/boost-geometry/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/geometry - REF boost-1.76.0 - SHA512 2ae1af6337cbb820cef2c34c24b55fb032e4b57ead2a5fc5ee041a083f08e1c35c873e94a135d1c990809e1f160d19aedb31d8a1715f2c211361279fd9707236 + REF boost-1.77.0 + SHA512 a5c6b1051bba1ec60ab5ad99421892ad868f9d31ac1d8da5a7bb995bd4ad27ec9e20daf2ad5646e48badb33e8b14c8ebb9343923b6ff7f725347c222e797cb67 HEAD_REF master ) diff --git a/ports/boost-geometry/vcpkg.json b/ports/boost-geometry/vcpkg.json index 573f8e2ded62b8..c1d574a84ac841 100644 --- a/ports/boost-geometry/vcpkg.json +++ b/ports/boost-geometry/vcpkg.json @@ -1,10 +1,11 @@ { "name": "boost-geometry", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost geometry module", "homepage": "https://github.com/boostorg/geometry", "dependencies": [ "boost-algorithm", + "boost-any", "boost-array", "boost-assert", "boost-concept-check", @@ -35,6 +36,7 @@ "boost-type-traits", "boost-utility", "boost-variant", + "boost-variant2", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-gil/portfile.cmake b/ports/boost-gil/portfile.cmake index ac480b26286ccf..b6dae42551f2e7 100644 --- a/ports/boost-gil/portfile.cmake +++ b/ports/boost-gil/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/gil - REF boost-1.76.0 - SHA512 ba3504fb8af75406c1e41d5f17fe8a31629949902cee75719890250bdbe45ab170d36e66f76e20dfe8612fb1888f152158bc21f4488e85a5a25ebc3aad18dd4d + REF boost-1.77.0 + SHA512 a779a3a471509f0a5cbb9048ac4345bcde875cab1afb540bc4b0d051367b3bbd4eb41ebc2d0e50cc4dda9c7775e7b753cb3dd582ae6fe938ae94a71187de4089 HEAD_REF master ) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 402b9e0fdd3188..2f3d1c8e81cea5 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-gil", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "dependencies": [ @@ -17,7 +17,6 @@ "boost-mp11", "boost-numeric-conversion", "boost-preprocessor", - "boost-utility", "boost-variant2", "boost-vcpkg-helpers" ] diff --git a/ports/boost-graph-parallel/portfile.cmake b/ports/boost-graph-parallel/portfile.cmake index 03830932976c98..b14dceb5008faf 100644 --- a/ports/boost-graph-parallel/portfile.cmake +++ b/ports/boost-graph-parallel/portfile.cmake @@ -3,10 +3,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph_parallel - REF boost-1.76.0 - SHA512 6328aa909cb611728e10cb23f666b68ce11d2a79130946e60da3ce664c5aa71da43e05269720455647f0b52f4b4d7e941ea1cfd1e203bf42a494a44f770185c2 + REF boost-1.77.0 + SHA512 2236b4ad0eae70c6dba7814003cb6e37505a09b29f26e2558cc6784d01b37a2e715acac0fdcacf553b94328fa6495fdcacabd9e7d00068ce4baccd29060faca1 HEAD_REF master ) +if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) + message(FATAL_ERROR "boost-graph-parallel requires a newer version of vcpkg in order to build.") +endif() +include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) +boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-graph-parallel/vcpkg.json b/ports/boost-graph-parallel/vcpkg.json index 7fbb59aa391fa4..436b280efcea2b 100644 --- a/ports/boost-graph-parallel/vcpkg.json +++ b/ports/boost-graph-parallel/vcpkg.json @@ -1,13 +1,20 @@ { "name": "boost-graph-parallel", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost graph_parallel module", "homepage": "https://github.com/boostorg/graph_parallel", + "supports": "!uwp", "dependencies": [ + "boost-algorithm", "boost-assert", + { + "name": "boost-build", + "host": true + }, "boost-concept-check", "boost-config", "boost-container-hash", + "boost-core", "boost-detail", "boost-dynamic-bitset", { @@ -19,18 +26,30 @@ "boost-graph", "boost-iterator", "boost-lexical-cast", - "boost-math", + { + "name": "boost-modular-build-helper", + "host": true + }, + { + "name": "boost-mpi", + "platform": "!uwp" + }, "boost-mpl", "boost-optional", "boost-property-map", + "boost-property-map-parallel", "boost-random", "boost-serialization", "boost-smart-ptr", "boost-static-assert", "boost-tuple", "boost-type-traits", - "boost-utility", "boost-variant", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + "mpi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-graph/portfile.cmake b/ports/boost-graph/portfile.cmake index bff59f5c57ce0b..61bf8a3b91c72e 100644 --- a/ports/boost-graph/portfile.cmake +++ b/ports/boost-graph/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/graph - REF boost-1.76.0 - SHA512 4a5699193adea6ad2df7c1fc9152be58a1234e79fad03a92dd7eca32cac41d2295b1b529b876b7d179b21097baadd8663e68a7d237abcf4b255772ed18f42a1a + REF boost-1.77.0 + SHA512 e7b318d18ec8586578d20398de862c852157f272bcc397b92a8808eb931aa1ca472df26972b052c123e3bed0213d41ad670bdc63621c6d5ef26495b66378bc76 HEAD_REF master ) diff --git a/ports/boost-graph/vcpkg.json b/ports/boost-graph/vcpkg.json index eb3e7e79fd24e0..b4a2db93bf99fc 100644 --- a/ports/boost-graph/vcpkg.json +++ b/ports/boost-graph/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-graph", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost graph module", "homepage": "https://github.com/boostorg/graph", "dependencies": [ @@ -45,10 +45,6 @@ "boost-smart-ptr", "boost-spirit", "boost-static-assert", - { - "name": "boost-test", - "platform": "!uwp" - }, "boost-throw-exception", "boost-tti", "boost-tuple", @@ -57,6 +53,10 @@ "boost-unordered", "boost-utility", "boost-vcpkg-helpers", - "boost-xpressive" + "boost-xpressive", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-hana/portfile.cmake b/ports/boost-hana/portfile.cmake index 324cc11bd7fca5..e4e5e22f89acd6 100644 --- a/ports/boost-hana/portfile.cmake +++ b/ports/boost-hana/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hana - REF boost-1.76.0 - SHA512 839eb1684335ae541dd9342fda8ef5df5003b470922abd5fd72c175e03be4f0158d5cb2892bbce071358b641f5591a852c180f81ac3fb9777e2b88dd095491f2 + REF boost-1.77.0 + SHA512 763d772026c9a3ed0e945c92c698f76a8acfb63947bea0520f58040c5461b2c8032fa025fbd93d44b17ea7d83ddd645d84ec1362d7e86b937cbb83e8108536f4 HEAD_REF master ) diff --git a/ports/boost-hana/vcpkg.json b/ports/boost-hana/vcpkg.json index 1a075a79b978eb..de7c4aa378e101 100644 --- a/ports/boost-hana/vcpkg.json +++ b/ports/boost-hana/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hana", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost hana module", "homepage": "https://github.com/boostorg/hana", "dependencies": [ diff --git a/ports/boost-heap/portfile.cmake b/ports/boost-heap/portfile.cmake index 34a53fdf0bf84b..33804f98450c66 100644 --- a/ports/boost-heap/portfile.cmake +++ b/ports/boost-heap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/heap - REF boost-1.76.0 - SHA512 11f16b0a573108d2c2f58ba9669371d2db5e6090f9d50abc367fd295fb5966a985793081e222742305e9cc86d950c8545f1afa0a855d43eab6cabf41a36e9335 + REF boost-1.77.0 + SHA512 73885784757bbec1ec5ac77fad398498f0f80f7d52b69f82b6d0c93d99cec38ec19765e20157fa6fee7e4fec371ce98962589ee2fc42b280dfe831ba56b0afef HEAD_REF master ) diff --git a/ports/boost-heap/vcpkg.json b/ports/boost-heap/vcpkg.json index a59c675fd3709f..6553f69d26d5fe 100644 --- a/ports/boost-heap/vcpkg.json +++ b/ports/boost-heap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-heap", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost heap module", "homepage": "https://github.com/boostorg/heap", "dependencies": [ diff --git a/ports/boost-histogram/portfile.cmake b/ports/boost-histogram/portfile.cmake index 1246b2a273c887..739a20889ee65e 100644 --- a/ports/boost-histogram/portfile.cmake +++ b/ports/boost-histogram/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/histogram - REF boost-1.76.0 - SHA512 0bef1cfbc328f73f14bd364902a157a519343ade5751466db3bfdfc63ab76490a9c7f11f8b6d0e24450646f7c26bb967f93719a0fb49f399de6e71b7a19827ff + REF boost-1.77.0 + SHA512 bb802772651e1e850ffbf385c83685a0f745f4e90a48b18dc80b701c4bd865fe47e167a7a7a2d434d6d07fbde088b2c3344a67a08a1b5a9268b4f68d88256ee7 HEAD_REF master ) diff --git a/ports/boost-histogram/vcpkg.json b/ports/boost-histogram/vcpkg.json index 00e04b7a5d5e02..1bdde815c66753 100644 --- a/ports/boost-histogram/vcpkg.json +++ b/ports/boost-histogram/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-histogram", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost histogram module", "homepage": "https://github.com/boostorg/histogram", "dependencies": [ diff --git a/ports/boost-hof/portfile.cmake b/ports/boost-hof/portfile.cmake index 7f07484da253f8..588a84b02697f1 100644 --- a/ports/boost-hof/portfile.cmake +++ b/ports/boost-hof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/hof - REF boost-1.76.0 - SHA512 40d70bd531c1c69bcefe0105001ff9c423e23029197a60e46c163abf2b66c726e7d8411503c1201946a1d6d0aa8aef5caded9942968b7844023fbe023a1509c8 + REF boost-1.77.0 + SHA512 8cbcc9ff6bf092c5ac90a44304a7e5eb2e969ad5d14d6913549941e941fe8bf1d2cabadfd6b4808fa494306eb53e9d1a5e6a9c7efa28db15b9844e87713e3cd6 HEAD_REF master ) diff --git a/ports/boost-hof/vcpkg.json b/ports/boost-hof/vcpkg.json index 3695f5ac94f79c..065612d9399dbf 100644 --- a/ports/boost-hof/vcpkg.json +++ b/ports/boost-hof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-hof", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost hof module", "homepage": "https://github.com/boostorg/hof", "dependencies": [ diff --git a/ports/boost-icl/portfile.cmake b/ports/boost-icl/portfile.cmake index ce5ffd240124a1..a50473f909c8f8 100644 --- a/ports/boost-icl/portfile.cmake +++ b/ports/boost-icl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/icl - REF boost-1.76.0 - SHA512 e8561b8217cc8048b8bcaed49f827ec26ab6f0169050d299a5d85bd87bc2fcbc6cf9a078ff9de2751f8a419e9a1556f93b70742cec6bea2e88a353ce17db5e12 + REF boost-1.77.0 + SHA512 680119595e9743b70a0444ee65cace053269d6c04133c1a59e82cf2e41f7e73b4aab160a232902cbbc5c2d5f7f6633c1f00e1564c8c62b95beafd247ff482399 HEAD_REF master ) diff --git a/ports/boost-icl/vcpkg.json b/ports/boost-icl/vcpkg.json index 69d0c261f6d3dc..8d4cdc50cad90f 100644 --- a/ports/boost-icl/vcpkg.json +++ b/ports/boost-icl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-icl", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost icl module", "homepage": "https://github.com/boostorg/icl", "dependencies": [ @@ -8,6 +8,7 @@ "boost-concept-check", "boost-config", "boost-container", + "boost-core", "boost-date-time", "boost-detail", "boost-iterator", diff --git a/ports/boost-integer/portfile.cmake b/ports/boost-integer/portfile.cmake index 618bafcf9e5a24..e5d3e499e7dbb5 100644 --- a/ports/boost-integer/portfile.cmake +++ b/ports/boost-integer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/integer - REF boost-1.76.0 - SHA512 d0df93ba10d4c6004c4b23aca512e3346c40cf6684d53059090b79dfcc633e89449beeae3b2f8f4e0c721076b55f92159dd5c6a7665405e426c66251ea2913a8 + REF boost-1.77.0 + SHA512 31a254a1ae2ea201b6e202c5f4c47291915a6fe76c947bb1fb254dd065b47beaf97ef54cec6bb29058c671b63d240a3db268e03bb90b133d375eb0606421106e HEAD_REF master ) diff --git a/ports/boost-integer/vcpkg.json b/ports/boost-integer/vcpkg.json index 5f6bc4df062fb9..d1b382d1987db7 100644 --- a/ports/boost-integer/vcpkg.json +++ b/ports/boost-integer/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-integer", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost integer module", "homepage": "https://github.com/boostorg/integer", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-detail", "boost-static-assert", "boost-throw-exception", "boost-vcpkg-helpers" diff --git a/ports/boost-interprocess/portfile.cmake b/ports/boost-interprocess/portfile.cmake index f4f402123ab593..431b05bd177b19 100644 --- a/ports/boost-interprocess/portfile.cmake +++ b/ports/boost-interprocess/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interprocess - REF boost-1.76.0 - SHA512 853cb0d6a51d42223d2c242d03b339f723e18c54c7a1f4e2be841a85a816ebc1524f5b9b90441c054072d5a408a724ee8dbeac22997ef5dfb3cf78c87c2acf71 + REF boost-1.77.0 + SHA512 59ccd15b58a8ba343ca4c009a3c6a59a06248d7f9829dbb355320d7184b6476dcbf98d68853fe9d2522e7d8500e39ce36073fde1f17cbab01003abb8e5d2d425 HEAD_REF master ) diff --git a/ports/boost-interprocess/vcpkg.json b/ports/boost-interprocess/vcpkg.json index 765d308702f400..58f1ffb35e0a90 100644 --- a/ports/boost-interprocess/vcpkg.json +++ b/ports/boost-interprocess/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-interprocess", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost interprocess module", "homepage": "https://github.com/boostorg/interprocess", "dependencies": [ @@ -8,15 +8,12 @@ "boost-config", "boost-container", "boost-core", - "boost-date-time", - "boost-detail", "boost-integer", "boost-intrusive", "boost-move", "boost-static-assert", "boost-type-traits", "boost-unordered", - "boost-utility", "boost-vcpkg-helpers", "boost-winapi" ] diff --git a/ports/boost-interval/portfile.cmake b/ports/boost-interval/portfile.cmake index 88017359bff32b..a73a59b11fc6ca 100644 --- a/ports/boost-interval/portfile.cmake +++ b/ports/boost-interval/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/interval - REF boost-1.76.0 - SHA512 72e7712634c314fe51733ecf8dcad5ddf6361cbae9df4471ec632b4b8c126a0965f3ded1a15c9229e2b2c817024cf27ec1febbe641b10fefa2572611ace5f4b7 + REF boost-1.77.0 + SHA512 c1a4780e77063da68c5d08604afd06ed4a17a2149217622037e23d5753a0324073f58e2ab899fffcb2edc8c19e5bf87bae330116407849f9ac90a2c71aeb1b1d HEAD_REF master ) diff --git a/ports/boost-interval/vcpkg.json b/ports/boost-interval/vcpkg.json index fccc60b6609768..5612c624c1f0a5 100644 --- a/ports/boost-interval/vcpkg.json +++ b/ports/boost-interval/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-interval", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost interval module", "homepage": "https://github.com/boostorg/interval", "dependencies": [ diff --git a/ports/boost-intrusive/portfile.cmake b/ports/boost-intrusive/portfile.cmake index 9a7a4f0afe5baa..26d2cfaf58f23b 100644 --- a/ports/boost-intrusive/portfile.cmake +++ b/ports/boost-intrusive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/intrusive - REF boost-1.76.0 - SHA512 272ad56917b9f54d1a4ff578ac690766a692932ca7226a496b9a161d399c9a2e00f762db21924d7de6a446757f1dc5723af5e977a62ccfe408e4422c80cf76a8 + REF boost-1.77.0 + SHA512 9fed1756ca0c4abe1c64bd9794cc5f8548f71fef761d0cef25f6d10ee65d84cdc34216e20e4e29e34d7664a6addac7cbbc4f2f43d5faaa0c0660fad20a594ad3 HEAD_REF master ) diff --git a/ports/boost-intrusive/vcpkg.json b/ports/boost-intrusive/vcpkg.json index 2f043a7b6a6f10..f79993cf332939 100644 --- a/ports/boost-intrusive/vcpkg.json +++ b/ports/boost-intrusive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-intrusive", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost intrusive module", "homepage": "https://github.com/boostorg/intrusive", "dependencies": [ diff --git a/ports/boost-io/portfile.cmake b/ports/boost-io/portfile.cmake index ba9c1f960b6607..1a3fa780b00f7d 100644 --- a/ports/boost-io/portfile.cmake +++ b/ports/boost-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/io - REF boost-1.76.0 - SHA512 e03511225fe52fb18842404f1218bf1cab4b36010d43c65ae8296a6b845e0dfce4b7efdb15c8784b54ad099cfe1ab46b535b628cff193d98662bb268d7db6d41 + REF boost-1.77.0 + SHA512 2806d3a5a66c0ea6b4a70fd19608e666eaa7569600a9cceee75313fa4945f652eac3522c67bc01a09f2ba5832b7f6e799e7f010d117a2112826c23a6753182e4 HEAD_REF master ) diff --git a/ports/boost-io/vcpkg.json b/ports/boost-io/vcpkg.json index 06a482f8d79bc7..08082c3cab3c3a 100644 --- a/ports/boost-io/vcpkg.json +++ b/ports/boost-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-io", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost io module", "homepage": "https://github.com/boostorg/io", "dependencies": [ diff --git a/ports/boost-iostreams/CMakeLists.txt b/ports/boost-iostreams/CMakeLists.txt deleted file mode 100644 index 582377d4cc1052..00000000000000 --- a/ports/boost-iostreams/CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(boost-iostreams) - -if(BUILD_SHARED_LIBS) - add_definitions(-DBOOST_IOSTREAMS_DYN_LINK=1) -endif() -add_definitions( - -DBOOST_ALL_NO_LIB=1 - -DBOOST_IOSTREAMS_USE_DEPRECATED -) -include_directories(include) -file(GLOB SOURCES src/*.cpp) -add_library(boost_iostreams ${SOURCES}) - -if(MSVC) - set_property(TARGET boost_iostreams PROPERTY OUTPUT_NAME_RELEASE boost_iostreams-vc140-mt) - set_property(TARGET boost_iostreams PROPERTY OUTPUT_NAME_DEBUG boost_iostreams-vc140-mt-gd) - - set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_RELEASE boost_iostreams) - set_property(TARGET boost_iostreams PROPERTY RUNTIME_OUTPUT_NAME_DEBUG boost_iostreamsd) -endif() - -find_package(ZLIB REQUIRED) -target_link_libraries(boost_iostreams PRIVATE ZLIB::ZLIB) - -find_package(BZip2 REQUIRED) -target_link_libraries(boost_iostreams PRIVATE BZip2::BZip2) - -find_package(LibLZMA REQUIRED) -target_include_directories(boost_iostreams PRIVATE ${LIBLZMA_INCLUDE_DIRS}) -target_link_libraries(boost_iostreams PRIVATE ${LIBLZMA_LIBRARIES}) - -find_library(ZSTD_LIBRARY NAMES zstdd zstd_staticd zstd zstd_static NAMES_PER_DIR) -target_link_libraries(boost_iostreams PRIVATE ${ZSTD_LIBRARY}) - -install(TARGETS boost_iostreams - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) diff --git a/ports/boost-iostreams/b2-options.cmake b/ports/boost-iostreams/b2-options.cmake new file mode 100644 index 00000000000000..5a10a4ae1ea87a --- /dev/null +++ b/ports/boost-iostreams/b2-options.cmake @@ -0,0 +1,30 @@ +list(APPEND B2_OPTIONS + -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" +) + +if(CMAKE_BUILD_TYPE STREQUAL "Release") + set(lib_suffix lib) +else() + set(lib_suffix debug/lib) + if(WIN32) + set(ZLIB_NAME zlibd) + else() + set(ZLIB_NAME z) + endif() + list(APPEND B2_OPTIONS + -sZLIB_NAME=${ZLIB_NAME} + -sBZIP2_NAME=bz2d + -sLZMA_NAME=lzmad + -sZSTD_BINARY=zstdd + ) +endif() + +list(APPEND B2_OPTIONS + -sZLIB_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" + -sBZIP2_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" + -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" + -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" +) diff --git a/ports/boost-iostreams/portfile.cmake b/ports/boost-iostreams/portfile.cmake index 3c6838f269e7e5..827c7595b3f7f2 100644 --- a/ports/boost-iostreams/portfile.cmake +++ b/ports/boost-iostreams/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iostreams - REF boost-1.76.0 - SHA512 3107bc329adf835b4f8592ec2c8988b377910bc6a724ba2f378dccf9e050da14ef593e5927ad53029e3ed8a51febbbef36af3dc6e889999c4768d8b9c1616393 + REF boost-1.77.0 + SHA512 0b656124e468c50623d4336a9bb357ca211d6d3989e0dc63a9036a2d13bfc352992a8673b7f13debf387b434cdf604c8fbb13ccf5b0b3fd8415b0f839aa4d7cf HEAD_REF master PATCHES Removeseekpos.patch ) @@ -13,6 +13,9 @@ if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-iostreams requires a newer version of vcpkg in order to build.") endif() include(${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake) -boost_modular_build(SOURCE_PATH ${SOURCE_PATH}) +boost_modular_build( + SOURCE_PATH ${SOURCE_PATH} + BOOST_CMAKE_FRAGMENT "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake" +) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 98d632ddbcf228..6077718372062f 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-iostreams", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "supports": "!uwp", @@ -15,6 +15,7 @@ "boost-detail", "boost-function", "boost-integer", + "boost-iterator", { "name": "boost-modular-build-helper", "host": true @@ -22,6 +23,7 @@ "boost-mpl", "boost-numeric-conversion", "boost-preprocessor", + "boost-random", "boost-range", "boost-regex", "boost-smart-ptr", @@ -32,6 +34,10 @@ "boost-vcpkg-helpers", "bzip2", "liblzma", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib", "zstd" ] diff --git a/ports/boost-iterator/portfile.cmake b/ports/boost-iterator/portfile.cmake index f55e4328eef63f..0743a5bbcd9e1c 100644 --- a/ports/boost-iterator/portfile.cmake +++ b/ports/boost-iterator/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/iterator - REF boost-1.76.0 - SHA512 0c890932dc16d87e350f3cfa0942aa92e9a590174d6f330259fe0b1eb2ead9ca3f1d0e0c2bb56e086e5eda9f2122e2eda2b67b52a4df8e614876a64ab014a300 + REF boost-1.77.0 + SHA512 9d374cd58bf3494197235521a16ea63609ebb368a041a039adf833b28050a49614466d667f64f5bf825d32a8aad83ee9859ec5bde188b49ea7e3ee84d2fc6aaf HEAD_REF master ) diff --git a/ports/boost-iterator/vcpkg.json b/ports/boost-iterator/vcpkg.json index df8348d3933b71..f581c57d707771 100644 --- a/ports/boost-iterator/vcpkg.json +++ b/ports/boost-iterator/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-iterator", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost iterator module", "homepage": "https://github.com/boostorg/iterator", "dependencies": [ diff --git a/ports/boost-json/001-remove-checks.patch b/ports/boost-json/001-remove-checks.patch new file mode 100644 index 00000000000000..cea25c9755bff7 --- /dev/null +++ b/ports/boost-json/001-remove-checks.patch @@ -0,0 +1,30 @@ + Jamfile | 2 +- + build/Jamfile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Jamfile b/Jamfile +index b999474..33bc8c9 100644 +--- a/Jamfile ++++ b/Jamfile +@@ -7,7 +7,7 @@ + # Official repository: https://github.com/boostorg/json + # + +-import ../config/checks/config : requires ; ++rule requires ( checks * ) { } + + # These make sure we only build on + # compatible C++11 or later toolchains. +diff --git a/build/Jamfile b/build/Jamfile +index 8425ad3..86d1208 100644 +--- a/build/Jamfile ++++ b/build/Jamfile +@@ -7,7 +7,7 @@ + # Official repository: https://github.com/boostorg/json + # + +-import ../../config/checks/config : requires ; ++rule requires ( checks * ) { } + + project boost/json + : requirements diff --git a/ports/boost-json/portfile.cmake b/ports/boost-json/portfile.cmake index 882daae7d4295a..b9c44818818691 100644 --- a/ports/boost-json/portfile.cmake +++ b/ports/boost-json/portfile.cmake @@ -3,19 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/json - REF boost-1.76.0 - SHA512 86807c1efafc582d41d6d46b0d83f95dcb4eebe071e8b6f25cb6c2706ee4c1f5be6dc70c5a28d76877390654889b3c02a77f655a132f715690f794be0336a00e + REF boost-1.77.0 + SHA512 538d749ae612b3c2e1681978d1aa9c87aed89a48ef7ce3f7cbd3caf72c4f2e2a232b86b7b089d5ddf63acf71e1a82146de370dfa8c8b881cd07db09885f421ce HEAD_REF master + PATCHES 001-remove-checks.patch ) -# see https://github.com/boostorg/json/issues/556 fore more details -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/config" "import config/checks/config") -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n /boost//container/off" "") - -vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config") -vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "..//check_basic_alignas" "..//..//..//check_basic_alignas") - -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-json requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-json/vcpkg.json b/ports/boost-json/vcpkg.json index e58aac4e250785..c3d3dfc6077c5f 100644 --- a/ports/boost-json/vcpkg.json +++ b/ports/boost-json/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-json", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost json module", "homepage": "https://github.com/boostorg/json", "dependencies": [ @@ -17,9 +17,14 @@ "name": "boost-modular-build-helper", "host": true }, + "boost-mp11", "boost-system", "boost-throw-exception", "boost-utility", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-lambda/portfile.cmake b/ports/boost-lambda/portfile.cmake index 8a17fdb72f8b70..f71d998d56c8d2 100644 --- a/ports/boost-lambda/portfile.cmake +++ b/ports/boost-lambda/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lambda - REF boost-1.76.0 - SHA512 3cde15d39798398938a896b9bba624ff78ca3eb22ae04b3293f7f63fa5408bfac227ce191b0cee8753ca8f521e16b682b2d035125d75788815635586f122355a + REF boost-1.77.0 + SHA512 bf8514928f42618eb056fc61370606ac38c1914822c308a288342459b29a8c202f2ca6efe3c9317b371a5ca435da2c0b79f6f8de2df7a8a95033b9eb22331102 HEAD_REF master ) diff --git a/ports/boost-lambda/vcpkg.json b/ports/boost-lambda/vcpkg.json index f8ae2329f4a342..f7a79b818f0a30 100644 --- a/ports/boost-lambda/vcpkg.json +++ b/ports/boost-lambda/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lambda", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost lambda module", "homepage": "https://github.com/boostorg/lambda", "dependencies": [ @@ -8,6 +8,7 @@ "boost-config", "boost-core", "boost-detail", + "boost-iterator", "boost-mpl", "boost-preprocessor", "boost-tuple", diff --git a/ports/boost-lambda2/portfile.cmake b/ports/boost-lambda2/portfile.cmake new file mode 100644 index 00000000000000..a0c3f402375ab2 --- /dev/null +++ b/ports/boost-lambda2/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/lambda2 + REF boost-1.77.0 + SHA512 2402ba5967082199d5c07f7bd03be9072b76173414a69029157e24bb3f65628febda7b609a128920e3b0f4bbc4265d6e692b24c985d39869b26f32168884df96 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-lambda2/vcpkg.json b/ports/boost-lambda2/vcpkg.json new file mode 100644 index 00000000000000..56067a693f4930 --- /dev/null +++ b/ports/boost-lambda2/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "boost-lambda2", + "version": "1.77.0", + "description": "Boost lambda2 module", + "homepage": "https://github.com/boostorg/lambda2", + "dependencies": [ + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-leaf/portfile.cmake b/ports/boost-leaf/portfile.cmake index 7f158826071add..27a688c0ab4d6f 100644 --- a/ports/boost-leaf/portfile.cmake +++ b/ports/boost-leaf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/leaf - REF boost-1.76.0 - SHA512 3ab95ba1d75cb9137805e656d7331cbf9fa290400ee88dc4f2088d26983c6c948c4fc7f05615f3bf5b9533aab84b259ec2158a97b4447f619f907b5377571b55 + REF boost-1.77.0 + SHA512 46035f095b76cdc9fee7f608fe2d05d0ad7bd59eb7b87e675c371ce43d842176c797c19a388e010f9bd8bf418789953e6e659af7940c1b1de1c3f2ff717fff18 HEAD_REF master ) diff --git a/ports/boost-leaf/vcpkg.json b/ports/boost-leaf/vcpkg.json index 72ee4ace096e2c..2831156c4a476a 100644 --- a/ports/boost-leaf/vcpkg.json +++ b/ports/boost-leaf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-leaf", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost leaf module", "homepage": "https://github.com/boostorg/leaf", "dependencies": [ diff --git a/ports/boost-lexical-cast/portfile.cmake b/ports/boost-lexical-cast/portfile.cmake index fae7b7fdbc06db..253eb1e5742649 100644 --- a/ports/boost-lexical-cast/portfile.cmake +++ b/ports/boost-lexical-cast/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lexical_cast - REF boost-1.76.0 - SHA512 80f3fe792e2f66fab4096c9d327091bce66f004b3355de0ee28c2c1ea438412fceae2a84799113f7e901393e86fa8dacddf6b6338d3e6265f528c636065dd06a + REF boost-1.77.0 + SHA512 1c9cfee10bb61f52f653f4adf68d7342fe952c24a180aa49a5cc83689567be3a0f68c05e96ade23025163262e1ba96b545ed4e182d9411deb2251b54bcfb7fab HEAD_REF master ) diff --git a/ports/boost-lexical-cast/vcpkg.json b/ports/boost-lexical-cast/vcpkg.json index 5767a4253a41f7..b2e3aa390e3cb6 100644 --- a/ports/boost-lexical-cast/vcpkg.json +++ b/ports/boost-lexical-cast/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lexical-cast", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost lexical_cast module", "homepage": "https://github.com/boostorg/lexical_cast", "dependencies": [ @@ -9,7 +9,6 @@ "boost-config", "boost-container", "boost-core", - "boost-detail", "boost-integer", "boost-numeric-conversion", "boost-range", diff --git a/ports/boost-local-function/portfile.cmake b/ports/boost-local-function/portfile.cmake index 9b3f1bc7f11083..db61899eed3e71 100644 --- a/ports/boost-local-function/portfile.cmake +++ b/ports/boost-local-function/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/local_function - REF boost-1.76.0 - SHA512 e1637f892c70e0e7df67e1e9c28658787305b873198d9c1a60826d4bd581a0b866aa675339d7c85927bb74d74711d14eb8bbb47663ab69fa10945ca21a5ec220 + REF boost-1.77.0 + SHA512 0e827aa35b9281abb2efc804c0eef554076fb39c29ce006b534a9e1f4bb6573e703a5f848fdb1ea5e3257ea9281bf1533239fce4e0275390e81740a4d2eed9e6 HEAD_REF master ) diff --git a/ports/boost-local-function/vcpkg.json b/ports/boost-local-function/vcpkg.json index 74d77a16fbee09..89c6386d471e3a 100644 --- a/ports/boost-local-function/vcpkg.json +++ b/ports/boost-local-function/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-local-function", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost local_function module", "homepage": "https://github.com/boostorg/local_function", "dependencies": [ diff --git a/ports/boost-locale/b2-options.cmake.in b/ports/boost-locale/b2-options.cmake.in index 865a0b1437861a..66fa64326fa52b 100644 --- a/ports/boost-locale/b2-options.cmake.in +++ b/ports/boost-locale/b2-options.cmake.in @@ -1,41 +1,40 @@ set(_B2_OPTIONS_FEATURES "@FEATURES@") if("icu" IN_LIST _B2_OPTIONS_FEATURES) - set(BOOST_LOCALE_ICU_FEATURE on) + set(BOOST_LOCALE_ENABLE_ICU on) else() - set(BOOST_LOCALE_ICU_FEATURE off) + set(BOOST_LOCALE_ENABLE_ICU off) endif() if(@VCPKG_TARGET_IS_WINDOWS@) - list(APPEND B2_OPTIONS - boost.locale.iconv=off - boost.locale.posix=off - /boost/locale//boost_locale - boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE} - ) -elseif(@VCPKG_TARGET_IS_ANDROID@) - find_library(LIBICONV_LIBRARY iconv) - get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY) - get_filename_component(LIBICONV_DIR "${LIBICONV_DIR}" DIRECTORY) - - list(APPEND B2_OPTIONS - boost.locale.iconv=on - boost.locale.posix=off - /boost/locale//boost_locale - boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE} - -sICONV_PATH=${LIBICONV_DIR} - ) + set(BOOST_LOCALE_ENABLE_ICONV off) + set(BOOST_LOCALE_ENABLE_POSIX off) + set(BOOST_LOCALE_ENABLE_WINAPI on) else() - find_library(LIBICONV_LIBRARY iconv) - get_filename_component(LIBICONV_DIR "${LIBICONV_LIBRARY}" DIRECTORY) + find_library(VCPKG_ICONV_LIBRARY_RELEASE iconv PATHS "${CURRENT_INSTALLED_DIR}/lib/" NO_DEFAULT_PATH) + find_library(VCPKG_ICONV_LIBRARY_DEBUG iconv PATHS "${CURRENT_INSTALLED_DIR}/debug/lib/" NO_DEFAULT_PATH) + set(BOOST_LOCALE_ENABLE_ICONV on) + if(@VCPKG_TARGET_IS_ANDROID@) + set(BOOST_LOCALE_ENABLE_POSIX off) + else() + set(BOOST_LOCALE_ENABLE_POSIX on) + endif() + set(BOOST_LOCALE_ENABLE_WINAPI off) +endif() +list(APPEND B2_OPTIONS + boost.locale.iconv=${BOOST_LOCALE_ENABLE_ICONV} + boost.locale.icu=${BOOST_LOCALE_ENABLE_ICU} + boost.locale.posix=${BOOST_LOCALE_ENABLE_POSIX} + boost.locale.winapi=${BOOST_LOCALE_ENABLE_WINAPI} + /boost/locale//boost_locale +) + +if(BOOST_LOCALE_ENABLE_ICONV) list(APPEND B2_OPTIONS - boost.locale.iconv=on - boost.locale.posix=on - /boost/locale//boost_locale - boost.locale.icu=${BOOST_LOCALE_ICU_FEATURE} - -sICONV_PATH=${LIBICONV_DIR} + -sICONV_PATH=${CURRENT_INSTALLED_DIR} ) - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") + + if(VCPKG_TARGET_IS_OSX OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32") list(APPEND B2_OPTIONS boost.locale.force-found-iconv=on ) diff --git a/ports/boost-locale/portfile.cmake b/ports/boost-locale/portfile.cmake index 981ce574329fe8..2ea0a35325125e 100644 --- a/ports/boost-locale/portfile.cmake +++ b/ports/boost-locale/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/locale - REF boost-1.76.0 - SHA512 509de7eb111cb408d1e4f766ab60388a4ecf593cb644ab22572765d0e0c6197937d6da886627d341e3665bdaa697f2c8cc4adef2f298858f16d72ae1029e5dac + REF boost-1.77.0 + SHA512 363bf4bc970fb044fc1739405ced27fee00fb2d5925263069f29821204c505ba4e4dac344a27232c8d7e96cd09d90342623ba5d93112277f21cf08ef5bbfd0ff HEAD_REF master PATCHES 0001-Fix-boost-ICU-support.patch diff --git a/ports/boost-locale/vcpkg.json b/ports/boost-locale/vcpkg.json index 014a13569aacf6..6953dc449e6392 100644 --- a/ports/boost-locale/vcpkg.json +++ b/ports/boost-locale/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-locale", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost locale module", "homepage": "https://github.com/boostorg/locale", "supports": "!uwp", @@ -19,7 +19,6 @@ }, "boost-smart-ptr", "boost-static-assert", - "boost-system", "boost-thread", "boost-type-traits", "boost-unordered", @@ -27,6 +26,10 @@ { "name": "libiconv", "platform": "!uwp & !windows & !mingw" + }, + { + "name": "vcpkg-cmake", + "host": true } ], "features": { diff --git a/ports/boost-lockfree/portfile.cmake b/ports/boost-lockfree/portfile.cmake index 8156322ee345ec..124af670e09d72 100644 --- a/ports/boost-lockfree/portfile.cmake +++ b/ports/boost-lockfree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/lockfree - REF boost-1.76.0 - SHA512 eb4f387306e843ed4fa16e4a8709d6ef8a54280f42dd453347ad9485d301835541bf256edcf237aefc7da94029b044ad3b8bc429b5afdeeebda75fa9bf8df2bd + REF boost-1.77.0 + SHA512 134e9f9d30b4ac124f2a18e0cf265c7ea7342279876625302bfeec8e25aff716e00ccd229389b0197b59d9ca85787eafb3fdec680a70d791497245dd8ca2cbec HEAD_REF master ) diff --git a/ports/boost-lockfree/vcpkg.json b/ports/boost-lockfree/vcpkg.json index f889222381526a..78b28dd4fd0734 100644 --- a/ports/boost-lockfree/vcpkg.json +++ b/ports/boost-lockfree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-lockfree", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost lockfree module", "homepage": "https://github.com/boostorg/lockfree", "dependencies": [ @@ -11,6 +11,7 @@ "boost-config", "boost-core", "boost-integer", + "boost-iterator", "boost-mpl", "boost-parameter", "boost-predef", diff --git a/ports/boost-log/portfile.cmake b/ports/boost-log/portfile.cmake index 9b16049e95f5e8..970942ccfc321d 100644 --- a/ports/boost-log/portfile.cmake +++ b/ports/boost-log/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/log - REF boost-1.76.0 - SHA512 9d29404852d9e79241bd745757960563e11c854887d2aa2fad5a0306f7c327351a70f526ebb8e9c603c79c6979678ca220071e6a62e0148a2bd51f30af952f07 + REF boost-1.77.0 + SHA512 17203830dce28e3b5c2c7b78f412ecdcae8b08cfc6dd4ae251bc6c99d9c2c66b0b3b5df3c2620c8ef8f39e48b37fc7477f2a2d86ebcb69bc95eb9cb1a98d01a0 HEAD_REF master ) diff --git a/ports/boost-log/vcpkg.json b/ports/boost-log/vcpkg.json index 1b700bb911ca7d..6812f2ed4ec235 100644 --- a/ports/boost-log/vcpkg.json +++ b/ports/boost-log/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-log", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost log module", "homepage": "https://github.com/boostorg/log", "supports": "!uwp & !emscripten", @@ -22,7 +22,6 @@ "boost-container", "boost-core", "boost-date-time", - "boost-detail", "boost-exception", { "name": "boost-filesystem", @@ -35,11 +34,6 @@ "boost-io", "boost-iterator", "boost-lexical-cast", - { - "name": "boost-locale", - "platform": "!uwp" - }, - "boost-math", { "name": "boost-modular-build-helper", "host": true @@ -67,6 +61,10 @@ "boost-utility", "boost-vcpkg-helpers", "boost-winapi", - "boost-xpressive" + "boost-xpressive", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-logic/portfile.cmake b/ports/boost-logic/portfile.cmake index 2d2c461bc2772d..d44d928c12858c 100644 --- a/ports/boost-logic/portfile.cmake +++ b/ports/boost-logic/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/logic - REF boost-1.76.0 - SHA512 6795e97a02f1b02c115951a075338fb62bf7458e30bd297071940d5a68990f0860736b29a18adbcf6bd3ca8c1af4042ddf64054c2ba873e54da3cbd587c098c4 + REF boost-1.77.0 + SHA512 e99a3b173e1d72c5e3228ada3061a8f5e09c544d5d9bb125495aecd863494ad007e3b7b4348e7f1940efe003446ea0e97b48b44af0180661d3f73621468c5ef1 HEAD_REF master ) diff --git a/ports/boost-logic/vcpkg.json b/ports/boost-logic/vcpkg.json index 440963f50e1880..4c33644bb1a374 100644 --- a/ports/boost-logic/vcpkg.json +++ b/ports/boost-logic/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-logic", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost logic module", "homepage": "https://github.com/boostorg/logic", "dependencies": [ "boost-config", "boost-core", - "boost-detail", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-math/001-remove-checks.patch b/ports/boost-math/001-remove-checks.patch new file mode 100644 index 00000000000000..d25166fa38b3b2 --- /dev/null +++ b/ports/boost-math/001-remove-checks.patch @@ -0,0 +1,23 @@ + build/Jamfile.v2 | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 +index fd84028..3537e9f 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -5,7 +5,6 @@ + + import testing ; + import pch ; +-import ../../config/checks/config : requires ; + + project + : requirements +@@ -19,7 +18,6 @@ project + intel-linux:-fvisibility=hidden + #sun:-xldscope=hidden + [ check-target-builds ../config//has_gcc_visibility "gcc visibility" : gcc:-fvisibility=hidden : ] +- [ requires cxx11_noexcept cxx11_rvalue_references sfinae_expr cxx11_auto_declarations cxx11_lambdas cxx11_unified_initialization_syntax cxx11_hdr_tuple cxx11_hdr_initializer_list cxx11_hdr_chrono cxx11_thread_local cxx11_constexpr cxx11_nullptr cxx11_numeric_limits cxx11_decltype cxx11_hdr_array cxx11_hdr_atomic cxx11_hdr_type_traits cxx11_allocator cxx11_explicit_conversion_operators ] + ; + + cpp-pch pch : ../src/tr1/pch.hpp : ../src/tr1 shared:BOOST_MATH_TR1_DYN_LINK=1 ; diff --git a/ports/boost-math/portfile.cmake b/ports/boost-math/portfile.cmake index 9fbcba6a6d41ab..3719fdda5f9e20 100644 --- a/ports/boost-math/portfile.cmake +++ b/ports/boost-math/portfile.cmake @@ -3,17 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/math - REF boost-1.76.0 - SHA512 50967b962ac4b3cfc799733e5cbbcc15215c27135368a739d2441a70aa6e4a7ccfb617bf3ccd571201568d8bacb209d2a98acbe0593cde7714c7da9faa09ee17 + REF boost-1.77.0 + SHA512 8a35fff7ecb12bc8caf8951859555016caa21601d5aa21284aae83df19cde054bfe9ead4cb92341558b23794f2b7bfd37979acb9fc6b2f5546f50505adffd8d3 HEAD_REF master + PATCHES 001-remove-checks.patch ) -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "import ../../config/checks/config" "import config/checks/config") -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "check-target-builds ../config//has_gcc_visibility" "check-target-builds ../has_gcc_visibility.cpp") - -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/build/config") -file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-math requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-math/vcpkg.json b/ports/boost-math/vcpkg.json index 044d88f7a53380..de22af32b91bee 100644 --- a/ports/boost-math/vcpkg.json +++ b/ports/boost-math/vcpkg.json @@ -1,13 +1,10 @@ { "name": "boost-math", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost math module", "homepage": "https://github.com/boostorg/math", "dependencies": [ - "boost-algorithm", - "boost-array", "boost-assert", - "boost-atomic", { "name": "boost-build", "host": true @@ -15,21 +12,20 @@ "boost-concept-check", "boost-config", "boost-core", - "boost-detail", "boost-integer", - "boost-lambda", "boost-lexical-cast", { "name": "boost-modular-build-helper", "host": true }, "boost-predef", - "boost-range", - "boost-smart-ptr", + "boost-random", "boost-static-assert", "boost-throw-exception", - "boost-type-traits", - "boost-utility", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-metaparse/portfile.cmake b/ports/boost-metaparse/portfile.cmake index 4056d81fe901b0..9240356058ba62 100644 --- a/ports/boost-metaparse/portfile.cmake +++ b/ports/boost-metaparse/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/metaparse - REF boost-1.76.0 - SHA512 27a9cc14b97f815960682da087137e656479069a0a5d57b26f9fbd43467217ba34b0d2f2336318e2394190c5d34d95d4fa71c6b3a2f95ccdae5a6010299e5783 + REF boost-1.77.0 + SHA512 b46ebf646a8e00c42c817191c02353d0d1a7635b367066a1ebe56e095278ac1d17c147ce46ca6aa3ec9021960530867b8f0bd097201798ba83cf2108db0e7407 HEAD_REF master ) diff --git a/ports/boost-metaparse/vcpkg.json b/ports/boost-metaparse/vcpkg.json index f91cd2f8c01599..157d5a1b4fb4b3 100644 --- a/ports/boost-metaparse/vcpkg.json +++ b/ports/boost-metaparse/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-metaparse", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost metaparse module", "homepage": "https://github.com/boostorg/metaparse", "dependencies": [ diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 54fdfe16c91956..8b2f5910a56044 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -21,11 +21,6 @@ else() list(APPEND B2_OPTIONS "-sICU_PATH=\"${ICU_PATH}\"") endif() -if(DEFINED BOOST_CMAKE_FRAGMENT) - message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") - include(${BOOST_CMAKE_FRAGMENT}) -endif() - # Add build type specific options if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") list(APPEND B2_OPTIONS runtime-link=shared) @@ -174,7 +169,6 @@ if(APPLE) string(APPEND LDFLAGS " -stdlib=libc++") endif() -set(TOOLSET_OPTIONS) if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") # cl in b2 appears to not receive `LIBPATH` for finding winmd files, so we transform them to `/AI` options. set(libpath_args "$ENV{LIBPATH}") @@ -187,59 +181,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(TRANSFORM libpath_args REPLACE "\\\"" "\\\\\"") list(JOIN libpath_args " " libpath_arg) - set(TOOLSET_OPTIONS "-Zl \"${libpath_arg}\" WindowsApp.lib /ZW -DVirtualAlloc=VirtualAllocFromApp -D_WIN32_WINNT=0x0A00") + string(APPEND CXXFLAGS " \"${libpath_arg}\" /ZW \"/D_WIN32_WINNT=0x0A00\"") + string(APPEND CFLAGS " -Zl") list(APPEND B2_OPTIONS windows-api=store) -endif() - -find_path(ZLIB_INCLUDE zlib.h) -list(APPEND B2_OPTIONS -sZLIB_INCLUDE="${ZLIB_INCLUDE}") - -find_path(BZIP2_INCLUDE bzlib.h) -list(APPEND B2_OPTIONS -sBZIP2_INCLUDE="${BZIP2_INCLUDE}") - -if(WIN32) - if(CMAKE_BUILD_TYPE STREQUAL "Release") - list(APPEND B2_OPTIONS - -sZLIB_BINARY=zlib - "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - -sBZIP2_BINARY=bz2 - "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - -sLZMA_BINARY=lzma - "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - -sZSTD_BINARY=zstd - "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/lib" - ) - else() - list(APPEND B2_OPTIONS - -sZLIB_BINARY=zlibd - "-sZLIB_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - -sBZIP2_BINARY=bz2d - "-sBZIP2_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - -sLZMA_BINARY=lzmad - "-sLZMA_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - -sZSTD_BINARY=zstdd - "-sZSTD_LIBPATH=${CURRENT_INSTALLED_DIR}/debug/lib" - ) - endif() -else() - find_library(ZLIB_LIBPATH z) - list(APPEND B2_OPTIONS - -sZLIB_BINARY=z - -sZLIB_LIBPATH="${ZLIB_LIBPATH}" - ) - if(CMAKE_BUILD_TYPE STREQUAL "Release") - find_library(BZIP2_LIBPATH bz2) - list(APPEND B2_OPTIONS - -sBZIP2_BINARY=bz2 - -sBZIP2_LIBPATH="${BZIP2_LIBPATH}" - ) - elseif(CMAKE_BUILD_TYPE STREQUAL "Debug") - find_library(BZIP2_LIBPATH bz2d) - list(APPEND B2_OPTIONS - -sBZIP2_BINARY=bz2d - -sBZIP2_LIBPATH="${BZIP2_LIBPATH}" - ) - endif() + list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) endif() if(CMAKE_BUILD_TYPE STREQUAL "Release") @@ -252,6 +197,12 @@ if(NOT WIN32) list(APPEND B2_OPTIONS "--layout=system") endif() +# Include port specific CMake fragment +if(DEFINED BOOST_CMAKE_FRAGMENT) + message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") + include(${BOOST_CMAKE_FRAGMENT}) +endif() + configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam ${CMAKE_CURRENT_BINARY_DIR}/user-config.jam @ONLY) include(ProcessorCount) diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index 7917408c36d7a5..2a70c7ebdda985 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.76.0 ; -constant BOOST_VERSION_ABI_TAG : 1_76 ; +constant BOOST_VERSION : 1.77.0 ; +constant BOOST_VERSION_ABI_TAG : 1_77 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; import boostcpp ; @@ -36,7 +36,8 @@ if "@PORT@" != "boost-system" { use-project /boost/system : . ; - lib boost_system : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_system : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_system : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_system@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_system ; use-project /boost : . ; @@ -47,7 +48,8 @@ if "@PORT@" != "boost-chrono" { use-project /boost/chrono : . ; - lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_chrono : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_chrono@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_chrono ; } @@ -55,7 +57,8 @@ if "@PORT@" != "boost-regex" { use-project /boost/regex : . ; - lib boost_regex : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_regex : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_regex : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_regex@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_regex ; } @@ -63,7 +66,8 @@ if "@PORT@" != "boost-date-time" { use-project /boost/date_time : . ; - lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_SUFFIX@" @VARIANT@ -/boost/date_time//boost_date_time ; + lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_RELEASE_SUFFIX@" release -/boost/date_time//boost_date_time ; + lib boost_date_time : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_date_time@BOOST_LIB_DEBUG_SUFFIX@" debug -/boost/date_time//boost_date_time ; explicit boost_date_time ; } @@ -71,7 +75,8 @@ if "@PORT@" != "boost-thread" { use-project /boost/thread : . ; - lib boost_thread : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_SUFFIX@" @VARIANT@ : : /boost/date_time//boost_date_time ; + lib boost_thread : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/date_time//boost_date_time ; + lib boost_thread : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_thread@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/date_time//boost_date_time ; explicit boost_thread ; } @@ -79,7 +84,8 @@ if "@PORT@" != "boost-timer" { use-project /boost/timer : . ; - lib boost_timer : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_timer : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_timer : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_timer@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_timer ; } @@ -87,7 +93,8 @@ if "@PORT@" != "boost-filesystem" { use-project /boost/filesystem : . ; - lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_SUFFIX@" @VARIANT@ : : /boost/system//boost_system ; + lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/system//boost_system ; + lib boost_filesystem : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_filesystem@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/system//boost_system ; explicit boost_filesystem ; } @@ -95,7 +102,8 @@ if "@PORT@" != "boost-atomic" { use-project /boost/atomic : . ; - lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_atomic : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_atomic@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_atomic ; } @@ -106,7 +114,8 @@ if "@PORT@" != "boost-context" use-project /boost/context : . ; - lib boost_context : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_context : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_context : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_context@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_context ; } @@ -114,7 +123,8 @@ if "@PORT@" != "boost-test" { use-project /boost/test : . ; - lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_unit_test_framework : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_unit_test_framework@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_unit_test_framework ; } @@ -122,10 +132,29 @@ if "@PORT@" != "boost-serialization" { use-project /boost/serialization : . ; - lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/@BUILD_LIB_PATH@@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_SUFFIX@" @VARIANT@ ; + lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_serialization : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_serialization@BOOST_LIB_DEBUG_SUFFIX@" debug ; explicit boost_serialization ; } +if "@PORT@" != "boost-mpi" +{ + use-project /boost/mpi : . ; + + lib boost_mpi : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_mpi@BOOST_LIB_RELEASE_SUFFIX@" release : : /boost/serialization//boost_serialization ; + lib boost_mpi : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_mpi@BOOST_LIB_DEBUG_SUFFIX@" debug : : /boost/serialization//boost_serialization ; + explicit boost_mpi ; +} + +if "@PORT@" != "boost-container" +{ + use-project /boost/container : . ; + + lib boost_container : : "@CURRENT_INSTALLED_DIR@/lib/@BOOST_LIB_PREFIX@boost_container@BOOST_LIB_RELEASE_SUFFIX@" release ; + lib boost_container : : "@CURRENT_INSTALLED_DIR@/debug/lib/@BOOST_LIB_PREFIX@boost_container@BOOST_LIB_DEBUG_SUFFIX@" debug ; + explicit boost_container ; +} + rule requires ( foo * ) { } diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 373a9a44d5e7ec..e4a4fd9f35c2b6 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -9,9 +9,6 @@ function(boost_modular_build) endif() # Next CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT} - set(B2_OPTIONS) - set(B2_OPTIONS_DBG) - set(B2_OPTIONS_REL) set(B2_REQUIREMENTS) # this variable is used in the Jamroot.jam if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) @@ -29,12 +26,6 @@ function(boost_modular_build) message(FATAL_ERROR "Could not find b2 in ${BOOST_BUILD_PATH}") endif() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - list(APPEND B2_OPTIONS windows-api=store) - endif() - - set(_bm_DIR ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build) - if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(BOOST_LIB_PREFIX) if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.") @@ -61,65 +52,50 @@ function(boost_modular_build) endif() endif() + set(_jamfile) if(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile.v2") - file(READ ${_bm_SOURCE_PATH}/build/Jamfile.v2 _contents) + set(_jamfile "${_bm_SOURCE_PATH}/build/Jamfile.v2") + elseif(EXISTS "${_bm_SOURCE_PATH}/build/Jamfile") + set(_jamfile "${_bm_SOURCE_PATH}/build/Jamfile") + endif() + if(_jamfile) + file(READ "${_jamfile}" _contents) string(REGEX REPLACE "\.\./\.\./([^/ ]+)/build//(boost_[^/ ]+)" "/boost/\\1//\\2" _contents "${_contents}" ) - string(REGEX REPLACE " /boost//([^/ ]+)" " /boost/\\1//boost_\\1" _contents "${_contents}") - file(WRITE ${_bm_SOURCE_PATH}/build/Jamfile.v2 "${_contents}") - endif() - - function(unix_build BOOST_LIB_SUFFIX BUILD_TYPE BUILD_LIB_PATH) - message(STATUS "Building ${BUILD_TYPE}...") - set(BOOST_LIB_SUFFIX ${BOOST_LIB_SUFFIX}) - set(VARIANT ${BUILD_TYPE}) - set(BUILD_LIB_PATH ${BUILD_LIB_PATH}) - configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) - - set(configure_option) - if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) - list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") - endif() - - vcpkg_configure_cmake( - SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build - PREFER_NINJA - OPTIONS - "-DPORT=${PORT}" - "-DFEATURES=${FEATURES}" - "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" - "-DB2_EXE=${B2_EXE}" - "-DSOURCE_PATH=${_bm_SOURCE_PATH}" - "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}" - "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" - ${configure_option} - ) - vcpkg_install_cmake() - - vcpkg_copy_pdbs() - endfunction() - - set(build_flag 0) - if(NOT DEFINED VCPKG_BUILD_TYPE) - set(build_flag 1) - set(VCPKG_BUILD_TYPE "release") + string(REGEX REPLACE "/boost//([^/ ]+)" "/boost/\\1//boost_\\1" _contents "${_contents}") + file(WRITE "${_jamfile}" "${_contents}") endif() - if(VCPKG_BUILD_TYPE STREQUAL "release") - unix_build(${BOOST_LIB_RELEASE_SUFFIX} "release" "lib/") - endif() + configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) - if(build_flag) - set(VCPKG_BUILD_TYPE "debug") + set(configure_options) + if(_bm_BOOST_CMAKE_FRAGMENT) + list(APPEND configure_options "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}") endif() - if(VCPKG_BUILD_TYPE STREQUAL "debug") - unix_build(${BOOST_LIB_DEBUG_SUFFIX} "debug" "debug/lib/") - endif() + vcpkg_cmake_configure( + SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build + GENERATOR Ninja + OPTIONS + "-DPORT=${PORT}" + "-DFEATURES=${FEATURES}" + "-DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR}" + "-DB2_EXE=${B2_EXE}" + "-DSOURCE_PATH=${_bm_SOURCE_PATH}" + "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}" + "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}" + ${configure_options} + MAYBE_UNUSED_VARIABLES + FEATURES + ) + + vcpkg_cmake_install() + + vcpkg_copy_pdbs() file(GLOB INSTALLED_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/*.lib ${CURRENT_PACKAGES_DIR}/lib/*.lib) foreach(LIB IN LISTS INSTALLED_LIBS) @@ -136,7 +112,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-1_76" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries + string(REPLACE "-1_77" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 8111494700de66..aabe51b01036d4 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -8,7 +8,6 @@ if "@VCPKG_PLATFORM_TOOLSET@" != "external" @CXXFLAGS@ @CFLAGS@ @LDFLAGS@ - @TOOLSET_OPTIONS@ ; } else @@ -33,7 +32,7 @@ if "@PORT@" = "boost-python" using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_DEBUG@" : on ; } -if "@PORT@" = "boost-mpi" +if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel" { using mpi : : "@CURRENT_INSTALLED_DIR@/lib" @@ -83,5 +82,5 @@ else } } -lib iconv : : "@LIBICONV_LIBRARY@" shared shared release : : ; -lib iconv : : "@LIBICONV_LIBRARY@" shared shared debug : : ; +lib iconv : : "@VCPKG_ICONV_LIBRARY_RELEASE@" shared shared release : : ; +lib iconv : : "@VCPKG_ICONV_LIBRARY_DEBUG@" shared shared debug : : ; diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 78d6efa372e5be..63251aa3c46d47 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,9 +1,8 @@ { "name": "boost-modular-build-helper", - "version-string": "1.76.0", - "port-version": 2, + "version": "1.77.0", + "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ - "boost-build", "boost-uninstall" ] } diff --git a/ports/boost-move/portfile.cmake b/ports/boost-move/portfile.cmake index 2ebcbc847c24de..e1a2e72783122d 100644 --- a/ports/boost-move/portfile.cmake +++ b/ports/boost-move/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/move - REF boost-1.76.0 - SHA512 f136696c88f398d27e97f77141f10c1ab80b0bccf9acdecc3c0e886c8f32e8e9bc9fe51ba563c814e20d71a15c01f70d96ffd88d5a6c5e297f568959492bc982 + REF boost-1.77.0 + SHA512 16a911d10e142c3fae375abd5062c45cb771aae214cebc4b56a1bf88e26dc7f33d678f68d47c7f6b15e6a893080a6f9db09ef944f9980463b063fe16b745b0fd HEAD_REF master ) diff --git a/ports/boost-move/vcpkg.json b/ports/boost-move/vcpkg.json index e197249a9bee88..0869b27f7cdcb4 100644 --- a/ports/boost-move/vcpkg.json +++ b/ports/boost-move/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-move", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost move module", "homepage": "https://github.com/boostorg/move", "dependencies": [ diff --git a/ports/boost-mp11/portfile.cmake b/ports/boost-mp11/portfile.cmake index 759f4849f57585..4eec827fce088d 100644 --- a/ports/boost-mp11/portfile.cmake +++ b/ports/boost-mp11/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mp11 - REF boost-1.76.0 - SHA512 fcdf427339f5e9a617d4ebcb5bbbf81eb6fd25568dbac64ad8f570df53997372d0c03e04b2c32d5ee704576a98008015f489d2a64726b50732da1cc3ab331531 + REF boost-1.77.0 + SHA512 02a93db3c0ee65b6742109c369c70300465ebc7d824f4c9bbf8f083395e68f0a4d2b4def8299f2fc29bc5c7cb0b18dc5a4d96d1f0e20216a49986ce9387ca5d1 HEAD_REF master ) diff --git a/ports/boost-mp11/vcpkg.json b/ports/boost-mp11/vcpkg.json index 4eb15cb1d83e83..7578247b5dc084 100644 --- a/ports/boost-mp11/vcpkg.json +++ b/ports/boost-mp11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-mp11", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost mp11 module", "homepage": "https://github.com/boostorg/mp11", "dependencies": [ diff --git a/ports/boost-mpi/portfile.cmake b/ports/boost-mpi/portfile.cmake index e8d6079d95a885..0dc764257259da 100644 --- a/ports/boost-mpi/portfile.cmake +++ b/ports/boost-mpi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpi - REF boost-1.76.0 - SHA512 42870fa1a8d85814aa125664bdadfd986112b6e9eb4b1007835f3434c4eacccad8971fc0767e9ac7b935068ed0c0031cea5820cbb79291d2b281ace565cd8bc5 + REF boost-1.77.0 + SHA512 9acefa7dfa5b103322bf16ac76f2b9977e6af598c8547e6e33299b610e43fe006409675b5829c3ddcf1a832e36d45d06ffee8e669950a45f64cca3f16faf0b1a HEAD_REF master ) diff --git a/ports/boost-mpi/vcpkg.json b/ports/boost-mpi/vcpkg.json index 3fadfc06003232..9cb9d09e77ff1b 100644 --- a/ports/boost-mpi/vcpkg.json +++ b/ports/boost-mpi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "boost-mpi", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost mpi module", "homepage": "https://github.com/boostorg/mpi", + "supports": "!uwp", "dependencies": [ "boost-assert", { @@ -17,7 +18,6 @@ "boost-integer", "boost-iterator", "boost-lexical-cast", - "boost-math", { "name": "boost-modular-build-helper", "host": true @@ -35,6 +35,10 @@ "boost-type-traits", "boost-utility", "boost-vcpkg-helpers", - "mpi" + "mpi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-mpl/portfile.cmake b/ports/boost-mpl/portfile.cmake index 982679e0146d15..10784dfc410ee9 100644 --- a/ports/boost-mpl/portfile.cmake +++ b/ports/boost-mpl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/mpl - REF boost-1.76.0 - SHA512 90362fbe99563754c9b692466f61a0c5cfbb1bcb7c24d107d9e1525755b928cb9bb741768ba2dceaf4f44efd4c644cf1ea184d2ee3fbf419459dfc12a42430f1 + REF boost-1.77.0 + SHA512 8f43a32281aa33749fef93be450adb7ccc2774589afbb498bac335ff1cd95ad21e5899cb4c26cbdc2836764ca7264e1408e3d0c15a21d1488a56579304a29ba4 HEAD_REF master ) diff --git a/ports/boost-mpl/vcpkg.json b/ports/boost-mpl/vcpkg.json index 999fbb596b40d4..f1d3dbca7d0e0b 100644 --- a/ports/boost-mpl/vcpkg.json +++ b/ports/boost-mpl/vcpkg.json @@ -1,16 +1,16 @@ { "name": "boost-mpl", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost mpl module", "homepage": "https://github.com/boostorg/mpl", "dependencies": [ "boost-config", "boost-core", - "boost-detail", "boost-predef", "boost-preprocessor", "boost-static-assert", "boost-type-traits", + "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-msm/portfile.cmake b/ports/boost-msm/portfile.cmake index 37b9e89a023720..a6eb4db9e63ff9 100644 --- a/ports/boost-msm/portfile.cmake +++ b/ports/boost-msm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/msm - REF boost-1.76.0 - SHA512 88734ef44bd8b8fe41920ed2e2d0576c87b86604fe8bb33e5512e01719593287028475bbd1a597ba4b8d32bc7cc119e2c62d9efc8006f772abce0fb988f8e9d1 + REF boost-1.77.0 + SHA512 b84162658b78cf8c1d60f3a390fa241293570f5956b31144fa56ffc74a22663c5a4c61a969c25db17c4265b44a4a216fc46becd40987ea8e6a198100191f7c03 HEAD_REF master ) diff --git a/ports/boost-msm/vcpkg.json b/ports/boost-msm/vcpkg.json index 4704144e07136a..6b6a345466aabb 100644 --- a/ports/boost-msm/vcpkg.json +++ b/ports/boost-msm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-msm", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost msm module", "homepage": "https://github.com/boostorg/msm", "dependencies": [ @@ -21,7 +21,6 @@ "boost-tuple", "boost-type-traits", "boost-typeof", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-multi-array/portfile.cmake b/ports/boost-multi-array/portfile.cmake index 625a9c98882736..78d172a5cb8fec 100644 --- a/ports/boost-multi-array/portfile.cmake +++ b/ports/boost-multi-array/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_array - REF boost-1.76.0 - SHA512 1e6487b127e8205ba9ce790fefa39994bfe85417e9f87ef332e73f4465f8e26ea2ffc54e4d3096f6c7d48dd30768e910f6bf2ebd3b49d0ba490be7f0bda0c965 + REF boost-1.77.0 + SHA512 501bc069759a77535f85a309bdb13d0ef346ddc3d130145c5aa43797cc692cccf310bf3ebd7939e4d3452beec2314f1e07454017d8dc7c8b5ff079a7ba00f6de HEAD_REF master ) diff --git a/ports/boost-multi-array/vcpkg.json b/ports/boost-multi-array/vcpkg.json index 07804cbd4a2046..ac7da7e014b1bf 100644 --- a/ports/boost-multi-array/vcpkg.json +++ b/ports/boost-multi-array/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multi-array", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost multi_array module", "homepage": "https://github.com/boostorg/multi_array", "dependencies": [ @@ -14,7 +14,6 @@ "boost-mpl", "boost-static-assert", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-multi-index/portfile.cmake b/ports/boost-multi-index/portfile.cmake index e8ac4693463505..bd178e64d81623 100644 --- a/ports/boost-multi-index/portfile.cmake +++ b/ports/boost-multi-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multi_index - REF boost-1.76.0 - SHA512 b7b19d5fb3f7c93009d7af6ab8e80694208f045d012778637bd57b018360311ce14d3921d0ee6163e0aaa01001a466c2b68cf32017361ef6c0c9858db14d8615 + REF boost-1.77.0 + SHA512 0cd8af351a946dca8c34e68b2b7419c815380d3ac21bcb4698112264a59a395d3adff47fced46fa8312e84aef336fc5d9b6ddb7c37f84faeb8d377afcbd00323 HEAD_REF master ) diff --git a/ports/boost-multi-index/vcpkg.json b/ports/boost-multi-index/vcpkg.json index 4bc77042b7982b..0c18de7a925873 100644 --- a/ports/boost-multi-index/vcpkg.json +++ b/ports/boost-multi-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-multi-index", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost multi_index module", "homepage": "https://github.com/boostorg/multi_index", "dependencies": [ @@ -9,15 +9,14 @@ "boost-config", "boost-container-hash", "boost-core", - "boost-detail", "boost-foreach", - "boost-functional", "boost-integer", "boost-iterator", "boost-move", "boost-mpl", "boost-preprocessor", "boost-serialization", + "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", "boost-tuple", diff --git a/ports/boost-multiprecision/portfile.cmake b/ports/boost-multiprecision/portfile.cmake index 8002d71867e9fd..684d8796fdff88 100644 --- a/ports/boost-multiprecision/portfile.cmake +++ b/ports/boost-multiprecision/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/multiprecision - REF boost-1.76.0 - SHA512 ced4b1d4f1f4549dcc5d9f1ea470af5fe69af79208e8609656d5d807c5c1f54b0835f0807eda476b8ac59103ba1045a0458ea124bfd61439aa3e3d56d011313d + REF boost-1.77.0 + SHA512 bc29e03b4a43ddbb96e7be49a0cb45d9973571d2dff8e8e0c776a8fd8f9a5da13861764b4004768341dd19a2a04766785032cc414846005e44ee6263ebb1cb85 HEAD_REF master ) diff --git a/ports/boost-multiprecision/vcpkg.json b/ports/boost-multiprecision/vcpkg.json index 523e5fb2ce253c..cd4bfdf322e905 100644 --- a/ports/boost-multiprecision/vcpkg.json +++ b/ports/boost-multiprecision/vcpkg.json @@ -1,20 +1,18 @@ { "name": "boost-multiprecision", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost multiprecision module", "homepage": "https://github.com/boostorg/multiprecision", "dependencies": [ - "boost-array", "boost-assert", "boost-config", - "boost-container-hash", "boost-core", - "boost-functional", "boost-integer", "boost-lexical-cast", + "boost-math", "boost-predef", + "boost-random", "boost-rational", - "boost-throw-exception", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-nowide/001-remove-checks.patch b/ports/boost-nowide/001-remove-checks.patch new file mode 100644 index 00000000000000..e097d8036d5e60 --- /dev/null +++ b/ports/boost-nowide/001-remove-checks.patch @@ -0,0 +1,16 @@ + build/Jamfile.v2 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 +index 44cbc1c..a5605a7 100644 +--- a/build/Jamfile.v2 ++++ b/build/Jamfile.v2 +@@ -8,7 +8,7 @@ + # (See accompanying file LICENSE or www.boost.org/LICENSE_1_0.txt) + # See library home page at http://www.boost.org/libs/nowide + +-import ../../config/checks/config : requires ; ++rule requires ( checks * ) { } + + local requirements = + shared:BOOST_NOWIDE_DYN_LINK=1 diff --git a/ports/boost-nowide/b2-options.cmake b/ports/boost-nowide/b2-options.cmake index cac0b0b9514b72..57388346841878 100644 --- a/ports/boost-nowide/b2-options.cmake +++ b/ports/boost-nowide/b2-options.cmake @@ -1,3 +1,3 @@ if(APPLE) - list(APPEND B2_OPTIONS cxxstd=11) + list(APPEND B2_OPTIONS cxxstd=11) endif() diff --git a/ports/boost-nowide/portfile.cmake b/ports/boost-nowide/portfile.cmake index 924d952de876c0..e058c66438d29d 100644 --- a/ports/boost-nowide/portfile.cmake +++ b/ports/boost-nowide/portfile.cmake @@ -3,18 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/nowide - REF boost-1.76.0 - SHA512 42acb8ef8d0c3ab01673814ada908dcfb6673c8fb6a4f056043b0a81bbeb9cc8bdd7b52febe0d06d5899d39af9717fa2e63f3678f7005e56d0bc4765e8a232c0 + REF boost-1.77.0 + SHA512 7af7a33aed8a8e88d8da37db302bb2d560e71dad57e2be23086dfca5260fb7b15ab4513807c566e91b3ebe27b10d58614e967895b922bc408c774550625d15cf HEAD_REF master + PATCHES 001-remove-checks.patch ) -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") -string(REPLACE "check-target-builds ../config//cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}") -string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config") if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR) message(FATAL_ERROR "boost-nowide requires a newer version of vcpkg in order to build.") endif() diff --git a/ports/boost-nowide/vcpkg.json b/ports/boost-nowide/vcpkg.json index 08d1daca387c9f..447705361d6be5 100644 --- a/ports/boost-nowide/vcpkg.json +++ b/ports/boost-nowide/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-nowide", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost nowide module", "homepage": "https://github.com/boostorg/nowide", "dependencies": [ @@ -17,6 +17,10 @@ "name": "boost-modular-build-helper", "host": true }, - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-numeric-conversion/portfile.cmake b/ports/boost-numeric-conversion/portfile.cmake index 24ebf24f7205dd..cf4e640c595bcf 100644 --- a/ports/boost-numeric-conversion/portfile.cmake +++ b/ports/boost-numeric-conversion/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/numeric_conversion - REF boost-1.76.0 - SHA512 cd659c91ae7f3b25e3d0b13b44c028fcc86295fe414fde70e5decbe1d8fcb1dbd233c6a36b90b33def4e0709075a41661aa311305329f38ba36810326306427b + REF boost-1.77.0 + SHA512 fa72f79ff3111c99ccddfa1af55d154665974096bb7f3c76ef28b6137212c263f95891b369a089d04b2f382cfbfbfee217631edf10d634f71ab644ef71c44afc HEAD_REF master ) diff --git a/ports/boost-numeric-conversion/vcpkg.json b/ports/boost-numeric-conversion/vcpkg.json index a25310104e6e18..4d1bd9593116f4 100644 --- a/ports/boost-numeric-conversion/vcpkg.json +++ b/ports/boost-numeric-conversion/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-numeric-conversion", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost numeric_conversion module", "homepage": "https://github.com/boostorg/numeric_conversion", "dependencies": [ "boost-config", "boost-conversion", "boost-core", - "boost-detail", "boost-mpl", "boost-preprocessor", "boost-throw-exception", diff --git a/ports/boost-odeint/portfile.cmake b/ports/boost-odeint/portfile.cmake index 0a7c9e2fb3685d..568f2dfc0ee7fa 100644 --- a/ports/boost-odeint/portfile.cmake +++ b/ports/boost-odeint/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/odeint - REF boost-1.76.0 - SHA512 8bc70dd31f948f467249caa4c67bf9dcb58bba524edd303cd4312037cff49409108c88321649ff31363da4897f8fa6053e4e5b632fbfe19f0529db4fdc734cd8 + REF boost-1.77.0 + SHA512 33f06b5450855c35c719418ed320ddcdf926c5f27f03d18b345cdaa7921fa749d626dfb8c7c3fdcb102074499e96cf526cb7bdaac1e1a67f6e9f2db5ca3bf481 HEAD_REF master ) diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index 483ea6e86b8c1b..618b34f68ba550 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-odeint", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "dependencies": [ @@ -14,6 +14,10 @@ "boost-fusion", "boost-iterator", "boost-math", + { + "name": "boost-mpi", + "platform": "!uwp" + }, "boost-mpl", "boost-multi-array", "boost-preprocessor", @@ -21,6 +25,7 @@ "boost-static-assert", "boost-throw-exception", "boost-type-traits", + "boost-ublas", "boost-units", "boost-utility", "boost-vcpkg-helpers" diff --git a/ports/boost-optional/portfile.cmake b/ports/boost-optional/portfile.cmake index 0705d960add47d..83d100cff11e6c 100644 --- a/ports/boost-optional/portfile.cmake +++ b/ports/boost-optional/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/optional - REF boost-1.76.0 - SHA512 4802a27da00446384ae4c91075593f0d67628192d9f9cbc2378a190d1ef5491979c40934b3ac0e72145522847d0abbd1afd44345696cd936875189ab0013138c + REF boost-1.77.0 + SHA512 aca6c679125d3e924a5f77e97ae06abfb2bb1794c70f84e1e72f79e3b7520f8ebe8cd3d980beb09a71b49dd62f450da0e3ccfa418d30306a6651cd029f43ff3f HEAD_REF master ) diff --git a/ports/boost-optional/vcpkg.json b/ports/boost-optional/vcpkg.json index 5cfaf9a3aba305..ba1c0e222bf2ee 100644 --- a/ports/boost-optional/vcpkg.json +++ b/ports/boost-optional/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-optional", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost optional module", "homepage": "https://github.com/boostorg/optional", "dependencies": [ diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index b434f1f22fdd50..00c443393d0cd5 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/outcome - REF boost-1.76.0 - SHA512 0e15ccdbb06db9308524e4e11b75b6c1802aec0237d139bcc6929a2dbeeee1cec21f2819cb8a881ba4d9d1d1934a91527cbf4a0044de34f9ff2c3bfdd01cb543 + REF boost-1.77.0 + SHA512 de4e84b43c8906fe4059249a526ea80d805bd9458cc30d467dd232a5326d199b1c38973645bf9115f19933d75998d767d1fea06e2a10edee8bf4453335927505 HEAD_REF master ) diff --git a/ports/boost-outcome/vcpkg.json b/ports/boost-outcome/vcpkg.json index fe9ab77a21c146..7088f3e340e2f4 100644 --- a/ports/boost-outcome/vcpkg.json +++ b/ports/boost-outcome/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-outcome", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost outcome module", "homepage": "https://github.com/boostorg/outcome", "dependencies": [ diff --git a/ports/boost-parameter-python/portfile.cmake b/ports/boost-parameter-python/portfile.cmake index 79ef14dbaa5d9b..34cc9d90abb52b 100644 --- a/ports/boost-parameter-python/portfile.cmake +++ b/ports/boost-parameter-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter_python - REF boost-1.76.0 - SHA512 d9e1cc0adae766e9c78fdd5002f2740902092f57f4c187f95e18d3cd9062bf8f9e5678caa9e7e2bc8a27d009302ba335ef8e7b7795a1e2577ab166c6adce9d7d + REF boost-1.77.0 + SHA512 d3fb2f165cbb1917143ea92be4debbf5f02d43003d9f1ec2e1c19412e39b96e143ac9e0b64a7455d9ce05617f152f0b8b67fee737c92381f0cdbf8996c610b77 HEAD_REF master ) diff --git a/ports/boost-parameter-python/vcpkg.json b/ports/boost-parameter-python/vcpkg.json index 104daca2d96c69..f82c3750efa0bd 100644 --- a/ports/boost-parameter-python/vcpkg.json +++ b/ports/boost-parameter-python/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter-python", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost parameter_python module", "homepage": "https://github.com/boostorg/parameter_python", "supports": "!emscripten", diff --git a/ports/boost-parameter/portfile.cmake b/ports/boost-parameter/portfile.cmake index 2d9c1acc512241..ba5c515792192c 100644 --- a/ports/boost-parameter/portfile.cmake +++ b/ports/boost-parameter/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/parameter - REF boost-1.76.0 - SHA512 737dac55fac0e4e31e80fb4adfa75880a857a41007d2cdbfacb58f89171410b7136bae69cee590a9de3735b58dc9c9bbf8c724f3ef4b4ac4cf27f695f8efc640 + REF boost-1.77.0 + SHA512 a9a46096b62af9a938403fe007cdf6ea7a0a5f1bd47bbecaad0e947c8175f848ccc44028a10470af3815157a604f4c2156ddc59d1dda07a1a0c1213728062932 HEAD_REF master ) diff --git a/ports/boost-parameter/vcpkg.json b/ports/boost-parameter/vcpkg.json index d662d36a764c45..4d1a532871776d 100644 --- a/ports/boost-parameter/vcpkg.json +++ b/ports/boost-parameter/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-parameter", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost parameter module", "homepage": "https://github.com/boostorg/parameter", "dependencies": [ diff --git a/ports/boost-pfr/portfile.cmake b/ports/boost-pfr/portfile.cmake index 7c6489e2771c84..615a77b51586ad 100644 --- a/ports/boost-pfr/portfile.cmake +++ b/ports/boost-pfr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pfr - REF boost-1.76.0 - SHA512 cb6108970c50fff93677f70f4610376d1d917b372633c913290fcefbd92c24329717fd95060a9403afe19daf9a525ee129c88eed7ce5320dd44dd6c56c7ec63f + REF boost-1.77.0 + SHA512 2b77f879d9ac7f9c1d137d353c6a0665a243292adae75d71d3c324bba6ca3a22b4ef80b511757e95e33d3aa6a2597e86f67a6a70bf81089bbbb476bcbfe3ad06 HEAD_REF master ) diff --git a/ports/boost-pfr/vcpkg.json b/ports/boost-pfr/vcpkg.json index 6c6cbf410192c2..ea10cd7b610b66 100644 --- a/ports/boost-pfr/vcpkg.json +++ b/ports/boost-pfr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-pfr", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost pfr module", "homepage": "https://github.com/boostorg/pfr", "dependencies": [ diff --git a/ports/boost-phoenix/portfile.cmake b/ports/boost-phoenix/portfile.cmake index 9c3f00410bb765..5ce6dfe70b01c4 100644 --- a/ports/boost-phoenix/portfile.cmake +++ b/ports/boost-phoenix/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/phoenix - REF boost-1.76.0 - SHA512 515895386647ea13a40045814f8f91989aa1ec257f139fff150401247fdf8684e8b1df73b18edd69ffeee87d6c25d4d895dbd6dbef54fec61ba0f192904eaad1 + REF boost-1.77.0 + SHA512 d34a1625476dcb47afbb5f96c70d824bfb76b4fca287b09b491d1fe6396d827ecc984f5d2b9e87b6a868f25c5fa676524da9a7d0e37f7288a35595a44b8d9201 HEAD_REF master ) diff --git a/ports/boost-phoenix/vcpkg.json b/ports/boost-phoenix/vcpkg.json index 49196cb71e1b2a..f4ea48609d3992 100644 --- a/ports/boost-phoenix/vcpkg.json +++ b/ports/boost-phoenix/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-phoenix", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost phoenix module", "homepage": "https://github.com/boostorg/phoenix", "dependencies": [ @@ -8,7 +8,6 @@ "boost-bind", "boost-config", "boost-core", - "boost-detail", "boost-function", "boost-fusion", "boost-mpl", diff --git a/ports/boost-poly-collection/portfile.cmake b/ports/boost-poly-collection/portfile.cmake index 695cc40c86e141..9ced6b08a07179 100644 --- a/ports/boost-poly-collection/portfile.cmake +++ b/ports/boost-poly-collection/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/poly_collection - REF boost-1.76.0 - SHA512 9bc910a72b232e8615d43e967f5a19d2b5910dcaf1641c71b9bbc67ea72e8fb96a834fab8657bce89be574ec9d56e298cb8f36d7663476a5604876fba6ae1cde + REF boost-1.77.0 + SHA512 94871d93bd92fd05a7d68838b7db9f92c7c3814ea71f23364486890ba8099b6374e59288a666890727e161d5e05fad417085f44b049e942617c99c9c11232639 HEAD_REF master ) diff --git a/ports/boost-poly-collection/vcpkg.json b/ports/boost-poly-collection/vcpkg.json index 50040ac1a376d1..8a8378ad7dd334 100644 --- a/ports/boost-poly-collection/vcpkg.json +++ b/ports/boost-poly-collection/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-poly-collection", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost poly_collection module", "homepage": "https://github.com/boostorg/poly_collection", "dependencies": [ "boost-assert", "boost-config", "boost-core", - "boost-detail", "boost-iterator", "boost-mp11", "boost-mpl", diff --git a/ports/boost-polygon/portfile.cmake b/ports/boost-polygon/portfile.cmake index 6f81c5c16ff109..b0387c7b4424e0 100644 --- a/ports/boost-polygon/portfile.cmake +++ b/ports/boost-polygon/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/polygon - REF boost-1.76.0 - SHA512 3b735ae15c75581297ad920a79c30ad3e58da4a747333ff9c6637ad10e08c536d0e9b495b20ecc743af98a9d46af92aa602b52aede50c1a77de84f121cd13a4a + REF boost-1.77.0 + SHA512 939529b812c97d3c40e2b0954da12f4aff867fc953dae6c44c7b60860ec665467e5856ef8f16cad8795e490c59b2e17d3539ea5575e401e552aab7511c93d6d8 HEAD_REF master ) diff --git a/ports/boost-polygon/vcpkg.json b/ports/boost-polygon/vcpkg.json index 89a857b1bd939b..1e0f3f14e20178 100644 --- a/ports/boost-polygon/vcpkg.json +++ b/ports/boost-polygon/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-polygon", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost polygon module", "homepage": "https://github.com/boostorg/polygon", "dependencies": [ diff --git a/ports/boost-pool/portfile.cmake b/ports/boost-pool/portfile.cmake index a2d4d2296f2ceb..332836b926d202 100644 --- a/ports/boost-pool/portfile.cmake +++ b/ports/boost-pool/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/pool - REF boost-1.76.0 - SHA512 df25c5df62471b176699300aac2b8fdfced427ebcf76bf9ef4f17679e5dfd52c25c227e628654de487b3403ecbd64c4a864d1c2ef52d52b58f185c5acbe9588e + REF boost-1.77.0 + SHA512 8b72d2a17f7295fd60660c5b3ec8d79f2279f97e4f870d88ffee35978f226ce3d9028322b84a484cd4555be2c0506f97edaccce7bf0ec76e6d89fd9fe7bd0285 HEAD_REF master ) diff --git a/ports/boost-pool/vcpkg.json b/ports/boost-pool/vcpkg.json index 8cdb410b3f8016..6c8c3a451675b2 100644 --- a/ports/boost-pool/vcpkg.json +++ b/ports/boost-pool/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-pool", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost pool module", "homepage": "https://github.com/boostorg/pool", "dependencies": [ "boost-assert", "boost-config", - "boost-detail", "boost-integer", "boost-throw-exception", "boost-type-traits", diff --git a/ports/boost-predef/portfile.cmake b/ports/boost-predef/portfile.cmake index 50f64847e149e9..dc4efd117e8b2c 100644 --- a/ports/boost-predef/portfile.cmake +++ b/ports/boost-predef/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/predef - REF boost-1.76.0 - SHA512 89c04eff29e31010072fbe79c8d4ecb3baa0dd48cd8eba8847b836fe6d355a5e1243726156ff7343be11d849096049cdb9420d5238792ea116dbe8e2645f3bf6 + REF boost-1.77.0 + SHA512 d3c6b0fc10200aa49d7b5db542e40a858f1697c457391fab777384a974718f2b855fc526f6f44fb329a74139b46e05cc17ce57db2e35fe0388c976ce80f1f964 HEAD_REF master ) diff --git a/ports/boost-predef/vcpkg.json b/ports/boost-predef/vcpkg.json index 2c571dccf6c461..5f561935c837e5 100644 --- a/ports/boost-predef/vcpkg.json +++ b/ports/boost-predef/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-predef", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost predef module", "homepage": "https://github.com/boostorg/predef", "dependencies": [ diff --git a/ports/boost-preprocessor/portfile.cmake b/ports/boost-preprocessor/portfile.cmake index b70eb0a1c3afbe..09673725f6870c 100644 --- a/ports/boost-preprocessor/portfile.cmake +++ b/ports/boost-preprocessor/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/preprocessor - REF boost-1.76.0 - SHA512 f7849c57fe0985ba872e591133fed8adf24bfd337b04847d1a30c5978881a8cc2050ad43b4e9ce0bc32a593bd87c14e9f0433aeb7d0b61a9d05ec3bd9d53c7b7 + REF boost-1.77.0 + SHA512 26d7487d9978551596cd243172c9ac6effd3f030244026fb73cac4dc64a458b5d1f0383ff4ac695492c598629d1bc93c186169b5be655d3cf700cf599cb22610 HEAD_REF master ) diff --git a/ports/boost-preprocessor/vcpkg.json b/ports/boost-preprocessor/vcpkg.json index c92339abe02d29..7660f620f38a72 100644 --- a/ports/boost-preprocessor/vcpkg.json +++ b/ports/boost-preprocessor/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-preprocessor", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost preprocessor module", "homepage": "https://github.com/boostorg/preprocessor", "dependencies": [ diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index c59feceb935003..27c0d16470d439 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/process - REF boost-1.76.0 - SHA512 d704892dee6ca83b4234bea9b267dae7db8d78ee740b037e054ab15051de0e09ea9bb9707be545c3c6d423f4a58259300de563cee54c3c76f632f13ab6bdce21 + REF boost-1.77.0 + SHA512 00eb27f702f092a20fdf1669b8c9c993b751971592d0bc5aa50b02d99d985a75361621b624aa51eb550c9e7905e15877168ae9d0feb1957fc85f99c264b152fd HEAD_REF master ) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 580cfbfa6d77d6..594b842c6081bf 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-process", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "supports": "!emscripten", diff --git a/ports/boost-program-options/portfile.cmake b/ports/boost-program-options/portfile.cmake index 77bc117b6653fc..1988be92705926 100644 --- a/ports/boost-program-options/portfile.cmake +++ b/ports/boost-program-options/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/program_options - REF boost-1.76.0 - SHA512 5cbd02923de60da9b8b4ac232daabc4b3ac8c07f46d8de1a69576c331d1f13951166d4c61649328c68405d7e4d2cb2bf5996521a53c211f5399bd67acb546bce + REF boost-1.77.0 + SHA512 9035f69d3b478db65c960e00887130ff1388d2af518ec7507dfc8708c601400aeefca091b693764dfeb539a1aa29583101360a55c6ae859053e1be88cb5e70aa HEAD_REF master ) diff --git a/ports/boost-program-options/vcpkg.json b/ports/boost-program-options/vcpkg.json index f4bab0e24d9a28..28af65129ae361 100644 --- a/ports/boost-program-options/vcpkg.json +++ b/ports/boost-program-options/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-program-options", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost program_options module", "homepage": "https://github.com/boostorg/program_options", "dependencies": [ @@ -16,7 +16,6 @@ "boost-function", "boost-iterator", "boost-lexical-cast", - "boost-math", { "name": "boost-modular-build-helper", "host": true @@ -26,6 +25,10 @@ "boost-throw-exception", "boost-tokenizer", "boost-type-traits", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-property-map-parallel/portfile.cmake b/ports/boost-property-map-parallel/portfile.cmake new file mode 100644 index 00000000000000..fe15c5e8febb32 --- /dev/null +++ b/ports/boost-property-map-parallel/portfile.cmake @@ -0,0 +1,12 @@ +# Automatically generated by scripts/boost/generate-ports.ps1 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boostorg/property_map_parallel + REF boost-1.77.0 + SHA512 e564ab747b9885002d983fd42196f2a84655ebf74a0fd42647067dca075b8a2462d5b88d65faa9e91284018a373c5b689749c42a9812922be222ebfb24064a91 + HEAD_REF master +) + +include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) +boost_modular_headers(SOURCE_PATH ${SOURCE_PATH}) diff --git a/ports/boost-property-map-parallel/vcpkg.json b/ports/boost-property-map-parallel/vcpkg.json new file mode 100644 index 00000000000000..accbd38746c614 --- /dev/null +++ b/ports/boost-property-map-parallel/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "boost-property-map-parallel", + "version": "1.77.0", + "description": "Boost property_map_parallel module", + "homepage": "https://github.com/boostorg/property_map_parallel", + "dependencies": [ + "boost-assert", + "boost-bind", + "boost-concept-check", + "boost-config", + "boost-function", + { + "name": "boost-mpi", + "platform": "!uwp" + }, + "boost-mpl", + "boost-multi-index", + "boost-optional", + "boost-property-map", + "boost-serialization", + "boost-smart-ptr", + "boost-static-assert", + "boost-type-traits", + "boost-vcpkg-helpers" + ] +} diff --git a/ports/boost-property-map/portfile.cmake b/ports/boost-property-map/portfile.cmake index c3e8e212730b1c..8ba04af74875bb 100644 --- a/ports/boost-property-map/portfile.cmake +++ b/ports/boost-property-map/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_map - REF boost-1.76.0 - SHA512 aa9778cc00a11af811a8163ab1530b92d23ded36b48b1fa3edfeef0926530c9318be93da0c3e5c13691a841c288d5189145d89d4f1d321884dc1f0a84fc2feba + REF boost-1.77.0 + SHA512 3ba808996ebb148e328778cc59fc210b3cf75f9b7baa2b14ce615d43a9253febe1e54160a534dc13eaade1dda96f0c9f406c2229c0f621033678842621cb7727 HEAD_REF master ) diff --git a/ports/boost-property-map/vcpkg.json b/ports/boost-property-map/vcpkg.json index d9960f408719fe..1706a7c9432d2a 100644 --- a/ports/boost-property-map/vcpkg.json +++ b/ports/boost-property-map/vcpkg.json @@ -1,23 +1,18 @@ { "name": "boost-property-map", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost property_map module", "homepage": "https://github.com/boostorg/property_map", "dependencies": [ "boost-any", "boost-assert", - "boost-bind", "boost-concept-check", "boost-config", "boost-core", "boost-function", "boost-iterator", "boost-lexical-cast", - "boost-math", "boost-mpl", - "boost-multi-index", - "boost-optional", - "boost-serialization", "boost-smart-ptr", "boost-static-assert", "boost-throw-exception", diff --git a/ports/boost-property-tree/portfile.cmake b/ports/boost-property-tree/portfile.cmake index dd20b347b53560..f3ad60b71ca7a4 100644 --- a/ports/boost-property-tree/portfile.cmake +++ b/ports/boost-property-tree/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/property_tree - REF boost-1.76.0 - SHA512 bd138f9ead12144b2975cf961d9820d6df4729491c259123b15f49f85c54b0391093874a5f825fbc9fce6d67746cef0a0bde893b448d0e07489abec67aa1eee1 + REF boost-1.77.0 + SHA512 60bbac071e1d62bf95e5f490e8ebde97313643ee0ad512f06247fddc89da9934322fe3351274233b7b32ac7d8602b80ae03e9161b2dbad477bdf2ff3f41aca22 HEAD_REF master ) diff --git a/ports/boost-property-tree/vcpkg.json b/ports/boost-property-tree/vcpkg.json index c01c411e2b19a8..dceaf13214139b 100644 --- a/ports/boost-property-tree/vcpkg.json +++ b/ports/boost-property-tree/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-property-tree", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost property_tree module", "homepage": "https://github.com/boostorg/property_tree", "dependencies": [ @@ -19,7 +19,6 @@ "boost-static-assert", "boost-throw-exception", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-proto/portfile.cmake b/ports/boost-proto/portfile.cmake index e643b8bb4a7347..1866bf5d3aa0e4 100644 --- a/ports/boost-proto/portfile.cmake +++ b/ports/boost-proto/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/proto - REF boost-1.76.0 - SHA512 0acca1fe1e0d41f919fd721a60dedcba9c88fc490a37012cdda617272caac036a2f1686bbf8cc380b3989cee4e3cfce9fed4ebe3242ef9b7394b944212ba545d + REF boost-1.77.0 + SHA512 2c50272ffbf1e0c69cec467238f77b4617ed7099a197a45c51232587f38e063b5397d3ab00ecd66dcb23ff0ab2ad22885d56569bc11093613de4e31b7f8d6a5a HEAD_REF master ) diff --git a/ports/boost-proto/vcpkg.json b/ports/boost-proto/vcpkg.json index 9adf4165390def..7bfba355cb14a2 100644 --- a/ports/boost-proto/vcpkg.json +++ b/ports/boost-proto/vcpkg.json @@ -1,12 +1,11 @@ { "name": "boost-proto", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost proto module", "homepage": "https://github.com/boostorg/proto", "dependencies": [ "boost-config", "boost-core", - "boost-detail", "boost-fusion", "boost-mpl", "boost-preprocessor", diff --git a/ports/boost-ptr-container/portfile.cmake b/ports/boost-ptr-container/portfile.cmake index da341f87842a19..3ef8d6a1520a83 100644 --- a/ports/boost-ptr-container/portfile.cmake +++ b/ports/boost-ptr-container/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ptr_container - REF boost-1.76.0 - SHA512 11a08ff378e0e70f18a79ded47c339eee9e1bf4fb7bd7ea5283f9d7b888112904453d8e6e3970993706f3d90069bd765bf848ec9a8b8edb0595f5b40f19ce1d8 + REF boost-1.77.0 + SHA512 31075bef92e568c125e03177ad6222f8708f86f09e469a894c676036e4fb57cee6befb709b22f23d0949fb7e9f5280417e6109d3ba2b756ec6e735783222d531 HEAD_REF master ) diff --git a/ports/boost-ptr-container/vcpkg.json b/ports/boost-ptr-container/vcpkg.json index 1edc6dfe2fb379..8b1c2ef5d33c91 100644 --- a/ports/boost-ptr-container/vcpkg.json +++ b/ports/boost-ptr-container/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ptr-container", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost ptr_container module", "homepage": "https://github.com/boostorg/ptr_container", "dependencies": [ diff --git a/ports/boost-python/portfile.cmake b/ports/boost-python/portfile.cmake index 097f770f2073e4..f8bcfccad20737 100644 --- a/ports/boost-python/portfile.cmake +++ b/ports/boost-python/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/python - REF boost-1.76.0 - SHA512 ab2d99f752dced241045c597408d3a76f78c800717752dc091510542a754fb86140359fdab81b57ff8405d05a1814083c3ddfa032b0d692cc40c3af4af496e91 + REF boost-1.77.0 + SHA512 755a5636e9c65586d0459d017d93a88e5d9973da262ac1b60486d8159c9601c289b9e1acb45fd67bcd24b73e7c841d6e224729dedc9f7996bc9aea52baaeca80 HEAD_REF master ) diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 754db2e9cfff3d..0ba6de705c49f2 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,11 +1,11 @@ { "name": "boost-python", - "version": "1.76.0", - "port-version": 1, + "version": "1.77.0", "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "supports": "!uwp & !(arm & windows) & !emscripten", "dependencies": [ + "boost-align", "boost-bind", { "name": "boost-build", @@ -21,7 +21,6 @@ "boost-integer", "boost-iterator", "boost-lexical-cast", - "boost-math", { "name": "boost-modular-build-helper", "host": true @@ -36,7 +35,11 @@ "boost-type-traits", "boost-utility", "boost-vcpkg-helpers", - "python3" + "python3", + { + "name": "vcpkg-cmake", + "host": true + } ], "features": { "python2": { diff --git a/ports/boost-qvm/portfile.cmake b/ports/boost-qvm/portfile.cmake index eaf65eb1f2f9dc..2ced66419075b7 100644 --- a/ports/boost-qvm/portfile.cmake +++ b/ports/boost-qvm/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/qvm - REF boost-1.76.0 - SHA512 98fc06a38ca220e53383295b0dae966272871e2d99ef23e2fb14790722ce36d75de158ef6d34bc44e99ee8692e33cae69762d2f058e88059e625574012e336ce + REF boost-1.77.0 + SHA512 23cc5a83a056270ec46e2e4a405da9319d08c551cec6011ecb0af67ce21bc6e0f2d992e2257c96de7bf5256910d527ad365afc3d2d9dfe16513ddfd4456eadf9 HEAD_REF master ) diff --git a/ports/boost-qvm/vcpkg.json b/ports/boost-qvm/vcpkg.json index 9ead8ef80be78b..2a92183a57066f 100644 --- a/ports/boost-qvm/vcpkg.json +++ b/ports/boost-qvm/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-qvm", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost qvm module", "homepage": "https://github.com/boostorg/qvm", "dependencies": [ diff --git a/ports/boost-random/portfile.cmake b/ports/boost-random/portfile.cmake index 1786248e6bdb6a..587d4db9da93c4 100644 --- a/ports/boost-random/portfile.cmake +++ b/ports/boost-random/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/random - REF boost-1.76.0 - SHA512 d34405b2b5d9e4de201b07d97a2440dbc49f54eba6e1f13f37a50f453d2e09ca7e0a0c2559706eab7f57651219325d2606cd29e91bff0710af269976504abb73 + REF boost-1.77.0 + SHA512 74b9bc57e685e79310c46d168f88cc04cff3bb58f37e66658b726d96e7ea3405ee8e3c50f6261e65d2dac2bf8edfa4fe30e987ce7d5cb31ed1cdf74ea4326814 HEAD_REF master ) diff --git a/ports/boost-random/vcpkg.json b/ports/boost-random/vcpkg.json index 4f40f9d6c1798c..d2e9e6c4ff3244 100644 --- a/ports/boost-random/vcpkg.json +++ b/ports/boost-random/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-random", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost random module", "homepage": "https://github.com/boostorg/random", "dependencies": [ @@ -12,7 +12,6 @@ }, "boost-config", "boost-core", - "boost-detail", "boost-dynamic-bitset", "boost-integer", "boost-io", @@ -26,6 +25,10 @@ "boost-throw-exception", "boost-type-traits", "boost-utility", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-range/portfile.cmake b/ports/boost-range/portfile.cmake index aa78a1ae6c47b2..605832012ef3c6 100644 --- a/ports/boost-range/portfile.cmake +++ b/ports/boost-range/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/range - REF boost-1.76.0 - SHA512 dc7801aad1bb271c28d9a0ec6e132b5b6992d4638b90c007e392148903acb27ef9bfe1273d00db181416e0325beb756eac26f458a360740889c521b8f5424fb4 + REF boost-1.77.0 + SHA512 502dfd6f4c08fd653fee6a9fac14c717ddcd53d3e9ff68c43b80ccac73b88bb98bfb92e88508b82eb8eafa96e29914fe43b0ab550f62e6708d5ea0465ae9d51e HEAD_REF master ) diff --git a/ports/boost-range/vcpkg.json b/ports/boost-range/vcpkg.json index b17779eed83b05..254fc05370e37d 100644 --- a/ports/boost-range/vcpkg.json +++ b/ports/boost-range/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-range", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost range module", "homepage": "https://github.com/boostorg/range", "dependencies": [ @@ -14,7 +14,6 @@ "boost-detail", "boost-iterator", "boost-mpl", - "boost-numeric-conversion", "boost-optional", "boost-preprocessor", "boost-regex", diff --git a/ports/boost-ratio/portfile.cmake b/ports/boost-ratio/portfile.cmake index 9c87047e74118c..352cbbe17e729b 100644 --- a/ports/boost-ratio/portfile.cmake +++ b/ports/boost-ratio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ratio - REF boost-1.76.0 - SHA512 514fa35a91604ff823ee6c4736a5e5d6059ba445466884e2e58c38f6daba6e36c18f4071ca928bbc338036e67435d210d130822b122e029a3440c409507df201 + REF boost-1.77.0 + SHA512 aa575893c00eac177cef6a5e8817747a457bae1ef83cd32b81d950b9f13cdc1b744e0f8336773361727f4cc374d4731e973aa3f33f19ef53830f2b0818bc8b0d HEAD_REF master ) diff --git a/ports/boost-ratio/vcpkg.json b/ports/boost-ratio/vcpkg.json index e3f71c4a6a432f..3638387894cadd 100644 --- a/ports/boost-ratio/vcpkg.json +++ b/ports/boost-ratio/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ratio", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost ratio module", "homepage": "https://github.com/boostorg/ratio", "dependencies": [ diff --git a/ports/boost-rational/portfile.cmake b/ports/boost-rational/portfile.cmake index 61cf338a57ccc5..915af079212486 100644 --- a/ports/boost-rational/portfile.cmake +++ b/ports/boost-rational/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/rational - REF boost-1.76.0 - SHA512 399c1f49a73701f6db9304ac476f88af50470d96d400a68695ed3b3f8462622b4dde671053c6b3fcdd6474e5c2e7527946b79a5ea378af77337eee3b0ed16680 + REF boost-1.77.0 + SHA512 aa5328efb8b614ebbb7e4997c4b6fb1888110ece16d2ccd003ee5a284f16f59c5088c6d2750f766c99beeeefc95eba47aed6e6861ebc04bd9b7c10a2b1feccdc HEAD_REF master ) diff --git a/ports/boost-rational/vcpkg.json b/ports/boost-rational/vcpkg.json index b3d2a6091ef377..566d04c56b4f19 100644 --- a/ports/boost-rational/vcpkg.json +++ b/ports/boost-rational/vcpkg.json @@ -1,11 +1,12 @@ { "name": "boost-rational", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost rational module", "homepage": "https://github.com/boostorg/rational", "dependencies": [ "boost-assert", "boost-config", + "boost-core", "boost-integer", "boost-static-assert", "boost-throw-exception", diff --git a/ports/boost-regex/portfile.cmake b/ports/boost-regex/portfile.cmake index e5c7381147b112..658d78cd3c95f9 100644 --- a/ports/boost-regex/portfile.cmake +++ b/ports/boost-regex/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/regex - REF boost-1.76.0 - SHA512 03af2b4ced7e09c3cf14fe9d7befed41e2be1f6e999445d2c376f0a6fcf82fa29ee39d6bdab976d76281a388466d39e71cb9ea069bc8df079137427d4576e264 + REF boost-1.77.0 + SHA512 1723747db78ff927b5e713604cedf5c8a2eb436ccb2b8e36691376bbf814438ed3e6a4862539f6b85aff27cc3690e0d37b0af7c6925e60b755a907e4ac51378c HEAD_REF master ) diff --git a/ports/boost-regex/vcpkg.json b/ports/boost-regex/vcpkg.json index 96f3069106e911..131e77673466a8 100644 --- a/ports/boost-regex/vcpkg.json +++ b/ports/boost-regex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-regex", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost regex module", "homepage": "https://github.com/boostorg/regex", "dependencies": [ @@ -13,9 +13,7 @@ "boost-config", "boost-container-hash", "boost-core", - "boost-detail", "boost-integer", - "boost-iterator", { "name": "boost-modular-build-helper", "host": true @@ -26,8 +24,11 @@ "boost-static-assert", "boost-throw-exception", "boost-type-traits", - "boost-utility", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ], "features": { "icu": { diff --git a/ports/boost-safe-numerics/portfile.cmake b/ports/boost-safe-numerics/portfile.cmake index 0994a9ba594f8a..986b9853b0614d 100644 --- a/ports/boost-safe-numerics/portfile.cmake +++ b/ports/boost-safe-numerics/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/safe_numerics - REF boost-1.76.0 - SHA512 450b69bbd03713189d8ea0e309ffa3e397d832ef0422862b67a8bca9d4615698cc3380a19cdb7b97f53c32ceb7afd18f258f0be7552a5641bf83351ac41b3973 + REF boost-1.77.0 + SHA512 780fc1c03763ff43f50c4672489427b61eed92168618ca7199160c0124ca79be4da5e1e3691ee85bf7b7f1e1d79897412b0bac6280f224ce6d4e7dea4862a363 HEAD_REF master ) diff --git a/ports/boost-safe-numerics/vcpkg.json b/ports/boost-safe-numerics/vcpkg.json index bbe3943bebc256..d328b0575bc361 100644 --- a/ports/boost-safe-numerics/vcpkg.json +++ b/ports/boost-safe-numerics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-safe-numerics", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost safe_numerics module", "homepage": "https://github.com/boostorg/safe_numerics", "dependencies": [ diff --git a/ports/boost-scope-exit/portfile.cmake b/ports/boost-scope-exit/portfile.cmake index cf95910f72e856..92047249581e8a 100644 --- a/ports/boost-scope-exit/portfile.cmake +++ b/ports/boost-scope-exit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/scope_exit - REF boost-1.76.0 - SHA512 addc6040749187ca5c6d22d9c33ef839422658f80588841b2c722c508049e04c6b41a228c739066438c9562ffc1c35cc2ec3f3e4ea5b2443fdef532e5708d08f + REF boost-1.77.0 + SHA512 f0a73ba219f2c47ff6e1dc6c9648708e6d31b11c85f4579ba35a6cfa4b633390effcc3508d269370101f776c1217f087b2f677f2e6bb1b9f07b33240f2ce3c77 HEAD_REF master ) diff --git a/ports/boost-scope-exit/vcpkg.json b/ports/boost-scope-exit/vcpkg.json index 7f0b9400c711ad..98eec990818d96 100644 --- a/ports/boost-scope-exit/vcpkg.json +++ b/ports/boost-scope-exit/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-scope-exit", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost scope_exit module", "homepage": "https://github.com/boostorg/scope_exit", "dependencies": [ "boost-config", - "boost-detail", "boost-function", "boost-preprocessor", "boost-type-traits", diff --git a/ports/boost-serialization/portfile.cmake b/ports/boost-serialization/portfile.cmake index c0ffebaef8ed52..51fe27f7707b23 100644 --- a/ports/boost-serialization/portfile.cmake +++ b/ports/boost-serialization/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/serialization - REF boost-1.76.0 - SHA512 ac9a0453f6244518a250c3d51f341b001618f2032b723467ad7a93aaf77a66d970d22b4a06072e98d4fc30b1b850c3cb9a7c7e3b46d6e4ea1adb2d9b55ff4b68 + REF boost-1.77.0 + SHA512 107264f536f3068415b7abbb30103defb9a51ef75b09132000381a8092cccc8f2796d39769a70b911c7b4aa8dc4ba1d987107a653f9dc6360769d5ecc525fc8d HEAD_REF master ) diff --git a/ports/boost-serialization/vcpkg.json b/ports/boost-serialization/vcpkg.json index 172efc1629264e..f75fe3b5fa0253 100644 --- a/ports/boost-serialization/vcpkg.json +++ b/ports/boost-serialization/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-serialization", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost serialization module", "homepage": "https://github.com/boostorg/serialization", "dependencies": [ @@ -33,6 +33,10 @@ "boost-unordered", "boost-utility", "boost-variant", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-signals2/portfile.cmake b/ports/boost-signals2/portfile.cmake index f65973dd6784f3..49c102fcaaea33 100644 --- a/ports/boost-signals2/portfile.cmake +++ b/ports/boost-signals2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/signals2 - REF boost-1.76.0 - SHA512 d298a325c35dc0eda9614b6e8a4e84e7ef240e83e2b5938bc521ac99e5095c13b7a4e6a48b1b30bf1c038dd4c3e43d23dd85c14473da942cf65c5723fbb1c954 + REF boost-1.77.0 + SHA512 7391cff74532df1df43c107070bba15324d3511066ec6eb5062775f3bc1ca6be0846e1719dc638a9920e09ca7f2c943909434e8d36758d6535e192d7e5a4c298 HEAD_REF master ) diff --git a/ports/boost-signals2/vcpkg.json b/ports/boost-signals2/vcpkg.json index caebbac00cca80..4e3e790a8feaf1 100644 --- a/ports/boost-signals2/vcpkg.json +++ b/ports/boost-signals2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-signals2", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost signals2 module", "homepage": "https://github.com/boostorg/signals2", "dependencies": [ @@ -8,7 +8,6 @@ "boost-bind", "boost-config", "boost-core", - "boost-detail", "boost-function", "boost-iterator", "boost-mpl", @@ -20,7 +19,6 @@ "boost-throw-exception", "boost-tuple", "boost-type-traits", - "boost-utility", "boost-variant", "boost-vcpkg-helpers" ] diff --git a/ports/boost-smart-ptr/portfile.cmake b/ports/boost-smart-ptr/portfile.cmake index 83120dd9896b84..479c4c63b0caec 100644 --- a/ports/boost-smart-ptr/portfile.cmake +++ b/ports/boost-smart-ptr/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/smart_ptr - REF boost-1.76.0 - SHA512 e6ac81d1da13daf080d67f046fae19e98ef4f1eeb17b65743b8ff52e4a28b15152b6fdf083662f9a2555694a93064f78fd0ec432bfe09d617d13fa7422e7f28b + REF boost-1.77.0 + SHA512 b34396f4e1b5660391b850b84393c8df8f207f5a8bb753af3f4ebc7f27d867e300d29e977ecd2f307089b3666949059ce3df64b68ab492873dfa5776b099b172 HEAD_REF master ) diff --git a/ports/boost-smart-ptr/vcpkg.json b/ports/boost-smart-ptr/vcpkg.json index c50e9a2e6cb631..a3b85edc9d3948 100644 --- a/ports/boost-smart-ptr/vcpkg.json +++ b/ports/boost-smart-ptr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-smart-ptr", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost smart_ptr module", "homepage": "https://github.com/boostorg/smart_ptr", "dependencies": [ diff --git a/ports/boost-sort/portfile.cmake b/ports/boost-sort/portfile.cmake index 08925d5f70eff5..eb6f92a64aeb2d 100644 --- a/ports/boost-sort/portfile.cmake +++ b/ports/boost-sort/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/sort - REF boost-1.76.0 - SHA512 71fd8a9b5ccf29d5971bdb2b58288555a6a63c12b5463dcd0e11fc7132f0c620a77fde4492005204e8ef4a9084a9ecb29f6c9ad8e325227e491a99ba033f2080 + REF boost-1.77.0 + SHA512 b27b58ea45a0392b8d2151e2d39899383f3c5d2a487de67433c64d89d529eaa8d7ca07559b944f0b93986e70f1de8d366d2d726e0a425c973ad9d98e1f8946cd HEAD_REF master ) diff --git a/ports/boost-sort/vcpkg.json b/ports/boost-sort/vcpkg.json index ec6278f4915b07..03e7f7b519b4bb 100644 --- a/ports/boost-sort/vcpkg.json +++ b/ports/boost-sort/vcpkg.json @@ -1,14 +1,14 @@ { "name": "boost-sort", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost sort module", "homepage": "https://github.com/boostorg/sort", "dependencies": [ "boost-config", + "boost-core", "boost-range", "boost-static-assert", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-spirit/portfile.cmake b/ports/boost-spirit/portfile.cmake index 829172d4836448..b5367ece548138 100644 --- a/ports/boost-spirit/portfile.cmake +++ b/ports/boost-spirit/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/spirit - REF boost-1.76.0 - SHA512 0ef312d514fac39636c9f7f1aff1746592eaf69be820d488503a99ce28530e2c987f7102f7d2928f31a263de5e1053500a29ec512684fac3489d0bc48a44cfa2 + REF boost-1.77.0 + SHA512 6fa466b084daf1a8b7191114217345be45226316e178e6b6ba6154493e674c584d903bd9d0a4f88104f60e5b47a99ad7e44052fe9ac2bc86d9be3f68bde42897 HEAD_REF master ) diff --git a/ports/boost-spirit/vcpkg.json b/ports/boost-spirit/vcpkg.json index 3ba81888f24125..081c5af52cab83 100644 --- a/ports/boost-spirit/vcpkg.json +++ b/ports/boost-spirit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-spirit", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost spirit module", "homepage": "https://github.com/boostorg/spirit", "dependencies": [ @@ -8,7 +8,6 @@ "boost-assert", "boost-config", "boost-core", - "boost-detail", "boost-endian", "boost-foreach", "boost-function", diff --git a/ports/boost-stacktrace/portfile.cmake b/ports/boost-stacktrace/portfile.cmake index ccc0d595894e78..a849f0ccddeb0a 100644 --- a/ports/boost-stacktrace/portfile.cmake +++ b/ports/boost-stacktrace/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stacktrace - REF boost-1.76.0 - SHA512 4a3ea0279fd41f19755ea6f90d7bb0b271d1e6c43c6e631acd17104a200bd425b9dd58a9cfcd7b1b1203e86c5a9216507d8e033f125bd582c5b68564a2a8200f + REF boost-1.77.0 + SHA512 bb4605b14ab1e1fbb2a593f8723ed5a3ef9258b21d7d0860f75773faca6c696792a8818f2a24c60f52b65e679067ac372d7a229682e52e05430555ed8e475b15 HEAD_REF master ) diff --git a/ports/boost-stacktrace/vcpkg.json b/ports/boost-stacktrace/vcpkg.json index ff1b17488b2c08..4398affb7edccb 100644 --- a/ports/boost-stacktrace/vcpkg.json +++ b/ports/boost-stacktrace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-stacktrace", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost stacktrace module", "homepage": "https://github.com/boostorg/stacktrace", "supports": "!uwp", @@ -21,6 +21,10 @@ "boost-static-assert", "boost-type-traits", "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-statechart/portfile.cmake b/ports/boost-statechart/portfile.cmake index d1271b2dd5937c..c11e60481a78c4 100644 --- a/ports/boost-statechart/portfile.cmake +++ b/ports/boost-statechart/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/statechart - REF boost-1.76.0 - SHA512 3b9476d1b59ecaf867c19f106c4e6ff9e66c5b26f9793256a52b8dc47c26ca63dfd67dfef374b20596287764589d7b274bf88e079fc191ff186321946ae3050d + REF boost-1.77.0 + SHA512 6bbe4a45ae1ff8ec76282d4bf2579a7882fe4682531facd97743096da33c715ea800fbf5e006c0d5b19a96b273fd297ee15c83a1ef90f1e0984aff66977ecbf1 HEAD_REF master ) diff --git a/ports/boost-statechart/vcpkg.json b/ports/boost-statechart/vcpkg.json index b1a7d268751a57..0664a3a7d6006c 100644 --- a/ports/boost-statechart/vcpkg.json +++ b/ports/boost-statechart/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-statechart", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost statechart module", "homepage": "https://github.com/boostorg/statechart", "dependencies": [ diff --git a/ports/boost-static-assert/portfile.cmake b/ports/boost-static-assert/portfile.cmake index ab617b641acda2..418975fbb8fde2 100644 --- a/ports/boost-static-assert/portfile.cmake +++ b/ports/boost-static-assert/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_assert - REF boost-1.76.0 - SHA512 efd94b25d66f9841d41c8ad22e751e8489fc78de68172554ec2a82be61b7163c6b90fff56ab8dcf14da7b03770c6f2d14f317be5abbef796dc4d4366efd6498f + REF boost-1.77.0 + SHA512 465b6af0f0eb66b0587f97dd1869d86c31dcdb9eb2d7d55249d4dc2d4c77eca0a501d1ccb82e0f93fc3be80ed2983b1b854a116ec965654eac43bdaaa9d4b2dc HEAD_REF master ) diff --git a/ports/boost-static-assert/vcpkg.json b/ports/boost-static-assert/vcpkg.json index 6a27f491a5f0ed..73445511f2014c 100644 --- a/ports/boost-static-assert/vcpkg.json +++ b/ports/boost-static-assert/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-static-assert", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost static_assert module", "homepage": "https://github.com/boostorg/static_assert", "dependencies": [ "boost-config", - "boost-detail", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-static-string/portfile.cmake b/ports/boost-static-string/portfile.cmake index 5b1936e93e8fae..67e382249d1c38 100644 --- a/ports/boost-static-string/portfile.cmake +++ b/ports/boost-static-string/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/static_string - REF boost-1.76.0 - SHA512 cf7908b40eddc0ef478479834ce73f3352c8f29729a77698f9ebfa4fdf944b2aafce82410977764b5bedf4bfc92e000fc2c7c0df4cbdf487e0bb790cd5f35111 + REF boost-1.77.0 + SHA512 62e8f014e1b073282a56136591f3eebde2e43574f4d12a638483740483f768e844d2f9f741d31ba7acf9d541c6ac68c1b54f30741763d029091e7d4d1c64bd37 HEAD_REF master ) diff --git a/ports/boost-static-string/vcpkg.json b/ports/boost-static-string/vcpkg.json index 0137445f012e54..ee2674cadf8a14 100644 --- a/ports/boost-static-string/vcpkg.json +++ b/ports/boost-static-string/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-static-string", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost static_string module", "homepage": "https://github.com/boostorg/static_string", "dependencies": [ diff --git a/ports/boost-stl-interfaces/portfile.cmake b/ports/boost-stl-interfaces/portfile.cmake index 21d0f03fe9a70f..7d92dd19dfd9df 100644 --- a/ports/boost-stl-interfaces/portfile.cmake +++ b/ports/boost-stl-interfaces/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/stl_interfaces - REF boost-1.76.0 - SHA512 6e260882bda4b57369fefbd4515273617b84708bd5b68f1e5ee77038b1a80e88efb43bddf1931ec6af346bfe25ae4afe7e282fb65712eb3959da88ff0d110ece + REF boost-1.77.0 + SHA512 df752f05d8c6125cf93b79a5b2b2722e3890fba888e729fba5503500da75a930ee29f654225028d3874107e3d1d0c4ecb165656ecf90ab4ba456fa435fe60b18 HEAD_REF master ) diff --git a/ports/boost-stl-interfaces/vcpkg.json b/ports/boost-stl-interfaces/vcpkg.json index 8939c1fa4d1001..922a5f330e36a6 100644 --- a/ports/boost-stl-interfaces/vcpkg.json +++ b/ports/boost-stl-interfaces/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-stl-interfaces", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost stl_interfaces module", "homepage": "https://github.com/boostorg/stl_interfaces", "dependencies": [ diff --git a/ports/boost-system/portfile.cmake b/ports/boost-system/portfile.cmake index bfc5dee5af2e2f..bbae650e885c21 100644 --- a/ports/boost-system/portfile.cmake +++ b/ports/boost-system/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_buildpath_length_warning(37) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/system - REF boost-1.76.0 - SHA512 7943bab559c0629fec008fca6e4377fb34ac45f809fd67250cda8a364f5a47149bbb3541d1e684a7f92903e7b3b90c1fb0f6902c7a827c1f69a3ab7b5da1facd + REF boost-1.77.0 + SHA512 d546f9f46d3b3723f7f2e26f7378e700fff2a81d1da93e0f45feb9efbe6ebb5cb072f5b783765f48d39ce5e7cf57414d0cb69590f37a7eea6c181991f038ad55 HEAD_REF master ) diff --git a/ports/boost-system/vcpkg.json b/ports/boost-system/vcpkg.json index 39ffb53b2f4394..6ac3905da4f429 100644 --- a/ports/boost-system/vcpkg.json +++ b/ports/boost-system/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-system", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost system module", "homepage": "https://github.com/boostorg/system", "dependencies": [ @@ -14,6 +14,10 @@ "host": true }, "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-test/portfile.cmake b/ports/boost-test/portfile.cmake index 0f98c557d09b6f..79cc825047314c 100644 --- a/ports/boost-test/portfile.cmake +++ b/ports/boost-test/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/test - REF boost-1.76.0 - SHA512 87b4e949adefd840ca1ac61ad97b5798508742ef10ca12d05be0181150b5cd23fa25e473ff5cb077a55afb04d61846b96f7dae298c2dbb2deb71589e6dbcc968 + REF boost-1.77.0 + SHA512 017807e1af6aec76211e6b452f5bdeba6d8df47916c4e9f119fd38b184bb380f97e4584febf6c60305f6de9386888bbac3c59fb93be2368338e4d4bbb293f916 HEAD_REF master ) diff --git a/ports/boost-test/vcpkg.json b/ports/boost-test/vcpkg.json index 6b2c8edffbab63..5187f8f638d022 100644 --- a/ports/boost-test/vcpkg.json +++ b/ports/boost-test/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-test", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost test module", "homepage": "https://github.com/boostorg/test", "supports": "!uwp", @@ -31,6 +31,10 @@ "boost-static-assert", "boost-type-traits", "boost-utility", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-thread/portfile.cmake b/ports/boost-thread/portfile.cmake index 564a247abe7b02..2fa7472644891e 100644 --- a/ports/boost-thread/portfile.cmake +++ b/ports/boost-thread/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/thread - REF boost-1.76.0 - SHA512 ed833316025be8a52ccfb620b874f9b9956c778e453de01a657745563184efc123f461dd54dc048946df3319c1b512810a9ce1fb8940fd75771a171c95349e28 + REF boost-1.77.0 + SHA512 b23a35190f0b57b057ddfb035c8b0ed33ff876ee35e9b1998fb429be370f8476e99bae9462906b40b7a0fa7e67d00cd9aba9a2e891786b5e5ebdb9f219492cff HEAD_REF master ) diff --git a/ports/boost-thread/vcpkg.json b/ports/boost-thread/vcpkg.json index 9e76367b9f2c2d..b91791b014fc98 100644 --- a/ports/boost-thread/vcpkg.json +++ b/ports/boost-thread/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-thread", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost thread module", "homepage": "https://github.com/boostorg/thread", "dependencies": [ @@ -19,13 +19,12 @@ "boost-container-hash", "boost-core", "boost-date-time", - "boost-detail", "boost-exception", "boost-function", "boost-intrusive", "boost-io", + "boost-iterator", "boost-lexical-cast", - "boost-math", { "name": "boost-modular-build-helper", "host": true @@ -42,6 +41,10 @@ "boost-type-traits", "boost-utility", "boost-vcpkg-helpers", - "boost-winapi" + "boost-winapi", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-throw-exception/portfile.cmake b/ports/boost-throw-exception/portfile.cmake index 592e1402a47276..c2f1f091473a21 100644 --- a/ports/boost-throw-exception/portfile.cmake +++ b/ports/boost-throw-exception/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/throw_exception - REF boost-1.76.0 - SHA512 875d7332eb2d80ff30a3bf51817d20260cae9fc598c3e51b0e1e1fe3627f86003a36da6a3a4fe957b943bb8afe33ba1fdb4931d067024a01cd3e6a34c13aa86f + REF boost-1.77.0 + SHA512 26f6f8269c597f15a1c9ab78ee1244befa41448e9a9f8549b6ee149d495d0258dad83471507228162b6532dd9f8144b584bbdecfb0ef7c934f460faae9e3a373 HEAD_REF master ) diff --git a/ports/boost-throw-exception/vcpkg.json b/ports/boost-throw-exception/vcpkg.json index 8718629dd0eaf3..b543770aec786e 100644 --- a/ports/boost-throw-exception/vcpkg.json +++ b/ports/boost-throw-exception/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-throw-exception", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost throw_exception module", "homepage": "https://github.com/boostorg/throw_exception", "dependencies": [ diff --git a/ports/boost-timer/portfile.cmake b/ports/boost-timer/portfile.cmake index fcca8cb5b98ec0..455aae9d571680 100644 --- a/ports/boost-timer/portfile.cmake +++ b/ports/boost-timer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/timer - REF boost-1.76.0 - SHA512 c61fa1957a193600091959b49f5d84137ce8823fbe53bb3761bd40c9c0bd7d3660b7e449c0a903cdd6249e21d84ee19d86e26449aabe0df8404e400af946aa87 + REF boost-1.77.0 + SHA512 39b4081fc8a19565493687c7c438597ad14b93523a901b2909412c41fa46bc97d300caa509d4651b5985ec9c7f4272be888b4570c0aff622bdb89ddc75af2bff HEAD_REF master ) diff --git a/ports/boost-timer/vcpkg.json b/ports/boost-timer/vcpkg.json index aceb8db8758337..3c6d96c800d27b 100644 --- a/ports/boost-timer/vcpkg.json +++ b/ports/boost-timer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-timer", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost timer module", "homepage": "https://github.com/boostorg/timer", "dependencies": [ @@ -19,6 +19,10 @@ "boost-predef", "boost-system", "boost-throw-exception", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-tokenizer/portfile.cmake b/ports/boost-tokenizer/portfile.cmake index 9d00409818a91a..837dcda6baca7d 100644 --- a/ports/boost-tokenizer/portfile.cmake +++ b/ports/boost-tokenizer/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tokenizer - REF boost-1.76.0 - SHA512 287916582c98aaf8c6549899f9258b1428a0c20942677cfe10b9285487918ac10a17cb7896eaceb800ed645587dcdbab5a58d3e7c18bb13eec230d00056fc453 + REF boost-1.77.0 + SHA512 3e271ba5fd74ba532cb9fb37c9aabb2c37c7221d780dbcd20ac372109e8a93aae591b5bbdcf901325d3fa2e3bfb5f564601d9920397a78fe0a3a9efe58e992ad HEAD_REF master ) diff --git a/ports/boost-tokenizer/vcpkg.json b/ports/boost-tokenizer/vcpkg.json index f679818ddd174f..93e53cb376d4ae 100644 --- a/ports/boost-tokenizer/vcpkg.json +++ b/ports/boost-tokenizer/vcpkg.json @@ -1,12 +1,12 @@ { "name": "boost-tokenizer", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost tokenizer module", "homepage": "https://github.com/boostorg/tokenizer", "dependencies": [ "boost-assert", "boost-config", - "boost-detail", + "boost-core", "boost-iterator", "boost-mpl", "boost-throw-exception", diff --git a/ports/boost-tti/portfile.cmake b/ports/boost-tti/portfile.cmake index b61649bc632085..18564ada6c926f 100644 --- a/ports/boost-tti/portfile.cmake +++ b/ports/boost-tti/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tti - REF boost-1.76.0 - SHA512 7ccc41099e3b800fab74d90ed47943e3358f4c0dd88c1fe901d9f81f601794e78a6d0df9c7ab04dd59261870820371d89a8d5bb5c4983143b48bd9d5a22394a2 + REF boost-1.77.0 + SHA512 15a9237f78b2686aad1ddf215c3d49f2711add13cb5b5b5b591778776c17f2aa7a6fe7e4e5da5660fc58db1d24a9ea6f97fb6d1a8fe3bb5a66ef26c44d20e3e9 HEAD_REF master ) diff --git a/ports/boost-tti/vcpkg.json b/ports/boost-tti/vcpkg.json index d64351cea337bf..ae20d2496a98ac 100644 --- a/ports/boost-tti/vcpkg.json +++ b/ports/boost-tti/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-tti", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost tti module", "homepage": "https://github.com/boostorg/tti", "dependencies": [ "boost-config", - "boost-detail", "boost-function-types", "boost-mpl", "boost-preprocessor", diff --git a/ports/boost-tuple/portfile.cmake b/ports/boost-tuple/portfile.cmake index 5f731c81a0d0e1..270379b957f522 100644 --- a/ports/boost-tuple/portfile.cmake +++ b/ports/boost-tuple/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/tuple - REF boost-1.76.0 - SHA512 22c40d1c9f63cd22d0b632d81b15b30767273be019afe4ae8030cd9ac740e84f50e2db202b62448e9aa44bad2d8f0a3102e54cf1648b414ab7e30814c9da6219 + REF boost-1.77.0 + SHA512 01ac85a757d96b3b7ec337bb43de202db3a3a7212c4e1eea740d83a0dfc947666e9ad713332751bafd0f1395da12600cd8354b6e23ec00818dde61114dee4c45 HEAD_REF master ) diff --git a/ports/boost-tuple/vcpkg.json b/ports/boost-tuple/vcpkg.json index 3ec8a549cb5f1a..48d98c5214e932 100644 --- a/ports/boost-tuple/vcpkg.json +++ b/ports/boost-tuple/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-tuple", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost tuple module", "homepage": "https://github.com/boostorg/tuple", "dependencies": [ @@ -8,7 +8,6 @@ "boost-core", "boost-static-assert", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-type-erasure/portfile.cmake b/ports/boost-type-erasure/portfile.cmake index b7afec0973ed29..625b6671f57c78 100644 --- a/ports/boost-type-erasure/portfile.cmake +++ b/ports/boost-type-erasure/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_erasure - REF boost-1.76.0 - SHA512 8f304de312dfb59d3d02d90f1806908bf91a74459c6ad156902bbc7d72ad326e98e07c43f6cef76b6b82ba37d3f074584722e04212100272cdea613e4c47104e + REF boost-1.77.0 + SHA512 ed875163ee10eb9c25ae190933efbebdec0f5c8962e8cb6fc717bd036e2d0405bca2cd2613b8984dad348b0f54c87617e64882e7b8b00ef77a1fc533cdede76d HEAD_REF master ) diff --git a/ports/boost-type-erasure/vcpkg.json b/ports/boost-type-erasure/vcpkg.json index 867e95e8879b2a..48919ee7befa45 100644 --- a/ports/boost-type-erasure/vcpkg.json +++ b/ports/boost-type-erasure/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-erasure", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost type_erasure module", "homepage": "https://github.com/boostorg/type_erasure", "dependencies": [ @@ -10,7 +10,7 @@ "host": true }, "boost-config", - "boost-detail", + "boost-core", "boost-fusion", "boost-iterator", { @@ -25,8 +25,11 @@ "boost-throw-exception", "boost-type-traits", "boost-typeof", - "boost-utility", "boost-vcpkg-helpers", - "boost-vmd" + "boost-vmd", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-type-index/portfile.cmake b/ports/boost-type-index/portfile.cmake index 64942aefe29881..d554a0b06c33aa 100644 --- a/ports/boost-type-index/portfile.cmake +++ b/ports/boost-type-index/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_index - REF boost-1.76.0 - SHA512 8103eea4f14f15046761adc0b438a182adb1cfc245f02dc8211b9a7985d67c859f88fae2de2d7aef8f2bd969dcaccc28515e1339c0207551fa44e43ff4d8fbbf + REF boost-1.77.0 + SHA512 b2f15d95fc0a357264f1dc90a334b926a53d8dfbb1eb2f0efdebc586e96a1071467e4785e2e36eb335071a6da6b1aa9cb56bdb99f86a561d7d7041f845a5fe4a HEAD_REF master ) diff --git a/ports/boost-type-index/vcpkg.json b/ports/boost-type-index/vcpkg.json index ecc5bdaf5b9fe7..6b919889beccac 100644 --- a/ports/boost-type-index/vcpkg.json +++ b/ports/boost-type-index/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-type-index", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost type_index module", "homepage": "https://github.com/boostorg/type_index", "dependencies": [ diff --git a/ports/boost-type-traits/portfile.cmake b/ports/boost-type-traits/portfile.cmake index 10bf763268d956..0bbde14fbbe6fd 100644 --- a/ports/boost-type-traits/portfile.cmake +++ b/ports/boost-type-traits/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/type_traits - REF boost-1.76.0 - SHA512 3dcaedf9dbb95c6b96ce5d836ad85c1a5cdf766a3421b3235dfa4a0e4db94d0322d714e03d53961a7a0cbe597bf0c7c8689c61a23274b2c9c70f90780b349659 + REF boost-1.77.0 + SHA512 3509a752e476ebcd19a7f17d3f7b709df82459659ab91976e5979fdfa14726d2840e7e59a50d47b3b489f86fb44153def13e0e009bfa0db33c1f6ed4e952f1b5 HEAD_REF master ) diff --git a/ports/boost-type-traits/vcpkg.json b/ports/boost-type-traits/vcpkg.json index 93322f28eb885e..6858974585a970 100644 --- a/ports/boost-type-traits/vcpkg.json +++ b/ports/boost-type-traits/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-type-traits", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost type_traits module", "homepage": "https://github.com/boostorg/type_traits", "dependencies": [ "boost-config", - "boost-detail", "boost-static-assert", "boost-vcpkg-helpers" ] diff --git a/ports/boost-typeof/portfile.cmake b/ports/boost-typeof/portfile.cmake index d162575d4bc275..d8ce3c67251bcd 100644 --- a/ports/boost-typeof/portfile.cmake +++ b/ports/boost-typeof/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/typeof - REF boost-1.76.0 - SHA512 3126a39a1e37cfe20d98f46ddecf88d8d6ed6f996a08087d47771d6eab8229b08ebc9e949e92363f109936de9ea9df1004f6df6d433f9b4957f8f7812d845da3 + REF boost-1.77.0 + SHA512 4e1e4fc50d323d7604c9535eca11158dcd5fd8e3b7851316e9f6614b9c60f7f398c06d30b02a5699cd2d01941bec423824376623c98dbeff83c295b07dcf96d2 HEAD_REF master ) diff --git a/ports/boost-typeof/vcpkg.json b/ports/boost-typeof/vcpkg.json index 489c94e4ec3bca..d3977ed533f0b5 100644 --- a/ports/boost-typeof/vcpkg.json +++ b/ports/boost-typeof/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-typeof", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost typeof module", "homepage": "https://github.com/boostorg/typeof", "dependencies": [ diff --git a/ports/boost-ublas/portfile.cmake b/ports/boost-ublas/portfile.cmake index 0e856f5d0fdabf..93df8d66531fec 100644 --- a/ports/boost-ublas/portfile.cmake +++ b/ports/boost-ublas/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/ublas - REF boost-1.76.0 - SHA512 b685374b8871f0f2edb8b1d2431ca448a28285e8d267123ee2cc9abe39e97775eacb47fc7f098547da7e3537ded1a3ba2b9ae73a7774302bf7cbe50d558431dd + REF boost-1.77.0 + SHA512 7be4845bebb317181667a3b2b284bc9098ad68a2751b187054c6f051af625a4f0c7754943b12cfda2a7268bedec2b12cfaf8fba5e58084b836993850ea5af942 HEAD_REF master ) diff --git a/ports/boost-ublas/vcpkg.json b/ports/boost-ublas/vcpkg.json index 1b0d943b44b5ed..ebccbb631cccd2 100644 --- a/ports/boost-ublas/vcpkg.json +++ b/ports/boost-ublas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-ublas", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost ublas module", "homepage": "https://github.com/boostorg/ublas", "dependencies": [ @@ -8,6 +8,7 @@ "boost-concept-check", "boost-config", "boost-core", + "boost-interval", "boost-iterator", "boost-mpl", "boost-range", @@ -16,7 +17,6 @@ "boost-static-assert", "boost-type-traits", "boost-typeof", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-uninstall/vcpkg.json b/ports/boost-uninstall/vcpkg.json index 09bef55d69f2ac..09aa7f2f383990 100644 --- a/ports/boost-uninstall/vcpkg.json +++ b/ports/boost-uninstall/vcpkg.json @@ -1,7 +1,5 @@ { "name": "boost-uninstall", - "version-string": "1.75.0", - "port-version": 1, - "description": "boost uninstall port", - "homepage": "https://boost.org" + "version": "1.77.0", + "description": "Internal vcpkg port used to uninstall Boost" } diff --git a/ports/boost-units/portfile.cmake b/ports/boost-units/portfile.cmake index 7ac447db4467a8..3a4afc42bee612 100644 --- a/ports/boost-units/portfile.cmake +++ b/ports/boost-units/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/units - REF boost-1.76.0 - SHA512 84eff531365db19254d52ef0cdc31631a6806b766a8d2be6f01aaf0b468b367c8cd9f4979d2c28434c19c6377f8be5a42851f0e90bb876501738b1da9245ebb4 + REF boost-1.77.0 + SHA512 a3667c3e4f15e7612ed96f386aa05eafcb2448340c7000f4f2bd840b13bc326780a5700fb171db8535396ccc5d6342114953f3c3cc6da2b729964b3db683e1d5 HEAD_REF master ) diff --git a/ports/boost-units/vcpkg.json b/ports/boost-units/vcpkg.json index 7b5b94d2561cc3..c0fcd1274df853 100644 --- a/ports/boost-units/vcpkg.json +++ b/ports/boost-units/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-units", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost units module", "homepage": "https://github.com/boostorg/units", "dependencies": [ @@ -13,11 +13,9 @@ "boost-math", "boost-mpl", "boost-preprocessor", - "boost-serialization", "boost-static-assert", "boost-type-traits", "boost-typeof", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-unordered/portfile.cmake b/ports/boost-unordered/portfile.cmake index 4e443ec3261fd2..b8cf77da97d0f5 100644 --- a/ports/boost-unordered/portfile.cmake +++ b/ports/boost-unordered/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/unordered - REF boost-1.76.0 - SHA512 77047942a8561c84a196606fc4d6964687f52c7da52b419e69cc0f73a8751ba937393ff25e2a7d3fa9f0487df1c78f34cd633c9440a1b2c47da53cfe66d5b526 + REF boost-1.77.0 + SHA512 a561c3b26142c870c15dcf6f38635a5035671c4beedd66877582dc9459ee658eddf067e0ee642d90ec292a6dbde8ff86ecbec66e1d1dd635ee699cbfa418aab4 HEAD_REF master ) diff --git a/ports/boost-unordered/vcpkg.json b/ports/boost-unordered/vcpkg.json index 8675aff1b4e2af..b1084f5c3145fc 100644 --- a/ports/boost-unordered/vcpkg.json +++ b/ports/boost-unordered/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-unordered", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost unordered module", "homepage": "https://github.com/boostorg/unordered", "dependencies": [ @@ -10,7 +10,6 @@ "boost-container-hash", "boost-core", "boost-detail", - "boost-functional", "boost-move", "boost-predef", "boost-preprocessor", @@ -18,7 +17,6 @@ "boost-throw-exception", "boost-tuple", "boost-type-traits", - "boost-utility", "boost-vcpkg-helpers" ] } diff --git a/ports/boost-utility/portfile.cmake b/ports/boost-utility/portfile.cmake index 6ae1500d91546a..0702ca049e49d1 100644 --- a/ports/boost-utility/portfile.cmake +++ b/ports/boost-utility/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/utility - REF boost-1.76.0 - SHA512 48beacbe0853d4d8cd7c5099639c0e52595640ee31827a039f1b06bf6f13b108a86bb6bafe1eb2eee03ec2a2d4e9fa65d8ee87cb45522eaa89f6b6672024468a + REF boost-1.77.0 + SHA512 2461e9b91b59df84ba7dc19c86c5f52b95780d9e5998575755144b5d1885da4e584b35b27694030eb6a2520c0891b5370b2ff19e657a05a81e1a3eaffaee2ac9 HEAD_REF master ) diff --git a/ports/boost-utility/vcpkg.json b/ports/boost-utility/vcpkg.json index 66b6454166ed4b..da333b8348f863 100644 --- a/ports/boost-utility/vcpkg.json +++ b/ports/boost-utility/vcpkg.json @@ -1,13 +1,11 @@ { "name": "boost-utility", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost utility module", "homepage": "https://github.com/boostorg/utility", "dependencies": [ "boost-config", - "boost-container-hash", "boost-core", - "boost-detail", "boost-io", "boost-preprocessor", "boost-throw-exception", diff --git a/ports/boost-uuid/portfile.cmake b/ports/boost-uuid/portfile.cmake index bfe621ed0469fc..89f4a492f011c9 100644 --- a/ports/boost-uuid/portfile.cmake +++ b/ports/boost-uuid/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/uuid - REF boost-1.76.0 - SHA512 9d0a4ee60cc941e8458a0796955860a2e760eff30bff0faa665a9e9dac78631af0f06a6b6d8146b73059d968f9cbc2065b341943bbaa6606bd6d02f4db9bfcb9 + REF boost-1.77.0 + SHA512 5548d3eed3f263595d9bb1babbd6f15d37b327c2c0e9ebd539e8d5f85e2fb59e7c9c932df615eb3eefcc2b48fa8e3c741a46a3b2ffad46b40a1a0cd4dde70c3f HEAD_REF master ) diff --git a/ports/boost-uuid/vcpkg.json b/ports/boost-uuid/vcpkg.json index f703a3a6e6e7ba..73dbcda7504115 100644 --- a/ports/boost-uuid/vcpkg.json +++ b/ports/boost-uuid/vcpkg.json @@ -1,13 +1,12 @@ { "name": "boost-uuid", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost uuid module", "homepage": "https://github.com/boostorg/uuid", "dependencies": [ "boost-assert", "boost-config", "boost-container-hash", - "boost-conversion", "boost-core", "boost-io", "boost-move", diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake index e7768285453def..c571ce509bc51d 100644 --- a/ports/boost-variant/portfile.cmake +++ b/ports/boost-variant/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant - REF boost-1.76.0 - SHA512 d4c5afd1bda28021b4c1eaa0a98db16320144aec2595cf52564486da3c33d89b7a486ec35389af228169a37b928956b6e6405fe86c3dfb3f949cf3e26f372779 + REF boost-1.77.0 + SHA512 60c5f185c183a9d186ffa00d9809aed79ef60d5d2731ad36275a0e9a0a239b682878d3c00ba9760621eb817601c0ca848794c7f2c4f34bced4a4bbcf9e71c95c HEAD_REF master ) diff --git a/ports/boost-variant/vcpkg.json b/ports/boost-variant/vcpkg.json index 0d3547aab4cb7b..771b5d8a025b96 100644 --- a/ports/boost-variant/vcpkg.json +++ b/ports/boost-variant/vcpkg.json @@ -1,15 +1,15 @@ { "name": "boost-variant", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost variant module", "homepage": "https://github.com/boostorg/variant", "dependencies": [ "boost-assert", "boost-bind", "boost-config", + "boost-container-hash", "boost-core", "boost-detail", - "boost-functional", "boost-integer", "boost-move", "boost-mpl", diff --git a/ports/boost-variant2/portfile.cmake b/ports/boost-variant2/portfile.cmake index 5519083b326905..e28c1022ea6041 100644 --- a/ports/boost-variant2/portfile.cmake +++ b/ports/boost-variant2/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/variant2 - REF boost-1.76.0 - SHA512 5888d24d5ccfeea6d1e774f4388e9820a7fbc1e9899d8cee35942777df5120c959ea2cb16668ed7d5d7105f3fc42e4dbe5175ae98037a9ef80ac8f003742e50e + REF boost-1.77.0 + SHA512 0f4741e29288b2856eaa09c33557117faab71900b50e12f76bc89fea711cf1319ebff4aa9b3efd4012e510192e22c006bf1179c37798b386c7cecc955819dd96 HEAD_REF master ) diff --git a/ports/boost-variant2/vcpkg.json b/ports/boost-variant2/vcpkg.json index e4a06c5a0f7573..a823020a80bbb5 100644 --- a/ports/boost-variant2/vcpkg.json +++ b/ports/boost-variant2/vcpkg.json @@ -1,11 +1,10 @@ { "name": "boost-variant2", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost variant2 module", "homepage": "https://github.com/boostorg/variant2", "dependencies": [ "boost-config", - "boost-detail", "boost-mp11", "boost-vcpkg-helpers" ] diff --git a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake index 2be7c64464e3ba..73350f053280ad 100644 --- a/ports/boost-vcpkg-helpers/boost-modular-headers.cmake +++ b/ports/boost-vcpkg-helpers/boost-modular-headers.cmake @@ -1,6 +1,8 @@ function(boost_modular_headers) cmake_parse_arguments(_bm "" "SOURCE_PATH" "" ${ARGN}) + set(BOOST_VERSION 1.77.0) + if(NOT DEFINED _bm_SOURCE_PATH) message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_headers.") endif() @@ -15,7 +17,7 @@ function(boost_modular_headers) message(STATUS "Packaging headers done") vcpkg_download_distfile(ARCHIVE - URLS "https://raw.githubusercontent.com/boostorg/boost/boost-1.74.0/LICENSE_1_0.txt" + URLS "https://raw.githubusercontent.com/boostorg/boost/boost-${BOOST_VERSION}/LICENSE_1_0.txt" FILENAME "boost_LICENSE_1_0.txt" SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8 ) diff --git a/ports/boost-vcpkg-helpers/vcpkg.json b/ports/boost-vcpkg-helpers/vcpkg.json index d22659efc64678..3b73dbb6c45148 100644 --- a/ports/boost-vcpkg-helpers/vcpkg.json +++ b/ports/boost-vcpkg-helpers/vcpkg.json @@ -1,8 +1,7 @@ { "name": "boost-vcpkg-helpers", - "version-string": "7", - "port-version": 2, - "description": "a set of vcpkg-internal scripts used to modularize boost", + "version": "1.77.0", + "description": "Internal vcpkg port used to modularize Boost", "dependencies": [ "boost-uninstall" ] diff --git a/ports/boost-vmd/portfile.cmake b/ports/boost-vmd/portfile.cmake index 1754882e45e58c..1af24d81373f2f 100644 --- a/ports/boost-vmd/portfile.cmake +++ b/ports/boost-vmd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/vmd - REF boost-1.76.0 - SHA512 a5abe1352bce1a8358230df914ad19acc99ecb6a077248274bf2aca956a0bd0f7b9490f38891c51e3ee3323b37878c4098e39b61ea86e63f0f915a81f8553283 + REF boost-1.77.0 + SHA512 2c7a5a631c78ff94a4557f102643f41add507b2bc80baed1705fbf13f76ae70672a4789cd310a3817e48d85e90477a8a81c68aab110aca53f714400dde438a7b HEAD_REF master ) diff --git a/ports/boost-vmd/vcpkg.json b/ports/boost-vmd/vcpkg.json index 125cc7fc56e08c..cc21a448a0d604 100644 --- a/ports/boost-vmd/vcpkg.json +++ b/ports/boost-vmd/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-vmd", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost vmd module", "homepage": "https://github.com/boostorg/vmd", "dependencies": [ diff --git a/ports/boost-wave/portfile.cmake b/ports/boost-wave/portfile.cmake index db17a26737eccb..a874786a820a07 100644 --- a/ports/boost-wave/portfile.cmake +++ b/ports/boost-wave/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/wave - REF boost-1.76.0 - SHA512 eb44ee15a836d926fa24585389a7e3eb355141846401e9e9b3a69754235d8a99fa3a01107462b8e4081dff072be47222b7e52c510b2ca884dfdb65dfaff2fe1e + REF boost-1.77.0 + SHA512 d7b940086776a54ab2907277bbdc6be40b99dd358fde333802076d1a7e671aaf09326fb1a3742f9d23036666e34efc0c9c58b7a421edd93f6807e10a1886d880 HEAD_REF master ) diff --git a/ports/boost-wave/vcpkg.json b/ports/boost-wave/vcpkg.json index 2d07b287d25c8b..761743a56514cd 100644 --- a/ports/boost-wave/vcpkg.json +++ b/ports/boost-wave/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-wave", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost wave module", "homepage": "https://github.com/boostorg/wave", "supports": "!uwp", @@ -13,14 +13,12 @@ "boost-concept-check", "boost-config", "boost-core", - "boost-detail", { "name": "boost-filesystem", "platform": "!uwp" }, "boost-iterator", "boost-lexical-cast", - "boost-math", { "name": "boost-modular-build-helper", "host": true @@ -36,6 +34,10 @@ "boost-static-assert", "boost-throw-exception", "boost-type-traits", - "boost-vcpkg-helpers" + "boost-vcpkg-helpers", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/boost-winapi/portfile.cmake b/ports/boost-winapi/portfile.cmake index c95542ab5e58c7..e959cbb1987009 100644 --- a/ports/boost-winapi/portfile.cmake +++ b/ports/boost-winapi/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/winapi - REF boost-1.76.0 - SHA512 f16965928f0781123a17d13b0f73b1af33d22baa412f87acf4355c6f110318f424b535a559d366d61b111ed1f9eda9140e7cc357f50936e0f8049e1fd44bbe47 + REF boost-1.77.0 + SHA512 a14aefe991dfb9f4845734990bcd567ef55f431658cabe8fb61a4380e323b5149652b8b2ed53e73215009b4e5672bac51bd5207d073a80d89dcbdaa736315f4e HEAD_REF master ) diff --git a/ports/boost-winapi/vcpkg.json b/ports/boost-winapi/vcpkg.json index 804e1be14e4933..1e457e8be9fa5a 100644 --- a/ports/boost-winapi/vcpkg.json +++ b/ports/boost-winapi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-winapi", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost winapi module", "homepage": "https://github.com/boostorg/winapi", "dependencies": [ diff --git a/ports/boost-xpressive/portfile.cmake b/ports/boost-xpressive/portfile.cmake index 302004ee91da9d..dd1f8f7def1609 100644 --- a/ports/boost-xpressive/portfile.cmake +++ b/ports/boost-xpressive/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/xpressive - REF boost-1.76.0 - SHA512 ce0ecfde6f1bbd0dcb0765a8a4648a6978e090f5563c7828e0bd95ea35e91788d1871965c3cec4f2a6d366cd9d2ef29f75b47474a8bfeb684873d074c002e1f1 + REF boost-1.77.0 + SHA512 79fcb6050c770590b0756d6cc2980bf6c8a4824affb56e41e3cbbefadcf1b5bfb04476691ebda57c61c8511eb2a50ee9618fdd8f8f75a7617ddabbda551531b1 HEAD_REF master ) diff --git a/ports/boost-xpressive/vcpkg.json b/ports/boost-xpressive/vcpkg.json index 99c4899e2017e0..3f11022987540c 100644 --- a/ports/boost-xpressive/vcpkg.json +++ b/ports/boost-xpressive/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-xpressive", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost xpressive module", "homepage": "https://github.com/boostorg/xpressive", "dependencies": [ @@ -8,13 +8,11 @@ "boost-config", "boost-conversion", "boost-core", - "boost-detail", "boost-exception", "boost-fusion", "boost-integer", "boost-iterator", "boost-lexical-cast", - "boost-math", "boost-mpl", "boost-numeric-conversion", "boost-optional", diff --git a/ports/boost-yap/portfile.cmake b/ports/boost-yap/portfile.cmake index d2a6e23f92d55a..17b4dc1622b80d 100644 --- a/ports/boost-yap/portfile.cmake +++ b/ports/boost-yap/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO boostorg/yap - REF boost-1.76.0 - SHA512 88c97e7b36748f925b2566c6308729b74419c118095de17011900497017bd3a0a445a0c29a0912da8852284b6fdf5d0e34bb63e7aa6790a9213b460ad57d1983 + REF boost-1.77.0 + SHA512 95a65b2961ce0df5ac5a544d1fe83dc7a74992a032a3f6c707b84aad04402ec32fa4b872117632dea7133bedb651d6fbcfcd826b3ceac79fafd372a8852a8291 HEAD_REF master ) diff --git a/ports/boost-yap/vcpkg.json b/ports/boost-yap/vcpkg.json index 58313ddbf6a03d..bdc57e0d11f8bd 100644 --- a/ports/boost-yap/vcpkg.json +++ b/ports/boost-yap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost-yap", - "version": "1.76.0", + "version": "1.77.0", "description": "Boost yap module", "homepage": "https://github.com/boostorg/yap", "dependencies": [ diff --git a/ports/boost/0001-Fix-boost-ICU-support.patch b/ports/boost/0001-Fix-boost-ICU-support.patch deleted file mode 100644 index 1952f5a6484f38..00000000000000 --- a/ports/boost/0001-Fix-boost-ICU-support.patch +++ /dev/null @@ -1,166 +0,0 @@ ---- - libs/locale/build/Jamfile.v2 | 63 ++++++-------------------------------- - libs/locale/build/has_icu_test.cpp | 4 --- - libs/regex/build/Jamfile.v2 | 47 +++++++--------------------- - 3 files changed, 20 insertions(+), 94 deletions(-) - -diff --git a/libs/locale/build/Jamfile.v2 b/libs/locale/build/Jamfile.v2 -index 578e722..5f25917 100644 ---- a/libs/locale/build/Jamfile.v2 -+++ b/libs/locale/build/Jamfile.v2 -@@ -70,62 +70,17 @@ if $(ICU_LINK) - } - else - { -- searched-lib icuuc : : icuuc -- $(ICU_PATH)/lib -- shared -- shared ; -- -- searched-lib icuuc : : msvc -- debug -- icuucd -- $(ICU_PATH)/lib -- shared -- shared ; -- -- searched-lib icuuc : : this_is_an_invalid_library_name ; -- -- searched-lib icudt : : $(ICU_PATH)/lib -- icudata -- shared -- shared ; -- -- searched-lib icudt : : $(ICU_PATH)/lib -- icudt -- msvc -- shared -- shared ; -- -- searched-lib icudt : : this_is_an_invalid_library_name ; -- -- searched-lib icuin : : $(ICU_PATH)/lib -- icui18n -- shared -- shared ; -- -- searched-lib icuin : : msvc -- debug -- icuind -- $(ICU_PATH)/lib -- shared -- shared ; -- -- searched-lib icuin : : msvc -- release -- icuin -- $(ICU_PATH)/lib -- shared -- shared ; -- -- searched-lib icuin : : this_is_an_invalid_library_name ; -- -- explicit icuuc icudt icuin ; -+ alias icuuc : /user-config//icuuc ; -+ alias icuin : /user-config//icuin ; -+ alias icudt : /user-config//icudt ; -+ -+ explicit icuuc icuin icudt ; - - ICU_OPTS = $(ICU_PATH)/include -- icuuc/shared/shared -- icudt/shared/shared -- icuin/shared/shared -- $(ICU_PATH)/bin -- shared ; -+ icuuc -+ icuin -+ icudt -+ $(ICU_PATH)/bin ; - - - -diff --git a/libs/locale/build/has_icu_test.cpp b/libs/locale/build/has_icu_test.cpp -index 9419b30..ed9be05 100644 ---- a/libs/locale/build/has_icu_test.cpp -+++ b/libs/locale/build/has_icu_test.cpp -@@ -15,10 +15,6 @@ - #include - #include - --#if defined(_MSC_VER) && !defined(_DLL) --#error "Mixing ICU with a static runtime doesn't work" --#endif -- - int main() - { - icu::Locale loc; -diff --git a/libs/regex/build/Jamfile.v2 b/libs/regex/build/Jamfile.v2 -index 58fd1fb..76ee9f4 100644 ---- a/libs/regex/build/Jamfile.v2 -+++ b/libs/regex/build/Jamfile.v2 -@@ -48,50 +48,25 @@ if ! $(disable-icu) - } - else - { -- lib icuuc : : shared @path_options ; -- lib icuuc : : msvc debug icuucd shared @path_options ; -- lib icuuc : : intel windows debug icuucd shared @path_options ; -- lib icuuc : : sicuuc static @path_options ; -- lib icuuc : : msvc debug sicuucd static @path_options ; -- lib icuuc : : intel windows debug sicuucd static @path_options ; -- lib icuuc : : this_is_an_invalid_library_name ; -- -- lib icudt : : icudata shared @path_options ; -- lib icudt : : icudt msvc shared @path_options ; -- lib icudt : : icudt intel windows shared @path_options ; -- lib icudt : : sicudata static @path_options ; -- lib icudt : : sicudt msvc static @path_options ; -- lib icudt : : sicudt intel windows static @path_options ; -- lib icudt : : this_is_an_invalid_library_name ; -- -- lib icuin : : icui18n shared @path_options ; -- lib icuin : : msvc debug icuind shared @path_options ; -- lib icuin : : msvc icuin shared @path_options ; -- lib icuin : : intel windows debug icuind shared @path_options ; -- lib icuin : : intel windows icuin shared @path_options ; -- lib icuin : : sicui18n static @path_options ; -- lib icuin : : msvc debug sicuind static @path_options ; -- lib icuin : : msvc sicuin static @path_options ; -- lib icuin : : intel windows debug sicuind static @path_options ; -- lib icuin : : intel windows sicuin static @path_options ; -- lib icuin : : this_is_an_invalid_library_name ; -+ -+ alias icuuc : /user-config//icuuc ; -+ alias icuin : /user-config//icuin ; -+ alias icudt : /user-config//icudt ; -+ -+ explicit icuuc icuin icudt ; - - ICU_OPTS = - $(ICU_PATH)/include -- shared:icuuc/shared -- shared:icudt/shared -- shared:icuin/shared -- static:icuuc -- static:icudt -- static:icuin -- BOOST_HAS_ICU=1 -- static:U_STATIC_IMPLEMENTATION=1 -+ icuuc -+ icudt -+ icuin -+ BOOST_HAS_ICU=1 - ; - } - - } - --unit-test has_icu : has_icu_test.cpp : $(ICU_OPTS) ; -+exe has_icu : has_icu_test.cpp : $(ICU_OPTS) ; - explicit has_icu ; - - alias icu_options : : : : [ check-target-builds has_icu : $(ICU_OPTS) : ] ; --- -2.12.2.windows.2 - diff --git a/ports/boost/desktop/user-config.jam b/ports/boost/desktop/user-config.jam deleted file mode 100644 index 311cc89515e524..00000000000000 --- a/ports/boost/desktop/user-config.jam +++ /dev/null @@ -1,38 +0,0 @@ -using msvc : 14.0 : cl.exe : -echo -; - -using msvc : 14.1 : cl.exe : -echo -; - -using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_RELEASE@" ; -using python : @PYTHON_VERSION@ : : "@PYTHON_INCLUDE_PATH@" : "@PYTHONLIBS_DEBUG@" : on ; - -project user-config ; -lib advapi32 ; -lib icuuc : : "@CURRENT_INSTALLED_DIR@/lib" : : - "@LIB_RUNTIME_LINK@" - advapi32 ; - -lib icuuc : : "@CURRENT_INSTALLED_DIR@/debug/lib" - debug - icuucd : : - "@LIB_RUNTIME_LINK@" - advapi32 ; - -lib icuin : : "@CURRENT_INSTALLED_DIR@/lib" : : - "@LIB_RUNTIME_LINK@" ; - -lib icuin : : "@CURRENT_INSTALLED_DIR@/debug/lib" - debug - icuind : : - "@LIB_RUNTIME_LINK@" ; - -lib icudt : : "@CURRENT_INSTALLED_DIR@/lib" : : - "@LIB_RUNTIME_LINK@" ; - -lib icudt : : "@CURRENT_INSTALLED_DIR@/debug/lib" - debug - icudtd : : - "@LIB_RUNTIME_LINK@" ; \ No newline at end of file diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake index df3ab59c3ba7c0..065116c276adcf 100644 --- a/ports/boost/portfile.cmake +++ b/ports/boost/portfile.cmake @@ -1,2 +1 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) - diff --git a/ports/boost/uwp/user-config.jam b/ports/boost/uwp/user-config.jam deleted file mode 100644 index 975b1d4125f36c..00000000000000 --- a/ports/boost/uwp/user-config.jam +++ /dev/null @@ -1,23 +0,0 @@ -using msvc : 14.0 : cl.exe : -echo -"\"/AI@PLATFORM_WINMD_DIR@\"" -kernel32.lib -RuntimeObject.lib -ole32.lib -; - -using msvc : 14.1 : cl.exe : -echo -"\"/AI@PLATFORM_WINMD_DIR@\"" -kernel32.lib -RuntimeObject.lib -ole32.lib -; - -project user-config ; - -lib icuuc : : dummy_lib_that_doesnt_exist ; - -lib icuin : : dummy_lib_that_doesnt_exist ; - -lib icudt : : dummy_lib_that_doesnt_exist ; \ No newline at end of file diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index 2ea1d4d3b8f83d..cf925fe92c1ca8 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boost", - "version": "1.76.0", + "version": "1.77.0", "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "dependencies": [ @@ -49,6 +49,7 @@ }, "boost-crc", "boost-date-time", + "boost-describe", "boost-detail", "boost-dll", "boost-dynamic-bitset", @@ -72,7 +73,10 @@ "boost-geometry", "boost-gil", "boost-graph", - "boost-graph-parallel", + { + "name": "boost-graph-parallel", + "platform": "!uwp" + }, "boost-hana", "boost-heap", "boost-histogram", @@ -81,7 +85,6 @@ "boost-integer", "boost-interprocess", "boost-interval", - "boost-interval", "boost-intrusive", "boost-io", { @@ -91,6 +94,7 @@ "boost-iterator", "boost-json", "boost-lambda", + "boost-lambda2", "boost-leaf", "boost-lexical-cast", "boost-local-function", @@ -108,6 +112,10 @@ "boost-metaparse", "boost-move", "boost-mp11", + { + "name": "boost-mpi", + "platform": "!uwp" + }, "boost-mpl", "boost-msm", "boost-multi-array", @@ -115,8 +123,6 @@ "boost-multiprecision", "boost-nowide", "boost-numeric-conversion", - "boost-numeric-conversion", - "boost-odeint", "boost-odeint", "boost-optional", "boost-outcome", @@ -138,6 +144,7 @@ }, "boost-program-options", "boost-property-map", + "boost-property-map-parallel", "boost-property-tree", "boost-proto", "boost-ptr-container", @@ -152,7 +159,6 @@ "boost-rational", "boost-regex", "boost-safe-numerics", - "boost-safe-numerics", "boost-scope-exit", "boost-serialization", "boost-signals2", @@ -183,7 +189,6 @@ "boost-type-traits", "boost-typeof", "boost-ublas", - "boost-ublas", "boost-units", "boost-unordered", "boost-utility", @@ -203,6 +208,7 @@ "mpi": { "description": "Build with MPI support", "dependencies": [ + "boost-graph-parallel", "boost-mpi" ] } diff --git a/ports/libe57/vcpkg.json b/ports/libe57/vcpkg.json index 4f802910afd420..09984c737be08b 100644 --- a/ports/libe57/vcpkg.json +++ b/ports/libe57/vcpkg.json @@ -1,12 +1,14 @@ { "name": "libe57", "version-semver": "1.1.312", + "port-version": 1, "description": "An open source implementation of the ASTM E2807 Standard Specification for 3D Imaging Data Exchange in the C++ language.", "homepage": "http://www.libe57.org/", "dependencies": [ "boost-crc", "boost-filesystem", "boost-format", + "boost-math", "boost-program-options", "boost-system", "boost-thread", diff --git a/ports/mpi/vcpkg.json b/ports/mpi/vcpkg.json index 0b7b9d9be7f873..386b978bd9cbe2 100644 --- a/ports/mpi/vcpkg.json +++ b/ports/mpi/vcpkg.json @@ -1,8 +1,9 @@ { "name": "mpi", "version-string": "1", - "port-version": 1, + "port-version": 2, "description": "Message Passing Interface (MPI) is a standardized and portable message-passing standard designed by a group of researchers from academia and industry to function on a wide variety of parallel computing architectures. The standard defines the syntax and semantics of a core of library routines useful to a wide range of users writing portable message-passing programs in C, C++, and Fortran. There are several well-tested and efficient implementations of MPI, many of which are open-source or in the public domain.", + "supports": "!uwp", "dependencies": [ { "name": "msmpi", diff --git a/ports/msmpi/vcpkg.json b/ports/msmpi/vcpkg.json index 100ad65316e135..fa32759b43af2e 100644 --- a/ports/msmpi/vcpkg.json +++ b/ports/msmpi/vcpkg.json @@ -1,9 +1,9 @@ { "name": "msmpi", "version": "10.1.12498", - "port-version": 1, + "port-version": 2, "description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.", "homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi", "license": "MIT", - "supports": "windows" + "supports": "windows & !uwp" } diff --git a/ports/openmvs/fix-build-boost-1_77_0.patch b/ports/openmvs/fix-build-boost-1_77_0.patch new file mode 100644 index 00000000000000..69924d219c5671 --- /dev/null +++ b/ports/openmvs/fix-build-boost-1_77_0.patch @@ -0,0 +1,19 @@ + libs/Common/Common.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libs/Common/Common.cpp b/libs/Common/Common.cpp +index 052951d..8dc404e 100644 +--- a/libs/Common/Common.cpp ++++ b/libs/Common/Common.cpp +@@ -31,6 +31,11 @@ namespace boost { + ASSERT("boost exception thrown" == NULL); + exit(EXIT_FAILURE); + } ++ void throw_exception(std::exception const & e, boost::source_location const &) { ++ VERBOSE("exception thrown: %s", e.what()); ++ ASSERT("boost exception thrown" == NULL); ++ exit(EXIT_FAILURE); ++ } + } // namespace boost + #endif + #endif diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index 2ec1bd0944171d..d2055fe1a1c804 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -8,20 +8,22 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-build.patch + fix-build-boost-1_77_0.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - cuda OpenMVS_USE_CUDA - openmp OpenMVS_USE_OPENMP + FEATURES + cuda OpenMVS_USE_CUDA + openmp OpenMVS_USE_OPENMP ) file(REMOVE "${SOURCE_PATH}/build/Modules/FindCERES.cmake") file(REMOVE "${SOURCE_PATH}/build/Modules/FindCGAL.cmake") file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + GENERATOR Ninja OPTIONS ${FEATURE_OPTIONS} -DOpenMVS_USE_NONFREE=ON -DOpenMVS_USE_CERES=OFF @@ -37,11 +39,11 @@ vcpkg_configure_cmake( -DOpenMVS_BUILD_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(READ ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake TARGETS_CMAKE) string(REPLACE "bin/InterfaceCOLMAP" "tools/openmvs/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}") string(REPLACE "bin/InterfaceVisualSFM" "tools/openmvs/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}") diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 74df96ee51e340..eba2acd9f8ad70 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvs", "version-string": "1.1", - "port-version": 5, + "port-version": 6, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "dependencies": [ @@ -9,6 +9,7 @@ "boost-program-options", "boost-serialization", "boost-system", + "boost-throw-exception", { "name": "cgal", "default-features": false @@ -27,6 +28,14 @@ }, "tiff", "vcglib", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/ports/wt/0007-boost_1_77_0.patch b/ports/wt/0007-boost_1_77_0.patch new file mode 100644 index 00000000000000..8fed5713d0d7c0 --- /dev/null +++ b/ports/wt/0007-boost_1_77_0.patch @@ -0,0 +1,15 @@ + src/Wt/Render/CssParser.C | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Wt/Render/CssParser.C b/src/Wt/Render/CssParser.C +index b8d409e..6bb47b4 100644 +--- a/src/Wt/Render/CssParser.C ++++ b/src/Wt/Render/CssParser.C +@@ -39,6 +39,7 @@ using namespace Wt::Render; + #include + #endif + #include ++#include + + #include + diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake index d7d70dab77e5ad..30dd1af9a9876d 100644 --- a/ports/wt/portfile.cmake +++ b/ports/wt/portfile.cmake @@ -8,16 +8,20 @@ vcpkg_from_github( 0002-link-glew.patch 0005-XML_file_path.patch 0006-GraphicsMagick.patch + 0007-boost_1_77_0.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SHARED_LIBS) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - dbo ENABLE_LIBWTDBO - postgresql ENABLE_POSTGRES - sqlite3 ENABLE_SQLITE - sqlserver ENABLE_MSSQLSERVER - openssl ENABLE_SSL +vcpkg_check_features( + OUT_FEATURE_OPTIONS + FEATURE_OPTIONS + FEATURES + dbo ENABLE_LIBWTDBO + postgresql ENABLE_POSTGRES + sqlite3 ENABLE_SQLITE + sqlserver ENABLE_MSSQLSERVER + openssl ENABLE_SSL ) if(VCPKG_TARGET_IS_WINDOWS) @@ -40,9 +44,9 @@ else() endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + GENERATOR Ninja OPTIONS -DINSTALL_CONFIG_FILE_PATH="${DOWNLOADS}/wt" -DSHARED_LIBS=${SHARED_LIBS} @@ -70,8 +74,8 @@ vcpkg_configure_cmake( -DCMAKE_INSTALL_DIR=share ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() # There is no way to suppress installation of the headers and resource files in debug build. file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json index 7a92d9228ed5f2..303e56c7775fca 100644 --- a/ports/wt/vcpkg.json +++ b/ports/wt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wt", "version-string": "4.5.0", - "port-version": 1, + "port-version": 2, "description": "Wt is a C++ library for developing web applications", "homepage": "https://github.com/emweb/wt", "dependencies": [ @@ -12,6 +12,7 @@ "boost-config", "boost-container-hash", "boost-filesystem", + "boost-foreach", "boost-fusion", "boost-interprocess", "boost-lexical-cast", @@ -43,6 +44,14 @@ "name": "pango", "platform": "!windows" }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 1079514720b16b..e7d258d509ac13 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -1,131 +1,170 @@ [CmdletBinding()] param ( $libraries = @(), - $version = "1.76.0", + $version = "1.77.0", $portsDir = $null ) $ErrorActionPreference = 'Stop' $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition -if ($null -eq $portsDir) -{ +if ($null -eq $portsDir) { $portsDir = "$scriptsDir/../../ports" } -if ($IsWindows) -{ +if ($IsWindows) { $vcpkg = "$scriptsDir/../../vcpkg.exe" $curl = "curl.exe" } -else -{ +else { $vcpkg = "$scriptsDir/../../vcpkg" $curl = "curl" } # Clear this array when moving to a new boost version -$port_versions = @{ - #e.g. "asio" = 1; - "python" = 1; +$portVersions = @{ + #e.g. "boost-asio" = 1; } -$per_port_data = @{ - "asio" = @{ "supports" = "!emscripten" }; - "beast" = @{ "supports" = "!emscripten" }; - "fiber" = @{ "supports" = "!osx&!uwp&!arm&!emscripten" }; - "filesystem" = @{ "supports" = "!uwp" }; - "iostreams" = @{ "supports" = "!uwp" }; - "context" = @{ "supports" = "!uwp&!emscripten" }; - "stacktrace" = @{ "supports" = "!uwp" }; - "coroutine" = @{ "supports" = "!arm&!uwp&!emscripten" }; - "coroutine2" = @{ "supports" = "!emscripten" }; - "test" = @{ "supports" = "!uwp" }; - "wave" = @{ "supports" = "!uwp" }; - "log" = @{ "supports" = "!uwp&!emscripten" }; - "locale" = @{ - "supports" = "!uwp"; - "features" = @{ - icu=@{ - dependencies=@("icu") - description="ICU backend for Boost.Locale" +$portData = @{ + "boost-asio" = @{ + "dependencies" = @("openssl"); + "supports" = "!emscripten" + }; + "boost-beast" = @{ "supports" = "!emscripten" }; + "boost-fiber" = @{ "supports" = "!osx&!uwp&!arm&!emscripten" }; + "boost-filesystem" = @{ "supports" = "!uwp" }; + "boost-iostreams" = @{ + "dependencies" = @("zlib", "bzip2", "liblzma", "zstd"); + "supports" = "!uwp"; + }; + "boost-context" = @{ "supports" = "!uwp&!emscripten" }; + "boost-stacktrace" = @{ "supports" = "!uwp" }; + "boost-coroutine" = @{ "supports" = "!arm&!uwp&!emscripten" }; + "boost-coroutine2" = @{ "supports" = "!emscripten" }; + "boost-test" = @{ "supports" = "!uwp" }; + "boost-wave" = @{ "supports" = "!uwp" }; + "boost-log" = @{ "supports" = "!uwp&!emscripten" }; + "boost-locale" = @{ + "dependencies" = @(@{ name = "libiconv"; platform = "!uwp&!windows&!mingw" }); + "supports" = "!uwp"; + "features" = @{ + icu = @{ + dependencies = @("icu") + description = "ICU backend for Boost.Locale" } } }; - "parameter-python" = @{ "supports" = "!emscripten" }; - "process" = @{ "supports" = "!emscripten" }; - "python" = @{ - "supports" = "!uwp&!(arm&windows)&!emscripten"; - "features" = @{ - python2=@{ - dependencies=@("python2") - description="Build with Python2 support" + "boost-mpi" = @{ + "dependencies" = @("mpi"); + "supports" = "!uwp"; + }; + "boost-graph-parallel" = @{ + "dependencies" = @("mpi"); + "supports" = "!uwp"; + }; + "boost-parameter-python" = @{ "supports" = "!emscripten" }; + "boost-process" = @{ "supports" = "!emscripten" }; + "boost-python" = @{ + "dependencies" = @("python3"); + "supports" = "!uwp&!(arm&windows)&!emscripten"; + "features" = @{ + python2 = @{ + dependencies = @("python2") + description = "Build with Python2 support" } } }; - "regex" = @{ + "boost-regex" = @{ "features" = @{ - icu=@{ - dependencies=@("icu") - description="ICU backend for Boost.Regex" + icu = @{ + dependencies = @("icu") + description = "ICU backend for Boost.Regex" } } } } -function TransformReference() -{ +function GeneratePortName() { param ( - [string]$library + [string]$Library ) + "boost-" + ($Library -replace "_", "-") +} - if ($per_port_data.Contains($library) -and $per_port_data[$library].Contains('supports')) - { - @{name="boost-$library"; platform=$per_port_data[$library]['supports']} +function GeneratePortDependency() { + param ( + [string]$Library + ) + $portName = GeneratePortName $Library + if ($portData.Contains($portName) -and $portData[$portName].Contains('supports')) { + @{name = $portName; platform = $portData[$portName]['supports'] } } - else - { - "boost-$library" + else { + $portName } } - -function Generate() -{ +function GeneratePortManifest() { param ( - [string]$Name, + [string]$Library, [string]$PortName, + [string]$Homepage, + [string]$Description, + $Dependencies = @(), + $Features = @() + ) + if ([string]::IsNullOrEmpty($PortName)) { + $PortName = GeneratePortName $Library + } + $manifest = @{ + name = $PortName + "version" = $version + homepage = $Homepage + description = $Description + } + if ($portVersions.Contains($PortName)) { + $manifest["port-version"] = $portVersions[$PortName] + } + if ($portData.Contains($PortName)) { + $manifest += $portData[$PortName] + } + if ($Dependencies.Count -gt 0) { + $manifest["dependencies"] += $Dependencies + } + if ($Features.Count -gt 0) { + $manifest["features"] += $Features + } + $manifest | ConvertTo-Json -Depth 10 -Compress ` + | Out-File -Encoding UTF8 "$portsDir/$PortName/vcpkg.json" + & $vcpkg format-manifest "$portsDir/$PortName/vcpkg.json" +} + +function GeneratePort() { + param ( + [string]$Library, [string]$Hash, [bool]$NeedsBuild, - $Depends = @() + $Dependencies = @() ) - New-Item -ItemType "Directory" "$portsDir/boost-$PortName" -erroraction SilentlyContinue | out-null - $controlLines = @{ - name="boost-$PortName"; ` - "version"=$version; ` - dependencies=$Depends; ` - homepage="https://github.com/boostorg/$Name"; ` - description="Boost $Name module" ` - } - if ($port_versions.Contains($PortName)) - { - $controlLines["port-version"] = $port_versions[$PortName] - } + $portName = GeneratePortName $Library - if ($per_port_data.Contains($PortName)) - { - $controlLines += $per_port_data[$PortName] - } - $controlLines | ConvertTo-Json -Depth 10 -Compress | out-file -enc ascii "$portsDir/boost-$PortName/vcpkg.json" - & $vcpkg format-manifest "$portsDir/boost-$PortName/vcpkg.json" + New-Item -ItemType "Directory" "$portsDir/$portName" -erroraction SilentlyContinue | out-null + + # Generate vcpkg.json + GeneratePortManifest ` + -Library $Library ` + -PortName $PortName ` + -Homepage "https://github.com/boostorg/$Library" ` + -Description "Boost $Library module" ` + -Dependencies $Dependencies $portfileLines = @( "# Automatically generated by scripts/boost/generate-ports.ps1" "" ) - if ($PortName -eq "system") - { + if ($Library -eq "system") { $portfileLines += @( "vcpkg_buildpath_length_warning(37)" "" @@ -135,24 +174,20 @@ function Generate() $portfileLines += @( "vcpkg_from_github(" " OUT_SOURCE_PATH SOURCE_PATH" - " REPO boostorg/$Name" + " REPO boostorg/$Library" " REF boost-$version" " SHA512 $Hash" " HEAD_REF master" ) - [Array]$patches = Get-Item -Path "$portsDir/boost-$PortName/*.patch" - if ($null -eq $patches -or $patches.Count -eq 0) - { + [Array]$patches = Get-Item -Path "$portsDir/$portName/*.patch" + if ($null -eq $patches -or $patches.Count -eq 0) { } - elseif ($patches.Count -eq 1) - { + elseif ($patches.Count -eq 1) { $portfileLines += @(" PATCHES $($patches.name)") } - else - { + else { $portfileLines += @(" PATCHES") - foreach ($patch in $patches) - { + foreach ($patch in $patches) { $portfileLines += @(" $($patch.name)") } } @@ -161,22 +196,19 @@ function Generate() "" ) - if (Test-Path "$scriptsDir/post-source-stubs/$PortName.cmake") - { - $portfileLines += @(get-content "$scriptsDir/post-source-stubs/$PortName.cmake") + if (Test-Path "$scriptsDir/post-source-stubs/$Library.cmake") { + $portfileLines += @(get-content "$scriptsDir/post-source-stubs/$Library.cmake") } - if ($NeedsBuild) - { + if ($NeedsBuild) { $portfileLines += @( "if(NOT DEFINED CURRENT_HOST_INSTALLED_DIR)" - " message(FATAL_ERROR `"boost-$PortName requires a newer version of vcpkg in order to build.`")" + " message(FATAL_ERROR `"$portName requires a newer version of vcpkg in order to build.`")" "endif()" "include(`${CURRENT_HOST_INSTALLED_DIR}/share/boost-build/boost-modular-build.cmake)" ) # b2-options.cmake contains port-specific build options - if (Test-Path "$portsDir/boost-$PortName/b2-options.cmake") - { + if (Test-Path "$portsDir/$portName/b2-options.cmake") { $portfileLines += @( "boost_modular_build(" " SOURCE_PATH `${SOURCE_PATH}" @@ -184,8 +216,7 @@ function Generate() ")" ) } - elseif (Test-Path "$portsDir/boost-$PortName/b2-options.cmake.in") - { + elseif (Test-Path "$portsDir/$portName/b2-options.cmake.in") { $portfileLines += @( 'configure_file(' ' "${CMAKE_CURRENT_LIST_DIR}/b2-options.cmake.in"' @@ -198,8 +229,7 @@ function Generate() ')' ) } - else - { + else { $portfileLines += @( "boost_modular_build(SOURCE_PATH `${SOURCE_PATH})" ) @@ -211,268 +241,282 @@ function Generate() "boost_modular_headers(SOURCE_PATH `${SOURCE_PATH})" ) - if (Test-Path "$scriptsDir/post-build-stubs/$PortName.cmake") - { - $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$PortName.cmake") + if (Test-Path "$scriptsDir/post-build-stubs/$Library.cmake") { + $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$Library.cmake") } $portfileLines += @("") - Set-Content -LiteralPath "$portsDir/boost-$PortName/portfile.cmake" ` + Set-Content -LiteralPath "$portsDir/$portName/portfile.cmake" ` -Value "$($portfileLines -join "`r`n")" ` -Encoding UTF8 ` -NoNewline } -if (!(Test-Path "$scriptsDir/boost")) -{ +if (!(Test-Path "$scriptsDir/boost")) { "Cloning boost..." - pushd $scriptsDir - try - { + Push-Location $scriptsDir + try { git clone https://github.com/boostorg/boost --branch boost-$version } - finally - { - popd + finally { + Pop-Location } } -else -{ - pushd $scriptsDir/boost - try - { +else { + Push-Location $scriptsDir/boost + try { git fetch git checkout -f boost-$version } - finally - { - popd + finally { + Pop-Location } } -$libraries_found = Get-ChildItem $scriptsDir/boost/libs -directory | % name | % { - if ($_ -match "numeric") - { +$foundLibraries = Get-ChildItem $scriptsDir/boost/libs -directory | ForEach-Object name | ForEach-Object { + if ($_ -eq "numeric") { "numeric_conversion" "interval" "odeint" "ublas" - "safe_numerics" } - elseif ($_ -eq "headers") - { + elseif ($_ -eq "headers") { } - else - { + else { $_ } } New-Item -ItemType "Directory" $scriptsDir/downloads -erroraction SilentlyContinue | out-null -if ($libraries.Length -eq 0) -{ - $libraries = $libraries_found +$updateServicePorts = $false + +if ($libraries.Length -eq 0) { + $libraries = $foundLibraries + $updateServicePorts = $true } -$libraries_in_boost_port = @() +$boostPortDependencies = @() -foreach ($library in $libraries) -{ +foreach ($library in $libraries) { "Handling boost/$library..." $archive = "$scriptsDir/downloads/$library-boost-$version.tar.gz" - if (!(Test-Path $archive)) - { + if (!(Test-Path $archive)) { "Downloading boost/$library..." & $curl -L "https://github.com/boostorg/$library/archive/boost-$version.tar.gz" --output "$scriptsDir/downloads/$library-boost-$version.tar.gz" } $hash = & $vcpkg --x-wait-for-lock hash $archive # remove prefix "Waiting to take filesystem lock on /.vcpkg-root... " - if($hash -is [Object[]]) - { + if ($hash -is [Object[]]) { $hash = $hash[1] } $unpacked = "$scriptsDir/libs/$library-boost-$version" - if (!(Test-Path $unpacked)) - { + if (!(Test-Path $unpacked)) { "Unpacking boost/$library..." New-Item -ItemType "Directory" $scriptsDir/libs -erroraction SilentlyContinue | out-null - pushd $scriptsDir/libs - try - { + Push-Location $scriptsDir/libs + try { cmake -E tar xf $archive } - finally - { - popd + finally { + Pop-Location } } - pushd $unpacked - try - { - $groups = Get-ChildItem -Recurse -Path include,src -File ` - | ? { $_ -is [System.IO.FileInfo] } ` - | % { Get-Content -LiteralPath $_ } ` - | ? { $_ -match 'include [<"]boost/' } - - $groups = $groups | % { - $_ ` - -replace "boost/numeric/conversion/","boost/numeric_conversion/" ` - -replace "boost/functional/hash.hpp","boost/container_hash/hash.hpp" ` - -replace "boost/detail/([^/]+)/","boost/`$1/" ` - -replace " *# *include *[<`"]boost/([a-zA-Z0-9\._]*)[/>`"].*", "`$1" ` - -replace "/|\.hp?p?| ","" - } | group | % name | % { - # mappings - Write-Verbose "${library}: $_" - if ($_ -match "aligned_storage") { "type_traits" } - elseif ($_ -match "noncopyable|ref|swap|get_pointer|checked_delete|visit_each") { "core" } - elseif ($_ -eq "type") { "core" } - elseif ($_ -match "concept|concept_archetype") { "concept_check" } - elseif ($_ -match "unordered_") { "unordered" } - elseif ($_ -match "integer_fwd|integer_traits") { "integer" } - elseif ($_ -match "call_traits|operators|current_function|cstdlib|next_prior|compressed_pair") { "utility" } - elseif ($_ -match "^version|^workaround|^config|cstdint|cxx11_char_types|limits") { "config" } - elseif ($_ -match "enable_shared_from_this|shared_ptr|make_shared|make_unique|intrusive_ptr|scoped_ptr|pointer_cast|pointer_to_other|weak_ptr|shared_array|scoped_array") { "smart_ptr" } - elseif ($_ -match "iterator_adaptors|generator_iterator|pointee") { "iterator" } - elseif ($_ -eq "regex_fwd") { "regex" } - elseif ($_ -eq "make_default") { "convert" } - elseif ($_ -eq "foreach_fwd") { "foreach" } - elseif ($_ -eq "cerrno") { "system" } - elseif ($_ -eq "circular_buffer_fwd") { "circular_buffer" } + Push-Location $unpacked + try { + $usedLibraries = Get-ChildItem -Recurse -Path include, src -File ` + | Where-Object { $_ -is [System.IO.FileInfo] } ` + | ForEach-Object { + Write-Verbose "${library}: processing file: $_" + Get-Content -LiteralPath $_ + } ` + | Where-Object { + $_ -match ' *# *include *[<"]boost\/' + } ` + | ForEach-Object { + # extract path from the line + Write-Verbose "${library}: processing line: $_" + $_ -replace " *# *include *[<`"]boost\/([a-zA-Z0-9\.\-_\/]*)[>`"].*", "`$1" + }` + | ForEach-Object { + # map the path to the library name + Write-Verbose "${library}: processing path: $_" + if ($_ -match "^detail\/winapi\/") { "winapi" } + elseif ($_ -eq "detail/algorithm.hpp") { "graph" } + elseif ($_ -eq "detail/atomic_count.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/basic_pointerbuf.hpp") { "lexical_cast" } + elseif ($_ -eq "detail/call_traits.hpp") { "utility" } + elseif ($_ -eq "detail/compressed_pair.hpp") { "utility" } + elseif ($_ -eq "detail/interlocked.hpp") { "winapi" } + elseif ($_ -eq "detail/iterator.hpp") { "core" } + elseif ($_ -eq "detail/lcast_precision.hpp") { "lexical_cast" } + elseif ($_ -eq "detail/lightweight_mutex.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/lightweight_test.hpp") { "core" } + elseif ($_ -eq "detail/lightweight_thread.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/no_exceptions_support.hpp") { "core" } + elseif ($_ -eq "detail/scoped_enum_emulation.hpp") { "core" } + elseif ($_ -eq "detail/sp_typeinfo.hpp") { "core" } + elseif ($_ -eq "detail/ob_compressed_pair.hpp") { "utility" } + elseif ($_ -eq "detail/quick_allocator.hpp") { "smart_ptr" } + elseif ($_ -eq "detail/workaround.hpp") { "config" } + elseif ($_ -match "^functional\/hash\/") { "container_hash" } + elseif ($_ -eq "functional/hash.hpp") { "container_hash" } + elseif ($_ -eq "functional/hash_fwd.hpp") { "container_hash" } + elseif ($_ -match "^graph\/distributed\/") { "graph_parallel" } + elseif ($_ -match "^graph\/parallel\/") { "graph_parallel" } + elseif ($_ -eq "graph/accounting.hpp") { "graph_parallel" } + elseif ($_ -eq "exception/exception.hpp") { "throw_exception" } + elseif ($_ -match "^numeric\/conversion\/") { "numeric_conversion" } + elseif ($_ -match "^numeric\/interval\/") { "interval" } + elseif ($_ -match "^numeric\/odeint\/") { "odeint" } + elseif ($_ -match "^numeric\/ublas\/") { "ublas" } + elseif ($_ -eq "numeric/interval.hpp") { "interval" } + elseif ($_ -eq "numeric/odeint.hpp") { "odeint" } + elseif ($_ -match "^parameter\/aux_\/python\/") { "parameter_python" } + elseif ($_ -eq "parameter/python.hpp") { "parameter_python" } + elseif ($_ -eq "pending/detail/disjoint_sets.hpp") { "graph" } + elseif ($_ -eq "pending/detail/int_iterator.hpp") { "iterator" } + elseif ($_ -eq "pending/detail/property.hpp") { "graph" } + elseif ($_ -eq "pending/bucket_sorter.hpp") { "graph" } + elseif ($_ -eq "pending/container_traits.hpp") { "graph" } + elseif ($_ -eq "pending/disjoint_sets.hpp") { "graph" } + elseif ($_ -eq "pending/fenced_priority_queue.hpp") { "graph" } + elseif ($_ -eq "pending/fibonacci_heap.hpp") { "graph" } + elseif ($_ -eq "pending/indirect_cmp.hpp") { "graph" } + elseif ($_ -eq "pending/integer_log2.hpp") { "integer" } + elseif ($_ -eq "pending/is_heap.hpp") { "graph" } + elseif ($_ -eq "pending/iterator_adaptors.hpp") { "iterator" } + elseif ($_ -eq "pending/iterator_tests.hpp") { "iterator" } + elseif ($_ -eq "pending/mutable_heap.hpp") { "graph" } + elseif ($_ -eq "pending/mutable_queue.hpp") { "graph" } + elseif ($_ -eq "pending/property.hpp") { "graph" } + elseif ($_ -eq "pending/property_serialize.hpp") { "graph" } + elseif ($_ -eq "pending/queue.hpp") { "graph" } + elseif ($_ -eq "pending/relaxed_heap.hpp") { "graph" } + elseif ($_ -eq "pending/stringtok.hpp") { "graph" } + elseif ($_ -match "^property_map\/parallel\/") { "property_map_parallel" } + elseif ($_ -eq "utility/addressof.hpp") { "core" } + elseif ($_ -eq "utility/declval.hpp") { "type_traits" } + elseif ($_ -eq "utility/enable_if.hpp") { "core" } + elseif ($_ -eq "utility/explicit_operator_bool.hpp") { "core" } + elseif ($_ -eq "utility/swap.hpp") { "core" } + # extract first directory name or file name from the path + else { $_ -replace "([a-zA-Z0-9\.\-_]*).*", "`$1" } + } ` + | ForEach-Object { + # map directory/file name to the library name + Write-Verbose "${library}: processing name: $_" + if ($_ -eq "current_function.hpp") { "assert" } + elseif ($_ -eq "memory_order.hpp") { "atomic" } + elseif ($_ -match "is_placeholder.hpp|mem_fn.hpp") { "bind" } + elseif ($_ -eq "circular_buffer_fwd.hpp") { "circular_buffer" } + elseif ($_ -match "^concept$|concept_archetype.hpp") { "concept_check" } + elseif ($_ -match "cstdint.hpp|cxx11_char_types.hpp|limits.hpp|version.hpp") { "config" } + elseif ($_ -eq "contract_macro.hpp") { "contract" } + elseif ($_ -match "implicit_cast.hpp|polymorphic_cast.hpp|polymorphic_pointer_cast.hpp") { "conversion" } + elseif ($_ -eq "make_default.hpp") { "convert" } + elseif ($_ -match "checked_delete.hpp|get_pointer.hpp|iterator.hpp|non_type.hpp|noncopyable.hpp|ref.hpp|swap.hpp|type.hpp|visit_each.hpp") { "core" } + elseif ($_ -match "blank.hpp|blank_fwd.hpp|cstdlib.hpp") { "detail" } + elseif ($_ -eq "dynamic_bitset_fwd.hpp") { "dynamic_bitset" } + elseif ($_ -eq "exception_ptr.hpp") { "exception" } + elseif ($_ -eq "foreach_fwd.hpp") { "foreach" } + elseif ($_ -eq "function_equal.hpp") { "function" } + elseif ($_ -match "integer_fwd.hpp|integer_traits.hpp") { "integer" } + elseif ($_ -eq "io_fwd.hpp") { "io" } + elseif ($_ -match "function_output_iterator.hpp|generator_iterator.hpp|indirect_reference.hpp|iterator_adaptors.hpp|next_prior.hpp|pointee.hpp|shared_container_iterator.hpp") { "iterator" } + elseif ($_ -match "cstdfloat.hpp|math_fwd.hpp") { "math" } + elseif ($_ -match "multi_index_container.hpp|multi_index_container_fwd.hpp") { "multi_index" } + elseif ($_ -eq "cast.hpp") { "numeric_conversion" } + elseif ($_ -match "none.hpp|none_t.hpp") { "optional" } + elseif ($_ -eq "qvm_lite.hpp") { "qvm" } + elseif ($_ -eq "nondet_random.hpp") { "random" } + elseif ($_ -match "cregex.hpp|regex_fwd.hpp") { "regex" } elseif ($_ -eq "archive") { "serialization" } - elseif ($_ -match "none|none_t") { "optional" } - elseif ($_ -match "cstdfloat|math_fwd") { "math" } - elseif ($_ -eq "cast") { "conversion"; "numeric_conversion" } # DEPRECATED header file, includes and - elseif ($_ -match "polymorphic_cast|implicit_cast") { "conversion" } - elseif ($_ -eq "nondet_random") { "random" } - elseif ($_ -eq "memory_order") { "atomic" } - elseif ($_ -match "blank|blank_fwd|numeric_traits|fenv") { "detail" } - elseif ($_ -match "is_placeholder|mem_fn") { "bind" } - elseif ($_ -eq "exception_ptr") { "exception" } - elseif ($_ -match "multi_index_container|multi_index_container_fwd") { "multi_index" } - elseif ($_ -eq "lexical_cast") { "lexical_cast"; "math" } - elseif ($_ -match "token_iterator|token_functions") { "tokenizer" } - elseif ($_ -eq "numeric" -and $library -notmatch "numeric_conversion|interval|odeint|ublas") { "numeric_conversion"; "interval"; "odeint"; "ublas" } - elseif ($_ -eq "io_fwd") { "io" } - else { $_ } - } | group | % name | ? { + elseif ($_ -match "^signals$|last_value.hpp|signal.hpp|signals.hpp") { "signals" } + elseif ($_ -match "enable_shared_from_this.hpp|intrusive_ptr.hpp|make_shared.hpp|make_unique.hpp|pointer_cast.hpp|pointer_to_other.hpp|scoped_array.hpp|scoped_ptr.hpp|shared_array.hpp|shared_ptr.hpp|weak_ptr.hpp") { "smart_ptr" } + elseif ($_ -eq "cerrno.hpp") { "system" } + elseif ($_ -eq "progress.hpp") { "timer" } + elseif ($_ -match "token_functions.hpp|token_iterator.hpp") { "tokenizer" } + elseif ($_ -match "aligned_storage.hpp") { "type_traits" } + elseif ($_ -match "unordered_map.hpp|unordered_set.hpp") { "unordered" } + elseif ($_ -match "call_traits.hpp|compressed_pair.hpp|operators.hpp|operators_v1.hpp") { "utility" } + # by dafault use the name as is, just remove the file extension if available + else { $_ -replace "\.hp?p?", "" } + } ` + | Where-Object { $_ -ne $library - } + } ` + | Group-Object -NoElement | ForEach-Object Name - #"`nFor ${library}:" - " [known] " + $($groups | ? { $libraries_found -contains $_ }) - " [unknown] " + $($groups | ? { $libraries_found -notcontains $_ }) - - $deps = @($groups | ? { $libraries_found -contains $_ }) - - $deps = @($deps | ? { - # Boost contains cycles, so remove a few dependencies to break the loop. - (($library -notmatch "core|assert|mpl|detail|throw_exception|type_traits|^exception") -or ($_ -notmatch "utility")) ` - -and ` - (($library -notmatch "assert") -or ($_ -notmatch "integer"))` - -and ` - (($library -notmatch "range") -or ($_ -notmatch "algorithm"))` - -and ` - (($library -ne "config") -or ($_ -notmatch "integer"))` - -and ` - (($library -notmatch "multiprecision") -or ($_ -notmatch "random|math"))` - -and ` - (($library -notmatch "lexical_cast") -or ($_ -notmatch "math"))` - -and ` - (($library -notmatch "functional") -or ($_ -notmatch "function"))` - -and ` - (($library -notmatch "detail") -or ($_ -notmatch "static_assert|integer|mpl|type_traits"))` - -and ` - ($_ -notmatch "mpi")` - -and ` - (($library -notmatch "spirit") -or ($_ -notmatch "serialization"))` - -and ` - (($library -notmatch "throw_exception") -or ($_ -notmatch "^exception"))` - -and ` - (($library -notmatch "iostreams|math") -or ($_ -notmatch "random"))` - -and ` - (($library -notmatch "utility|concept_check") -or ($_ -notmatch "iterator")) - } | % { $_ -replace "_","-" } | % { TransformReference $_ }) + " [known] " + $($usedLibraries | Where-Object { $foundLibraries -contains $_ }) + " [unknown] " + $($usedLibraries | Where-Object { $foundLibraries -notcontains $_ }) + $deps = @($usedLibraries | Where-Object { $foundLibraries -contains $_ }) + $deps = @($deps | ForEach-Object { GeneratePortDependency $_ }) $deps += @("boost-vcpkg-helpers") $needsBuild = $false - if (((Test-Path $unpacked/build/Jamfile.v2) -or (Test-Path $unpacked/build/Jamfile)) -and $library -notmatch "(metaparse|graph_parallel|function_types)") - { + if (((Test-Path $unpacked/build/Jamfile.v2) -or (Test-Path $unpacked/build/Jamfile)) -and $library -notmatch "function_types") { $deps += @( - @{ name="boost-build"; host=$True }, - @{ name="boost-modular-build-helper"; host=$True } + @{ name = "boost-build"; host = $True }, + @{ name = "boost-modular-build-helper"; host = $True }, + @{ name = "vcpkg-cmake"; host = $True } ) $needsBuild = $true } - if ($library -eq "python") - { - $deps += @("python3") - $needsBuild = $true - } - elseif ($library -eq "iostreams") - { - $deps += @("zlib", "bzip2", "liblzma", "zstd") - } - elseif ($library -eq "locale") - { - $deps += @(@{ name="libiconv"; platform="!uwp&!windows&!mingw" }, "boost-system") - } - elseif ($library -eq "asio") - { - $deps += @("openssl") - } - elseif ($library -eq "mpi") - { - $deps += @("mpi") - } - - $portName = $library -replace "_","-" - - Generate ` - -Name $library ` - -PortName $portName ` + GeneratePort ` + -Library $library ` -Hash $hash ` - -Depends $deps ` + -Dependencies $deps ` -NeedsBuild $needsBuild - $libraries_in_boost_port += @(TransformReference $portName) + $boostPortDependencies += @(GeneratePortDependency $library) } - finally - { - popd + finally { + Pop-Location } } -if ($libraries_in_boost_port.length -gt 1) { - # Generate master boost control file which depends on each individual library - # mpi is excluded due to it having a dependency on msmpi/openmpi - $boostDependsList = $libraries_in_boost_port | ? { $_ -notmatch "boost-mpi" } - - @{ - name = "boost"; - "version" = $version; - "port-version" = $port_versions.Contains('boost') ? $port_versions['boost'] : 0; - homepage = "https://boost.org"; - description = "Peer-reviewed portable C++ source libraries"; - dependencies = $boostDependsList; - features = @( - @{ - name = "mpi"; - description = "Build with MPI support"; - dependencies = @("boost-mpi"); - } - ); - } ` - | ConvertTo-Json -Depth 10 -Compress ` - | Out-File -Encoding UTF8 -FilePath "$portsDir/boost/vcpkg.json" - & $vcpkg format-manifest "$portsDir/boost/vcpkg.json" +if ($updateServicePorts) { + # Generate manifest file for master boost port which depends on each individual library + # mpi and graph-parallel are excluded due to they having a dependency on msmpi/openmpi + $boostPortDependencies = $boostPortDependencies | Where-Object { $_ -notmatch "boost-mpi|boost-graph-parallel" } + $boostPortFeatures = @( + @{ + name = "mpi" + description = "Build with MPI support" + dependencies = @("boost-mpi", "boost-graph-parallel") + } + ) + GeneratePortManifest ` + -PortName "boost" ` + -Homepage "https://boost.org" ` + -Description "Peer-reviewed portable C++ source libraries" ` + -Dependencies $boostPortDependencies ` + -Features $boostPortFeatures Set-Content -LiteralPath "$portsDir/boost/portfile.cmake" ` -Value "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" ` -Encoding UTF8 ` -NoNewline + + # Generate manifest files for boost-uninstall + GeneratePortManifest ` + -PortName "boost-uninstall" ` + -Description "Internal vcpkg port used to uninstall Boost" + + # Generate manifest files for boost-vcpkg-helpers + GeneratePortManifest ` + -PortName "boost-vcpkg-helpers" ` + -Description "Internal vcpkg port used to modularize Boost" ` + -Dependencies @("boost-uninstall") + + # Generate manifest files for boost-modular-build-helper + GeneratePortManifest ` + -PortName "boost-modular-build-helper" ` + -Description "Internal vcpkg port used to build Boost libraries" ` + -Dependencies @("boost-uninstall") + } diff --git a/scripts/boost/post-build-stubs/context.cmake b/scripts/boost/post-build-stubs/context.cmake deleted file mode 100644 index a88f8441dde071..00000000000000 --- a/scripts/boost/post-build-stubs/context.cmake +++ /dev/null @@ -1,6 +0,0 @@ - -# boost-context removed all.hpp, which is used by FindBoost to determine that context is installed -if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp) - file(WRITE ${CURRENT_PACKAGES_DIR}/include/boost/context/all.hpp - "#error \"#include is no longer supported by boost_context.\"") -endif() diff --git a/scripts/boost/post-build-stubs/exception.cmake b/scripts/boost/post-build-stubs/exception.cmake deleted file mode 100644 index 43594a04414cda..00000000000000 --- a/scripts/boost/post-build-stubs/exception.cmake +++ /dev/null @@ -1,3 +0,0 @@ - -set(VCPKG_LIBRARY_LINKAGE static) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) diff --git a/scripts/boost/post-source-stubs/json.cmake b/scripts/boost/post-source-stubs/json.cmake deleted file mode 100644 index bdc751886f89f7..00000000000000 --- a/scripts/boost/post-source-stubs/json.cmake +++ /dev/null @@ -1,8 +0,0 @@ -# see https://github.com/boostorg/json/issues/556 fore more details -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "import ../../config/checks/config" "import config/checks/config") -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile" "\n /boost//container/off" "") - -vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "import ../config/checks/config" "import build/config/checks/config") -vcpkg_replace_string("${SOURCE_PATH}/Jamfile" "..//check_basic_alignas" "..//..//..//check_basic_alignas") - -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") diff --git a/scripts/boost/post-source-stubs/math.cmake b/scripts/boost/post-source-stubs/math.cmake deleted file mode 100644 index fcbdd58149f1a2..00000000000000 --- a/scripts/boost/post-source-stubs/math.cmake +++ /dev/null @@ -1,6 +0,0 @@ -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "import ../../config/checks/config" "import config/checks/config") -vcpkg_replace_string("${SOURCE_PATH}/build/Jamfile.v2" "check-target-builds ../config//has_gcc_visibility" "check-target-builds ../has_gcc_visibility.cpp") - -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/build/config") -file(COPY "${SOURCE_PATH}/config/has_gcc_visibility.cpp" DESTINATION "${SOURCE_PATH}/") diff --git a/scripts/boost/post-source-stubs/nowide.cmake b/scripts/boost/post-source-stubs/nowide.cmake deleted file mode 100644 index a523422597e271..00000000000000 --- a/scripts/boost/post-source-stubs/nowide.cmake +++ /dev/null @@ -1,7 +0,0 @@ -file(READ "${SOURCE_PATH}/build/Jamfile.v2" _contents) -string(REPLACE "import ../../config/checks/config" "import config/checks/config" _contents "${_contents}") -string(REPLACE "check-target-builds ../config//cxx11_moveable_fstreams" "check-target-builds ../check_movable_fstreams.cpp" _contents "${_contents}") -string(REPLACE "check-target-builds ../config//lfs_support" "check-target-builds ../check_lfs_support.cpp" _contents "${_contents}") -file(WRITE "${SOURCE_PATH}/build/Jamfile.v2" "${_contents}") -file(COPY "${CURRENT_INSTALLED_DIR}/share/boost-config/checks" DESTINATION "${SOURCE_PATH}/build/config") -file(COPY "${SOURCE_PATH}/config/check_lfs_support.cpp" "${SOURCE_PATH}/config/check_movable_fstreams.cpp" DESTINATION "${SOURCE_PATH}/build/config") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8bdb71d556de25..fcea39c4182dd3 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1295,6 +1295,7 @@ quickfix:x64-windows-static-md=fail quickfix:x64-windows=fail quickfix:x86-windows=fail qwt:x64-osx=fail +qwtw:x64-windows=fail rabit:x64-osx=fail ragel:arm-uwp=fail ragel:x64-uwp=fail diff --git a/versions/a-/avro-cpp.json b/versions/a-/avro-cpp.json index 0fb40249df62a3..1f27c12857b593 100644 --- a/versions/a-/avro-cpp.json +++ b/versions/a-/avro-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7804bfb279bdea0b9e270f010e1683b9b8d7ee38", + "version-date": "2021-06-01", + "port-version": 1 + }, { "git-tree": "ecafbb456636115f10c5670a8bb484181c133d89", "version-date": "2021-06-01", diff --git a/versions/b-/boost-accumulators.json b/versions/b-/boost-accumulators.json index 91997673a2de26..c8562b855736a0 100644 --- a/versions/b-/boost-accumulators.json +++ b/versions/b-/boost-accumulators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b24ef7a5bec0e29c8013593cd6bba58e52b19a7a", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "94824d664d1b512dd44c3c84652b59da7726273a", "version": "1.76.0", diff --git a/versions/b-/boost-algorithm.json b/versions/b-/boost-algorithm.json index d4abb0b559e95d..85eb9ae2115f93 100644 --- a/versions/b-/boost-algorithm.json +++ b/versions/b-/boost-algorithm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "338f795a1e6d73ab25444f64fe7ba1d617128813", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b6ce23e02aaf8b595e852e9746677fa7f85819ca", "version": "1.76.0", diff --git a/versions/b-/boost-align.json b/versions/b-/boost-align.json index 53a6ac2c0819c7..56e02d2dd827bc 100644 --- a/versions/b-/boost-align.json +++ b/versions/b-/boost-align.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e733503d18c7e82478961e1155a40a95af0ab42", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b28cfbc210773962783f57f6526678f1085be471", "version": "1.76.0", diff --git a/versions/b-/boost-any.json b/versions/b-/boost-any.json index c548b6c62c022c..c1150ccd6cb56a 100644 --- a/versions/b-/boost-any.json +++ b/versions/b-/boost-any.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf8bdfd2ce434a981620383dcc07d46c0a071ca1", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "20631fecfd4ef3388bcaca6a3491d27b23bde42d", "version": "1.76.0", diff --git a/versions/b-/boost-array.json b/versions/b-/boost-array.json index 2f0eb1855c5e42..f14f775d7c16b1 100644 --- a/versions/b-/boost-array.json +++ b/versions/b-/boost-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fb008cce0de1c6a34ac5222d03d7e1069d135dc4", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "bea67607788bd73e3c83b93848a507090f886b7c", "version": "1.76.0", diff --git a/versions/b-/boost-asio.json b/versions/b-/boost-asio.json index 1043fdf4e953d1..655983326cdf4e 100644 --- a/versions/b-/boost-asio.json +++ b/versions/b-/boost-asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c5c591c857588b69354bf075019bc78ce4237bd", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "c422367cb9f7a8de0fcbf1809e1a2cab1983bce9", "version": "1.76.0", diff --git a/versions/b-/boost-assert.json b/versions/b-/boost-assert.json index 38aa1d4aef9d52..04e07585cebd69 100644 --- a/versions/b-/boost-assert.json +++ b/versions/b-/boost-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db6b88ce332c6752f87f8f0c098a832e23610303", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "d756c428b49e3aed8ce71c1d0b946426e929ef8a", "version": "1.76.0", diff --git a/versions/b-/boost-assign.json b/versions/b-/boost-assign.json index 1ee54c914b441c..2ba9d6427d3a45 100644 --- a/versions/b-/boost-assign.json +++ b/versions/b-/boost-assign.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7c391576a6f9714453c28f6b73ddcb3c7439827", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b026e0722c90b595f8125caab74275b68dcd81f9", "version": "1.76.0", diff --git a/versions/b-/boost-atomic.json b/versions/b-/boost-atomic.json index be30f33fed6b10..b16f499384471e 100644 --- a/versions/b-/boost-atomic.json +++ b/versions/b-/boost-atomic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5f02ea8b6555b20b6cc8901bdae9e9628086640", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "cfe27152cb82633d279f5c55b3eb9ba3b454e23e", "version": "1.76.0", diff --git a/versions/b-/boost-beast.json b/versions/b-/boost-beast.json index f3d48090a1a0dc..58a516bcdbe6c5 100644 --- a/versions/b-/boost-beast.json +++ b/versions/b-/boost-beast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "154d8664ca78bcee263cec7a297afe36a4877313", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "9d135f2fabb815ef2c643e71db48e227494aa3dd", "version": "1.76.0", diff --git a/versions/b-/boost-bimap.json b/versions/b-/boost-bimap.json index afb682e39ff2b1..ff33f654cf2f13 100644 --- a/versions/b-/boost-bimap.json +++ b/versions/b-/boost-bimap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "726aaa86124fd8d1658f0813902b8bf9b27bb707", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "2a01b028c11f40a89e1f0157f97e866ed4d53046", "version": "1.76.0", diff --git a/versions/b-/boost-bind.json b/versions/b-/boost-bind.json index bf814c60da97a8..a69492ff3b4a2d 100644 --- a/versions/b-/boost-bind.json +++ b/versions/b-/boost-bind.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1764edb5aaa4cf532e6e2d60d56420240dec410", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "7e622ce41f16af974c759e51dd9a250b054b3a71", "version": "1.76.0", diff --git a/versions/b-/boost-build.json b/versions/b-/boost-build.json index 42d36cd47a24dc..a660f3f6370670 100644 --- a/versions/b-/boost-build.json +++ b/versions/b-/boost-build.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d12d4a6f44a7356c4262b27adcda834fe893b576", + "version-string": "1.77.0", + "port-version": 0 + }, { "git-tree": "8e84097fbdf78eb6220bb0bb7c63addefb6301d9", "version-string": "1.75.0", diff --git a/versions/b-/boost-callable-traits.json b/versions/b-/boost-callable-traits.json index adc0b9f7b85de2..ae3883005c1f98 100644 --- a/versions/b-/boost-callable-traits.json +++ b/versions/b-/boost-callable-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c22b4049665b95038b8f5d1e1952434f1387f7c", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "61e468bd018412606e863d2b43d9b01c54205ba8", "version": "1.76.0", diff --git a/versions/b-/boost-chrono.json b/versions/b-/boost-chrono.json index 92397aedc80356..058f458e4ebce7 100644 --- a/versions/b-/boost-chrono.json +++ b/versions/b-/boost-chrono.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0143b4dd81e3de932ea886e69efd196452d81b3", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "9852214af239e8f5f34ba4299ac07b5e207f01da", "version": "1.76.0", diff --git a/versions/b-/boost-circular-buffer.json b/versions/b-/boost-circular-buffer.json index 0d7578bab4845c..0de7c05daa2599 100644 --- a/versions/b-/boost-circular-buffer.json +++ b/versions/b-/boost-circular-buffer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6352fb4c9b9e30001311015e28e712e9a2ef4a33", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "bcf85566e4489a3d73496650c2ae9481ff3640ef", "version": "1.76.0", diff --git a/versions/b-/boost-compatibility.json b/versions/b-/boost-compatibility.json index 2c9f8fb1e4b7f3..11473c87d3b6de 100644 --- a/versions/b-/boost-compatibility.json +++ b/versions/b-/boost-compatibility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2b4f365d9ee62baf2f0197bad774a679cb7449e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "06fb2597b509bc3d29528cb737c46db0ee09ecdc", "version": "1.76.0", diff --git a/versions/b-/boost-compute.json b/versions/b-/boost-compute.json index 34cca0afd07914..a4d2f56365da8c 100644 --- a/versions/b-/boost-compute.json +++ b/versions/b-/boost-compute.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e134e562b5a454a46bf922f7633cdf581db7795", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "805aad1fd978317024fd94885e2cfde0b90af4ef", "version": "1.76.0", diff --git a/versions/b-/boost-concept-check.json b/versions/b-/boost-concept-check.json index a8e62830292a1c..e116be7dc80d0a 100644 --- a/versions/b-/boost-concept-check.json +++ b/versions/b-/boost-concept-check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bdfb3a9b14b35dc1833bc559226c7925096ff57", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b6c3818b3fbea8e53859becf5f7a80ab8e583a85", "version": "1.76.0", diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 05000084115e7c..6e93f18fe62e2a 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a93a4c962b961f617c133389c18a994e3c27af1", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "a840275c02416548a8fa29b9d6170cb0a6e14680", "version": "1.76.0", diff --git a/versions/b-/boost-container-hash.json b/versions/b-/boost-container-hash.json index ca606953d67d27..961198633273df 100644 --- a/versions/b-/boost-container-hash.json +++ b/versions/b-/boost-container-hash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "76c8d3c46db10b6774d6986822e53d1140934667", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b8f8aa1976367c2a674b1a8a91ec5e2ceee25a4c", "version": "1.76.0", diff --git a/versions/b-/boost-container.json b/versions/b-/boost-container.json index 2da6fb4ca8a376..99438e8de73e19 100644 --- a/versions/b-/boost-container.json +++ b/versions/b-/boost-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9af11f40e9b9fc2ebdda7e8885f9f49dea1923d7", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "d24b325327cadb5031964d839a0c89ca482d87ad", "version": "1.76.0", diff --git a/versions/b-/boost-context.json b/versions/b-/boost-context.json index 02dd5e0ff6f6c0..4b72fec663bd5e 100644 --- a/versions/b-/boost-context.json +++ b/versions/b-/boost-context.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec8ceb582e4ef9936ceb840c70b90dfb20703f1d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "42c1043410aaf53351ccaf5c7ee6ae133f78a5db", "version": "1.76.0", diff --git a/versions/b-/boost-contract.json b/versions/b-/boost-contract.json index 6a3914a3853c10..d71be84fc1208d 100644 --- a/versions/b-/boost-contract.json +++ b/versions/b-/boost-contract.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8249694c8d2dfd942dbb733f138997d00ce89c7", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "6b8c36f8582d262cc3c02dc91e98309dd53b5a4b", "version": "1.76.0", diff --git a/versions/b-/boost-conversion.json b/versions/b-/boost-conversion.json index 339724897c4afb..40cc349771ee67 100644 --- a/versions/b-/boost-conversion.json +++ b/versions/b-/boost-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b591e95244353857eaade53621ee895b1d9e0a6", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "a18dc435cbe0aa35d32830fbe85d7d5ab0b71bf0", "version": "1.76.0", diff --git a/versions/b-/boost-convert.json b/versions/b-/boost-convert.json index b12a031b753a8a..1bdea7dfbe6551 100644 --- a/versions/b-/boost-convert.json +++ b/versions/b-/boost-convert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f01a746807fe131cfd83962df7faebd340eaef4", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "d13b694428c83a3f00302d0a4af2d2c457f13f05", "version": "1.76.0", diff --git a/versions/b-/boost-core.json b/versions/b-/boost-core.json index 03ec7ef2090feb..8c80cf3e048528 100644 --- a/versions/b-/boost-core.json +++ b/versions/b-/boost-core.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a56c8546828ee16a442a336c2385f9986f8c055f", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "f72d1f923bbbf99709e9cbaf54f36b7c2d22d169", "version": "1.76.0", diff --git a/versions/b-/boost-coroutine.json b/versions/b-/boost-coroutine.json index f00bc267b98ddc..ac2aa2410db041 100644 --- a/versions/b-/boost-coroutine.json +++ b/versions/b-/boost-coroutine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5afb95d36e4f0baa263193b00e9a1abc1f01454", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "55c94396b67927007f75ce08b2acc2b9adc908e5", "version": "1.76.0", diff --git a/versions/b-/boost-coroutine2.json b/versions/b-/boost-coroutine2.json index a77f8efe666668..de4f10b9b121b2 100644 --- a/versions/b-/boost-coroutine2.json +++ b/versions/b-/boost-coroutine2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8142422dd258f6a24df4ef3caf54b1d48096d8e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "4fe20c2b3573e82f0db30917b005310bc8697f88", "version": "1.76.0", diff --git a/versions/b-/boost-crc.json b/versions/b-/boost-crc.json index b3f8af42036c7a..d887e71303fc1b 100644 --- a/versions/b-/boost-crc.json +++ b/versions/b-/boost-crc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bab49b15015caaf455e6b304a613fccacd501ada", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "a9fb53c9bd706bc62d747a6e19e7d0639da9805d", "version": "1.76.0", diff --git a/versions/b-/boost-date-time.json b/versions/b-/boost-date-time.json index 7f7d43699c327e..75e5967109583a 100644 --- a/versions/b-/boost-date-time.json +++ b/versions/b-/boost-date-time.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2ca710f2484af3cbeee428e063a7e4269510110", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "47a2624a239c59fd89846f7b24fc3b108b31e82b", "version": "1.76.0", diff --git a/versions/b-/boost-describe.json b/versions/b-/boost-describe.json new file mode 100644 index 00000000000000..aaa95622c65b46 --- /dev/null +++ b/versions/b-/boost-describe.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "399140a565739230fd9b805f047013bf42a2a0b6", + "version": "1.77.0", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boost-detail.json b/versions/b-/boost-detail.json index 6697d99353ed4d..2a2390bad36310 100644 --- a/versions/b-/boost-detail.json +++ b/versions/b-/boost-detail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57dabb22a4f9dfe872c6f007c9dbae7bf0847514", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "69e27a71e0cacff0f2a9b005f03bc6262fe97210", "version": "1.76.0", diff --git a/versions/b-/boost-dll.json b/versions/b-/boost-dll.json index fd55ed1b7e57ac..8fef2013dd5ce1 100644 --- a/versions/b-/boost-dll.json +++ b/versions/b-/boost-dll.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ca0cf6c2a9f41257ad68442240ff7ad21b7e662", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b04bd18cc23d270ccaf152f5d28d5948ca69a664", "version": "1.76.0", diff --git a/versions/b-/boost-dynamic-bitset.json b/versions/b-/boost-dynamic-bitset.json index a8f5f199bbd1b8..25de5316dfebc7 100644 --- a/versions/b-/boost-dynamic-bitset.json +++ b/versions/b-/boost-dynamic-bitset.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5b7742c115d4e4a450062e30b1542c6fe4aac5d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "f0d3d3b2abd89405fba3564e8db5e05a02fb2902", "version": "1.76.0", diff --git a/versions/b-/boost-endian.json b/versions/b-/boost-endian.json index 45e4a268e7f554..48caee343a1333 100644 --- a/versions/b-/boost-endian.json +++ b/versions/b-/boost-endian.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6950c45ffb4e112920b6dd50c1cddde07b30d61d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "c191f1b591ce4455f933fa254ca32dfa5796058d", "version": "1.76.0", diff --git a/versions/b-/boost-exception.json b/versions/b-/boost-exception.json index 5dc5968a1ce35c..831c9464149f61 100644 --- a/versions/b-/boost-exception.json +++ b/versions/b-/boost-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d60d712de012657effc2314a5d8781e453097129", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "aa0a09700d91a3cd3bf1fbf6b8463e20ede77053", "version": "1.76.0", diff --git a/versions/b-/boost-fiber.json b/versions/b-/boost-fiber.json index fc78d022445ba7..14501708735ae2 100644 --- a/versions/b-/boost-fiber.json +++ b/versions/b-/boost-fiber.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6fb978600b4d0ec5e62111f587f537d475c95a2", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e9b109cf5a3f708a5036ddeee8b58676357b3db9", "version": "1.76.0", diff --git a/versions/b-/boost-filesystem.json b/versions/b-/boost-filesystem.json index b26dbff27f8211..621e9a2a025b50 100644 --- a/versions/b-/boost-filesystem.json +++ b/versions/b-/boost-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7665f5ed27513a334df5b6051cb72d076ce626c2", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "9265c46ce355c8470fa5bf8941b59dd27428d92e", "version": "1.76.0", diff --git a/versions/b-/boost-flyweight.json b/versions/b-/boost-flyweight.json index 06bb8dcdfa2038..4f92215d8c9ddc 100644 --- a/versions/b-/boost-flyweight.json +++ b/versions/b-/boost-flyweight.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c927df2056a6603e5bdc20673e22692183fd92e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "476c374b6a92402048db19b98376eff8b3e05782", "version": "1.76.0", diff --git a/versions/b-/boost-foreach.json b/versions/b-/boost-foreach.json index e5dec6f11b9c26..14e835af722dc8 100644 --- a/versions/b-/boost-foreach.json +++ b/versions/b-/boost-foreach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95983cd3eb11558e24d1f63a68a2ee944da927df", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "0e0fdd6589d7f0f04406efec82efcec315fa337e", "version": "1.76.0", diff --git a/versions/b-/boost-format.json b/versions/b-/boost-format.json index e398345e83b313..6b3d15127219bb 100644 --- a/versions/b-/boost-format.json +++ b/versions/b-/boost-format.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15c6449aa221b65139b38cc6c6ef91f32e2d2b1d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "352c9212fd097f4c147caf0dab9cec05cd47aa1a", "version": "1.76.0", diff --git a/versions/b-/boost-function-types.json b/versions/b-/boost-function-types.json index b7af3e73873dad..c2d0dcf553d949 100644 --- a/versions/b-/boost-function-types.json +++ b/versions/b-/boost-function-types.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7675770af935fb375c0350c7a5fc561f9bc31432", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "2f33a85bf7a578c9659b4bccd02296568bae3f3e", "version": "1.76.0", diff --git a/versions/b-/boost-function.json b/versions/b-/boost-function.json index eb9a5ce127640e..9de524d1d9b369 100644 --- a/versions/b-/boost-function.json +++ b/versions/b-/boost-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "092af2f7e20c516fc02e8a39d8887f2301bb1fd9", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "ad37e24486926b336f2ee015a3fa88cc8f8a2490", "version": "1.76.0", diff --git a/versions/b-/boost-functional.json b/versions/b-/boost-functional.json index cc58bf42acdd02..68497a74b45c5b 100644 --- a/versions/b-/boost-functional.json +++ b/versions/b-/boost-functional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26960fd1a5c5ffbb7da0d747f43a61a27d8825eb", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e84b797bddccd2a46e818d4364f71810f687b117", "version": "1.76.0", diff --git a/versions/b-/boost-fusion.json b/versions/b-/boost-fusion.json index 58cb0d00bfbcc2..da58b9f71b37ab 100644 --- a/versions/b-/boost-fusion.json +++ b/versions/b-/boost-fusion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e33ce42cfab1b757d73fc0c4ac7edacaefd0be58", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e6168fcf7f513e57e8f01f5c0ab19f446a66cd57", "version": "1.76.0", diff --git a/versions/b-/boost-geometry.json b/versions/b-/boost-geometry.json index a0b8d11cf2fcc1..df15e0fdad10c8 100644 --- a/versions/b-/boost-geometry.json +++ b/versions/b-/boost-geometry.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96d1b04d567acad7c4caafc869fa7daa64968aac", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "7de8c6c9ed0908a5d85b3dd739d27922fa213931", "version": "1.76.0", diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index b1f28b1fb07cf1..4b38949a22594e 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f4d4429e10ce2721dc48a01588fbf200c683bc5", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "4d323694c269cffa88a705e2eec5339c1dd391d3", "version": "1.76.0", diff --git a/versions/b-/boost-graph-parallel.json b/versions/b-/boost-graph-parallel.json index 8bb123d97a9aa9..e2b09a00a46e10 100644 --- a/versions/b-/boost-graph-parallel.json +++ b/versions/b-/boost-graph-parallel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "779ea0573b2c460496e5014b1776f8577d9a9dac", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e71dd1ba560f6dfcfefa262a5c6762a15b94e3d4", "version": "1.76.0", diff --git a/versions/b-/boost-graph.json b/versions/b-/boost-graph.json index 41ac721d97992f..653b130a7444e4 100644 --- a/versions/b-/boost-graph.json +++ b/versions/b-/boost-graph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8c7974cbf961af1d5eabeb1047f2dd16e087f180", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "c14b7885fb22225d265897b942a090ee43bcc1c3", "version": "1.76.0", diff --git a/versions/b-/boost-hana.json b/versions/b-/boost-hana.json index 469ac151c7cf69..4a4d4721856851 100644 --- a/versions/b-/boost-hana.json +++ b/versions/b-/boost-hana.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e24bae813978df09c5b5718b6c4d2aa87734ab2a", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "55d762dd0711b68ad1e494dc5d7f3e88ba6b6889", "version": "1.76.0", diff --git a/versions/b-/boost-heap.json b/versions/b-/boost-heap.json index 5053b07d52a525..02f47838fe84ae 100644 --- a/versions/b-/boost-heap.json +++ b/versions/b-/boost-heap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9947d5f31b9c87f5ce1e759e02099b1949502e4", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "7901583dc54be5f2453147da8fc772c5295f3ccd", "version": "1.76.0", diff --git a/versions/b-/boost-histogram.json b/versions/b-/boost-histogram.json index 928b7b07867675..8419587845c96c 100644 --- a/versions/b-/boost-histogram.json +++ b/versions/b-/boost-histogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09522ba204485792839f58b858ac31550e14a023", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "dcdf8ce8a1b3b6563bc1aae0ef60afaaac061f89", "version": "1.76.0", diff --git a/versions/b-/boost-hof.json b/versions/b-/boost-hof.json index 15433f00b380f2..e35145444d84c2 100644 --- a/versions/b-/boost-hof.json +++ b/versions/b-/boost-hof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c22e81e06ddd812d0328854ce7302f662fca398", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "8bc8af27f9d16f09f9c17a179abdf230d39a24eb", "version": "1.76.0", diff --git a/versions/b-/boost-icl.json b/versions/b-/boost-icl.json index 96f0dbfdabc863..a248dde081f8b9 100644 --- a/versions/b-/boost-icl.json +++ b/versions/b-/boost-icl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "753c4291a6d27d5c2fc377455c83df2ee9fd569a", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "70080f8e245f5ba2caa54b447f946bee8c998ec8", "version": "1.76.0", diff --git a/versions/b-/boost-integer.json b/versions/b-/boost-integer.json index 511c3d1539c271..9310a58f933f1d 100644 --- a/versions/b-/boost-integer.json +++ b/versions/b-/boost-integer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "375a2af7e2d5d620aa9f42064255c269b0c73f5a", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "77a69013cb4d850223122dff3bff12318a140d82", "version": "1.76.0", diff --git a/versions/b-/boost-interprocess.json b/versions/b-/boost-interprocess.json index 48908e0498c2b1..7cb7b5eda180af 100644 --- a/versions/b-/boost-interprocess.json +++ b/versions/b-/boost-interprocess.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6461c4f63a5c0f31efb213c9d1e3b9328b2e3dcc", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "6e0c78814b07fcfe58e421f651bda285081dcd48", "version": "1.76.0", diff --git a/versions/b-/boost-interval.json b/versions/b-/boost-interval.json index 5f1944f771b3c8..277962acba2ad2 100644 --- a/versions/b-/boost-interval.json +++ b/versions/b-/boost-interval.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e57b55cec7198cb4f448933fa2763465db0c9672", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "6c7ee56a1456d43b67e772976c40eab0f96e10e8", "version": "1.76.0", diff --git a/versions/b-/boost-intrusive.json b/versions/b-/boost-intrusive.json index a691948cfcd569..5d825dcea16eac 100644 --- a/versions/b-/boost-intrusive.json +++ b/versions/b-/boost-intrusive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fb49266dc300d8914a0485972738b960ccf4339", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "c63e249209fcddec92063bb59266892ed6bfab38", "version": "1.76.0", diff --git a/versions/b-/boost-io.json b/versions/b-/boost-io.json index 2ca5c987ab6a0f..cd5cec0aed2688 100644 --- a/versions/b-/boost-io.json +++ b/versions/b-/boost-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83ec8bab1f1bbd6eb1e2883a26747c7982d5c34f", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "33d8fc8dd5a42e12f4d1cd0989c147a674d5c6f1", "version": "1.76.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 348cd0d1e2b618..9a6380b1ddee38 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ff4027cebb3423a41814a8c2da942ea959b17ad", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "0909e271c34f98d1e5857091ce21b16e1d165e05", "version": "1.76.0", diff --git a/versions/b-/boost-iterator.json b/versions/b-/boost-iterator.json index 69f4d6577466fa..ce0b7af1635706 100644 --- a/versions/b-/boost-iterator.json +++ b/versions/b-/boost-iterator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bec2abc5b714c2bd975178406937ef59a73f29b", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "504d724993ea74e0bc0b17b4101539cd603460d5", "version": "1.76.0", diff --git a/versions/b-/boost-json.json b/versions/b-/boost-json.json index b09be2c5fda44a..02a595c9accf00 100644 --- a/versions/b-/boost-json.json +++ b/versions/b-/boost-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80003ce3a7bb1c08b9ac354c58085758343ca42d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b7a48d6f43ab6578d7f25969c0aaf0c385036c8a", "version": "1.76.0", diff --git a/versions/b-/boost-lambda.json b/versions/b-/boost-lambda.json index f1bd8dd4251949..9655aa372205e6 100644 --- a/versions/b-/boost-lambda.json +++ b/versions/b-/boost-lambda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56ca5b54a9913e884d79bfd72e13ac6d72acd71d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "63ee28b3c29f04ba5d62bb8d0c9ab8e4b051dd1c", "version": "1.76.0", diff --git a/versions/b-/boost-lambda2.json b/versions/b-/boost-lambda2.json new file mode 100644 index 00000000000000..58b85cda00c26e --- /dev/null +++ b/versions/b-/boost-lambda2.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d97e933c5109b73c577e20f53bc095224e9ca198", + "version": "1.77.0", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boost-leaf.json b/versions/b-/boost-leaf.json index 429812e0a37fc3..7061e9bc0c6f9f 100644 --- a/versions/b-/boost-leaf.json +++ b/versions/b-/boost-leaf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e257e66da57763ab4e677806d04b6d67721c09df", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e5d414a21f12b33a083b6595ef485d21e6e4df76", "version": "1.76.0", diff --git a/versions/b-/boost-lexical-cast.json b/versions/b-/boost-lexical-cast.json index 378637e5a2d6c9..a1012e927ba4f1 100644 --- a/versions/b-/boost-lexical-cast.json +++ b/versions/b-/boost-lexical-cast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a265d9296755adc81f3c02b273d758798903b0c", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "966a986af9237664ffc3b35384ccbe006b83e196", "version": "1.76.0", diff --git a/versions/b-/boost-local-function.json b/versions/b-/boost-local-function.json index b4821984049c25..41612a19d3f838 100644 --- a/versions/b-/boost-local-function.json +++ b/versions/b-/boost-local-function.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61818440e17f46b0715e5b53b8c49a79dc274a27", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "3e9c798dfb0bba3dd3833464354ff492e735231e", "version": "1.76.0", diff --git a/versions/b-/boost-locale.json b/versions/b-/boost-locale.json index 7bd52febbd9ccc..3b10fee0bcbde4 100644 --- a/versions/b-/boost-locale.json +++ b/versions/b-/boost-locale.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c391246c7c5588d89f0d3fe5425a3fb3c97d7787", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "76b51eadd7efd7d81d23c39d126a50abd1cb82e5", "version": "1.76.0", diff --git a/versions/b-/boost-lockfree.json b/versions/b-/boost-lockfree.json index 66c9bc446ac270..75c947d2cbbc8a 100644 --- a/versions/b-/boost-lockfree.json +++ b/versions/b-/boost-lockfree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6760017d0cf025254b1056309a2c32407081c4bb", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "22166eccd3d3b536062ee1648d147ee357a058ed", "version": "1.76.0", diff --git a/versions/b-/boost-log.json b/versions/b-/boost-log.json index d7baec9dfaa3f6..fd39146738c144 100644 --- a/versions/b-/boost-log.json +++ b/versions/b-/boost-log.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ab1ab88f37500f86b5c9b9222e50dc2c17da5c1", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "1e1221d665804faaebfc9c5b91c89a6b3f66f91d", "version": "1.76.0", diff --git a/versions/b-/boost-logic.json b/versions/b-/boost-logic.json index 5abc466097af6a..2cccebec6302d5 100644 --- a/versions/b-/boost-logic.json +++ b/versions/b-/boost-logic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afcc526b0a9287bc84744bf57a1a6d37a0b3b567", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "ee745d1ee8b0842a39a46d7830655c765b438bca", "version": "1.76.0", diff --git a/versions/b-/boost-math.json b/versions/b-/boost-math.json index 413344d928d060..2cc8be73079f61 100644 --- a/versions/b-/boost-math.json +++ b/versions/b-/boost-math.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3caf2df93bffdc6d72b5c4df120200abe0f6562", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "448de1ada43d74ffd7b4511c34319a5cc25bbec0", "version": "1.76.0", diff --git a/versions/b-/boost-metaparse.json b/versions/b-/boost-metaparse.json index 4b3a52a0e436d5..bfdb5098845aec 100644 --- a/versions/b-/boost-metaparse.json +++ b/versions/b-/boost-metaparse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f5433852913f94917d5e6afde09d24d48421ed3", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "44ca94c8ff9e03288a08adedfbccd61541867d75", "version": "1.76.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 2b37412e7e63c7..6d8bd59a618190 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b14ac826c44c030a65af10732269f379b856f76f", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "fd1c08c606cabfe31c22e2677c383f8b5119fba6", "version-string": "1.76.0", diff --git a/versions/b-/boost-move.json b/versions/b-/boost-move.json index e8cebf7bebc3be..2063ba75059937 100644 --- a/versions/b-/boost-move.json +++ b/versions/b-/boost-move.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d912a2a9e0b705919dae22cd8af6a4467e209e4e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b6563abd760c2241004acc0da699152ab8c4b294", "version": "1.76.0", diff --git a/versions/b-/boost-mp11.json b/versions/b-/boost-mp11.json index 77668299003d03..f0be35fcece9d0 100644 --- a/versions/b-/boost-mp11.json +++ b/versions/b-/boost-mp11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f685c323f00cf309294ac9e26b554baacbe3aecf", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "8aa7b3c86aa66c1629ac5cf5ce4e4b6a4a95b61e", "version": "1.76.0", diff --git a/versions/b-/boost-mpi.json b/versions/b-/boost-mpi.json index 57f691cb92834c..5bf38a9fc2dec6 100644 --- a/versions/b-/boost-mpi.json +++ b/versions/b-/boost-mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25bace7adcac31b1199ae4e8b522a3bf020362e2", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "21a8e85d8e04d477e9127f80d78b6abf1d130651", "version": "1.76.0", diff --git a/versions/b-/boost-mpl.json b/versions/b-/boost-mpl.json index 59a9f4267bd220..ef673f4feb5c3a 100644 --- a/versions/b-/boost-mpl.json +++ b/versions/b-/boost-mpl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b0bd80c486b32952b76c2b9539555cff5d2f911", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "250327ba168c480f1f530792a14e87cd4d13b63d", "version": "1.76.0", diff --git a/versions/b-/boost-msm.json b/versions/b-/boost-msm.json index 4e4dcbbd53d885..09d01c88d5ce80 100644 --- a/versions/b-/boost-msm.json +++ b/versions/b-/boost-msm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2dc03df49f99f1fca480d0439fe973a1f02c96b", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "ba54ee9c431c0c499935a7d7bc8a255cd5e9cac7", "version": "1.76.0", diff --git a/versions/b-/boost-multi-array.json b/versions/b-/boost-multi-array.json index e705e3ca788dde..5fa1f2bea25c88 100644 --- a/versions/b-/boost-multi-array.json +++ b/versions/b-/boost-multi-array.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "afcf3afccfec7dacd50795dad8c588b3f2dabbb5", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "bc5acbb8051e16c1e48d8e82ea0fac48c6024287", "version": "1.76.0", diff --git a/versions/b-/boost-multi-index.json b/versions/b-/boost-multi-index.json index d0fa4e3195257f..1be14c6dac1c9e 100644 --- a/versions/b-/boost-multi-index.json +++ b/versions/b-/boost-multi-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e993a57f4569f76310bc8c203372ebe472395005", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "d1e0c81cdc2adb33d2963722016c0b13a15055f7", "version": "1.76.0", diff --git a/versions/b-/boost-multiprecision.json b/versions/b-/boost-multiprecision.json index aec911444d9378..2959fa9c1c624b 100644 --- a/versions/b-/boost-multiprecision.json +++ b/versions/b-/boost-multiprecision.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58d7184ae4115f7f46671db9929708872e6aae6c", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "55ee6b85fe02f7875374cb3f78a427365ba7beb5", "version": "1.76.0", diff --git a/versions/b-/boost-nowide.json b/versions/b-/boost-nowide.json index 79290c812354cf..3244ab2d7d63ec 100644 --- a/versions/b-/boost-nowide.json +++ b/versions/b-/boost-nowide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fc28ef9747a6ead394ae884518c8be324dd8e33", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "9b1a6083440b08b8b266524dac6a8aa200e417dc", "version": "1.76.0", diff --git a/versions/b-/boost-numeric-conversion.json b/versions/b-/boost-numeric-conversion.json index 290443486eef2d..1d616a86e0fc48 100644 --- a/versions/b-/boost-numeric-conversion.json +++ b/versions/b-/boost-numeric-conversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "78140f78c6400520bd4ce340c68236e083a504e9", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "3ab3a3a915ad6bff1aa094641e7471e5ddc8a11d", "version": "1.76.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index c0d98ace1af294..17884143b5d86e 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ef1ae6d236984a5cdb1cb5dbc76067648461231", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "89c69f304356b50d3e4e58155bb08009629de385", "version": "1.76.0", diff --git a/versions/b-/boost-optional.json b/versions/b-/boost-optional.json index 00a11e946e0542..e4f8ac19d25995 100644 --- a/versions/b-/boost-optional.json +++ b/versions/b-/boost-optional.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a1ddf516bc0edc855ab4d9b8d134f338ba51a94", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "5a824aac647806d7f8d03ea8ec715faea895d54a", "version": "1.76.0", diff --git a/versions/b-/boost-outcome.json b/versions/b-/boost-outcome.json index 3944d0a8183b07..9169456da791ca 100644 --- a/versions/b-/boost-outcome.json +++ b/versions/b-/boost-outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6737734e6d10c475676e1ed16967ec7792acc7dc", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "1ea91b17815f03d2702bf3721f8002cb8d64cb85", "version": "1.76.0", diff --git a/versions/b-/boost-parameter-python.json b/versions/b-/boost-parameter-python.json index 746e6f6c960d9c..3e36eaeeaea8fb 100644 --- a/versions/b-/boost-parameter-python.json +++ b/versions/b-/boost-parameter-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5295cb4faa096633a23163b2a6409a27464a157e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e57e6544326fe84416a0060a9d93723d05b9bb54", "version": "1.76.0", diff --git a/versions/b-/boost-parameter.json b/versions/b-/boost-parameter.json index 73318e03cd26d5..794115cda204fb 100644 --- a/versions/b-/boost-parameter.json +++ b/versions/b-/boost-parameter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f480980e4e1ce4713a28bd24d728efb0bb931fa", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e064373327329af8a7624ad00073dbfdbc196a48", "version": "1.76.0", diff --git a/versions/b-/boost-pfr.json b/versions/b-/boost-pfr.json index 072e5835d00a79..3c04fc39c3cf08 100644 --- a/versions/b-/boost-pfr.json +++ b/versions/b-/boost-pfr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "23bdfdb9c9cb19e28201088dc055b85dc44b62bf", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "f58af0deba41766f33ad383428463f59cf38d976", "version": "1.76.0", diff --git a/versions/b-/boost-phoenix.json b/versions/b-/boost-phoenix.json index 114477982c1621..e8742b823075be 100644 --- a/versions/b-/boost-phoenix.json +++ b/versions/b-/boost-phoenix.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2926d1b537106cb231bb9f3a657f6fde6c8530f8", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "20af48e0084ec80f69c580872c2fc4e01fffd4fc", "version": "1.76.0", diff --git a/versions/b-/boost-poly-collection.json b/versions/b-/boost-poly-collection.json index 5072c7ed77c65b..3aed0d7a624683 100644 --- a/versions/b-/boost-poly-collection.json +++ b/versions/b-/boost-poly-collection.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d57a3554e15ff1a0bf279688f487751bc5f74efb", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "603662ddf6590592848f2dd714fb08776d3a9616", "version": "1.76.0", diff --git a/versions/b-/boost-polygon.json b/versions/b-/boost-polygon.json index 85a7bea32b3500..c7f28fefc923db 100644 --- a/versions/b-/boost-polygon.json +++ b/versions/b-/boost-polygon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81ea3095d56a98f6d5b75db6568a19e48ac819bb", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "1a6ab42b35df132f8a1f7c52dc7d92eb8a7cb894", "version": "1.76.0", diff --git a/versions/b-/boost-pool.json b/versions/b-/boost-pool.json index 0ddce84599ecca..c6c63d6928ad45 100644 --- a/versions/b-/boost-pool.json +++ b/versions/b-/boost-pool.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7794803f75109db0ca64a48d2f1cbd76100b153d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "a9ae22b07f1f3b91d8b90f8532480abfbd0a24ac", "version": "1.76.0", diff --git a/versions/b-/boost-predef.json b/versions/b-/boost-predef.json index 5428d428aeb1a6..cfea8f0ef0cda5 100644 --- a/versions/b-/boost-predef.json +++ b/versions/b-/boost-predef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a291dbfb68391a25f04944f9caa924f570b26d41", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "240a1963be7f74c2de3f507bf034e765c632f033", "version": "1.76.0", diff --git a/versions/b-/boost-preprocessor.json b/versions/b-/boost-preprocessor.json index dd306d354b2786..ec230e7af6f6b6 100644 --- a/versions/b-/boost-preprocessor.json +++ b/versions/b-/boost-preprocessor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6abad213e30df5ed168164b2612dba2041c7e8c1", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "c618127e3c475a0991c59922fa57c2fee6eabd40", "version": "1.76.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index df9877e51715a0..464304c2fa244d 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6589096a03d4f8ea1590b1b9e1bdc41a47c2f907", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "dd105bdb8e892a098738e054cfb90cb1786c856e", "version": "1.76.0", diff --git a/versions/b-/boost-program-options.json b/versions/b-/boost-program-options.json index b147dcb9d588ec..a844bf6338fd2c 100644 --- a/versions/b-/boost-program-options.json +++ b/versions/b-/boost-program-options.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ba826d9a2078c4e933cb9bfd23cb9c1a0e252ac", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "6e841e59b06375faa95855cefe7cf14515ddcc42", "version": "1.76.0", diff --git a/versions/b-/boost-property-map-parallel.json b/versions/b-/boost-property-map-parallel.json new file mode 100644 index 00000000000000..7ea721c402434b --- /dev/null +++ b/versions/b-/boost-property-map-parallel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "32b8452f34ad6048981ab1f2a5d7c226753205b8", + "version": "1.77.0", + "port-version": 0 + } + ] +} diff --git a/versions/b-/boost-property-map.json b/versions/b-/boost-property-map.json index b14a178136f604..c5666200e3a8dd 100644 --- a/versions/b-/boost-property-map.json +++ b/versions/b-/boost-property-map.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c866a47a5b9a770e415dc1078cc37870cd5851bf", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "68d4dfac2cedfe5786ecfb96bbe974c7257c73c7", "version": "1.76.0", diff --git a/versions/b-/boost-property-tree.json b/versions/b-/boost-property-tree.json index 260a3a16b915a4..590c41eb6af4f3 100644 --- a/versions/b-/boost-property-tree.json +++ b/versions/b-/boost-property-tree.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "959191d822cc095e02a3f6d9af5b68aeb823a0d1", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "099a09d3ed31651c57f2f3c735da5948dce45b66", "version": "1.76.0", diff --git a/versions/b-/boost-proto.json b/versions/b-/boost-proto.json index b1a2f8bfca3bb9..64d5c6e3e7b10c 100644 --- a/versions/b-/boost-proto.json +++ b/versions/b-/boost-proto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d33f62f1117da9bac418c4b85d1a1bd96c547a4", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e7d8b52790eabfc30fa162d68055d3fe30c8b20c", "version": "1.76.0", diff --git a/versions/b-/boost-ptr-container.json b/versions/b-/boost-ptr-container.json index da82a8157a191b..342e26e7bb555d 100644 --- a/versions/b-/boost-ptr-container.json +++ b/versions/b-/boost-ptr-container.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e954b84d951409f6445d7d49bafa66c977ed9834", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "1a46fb253999b4a420c6ae8c060351bb56dfb303", "version": "1.76.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index 3b2903d194f19d..d58ad4b7d66b0f 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f6fba6abc29e2084469c11ba2f2f1f745b08137", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "789047e74a9db18c96ada8dc7addda4fc867360e", "version": "1.76.0", diff --git a/versions/b-/boost-qvm.json b/versions/b-/boost-qvm.json index 423359537de1b8..072fa2f55ae136 100644 --- a/versions/b-/boost-qvm.json +++ b/versions/b-/boost-qvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d7b01d612075dfb3d89b799bec152785c838b84", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "70b5734ed30839efbf4048f5749af11e292df641", "version": "1.76.0", diff --git a/versions/b-/boost-random.json b/versions/b-/boost-random.json index 7ab2951c76318b..ab58ea216db09e 100644 --- a/versions/b-/boost-random.json +++ b/versions/b-/boost-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f6c3399689c43f599f3852d98325cb272e8f775", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "174356d3aa0622ffc40c5a8a2c4c4d2813498a2e", "version": "1.76.0", diff --git a/versions/b-/boost-range.json b/versions/b-/boost-range.json index 5eb03734bbe21e..a04bcd0a574992 100644 --- a/versions/b-/boost-range.json +++ b/versions/b-/boost-range.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "737f4f322e661e01459862fbe73f748390b59c3d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e595f4b0f7135b43d0bef283fec3c0d4d742dc51", "version": "1.76.0", diff --git a/versions/b-/boost-ratio.json b/versions/b-/boost-ratio.json index 0f17ec5e3ae618..8f132fe021939c 100644 --- a/versions/b-/boost-ratio.json +++ b/versions/b-/boost-ratio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "724fa7b1c0e1d78a9c29595b042443090e53a8ee", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "002edb9b01fe471f968eba09c80bed4ea60fa865", "version": "1.76.0", diff --git a/versions/b-/boost-rational.json b/versions/b-/boost-rational.json index 749b85e1dbcfbd..2fae947dd3b661 100644 --- a/versions/b-/boost-rational.json +++ b/versions/b-/boost-rational.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d54d04de158ddaf33d7b8a6815532e8ee2771515", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "8f6911d5b98ba7669956568acb155112e623927b", "version": "1.76.0", diff --git a/versions/b-/boost-regex.json b/versions/b-/boost-regex.json index 756cd71c8f30f7..9066d4b5a65a51 100644 --- a/versions/b-/boost-regex.json +++ b/versions/b-/boost-regex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7c4497156a2c9e4f3227ee3807512630242307d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "7803a877c9e9acd2162106e3bc15eb363b6b069a", "version": "1.76.0", diff --git a/versions/b-/boost-safe-numerics.json b/versions/b-/boost-safe-numerics.json index 388d351f2d33b2..09227552291e64 100644 --- a/versions/b-/boost-safe-numerics.json +++ b/versions/b-/boost-safe-numerics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc4fa0c3b394d848fbc83ca16bcaec15742ed3db", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "69c7ccf5d656e92b0a71e2456933481338ddb675", "version": "1.76.0", diff --git a/versions/b-/boost-scope-exit.json b/versions/b-/boost-scope-exit.json index 351561ea0be17f..622822b7f3f633 100644 --- a/versions/b-/boost-scope-exit.json +++ b/versions/b-/boost-scope-exit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33d55355e2f85c6188f1d131f386f86b8e29efc1", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "419330b673f261bc92184d6f65b442bda6fb0fbb", "version": "1.76.0", diff --git a/versions/b-/boost-serialization.json b/versions/b-/boost-serialization.json index 127e96e7c1da79..a762ba7e011a81 100644 --- a/versions/b-/boost-serialization.json +++ b/versions/b-/boost-serialization.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdb25d2d55569534825b139f62cf29a2f7aaba6e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "7cd97a04356c141db68bfb6aec62c68e467f9ea6", "version": "1.76.0", diff --git a/versions/b-/boost-signals2.json b/versions/b-/boost-signals2.json index a03b6c18449e9f..633f990917f739 100644 --- a/versions/b-/boost-signals2.json +++ b/versions/b-/boost-signals2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac3a1ba310974e1653a99cccc34339f29ad43786", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "c574224ceed1d97eb67edfdb398117fb908b91c9", "version": "1.76.0", diff --git a/versions/b-/boost-smart-ptr.json b/versions/b-/boost-smart-ptr.json index 08a929562f634e..dfb0d402efbc0c 100644 --- a/versions/b-/boost-smart-ptr.json +++ b/versions/b-/boost-smart-ptr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "700532550b70d03254c77f1467ab4c01a2c6e62a", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "f43e22c2f1e0d71baa91b8ac5d995ab0cc0a802e", "version": "1.76.0", diff --git a/versions/b-/boost-sort.json b/versions/b-/boost-sort.json index 2d9c8e0517190d..df8596da5e8426 100644 --- a/versions/b-/boost-sort.json +++ b/versions/b-/boost-sort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af8327ce79cadcc43327a0f75d79b2e5feed38b8", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "078e3d6c36e55a55d2af19d02036437d6dabff5e", "version": "1.76.0", diff --git a/versions/b-/boost-spirit.json b/versions/b-/boost-spirit.json index 4ec1efb6e5dffb..098082d48a1900 100644 --- a/versions/b-/boost-spirit.json +++ b/versions/b-/boost-spirit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc66c5a9ccd7f7bde95426392bc7ff62189f920d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "0fd209b14daf0b5990c60a1e10a6d92dd03c009c", "version": "1.76.0", diff --git a/versions/b-/boost-stacktrace.json b/versions/b-/boost-stacktrace.json index 06611a53b9f9d3..ffa45e095739aa 100644 --- a/versions/b-/boost-stacktrace.json +++ b/versions/b-/boost-stacktrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d5ffa9ca1552ad32a5c6a78c28a3e275323dc2d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "02837608d604cde8de8bcbd5dcc706e406a808dd", "version": "1.76.0", diff --git a/versions/b-/boost-statechart.json b/versions/b-/boost-statechart.json index 934fe3ac9f9791..b3e250803bf5dc 100644 --- a/versions/b-/boost-statechart.json +++ b/versions/b-/boost-statechart.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "044b9fc61c729216838037b6b519393e32b2fa26", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "94c1acd6353e0db7370f742c082c160114f7af8a", "version": "1.76.0", diff --git a/versions/b-/boost-static-assert.json b/versions/b-/boost-static-assert.json index 5a1eef7dfe40dd..1da1c117dfd724 100644 --- a/versions/b-/boost-static-assert.json +++ b/versions/b-/boost-static-assert.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57ca16ab3652380b32a137add7aed6a385754d75", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "dc334c3a07d041efa802d868ece12150bdef34b9", "version": "1.76.0", diff --git a/versions/b-/boost-static-string.json b/versions/b-/boost-static-string.json index ce71f6e327c466..c5953e7103af83 100644 --- a/versions/b-/boost-static-string.json +++ b/versions/b-/boost-static-string.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8296453890169b2bf99e2b7ecf4231c7ae572903", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "990abb2e15b868e2f80750422c3750e11700bc17", "version": "1.76.0", diff --git a/versions/b-/boost-stl-interfaces.json b/versions/b-/boost-stl-interfaces.json index 4b44371ba7992f..4d7a745979ba00 100644 --- a/versions/b-/boost-stl-interfaces.json +++ b/versions/b-/boost-stl-interfaces.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e127914d34e8dbaebf9f36fe800b8bc85252233", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "4b74daa481d1f60e2d6f9c6b221a80dc8668cde7", "version": "1.76.0", diff --git a/versions/b-/boost-system.json b/versions/b-/boost-system.json index 61c8f4ce493fe5..7e9741164bba29 100644 --- a/versions/b-/boost-system.json +++ b/versions/b-/boost-system.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86ac553606d3af5cf67b96bafd1ddaf9e6c57b60", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "c0286de08a3fa5ba043e432b986df78f4defcc96", "version": "1.76.0", diff --git a/versions/b-/boost-test.json b/versions/b-/boost-test.json index de7fd15ef740e6..f7f6df87e386f4 100644 --- a/versions/b-/boost-test.json +++ b/versions/b-/boost-test.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6429276e9f4fa438346cb3d41e73b9c15bff1868", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "9bab6b8839833eda9df6a0016d8634d129fef485", "version": "1.76.0", diff --git a/versions/b-/boost-thread.json b/versions/b-/boost-thread.json index b6358cf03ec3af..ac617602c296b8 100644 --- a/versions/b-/boost-thread.json +++ b/versions/b-/boost-thread.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c097a032a997463e15245272e40ea9298554f8b", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "ef29c4cc84cd28ca6cc812794dfb264709dac11e", "version": "1.76.0", diff --git a/versions/b-/boost-throw-exception.json b/versions/b-/boost-throw-exception.json index 673c72566a54b9..39345f00046f09 100644 --- a/versions/b-/boost-throw-exception.json +++ b/versions/b-/boost-throw-exception.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0887800c8710d96015c7c1541f78265e1227963", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "29a39e0d594d74febccddce3a077ff39c484fe21", "version": "1.76.0", diff --git a/versions/b-/boost-timer.json b/versions/b-/boost-timer.json index 70ad94f66e17c6..2d50aeb789ff69 100644 --- a/versions/b-/boost-timer.json +++ b/versions/b-/boost-timer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa256b5fe2ecea8dc514e446f136bbe1100a9805", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "7e8fe8dd0d1524fc679c48bf4ca41f31a99ebc36", "version": "1.76.0", diff --git a/versions/b-/boost-tokenizer.json b/versions/b-/boost-tokenizer.json index ab96011fdd1445..b66552312ff79c 100644 --- a/versions/b-/boost-tokenizer.json +++ b/versions/b-/boost-tokenizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56a1fb828a469ba50000983860226452c264050f", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "2b9b3cbc205006491c43f7244cd4a046961e610c", "version": "1.76.0", diff --git a/versions/b-/boost-tti.json b/versions/b-/boost-tti.json index 49ab50a25cfffe..8de66a06111cbc 100644 --- a/versions/b-/boost-tti.json +++ b/versions/b-/boost-tti.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "102fbb95889400677115252d4a5954a2f7edd5e1", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "878a097bf8023343a8af384bb30e0eee437a6904", "version": "1.76.0", diff --git a/versions/b-/boost-tuple.json b/versions/b-/boost-tuple.json index 47483eab79645a..a37d4c55a453a5 100644 --- a/versions/b-/boost-tuple.json +++ b/versions/b-/boost-tuple.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35d10ab4f156848f6f08f8bc26e41b27638af55e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "8b10179f5ffe71f697610799b865c72d7be1dfb2", "version": "1.76.0", diff --git a/versions/b-/boost-type-erasure.json b/versions/b-/boost-type-erasure.json index 4e4fa5edf48b10..2d00e539e8cc63 100644 --- a/versions/b-/boost-type-erasure.json +++ b/versions/b-/boost-type-erasure.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d98f14bce468d5ac0e5fca0f61bd6c5eef911224", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b488a742d2f94e05da4f00a2fd3c9cb46fba13df", "version": "1.76.0", diff --git a/versions/b-/boost-type-index.json b/versions/b-/boost-type-index.json index 5c43e79438857f..41d2c8622cb594 100644 --- a/versions/b-/boost-type-index.json +++ b/versions/b-/boost-type-index.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b8c5d86d75e307f04c4e5548f2ff57dccdc29e40", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "2125b24468cfbf25aaf0c3f600cda9b6773ffb18", "version": "1.76.0", diff --git a/versions/b-/boost-type-traits.json b/versions/b-/boost-type-traits.json index 0769cc4346d054..85a5178f72bec5 100644 --- a/versions/b-/boost-type-traits.json +++ b/versions/b-/boost-type-traits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f108bb5313d004627d2b81b5e2a6d7298b091e9", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "2feae16df79f9f3d24b98d407e542458706426c5", "version": "1.76.0", diff --git a/versions/b-/boost-typeof.json b/versions/b-/boost-typeof.json index fe3d24d7eb02f4..f68d6561a7c685 100644 --- a/versions/b-/boost-typeof.json +++ b/versions/b-/boost-typeof.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7df16df37b9fe9d5e4184dfdf928030010522f51", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "6f493f75125a3d4c8b69fccc3c72ed6b868368c4", "version": "1.76.0", diff --git a/versions/b-/boost-ublas.json b/versions/b-/boost-ublas.json index 843391a4c5a522..813a33d10d51d3 100644 --- a/versions/b-/boost-ublas.json +++ b/versions/b-/boost-ublas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7261e769f15495294c4eed2d06a157979419b0a9", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "845a49ec34532fe2ba0d071e489eec10808499ab", "version": "1.76.0", diff --git a/versions/b-/boost-uninstall.json b/versions/b-/boost-uninstall.json index 200bac7bb6613e..447f44ef5a1443 100644 --- a/versions/b-/boost-uninstall.json +++ b/versions/b-/boost-uninstall.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d472d1b44489c230a741cb519e893732f5d00ac", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "092a563d81779e6bfb0ee656bc4c8f01f57c7666", "version-string": "1.75.0", diff --git a/versions/b-/boost-units.json b/versions/b-/boost-units.json index df5f79b312cad6..366bdf93a9c37a 100644 --- a/versions/b-/boost-units.json +++ b/versions/b-/boost-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "696b0e8e934400879bf390ad024b231a3b32fa4c", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "fce0be543d0eabb6160e3294f89c10165623e53f", "version": "1.76.0", diff --git a/versions/b-/boost-unordered.json b/versions/b-/boost-unordered.json index a68e71d84cc4ca..008c8e412651ed 100644 --- a/versions/b-/boost-unordered.json +++ b/versions/b-/boost-unordered.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0e056b82651533817c1ca6dce6fb6239ccdcdbb", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "f950f2d90f50ec8d7982801ae8df77ab848285a6", "version": "1.76.0", diff --git a/versions/b-/boost-utility.json b/versions/b-/boost-utility.json index 94ad46f2c516f2..7162542a7c60fe 100644 --- a/versions/b-/boost-utility.json +++ b/versions/b-/boost-utility.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3589215d60cac29105fb361ef70e6d8befb8f94", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "aa3e587e5d4f80c8aa934cde043ac5940adaed55", "version": "1.76.0", diff --git a/versions/b-/boost-uuid.json b/versions/b-/boost-uuid.json index 92e4a8ec156cb1..c8005837128ea6 100644 --- a/versions/b-/boost-uuid.json +++ b/versions/b-/boost-uuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce741d3c6c5770db02da8abb268bdd0b2cd0519b", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "5da2f125967693081c7afcf81a327fb6b63343f0", "version": "1.76.0", diff --git a/versions/b-/boost-variant.json b/versions/b-/boost-variant.json index 87d228c23607c3..fa05a70ace6a72 100644 --- a/versions/b-/boost-variant.json +++ b/versions/b-/boost-variant.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63d66b780f8fb2e1b7c1365fc54b23795b09279c", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "cc3ce58ddedfd3cf1d23a75154f3939a1f7604bb", "version": "1.76.0", diff --git a/versions/b-/boost-variant2.json b/versions/b-/boost-variant2.json index 3482f58425a9d8..12a9941867fe14 100644 --- a/versions/b-/boost-variant2.json +++ b/versions/b-/boost-variant2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cc13c2fc5f9f303b76d9fc39da52e198bd6a998", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "e3a2b15165133dd1a0ab0c5477e521e25ad02a31", "version": "1.76.0", diff --git a/versions/b-/boost-vcpkg-helpers.json b/versions/b-/boost-vcpkg-helpers.json index c57f5962ccd404..840957fe9c044f 100644 --- a/versions/b-/boost-vcpkg-helpers.json +++ b/versions/b-/boost-vcpkg-helpers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0b625fd73edd33c92f70727a4cf068d0268379e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "2a21e5ab45d1ce41c185faf85dff0670ea6def1d", "version-string": "7", diff --git a/versions/b-/boost-vmd.json b/versions/b-/boost-vmd.json index 1bd9429ef119fb..b6fba2a1af9934 100644 --- a/versions/b-/boost-vmd.json +++ b/versions/b-/boost-vmd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65746c8cdad55d1703218a4e1eeaedd8a8cf3641", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "b2e44500c55aa436e9d239130203e1953f4d713c", "version": "1.76.0", diff --git a/versions/b-/boost-wave.json b/versions/b-/boost-wave.json index 1e613bd3028a49..9ba855728fc29f 100644 --- a/versions/b-/boost-wave.json +++ b/versions/b-/boost-wave.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd8b4e8a20d59332f25b012c8379b8847b98524f", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "0b25e696df99e6186c1018a04d8c66607d330b89", "version": "1.76.0", diff --git a/versions/b-/boost-winapi.json b/versions/b-/boost-winapi.json index fe729f3679eabc..6279226c9dc38d 100644 --- a/versions/b-/boost-winapi.json +++ b/versions/b-/boost-winapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d4c0be143dbffd619ac154ef5d8f4fe24277bbe", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "48b21bc998317a6d60c63e07b38c83f4126b107b", "version": "1.76.0", diff --git a/versions/b-/boost-xpressive.json b/versions/b-/boost-xpressive.json index eef160d461f8c5..36d6037e34fcc4 100644 --- a/versions/b-/boost-xpressive.json +++ b/versions/b-/boost-xpressive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf04b7076a27d24203528b52aaf41efc83923c67", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "8fea61636685db99cf11030e507f028cfa212bee", "version": "1.76.0", diff --git a/versions/b-/boost-yap.json b/versions/b-/boost-yap.json index 7365300b554a48..6fa9b8ff9e1497 100644 --- a/versions/b-/boost-yap.json +++ b/versions/b-/boost-yap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "856780f406def0087cc90b0dd0b623a65d78103e", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "daf7f224a26824ae0f4deb4e605e952d97755eb6", "version": "1.76.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 6c3c1e0c95a598..50252e7391bec0 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2e18442532ea17f03c775323f53a3b03ade0b6d", + "version": "1.77.0", + "port-version": 0 + }, { "git-tree": "1e18b90b86df900244b7c8c7001ceeac37b083ae", "version": "1.76.0", diff --git a/versions/baseline.json b/versions/baseline.json index b126d2bfa66f18..c502898479ea3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -246,7 +246,7 @@ }, "avro-cpp": { "baseline": "2021-06-01", - "port-version": 0 + "port-version": 1 }, "aws-c-auth": { "baseline": "0.6.3", @@ -501,135 +501,139 @@ "port-version": 0 }, "boost": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-accumulators": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-algorithm": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-align": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-any": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-array": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-asio": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-assert": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-assign": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-atomic": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-beast": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-bimap": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-bind": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-build": { - "baseline": "1.75.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-callable-traits": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-chrono": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-circular-buffer": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-compatibility": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-compute": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-concept-check": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-config": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-container": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-container-hash": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-context": { - "baseline": "1.76.0", - "port-version": 1 + "baseline": "1.77.0", + "port-version": 0 }, "boost-contract": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-conversion": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-convert": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-core": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-coroutine": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-coroutine2": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-crc": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-date-time": { - "baseline": "1.76.0", + "baseline": "1.77.0", + "port-version": 0 + }, + "boost-describe": { + "baseline": "1.77.0", "port-version": 0 }, "boost-detail": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-di": { @@ -637,459 +641,467 @@ "port-version": 0 }, "boost-dll": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-dynamic-bitset": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-endian": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-exception": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-fiber": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-filesystem": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-flyweight": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-foreach": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-format": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-function": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-function-types": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-functional": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-fusion": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-geometry": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-gil": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-graph": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-graph-parallel": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-hana": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-heap": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-histogram": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-hof": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-icl": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-integer": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-interprocess": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-interval": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-intrusive": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-io": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-iostreams": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-iterator": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-json": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-lambda": { - "baseline": "1.76.0", + "baseline": "1.77.0", + "port-version": 0 + }, + "boost-lambda2": { + "baseline": "1.77.0", "port-version": 0 }, "boost-leaf": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-lexical-cast": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-local-function": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-locale": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-lockfree": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-log": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-logic": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-math": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-metaparse": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-modular-build-helper": { - "baseline": "1.76.0", - "port-version": 2 + "baseline": "1.77.0", + "port-version": 0 }, "boost-move": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-mp11": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-mpi": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-mpl": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-msm": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-multi-array": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-multi-index": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-multiprecision": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-nowide": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-numeric-conversion": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-odeint": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-optional": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-outcome": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-parameter": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-parameter-python": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-pfr": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-phoenix": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-poly-collection": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-polygon": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-pool": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-predef": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-preprocessor": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-process": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-program-options": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-property-map": { - "baseline": "1.76.0", + "baseline": "1.77.0", + "port-version": 0 + }, + "boost-property-map-parallel": { + "baseline": "1.77.0", "port-version": 0 }, "boost-property-tree": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-proto": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-ptr-container": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-python": { - "baseline": "1.76.0", - "port-version": 1 + "baseline": "1.77.0", + "port-version": 0 }, "boost-qvm": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-random": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-range": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-ratio": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-rational": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-regex": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-safe-numerics": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-scope-exit": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-serialization": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-signals2": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-smart-ptr": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-sort": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-spirit": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-stacktrace": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-statechart": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-static-assert": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-static-string": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-stl-interfaces": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-system": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-test": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-thread": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-throw-exception": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-timer": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-tokenizer": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-tti": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-tuple": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-type-erasure": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-type-index": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-type-traits": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-typeof": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-ublas": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-uninstall": { - "baseline": "1.75.0", - "port-version": 1 + "baseline": "1.77.0", + "port-version": 0 }, "boost-units": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-unordered": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-utility": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-uuid": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-variant": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-variant2": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-vcpkg-helpers": { - "baseline": "7", - "port-version": 2 + "baseline": "1.77.0", + "port-version": 0 }, "boost-vmd": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-wave": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-winapi": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-xpressive": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boost-yap": { - "baseline": "1.76.0", + "baseline": "1.77.0", "port-version": 0 }, "boringssl": { @@ -3290,7 +3302,7 @@ }, "libe57": { "baseline": "1.1.312", - "port-version": 0 + "port-version": 1 }, "libebur128": { "baseline": "1.2.6", @@ -4358,7 +4370,7 @@ }, "mpi": { "baseline": "1", - "port-version": 1 + "port-version": 2 }, "mpir": { "baseline": "3.0.0", @@ -4410,7 +4422,7 @@ }, "msmpi": { "baseline": "10.1.12498", - "port-version": 1 + "port-version": 2 }, "mstch": { "baseline": "1.0.2", @@ -4834,7 +4846,7 @@ }, "openmvs": { "baseline": "1.1", - "port-version": 5 + "port-version": 6 }, "openni2": { "baseline": "2.2.0.33", @@ -6962,7 +6974,7 @@ }, "wt": { "baseline": "4.5.0", - "port-version": 1 + "port-version": 2 }, "wtl": { "baseline": "10.0.10320", diff --git a/versions/l-/libe57.json b/versions/l-/libe57.json index d9be12351d6f3e..e21d6930bf7c4d 100644 --- a/versions/l-/libe57.json +++ b/versions/l-/libe57.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed9a20551a07f8dbcb637af8394653c326e95aac", + "version-semver": "1.1.312", + "port-version": 1 + }, { "git-tree": "50300e4d95248be2c168fee27a31c5506c7b840d", "version-semver": "1.1.312", diff --git a/versions/m-/mpi.json b/versions/m-/mpi.json index 20b06883d1d623..599d1b627a8f3b 100644 --- a/versions/m-/mpi.json +++ b/versions/m-/mpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "783aea281dc7cdf59ec0636bd60c2feaef6595b4", + "version-string": "1", + "port-version": 2 + }, { "git-tree": "37ad8f71ce08f401038c2468f5776b0bd4265e4f", "version-string": "1", diff --git a/versions/m-/msmpi.json b/versions/m-/msmpi.json index 687eb427e9b937..7890abdddcd664 100644 --- a/versions/m-/msmpi.json +++ b/versions/m-/msmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a93f4540161febeb02c42e92a6bfff770c4729dc", + "version": "10.1.12498", + "port-version": 2 + }, { "git-tree": "d333159a4463603aade50bfa48dbb4bd5b33946e", "version": "10.1.12498", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 813b4c71be4a37..e81c7e82eb257e 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1c5c58b15affc0db0e179229c4640341d62a4d7", + "version-string": "1.1", + "port-version": 6 + }, { "git-tree": "35e7c38229f3ddc1e59be044e8daa29afc650f99", "version-string": "1.1", diff --git a/versions/w-/wt.json b/versions/w-/wt.json index ed429e6bfc8d62..8fc39c07a13b0a 100644 --- a/versions/w-/wt.json +++ b/versions/w-/wt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1535b49590f6871ba9195f3a712e99ba1da27107", + "version-string": "4.5.0", + "port-version": 2 + }, { "git-tree": "1d3b1c0ba6b473d5b5e77ca515e74e90567e2965", "version-string": "4.5.0", From bae18057a4d530301cb1b2e137203447405ec263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 28 Sep 2021 03:15:18 +0300 Subject: [PATCH 0639/1858] [kf5bookmarks] new port (#19780) * Add kf5bookmarks port * Fixed kf5bookmarks in windows * [kf5*] update to 5.75.0 * [kf5bookmarks] WIP * [kf5bookmarks] remove redundant kf5guiaddons dependnecy * [kf5bookmarks] remove redundant options * [kf5bookmarks] only remove what's needed * [kf5bookmarks] wrap paths in quotes * [kf5bookmarks] use semVer * [kf5bookmarks] update to 5.84 * [kf5bookmarks] add missing gettext dep * [kf5bookmarks] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5bookmarks] update versions * [kf5bookmarks] remove static bin files * [kf5bookmarks] update versions * [kf5bookmarks] fix config cmake file * [kf5bookmarks] update versions * [kf5bookmarks] remote meta info from patch * [kf5bookmarks] use generic, non-semver versioning * [kf5bookmarks] update versions Co-authored-by: Kuntal Majumder --- ports/kf5bookmarks/fix_config_cmake.patch | 25 ++++++++++++++++++ ports/kf5bookmarks/portfile.cmake | 29 ++++++++++++++++++++ ports/kf5bookmarks/vcpkg.json | 32 +++++++++++++++++++++++ versions/baseline.json | 4 +++ versions/k-/kf5bookmarks.json | 9 +++++++ 5 files changed, 99 insertions(+) create mode 100644 ports/kf5bookmarks/fix_config_cmake.patch create mode 100644 ports/kf5bookmarks/portfile.cmake create mode 100644 ports/kf5bookmarks/vcpkg.json create mode 100644 versions/k-/kf5bookmarks.json diff --git a/ports/kf5bookmarks/fix_config_cmake.patch b/ports/kf5bookmarks/fix_config_cmake.patch new file mode 100644 index 00000000000000..1a034ccc530bf4 --- /dev/null +++ b/ports/kf5bookmarks/fix_config_cmake.patch @@ -0,0 +1,25 @@ +diff --git a/KF5BookmarksConfig.cmake.in b/KF5BookmarksConfig.cmake.in +index 0c4494a..de973f7 100644 +--- a/KF5BookmarksConfig.cmake.in ++++ b/KF5BookmarksConfig.cmake.in +@@ -6,6 +6,17 @@ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") + find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) + find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) + ++if (NOT @BUILD_SHARED_LIBS@) ++ if (@Qt5DBus_FOUND@) ++ find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) ++ endif() ++ ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5Codecs "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") ++ find_dependency(KF5XmlGui "@KF_DEP_VERSION@") ++endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5BookmarksTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake new file mode 100644 index 00000000000000..5d509a4bf314dd --- /dev/null +++ b/ports/kf5bookmarks/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kbookmarks + REF v5.84.0 + SHA512 3ba70c7fb312cd7715f0c14f78a4380150fd8716e93186302c39692609dbedda96d5e82d316ea683ffc9338cc5b4f2c689b24e06d66c3d5d735bae57f36ccad0 + HEAD_REF master + PATCHES + fix_config_cmake.patch +) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Bookmarks CONFIG_PATH lib/cmake/KF5Bookmarks) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json new file mode 100644 index 00000000000000..e07d045695da9c --- /dev/null +++ b/ports/kf5bookmarks/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "kf5bookmarks", + "version": "5.84.0", + "description": "Bookmarks management library", + "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5codecs", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c502898479ea3a..0d30737913dbd8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2976,6 +2976,10 @@ "baseline": "5.84.0", "port-version": 2 }, + "kf5bookmarks": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5codecs": { "baseline": "5.84.0", "port-version": 2 diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json new file mode 100644 index 00000000000000..b98605df0deb5e --- /dev/null +++ b/versions/k-/kf5bookmarks.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "64191caa589d36090d34e4f699e7c90d836a6726", + "version": "5.84.0", + "port-version": 0 + } + ] +} From b3760cd0fcfe686ccad779a6081c1ecf94183368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 28 Sep 2021 03:19:43 +0300 Subject: [PATCH 0640/1858] [libcanberra] new port (#19816) * [libcanberra] new port * [libcanberra] add libvorbis depnendency * [libcanberra] update versions * [libcanberra] fix macOS build * [libcanberra] only support mac and linux * [libcanberra] update versions * [libcanberra] patch pkgconfig on macOS * [libcanberra] update versions * [libcanberra] unix-only port, remove vcpkg_copy_pdbs() diff --git a/ports/libcanberra/portfile.cmake b/ports/libcanberra/portfile.cmake index 1dec6214c..b4d75f77e 100644 --- a/ports/libcanberra/portfile.cmake +++ b/ports/libcanberra/portfile.cmake @@ -62,7 +62,6 @@ if(VCPKG_TARGET_IS_OSX) endif() vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder * [libcanberra] update versions * [libcanberra] fix .pc.in token expansion * [libcanberra] update versions --- ports/libcanberra/macos_fix.patch | 14 +++++ ports/libcanberra/macos_pkgconfig.patch | 12 +++++ ports/libcanberra/portfile.cmake | 69 +++++++++++++++++++++++++ ports/libcanberra/vcpkg.json | 10 ++++ versions/baseline.json | 4 ++ versions/l-/libcanberra.json | 9 ++++ 6 files changed, 118 insertions(+) create mode 100644 ports/libcanberra/macos_fix.patch create mode 100644 ports/libcanberra/macos_pkgconfig.patch create mode 100644 ports/libcanberra/portfile.cmake create mode 100644 ports/libcanberra/vcpkg.json create mode 100644 versions/l-/libcanberra.json diff --git a/ports/libcanberra/macos_fix.patch b/ports/libcanberra/macos_fix.patch new file mode 100644 index 00000000000000..e7f9016e721c3a --- /dev/null +++ b/ports/libcanberra/macos_fix.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index f68602d..1451747 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,8 +115,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ + AC_SUBST([WARNINGFLAGS], $with_cflags) + + CC_CHECK_FLAGS_APPEND([with_ldflags], [LDFLAGS], [\ +- -Wl,--as-needed \ +- -Wl,--gc-sections]) ++]) + AC_SUBST([GCLDFLAGS], $with_ldflags) + + #### libtool stuff #### diff --git a/ports/libcanberra/macos_pkgconfig.patch b/ports/libcanberra/macos_pkgconfig.patch new file mode 100644 index 00000000000000..7179e5b673f2d3 --- /dev/null +++ b/ports/libcanberra/macos_pkgconfig.patch @@ -0,0 +1,12 @@ +diff --git a/libcanberra.pc.in b/libcanberra.pc.in +index 0a5c7a1..91a9e39 100644 +--- a/libcanberra.pc.in ++++ b/libcanberra.pc.in +@@ -7,5 +7,7 @@ Name: libcanberra + Description: Event Sound API + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lcanberra @PTHREAD_LIBS@ ++Libs.private: @LIBS_PRIVATE@ + Cflags: -D_REENTRANT -I${includedir} ++Cflags.private: @CFLAGS_PRIVATE@ + Requires: diff --git a/ports/libcanberra/portfile.cmake b/ports/libcanberra/portfile.cmake new file mode 100644 index 00000000000000..49095e63a30fa0 --- /dev/null +++ b/ports/libcanberra/portfile.cmake @@ -0,0 +1,69 @@ +vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") +set(VERSION 0.30) +set(PATCHES) + +if(VCPKG_TARGET_IS_OSX) + list(APPEND PATCHES macos_fix.patch macos_pkgconfig.patch) +endif() + +if(VCPKG_TARGET_IS_OSX) + message("${PORT} currently requires the following libraries from the system package manager:\n automake\n libtool\n\nThey can be installed with brew install automake libtool") +else() + message("${PORT} currently requires the following libraries from the system package manager:\n automake\n libtool\n\nThey can be installed with apt-get install automake libtool") +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "http://0pointer.de/lennart/projects/${PORT}/${PORT}-${VERSION}.tar.xz" + FILENAME "${PORT}-${VERSION}.tar.xz" + SHA512 f7543582122256826cd01d0f5673e1e58d979941a93906400182305463d6166855cb51f35c56d807a56dc20b7a64f7ce4391368d24990c1b70782a7d0b4429c2 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${VERSION} + PATCHES ${PATCHES} +) + +set(EXTRA_CPPFLAGS) +set(EXTRA_LDFLAGS) + +#libltdl fixes +if(VCPKG_TARGET_IS_OSX) + execute_process( + COMMAND brew --prefix libtool + OUTPUT_VARIABLE BREW_LIBTOOL_PATH + ) + string(STRIP ${BREW_LIBTOOL_PATH} BREW_LIBTOOL_PATH) + + set(LIBS_PRIVATE "-L${BREW_LIBTOOL_PATH}/lib -lltdl") + set(CFLAGS_PRIVATE "-I${BREW_LIBTOOL_PATH}/include") + set(EXTRA_LDFLAGS "LDFLAGS=${LIBS_PRIVATE}") + set(EXTRA_CPPFLAGS "CPPFLAGS=${CFLAGS_PRIVATE}") +endif() + +set(ENV{GTKDOCIZE} true) +vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-gtk-doc + --disable-lynx + --disable-silent-rules + ${EXTRA_CPPFLAGS} + ${EXTRA_LDFLAGS} +) + +vcpkg_install_make() + +if(VCPKG_TARGET_IS_OSX) + configure_file("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY) + configure_file("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) +endif() + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools") # empty folder + +file(INSTALL "${SOURCE_PATH}/LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libcanberra/vcpkg.json b/ports/libcanberra/vcpkg.json new file mode 100644 index 00000000000000..1e914c1429a385 --- /dev/null +++ b/ports/libcanberra/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libcanberra", + "version": "0.30", + "description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops", + "homepage": "http://0pointer.de/lennart/projects/libcanberra/", + "supports": "!(windows | uwp)", + "dependencies": [ + "libvorbis" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 0d30737913dbd8..931b866e931523 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3240,6 +3240,10 @@ "baseline": "1.16.1", "port-version": 3 }, + "libcanberra": { + "baseline": "0.30", + "port-version": 0 + }, "libcbor": { "baseline": "0.8.0", "port-version": 1 diff --git a/versions/l-/libcanberra.json b/versions/l-/libcanberra.json new file mode 100644 index 00000000000000..8a3cc523c62d9f --- /dev/null +++ b/versions/l-/libcanberra.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "9332e8b3945451a2776337d41c54c7200d187a28", + "version": "0.30", + "port-version": 0 + } + ] +} From 70cd34c73307806dad4c3023773726811b4eec5b Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 27 Sep 2021 17:20:33 -0700 Subject: [PATCH 0641/1858] [openjpeg] Update version to 2.4.0 (#20021) * [openjpeg] Update version to 2.4.0 * Modify linkage check and remove unused parameters * Enable the tool generation of each features Co-authored-by: Cheney-Wang --- .../Enable-tools-of-each-features.patch | 13 ++++ ports/openjpeg/portfile.cmake | 67 +++++++++---------- ports/openjpeg/vcpkg.json | 13 +++- versions/baseline.json | 4 +- versions/o-/openjpeg.json | 5 ++ 5 files changed, 64 insertions(+), 38 deletions(-) create mode 100644 ports/openjpeg/Enable-tools-of-each-features.patch diff --git a/ports/openjpeg/Enable-tools-of-each-features.patch b/ports/openjpeg/Enable-tools-of-each-features.patch new file mode 100644 index 00000000000000..cce376596cc3c0 --- /dev/null +++ b/ports/openjpeg/Enable-tools-of-each-features.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5a41078..747c61c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -277,7 +277,7 @@ mark_as_advanced(BUILD_VIEWER) + mark_as_advanced(BUILD_JAVA) + mark_as_advanced(BUILD_JP3D) + +-if(BUILD_CODEC OR BUILD_MJ2) ++if(BUILD_CODEC OR BUILD_JPWL OR BUILD_MJ2 OR BUILD_JPIP OR BUILD_JP3D) + # OFF: It will only build 3rd party libs if they are not found on the system + # ON: 3rd party libs will ALWAYS be build, and used + option(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF) diff --git a/ports/openjpeg/portfile.cmake b/ports/openjpeg/portfile.cmake index 348b2594fc7ac1..195ff13a76d531 100644 --- a/ports/openjpeg/portfile.cmake +++ b/ports/openjpeg/portfile.cmake @@ -1,44 +1,41 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uclouvain/openjpeg - REF v2.3.1 - SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 + REF 37ac30ceff6640bbab502388c5e0fa0bff23f505 #v2.4.0 + SHA512 7554d64701f1b51501a977bc165e61e4696d97f1f40e4c784c729824878a716c13ac378c6b2dd0d23a11d9e3fa316ff6fc817ca5a614ef4d6530db06a8f83971 HEAD_REF master PATCHES dll.location.patch fix-lrintf-to-opj_lrintf.patch + Enable-tools-of-each-features.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND OPTIONS "-DBUILD_SHARED_LIBS=OFF" - "-DBUILD_STATIC_LIBS=ON") -else() - list(APPEND OPTIONS "-DBUILD_SHARED_LIBS=ON" - "-DBUILD_STATIC_LIBS=OFF") -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "jpwl" BUILD_JPWL - "mj2" BUILD_MJ2 - "jpip" BUILD_JPIP - "jp3d" BUILD_JP3D - ) + FEATURES + "jpwl" BUILD_JPWL + "mj2" BUILD_MJ2 + "jpip" BUILD_JPIP + "jp3d" BUILD_JP3D +) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_CODEC:BOOL=OFF - -DBUILD_DOC:BOOL=OFF - -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg - -DOPENJPEG_INSTALL_INCLUDE_DIR=include - -DEXECUTABLE_OUTPUT_PATH=tools/${PORT} - -DBUILD_PKGCONFIG_FILES=ON - ${FEATURE_OPTIONS} - ${OPTIONS} + OPTIONS + -DBUILD_CODEC:BOOL=OFF + -DBUILD_DOC:BOOL=OFF + -DOPENJPEG_INSTALL_PACKAGE_DIR=share/openjpeg + -DOPENJPEG_INSTALL_INCLUDE_DIR=include + -DEXECUTABLE_OUTPUT_PATH=tools/${PORT} + -DBUILD_PKGCONFIG_FILES=ON + ${FEATURE_OPTIONS} + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + if(VCPKG_TARGET_IS_WINDOWS AND (NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL MinGW)) if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libopenjp2.pc" "-lm" "") @@ -50,19 +47,20 @@ else() endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libopenjp2.pc" "-lm" "-lm -pthread") endif() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") set(TOOL_NAMES) if("jpwl" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_dec_server opj_jpwl_compress opj_jpwl_decompress) -endif() + list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_jpwl_compress opj_jpwl_decompress) +endif() if("mj2" IN_LIST FEATURES) list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_mj2_compress opj_mj2_decompress opj_mj2_extract opj_mj2_wrap) -endif() +endif() if("jpip" IN_LIST FEATURES) - list(APPEND TOOL_NAMES opj_jpip_addxml opj_jpip_test opj_jpip_transcode) + list(APPEND TOOL_NAMES opj_compress opj_decompress opj_dump opj_dec_server opj_jpip_addxml opj_jpip_test opj_jpip_transcode) endif() if("jp3d" IN_LIST FEATURES) list(APPEND TOOL_NAMES opj_jp3d_compress opj_jp3d_decompress) @@ -70,14 +68,15 @@ endif() if(TOOL_NAMES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif() -file(READ ${CURRENT_PACKAGES_DIR}/include/openjpeg.h OPENJPEG_H) + +file(READ "${CURRENT_PACKAGES_DIR}/include/openjpeg.h" OPENJPEG_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined(OPJ_STATIC)" "1" OPENJPEG_H "${OPENJPEG_H}") else() string(REPLACE "defined(OPJ_STATIC)" "0" OPENJPEG_H "${OPENJPEG_H}") endif() string(REPLACE "defined(DLL_EXPORT)" "0" OPENJPEG_H "${OPENJPEG_H}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/openjpeg.h "${OPENJPEG_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/openjpeg.h" "${OPENJPEG_H}") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openjpeg/vcpkg.json b/ports/openjpeg/vcpkg.json index f910c2cc4d62ad..031f12a4462e0f 100644 --- a/ports/openjpeg/vcpkg.json +++ b/ports/openjpeg/vcpkg.json @@ -1,9 +1,18 @@ { "name": "openjpeg", - "version-semver": "2.3.1", - "port-version": 4, + "version-semver": "2.4.0", "description": "OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been developed in order to promote the use of JPEG 2000, a still-image compression standard from the Joint Photographic Experts Group (JPEG). Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a JPEG 2000 Reference Software.", "homepage": "https://github.com/uclouvain/openjpeg", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "jp3d": { "description": "Build optional component jp3d" diff --git a/versions/baseline.json b/versions/baseline.json index 931b866e931523..8959ae3a32764d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4833,8 +4833,8 @@ "port-version": 2 }, "openjpeg": { - "baseline": "2.3.1", - "port-version": 4 + "baseline": "2.4.0", + "port-version": 0 }, "openmama": { "baseline": "6.3.1", diff --git a/versions/o-/openjpeg.json b/versions/o-/openjpeg.json index e0acda96d4fc47..d85518d381dfcc 100644 --- a/versions/o-/openjpeg.json +++ b/versions/o-/openjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffb3c981c0026662feded28db73c177a739773d2", + "version-semver": "2.4.0", + "port-version": 0 + }, { "git-tree": "a11a593758d57ee96493bd2cb667ac1aa88e972c", "version-semver": "2.3.1", From 6b4db79c84d1dc6252adf9db76f4d2391fbf3377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Tue, 28 Sep 2021 02:22:39 +0200 Subject: [PATCH 0642/1858] [libgxps] Add new port (#20062) Add libgxps version 0.3.2 --- .../libgxps-0.3.2_fix_meson_warnings.patch | 55 +++++++++++++++++++ ports/libgxps/portfile.cmake | 34 ++++++++++++ ports/libgxps/vcpkg.json | 17 ++++++ versions/baseline.json | 4 ++ versions/l-/libgxps.json | 9 +++ 5 files changed, 119 insertions(+) create mode 100644 ports/libgxps/libgxps-0.3.2_fix_meson_warnings.patch create mode 100644 ports/libgxps/portfile.cmake create mode 100644 ports/libgxps/vcpkg.json create mode 100644 versions/l-/libgxps.json diff --git a/ports/libgxps/libgxps-0.3.2_fix_meson_warnings.patch b/ports/libgxps/libgxps-0.3.2_fix_meson_warnings.patch new file mode 100644 index 00000000000000..875f55c75fd633 --- /dev/null +++ b/ports/libgxps/libgxps-0.3.2_fix_meson_warnings.patch @@ -0,0 +1,55 @@ +From a18e12604d2cab13146a357c7fd3b80909b65efd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= +Date: Thu, 9 Sep 2021 17:59:13 +0200 +Subject: [PATCH] Fix meson warnings + +- Deduplicate "libraries" in pkgg.generate() + Fixes: + libgxps/meson.build:101: WARNING: Keyword argument "libraries" + defined multiple times. + WARNING: This will be an error in future Meson releases. +- Increase required meson_version from 0.43.0 to 0.50.0 due to usage + of install arg in libgxps/meson.build:63: + Fixes: + WARNING: Project targeting '>= 0.43.0' but tried to use feature + introduced in '0.50.0': install arg in configure_file. +--- + libgxps/meson.build | 5 ++--- + meson.build | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/libgxps/meson.build b/libgxps/meson.build +index 29b044e..52d53d0 100644 +--- a/libgxps/meson.build ++++ b/libgxps/meson.build +@@ -98,12 +98,11 @@ pkgg = import('pkgconfig') + cairo_dep_str = cairo_pc_found ? ', cairo >= ' + cairo_req : '' + cairo_dep_libs = cairo_pc_found ? [] : cairo_dep + +-pkgg.generate(libraries: gxps, ++pkgg.generate(libraries: [gxps, cairo_dep_libs], + version: gxps_version, + name: 'libgxps', + description: 'XPS Documents library', +- requires: 'gobject-2.0 >= ' + glib_req + ', gio-2.0 >= ' + glib_req + ', libarchive >= ' + archive_req + cairo_dep_str, +- libraries: [gxps, cairo_dep_libs]) ++ requires: 'gobject-2.0 >= ' + glib_req + ', gio-2.0 >= ' + glib_req + ', libarchive >= ' + archive_req + cairo_dep_str) + + if build_gir + gir_extra_args = [ +diff --git a/meson.build b/meson.build +index 07c8cc2..c6780c9 100644 +--- a/meson.build ++++ b/meson.build +@@ -4,7 +4,7 @@ project('libgxps', 'c', + 'buildtype=debugoptimized' + ], + license: 'LGPL2+', +- meson_version: '>= 0.43.0') ++ meson_version: '>= 0.50.0') + + gxps_version = meson.project_version() + version_array = gxps_version.split('.') +-- +GitLab + diff --git a/ports/libgxps/portfile.cmake b/ports/libgxps/portfile.cmake new file mode 100644 index 00000000000000..d7dd89ba29b260 --- /dev/null +++ b/ports/libgxps/portfile.cmake @@ -0,0 +1,34 @@ +set(LIBGXPS_VERSION 0.3.2) +string(SUBSTRING ${LIBGXPS_VERSION} 0 3 MAJOR_MINOR) # e.g. 0.3 + +vcpkg_download_distfile(ARCHIVE + URLS "https://download.gnome.org/sources/${PORT}/${MAJOR_MINOR}/${PORT}-${LIBGXPS_VERSION}.tar.xz" + FILENAME "${PORT}-${LIBGXPS_VERSION}.tar.xz" + SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBGXPS_VERSION} + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/libgxps-0.3.2_fix_meson_warnings.patch" # https://gitlab.gnome.org/GNOME/libgxps/-/commit/a18e1260 +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${OPTIONS} + -Ddisable-introspection=true + -Denable-test=false + -Dwith-libjpeg=true + -Dwith-liblcms2=true + -Dwith-libtiff=true +) + +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() + +vcpkg_copy_tools(TOOL_NAMES xpstojpeg xpstopdf xpstopng xpstops xpstosvg AUTO_CLEAN) + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libgxps/vcpkg.json b/ports/libgxps/vcpkg.json new file mode 100644 index 00000000000000..b74fcc9eaa0a1f --- /dev/null +++ b/ports/libgxps/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "libgxps", + "version": "0.3.2", + "description": "libgxps is a GObject based library for handling and rendering XPS documents.", + "homepage": "https://wiki.gnome.org/Projects/libgxps", + "dependencies": [ + "cairo", + "glib", + "lcms", + "libarchive", + "libjpeg-turbo", + "libpng", + "libxslt", + "tiff", + "tool-meson" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8959ae3a32764d..723981e5f79001 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3408,6 +3408,10 @@ "baseline": "5.6.0", "port-version": 0 }, + "libgxps": { + "baseline": "0.3.2", + "port-version": 0 + }, "libharu": { "baseline": "2017-08-15", "port-version": 10 diff --git a/versions/l-/libgxps.json b/versions/l-/libgxps.json new file mode 100644 index 00000000000000..05fc8f2dd22e3b --- /dev/null +++ b/versions/l-/libgxps.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aa14ea859cee510d9c738fbdb5a1955531aabb87", + "version": "0.3.2", + "port-version": 0 + } + ] +} From 29b8f9865917f13d308220b86734db901a9a0635 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 28 Sep 2021 08:26:06 +0800 Subject: [PATCH 0643/1858] [libssh/libressl] update to the latest version (#20067) * [libssh/libssh2/libssh2] update to the latest version * update version * update patches formating * update version * update hash512 * update version' * fix CI build error * update version * update vcpkg.json and portifile.cmake * update version * delete hash * update version * revert libssh2 * update version * revert libssh2 * update portfile.cmake * update version --- ports/libressl/portfile.cmake | 19 ++++--------- ports/libressl/vcpkg.json | 12 +++++++- ports/libssh/0002-mingw_for_Android.patch | 13 ++++----- .../0003-create_symlink_unix_only.patch | 11 ++++---- ports/libssh/portfile.cmake | 28 +++++++++---------- ports/libssh/vcpkg.json | 11 ++++++-- versions/baseline.json | 6 ++-- versions/l-/libressl.json | 5 ++++ versions/l-/libssh.json | 5 ++++ 9 files changed, 63 insertions(+), 47 deletions(-) diff --git a/ports/libressl/portfile.cmake b/ports/libressl/portfile.cmake index 7483e02c880e92..32ca4d767919e4 100644 --- a/ports/libressl/portfile.cmake +++ b/ports/libressl/portfile.cmake @@ -6,8 +6,8 @@ endif() vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") -set(LIBRESSL_VERSION 3.3.3) -set(LIBRESSL_HASH 2d0b5f4cfe37d573bc64d5967abb77f536dbe581fbad9637d925332bcdfd185fe6810335b2af80a89f92d7e6edaa8ea3ba2492c60a117e47ea1b2d6aacf01f0f) +set(LIBRESSL_VERSION 3.3.4) +set(LIBRESSL_HASH 11defdde8169d3653c24e149e698ffc5a8ead5ac0808111d1986cb11ef72e9912c463d4891d4635877021e73a8a045dbdbe5e83ec785a59150f170d2ca2031de) vcpkg_download_distfile( LIBRESSL_SOURCE_ARCHIVE @@ -30,9 +30,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "tools" LIBRESSL_APPS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DLIBRESSL_TESTS=OFF @@ -40,16 +39,10 @@ vcpkg_configure_cmake( -DLIBRESSL_APPS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if("tools" IN_LIST FEATURES) - if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - set(EXECUTABLE_SUFFIX .exe) - endif() - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/openssl") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/openssl${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/openssl${EXECUTABLE_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ocspcheck${EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/openssl/ocspcheck${EXECUTABLE_SUFFIX}") - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/openssl") + vcpkg_copy_tools(TOOL_NAMES ocspcheck openssl DESTINATION "${CURRENT_PACKAGES_DIR}/tools/openssl" AUTO_CLEAN) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/libressl/vcpkg.json b/ports/libressl/vcpkg.json index 59c18243c2fb50..ff08a3b587b5e4 100644 --- a/ports/libressl/vcpkg.json +++ b/ports/libressl/vcpkg.json @@ -1,8 +1,18 @@ { "name": "libressl", - "version": "3.3.3", + "version": "3.3.4", "description": "LibreSSL is a version of the TLS/crypto stack forked from OpenSSL in 2014, with goals of modernizing the codebase, improving security, and applying best practice development processes.", "supports": "!(uwp | arm)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build openssl and ocspcheck executables" diff --git a/ports/libssh/0002-mingw_for_Android.patch b/ports/libssh/0002-mingw_for_Android.patch index 973f6eafa9671b..963eb6f61a4b64 100644 --- a/ports/libssh/0002-mingw_for_Android.patch +++ b/ports/libssh/0002-mingw_for_Android.patch @@ -1,16 +1,13 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ccf5a33..8e88494 100644 +index a576cf7..1f6a048 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -361,9 +361,9 @@ if (WITH_VISIBILITY_HIDDEN) - set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-fvisibility=hidden") +@@ -359,7 +359,7 @@ if (WITH_VISIBILITY_HIDDEN) + set_target_properties(ssh PROPERTIES C_VISIBILITY_PRESET hidden) endif (WITH_VISIBILITY_HIDDEN) -if (MINGW) +if (MINGW AND NOT ANDROID) - set_target_properties(ssh PROPERTIES LINK_FLAGS "-Wl,--enable-stdcall-fixup") -- set_target_properties(ssh PROPERTIES COMPILE_FLAGS "-D_POSIX_SOURCE") -+ set_property(TARGET ssh APPEND PROPERTY COMPILE_FLAGS "-D_POSIX_SOURCE") + target_link_libraries(ssh PRIVATE "-Wl,--enable-stdcall-fixup") + target_compile_definitions(ssh PRIVATE "_POSIX_SOURCE") endif () - - diff --git a/ports/libssh/0003-create_symlink_unix_only.patch b/ports/libssh/0003-create_symlink_unix_only.patch index 140d7e1c8449fc..20b2b646233e62 100644 --- a/ports/libssh/0003-create_symlink_unix_only.patch +++ b/ports/libssh/0003-create_symlink_unix_only.patch @@ -1,16 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f5b0bf..6559468 100644 +index 53e6bd5..51d76c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -206,9 +206,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) - add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET}) +@@ -231,10 +231,11 @@ endif (WITH_SYMBOL_VERSIONING AND ABIMAP_FOUND) + add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source DEPENDS ${_SYMBOL_TARGET} VERBATIM) # Link compile database for clangd +if(UNIX) - execute_process(COMMAND cmake -E create_symlink + execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_BINARY_DIR}/compile_commands.json" "${CMAKE_SOURCE_DIR}/compile_commands.json") +- +endif() - message(STATUS "********************************************") message(STATUS "********** ${PROJECT_NAME} build options : **********") + diff --git a/ports/libssh/portfile.cmake b/ports/libssh/portfile.cmake index c15cc0a9c1d602..3cd1ea915a63c5 100644 --- a/ports/libssh/portfile.cmake +++ b/ports/libssh/portfile.cmake @@ -3,8 +3,7 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL https://git.libssh.org/projects/libssh.git - REF 9c4af47965d284b2de26407bcd80473aba4ee4c9 # REFERENCE VERSION 0.9.5 - SHA512 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18 + REF 47fd6e56c1058dca54afee1638c11fb6ec41911d # REFERENCE VERSION 0.9.6 PATCHES 0001-export-pkgconfig-file.patch 0002-mingw_for_Android.patch @@ -13,8 +12,8 @@ vcpkg_from_git( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - mbedtls WITH_MBEDTLS - zlib WITH_ZLIB + mbedtls WITH_MBEDTLS + zlib WITH_ZLIB ) if (VCPKG_TARGET_IS_ANDROID) @@ -23,9 +22,8 @@ if (VCPKG_TARGET_IS_ANDROID) ) endif () -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${EXTRA_ARGS} ${FEATURE_OPTIONS} @@ -36,8 +34,8 @@ vcpkg_configure_cmake( -DWITH_NACL=OFF -DWITH_GSSAPI=OFF) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() #Fixup pthread naming if(NOT VCPKG_TARGET_IS_MINGW AND VCPKG_TARGET_IS_WINDOWS) @@ -49,9 +47,9 @@ endif() vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h + "${CURRENT_PACKAGES_DIR}/include/libssh/libssh.h" "#ifdef LIBSSH_STATIC" "#if 1" ) @@ -59,12 +57,12 @@ endif() if(VCPKG_TARGET_IS_WINDOWS) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake + "${CURRENT_PACKAGES_DIR}/share/libssh/libssh-config.cmake" ".dll" ".lib" ) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libssh/vcpkg.json b/ports/libssh/vcpkg.json index 47669c5a226fbd..28a190f64d784c 100644 --- a/ports/libssh/vcpkg.json +++ b/ports/libssh/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libssh", - "version-string": "0.9.5", - "port-version": 6, + "version": "0.9.6", "description": "libssh is a multiplatform C library implementing the SSHv2 protocol on client and server side", "homepage": "https://www.libssh.org/", "supports": "!(uwp | arm)", @@ -13,6 +12,14 @@ "mbedtls" ], "platform": "android" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 723981e5f79001..fbed5d3d66ed2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3713,7 +3713,7 @@ "port-version": 1 }, "libressl": { - "baseline": "3.3.3", + "baseline": "3.3.4", "port-version": 0 }, "librsvg": { @@ -3801,8 +3801,8 @@ "port-version": 1 }, "libssh": { - "baseline": "0.9.5", - "port-version": 6 + "baseline": "0.9.6", + "port-version": 0 }, "libssh2": { "baseline": "1.9.0", diff --git a/versions/l-/libressl.json b/versions/l-/libressl.json index c8d28210087c96..0ba04b1e1c91c2 100644 --- a/versions/l-/libressl.json +++ b/versions/l-/libressl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2dcc81c2e764c5f32d9c35280ab9ae06fda622c3", + "version": "3.3.4", + "port-version": 0 + }, { "git-tree": "24a18d6ed79f2b8c4c01c5201998981b2d831a1a", "version": "3.3.3", diff --git a/versions/l-/libssh.json b/versions/l-/libssh.json index 2de41c959d9073..e9fb5170c12953 100644 --- a/versions/l-/libssh.json +++ b/versions/l-/libssh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02a95a0ab1a26e3395173bc59e9f041f23b7f5c9", + "version": "0.9.6", + "port-version": 0 + }, { "git-tree": "0eb17d68736a224ca8ce341b1b84bbae2f2f43a5", "version-string": "0.9.5", From f5262e67178fbcfd92d8cd6ea658be27619f198d Mon Sep 17 00:00:00 2001 From: Antoine Hoarau <703240+ahoarau@users.noreply.github.com> Date: Tue, 28 Sep 2021 02:51:07 +0200 Subject: [PATCH 0644/1858] [mosquitto] Update to 2.0.12 (#20148) * update mosquitto to 2.0.12 * update json * Update ports/mosquitto/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/libwebsockets/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * add head ref * remove plugins * update jsons * update libwebsockets * Update versions/m-/mosquitto.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update versions/l-/libwebsockets.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/mosquitto/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/libwebsockets/portfile.cmake | 1 + ports/mosquitto/0002-win64-support.patch | 36 ++----------- .../mosquitto/0004-support-static-build.patch | 51 ++++++++----------- ports/mosquitto/0005-add-mach.h-include.patch | 27 ---------- .../0005-websocket-shared-lib-name.patch | 20 ++++++++ ports/mosquitto/portfile.cmake | 14 ++--- ports/mosquitto/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libwebsockets.json | 2 +- versions/m-/mosquitto.json | 5 ++ 10 files changed, 63 insertions(+), 100 deletions(-) delete mode 100644 ports/mosquitto/0005-add-mach.h-include.patch create mode 100644 ports/mosquitto/0005-websocket-shared-lib-name.patch diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index d99a2ed19cc6ee..f01ef280f4ab3d 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -145,6 +145,7 @@ vcpkg_cmake_configure( -DLWS_WITH_HTTP2=ON -DLWS_WITH_HTTP_STREAM_COMPRESSION=ON # Since zlib is already a dependency -DLWS_WITH_LIBUV=ON + -DLWS_WITH_EXTERNAL_POLL=ON # OPTIONS_RELEASE -DOPTIMIZE=1 # OPTIONS_DEBUG -DDEBUGGABLE=1 ) diff --git a/ports/mosquitto/0002-win64-support.patch b/ports/mosquitto/0002-win64-support.patch index 8698db81a5cc03..dae3d03a36ddc2 100644 --- a/ports/mosquitto/0002-win64-support.patch +++ b/ports/mosquitto/0002-win64-support.patch @@ -1,18 +1,8 @@ -From 675ba1de6c01b4050ae3cc60916d3f0a72b03105 Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 15:40:55 -0700 -Subject: [PATCH 2/5] win64 support - ---- - CMakeLists.txt | 7 +------ - config.h | 2 +- - 2 files changed, 2 insertions(+), 7 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index e11959c..1a92fe3 100644 +index 07eff849..3edc7efa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -57,12 +57,7 @@ option(WITH_THREADING "Include client library threading support?" ON) +@@ -67,12 +67,7 @@ option(WITH_THREADING "Include client library threading support?" ON) if (WITH_THREADING) add_definitions("-DWITH_THREADING") if (WIN32) @@ -23,22 +13,6 @@ index e11959c..1a92fe3 100644 - endif (CMAKE_CL_64) - set (PTHREAD_INCLUDE_DIR C:\\pthreads\\Pre-built.2\\include) + find_package(pthread REQUIRED) - else (WIN32) - find_library(LIBPTHREAD pthread) - if (LIBPTHREAD) -diff --git a/config.h b/config.h -index 5cce39e..c673bf4 100644 ---- a/config.h -+++ b/config.h -@@ -31,7 +31,7 @@ - # define EPROTO ECONNABORTED - #endif - --#ifdef WIN32 -+#ifdef _WIN32 - # ifndef strcasecmp - # define strcasecmp strcmpi - # endif --- -2.24.3 (Apple Git-128) - + elseif (ANDROID) + set (PTHREAD_LIBRARIES "") + set (PTHREAD_INCLUDE_DIR "") diff --git a/ports/mosquitto/0004-support-static-build.patch b/ports/mosquitto/0004-support-static-build.patch index 55606e7d5de29e..bd3e44d030b05a 100644 --- a/ports/mosquitto/0004-support-static-build.patch +++ b/ports/mosquitto/0004-support-static-build.patch @@ -1,19 +1,25 @@ -From 4bb19e77e95bc505d32e098190ffbf056810017c Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 15:44:42 -0700 -Subject: [PATCH 4/5] support static build - ---- - lib/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 8 ++++++-- - 2 files changed, 7 insertions(+), 3 deletions(-) - +diff --git a/apps/mosquitto_passwd/CMakeLists.txt b/apps/mosquitto_passwd/CMakeLists.txt +index 13a7d826..31069306 100644 +--- a/apps/mosquitto_passwd/CMakeLists.txt ++++ b/apps/mosquitto_passwd/CMakeLists.txt +@@ -13,6 +13,10 @@ if (WITH_TLS) + ) + + +- target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) ++ if(WIN32) ++ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES} ws2_32 crypt32) ++ else() ++ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) ++ endif() + install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + endif (WITH_TLS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index bd60b75..cc01a2a 100644 +index 5da221dc..c3e9fce0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt -@@ -60,7 +60,7 @@ if (UNIX AND NOT APPLE) - endif (UNIX AND NOT APPLE) +@@ -69,7 +69,7 @@ if (UNIX AND NOT APPLE AND NOT ANDROID) + endif (UNIX AND NOT APPLE AND NOT ANDROID) if (WIN32) - set (LIBRARIES ${LIBRARIES} ws2_32) @@ -22,10 +28,10 @@ index bd60b75..cc01a2a 100644 if (WITH_SRV) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7898ff5..f066aea 100644 +index 9380a046..62ce99e5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -158,7 +158,7 @@ if (UNIX) +@@ -189,7 +189,7 @@ if (UNIX) endif (UNIX) if (WIN32) @@ -34,18 +40,3 @@ index 7898ff5..f066aea 100644 endif (WIN32) if (WITH_WEBSOCKETS) -@@ -189,6 +189,10 @@ install(FILES mosquitto_broker.h mosquitto_plugin.h DESTINATION "${CMAKE_INSTALL - - if (WITH_TLS) - add_executable(mosquitto_passwd mosquitto_passwd.c) -- target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) -+ if(WIN32) -+ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES} ws2_32 crypt32) -+ else() -+ target_link_libraries(mosquitto_passwd ${OPENSSL_LIBRARIES}) -+ endif() - install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - endif (WITH_TLS) --- -2.24.3 (Apple Git-128) - diff --git a/ports/mosquitto/0005-add-mach.h-include.patch b/ports/mosquitto/0005-add-mach.h-include.patch deleted file mode 100644 index b01ff534b04608..00000000000000 --- a/ports/mosquitto/0005-add-mach.h-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -From af7d62dceb064b5a8458616536bc27329ad236b1 Mon Sep 17 00:00:00 2001 -From: Nicole Mazzuca -Date: Tue, 22 Sep 2020 15:46:06 -0700 -Subject: [PATCH 5/5] add mach.h include - ---- - lib/mosquitto.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/mosquitto.c b/lib/mosquitto.c -index 795013e..cd00513 100644 ---- a/lib/mosquitto.c -+++ b/lib/mosquitto.c -@@ -33,6 +33,10 @@ Contributors: - #include "packet_mosq.h" - #include "will_mosq.h" - -+#if defined(__APPLE__) -+#include -+#endif -+ - - void mosquitto__destroy(struct mosquitto *mosq); - --- -2.24.3 (Apple Git-128) - diff --git a/ports/mosquitto/0005-websocket-shared-lib-name.patch b/ports/mosquitto/0005-websocket-shared-lib-name.patch new file mode 100644 index 00000000000000..4ce8a826787233 --- /dev/null +++ b/ports/mosquitto/0005-websocket-shared-lib-name.patch @@ -0,0 +1,20 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9380a046..f2929e19 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -194,13 +194,13 @@ endif (WIN32) + + if (WITH_WEBSOCKETS) + if (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets_static) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets) + if (WIN32) + set (MOSQ_LIBS ${MOSQ_LIBS} iphlpapi) + link_directories(${mosquitto_SOURCE_DIR}) + endif (WIN32) + else (STATIC_WEBSOCKETS) +- set (MOSQ_LIBS ${MOSQ_LIBS} websockets) ++ set (MOSQ_LIBS ${MOSQ_LIBS} websockets_shared) + endif (STATIC_WEBSOCKETS) + endif (WITH_WEBSOCKETS) + diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index bf832107b73e99..321ac137cb9a29 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -1,31 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eclipse/mosquitto - REF e55f7facce7628b33e57d6b44cc8e9dd1042e624 # v1.6.8 - SHA512 c192b53f52ce9dc8e02d31acd9e93c00cafbe543b038d7619e6b653f102126872bbd485c94604bca9287e71a5dfe0de2f4d8d3f51cdd5c37f90fd2a6535bd89b HEAD_REF master + REF v2.0.12 + SHA512 bf502f4f8c5f8d9ae9ee6e6a417e3f9deea9933c69176903d460a1c91132658ebe093c8e9ed000cb579fe93f15626c15d8041ceb6438e15caca1d153a67975f9 PATCHES 0001-add-archive-destination-to-install.patch 0002-win64-support.patch 0003-add-find_package-libwebsockets.patch 0004-support-static-build.patch - 0005-add-mach.h-include.patch + 0005-websocket-shared-lib-name.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_WEBSOCKETS) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DWITH_SRV=OFF -DWITH_WEBSOCKETS=ON + -DSTATIC_WEBSOCKETS=${STATIC_WEBSOCKETS} -DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_THREADING=ON -DDOCUMENTATION=OFF - OPTIONS_RELEASE - -DENABLE_DEBUG=OFF - OPTIONS_DEBUG - -DENABLE_DEBUG=ON + -DWITH_PLUGINS=OFF ) vcpkg_install_cmake() diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index 4f0c6163406475..13ee87acaf5d47 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mosquitto", - "version-string": "1.6.8", - "port-version": 3, + "version": "2.0.12", "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", "homepage": "https://mosquitto.org/download/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fbed5d3d66ed2d..0e5051e4077033 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4349,8 +4349,8 @@ "port-version": 1 }, "mosquitto": { - "baseline": "1.6.8", - "port-version": 3 + "baseline": "2.0.12", + "port-version": 0 }, "mozjpeg": { "baseline": "2020-06-02", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index 6ececa656f4e63..4d2d9b9d75f4b4 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1f861f30fa2d88ebb0547f48940266517b015cc3", + "git-tree": "30615e7ce9a1ce09d473a05260da695fb0ee56d3", "version-semver": "4.2.2", "port-version": 1 }, diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index bb1bfbc30f8be1..5572dcfdce9674 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90a1a4314b15a787186d515df048f77961a4c7f3", + "version": "2.0.12", + "port-version": 0 + }, { "git-tree": "e50ddad9108597e09097e1853e116a62d650044d", "version-string": "1.6.8", From 97756c8603464adac0270dff79c0c4cc87c9f65e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 28 Sep 2021 08:51:56 +0800 Subject: [PATCH 0645/1858] [libwebp] update to 1.2.1 (#20152) * [libwebp] update to 1.2.1 * update version * Convert patch CRLF to LF * update version * update patch and portfile,cmake * update version * update portifile.cmake * update portfile.cmake * update version * update portfile.cmake * update version * revert portfile.cmake * update version * add trailing line break * update version --- ports/libwebp/0001-build.patch | 29 ++++---- ...e-config-add-backwards-compatibility.patch | 4 +- ports/libwebp/0003-always-mux.patch | 22 +++--- .../0004-add-missing-linked-library.patch | 4 +- ports/libwebp/0007-fix-arm-build.patch | 12 ++-- ports/libwebp/0008-sdl.patch | 69 ++++++++++--------- ports/libwebp/0009-glut.patch | 24 +++---- ports/libwebp/portfile.cmake | 19 +++-- ports/libwebp/vcpkg.json | 14 +++- versions/baseline.json | 4 +- versions/l-/libwebp.json | 5 ++ 11 files changed, 110 insertions(+), 96 deletions(-) diff --git a/ports/libwebp/0001-build.patch b/ports/libwebp/0001-build.patch index e95468c3277f15..3c6a63988122df 100644 --- a/ports/libwebp/0001-build.patch +++ b/ports/libwebp/0001-build.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9503daacb..2fb9ef137 100644 +index bd1bebb..4ce801d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -167,6 +167,9 @@ add_definitions(-DHAVE_CONFIG_H) +@@ -214,6 +214,9 @@ endfunction() if(MSVC) # avoid security warnings for e.g., fopen() used in the examples. add_definitions(-D_CRT_SECURE_NO_WARNINGS) @@ -12,7 +12,7 @@ index 9503daacb..2fb9ef137 100644 else() add_definitions(-Wall) endif() -@@ -420,9 +423,9 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) +@@ -482,7 +485,7 @@ if(WEBP_BUILD_LIBWEBPMUX) "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;") @@ -21,26 +21,25 @@ index 9503daacb..2fb9ef137 100644 list(APPEND INSTALLED_LIBRARIES libwebpmux) configure_pkg_config("src/mux/libwebpmux.pc") endif() - - if(WEBP_BUILD_GIF2WEBP) -@@ -524,7 +528,11 @@ if(WEBP_BUILD_EXTRAS) - +@@ -586,8 +589,12 @@ if(WEBP_BUILD_EXTRAS) # webp_quality add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS}) target_link_libraries(webp_quality exampleutil imagedec) + if(BUILD_SHARED_LIBS) + target_link_libraries(webp_quality webpdspdecode) -+ endif() ++ endif() target_include_directories(webp_quality PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}) -@@ -573,7 +573,7 @@ if(WEBP_BUILD_WEBP_JS) - "-s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ - -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") - set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) -- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) -+ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + + # vwebp_sdl +@@ -620,7 +627,7 @@ if(WEBP_BUILD_WEBP_JS) + -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ + -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") + set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) +- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + endif() # WASM version - add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) diff --git a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch index 2ed199ec8f6cd6..5e039a6811b280 100644 --- a/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch +++ b/ports/libwebp/0002-cmake-config-add-backwards-compatibility.patch @@ -1,5 +1,5 @@ diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in -index bb22164..3ad256f 100644 +index 822fc59..cef75fe 100644 --- a/cmake/WebPConfig.cmake.in +++ b/cmake/WebPConfig.cmake.in @@ -4,8 +4,60 @@ set(WEBP_VERSION ${WebP_VERSION}) @@ -8,7 +8,7 @@ index bb22164..3ad256f 100644 include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") +include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) --set(WebP_INCLUDE_DIRS "webp") +-set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") -set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) -set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") -set(WEBP_LIBRARIES "${WebP_LIBRARIES}") diff --git a/ports/libwebp/0003-always-mux.patch b/ports/libwebp/0003-always-mux.patch index 1484bc891fb090..c120c95d0ed1e6 100644 --- a/ports/libwebp/0003-always-mux.patch +++ b/ports/libwebp/0003-always-mux.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6f6c8eca2..00366ae53 100644 ---- a/CMakeLists.txt +index b0ae7d5..5813c06 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -405,7 +405,7 @@ if(WEBP_BUILD_CWEBP) - install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - --if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) -+if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP OR TRUE) - parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") - add_library(libwebpmux ${WEBP_MUX_SRCS}) - target_link_libraries(libwebpmux webp) +@@ -472,7 +472,7 @@ if(WEBP_BUILD_CWEBP) + install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +-if(WEBP_BUILD_LIBWEBPMUX) ++if(WEBP_BUILD_LIBWEBPMUX OR WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP OR TRUE) + parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") + add_library(libwebpmux ${WEBP_MUX_SRCS}) + target_link_libraries(libwebpmux webp) diff --git a/ports/libwebp/0004-add-missing-linked-library.patch b/ports/libwebp/0004-add-missing-linked-library.patch index 6cbb394d5d9844..6cfbe7ce8261e6 100644 --- a/ports/libwebp/0004-add-missing-linked-library.patch +++ b/ports/libwebp/0004-add-missing-linked-library.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a98540c..a3697cb 100644 +index 8386687..5ab9ed2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -479,6 +479,10 @@ if(WEBP_BUILD_VWEBP) +@@ -540,6 +540,10 @@ if(WEBP_BUILD_VWEBP) PRIVATE ${GLUT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src ${OPENGL_INCLUDE_DIR}) diff --git a/ports/libwebp/0007-fix-arm-build.patch b/ports/libwebp/0007-fix-arm-build.patch index aae5e39574a673..909b7c29307441 100644 --- a/ports/libwebp/0007-fix-arm-build.patch +++ b/ports/libwebp/0007-fix-arm-build.patch @@ -1,13 +1,13 @@ diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake -index da9a42a4..ce7a69f3 100644 +index bc0dbc9..381f64a 100644 --- a/cmake/cpu.cmake +++ b/cmake/cpu.cmake -@@ -73,7 +73,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE}) +@@ -97,7 +97,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE}) set(CMAKE_REQUIRED_FLAGS ${SIMD_COMPILE_FLAG}) webp_check_compiler_flag(${WEBP_SIMD_FLAG} ${WEBP_ENABLE_SIMD}) else() -- if(MSVC) -+ if(MSVC AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM")) +- if(MSVC AND SIMD_ENABLE_FLAGS) ++ if(MSVC AND SIMD_ENABLE_FLAGS AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM")) + # The detection for SSE2/SSE4 support under MSVC is based on the compiler + # version so e.g., clang-cl will require flags to enable the assembly. list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG) - else() - set(SIMD_COMPILE_FLAG " ") diff --git a/ports/libwebp/0008-sdl.patch b/ports/libwebp/0008-sdl.patch index 7f3363f7b1dc81..b922ef17254259 100644 --- a/ports/libwebp/0008-sdl.patch +++ b/ports/libwebp/0008-sdl.patch @@ -1,36 +1,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7b0d2fa55..efd10887b 100644 ---- a/CMakeLists.txt +index 91a4ba8..10a3f4d 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -563,10 +563,11 @@ if(WEBP_BUILD_EXTRAS) - endif() - - if(WEBP_BUILD_WEBP_JS) -+ find_package(SDL REQUIRED) - # JavaScript version - add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) -- target_link_libraries(webp_js webpdecoder SDL) -- target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -+ target_link_libraries(webp_js webpdecoder ${SDL_LIBRARY}) -+ target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) - set(WEBP_HAVE_SDL 1) - set_target_properties( - webp_js -@@ -578,14 +579,14 @@ if(WEBP_BUILD_WEBP_JS) - - # WASM version - add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) -- target_link_libraries(webp_wasm webpdecoder SDL) -- target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) -+ target_link_libraries(webp_wasm webpdecoder ${SDL_LIBRARY}) -+ target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) - set_target_properties( - webp_wasm - PROPERTIES LINK_FLAGS "-s WASM=1 \ - -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ - -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") -- target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) -+ target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) - - target_compile_definitions(webpdspdecode PUBLIC EMSCRIPTEN) - endif() +@@ -624,11 +624,12 @@ endif() + + if(WEBP_BUILD_WEBP_JS) + # wasm2js does not support SIMD. ++ find_package(SDL REQUIRED) + if(NOT WEBP_ENABLE_SIMD) + # JavaScript version + add_executable(webp_js ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) +- target_link_libraries(webp_js webpdecoder SDL) +- target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_link_libraries(webp_js webpdecoder ${SDL_LIBRARY}) ++ target_include_directories(webp_js PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) + set(WEBP_HAVE_SDL 1) + set_target_properties( + webp_js +@@ -641,14 +642,14 @@ if(WEBP_BUILD_WEBP_JS) + + # WASM version + add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) +- target_link_libraries(webp_wasm webpdecoder SDL) +- target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) ++ target_link_libraries(webp_wasm webpdecoder ${SDL_LIBRARY}) ++ target_include_directories(webp_wasm PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${SDL_INCLUDE_DIR}) + set_target_properties( + webp_wasm + PROPERTIES LINK_FLAGS "-s WASM=1 \ + -s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ + -s EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") +- target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_wasm PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + + target_compile_definitions(webpdspdecode PUBLIC EMSCRIPTEN) + endif() diff --git a/ports/libwebp/0009-glut.patch b/ports/libwebp/0009-glut.patch index e1bf267ed71e51..01d011e5f73ac0 100644 --- a/ports/libwebp/0009-glut.patch +++ b/ports/libwebp/0009-glut.patch @@ -1,17 +1,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index efd10887b..8b41cc1ba 100644 ---- a/CMakeLists.txt +index 0799269..45b3306 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -470,7 +470,7 @@ if(WEBP_BUILD_VWEBP) - target_link_libraries(vwebp - ${OPENGL_LIBRARIES} - exampleutil -- ${GLUT_glut_LIBRARY} -+ GLUT::GLUT - imageioutil - webp - webpdemux) -@@ -481,6 +481,9 @@ if(WEBP_BUILD_VWEBP) +@@ -532,7 +532,7 @@ if(WEBP_BUILD_VWEBP) + target_link_libraries(vwebp + ${OPENGL_LIBRARIES} + exampleutil +- ${GLUT_glut_LIBRARY} ++ GLUT::GLUT + imageioutil + webp + webpdemux) +@@ -543,6 +543,9 @@ if(WEBP_BUILD_VWEBP) if(UNIX AND NOT(ANDROID OR BLACKBERRY OR APPLE)) find_package(X11 REQUIRED) target_link_libraries(vwebp ${X11_LIBRARIES} ${X11_Xxf86vm_LIB}) diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 97673b7e4ae4b6..985a6d518c6db3 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libwebp - REF d7844e9762b61c9638c263657bd49e1690184832 # v1.1.0 - SHA512 13692970e7dd909cd6aaa03c9a0c863243baac1885644794362dec0c0b0721d6807f281f746215bfd856c6e0cb742b01a731a33fe075a32ff24496e10c1a94b4 + REF 9ce5843dbabcfd3f7c39ec7ceba9cbeb213cbfdf # v1.2.1 + SHA512 43224caedb0d591ad1dd3872cd882c0fe255e24425f6da82fca212783ddb231326797a82ead0a1b8b15dc98db1cb05741e3a5e5131babbcc49a529a9f3253865 HEAD_REF master PATCHES 0001-build.patch @@ -31,6 +31,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS dwebp WEBP_BUILD_DWEBP swap16bitcsp WEBP_ENABLE_SWAP_16BIT_CSP unicode WEBP_UNICODE + libbwebpmux WEBP_BUILD_LIBWEBPMUX ) @@ -44,22 +45,21 @@ if(VCPKG_TARGET_IS_OSX) endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/WebP/cmake TARGET_PATH share/WebP) # find_package is called with WebP not libwebp -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_config_fixup(PACKAGE_NAME WebP CONFIG_PATH share/WebP/cmake) # find_package is called with WebP not libwebp +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libwebp.pc" "-lwebp" "-lwebpd") @@ -69,7 +69,6 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") endif() vcpkg_fixup_pkgconfig() - set(BIN_NAMES get_disto gif2webp img2webp vwebp vwebp_sdl webpinfo webpmux webp_quality cwebp dwebp) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/webp/") foreach(tool ${BIN_NAMES}) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index 1f19252160bd96..179f1cc1b30f9a 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libwebp", - "version-string": "1.1.0", - "port-version": 4, + "version": "1.2.1", "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "dependencies": [ @@ -11,6 +10,14 @@ "unicode" ], "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ @@ -101,6 +108,9 @@ "info": { "description": "Build the webpinfo command line tool." }, + "libbwebpmux": { + "description": "Build the libwebpmux library" + }, "mux": { "description": "Build the webpmux command line tool." }, diff --git a/versions/baseline.json b/versions/baseline.json index 0e5051e4077033..0f7ca3c5d4a3a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3925,8 +3925,8 @@ "port-version": 7 }, "libwebp": { - "baseline": "1.1.0", - "port-version": 4 + "baseline": "1.2.1", + "port-version": 0 }, "libwebsockets": { "baseline": "4.2.2", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index f032f533e00257..935958cc6a3e70 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca5a8b2ed264617e8a35d22e1e6ac18ebe99900f", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "4fcb5d97e464c046b1f4c1a81b7d23a9cb63a615", "version-string": "1.1.0", From 459fea691fc9353599b5c051d1a17c64fde723f0 Mon Sep 17 00:00:00 2001 From: plevy Date: Mon, 27 Sep 2021 22:39:25 -0400 Subject: [PATCH 0646/1858] [osgearth ] update osgearth to 3.2 and updated patches (#20160) * initial update for osgearth 3.2 and updated patches * Adding output from ./vcpkg x-add-version --all * update version * update version * delete Remark * update version Co-authored-by: Paul Levy Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/osgearth/fix-dependencies.patch | 67 ------- ports/osgearth/fix-dependency-osg.patch | 13 +- .../make-all-find-packages-required.patch | 179 ++++++++++-------- ports/osgearth/portfile.cmake | 8 +- ports/osgearth/vcpkg.json | 5 +- versions/baseline.json | 4 +- versions/o-/osgearth.json | 5 + 7 files changed, 114 insertions(+), 167 deletions(-) delete mode 100644 ports/osgearth/fix-dependencies.patch diff --git a/ports/osgearth/fix-dependencies.patch b/ports/osgearth/fix-dependencies.patch deleted file mode 100644 index 54c414875bb15d..00000000000000 --- a/ports/osgearth/fix-dependencies.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 001ebf1..8e49af2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -128,24 +128,45 @@ ENDIF (OSGEARTH_USE_GLES) - - # required - find_package(OSG REQUIRED) --find_package(CURL REQUIRED) -+find_package(CURL CONFIG REQUIRED) -+set(CURL_LIBRARY CURL::libcurl) -+ - find_package(GDAL REQUIRED) -+set(GDAL_LIBRARY ${GDAL_LIBRARIES}) -+set(GDAL_FOUND 1) - - # optional --find_package(GEOS REQUIRED) --find_package(Sqlite3 REQUIRED) -+find_package(geos CONFIG REQUIRED) -+set(GEOS_LIBRARY GEOS::geos GEOS::geos_c) -+set(GEOS_FOUND 1) -+ -+find_package(unofficial-sqlite3 CONFIG REQUIRED) -+set(SQLITE3_FOUND 1) -+set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3) -+ - find_package(Draco REQUIRED) - find_package(BASISU REQUIRED) -+ - find_package(GLEW REQUIRED) --find_package(Protobuf REQUIRED) --find_package(WEBP REQUIRED) -+set(GLEW_LIBRARIES GLEW::GLEW) -+set(GLEW_FOUND 1) -+ -+find_package(protobuf CONFIG REQUIRED) -+set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf) -+set(Protobuf_FOUND 1) -+ -+find_package(WebP CONFIG REQUIRED) -+set(WEBP_LIBRARY WebP::webp) -+set(WEBP_FOUND 1) - - if(OSGEARTH_ENABLE_PROFILING) - find_package(Tracy REQUIRED) - endif() - - if(OSGEARTH_BUILD_ZIP_PLUGIN) -- find_package(LIBZIP REQUIRED) -+ find_package(libzip CONFIG REQUIRED) -+ set(LIBZIP_LIBRARY libzip::zip) -+ set(LIBZIP_FOUND 1) - endif() - - if(OSGEARTH_BUILD_TRITON_NODEKIT) -@@ -193,7 +214,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak - # TinyXML is an XML parsing library - SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") - IF (WITH_EXTERNAL_TINYXML) -- find_package(TinyXML REQUIRED) -+ find_package(tinyxml CONFIG REQUIRED) -+ set(TINYXML_FOUND 1) -+ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml) - ENDIF (WITH_EXTERNAL_TINYXML) - - # postfix settings for various configs diff --git a/ports/osgearth/fix-dependency-osg.patch b/ports/osgearth/fix-dependency-osg.patch index 18489b1c821a0d..9d8b0d43df78be 100644 --- a/ports/osgearth/fix-dependency-osg.patch +++ b/ports/osgearth/fix-dependency-osg.patch @@ -152,20 +152,21 @@ index 8c61e42..bbda7be 100644 SET(TARGET_SRC osgearth_viewer.cpp ) diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt -index c49bfcd..a7b9a2d 100644 +index cd55c1164..7cecdac74 100644 --- a/src/osgEarth/CMakeLists.txt +++ b/src/osgEarth/CMakeLists.txt -@@ -870,9 +870,11 @@ ENDIF(TRACY_FOUND) - +@@ -928,9 +928,11 @@ ENDIF(TRACY_FOUND) + OPTION(NRL_STATIC_LIBRARIES "Link osgEarth against static GDAL and cURL, including static OpenSSL, Proj4, JPEG, PNG, and TIFF." OFF) if(NOT NRL_STATIC_LIBRARIES) -- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY) +- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY) + LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY) + TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES}) else(NOT NRL_STATIC_LIBRARIES) -- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY) +- LINK_WITH_VARIABLES(${LIB_NAME} OSG_LIBRARY OSGUTIL_LIBRARY OSGSIM_LIBRARY OSGDB_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY CURL_LIBRARY GDAL_LIBRARY OSGMANIPULATOR_LIBRARY SSL_EAY_RELEASE LIB_EAY_RELEASE TIFF_LIBRARY PROJ4_LIBRARY PNG_LIBRARY JPEG_LIBRARY) + LINK_WITH_VARIABLES(${LIB_NAME} OSGSIM_LIBRARY OSGVIEWER_LIBRARY OSGTEXT_LIBRARY OSGDB_LIBRARY OSGGA_LIBRARY OSGSHADOW_LIBRARY OPENTHREADS_LIBRARY OSGMANIPULATOR_LIBRARY OSGUTIL_LIBRARY OSG_LIBRARY) + TARGET_LINK_LIBRARIES(${LIB_NAME} ${OSG_DEPENDS_LIBRARY} ${CURL_LIBRARY} ${GDAL_LIBRARIES} ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} ${TIFF_LIBRARY} ${PROJ4_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY}) endif(NOT NRL_STATIC_LIBRARIES) - + LINK_CORELIB_DEFAULT(${LIB_NAME} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIBRARY}) + diff --git a/ports/osgearth/make-all-find-packages-required.patch b/ports/osgearth/make-all-find-packages-required.patch index f5ea6793f72114..a39abb47955a59 100644 --- a/ports/osgearth/make-all-find-packages-required.patch +++ b/ports/osgearth/make-all-find-packages-required.patch @@ -1,84 +1,95 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 049e37e..c78bd16 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -121,9 +121,9 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit - - # Mobile/GLES: - IF (OSGEARTH_USE_GLES) -- find_package(OpenGLES) -+ find_package(OpenGLES REQUIRED) - ELSE () -- find_package(OpenGL) -+ find_package(OpenGL REQUIRED) - ENDIF (OSGEARTH_USE_GLES) - - # required -@@ -132,28 +132,28 @@ find_package(CURL REQUIRED) - find_package(GDAL REQUIRED) - - # optional --find_package(GEOS) --find_package(Sqlite3) --find_package(Draco) --find_package(BASISU) --find_package(GLEW) --find_package(Protobuf) --find_package(WEBP) -+find_package(GEOS REQUIRED) -+find_package(Sqlite3 REQUIRED) -+find_package(Draco REQUIRED) -+find_package(BASISU REQUIRED) -+find_package(GLEW REQUIRED) -+find_package(Protobuf REQUIRED) -+find_package(WEBP REQUIRED) - - if(OSGEARTH_ENABLE_PROFILING) -- find_package(Tracy) -+ find_package(Tracy REQUIRED) - endif() - - if(OSGEARTH_BUILD_ZIP_PLUGIN) -- find_package(LIBZIP) -+ find_package(LIBZIP REQUIRED) - endif() - - if(OSGEARTH_BUILD_TRITON_NODEKIT) -- find_package(Triton QUIET) -+ find_package(Triton QUIET REQUIRED) - endif() - - if(OSGEARTH_BUILD_SILVERLINING_NODEKIT) -- find_package(SilverLining QUIET) -+ find_package(SilverLining QUIET REQUIRED) - endif() - - # Sqlite enables the MBTiles format: -@@ -182,18 +182,18 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile - # Duktape is the JavaScript interpreter - SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") - IF (WITH_EXTERNAL_DUKTAPE) -- find_package(Duktape) -+ find_package(Duktape REQUIRED) - ENDIF (WITH_EXTERNAL_DUKTAPE) - - # Whether to install shaders (glsl files). --# If true, shaders install into a resources folder. If false, they are inlined in the -+# If true, shaders install into a resources folder. If false, they are inlined in the - # code and you cannot tweak them after install. - OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Make INSTALL" OFF) - - # TinyXML is an XML parsing library - SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") - IF (WITH_EXTERNAL_TINYXML) -- find_package(TinyXML) -+ find_package(TinyXML REQUIRED) - ENDIF (WITH_EXTERNAL_TINYXML) - - # postfix settings for various configs -@@ -272,4 +272,4 @@ ADD_SUBDIRECTORY(src) - - if (OSGEARTH_BUILD_DOCS) - ADD_SUBDIRECTORY(docs) --endif() -+endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7541c8d..b4076fe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -122,40 +122,54 @@ option(OSGEARTH_ENABLE_GEOCODER "Enable the geocoder (GDAL/OGR must be built wit + + # Mobile/GLES: + IF (OSGEARTH_USE_GLES) +- find_package(OpenGLES) ++ find_package(OpenGLES REQUIRED) + ELSE () +- find_package(OpenGL) ++ find_package(OpenGL REQUIRED) + ENDIF (OSGEARTH_USE_GLES) + + # required + find_package(OSG REQUIRED) +-find_package(CURL REQUIRED) ++find_package(CURL CONFIG REQUIRED) ++set(CURL_LIBRARY CURL::libcurl) + find_package(GDAL REQUIRED) +- ++set(GDAL_LIBRARY ${GDAL_LIBRARIES}) ++set(GDAL_FOUND 1) + # optional +-find_package(GEOS) +-find_package(Sqlite3) +-find_package(Draco) +-find_package(BASISU) +-find_package(GLEW) +-find_package(Protobuf) +-find_package(WEBP) +-find_package(Blend2D) ++find_package(geos CONFIG REQUIRED) ++set(GEOS_LIBRARY GEOS::geos GEOS::geos_c) ++set(GEOS_FOUND 1) ++find_package(unofficial-sqlite3 CONFIG REQUIRED) ++set(SQLITE3_FOUND 1) ++set(SQLITE3_LIBRARY unofficial::sqlite3::sqlite3) ++find_package(Draco REQUIRED) ++find_package(BASISU REQUIRED) ++find_package(GLEW REQUIRED) ++set(GLEW_LIBRARIES GLEW::GLEW) ++set(GLEW_FOUND 1) ++find_package(protobuf CONFIG REQUIRED) ++set(Protobuf_LIBRARIES protobuf::libprotoc protobuf::libprotobuf) ++set(Protobuf_FOUND 1) ++find_package(WebP CONFIG REQUIRED) ++set(WEBP_LIBRARY WebP::webp) ++set(WEBP_FOUND 1) ++find_package(Blend2D REQUIRED) + + if(OSGEARTH_ENABLE_PROFILING) +- find_package(Tracy) ++ find_package(Tracy REQUIRED) + endif() + + if(OSGEARTH_BUILD_ZIP_PLUGIN) +- find_package(LIBZIP) ++ find_package(libzip CONFIG REQUIRED) ++ set(LIBZIP_LIBRARY libzip::zip) ++ set(LIBZIP_FOUND 1) + endif() + + if(OSGEARTH_BUILD_TRITON_NODEKIT) +- find_package(Triton QUIET) ++ find_package(Triton QUIET REQUIRED) + endif() + + if(OSGEARTH_BUILD_SILVERLINING_NODEKIT) +- find_package(SilverLining QUIET) ++ find_package(SilverLining QUIET REQUIRED) + endif() + + # Sqlite enables the MBTiles format: +@@ -193,7 +207,7 @@ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compile + # Duktape is the JavaScript interpreter + SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape") + IF (WITH_EXTERNAL_DUKTAPE) +- find_package(Duktape) ++ find_package(Duktape REQUIRED) + ENDIF (WITH_EXTERNAL_DUKTAPE) + + # Whether to install shaders (glsl files). +@@ -204,7 +218,9 @@ OPTION(OSGEARTH_INSTALL_SHADERS "Whether to deploy GLSL shaders when doing a Mak + # TinyXML is an XML parsing library + SET (WITH_EXTERNAL_TINYXML FALSE CACHE BOOL "Use bundled or system wide version of TinyXML") + IF (WITH_EXTERNAL_TINYXML) +- find_package(TinyXML) ++ find_package(tinyxml CONFIG REQUIRED) ++ set(TINYXML_FOUND 1) ++ set(TINYXML_LIBRARY unofficial-tinyxml::unofficial-tinyxml) + ENDIF (WITH_EXTERNAL_TINYXML) + + # postfix settings for various configs diff --git a/ports/osgearth/portfile.cmake b/ports/osgearth/portfile.cmake index 4a7270469740a5..6b7725ccc6591b 100644 --- a/ports/osgearth/portfile.cmake +++ b/ports/osgearth/portfile.cmake @@ -11,14 +11,12 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gwaldron/osgearth - REF 342fcadf4c8892ba84841cb5b4162bdc51519e3c #version 3.1 - SHA512 03378a918306846d2144e545785c783b01e33fa2dd5c77d16d390a275217b6ce7a3a743c35ae99a497b272a7516b055442c0a891bd312cce727a5538b40364f5 + REF 15d5340f174212d6f93ae55c0d9af606c3d361c0 #version 3.2 + SHA512 f922e8bbb041a498e948587f03e8dc8a07b92e641f38d50a8eafb8b3ce1e0c92bb1ee01360d57e794429912734b60cf05ba143445a442bc95af39e3dd9fc3670 HEAD_REF master PATCHES StaticOSG.patch # Fix port compilation in static-md module - deprecated_cpp_fix.patch # Fix port headers to not use classes deprecated in c++17. Gives errors when using the installed port headers make-all-find-packages-required.patch - fix-dependencies.patch fix-dependency-osg.patch remove-tool-debug-suffix.patch ) @@ -79,7 +77,7 @@ endif() if ("tools" IN_LIST FEATURES) vcpkg_copy_tools(TOOL_NAMES osgearth_3pv osgearth_atlas osgearth_boundarygen osgearth_clamp - osgearth_conv osgearth_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer + osgearth_conv osgearth_imgui osgearth_overlayviewer osgearth_tfs osgearth_toc osgearth_version osgearth_viewer AUTO_CLEAN ) endif() diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index c71392131c2fa7..090f11f5c92a5a 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,8 +1,7 @@ { "name": "osgearth", - "version": "3.1", - "port-version": 4, - "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2015 Pelican Mapping.", + "version": "3.2", + "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0f7ca3c5d4a3a0..0c24c30d985269 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4945,8 +4945,8 @@ "port-version": 2 }, "osgearth": { - "baseline": "3.1", - "port-version": 4 + "baseline": "3.2", + "port-version": 0 }, "osi": { "baseline": "0.108.6", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index 1857c201aa437a..bd416102cdcbe0 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a77075c3ff1a0372588cb78af6f4f08352b82896", + "version": "3.2", + "port-version": 0 + }, { "git-tree": "d12ff3ef1419ab8813b430101fb6dbcc96861671", "version": "3.1", From 3e2812c74bf526eba1822e263f59b5a277426b2b Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 28 Sep 2021 10:45:08 +0800 Subject: [PATCH 0647/1858] [libaaplus] Update to 2.36 (#20228) * [libaaplus] Update to 2.36 * Export include path --- ports/libaaplus/CMakeLists.txt | 69 ---------------------- ports/libaaplus/fix-cmakelists.patch | 85 ++++++++++++++++++++++++++++ ports/libaaplus/portfile.cmake | 25 ++++---- ports/libaaplus/vcpkg.json | 13 ++++- versions/baseline.json | 4 +- versions/l-/libaaplus.json | 5 ++ 6 files changed, 116 insertions(+), 85 deletions(-) delete mode 100644 ports/libaaplus/CMakeLists.txt create mode 100644 ports/libaaplus/fix-cmakelists.patch diff --git a/ports/libaaplus/CMakeLists.txt b/ports/libaaplus/CMakeLists.txt deleted file mode 100644 index fa8f60f806c3d7..00000000000000 --- a/ports/libaaplus/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -PROJECT (AstronomicalAlgorithms) - -cmake_minimum_required(VERSION 3.11) -cmake_policy(VERSION 3.11) - -project(libaaplus LANGUAGES CXX) - -set(CMAKE_CXX_STANDARD 14) - -option(BUILD_TOOLS "Build libaaplus tools" OFF) - -file(GLOB LIBS_SRC RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/*.cpp) - -list(REMOVE_ITEM ${LIBS_SRC} AATest.cpp) - -file(GLOB PUBLIC_HEADERS RELATIVE ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/*.h) - -set(TEST_SRCS - AATest.cpp -) - -add_library(libaaplus - ${LIBS_SRC} -) - -if (MSVC AND BUILD_SHARED_LIBS) -target_compile_definitions(libaaplus - PRIVATE - -DAAPLUS_EXT_CLASS\=__declspec\(dllexport\) -) -endif (MSVC AND BUILD_SHARED_LIBS) - -install( - TARGETS libaaplus - EXPORT libaaplus - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin -) - -# Headers makes relative includes so directory structure must be kept -foreach(HEADER ${PUBLIC_HEADERS}) - get_filename_component(HEADER_DIR ${HEADER} DIRECTORY) - install( - FILES ${HEADER} - DESTINATION include/aaplus/${HEADER_DIR} - ) -endforeach() - - -if (BUILD_TOOLS) - add_executable(aatest AATest.cpp) - target_link_libraries(aatest PRIVATE libaaplus) - if (BUILD_SHARED_LIBS AND MSVC) - target_compile_definitions(aatest - PUBLIC - -DAAPLUS_EXT_CLASS\=__declspec\(dllimport\) - ) - endif (BUILD_SHARED_LIBS AND MSVC) - - install(TARGETS aatest RUNTIME DESTINATION tools/aaplus) -endif() - -install( - EXPORT libaaplus - DESTINATION share/libaaplus - FILE libaaplusConfig.cmake - NAMESPACE libaaplus:: -) diff --git a/ports/libaaplus/fix-cmakelists.patch b/ports/libaaplus/fix-cmakelists.patch new file mode 100644 index 00000000000000..a57e05b3b4969d --- /dev/null +++ b/ports/libaaplus/fix-cmakelists.patch @@ -0,0 +1,85 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9bb8ea3..c445c4b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.8) + SET(CMAKE_CXX_STANDARD 17) + SET(CMAKE_CXX_STANDARD_REQUIRED ON) + ++option(BUILD_TOOLS "Build libaaplus tools" OFF) + #----------------------------------------------------------------------------- + # Output directories. + SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH +@@ -261,18 +262,66 @@ SET ( SRCS + #----------------------------------------------------------------------------- + # Executables. + #----------------------------------------------------------------------------- ++if(BUILD_TOOLS) + ADD_EXECUTABLE(AATest ${SRCS} ) +- ++endif() + #----------------------------------------------------------------------------- + # Libraries. ++if(NOT BUILD_SHARED_LIBS) + ADD_LIBRARY(aaplus-static STATIC ${SRCS_LIB} ${INCS}) + SET_TARGET_PROPERTIES(aaplus-static PROPERTIES OUTPUT_NAME "aaplus") +- ++target_include_directories(aaplus-static PUBLIC $ $) ++else() + ADD_LIBRARY(aaplus-shared SHARED ${SRCS_LIB} ${INCS}) + SET_TARGET_PROPERTIES(aaplus-shared PROPERTIES OUTPUT_NAME "aaplus") ++target_include_directories(aaplus-shared PUBLIC $ $) ++endif() ++ ++if (MSVC AND BUILD_SHARED_LIBS) ++target_compile_definitions(aaplus-shared ++ PRIVATE ++ -DAAPLUS_EXT_CLASS\=__declspec\(dllexport\) ++) ++endif (MSVC AND BUILD_SHARED_LIBS) ++ ++if(BUILD_SHARED_LIBS) ++ install( ++ TARGETS aaplus-shared ++ EXPORT aaplus ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++ ) ++else() ++ install( ++ TARGETS aaplus-static ++ EXPORT aaplus ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++ RUNTIME DESTINATION bin ++ ) ++endif() + +-install(TARGETS aaplus-shared aaplus-static +- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" ) ++if(BUILD_TOOLS) ++ if(BUILD_SHARED_LIBS) ++ TARGET_LINK_LIBRARIES(AATest aaplus-shared) ++ if(MSVC) ++ target_compile_definitions(AATest ++ PUBLIC ++ -DAAPLUS_EXT_CLASS\=__declspec\(dllimport\) ++ ) ++ endif() ++ ++ else() ++ TARGET_LINK_LIBRARIES(AATest aaplus-static) ++ endif() ++endif() + +-TARGET_LINK_LIBRARIES(AATest aaplus-static) ++install( ++ EXPORT aaplus ++ DESTINATION share/aaplus ++ FILE aaplusConfig.cmake ++ NAMESPACE aaplus:: ++) + ++install(FILES ${INCS} DESTINATION include/aaplus) +\ No newline at end of file diff --git a/ports/libaaplus/portfile.cmake b/ports/libaaplus/portfile.cmake index 358fdaba644cfb..f7387aa854f9fb 100644 --- a/ports/libaaplus/portfile.cmake +++ b/ports/libaaplus/portfile.cmake @@ -1,10 +1,10 @@ -set(VERSION 2.12) +set(VERSION 2.36) vcpkg_download_distfile( ARCHIVE_FILE URLS "http://www.naughter.com/download/aaplus_v${VERSION}.zip" FILENAME "aaplus_v${VERSION}.zip" - SHA512 ec3a3d1346637fbed3ec5093ded821c6d80950a6432378d9826ed842571d8670cd5d2a1c9ff58a18f308e18669d786f72d24961e26bd8e070ee35674688a39e7 + SHA512 a7abf20feb49df00b95be987809a3dc8df3e9ff706dd5a873ecfdd695af125f858264e092b6b856e83685e9eb46fd46520cf09dfae892c32cbb71f925ba17b86 ) vcpkg_extract_source_archive_ex( @@ -12,25 +12,26 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE_FILE} REF ${VERSION} NO_REMOVE_ONE_LEVEL + PATCHES + fix-cmakelists.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools BUILD_TOOLS + FEATURES + tools BUILD_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/libaaplus) +vcpkg_cmake_config_fixup(PACKAGE_NAME aaplus CONFIG_PATH share/aaplus) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/AA+.htm DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/AA+.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libaaplus/vcpkg.json b/ports/libaaplus/vcpkg.json index 7bf35394570234..35572ec24275f4 100644 --- a/ports/libaaplus/vcpkg.json +++ b/ports/libaaplus/vcpkg.json @@ -1,9 +1,18 @@ { "name": "libaaplus", - "version-string": "2.12", - "port-version": 2, + "version": "2.36", "description": "libaaplus is an astronomical computations library by naughter software", "homepage": "http://www.naughter.com/aa.html", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "Build libaaplus tools" diff --git a/versions/baseline.json b/versions/baseline.json index 0c24c30d985269..51338baf845264 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3201,8 +3201,8 @@ "port-version": 0 }, "libaaplus": { - "baseline": "2.12", - "port-version": 2 + "baseline": "2.36", + "port-version": 0 }, "libaiff": { "baseline": "5.0", diff --git a/versions/l-/libaaplus.json b/versions/l-/libaaplus.json index abfe02b34051bd..4e7d376fbfe399 100644 --- a/versions/l-/libaaplus.json +++ b/versions/l-/libaaplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "196f02649779e1a3b06c9d0c32b41082205c69b5", + "version": "2.36", + "port-version": 0 + }, { "git-tree": "350415271eff06157085854060050dcbc80448a9", "version-string": "2.12", From f8dbda8d2b8de07222648a18058a933532b3be89 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 27 Sep 2021 19:47:36 -0700 Subject: [PATCH 0648/1858] [srell] Add new port (#20315) * add srell port * add versioning * fill out manifest * update versioning --- ports/srell/portfile.cmake | 23 +++++++++++++++++++++++ ports/srell/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/s-/srell.json | 9 +++++++++ 4 files changed, 42 insertions(+) create mode 100644 ports/srell/portfile.cmake create mode 100644 ports/srell/vcpkg.json create mode 100644 versions/s-/srell.json diff --git a/ports/srell/portfile.cmake b/ports/srell/portfile.cmake new file mode 100644 index 00000000000000..b7b36652c7298b --- /dev/null +++ b/ports/srell/portfile.cmake @@ -0,0 +1,23 @@ +set(VERSION 2_920) + +vcpkg_download_distfile( + ARCHIVE + URLS "https://www.akenotsuki.com/misc/srell/srell${VERSION}.zip" + FILENAME "srell${VERSION}.zip" + SHA512 504BE3C24F497B8EA75D06787CBD3C8A475073F5881317D15619DFE6F7CBF4F75B9A81145981D1EE0F945C0D748C7BEDC60258DC52E4860FC7B769A01C9FA9FB +) + +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + NO_REMOVE_ONE_LEVEL +) + +file(INSTALL + "${SOURCE_PATH}/srell.hpp" + "${SOURCE_PATH}/srell_ucfdata2.hpp" + "${SOURCE_PATH}/srell_updata.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include" +) + +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/srell/vcpkg.json b/ports/srell/vcpkg.json new file mode 100644 index 00000000000000..9aa65dcdc1b747 --- /dev/null +++ b/ports/srell/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "srell", + "version-string": "2.920", + "description": "SRELL (std::regex-like library) is a regular expression template library for C++.", + "homepage": "https://www.akenotsuki.com/misc/srell/en/" +} diff --git a/versions/baseline.json b/versions/baseline.json index 51338baf845264..0b146f022be4c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6312,6 +6312,10 @@ "baseline": "0.6.4", "port-version": 0 }, + "srell": { + "baseline": "2.920", + "port-version": 0 + }, "srpc": { "baseline": "0.9.3", "port-version": 0 diff --git a/versions/s-/srell.json b/versions/s-/srell.json new file mode 100644 index 00000000000000..0f69b92c4f024c --- /dev/null +++ b/versions/s-/srell.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3497458c9ed34a6d973e693711dffcc387e81ad0", + "version-string": "2.920", + "port-version": 0 + } + ] +} From fb6e2090fbe78f7940f549b3e544788e8424414c Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 28 Sep 2021 10:49:56 +0800 Subject: [PATCH 0649/1858] [libdatachannel] Update to 0.15.1 (#20317) * [libdatachannel] Update to 0.15.1 * Revert to version-semver --- ports/libdatachannel/0001-fix-for-vcpkg.patch | 41 ++++++------ .../0002-fix-export-include.patch | 66 ------------------- ports/libdatachannel/portfile.cmake | 15 ++--- ports/libdatachannel/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libdatachannel.json | 5 ++ 6 files changed, 34 insertions(+), 100 deletions(-) delete mode 100644 ports/libdatachannel/0002-fix-export-include.patch diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch index 528f47a8835f56..1d859d814d2844 100644 --- a/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f0559b1..3c01184 100644 +index 02b688c..03b185f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,6 @@ endif() @@ -10,7 +10,7 @@ index f0559b1..3c01184 100644 if(WIN32) add_definitions(-DWIN32_LEAN_AND_MEAN) -@@ -197,22 +196,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) +@@ -196,9 +195,10 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) set(THREADS_PREFER_PTHREAD_FLAG TRUE) find_package(Threads REQUIRED) @@ -19,43 +19,43 @@ index f0559b1..3c01184 100644 +find_library(USRSCTP_LIBRARY usrsctp REQUIRED) +find_path(PLOG_INCLUDE_DIRS "plog/Appenders/AndroidAppender.h") --option(sctp_build_programs 0) --option(sctp_build_shared_lib 0) --set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) --add_subdirectory(deps/usrsctp EXCLUDE_FROM_ALL) --if (MSYS OR MINGW) -- target_compile_definitions(usrsctp PUBLIC -DSCTP_STDINT_INCLUDE=) --endif() --if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") -- target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) --endif() --add_library(Usrsctp::Usrsctp ALIAS usrsctp) ++if(0) + option(sctp_build_programs 0) + option(sctp_build_shared_lib 0) + set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) +@@ -210,8 +210,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU") + target_compile_options(usrsctp PRIVATE -Wno-error=format-truncation) + endif() + add_library(Usrsctp::Usrsctp ALIAS usrsctp) - -add_library(datachannel SHARED ++endif() +add_library(datachannel ${LIBDATACHANNEL_SOURCES} ${LIBDATACHANNEL_HEADERS} ${LIBDATACHANNEL_IMPL_SOURCES} -@@ -233,14 +220,16 @@ set_target_properties(datachannel-static PROPERTIES - target_include_directories(datachannel PUBLIC $) +@@ -235,16 +235,18 @@ target_include_directories(datachannel PUBLIC + $) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel PUBLIC Threads::Threads) + target_link_libraries(datachannel PRIVATE Threads::Threads) -target_link_libraries(datachannel PRIVATE Usrsctp::Usrsctp plog::plog) +target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) - target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) + target_include_directories(datachannel-static PUBLIC + $ + $) target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) +target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) - target_link_libraries(datachannel-static PUBLIC Threads::Threads) + target_link_libraries(datachannel-static PRIVATE Threads::Threads) -target_link_libraries(datachannel-static PRIVATE Usrsctp::Usrsctp plog::plog) +target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) if(WIN32) target_link_libraries(datachannel PUBLIC ws2_32) # winsock2 -@@ -335,11 +324,11 @@ else() +@@ -339,11 +341,11 @@ else() target_link_libraries(datachannel PRIVATE LibJuice::LibJuice) target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) else() @@ -70,6 +70,3 @@ index f0559b1..3c01184 100644 endif() endif() --- -2.33.0.windows.1 - diff --git a/ports/libdatachannel/0002-fix-export-include.patch b/ports/libdatachannel/0002-fix-export-include.patch deleted file mode 100644 index 980f242b937b37..00000000000000 --- a/ports/libdatachannel/0002-fix-export-include.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c01184..0adff6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -217,18 +217,22 @@ set_target_properties(datachannel-static PROPERTIES - VERSION ${PROJECT_VERSION} - CXX_STANDARD 17) - --target_include_directories(datachannel PUBLIC $) -+target_include_directories(datachannel PUBLIC -+ $ -+ $) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) - target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) --target_link_libraries(datachannel PUBLIC Threads::Threads) -+target_link_libraries(datachannel PRIVATE Threads::Threads) - target_link_libraries(datachannel PRIVATE ${USRSCTP_LIBRARY}) - --target_include_directories(datachannel-static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include) -+target_include_directories(datachannel-static PUBLIC -+ $ -+ $) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/rtc) - target_include_directories(datachannel-static PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src) - target_include_directories(datachannel PRIVATE ${PLOG_INCLUDE_DIRS}) --target_link_libraries(datachannel-static PUBLIC Threads::Threads) -+target_link_libraries(datachannel-static PRIVATE Threads::Threads) - target_link_libraries(datachannel-static PRIVATE ${USRSCTP_LIBRARY}) - - if(WIN32) -diff --git a/examples/client-benchmark/CMakeLists.txt b/examples/client-benchmark/CMakeLists.txt -index ad0024c..a734db6 100644 ---- a/examples/client-benchmark/CMakeLists.txt -+++ b/examples/client-benchmark/CMakeLists.txt -@@ -3,6 +3,7 @@ if(POLICY CMP0079) - cmake_policy(SET CMP0079 NEW) - endif() - -+find_package(Threads) - if(WIN32) - add_executable(datachannel-client-benchmark main.cpp parse_cl.cpp parse_cl.h getopt.cpp getopt.h) - target_compile_definitions(datachannel-client-benchmark PUBLIC STATIC_GETOPT) -@@ -15,7 +16,7 @@ set_target_properties(datachannel-client-benchmark PROPERTIES - OUTPUT_NAME client-benchmark) - set_target_properties(datachannel-client-benchmark PROPERTIES - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.github.paullouisageneau.libdatachannel.examples.client.benchmark) --target_link_libraries(datachannel-client-benchmark datachannel nlohmann_json) -+target_link_libraries(datachannel-client-benchmark datachannel nlohmann_json Threads::Threads) - - if(WIN32) - add_custom_command(TARGET datachannel-client-benchmark POST_BUILD -diff --git a/examples/streamer/CMakeLists.txt b/examples/streamer/CMakeLists.txt -index cebec95..3e73160 100644 ---- a/examples/streamer/CMakeLists.txt -+++ b/examples/streamer/CMakeLists.txt -@@ -47,7 +47,8 @@ set_target_properties(streamer PROPERTIES - set_target_properties(streamer PROPERTIES - XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.github.paullouisageneau.libdatachannel.examples.streamer) - --target_link_libraries(streamer datachannel nlohmann_json) -+find_package(Threads) -+target_link_libraries(streamer datachannel nlohmann_json Threads::Threads) - - if(WIN32) - add_custom_command(TARGET streamer POST_BUILD diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index 96033b72334efd..c6158794255968 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -1,12 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libdatachannel - REF v0.14.3 - SHA512 21746d1a02aa8eb98a5c9716c12f14048a680f85efab8d8beca02379946bb49858c7ed02e7238f61e94d0aba6d70069136778d78484b88f8d09640c0740e24a3 + REF 267fdc190bcd276aacf45e4cd5ab8a51541161e8 #v0.15.1 + SHA512 333b1308b9f620326aa3b1af30aed8be2011c3a5a7d850e94476b8a14f696cef4cc815fda57e7a205cc264a077b7d1fa403ff1354364aae58651cdb0324c951b HEAD_REF master PATCHES 0001-fix-for-vcpkg.patch - 0002-fix-export-include.patch # Remove this patch in the next update ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -18,7 +17,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DUSE_SYSTEM_SRTP=ON @@ -28,11 +27,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libdatachannel) +vcpkg_cmake_config_fixup(PACKAGE_NAME LibDataChannel CONFIG_PATH lib/cmake/LibDataChannel) vcpkg_fixup_pkgconfig() -file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake" DATACHANNEL_CONFIG) -file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/libdatachannel-config.cmake" " +file(READ "${CURRENT_PACKAGES_DIR}/share/LibDataChannel/LibDataChannelConfig.cmake" DATACHANNEL_CONFIG) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/LibDataChannel/LibDataChannelConfig.cmake" " include(CMakeFindDependencyMacro) find_dependency(Threads) find_dependency(OpenSSL) @@ -41,4 +40,4 @@ ${DATACHANNEL_CONFIG}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index 4c34b761847ed8..cffe9b8a24d3ad 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdatachannel", - "version-semver": "0.14.3", - "port-version": 1, + "version-semver": "0.15.1", "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0b146f022be4c2..719b5257f704e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3281,8 +3281,8 @@ "port-version": 1 }, "libdatachannel": { - "baseline": "0.14.3", - "port-version": 1 + "baseline": "0.15.1", + "port-version": 0 }, "libdatrie": { "baseline": "0.2.10", diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index b351d9f3b31946..cb6963b987a981 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb99868eb60c37127a98ff943da771edb8002a29", + "version-semver": "0.15.1", + "port-version": 0 + }, { "git-tree": "4e6c861ece23dfcb6f777b4a63dd97592cd578db", "version-semver": "0.14.3", From 242f4cdf462d39dc1ca3b89596ada28b3bcc44be Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 04:50:26 +0200 Subject: [PATCH 0650/1858] [clue] Update to 1.0.0 (#20329) * Update clue to 1.0.0 * Update CI baseline * Address PR feedback * Update git-tree hash * Update ports/clue/portfile.cmake * Small changes for copyright Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 --- ports/clue/CMakeLists.txt | 6 +++--- ports/clue/portfile.cmake | 18 ++++++++---------- ports/clue/vcpkg.json | 9 +++++++-- versions/baseline.json | 4 ++-- versions/c-/clue.json | 5 +++++ 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/ports/clue/CMakeLists.txt b/ports/clue/CMakeLists.txt index 451d414b8097cf..da8afe69f8e43a 100644 --- a/ports/clue/CMakeLists.txt +++ b/ports/clue/CMakeLists.txt @@ -6,12 +6,12 @@ option(CLUE_BUILD_TEST "Build tests for clue" OFF) option(CLUE_BUILD_EXAMPLE "Build examples" OFF) include(GNUInstallDirs) -include_directories("${CMAKE_CURRENT_SOURCE_DIR}/clue.hpp") +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include/clue.hpp") if(CLUE_BUILD_TEST) file(GLOB TEST_SOURCES "tests/*.cpp") add_executable(test_clue ${TEST_SOURCES}) - target_include_directories(test_clue PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/tests) + target_include_directories(test_clue PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/tests") install(TARGETS test_clue RUNTIME DESTINATION tools) endif() @@ -21,5 +21,5 @@ if(CLUE_BUILD_EXAMPLE) install(FILES ${EXAMPLES} DESTINATION examples) endif() -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/clue.hpp DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/clue.hpp" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") # end of file \ No newline at end of file diff --git a/ports/clue/portfile.cmake b/ports/clue/portfile.cmake index 3b9715f9e98932..3be585eb6e70dd 100644 --- a/ports/clue/portfile.cmake +++ b/ports/clue/portfile.cmake @@ -1,28 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/clue - REF v1.0.0-alpha.7 - SHA512 4f0d1115dcf16412239e1ac158be210403f93596b76c91100ae81be3d4f4cb04dda525101850356a7195b219c826305a82cab7a96b1bc1e2cefaa7860a853e73 + REF v1.0.0 + SHA512 A142EDD57753DA36687803332E81BD9D4413203F69F0055466219437C3385C593384DA2A3C6BC67B39EC7ED0C36854354F34C2AA2D4CE4F1D2B912546F4F46B2 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES test CLUE_BUILD_TEST ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/clue/vcpkg.json b/ports/clue/vcpkg.json index 105741b0955ea8..bed4f2fe66ca80 100644 --- a/ports/clue/vcpkg.json +++ b/ports/clue/vcpkg.json @@ -1,9 +1,14 @@ { "name": "clue", - "version-string": "1.0.0-alpha.7", - "port-version": 1, + "version": "1.0.0", "description": "clue is a C++03 header-only library to log messages with a severity and optional module identifier.", "homepage": "https://github.com/martinmoene/clue", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "test": { "description": "Build test" diff --git a/versions/baseline.json b/versions/baseline.json index 719b5257f704e1..5936fbfa0153af 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1397,8 +1397,8 @@ "port-version": 1 }, "clue": { - "baseline": "1.0.0-alpha.7", - "port-version": 1 + "baseline": "1.0.0", + "port-version": 0 }, "cmark": { "baseline": "0.30.1", diff --git a/versions/c-/clue.json b/versions/c-/clue.json index def781117f8b9a..bb871c3205bd3d 100644 --- a/versions/c-/clue.json +++ b/versions/c-/clue.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b486e21df033265619432ec3718ae4db462fb76b", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "b58662a5b92d34be097810c33d6ec24400ae0b26", "version-string": "1.0.0-alpha.7", From c51ef52216e1b026abe697d45d6f0ab382b552ed Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:01:51 +0200 Subject: [PATCH 0651/1858] [uwebsockets] Update to 19.9.0 (#20331) * Update uwebsockets to 19.9.0 * Update CI baseline Co-authored-by: chausner --- ports/uwebsockets/portfile.cmake | 5 +++-- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 220a202073ec48..5b479c18e248d8 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF d40c2d1a3119e5855ddc187f6647d79fd2229e08 # v19.5.0 - SHA512 c99df55c1e557ba2ea035a4774988d76b0d5d239b42b5cccd267d7d0344aa84d5134efb960f46520f246d8bd7b2034f3626942e07a080e8493e9664dd2de5f49 + REF v19.9.0 + SHA512 A79C454AC37B279220C8B158434FD794512EECDE882C0FE3DC7047275B2FDF31E50B319A4D01B983C2C4EBCF3E1FD383D2D9AB977185326E6AE5B47685C0A048 HEAD_REF master ) @@ -10,3 +10,4 @@ file(COPY "${SOURCE_PATH}/src" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(RENAME "${CURRENT_PACKAGES_DIR}/include/src" "${CURRENT_PACKAGES_DIR}/include/uwebsockets") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index e886f53a1a9337..ef83022c5de792 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version": "19.5.0", + "version": "19.9.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5936fbfa0153af..caf94b8033a172 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6801,7 +6801,7 @@ "port-version": 1 }, "uwebsockets": { - "baseline": "19.5.0", + "baseline": "19.9.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 8b5f54baab4a34..52dbfa79ac1a9e 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a4914dce094328bc8cf2040025268c96f10fc30", + "version": "19.9.0", + "port-version": 0 + }, { "git-tree": "2f80ce22f9718454ab35607c0a65138b65c06fe7", "version": "19.5.0", From e2339a1fda55d7b4cdb21e0898bdd352761216f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 27 Sep 2021 20:03:20 -0700 Subject: [PATCH 0652/1858] [rsm-binary-io] Add new port (#20334) * add rsm-binary-io port * add versioning * add rsm-binary-io x64-linux to ci baseline * convert indentation to spaces * update versioning --- ports/rsm-binary-io/portfile.cmake | 31 ++++++++++++++++++++++++++++++ ports/rsm-binary-io/vcpkg.json | 18 +++++++++++++++++ scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 4 ++++ versions/r-/rsm-binary-io.json | 9 +++++++++ 5 files changed, 64 insertions(+) create mode 100644 ports/rsm-binary-io/portfile.cmake create mode 100644 ports/rsm-binary-io/vcpkg.json create mode 100644 versions/r-/rsm-binary-io.json diff --git a/ports/rsm-binary-io/portfile.cmake b/ports/rsm-binary-io/portfile.cmake new file mode 100644 index 00000000000000..a8210e426796e3 --- /dev/null +++ b/ports/rsm-binary-io/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_fail_port_install(ON_TARGET "OSX" "UWP") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ryan-rsm-McKenzie/binary_io + REF 2.0.2 + SHA512 4b7e725d9143d37481b4a7e4e101c88c3b73628dd2882fa23ef10a602f8a6ca79de111138237d4dd6fc09d1df863b91a949782961f5623fcac1e324b2e301121 + HEAD_REF main +) + +if(VCPKG_TARGET_IS_LINUX) + message(WARNING "Build ${PORT} requires at least gcc 10.") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME binary_io + CONFIG_PATH "lib/cmake/binary_io" +) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rsm-binary-io/vcpkg.json b/ports/rsm-binary-io/vcpkg.json new file mode 100644 index 00000000000000..3d76fc8d32c5c7 --- /dev/null +++ b/ports/rsm-binary-io/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "rsm-binary-io", + "version-semver": "2.0.2", + "description": "A binary i/o library for C++, without the agonizing pain", + "homepage": "https://github.com/Ryan-rsm-McKenzie/binary_io", + "documentation": "https://ryan-rsm-mckenzie.github.io/binary_io/", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fcea39c4182dd3..7de3b6423e4102 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1365,6 +1365,8 @@ rsasynccpp:arm-uwp=fail rsasynccpp:x64-linux=fail rsasynccpp:x64-osx=fail # Requires g++10 but CI compiler only has g++9 +rsm-binary-io:x64-linux=fail +# Requires g++10 but CI compiler only has g++9 rsm-bsa:x64-linux=fail rsocket:x64-windows=fail rsocket:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index caf94b8033a172..f313b716bfdaa6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5840,6 +5840,10 @@ "baseline": "0.0.7", "port-version": 0 }, + "rsm-binary-io": { + "baseline": "2.0.2", + "port-version": 0 + }, "rsm-bsa": { "baseline": "2.0.3", "port-version": 0 diff --git a/versions/r-/rsm-binary-io.json b/versions/r-/rsm-binary-io.json new file mode 100644 index 00000000000000..e0798008027a0a --- /dev/null +++ b/versions/r-/rsm-binary-io.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "33782ecb57f5016dbaa8b2a2cd3f66cf80437027", + "version-semver": "2.0.2", + "port-version": 0 + } + ] +} From 659bffa5b4cd2df338efd9eaaa7ffb1db6f14614 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 27 Sep 2021 20:03:44 -0700 Subject: [PATCH 0653/1858] [rsm-mmio] Add new port (#20336) * add port rsm-mmio * add versioning * convert indentation to spaces * update versioning --- ports/rsm-mmio/portfile.cmake | 24 ++++++++++++++++++++++++ ports/rsm-mmio/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/r-/rsm-mmio.json | 9 +++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/rsm-mmio/portfile.cmake create mode 100644 ports/rsm-mmio/vcpkg.json create mode 100644 versions/r-/rsm-mmio.json diff --git a/ports/rsm-mmio/portfile.cmake b/ports/rsm-mmio/portfile.cmake new file mode 100644 index 00000000000000..12cf6500028e20 --- /dev/null +++ b/ports/rsm-mmio/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_fail_port_install(ON_TARGET "OSX" "UWP") +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Ryan-rsm-McKenzie/mmio + REF 1.1.0 + SHA512 54c63c345d9e0a284d13078d525fcbe73d793462968121fee89a19c810cdac736aca9c81f4c8b4f5ea51db1c47ad0c55e7cea38772049e4939b0d6e280f9a332 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/mmio") + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rsm-mmio/vcpkg.json b/ports/rsm-mmio/vcpkg.json new file mode 100644 index 00000000000000..7115a226f2e8a4 --- /dev/null +++ b/ports/rsm-mmio/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "rsm-mmio", + "version-semver": "1.1.0", + "description": "A cross-platform memory-mapped io library for C++ ", + "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio", + "supports": "!osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f313b716bfdaa6..b53b9a48c21924 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5848,6 +5848,10 @@ "baseline": "2.0.3", "port-version": 0 }, + "rsm-mmio": { + "baseline": "1.1.0", + "port-version": 0 + }, "rsocket": { "baseline": "2020.05.04.00", "port-version": 2 diff --git a/versions/r-/rsm-mmio.json b/versions/r-/rsm-mmio.json new file mode 100644 index 00000000000000..981d24616c2096 --- /dev/null +++ b/versions/r-/rsm-mmio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8a7d738a20500733ea97af87e6f83df5558856c9", + "version-semver": "1.1.0", + "port-version": 0 + } + ] +} From fa16ebeec5714b07c3872e11ce627994f6f41f3b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:50:45 +0200 Subject: [PATCH 0654/1858] [sparsehash] Update to 2.0.4 (#20343) * Update sparsehash to 2.0.4 * Update CI baseline * update vcpkg.json * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/sparsehash/portfile.cmake | 5 ++--- ports/sparsehash/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sparsehash.json | 5 +++++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ports/sparsehash/portfile.cmake b/ports/sparsehash/portfile.cmake index a999e88412ef91..b23df02e6238e3 100644 --- a/ports/sparsehash/portfile.cmake +++ b/ports/sparsehash/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sparsehash/sparsehash - REF sparsehash-2.0.3 - SHA512 bb00d0acb8eba65f7da8015ea4f6bebf8bba36ed6777881960ee215f22b7be17b069c59838d210551ce67a34baccfc7b2fed603677ec53c0c32714d8e76f5d6c + REF sparsehash-2.0.4 + SHA512 40C007BC5814DD5F2BDACD5EC884BC5424F7126F182D4C7B34371F88B674456FC193B947FDD283DBD0C7EB044D8F06BAF8CAEC6C93E73B1B587282B9026EA877 HEAD_REF master - PATCHES 00001-windows-use-std.patch ) if(VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/sparsehash/vcpkg.json b/ports/sparsehash/vcpkg.json index 697aa7b6461fe2..f43d9bd41cdd7b 100644 --- a/ports/sparsehash/vcpkg.json +++ b/ports/sparsehash/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sparsehash", - "version-string": "2.0.3", - "port-version": 1, + "version": "2.0.4", "description": "The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.", "homepage": "https://github.com/sparsehash/sparsehash" } diff --git a/versions/baseline.json b/versions/baseline.json index b53b9a48c21924..a27eb2f707d505 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6213,8 +6213,8 @@ "port-version": 0 }, "sparsehash": { - "baseline": "2.0.3", - "port-version": 1 + "baseline": "2.0.4", + "port-version": 0 }, "sparsepp": { "baseline": "1.22", diff --git a/versions/s-/sparsehash.json b/versions/s-/sparsehash.json index 9610c04549798f..558dd9bf1853b8 100644 --- a/versions/s-/sparsehash.json +++ b/versions/s-/sparsehash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "833f95be52924049168376714c59fd022ef9568c", + "version": "2.0.4", + "port-version": 0 + }, { "git-tree": "e862d4c31bee927f18b012bb062e9d5282f77733", "version-string": "2.0.3", From 34c39f29754d7966e7d71dd84899a9073890f34a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Tue, 28 Sep 2021 06:51:35 +0300 Subject: [PATCH 0655/1858] [kf5xmlgui] fix loading resources when building statically (#20346) * [kf5xmlgui] fix loading resources when built statically * [kf5xmlgui] update versions --- ports/kf5xmlgui/fix_static_resources.diff | 26 +++++++++++++++++++++++ ports/kf5xmlgui/portfile.cmake | 1 + ports/kf5xmlgui/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/k-/kf5xmlgui.json | 5 +++++ 5 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 ports/kf5xmlgui/fix_static_resources.diff diff --git a/ports/kf5xmlgui/fix_static_resources.diff b/ports/kf5xmlgui/fix_static_resources.diff new file mode 100644 index 00000000000000..ae8bcfaad5ef48 --- /dev/null +++ b/ports/kf5xmlgui/fix_static_resources.diff @@ -0,0 +1,26 @@ +diff --git a/src/kxmlguiclient.cpp b/src/kxmlguiclient.cpp +index a830ad0fa6b962654a0d1ebb161761a3afafb479..b2c9d0d21dce5f5d9ae4941ae4a909dfa9531155 100644 +--- a/src/kxmlguiclient.cpp ++++ b/src/kxmlguiclient.cpp +@@ -70,6 +70,8 @@ KXMLGUIClient::KXMLGUIClient() + KXMLGUIClient::KXMLGUIClient(KXMLGUIClient *parent) + : d(new KXMLGUIClientPrivate) + { ++ Q_INIT_RESOURCE(kxmlgui); ++ + parent->insertChildClient(this); + } + +diff --git a/src/kxmlguifactory.cpp b/src/kxmlguifactory.cpp +index fc453cb2598dd36f8212cbccb3d4e777ffca4480..5c8dbda2b5700144e9aaf96f877615f874292640 100644 +--- a/src/kxmlguifactory.cpp ++++ b/src/kxmlguifactory.cpp +@@ -172,6 +172,8 @@ KXMLGUIFactory::KXMLGUIFactory(KXMLGUIBuilder *builder, QObject *parent) + : QObject(parent) + , d(new KXMLGUIFactoryPrivate) + { ++ Q_INIT_RESOURCE(kxmlgui); ++ + d->builder = builder; + d->guiClient = nullptr; + if (d->builder) { diff --git a/ports/kf5xmlgui/portfile.cmake b/ports/kf5xmlgui/portfile.cmake index 57f519f11f8b61..707d93ea80135f 100644 --- a/ports/kf5xmlgui/portfile.cmake +++ b/ports/kf5xmlgui/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES remove_explicit_shared_argument.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/d12e8f6266188ce7e221dc014a56071b8a5ef706 add_support_for_static_builds.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/2f1b948ad690942d4ec208c5676c11218f29181a + fix_static_resources.diff # https://invent.kde.org/frameworks/kxmlgui/-/merge_requests/77 ) vcpkg_check_features( diff --git a/ports/kf5xmlgui/vcpkg.json b/ports/kf5xmlgui/vcpkg.json index 3c57d2955c0041..85ccdcae09ae56 100644 --- a/ports/kf5xmlgui/vcpkg.json +++ b/ports/kf5xmlgui/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5xmlgui", "version": "5.84.0", + "port-version": 1, "description": "Framework for managing menu and toolbar actions", "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a27eb2f707d505..7a5fa610bba909 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3086,7 +3086,7 @@ }, "kf5xmlgui": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kfr": { "baseline": "4.2.1", diff --git a/versions/k-/kf5xmlgui.json b/versions/k-/kf5xmlgui.json index a8c8191448e329..2d454fa8395716 100644 --- a/versions/k-/kf5xmlgui.json +++ b/versions/k-/kf5xmlgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4fa462d8e9f3592a9ded89bb25ea21de65932112", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "5cecdc03d8c8a9d399ef6aae83e26a9cd32d2f28", "version": "5.84.0", From 9007a485b50b8c3abfac45d779f976f94851cb9b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:51:56 +0200 Subject: [PATCH 0656/1858] [z3] Update to 4.8.12 (#20348) * Update z3 to 4.8.12 * Update CI baseline * Change version-semver to version * Update git-tree hash * Update z3.json Co-authored-by: chausner --- ports/z3/portfile.cmake | 4 ++-- ports/z3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/z3.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index 34c2429b6c40a7..aab0d9b88492eb 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -7,8 +7,8 @@ vcpkg_add_to_path("${PYTHON2_DIR}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Z3Prover/z3 - REF 517d907567f4283ad8b48ff9c2a3f6dce838569e # z3-4.8.10 - SHA512 5102f8c5fb988e93c586fa288267e4803d31a9cd0e2dbc7ce836a33b297cdbc9f3428933d0304ef4cef86812c7b9a6d000094cc13b3ed23ab0712dcc3d4677a8 + REF z3-4.8.12 + SHA512 0B377923BDAFFACA1846AA2ABD61003BBECADFCDFC908ED3097D0AAC8F32028AC39D93FB4A9C2E2C2BFFFBDBEE80AA415875F17DE6C2EE2AE8E2B7921F788C6E HEAD_REF master PATCHES fix-install-path.patch ) diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 41101a650bc5a6..3020f60f725ced 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "z3", - "version-semver": "4.8.10", + "version": "4.8.12", "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 7a5fa610bba909..62997b82959a02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7149,7 +7149,7 @@ "port-version": 0 }, "z3": { - "baseline": "4.8.10", + "baseline": "4.8.12", "port-version": 0 }, "z85": { diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 8214ff2f6c5a00..1f82e94b62a301 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "898df3d611ad4a833593adbfd7f2a3b0e686fc2b", + "version": "4.8.12", + "port-version": 0 + }, { "git-tree": "9c0fdcbcb443a4d0e2b58a1b3b56424e8c2d384c", "version-semver": "4.8.10", From d1683b813c4b3015eb88fce10b55d509eb32d7d7 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:52:24 +0200 Subject: [PATCH 0657/1858] [re2] Update to 2021-09-01 (#20349) * Update re2 to 2021-09-01 * Update CI baseline * update vcpkg.json * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/re2/portfile.cmake | 5 +++-- ports/re2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/re2.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 7d646cd287bc31..b6fef0f6c5e593 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF 2020-10-01 - SHA512 cd620878ffa6d4e47f1583f27a179f6520fc1226554bd7c0e104d3d45b2bee70873c0d661e87eb4a9d912b58f86f115766c35d08e124f5f67ddcc3b50535f726 + REF 2021-09-01 + SHA512 D0E13CE3E345EDF7A3927756269EF8670240E364E75AF2386CD03870FEA14D8C957DB46CA6BF7000077ACB1EF4244D8F3F77B654FE0D297D11C5100F3A380C5F HEAD_REF master ) @@ -20,3 +20,4 @@ vcpkg_copy_pdbs() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/re2 RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + diff --git a/ports/re2/vcpkg.json b/ports/re2/vcpkg.json index 9e8765d197916c..a55d0392ca51c1 100644 --- a/ports/re2/vcpkg.json +++ b/ports/re2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "re2", - "version-string": "2020-10-01", - "port-version": 1, + "version-date": "2021-09-01", "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.", "homepage": "https://github.com/google/re2" } diff --git a/versions/baseline.json b/versions/baseline.json index 62997b82959a02..eba38a3d677a16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5721,8 +5721,8 @@ "port-version": 1 }, "re2": { - "baseline": "2020-10-01", - "port-version": 1 + "baseline": "2021-09-01", + "port-version": 0 }, "readerwriterqueue": { "baseline": "1.0.5", diff --git a/versions/r-/re2.json b/versions/r-/re2.json index c8e43554ef3e82..2617f99f162b3b 100644 --- a/versions/r-/re2.json +++ b/versions/r-/re2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2062d8577ace1dbccbb4b2a317f0e68571f0e2e", + "version-date": "2021-09-01", + "port-version": 0 + }, { "git-tree": "6cd6db642e5e56f83c6098da5d954a511b5b8f17", "version-string": "2020-10-01", From d64f2628e8d1be4c23db88ead45f5fe56fe24c0d Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:52:58 +0200 Subject: [PATCH 0658/1858] [snappy] Update to 1.1.9 (#20350) * Update snappy to 1.1.9 * Update CI baseline * udpate vcpkg.json * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/snappy/portfile.cmake | 5 +++-- ports/snappy/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/snappy.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake index 75dd133027dfb5..07bef5ee18c0fe 100644 --- a/ports/snappy/portfile.cmake +++ b/ports/snappy/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/snappy - REF 537f4ad6240e586970fe554614542e9717df7902 # 1.1.8 - SHA512 555d3b69a6759592736cbaae8f41654f0cf14e8be693b5dde37640191e53daec189f895872557b173e905d10681ef502f3e6ed8566811add963ffef96ce4016d + REF 1.1.9 + SHA512 F1F8A90F5F7F23310423574B1D8C9ACB84C66EA620F3999D1060395205E5760883476837ABA02F0AA913AF60819E34C625D8308C18A5D7A9C4E190F35968B024 HEAD_REF master ) @@ -11,6 +11,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DSNAPPY_BUILD_TESTS=OFF + -DSNAPPY_BUILD_BENCHMARKS=OFF -DCMAKE_DEBUG_POSTFIX=d) vcpkg_install_cmake() diff --git a/ports/snappy/vcpkg.json b/ports/snappy/vcpkg.json index df302a6d6c604f..f67defb6683791 100644 --- a/ports/snappy/vcpkg.json +++ b/ports/snappy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "snappy", - "version-string": "1.1.8", - "port-version": 1, + "version": "1.1.9", "description": "A fast compressor/decompressor.", "homepage": "https://github.com/google/snappy" } diff --git a/versions/baseline.json b/versions/baseline.json index eba38a3d677a16..a815078e4a0d4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6129,8 +6129,8 @@ "port-version": 7 }, "snappy": { - "baseline": "1.1.8", - "port-version": 1 + "baseline": "1.1.9", + "port-version": 0 }, "sndfile": { "baseline": "0", diff --git a/versions/s-/snappy.json b/versions/s-/snappy.json index 121944067d6c1a..e0fac7ee6f15b2 100644 --- a/versions/s-/snappy.json +++ b/versions/s-/snappy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca2180e16528c28e8afe86ce0d7cf0e8a053f273", + "version": "1.1.9", + "port-version": 0 + }, { "git-tree": "c1afd7c780a1ca8befbc3fbde0262d073afeee35", "version-string": "1.1.8", From 299095cb134e77a687e4cf939474b533584f213f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 05:53:48 +0200 Subject: [PATCH 0659/1858] [draco] Update to 1.4.1 (#20352) * Update draco to 1.4.1 * Update CI baseline * add vcpkg_fixup_pkgconfig function * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/draco/fix-build-error-in-gcc11.patch | 28 ---------------------- ports/draco/fix-compile-error-uwp.patch | 14 +++++------ ports/draco/portfile.cmake | 12 ++++------ ports/draco/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/d-/draco.json | 5 ++++ 6 files changed, 19 insertions(+), 47 deletions(-) delete mode 100644 ports/draco/fix-build-error-in-gcc11.patch diff --git a/ports/draco/fix-build-error-in-gcc11.patch b/ports/draco/fix-build-error-in-gcc11.patch deleted file mode 100644 index 94f24ff6dcf68b..00000000000000 --- a/ports/draco/fix-build-error-in-gcc11.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/draco/core/hash_utils.h b/src/draco/core/hash_utils.h -index dd910d0..aa61523 100644 ---- a/src/draco/core/hash_utils.h -+++ b/src/draco/core/hash_utils.h -@@ -17,10 +17,9 @@ - - #include - -+#include - #include - --// TODO(fgalligan): Move this to core. -- - namespace draco { - - template -diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc -index 3c302b9..adca2ac 100644 ---- a/src/draco/io/parser_utils.cc -+++ b/src/draco/io/parser_utils.cc -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - namespace draco { - namespace parser { diff --git a/ports/draco/fix-compile-error-uwp.patch b/ports/draco/fix-compile-error-uwp.patch index b098fd715542d2..63f672d816f7fc 100644 --- a/ports/draco/fix-compile-error-uwp.patch +++ b/ports/draco/fix-compile-error-uwp.patch @@ -2,7 +2,7 @@ diff --git a/src/draco/io/parser_utils.cc b/src/draco/io/parser_utils.cc index 6e42a58..3c302b9 100644 --- a/src/draco/io/parser_utils.cc +++ b/src/draco/io/parser_utils.cc -@@ -160,7 +160,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { +@@ -152,7 +152,9 @@ bool ParseSignedInt(DecoderBuffer *buffer, int32_t *value) { if (!ParseUnsignedInt(buffer, &v)) { return false; } @@ -17,14 +17,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e79da7..c4d9880 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -153,6 +153,10 @@ if(ENABLE_EXTRA_SPEED) - endif() - endif() +@@ -70,6 +70,10 @@ draco_set_build_definitions() + draco_set_cxx_flags() + draco_generate_features_h() +if (MSVC) + add_compile_options(/wd4996) +endif() + - # Generate a version file containing repository info. - include(FindGit) - find_package(Git) + # Draco source file listing variables. + list(APPEND draco_attributes_sources + "${draco_src_root}/attributes/attribute_octahedron_transform.cc" diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index 2d2f7eee1a5022..201f73cca604b4 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,13 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 83b0922745981a35be16e2907bdbb749ebf2bf43 # 1.3.6 - SHA512 29b270d749c5c0efcf791aaae7e33e2ae4404103ad8849d73aaca71492a3780d2fcaec01ec225da886bce2ab20ec14b8cf2d9e0976810cdaee557f97b3b0d9b8 + REF 1.4.1 + SHA512 55B8AF74552987220FB23580F6B167E4610A1341BC36117B6D235C05E126A79981F93787ACB90210127DC779B3134A1D9CC8D6697B1286459F233BF660B890BC HEAD_REF master PATCHES fix-compile-error-uwp.patch fix-uwperror.patch - fix-build-error-in-gcc11.patch # Remove this patch in next release ) vcpkg_configure_cmake( @@ -19,8 +18,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/draco/cmake) - +vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake) +vcpkg_fixup_pkgconfig() # Install tools and plugins file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe") if(TOOLS) @@ -29,10 +28,7 @@ if(TOOLS) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/draco) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/draco) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 68a63f721269ab..171493214eaf37 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,7 +1,6 @@ { "name": "draco", - "version": "1.3.6", - "port-version": 2, + "version": "1.4.1", "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.", "homepage": "https://github.com/google/draco" } diff --git a/versions/baseline.json b/versions/baseline.json index a815078e4a0d4a..38f12cf855f874 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1861,8 +1861,8 @@ "port-version": 1 }, "draco": { - "baseline": "1.3.6", - "port-version": 2 + "baseline": "1.4.1", + "port-version": 0 }, "drlibs": { "baseline": "2019-08-12", diff --git a/versions/d-/draco.json b/versions/d-/draco.json index 2367a5473c4636..2ac33f2df023e4 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3289b6aa2981d3fb169f35ca384608b514210401", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "d306b49fab537cd9980ce5de0c994372a1300777", "version": "1.3.6", From 916e83d1e8d7cd80546c67c35eda11d11c8b1358 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:57:22 +0800 Subject: [PATCH 0660/1858] [vtk] fix usage and add the usage file (#20356) * [vtk] fix usage and add the usage file * version stuff * typo * version * Change qt5-base as a host port * version * Revert 433fe479010215756d26448e345bd874134a9324, push in wrong branch * Replace deprecate functions * version --- ports/vtk/portfile.cmake | 14 ++++++++++---- ports/vtk/usage | 5 +++++ ports/vtk/vcpkg.json | 10 +++++++++- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 +++++ 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 ports/vtk/usage diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index b9af50ad87860d..adfb0f3a0bf09d 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -164,9 +164,8 @@ file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake # Configure & Install # We set all libraries to "system" and explicitly list the ones that should use embedded copies -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DVTK_BUILD_TESTING=OFF @@ -185,12 +184,12 @@ vcpkg_configure_cmake( ${ADDITIONAL_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # ============================================================================= # Fixup target files -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtk-9.0) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vtk-9.0) # ============================================================================= # Clean-up other directories @@ -306,6 +305,13 @@ else() endif() endforeach() +# Use vcpkg provided find method +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindEXPAT.cmake") + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/licenses" "${CURRENT_PACKAGES_DIR}/share/${PORT}/licenses") + # ============================================================================= +# Usage +configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) # Handle copyright file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/vtk/usage b/ports/vtk/usage new file mode 100644 index 00000000000000..bba2f639079441 --- /dev/null +++ b/ports/vtk/usage @@ -0,0 +1,5 @@ +The package vtk provides CMake targets: + + find_package(VTK REQUIRED) + include("${VTK_USE_FILE}") + target_link_libraries(main PRIVATE ${VTK_LIBRARIES}) diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index a22785db36c0dd..2437c229223187 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 1, + "port-version": 2, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "dependencies": [ @@ -35,6 +35,14 @@ "sqlite3", "tiff", "utfcpp", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 38f12cf855f874..9d985fe91b0d0d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6886,7 +6886,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 1 + "port-version": 2 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 5b674191725d7a..6022f3fefc12ae 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e50a05b2ff0cc2f4df601ddb146c75a2f266a6a", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 2 + }, { "git-tree": "413d7fcbff9b50e57e486d1249c841a5e25c0def", "version-semver": "9.0.3-pv5.9.1", From 9fc1880074e8ba393ffd794a77c4a95ad84caf07 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 28 Sep 2021 11:58:41 +0800 Subject: [PATCH 0661/1858] [poissonrecon] Update to latest commit (#20357) --- ports/poissonrecon/CMakeLists.txt | 7 - ports/poissonrecon/disable-gcc5-checks.patch | 134 +++++++------------ ports/poissonrecon/portfile.cmake | 17 ++- ports/poissonrecon/vcpkg.json | 10 +- versions/baseline.json | 2 +- versions/p-/poissonrecon.json | 5 + 6 files changed, 70 insertions(+), 105 deletions(-) diff --git a/ports/poissonrecon/CMakeLists.txt b/ports/poissonrecon/CMakeLists.txt index d0b108e4c907c0..31fdb0dcbfb065 100644 --- a/ports/poissonrecon/CMakeLists.txt +++ b/ports/poissonrecon/CMakeLists.txt @@ -30,13 +30,9 @@ set(PoissonRecon_HEADERS "Src/Ply.h" "Src/PlyFile.h" "Src/PNG.h" -"Src/PointStream.h" -"Src/PointStreamData.h" "Src/Polynomial.h" "Src/PPolynomial.h" "Src/PreProcessor.h" -#"Src/Rasterizer.h" -#"Src/RegularGrid.h" "Src/RegularTree.h" "Src/SparseMatrix.h" "Src/SparseMatrixInterface.h" @@ -61,11 +57,8 @@ set(PoissonRecon_INLINES "Src/MAT.inl" "Src/PlyFile.inl" "Src/PNG.inl" -"Src/PointStream.inl" "Src/Polynomial.inl" "Src/PPolynomial.inl" -#"Src/Rasterizer.inl" -#"Src/RegularGrid.inl" "Src/RegularTree.inl" "Src/SparseMatrix.inl" "Src/SparseMatrixInterface.inl" diff --git a/ports/poissonrecon/disable-gcc5-checks.patch b/ports/poissonrecon/disable-gcc5-checks.patch index d147df944d86ed..c517b3e7912acc 100644 --- a/ports/poissonrecon/disable-gcc5-checks.patch +++ b/ports/poissonrecon/disable-gcc5-checks.patch @@ -1,87 +1,47 @@ -diff --git a/Src/FEMTree.System.inl b/Src/FEMTree.System.inl -index ae554d4..87f0423 100644 ---- a/Src/FEMTree.System.inl -+++ b/Src/FEMTree.System.inl -@@ -792,7 +792,7 @@ void FEMTree< Dim , Real >::_solveRegularMG( UIntPack< FEMSigs ... > , typename - } - } - --#if defined( __GNUC__ ) && __GNUC__ < 5 -+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 - #warning "you've got me gcc version<5" - template< unsigned int Dim , class Real > - template< unsigned int ... FEMSigs > -@@ -1679,7 +1679,7 @@ SparseMatrix< Real , matrix_index_type > FEMTree< Dim , Real >::systemMatrix( UI - typename FEMTreeNode::template ConstNeighbors< OverlapSizes > neighbors; - neighborKey.getNeighbors( OverlapRadii() , OverlapRadii() , _sNodes.treeNodes[i] , neighbors ); - --#if defined( __GNUC__ ) && __GNUC__ < 5 -+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 - #warning "you've got me gcc version<5" - matrix.setRowSize( ii , _getMatrixRowSize( UIntPack< FEMSigs ... >() , neighbors ) ); - #else // !__GNUC__ || __GNUC__ >=5 -diff --git a/Src/FEMTree.WeightedSamples.inl b/Src/FEMTree.WeightedSamples.inl -index b263dda..282387e 100644 ---- a/Src/FEMTree.WeightedSamples.inl -+++ b/Src/FEMTree.WeightedSamples.inl -@@ -225,7 +225,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc - - width = 1.0 / ( 1<<_localDepth( temp ) ); - _v = v * weight / Real( pow( width , dim ) ) * Real( dx ); --#if defined( __GNUC__ ) && __GNUC__ < 5 -+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 - #warning "you've got me gcc version<5" - _splatPointData< CreateNodes , ThreadSafe , V >( nodeAllocator , temp , position , _v , dataInfo , dataKey ); - #else // !__GNUC__ || __GNUC__ >=5 -@@ -238,7 +238,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc - width = 1.0 / ( 1<<_localDepth( temp ) ); - - _v = v * weight / Real( pow( width , dim ) ) * Real( dx ); --#if defined( __GNUC__ ) && __GNUC__ < 5 -+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 - #warning "you've got me gcc version<5" - _splatPointData< CreateNodes , ThreadSafe , V >( nodeAllocator , temp , position , _v , dataInfo , dataKey ); - #else // !__GNUC__ || __GNUC__ >=5 -diff --git a/Src/FEMTree.h b/Src/FEMTree.h -index 8aa3b41..0be77a1 100644 ---- a/Src/FEMTree.h -+++ b/Src/FEMTree.h -@@ -219,6 +219,7 @@ template< class Data , typename Pack > struct _SparseOrDenseNodeData{}; - template< class Data , unsigned int ... FEMSigs > - struct _SparseOrDenseNodeData< Data , UIntPack< FEMSigs ... > > - { -+ virtual ~_SparseOrDenseNodeData() {} - static const unsigned int Dim = sizeof ... ( FEMSigs ); - typedef UIntPack< FEMSigs ... > FEMSignatures; - typedef Data data_type; -@@ -1841,7 +1842,7 @@ protected: - - template< unsigned int ... FEMSigs > - int _getProlongedMatrixRowSize( const FEMTreeNode* node , const typename FEMTreeNode::template ConstNeighbors< UIntPack< BSplineOverlapSizes< FEMSignature< FEMSigs >::Degree >::OverlapSize ... > >& pNeighbors ) const; --#if defined( __GNUC__ ) && __GNUC__ < 5 -+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 - #warning "you've got me gcc version<5" - template< unsigned int ... FEMSigs > - int _getMatrixRowSize( UIntPack< FEMSigs ... > , const typename FEMTreeNode::template ConstNeighbors< UIntPack< BSplineOverlapSizes< FEMSignature< FEMSigs >::Degree >::OverlapSize ... > >& neighbors ) const; -diff --git a/Src/FEMTree.inl b/Src/FEMTree.inl -index e4c2310..f88316b 100644 ---- a/Src/FEMTree.inl -+++ b/Src/FEMTree.inl -@@ -374,7 +374,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setD - AddAtomic( weightSum , sample.weight ); - out *= sample.weight; - Allocator< FEMTreeNode > *nodeAllocator = nodeAllocators.size() ? nodeAllocators[ thread ] : NULL; --#if defined( __GNUC__ ) && __GNUC__ < 5 -+#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 - #warning "you've got me gcc version<5" - if( density ) AddAtomic( _pointWeightSum , _splatPointData< true , true , DensityDegree , OutData >( nodeAllocator , *density , p , out , dataField , densityKey , oneKey ? *( (DataKey*)&densityKey ) : dataKey , 0 , maxDepth , Dim , depthBias ) * sample.weight ); - #else // !__GNUC__ || __GNUC__ >=5 -@@ -383,7 +383,7 @@ - else - { - Real width = (Real)( 1.0 / ( 1<( nodeAllocator , _leaf< true >( nodeAllocator , p , maxDepth ) , p , out / (Real)pow( width , Dim ) , dataField , oneKey ? *( (DataKey*)&densityKey ) : dataKey ); - #else // !__GNUC__ || __GNUC__ >=5 +diff --git a/Src/FEMTree.WeightedSamples.inl b/Src/FEMTree.WeightedSamples.inl +index 7b0d6b4..bb3ad0f 100644 +--- a/Src/FEMTree.WeightedSamples.inl ++++ b/Src/FEMTree.WeightedSamples.inl +@@ -362,7 +362,7 @@ Real FEMTree< Dim , Real >::_splatPointData( Allocator< FEMTreeNode > *nodeAlloc + // pow( width , -dim ): So that each sample is splatted with a unit volume + V _v = v * weight / Real( pow( width , dim ) ) * dx; + // V _v = v / Length(v) * dx; +-#if defined( __GNUC__ ) && __GNUC__ < 5 ++#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 + #ifdef SHOW_WARNINGS + #warning "you've got me gcc version<5" + #endif // SHOW_WARNINGS +diff --git a/Src/FEMTree.h b/Src/FEMTree.h +index 8f00045..2faa0f4 100644 +--- a/Src/FEMTree.h ++++ b/Src/FEMTree.h +@@ -231,6 +231,7 @@ template< class Data , typename Pack > struct _SparseOrDenseNodeData{}; + template< class Data , unsigned int ... FEMSigs > + struct _SparseOrDenseNodeData< Data , UIntPack< FEMSigs ... > > + { ++ virtual ~_SparseOrDenseNodeData() {} + static const unsigned int Dim = sizeof ... ( FEMSigs ); + typedef UIntPack< FEMSigs ... > FEMSignatures; + typedef Data data_type; +diff --git a/Src/FEMTree.inl b/Src/FEMTree.inl +index 814f1ae..405e996 100644 +--- a/Src/FEMTree.inl ++++ b/Src/FEMTree.inl +@@ -425,7 +425,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI + AddAtomic( weightSum , sample.weight ); + out *= sample.weight; + Allocator< FEMTreeNode > *nodeAllocator = nodeAllocators.size() ? nodeAllocators[ thread ] : NULL; +-#if defined( __GNUC__ ) && __GNUC__ < 5 ++#if defined( __GNUC__ ) && __GNUC__ < 5 && 0 + #ifdef SHOW_WARNINGS + #warning "you've got me gcc version<5" + #endif // SHOW_WARNINGS +@@ -436,7 +436,7 @@ SparseNodeData< OutData , UIntPack< DataSigs ... > > FEMTree< Dim , Real >::setI + else + { + Real width = (Real)( 1.0 / ( 1< Date: Tue, 28 Sep 2021 06:00:00 +0200 Subject: [PATCH 0662/1858] [rpclib] Update to 2.3.0 (#20358) * Update rpclib to 2.3.0 * Update CI baseline * Update ports/rpclib/portfile.cmake * Update versions/r-/rpclib.json Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/rpclib/portfile.cmake | 12 ++++++------ ports/rpclib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/rpclib.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/rpclib/portfile.cmake b/ports/rpclib/portfile.cmake index eb42ebeba1a8fc..053efc179bc9c4 100644 --- a/ports/rpclib/portfile.cmake +++ b/ports/rpclib/portfile.cmake @@ -3,23 +3,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rpclib/rpclib - REF v2.2.1 - SHA512 a63c6d09a411fb6b87d0df7c4f75a189f775ff0208f5f1c67333a85030a47efe60d5518e5939e98abc683a6063afb6cfed51f118f594a2a08be32330a9691051 + REF v2.3.0 + SHA512 9C65AE5D000CD66E39498667DC826A4E8A2C28EB4138CFFE3AA09D5DDC22575551B9FA6CE9D951343213B9583F947899CB18B58130AEAEE36DAB5881EA496272 HEAD_REF master ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE PREFER_NINJA ) vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/rpclib) +vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/rpclib") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rpclib/vcpkg.json b/ports/rpclib/vcpkg.json index 7ac73846db17e9..cff1b08e719ce0 100644 --- a/ports/rpclib/vcpkg.json +++ b/ports/rpclib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rpclib", - "version-string": "2.2.1", - "port-version": 3, + "version-semver": "2.3.0", "description": "a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.", "homepage": "https://github.com/rpclib/rpclib" } diff --git a/versions/baseline.json b/versions/baseline.json index 35e7f7a0108ae3..b177ccc98b683b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5825,8 +5825,8 @@ "port-version": 1 }, "rpclib": { - "baseline": "2.2.1", - "port-version": 3 + "baseline": "2.3.0", + "port-version": 0 }, "rply": { "baseline": "1.1.4", diff --git a/versions/r-/rpclib.json b/versions/r-/rpclib.json index ab7300a52be27d..a78ca9521f3215 100644 --- a/versions/r-/rpclib.json +++ b/versions/r-/rpclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8479e995436633dafc97a4dd951beff832bc3367", + "version-semver": "2.3.0", + "port-version": 0 + }, { "git-tree": "b93584cf646f04baeffb45e6a185f6711192c164", "version-string": "2.2.1", From e468e72b7dd0496178713d0ea0362c56a675d323 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:00:19 +0200 Subject: [PATCH 0663/1858] [libsrtp] Update to 2.4.2 (#20359) * Update libsrtp to 2.4.2 * Update CI baseline * More tweaks * Update git-tree hash Co-authored-by: chausner --- ports/libsrtp/portfile.cmake | 26 +++++++++++++------------- ports/libsrtp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libsrtp.json | 5 +++++ 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/ports/libsrtp/portfile.cmake b/ports/libsrtp/portfile.cmake index 88a13b88579f45..2a1b5bea6e23c7 100644 --- a/ports/libsrtp/portfile.cmake +++ b/ports/libsrtp/portfile.cmake @@ -1,31 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cisco/libsrtp - REF 56a065555aea2abddaf9fb60353fe59f277837a3 - SHA512 59afa25df79f875d28eefe95ef89b5956b1d2f319bba38ec34b832c2faa16b5425aae2f6ad19cf478afe02b28f4032b5dcf20a301d647d897d4577f66ca77376 + REF v2.4.2 + SHA512 6E4805E6D34B2050A6F68F629B0B42356B1D27F2CBAA6CC6166E56957609C3D9AA6B723DCC674E5C74180D122D27BADD2F9496639CCB1E0C210B9E1F7949D0E2 ) if (VCPKG_TARGET_IS_WINDOWS) - set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4703") - set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS /wd4703") + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /wd4703") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /wd4703") endif() vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/srtp2.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/srtp2.dll ${CURRENT_PACKAGES_DIR}/bin/srtp2.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/srtp2.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/srtp2.dll" "${CURRENT_PACKAGES_DIR}/bin/srtp2.dll") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll ${CURRENT_PACKAGES_DIR}/debug/bin/srtp2.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/srtp2.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/srtp2.dll") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsrtp RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libsrtp" RENAME copyright) diff --git a/ports/libsrtp/vcpkg.json b/ports/libsrtp/vcpkg.json index fd0d3db3d2a7fd..234d7faf1bfd55 100644 --- a/ports/libsrtp/vcpkg.json +++ b/ports/libsrtp/vcpkg.json @@ -1,6 +1,5 @@ { "name": "libsrtp", - "version-string": "2.2.0", - "port-version": 1, + "version": "2.4.2", "description": "This package provides an implementation of the Secure Real-time Transport Protocol (SRTP), the Universal Security Transform (UST), and a supporting cryptographic kernel." } diff --git a/versions/baseline.json b/versions/baseline.json index b177ccc98b683b..2528e86d432ade 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3797,8 +3797,8 @@ "port-version": 1 }, "libsrtp": { - "baseline": "2.2.0", - "port-version": 1 + "baseline": "2.4.2", + "port-version": 0 }, "libssh": { "baseline": "0.9.6", diff --git a/versions/l-/libsrtp.json b/versions/l-/libsrtp.json index 4eab78d14805e6..eafc5bb2b67f59 100644 --- a/versions/l-/libsrtp.json +++ b/versions/l-/libsrtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20d89602c93b0aa1df176a8610b514b014375c8c", + "version": "2.4.2", + "port-version": 0 + }, { "git-tree": "fdf039be54c0a11434b8c923e808d6315b398082", "version-string": "2.2.0", From f597b860a7dea48fbc677279f768b12791e6e7cf Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:01:08 +0200 Subject: [PATCH 0664/1858] [sfsexp] Update to 1.3.1 (#20361) * Update sfsexp to 1.3.1 * Update CI baseline Co-authored-by: chausner --- ports/sfsexp/portfile.cmake | 12 ++++++------ ports/sfsexp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sfsexp.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/sfsexp/portfile.cmake b/ports/sfsexp/portfile.cmake index 6bc6f2c9dc28f3..7b266ce08a5978 100644 --- a/ports/sfsexp/portfile.cmake +++ b/ports/sfsexp/portfile.cmake @@ -5,19 +5,19 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mjsottile/sfsexp - REF ad589f9e6e0eca20345320e9c82a3aecc0a5c8aa #v1.3 - SHA512 cdd469e23de48a5d6cd633b7b97b394cbfcba330ac2c3ae549811d856f2eec0c8558f99313e56a9f1cc9d72d4f17077584b6cf15c87814b91fe44ddd76895a8c + REF v1.3.1 + SHA512 56DABC8F0C16C4707F191C8D60E97C6C3DB1B359673E77967E3C21ACBDC2239F1423FE62A062CE256F3F7A1CCF8572D16A82EF67FFCD215B48E261ED1D8720D7 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA ) vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/sfsexp/vcpkg.json b/ports/sfsexp/vcpkg.json index d47366b4fd5cca..cb2134fff65607 100644 --- a/ports/sfsexp/vcpkg.json +++ b/ports/sfsexp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sfsexp", - "version-string": "1.3", - "port-version": 1, + "version": "1.3.1", "description": "Small Fast S-Expression Library", "homepage": "https://github.com/mjsottile/sfsexp" } diff --git a/versions/baseline.json b/versions/baseline.json index 2528e86d432ade..ad8484744284dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6041,8 +6041,8 @@ "port-version": 10 }, "sfsexp": { - "baseline": "1.3", - "port-version": 1 + "baseline": "1.3.1", + "port-version": 0 }, "shaderc": { "baseline": "2021.1", diff --git a/versions/s-/sfsexp.json b/versions/s-/sfsexp.json index 6396ea419d02d1..8cec388628dc6d 100644 --- a/versions/s-/sfsexp.json +++ b/versions/s-/sfsexp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca4335a5797bd0b2510b0fa53b9c3445d6a02a30", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "e5ca6aca4e64e303a37342534f85a1790ec3991e", "version-string": "1.3", From f894f05ac788248f0af8ca99d40e922a0d9e7070 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:01:49 +0200 Subject: [PATCH 0665/1858] [platform-folders] Update to 4.1.0 (#20362) * Update platform-folders to 4.1.0 * Update CI baseline * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update git-tree hash Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/platform-folders/portfile.cmake | 24 ++++++++++++------------ ports/platform-folders/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/p-/platform-folders.json | 5 +++++ 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/ports/platform-folders/portfile.cmake b/ports/platform-folders/portfile.cmake index 6b2344db639f1b..f7832767d7b097 100644 --- a/ports/platform-folders/portfile.cmake +++ b/ports/platform-folders/portfile.cmake @@ -1,36 +1,36 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(TARGET_BUILD_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) +set(TARGET_BUILD_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sago007/PlatformFolders - REF 4.0.0 - SHA512 89bd9b971cff55ddb051ffcf2e1bbf1678ec14c601916d65ebd4d8e46a79cf93f12cbe9c13ebd0417808f35d7031d13274cda78f009a26fbd19d71e13a5e5ac6 + REF 4.1.0 + SHA512 B2C7983399D9EAA8EF95F45E51B7B70626466FC14A0E53C8B497E683D63E40683CC995C75FC9529C7E969BB802CF9C92051B663901326985722AEBF7618C48EB HEAD_REF master ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - -DBUILD_TESTING=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${TARGET_BUILD_PATH}-rel/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) - file(INSTALL ${TARGET_BUILD_PATH}-dbg/platform_folders.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${TARGET_BUILD_PATH}-rel/platform_folders.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/") + file(INSTALL "${TARGET_BUILD_PATH}-dbg/platform_folders.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/") endif() -if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW") +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_MinGW) vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/platform_folders) else() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ TARGET_PATH /share/) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/platform-folders RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/platform-folders/vcpkg.json b/ports/platform-folders/vcpkg.json index e0f57ccac5af8e..48230b0469e2f6 100644 --- a/ports/platform-folders/vcpkg.json +++ b/ports/platform-folders/vcpkg.json @@ -1,6 +1,6 @@ { "name": "platform-folders", - "version-string": "4.0.0", - "port-version": 7, - "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"" + "version": "4.1.0", + "description": "A C++ library to look for special directories like \"My Documents\" and \"%APPDATA%\"", + "homepage": "https://github.com/sago007/PlatformFolders" } diff --git a/versions/baseline.json b/versions/baseline.json index ad8484744284dd..3b3b0670f77e7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5121,8 +5121,8 @@ "port-version": 0 }, "platform-folders": { - "baseline": "4.0.0", - "port-version": 7 + "baseline": "4.1.0", + "port-version": 0 }, "plf-colony": { "baseline": "6.28", diff --git a/versions/p-/platform-folders.json b/versions/p-/platform-folders.json index 54763549ee2e89..d2de2cafd226b0 100644 --- a/versions/p-/platform-folders.json +++ b/versions/p-/platform-folders.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bb2bb2c54727cd2fa9b97a09313b1589e8f4e03", + "version": "4.1.0", + "port-version": 0 + }, { "git-tree": "86a7b50a14bdd41de268fedb24601eeb94661ebb", "version-string": "4.0.0", From 6e090a6e3ac5ccf1f135d9c26b98bc3c852d57f0 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:02:22 +0200 Subject: [PATCH 0666/1858] [ring-span-lite] Update to 0.6.0 (#20363) * Update ring-span-lite to 0.6.0 * Update CI baseline * Update ports/ring-span-lite/portfile.cmake * Update versions/r-/ring-span-lite.json Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/ring-span-lite/portfile.cmake | 14 +++++++------- ports/ring-span-lite/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/r-/ring-span-lite.json | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ports/ring-span-lite/portfile.cmake b/ports/ring-span-lite/portfile.cmake index a96a8af17fdc5f..ce1e7b0b8e8c98 100644 --- a/ports/ring-span-lite/portfile.cmake +++ b/ports/ring-span-lite/portfile.cmake @@ -1,12 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/ring-span-lite - REF v0.3.0 - SHA512 5ecbfc63b4a09cc382edc2acae41a45946c9c6a18aa48e855201366b7696df7cbf46c2de1b5aa5296ae2dde4360d5abd8efdc3e3a1c3d427fbbddadab7dcfe79 + REF v0.6.0 + SHA512 1C3C9560BC1F8CBDF9CDFD5593233020D8403CE707D8B129FED82080CB806E82E83CBB839BEA64D53B022A58400F817A54FFB30099A0D7D7B300E8D0103F483B ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DRING_SPAN_LITE_OPT_BUILD_TESTS=OFF @@ -16,14 +16,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} + CONFIG_PATH "lib/cmake/${PORT}" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/ring-span-lite/vcpkg.json b/ports/ring-span-lite/vcpkg.json index 06121f35198126..9907d29b4f9767 100644 --- a/ports/ring-span-lite/vcpkg.json +++ b/ports/ring-span-lite/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ring-span-lite", - "version-string": "0.3.0", - "port-version": 1, - "description": "A C++yy-like ring_span type for C++98, C++11 and later in a single-file header-only library" + "version": "0.6.0", + "description": "A C++yy-like ring_span type for C++98, C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/ring-span-lite" } diff --git a/versions/baseline.json b/versions/baseline.json index 3b3b0670f77e7b..95fdfb531d9672 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5801,8 +5801,8 @@ "port-version": 1 }, "ring-span-lite": { - "baseline": "0.3.0", - "port-version": 1 + "baseline": "0.6.0", + "port-version": 0 }, "rmlui": { "baseline": "4.2", diff --git a/versions/r-/ring-span-lite.json b/versions/r-/ring-span-lite.json index 8331b1f1378f05..8da793052c543e 100644 --- a/versions/r-/ring-span-lite.json +++ b/versions/r-/ring-span-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1357f573addef91177f5912c9855cf3cfbc2b265", + "version": "0.6.0", + "port-version": 0 + }, { "git-tree": "aac3ae1d9cfcd716c2faf213aa7ed81b6271ab82", "version-string": "0.3.0", From 335f6594f340379834184748e2700922da3417e2 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:03:06 +0200 Subject: [PATCH 0667/1858] [wavpack] Update to 5.4.0 (#20370) * Update wavpack to 5.4.0 * Update CI baseline * Add back OpenSSL patch * Update git-tree hash Co-authored-by: chausner --- ports/wavpack/portfile.cmake | 8 ++++---- ports/wavpack/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/wavpack.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/wavpack/portfile.cmake b/ports/wavpack/portfile.cmake index 13d35a8f2f2457..aa7300aa5b867b 100644 --- a/ports/wavpack/portfile.cmake +++ b/ports/wavpack/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dbry/WavPack - REF 350b6d7737383029573ea2cce9bd94f1b6756bbd # 5.3.0 - SHA512 42116b41b8df179193822d25ea34d2c1d9a2af3598f7d25c6665d31aca11a3a11984cdb17b05e5d0874c94562e1b471736f6a1ae67bd3a22d018cd142676634c + REF 5.4.0 + SHA512 4DD6C484032FDFB1BC0E9A95881677FADE39A5E07CB98713A6B29DF0E9A570D6D27856FCAF412A714A5D7708C9CC2ADACE03A06970B06C4C5B2987E7EB2E643D HEAD_REF master PATCHES OpenSSL.patch @@ -33,9 +33,9 @@ endif() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) if(WIN32 AND (NOT MINGW)) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") diff --git a/ports/wavpack/vcpkg.json b/ports/wavpack/vcpkg.json index 6812cdcd5b4cf9..bf488fb5431be4 100644 --- a/ports/wavpack/vcpkg.json +++ b/ports/wavpack/vcpkg.json @@ -1,7 +1,6 @@ { "name": "wavpack", - "version-string": "5.3.0", - "port-version": 2, + "version": "5.4.0", "description": "WavPack encode/decode library, command-line programs, and several plugins", "homepage": "https://github.com/dbry/WavPack", "supports": "!(arm | arm64)" diff --git a/versions/baseline.json b/versions/baseline.json index 95fdfb531d9672..f63fadb356a906 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6929,8 +6929,8 @@ "port-version": 0 }, "wavpack": { - "baseline": "5.3.0", - "port-version": 2 + "baseline": "5.4.0", + "port-version": 0 }, "websocketpp": { "baseline": "0.8.2", diff --git a/versions/w-/wavpack.json b/versions/w-/wavpack.json index 5e8143ef47601f..89722b850f63bc 100644 --- a/versions/w-/wavpack.json +++ b/versions/w-/wavpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba245d1ac0cf8e5024feca18df32365ceed6a402", + "version": "5.4.0", + "port-version": 0 + }, { "git-tree": "e5a933ff5c3c9d43e3bf43beb816b458be6025d3", "version-string": "5.3.0", From 9f64954685229898bbfaa9d4fc70bd96805d26aa Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:03:25 +0200 Subject: [PATCH 0668/1858] [easyhook] Update to 2.7.7097.0 (#20371) * Update easyhook to 2.7.7097.0 * Update CI baseline Co-authored-by: chausner --- ports/easyhook/portfile.cmake | 4 ++-- ports/easyhook/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/e-/easyhook.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index 983c4a5099b251..378c2d5d04736f 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -5,8 +5,8 @@ message(WARNING ".Net framework 4.0 is required, please install it before instal vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO EasyHook/EasyHook - REF v2.7.6789.0 - SHA512 a48b4fe6dd2e55a2d515bc917c0f3ff5b73f08d1778e671df802347c3b8e1d4638005582a494acdf891ffe3fa6eae3eab0096083a8af2352e3f0883eb83421d6 + REF v2.7.7097.0 + SHA512 D0CA5B64E77F6281B2DD7EE0DC492A9B07DDB60A9F514037938CC3E3FFA5DD57C95CB630E18C02C984A89070839E4188044896D4EE57A21E43E6EA3A4918255A HEAD_REF master PATCHES fix-build.patch ) diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json index bac2a88d414412..3a9e6c00cd9265 100644 --- a/ports/easyhook/vcpkg.json +++ b/ports/easyhook/vcpkg.json @@ -1,7 +1,6 @@ { "name": "easyhook", - "version": "2.7.6789.0", - "port-version": 1, + "version": "2.7.7097.0", "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", "supports": "windows & !(static | arm | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index f63fadb356a906..29515f8ab38cd5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1913,8 +1913,8 @@ "port-version": 1 }, "easyhook": { - "baseline": "2.7.6789.0", - "port-version": 1 + "baseline": "2.7.7097.0", + "port-version": 0 }, "easyloggingpp": { "baseline": "9.96.7", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index 70e323a8570bdf..0e249a7e076bee 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "efa456841ef4446343c908f3ed36217b7a1d75a3", + "version": "2.7.7097.0", + "port-version": 0 + }, { "git-tree": "e427f42cec56130de81333fda405afabc88c9e82", "version": "2.7.6789.0", From c8e84d1dc09d624aaa088e552da5b7bbd254f2ac Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:06:58 +0200 Subject: [PATCH 0669/1858] [cppmicroservices] Update to 3.6.0 (#20375) * Update cppmicroservices to 3.6.0 * Update CI baseline * delete Remove double quotes * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/cppmicroservices/portfile.cmake | 14 +++++++------- ports/cppmicroservices/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/cppmicroservices.json | 5 +++++ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ports/cppmicroservices/portfile.cmake b/ports/cppmicroservices/portfile.cmake index 47c209a8773a77..f8f94aec13f7e0 100644 --- a/ports/cppmicroservices/portfile.cmake +++ b/ports/cppmicroservices/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO "CppMicroServices/CppMicroservices" - REF b4d3d404df01d67dfd7fc36111bc5de50e1b89d6 # v3.4.0 - SHA512 b4a55f7c86cae25e936a237108b82824458b123fa1c14d4e0218c72c444a6d7f0db8900409af321225ec818f5691894b01fd311c606463386e7ce8e81e3656c8 + REPO CppMicroServices/CppMicroservices + REF v3.6.0 + SHA512 C1407E1D3C2FD31675C32D8C00F7D005C09B03A835D5B09411B0043DDEAF5E3A1A0C7A5FA34FA04D5A643169D222D0E8D3A3C31CDA69FB64CDF1A8CCA276BE18 HEAD_REF development PATCHES werror.patch @@ -11,8 +11,8 @@ vcpkg_from_github( ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA OPTIONS -DTOOLS_INSTALL_DIR:STRING=tools/cppmicroservices -DAUXILIARY_INSTALL_DIR:STRING=share/cppmicroservices @@ -21,12 +21,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_fixup_cmake_targets() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # CppMicroServices uses a custom resource compiler to compile resources # the zipped resources are then appended to the target which cause the linker to crash diff --git a/ports/cppmicroservices/vcpkg.json b/ports/cppmicroservices/vcpkg.json index 1c28245eb77d89..1ddf09e6e5c1df 100644 --- a/ports/cppmicroservices/vcpkg.json +++ b/ports/cppmicroservices/vcpkg.json @@ -1,7 +1,6 @@ { "name": "cppmicroservices", - "version-string": "3.4.0", - "port-version": 3, + "version": "3.6.0", "description": "An OSGi-like C++ dynamic module system and service registry", "homepage": "https://github.com/CppMicroServices/CppMicroServices", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 29515f8ab38cd5..d5929a9d68b63c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1549,8 +1549,8 @@ "port-version": 3 }, "cppmicroservices": { - "baseline": "3.4.0", - "port-version": 3 + "baseline": "3.6.0", + "port-version": 0 }, "cpprestsdk": { "baseline": "2.10.18", diff --git a/versions/c-/cppmicroservices.json b/versions/c-/cppmicroservices.json index ed66434c184533..0ab78b6200af7d 100644 --- a/versions/c-/cppmicroservices.json +++ b/versions/c-/cppmicroservices.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df21454215c4d4d1106621ead01a95a199163b60", + "version": "3.6.0", + "port-version": 0 + }, { "git-tree": "0462f2f3f6c9bb3e3374b53eccc05adc00417bae", "version-string": "3.4.0", From ec2c5eec0681ef1ab2ab0ec4821b518e30075af2 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 28 Sep 2021 06:07:25 +0200 Subject: [PATCH 0670/1858] [libmediainfo] fix dependency (#20376) --- ports/libmediainfo/vcpkg.json | 2 ++ versions/baseline.json | 2 +- versions/l-/libmediainfo.json | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/libmediainfo/vcpkg.json b/ports/libmediainfo/vcpkg.json index f254ce92487f93..89db9dce1a7dc3 100644 --- a/ports/libmediainfo/vcpkg.json +++ b/ports/libmediainfo/vcpkg.json @@ -1,11 +1,13 @@ { "name": "libmediainfo", "version-string": "21.03", + "port-version": 1, "description": "Get most relevant technical and tag data from video and audio files", "homepage": "https://github.com/MediaArea/MediaInfoLib", "dependencies": [ "curl", "libzen", + "tinyxml2", { "name": "vcpkg-cmake", "host": true diff --git a/versions/baseline.json b/versions/baseline.json index d5929a9d68b63c..ceda112ec2d0ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3530,7 +3530,7 @@ }, "libmediainfo": { "baseline": "21.03", - "port-version": 0 + "port-version": 1 }, "libmesh": { "baseline": "1.5.0", diff --git a/versions/l-/libmediainfo.json b/versions/l-/libmediainfo.json index 95dad996eb2fcc..7b907d79c9b736 100644 --- a/versions/l-/libmediainfo.json +++ b/versions/l-/libmediainfo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cdc779b496da59aabfb9e1cc459d68c54cdb4d8", + "version-string": "21.03", + "port-version": 1 + }, { "git-tree": "a24db679914e335ba6235de799467dfcb8842fc6", "version-string": "21.03", From c5dc54da60b630b0fd0981cc675bc30cb80279c6 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 27 Sep 2021 21:07:48 -0700 Subject: [PATCH 0671/1858] [xbyak] Update port to 6.00 (#20377) * update to 6.00 * quote cmake arguments * update deprecated functions * update versioning --- ports/xbyak/portfile.cmake | 20 ++++++++------------ ports/xbyak/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/x-/xbyak.json | 5 +++++ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ports/xbyak/portfile.cmake b/ports/xbyak/portfile.cmake index a2a06b1aa8c517..2bfc9ff8fcc4ae 100644 --- a/ports/xbyak/portfile.cmake +++ b/ports/xbyak/portfile.cmake @@ -3,23 +3,19 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO herumi/xbyak - REF 77ffe717376d194f1e5cc910bbd755d99bbba94e # 5.991 + cmake targets - SHA512 4e1ffa98dc63444aebf0a6e7a4ea57a9040cbf261f3a6fa43d23f0361cece71f1f4b597e95b6c85efbd4668e421081730b04ee924450ea0b0114923c36fc9c74 + REF v6.00 + SHA512 8bea95ddb44be39312083173cd4401039bd402c4732d97f9ff63174f6db29793f80dc1f1589d64bd96b4b13af819133897cd9843523662d13d57158c3837a778 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xbyak/vcpkg.json b/ports/xbyak/vcpkg.json index 3f18d44c5c6abf..cf7a9efbd38895 100644 --- a/ports/xbyak/vcpkg.json +++ b/ports/xbyak/vcpkg.json @@ -1,7 +1,17 @@ { "name": "xbyak", - "version-string": "5.991", + "version-string": "6.00", "description": "Xbyak is a JIT assembler for x86(IA-32)/x64(AMD64, x86-64).", "homepage": "https://github.com/herumi/xbyak", - "supports": "!(arm | uwp)" + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ceda112ec2d0ee..20049abc2865bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7033,7 +7033,7 @@ "port-version": 0 }, "xbyak": { - "baseline": "5.991", + "baseline": "6.00", "port-version": 0 }, "xerces-c": { diff --git a/versions/x-/xbyak.json b/versions/x-/xbyak.json index 8306213cef81f4..480d7d214674f7 100644 --- a/versions/x-/xbyak.json +++ b/versions/x-/xbyak.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca393737aa37584343dc10008000c850f26b0881", + "version-string": "6.00", + "port-version": 0 + }, { "git-tree": "71447e4379e27bf5e16479edd03019e71ae36bb8", "version-string": "5.991", From 033831b8cad40b8f938b1260efa50d9cd37d766f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:10:00 +0800 Subject: [PATCH 0672/1858] [simage] Re-process the features, add feature avienc and gdiplus (#20378) * [simage] Re-handle the features, add feature avienc and gdiplus * version * Add double quotes * version --- ports/simage/portfile.cmake | 38 +++++++++++++++++-------------------- ports/simage/vcpkg.json | 33 ++++++++++++++++++++++++++++++++ versions/baseline.json | 2 +- versions/s-/simage.json | 5 +++++ 4 files changed, 56 insertions(+), 22 deletions(-) diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index 6868fb16e13bc3..247018842c37ab 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -18,35 +18,31 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" SIMAGE_USE_MSVC_STATIC_RUNT vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES + avienc SIMAGE_USE_AVIENC + gdiplus SIMAGE_USE_GDIPLUS oggvorbis SIMAGE_OGGVORBIS_SUPPORT sndfile SIMAGE_LIBSNDFILE_SUPPORT + giflib SIMAGE_GIF_SUPPORT + jpeg SIMAGE_JPEG_SUPPORT + png SIMAGE_PNG_SUPPORT + tiff SIMAGE_TIFF_SUPPORT + zlib SIMAGE_ZLIB_SUPPORT ) # Depends on the platform -if(VCPKG_TARGET_IS_WINDOWS) - set(SIMAGE_ON_WIN ON) - set(SIMAGE_ON_NON_WIN OFF) -else() - set(SIMAGE_ON_WIN OFF) - set(SIMAGE_ON_NON_WIN ON) +if(VCPKG_TARGET_IS_WINDOWS AND "gdiplus" IN_LIST FEATURES) + message(WARNING "Feature 'gdiplus' will disable feature 'zlib', 'giflib', 'jpeg', 'png' and 'tiff' automaticly.") +elseif ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + AND ("gdiplus" IN_LIST FEATURES OR "avienc" IN_LIST FEATURES)) + message(FATAL_ERROR "Feature 'avienc' and 'gdiplus' only support Windows.") endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DSIMAGE_BUILD_SHARED_LIBS:BOOL=${SIMAGE_BUILD_SHARED_LIBS} -DSIMAGE_USE_STATIC_LIBS:BOOL=${SIMAGE_USE_STATIC_LIBS} -DSIMAGE_USE_MSVC_STATIC_RUNTIME:BOOL=${SIMAGE_USE_MSVC_STATIC_RUNTIME} - -DSIMAGE_USE_AVIENC=${SIMAGE_ON_WIN} - -DSIMAGE_USE_GDIPLUS=${SIMAGE_ON_WIN} - # Available on Linux, OSX and Windows without gdiplus - -DSIMAGE_ZLIB_SUPPORT=${SIMAGE_ON_NON_WIN} - -DSIMAGE_GIF_SUPPORT=${SIMAGE_ON_NON_WIN} - -DSIMAGE_JPEG_SUPPORT=${SIMAGE_ON_NON_WIN} - -DSIMAGE_PNG_SUPPORT=${SIMAGE_ON_NON_WIN} - -DSIMAGE_TIFF_SUPPORT=${SIMAGE_ON_NON_WIN} - # -DSIMAGE_USE_CGIMAGE=OFF -DSIMAGE_USE_QIMAGE=OFF -DSIMAGE_USE_QT6=OFF @@ -65,15 +61,15 @@ vcpkg_configure_cmake( -DSIMAGE_BUILD_DOCUMENTATION=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/simage-${SIMAGE_VERSION}) if (NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) vcpkg_copy_tools(TOOL_NAMES simage-config AUTO_CLEAN) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json index 2b50a2c6dc19f6..e302ce701c30c6 100644 --- a/ports/simage/vcpkg.json +++ b/ports/simage/vcpkg.json @@ -1,9 +1,20 @@ { "name": "simage", "version-semver": "1.8.1", + "port-version": 1, "description": "Image file format library abstraction layer", "homepage": "https://github.com/coin3d/simage", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "all" ], @@ -25,6 +36,22 @@ "sndfile" ] }, + { + "name": "simage", + "default-features": false, + "features": [ + "avienc" + ], + "platform": "windows" + }, + { + "name": "simage", + "default-features": false, + "features": [ + "gdiplus" + ], + "platform": "windows" + }, { "name": "simage", "default-features": false, @@ -67,6 +94,12 @@ } ] }, + "avienc": { + "description": "Use Video for Windows for AVI encoding" + }, + "gdiplus": { + "description": "Use GDI+ on Windows to load/save images" + }, "giflib": { "description": "Enable support for GIF images", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 20049abc2865bb..626c66dbb922ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6078,7 +6078,7 @@ }, "simage": { "baseline": "1.8.1", - "port-version": 0 + "port-version": 1 }, "simde": { "baseline": "0.7.0", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index d20b1cd9065457..3f603aff786625 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9b941ad6737569ae7c400625b6fc8aac8140683", + "version-semver": "1.8.1", + "port-version": 1 + }, { "git-tree": "429f5758def1d9514aa6f3f2bbcb98d8a3f19cd1", "version-semver": "1.8.1", From fff2aea18a90656793b91330411db981da229860 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Mon, 27 Sep 2021 21:10:48 -0700 Subject: [PATCH 0673/1858] [realsense2] Update to 2.49.0 (#20379) Co-authored-by: Cheney-Wang --- ports/realsense2/portfile.cmake | 61 ++++++++++----------------------- ports/realsense2/vcpkg.json | 13 +++++-- versions/baseline.json | 4 +-- versions/r-/realsense2.json | 5 +++ 4 files changed, 35 insertions(+), 48 deletions(-) diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index 3b966e0353e45d..bd45c69d2e8283 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO IntelRealSense/librealsense - REF bc0910f8ba3c33307ff247a29dd2b9e9ef1b269d #v2.42.0 - SHA512 b2a2d24df4bdf4853df626942b1931bbe011a4e3faaa4e3c4bcb3f76506ae8edb955a458219fdc300018e640e2ffe4cd34f459786b909cf9aab71a767d691178 + REF e9f05c55f88f6876633bd59fd1cb3848da64b699 #v2.49.0 + SHA512 dfd7012eb96f7d4a8054c8cc1141cd2c743255b7783d16565e02b2c688ea9d81cd61f3824f999c2c9d4ed1f44b3866b5bd399fab376ba8f16369989bda4bda85 HEAD_REF master PATCHES fix_openni2.patch @@ -10,19 +10,15 @@ vcpkg_from_github( fix_config_osx.patch ) -file(COPY ${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf DESTINATION ${SOURCE_PATH}) +file(COPY "${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf" DESTINATION "${SOURCE_PATH}") string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tm2 BUILD_WITH_TM2 + tools BUILD_TOOLS ) -set(BUILD_TOOLS OFF) -if("tools" IN_LIST FEATURES) - set(BUILD_TOOLS ON) -endif() - set(BUILD_OPENNI2_BINDINGS OFF) if(("openni2" IN_LIST FEATURES) AND (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")) set(BUILD_OPENNI2_BINDINGS ON) @@ -33,9 +29,8 @@ if (VCPKG_TARGET_IS_ANDROID) list(APPEND PLATFORM_OPTIONS -DFORCE_RSUSB_BACKEND=ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DENFORCE_METADATA=ON -DBUILD_WITH_OPENMP=OFF @@ -44,52 +39,32 @@ vcpkg_configure_cmake( -DBUILD_OPENNI2_BINDINGS=${BUILD_OPENNI2_BINDINGS} -DOPENNI2_DIR=${CURRENT_INSTALLED_DIR}/include/openni2 ${PLATFORM_OPTIONS} - OPTIONS_RELEASE - -DBUILD_EXAMPLES=${BUILD_TOOLS} - -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_TOOLS} - OPTIONS_DEBUG -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF + MAYBE_UNUSED_VARIABLES + OPENNI2_DIR ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/realsense2) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/realsense2) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(BUILD_TOOLS) - file(GLOB EXEFILES_RELEASE - ${CURRENT_PACKAGES_DIR}/bin/rs-* - ${CURRENT_PACKAGES_DIR}/bin/realsense-* - ) - - if (EXEFILES_RELEASE) - file(COPY ${EXEFILES_RELEASE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/realsense2) - file(REMOVE ${EXEFILES_RELEASE}) - endif() - - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/realsense2) - - file(GLOB BINS ${CURRENT_PACKAGES_DIR}/bin/*) - if(NOT BINS) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - endif() - - # Issue#7109, remove mismatched dlls and libs when build with tools, this workaround should be removed when the post-build checks related feature implemented. - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/realsense2-gl.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/realsense2-gl.dll) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/realsense2-gl.pdb) + set(TOOL_NAMES) + list(APPEND TOOL_NAMES rs-convert rs-enumerate-devices rs-fw-logger rs-fw-update rs-record rs-terminal) + vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) endif() if(BUILD_OPENNI2_BINDINGS) - file(GLOB RS2DRIVER ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/_out/rs2driver*) + file(GLOB RS2DRIVER "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/_out/rs2driver*") if(RS2DRIVER) - file(COPY ${RS2DRIVER} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers) + file(COPY ${RS2DRIVER} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers") endif() endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index d14554b308de22..e5add498a8e339 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,13 +1,20 @@ { "name": "realsense2", - "version": "2.42.0", - "port-version": 1, + "version": "2.49.0", "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "dependencies": [ { "name": "libusb", "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { @@ -21,7 +28,7 @@ "description": "Build Intel® RealSense™ T265 device" }, "tools": { - "description": "Build Intel® RealSense™ examples and tools", + "description": "Build Intel® RealSense™ tools", "dependencies": [ "glfw3", "opengl" diff --git a/versions/baseline.json b/versions/baseline.json index 626c66dbb922ba..e119e5b6ac7a03 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5741,8 +5741,8 @@ "port-version": 1 }, "realsense2": { - "baseline": "2.42.0", - "port-version": 1 + "baseline": "2.49.0", + "port-version": 0 }, "recast": { "baseline": "1.5.1", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index b8df867f6a70cc..f0b1fa8703fdc8 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "196cd1829bb74acd275abdcbc5344238b5414661", + "version": "2.49.0", + "port-version": 0 + }, { "git-tree": "7126a8b0d6dffc469da9a7aeccca58d48f05b1d2", "version": "2.42.0", From 6d27189fd0e8c944af8d69d0915ca0c2c8aca1d1 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:11:34 +0800 Subject: [PATCH 0674/1858] [redis_plus_plus] Update to 1.3.0 (#20384) * [redis_plus_plus] Update to 1.3.0 * update version --- ports/redis-plus-plus/portfile.cmake | 22 ++++++++-------------- ports/redis-plus-plus/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/r-/redis-plus-plus.json | 5 +++++ 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index 7e97b032311edc..ace6b27f6a0de3 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sewenew/redis-plus-plus - REF df522812ba4114f1dd3386b81afc2369c82b717d # 1.2.3 - SHA512 2ac59c5416ba85a60061d941787cb3bc2e43042ca0a53829f866448015ed6800c38ecbde3319d9756a70bfba2860732136d89d296382a6b9a675bbe32173f22b + REF cff6ab8d8557a113ad97dfb779eb46647f7c92c7 # 1.3.1 + SHA512 2bd179f47b13d05d58358ddf1aeef93fbc9e748a12f07fa5bd59fd75adcf7f3261d5f871d8fd33628d2d9df04e341ed24314fc2e817887ba0079e2711b5da317 HEAD_REF master PATCHES fix-ws2-linking-windows.patch @@ -15,17 +15,11 @@ else() set(REDIS_PLUS_PLUS_CXX_STANDARD 11) endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(REDIS_PLUS_PLUS_BUILD_STATIC ON) - set(REDIS_PLUS_PLUS_BUILD_SHARED OFF) -else() - set(REDIS_PLUS_PLUS_BUILD_STATIC OFF) - set(REDIS_PLUS_PLUS_BUILD_SHARED ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" REDIS_PLUS_PLUS_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DREDIS_PLUS_PLUS_USE_TLS=OFF -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC} @@ -34,11 +28,11 @@ vcpkg_configure_cmake( -DREDIS_PLUS_PLUS_CXX_STANDARD=${REDIS_PLUS_PLUS_CXX_STANDARD} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index 0e61b5d843390c..b67b176b7c8fe9 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,10 +1,18 @@ { "name": "redis-plus-plus", - "version-semver": "1.2.3", + "version-semver": "1.3.1", "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "dependencies": [ - "hiredis" + "hiredis", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cxx17": { diff --git a/versions/baseline.json b/versions/baseline.json index e119e5b6ac7a03..b289975a8b6ba0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5749,7 +5749,7 @@ "port-version": 4 }, "redis-plus-plus": { - "baseline": "1.2.3", + "baseline": "1.3.1", "port-version": 0 }, "refl-cpp": { diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 197df5c2ab9906..02919e2fd4cfbf 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8bbde067a459c4fff18d7c63eb682487f1955e5", + "version-semver": "1.3.1", + "port-version": 0 + }, { "git-tree": "6a76da721b6b5c1820ccf60184f1c0aa44af788d", "version-semver": "1.2.3", From 405a1eeececb1dee369369e206be2dca6f7d7f93 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:11:50 +0800 Subject: [PATCH 0675/1858] [vcpkg_cmake_config_fixup] Fix variable name (#20380) * [vcpkg_cmake_config_fixup] Fix variable name * Fix vcpkg.json --- ports/vcpkg-cmake-config/vcpkg.json | 3 +-- ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake | 2 +- versions/baseline.json | 4 ++-- versions/v-/vcpkg-cmake-config.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 49faaf4d402b37..749114aa4d2a2f 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,5 +1,4 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-05-22", - "port-version": 1 + "version-date": "2021-09-27" } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index a145d324a91d8c..7a7a6c833b6829 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -216,7 +216,7 @@ get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)]] # Patch out any remaining absolute references file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}" cmake_current_packages_dir) - string(REPLACE "${CMAKE_CURRENT_PACKAGES_DIR}" [[${_IMPORT_PREFIX}]] contents "${contents}") + string(REPLACE "${cmake_current_packages_dir}" [[${_IMPORT_PREFIX}]] contents "${contents}") file(WRITE "${main_cmake}" "${contents}") endforeach() diff --git a/versions/baseline.json b/versions/baseline.json index b289975a8b6ba0..3500c7d69813b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6849,8 +6849,8 @@ "port-version": 0 }, "vcpkg-cmake-config": { - "baseline": "2021-05-22", - "port-version": 1 + "baseline": "2021-09-27", + "port-version": 0 }, "vcpkg-gfortran": { "baseline": "3", diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index 2561cfa3f2176a..cff03bb75dca0a 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ae99981abcd01b092344f85ef6e1de3c1f9856a", + "version-date": "2021-09-27", + "port-version": 0 + }, { "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5", "version-date": "2021-05-22", From d0ada8aad04f6a653b1fa05f7156a4e623a1b3ea Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 20:48:38 +0200 Subject: [PATCH 0676/1858] [yoga] Update to 1.19.0 (#20330) * Update yoga to 1.19.0 * Update CI baseline * Change version-string to version-semver Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update git-tree hash * Update yoga.json * Use version instead of version-semver as yoga doesn't document that they follow semver. Co-authored-by: chausner Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/yoga/portfile.cmake | 5 +++-- ports/yoga/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/y-/yoga.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/yoga/portfile.cmake b/ports/yoga/portfile.cmake index 7b07a63999dd0e..6c7a2cf94b2bbd 100644 --- a/ports/yoga/portfile.cmake +++ b/ports/yoga/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/yoga - REF 1.18.0 - SHA512 dba75bff0fd3b72a3c17a6856253bd14d8af7fbb2832b432118c6ee509f9fe234874969a9cfb56690ec5a2649637a6bf090da5c5f5e8907c1e1e9c09f05977e2 + REF v1.19.0 + SHA512 B1CB1F23CF9B5DD2491B6883CAF8FB47E264B736C94F6AA6655E9A6F641664B4BCEEB48F74C98B955F0EE02BA2E0AE8E01539A928ABB4B81FAE13ED3B57287CA HEAD_REF master PATCHES add-project-declaration.patch ) @@ -40,3 +40,4 @@ endif() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + diff --git a/ports/yoga/vcpkg.json b/ports/yoga/vcpkg.json index 03e86b78587536..570be343604041 100644 --- a/ports/yoga/vcpkg.json +++ b/ports/yoga/vcpkg.json @@ -1,7 +1,6 @@ { "name": "yoga", - "version-string": "1.18.0", - "port-version": 2, + "version": "1.19.0", "description": "Yoga is a cross-platform layout engine which implements Flexbox", "homepage": "https://github.com/facebook/yoga", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 3500c7d69813b4..5b97b95adc6516 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7137,8 +7137,8 @@ "port-version": 3 }, "yoga": { - "baseline": "1.18.0", - "port-version": 2 + "baseline": "1.19.0", + "port-version": 0 }, "yomm2": { "baseline": "1.1.2", diff --git a/versions/y-/yoga.json b/versions/y-/yoga.json index ced362906dc044..891c54e4c21b4c 100644 --- a/versions/y-/yoga.json +++ b/versions/y-/yoga.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12751eb94758566f26b621b28dc86fe8b1977a7f", + "version": "1.19.0", + "port-version": 0 + }, { "git-tree": "00f17f608ffc20c70786f750aa66035b0f1f0ca4", "version-string": "1.18.0", From 055fd66d13d6fe392359040f3aec1d7f629941c5 Mon Sep 17 00:00:00 2001 From: Samuel Marks <807580+SamuelMarks@users.noreply.github.com> Date: Tue, 28 Sep 2021 14:50:14 -0400 Subject: [PATCH 0677/1858] [Guilite] Add new port (#20156) * [ports/guilite] Init * ./vcpkg x-add-version --- ports/guilite/portfile.cmake | 9 +++++++++ ports/guilite/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/g-/guilite.json | 9 +++++++++ 4 files changed, 28 insertions(+) create mode 100644 ports/guilite/portfile.cmake create mode 100644 ports/guilite/vcpkg.json create mode 100644 versions/g-/guilite.json diff --git a/ports/guilite/portfile.cmake b/ports/guilite/portfile.cmake new file mode 100644 index 00000000000000..70189fd6112238 --- /dev/null +++ b/ports/guilite/portfile.cmake @@ -0,0 +1,9 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO "idea4good/GuiLite" + SHA512 "9132f854f2e0d517797a3b30458ac692b509cb5a2fea2bff606b6b84b60a5760311f488c77f2dc21e954a14378e8d803d555750f90d00d5655e216a2a0c83ce8" + REF "master" +) + +file(INSTALL "${SOURCE_PATH}/GuiLite.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/guilite/vcpkg.json b/ports/guilite/vcpkg.json new file mode 100644 index 00000000000000..6cbda897a3870a --- /dev/null +++ b/ports/guilite/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "guilite", + "version-date": "2021-07-31", + "description": "The smallest header-only GUI library (4 KLOC) for all platforms.", + "homepage": "https://github.com/idea4good/GuiLite" +} diff --git a/versions/baseline.json b/versions/baseline.json index 5b97b95adc6516..66421ba22ef13f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2564,6 +2564,10 @@ "baseline": "2020-09-14", "port-version": 1 }, + "guilite": { + "baseline": "2021-07-31", + "port-version": 0 + }, "gumbo": { "baseline": "0.10.1", "port-version": 4 diff --git a/versions/g-/guilite.json b/versions/g-/guilite.json new file mode 100644 index 00000000000000..db73a1105b1d13 --- /dev/null +++ b/versions/g-/guilite.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c68992e6acdc51afc39edfdfe1342ecbd197bee6", + "version-date": "2021-07-31", + "port-version": 0 + } + ] +} From f631ce956a8a7a51669579a8d2e27c3f8213e215 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 20:50:35 +0200 Subject: [PATCH 0678/1858] [openmvs] Update to 1.1.1 (#20373) * Update openmvs to 1.1.1 * Update CI baseline * Update patch * Update git-tree hash Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/openmvs/fix-build.patch | 2 +- ports/openmvs/portfile.cmake | 4 ++-- ports/openmvs/vcpkg.json | 7 +++---- versions/baseline.json | 4 ++-- versions/o-/openmvs.json | 5 +++++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/openmvs/fix-build.patch b/ports/openmvs/fix-build.patch index 54d50c25f2a087..48f62ae0a9d0ea 100644 --- a/ports/openmvs/fix-build.patch +++ b/ports/openmvs/fix-build.patch @@ -108,7 +108,7 @@ index f4914bf..23d03e6 100644 --- a/MvgMvsPipeline.py +++ b/MvgMvsPipeline.py.in @@ -91,12 +91,12 @@ def find(afile): - return None + # Try to find openMVG and openMVS binaries in PATH -OPENMVG_BIN = whereis("openMVG_main_SfMInit_ImageListing") diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index d2055fe1a1c804..ef4f8eac3d6595 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/openMVS - REF v1.1 - SHA512 baa9149853dc08c602deeb1a04cf57643d1cb0733aee2776f4e99b210279aad3b4a1013ab1d790e91a3a95b7c72b9c12c6be25f2c30a76b69b5319b610cb8e7a + REF v1.1.1 + SHA512 EEB15D0756F12136A1E7938A0EED97024D564EEF3355F3BB6ABF6C681E38919011E1A133D89CA360F463E7FED5FEB8E0138A0FE9BE4C25B6A13BA4B042AEF3EB HEAD_REF master PATCHES fix-build.patch diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index eba2acd9f8ad70..6e482076c17b0e 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,7 +1,6 @@ { "name": "openmvs", - "version-string": "1.1", - "port-version": 6, + "version": "1.1.1", "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "dependencies": [ @@ -40,13 +39,13 @@ ], "features": { "cuda": { - "description": "cuda support for openmvs", + "description": "CUDA support for openmvs", "dependencies": [ "cuda" ] }, "openmp": { - "description": "openmp support for openmvs" + "description": "OpenMP support for openmvs" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 66421ba22ef13f..71bfa3e3c2a7e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4861,8 +4861,8 @@ "port-version": 3 }, "openmvs": { - "baseline": "1.1", - "port-version": 6 + "baseline": "1.1.1", + "port-version": 0 }, "openni2": { "baseline": "2.2.0.33", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index e81c7e82eb257e..2c4ba8b5f4d664 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cda3b971b05a5519ef36759d8f3f49045fa6445e", + "version": "1.1.1", + "port-version": 0 + }, { "git-tree": "b1c5c58b15affc0db0e179229c4640341d62a4d7", "version-string": "1.1", From 152513a35519c5e0dbbadb680d540a4f6779e48e Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 28 Sep 2021 20:53:02 +0200 Subject: [PATCH 0679/1858] [fftw3] Update to 3.3.10 (#20353) * Update fftw3 to 3.3.10 * Update CI baseline * Use version rather than version-string. Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/fftw3/portfile.cmake | 4 ++-- ports/fftw3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index c9802469591173..b580d42e1a80d5 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -1,6 +1,6 @@ vcpkg_download_distfile(ARCHIVE - URLS "http://www.fftw.org/fftw-3.3.9.tar.gz" - FILENAME "fftw-3.3.9.tar.gz" + URLS "http://www.fftw.org/fftw-3.3.10.tar.gz" + FILENAME "fftw-3.3.10.tar.gz" SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf ) diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 646e2627e932d3..9ce87120f9af0b 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fftw3", - "version-string": "3.3.9", + "version": "3.3.10", "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 71bfa3e3c2a7e4..857ce7a8e40caa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2109,7 +2109,7 @@ "port-version": 0 }, "fftw3": { - "baseline": "3.3.9", + "baseline": "3.3.10", "port-version": 0 }, "fftwpp": { diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 2bb735e8053119..71bbb8f85fb908 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "174084fa9cf349e48d219eb948c585df3f093f6e", + "version": "3.3.10", + "port-version": 0 + }, { "git-tree": "28c3b35930f17c8ec3e05cd24d582e81df0c9dce", "version-string": "3.3.9", From eb41546a70d15c578ffcb529b84c29d94522e2eb Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 28 Sep 2021 13:51:42 -0700 Subject: [PATCH 0680/1858] [ci] Move formatting and doc checks into x86-windows (#20402) * [ci] Move formatting and doc checks into x86-windows to avoid burning a whole job for that 1 run, don't run file lists generation in PRs. * Deduplicate x86-windows and restore PR file lists, as requested/suggested by @dg0yt * More quotes Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- scripts/azure-pipelines/azure-pipelines.yml | 139 +++++++----------- .../windows/azure-pipelines.yml | 31 +++- 2 files changed, 79 insertions(+), 91 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index e5102c32cdbf4e..f57de88355be64 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -6,92 +6,53 @@ variables: linux-pool: 'PrLin-2021-09-08' osx-pool: 'PrOsx-2021-07-27' -stages: -- stage: FormatChecks - displayName: 'Formatting and Documentation Checks' - pool: $(windows-pool) - jobs: - - job: - workspace: - clean: resources - variables: - - name: VCPKG_DOWNLOADS - value: D:\downloads - - name: DiffFile - value: $(Build.ArtifactStagingDirectory)\format.diff - steps: - - task: Powershell@2 - displayName: 'Generate Documentation' - inputs: - filePath: 'docs/regenerate.ps1' - arguments: '-VcpkgRoot . -WarningAction Stop' - pwsh: true - - script: .\bootstrap-vcpkg.bat - displayName: 'Bootstrap vcpkg' - - script: '.\vcpkg.exe format-manifest --all' - displayName: 'Format Manifests' - - task: Powershell@2 - displayName: 'Create Diff' - inputs: - filePath: scripts/azure-pipelines/Create-PRDiff.ps1 - arguments: '-DiffFile $(DiffFile)' - pwsh: true - - task: PublishBuildArtifacts@1 - condition: failed() - displayName: 'Publish Format and Documentation Diff' - inputs: - PathtoPublish: '$(DiffFile)' - ArtifactName: 'format.diff' -- stage: RunPrTests - displayName: 'Run PR Tests:' - dependsOn: FormatChecks - jobs: - - template: windows/azure-pipelines.yml - parameters: - triplet: x86-windows - jobName: x86_windows - poolName: $(windows-pool) - - - template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows - jobName: x64_windows - poolName: $(windows-pool) - - - template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static - jobName: x64_windows_static - poolName: $(windows-pool) - - - template: windows/azure-pipelines.yml - parameters: - triplet: x64-windows-static-md - jobName: x64_windows_static_md - poolName: $(windows-pool) - - - template: windows/azure-pipelines.yml - parameters: - triplet: x64-uwp - jobName: x64_uwp - poolName: $(windows-pool) - - - template: windows/azure-pipelines.yml - parameters: - triplet: arm64-windows - jobName: arm64_windows - poolName: $(windows-pool) - - - template: windows/azure-pipelines.yml - parameters: - triplet: arm-uwp - jobName: arm_uwp - poolName: $(windows-pool) - - - template: osx/azure-pipelines.yml - parameters: - poolName: $(osx-pool) - - - template: linux/azure-pipelines.yml - parameters: - poolName: $(linux-pool) +jobs: +- template: windows/azure-pipelines.yml + parameters: + triplet: x86-windows + jobName: x86_windows + poolName: $(windows-pool) + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows + jobName: x64_windows + poolName: $(windows-pool) + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-static + jobName: x64_windows_static + poolName: $(windows-pool) + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-windows-static-md + jobName: x64_windows_static_md + poolName: $(windows-pool) + +- template: windows/azure-pipelines.yml + parameters: + triplet: x64-uwp + jobName: x64_uwp + poolName: $(windows-pool) + +- template: windows/azure-pipelines.yml + parameters: + triplet: arm64-windows + jobName: arm64_windows + poolName: $(windows-pool) + +- template: windows/azure-pipelines.yml + parameters: + triplet: arm-uwp + jobName: arm_uwp + poolName: $(windows-pool) + +- template: osx/azure-pipelines.yml + parameters: + poolName: $(osx-pool) + +- template: linux/azure-pipelines.yml + parameters: + poolName: $(linux-pool) diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index b88a5f12036372..d341a7a9deb0b1 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -14,6 +14,10 @@ jobs: value: D:\ - name: VCPKG_DOWNLOADS value: D:\downloads + - name: DiffFile + value: $(Build.ArtifactStagingDirectory)\format.diff + - name: ExtraChecksTriplet + value: x86-windows - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES value: "x-azurl,$(root-url),$(sas),readwrite" @@ -28,12 +32,35 @@ jobs: inputs: filePath: 'scripts/azure-pipelines/windows/disk-space.ps1' pwsh: true - # Note: E: is the Azure machines' temporary disk. - script: .\bootstrap-vcpkg.bat displayName: 'Bootstrap vcpkg' - script: | if exist ${{ variables.VCPKG_DOWNLOADS }} rmdir /S /Q ${{ variables.VCPKG_DOWNLOADS }} 2>&1 displayName: 'Clean downloads' + # Note that we run docs checks before PR checks because they are likely to invalidate a whole run anyway + - task: Powershell@2 + displayName: 'Generate Documentation' + condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') + inputs: + filePath: 'docs/regenerate.ps1' + arguments: '-VcpkgRoot . -WarningAction Stop' + pwsh: true + - script: '.\vcpkg.exe format-manifest --all' + displayName: 'Format Manifests' + condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') + - task: Powershell@2 + displayName: 'Create Diff' + condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') + inputs: + filePath: scripts/azure-pipelines/Create-PRDiff.ps1 + arguments: "-DiffFile '$(DiffFile)'" + pwsh: true + - task: PublishBuildArtifacts@1 + displayName: 'Publish Format and Documentation Diff' + condition: and(eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}'), failed()) + inputs: + PathtoPublish: '$(DiffFile)' + ArtifactName: 'format.diff' - task: PowerShell@2 displayName: '*** Test Modified Ports and Prepare Test Logs ***' inputs: @@ -43,7 +70,7 @@ jobs: pwsh: true - task: PowerShell@2 displayName: 'Validate version files' - condition: eq('${{ parameters.triplet }}', 'x86-windows') + condition: eq('${{ parameters.triplet }}', '${{ variables.ExtraChecksTriplet }}') inputs: targetType: inline script: | From 3b7670058a229baef98fc6d9b730b7cdb9fffba8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 28 Sep 2021 23:00:33 +0200 Subject: [PATCH 0681/1858] [ci] Don't emit warnings for absence of failure logs (#20316) * No warning for absence of failure logs * Update condition for osx and linux Co-authored-by: Billy Robert O'Neal III --- scripts/azure-pipelines/linux/azure-pipelines.yml | 2 +- scripts/azure-pipelines/osx/azure-pipelines.yml | 2 +- scripts/azure-pipelines/test-modified-ports.ps1 | 3 +++ scripts/azure-pipelines/windows/azure-pipelines.yml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml index f68f971e5a3219..0025750ee29150 100644 --- a/scripts/azure-pipelines/linux/azure-pipelines.yml +++ b/scripts/azure-pipelines/linux/azure-pipelines.yml @@ -56,7 +56,7 @@ jobs: inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs' ArtifactName: 'failure logs for x64-linux' - condition: always() + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') - bash: | python3 scripts/file_script.py /mnt/vcpkg-ci/installed/vcpkg/info/ displayName: 'Build a file list for all packages' diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index 154247da47481b..aa5884f0b6f766 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -50,7 +50,7 @@ jobs: inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs' ArtifactName: 'failure logs for x64-osx' - condition: always() + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') - bash: | python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/ displayName: 'Build a file list for all packages' diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 8212509d0134b2..d55c6f629a54c1 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -137,6 +137,9 @@ else & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs } +$failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0) +Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" + if ($LASTEXITCODE -ne 0) { throw "vcpkg ci failed" diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml index d341a7a9deb0b1..60ba6fa1b80a14 100644 --- a/scripts/azure-pipelines/windows/azure-pipelines.yml +++ b/scripts/azure-pipelines/windows/azure-pipelines.yml @@ -115,7 +115,7 @@ jobs: inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)\failure-logs' ArtifactName: 'failure logs for ${{ parameters.triplet }}' - condition: always() + condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') - task: PowerShell@2 displayName: 'Build a file list for all packages' condition: always() From e33c1abf0af887eec8425fae59b4d9671f31d7c7 Mon Sep 17 00:00:00 2001 From: Be Date: Tue, 28 Sep 2021 19:10:48 -0500 Subject: [PATCH 0682/1858] [soundtouch] update to 2.3.1 (#20017) I worked with upstream to implement a CMake build system, so I removed the CMakeLists.txt from this port. This fixes multiple issues: * Headers were not installed by the port before. * The port did not allow dynamic linking before. * pkgconfig and CMake config files were not installed before. --- ports/soundtouch/CMakeLists.txt | 35 ------------------------ ports/soundtouch/portfile.cmake | 48 ++++++++++++++++++--------------- ports/soundtouch/vcpkg.json | 21 ++++++++++++--- versions/baseline.json | 4 +-- versions/s-/soundtouch.json | 5 ++++ 5 files changed, 52 insertions(+), 61 deletions(-) delete mode 100644 ports/soundtouch/CMakeLists.txt diff --git a/ports/soundtouch/CMakeLists.txt b/ports/soundtouch/CMakeLists.txt deleted file mode 100644 index 075c8ee2dd5258..00000000000000 --- a/ports/soundtouch/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(soundtouch CXX) - -if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(ARCH_SUFFIX _x64) -else() - set(ARCH_SUFFIX) -endif() - -if(BUILD_SHARED_LIBS) - set(TYPE_SUFFIX Dll) -else() - set(TYPE_SUFFIX $<$:D>) -endif() - -configure_file("${CMAKE_CURRENT_LIST_DIR}/include/soundtouch_config.h.in" ${CMAKE_CURRENT_BINARY_DIR}/include/soundtouch_config.h) - -file(GLOB SOUNDTOUCH_SOURCES "${CMAKE_CURRENT_LIST_DIR}/source/SoundTouch/*.cpp") -add_library(libsoundtouch ${SOUNDTOUCH_SOURCES}) -target_include_directories(libsoundtouch PUBLIC "${CMAKE_CURRENT_LIST_DIR}/include") -target_include_directories(libsoundtouch PUBLIC "${CMAKE_CURRENT_BINARY_DIR}/include") -set_target_properties(libsoundtouch PROPERTIES OUTPUT_NAME SoundTouch${TYPE_SUFFIX}${ARCH_SUFFIX}) -if(WIN32 AND BUILD_SHARED_LIBS) - target_compile_definitions(libsoundtouch PRIVATE -DDLL_EXPORTS) - target_sources(libsoundtouch PRIVATE - "${CMAKE_CURRENT_LIST_DIR}/source/SoundTouchDLL/SoundTouchDLL.cpp" - "${CMAKE_CURRENT_LIST_DIR}/source/SoundTouchDLL/SoundTouchDLL.rc" - ) -endif() - -install(TARGETS libsoundtouch - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib -) diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake index 12cc0b08468923..609876d88a6e0f 100644 --- a/ports/soundtouch/portfile.cmake +++ b/ports/soundtouch/portfile.cmake @@ -1,31 +1,37 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +vcpkg_fail_port_install(ON_TARGET "UWP") -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "WindowsStore not supported") -endif() - -set(VERSION 2.0.0) - -vcpkg_download_distfile(ARCHIVE - URLS "https://www.surina.net/soundtouch/soundtouch-${VERSION}.zip" - FILENAME "soundtouch-${VERSION}.zip" - SHA512 50ef36b6cd21c16e235b908c5518e29b159b11f658a014c47fe767d3d8acebaefefec0ce253b4ed322cbd26387c69c0ed464ddace0c098e61d56d55c198117a5 +vcpkg_from_gitlab( + OUT_SOURCE_PATH SOURCE_PATH + GITLAB_URL https://gitlab.com + REPO soundtouch/soundtouch + REF 2.3.1 + SHA512 1eea5c06dc5af633b5c16902c6a951593190daf75bd6aa12e00c745080f9363e9c45ab52ddc434bd905e4195b306cc38c9143e813430c15c19a275ae1a82df24 + HEAD_REF master ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + soundstretch SOUNDSTRETCH + soundtouchdll SOUNDTOUCH_DLL ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +if(SOUNDTOUCH_DLL) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS ${FEATURE_OPTIONS} ) +vcpkg_cmake_install() -vcpkg_install_cmake() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SoundTouch) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/source/SoundTouchDLL/SoundTouchDLL.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +if(SOUNDSTRETCH) + vcpkg_copy_tools(TOOL_NAMES soundstretch AUTO_CLEAN) +endif() -file(INSTALL ${SOURCE_PATH}/COPYING.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/soundtouch/vcpkg.json b/ports/soundtouch/vcpkg.json index f2d7f64aa5a4c2..a16786f0378806 100644 --- a/ports/soundtouch/vcpkg.json +++ b/ports/soundtouch/vcpkg.json @@ -1,7 +1,6 @@ { "name": "soundtouch", - "version-string": "2.0.0", - "port-version": 7, + "version": "2.3.1", "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.", "homepage": "https://www.surina.net/soundtouch", "supports": "!uwp", @@ -9,6 +8,22 @@ { "name": "atlmfc", "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "soundstretch": { + "description": "Build the soundstretch command line tool" + }, + "soundtouchdll": { + "description": "Build the SoundTouchDLL C wrapper dynamic library" } - ] + } } diff --git a/versions/baseline.json b/versions/baseline.json index 857ce7a8e40caa..6138af6835661c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6201,8 +6201,8 @@ "port-version": 0 }, "soundtouch": { - "baseline": "2.0.0", - "port-version": 7 + "baseline": "2.3.1", + "port-version": 0 }, "soxr": { "baseline": "0.1.3", diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json index a6952b726c3e44..330e1d1a549798 100644 --- a/versions/s-/soundtouch.json +++ b/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b6b644eb3ae55d7e56413e9cd88ca5ccc814c33", + "version": "2.3.1", + "port-version": 0 + }, { "git-tree": "47269f38d27248c1e52fd21c3a296d032e02ac01", "version-string": "2.0.0", From 2f6d7b181e281c54f2a89e5f74a87b57b44d8be6 Mon Sep 17 00:00:00 2001 From: Sy Brand Date: Wed, 29 Sep 2021 01:32:06 +0100 Subject: [PATCH 0683/1858] [New Port] Add tl-generator (#20385) * Add tl-generator * Format manifest and update versions * Update versions * Update ports/tl-generator/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/tl-generator/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/tl-generator/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/tl-generator/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Fixup version database. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/tl-generator/portfile.cmake | 18 ++++++++++++++++++ ports/tl-generator/vcpkg.json | 12 ++++++++++++ versions/baseline.json | 4 ++++ versions/t-/tl-generator.json | 9 +++++++++ 4 files changed, 43 insertions(+) create mode 100644 ports/tl-generator/portfile.cmake create mode 100644 ports/tl-generator/vcpkg.json create mode 100644 versions/t-/tl-generator.json diff --git a/ports/tl-generator/portfile.cmake b/ports/tl-generator/portfile.cmake new file mode 100644 index 00000000000000..1ec53ebcd3fec0 --- /dev/null +++ b/ports/tl-generator/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO TartanLlama/generator + REF a8e421f04159199f6896b09cad2bd3c6fbb2a5fb + SHA512 bb00cc0b3224813c7837175d81d7a08627dfe7a2f52c0bb8125ec7c6e8018a0a856c94463105dd04e7e20b8af9afc57c1c7228e9119174a9e621e675f8a3b447 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DGENERATOR_BUILD_TESTS=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tl-generator/vcpkg.json b/ports/tl-generator/vcpkg.json new file mode 100644 index 00000000000000..6fb847154246cd --- /dev/null +++ b/ports/tl-generator/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "tl-generator", + "version-date": "2021-09-28", + "description": "Single-header, ranges-compatible generator type built on C++20 coroutines", + "homepage": "https://tl.tartanllama.xyz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 6138af6835661c..1198546568a6a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6612,6 +6612,10 @@ "baseline": "1.0.0", "port-version": 2 }, + "tl-generator": { + "baseline": "2021-09-28", + "port-version": 0 + }, "tl-optional": { "baseline": "1.0.0", "port-version": 2 diff --git a/versions/t-/tl-generator.json b/versions/t-/tl-generator.json new file mode 100644 index 00000000000000..23debbd16de4af --- /dev/null +++ b/versions/t-/tl-generator.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aac3612e6eaa3c6a6618226a96888c5b21a76a06", + "version-date": "2021-09-28", + "port-version": 0 + } + ] +} From 858f5d20dfbd4ee4d0f8f7b6a9c8e7c7b3221ba8 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 29 Sep 2021 23:26:29 +0800 Subject: [PATCH 0684/1858] [fftw3] Update the hash (#20420) --- ports/fftw3/fftw3_arch_fix.patch | 15 +++++++-------- ports/fftw3/portfile.cmake | 2 +- ports/fftw3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/fftw3.json | 5 +++++ 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ports/fftw3/fftw3_arch_fix.patch b/ports/fftw3/fftw3_arch_fix.patch index 0f1a7e5ae664a8..53fd7c0e7369e2 100644 --- a/ports/fftw3/fftw3_arch_fix.patch +++ b/ports/fftw3/fftw3_arch_fix.patch @@ -1,17 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 95bd537a..245acc8f 100644 ---- a/CMakeLists.txt +index 49be67d..ef69fa6 100644 +--- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,6 +66,8 @@ +@@ -66,6 +66,7 @@ check_prototype_definition (cosl "long double cosl( long double arg )" "0" math. check_prototype_definition (sinl "long double sinl( long double arg )" "0" math.h HAVE_DECL_SINL) check_prototype_definition (memalign "void *memalign(size_t alignment, size_t size)" "0" malloc.h HAVE_DECL_MEMALIGN) check_prototype_definition (posix_memalign "int posix_memalign(void **memptr, size_t alignment, size_t size)" "0" stdlib.h HAVE_DECL_POSIX_MEMALIGN) +check_prototype_definition (_aligned_malloc "void* __cdecl _aligned_malloc(size_t _Size, size_t _Alignment)" "0" malloc.h HAVE_DECL_ALIGNED_MALLOC) -+ include (CheckSymbolExists) check_symbol_exists (clock_gettime time.h HAVE_CLOCK_GETTIME) -@@ -75,6 +77,7 @@ +@@ -75,6 +76,7 @@ check_symbol_exists (drand48 stdlib.h HAVE_DRAND48) check_symbol_exists (srand48 stdlib.h HAVE_SRAND48) check_symbol_exists (memalign malloc.h HAVE_MEMALIGN) check_symbol_exists (posix_memalign stdlib.h HAVE_POSIX_MEMALIGN) @@ -19,7 +18,7 @@ index 95bd537a..245acc8f 100644 check_symbol_exists (mach_absolute_time mach/mach_time.h HAVE_MACH_ABSOLUTE_TIME) check_symbol_exists (alloca alloca.h HAVE_ALLOCA) if (NOT HAVE_ALLOCA) -@@ -131,6 +131,7 @@ endif () +@@ -131,6 +133,7 @@ endif () include (CheckCCompilerFlag) @@ -27,7 +26,7 @@ index 95bd537a..245acc8f 100644 if (ENABLE_SSE) foreach (FLAG "-msse" "/arch:SSE") unset (HAVE_SSE CACHE) -@@ -176,8 +177,9 @@ if (ENABLE_AVX2) +@@ -180,8 +183,9 @@ if (ENABLE_AVX2) endif () # AVX2 codelets require FMA support as well @@ -36,5 +35,5 @@ index 95bd537a..245acc8f 100644 - foreach (FLAG "-mfma" "/arch:FMA") + foreach (FLAG "-mfma" "/arch:AVX2") unset (HAVE_FMA CACHE) + unset (HAVE_FMA) check_c_compiler_flag (${FLAG} HAVE_FMA) - if (HAVE_FMA) diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index b580d42e1a80d5..3493d7cdac1646 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "http://www.fftw.org/fftw-3.3.10.tar.gz" FILENAME "fftw-3.3.10.tar.gz" - SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf + SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40 ) vcpkg_extract_source_archive_ex( diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 9ce87120f9af0b..08b641c4a522b1 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fftw3", "version": "3.3.10", + "port-version": 1, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1198546568a6a9..669d17b5a8e870 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2110,7 +2110,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 0 + "port-version": 1 }, "fftwpp": { "baseline": "2019-12-19", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 71bbb8f85fb908..6a5b99192bf833 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecf3602083e88dce78331f58590466c22664c584", + "version": "3.3.10", + "port-version": 1 + }, { "git-tree": "174084fa9cf349e48d219eb948c585df3f093f6e", "version": "3.3.10", From 3b787125c99bd6fc320ece97651616216d6e16b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 29 Sep 2021 18:32:13 +0300 Subject: [PATCH 0685/1858] [kf5notifications] new port (#19828) * Add kf5notifications port * Fixed kf5notifications for windows * [kf5*] update to 5.75.0 * [kf5notifications] port CONTROL to JSON * [kf5notifications] remove redundant options * [kf5notifications] update to current spec * [kf5notifications] wrap paths in quotes * [kf5notifications] use semver * [kf5notifications] update to 5.84.0 * [kf5notifications] update versions * [kf5notifications] remove bin from static builds * [kf5notifications] update versions * [kf5notifications] add kf5windowsystem dependency * [kf5notifications] update versions * [kf5notifications] fix CMake config file * [kf5notifications] update versions * [kf5notifications] add androidextras dependency * [kf5notifications] update versions * [kf5notifications] update versions * [kf5newstuff] minimize patch size * [kf5newstuff] use generic, non-semver versioning * [kf5newstuff] update versions * [kf5notifications] re-enable parallel configure * [kf5notifications] update versions Co-authored-by: Kuntal Majumder --- ports/kf5notifications/fix_config_cmake.patch | 55 +++++++++++++++++++ ports/kf5notifications/portfile.cmake | 31 +++++++++++ ports/kf5notifications/vcpkg.json | 45 +++++++++++++++ versions/baseline.json | 4 ++ versions/k-/kf5notifications.json | 9 +++ 5 files changed, 144 insertions(+) create mode 100644 ports/kf5notifications/fix_config_cmake.patch create mode 100644 ports/kf5notifications/portfile.cmake create mode 100644 ports/kf5notifications/vcpkg.json create mode 100644 versions/k-/kf5notifications.json diff --git a/ports/kf5notifications/fix_config_cmake.patch b/ports/kf5notifications/fix_config_cmake.patch new file mode 100644 index 00000000000000..318881cfbfaeea --- /dev/null +++ b/ports/kf5notifications/fix_config_cmake.patch @@ -0,0 +1,55 @@ +diff --git a/KF5NotificationsConfig.cmake.in b/KF5NotificationsConfig.cmake.in +index eeded42..6b261c0 100644 +--- a/KF5NotificationsConfig.cmake.in ++++ b/KF5NotificationsConfig.cmake.in +@@ -11,5 +11,47 @@ if (@HAVE_DBUS@) + find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) + endif() + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ ++ if (@HAVE_KWINDOWSYSTEM@) ++ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") ++ endif() ++ ++ if (@WITH_SNORETOAST@) ++ find_dependency(LibSnoreToast) ++ find_dependency(Qt5Network @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if (@HAVE_PHONON4QT5@) ++ find_dependency(Phonon4Qt5) ++ endif() ++ ++ if (@Canberra_FOUND@) ++ find_dependency(Canberra) ++ endif() ++ ++ if (@Qt5TextToSpeech_FOUND@) ++ find_dependency(Qt5TextToSpeech @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if(@X11_FOUND@) ++ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if(APPLE) ++ find_dependency(Qt5MacExtras @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if(@HAVE_DBUSMENUQT@) ++ find_dependency(dbusmenu-qt5) ++ endif() ++ ++ if (ANDROID) ++ find_dependency(Qt5AndroidExtras @REQUIRED_QT_VERSION@) ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5NotificationsTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake new file mode 100644 index 00000000000000..afff6c000fc71d --- /dev/null +++ b/ports/kf5notifications/portfile.cmake @@ -0,0 +1,31 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/knotifications + REF v5.84.0 + SHA512 ee8d2d0531df726f3e372983e30c2365aab887e1a3cdf5fb9c1b788e78b490f984018a44934ce62116bf10827fbf9aeeaf23236a7024a0e3757a1da7e90dca6c + HEAD_REF master + PATCHES + fix_config_cmake.patch +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Notifications CONFIG_PATH lib/cmake/KF5Notifications) +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json new file mode 100644 index 00000000000000..f2b920c1301801 --- /dev/null +++ b/ports/kf5notifications/vcpkg.json @@ -0,0 +1,45 @@ +{ + "name": "kf5notifications", + "version": "5.84.0", + "description": "Desktop notifications", + "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5coreaddons", + { + "name": "kf5windowsystem", + "platform": "!android" + }, + { + "name": "libcanberra", + "platform": "!(windows | uwp)" + }, + { + "name": "libsnoretoast", + "platform": "windows" + }, + { + "name": "qt5-androidextras", + "platform": "android" + }, + "qt5-base", + { + "name": "qt5-macextras", + "platform": "osx" + }, + "qt5-tools", + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 669d17b5a8e870..18fe25429c52e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3048,6 +3048,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5notifications": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5package": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json new file mode 100644 index 00000000000000..b837ed00d08145 --- /dev/null +++ b/versions/k-/kf5notifications.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a565cfd79777b605b4e3fc57be5bd2957c498c7f", + "version": "5.84.0", + "port-version": 0 + } + ] +} From e3cb075b4feee011654b89562e4d2159e52cf91a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:34:53 +0200 Subject: [PATCH 0686/1858] [proj4] remove feature "database" (#20368) * [proj4] remove database feature * [mapnik] remove dependency an feature 'database' of proj4 * add version files --- ports/mapnik/vcpkg.json | 8 ++------ ports/proj4/portfile.cmake | 5 +---- ports/proj4/vcpkg.json | 22 ++++++++-------------- versions/baseline.json | 4 ++-- versions/m-/mapnik.json | 5 +++++ versions/p-/proj4.json | 5 +++++ 6 files changed, 23 insertions(+), 26 deletions(-) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index c6aebcc527709d..b9f2c7d4a1fac6 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mapnik", "version-date": "2021-09-15", + "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", @@ -152,12 +153,7 @@ "proj": { "description": "PROJ Functionalities", "dependencies": [ - { - "name": "proj4", - "features": [ - "database" - ] - } + "proj4" ] }, "svg-renderer": { diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 34fb1fd028cf9c..73a458e84fcf62 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -23,7 +23,6 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - database BUILD_PROJ_DATABASE tools BUILD_CCT tools BUILD_CS2CS tools BUILD_GEOD @@ -38,9 +37,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(FEATURE_OPTIONS ${FEATURE_OPTIONS} -DENABLE_TIFF=OFF -DENABLE_CURL=OFF -DBUILD_PROJSYNC=OFF) endif() -if ("database" IN_LIST FEATURES) - set(EXE_SQLITE3 ${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}) -endif() +set(EXE_SQLITE3 "${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index b2d12fc0013bf5..2f497276326d99 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proj4", "version-semver": "7.2.1", - "port-version": 5, + "port-version": 6, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ @@ -9,6 +9,13 @@ "name": "sqlite3", "default-features": false }, + { + "name": "sqlite3", + "host": true, + "features": [ + "tool" + ] + }, { "name": "vcpkg-cmake", "host": true @@ -19,22 +26,9 @@ } ], "default-features": [ - "database", "tiff" ], "features": { - "database": { - "description": "generate database", - "dependencies": [ - { - "name": "sqlite3", - "host": true, - "features": [ - "tool" - ] - } - ] - }, "tiff": { "description": "Enable TIFF support to read some grids", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 18fe25429c52e4..cf5f47eccea93b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4150,7 +4150,7 @@ }, "mapnik": { "baseline": "2021-09-15", - "port-version": 0 + "port-version": 1 }, "marble": { "baseline": "19.08.2", @@ -5262,7 +5262,7 @@ }, "proj4": { "baseline": "7.2.1", - "port-version": 5 + "port-version": 6 }, "prometheus-cpp": { "baseline": "0.13.0", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 7924f1250b7be4..1445956f5a7ff5 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d75a684e7f654d0fc2485c4fa501a8821056c92b", + "version-date": "2021-09-15", + "port-version": 1 + }, { "git-tree": "794329d32e3af221bb8751cf747f354d087fceab", "version-date": "2021-09-15", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index 1c72aae292c594..43d8f699e25857 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7d82e5f8d67636114f179f44b7277f818e3754c", + "version-semver": "7.2.1", + "port-version": 6 + }, { "git-tree": "aa22133ae2355b540a2676402896abc323f26aa9", "version-semver": "7.2.1", From 0457b192af27b939f9b79bb107a3d8a6e12b09ed Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:35:27 +0200 Subject: [PATCH 0687/1858] [sleepy-discord] fix [core] build (#20372) --- ports/sleepy-discord/fix-boost.patch | 13 +++++++++++++ ports/sleepy-discord/portfile.cmake | 6 ++++-- ports/sleepy-discord/vcpkg.json | 6 ++++++ versions/baseline.json | 2 +- versions/s-/sleepy-discord.json | 5 +++++ 5 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 ports/sleepy-discord/fix-boost.patch diff --git a/ports/sleepy-discord/fix-boost.patch b/ports/sleepy-discord/fix-boost.patch new file mode 100644 index 00000000000000..a8279182dea92e --- /dev/null +++ b/ports/sleepy-discord/fix-boost.patch @@ -0,0 +1,13 @@ +diff --git a/sleepy_discord/CMakeLists.txt b/sleepy_discord/CMakeLists.txt +index 6c134141..2d115985 100644 +--- a/sleepy_discord/CMakeLists.txt ++++ b/sleepy_discord/CMakeLists.txt +@@ -84,7 +84,7 @@ if (NOT ONLY_SLEEPY_DISCORD) + elseif(USE_BOOST_ASIO) + #Look for boost as an alt + find_package(Boost REQUIRED) +- list(APPEND LIBRARIES_TO_LINK ${Boost_LIBRARIES}) ++ list(APPEND LIBRARIES_INCLUDE_DIRS "${Boost_INCLUDE_DIRS}") + list(APPEND LIB_CONFIG "EXISTENT_BOOST_ASIO") + list(APPEND LIB_CONFIG "EXISTENT_ASIO") + list(APPEND REQUIRED_PACKAGES "Boost") diff --git a/ports/sleepy-discord/portfile.cmake b/ports/sleepy-discord/portfile.cmake index b59a2779f6ca95..027a9edc5add8c 100644 --- a/ports/sleepy-discord/portfile.cmake +++ b/ports/sleepy-discord/portfile.cmake @@ -1,7 +1,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "websocketpp" USE_WEBSOCKETPP - "websocketpp" USE_BOOST_ASIO "cpr" USE_CPR "voice" ENABLE_VOICE "compression" USE_ZLIB @@ -13,6 +12,8 @@ vcpkg_from_github( REF 53e68d6a569ab6da17b74279e308bf94919db933 SHA512 1ee6de7aa70f3d7fc6ec0e21f5e65c6a868c23a29b4f26f614b59bbce3425c1305ce192562bf287d40f98060301b8638bc4bef95789fe8594ce5809adb6dc1e5 HEAD_REF develop + PATCHES + fix-boost.patch ) # Handle version data here to prevent issues from doing this twice in parallel @@ -32,12 +33,13 @@ vcpkg_cmake_configure( OPTIONS -DSLEEPY_VCPKG=ON -DAUTO_DOWNLOAD_LIBRARY=OFF + -DUSE_BOOST_ASIO=ON ${FEATURE_OPTIONS} ) vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sleepy-discord) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sleepy-discord) file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/sleepy-discord/vcpkg.json b/ports/sleepy-discord/vcpkg.json index 2e4ff128eeb36a..1fc2355beb9b8b 100644 --- a/ports/sleepy-discord/vcpkg.json +++ b/ports/sleepy-discord/vcpkg.json @@ -1,12 +1,18 @@ { "name": "sleepy-discord", "version-date": "2021-07-07", + "port-version": 1, "description": "C++ library for the Discord chat client", "homepage": "https://yourwaifu.dev/sleepy-discord/", "dependencies": [ + "boost-asio", { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index cf5f47eccea93b..25d3f87ed289b4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6122,7 +6122,7 @@ }, "sleepy-discord": { "baseline": "2021-07-07", - "port-version": 0 + "port-version": 1 }, "slikenet": { "baseline": "2021-06-07", diff --git a/versions/s-/sleepy-discord.json b/versions/s-/sleepy-discord.json index 49b1554c315898..d3d2a31a87d08a 100644 --- a/versions/s-/sleepy-discord.json +++ b/versions/s-/sleepy-discord.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0aba637e01389ec4ed5923eaf898ca78dac96cbb", + "version-date": "2021-07-07", + "port-version": 1 + }, { "git-tree": "9ef84b8cb8cdd5d278b005a551044a6635490bda", "version-date": "2021-07-07", From ce67d4cfcf66d381700ee584c9ee081a02da669a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:35:56 +0200 Subject: [PATCH 0688/1858] [easyloggingpp] Update to 9.97.0 (#20394) * Update easyloggingpp to 9.97.0 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/easyloggingpp/portfile.cmake | 18 +++++++++--------- ports/easyloggingpp/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/e-/easyloggingpp.json | 5 +++++ 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index 6df99d27d3ec59..a2d04b6ca962b8 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -3,20 +3,20 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO muflihun/easyloggingpp - REF v9.96.7 - SHA512 53ee637cd7462fac542170a81a9a206f3418dd8bc9e1f25d1d13dadef630e0fdf2880d71079808ebc49d36a7dbca7b5cdb76ad37b722c66b4b3d3efc8b5d2f35 + REF v9.97.0 + SHA512 E45789EDAF7A43AD6A73861840D24CCCE9B9D6BBA1AAACF93C6AC26FF7449957251D2CA322C9DA85130B893332DD305B13A2499EAFFC65ECFAAAFA3E11F8D63D HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dbuild_static_lib=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/easyloggingpp" RENAME copyright) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/easyloggingpp RENAME copyright) diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json index 8f7066d5531c5a..1dbf4d6e081414 100644 --- a/ports/easyloggingpp/vcpkg.json +++ b/ports/easyloggingpp/vcpkg.json @@ -1,6 +1,16 @@ { "name": "easyloggingpp", - "version-string": "9.96.7", - "port-version": 2, - "description": "Easylogging++ is a single header efficient logging library for C++ applications." + "version": "9.97.0", + "description": "Easylogging++ is a single header efficient logging library for C++ applications.", + "homepage": "https://github.com/amrayn/easyloggingpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 25d3f87ed289b4..d9f5c29bb26a27 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1917,8 +1917,8 @@ "port-version": 0 }, "easyloggingpp": { - "baseline": "9.96.7", - "port-version": 2 + "baseline": "9.97.0", + "port-version": 0 }, "eathread": { "baseline": "1.32.09", diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json index 3c076f8357a838..a9b91c65a578d1 100644 --- a/versions/e-/easyloggingpp.json +++ b/versions/e-/easyloggingpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3978e3f41876c42b501eb4d246ee98dea886fa36", + "version": "9.97.0", + "port-version": 0 + }, { "git-tree": "4dccf41488f050a70d3232a86296883b54533d2f", "version-string": "9.96.7", From 79505da4877a996ae5a3746416f26f9b9086949a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:36:24 +0200 Subject: [PATCH 0689/1858] [meshoptimizer] Update to 0.16 (#20395) * Update meshoptimizer to 0.16 * Update CI baseline * Address PR feedback * Update git-tree hash Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/meshoptimizer/portfile.cmake | 21 +++++++++------------ ports/meshoptimizer/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/m-/meshoptimizer.json | 5 +++++ 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ports/meshoptimizer/portfile.cmake b/ports/meshoptimizer/portfile.cmake index e46b174601a5c0..f72d3e493412b6 100644 --- a/ports/meshoptimizer/portfile.cmake +++ b/ports/meshoptimizer/portfile.cmake @@ -1,29 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeux/meshoptimizer - REF v0.14 - SHA512 303b3bf1bed7cba8f89bce1c2782e3718fc8f4ec01f7ffd64f5ca23406130097f07d234b142916b16fe586db97c7deaa0ae9135b4e558543cc1664e7db85de67 + REF v0.16 + SHA512 CC6D28359FB99A615E1046A4AF1B247CBC6EA0266D9E7F41EA0516C1FC09FA1E67376071DAF138A126C77BCA3BAF9D565636ED0E3ADF045F1A08498C38B7A7E7 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMESHOPT_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/meshoptimizer) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/meshoptimizer) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/meshoptimizer/vcpkg.json b/ports/meshoptimizer/vcpkg.json index 47439742eaabe6..7124de0788bd9c 100644 --- a/ports/meshoptimizer/vcpkg.json +++ b/ports/meshoptimizer/vcpkg.json @@ -1,7 +1,16 @@ { "name": "meshoptimizer", - "version-string": "0.14", - "port-version": 2, + "version": "0.16", "description": "Mesh optimization library that makes meshes smaller and faster to render", - "homepage": "https://github.com/zeux/meshoptimizer" + "homepage": "https://github.com/zeux/meshoptimizer", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d9f5c29bb26a27..c91372a19a3b57 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4217,8 +4217,8 @@ "port-version": 4 }, "meshoptimizer": { - "baseline": "0.14", - "port-version": 2 + "baseline": "0.16", + "port-version": 0 }, "metis": { "baseline": "5.1.0", diff --git a/versions/m-/meshoptimizer.json b/versions/m-/meshoptimizer.json index cb58f7af4c13d2..57964ad9deb119 100644 --- a/versions/m-/meshoptimizer.json +++ b/versions/m-/meshoptimizer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1693991d70ae383ea21f4f634f8d0f136e15bd7", + "version": "0.16", + "port-version": 0 + }, { "git-tree": "f565fc6b5cc9a3c133af9193a7d06915cf9b6845", "version-string": "0.14", From d9c0ffe225682f663d84f43c44c1fc94b74a5c87 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:36:49 +0200 Subject: [PATCH 0690/1858] [onednn] Update to 2.3.2 (#20396) * Update onednn to 2.3.2 * Update CI baseline * Fix vcpkg_cmake_config_fixup * Update git-tree hash * Update portfile.cmake * Update versions/o-/onednn.json Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/onednn/portfile.cmake | 15 +++++++-------- ports/onednn/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/o-/onednn.json | 5 +++++ 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index c2179d5ffe13e2..69d0a17e7d5799 100644 --- a/ports/onednn/portfile.cmake +++ b/ports/onednn/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN - REF v2.0 - SHA512 740fa871e29edc8bb8a54d4ba615e856712f7f63efe4c70f4a3d5f6d143d60bc51366b9355ab4b6702718ba711b48350ea49b1335ec10c1dc4f655cc9728ff3e + REF v2.3.2 + SHA512 14B3E6E40F29250AAE1FC677E6723953CA3BFBC9544B32CA1AE51ABA35DAB53C8CFCC58DD57610E644EB324821F3F370A31E8D960B1E4D5AF0C066441ED7FF45 HEAD_REF master ) @@ -12,18 +12,17 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(DNNL_OPTIONS "-DDNNL_LIBRARY_TYPE=STATIC") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${DNNL_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # The port name and the find_package() name are different (onednn versus dnnl) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/dnnl TARGET_PATH share/dnnl) +vcpkg_cmake_config_fixup(PACKAGE_NAME dnnl CONFIG_PATH lib/cmake/dnnl) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Copyright and license -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index 86f7989f486f1a..7e46d72ba515ad 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,7 +1,17 @@ { "name": "onednn", - "version-string": "2.0", - "port-version": 1, + "version-semver": "2.3.2", "description": "oneAPI Deep Neural Network Library (oneDNN)", - "supports": "x64 & !uwp" + "homepage": "https://github.com/oneapi-src/oneDNN", + "supports": "x64 & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index c91372a19a3b57..ebc61866003bd6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4741,8 +4741,8 @@ "port-version": 0 }, "onednn": { - "baseline": "2.0", - "port-version": 1 + "baseline": "2.3.2", + "port-version": 0 }, "oniguruma": { "baseline": "6.9.4", diff --git a/versions/o-/onednn.json b/versions/o-/onednn.json index f403b00d023b08..c3cfeb88686e31 100644 --- a/versions/o-/onednn.json +++ b/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d3bacca42ae3bc1a41217c50f23953f13220732", + "version-semver": "2.3.2", + "port-version": 0 + }, { "git-tree": "c48b3b7e1da48208cce9dbd5ee231d8c087b29ac", "version-string": "2.0", From 2139058508c4aafd0435937bf57a3dbac93d3443 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:37:39 +0200 Subject: [PATCH 0691/1858] [numcpp] Update to 2.6.0 (#20397) * Update numcpp to 2.6.0 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/numcpp/portfile.cmake | 20 ++++++++------------ ports/numcpp/vcpkg.json | 14 +++++++++++--- versions/baseline.json | 2 +- versions/n-/numcpp.json | 5 +++++ 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/ports/numcpp/portfile.cmake b/ports/numcpp/portfile.cmake index d605b19da6b892..e2dce207f88e81 100644 --- a/ports/numcpp/portfile.cmake +++ b/ports/numcpp/portfile.cmake @@ -2,23 +2,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dpilger26/NumCpp - REF fc68d897f8c2ae4f5b14baff3eefda897351abbd # 2.1.0 - SHA512 ce407d9782d304658853cd66ba5901a4dc84d8cf74d45b2dd466ca6328f6bf60b39906efd5373624df6b46c4253f861208b15254d0e156fdb09f32ca731ad2bc + REF Version_2.6.0 + SHA512 4D057941F4CB541CFAA56E4188C865DFC1804CA1B2203422B9EB7D7E8EE43CCB15DC5109DA5C932234E6055B6A5554D877347FA7CAEC5EA619A2975A56D2B16C HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DNUMCPP_TEST=OFF - -DNUMCPP_EXAMPLES=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/NumCpp/cmake TARGET_PATH share/NumCpp) +vcpkg_cmake_config_fixup(PACKAGE_NAME NumCpp CONFIG_PATH share/NumCpp/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/numcpp/vcpkg.json b/ports/numcpp/vcpkg.json index dab0d3abc3d62b..d93591882171e7 100644 --- a/ports/numcpp/vcpkg.json +++ b/ports/numcpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "numcpp", - "version-string": "2.1.0", + "version": "2.6.0", "description": "C++ implementation of the Python Numpy library", "homepage": "https://dpilger26.github.io/NumCpp", "license": "MIT", @@ -11,11 +11,19 @@ "boost-math", "boost-predef", "boost-random", - "boost-type-traits" + "boost-type-traits", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "python": { - "description": "Interacting with python with pybind11 interface", + "description": "Interacting with Python with pybind11 interface", "dependencies": [ "boost-python", "pybind11" diff --git a/versions/baseline.json b/versions/baseline.json index ebc61866003bd6..c4d9cef9fe6952 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4637,7 +4637,7 @@ "port-version": 1 }, "numcpp": { - "baseline": "2.1.0", + "baseline": "2.6.0", "port-version": 0 }, "nuspell": { diff --git a/versions/n-/numcpp.json b/versions/n-/numcpp.json index 659a2810c65683..6d168e28a70f67 100644 --- a/versions/n-/numcpp.json +++ b/versions/n-/numcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "648047125e8e78a10fec23ab02b10037197206a6", + "version": "2.6.0", + "port-version": 0 + }, { "git-tree": "9661c913b6651de51f8e3b42be395eaece9b0475", "version-string": "2.1.0", From e7f5fb2bcc65ba57f12b38f2a1902c8f45cd4e0d Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:38:00 +0200 Subject: [PATCH 0692/1858] [indicators] Update to 2.2 (#20398) * Update indicators to 2.2 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/indicators/portfile.cmake | 21 +++++++++++---------- ports/indicators/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/i-/indicators.json | 5 +++++ 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/ports/indicators/portfile.cmake b/ports/indicators/portfile.cmake index c4a49c0cc192d6..4a71032b702693 100644 --- a/ports/indicators/portfile.cmake +++ b/ports/indicators/portfile.cmake @@ -3,25 +3,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO p-ranav/indicators - REF b85eadb47c1d0f0edbb4da9c3b6384ec6486b24a # v2.0 - SHA512 e9674440fa8643284a593b9e93345dc849301f42fe644b485e5dad1e12a20ef6687a2bf1eaeb2aec542d74544b7193c9b76b0166d7570781bc11604c71e8132a + REF v2.2 + SHA512 7CED2D3C320D51C7E0569104744730C8E2F952350BCAE214A9781EB43EF4002C8314937DB78461351741FC4C3AEE7A1364582B1274991E95EB30006A5F2A7EF9 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DINDICATORS_BUILD_TESTS=OFF -DINDICATORS_SAMPLES=OFF -DINDICATORS_DEMO=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/indicators) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/indicators) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.termcolor" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/LICENSE.termcolor DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/indicators/vcpkg.json b/ports/indicators/vcpkg.json index 5cca6d4b3e2317..80bf1bb012ba6e 100644 --- a/ports/indicators/vcpkg.json +++ b/ports/indicators/vcpkg.json @@ -1,6 +1,16 @@ { "name": "indicators", - "version": "2.0", + "version": "2.2", "description": "Activity indicators for modern C++", - "homepage": "https://github.com/p-ranav/indicators" + "homepage": "https://github.com/p-ranav/indicators", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index c4d9cef9fe6952..ec4d98a1828053 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2793,7 +2793,7 @@ "port-version": 0 }, "indicators": { - "baseline": "2.0", + "baseline": "2.2", "port-version": 0 }, "influxdb-cxx": { diff --git a/versions/i-/indicators.json b/versions/i-/indicators.json index b30cb7a4e7a302..014ea54588e4ce 100644 --- a/versions/i-/indicators.json +++ b/versions/i-/indicators.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f6f4a44b4af9900116de9bd567e78372d3f7278", + "version": "2.2", + "port-version": 0 + }, { "git-tree": "d3271abb0e661db9fa81a346851c0caaa540ade6", "version": "2.0", From fb75cf6da9b8419cdf204df62bba89e640870d36 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:38:23 +0200 Subject: [PATCH 0693/1858] [open62541] Update to 1.2.2 (#20399) * Update open62541 to 1.2.2 * Update CI baseline * delete double quotes * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III --- ports/open62541/portfile.cmake | 33 +++++++++++++++++---------------- ports/open62541/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/o-/open62541.json | 5 +++++ 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index 55fbd6edb9ab9c..e6612315cda4bd 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -1,26 +1,27 @@ -set(VERSION v1.1) +set(VERSION v1.2.2) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 - REF 8ad84962e67987af91d7f746425d7b26be47a0cb # v1.1.2 - SHA512 7cca9458cdfbc386c0a7012373c91e9ab3a4876303db95a513f62cf26e751446bd73c0fa1f76e0821d2a47747bfb4612e8822389bc9002775636db8f8093f94c + REF "${VERSION}" + SHA512 E6A1EC2208EC29D8685D2A957FAE6F3FEDC0E847D6AB1BB8AC5C7980223BC377692334C87575956B53BB37A9B71C5DEDD1B5C4F19F122561543D04661FEFE1D5 HEAD_REF master ) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - openssl UA_ENABLE_ENCRYPTION_OPENSSL - mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS - amalgamation UA_ENABLE_AMALGAMATION +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openssl UA_ENABLE_ENCRYPTION_OPENSSL + mbedtls UA_ENABLE_ENCRYPTION_MBEDTLS + amalgamation UA_ENABLE_AMALGAMATION ) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DOPEN62541_VERSION=${VERSION} @@ -28,12 +29,12 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/open62541/tools) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/open62541/tools") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 0dcbcb81b3c6de..a1e80fc4cca295 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,9 +1,18 @@ { "name": "open62541", - "version": "1.1.2", - "port-version": 2, + "version": "1.2.2", "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "openssl" ], diff --git a/versions/baseline.json b/versions/baseline.json index ec4d98a1828053..ff9231e1f89484 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4761,8 +4761,8 @@ "port-version": 0 }, "open62541": { - "baseline": "1.1.2", - "port-version": 2 + "baseline": "1.2.2", + "port-version": 0 }, "openal-soft": { "baseline": "1.21.1", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index f91b9f9b34cfd8..1edf75bb727c5e 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9f30c2699c8919f074676b99f79358ef1f0a059", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "98a37e8146a1e56f67a180b3c239f903ed59c401", "version": "1.1.2", From b709eaf2e7050b519d520be381d84d043d5b9bb3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:39:07 +0200 Subject: [PATCH 0694/1858] [pegtl] Update to 3.2.1 (#20400) * Update pegtl to 3.2.1 * Update CI baseline * Update ports/pegtl/portfile.cmake * Update versions/p-/pegtl.json Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/pegtl/portfile.cmake | 17 ++++++++--------- ports/pegtl/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/p-/pegtl.json | 5 +++++ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index 265f596c4f2675..f54e1d239c68fd 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,14 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.2.0 - SHA512 3ec457e37d87d95f3a89c550abbf611a1ce094c2f05f6d23086e70079a9cabddb4c75e9121e764ad1768845a39e62ab49ca658ffed0f09d0e9a0e36501a162ae + REF 3.2.1 + SHA512 6297ADEA085BB3043A60C28EB3A868A7C2D203B351F907EA3FDC4EF34C63F87A5786AC7D297531F8B8C8C3414F5DDEF658A025A7BAE2515BDC750E974975F6FF HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPEGTL_BUILD_TESTS=OFF -DPEGTL_BUILD_EXAMPLES=OFF @@ -16,11 +15,11 @@ vcpkg_configure_cmake( -DPEGTL_INSTALL_CMAKE_DIR=share/pegtl/cmake ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/pegtl/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/pegtl/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pegtl/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index 0a56f3f726d460..9db2de5a3009db 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,7 +1,16 @@ { "name": "pegtl", - "version-string": "3.2.0", - "port-version": 1, + "version-semver": "3.2.1", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", - "homepage": "https://github.com/taocpp/PEGTL" + "homepage": "https://github.com/taocpp/PEGTL", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ff9231e1f89484..a499edc0cbdaeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5073,8 +5073,8 @@ "port-version": 1 }, "pegtl": { - "baseline": "3.2.0", - "port-version": 1 + "baseline": "3.2.1", + "port-version": 0 }, "pegtl-2": { "baseline": "2.8.3", diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index 94ef7afee68a5b..abc03684dff518 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a95202decfce79a39190525dea1c3a135bf393f", + "version-semver": "3.2.1", + "port-version": 0 + }, { "git-tree": "2e4a20284dace72d0591ae48e03087333c857991", "version-string": "3.2.0", From ed7ef66132280949b6a25b37b3fa7b95c4715207 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 29 Sep 2021 23:39:58 +0800 Subject: [PATCH 0695/1858] [mozjpeg] Update to latest commit (#20401) * [mozjpeg] Update to latest commit * update version * Convert patch format * update version * Add double quotes * update version Co-authored-by: Billy Robert O'Neal III --- ports/mozjpeg/fix-install-error.patch | 24 ++---------------------- ports/mozjpeg/portfile.cmake | 27 +++++++++++++-------------- ports/mozjpeg/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/m-/mozjpeg.json | 5 +++++ 5 files changed, 32 insertions(+), 41 deletions(-) diff --git a/ports/mozjpeg/fix-install-error.patch b/ports/mozjpeg/fix-install-error.patch index 0d0a283652a6c2..da8ecce9fcecf4 100644 --- a/ports/mozjpeg/fix-install-error.patch +++ b/ports/mozjpeg/fix-install-error.patch @@ -1,25 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt +index ae07280..54dc4f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1369,13 +1369,13 @@ - ############################################################################### - - set(EXE ${CMAKE_EXECUTABLE_SUFFIX}) - - if(WITH_TURBOJPEG) - if(ENABLE_SHARED) -- install(TARGETS turbojpeg tjbench -+ install(TARGETS turbojpeg #tjbench - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND - CMAKE_C_LINKER_SUPPORTS_PDB) - install(FILES "$" -@@ -1413,13 +1413,13 @@ - DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME djpeg${EXE}) - install(PROGRAMS ${DIR}/jpegtran-static${EXE} - DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME jpegtran${EXE}) +@@ -1487,7 +1487,7 @@ if(ENABLE_STATIC) endif() endif() @@ -28,6 +11,3 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt - ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c - ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt - ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt diff --git a/ports/mozjpeg/portfile.cmake b/ports/mozjpeg/portfile.cmake index b5095a9adadc6e..2cd6bbdf73470a 100644 --- a/ports/mozjpeg/portfile.cmake +++ b/ports/mozjpeg/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mozilla/mozjpeg - REF 6d95c51adf0c314017f541b6cb07e13cc1bce754 - SHA512 a21c8b3a561b387933a27befaa1d05a8c63b0e203d72d73071a4c9b57c6b7d57b44836f211c4dcb80eee4b01876f0a0fb4c91a60c3ae867e906e5e4e27165627 + REF 512a7c3a51071981e4b314c9bc029f1daa3fb72b #2021-09-27 + SHA512 bdada9757bec5e02533d976a988210e59e37a07aa9dd321d29f18161d4143a1398c004b210d05748aa61a9005411b46e9e0bfa37af2b45570e45020fbc28f551 HEAD_REF master PATCHES fix-install-error.patch @@ -20,16 +20,15 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_SHARED=${ENABLE_SHARED} -DENABLE_STATIC=${ENABLE_STATIC} -DWITH_CRT_DLL=${WITH_CRT_DLL} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Rename libraries for static builds if(VCPKG_LIBRARY_LINKAGE STREQUAL static) @@ -42,20 +41,20 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") endif() endif() - +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mozjpeg) # Remove extra debug files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_copy_tools(TOOL_NAMES cjpeg djpeg jpegtran AUTO_CLEAN) +vcpkg_copy_tools(TOOL_NAMES cjpeg djpeg jpegtran tjbench AUTO_CLEAN) vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() # Remove empty folders after static build if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_pdbs() \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mozjpeg/vcpkg.json b/ports/mozjpeg/vcpkg.json index 605abca1c253dc..cf7e96cf29cefa 100644 --- a/ports/mozjpeg/vcpkg.json +++ b/ports/mozjpeg/vcpkg.json @@ -1,10 +1,17 @@ { "name": "mozjpeg", - "version-string": "2020-06-02", - "port-version": 3, + "version-date": "2021-09-27", "description": "MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.", "homepage": "https://github.com/mozilla/mozjpeg", "dependencies": [ - "libpng" + "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index a499edc0cbdaeb..a448eb1ba47217 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4361,8 +4361,8 @@ "port-version": 0 }, "mozjpeg": { - "baseline": "2020-06-02", - "port-version": 3 + "baseline": "2021-09-27", + "port-version": 0 }, "mp-units": { "baseline": "0.6.0", diff --git a/versions/m-/mozjpeg.json b/versions/m-/mozjpeg.json index 25217d56917ed8..cd92e4264cd9a2 100644 --- a/versions/m-/mozjpeg.json +++ b/versions/m-/mozjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7713d74fddfa5b02228fdc489661c9ba15686cb6", + "version-date": "2021-09-27", + "port-version": 0 + }, { "git-tree": "0d92e5b33e3b57bed654510b0562ac82c68019cf", "version-string": "2020-06-02", From bc8369a26b7e1b7678bb2d7b1966acf9aa7b5339 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Wed, 29 Sep 2021 17:40:26 +0200 Subject: [PATCH 0696/1858] [boinc] Fix typo (#20404) Signed-off-by: Vitalii Koshura --- ports/boinc/CMakeLists.txt | 2 +- ports/boinc/vcpkg.json | 1 + versions/b-/boinc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/boinc/CMakeLists.txt b/ports/boinc/CMakeLists.txt index 635aa9011ab098..7e45922086f30d 100644 --- a/ports/boinc/CMakeLists.txt +++ b/ports/boinc/CMakeLists.txt @@ -214,7 +214,7 @@ target_include_directories(boinc PUBLIC target_include_directories(boincapi PUBLIC $ - $/lib + $ $ ) diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index 126e73dbfde6cf..f597fb040bad60 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boinc", "version": "7.18.1", + "port-version": 1, "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "supports": "!(windows & arm) & !uwp", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 63e7b8e24f348a..1a417d7685ab46 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47766741495b79066e3e24b1547684024b9e16b8", + "version": "7.18.1", + "port-version": 1 + }, { "git-tree": "9fcf80005012082801212b0761a61a53f92b6104", "version": "7.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index a448eb1ba47217..2bd80884302efb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -490,7 +490,7 @@ }, "boinc": { "baseline": "7.18.1", - "port-version": 0 + "port-version": 1 }, "bond": { "baseline": "9.0.3", From f0229079706eefbef90123b8f382dc01bca04f17 Mon Sep 17 00:00:00 2001 From: Ronald <3665590+playgithub@users.noreply.github.com> Date: Wed, 29 Sep 2021 23:41:39 +0800 Subject: [PATCH 0697/1858] [vcpkg docs] Make telemetry section of README.md clearer (#20412) * Update README.md format section telemetry to make it more clear * Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 936cc16819873f..2ece9836272a12 100644 --- a/README.md +++ b/README.md @@ -356,8 +356,9 @@ The code in this repository is licensed under the [MIT License](LICENSE.txt). vcpkg collects usage data in order to help us improve your experience. The data collected by Microsoft is anonymous. -You can opt-out of telemetry by re-running the bootstrap-vcpkg script with -disableMetrics, -passing --disable-metrics to vcpkg on the command line, -or by setting the VCPKG_DISABLE_METRICS environment variable. +You can opt-out of telemetry by +- running the bootstrap-vcpkg script with -disableMetrics +- passing --disable-metrics to vcpkg on the command line +- setting the VCPKG_DISABLE_METRICS environment variable Read more about vcpkg telemetry at docs/about/privacy.md From bb8e18da0c96012783e70eb84470f77827b2a16a Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 29 Sep 2021 08:42:09 -0700 Subject: [PATCH 0698/1858] [rsm-mmio] Fix port installation (#20416) * correct config fixup package name * update versioning --- ports/rsm-mmio/portfile.cmake | 5 ++++- ports/rsm-mmio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rsm-mmio.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/rsm-mmio/portfile.cmake b/ports/rsm-mmio/portfile.cmake index 12cf6500028e20..a55ed8760c8e81 100644 --- a/ports/rsm-mmio/portfile.cmake +++ b/ports/rsm-mmio/portfile.cmake @@ -14,7 +14,10 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/mmio") +vcpkg_cmake_config_fixup( + PACKAGE_NAME "mmio" + CONFIG_PATH "lib/cmake/mmio" +) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" diff --git a/ports/rsm-mmio/vcpkg.json b/ports/rsm-mmio/vcpkg.json index 7115a226f2e8a4..fa7d4f7da53b2d 100644 --- a/ports/rsm-mmio/vcpkg.json +++ b/ports/rsm-mmio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rsm-mmio", "version-semver": "1.1.0", + "port-version": 1, "description": "A cross-platform memory-mapped io library for C++ ", "homepage": "https://github.com/Ryan-rsm-McKenzie/mmio", "supports": "!osx & !uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 2bd80884302efb..89e26944d318c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5858,7 +5858,7 @@ }, "rsm-mmio": { "baseline": "1.1.0", - "port-version": 0 + "port-version": 1 }, "rsocket": { "baseline": "2020.05.04.00", diff --git a/versions/r-/rsm-mmio.json b/versions/r-/rsm-mmio.json index 981d24616c2096..ac662f9756a3d9 100644 --- a/versions/r-/rsm-mmio.json +++ b/versions/r-/rsm-mmio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "634597e88010f239748fafb52c6e8f431242b53a", + "version-semver": "1.1.0", + "port-version": 1 + }, { "git-tree": "8a7d738a20500733ea97af87e6f83df5558856c9", "version-semver": "1.1.0", From 1c654c4f6548b2a6e40eec27c379b4832c026a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8F=9C=E5=A7=AC?= Date: Wed, 29 Sep 2021 23:44:05 +0800 Subject: [PATCH 0699/1858] [libass] update to 0.15.2 and fix .pc file (#20410) * [libass] update to 0.15.2 and fix .pc file on windows * [libass] Add to versions file --- ports/libass/CMakeLists.txt | 4 +++- ports/libass/portfile.cmake | 4 ++-- ports/libass/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libass.json | 5 +++++ 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt index eaaa80b1343078..b2331d325752fe 100644 --- a/ports/libass/CMakeLists.txt +++ b/ports/libass/CMakeLists.txt @@ -82,7 +82,9 @@ if(WIN32 OR APPLE) else() set(PKG_REQUIRES_PRIVATE "fontconfig >= 2.10.92, harfbuzz >= 1.2.3, fribidi >= 0.19.0, freetype2 >= 9.10.3") endif() -set(PKG_LIBS_PRIVATE -lm) +if (NOT WIN32) + set(PKG_LIBS_PRIVATE -lm) +endif() configure_file(libass.pc.in libass.pc @ONLY) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libass.pc diff --git a/ports/libass/portfile.cmake b/ports/libass/portfile.cmake index 7207b9e058aa8a..e1a185a381e0c2 100644 --- a/ports/libass/portfile.cmake +++ b/ports/libass/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libass/libass - REF 0.15.1 - SHA512 eadda1dcdeb15be8cecbb14ad922eb3f366a780d82376d257c799424a0296b4d7539e86f12234e8c1480bdea423d9dbb78644b18970f65b8f5af5d0ef49c5fc9 + REF 0.15.2 + SHA512 ae3ea533e57ab3c386ce457dbaa39a256801b7340649d5ff80a51410481e73ab194724744b97d85cb6d111798e45eee594bb22da2f1f3c547fe8e331e0690127 HEAD_REF master ) diff --git a/ports/libass/vcpkg.json b/ports/libass/vcpkg.json index 9abf0a1f1891bc..f4b2821676ba1d 100644 --- a/ports/libass/vcpkg.json +++ b/ports/libass/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libass", - "version": "0.15.1", - "port-version": 1, + "version": "0.15.2", "description": "libass is a portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format", "homepage": "https://github.com/libass/libass", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 89e26944d318c8..655a059dbc3648 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3221,8 +3221,8 @@ "port-version": 1 }, "libass": { - "baseline": "0.15.1", - "port-version": 1 + "baseline": "0.15.2", + "port-version": 0 }, "libassuan": { "baseline": "2.5.3", diff --git a/versions/l-/libass.json b/versions/l-/libass.json index 389e1aa4407d71..ba862065635b4a 100644 --- a/versions/l-/libass.json +++ b/versions/l-/libass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "358f5ebe2b07d2c3043f1397a7caa51fcf7ebdce", + "version": "0.15.2", + "port-version": 0 + }, { "git-tree": "7c9d2203cb8e0f912847cdd70a9ba1142b1ab32f", "version": "0.15.1", From 80e56fb90b504fdbd326d4eefd28ec1392bc2d69 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 29 Sep 2021 17:46:03 +0200 Subject: [PATCH 0700/1858] [cli11] Update to 2.1.0 (#20304) * Update cli11 to 2.1.0 * Update CI baseline * Change version-semver to version for cli11 * Update git-tree version Co-authored-by: chausner --- ports/cli11/portfile.cmake | 8 ++++---- ports/cli11/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cli11.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 78776fdbebdfd0..43cb23df563acc 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF 0d06d21b56eadef9dcb24907ee2866b2b6f0babe #version 2.0.0 - SHA512 1952ce0e9fd3bc6646f00abdd7f0f7bae541c383b691a985b0f70ca53fe80a9acbcf68c07c59e021c92aae7b1e062fd7ffe4c9f9b198b95525dde3a1ce83c2f5 + REF v2.1.0 + SHA512 22c75e6b55d5320656ca2f65bf7c1dc82546fa65458f66a3d6401d002e83f12a0ee93a572637f5daa8daed9e0ce11fbf4aabf864caadc851f75bced63814ba10 HEAD_REF master ) @@ -16,9 +16,9 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CLI11) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/CLI11) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json index 93f45475d5a495..dc20fd1e19650c 100644 --- a/ports/cli11/vcpkg.json +++ b/ports/cli11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cli11", - "version-semver": "2.0.0", + "version": "2.1.0", "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", "homepage": "https://github.com/CLIUtils/CLI11", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 655a059dbc3648..9d6dfb5ad25925 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1373,7 +1373,7 @@ "port-version": 0 }, "cli11": { - "baseline": "2.0.0", + "baseline": "2.1.0", "port-version": 0 }, "clickhouse-cpp": { diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json index 019131c1064450..2406a85a9c64d9 100644 --- a/versions/c-/cli11.json +++ b/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07b6e6eba954d7f9300768c354e650ae32582c90", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "1430611e0538943498bb96f67ab5de443c76cad2", "version-semver": "2.0.0", From 28d06b1b1fa7a23baeabedc2c31641bd7c058c28 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 29 Sep 2021 23:46:34 +0800 Subject: [PATCH 0701/1858] [boost-process] Add missing include on algorithm (#20421) --- ports/boost-process/fix_include.patch | 13 +++++++++++++ ports/boost-process/portfile.cmake | 2 ++ ports/boost-process/vcpkg.json | 1 + versions/b-/boost-process.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/boost-process/fix_include.patch diff --git a/ports/boost-process/fix_include.patch b/ports/boost-process/fix_include.patch new file mode 100644 index 00000000000000..49d30691821059 --- /dev/null +++ b/ports/boost-process/fix_include.patch @@ -0,0 +1,13 @@ +diff --git a/include/boost/process/detail/traits/wchar_t.hpp b/include/boost/process/detail/traits/wchar_t.hpp +index 812a92c..98026d3 100644 +--- a/include/boost/process/detail/traits/wchar_t.hpp ++++ b/include/boost/process/detail/traits/wchar_t.hpp +@@ -12,6 +12,8 @@ + #include + #include + ++#include ++ + namespace boost { namespace process { namespace detail { + + //template diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 27c0d16470d439..262e9f07d02687 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF boost-1.77.0 SHA512 00eb27f702f092a20fdf1669b8c9c993b751971592d0bc5aa50b02d99d985a75361621b624aa51eb550c9e7905e15877168ae9d0feb1957fc85f99c264b152fd HEAD_REF master + PATCHES + fix_include.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 594b842c6081bf..904e902383c8b4 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-process", "version": "1.77.0", + "port-version": 1, "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "supports": "!emscripten", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index 464304c2fa244d..d30c66c9ebcbca 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e70acbb855538f95200b341b1cf26d9c1dc6e6cd", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "6589096a03d4f8ea1590b1b9e1bdc41a47c2f907", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 9d6dfb5ad25925..1f3b359b277d1a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -898,7 +898,7 @@ }, "boost-process": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-program-options": { "baseline": "1.77.0", From 1bdcf7d82288954523dcb521d153fa2d1d9b7fa8 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Thu, 30 Sep 2021 00:55:10 +0900 Subject: [PATCH 0702/1858] [gemmlowp] create a new port (#20403) * [gemmlowp] create a new port * update baseline JSON * [gemmlowp] support find_pacakge * export `unofficial::` targets * [gemmlowp] add HEAD_REF * [gemmlowp] use latest sources * remove patches to support find_package --- ports/gemmlowp/portfile.cmake | 22 ++++++++++++++++++++++ ports/gemmlowp/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/g-/gemmlowp.json | 9 +++++++++ 4 files changed, 52 insertions(+) create mode 100644 ports/gemmlowp/portfile.cmake create mode 100644 ports/gemmlowp/vcpkg.json create mode 100644 versions/g-/gemmlowp.json diff --git a/ports/gemmlowp/portfile.cmake b/ports/gemmlowp/portfile.cmake new file mode 100644 index 00000000000000..7a58537f6757f4 --- /dev/null +++ b/ports/gemmlowp/portfile.cmake @@ -0,0 +1,22 @@ +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/gemmlowp + REF daf630d3d0c439dbe22229838a5ba1bc5f82908d + SHA512 8d1a422bbf2495dcec1c30147bc96d0a2ca494220a45050937f84567c3352cd8916f07d1bbab68c8d36ae7ce3e9b8bee8b518900e21967a3185bf7ff25812785 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/contrib" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/gemmlowp/vcpkg.json b/ports/gemmlowp/vcpkg.json new file mode 100644 index 00000000000000..329fa1101430c8 --- /dev/null +++ b/ports/gemmlowp/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "gemmlowp", + "version-date": "2021-09-28", + "description": "Low-precision matrix multiplication", + "homepage": "https://github.com/google/gemmlowp", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1f3b359b277d1a..68e1720da7c16a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2336,6 +2336,10 @@ "baseline": "2.42.2", "port-version": 1 }, + "gemmlowp": { + "baseline": "2021-09-28", + "port-version": 0 + }, "genann": { "baseline": "2019-07-10", "port-version": 1 diff --git a/versions/g-/gemmlowp.json b/versions/g-/gemmlowp.json new file mode 100644 index 00000000000000..dc471d15289812 --- /dev/null +++ b/versions/g-/gemmlowp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "843bf152a690b01de4606a68a769e67e8d1ca6bf", + "version-date": "2021-09-28", + "port-version": 0 + } + ] +} From 59191b5ea68217364a1f6bbea0ba06e9b85817df Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 29 Sep 2021 12:00:21 -0400 Subject: [PATCH 0703/1858] [python3] Add patch to fix Windows 11 SDK build failure. (#20292) * [python3] Remove spurious dependencies. * [python3] Add workaround for SDK 10.0.22000.0 * x-add-version --- ...und-windows-11-sdk-rc-compiler-error.patch | 30 +++++++++++++++++++ ports/python3/portfile.cmake | 14 +++++---- ports/python3/vcpkg.json | 9 +----- versions/baseline.json | 2 +- versions/p-/python3.json | 5 ++++ 5 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch diff --git a/ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch b/ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch new file mode 100644 index 00000000000000..e5f8237d161b69 --- /dev/null +++ b/ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch @@ -0,0 +1,30 @@ +From 0a72b7061ed79c5d6d37b41a5b1610e32fb371a4 Mon Sep 17 00:00:00 2001 +From: Adam Johnson +Date: Wed, 22 Sep 2021 21:04:21 -0400 +Subject: [PATCH] workaround windows 11 sdk rc compiler error + +winnt.h was changed to error if the `SYSTEM_CACHE_ALIGNMENT` cannot be +determined. when the RC compiler is invoked, this seems to fail where +previous SDKs silently set the ARM value. +--- + PC/python_ver_rc.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h +index 90fc6ba1a1..e313a5138e 100644 +--- a/PC/python_ver_rc.h ++++ b/PC/python_ver_rc.h +@@ -1,3 +1,10 @@ ++// Temporarily workaround bug in Windows SDK 10.0.22000.0 winnt.h ++#ifdef RC_INVOKED ++# ifndef SYSTEM_CACHE_ALIGNMENT_SIZE ++# define SYSTEM_CACHE_ALIGNMENT_SIZE 64 ++# endif ++#endif ++ + // Resource script for Python core DLL. + // Currently only holds version information. + // +-- +2.33.0.windows.1 + diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 069008408025c4..2ea8783771ae64 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -28,6 +28,14 @@ elseif(VCPKG_TARGET_IS_WINDOWS AND CMAKE_SYSTEM_VERSION EQUAL 6.1) message(FATAL_ERROR "python3 requires the feature deprecated-win7-support when building on Windows 7.") endif() +# The Windows 11 SDK has a problem that causes it to error on the resource files, so we patch that. +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + vcpkg_get_windows_sdk(WINSDK_VERSION) + if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000") + list(APPEND PATCHES "0008-workaround-windows-11-sdk-rc-compiler-error.patch") + endif() +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython @@ -88,11 +96,6 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) "/p:ForceImportBeforeCppTargets=${SOURCE_PATH}/PCbuild/python_vcpkg.props" ) endif() - string(REPLACE "\\" "" WindowsSDKVersion "$ENV{WindowsSDKVersion}") - list(APPEND OPTIONS - "/p:WindowsTargetPlatformVersion=${WindowsSDKVersion}" - "/p:DefaultWindowsSDKVersion=${WindowsSDKVersion}" - ) if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS "/p:IncludeUwp=true") else() @@ -117,6 +120,7 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) PROJECT_SUBPATH "PCbuild/pcbuild.proj" OPTIONS ${OPTIONS} LICENSE_SUBPATH "LICENSE" + TARGET_PLATFORM_VERSION "${WINSDK_VERSION}" SKIP_CLEAN ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 5803414a87dad0..63740b289393bc 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "python3", "version-semver": "3.9.7", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", @@ -34,14 +35,6 @@ "name": "sqlite3", "platform": "!(windows & static)" }, - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 68e1720da7c16a..5bc10b05b53e32 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5330,7 +5330,7 @@ }, "python3": { "baseline": "3.9.7", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 34194e0abba275..b4fc820092f7d9 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a1011c32aa2eb7de0b9a6184b2805e34c41f0b5", + "version-semver": "3.9.7", + "port-version": 1 + }, { "git-tree": "b3a545b39c982b7f0a12891765dd9909e364ebc6", "version-semver": "3.9.7", From f0d786a054b29270e558e1b38c62a263ccdc0c45 Mon Sep 17 00:00:00 2001 From: Christian Fersch Date: Wed, 29 Sep 2021 18:04:29 +0200 Subject: [PATCH 0704/1858] [minizip-ng] Make dependencies optional (#20324) * [minizip-ng] Make dependencies optional * minor changes from review * improve implementation of crypto feature * x-add-version * split crypto into 3 features * properly forward features --- ports/minizip-ng/portfile.cmake | 20 +++++++-- ports/minizip-ng/vcpkg.json | 79 +++++++++++++++++++++++++++++---- versions/baseline.json | 2 +- versions/m-/minizip-ng.json | 5 +++ 4 files changed, 94 insertions(+), 12 deletions(-) diff --git a/ports/minizip-ng/portfile.cmake b/ports/minizip-ng/portfile.cmake index 69ccb97af3a68b..9faecfc489567e 100644 --- a/ports/minizip-ng/portfile.cmake +++ b/ports/minizip-ng/portfile.cmake @@ -8,11 +8,25 @@ vcpkg_from_github( Modify-header-file-path.patch ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + pkcrypt MZ_PKCRYPT + signing MZ_SIGNING + wzaes MZ_WZAES + openssl MZ_OPENSSL + bzip2 MZ_BZIP2 + lzma MZ_LZMA + zlib MZ_ZLIB + zstd MZ_ZSTD +) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS + ${FEATURE_OPTIONS} + -DMZ_FETCH_LIBS=OFF -DMZ_PROJECT_SUFFIX:STRING=-ng ) @@ -25,4 +39,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/minizip-ng/copyright" COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/minizip-ng/vcpkg.json b/ports/minizip-ng/vcpkg.json index 33f77dd29a98cc..eeab4ef8e853e5 100644 --- a/ports/minizip-ng/vcpkg.json +++ b/ports/minizip-ng/vcpkg.json @@ -1,16 +1,11 @@ { "name": "minizip-ng", "version": "3.0.2", + "port-version": 1, "description": "minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux.", "homepage": "https://github.com/zlib-ng/minizip-ng", "supports": "!uwp", "dependencies": [ - "bzip2", - "liblzma", - { - "name": "openssl", - "platform": "linux" - }, { "name": "vcpkg-cmake", "host": true @@ -18,8 +13,76 @@ { "name": "vcpkg-cmake-config", "host": true - }, + } + ], + "default-features": [ + "bzip2", + "lzma", + "pkcrypt", + "signing", + "wzaes", "zlib", "zstd" - ] + ], + "features": { + "bzip2": { + "description": "Enables BZIP2 compression", + "dependencies": [ + "bzip2" + ] + }, + "lzma": { + "description": "Enables LZMA compression", + "dependencies": [ + "liblzma" + ] + }, + "openssl": { + "description": "Enables OpenSSL for encryption", + "dependencies": [ + "openssl" + ] + }, + "pkcrypt": { + "description": "Enables PKWARE traditional encryption" + }, + "signing": { + "description": "Enables zip signing support", + "dependencies": [ + { + "name": "minizip-ng", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !osx" + } + ] + }, + "wzaes": { + "description": "Enables WinZIP AES encryption", + "dependencies": [ + { + "name": "minizip-ng", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !osx" + } + ] + }, + "zlib": { + "description": "Enables ZLIB compression", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Enables ZSTD compression", + "dependencies": [ + "zstd" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 5bc10b05b53e32..854de77eb2ae10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4298,7 +4298,7 @@ }, "minizip-ng": { "baseline": "3.0.2", - "port-version": 0 + "port-version": 1 }, "mio": { "baseline": "2019-02-10", diff --git a/versions/m-/minizip-ng.json b/versions/m-/minizip-ng.json index 7230ce31c9e0a0..e71ee7e3321b64 100644 --- a/versions/m-/minizip-ng.json +++ b/versions/m-/minizip-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4a8de7f8609b758c48eea13b67d47c22efc832a3", + "version": "3.0.2", + "port-version": 1 + }, { "git-tree": "9c49a3f4d6bb3e5173cf17e1539b439dcf4bf6ea", "version": "3.0.2", From 03571bf5838de1029a45fcc6555a2cbb6c26596b Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 29 Sep 2021 13:15:25 -0700 Subject: [PATCH 0705/1858] [macos ci] move out tensorflow (#20388) * [macos ci] move out tensorflow * rename ExtraPorts and CorePorts Co-authored-by: nicole mazzuca Co-authored-by: Billy Robert O'Neal III --- scripts/azure-pipelines/azure-pipelines.yml | 10 ++++ .../azure-pipelines/generate-skip-list.ps1 | 4 +- .../azure-pipelines/osx/azure-pipelines.yml | 41 ++++++++++++-- .../azure-pipelines/test-modified-ports.ps1 | 55 ++++++++++++------- 4 files changed, 84 insertions(+), 26 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index f57de88355be64..49d30c2bc578ab 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -52,6 +52,16 @@ jobs: - template: osx/azure-pipelines.yml parameters: poolName: $(osx-pool) + ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + mode: AllPorts + ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + mode: NonTensorflow +- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: + - template: osx/azure-pipelines.yml + parameters: + poolName: $(osx-pool) + mode: OnlyTensorflow + jobName: x64_osx_tensorflow - template: linux/azure-pipelines.yml parameters: diff --git a/scripts/azure-pipelines/generate-skip-list.ps1 b/scripts/azure-pipelines/generate-skip-list.ps1 index 84b78b33878721..6c533595faf9c9 100755 --- a/scripts/azure-pipelines/generate-skip-list.ps1 +++ b/scripts/azure-pipelines/generate-skip-list.ps1 @@ -20,7 +20,8 @@ The path to the ci.baseline.txt file. Param( [string]$Triplet, [string]$BaselineFile, - [switch]$SkipFailures = $false + [switch]$SkipFailures = $false, + [String[]]$AdditionalSkips = @() ) $ErrorActionPreference = 'Stop' @@ -80,4 +81,5 @@ if ($SkipFailures) { $skip_list = $baselineForTriplet ` | Where-Object { $_ -match $targetRegex } ` | ForEach-Object { $_ -replace ":.*$" } +$skip_list += $AdditionalSkips [string]::Join(",", $skip_list) diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index aa5884f0b6f766..f90a7c82cbb014 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -2,8 +2,21 @@ # SPDX-License-Identifier: MIT # +parameters: +- name: poolName + type: string +- name: mode + type: string + values: + - 'AllPorts' + - 'NonTensorflow' + - 'OnlyTensorflow' +- name: jobName + type: string + default: x64_osx + jobs: -- job: x64_osx +- job: "${{ parameters.jobName }}" pool: name: ${{ parameters.poolName }} workspace: @@ -20,6 +33,18 @@ jobs: - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES value: "x-azurl,$(root-url),$(sas),readwrite" + - name: PowershellExtraArguments + ${{ if eq(parameters.mode, 'AllPorts') }}: + value: '' + ${{ if eq(parameters.mode, 'NonTensorflow') }}: + value: "-AdditionalSkips @('tensorflow', 'tensorflow-cc')" + ${{ if eq(parameters.mode, 'OnlyTensorflow') }}: + value: "-OnlyTest @('tensorflow', 'tensorflow-cc')" + - name: Postfix + ${{ if eq(parameters.mode, 'OnlyTensorflow') }}: + value: '-tensorflow' + ${{ if ne(parameters.mode, 'OnlyTensorflow') }}: + value: '' steps: - bash: df -h @@ -39,7 +64,13 @@ jobs: inputs: failOnStderr: true filePath: 'scripts/azure-pipelines/test-modified-ports.ps1' - arguments: '-Triplet x64-osx -BuildReason $(Build.Reason) -BinarySourceStub "$(BINARY_SOURCE_STUB)" -WorkingRoot ${{ variables.WORKING_ROOT }} -ArtifactStagingDirectory $(Build.ArtifactStagingDirectory)' + arguments: > + -Triplet "x64-osx" + -BuildReason "$(Build.Reason)" + -BinarySourceStub "${{ variables.BINARY_SOURCE_STUB }}" + -WorkingRoot "${{ variables.WORKING_ROOT }}" + -ArtifactStagingDirectory "$(Build.ArtifactStagingDirectory)" + ${{ variables.PowershellExtraArguments }} pwsh: true - bash: | df -h @@ -49,15 +80,15 @@ jobs: displayName: 'Publish Artifact: failure logs for x64-osx' inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/failure-logs' - ArtifactName: 'failure logs for x64-osx' + ArtifactName: 'failure logs for x64-osx${{ variables.Postfix }}' condition: ne(variables['FAILURE_LOGS_EMPTY'], 'True') - bash: | python3 scripts/file_script.py /Users/vagrant/Data/installed/vcpkg/info/ displayName: 'Build a file list for all packages' condition: always() - task: PublishBuildArtifacts@1 - displayName: 'Publish Artifact: file lists for x64-osx' + displayName: 'Publish Artifact: file lists for x64-osx${{ variables.Postfix }}' condition: always() inputs: PathtoPublish: scripts/list_files - ArtifactName: 'file lists for x64-osx' + ArtifactName: 'file lists for x64-osx${{ variables.Postfix }}' diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index d55c6f629a54c1..46ea637dcacdad 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -46,9 +46,10 @@ Param( $ArchivesRoot = $null, [Parameter(ParameterSetName='BinarySourceStub')] $BinarySourceStub = $null, - $BuildReason = $null, - [switch] - $PassingIsPassing = $false + [String]$BuildReason = $null, + [String[]]$AdditionalSkips = @(), + [String[]]$OnlyTest = $null, + [switch]$PassingIsPassing = $false ) if (-Not ((Test-Path "triplets/$Triplet.cmake") -or (Test-Path "triplets/community/$Triplet.cmake"))) { @@ -124,28 +125,42 @@ if ($LASTEXITCODE -ne 0) $skipList = . "$PSScriptRoot/generate-skip-list.ps1" ` -Triplet $Triplet ` -BaselineFile "$PSScriptRoot/../ci.baseline.txt" ` - -SkipFailures:$skipFailures + -SkipFailures:$skipFailures ` + -AdditionalSkips $AdditionalSkips -if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) +if ($null -ne $OnlyTest) { - # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. - # The workaround is to pass the skip list as host-excludes as well. - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs + $OnlyTest | % { + $portName = $_ + & "./vcpkg$executableExtension" install --triplet $Triplet @commonArgs $portName + [System.Console]::Error.WriteLine( ` + "REGRESSION: ${portName}:$triplet. If expected, remove ${portName} from the OnlyTest list." ` + ) + } } else { - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs -} + if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) + { + # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. + # The workaround is to pass the skip list as host-excludes as well. + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs + } + else + { + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs + } -$failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0) -Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" + $failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0) + Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" -if ($LASTEXITCODE -ne 0) -{ - throw "vcpkg ci failed" -} + if ($LASTEXITCODE -ne 0) + { + throw "vcpkg ci failed" + } -& "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` - -triplet $Triplet ` - -baselineFile .\scripts\ci.baseline.txt ` - -passingIsPassing:$PassingIsPassing + & "$PSScriptRoot/analyze-test-results.ps1" -logDir $xmlResults ` + -triplet $Triplet ` + -baselineFile .\scripts\ci.baseline.txt ` + -passingIsPassing:$PassingIsPassing +} From 9832f37d72c843abdbbdaedb27b482d59046ab5c Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 29 Sep 2021 18:03:18 -0700 Subject: [PATCH 0706/1858] Build fixes from 2021-09-28's nightly build. (#20435) https://dev.azure.com/vcpkg/public/_build/results?buildId=60445 PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static Probably fixed by: https://github.com/microsoft/vcpkg/pull/19377 REGRESSION: mosquitto:x86-windows REGRESSION: mosquitto:x64-windows Probably broken by: https://github.com/microsoft/vcpkg/pull/20148/ ``` The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets. D:/packages/mosquitto_x86-windows/bin/mosquitto_ctrl.exe The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets. D:/packages/mosquitto_x86-windows/debug/bin/mosquitto_ctrl.exe Found 2 error(s). Please correct the portfile: C:\a\1\s\ports\mosquitto\portfile.cmake -- Performing post-build validation done ``` The upstream build system has this: ``` option(WITH_CJSON "Build with cJSON support (required for dynamic security plugin and useful for mosquitto_sub)?" ON) if (WITH_CJSON) FIND_PACKAGE(cJSON) if (CJSON_FOUND) message(STATUS ${CJSON_FOUND}) else (CJSON_FOUND) message(STATUS "Optional dependency cJSON not found. Some features will be disabled.") endif(CJSON_FOUND) endif() ``` and indeed, I repro the problem if cjson is installed first. Disable WITH_CJSON as a fix. OSX never finishing: Hopefully fixed by https://github.com/microsoft/vcpkg/pull/20388 --- ports/mosquitto/portfile.cmake | 1 + ports/mosquitto/vcpkg.json | 1 + scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/m-/mosquitto.json | 5 +++++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index 321ac137cb9a29..8994d654356a82 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_configure_cmake( -DWITH_THREADING=ON -DDOCUMENTATION=OFF -DWITH_PLUGINS=OFF + -DWITH_CJSON=OFF ) vcpkg_install_cmake() diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index 13ee87acaf5d47..b755eff18a1902 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mosquitto", "version": "2.0.12", + "port-version": 1, "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", "homepage": "https://mosquitto.org/download/", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7de3b6423e4102..84a6f18bf29655 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1466,7 +1466,6 @@ soqt:arm-uwp=fail soqt:x64-uwp=fail soundtouch:arm-uwp=fail soundtouch:x64-uwp=fail -soundtouch:x64-windows-static=fail spaceland:arm64-windows=fail spaceland:arm-uwp=fail spaceland:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 854de77eb2ae10..661c07e67c1730 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4362,7 +4362,7 @@ }, "mosquitto": { "baseline": "2.0.12", - "port-version": 0 + "port-version": 1 }, "mozjpeg": { "baseline": "2021-09-27", diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index 5572dcfdce9674..0fe4043f198df9 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ef8ae230660456d039888e201ea521f58caf0951", + "version": "2.0.12", + "port-version": 1 + }, { "git-tree": "90a1a4314b15a787186d515df048f77961a4c7f3", "version": "2.0.12", From 2d8585a90f7254c03cf2e380b02dde13fa7abe2c Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 30 Sep 2021 03:06:21 +0200 Subject: [PATCH 0707/1858] [rbdl-orb] Update port to version 3.1.2 (#20305) * update rbdl-orb port to newest source version * vcpkg x-add-version rbdl-orb * fixup cmake files location * update versions database * Update ports/rbdl-orb/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update version database * update port to newest commit on rbdl-orb * update version database * update rbdl-orb port * update version database * Update versions/r-/rbdl-orb.json Co-authored-by: Billy O'Neal * Update versions/r-/rbdl-orb.json Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy O'Neal Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/rbdl-orb/portfile.cmake | 10 ++++++---- ports/rbdl-orb/vcpkg.json | 7 +++++-- versions/baseline.json | 4 ++-- versions/r-/rbdl-orb.json | 5 +++++ 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ports/rbdl-orb/portfile.cmake b/ports/rbdl-orb/portfile.cmake index 02da8be0784ad8..f29acca1f19959 100644 --- a/ports/rbdl-orb/portfile.cmake +++ b/ports/rbdl-orb/portfile.cmake @@ -7,16 +7,16 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RBDL_STATIC) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ORB-HD/rbdl-orb - REF b22abab856a90dbc62e6b2e79f148bd383b5ce43 - SHA512 744a60145243454a9d148971d998ae7a3cc5b9d66131b5d6f3c7be80d6c9ef8b8bf4390b9d1b90b14be6c619c2e1d14c7c6104b3ca6e606e22e3581b548e4f9d + REF a2e5428729b636c6232c3b90e4ddac80f7d42b1a + SHA512 2a10b3a7ac4e49b0ac5e7204f419a132bef7431c3ba55a72a8d10f9fea1972419682367bda32506b8daf58fc65405c7f3b7fe11fe661fc3dc6c98a3206cf1253 HEAD_REF master ) vcpkg_from_github( OUT_SOURCE_PATH PARSER_SOURCE_PATH REPO ORB-HD/URDF_Parser - REF 0f3310d766c658b72d54560833012c8fe63ce9d7 - SHA512 6cd8e300cc47b5a5370efb5a4cd843a1621e2832b790daedc1e260ba5bbcaaabdbcddce239f93c3900258093d483d332110ba7e9f0b4b6cda64ce51b6cf2365d + REF 8fcc3174743cf3e7561ffb6625524f8133161df4 + SHA512 6cba22e98f23e74fd7c1dcb356d88b5e24c61913dc900e584ed313b1fcce5d6832ceafcf15a3ea7a56714ab82d3cd7d9f4350d3d242614561c836bd4735e3f4f ) if(NOT EXISTS "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser/CMakeLists.txt") file(REMOVE_RECURSE "${SOURCE_PATH}/addons/urdfreader/thirdparty/urdfparser") @@ -31,6 +31,7 @@ vcpkg_cmake_configure( -DRBDL_BUILD_ADDON_GEOMETRY=ON -DRBDL_BUILD_ADDON_URDFREADER=ON -DRBDL_BUILD_EXECUTABLES=OFF + -DRBDL_VCPKG_BUILD=ON ) vcpkg_cmake_install() @@ -38,5 +39,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/RBDL PACKAGE_NAME RBDL) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rbdl-orb/vcpkg.json b/ports/rbdl-orb/vcpkg.json index 8b460557a64d70..86920c98e44880 100644 --- a/ports/rbdl-orb/vcpkg.json +++ b/ports/rbdl-orb/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rbdl-orb", - "version": "3.0.0", - "port-version": 1, + "version": "3.1.2", "description": "Rigid Body Dynamics Library - ORB", "homepage": "https://github.com/orb-hd/rbdl-orb", "dependencies": [ @@ -11,6 +10,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 661c07e67c1730..8c4ebc40d12aa4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5729,8 +5729,8 @@ "port-version": 1 }, "rbdl-orb": { - "baseline": "3.0.0", - "port-version": 1 + "baseline": "3.1.2", + "port-version": 0 }, "re2": { "baseline": "2021-09-01", diff --git a/versions/r-/rbdl-orb.json b/versions/r-/rbdl-orb.json index f2ec0ef61c950e..b9a6133f8c879a 100644 --- a/versions/r-/rbdl-orb.json +++ b/versions/r-/rbdl-orb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6cec01f39c02f0ac2164e31e4615e21a80f4515", + "version": "3.1.2", + "port-version": 0 + }, { "git-tree": "5850c6901f4123803184bfe9b6e587af9350331a", "version": "3.0.0", From 1706b16b01a45d86b2a66a06550c1e82d7e72eaf Mon Sep 17 00:00:00 2001 From: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com> Date: Thu, 30 Sep 2021 05:43:32 +0200 Subject: [PATCH 0708/1858] [tensorflow] update to 2.6 (#20015) * Revert "incorporate changes from microsoft:master" * Revert "Revert "incorporate changes from microsoft:master"" * WIP: update to tensorflow 2.6 * update patch * update more patches * fix patch again * fix new Windows compile/linkage errors * fix patch * fix patch again * temporarily revert Windows build option fix to test whether upstream fix doesn't work * check if constexpr is sufficient (is_same_v requires C++17) * try patch for build parameters * remove fastbuild patch and improve constexpr patch (no C++17 requirement) (fastbuild patch didn't work because bazel overrides it with /DEBUG:FULL) * x-add-version * add C++17 preprocessor switch for "if constexpr" * x-add-version * remove pre-processor switch (doesn't work without) * x-add-version * work-around toolchain issues on macOS * x-add-version * fix Windows build options (must be string, not list) * x-add-version * temporarily add code to debug CI * temporarily add more debug output as build doesn't even start on macOS CI * remove debug code, add switch for linker parameters on macOS and re-introduce old behaviour (some platforms still use old behaviour) * x-add-version * fix broken string termination * x-add-version * fix function name * x-add-version Co-authored-by: jgehw Co-authored-by: Billy Robert O'Neal III --- ports/tensorflow-cc/vcpkg.json | 3 +- .../Update-bazel-max-version.patch | 5 +- .../change-macros-for-static-lib.patch | 57 ++++++++++++- .../convert_lib_params_macos.py | 26 +++--- ports/tensorflow-common/fix-build-error.patch | 3 +- ports/tensorflow-common/fix-linux-build.patch | 25 ------ .../tensorflow-common/fix-windows-build.patch | 65 ++++++++++++--- .../generate_static_link_cmd_linux.py | 4 +- .../generate_static_link_cmd_macos.py | 81 +++++++++++++++---- .../generate_static_link_cmd_windows.py | 4 +- ports/tensorflow-common/portfile.cmake | 1 - .../tensorflow-common/tensorflow-common.cmake | 19 ++--- ports/tensorflow-common/vcpkg.json | 3 +- ports/tensorflow/vcpkg.json | 2 +- versions/baseline.json | 10 +-- versions/t-/tensorflow-cc.json | 5 ++ versions/t-/tensorflow-common.json | 5 ++ versions/t-/tensorflow.json | 5 ++ 18 files changed, 228 insertions(+), 95 deletions(-) delete mode 100644 ports/tensorflow-common/fix-linux-build.patch diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json index d67e50c93e6ab8..b2f1edcc77f92e 100644 --- a/ports/tensorflow-cc/vcpkg.json +++ b/ports/tensorflow-cc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tensorflow-cc", - "version-semver": "2.4.1", - "port-version": 1, + "version-semver": "2.6.0", "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)", "homepage": "https://github.com/tensorflow/tensorflow", "supports": "!(x86 | arm | uwp)", diff --git a/ports/tensorflow-common/Update-bazel-max-version.patch b/ports/tensorflow-common/Update-bazel-max-version.patch index 9dffd884b0206b..172a6439d319f7 100644 --- a/ports/tensorflow-common/Update-bazel-max-version.patch +++ b/ports/tensorflow-common/Update-bazel-max-version.patch @@ -1,11 +1,10 @@ diff --git a/configure.py b/configure.py -index e5428a6..9324d7b 100644 --- a/configure.py +++ b/configure.py -@@ -47,7 +47,7 @@ _TF_WORKSPACE_ROOT = '' +@@ -50,7 +50,7 @@ _TF_BAZELRC = '' _TF_CURRENT_BAZEL_VERSION = None - _TF_MIN_BAZEL_VERSION = '3.1.0' + _TF_MIN_BAZEL_VERSION = '3.7.2' -_TF_MAX_BAZEL_VERSION = '3.99.0' +_TF_MAX_BAZEL_VERSION = '4.1.0' diff --git a/ports/tensorflow-common/change-macros-for-static-lib.patch b/ports/tensorflow-common/change-macros-for-static-lib.patch index daff655cebc670..a9d5fe7a04e0a4 100644 --- a/ports/tensorflow-common/change-macros-for-static-lib.patch +++ b/ports/tensorflow-common/change-macros-for-static-lib.patch @@ -103,7 +103,7 @@ diff --git a/tensorflow/c/c_api_macros.h b/tensorflow/c/c_api_macros.h diff --git a/tensorflow/c/kernels.h b/tensorflow/c/kernels.h --- a/tensorflow/c/kernels.h +++ b/tensorflow/c/kernels.h -@@ -23,24 +23,7 @@ +@@ -24,24 +24,7 @@ #include "tensorflow/c/tf_status.h" #include "tensorflow/c/tf_tensor.h" @@ -129,6 +129,35 @@ diff --git a/tensorflow/c/kernels.h b/tensorflow/c/kernels.h #ifdef __cplusplus extern "C" { +diff --git a/tensorflow/c/kernels_experimental.h b/tensorflow/c/kernels_experimental.h +--- a/tensorflow/c/kernels_experimental.h ++++ b/tensorflow/c/kernels_experimental.h +@@ -25,24 +25,7 @@ + // The API here is subject to changes in the future. + // -------------------------------------------------------------------------- + +-// Macro to control visibility of exported symbols in the shared library (.so, +-// .dylib, .dll). +-// This duplicates the TF_EXPORT macro definition in +-// tensorflow/core/platform/macros.h in order to keep this .h file independent +-// of any other includes. +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + + #ifdef __cplusplus + extern "C" { + diff --git a/tensorflow/c/ops.h b/tensorflow/c/ops.h --- a/tensorflow/c/ops.h +++ b/tensorflow/c/ops.h @@ -212,7 +241,7 @@ diff --git a/tensorflow/c/tf_tensor.h b/tensorflow/c/tf_tensor.h @@ -23,24 +23,7 @@ #include "tensorflow/c/tf_datatype.h" #include "tensorflow/c/tf_status.h" - + -// Macro to control visibility of exported symbols in the shared library (.so, -// .dylib, .dll). -// This duplicates the TF_EXPORT macro definition in @@ -231,7 +260,31 @@ diff --git a/tensorflow/c/tf_tensor.h b/tensorflow/c/tf_tensor.h -#define TF_CAPI_EXPORT __attribute__((visibility("default"))) -#endif // _WIN32 -#endif // SWIG + + #ifdef __cplusplus + extern "C" { +diff --git a/tensorflow/c/tf_tstring.h b/tensorflow/c/tf_tstring.h +--- a/tensorflow/c/tf_tstring.h ++++ b/tensorflow/c/tf_tstring.h +@@ -18,19 +18,7 @@ + #include "tensorflow/c/tf_tensor.h" + #include "tensorflow/core/platform/ctstring.h" + +-#ifdef SWIG + #define TF_CAPI_EXPORT +-#else +-#if defined(_WIN32) +-#ifdef TF_COMPILE_LIBRARY +-#define TF_CAPI_EXPORT __declspec(dllexport) +-#else +-#define TF_CAPI_EXPORT __declspec(dllimport) +-#endif // TF_COMPILE_LIBRARY +-#else +-#define TF_CAPI_EXPORT __attribute__((visibility("default"))) +-#endif // _WIN32 +-#endif // SWIG + #ifdef __cplusplus extern "C" { diff --git a/ports/tensorflow-common/convert_lib_params_macos.py b/ports/tensorflow-common/convert_lib_params_macos.py index b3c419363e6cf4..d49f4d58168298 100644 --- a/ports/tensorflow-common/convert_lib_params_macos.py +++ b/ports/tensorflow-common/convert_lib_params_macos.py @@ -1,18 +1,20 @@ +import os.path import sys version = sys.argv[1] lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] -with open(f"libtensorflow{lib_suffix}.{version}.a-2.params", "w") as f_out: - parts = [] - with open(f"libtensorflow_framework.{version}.dylib-2.params", "r") as f_in: - for line in f_in: - if line.startswith("-Wl,-force_load,"): - f_out.write(line[16:]) - parts.append(line[16:]) - parts = set(parts) - with open(f"libtensorflow{lib_suffix}.{version}.dylib-2.params", "r") as f_in: - for line in f_in: - if line.startswith("-Wl,-force_load,"): - if line[16:] not in parts: +if os.path.isfile(f"libtensorflow_framework.{version}.dylib-2.params"): + with open(f"libtensorflow{lib_suffix}.{version}.a-2.params", "w") as f_out: + parts = [] + with open(f"libtensorflow_framework.{version}.dylib-2.params", "r") as f_in: + for line in f_in: + if line.startswith("-Wl,-force_load,"): f_out.write(line[16:]) + parts.append(line[16:]) + parts = set(parts) + with open(f"libtensorflow{lib_suffix}.{version}.dylib-2.params", "r") as f_in: + for line in f_in: + if line.startswith("-Wl,-force_load,"): + if line[16:] not in parts: + f_out.write(line[16:]) diff --git a/ports/tensorflow-common/fix-build-error.patch b/ports/tensorflow-common/fix-build-error.patch index 89a15f17a44c17..eb2a91c97c650b 100644 --- a/ports/tensorflow-common/fix-build-error.patch +++ b/ports/tensorflow-common/fix-build-error.patch @@ -1,8 +1,7 @@ diff --git a/tensorflow/core/platform/default/logging.h b/tensorflow/core/platform/default/logging.h -index 99dd6de..3cbe8ed 100644 --- a/tensorflow/core/platform/default/logging.h +++ b/tensorflow/core/platform/default/logging.h -@@ -82,13 +82,13 @@ class LogMessageFatal : public LogMessage { +@@ -104,13 +104,13 @@ class LogMessageFatal : public LogMessage { }; #define _TF_LOG_INFO \ diff --git a/ports/tensorflow-common/fix-linux-build.patch b/ports/tensorflow-common/fix-linux-build.patch deleted file mode 100644 index e3eaca5177b5bb..00000000000000 --- a/ports/tensorflow-common/fix-linux-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc ---- a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc -+++ b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc -@@ -72,6 +72,8 @@ - SnapshotDatasetV2Op::kReaderFuncTarguments; - /* static */ constexpr const char* const - SnapshotDatasetV2Op::kShardFuncTarguments; -+/* static */ constexpr const char* const SnapshotDatasetV2Op::kReaderPrefix; -+/* static */ constexpr const char* const SnapshotDatasetV2Op::kWriterPrefix; - /* static */ constexpr const int SnapshotDatasetV2Op::kFileFormatVersion; - - // ==== Snapshot Implementation ==== - -diff --git a/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc b/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc ---- a/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc -+++ b/tensorflow/core/kernels/data/experimental/data_service_dataset_op.cc -@@ -53,6 +53,8 @@ - /* static */ constexpr const char* const - DataServiceDatasetOp::kMaxOutstandingRequests; - /* static */ constexpr const char* const -+ DataServiceDatasetOp::kTaskRefreshIntervalHintMs; -+/* static */ constexpr const char* const - DataServiceDatasetOp::kIterationCounter; - /* static */ constexpr const char* const DataServiceDatasetOp::kOutputTypes; - /* static */ constexpr const char* const DataServiceDatasetOp::kOutputShapes; diff --git a/ports/tensorflow-common/fix-windows-build.patch b/ports/tensorflow-common/fix-windows-build.patch index 89536836fccf77..8450299e80f7fb 100644 --- a/ports/tensorflow-common/fix-windows-build.patch +++ b/ports/tensorflow-common/fix-windows-build.patch @@ -1,12 +1,57 @@ -diff --git a/core/platform/default/logging.h b/core/platform/default/logging.h ---- a/tensorflow/core/platform/default/logging.h -+++ b/tensorflow/core/platform/default/logging.h -@@ -13,6 +13,8 @@ - limitations under the License. - ==============================================================================*/ +diff --git a/tensorflow/core/kernels/depthtospace_op.cc b/tensorflow/core/kernels/depthtospace_op.cc +--- a/tensorflow/core/kernels/depthtospace_op.cc ++++ b/tensorflow/core/kernels/depthtospace_op.cc +@@ -112,7 +112,7 @@ + auto Tinput = input.tensor(); + auto Toutput = outputs_tensor->tensor(); + +- if (std::is_same::value) { ++ if constexpr (std::is_same::value) { + if (is_int8x4) { + // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32. + auto Tinput_v = input.template reinterpret_last_dimension(); +@@ -173,15 +173,6 @@ + } + }; + +-#ifdef WIN32 +-template +-struct DepthToSpaceOpFunctor { +- void operator()(const CPUDevice& d, typename TTypes::ConstTensor input, +- int block_size, typename TTypes::Tensor output) { +- LOG(FATAL) << "Trivial implementation to make debug build compile."; +- } +-}; +-#endif + } // namespace functor + + #define REGISTER(type) \ -+#pragma warning(disable:4716) -+ - #ifndef TENSORFLOW_CORE_PLATFORM_DEFAULT_LOGGING_H_ - #define TENSORFLOW_CORE_PLATFORM_DEFAULT_LOGGING_H_ +diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernels/spacetodepth_op.cc +--- a/tensorflow/core/kernels/spacetodepth_op.cc ++++ b/tensorflow/core/kernels/spacetodepth_op.cc +@@ -126,7 +126,7 @@ + output_width, output_depth), + &outputs_tensor)); + +- if (std::is_same::value) { ++ if constexpr (std::is_same::value) { + using RT = typename RawType::type; + if (data_format_ == FORMAT_NCHW_VECT_C) { + // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32. +@@ -189,15 +189,6 @@ + } + }; + +-#ifdef WIN32 +-template +-struct SpaceToDepthOpFunctor { +- void operator()(const CPUDevice& d, typename TTypes::ConstTensor input, +- int block_size, typename TTypes::Tensor output) { +- LOG(FATAL) << "Trivial implementation to make debug build compile."; +- } +-}; +-#endif + } // namespace functor + #define REGISTER(type) \ diff --git a/ports/tensorflow-common/generate_static_link_cmd_linux.py b/ports/tensorflow-common/generate_static_link_cmd_linux.py index 7b17552154b6b3..fa1f73656cf549 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_linux.py +++ b/ports/tensorflow-common/generate_static_link_cmd_linux.py @@ -1,7 +1,9 @@ import re import sys -lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] +version = sys.argv[2] +lib_suffix = "" if len(sys.argv) < 4 else sys.argv[3] + with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: p_cd = re.compile(r"^\((cd .*) && \\$") diff --git a/ports/tensorflow-common/generate_static_link_cmd_macos.py b/ports/tensorflow-common/generate_static_link_cmd_macos.py index 5894c99b00232c..f7b99763eaa545 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_macos.py +++ b/ports/tensorflow-common/generate_static_link_cmd_macos.py @@ -1,23 +1,70 @@ +import os.path import re import sys -lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] +version = sys.argv[2] +lib_suffix = "" if len(sys.argv) < 4 else sys.argv[3] + with open(sys.argv[1], "r") as f_in: with open("static_link.sh", "w") as f_out: - p_cd = re.compile(r"^\((cd .*) && \\$") - p_linker = re.compile(fr"^\s*.+cc_wrapper.sh.+(@bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib-2\.params).*") - f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") - env = [] - for line in f_in: - if line.startswith("(cd"): - # new command, reset - env = [line] - else: - m1 = p_linker.match(line) - if m1: - m2 = p_cd.match(env[0]) - f_out.write(m2.group(1) + "\n") - line = f'"/usr/bin/libtool" -static -o {m1.group(1)[1:-9].replace(".dylib", ".a")} {m1.group(1).replace(".dylib", ".a")}\n' - f_out.write(line) + if os.path.isfile(f"libtensorflow_framework.{version}.dylib-2.params"): + p_cd = re.compile(r"^\((cd .*) && \\$") + p_linker = re.compile(fr"^\s*.+cc_wrapper.sh.+(@bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib-2\.params).*") + f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") + env = [] + for line in f_in: + if line.startswith("(cd"): + # new command, reset + env = [line] + else: + m1 = p_linker.match(line) + if m1: + m2 = p_cd.match(env[0]) + f_out.write(m2.group(1) + "\n") + line = f'"/usr/bin/libtool" -static -o {m1.group(1)[1:-9].replace(".dylib", ".a")} {m1.group(1).replace(".dylib", ".a")}\n' + f_out.write(line) + else: + env.append(line) + else: + # old behaviour (still on some platforms): inline all parameters instead of using -2.params file + p_cd = re.compile(r"^\((cd .*) && \\$") + p_linker1 = re.compile(fr"^.*cc_wrapper.sh.+-shared.+-o (bazel-out\S+libtensorflow{lib_suffix}\.\d\.\d\.\d\.dylib)") + p_linker2 = re.compile("^.*cc_wrapper.sh.+-shared.+-o (bazel-out\\S+libtensorflow_framework\\.\\d\\.\\d\\.\\d\\.dylib)") + f_out.write("#!/bin/bash\n# note: ar/binutils version 2.27 required to support output files > 4GB\n") + env = [] + parts = None + for line in f_in: + if line.startswith("(cd"): + # new command, reset + env = [line] else: - env.append(line) + m1 = p_linker1.match(line) + m2 = p_linker2.match(line) + if m1: + tokens = line.split() + if parts is None: + parts = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + else: + m = p_cd.match(env[0]) + f_out.write(m.group(1) + "\n") + tmp = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + old = set(parts) + parts += [t for t in tmp if t not in old] + line = f"libtool -static -o {m1.group(1).replace('.dylib', '.a')} {' '.join(parts)}\n" + f_out.write(line) + break + elif m2 and len(env) > 6: + tokens = line.split() + if parts is None: + parts = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + else: + m = p_cd.match(env[0]) + f_out.write(m.group(1) + "\n") + tmp = [t[16:] for t in tokens if t.startswith("-Wl,-force_load,")] + old = set(parts) + parts += [t for t in tmp if t not in old] + line = f"libtool -static -o {m2.group(1).replace('_framework', lib_suffix).replace('.dylib', '.a')} {' '.join(parts)}\n" + f_out.write(line) + break + else: + env.append(line) diff --git a/ports/tensorflow-common/generate_static_link_cmd_windows.py b/ports/tensorflow-common/generate_static_link_cmd_windows.py index 84ec9eede2186a..82f01a76893181 100644 --- a/ports/tensorflow-common/generate_static_link_cmd_windows.py +++ b/ports/tensorflow-common/generate_static_link_cmd_windows.py @@ -2,7 +2,9 @@ import re import sys -lib_suffix = "" if len(sys.argv) < 3 else sys.argv[2] +version = sys.argv[2] +lib_suffix = "" if len(sys.argv) < 4 else sys.argv[3] + with open(sys.argv[1], "r") as f_in: with open("static_link.bat", "w") as f_out: p_setenv = re.compile(r"^\s*(SET .+=.*)$") diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake index edd171aa48e322..bbfc287df5c544 100644 --- a/ports/tensorflow-common/portfile.cmake +++ b/ports/tensorflow-common/portfile.cmake @@ -6,7 +6,6 @@ set(TENSORFLOW_FILES "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_macos.py" "${CMAKE_CURRENT_LIST_DIR}/convert_lib_params_windows.py" "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" - "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch" "${CMAKE_CURRENT_LIST_DIR}/fix-windows-build.patch" "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_linux.py" "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_macos.py" diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake index 55387eb0d411f4..0813dd94e14313 100644 --- a/ports/tensorflow-common/tensorflow-common.cmake +++ b/ports/tensorflow-common/tensorflow-common.cmake @@ -1,5 +1,5 @@ -set(TF_VERSION 2.4.1) -set(TF_VERSION_SHORT 2.4) +set(TF_VERSION 2.6.0) +set(TF_VERSION_SHORT 2.6) vcpkg_find_acquire_program(BAZEL) get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY) @@ -129,28 +129,23 @@ foreach(BUILD_TYPE dbg rel) # prefer repeated source extraction here for each build type over extracting once above the loop and copying because users reported issues with copying symlinks set(STATIC_ONLY_PATCHES) set(WINDOWS_ONLY_PATCHES) - set(LINUX_ONLY_PATCHES) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(STATIC_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/change-macros-for-static-lib.patch") # there is no static build option - change macros via patch and link library manually at the end endif() if(VCPKG_TARGET_IS_WINDOWS) set(WINDOWS_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-windows-build.patch") endif() - if(VCPKG_TARGET_IS_LINUX) - set(LINUX_ONLY_PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-linux-build.patch") - endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tensorflow/tensorflow REF "v${TF_VERSION}" - SHA512 be8273f464c1c1c392f3ab0190dbba36d56a0edcc7991c1a86f16604c859056d3188737d11c3b41ec7918e1cf46d13814c50c00be8f459dde9f0fb618740ee3c + SHA512 d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05 HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch" ${STATIC_ONLY_PATCHES} ${WINDOWS_ONLY_PATCHES} - ${LINUX_ONLY_PATCHES} ) message(STATUS "Configuring TensorFlow (${BUILD_TYPE})") @@ -192,8 +187,10 @@ foreach(BUILD_TYPE dbg rel) if(BUILD_TYPE STREQUAL dbg) if(VCPKG_TARGET_IS_WINDOWS) set(BUILD_OPTS "--compilation_mode=dbg --features=fastbuild") # link with /DEBUG:FASTLINK instead of /DEBUG:FULL to avoid .pdb >4GB error + elseif(VCPKG_TARGET_IS_OSX) + set(BUILD_OPTS --compilation_mode=fastbuild) # debug build on macOS currently broken else() - set(BUILD_OPTS "--compilation_mode=dbg") + set(BUILD_OPTS --compilation_mode=dbg) endif() separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) @@ -212,7 +209,7 @@ foreach(BUILD_TYPE dbg rel) list(APPEND LINKOPTS "--linkopt='${OPT}'") endforeach() else() - set(BUILD_OPTS "--compilation_mode=opt") + set(BUILD_OPTS --compilation_mode=opt) separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS}) separate_arguments(VCPKG_C_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_RELEASE}) @@ -289,7 +286,7 @@ foreach(BUILD_TYPE dbg rel) endif() # for some reason stdout of bazel ends up in stderr, so use err log file in the following command vcpkg_execute_build_process( - COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" ${TF_LIB_SUFFIX} + COMMAND ${PYTHON3} "${CMAKE_CURRENT_LIST_DIR}/generate_static_link_cmd_${PLATFORM_SUFFIX}.py" "${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-${BUILD_TYPE}-err.log" ${TF_VERSION} ${TF_LIB_SUFFIX} WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${BUILD_TYPE}/bazel-${TARGET_TRIPLET}-${BUILD_TYPE} LOGNAME postbuild2-${TARGET_TRIPLET}-${BUILD_TYPE} ) diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json index 51d3fa8558abcd..dae75635c4f0b9 100644 --- a/ports/tensorflow-common/vcpkg.json +++ b/ports/tensorflow-common/vcpkg.json @@ -1,7 +1,6 @@ { "name": "tensorflow-common", - "version-semver": "2.4.1", - "port-version": 5, + "version-semver": "2.6.0", "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.", "homepage": "https://github.com/tensorflow/tensorflow" } diff --git a/ports/tensorflow/vcpkg.json b/ports/tensorflow/vcpkg.json index b6fb8e6136086b..b00a067fcf3bf3 100644 --- a/ports/tensorflow/vcpkg.json +++ b/ports/tensorflow/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tensorflow", - "version-semver": "2.4.1", + "version-semver": "2.6.0", "description": "Library for computation using data flow graphs for scalable machine learning (C API version)", "homepage": "https://github.com/tensorflow/tensorflow", "supports": "!(x86 | arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 8c4ebc40d12aa4..d19079847f968c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6457,16 +6457,16 @@ "port-version": 1 }, "tensorflow": { - "baseline": "2.4.1", + "baseline": "2.6.0", "port-version": 0 }, "tensorflow-cc": { - "baseline": "2.4.1", - "port-version": 1 + "baseline": "2.6.0", + "port-version": 0 }, "tensorflow-common": { - "baseline": "2.4.1", - "port-version": 5 + "baseline": "2.6.0", + "port-version": 0 }, "tensorpipe": { "baseline": "2021-04-26", diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json index b43b8b239ec974..2fb6918aa5f074 100644 --- a/versions/t-/tensorflow-cc.json +++ b/versions/t-/tensorflow-cc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b9e9f840127f8da0c67cadf0369023753c90686b", + "version-semver": "2.6.0", + "port-version": 0 + }, { "git-tree": "77875da04a151fb36abe52cce80491a9a7f16c55", "version-semver": "2.4.1", diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json index a647b39e35f863..26d4c0d267ed2f 100644 --- a/versions/t-/tensorflow-common.json +++ b/versions/t-/tensorflow-common.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84662f791eb9d38350a4ffe99cd80d49f562b10f", + "version-semver": "2.6.0", + "port-version": 0 + }, { "git-tree": "2160d070413af839dbe9da331350e34c91352e11", "version-semver": "2.4.1", diff --git a/versions/t-/tensorflow.json b/versions/t-/tensorflow.json index c83f74066e7c55..900e6a8ed8106e 100644 --- a/versions/t-/tensorflow.json +++ b/versions/t-/tensorflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8692b5026a3b7666e73dcaf7432e525dc103f8c5", + "version-semver": "2.6.0", + "port-version": 0 + }, { "git-tree": "bd9bf99a10fe9a9769f26dedb282f3c1954fc9bb", "version-semver": "2.4.1", From ee3dfa2893ece5d2a72b1d58ce456e5e561f9189 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 30 Sep 2021 22:03:56 +0200 Subject: [PATCH 0709/1858] [Qt 6.2] Update Qt6 to 6.2 (#18687) * [qt6] Update to 6.1.1 * version stuff * fix empty dir * update version * fix casing in qtbase * [libpq] add secure32.lib on windows * add clang-cl fix * version stuff * fix flag removal by adding a space * version stuff * make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q * fix libpq wrapper opensll linkage on linux * use policy to fix dependent ports * version stuff * use upstream patch * version stuff * fix source_location with clang-cl * version stuff * add all new modules * add all modules to the qt port * push all the ports * fix patch * update ports * split qt_install_submodule into smaller functions * add qlitehtml submodule to qttools * update a few ports before moving to beta * update vcpkg.json and refs and fix issue with update * fix dependencies * remove patch * update to 6.2 * add nodejs to vcpkg_find_acquire_program for qtwebengine * format manifest. * fix webengine and see if it builds. * apply format diff * add patch * fix arm builds * fix linux gcc 7.5 build error * fix patch * bump version in qtbase otherwise CI seems to resuse the wrong version * fix webengine release build * try fixing gcc 7.5 build * revert gcc 7.5 fixes since they broke osx * revert gcc 7.5 fixes since they broke osx * fix qtimageformats. * actually enable new qt6 builds. * fix search path for nodejs. * fix the webengine patch again. * fix wrong binary name * revisit all dependencies * revisit webengine features and build settings * more feature stuff * remove qt6betablock and more features review for qt 6.2 * add missing qt prefix. * format manifest * fix ci issues * format manifest. * add node on osx. * install node on linux * fix a typo and a disable another find_package * fix mingw build issues and switch to not using tag * use CMAKE_HOST_WIN32 instead * update ref * fix core configure error * fix mingw case. * fix script installation * remove qmake helper scrpt * delete debug folder if empty * add vcpkg-tool-nodejs * revert changes in the pipeline scripts * adjust qtwebengine to the changes * format manifest and revert doc changes * fix message and logic * fix hashes and make host only port * fix hash again? * qttools add linguist feature for crossbuilds * fix dependency * add thread and future to concurrent feature * add assistant as a required host feature (somebody should tell Qt not to do that) * fix dependency. * [skip ci] not a host dep?!? * [skip ci] debuging * [skip ci] more debug messages * [skip ci] try always redownloading * [skip ci] fix hash und skip hash for redownloading once * [skip ci] comment out skip sha and redownload * add vcpkg_fixup_pkgconfig to libvpx * qtwebengine requires qml and quick * fix manifest format * qtwebengine does not support static builds! * remove unnecessary parts of the patch * update to beta2 * add some " and a message in update mode * [skip ci] remove old and reorder patches * [skip ci] add qtpaths6 * [skip actions] fix webengine patch * [skip actions] fix a few submodule refs * [skip actions] fix qtwebengine * [skip actions] remove qml feature from webengine in qt metaport * qtdeclarative raise minimum cmake version * use the tree id instead? * [skip actions] raise minimum cmake version in qtquick3d * fix fetching of unadvertised commit ids * revert changes to vcpkg_from_git * revert doc changes * [skip actions] use the new FETCH_REF * [skip actiosn] remove raise of minimum version to retry with new cmake version * [skip actions] update to beta3 * revert removal of patch * update to beta4 remove qtquickcontrols2 deps * fix missing \ * [skip actions] fix gstreamer feature on windows * [skip actions] remove outdated patches format qtmultimedia * [skip actions] update to rc1 * [skip actions] remove patch for now * update refs * [skip actions] comment patch to try another patch in qtmultimedia * x86 is not supported by qtwebengine (at least one of its internal third party deps fails due to x64 intrinsics.) * Finalize for 6.2 release. Open issues: QtWebengine and cross builds. * version stuff * fix semver in qtquickcontrols. * version stuff * revise qtwebengine supports expression * update version --- ports/qt/vcpkg.json | 144 +++++++++++++++-- ports/qt5compat/portfile.cmake | 5 + ports/qt5compat/vcpkg.json | 19 ++- ports/qt6betablock/portfile.cmake | 1 - ports/qt6betablock/vcpkg.json | 12 -- ports/qtactiveqt/portfile.cmake | 8 +- ports/qtactiveqt/vcpkg.json | 26 +++- ports/qtbase/20b3eb0.diff | 130 ---------------- ports/qtbase/buildcmake.patch | 41 ----- ports/qtbase/clang-cl_source_location.patch | 2 +- ports/qtbase/cmake/qt_install_submodule.cmake | 3 +- .../qtbase/cmake/qt_port_details-latest.cmake | 100 ++++++++---- ports/qtbase/cmake/qt_port_details.cmake | 93 +++++++---- ports/qtbase/fix_cmake_build.patch | 15 ++ ports/qtbase/fix_egl.patch | 12 ++ ports/qtbase/fix_find_dep.patch | 13 -- ports/qtbase/jpeg.patch | 22 --- ports/qtbase/portfile.cmake | 35 +++-- ports/qtbase/vcpkg.json | 2 +- ports/qtcharts/portfile.cmake | 8 +- ports/qtcharts/vcpkg.json | 34 +++- ports/qtcoap/portfile.cmake | 2 +- ports/qtcoap/vcpkg.json | 17 +- ports/qtconnectivity/portfile.cmake | 10 ++ ports/qtconnectivity/vcpkg.json | 17 ++ ports/qtdatavis3d/vcpkg.json | 10 +- ports/qtdeclarative/fix_alignment.patch | 15 -- ports/qtdeclarative/portfile.cmake | 5 +- ports/qtdeclarative/vcpkg.json | 6 +- ports/qtdoc/portfile.cmake | 2 - ports/qtdoc/vcpkg.json | 13 +- .../qtimageformats/no_target_promotion.patch | 22 +++ ports/qtimageformats/portfile.cmake | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtlocation/portfile.cmake | 23 +++ ports/qtlocation/vcpkg.json | 44 ++++++ ports/qtlottie/portfile.cmake | 9 +- ports/qtlottie/vcpkg.json | 24 +-- ports/qtmqtt/vcpkg.json | 12 +- .../fix_windows_header_include.patch | 13 ++ ports/qtmultimedia/portfile.cmake | 40 +++++ ports/qtmultimedia/vcpkg.json | 49 ++++++ ports/qtnetworkauth/vcpkg.json | 12 +- ports/qtopcua/portfile.cmake | 1 + ports/qtopcua/vcpkg.json | 21 ++- ports/qtquick3d/portfile.cmake | 4 +- ports/qtquick3d/vcpkg.json | 9 +- ports/qtquickcontrols2/portfile.cmake | 12 -- ports/qtquickcontrols2/vcpkg.json | 18 +-- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/portfile.cmake | 18 +++ ports/qtremoteobjects/vcpkg.json | 42 +++++ ports/qtscxml/portfile.cmake | 8 +- ports/qtscxml/vcpkg.json | 25 ++- ports/qtsensors/portfile.cmake | 16 ++ ports/qtsensors/vcpkg.json | 30 ++++ ports/qtserialbus/portfile.cmake | 18 +++ ports/qtserialbus/vcpkg.json | 32 ++++ ports/qtserialport/portfile.cmake | 10 ++ ports/qtserialport/vcpkg.json | 12 ++ ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/portfile.cmake | 70 +++++++-- ports/qttools/vcpkg.json | 48 +++++- ports/qttranslations/vcpkg.json | 10 +- ports/qtvirtualkeyboard/vcpkg.json | 20 ++- ports/qtwayland/portfile.cmake | 9 +- ports/qtwayland/vcpkg.json | 25 +-- ports/qtwebchannel/portfile.cmake | 17 ++ ports/qtwebchannel/vcpkg.json | 23 +++ ports/qtwebengine/portfile.cmake | 110 +++++++++++++ ports/qtwebengine/vcpkg.json | 146 ++++++++++++++++++ ports/qtwebsockets/portfile.cmake | 17 ++ ports/qtwebsockets/vcpkg.json | 26 ++++ ports/qtwebview/portfile.cmake | 19 +++ ports/qtwebview/vcpkg.json | 35 +++++ ports/vcpkg-tool-nodejs/portfile.cmake | 57 +++++++ ports/vcpkg-tool-nodejs/vcpkg.json | 5 + scripts/ci.baseline.txt | 7 - versions/baseline.json | 98 +++++++++--- versions/q-/qt.json | 5 + versions/q-/qt5compat.json | 5 + versions/q-/qtactiveqt.json | 5 + versions/q-/qtbase.json | 5 + versions/q-/qtcharts.json | 5 + versions/q-/qtcoap.json | 5 + versions/q-/qtconnectivity.json | 9 ++ versions/q-/qtdatavis3d.json | 5 + versions/q-/qtdeclarative.json | 5 + versions/q-/qtdoc.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtlocation.json | 9 ++ versions/q-/qtlottie.json | 5 + versions/q-/qtmqtt.json | 5 + versions/q-/qtmultimedia.json | 9 ++ versions/q-/qtnetworkauth.json | 5 + versions/q-/qtopcua.json | 5 + versions/q-/qtquick3d.json | 5 + versions/q-/qtquickcontrols2.json | 5 + versions/q-/qtquicktimeline.json | 5 + versions/q-/qtremoteobjects.json | 9 ++ versions/q-/qtscxml.json | 5 + versions/q-/qtsensors.json | 9 ++ versions/q-/qtserialbus.json | 9 ++ versions/q-/qtserialport.json | 9 ++ versions/q-/qtshadertools.json | 5 + versions/q-/qtsvg.json | 5 + versions/q-/qttools.json | 5 + versions/q-/qttranslations.json | 5 + versions/q-/qtvirtualkeyboard.json | 5 + versions/q-/qtwayland.json | 5 + versions/q-/qtwebchannel.json | 9 ++ versions/q-/qtwebengine.json | 9 ++ versions/q-/qtwebsockets.json | 9 ++ versions/q-/qtwebview.json | 9 ++ versions/v-/vcpkg-tool-nodejs.json | 9 ++ 116 files changed, 1801 insertions(+), 525 deletions(-) delete mode 100644 ports/qt6betablock/portfile.cmake delete mode 100644 ports/qt6betablock/vcpkg.json delete mode 100644 ports/qtbase/20b3eb0.diff delete mode 100644 ports/qtbase/buildcmake.patch create mode 100644 ports/qtbase/fix_cmake_build.patch create mode 100644 ports/qtbase/fix_egl.patch delete mode 100644 ports/qtbase/fix_find_dep.patch delete mode 100644 ports/qtbase/jpeg.patch create mode 100644 ports/qtconnectivity/portfile.cmake create mode 100644 ports/qtconnectivity/vcpkg.json delete mode 100644 ports/qtdeclarative/fix_alignment.patch create mode 100644 ports/qtimageformats/no_target_promotion.patch create mode 100644 ports/qtlocation/portfile.cmake create mode 100644 ports/qtlocation/vcpkg.json create mode 100644 ports/qtmultimedia/fix_windows_header_include.patch create mode 100644 ports/qtmultimedia/portfile.cmake create mode 100644 ports/qtmultimedia/vcpkg.json create mode 100644 ports/qtremoteobjects/portfile.cmake create mode 100644 ports/qtremoteobjects/vcpkg.json create mode 100644 ports/qtsensors/portfile.cmake create mode 100644 ports/qtsensors/vcpkg.json create mode 100644 ports/qtserialbus/portfile.cmake create mode 100644 ports/qtserialbus/vcpkg.json create mode 100644 ports/qtserialport/portfile.cmake create mode 100644 ports/qtserialport/vcpkg.json create mode 100644 ports/qtwebchannel/portfile.cmake create mode 100644 ports/qtwebchannel/vcpkg.json create mode 100644 ports/qtwebengine/portfile.cmake create mode 100644 ports/qtwebengine/vcpkg.json create mode 100644 ports/qtwebsockets/portfile.cmake create mode 100644 ports/qtwebsockets/vcpkg.json create mode 100644 ports/qtwebview/portfile.cmake create mode 100644 ports/qtwebview/vcpkg.json create mode 100644 ports/vcpkg-tool-nodejs/portfile.cmake create mode 100644 ports/vcpkg-tool-nodejs/vcpkg.json create mode 100644 versions/q-/qtconnectivity.json create mode 100644 versions/q-/qtlocation.json create mode 100644 versions/q-/qtmultimedia.json create mode 100644 versions/q-/qtremoteobjects.json create mode 100644 versions/q-/qtsensors.json create mode 100644 versions/q-/qtserialbus.json create mode 100644 versions/q-/qtserialport.json create mode 100644 versions/q-/qtwebchannel.json create mode 100644 versions/q-/qtwebengine.json create mode 100644 versions/q-/qtwebsockets.json create mode 100644 versions/q-/qtwebview.json create mode 100644 versions/v-/vcpkg-tool-nodejs.json diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index a0baa9d187e86d..95caf678c49286 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,33 +1,149 @@ { "name": "qt", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ - "qt5compat", + { + "name": "qt5compat", + "default-features": false, + "features": [ + "big-codecs", + "codecs", + "qml", + "textcodec" + ] + }, { "name": "qtbase", "default-features": false }, - "qtcharts", + { + "name": "qtcharts", + "default-features": false, + "features": [ + "designer", + "qml" + ] + }, "qtcoap", + "qtconnectivity", "qtdatavis3d", "qtdeclarative", "qtdoc", - "qtimageformats", - "qtlottie", + { + "name": "qtimageformats", + "default-features": false, + "features": [ + "jasper", + "tiff", + "webp" + ] + }, + { + "name": "qtlocation", + "default-features": false, + "features": [ + "nmea", + "qml" + ] + }, + { + "name": "qtlottie", + "default-features": false, + "features": [ + "qml" + ] + }, "qtmqtt", + { + "name": "qtmultimedia", + "default-features": false, + "features": [ + "gstreamer", + "qml", + "widgets" + ] + }, "qtnetworkauth", - "qtopcua", - "qtquick3d", - "qtquickcontrols2", + { + "name": "qtopcua", + "features": [ + "qml" + ] + }, + { + "name": "qtquick3d", + "default-features": false + }, "qtquicktimeline", - "qtscxml", + { + "name": "qtremoteobjects", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtscxml", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtsensors", + "default-features": false, + "features": [ + "qml" + ] + }, + "qtserialbus", + "qtserialport", "qtshadertools", "qtsvg", - "qttools", + { + "name": "qttools", + "default-features": false, + "features": [ + "assistant", + "designer", + "qml" + ] + }, "qttranslations", - "qtvirtualkeyboard" + "qtvirtualkeyboard", + { + "name": "qtwebchannel", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtwebengine", + "default-features": false, + "features": [ + "geolocation", + "spellchecker", + "webchannel" + ] + }, + { + "name": "qtwebsockets", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtwebview", + "default-features": false, + "features": [ + "qml", + "webengine" + ] + } ], "default-features": [ "default-features" @@ -38,10 +154,16 @@ "dependencies": [ { "name": "qtactiveqt", + "features": [ + "qml" + ], "platform": "windows" }, { "name": "qtwayland", + "features": [ + "qml" + ], "platform": "linux" } ] diff --git a/ports/qt5compat/portfile.cmake b/ports/qt5compat/portfile.cmake index 15c35a056bb2ed..d597b464ec43e0 100644 --- a/ports/qt5compat/portfile.cmake +++ b/ports/qt5compat/portfile.cmake @@ -12,6 +12,7 @@ FEATURES "iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU INVERTED_FEATURES "iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) #For iconv feature to work the following must be true: @@ -26,3 +27,7 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) + +#For my documentation: +# find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) +# find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml Gui Quick) diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 0bb1654fbada93..9023688dcba6f3 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ @@ -13,6 +13,7 @@ "big-codecs", "codecs", "default-features", + "qml", "textcodec" ], "features": { @@ -56,6 +57,22 @@ } ] }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, "textcodec": { "description": "Supports conversions between text encodings." } diff --git a/ports/qt6betablock/portfile.cmake b/ports/qt6betablock/portfile.cmake deleted file mode 100644 index 9aefc82414d125..00000000000000 --- a/ports/qt6betablock/portfile.cmake +++ /dev/null @@ -1 +0,0 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/ports/qt6betablock/vcpkg.json b/ports/qt6betablock/vcpkg.json deleted file mode 100644 index ddae387f7265cd..00000000000000 --- a/ports/qt6betablock/vcpkg.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "qt6betablock", - "version-semver": "6.2.0-beta", - "description": "Port to block qt6 ports not in the current release to be build in CI", - "homepage": "https://www.qt.io/", - "dependencies": [ - { - "name": "qtbase", - "default-features": false - } - ] -} diff --git a/ports/qtactiveqt/portfile.cmake b/ports/qtactiveqt/portfile.cmake index 7284983c825668..5092d7d85c88c6 100644 --- a/ports/qtactiveqt/portfile.cmake +++ b/ports/qtactiveqt/portfile.cmake @@ -17,9 +17,15 @@ if(NOT NO_BIN_AND_TOOLS) ) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index bd8bcf93bb69dc..d92ae9c1b419a3 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", @@ -11,12 +11,24 @@ "default-features": false }, { + "$comment": "also requires printsupport!", "name": "qtbase", - "default-features": false - }, - { - "name": "qttools", - "default-features": false + "default-features": false, + "features": [ + "gui", + "widgets" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] } - ] + } } diff --git a/ports/qtbase/20b3eb0.diff b/ports/qtbase/20b3eb0.diff deleted file mode 100644 index 978b30ffa5bc8a..00000000000000 --- a/ports/qtbase/20b3eb0.diff +++ /dev/null @@ -1,130 +0,0 @@ -From 20b3eb0fd8b5f82cf432f2c06e7c5d3f533df0a5 Mon Sep 17 00:00:00 2001 -From: Cristian Adam -Date: Thu, 03 Jun 2021 12:42:07 +0200 -Subject: [PATCH] CMake: Add support for building with clang-cl - -qmake had support for building with clang-cl as the win32-clang-msvc mkspec. - -Task-number: QTBUG-89642 -Task-number: QTBUG-88081 -Change-Id: I0709c289f90fedb121620d1e67ef841602219816 -Reviewed-by: Alexandru Croitor ---- - -diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index bb8b146..792276e 100644 ---- a/cmake/QtBuild.cmake -+++ b/cmake/QtBuild.cmake -@@ -285,7 +285,9 @@ - list(APPEND QT_DEFAULT_PLATFORM_DEFINITIONS WIN64 _WIN64) - endif() - if(MSVC) -- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") -+ if (CLANG) -+ set(QT_DEFAULT_MKSPEC win32-clang-msvc) -+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") - set(QT_DEFAULT_MKSPEC win32-arm64-msvc) - else() - set(QT_DEFAULT_MKSPEC win32-msvc) -diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake -index 0c57d9e..0eeccce 100644 ---- a/cmake/QtFlagHandlingHelpers.cmake -+++ b/cmake/QtFlagHandlingHelpers.cmake -@@ -235,7 +235,7 @@ - function(qt_set_msvc_cplusplus_options target visibility) - # For MSVC we need to explicitly pass -Zc:__cplusplus to get correct __cplusplus. - # Check qt_config_compile_test for more info. -- if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" AND MSVC_VERSION GREATER_EQUAL 1913) -+ if(MSVC AND MSVC_VERSION GREATER_EQUAL 1913) - target_compile_options("${target}" ${visibility} "-Zc:__cplusplus" "-permissive-") - endif() - endfunction() -diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index 2c991f7..9f0c95e 100644 ---- a/src/corelib/CMakeLists.txt -+++ b/src/corelib/CMakeLists.txt -@@ -263,4 +263,24 @@ - # special case end - ) - -+if (MSVC AND CLANG) -+ foreach(subarch sse4_1 rdrnd rdseed) -+ if (TEST_subarch_${subarch}) -+ qt_internal_add_simd_part(Core SIMD ${subarch} -+ SOURCES -+ global/qsimd.cpp -+ ) -+ endif() -+ endforeach() -+ -+ foreach(subarch sse4_1 aesni) -+ if (TEST_subarch_${subarch}) -+ qt_internal_add_simd_part(Core SIMD ${subarch} -+ SOURCES -+ tools/qhash.cpp -+ ) -+ endif() -+ endforeach() -+endif() -+ - # special case begin -diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h -index 5869751..6108b07 100644 ---- a/src/corelib/global/qt_pch.h -+++ b/src/corelib/global/qt_pch.h -@@ -62,17 +62,22 @@ - # define _POSIX_ - # include - # undef _POSIX_ --#endif --#include --#include --#include --#include --#include /* All moc genereated code has this include */ --#include --#include --#include --#include --#include --#include --#include -+# if defined(Q_CC_CLANG) && defined(Q_CC_MSVC) -+// See https://bugs.llvm.org/show_bug.cgi?id=41226 -+# include -+__declspec(selectany) auto *__wmemchr_symbol_loader_value = wmemchr(L"", L'0', 0); -+# endif -+# endif -+# include -+# include -+# include -+# include -+# include /* All moc genereated code has this include */ -+# include -+# include -+# include -+# include -+# include -+# include -+# include - #endif -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 5fe4d59..04f58dd 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -577,6 +577,15 @@ - ) - endif() - -+ if (MSVC AND CLANG AND TEST_subarch_sse4_1) -+ qt_internal_add_simd_part(Gui SIMD sse4_1 -+ SOURCES -+ painting/qdrawhelper.cpp -+ painting/qdrawhelper_sse2.cpp -+ painting/qdrawhelper_ssse3.cpp -+ ) -+ endif() -+ - qt_internal_add_simd_part(Gui SIMD ssse3 - SOURCES - image/qimage_ssse3.cpp diff --git a/ports/qtbase/buildcmake.patch b/ports/qtbase/buildcmake.patch deleted file mode 100644 index 07c3e3704d39a4..00000000000000 --- a/ports/qtbase/buildcmake.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index d08126731..efd1ada92 100644 ---- a/cmake/QtBuild.cmake -+++ b/cmake/QtBuild.cmake -@@ -387,7 +387,7 @@ set(QT_KNOWN_MODULES_WITH_TOOLS "" CACHE INTERNAL "Known Qt modules with tools" - - # Reset syncqt cache variable, to make sure it gets recomputed on reconfiguration, otherwise - # it might not get installed. --unset(QT_SYNCQT CACHE) -+# unset(QT_SYNCQT CACHE) - - # For adjusting variables when running tests, we need to know what - # the correct variable is for separating entries in PATH-alike -diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in -index 9eb913f4d..286f3287e 100644 ---- a/cmake/QtBuildInternalsExtra.cmake.in -+++ b/cmake/QtBuildInternalsExtra.cmake.in -@@ -35,8 +35,8 @@ endif() - set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL - "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) - --set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH --"A path to the source tree of the previously configured QtBase project." FORCE) -+# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH -+# "A path to the source tree of the previously configured QtBase project." FORCE) - - # Propagate decision of building tests and examples to other repositories. - set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.") -diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake -index 30d3bd6d3..80bb2bf46 100644 ---- a/cmake/QtPrlHelpers.cmake -+++ b/cmake/QtPrlHelpers.cmake -@@ -222,7 +222,7 @@ function(qt_internal_walk_libs - qt_internal_should_not_promote_package_target_to_global( - "${lib_target_unaliased}" should_not_promote) - if(NOT is_global AND is_imported AND NOT should_not_promote) -- set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE) -+ #set_property(TARGET ${lib_target_unaliased} PROPERTY IMPORTED_GLOBAL TRUE) - endif() - endif() - else() diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch index 1eeb67aaf74c07..6d0a9527e26470 100644 --- a/ports/qtbase/clang-cl_source_location.patch +++ b/ports/qtbase/clang-cl_source_location.patch @@ -9,6 +9,6 @@ index 823b2057b..4a8cd4fa8 100644 -#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) +#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) #include - #if defined(__cpp_lib_source_location) + #if defined(__cpp_lib_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std #define QT_PROPERTY_COLLECT_BINDING_LOCATION diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index ed497a13e59ca7..56c40c5791516d 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -32,7 +32,6 @@ function(qt_download_submodule) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://code.qt.io/qt/${PORT}.git" - #TAG ${${PORT}_TAG} REF "${${PORT}_REF}" ${UPDATE_PORT_GIT_OPTIONS} PATCHES ${_qarg_PATCHES} @@ -245,4 +244,4 @@ function(qt_install_submodule) qt_install_copyright("${SOURCE_PATH}") set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE) -endfunction() \ No newline at end of file +endfunction() diff --git a/ports/qtbase/cmake/qt_port_details-latest.cmake b/ports/qtbase/cmake/qt_port_details-latest.cmake index 5dda21b7fc7ba5..e89df6b9689472 100644 --- a/ports/qtbase/cmake/qt_port_details-latest.cmake +++ b/ports/qtbase/cmake/qt_port_details-latest.cmake @@ -1,12 +1,21 @@ -set(QT_VERSION 6.1.0-beta3) +set(QT_VERSION 6.2.0) + +if(PORT MATCHES "qtquickcontrols2") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") + return() +endif() set(QT_GIT_TAG v${QT_VERSION}) + #set(QT_UPDATE_VERSION TRUE) +if(QT_UPDATE_VERSION) + function(vcpkg_extract_source_archive) + endfunction() +endif() set(QT_IS_LATEST 1) -# List of added an removed modules https://doc-snapshots.qt.io/qt6-dev/whatsnew60.html#changes-to-supported-modules -#https://wiki.qt.io/Get_the_Source -#TODO:qtknx? -set(QT_PORTS qtbase +set(QT_PORTS qt + qtbase qttools qtdeclarative qtsvg @@ -22,8 +31,8 @@ set(QT_PORTS qtbase qtimageformats qtmqtt qtnetworkauth - qtquickcontrols2 - ### + # qtquickcontrols2 -> moved into qtdeclarative + ## New in 6.1 qtactiveqt qtdatavis3d #qtdeviceutils @@ -31,38 +40,60 @@ set(QT_PORTS qtbase qtscxml qtvirtualkeyboard qtcharts + ## New in 6.2 + qtconnectivity + qtlocation + qtmultimedia + qtremoteobjects + qtsensors + qtserialbus + qtserialport + qtwebchannel + qtwebengine + qtwebsockets + qtwebview ) -# New: qtactiveqt qtdatavis3d qtlottie qtscxml qtvirtualkeyboard qtcharts foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() - -set(qtbase_REF 089b73de033190e511c0bd11cba22160024ef9a4) -set(qttools_REF a810532b7f68348281bac13fc03395bf08827c28) -set(qtdeclarative_REF 1e4730ae0f44ece8ff8a27d4de127d8da9ed8a13) -set(qtsvg_REF 1adf841f16cab093f7db6a1fbffd088b138afed3) -set(qt5compat_REF 6ab304e8d2fe7f58cf608f8a30abbf769680f027) -set(qtshadertools_REF c26caefc6f67f01ae52372a70d3887077477388d) -set(qtquicktimeline_REF a91e82010047c9422d573b4c8648c175b470839e) -set(qtquick3d_REF f6614a31bd8a092d2081092dc7043ead9e7475ea) -set(qttranslations_REF 8a39fca4b56817fa2f7393fd5c5850bb167ac8f3) -set(qtwayland_REF 8237b7384537e3bc1687c1e05a20d450a6ed38f3) -set(qtdoc_REF 9259552281e4322a63f2cd0edce7904af1147bca) -set(qtimageformats_REF acd9ad1f69606553bc975fb33ae4efd52b2fbe9f) -set(qtmqtt_REF 3bdd419302de7e1e8a819509d115c32d2fbf4d49) -set(qtquickcontrols2_REF a74819563efc3495a86a696e678bec11bab33ec6) -set(qtnetworkauth_REF 92a1ff5b63f56e77030cdfbe9c456a31d3a2d5e2) -set(qtcoap_REF bc8f5ff0e678aa4b4c9081e543fd7c119754a3a1) -set(qtopcua_REF 0cd72d5e9cfaaf96b6d9a2d4ce4a6c46ffbbcdd4) -### -set(qtactiveqt_REF 94a100baa75248ba49c01680ca3632cd7180a8e8) -set(qtdatavis3d_REF c1e7a47f47cc289652f2004403cb1e587308c290) +set(qtbase_REF 0c2d00de3488116db9f9d657fe18bcb972a83792) +set(qtshadertools_REF 119cd6e9c9e89f93b74db28f261382a2fcfe504e) +set(qtdeclarative_REF 37da36c97d9d557945abca3cea5c68d9985a06e3) +set(qt5compat_REF 291993c7813ec706e54069c7de339edfdd385c0d) +set(qttools_REF 00efbf90f978afefdcece314d19b79459eee2211) # Additional refs in portfile due to submodule +set(qtcoap_REF be7822dc920a3e3eb252d5693a7153aa606d3dc1) +set(qtdoc_REF 48a1fbab30a9f57f011fdea8ec2b47048dce4069) +set(qtimageformats_REF 7bb9dc839c0dd0806445fd475b027a82c961f686) +set(qtmqtt_REF 4fd647e23d95c522c45d86be584d18578f894823) +set(qtnetworkauth_REF aa23db40ca552d60383dea17d703b1cc0cbeace4) +set(qtopcua_REF cfb3767b2a6785e0437b99c015cb6aef7f40189c) +set(qtquicktimeline_REF e9578a6949f6192440df1cb261ed9de98a9de7d7) +set(qtquick3d_REF eaf9c60073b95b03c006279f08d4947699c32a4b) +set(qtsvg_REF cceecea040ca1247db0212217d07ec2c331004ba) +set(qttranslations_REF 03a146236e69ee41c0405a8b5707104b4ac0c6e8) +set(qtwayland_REF 8c4900dda393752faab14e39e60aec6b545c8a0f) +# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2 +### New in 6.1 +set(qtactiveqt_REF 94c924a8501dba7487bf2648bdf06aefc33e726d) +set(qtcharts_REF d56b9f3de193cbf561f4b1ec332d8598dbdaaaca) +set(qtdatavis3d_REF 5c90e6642882b3b7440608f71b96ce28908f0ee8) #set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF ddda33a7294512487035de6338a91657501c9fd2) -set(qtscxml_REF 8e2ad5c798110337b90c582c68e903465e19e3fe) -set(qtvirtualkeyboard_REF 266626a0414aef2fcc65d412f02c993c87a1cae6) -set(qtcharts_REF 962a05cea44108d13f081a12bd53232ef856427c) +set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288) +set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344) +set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f) +### New in 6.2 +set(qtconnectivity_REF 78e7ffbe16469a19fa34cad711e0898d91bd2f30) +set(qtlocation_REF 47a945b0d054539eab3ba1cf3a1d7bf5977051d6) +set(qtmultimedia_REF d7d0e676abd4b280feb0d5105846378b64782487) +set(qtremoteobjects_REF 58932ba10420faa1cc989ed5bf101ff06475a4fc) +set(qtsensors_REF 192ca0fd252066101eb0456b957fdb51618fa7db) +set(qtserialbus_REF ce089bef29ca55d7fe46508d92d3e498eb5bb847) +set(qtserialport_REF 14dc155f3640af94c6ecff2de1489e14cd5b0047) +set(qtwebchannel_REF 09315a8d626e106953723ce68e68d6b4b97c2c52) +set(qtwebengine_REF 261d72c8afc72faf23d169a64749db216db68859) # Additional refs in portfile due to submodule +set(qtwebsockets_REF a01c2d6638fad700db23863258b7fc4a1ecdd542) +set(qtwebview_REF ca0053b6a5320046508e9ba205df775a62c1a211) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") @@ -72,7 +103,8 @@ if(QT_UPDATE_VERSION) foreach(_current_qt_port IN LISTS QT_PORTS) set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") file(READ "${_current_control}" _control_contents) - string(REGEX REPLACE "\"version-string\": [^\n]+\n" "\"version-string\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") file(WRITE "${_current_control}" "${_control_contents}") #need to run a vcpkg format-manifest --all after update once endforeach() diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 7d44bf87e9954d..88e234e02aebfd 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,15 +1,20 @@ -set(QT_VERSION 6.1.3) +set(QT_VERSION 6.2.0) + +if(PORT MATCHES "qtquickcontrols2") + set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!") + return() +endif() set(QT_GIT_TAG v${QT_VERSION}) + #set(QT_UPDATE_VERSION TRUE) if(QT_UPDATE_VERSION) function(vcpkg_extract_source_archive) endfunction() endif() -# List of added an removed modules https://doc-snapshots.qt.io/qt6-dev/whatsnew60.html#changes-to-supported-modules -#https://wiki.qt.io/Get_the_Source -#TODO:qtknx? -set(QT_PORTS qtbase +set(QT_PORTS qt + qtbase qttools qtdeclarative qtsvg @@ -25,7 +30,8 @@ set(QT_PORTS qtbase qtimageformats qtmqtt qtnetworkauth - qtquickcontrols2 + # qtquickcontrols2 -> moved into qtdeclarative + ## New in 6.1 qtactiveqt qtdatavis3d #qtdeviceutils @@ -33,46 +39,71 @@ set(QT_PORTS qtbase qtscxml qtvirtualkeyboard qtcharts - qt + ## New in 6.2 + qtconnectivity + qtlocation + qtmultimedia + qtremoteobjects + qtsensors + qtserialbus + qtserialport + qtwebchannel + qtwebengine + qtwebsockets + qtwebview ) foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() - -set(qtbase_REF 3ff48409ed14c7a63010b14e053a7201a61391c5) -set(qttools_REF a69e290e25fd145a8b02223130192555f7962ea2) -set(qtdeclarative_REF 38845e18ef11ac2f1a1db82377b30f1649fdc499) -set(qtsvg_REF 24d635154689be46aaaf2ba0e3538d2f8fafeb3d) -set(qt5compat_REF fcacd7f544b496420db485187aa55d76898ce73d) -set(qtshadertools_REF 06fc3c49b7b8cba80e6b6ff31ac5d703e3a2abcb) -set(qtquicktimeline_REF be6321dc5164657072ff7069a7132d44222a503c) -set(qtquick3d_REF ccd45eb39ec1fb88d62438c9dd0007e26c0ccc18) -set(qttranslations_REF 2d30ad16d90abfc0806d28e3504348df84b1e62b) -set(qtwayland_REF 501c287f34a66ec89e3e49da218feb4bc69c9c5e) -set(qtdoc_REF 13fa00e32307bae90884a608880a542f6ed90646) -set(qtimageformats_REF 8d6e8efc1afbd5e9cf793fbf0507e1d332c45d1f) -set(qtmqtt_REF a6213a104f65dccb13508b58b0f07a249d9922c8) -set(qtquickcontrols2_REF 6d62c0677d60e42a19bb72d641129933770f7723) -set(qtnetworkauth_REF 7ce9e47b469141f9bace9661d07999dcc120e7f6) -set(qtcoap_REF 83b5b7e8e2c6afa9d5ab69123c40993c48b30970) -set(qtopcua_REF bda48fd7729fb65a7504a1bada496489ee15d245) -set(qtactiveqt_REF 32cad4a02f78205e85490f6b8cbde82ecb1b5f2f) -set(qtdatavis3d_REF 8d6c15fa8daa68a4d48368b8ceb8c517e973eac7) +set(qtbase_REF 0c2d00de3488116db9f9d657fe18bcb972a83792) +set(qtshadertools_REF 119cd6e9c9e89f93b74db28f261382a2fcfe504e) +set(qtdeclarative_REF 37da36c97d9d557945abca3cea5c68d9985a06e3) +set(qt5compat_REF 291993c7813ec706e54069c7de339edfdd385c0d) +set(qttools_REF 00efbf90f978afefdcece314d19b79459eee2211) # Additional refs in portfile due to submodule +set(qtcoap_REF be7822dc920a3e3eb252d5693a7153aa606d3dc1) +set(qtdoc_REF 48a1fbab30a9f57f011fdea8ec2b47048dce4069) +set(qtimageformats_REF 7bb9dc839c0dd0806445fd475b027a82c961f686) +set(qtmqtt_REF 4fd647e23d95c522c45d86be584d18578f894823) +set(qtnetworkauth_REF aa23db40ca552d60383dea17d703b1cc0cbeace4) +set(qtopcua_REF cfb3767b2a6785e0437b99c015cb6aef7f40189c) +set(qtquicktimeline_REF e9578a6949f6192440df1cb261ed9de98a9de7d7) +set(qtquick3d_REF eaf9c60073b95b03c006279f08d4947699c32a4b) +set(qtsvg_REF cceecea040ca1247db0212217d07ec2c331004ba) +set(qttranslations_REF 03a146236e69ee41c0405a8b5707104b4ac0c6e8) +set(qtwayland_REF 8c4900dda393752faab14e39e60aec6b545c8a0f) +# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2 +### New in 6.1 +set(qtactiveqt_REF 94c924a8501dba7487bf2648bdf06aefc33e726d) +set(qtcharts_REF d56b9f3de193cbf561f4b1ec332d8598dbdaaaca) +set(qtdatavis3d_REF 5c90e6642882b3b7440608f71b96ce28908f0ee8) #set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF 266531117ba6646893d3806566144aff19d5e309) -set(qtscxml_REF aa27d28e302f3529940172ab2782c2d7e28fb532) -set(qtvirtualkeyboard_REF eb26e2af30e6cbb2c4b9224d8e9f489f198c82f0) -set(qtcharts_REF 3e0d6ffa572efe8a09774ac6c6263b6df5eaf718) +set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288) +set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344) +set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f) +### New in 6.2 +set(qtconnectivity_REF 78e7ffbe16469a19fa34cad711e0898d91bd2f30) +set(qtlocation_REF 47a945b0d054539eab3ba1cf3a1d7bf5977051d6) +set(qtmultimedia_REF d7d0e676abd4b280feb0d5105846378b64782487) +set(qtremoteobjects_REF 58932ba10420faa1cc989ed5bf101ff06475a4fc) +set(qtsensors_REF 192ca0fd252066101eb0456b957fdb51618fa7db) +set(qtserialbus_REF ce089bef29ca55d7fe46508d92d3e498eb5bb847) +set(qtserialport_REF 14dc155f3640af94c6ecff2de1489e14cd5b0047) +set(qtwebchannel_REF 09315a8d626e106953723ce68e68d6b4b97c2c52) +set(qtwebengine_REF 261d72c8afc72faf23d169a64749db216db68859) # Additional refs in portfile due to submodule +set(qtwebsockets_REF a01c2d6638fad700db23863258b7fc4a1ecdd542) +set(qtwebview_REF ca0053b6a5320046508e9ba205df775a62c1a211) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") set(_VCPKG_INTERNAL_NO_HASH_CHECK 1) if("${PORT}" MATCHES "qtbase") + file(REMOVE "${CMAKE_CURRENT_LIST_DIR}/cmake/qt_new_refs.cmake") foreach(_current_qt_port IN LISTS QT_PORTS) set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json") file(READ "${_current_control}" _control_contents) string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}") + string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}") file(WRITE "${_current_control}" "${_control_contents}") #need to run a vcpkg format-manifest --all after update once endforeach() diff --git a/ports/qtbase/fix_cmake_build.patch b/ports/qtbase/fix_cmake_build.patch new file mode 100644 index 00000000000000..65410e3fc70899 --- /dev/null +++ b/ports/qtbase/fix_cmake_build.patch @@ -0,0 +1,15 @@ +diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in +index ffc9d90f8..0b3a7d59e 100644 +--- a/cmake/QtBuildInternalsExtra.cmake.in ++++ b/cmake/QtBuildInternalsExtra.cmake.in +@@ -51,8 +51,8 @@ endif() + set(QT_WILL_INSTALL @QT_WILL_INSTALL@ CACHE BOOL + "Boolean indicating if doing a Qt prefix build (vs non-prefix build)." FORCE) + +-set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH +-"A path to the source tree of the previously configured QtBase project." FORCE) ++# set(QT_SOURCE_TREE "@QT_SOURCE_TREE@" CACHE PATH ++# "A path to the source tree of the previously configured QtBase project." FORCE) + + # Propagate decision of building tests and examples to other repositories. + set(QT_BUILD_TESTS @QT_BUILD_TESTS@ CACHE BOOL "Build the testing tree.") diff --git a/ports/qtbase/fix_egl.patch b/ports/qtbase/fix_egl.patch new file mode 100644 index 00000000000000..7868310687cd81 --- /dev/null +++ b/ports/qtbase/fix_egl.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake +index eafbc1ff9..dd4068838 100644 +--- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake ++++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindEGL.cmake +@@ -82,6 +82,7 @@ find_path(EGL_INCLUDE_DIR + find_library(EGL_LIBRARY + NAMES + EGL ++ libEGL # required to find angle on windows within vcpkg. + HINTS + ${PKG_EGL_LIBRARY_DIRS} + ) diff --git a/ports/qtbase/fix_find_dep.patch b/ports/qtbase/fix_find_dep.patch deleted file mode 100644 index 0414198a1e6884..00000000000000 --- a/ports/qtbase/fix_find_dep.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 40c410aeb..c36084fb9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,6 +24,8 @@ project(QtBase - LANGUAGES CXX C ASM - ) - -+find_package(Threads REQUIRED) -+set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) - # Make sure we only use latest private CMake API, aka no compatibility wrappers. - set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) - diff --git a/ports/qtbase/jpeg.patch b/ports/qtbase/jpeg.patch deleted file mode 100644 index 1f2080561e300d..00000000000000 --- a/ports/qtbase/jpeg.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp -index 29bf5ab58..1a3cfd2bf 100644 ---- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp -+++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp -@@ -63,12 +63,12 @@ - extern "C" { - // jpeglib.h->jmorecfg.h tries to typedef int boolean; but this conflicts with - // some Windows headers that may or may not have been included --#ifdef HAVE_BOOLEAN --# undef HAVE_BOOLEAN --#endif --#define boolean jboolean -+//#ifdef HAVE_BOOLEAN -+//# undef HAVE_BOOLEAN -+//#endif -+//#define boolean jboolean - --#define XMD_H // shut JPEGlib up -+//#define XMD_H // shut JPEGlib up - #include - #ifdef const - # undef const // remove crazy C hackery in jconfig.h diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 9d48e0ed5c445d..60a2472544a5c2 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -1,23 +1,27 @@ -set(QT_IS_LATEST OFF) +# Reminder for myself and everybody else: +# Qt cross module dependency information within the Qt respository is wrong and/or incomplete. +# Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets +# Often enough certain (bigger) dependencies are only used to build examples and/or tests. +# As such getting the correct dependency information relevant for vcpkg requires a manual search/check + +#set(QT_IS_LATEST ON) ## All above goes into the qt_port_hashes in the future include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") set(${PORT}_PATCHES - jpeg.patch - harfbuzz.patch - config_install.patch allow_outside_prefix.patch - buildcmake.patch - dont_force_cmakecache.patch - fix_find_dep.patch - 20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch. clang-cl_source_location.patch + config_install.patch + dont_force_cmakecache.patch + fix_cmake_build.patch + harfbuzz.patch + fix_egl.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) list(APPEND ${PORT}_PATCHES - ) + ) endif() if(VCPKG_TARGET_IS_WINDOWS AND NOT "doubleconversion" IN_LIST FEATURES) @@ -58,6 +62,8 @@ FEATURES "zstd" FEATURE_zstd "framework" FEATURE_framework "concurrent" FEATURE_concurrent + "concurrent" FEATURE_future + "concurrent" FEATURE_thread "dbus" FEATURE_dbus "gui" FEATURE_gui "network" FEATURE_network @@ -87,13 +93,11 @@ INVERTED_FEATURES "glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2 ) -#list(APPEND FEATURE_CORE_OPTIONS -DFEATURE_doubleconversion:BOOL=ON) list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_LTTngUST:BOOL=ON) list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_PPS:BOOL=ON) list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Slog2:BOOL=ON) list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON) - # Network features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_NET_OPTIONS FEATURES @@ -205,6 +209,8 @@ set(TOOL_NAMES rcc tracegen uic + qtpaths + qtpaths6 ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} @@ -255,12 +261,13 @@ file(COPY qt_stop_on_update() set(script_files qt-cmake qt-cmake-private qt-cmake-standalone-test qt-configure-module qt-internal-configure-tests) -if(VCPKG_TARGET_IS_WINDOWS) +if(CMAKE_HOST_WIN32) set(script_suffix .bat) else() set(script_suffix) endif() set(other_files + target_qt.conf qt-cmake-private-install.cmake syncqt.pl android_cmakelist_patcher.sh @@ -297,8 +304,10 @@ foreach(_config debug release) endforeach() endforeach() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(VCPKG_CROSSCOMPILING) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/qmake" "${CURRENT_PACKAGES_DIR}/debug/bin/qmake") # qmake has been moved so this is the qmake helper script + endif() file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*") if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/") diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 72b43da6821318..876f3f43fb4e4c 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/portfile.cmake b/ports/qtcharts/portfile.cmake index 1a3a6f1bfedbd7..d6a3b2fd0ad24e 100644 --- a/ports/qtcharts/portfile.cmake +++ b/ports/qtcharts/portfile.cmake @@ -3,8 +3,14 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 75ba14445ff8d7..710907fd98307e 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,18 +1,36 @@ { "name": "qtcharts", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ - "qtdeclarative", - "qttools" - ], - "default-features": [ - "default-features" + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "widgets" + ] + } ], "features": { - "default-features": { - "description": "Platform-dependent default features" + "designer": { + "description": "Build Designer plugin", + "dependencies": [ + { + "name": "qttools", + "default-features": false + } + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] } } } diff --git a/ports/qtcoap/portfile.cmake b/ports/qtcoap/portfile.cmake index 1a3a6f1bfedbd7..1940e3989d968e 100644 --- a/ports/qtcoap/portfile.cmake +++ b/ports/qtcoap/portfile.cmake @@ -4,7 +4,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES) qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS + CONFIGURE_OPTIONS CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 011cf9ea684c59..b68ddc6401b9b8 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,20 +1,15 @@ { "name": "qtcoap", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ { "name": "qtbase", - "default-features": false + "default-features": false, + "features": [ + "network" + ] } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } + ] } diff --git a/ports/qtconnectivity/portfile.cmake b/ports/qtconnectivity/portfile.cmake new file mode 100644 index 00000000000000..1a3a6f1bfedbd7 --- /dev/null +++ b/ports/qtconnectivity/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json new file mode 100644 index 00000000000000..8af8688face9db --- /dev/null +++ b/ports/qtconnectivity/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "qtconnectivity", + "version-semver": "6.2.0", + "description": "Qt Connectivity", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "dbus", + "gui", + "network" + ] + } + ] +} diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index f998b145b98d54..f274834acac69e 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ @@ -8,9 +8,13 @@ "name": "qtbase", "default-features": false, "features": [ - "gui" + "gui", + "testlib" ] }, - "qttools" + { + "name": "qtdeclarative", + "default-features": false + } ] } diff --git a/ports/qtdeclarative/fix_alignment.patch b/ports/qtdeclarative/fix_alignment.patch deleted file mode 100644 index 088f60dc632894..00000000000000 --- a/ports/qtdeclarative/fix_alignment.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/qml/jsruntime/qv4enginebase_p.h b/src/qml/jsruntime/qv4enginebase_p.h -index 612c2dd4530..17e47e1b059 100644 ---- a/src/qml/jsruntime/qv4enginebase_p.h -+++ b/src/qml/jsruntime/qv4enginebase_p.h -@@ -88,7 +88,9 @@ struct Q_QML_EXPORT EngineBase { - MemoryManager *memoryManager = nullptr; - - qint32 callDepth = 0; -- quint8 padding2[QT_POINTER_SIZE - sizeof(quint32)]; -+#if QT_POINTER_SIZE == 8 -+ quint32 padding2; -+#endif - Object *globalObject = nullptr; - Value *jsStackLimit = nullptr; - Value *jsStackBase = nullptr; diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index fcea8ed2b3da09..3928c3af39d69d 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -1,10 +1,6 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -if(QT_IS_LATEST) - set(${PORT}_PATCHES fix_alignment.patch) -endif() - set(TOOL_NAMES qml qmlcachegen @@ -19,6 +15,7 @@ endif() qmltestrunner qmltime qmltyperegistrar + qmldom ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index b8249ab253ad19..7a8e82c7af17ec 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ @@ -15,6 +15,10 @@ "name": "qtdeclarative", "host": true, "default-features": false + }, + { + "name": "qtshadertools", + "default-features": false } ] } diff --git a/ports/qtdoc/portfile.cmake b/ports/qtdoc/portfile.cmake index a060db617d7e4e..df99e640f4f1fd 100644 --- a/ports/qtdoc/portfile.cmake +++ b/ports/qtdoc/portfile.cmake @@ -2,10 +2,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES) -set(TOOL_NAMES) qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 7391fc2d899138..c29a93d6512de7 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,21 +1,12 @@ { "name": "qtdoc", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ { "name": "qtbase", "default-features": false - }, - "qtdeclarative" - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" } - } + ] } diff --git a/ports/qtimageformats/no_target_promotion.patch b/ports/qtimageformats/no_target_promotion.patch new file mode 100644 index 00000000000000..73e5f7d4e00395 --- /dev/null +++ b/ports/qtimageformats/no_target_promotion.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7fdd7ddbd..f189c472c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,7 +9,16 @@ project(QtImageFormats # special case + HOMEPAGE_URL "https://qt.io/" + LANGUAGES CXX C + ) +- ++find_package(Threads) ++set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE) ++find_package(ZLIB) ++if(TARGET ZLIB::ZLIB) ++ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE) ++endif() ++find_package(JPEG) ++if(TARGET JPEG::JPEG) ++ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) ++endif() + # special case begin + # Make sure we only use latest private CMake API, aka no compatibility wrappers. + set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) diff --git a/ports/qtimageformats/portfile.cmake b/ports/qtimageformats/portfile.cmake index db31bc4d32c90f..c72184818458cf 100644 --- a/ports/qtimageformats/portfile.cmake +++ b/ports/qtimageformats/portfile.cmake @@ -2,7 +2,7 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES) +set(${PORT}_PATCHES no_target_promotion.patch) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index 998de3faa66cf9..f5796058ee0f67 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlocation/portfile.cmake b/ports/qtlocation/portfile.cmake new file mode 100644 index 00000000000000..6bb133bb07bdee --- /dev/null +++ b/ports/qtlocation/portfile.cmake @@ -0,0 +1,23 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort + "nmea" CMAKE_DISABLE_FIND_PACKAGE_Qt6Network +) + +list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_Gypsy=ON" + "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json new file mode 100644 index 00000000000000..e853751968a91c --- /dev/null +++ b/ports/qtlocation/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "qtlocation", + "version-semver": "6.2.0", + "description": "Qt Location", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "dbus" + ], + "platform": "linux" + } + ], + "features": { + "nmea": { + "description": "Build with nmea", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + }, + "qtserialport" + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/ports/qtlottie/portfile.cmake b/ports/qtlottie/portfile.cmake index 1a3a6f1bfedbd7..9ad5b29e39d465 100644 --- a/ports/qtlottie/portfile.cmake +++ b/ports/qtlottie/portfile.cmake @@ -3,8 +3,15 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 1f8731f9389d6a..06a3c1fe876bae 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,22 +1,26 @@ { "name": "qtlottie", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "dependencies": [ { "name": "qtbase", - "default-features": false - }, - "qtdeclarative", - "qttools" - ], - "default-features": [ - "default-features" + "default-features": false, + "features": [ + "gui" + ] + } ], "features": { - "default-features": { - "description": "Platform-dependent default features" + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] } } } diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index cd0f253cd1051e..db5afd4eaaa4a7 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ @@ -11,13 +11,5 @@ "network" ] } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } + ] } diff --git a/ports/qtmultimedia/fix_windows_header_include.patch b/ports/qtmultimedia/fix_windows_header_include.patch new file mode 100644 index 00000000000000..6e06e5c4a9edc5 --- /dev/null +++ b/ports/qtmultimedia/fix_windows_header_include.patch @@ -0,0 +1,13 @@ +diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +index 23e349e02..233a816d4 100644 +--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h ++++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +@@ -56,7 +56,7 @@ + #include + #include + #include +-#include ++#include + + struct IMMDeviceEnumerator; + diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake new file mode 100644 index 00000000000000..35d706187b12b1 --- /dev/null +++ b/ports/qtmultimedia/portfile.cmake @@ -0,0 +1,40 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES fix_windows_header_include.patch) + +#Maybe TODO: ALSA + PulseAudio? (Missing Ports) + +# qt_find_package(ALSA PROVIDED_TARGETS ALSA::ALSA MODULE_NAME multimedia QMAKE_LIB alsa) +# qt_find_package(AVFoundation PROVIDED_TARGETS AVFoundation::AVFoundation MODULE_NAME multimedia QMAKE_LIB avfoundation) +# qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio) +# qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf) + +# qt_configure_add_summary_section(NAME "Qt Multimedia") +# qt_configure_add_summary_entry(ARGS "alsa") +# qt_configure_add_summary_entry(ARGS "gstreamer_1_0") +# qt_configure_add_summary_entry(ARGS "linux_v4l") +# qt_configure_add_summary_entry(ARGS "pulseaudio") +# qt_configure_add_summary_entry(ARGS "mmrenderer") +# qt_configure_add_summary_entry(ARGS "avfoundation") +# qt_configure_add_summary_entry(ARGS "wmf") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets + "gstreamer" CMAKE_DISABLE_FIND_PACKAGE_GStreamer +) + +if("gstreamer" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'") +else() + list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") +endif() + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json new file mode 100644 index 00000000000000..f354e57afa8d83 --- /dev/null +++ b/ports/qtmultimedia/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "qtmultimedia", + "version-semver": "6.2.0", + "description": "Qt Multimedia", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "network" + ] + } + ], + "default-features": [ + "widgets" + ], + "features": { + "gstreamer": { + "description": "Build with gstreamer", + "dependencies": [ + "angle", + "gstreamer" + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "widgets": { + "description": "Build Multimedia Widgets", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "widgets" + ] + } + ] + } + } +} diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 43565da8a873da..9ac791bbe44771 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ @@ -11,13 +11,5 @@ "network" ] } - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } + ] } diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 258b358a2ff907..024052484586e9 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -10,6 +10,7 @@ FEATURES "ns0idnames" FEATURE_ns0idnames "ns0idgenerator" FEATURE_ns0idgenerator INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) if("open62541" IN_LIST FEATURES) list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 89b264c53f05a0..1021c16d60057c 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ @@ -10,8 +10,7 @@ "features": [ "network" ] - }, - "qtdeclarative" + } ], "default-features": [ "default-features", @@ -45,6 +44,22 @@ } ] }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, "uacpp": { "description": "Unified Automation C++ SDK" } diff --git a/ports/qtquick3d/portfile.cmake b/ports/qtquick3d/portfile.cmake index 4b4b49a9fc3f26..f7c6c761a65627 100644 --- a/ports/qtquick3d/portfile.cmake +++ b/ports/qtquick3d/portfile.cmake @@ -1,8 +1,6 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES) - # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -17,7 +15,7 @@ else() list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no) endif() -set(TOOL_NAMES balsam meshdebug shadergen) +set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer) qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index cc432867a2aa0f..c3a396fbdb6ff4 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,12 +1,15 @@ { "name": "qtquick3d", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ { "name": "qtbase", - "default-features": false + "default-features": false, + "features": [ + "gui" + ] }, "qtdeclarative", { @@ -14,6 +17,7 @@ "host": true, "default-features": false }, + "qtquicktimeline", "qtshadertools" ], "default-features": [ @@ -21,6 +25,7 @@ ], "features": { "assimp": { + "$comment": "feature assimp requires a newer version of assimp than available within vcpkg. Install assimp with e.g. --head or use an overlay", "description": "assimp", "dependencies": [ "assimp" diff --git a/ports/qtquickcontrols2/portfile.cmake b/ports/qtquickcontrols2/portfile.cmake index df909777b91b3f..2999fa8f3e0f79 100644 --- a/ports/qtquickcontrols2/portfile.cmake +++ b/ports/qtquickcontrols2/portfile.cmake @@ -1,14 +1,2 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") - -set(${PORT}_PATCHES) - -#make sure your path is really short! Otherwise the build will probably fail. -# or maybe try to switch the build to nmake. -#set(ENV{CMAKE_BUILD_PARALLEL_LEVEL} 1) - -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - CONFIGURE_OPTIONS - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index 8de3a63c5d2e3f..cdc422ec3290b9 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,21 +1,9 @@ { "name": "qtquickcontrols2", - "version-semver": "6.1.3", - "description": "Qt Quick Controls 2", + "version-semver": "6.2.0", + "description": "Qt Quick Controls 2 (deprecated). Included in qtdeclarative", "homepage": "https://www.qt.io/", "dependencies": [ - { - "name": "qtbase", - "default-features": false - }, "qtdeclarative" - ], - "default-features": [ - "default-features" - ], - "features": { - "default-features": { - "description": "Platform-dependent default features" - } - } + ] } diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 9ca9a302012195..6ec128e6e4700c 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtremoteobjects/portfile.cmake b/ports/qtremoteobjects/portfile.cmake new file mode 100644 index 00000000000000..9969bd4eeb9eaa --- /dev/null +++ b/ports/qtremoteobjects/portfile.cmake @@ -0,0 +1,18 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES repc) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json new file mode 100644 index 00000000000000..e8160b64a80fdb --- /dev/null +++ b/ports/qtremoteobjects/vcpkg.json @@ -0,0 +1,42 @@ +{ + "name": "qtremoteobjects", + "version-semver": "6.2.0", + "description": "Qt distributed object system", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtremoteobjects", + "host": true, + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/ports/qtscxml/portfile.cmake b/ports/qtscxml/portfile.cmake index daa6b663e20be4..1215ca019df642 100644 --- a/ports/qtscxml/portfile.cmake +++ b/ports/qtscxml/portfile.cmake @@ -5,9 +5,15 @@ set(${PORT}_PATCHES) set(TOOL_NAMES qscxmlc) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml +) + qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 72af5b0121aeef..8e52fe46e51279 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,22 +1,31 @@ { "name": "qtscxml", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ { "name": "qtbase", - "default-features": false + "default-features": false, + "features": [ + "gui" + ] }, - "qtdeclarative", { "name": "qtscxml", "host": true, "default-features": false - }, - { - "name": "qttools", - "default-features": false } - ] + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } } diff --git a/ports/qtsensors/portfile.cmake b/ports/qtsensors/portfile.cmake new file mode 100644 index 00000000000000..d6a3b2fd0ad24e --- /dev/null +++ b/ports/qtsensors/portfile.cmake @@ -0,0 +1,16 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json new file mode 100644 index 00000000000000..96ddd1ea241141 --- /dev/null +++ b/ports/qtsensors/vcpkg.json @@ -0,0 +1,30 @@ +{ + "name": "qtsensors", + "version-semver": "6.2.0", + "description": "Qt Sensors", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "dbus" + ] + }, + { + "name": "qtconnectivity", + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/ports/qtserialbus/portfile.cmake b/ports/qtserialbus/portfile.cmake new file mode 100644 index 00000000000000..b69e37c31e9fd6 --- /dev/null +++ b/ports/qtserialbus/portfile.cmake @@ -0,0 +1,18 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + + set(TOOL_NAMES + canbusutil + ) + +# Probably not worth the time to make it features: +# qt_configure_add_summary_entry(ARGS "socketcan") # only unix +# qt_configure_add_summary_entry(ARGS "socketcan_fd") # only unix +# qt_configure_add_summary_entry(ARGS "modbus-serialport") + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json new file mode 100644 index 00000000000000..9d098a20b6be8c --- /dev/null +++ b/ports/qtserialbus/vcpkg.json @@ -0,0 +1,32 @@ +{ + "name": "qtserialbus", + "version-semver": "6.2.0", + "description": "Support for CAN and potentially other serial buses.", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + }, + { + "name": "qtserialbus", + "host": true, + "default-features": false + }, + { + "name": "qtserialport", + "default-features": false + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + } + } +} diff --git a/ports/qtserialport/portfile.cmake b/ports/qtserialport/portfile.cmake new file mode 100644 index 00000000000000..1a3a6f1bfedbd7 --- /dev/null +++ b/ports/qtserialport/portfile.cmake @@ -0,0 +1,10 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json new file mode 100644 index 00000000000000..a79bd280efc2f6 --- /dev/null +++ b/ports/qtserialport/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qtserialport", + "version-semver": "6.2.0", + "description": "Qt Serial Port support", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false + } + ] +} diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 534162d740fa80..2919d89ae514e0 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 97ab747c96917c..8b547f8e358ed3 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index 77b2787d688cd4..3f965aa52b9e7e 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -33,9 +33,15 @@ set(${PORT}_PATCHES )#fix_static_build.patch) # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "assistant" FEATURE_assistant + "designer" FEATURE_designer + "linguist" FEATURE_linguist INVERTED_FEATURES - "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang - "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets ) set(TOOL_NAMES @@ -67,14 +73,52 @@ elseif(VCPKG_TARGET_IS_OSX) list(APPEND TOOL_NAMES macdeployqt) endif() -qt_install_submodule(PATCHES ${${PORT}_PATCHES} - TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON - CONFIGURE_OPTIONS_RELEASE - CONFIGURE_OPTIONS_DEBUG - ) - +### Download third_party modules +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML + URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git + REF 908670c5b68d3bcf4712019a028079b8b2042dd4 + FETCH_REF master + HEAD_REF master +) +# port 'litehtml' is not in vcpkg! +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH_LITEHTML + REPO litehtml/litehtml + REF db7f59d5886fd50f84d48720c79dc2e6152efa83 + SHA512 6beed53f8b779359eb2d08495547f9b4e3d02b70d68e035e6c188f009a283e630b3961caa472ce045799a9ef82e1cd6b3c63d8534e6e8127441944f4837a0352 + HEAD_REF master +) + +##### qt_install_submodule +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() +file(COPY "${SOURCE_PATH_QLITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml") +file(COPY "${SOURCE_PATH_LITEHTML}/" DESTINATION "${SOURCE_PATH}/src/assistant/qlitehtml/src/3rdparty/litehtml") + + +if(_qis_DISABLE_NINJA) + set(_opt DISABLE_NINJA) +endif() +qt_cmake_configure(${_opt} + OPTIONS ${FEATURE_OPTIONS} + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + +vcpkg_install_cmake(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +##### qt_install_submodule + if(VCPKG_TARGET_IS_OSX) set(OSX_APP_FOLDERS Designer.app Linguist.app pixeltool.app qdbusviewer.app) foreach(_appfolder IN LISTS OSX_APP_FOLDERS) @@ -92,3 +136,9 @@ if(EXISTS "${configfile}" AND EXISTS "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/wind string(REPLACE [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.exe]] [[${_IMPORT_PREFIX}/tools/Qt6/bin/windeployqt.debug.bat]] _contents "${_contents}") file(WRITE "${configfile}" "${_contents}") endif() + +file(GLOB_RECURSE debug_dir "${CURRENT_PACKAGES_DIR}/debug/*") +list(LENGTH debug_dir debug_dir_elements) +if(debug_dir_elements EQUAL 0) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index e9bd7dd30be3b8..cfdf1a27241353 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,29 +1,63 @@ { "name": "qttools", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ { "name": "qtbase", - "default-features": false, - "features": [ - "network" - ] + "default-features": false }, - "qtdeclarative", { "name": "qttools", "host": true, - "default-features": false + "default-features": false, + "features": [ + "assistant", + "linguist" + ] } ], "features": { + "assistant": { + "description": "Build Qt Assistant" + }, + "designer": { + "description": "Build Qt Designer" + }, + "linguist": { + "description": "Build Qt Linguist components", + "dependencies": [ + { + "name": "qttools", + "default-features": false, + "features": [ + "designer" + ] + } + ] + }, "qdoc": { "description": "Build QDoc.", "dependencies": [ "llvm" ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + } + ] } } } diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index fec110b00ae896..82fcdc97b60c4e 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ @@ -8,7 +8,13 @@ "name": "qtbase", "default-features": false }, - "qttools" + { + "name": "qttools", + "default-features": false, + "features": [ + "linguist" + ] + } ], "default-features": [ "default-features" diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 533af68a162002..24385931486855 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,12 +1,24 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.1.3", + "version-semver": "6.2.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ - "qtdeclarative", - "qtsvg", - "qttools" + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtsvg", + "default-features": false + } ], "default-features": [ "default-features", diff --git a/ports/qtwayland/portfile.cmake b/ports/qtwayland/portfile.cmake index cac3fa73e388d2..d8846384660c96 100644 --- a/ports/qtwayland/portfile.cmake +++ b/ports/qtwayland/portfile.cmake @@ -9,9 +9,16 @@ set(${PORT}_PATCHES) set(TOOL_NAMES qtwaylandscanner) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + qt_install_submodule(PATCHES ${${PORT}_PATCHES} TOOL_NAMES ${TOOL_NAMES} - CONFIGURE_OPTIONS + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index cfe7d278f77061..b7dcae0e7c1c0b 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,24 +1,27 @@ { "name": "qtwayland", - "version-semver": "6.1.3", - "port-version": 2, + "version-semver": "6.2.0", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "supports": "!windows", "dependencies": [ { "name": "qtbase", - "default-features": false - }, - "qtdeclarative", - "qtopcua" - ], - "default-features": [ - "default-features" + "default-features": false, + "features": [ + "gui" + ] + } ], "features": { - "default-features": { - "description": "Platform-dependent default features" + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] } } } diff --git a/ports/qtwebchannel/portfile.cmake b/ports/qtwebchannel/portfile.cmake new file mode 100644 index 00000000000000..9ad5b29e39d465 --- /dev/null +++ b/ports/qtwebchannel/portfile.cmake @@ -0,0 +1,17 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json new file mode 100644 index 00000000000000..ead77bb550c6ed --- /dev/null +++ b/ports/qtwebchannel/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "qtwebchannel", + "version-semver": "6.2.0", + "description": "Qt WebChannel", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake new file mode 100644 index 00000000000000..a96399dafdfa5f --- /dev/null +++ b/ports/qtwebengine/portfile.cmake @@ -0,0 +1,110 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES + "proprietary-codecs" FEATURE_webengine-proprietary-codecs + "spellchecker" FEATURE_webengine-spellchecker + "geolocation" FEATURE_webengine-geolocation + "webchannel" FEATURE_webengine-webchannel +INVERTED_FEATURES + "geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning + "webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel +) + +if(VCPKG_TARGET_IS_OSX AND "spellchecker" IN_LIST FEATRUES) + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-native-spellchecker=ON") +endif() + +# webengine-extensions +# webengine-printing-and-pdf +# webengine-pepper-plugins +set(deactivated_features webengine-webrtc webengine-webrtc-pipewire webengine-v8-snapshot-support) +foreach(_feat IN LISTS deactivated_features) + list(APPEND FEATURE_OPTIONS "-DFEATURE_${_feat}=OFF") +endforeach() + +if(VCPKG_TARGET_IS_LINUX) + # qt_configure_add_summary_entry(ARGS "webengine-system-lcms2") + # qt_configure_add_summary_entry(ARGS "webengine-system-libpci") + # + ALSA and PULSEAUDIO + set(system_libs re2 icu libwebp opus ffmpeg libvpx snappy glib zlib minizip libevent protobuf libxml libpng libjpeg harfbuzz freetype) + foreach(_sys_lib IN LISTS system_libs) + list(APPEND FEATURE_OPTIONS "-DFEATURE_webengine-system-${_sys_lib}=ON") + endforeach() +endif() + +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(GPERF) +vcpkg_find_acquire_program(PYTHON2) + +#vcpkg_find_acquire_program(GN) # Qt builds its own internal version + +find_program(NODEJS NAMES node PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/node" "bin" NO_DEFAULT_PATHS) +find_program(NODEJS NAMES node) +if(NOT NODEJS) + message(FATAL_ERROR "node not found! Please install it via your system package manager!") +endif() + +get_filename_component(GPERF_DIR "${GPERF}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${GPERF_DIR}") +get_filename_component(NODEJS_DIR "${NODEJS}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${NODEJS_DIR}") +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${FLEX_DIR}") +get_filename_component(BISON_DIR "${BISON}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${BISON_DIR}") +get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY ) +vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}") + +if(WIN32) # WIN32 HOST probably has win_flex and win_bison! + if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${FLEX}" "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() + if(NOT EXISTS "${BISON_DIR}/BISON${VCPKG_HOST_EXECUTABLE_SUFFIX}") + file(CREATE_LINK "${BISON}" "${BISON_DIR}/bison${VCPKG_HOST_EXECUTABLE_SUFFIX}") + endif() +endif() + +### Download third_party modules +vcpkg_from_git( + OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE + URL git://code.qt.io/qt/qtwebengine-chromium.git + REF 202e34476e934633b3c2e4679a53c4b0847364a8 +) + +##### qt_install_submodule +set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins) +set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) + +qt_download_submodule(PATCHES ${${PORT}_PATCHES}) +if(QT_UPDATE_VERSION) + return() +endif() +if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") + file(RENAME "${SOURCE_PATH_WEBENGINE}/chromium" "${SOURCE_PATH}/src/3rdparty/chromium") +endif() +if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/gn") + file(RENAME "${SOURCE_PATH_WEBENGINE}/gn" "${SOURCE_PATH}/src/3rdparty/gn") +endif() + +qt_cmake_configure(OPTIONS ${FEATURE_OPTIONS} + -DGPerf_EXECUTABLE=${GPERF} + -DBISON_EXECUTABLE=${BISON} + -DFLEX_EXECUTABLE=${FLEX} + #-DGn_EXECUTABLE=${GN} + -DPython2_EXECUTABLE=${PYTHON2} + -DNodejs_EXECUTABLE=${NODEJS} + OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} + OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) + +vcpkg_install_cmake(ADD_BIN_TO_PATH) + +qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES}) + +qt_install_copyright("${SOURCE_PATH}") + +##### qt_install_submodule diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json new file mode 100644 index 00000000000000..8b72f15de4a9a3 --- /dev/null +++ b/ports/qtwebengine/vcpkg.json @@ -0,0 +1,146 @@ +{ + "$comment": "x86-windows is not within the upstream support matrix of Qt6", + "name": "qtwebengine", + "version-semver": "6.2.0", + "description": "Qt WebEngine", + "homepage": "https://www.qt.io/", + "supports": "!static & !((arm | x86) & windows)", + "dependencies": [ + { + "name": "ffmpeg", + "platform": "!windows" + }, + { + "name": "fontconfig", + "platform": "!windows" + }, + { + "name": "freetype", + "platform": "!windows" + }, + { + "name": "glib", + "platform": "!windows" + }, + { + "name": "harfbuzz", + "platform": "!windows" + }, + { + "name": "icu", + "platform": "!windows" + }, + { + "name": "libevent", + "platform": "!windows" + }, + { + "name": "libjpeg-turbo", + "platform": "!windows" + }, + { + "name": "libpng", + "platform": "!windows" + }, + { + "name": "libvpx", + "platform": "!windows" + }, + { + "name": "libwebp", + "platform": "!windows" + }, + { + "name": "libxml2", + "platform": "!windows" + }, + { + "name": "minizip", + "platform": "!windows" + }, + "opengl-registry", + { + "name": "opus", + "platform": "!windows" + }, + { + "name": "protobuf", + "platform": "!windows" + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "network", + "widgets" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qttools", + "default-features": false + }, + { + "$comment": "Requires GN host tool build by the port itself! (special version check)", + "name": "qtwebengine", + "host": true, + "default-features": false + }, + { + "name": "re2", + "platform": "!windows" + }, + { + "name": "snappy", + "platform": "!windows" + }, + { + "name": "vcpkg-tool-nodejs", + "host": true + }, + { + "name": "zlib", + "platform": "!windows" + } + ], + "default-features": [ + "default-features" + ], + "features": { + "default-features": { + "description": "Platform-dependent default features" + }, + "geolocation": { + "description": "Build with Geolocation", + "dependencies": [ + { + "name": "qtlocation", + "default-features": false + } + ] + }, + "proprietary-codecs": { + "description": "Enables the use of proprietary codecs such as h.264/h.265 and MP3." + }, + "spellchecker": { + "description": "Provides a spellchecker" + }, + "webchannel": { + "description": "Provides QtWebChannel integration", + "dependencies": [ + { + "name": "qtwebchannel", + "default-features": false + } + ] + } + } +} diff --git a/ports/qtwebsockets/portfile.cmake b/ports/qtwebsockets/portfile.cmake new file mode 100644 index 00000000000000..9ad5b29e39d465 --- /dev/null +++ b/ports/qtwebsockets/portfile.cmake @@ -0,0 +1,17 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json new file mode 100644 index 00000000000000..8570fd72d17e68 --- /dev/null +++ b/ports/qtwebsockets/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "qtwebsockets", + "version-semver": "6.2.0", + "description": "Qt WebSockets", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + } + } +} diff --git a/ports/qtwebview/portfile.cmake b/ports/qtwebview/portfile.cmake new file mode 100644 index 00000000000000..7385e5bf29ac6c --- /dev/null +++ b/ports/qtwebview/portfile.cmake @@ -0,0 +1,19 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) + + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick + "webengine" CMAKE_DISABLE_FIND_PACKAGE_WebEngineCore +) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json new file mode 100644 index 00000000000000..14c9dbdcaa5f25 --- /dev/null +++ b/ports/qtwebview/vcpkg.json @@ -0,0 +1,35 @@ +{ + "name": "qtwebview", + "version-semver": "6.2.0", + "description": "Qt Web View", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + } + ], + "features": { + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "webengine": { + "description": "Build with Webengine", + "dependencies": [ + { + "name": "qtwebengine", + "default-features": false + } + ] + } + } +} diff --git a/ports/vcpkg-tool-nodejs/portfile.cmake b/ports/vcpkg-tool-nodejs/portfile.cmake new file mode 100644 index 00000000000000..c7dd8e17b18034 --- /dev/null +++ b/ports/vcpkg-tool-nodejs/portfile.cmake @@ -0,0 +1,57 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) + +set(PROGNAME node) +set(PROG_VERSION 14.17.4) + +set(BREW_PACKAGE_NAME "${PROGNAME}") +set(APT_PACKAGE_NAME "${PROGNAME}") + +if(VCPKG_CROSSCOMPILING) + message(FATAL_ERROR "This is a host only port!") +endif() + +set(BASE_URL "https://nodejs.org/dist/v${PROG_VERSION}/") +set(ARCHIVE "") +set(ARCHIVE_EXT "") + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE MATCHES "^x86$|arm") + set(ARCHIVE "node-v${PROG_VERSION}-win-x86") + set(ARCHIVE_EXT ".zip") + set(HASH 82ea09a10f20ecab860b9e15b2cc72eec4a60ac5f20680f7846f37c5c1422d38d448cd7a71382cbb41101c1382412368bb74bf1a0bd7698f7ba882e022ae7304) +elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHIVE "node-v${PROG_VERSION}-win-x64") + set(ARCHIVE_EXT ".zip") + set(HASH 9a067c9ac5abc8d6af756b9a5344beee552f877a54833bdfa3a88e694359831f4edc9fac9c2c29b2f02f859e79bfeb4b91735e70c02c9daddf3e82efbfcbe46c) +elseif(VCPKG_TARGET_IS_OSX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHIVE "node-v${PROG_VERSION}-darwin-x64") + set(ARCHIVE_EXT ".tar.gz") + set(HASH 76575afb5711c6fbccd45ef319d6c3960d0363808a0703e7e9ed5c637fe19af63a8ff6eb08182df77c7620d50a42bf9fd324489466556a1b5895f0f2aebb8a5a) +elseif(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(ARCHIVE "node-v${PROG_VERSION}-linux-x64") + set(ARCHIVE_EXT ".tar.xz") + set(HASH 696af62f78147dc20e15364ba7fea6f707b0d5e3c9ae925975d64ec7dc90db4f27a3e5e90307a26bf48b05e0096ab34144d29cd9379b70b384cbd3144bf8cd85) +else() + message(FATAL_ERROR "Target not yet supported by '${PORT}'") +endif() +set(URL "${BASE_URL}${ARCHIVE}${ARCHIVE_EXT}") +message(STATUS "URL: '${URL}'") + +vcpkg_download_distfile(ARCHIVE_PATH + URLS "${URL}" + SHA512 "${HASH}" + FILENAME "${ARCHIVE}${ARCHIVE_EXT}" + #ALWAYS_REDOWNLOAD + #SKIP_SHA512 +) + +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools") +message(STATUS "ARCHIVE_PATH: '${ARCHIVE_PATH}'") + +vcpkg_execute_in_download_mode( + COMMAND ${CMAKE_COMMAND} -E tar xzf "${ARCHIVE_PATH}" + WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" +) +file(GLOB_RECURSE folders "${CURRENT_PACKAGES_DIR}/tools/*" LIST_DIRECTORIES true) +message(STATUS "Files and Folders: '${folders}'") + +file(RENAME "${CURRENT_PACKAGES_DIR}/tools/${ARCHIVE}" "${CURRENT_PACKAGES_DIR}/tools/node") diff --git a/ports/vcpkg-tool-nodejs/vcpkg.json b/ports/vcpkg-tool-nodejs/vcpkg.json new file mode 100644 index 00000000000000..aed974a26e1a27 --- /dev/null +++ b/ports/vcpkg-tool-nodejs/vcpkg.json @@ -0,0 +1,5 @@ +{ + "name": "vcpkg-tool-nodejs", + "version-semver": "14.17.4", + "supports": "native" +} diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 84a6f18bf29655..47af7c8c79d26e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1249,13 +1249,6 @@ qhull:arm-uwp=fail qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail -# Skip ports not available in Qt 6.1.0 (for Qt 6.2) -qt6betablock:x86-windows=skip -qt6betablock:x64-windows=skip -qt6betablock:x64-windows-static=skip -qt6betablock:x64-windows-static-md=skip -qt6betablock:x64-linux=skip -qt6betablock:x64-osx=skip qt5-base:arm64-windows=fail # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) diff --git a/versions/baseline.json b/versions/baseline.json index d19079847f968c..9af77e25358c28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5357,7 +5357,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5537,7 +5537,7 @@ "port-version": 1 }, "qt5compat": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qt6betablock": { @@ -5545,96 +5545,140 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtbase": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtcharts": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.1.3", + "baseline": "6.2.0", + "port-version": 0 + }, + "qtconnectivity": { + "baseline": "6.2.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtkeychain": { "baseline": "0.11.1", "port-version": 1 }, + "qtlocation": { + "baseline": "6.2.0", + "port-version": 0 + }, "qtlottie": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.1.3", + "baseline": "6.2.0", + "port-version": 0 + }, + "qtmultimedia": { + "baseline": "6.2.0", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.1.3", + "baseline": "6.2.0", + "port-version": 0 + }, + "qtremoteobjects": { + "baseline": "6.2.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.1.3", + "baseline": "6.2.0", + "port-version": 0 + }, + "qtsensors": { + "baseline": "6.2.0", + "port-version": 0 + }, + "qtserialbus": { + "baseline": "6.2.0", + "port-version": 0 + }, + "qtserialport": { + "baseline": "6.2.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtsvg": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qttools": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qttranslations": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.1.3", + "baseline": "6.2.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.1.3", - "port-version": 2 + "baseline": "6.2.0", + "port-version": 0 + }, + "qtwebchannel": { + "baseline": "6.2.0", + "port-version": 0 + }, + "qtwebengine": { + "baseline": "6.2.0", + "port-version": 0 + }, + "qtwebsockets": { + "baseline": "6.2.0", + "port-version": 0 + }, + "qtwebview": { + "baseline": "6.2.0", + "port-version": 0 }, "quadtree": { "baseline": "2020-04-13", @@ -6876,6 +6920,10 @@ "baseline": "2021-04-02", "port-version": 1 }, + "vcpkg-tool-nodejs": { + "baseline": "14.17.4", + "port-version": 0 + }, "vectorclass": { "baseline": "2.00.01", "port-version": 1 diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 922dbedaf5ea40..6e24a71f316696 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "420d2198ead04223b9c2901f9c1078b6f956cf44", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "7af9212716c1c55de883178c890121a7d804cc48", "version-semver": "6.1.3", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 322b3247c4e550..59b8e7099bfaf5 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "374ed713fb29fa32bc126a93372be23a0fc85ff3", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "215bfc596de54c9c4b5c83e1d8d4ab53ddfaba72", "version-semver": "6.1.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 0e6ef81b0002b5..2244cc69ca7b56 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7d57c70efabceaca7d833b441ad986c4eebb09b", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "925f4777d7eb69e9fa1d6de9af0fdf3e4511799f", "version-semver": "6.1.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 16a8e0e8a2989b..9585acad132abb 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9850138b57bf2122ee9e5063c76944754f4dbf63", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "23812ecb279c5ae29a26e99f2ccc605bbe17f45a", "version-semver": "6.1.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index b9bb06eea5e549..41ece7ea8a5cd8 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9849e3eaccce1a69b18aab5c6bd84e952960b3a", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "f40ae8925f5dc6cf6947fd0a14f607eff3c0438a", "version-semver": "6.1.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 221ffa02882ca7..f8026bf46d838d 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "684cdbc0cd6c1df0f94c3057722649ea22c23d5b", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "e51f03a5c9c142390aea35d1a6389383c245414f", "version-semver": "6.1.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json new file mode 100644 index 00000000000000..b4d4033df67dad --- /dev/null +++ b/versions/q-/qtconnectivity.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c646047361feb006e3d5ab1d29412de763c4c505", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index c5af866972cfd7..ce726b2fa3dc28 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80e7cb3d96c9ecf079d94b39d06d1eb19fbe6bdc", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "30c282e8438df69e77b4e2a6935addb778bc761c", "version-semver": "6.1.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index febd23d2e70680..bdbf33e5bb701a 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc859e66bbcb0a45c5476ea8d882ce9c05af1e66", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "a4c4e942686e20cc25f4f608c7f423b295a11830", "version-semver": "6.1.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index ba6bbcab959631..7cadf03ce6de36 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c752aec2e3f90c70b41895bba5165bc86f14f06", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "c393da11dd6c6cbdbc01b32e123327a9971fa353", "version-semver": "6.1.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 61b96a2f15150f..bf73643e207bf7 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "524dcbf6d624cf260f30c9c38a9823a089e5795f", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "37b1ff899c20c104a1987dff249c7b51755e4fc4", "version-semver": "6.1.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json new file mode 100644 index 00000000000000..4825f43a0b242a --- /dev/null +++ b/versions/q-/qtlocation.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ce4d2a217a74a82545c0ec6f5dcb343bedad3f6a", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 2f4f9eafa02f8b..1e982c7862d325 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1ac4e53ead69723b671e153edd918c818380668", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "4c9e0cf0663bfb60c9f99f44302e0934c2e325bb", "version-semver": "6.1.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 4c7ddf6564c6f2..eb924bc06028d8 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eca54f4259f492a6898e3108dbb0917eb52ff91f", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "fffa3edc4b989f223176e6c5fd37692361b3b713", "version-semver": "6.1.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json new file mode 100644 index 00000000000000..7d485febd12c92 --- /dev/null +++ b/versions/q-/qtmultimedia.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3ddc9abc52e8df720dd1799b3ecaabe36bb5b7f3", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index bb670085f714d1..0ab9951f5b0e56 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "278a506f659c274c02bd9d811510b37f4574fd9c", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "9793619e1a8167daa86e50d533b0ec3d1a843568", "version-semver": "6.1.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index ee450490ce5ab6..78734e20b64bd2 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d61483af1def3a289ff148e0389d6d1d11011b13", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "3112bdb7d0ff9c2e023dd15446975806ffc9a87a", "version-semver": "6.1.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index ebbfd3d557f0d6..880c7168756a4c 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a916150c6157e85d5d303817cd21e61d59061d73", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "c9871c8665ce287463902e6aa56b6f8b5836cd46", "version-semver": "6.1.3", diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index aa3dec9bada057..babcf6e316acdb 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc6552504db6a9b651a65d98fbeb232152b7a8fe", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "cdf33560d3def651acf48341ea6dc0447c270c5b", "version-semver": "6.1.3", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 2b7fd5af4ec5e3..711cfabb28c230 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34391c636963d95d64bb987d2edc1f75cbefa322", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "664a251eb795ac206c32b87e39060db32922fe4d", "version-semver": "6.1.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json new file mode 100644 index 00000000000000..a00771327cd16e --- /dev/null +++ b/versions/q-/qtremoteobjects.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ef23f0d4f92edb51f9343655d0e9323395603dd7", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index a47fea30e607cc..698677044087fe 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d174181a7c25a7f71ae1bb4ee31baa3e1c2aae77", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "c8e642305ce89691d07946081ac77aa3216dc418", "version-semver": "6.1.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json new file mode 100644 index 00000000000000..e705a9562dc9c6 --- /dev/null +++ b/versions/q-/qtsensors.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "972ae47281fcab019fe1c4802f207505538177a2", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json new file mode 100644 index 00000000000000..08ba7b76fe7732 --- /dev/null +++ b/versions/q-/qtserialbus.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fd16c70a834bf87bd68c99c997beb1765c556e80", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json new file mode 100644 index 00000000000000..9014a17038ef59 --- /dev/null +++ b/versions/q-/qtserialport.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a14aaf079ec45dcd20bafaa8634a9474a70902f5", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 4003afb9171cba..ac8487af3488d0 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6e147b845c4bb60aede54ad9fcd6f6c8daad81b", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "4796eb58b411235a7f1b5e45728a9d1ca2c4f944", "version-semver": "6.1.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 2f889f064eec3e..40eefda368c5e4 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7513170430df20e23c5013792b6c2fed5b82f7ba", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "ffffd840205636ee1ce99e623679ae7c0159872c", "version-semver": "6.1.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index e7b68e22ab5ac6..3d380d69381421 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "829976cbf157c36668dd1535bbeeadd2c1d39416", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "aeacc8ed34e798f5d73df932e09b1b619d89910b", "version-semver": "6.1.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index cb8e674cf5d033..eed13d8d895bd1 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6d759670e59feae1c8f81cc8e176cdd6f4f0b38", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "754d6279d7b7c6f7a3b976d90cba153fb12d036e", "version-semver": "6.1.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index b635eb73d61a91..f41540bda94003 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19665ad160707c2d22a6a1bc26ff9dc4a31a3304", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "09bccb97807efe784799cac5346a90fcc16d5517", "version-semver": "6.1.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 744432382ab179..5ba413c9d7bcf2 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2cf1a6edea89674bb5bdd2e3d1e9322055da7fd", + "version-semver": "6.2.0", + "port-version": 0 + }, { "git-tree": "a2e96d86ddc71f8fe862d70d4c685416cfb3479d", "version-semver": "6.1.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json new file mode 100644 index 00000000000000..dcedeb0f7ec1af --- /dev/null +++ b/versions/q-/qtwebchannel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f1a82a47775e3c354e5b2b6cb5d39aa2317a1e9b", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json new file mode 100644 index 00000000000000..b6f5bf3c8204a0 --- /dev/null +++ b/versions/q-/qtwebengine.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "47de546e07339c97ba827fa8b5ceba4d7198d561", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json new file mode 100644 index 00000000000000..bc5407ae064f15 --- /dev/null +++ b/versions/q-/qtwebsockets.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "929a30289035e2424ecac2ae6c4059ec47820134", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json new file mode 100644 index 00000000000000..1f93e0af0fc26b --- /dev/null +++ b/versions/q-/qtwebview.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f2d149cd37a47e54925f0e57aec8cb9816e10473", + "version-semver": "6.2.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vcpkg-tool-nodejs.json b/versions/v-/vcpkg-tool-nodejs.json new file mode 100644 index 00000000000000..fc5994031eec63 --- /dev/null +++ b/versions/v-/vcpkg-tool-nodejs.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "91407db5ac964382618c11765caafc444e684a19", + "version-semver": "14.17.4", + "port-version": 0 + } + ] +} From ba3b0335069b0ba5b279f888c60b1c01818b9d0c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 30 Sep 2021 22:55:14 +0200 Subject: [PATCH 0710/1858] [promise-cpp] Add new port (#20340) * Update promise-cpp to 1.0.3 * Update CI baseline * Fix portfile * Update git-tree hash * Update to version 2.1.0 * Update CI baseline and git-tree hash * Add usage * Update git-tree hash * Update to promise-cpp 2.1.2 * Update git-tree hash Co-authored-by: chausner --- ports/promise-cpp/fix-ifdef.patch | 12 ++++++++++++ ports/promise-cpp/portfile.cmake | 15 +++++++++++++++ ports/promise-cpp/usage | 9 +++++++++ ports/promise-cpp/vcpkg.json | 12 ++++++++++++ versions/baseline.json | 4 ++++ versions/p-/promise-cpp.json | 9 +++++++++ 6 files changed, 61 insertions(+) create mode 100644 ports/promise-cpp/fix-ifdef.patch create mode 100644 ports/promise-cpp/portfile.cmake create mode 100644 ports/promise-cpp/usage create mode 100644 ports/promise-cpp/vcpkg.json create mode 100644 versions/p-/promise-cpp.json diff --git a/ports/promise-cpp/fix-ifdef.patch b/ports/promise-cpp/fix-ifdef.patch new file mode 100644 index 00000000000000..8d818b3abe12cf --- /dev/null +++ b/ports/promise-cpp/fix-ifdef.patch @@ -0,0 +1,12 @@ +diff --git a/include/promise-cpp/promise.hpp b/include/promise-cpp/promise.hpp +--- a/include/promise-cpp/promise.hpp ++++ b/include/promise-cpp/promise.hpp +@@ -2,7 +2,7 @@ + #ifndef INC_PROMISE_HPP_ + #define INC_PROMISE_HPP_ + +-#ifdef PROMISE_HEADER_ONLY ++#ifdef PROMISE_HEADONLY + #define PROMISE_API inline + #elif defined PROMISE_BUILD_SHARED + diff --git a/ports/promise-cpp/portfile.cmake b/ports/promise-cpp/portfile.cmake new file mode 100644 index 00000000000000..ed49e05269c9ee --- /dev/null +++ b/ports/promise-cpp/portfile.cmake @@ -0,0 +1,15 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO xhawk18/promise-cpp + REF 2.1.2 + SHA512 490571e6d6742e05ae6a2549af4e242a1d7084edc583fbbb183798bdddb25d08a7f68becfa94f55b877cba7e2e8e8515964f892881591b5bb394b4b33e6593f7 + HEAD_REF master + PATCHES fix-ifdef.patch +) + +file(GLOB PROMISE_HEADERS "${SOURCE_PATH}/include/*.hpp") +file(INSTALL "${SOURCE_PATH}/include/promise-cpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/promise-cpp/usage b/ports/promise-cpp/usage new file mode 100644 index 00000000000000..0e9d486369365d --- /dev/null +++ b/ports/promise-cpp/usage @@ -0,0 +1,9 @@ +The package promise-cpp is header only and can be used from CMake via: + + find_path(PROMISE_CPP_INCLUDE_DIRS "promise-cpp/promise.hpp") + target_include_directories(main PRIVATE ${PROMISE_CPP_INCLUDE_DIRS}) + +Make sure to define the pre-processor macro PROMISE_HEADONLY before including "promise-cpp/promise.hpp": + + #define PROMISE_HEADONLY + #include "promise-cpp/promise.hpp" \ No newline at end of file diff --git a/ports/promise-cpp/vcpkg.json b/ports/promise-cpp/vcpkg.json new file mode 100644 index 00000000000000..3e6b7976def43d --- /dev/null +++ b/ports/promise-cpp/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "promise-cpp", + "version": "2.1.2", + "description": "C++ promise/A+ library in Javascript style.", + "homepage": "https://github.com/xhawk18/promise-cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 9af77e25358c28..cfaecb60ee0f8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5272,6 +5272,10 @@ "baseline": "0.13.0", "port-version": 0 }, + "promise-cpp": { + "baseline": "2.1.2", + "port-version": 0 + }, "protobuf": { "baseline": "3.18.0", "port-version": 0 diff --git a/versions/p-/promise-cpp.json b/versions/p-/promise-cpp.json new file mode 100644 index 00000000000000..63ec6b263c10e3 --- /dev/null +++ b/versions/p-/promise-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "ebacf13f64f6bab1413ec0e45d16259c8cf78279", + "version": "2.1.2", + "port-version": 0 + } + ] +} From 2993e260ee616061e1137c2730f606ab186fa845 Mon Sep 17 00:00:00 2001 From: Hconk <1164588530@qq.com> Date: Fri, 1 Oct 2021 05:03:38 +0800 Subject: [PATCH 0711/1858] [tree.hh] Add new port. (#20427) * [tree.hh] create a new port. * [tree.hh] update baseline.json. * [treehh] update portfile and copyright * [treehh] update baseline --- ports/treehh/copyright | 5 +++++ ports/treehh/portfile.cmake | 10 ++++++++++ ports/treehh/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/t-/treehh.json | 9 +++++++++ 5 files changed, 34 insertions(+) create mode 100644 ports/treehh/copyright create mode 100644 ports/treehh/portfile.cmake create mode 100644 ports/treehh/vcpkg.json create mode 100644 versions/t-/treehh.json diff --git a/ports/treehh/copyright b/ports/treehh/copyright new file mode 100644 index 00000000000000..2fcaf2b3a489a9 --- /dev/null +++ b/ports/treehh/copyright @@ -0,0 +1,5 @@ +Copyright (C) 2001-2020 Kasper Peeters +Distributed under the GNU General Public License version 3. + +Special permission to use tree.hh under the conditions of a +different license can be requested from the author. diff --git a/ports/treehh/portfile.cmake b/ports/treehh/portfile.cmake new file mode 100644 index 00000000000000..1546f36403d322 --- /dev/null +++ b/ports/treehh/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kpeeters/tree.hh + REF 8dc57bc2bb7cd2fd1d6e777c6b5b58db0c3852ef + SHA512 a40481952802fdfab05159822b012a576ea956135a44f88d93844cb578c49ed5fb6fb7330bce699d7fa6ba1da65d12b284b6e9e6b103eadfd76cbc96d6839db5 + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/src/tree.hh" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}/") +file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/treehh/vcpkg.json b/ports/treehh/vcpkg.json new file mode 100644 index 00000000000000..85147876d93c45 --- /dev/null +++ b/ports/treehh/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "treehh", + "version": "3.16", + "description": "An STL-like C++ header-only tree library", + "homepage": "https://github.com/kpeeters/tree.hh" +} diff --git a/versions/baseline.json b/versions/baseline.json index cfaecb60ee0f8c..449beeb146cd77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6720,6 +6720,10 @@ "baseline": "0.8.0", "port-version": 3 }, + "treehh": { + "baseline": "3.16", + "port-version": 0 + }, "treehopper": { "baseline": "1.11.3", "port-version": 5 diff --git a/versions/t-/treehh.json b/versions/t-/treehh.json new file mode 100644 index 00000000000000..536eaa5427fc9a --- /dev/null +++ b/versions/t-/treehh.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "935cf42d03c842e7408961440ece8a94303d45a6", + "version": "3.16", + "port-version": 0 + } + ] +} From 53585bb8ecd057c55c09322fc3cd37794698095d Mon Sep 17 00:00:00 2001 From: Take Vos Date: Thu, 30 Sep 2021 23:04:06 +0200 Subject: [PATCH 0712/1858] [tauri] update to version 0.5.0 (#20431) --- ports/ttauri/portfile.cmake | 4 ++-- ports/ttauri/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/ttauri.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/ttauri/portfile.cmake b/ports/ttauri/portfile.cmake index 7a998177537592..b2878a2d263173 100644 --- a/ports/ttauri/portfile.cmake +++ b/ports/ttauri/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ttauri-project/ttauri - REF v0.4.0 - SHA512 85a15b9d9b1b98b5811a5833415d1ab8a34b39e055959038507b3d873c3544b5193817ce8d474ffc4f8b7ad1602bc0f6401e3565225cf58a90ddee3f9f0a0731 + REF v0.5.0 + SHA512 946c8b7fbd030235d06fff3e100c6be15c2dd360306c674906eb395067642ea38551290ebf4d2c398798219b5c0711eeaecb57bc5021db9f91ec343baab64171 HEAD_REF main ) diff --git a/ports/ttauri/vcpkg.json b/ports/ttauri/vcpkg.json index 7b989bb4cc3b5c..5bc11e747c8c7b 100644 --- a/ports/ttauri/vcpkg.json +++ b/ports/ttauri/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ttauri", - "version": "0.4.0", + "version": "0.5.0", "maintainers": "@takev", "description": "A portable, low latency, retained-mode GUI framework written in C++.", "homepage": "https://github.com/ttauri-project/ttauri", diff --git a/versions/baseline.json b/versions/baseline.json index 449beeb146cd77..03f2862c54718d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6749,7 +6749,7 @@ "port-version": 1 }, "ttauri": { - "baseline": "0.4.0", + "baseline": "0.5.0", "port-version": 0 }, "turbobase64": { diff --git a/versions/t-/ttauri.json b/versions/t-/ttauri.json index e44489240ff81d..74a61a87a9edb9 100644 --- a/versions/t-/ttauri.json +++ b/versions/t-/ttauri.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8214a006b0e577a7c4076ed5bfd7f155abc99ace", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "640bce2fd18c48a41a148e9c0c9ee19f6537b171", "version": "0.4.0", From 198346178140355ed8b4fbd9bea02bcd7eb13f8c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 30 Sep 2021 23:32:46 +0200 Subject: [PATCH 0713/1858] [minisat-master-keying] Update to 2.3.6 (#20437) * Update minisat-master-keying to 2.3.6 * Update CI baseline Co-authored-by: chausner --- ports/minisat-master-keying/portfile.cmake | 19 +++++++++---------- ports/minisat-master-keying/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/m-/minisat-master-keying.json | 5 +++++ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ports/minisat-master-keying/portfile.cmake b/ports/minisat-master-keying/portfile.cmake index 34bd4ca955f285..3b487e3c0d4c6f 100644 --- a/ports/minisat-master-keying/portfile.cmake +++ b/ports/minisat-master-keying/portfile.cmake @@ -3,22 +3,21 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO master-keying/minisat - REF 60f47c0b59a5116639a73ceb9b50eb818536af0b - SHA512 267b7dd44bd1390826228c45ce0e71976a78940d2086470a26b59a6c692ad5e0e911c255eda0c187c33f8138b34deab59aa53191a0e1a46df38c5b73680d74d6 + REF v2.3.6 + SHA512 48E7AC1C97EA58070EAB9310F977404295E881B1403D527A33E059A0BB5A16CAA9AF2FA9E5230AD7E53E008B83077E300B3BAEEB0C220BE4E52B6B85887A05E1 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/MiniSat TARGET_PATH share/minisat) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME MiniSat CONFIG_PATH lib/cmake/MiniSat) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/minisat-master-keying RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/minisat-master-keying/vcpkg.json b/ports/minisat-master-keying/vcpkg.json index 9df7d9d6e0c4f4..c2a89562efa7a5 100644 --- a/ports/minisat-master-keying/vcpkg.json +++ b/ports/minisat-master-keying/vcpkg.json @@ -1,10 +1,19 @@ { "name": "minisat-master-keying", - "version-string": "2.2-mod", - "port-version": 3, + "version": "2.3.6", "description": [ "A minimalistic high-performance SAT solver", "This is a modernized, cross-platform, CMake-enabled fork of the original MiniSat." ], - "homepage": "https://github.com/master-keying/minisat" + "homepage": "https://github.com/master-keying/minisat", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 03f2862c54718d..b513a637082b3c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4277,8 +4277,8 @@ "port-version": 1 }, "minisat-master-keying": { - "baseline": "2.2-mod", - "port-version": 3 + "baseline": "2.3.6", + "port-version": 0 }, "minitrace": { "baseline": "2019.02.06", diff --git a/versions/m-/minisat-master-keying.json b/versions/m-/minisat-master-keying.json index fe7d267fc09d57..9012522e499cb9 100644 --- a/versions/m-/minisat-master-keying.json +++ b/versions/m-/minisat-master-keying.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7f174538407ae3f279ab4c7d2025a8545d220c9", + "version": "2.3.6", + "port-version": 0 + }, { "git-tree": "175ab6a87c6a80cbbd2ff26c976c17cab6e8fff6", "version-string": "2.2-mod", From 07c3f1eeb1d0c520929269aa8b68a27cdb7b2fd4 Mon Sep 17 00:00:00 2001 From: Lassi Date: Fri, 1 Oct 2021 01:45:01 +0300 Subject: [PATCH 0714/1858] [hypodermic] added version 2.5.3, updated baseline (#20414) * added 2.5.3, updated baseline * added quotes and fixed how license installation is done * updated portfile based on bots recommendations * Change version-semver to version. Co-authored-by: Billy Robert O'Neal III --- ports/hypodermic/portfile.cmake | 18 +++++++----------- ports/hypodermic/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/h-/hypodermic.json | 5 +++++ 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/ports/hypodermic/portfile.cmake b/ports/hypodermic/portfile.cmake index 9e1f2fd981de4c..ec58f3c494884d 100644 --- a/ports/hypodermic/portfile.cmake +++ b/ports/hypodermic/portfile.cmake @@ -1,26 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ybainier/Hypodermic - REF 3e86a5a1fd5e8279d6ca461f9f398fa3f3c2eddc # v2.5.2 - SHA512 1af2a94037aa5bf8c65aceb4a2e941f7f6d016422d345f86280085115e9bb871387370158b1a83891be8efdadd4eea0a1f8905225ebee64c000ec9023a9f212e + REF 0e0d85d70aa2f2391dfd84f8af4a3863d4fb1611 # v2.5.3 + SHA512 6fc3f9eca034a4de3f7086bd51e9ba11ee31c8ec000a3e0bdfc06db1f3c12a89b66793adf5d219441e680541e26acaef72d21f9dd0acf3f5fee3aa12d3fb7b4d HEAD_REF master PATCHES "disable_hypodermic_tests.patch" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) +vcpkg_cmake_configure(SOURCE_PATH ${SOURCE_PATH}) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug" ) # Put the license file where vcpkg expects it -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/hypodermic/) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/hypodermic/LICENSE ${CURRENT_PACKAGES_DIR}/share/hypodermic/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/hypodermic/vcpkg.json b/ports/hypodermic/vcpkg.json index c36a5eec7fa024..6bef7aa6bc607d 100644 --- a/ports/hypodermic/vcpkg.json +++ b/ports/hypodermic/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hypodermic", - "version-string": "2.5.2", + "version": "2.5.3", "description": "Hypodermic is a non-intrusive header only IoC container for C++", "homepage": "https://github.com/ybainier/Hypodermic", "license": "MIT", @@ -11,6 +11,14 @@ "boost-range", "boost-signals2", "boost-system", - "boost-test" + "boost-test", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b513a637082b3c..58df68a869271e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2669,7 +2669,7 @@ "port-version": 2 }, "hypodermic": { - "baseline": "2.5.2", + "baseline": "2.5.3", "port-version": 0 }, "hypre": { diff --git a/versions/h-/hypodermic.json b/versions/h-/hypodermic.json index 0712716e050b2b..ceb3ab656b8d80 100644 --- a/versions/h-/hypodermic.json +++ b/versions/h-/hypodermic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b25c37438cbd5b8c8851c91413e1f671ebe1436", + "version": "2.5.3", + "port-version": 0 + }, { "git-tree": "94648decd2043ffd566f58a1d5c826835bb33aca", "version-string": "2.5.2", From bd500dd4dbf4504093c7c89ec0e437367e4cd6e7 Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Thu, 30 Sep 2021 19:39:14 -0400 Subject: [PATCH 0715/1858] [vcpkg/msbuild] parellel build (#19718) * [vcpkg/msbuild] parellel build * [vcpkg/msbuild] respects VCPKG_MAX_CONCURRENCY * [vcpkg/msbuild] handle unset VCPKG_MAX_CONCURRENCY * [vcpkg/msbuild] uses VCPKG_CONCURRENCY * [vcpkg/msbuild] MultiProcMaxCount=... * [vcpkg/msbuild] EnforceProcessCountAcrossBuilds EnforceProcessCountAcrossBuilds=true (must have value) * [vcpkg/msbuild] no missing ) * [vcpkg/msbuild] no extra ' 's Co-authored-by: mheyman Co-authored-by: Billy Robert O'Neal III --- scripts/cmake/vcpkg_install_msbuild.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake index a6b9ec9c2973fd..580e86ab22c5af 100644 --- a/scripts/cmake/vcpkg_install_msbuild.cmake +++ b/scripts/cmake/vcpkg_install_msbuild.cmake @@ -143,7 +143,10 @@ function(vcpkg_install_msbuild) "/p:VcpkgTriplet=${TARGET_TRIPLET}" "/p:VcpkgInstalledDir=${_VCPKG_INSTALLED_DIR}" "/p:VcpkgManifestInstall=false" - "/m" + "/p:UseMultiToolTask=true" + "/p:MultiProcMaxCount=${VCPKG_CONCURRENCY}" + "/p:EnforceProcessCountAcrossBuilds=true" + "/m:${VCPKG_CONCURRENCY}" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") From 41eb9b85c5bdd3f53b3f43db2743169da2d0be70 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Thu, 30 Sep 2021 19:52:23 -0700 Subject: [PATCH 0716/1858] [macos ci] oops that was a dumb bug (#20448) --- scripts/azure-pipelines/test-modified-ports.ps1 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 46ea637dcacdad..d837dbb627e88b 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -133,9 +133,12 @@ if ($null -ne $OnlyTest) $OnlyTest | % { $portName = $_ & "./vcpkg$executableExtension" install --triplet $Triplet @commonArgs $portName - [System.Console]::Error.WriteLine( ` - "REGRESSION: ${portName}:$triplet. If expected, remove ${portName} from the OnlyTest list." ` - ) + if (-not $?) + { + [System.Console]::Error.WriteLine( ` + "REGRESSION: ${portName}:$triplet. If expected, remove ${portName} from the OnlyTest list." ` + ) + } } } else From 5591db244d74bb45616963626a92ef7192d307f4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 1 Oct 2021 08:58:36 +0200 Subject: [PATCH 0717/1858] [vcpkg_configure_make] Standardize `OPTIONS` list item handling (#19540) * Remove unused EXTRA_QUOTES * Uniformly invoke 'configure' * [libtasn1] Fix mingw build * Unify prefix handling * Revise install dir processing * x-add-version * Force libdir to lib (adopted from #19666) * [skip actions] CI rebuild * CR request: Put backslash before shell var * CR request: Use vcpkg_list * Update versions * Fix python3 options * Update versions * Bump python port-version. * CR request: Add comment about backslashes before prefix Co-authored-by: Billy Robert O'Neal III --- ports/libtasn1/portfile.cmake | 9 ++- ports/libtasn1/vcpkg.json | 6 +- ports/python3/portfile.cmake | 2 +- ports/python3/vcpkg.json | 2 +- ports/starlink-ast/portfile.cmake | 16 +++-- ports/starlink-ast/vcpkg.json | 2 +- scripts/cmake/vcpkg_configure_make.cmake | 88 ++++++++++++------------ versions/baseline.json | 6 +- versions/l-/libtasn1.json | 5 ++ versions/p-/python3.json | 5 ++ versions/s-/starlink-ast.json | 5 ++ 11 files changed, 80 insertions(+), 66 deletions(-) diff --git a/ports/libtasn1/portfile.cmake b/ports/libtasn1/portfile.cmake index 700bb977e7a253..902dff196bf620 100644 --- a/ports/libtasn1/portfile.cmake +++ b/ports/libtasn1/portfile.cmake @@ -18,21 +18,20 @@ vcpkg_extract_source_archive_ex( ${PATCHES} ) -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) +set(EXTRA_OPTS "") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) # $LIBS is an environment variable that vcpkg already pre-populated with some libraries. # We need to re-purpose it when passing LIBS option to make to avoid overriding the vcpkg's own list. - set(EXTRA_OPTS "LIBS=\"$LIBS -lgettimeofday -lgetopt\"") + list(APPEND EXTRA_OPTS "LIBS=-lgettimeofday -lgetopt \$LIBS") else() # restore the default ac_cv_prog_cc_g flags, otherwise it fails to compile - set(EXTRA_OPTS) set(VCPKG_C_FLAGS "-g -O2") set(VCPKG_CXX_FLAGS "-g -O2") endif() # The upstream doesn't add this macro to the configure if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - - set(EXTRA_OPTS "${EXTRA_OPTS} CFLAGS=\"$CFLAGS -DASN1_STATIC\"") + list(APPEND EXTRA_OPTS "CFLAGS=\$CFLAGS -DASN1_STATIC") endif() set(ENV{GTKDOCIZE} true) diff --git a/ports/libtasn1/vcpkg.json b/ports/libtasn1/vcpkg.json index e61d35e03f667c..fd021c21c3d216 100644 --- a/ports/libtasn1/vcpkg.json +++ b/ports/libtasn1/vcpkg.json @@ -1,18 +1,18 @@ { "name": "libtasn1", "version": "4.17.0", - "port-version": 1, + "port-version": 3, "description": "A secure communications library implementing the SSL, TLS and DTLS protocols", "homepage": "https://www.gnutls.org/", "supports": "!uwp", "dependencies": [ { "name": "getopt", - "platform": "windows" + "platform": "windows & !mingw" }, { "name": "gettimeofday", - "platform": "windows" + "platform": "windows & !mingw" } ] } diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 2ea8783771ae64..8967d5a3d757e1 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -162,7 +162,7 @@ else() set(OPTIONS "--with-openssl=${CURRENT_INSTALLED_DIR}" "--with-ensurepip" - [[--with-suffix=""]] + "--with-suffix=" "--with-system-expat" ) if(VCPKG_TARGET_IS_OSX) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 63740b289393bc..c3bec2e6b80daa 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-semver": "3.9.7", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake index 054da29008f1e2..92475ad5509dc2 100644 --- a/ports/starlink-ast/portfile.cmake +++ b/ports/starlink-ast/portfile.cmake @@ -11,18 +11,22 @@ vcpkg_extract_source_archive_ex( ARCHIVE ${ARCHIVE} ) -set(CONFIGURE_OPTIONS "--without-fortran star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no") +set(CONFIGURE_OPTIONS + --without-fortran + star_cv_cnf_trail_type=long + star_cv_cnf_f2c_compatible=no +) if ("yaml" IN_LIST FEATURES) - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --with-yaml") + list(APPEND CONFIGURE_OPTIONS --with-yaml) else() - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-yaml") + list(APPEND CONFIGURE_OPTIONS --without-yaml) endif() if ("pthreads" IN_LIST FEATURES) - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --with-pthreads") + list(APPEND CONFIGURE_OPTIONS --with-pthreads) else() - set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --without-pthreads") + list(APPEND CONFIGURE_OPTIONS --without-pthreads) endif() vcpkg_configure_make( @@ -31,8 +35,6 @@ vcpkg_configure_make( DETERMINE_BUILD_TRIPLET ADDITIONAL_MSYS_PACKAGES perl OPTIONS ${CONFIGURE_OPTIONS} - OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} - OPTIONS_DEBUG ${CONFIGURE_OPTIONS_DEBUG} ) vcpkg_install_make() diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json index 3248e265940b14..5c3753df6b4cdd 100644 --- a/ports/starlink-ast/vcpkg.json +++ b/ports/starlink-ast/vcpkg.json @@ -1,7 +1,7 @@ { "name": "starlink-ast", "version-semver": "9.2.4", - "port-version": 1, + "port-version": 2, "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it", "homepage": "https://starlink.eao.hawaii.edu/starlink/AST", "supports": "windows", diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index a806415126062a..0b8e88be1cc4d5 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -302,6 +302,7 @@ function(vcpkg_configure_make) set(_vcm_paths_with_spaces TRUE) endif() + set(CONFIGURE_ENV "V=1") # Pre-processing windows configure requirements if (VCPKG_TARGET_IS_WINDOWS) if(CMAKE_HOST_WIN32) @@ -351,7 +352,6 @@ function(vcpkg_configure_make) endif() endmacro() - set(CONFIGURE_ENV "V=1") # Remove full filepaths due to spaces and prepend filepaths to PATH (cross-compiling tools are unlikely on path by default) set(progs VCPKG_DETECTED_CMAKE_C_COMPILER VCPKG_DETECTED_CMAKE_CXX_COMPILER VCPKG_DETECTED_CMAKE_AR VCPKG_DETECTED_CMAKE_LINKER VCPKG_DETECTED_CMAKE_RANLIB VCPKG_DETECTED_CMAKE_OBJDUMP @@ -448,17 +448,16 @@ function(vcpkg_configure_make) endif() endif() + # Some PATH handling for dealing with spaces....some tools will still fail with that! + # In particular, the libtool install command is unable to install correctly to paths with spaces. + # CURRENT_INSTALLED_DIR: Pristine native path (unprotected spaces, Windows drive letters) + # _VCPKG_INSTALLED: Native path with escaped space characters + # _VCPKG_PREFIX: Path with unprotected spaces, but drive letters transformed for mingw/msys + string(REPLACE " " "\\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") if(CMAKE_HOST_WIN32) - #Some PATH handling for dealing with spaces....some tools will still fail with that! - string(REPLACE " " "\\\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR}) - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PREFIX "${_VCPKG_PREFIX}") - set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) - set(prefix_var "'\${prefix}'") # Windows needs extra quotes or else the variable gets expanded in the makefile! + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PREFIX "${CURRENT_INSTALLED_DIR}") else() - string(REPLACE " " "\ " _VCPKG_PREFIX ${CURRENT_INSTALLED_DIR}) - string(REPLACE " " "\ " _VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) - set(EXTRA_QUOTES) - set(prefix_var "\${prefix}") + set(_VCPKG_PREFIX "${CURRENT_INSTALLED_DIR}") endif() # macOS - cross-compiling support @@ -484,25 +483,26 @@ function(vcpkg_configure_make) "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") # Set configure paths - set(_csc_OPTIONS_RELEASE ${_csc_OPTIONS_RELEASE} "--prefix=${EXTRA_QUOTES}${_VCPKG_PREFIX}${EXTRA_QUOTES}") - set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} "--prefix=${EXTRA_QUOTES}${_VCPKG_PREFIX}/debug${EXTRA_QUOTES}") + set(_csc_OPTIONS_RELEASE ${_csc_OPTIONS_RELEASE} "--prefix=${_VCPKG_PREFIX}") + set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} "--prefix=${_VCPKG_PREFIX}/debug") if(NOT _csc_NO_ADDITIONAL_PATHS) + # ${prefix} has an extra backslash to prevent early expansion when calling `bash -c configure "..."`. set(_csc_OPTIONS_RELEASE ${_csc_OPTIONS_RELEASE} # Important: These should all be relative to prefix! - "--bindir=${prefix_var}/tools/${PORT}/bin" - "--sbindir=${prefix_var}/tools/${PORT}/sbin" - "--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default + "--bindir=\\\${prefix}/tools/${PORT}/bin" + "--sbindir=\\\${prefix}/tools/${PORT}/sbin" + "--libdir=\\\${prefix}/lib" # On some Linux distributions lib64 is the default #"--includedir='\${prefix}'/include" # already the default! - "--mandir=${prefix_var}/share/${PORT}" - "--docdir=${prefix_var}/share/${PORT}" - "--datarootdir=${prefix_var}/share/${PORT}") + "--mandir=\\\${prefix}/share/${PORT}" + "--docdir=\\\${prefix}/share/${PORT}" + "--datarootdir=\\\${prefix}/share/${PORT}") set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} # Important: These should all be relative to prefix! - "--bindir=${prefix_var}/../tools/${PORT}/debug/bin" - "--sbindir=${prefix_var}/../tools/${PORT}/debug/sbin" - "--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default - "--includedir=${prefix_var}/../include" - "--datarootdir=${prefix_var}/share/${PORT}") + "--bindir=\\\${prefix}/../tools/${PORT}/debug/bin" + "--sbindir=\\\${prefix}/../tools/${PORT}/debug/sbin" + "--libdir=\\\${prefix}/lib" # On some Linux distributions lib64 is the default + "--includedir=\\\${prefix}/../include" + "--datarootdir=\\\${prefix}/share/${PORT}") endif() # Setup common options if(NOT DISABLE_VERBOSE_FLAGS) @@ -534,18 +534,13 @@ function(vcpkg_configure_make) else() find_program(base_cmd bash REQUIRED) endif() - if(VCPKG_TARGET_IS_WINDOWS) - list(JOIN _csc_OPTIONS " " _csc_OPTIONS) - list(JOIN _csc_OPTIONS_RELEASE " " _csc_OPTIONS_RELEASE) - list(JOIN _csc_OPTIONS_DEBUG " " _csc_OPTIONS_DEBUG) - endif() # Setup include environment (since these are buildtype independent restoring them is unnecessary) macro(prepend_include_path var) if("${${var}_BACKUP}" STREQUAL "") - set(ENV{${var}} "${_VCPKG_INSTALLED}/include") + set(ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") else() - set(ENV{${var}} "${_VCPKG_INSTALLED}/include${VCPKG_HOST_PATH_SEPARATOR}${${var}_BACKUP}") + set(ENV{${var}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}${${var}_BACKUP}") endif() endmacro() # Used by CL @@ -693,10 +688,10 @@ function(vcpkg_configure_make) endif() else() set(_link_dirs) - if(EXISTS "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") + if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") set(_link_dirs "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") endif() - if(EXISTS "{_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + if(EXISTS "{CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") set(_link_dirs "${_link_dirs} -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") endif() string(STRIP "${_link_dirs}" _link_dirs) @@ -726,10 +721,10 @@ function(vcpkg_configure_make) endif() else() set(_link_dirs) - if(EXISTS "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") + if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") set(_link_dirs "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") endif() - if(EXISTS "{_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + if(EXISTS "{CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") set(_link_dirs "${_link_dirs} -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") endif() string(STRIP "${_link_dirs}" _link_dirs) @@ -738,6 +733,15 @@ function(vcpkg_configure_make) unset(_VAR_SUFFIX) endif() + foreach(var IN ITEMS _csc_OPTIONS _csc_OPTIONS_RELEASE _csc_OPTIONS_DEBUG) + vcpkg_list(SET tmp) + foreach(element IN LISTS "${var}") + string(REPLACE [["]] [[\"]] element "${element}") + vcpkg_list(APPEND tmp "\"${element}\"") + endforeach() + vcpkg_list(JOIN tmp " " "${var}") + endforeach() + foreach(_buildtype IN LISTS _buildtypes) foreach(ENV_VAR ${_csc_CONFIG_DEPENDENT_ENVIRONMENT}) if(DEFINED ENV{${ENV_VAR}}) @@ -788,27 +792,21 @@ function(vcpkg_configure_make) set(_lib_env_vars LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) foreach(_lib_env_var IN LISTS _lib_env_vars) set(_link_path) - if(EXISTS "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib") - set(_link_path "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib") + if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib") + set(_link_path "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib") endif() - if(EXISTS "${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link") + if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib/manual-link") if(_link_path) set(_link_path "${_link_path}${VCPKG_HOST_PATH_SEPARATOR}") endif() - set(_link_path "${_link_path}${_VCPKG_INSTALLED}${PATH_SUFFIX_${_buildtype}}/lib/manual-link") + set(_link_path "${_link_path}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib/manual-link") endif() set(ENV{${_lib_env_var}} "${_link_path}${${_lib_env_var}_PATHLIKE_CONCAT}") endforeach() unset(_link_path) unset(_lib_env_vars) - if(CMAKE_HOST_WIN32) - set(command "${base_cmd}" -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") - elseif(VCPKG_TARGET_IS_WINDOWS) - set(command "${base_cmd}" -c "${CONFIGURE_ENV} $@" -- "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) - else() - set(command "${base_cmd}" "./${RELATIVE_BUILD_PATH}/configure" ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}) - endif() + set(command "${base_cmd}" -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") if(_csc_ADD_BIN_TO_PATH) set(PATH_BACKUP $ENV{PATH}) diff --git a/versions/baseline.json b/versions/baseline.json index 58df68a869271e..238f0ce3d46f36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3834,7 +3834,7 @@ }, "libtasn1": { "baseline": "4.17.0", - "port-version": 1 + "port-version": 3 }, "libtcod": { "baseline": "1.18.0", @@ -5334,7 +5334,7 @@ }, "python3": { "baseline": "3.9.7", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.1", @@ -6390,7 +6390,7 @@ }, "starlink-ast": { "baseline": "9.2.4", - "port-version": 1 + "port-version": 2 }, "status-code": { "baseline": "1.0.0-ab3cd821", diff --git a/versions/l-/libtasn1.json b/versions/l-/libtasn1.json index 5960a6674172f7..ad952fc1aa5b62 100644 --- a/versions/l-/libtasn1.json +++ b/versions/l-/libtasn1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c387ff2824b319ecd287ea3e5a507a8263dce95e", + "version": "4.17.0", + "port-version": 3 + }, { "git-tree": "3554f6c03cdac32ddf68540d62c04f6f4644ec94", "version": "4.17.0", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index b4fc820092f7d9..64e2590cd11a83 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3975ee0659914edc75d63f914ac91bb3b7453f0c", + "version-semver": "3.9.7", + "port-version": 2 + }, { "git-tree": "6a1011c32aa2eb7de0b9a6184b2805e34c41f0b5", "version-semver": "3.9.7", diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json index a724950005c830..0ba8d7525f3ba6 100644 --- a/versions/s-/starlink-ast.json +++ b/versions/s-/starlink-ast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "487c5e318ce957c09647d0d74a2b5b4a4e99ffef", + "version-semver": "9.2.4", + "port-version": 2 + }, { "git-tree": "2fecd468269d73b6e8f29a297c4f7db771ea37c4", "version-semver": "9.2.4", From 302142bd3348f95715ae78ba59f8863a3da4197b Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 1 Oct 2021 00:00:18 -0700 Subject: [PATCH 0718/1858] PASSING, REMOVE FROM FAIL LIST: concurrencpp:x64-osx (.\scripts\ci.baseline.txt) (#20454) PASSING, REMOVE FROM FAIL LIST: libsamplerate:x64-osx (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: cppgraphqlgen:x64-osx (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: libopusenc:x64-osx (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: cartographer:x64-osx (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: clockutils:x64-osx (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: cairo:x64-osx (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: matio:x64-osx (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: coolprop:x64-osx (.\scripts\ci.baseline.txt) These were all hidden because before the Tensorflow fix we haven't had a working MacOS CI in weeks. REGRESSION: mfl:x64-osx. If expected, add mfl:x64-osx=fail to .\scripts\ci.baseline.txt. This depended on cario. REGRESSION: cppkafka:x64-osx. If expected, add cppkafka:x64-osx=fail to .\scripts\ci.baseline.txt. This looks like a legitimate failure to detect the dependent library librdkafka REGRESSION: forge:x64-osx. If expected, add forge:x64-osx=fail to .\scripts\ci.baseline.txt. This looks like a legitimate failure to REGRESSION: embree3:x64-osx. If expected, add embree3:x64-osx=fail to .\scripts\ci.baseline.txt. Conflicts on MacOS probably for the same reason as Linux. --- scripts/ci.baseline.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 47af7c8c79d26e..4c07eb491316a5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -78,11 +78,8 @@ caf:arm-uwp=fail caf:x64-uwp=fail caffe2:x86-windows=fail caffe2:arm64-windows=fail -# Requires VM update for gtk-doc -cairo:x64-osx=fail c-ares:arm-uwp=fail c-ares:x64-uwp=fail -cartographer:x64-osx=fail casclib:arm-uwp=fail casclib:x64-uwp=fail catch-classic:arm64-windows = skip @@ -136,7 +133,6 @@ clblast:x64-linux=fail clblast:x64-windows-static=fail clblast:x64-windows-static-md=fail clockutils:x64-linux=fail -clockutils:x64-osx=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip cmcstl2:x64-linux = skip @@ -151,10 +147,8 @@ coin:arm-uwp=fail coin:x64-uwp=fail colmap:x64-windows-static=fail concurrencpp:x64-linux=fail -concurrencpp:x64-osx=fail constexpr-contracts:x64-linux=fail coolprop:arm-uwp=fail -coolprop:x64-osx=fail coolprop:x64-uwp=fail coroutine:arm-uwp=fail coroutine:x64-linux=fail @@ -274,8 +268,9 @@ elfutils:x64-osx=fail # https://github.com/embree/embree/issues/331 embree2:x64-windows-static=skip embree2:x64-windows-static-md=skip -# embree2 conflicts with embree3 on Linux +# embree2 conflicts with embree3 embree2:x64-linux=skip +embree2:x64-osx=skip enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail @@ -668,7 +663,6 @@ libnice:x64-osx=skip libopenmpt:x64-linux=fail libopenmpt:x64-osx=fail libopusenc:arm-uwp=fail -libopusenc:x64-osx=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail libpff:arm-uwp=fail @@ -720,7 +714,6 @@ libressl:x64-windows = skip libressl:x64-windows-static = skip libressl:x64-windows-static-md=skip libressl:x86-windows = skip -libsamplerate:x64-osx=fail libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail @@ -857,7 +850,6 @@ marl:arm-uwp=fail marl:x64-uwp=fail mathgl:x64-osx=fail mathgl:x64-uwp=fail -matio:x64-osx=fail mdnsresponder:arm64-windows=fail mdnsresponder:arm-uwp=fail mdnsresponder:x64-linux=fail @@ -888,6 +880,7 @@ meschach:x64-uwp=fail metis:arm-uwp=fail metis:x64-uwp=fail mfl:x64-linux=skip +mfl:x64-osx=skip mhook:arm64-windows=fail mhook:arm-uwp=fail mhook:x64-linux=fail @@ -1744,6 +1737,3 @@ wangle:x64-windows-static-md=fail # See https://developercommunity.visualstudio.com/t/Toolset-169-regression-vcxproj-producin/1356639 dimcli:x64-windows-static-md=fail dimcli:x64-windows-static=fail - -# cppgraphqlgen triggers an ICE on Apple Clang that comes with MacOS 11. -cppgraphqlgen:x64-osx=fail From 82cb9433e6de01e95dd58b5c2fa5b620c185094a Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Fri, 1 Oct 2021 19:59:54 -0400 Subject: [PATCH 0719/1858] [google-cloud-cpp] update to latest release (v1.32.0) (#20463) * [google-cloud-cpp] update to latest release (v1.32.0) * Update from deprecated vcpkg functions * Undo migration to `vcpkg_cmake_config_fixup()` I could not get this to work. I will ask in the discord channel because I must be using it wrong. --- ports/google-cloud-cpp/portfile.cmake | 11 +++++------ ports/google-cloud-cpp/vcpkg.json | 8 ++++++-- versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 22a0829e5757d3..06ff7860a6eeb1 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,9 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.31.1 - SHA512 c172280cc934978505524d53bc804dc9079af21a1357f347b0bd3554d25cc2d57dec3869f1ba01f9eacaa1367feede84ae158fa3e9039b0e6bb87f7c27717bb1 - HEAD_REF master + REF v1.32.0 + SHA512 ffec5a4f76fc4232f15940afea137c38f12e395d0b04cf49838e53f04ba28c151c05470191dc9648b5ae9be5bdcc5b449379b3dbb51552917625a9a87b97c8e2 + HEAD_REF main ) vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/grpc") @@ -16,9 +16,8 @@ set(GOOGLE_CLOUD_CPP_ENABLE "${FEATURES}") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "core") list(REMOVE_ITEM GOOGLE_CLOUD_CPP_ENABLE "googleapis") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS "-DGOOGLE_CLOUD_CPP_ENABLE=${GOOGLE_CLOUD_CPP_ENABLE}" @@ -29,7 +28,7 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 430fc44f41c761..35cbf153b008c7 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,12 +1,16 @@ { "name": "google-cloud-cpp", - "version": "1.31.1", + "version": "1.32.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", "supports": "!uwp", "dependencies": [ - "abseil" + "abseil", + { + "name": "vcpkg-cmake", + "host": true + } ], "default-features": [ "bigquery", diff --git a/versions/baseline.json b/versions/baseline.json index 238f0ce3d46f36..71ba3c2c1bc8e9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2473,7 +2473,7 @@ "port-version": 7 }, "google-cloud-cpp": { - "baseline": "1.31.1", + "baseline": "1.32.0", "port-version": 0 }, "google-cloud-cpp-common": { diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index b2a8c9989a7822..ea0a234d274fac 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d138daefe227de160954ecdce23178fa659edb36", + "version": "1.32.0", + "port-version": 0 + }, { "git-tree": "64af5624931918b1df7ff30a2f44ef86104739cd", "version": "1.31.1", From 8bed4564c5d5ba2125dc49e5690555ebf2aa9713 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 1 Oct 2021 17:03:20 -0700 Subject: [PATCH 0720/1858] [directxtk, directxtk12, directxtex, directxmesh, uvatlas] ports updated for September 2021 release (#20457) * Update for September 2021 GitHub releases * Update directx tool kit ports * Update versions * Convert directxmesh and uvatlas to vcpkg-cmake * Refresh version hash --- ports/directxmesh/portfile.cmake | 19 +++++++++---------- ports/directxmesh/vcpkg.json | 14 +++++++++++--- ports/directxtex/portfile.cmake | 28 ++++++++++++++-------------- ports/directxtex/vcpkg.json | 2 +- ports/directxtk/portfile.cmake | 20 ++++++++++---------- ports/directxtk/vcpkg.json | 2 +- ports/directxtk12/portfile.cmake | 22 +++++++++++----------- ports/directxtk12/vcpkg.json | 2 +- ports/uvatlas/portfile.cmake | 19 +++++++++---------- ports/uvatlas/vcpkg.json | 10 +++++++++- versions/baseline.json | 10 +++++----- versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 16 files changed, 106 insertions(+), 67 deletions(-) diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index baf22e54baa492..650cf50f1bf3e9 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF jun2021 - SHA512 ed61e14bb217bdff803ad95bfffe31aac7ff0a3f78b963aac183c61233374def4c0b052d1bf9b0d03900fc5be052e1d8fe8de00e81f01349eff1a564d55be610 + REF sept2021 + SHA512 e07f944080dc7e0ffe154061057a81d7caee3c4612b9261ba5a4812b3cb45571dee0a1c9b01824ccfbe9566132eadef30b80164fefe6a3ead60a3762566e2604 HEAD_REF master ) @@ -26,21 +26,20 @@ else() set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jun2021/meshconvert.exe" - FILENAME "meshconvert-jun2021.exe" - SHA512 2a5e1eb69f24fd321d372dcd790970a15957757eacd0a861001299409ff56372bc890c2d8baba32368c81eeb63cdd7aef514c57bca1e7e4e3f7bdf494c3453a0 + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/sept2021/meshconvert.exe" + FILENAME "meshconvert-sept2021.exe" + SHA512 9d527b95d3a37604ac3a4c05f8ef44e81cfd8044dd44eddc531116ee5110443679787e4719b0504dc60e406e28396e1f553388cf261b3df81103bd03391c32af ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -49,7 +48,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 4eb6c26beaa6c4..834581b20972e8 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,14 +1,22 @@ { "name": "directxmesh", - "version-string": "jun2021", + "version-string": "sept2021", "description": "DirectXMesh geometry processing library", - "homepage": "http://go.microsoft.com/fwlink/?LinkID=324981", + "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", "license": "MIT", "supports": "windows | linux", "dependencies": [ "directx-headers", - "directxmath" + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "dx12": { diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index e3efa28f1314a9..08b59649fb8c6f 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF aug2021 - SHA512 72b688848ad7645e018bb7dc3a3179ea3857e8349185ad53ad583b17aca555554ce44773a4b900ad163b2fd8551c28c3503b88333d8cff8f8d3ee03017bad35d + REF sept2021 + SHA512 5fe5ed64fd58d9b881b186d3ca0fcac7980afc214eb219f842607d4b868b14c1411613a46d74d3cd9ab242d533dfa0ac8c181d083391c665a4577e4c3b931100 HEAD_REF master ) @@ -65,23 +65,23 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/aug2021/texassemble.exe" - FILENAME "texassemble-aug2021.exe" - SHA512 11b07da257d7ea394fa789210b2985656bf28a0b6117d5380d9639ffc0a460a0e6c4bdbb24256dcf3b4d75088b4b5386951a7de856fecb99e73dfe326b4bfe45 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/sept2021/texassemble.exe" + FILENAME "texassemble-sept2021.exe" + SHA512 05539bae0f77bba1e6fa349ac483367d3f34f808857fd3c3bdecd2a956465101dbaec95cb4e61c15d5d65fd12cdc14fab17cede3a2719dc32bda8748b7a1c59a ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/aug2021/texconv.exe" - FILENAME "texconv-aug2021.exe" - SHA512 c11bc77a36d5989189519793f3a44c15f1e01b3e0a6254bffca4ee6f96c933a6add34ffc7e409f3c3f97d862816006d3ca440876a4af200f035353d096902c5b + URLS "https://github.com/Microsoft/DirectXTex/releases/download/sept2021/texconv.exe" + FILENAME "texconv-sept2021.exe" + SHA512 9ec2415d2d1b665a0a67c01c916afb5946dedede3518e3a029b83e4a8bb86d8f22b2dc0afdc7dbe0824f8f9843a86e555f3e4705570703d4447a47f2719f5b5a ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/aug2021/texdiag.exe" - FILENAME "texdiag-aug2021.exe" - SHA512 73ae5fbc20ff7d970891d8e4029f1400f5d16675912cc4af97f9ef0e563dc77fa89690989e80eec5fd033975cf67d350be5a547d08fc5fecbabd4577603eef80 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/sept2021/texdiag.exe" + FILENAME "texdiag-sept2021.exe" + SHA512 380660fa46438368a0f30684e0b9d9f4c267d76145bacbf4e5643889e00f869b0925250c1911397ce6a3890752de87f6105ef0e60d0e0334eb36fbc7f53deea7 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -92,9 +92,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtex/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 441c18d442bc07..05b5775c61a770 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-string": "aug2021", + "version-string": "sept2021", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 2698b9b2dcccba..528615e6159553 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF aug2021 - SHA512 ed4ff5c8a1f12e2489a4ddb653a0d8097da4a901498852ada5595959f6e6275531e11ca20d8ce16da19f3ac37193b23edf7c9c1b6d6a78a8810e8f0d399ca4b8 + REF sept2021 + SHA512 57fb4cf54b09abee87ff2471c1b504b071a9d3229a09d01d5de58fa3e8bfc956262f21ace88cf05b13f4ff4184b2f7c3b018f9b95d0cac55825c4e3c6549ee89 HEAD_REF master ) @@ -36,16 +36,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/aug2021/MakeSpriteFont.exe" - FILENAME "makespritefont-aug2021.exe" - SHA512 a84786f57f7f26c4ab0cd446136d79c19a74296f5074396854c81ad67aedfccfe76e15025ba9bcfcabb993f0bb7247ca536d55b4574192efb3e7c2069abf70d7 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/sept2021/MakeSpriteFont.exe" + FILENAME "makespritefont-sept2021.exe" + SHA512 a22ec8e7d283585574a5aec82c937c2844e89e66ded01fea92bb278beb7ff32c8070fa3016192029ed8c106db7ef0356f867521a2603a4de7c085cd8db693d0a ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/aug2021/XWBTool.exe" - FILENAME "xwbtool-aug2021.exe" - SHA512 3dd1ebd04db21517f74453727512783141b997d33efc1a47236c9ff343310da17b4add4c4ba6e138ad35095fb77f4207e7458a9e51ee3f4872fc0e0cf62be5b5 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/sept2021/XWBTool.exe" + FILENAME "xwbtool-sept2021.exe" + SHA512 40f33af95bfdaf60a41564dc347d51768774ad7caa8529046e3f87256e80e165aa124b21193d0ffa1e94644343006d6de01807df317dfdf13377a31275b973ef ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -55,8 +55,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index f8b042df669569..317cafb7702c12 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-string": "aug2021", + "version-string": "sept2021", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 3eabb68b622fd8..3a1bdc23435b34 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -5,15 +5,15 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF aug2021 - SHA512 9d0234d7f8d631fa7cb434487bb1fbb4a52760550962f8ebd5a8c09b33cc2b328651b0c0355057e9b172b7445c86b083f33967ee7918a5eeaf19b3e4915dfe00 + REF sept2021 + SHA512 bb8a8a81381a6638e33cefc0c058126843df79cf84fd9a248606e965048ba6faae23e8167eb91dd6b8e9a11a788b188067877ef26852c6530ef6fc3c50b221b4 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DBUILD_XAUDIO_WIN10=ON + OPTIONS -DBUILD_XAUDIO_WIN10=ON -DBUILD_DXIL_SHADERS=ON ) vcpkg_install_cmake() @@ -22,16 +22,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/aug2021/MakeSpriteFont.exe" - FILENAME "makespritefont-aug2021.exe" - SHA512 a84786f57f7f26c4ab0cd446136d79c19a74296f5074396854c81ad67aedfccfe76e15025ba9bcfcabb993f0bb7247ca536d55b4574192efb3e7c2069abf70d7 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/sept2021/MakeSpriteFont.exe" + FILENAME "makespritefont-sept2021.exe" + SHA512 a22ec8e7d283585574a5aec82c937c2844e89e66ded01fea92bb278beb7ff32c8070fa3016192029ed8c106db7ef0356f867521a2603a4de7c085cd8db693d0a ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/aug2021/XWBTool.exe" - FILENAME "xwbtool-aug2021.exe" - SHA512 3dd1ebd04db21517f74453727512783141b997d33efc1a47236c9ff343310da17b4add4c4ba6e138ad35095fb77f4207e7458a9e51ee3f4872fc0e0cf62be5b5 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/sept2021/XWBTool.exe" + FILENAME "xwbtool-sept2021.exe" + SHA512 40f33af95bfdaf60a41564dc347d51768774ad7caa8529046e3f87256e80e165aa124b21193d0ffa1e94644343006d6de01807df317dfdf13377a31275b973ef ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -41,8 +41,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-aug2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index 9a701bea536573..a09232f4fd9b73 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-string": "aug2021", + "version-string": "sept2021", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index a8888d05cdb235..ba71fd0997aa51 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF jun2021b - SHA512 d08bacacba324ddf60b003c5cbd5ad715bdbc1cf352a0dc9de58c40fd8f4bcbb562b8285ff1a443453399167a96e5b1af51d32ffc5e1e8f65391ef124c0706d4 + REF sept2021 + SHA512 bb2659e83aa04ad6a43b953f40535531f4f5766d3390b9ce8ea0d83b3146cb92fe27a44c7b744da91cc20f529aabf87794b3b19272c2bd27817e65b091ffe3f5 HEAD_REF master ) @@ -26,21 +26,20 @@ else() set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/jun2021/uvatlastool.exe" - FILENAME "uvatlastool-jun2021.exe" - SHA512 af2e57a2d6aa41b53784c78ea8b5e181bb6ea6f66b23bfb3710ae3d7aebf3184c1739d02822a1eab438ebaac5fccb053bfac29b77d5ce81ae1f9c8e0bd396b49 + URLS "https://github.com/Microsoft/UVAtlas/releases/download/sept2021/uvatlastool.exe" + FILENAME "uvatlastool-sept2021.exe" + SHA512 56e5ca39f5e1d4fd5fc0f23dee0b2c4b814a53848614d3a470a68821177662e068e0d4e3db93446d32e734af4a6bad0f729d0691b2a3bb127e0395c14aa5a1e7 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -49,7 +48,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 4f5a81fee004c9..7996d056b3436f 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-string": "jun2021b", + "version-string": "sept2021", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", @@ -16,6 +16,14 @@ { "name": "directxtex", "platform": "!(uwp | linux)" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 71ba3c2c1bc8e9..1e582582882a2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1789,7 +1789,7 @@ "port-version": 1 }, "directxmesh": { - "baseline": "jun2021", + "baseline": "sept2021", "port-version": 0 }, "directxsdk": { @@ -1797,15 +1797,15 @@ "port-version": 4 }, "directxtex": { - "baseline": "aug2021", + "baseline": "sept2021", "port-version": 0 }, "directxtk": { - "baseline": "aug2021", + "baseline": "sept2021", "port-version": 0 }, "directxtk12": { - "baseline": "aug2021", + "baseline": "sept2021", "port-version": 0 }, "dirent": { @@ -6869,7 +6869,7 @@ "port-version": 1 }, "uvatlas": { - "baseline": "jun2021b", + "baseline": "sept2021", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index cfb012c233d71e..f11dd9707b5fb4 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6e38f3e2c1f90556658d75ae6edd0e170ab0ac4", + "version-string": "sept2021", + "port-version": 0 + }, { "git-tree": "57ebdc7d52aef816917feb6d24ad2e6e67fa92ec", "version-string": "jun2021", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index d90ed735e0bf4d..348d3e159aea46 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1dea5cbc125f2e87484afcd19c59b9c2955ce12d", + "version-string": "sept2021", + "port-version": 0 + }, { "git-tree": "fa15773926896a6f0b1f9eb47a5aed34f65175e4", "version-string": "aug2021", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 2a80e73170b5a7..b0513dea1664da 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fa980b193db947e6a803ed413e87df23ee315c7", + "version-string": "sept2021", + "port-version": 0 + }, { "git-tree": "e7f8c6f80d18f82e3e5a6ab621f4e43d6a110b2b", "version-string": "aug2021", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index f043aff3a6df88..f5175d4d188f60 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22e26ef3a716ae717ef2e972ce47ea6436d7025b", + "version-string": "sept2021", + "port-version": 0 + }, { "git-tree": "49693bbdb6a484add7a33c52cb54059beca228b9", "version-string": "aug2021", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index f4dd97775d7d75..c929a7052a25c7 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa1c69c4376ea2d6332065397292b386d60984a4", + "version-string": "sept2021", + "port-version": 0 + }, { "git-tree": "60f3026412b95786a91eadb5e97483cb9539b8c1", "version-string": "jun2021b", From 9a9de234018f85cf3414bde08706747cfd018216 Mon Sep 17 00:00:00 2001 From: Moritz Beutel Date: Sat, 2 Oct 2021 02:07:45 +0200 Subject: [PATCH 0721/1858] [gsl-lite] Update to 0.39.0 (#20450) * [gsl-lite] Update to 0.39.0, update portfile * [gsl-lite] Update version registry --- ports/gsl-lite/portfile.cmake | 20 ++++++++++++-------- ports/gsl-lite/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/g-/gsl-lite.json | 5 +++++ 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/ports/gsl-lite/portfile.cmake b/ports/gsl-lite/portfile.cmake index a37ea6144282ba..63f2488debdf7d 100644 --- a/ports/gsl-lite/portfile.cmake +++ b/ports/gsl-lite/portfile.cmake @@ -1,18 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gsl-lite/gsl-lite - REF e1c381746c2625a76227255f999ae9f14a062208 - SHA512 36b7ee945e384f1d425287a780953bf979782aa799547d08fb32e05c4671050278de34d857807de4c7e42b215900457014c49e89b7f330d522609f7cc10d47f8 + REF d0903fa87ff579c30f608bc363582e6563570342 + SHA512 f4032404db0073a8ca162e627af8e2741b26a9a251499b0d0009c56ae34b69904d488a4f463c107e40ec495f79b5990c685008979b397d1b670c088ceb4508a0 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA ) - -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/gsl-lite") +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/gsl-lite" +) file(WRITE ${CURRENT_PACKAGES_DIR}/include/gsl-lite.hpp "#ifndef GSL_LITE_HPP_VCPKG_COMPAT_HEADER_INCLUDED #define GSL_LITE_HPP_VCPKG_COMPAT_HEADER_INCLUDED @@ -25,4 +25,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" ) -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL + "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/gsl-lite/vcpkg.json b/ports/gsl-lite/vcpkg.json index 543db28de6d590..81a2d445baf7cd 100644 --- a/ports/gsl-lite/vcpkg.json +++ b/ports/gsl-lite/vcpkg.json @@ -1,6 +1,16 @@ { "name": "gsl-lite", - "version": "0.38.1", + "version": "0.39.0", "description": "A single-file header-only implementation of ISO C++ Guidelines Support Library (GSL) for C++98, C++11 and later.", - "homepage": "https://github.com/gsl-lite/gsl-lite/" + "homepage": "https://github.com/gsl-lite/gsl-lite/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1e582582882a2a..6a26b732f4f454 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2537,7 +2537,7 @@ "port-version": 0 }, "gsl-lite": { - "baseline": "0.38.1", + "baseline": "0.39.0", "port-version": 0 }, "gsoap": { diff --git a/versions/g-/gsl-lite.json b/versions/g-/gsl-lite.json index 3e424f47c5bedf..ff14b5ec23f0ef 100644 --- a/versions/g-/gsl-lite.json +++ b/versions/g-/gsl-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "764fdd7f284e4cbc5f8f28473c3c241e9bfa8d9c", + "version": "0.39.0", + "port-version": 0 + }, { "git-tree": "2ce26ff116fc8b387a5b67f157a0363688b22e91", "version": "0.38.1", From b09c955118ed280b3df9823c5be569f21a384040 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 4 Oct 2021 11:52:47 -0700 Subject: [PATCH 0722/1858] Use the correct SAS token for macos and fix tensorflow build failing on success. (#20512) * Use the correct SAS token for macos and fix tensorflow build failing on success. * Fix binary cache. --- scripts/azure-pipelines/osx/azure-pipelines.yml | 8 ++++---- scripts/azure-pipelines/test-modified-ports.ps1 | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index f90a7c82cbb014..a8d94f6f647b3e 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -27,9 +27,9 @@ jobs: value: /Users/vagrant/Data - name: VCPKG_DOWNLOADS value: /Users/vagrant/Data/downloads - - group: osx-binary-caching-credentials - - name: BINARY_SOURCE_STUB - value: "x-azblob,$(root-url),$(sas)" + - group: vcpkg-binary-caching-credentials + - name: X_VCPKG_BINARY_SOURCE_STUB + value: "x-azblob,$(root-bin-url),$(sas-bin)" - group: vcpkg-asset-caching-credentials - name: X_VCPKG_ASSET_SOURCES value: "x-azurl,$(root-url),$(sas),readwrite" @@ -67,7 +67,7 @@ jobs: arguments: > -Triplet "x64-osx" -BuildReason "$(Build.Reason)" - -BinarySourceStub "${{ variables.BINARY_SOURCE_STUB }}" + -BinarySourceStub "${{ variables.X_VCPKG_BINARY_SOURCE_STUB }}" -WorkingRoot "${{ variables.WORKING_ROOT }}" -ArtifactStagingDirectory "$(Build.ArtifactStagingDirectory)" ${{ variables.PowershellExtraArguments }} diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index d837dbb627e88b..6f25eb4c561563 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -140,6 +140,9 @@ if ($null -ne $OnlyTest) ) } } + + $failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0) + Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" } else { From 0dc7f5f9770b58b6eb17bfd8db5306820f0e2594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 4 Oct 2021 22:40:14 +0300 Subject: [PATCH 0723/1858] [vcpkg_copy_tools] support copying .app bundles (#20210) * [vcpkg_copy_tools] support copying .app bundles * check for VCPKG_TARGET_IS_OSX * Fix formatting * [vcpkg_copy_tools] copy bundle and plain bin if both present * Update scripts/cmake/vcpkg_copy_tools.cmake Co-authored-by: Billy Robert O'Neal III Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> --- docs/maintainers/vcpkg_common_definitions.md | 2 ++ scripts/cmake/vcpkg_common_definitions.cmake | 15 +++++++++++++++ scripts/cmake/vcpkg_copy_tools.cmake | 8 ++++++++ 3 files changed, 25 insertions(+) diff --git a/docs/maintainers/vcpkg_common_definitions.md b/docs/maintainers/vcpkg_common_definitions.md index 2e1037af5f50bc..b96dd3cbc5e56e 100644 --- a/docs/maintainers/vcpkg_common_definitions.md +++ b/docs/maintainers/vcpkg_common_definitions.md @@ -10,6 +10,8 @@ VCPKG_HOST_IS_ with being one of the following: VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target +VCPKG_HOST_BUNDLE_SUFFIX bundle suffix of the host +VCPKG_TARGET_BUNDLE_SUFFIX bundle suffix of the target VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX) VCPKG_TARGET_STATIC_LIBRARY_SUFFIX static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX) VCPKG_TARGET_SHARED_LIBRARY_PREFIX shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX) diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake index e53d9396354171..40c8183f1bbb0c 100644 --- a/scripts/cmake/vcpkg_common_definitions.cmake +++ b/scripts/cmake/vcpkg_common_definitions.cmake @@ -9,6 +9,8 @@ VCPKG_HOST_IS_ with being one of the following: VCPKG_HOST_PATH_SEPARATOR Host specific path separator (USAGE: "${VCPKG_HOST_PATH_SEPARATOR}"; only use and pass variables with VCPKG_HOST_PATH_SEPARATOR within "") VCPKG_HOST_EXECUTABLE_SUFFIX executable suffix of the host VCPKG_TARGET_EXECUTABLE_SUFFIX executable suffix of the target +VCPKG_HOST_BUNDLE_SUFFIX bundle suffix of the host +VCPKG_TARGET_BUNDLE_SUFFIX bundle suffix of the target VCPKG_TARGET_STATIC_LIBRARY_PREFIX static library prefix for target (same as CMAKE_STATIC_LIBRARY_PREFIX) VCPKG_TARGET_STATIC_LIBRARY_SUFFIX static library suffix for target (same as CMAKE_STATIC_LIBRARY_SUFFIX) VCPKG_TARGET_SHARED_LIBRARY_PREFIX shared library prefix for target (same as CMAKE_SHARED_LIBRARY_PREFIX) @@ -88,6 +90,19 @@ else() set(VCPKG_TARGET_EXECUTABLE_SUFFIX "") endif() +#Helper variables to identify bundles on host/target +if(VCPKG_HOST_IS_OSX) + set(VCPKG_HOST_BUNDLE_SUFFIX ".app") +else() + set(VCPKG_HOST_BUNDLE_SUFFIX "") +endif() + +if(VCPKG_TARGET_IS_OSX) + set(VCPKG_TARGET_BUNDLE_SUFFIX ".app") +else() + set(VCPKG_TARGET_BUNDLE_SUFFIX "") +endif() + #Helper variables for libraries if(VCPKG_TARGET_IS_MINGW) set(VCPKG_TARGET_STATIC_LIBRARY_SUFFIX ".a") diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake index ef3259840ccf02..af4a457ffee24d 100644 --- a/scripts/cmake/vcpkg_copy_tools.cmake +++ b/scripts/cmake/vcpkg_copy_tools.cmake @@ -58,6 +58,14 @@ function(vcpkg_copy_tools) set(tool_pdb "${arg_SEARCH_DIR}/${tool_name}.pdb") if(EXISTS "${tool_path}") file(COPY "${tool_path}" DESTINATION "${arg_DESTINATION}") + elseif(NOT "${VCPKG_TARGET_BUNDLE_SUFFIX}" STREQUAL "" AND NOT "${VCPKG_TARGET_BUNDLE_SUFFIX}" STREQUAL "${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + set(bundle_path "${arg_SEARCH_DIR}/${tool_name}${VCPKG_TARGET_BUNDLE_SUFFIX}") + if(EXISTS "${bundle_path}") + file(COPY "${bundle_path}" DESTINATION "${arg_DESTINATION}") + else() + message(FATAL_ERROR "Couldn't find tool \"${tool_name}\": + neither \"${tool_path}\" nor \"${bundle_path}\" exists") + endif() else() message(FATAL_ERROR "Couldn't find tool \"${tool_name}\": \"${tool_path}\" does not exist") From b18b488e0a5f3023668d84b4a43303c563f04408 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 5 Oct 2021 02:13:23 +0200 Subject: [PATCH 0724/1858] [yas] Update to 7.1.0 (#20497) * Update yas to 7.1.0 * Update CI baseline Co-authored-by: chausner --- ports/yas/portfile.cmake | 8 ++++---- ports/yas/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/y-/yas.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/yas/portfile.cmake b/ports/yas/portfile.cmake index 3673b2c40ff995..10b8026e1a3344 100644 --- a/ports/yas/portfile.cmake +++ b/ports/yas/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO niXman/yas - REF 7.0.5 - SHA512 52f7e28d4487286d1ead5cdebcd6c584f7e182d9890a6d367b73deacff14f43caa2412cc1f487e6682cc52e17015638bc41eb540e2a0074c8cb1b30344ccc89e + REF 7.1.0 + SHA512 1101BBE0B11FF8FA3B40B1E3030E5E93125FEDC85A90532466C9E6E0708B1C4C38821C86FCAFE153717B66B7107FCB29D0E13E87E68BF2217948A7014FC3BAC0 HEAD_REF master ) -file(INSTALL ${SOURCE_PATH}/include/yas DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/include/yas" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL ${SOURCE_PATH}/include/yas/version.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/include/yas/version.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/yas/vcpkg.json b/ports/yas/vcpkg.json index 13dd7c5addb9a5..b067a7c88e27b7 100644 --- a/ports/yas/vcpkg.json +++ b/ports/yas/vcpkg.json @@ -1,7 +1,6 @@ { "name": "yas", - "version-string": "7.0.5", - "port-version": 1, + "version": "7.1.0", "description": "Yet Another Serialization is a header only serialization library", "homepage": "https://github.com/niXman/yas" } diff --git a/versions/baseline.json b/versions/baseline.json index 6a26b732f4f454..55b1e89f958d20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7189,8 +7189,8 @@ "port-version": 0 }, "yas": { - "baseline": "7.0.5", - "port-version": 1 + "baseline": "7.1.0", + "port-version": 0 }, "yasm": { "baseline": "1.3.0", diff --git a/versions/y-/yas.json b/versions/y-/yas.json index 18187e169326bd..38d3f741f5dfd3 100644 --- a/versions/y-/yas.json +++ b/versions/y-/yas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52a671ae15bd1c29c00baa756d8b1f83e7cc3db2", + "version": "7.1.0", + "port-version": 0 + }, { "git-tree": "65fcc49d8cf563755c7fab9116c57b4de9780d73", "version-string": "7.0.5", From bb99ed3c555821dc247d60feee1f7f2dac2ba542 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 5 Oct 2021 02:13:49 +0200 Subject: [PATCH 0725/1858] [effolkronium-random] Update to 1.4.0 (#20496) * Update effolkronium-random to 1.4.0 * Update CI baseline Co-authored-by: chausner --- ports/effolkronium-random/portfile.cmake | 17 ++++++++--------- ports/effolkronium-random/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/e-/effolkronium-random.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/effolkronium-random/portfile.cmake b/ports/effolkronium-random/portfile.cmake index f5b283a1a1bd4f..94a18fec88079a 100644 --- a/ports/effolkronium-random/portfile.cmake +++ b/ports/effolkronium-random/portfile.cmake @@ -1,20 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO effolkronium/random - REF ead633a312d1a41baae72c22f0b2fd28b1853558 # v1.3.1 - SHA512 598e6edfc124f4619ea37292ea01c67ce87181476957137175cf9e9ca3c9cf44dfde3c2cebc0e57b4c8497058a320f8ce535f66bad5f8db5ceacc0cedd40936e + REF v1.4.0 + SHA512 B3DDEC048BBFB48877FD12295D4E0492E25976E1C4FE66F13E9E6E611DAAF654BD8D4AE75EA75125CB5AB420B82472C1CC1AB0BED3AEF632911B0934B45B23AF HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DRandom_BuildTests=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake/ TARGET_PATH /share/effolkronium_random) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/effolkronium-random RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/effolkronium-random/vcpkg.json b/ports/effolkronium-random/vcpkg.json index 39d13104477ee9..86d3fcf718ffa6 100644 --- a/ports/effolkronium-random/vcpkg.json +++ b/ports/effolkronium-random/vcpkg.json @@ -1,6 +1,16 @@ { "name": "effolkronium-random", - "version-string": "1.3.1", - "port-version": 1, - "description": "Random with a modern C++ API" + "version": "1.4.0", + "description": "Random with a modern C++ API", + "homepage": "https://github.com/effolkronium/random", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 55b1e89f958d20..0aef0b4f0134ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1949,8 +1949,8 @@ "port-version": 1 }, "effolkronium-random": { - "baseline": "1.3.1", - "port-version": 1 + "baseline": "1.4.0", + "port-version": 0 }, "efsw": { "baseline": "2020-06-08", diff --git a/versions/e-/effolkronium-random.json b/versions/e-/effolkronium-random.json index 64d9d3602d81b5..245c72ac7f40df 100644 --- a/versions/e-/effolkronium-random.json +++ b/versions/e-/effolkronium-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f870445e1974665f94fd66bc79c4bec3f33d090", + "version": "1.4.0", + "port-version": 0 + }, { "git-tree": "c07bb6dd8e736bf6b970117efbdc2c329f7192f1", "version-string": "1.3.1", From 435ebf2d2f652cc6bc38cf773501564bb3818ad1 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 5 Oct 2021 02:14:16 +0200 Subject: [PATCH 0726/1858] [nanoflann] Update to 1.3.2 (#20494) * Update nanoflann to 1.3.2 * Update CI baseline Co-authored-by: chausner --- ports/nanoflann/portfile.cmake | 15 +++++++-------- ports/nanoflann/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/n-/nanoflann.json | 5 +++++ 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake index 20c372cd10d3d1..0d047c9b6b7667 100644 --- a/ports/nanoflann/portfile.cmake +++ b/ports/nanoflann/portfile.cmake @@ -1,19 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jlblancoc/nanoflann - REF e8792e464ab05267216acde8b4ddf301714176a2 #1.3.1 - SHA512 78a04d39b418b6c6582e6d4180958bb0b492547a9662026da07a8b75d7186140bc4d6b50b6eece32db0196607cfcc901aaf4b458e9ab8a9a115b569acc2bae40 + REF v1.3.2 + SHA512 937D3787DF389EFE530060CD2723130251E2CA7937B10F8D770C7B0D21FFD972E6DA21B2B9E655C5740D57B4AF8F76F0CC6D9AE39527C440BE8863BE0DEAA7ED HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT} TARGET_PATH share/${PORT}) +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json index 1c9afca8b1b86e..e8ca03b60fc7d0 100644 --- a/ports/nanoflann/vcpkg.json +++ b/ports/nanoflann/vcpkg.json @@ -1,7 +1,16 @@ { "name": "nanoflann", - "version-string": "1.3.1", - "port-version": 1, + "version": "1.3.2", "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", - "homepage": "https://github.com/jlblancoc/nanoflann" + "homepage": "https://github.com/jlblancoc/nanoflann", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0aef0b4f0134ac..fc6d1374fe7003 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4493,8 +4493,8 @@ "port-version": 4 }, "nanoflann": { - "baseline": "1.3.1", - "port-version": 1 + "baseline": "1.3.2", + "port-version": 0 }, "nanogui": { "baseline": "2019-09-23", diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index df5aec220f3658..a62b9a89779d93 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9c4ef40eda67ef94cca10e5a50ac679ac0a34ad", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "256c8df02e530498eeb951b7760d5988d22615eb", "version-string": "1.3.1", From 9ab66f0f99a255d5bc11b7dbf3bab07cbe483856 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 4 Oct 2021 17:15:24 -0700 Subject: [PATCH 0727/1858] [expected-lite] Update port to 0.5.0 (#20455) * update to 0.5.0 * fixup deprecated functions * quote paths * use semver * add homepage * update versioning * add HEAD_REF * update versioning * use `version` instead * update versioning --- ports/expected-lite/portfile.cmake | 20 ++++++++++---------- ports/expected-lite/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/e-/expected-lite.json | 5 +++++ 4 files changed, 30 insertions(+), 15 deletions(-) diff --git a/ports/expected-lite/portfile.cmake b/ports/expected-lite/portfile.cmake index fcd73e9b74c39b..33079f6746144a 100644 --- a/ports/expected-lite/portfile.cmake +++ b/ports/expected-lite/portfile.cmake @@ -1,29 +1,29 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/expected-lite - REF v0.3.0 - SHA512 b24b58ff7bd6d5f355935854b6b5e67c7e9b2f1b6383ecdd2a1655833f414fd1189a07000b40c45a6df8a8641602c5eca19eb5e8639ac6cfe59e3d94bc102ab3 + REF v0.5.0 + SHA512 6dd8974d518db0c79fe7bd0e407a85436c6ad222f8e5ed84efb34925d9a665b5b83ff08529b3e985034ed9a9201c80575f6a956132408ef6577c9c47cac55eae + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DEXPECTED_LITE_OPT_BUILD_TESTS=OFF -DEXPECTED_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( CONFIG_PATH lib/cmake/${PORT} ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/expected-lite/vcpkg.json b/ports/expected-lite/vcpkg.json index f80f0abfff0012..3093555aabb987 100644 --- a/ports/expected-lite/vcpkg.json +++ b/ports/expected-lite/vcpkg.json @@ -1,6 +1,16 @@ { "name": "expected-lite", - "version-string": "0.3.0", - "port-version": 1, - "description": "Expected objects in C++11 and later in a single-file header-only library" + "version": "0.5.0", + "description": "Expected objects in C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/expected-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index fc6d1374fe7003..2b1e8b81f660ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2017,8 +2017,8 @@ "port-version": 0 }, "expected-lite": { - "baseline": "0.3.0", - "port-version": 1 + "baseline": "0.5.0", + "port-version": 0 }, "exprtk": { "baseline": "2021-01-01", diff --git a/versions/e-/expected-lite.json b/versions/e-/expected-lite.json index 4c59a26580c348..2cd69539cbebf8 100644 --- a/versions/e-/expected-lite.json +++ b/versions/e-/expected-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1e36e579144b5ebf1231aac06fbfc89c300351f", + "version": "0.5.0", + "port-version": 0 + }, { "git-tree": "877f85638b2a3f618c48729a2e39149effbcb851", "version-string": "0.3.0", From 0b779db28ead8abc05875f07f181fa44a7f8ea67 Mon Sep 17 00:00:00 2001 From: Be Date: Mon, 4 Oct 2021 19:18:49 -0500 Subject: [PATCH 0728/1858] [hidapi] update to 0.11.0; switch to CMake (#20460) --- ports/hidapi/hidapi-config.cmake | 48 ---------- ports/hidapi/portfile.cmake | 91 +++++-------------- ...remove-duplicate-AC_CONFIG_MACRO_DIR.patch | 12 --- ports/hidapi/vcpkg.json | 16 +++- versions/baseline.json | 4 +- versions/h-/hidapi.json | 5 + 6 files changed, 40 insertions(+), 136 deletions(-) delete mode 100644 ports/hidapi/hidapi-config.cmake delete mode 100644 ports/hidapi/remove-duplicate-AC_CONFIG_MACRO_DIR.patch diff --git a/ports/hidapi/hidapi-config.cmake b/ports/hidapi/hidapi-config.cmake deleted file mode 100644 index 126685a89d7cea..00000000000000 --- a/ports/hidapi/hidapi-config.cmake +++ /dev/null @@ -1,48 +0,0 @@ -# - try to find HIDAPI library -# from http://www.signal11.us/oss/hidapi/ -# -# Cache Variables: (probably not for direct use in your scripts) -# HIDAPI_INCLUDE_DIR -# HIDAPI_LIBRARY -# -# Non-cache variables you might use in your CMakeLists.txt: -# HIDAPI_FOUND -# HIDAPI_INCLUDE_DIRS -# HIDAPI_LIBRARIES -# -# Requires these CMake modules: -# FindPackageHandleStandardArgs (known included with CMake >=2.6.2) -# -# Original Author: -# 2009-2010 Ryan Pavlik -# http://academic.cleardefinition.com -# Iowa State University HCI Graduate Program/VRAC -# -# Copyright Iowa State University 2009-2010. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# hacking FindHIDAPI.cmake as hidapi-config.cmake - -find_library(HIDAPI_LIBRARY - NAMES hidapi hidapi-libusb) - -find_path(HIDAPI_INCLUDE_DIR - NAMES hidapi.h - PATH_SUFFIXES - hidapi) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(HIDAPI - DEFAULT_MSG - HIDAPI_LIBRARY - HIDAPI_INCLUDE_DIR) - -if(HIDAPI_FOUND) - set(HIDAPI_LIBRARIES "${HIDAPI_LIBRARY}") - - set(HIDAPI_INCLUDE_DIRS "${HIDAPI_INCLUDE_DIR}") -endif() - -mark_as_advanced(HIDAPI_INCLUDE_DIR HIDAPI_LIBRARY) diff --git a/ports/hidapi/portfile.cmake b/ports/hidapi/portfile.cmake index 1e13ee197ea808..1c9edd1ff0371c 100644 --- a/ports/hidapi/portfile.cmake +++ b/ports/hidapi/portfile.cmake @@ -1,70 +1,21 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO libusb/hidapi - REF hidapi-0.10.1 - SHA512 0479706c631775483378070ff7170542725678eabc202a5bd07436c951fd766e01743417999ac3fb2b5436c865f6ace2cfced1f210fa3a3e88c19ceb3bbe0534 - HEAD_REF master - PATCHES remove-duplicate-AC_CONFIG_MACRO_DIR.patch -) - -if(VCPKG_TARGET_IS_WINDOWS) - file(READ "${SOURCE_PATH}/windows/hidapi.vcxproj" _contents) - if(${VCPKG_CRT_LINKAGE} STREQUAL "dynamic") - string(REGEX REPLACE - "MultiThreadedDebug" - "MultiThreadedDebugDLL" - _contents "${_contents}") - string(REGEX REPLACE - "MultiThreaded" - "MultiThreadedDLL" - _contents "${_contents}") - else() - string(REGEX REPLACE - "MultiThreadedDebugDLL" - "MultiThreadedDebug" - _contents "${_contents}") - string(REGEX REPLACE - "MultiThreadedDLL" - "MultiThreaded" - _contents "${_contents}") - endif() - - if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") - string(REPLACE - "StaticLibrary" - "DynamicLibrary" - _contents "${_contents}") - else() - string(REPLACE - "DynamicLibrary" - "StaticLibrary" - _contents "${_contents}") - endif() - file(WRITE "${SOURCE_PATH}/windows/hidapi.vcxproj" "${_contents}") - - vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} - PROJECT_SUBPATH windows/hidapi.vcxproj - INCLUDES_SUBPATH hidapi ALLOW_ROOT_INCLUDES - LICENSE_SUBPATH LICENSE-bsd.txt # use BSD license - ) - - file(COPY ${CMAKE_CURRENT_LIST_DIR}/hidapi-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -else(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - ) - - vcpkg_install_make() - - vcpkg_copy_pdbs() - - vcpkg_fixup_pkgconfig() - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - - file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -endif() +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libusb/hidapi + REF hidapi-0.11.0 + SHA512 0de4abc963600d159ce231416c468b9e81a8361e4d2c2202988d6eb2e58a923700e9b9be639fbddc6bc14625131848409e2e88dbc4b34a1f8a726c8fa4692d92 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DHIDAPI_BUILD_HIDTEST=OFF +) +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE-bsd.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/hidapi/remove-duplicate-AC_CONFIG_MACRO_DIR.patch b/ports/hidapi/remove-duplicate-AC_CONFIG_MACRO_DIR.patch deleted file mode 100644 index 0eae649af75d28..00000000000000 --- a/ports/hidapi/remove-duplicate-AC_CONFIG_MACRO_DIR.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 220909a..77da67a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,7 +13,6 @@ LTLDFLAGS="-version-info ${lt_current}:${lt_revision}:${lt_age}" - - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([foreign -Wall -Werror]) --AC_CONFIG_MACRO_DIR([m4]) - - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - LT_INIT diff --git a/ports/hidapi/vcpkg.json b/ports/hidapi/vcpkg.json index b4b1f1a73117f6..cefc523a421371 100644 --- a/ports/hidapi/vcpkg.json +++ b/ports/hidapi/vcpkg.json @@ -1,14 +1,22 @@ { "name": "hidapi", - "version-semver": "0.10.1", - "port-version": 2, + "version-semver": "0.11.0", "description": "A Simple library for communicating with USB and Bluetooth HID devices on Linux, Mac and Windows.", "homepage": "https://github.com/libusb/hidapi", - "supports": "!(arm | uwp)", + "license": "BSD-3-Clause-Clear", + "supports": "!uwp", "dependencies": [ { "name": "libusb", - "platform": "!windows" + "platform": "!(windows | osx)" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 2b1e8b81f660ba..f2ba1a89ac6016 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2633,8 +2633,8 @@ "port-version": 1 }, "hidapi": { - "baseline": "0.10.1", - "port-version": 2 + "baseline": "0.11.0", + "port-version": 0 }, "highfive": { "baseline": "2.3", diff --git a/versions/h-/hidapi.json b/versions/h-/hidapi.json index d3e0af407a4eea..6bbe71ea2fc53b 100644 --- a/versions/h-/hidapi.json +++ b/versions/h-/hidapi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2540911a0c10b731ac15a04c6f9c5153003c19fd", + "version-semver": "0.11.0", + "port-version": 0 + }, { "git-tree": "8ddfc714e198b19f67260bfeb2e5ae58e37fd909", "version-semver": "0.10.1", From b489044b21cf008340a9fb6a87f08e5158425291 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 4 Oct 2021 17:20:02 -0700 Subject: [PATCH 0729/1858] [reproc] Update port to 14.2.3 (#20456) * update to 14.2.3 * remove trailing whitespace * update HEAD_REF * update deprecated functions * quote paths * update versioning * update baseline * update versioning * Use version rather than version-string. Co-authored-by: Billy Robert O'Neal III --- ports/reproc/portfile.cmake | 26 +++++++++++++------------- ports/reproc/vcpkg.json | 16 +++++++++++++--- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 ++-- versions/r-/reproc.json | 5 +++++ 5 files changed, 33 insertions(+), 20 deletions(-) diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake index 8d6c0370682875..0a64711afbc462 100644 --- a/ports/reproc/portfile.cmake +++ b/ports/reproc/portfile.cmake @@ -1,33 +1,33 @@ +vcpkg_fail_port_install(ON_TARGET "UWP") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaanDeMeyer/reproc - REF 8f70f97af263dd3f41bdc07f6f04e92436b1b55a # v14.2.1 - SHA512 98bc8cb8aac5da83407ce23911b97840180d0d6f0321ac68ab035717ab84dcf312f886477cd393e0ac322993a3d1acaa3bfdabb4fe8131916df53658d5a59adf - HEAD_REF master + REF v14.2.3 + SHA512 acb3a0b90aca7bcfd1b0882b7094ba0f2f8dd8aa4a7c4a37d37780cebb23ef3c8842ca9a9aded337f607d832a95eed5cc7ccc120c64daef9a979a9d20aa07aad + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DREPROC++=ON -DREPROC_INSTALL_PKGCONFIG=OFF -DREPROC_INSTALL_CMAKECONFIGDIR=share ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") foreach(TARGET reproc reproc++) - vcpkg_fixup_cmake_targets( - CONFIG_PATH share/${TARGET} - TARGET_PATH share/${TARGET} + vcpkg_cmake_config_fixup( + PACKAGE_NAME ${TARGET} ) endforeach() file( - INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/reproc/vcpkg.json b/ports/reproc/vcpkg.json index bf51252e324784..b0530b3e7ed46b 100644 --- a/ports/reproc/vcpkg.json +++ b/ports/reproc/vcpkg.json @@ -1,7 +1,17 @@ { "name": "reproc", - "version-string": "14.2.1", - "port-version": 1, + "version": "14.2.3", "description": "Cross-platform (C99/C++11) process library", - "homepage": "https://github.com/DaanDeMeyer/reproc" + "homepage": "https://github.com/DaanDeMeyer/reproc", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4c07eb491316a5..89b05d34211777 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1326,8 +1326,6 @@ realsense2:arm-uwp=fail realsense2:x64-uwp=fail replxx:arm-uwp=fail replxx:x64-uwp=fail -reproc:arm-uwp=fail -reproc:x64-uwp=fail restbed:arm-uwp=fail restbed:x64-uwp=fail # file conflicts with msgpack diff --git a/versions/baseline.json b/versions/baseline.json index f2ba1a89ac6016..8a7d3fa94d8bdf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5825,8 +5825,8 @@ "port-version": 3 }, "reproc": { - "baseline": "14.2.1", - "port-version": 1 + "baseline": "14.2.3", + "port-version": 0 }, "rest-rpc": { "baseline": "0.07", diff --git a/versions/r-/reproc.json b/versions/r-/reproc.json index ce9b3ced9be469..cf227e0b23634d 100644 --- a/versions/r-/reproc.json +++ b/versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f27a66507c39df365532d526313c247211aaa1d", + "version": "14.2.3", + "port-version": 0 + }, { "git-tree": "3173c9bf7aca150b6b7859a4c055ac778c157f58", "version-string": "14.2.1", From 0a9e864258cf9baa5e1d1aab9174591d72640507 Mon Sep 17 00:00:00 2001 From: Buck Yeh Date: Wed, 6 Oct 2021 05:47:37 +0800 Subject: [PATCH 0730/1858] [buck-yeh-bux] Update port to 1.5.0 (#20477) * [bux] Add new port * Corrections according to Create Pull Request suggested questions * SHA512 * Mark fails into .\scripts\ci.baseline.txt * Mark fails into .\scripts\ci.baseline.txt * No need of "port-version": 1 in vcpkg.json * Update version database * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update bux.json * Update ports/bux/vcpkg.json * update version * Update scripts/ci.baseline.txt Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update bux support * update version * update version * Rename bux to buck-yeh-bux * Update version database * [buck-yeh-bux] upgrade to v1.5.0 1. [New] `bux::C_ParaLog` is ready for a variety of parallel logging configurations, filtered or unfiltered. 2. [New] Necessary helper classes for implementation _s.t_ logger users no longer need to declare child source instances explicitly. 3. [New] Add methods to `ParaLog.h` & `SyncLog.h` to support testability. 4. [New] Add unit test cases to `ParaLog.h` & `SyncLog.h` (test_paralog & test_logger) 5. [New] Update what are found in `test/` to `test/archlinux/aur_poc/` 6. [Bug] `std::uniform_int_distribution` no longer allowed. 7. [Change] `CUR_FUNC_` for Windows (MSVC) 8. [Change] `tbb` is no longer implicitly needed by C++ standard library. 9. [Change] `smoke_filtlog.cpp` verifies 2-level log filters ok. * Missing comma in versions/b-/buck-yeh-bux.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/buck-yeh-bux/portfile.cmake | 4 ++-- ports/buck-yeh-bux/vcpkg.json | 2 +- versions/b-/buck-yeh-bux.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index cfcaadc69698b9..1613d213a5d6e4 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "linux" "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux - REF 4636183159f74f350238e6ee59583b34f7e7aca9 # v1.4.1 - SHA512 319cd15c73ca469849cbc364635d7147cfa3fed57d6043b0cb2b52d504a253645518ec6254ddba51fc8cc32cc89e345458530628b331629cabce5b64d8723a6a + REF 7cd3bb2b563dbc907d64ade6dc66f1fcae282067 # v1.5.0 + SHA512 06ed00ce627a49dc9d36ac769e9b4a1851489248c57f24a4850ab28d0f2d63d2fc3e7b9712d954752e212476322b7a5f708838ed440364173b71a648dced2eb4 HEAD_REF main ) diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index 3ae078499010a2..6cda15750dbe8d 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,6 +1,6 @@ { "name": "buck-yeh-bux", - "version": "1.4.1", + "version": "1.5.0", "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "supports": "!(arm | uwp | osx | linux)", diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index 1829717189c816..c81ba8cd23e87a 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b420b8fe7a8712cee4a2317433902c32d4b6634d", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "4cdd433b94429da69f293e95dd60390daf6966a0", "version": "1.4.1", diff --git a/versions/baseline.json b/versions/baseline.json index 8a7d3fa94d8bdf..bc6fd58ca7b83d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1149,7 +1149,7 @@ "port-version": 0 }, "buck-yeh-bux": { - "baseline": "1.4.1", + "baseline": "1.5.0", "port-version": 0 }, "bullet3": { From 8e559edc5002c90e858091dc9b705070b9333a77 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 5 Oct 2021 14:59:57 -0700 Subject: [PATCH 0731/1858] [azure-security-keyvault-keys-cpp] Update to 4.2.0 (#20535) ## 4.2.0 (2021-10-05) ### Features Added - [2833](https://github.com/Azure/azure-sdk-for-cpp/issues/2833) Added `GetCryptographyClient()` to `KeyClient` to return a `CryptographyClient` that uses the same options, policies, and pipeline as the `KeyClient` that created it. --- ports/azure-security-keyvault-keys-cpp/portfile.cmake | 4 ++-- ports/azure-security-keyvault-keys-cpp/vcpkg.json | 2 +- versions/a-/azure-security-keyvault-keys-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-security-keyvault-keys-cpp/portfile.cmake b/ports/azure-security-keyvault-keys-cpp/portfile.cmake index 3852bb5ec4487d..890652a7c333d6 100644 --- a/ports/azure-security-keyvault-keys-cpp/portfile.cmake +++ b/ports/azure-security-keyvault-keys-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-security-keyvault-keys_4.1.0 - SHA512 1292a7964a35ea97341f26e886f25a9ac11353105edcb45b074741564950f0bc7fcd4fc8be1cd9c68c645565c0248eb53cf7ca3d118bc3d32c29a32d7945a600 + REF azure-security-keyvault-keys_4.2.0 + SHA512 b7556019a23344c109f62120c9fc0451f81bf476700ef08c6968a3e731fa783522b2f9b4de411e6727cb1cb977cc4344303e32d825515c192544bb78d9517c32 ) vcpkg_cmake_configure( diff --git a/ports/azure-security-keyvault-keys-cpp/vcpkg.json b/ports/azure-security-keyvault-keys-cpp/vcpkg.json index edd5070d5dc492..b214ba2dda913a 100644 --- a/ports/azure-security-keyvault-keys-cpp/vcpkg.json +++ b/ports/azure-security-keyvault-keys-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-security-keyvault-keys-cpp", - "version-semver": "4.1.0", + "version-semver": "4.2.0", "description": [ "Microsoft Azure Key Vault Keys SDK for C++", "This library provides Azure Key Vault Keys SDK." diff --git a/versions/a-/azure-security-keyvault-keys-cpp.json b/versions/a-/azure-security-keyvault-keys-cpp.json index 81bbdc973386c9..2e20c672f2b636 100644 --- a/versions/a-/azure-security-keyvault-keys-cpp.json +++ b/versions/a-/azure-security-keyvault-keys-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c2a617f9326c712866be1e5218a1ae18262ee178", + "version-semver": "4.2.0", + "port-version": 0 + }, { "git-tree": "ee627e15fc96740b6d7d89fea0ef9bae6f24da5c", "version-semver": "4.1.0", diff --git a/versions/baseline.json b/versions/baseline.json index bc6fd58ca7b83d..a509c033235e00 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -333,7 +333,7 @@ "port-version": 0 }, "azure-security-keyvault-keys-cpp": { - "baseline": "4.1.0", + "baseline": "4.2.0", "port-version": 0 }, "azure-security-keyvault-secrets-cpp": { From c190595ef8d9f332841ee189041763cfd3a75239 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 00:59:26 +0200 Subject: [PATCH 0732/1858] [boolinq] Update to 3.0.2 (#20486) * Update boolinq to 3.0.2 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/boolinq/portfile.cmake | 9 ++++----- ports/boolinq/vcpkg.json | 2 +- versions/b-/boolinq.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/boolinq/portfile.cmake b/ports/boolinq/portfile.cmake index 1d75e3e2d76735..08f1606fae6269 100644 --- a/ports/boolinq/portfile.cmake +++ b/ports/boolinq/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO k06a/boolinq - REF d8456eae92508d8a14fb209e8aa6dc1a1ae6b56d #v3.0.1 - SHA512 587d91c05cc2f3a900c2614832fe61f4c60b0ffe8ca3af273736ef7eaf6aa57185b9aa62906bf7d26beffd1fad3790b49107fe68c72d924509ca744212fdaee1 + REF 3.0.2 + SHA512 9BE859485F7B0E8129D05E1AB92C7316C4C94EA9195779A363063ADA6BBB0E4231B0EF0A91807786B24E4CF694CF93E398782E57F9B46A57DADD436A6FF57E57 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/include/boolinq/boolinq.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/boolinq) +file(COPY "${SOURCE_PATH}/include/boolinq/boolinq.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/boolinq") -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/boolinq/vcpkg.json b/ports/boolinq/vcpkg.json index 7d0dfc1a826f33..9052b27ca03685 100644 --- a/ports/boolinq/vcpkg.json +++ b/ports/boolinq/vcpkg.json @@ -1,6 +1,6 @@ { "name": "boolinq", - "version": "3.0.1", + "version": "3.0.2", "description": "Super tiny C++11 single-file header-only LINQ library", "homepage": "https://github.com/k06a/boolinq" } diff --git a/versions/b-/boolinq.json b/versions/b-/boolinq.json index 8194d61fd566fe..01cf3c3d4e1add 100644 --- a/versions/b-/boolinq.json +++ b/versions/b-/boolinq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "86d17070137580ac517b418686329b8fbc28b147", + "version": "3.0.2", + "port-version": 0 + }, { "git-tree": "6c818ffded6676e523656e7ae145bfe6e6bf9220", "version": "3.0.1", diff --git a/versions/baseline.json b/versions/baseline.json index a509c033235e00..2bb3cf960740a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -497,7 +497,7 @@ "port-version": 2 }, "boolinq": { - "baseline": "3.0.1", + "baseline": "3.0.2", "port-version": 0 }, "boost": { From c3637a7f21894a1841b972f6052d19dcaa01accf Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 00:59:59 +0200 Subject: [PATCH 0733/1858] [bitmagic] Update to 7.5.0 (#20487) * Update bitmagic to 7.5.0 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/bitmagic/portfile.cmake | 8 ++++---- ports/bitmagic/vcpkg.json | 3 +-- versions/b-/bitmagic.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/bitmagic/portfile.cmake b/ports/bitmagic/portfile.cmake index 726277754c2952..570aa610cf66df 100644 --- a/ports/bitmagic/portfile.cmake +++ b/ports/bitmagic/portfile.cmake @@ -2,12 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO tlk00/BitMagic - REF v7.2.0 - SHA512 74e7b32dcc66960a50e4976f82a0388d5e3b43c737c87277d5f2eac0f551866fca227704d61df867e6bd61e3dbc7b1de0e52ac48d732760f9dc7e50ecef9be6b + REF v7.5.0 + SHA512 237D81D6AED1DAF612BF4F64DD7C883018198C1E1F5A58837B04D010971950C27C91B978AA8D774145B45A5B0C4121AC45CFF1094793E56066F2EFA8B4C3D6ED HEAD_REF master ) file(GLOB HEADER_LIST "${SOURCE_PATH}/src/*.h") -file(INSTALL ${HEADER_LIST} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL ${HEADER_LIST} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bitmagic/vcpkg.json b/ports/bitmagic/vcpkg.json index c6203e75567f13..a41fde0ca4708c 100644 --- a/ports/bitmagic/vcpkg.json +++ b/ports/bitmagic/vcpkg.json @@ -1,7 +1,6 @@ { "name": "bitmagic", - "version-string": "7.2.0", - "port-version": 1, + "version": "7.5.0", "description": "Algorithms and tools for Algebra of Sets for information retrieval, indexing of databases, scientific algorithms, ranking, clustering, unsupervised machine learning and signal processing.", "homepage": "http://bitmagic.io" } diff --git a/versions/b-/bitmagic.json b/versions/b-/bitmagic.json index 4771281def0b31..07b6ea476bcb97 100644 --- a/versions/b-/bitmagic.json +++ b/versions/b-/bitmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a8ea093834ac196fd75eb7d07348dd27ebcb715", + "version": "7.5.0", + "port-version": 0 + }, { "git-tree": "9854378bbae00f886710d80f38221368faf99547", "version-string": "7.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 2bb3cf960740a8..a4c57e3e9a3134 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -441,8 +441,8 @@ "port-version": 1 }, "bitmagic": { - "baseline": "7.2.0", - "port-version": 1 + "baseline": "7.5.0", + "port-version": 0 }, "bitserializer": { "baseline": "0.10", From 057aac739fc0924184ed84b388fd6be4accccbb5 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 5 Oct 2021 19:03:03 -0400 Subject: [PATCH 0734/1858] [google-cloud-cpp] migrate to vcpkg_cmake_config_fixup() (#20521) * [google-cloud-cpp] migrate to vcpkg_cmake_config_fixup() * Address review comments --- ports/google-cloud-cpp/portfile.cmake | 45 +++++++++++++++++++++++++-- ports/google-cloud-cpp/vcpkg.json | 5 +++ versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++ 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 06ff7860a6eeb1..cc29525cc8455c 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -31,9 +31,50 @@ vcpkg_cmake_configure( vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +foreach(feature IN LISTS FEATURES) + set(config_path "lib/cmake/google_cloud_cpp_${feature}") + # Most features get their own package in `google-cloud-cpp`. + # The exceptions are captured by this `if()` command, basically + # things like `core` and `experimental-storage-grpc` are skipped. + if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") + continue() + endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${feature}" + CONFIG_PATH "${config_path}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() +# These packages are automatically installed depending on what features are +# enabled. +foreach(suffix common googleapis grpc_utils) + set(config_path "lib/cmake/google_cloud_cpp_${suffix}") + if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") + continue() + endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME "google_cloud_cpp_${suffix}" + CONFIG_PATH "${config_path}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +# These packages are only for backwards compability. The google-cloud-cpp team +# is planning to remove them around 2022-02-15. +foreach(package + googleapis + bigtable_client + pubsub_client + spanner_client + storage_client) + set(config_path "lib/cmake/google_cloud_cpp_${suffix}") + if(NOT IS_DIRECTORY "${config_path}") + continue() + endif() + vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" + CONFIG_PATH "${config_path}" + DO_NOT_DELETE_PARENT_CONFIG_PATH) +endforeach() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 35cbf153b008c7..5b3f62ef4207b5 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", "version": "1.32.0", + "port-version": 1, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -10,6 +11,10 @@ { "name": "vcpkg-cmake", "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index a4c57e3e9a3134..e7fd77ee696edc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2474,7 +2474,7 @@ }, "google-cloud-cpp": { "baseline": "1.32.0", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index ea0a234d274fac..94dbefbdc3c273 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b53c52b812f1d7fe8ada0a6d938b047b5a3dbd2", + "version": "1.32.0", + "port-version": 1 + }, { "git-tree": "d138daefe227de160954ecdce23178fa659edb36", "version": "1.32.0", From c0c62f43a44bfb739bd9d1ac47a3ca2dd01e18c0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:04:23 +0200 Subject: [PATCH 0735/1858] [qtbase/qttools] Fix missing feature dependencies. (#20528) * [qttools] add missing feature dependency. * version stuff * assistant also requires sql-sqlite. * version stuff * qtbase add missing concurrent dependency * update port version * version stuff --- ports/qtbase/vcpkg.json | 12 +++++++++++- ports/qttools/vcpkg.json | 24 ++++++++++++++++++++++-- versions/baseline.json | 4 ++-- versions/q-/qtbase.json | 5 +++++ versions/q-/qttools.json | 5 +++++ 5 files changed, 45 insertions(+), 5 deletions(-) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 876f3f43fb4e4c..25f24be83c74fb 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version-semver": "6.2.0", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ @@ -211,7 +212,16 @@ ] }, "sql": { - "description": "Qt Sql" + "description": "Qt Sql", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "concurrent" + ] + } + ] }, "sql-psql": { "description": "Enable SQL Driver psql", diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index cfdf1a27241353..9a806339d1c191 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qttools", "version-semver": "6.2.0", + "port-version": 1, "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ @@ -20,10 +21,29 @@ ], "features": { "assistant": { - "description": "Build Qt Assistant" + "description": "Build Qt Assistant", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network", + "sql-sqlite" + ] + } + ] }, "designer": { - "description": "Build Qt Designer" + "description": "Build Qt Designer", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "network" + ] + } + ] }, "linguist": { "description": "Build Qt Linguist components", diff --git a/versions/baseline.json b/versions/baseline.json index e7fd77ee696edc..318bbac4d82b61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5554,7 +5554,7 @@ }, "qtbase": { "baseline": "6.2.0", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.2.0", @@ -5654,7 +5654,7 @@ }, "qttools": { "baseline": "6.2.0", - "port-version": 0 + "port-version": 1 }, "qttranslations": { "baseline": "6.2.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 9585acad132abb..657fa7a5e6abda 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "01075dfd8097c54bd832400553958c2ff9bebf31", + "version-semver": "6.2.0", + "port-version": 1 + }, { "git-tree": "9850138b57bf2122ee9e5063c76944754f4dbf63", "version-semver": "6.2.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 3d380d69381421..8a4d3077287f41 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7473cbd91e3a1f662866cd695e94ff6a96a9cfb4", + "version-semver": "6.2.0", + "port-version": 1 + }, { "git-tree": "829976cbf157c36668dd1535bbeeadd2c1d39416", "version-semver": "6.2.0", From f90870dd6007334638f92e47e590e6b8beec1a28 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:11:01 +0200 Subject: [PATCH 0736/1858] [span-lite] Update to 0.10.3 (#20499) * Update span-lite to 0.10.3 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/span-lite/portfile.cmake | 21 ++++++++++----------- ports/span-lite/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/s-/span-lite.json | 5 +++++ 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/ports/span-lite/portfile.cmake b/ports/span-lite/portfile.cmake index fd34b69ca06bd1..fcf8b9210f37c4 100644 --- a/ports/span-lite/portfile.cmake +++ b/ports/span-lite/portfile.cmake @@ -1,29 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/span-lite - REF v0.9.0 - SHA512 e7d8a5f2e85b4aa7dc148c5a17898729bafa6124affacf66280eaa74c6aad5a4c9a9231e664f95392aa4edb784eaf3e2e3e03d34914c90565b9026744d7f7276 + REF v0.10.3 + SHA512 001259FEC3F043391D8C00D858841823F7F88B56884AE73FA0D08F71CD35FAC636DDCC323FE5AAA7E680BDE6092E693F810DA821E8E3ADE29C6D73ED46DB3609 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSPAN_LITE_OPT_BUILD_TESTS=OFF -DSPAN_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/span-lite/vcpkg.json b/ports/span-lite/vcpkg.json index 1227b0a5d05fd2..43526240e3f2a3 100644 --- a/ports/span-lite/vcpkg.json +++ b/ports/span-lite/vcpkg.json @@ -1,6 +1,16 @@ { "name": "span-lite", - "version-string": "0.9.0", + "version": "0.10.3", "description": "A C++20-like span for C++98, C++11 and later in a single-file header-only library", - "homepage": "https://github.com/martinmoene/span-lite" + "homepage": "https://github.com/martinmoene/span-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 318bbac4d82b61..8efa2f8b0045ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6269,7 +6269,7 @@ "port-version": 5 }, "span-lite": { - "baseline": "0.9.0", + "baseline": "0.10.3", "port-version": 0 }, "sparsehash": { diff --git a/versions/s-/span-lite.json b/versions/s-/span-lite.json index 1de3d322ba076f..0a15f28bd776de 100644 --- a/versions/s-/span-lite.json +++ b/versions/s-/span-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fdf6960d9eab8dfdd0a03ef8e7d3db09a50defb", + "version": "0.10.3", + "port-version": 0 + }, { "git-tree": "3a97b03dacd5b7fdcec06275cf87a4df933d58a0", "version-string": "0.9.0", From d4f69d54f063afa0b426c445148b9c6e2d8af296 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:11:48 +0200 Subject: [PATCH 0737/1858] [libmorton] Update to 0.2.8 (#20498) * Update libmorton to 0.2.8 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/libmorton/portfile.cmake | 22 +++++++++++++++------- ports/libmorton/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/l-/libmorton.json | 5 +++++ 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/ports/libmorton/portfile.cmake b/ports/libmorton/portfile.cmake index dee3b6e629e811..b865731215750b 100644 --- a/ports/libmorton/portfile.cmake +++ b/ports/libmorton/portfile.cmake @@ -1,14 +1,22 @@ -#header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Forceflow/libmorton - REF v0.2 - SHA512 04cf8332a1cee52eebfb25a46ac64517900704f62fe53ccf1d6a74c535ccac5af4e3ce2e0a5ce94ee850fadb429fe0d88d5a66901f16e4308341a621e599d33d + REF v0.2.8 + SHA512 7497203573965337F1216DB729D3F6806278B8DDFF539E8D01EF83FB3EAB50D5FF90C965CF5EA3A76464CF6F279C000434D2111B37D3D368834F7EF20959E790 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmorton) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmorton/LICENSE ${CURRENT_PACKAGES_DIR}/share/libmorton/copyright) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libmorton) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(GLOB HEADER_FILES ${SOURCE_PATH}/libmorton/include/*.h) -file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/libmorton) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libmorton/vcpkg.json b/ports/libmorton/vcpkg.json index c3df1681a7192e..6ce97b43042a81 100644 --- a/ports/libmorton/vcpkg.json +++ b/ports/libmorton/vcpkg.json @@ -1,6 +1,15 @@ { "name": "libmorton", - "version-string": "0.2", - "port-version": 1, - "description": "header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates" + "version": "0.2.8", + "description": "Header-only library for encoding/decoding Morton codes in/from 2D/3D coordinates", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 8efa2f8b0045ae..f93c9c3e97c939 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3569,8 +3569,8 @@ "port-version": 8 }, "libmorton": { - "baseline": "0.2", - "port-version": 1 + "baseline": "0.2.8", + "port-version": 0 }, "libmpeg2": { "baseline": "0.5.1", diff --git a/versions/l-/libmorton.json b/versions/l-/libmorton.json index 50136e69ab6b6f..c97e9f12f0029b 100644 --- a/versions/l-/libmorton.json +++ b/versions/l-/libmorton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b25f31e6c58dbf7106777360374ea7f84182ddc", + "version": "0.2.8", + "port-version": 0 + }, { "git-tree": "0c25c5cd76d1c395f24c0e22407673e2c88c6458", "version-string": "0.2", From 319571789f4040055819a036f45cb6b14cc0e3e9 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:12:22 +0200 Subject: [PATCH 0738/1858] [doctest] Update to 2.4.6 (#20493) * Update doctest to 2.4.6 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/doctest/portfile.cmake | 12 ++++++------ ports/doctest/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/d-/doctest.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/doctest/portfile.cmake b/ports/doctest/portfile.cmake index 356b63909187bb..170c48578a6ffb 100644 --- a/ports/doctest/portfile.cmake +++ b/ports/doctest/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onqtam/doctest - REF f0ab4e793fa863d4a5929ff263ddd3bebec8767e #version 2.4.5 - SHA512 7107787bc10e842b796b0d4dbe6d364ec6ca84813f00f48a07c4c91eb2fc71bd01779715296955dac2219b681f33721f3be46cb884997b4d84bf366122a620d6 + REF 2.4.6 + SHA512 A5CCCF085AF946003140AF688F071A6407D42FC685324A537E3B704EF9DE0F2228BD06EABFD1DF8DA70DEC001420DD0B2813E5E4320B5C1DA450CB0AADD63788 HEAD_REF master ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DDOCTEST_WITH_TESTS=OFF @@ -16,6 +16,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/doctest) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/doctest/vcpkg.json b/ports/doctest/vcpkg.json index 4a4cdaad24d3aa..060fecff60039d 100644 --- a/ports/doctest/vcpkg.json +++ b/ports/doctest/vcpkg.json @@ -1,7 +1,6 @@ { "name": "doctest", - "version-string": "2.4.5", - "port-version": 1, + "version": "2.4.6", "description": "The fastest feature-rich C++ single-header testing framework for unit tests and TDD", "homepage": "https://github.com/onqtam/doctest" } diff --git a/versions/baseline.json b/versions/baseline.json index f93c9c3e97c939..a4ad0f3610c155 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1849,8 +1849,8 @@ "port-version": 1 }, "doctest": { - "baseline": "2.4.5", - "port-version": 1 + "baseline": "2.4.6", + "port-version": 0 }, "double-conversion": { "baseline": "3.1.5", diff --git a/versions/d-/doctest.json b/versions/d-/doctest.json index 30a591ff0edb55..d413559fa0a8ed 100644 --- a/versions/d-/doctest.json +++ b/versions/d-/doctest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15aee759d06d6b4a61bc3fec3ecd1fbfac7c1d05", + "version": "2.4.6", + "port-version": 0 + }, { "git-tree": "7e39ece916763931668299b3856bbbb8e41308cf", "version-string": "2.4.5", From c9741a069397ae870645b24e4030938829edae14 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:13:21 +0200 Subject: [PATCH 0739/1858] [tmxlite] Update to 1.3.0 (#20492) * Update tmxlite to 1.3.0 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/tmxlite/portfile.cmake | 17 ++++++++--------- ports/tmxlite/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/t-/tmxlite.json | 5 +++++ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/ports/tmxlite/portfile.cmake b/ports/tmxlite/portfile.cmake index 6c0dda980e0abb..ff1fb37a83c0ce 100644 --- a/ports/tmxlite/portfile.cmake +++ b/ports/tmxlite/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fallahn/tmxlite - REF 591dd0371dceb2c43abeceac11cd9e8077880cca + REF v1.3.0 HEAD_REF master - SHA512 a857aea3ec99c686e97d25ecb2bdd8d2f2f14dcb8419e14535ace8794bfbc21fe825cffc60e589df7291ae35076fb6734f7047c985a6ea6d0c55c861c07ba784 + SHA512 3D432152080F7FDDD14A150FF87C34932695C96D7F676399C7610FF373972223CE54C9483BD9A872FD53668C113E334FCBF8596AE21CFDAF83B6159C7287A4A3 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/tmxlite - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/tmxlite" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -configure_file(${SOURCE_PATH}/readme.md ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/tmxlite/vcpkg.json b/ports/tmxlite/vcpkg.json index 0b710f19d4c063..66cbcf47d239df 100644 --- a/ports/tmxlite/vcpkg.json +++ b/ports/tmxlite/vcpkg.json @@ -1,6 +1,15 @@ { "name": "tmxlite", - "version-string": "2019-03-05", - "port-version": 1, - "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor." + "version": "1.3.0", + "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a4ad0f3610c155..a3a44f2f8213ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6685,8 +6685,8 @@ "port-version": 1 }, "tmxlite": { - "baseline": "2019-03-05", - "port-version": 1 + "baseline": "1.3.0", + "port-version": 0 }, "tmxparser": { "baseline": "2.1.0", diff --git a/versions/t-/tmxlite.json b/versions/t-/tmxlite.json index e66ad8161e047b..09092bb6ae9170 100644 --- a/versions/t-/tmxlite.json +++ b/versions/t-/tmxlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a60946b8d791faf0936b14f7ad9868d74b0dd872", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "177873f8c1357bfcc2a15954de053e949737dd30", "version-string": "2019-03-05", From 459c0f434e0ced6c6d5c73dc64dccab951b08404 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:13:59 +0200 Subject: [PATCH 0740/1858] [ebml] Update to 1.4.2 (#20491) * Update ebml to 1.4.2 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/ebml/portfile.cmake | 17 ++++++++--------- ports/ebml/vcpkg.json | 17 +++++++++++++---- versions/baseline.json | 4 ++-- versions/e-/ebml.json | 5 +++++ 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ports/ebml/portfile.cmake b/ports/ebml/portfile.cmake index 944dcb00ce4928..2a4d232ae9fe72 100644 --- a/ports/ebml/portfile.cmake +++ b/ports/ebml/portfile.cmake @@ -5,22 +5,21 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libebml - REF 6145c5700d894312c4dd47ba6c1ace72075b0692 # release-1.4.0 - SHA512 74132d4605ec8b75e72fa58ca4c04c5aa980aae4b028032d34fde14eff406c814518168ae7bfec5cdaf026d914a019b1fcac1458c40537c4964a46989c1283d0 + REF release-1.4.2 + SHA512 2A03CA1D82A41EE05CFE4DD2726CC79295FA06A4D8ECEB93FE8F41BDFF09F04897B434B49DD1F496E1C014289B14C3F3416EAB4C8B1E745652FF1AB4A620BF83 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DDISABLE_PKGCONFIG=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EBML) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EBML) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ebml/vcpkg.json b/ports/ebml/vcpkg.json index 764a42e798d008..f90e93d79f9fcb 100644 --- a/ports/ebml/vcpkg.json +++ b/ports/ebml/vcpkg.json @@ -1,8 +1,17 @@ { "name": "ebml", - "version-string": "1.4.0", - "port-version": 1, - "description": "a C++ library to parse EBML files", + "version": "1.4.2", + "description": "A C++ library to parse EBML files", "homepage": "https://github.com/Matroska-Org/libebml", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a3a44f2f8213ae..ce1092dde1a56c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1925,8 +1925,8 @@ "port-version": 2 }, "ebml": { - "baseline": "1.4.0", - "port-version": 1 + "baseline": "1.4.2", + "port-version": 0 }, "ecm": { "baseline": "5.84.0", diff --git a/versions/e-/ebml.json b/versions/e-/ebml.json index 9a4a7e43abc607..3d935cba33adb8 100644 --- a/versions/e-/ebml.json +++ b/versions/e-/ebml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba8376ad269930aee17a0890ccbd267639122616", + "version": "1.4.2", + "port-version": 0 + }, { "git-tree": "92e5e7a92a8bd6a496911ea44a032088e776471f", "version-string": "1.4.0", From 5e9acb7af51707727e3c1d0a93551f7c62a7d035 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:14:20 +0200 Subject: [PATCH 0741/1858] [cppzmq] Update to 4.8.1 (#20490) * Update cppzmq to 4.8.1 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/cppzmq/portfile.cmake | 17 ++++++++--------- ports/cppzmq/vcpkg.json | 11 +++++++++-- versions/baseline.json | 4 ++-- versions/c-/cppzmq.json | 5 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ports/cppzmq/portfile.cmake b/ports/cppzmq/portfile.cmake index aa968e8a3fc9e2..a4642d308035c4 100644 --- a/ports/cppzmq/portfile.cmake +++ b/ports/cppzmq/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zeromq/cppzmq - REF 76bf169fd67b8e99c1b0e6490029d9cd5ef97666 # v4.7.1 - SHA512 03d7444b36937521e2826c7dd2f6cf55d820d0e4d66c30e3947527e13ba2d7cd68f426b5bfedb5a0d0deb4245893a872d5132b68ef966063d72fcd95e42e3eed + REF v4.8.1 + SHA512 02F9B77F67DD46557705511195EB3F4F4E52381256BC9687F36D3E69DB6A628C19CFFF02209B6E6B53822A60781AB0850EB064D8F020E059FC1ACA4D191B66DB HEAD_REF master ) @@ -11,18 +11,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS draft ENABLE_DRAFTS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DCPPZMQ_BUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cppzmq) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/cppzmq) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/${PORT}/libzmq-pkg-config) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/share/${PORT}/libzmq-pkg-config") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppzmq/vcpkg.json b/ports/cppzmq/vcpkg.json index db7ce81fbe8e1f..0fe1d26b36163a 100644 --- a/ports/cppzmq/vcpkg.json +++ b/ports/cppzmq/vcpkg.json @@ -1,10 +1,17 @@ { "name": "cppzmq", - "version": "4.7.1", - "port-version": 2, + "version": "4.8.1", "description": "lightweight messaging kernel, C++ bindings", "homepage": "https://github.com/zeromq/cppzmq", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zeromq" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index ce1092dde1a56c..54f5bacd61351c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1573,8 +1573,8 @@ "port-version": 0 }, "cppzmq": { - "baseline": "4.7.1", - "port-version": 2 + "baseline": "4.8.1", + "port-version": 0 }, "cpr": { "baseline": "1.6.2", diff --git a/versions/c-/cppzmq.json b/versions/c-/cppzmq.json index bbf86ebf20665f..36d750c936d207 100644 --- a/versions/c-/cppzmq.json +++ b/versions/c-/cppzmq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79921528ad838f11245ebfb6b3f2fe9dc4bdca26", + "version": "4.8.1", + "port-version": 0 + }, { "git-tree": "142701d624e76cc4288ddce74c796501ba8cfa57", "version": "4.7.1", From 8f8dee1a61d76ed4df598f2f751c59f53c387512 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:15:09 +0200 Subject: [PATCH 0742/1858] [edlib] Update to 1.2.7 (#20489) * Update edlib to 1.2.7 * Update CI baseline * Remove obsolete patch file * Update git-tree hash Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/edlib/fix-cmake-install.patch | 64 ----------------------------- ports/edlib/portfile.cmake | 21 ++++------ ports/edlib/vcpkg.json | 15 +++++-- versions/baseline.json | 4 +- versions/e-/edlib.json | 5 +++ 5 files changed, 27 insertions(+), 82 deletions(-) delete mode 100644 ports/edlib/fix-cmake-install.patch diff --git a/ports/edlib/fix-cmake-install.patch b/ports/edlib/fix-cmake-install.patch deleted file mode 100644 index 8081bba782c661..00000000000000 --- a/ports/edlib/fix-cmake-install.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 767d808..21f0cfc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -74,14 +74,42 @@ if (NOT WIN32) # If on windows, do not build binaries that do not support window - target_link_libraries(edlib-aligner edlib) - endif() - -- --# Create target 'install' for installing libraries. --install(TARGETS edlib DESTINATION ${CMAKE_INSTALL_LIBDIR}) --install(FILES edlib/include/edlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -- - # configure and install pkg-config file - configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/edlib.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/edlib-1.pc - @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/edlib-1.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -+ -+### Additional config for VCPKG -+include(CMakePackageConfigHelpers) -+set(EDLIB_CMAKE_DIR "lib/cmake/edlib" CACHE STRING -+ "Installation directory for cmake files, relative to ${CMAKE_INSTALL_PREFIX}.") -+set(version_config "${PROJECT_BINARY_DIR}/edlib-config-version.cmake") -+set(project_config "${PROJECT_BINARY_DIR}/edlib-config.cmake") -+set(targets_export_name edlib-targets) -+ -+# Generate the version, config and target files into the build directory. -+write_basic_package_version_file( -+ ${version_config} -+ VERSION ${VERSION} -+ COMPATIBILITY AnyNewerVersion) -+configure_package_config_file( -+ ${PROJECT_SOURCE_DIR}/edlib-config.cmake.in -+ ${project_config} -+ INSTALL_DESTINATION ${EDLIB_CMAKE_DIR}) -+export(TARGETS edlib NAMESPACE edlib:: -+ FILE ${PROJECT_BINARY_DIR}/${targets_export_name}.cmake) -+ -+# Install version, config and target files. -+install( -+ FILES ${project_config} ${version_config} -+ DESTINATION ${EDLIB_CMAKE_DIR}) -+install(EXPORT ${targets_export_name} DESTINATION ${EDLIB_CMAKE_DIR} -+ NAMESPACE edlib::) -+ -+### // -+ -+# Create target 'install' for installing libraries. -+install(TARGETS edlib EXPORT ${targets_export_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+install(FILES edlib/include/edlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -\ No newline at end of file -diff --git a/edlib-config.cmake.in b/edlib-config.cmake.in -new file mode 100644 -index 0000000..f2cc030 ---- /dev/null -+++ b/edlib-config.cmake.in -@@ -0,0 +1,4 @@ -+@PACKAGE_INIT@ -+ -+include(${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake) -+check_required_components(edlib) -\ No newline at end of file diff --git a/ports/edlib/portfile.cmake b/ports/edlib/portfile.cmake index 788320015ec262..96fdcc3bab6b49 100644 --- a/ports/edlib/portfile.cmake +++ b/ports/edlib/portfile.cmake @@ -1,24 +1,19 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Martinsos/edlib - REF v1.2.6 - SHA512 75b470c1403113e5f0895b3c1bb4163e65c6e04ccf41a75297a5b4cc915a567567ebcc79f3b9ea74b5e7188adfab2eceda5ac75e2d861aef8b3fefc6d4f39200 + REF v1.2.7 + SHA512 720C732C76D0D9ABE28ADCE9972B355864571A2E6CBD2C72C3B4A92E045A99E3A688153865586F7E8B6C90433E2EB1BB024AD0A6E9D4EB4B4D401A160D3F13CE HEAD_REF master - PATCHES - fix-cmake-install.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/edlib) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/edlib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/edlib/vcpkg.json b/ports/edlib/vcpkg.json index 1676dd9339786c..4ac50b3bf21de2 100644 --- a/ports/edlib/vcpkg.json +++ b/ports/edlib/vcpkg.json @@ -1,7 +1,16 @@ { "name": "edlib", - "version-string": "1.2.6", - "port-version": 1, + "version": "1.2.7", "description": "Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance.", - "homepage": "https://github.com/Martinsos/edlib" + "homepage": "https://github.com/Martinsos/edlib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 54f5bacd61351c..9c822f790cb809 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1941,8 +1941,8 @@ "port-version": 1 }, "edlib": { - "baseline": "1.2.6", - "port-version": 1 + "baseline": "1.2.7", + "port-version": 0 }, "effects11": { "baseline": "11.26", diff --git a/versions/e-/edlib.json b/versions/e-/edlib.json index 4c87106f1854af..3ba91696c5020e 100644 --- a/versions/e-/edlib.json +++ b/versions/e-/edlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bbcb572fded319dcbb790d57132513c35be4a9fa", + "version": "1.2.7", + "port-version": 0 + }, { "git-tree": "f1c507cb59e800c53256b3722b862df4ff41dbd6", "version-string": "1.2.6", From e6ddd066404c09394722a6141311008c0210303b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:16:05 +0200 Subject: [PATCH 0743/1858] [date] Update to 3.0.1 (#20481) * Update date to 3.0.1 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/date/0002-fix-cmake-3.14.patch | 8 +++---- ports/date/0003-find-dependency-pthread.patch | 15 ------------ ports/date/portfile.cmake | 23 +++++++++---------- ports/date/vcpkg.json | 13 +++++++++-- versions/baseline.json | 4 ++-- versions/d-/date.json | 5 ++++ 6 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 ports/date/0003-find-dependency-pthread.patch diff --git a/ports/date/0002-fix-cmake-3.14.patch b/ports/date/0002-fix-cmake-3.14.patch index 9d117231ca3503..4fece8fa81d92d 100644 --- a/ports/date/0002-fix-cmake-3.14.patch +++ b/ports/date/0002-fix-cmake-3.14.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ad74900..42d55af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,7 +72,7 @@ target_sources( date INTERFACE +@@ -73,7 +73,7 @@ target_sources( date INTERFACE $ $ ) @@ -11,15 +11,15 @@ index ad74900..42d55af 100644 # public headers will get installed: set_target_properties( date PROPERTIES PUBLIC_HEADER include/date/date.h ) endif () -@@ -115,7 +115,6 @@ if( BUILD_TZ_LIB ) +@@ -144,7 +144,6 @@ if( BUILD_TZ_LIB ) endif( ) set_target_properties( date-tz PROPERTIES POSITION_INDEPENDENT_CODE ON - PUBLIC_HEADER "${TZ_HEADERS}" VERSION "${PROJECT_VERSION}" - SOVERSION "${PROJECT_VERSION}" ) + SOVERSION "${ABI_VERSION}" ) if( NOT MSVC ) -@@ -140,8 +139,8 @@ write_basic_package_version_file( "${version_config}" +@@ -169,8 +169,8 @@ write_basic_package_version_file( "${version_config}" COMPATIBILITY SameMajorVersion ) install( TARGETS date diff --git a/ports/date/0003-find-dependency-pthread.patch b/ports/date/0003-find-dependency-pthread.patch deleted file mode 100644 index 72c6c765a15b54..00000000000000 --- a/ports/date/0003-find-dependency-pthread.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/dateConfig.cmake b/cmake/dateConfig.cmake -index 20f86e8..2198ad1 100644 ---- a/cmake/dateConfig.cmake -+++ b/cmake/dateConfig.cmake -@@ -1,8 +1,8 @@ - include( CMakeFindDependencyMacro ) - include( "${CMAKE_CURRENT_LIST_DIR}/dateTargets.cmake" ) --if( NOT MSVC AND TARGET date::tz ) -+if( NOT MSVC AND TARGET date::date-tz ) - find_dependency( Threads REQUIRED) -- get_target_property( _tzill date::tz INTERFACE_LINK_LIBRARIES ) -+ get_target_property( _tzill date::date-tz INTERFACE_LINK_LIBRARIES ) - if( _tzill AND "${_tzill}" MATCHES "libcurl" ) - find_dependency( CURL ) - endif( ) diff --git a/ports/date/portfile.cmake b/ports/date/portfile.cmake index 215f1ef2a24d9b..b06d29f923ba4d 100644 --- a/ports/date/portfile.cmake +++ b/ports/date/portfile.cmake @@ -8,37 +8,36 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HowardHinnant/date - REF cac99da8dc88be719a728dc1b597b0ac307c1800 #3.0.0 - SHA512 07bac40c9d92ed92f05ab71b07c203fc341cd35999f1eab16d584bf77ff69e2cdc106931b2faf0dcfc5a311ee55e8445a81fd97c62f4672957b6aac1b24a08fd + REF v3.0.1 + SHA512 6BDC7CBA821D66E17A559250CC0CE0095808E9DB81CEC9E16EAA4C31ABDFA705299C67B72016D9B06B302BC306D063E83A374EB00728071B83A5AD650D59034F HEAD_REF master PATCHES 0001-fix-uwp.patch 0002-fix-cmake-3.14.patch - 0003-find-dependency-pthread.patch ) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES remote-api USE_SYSTEM_TZ_DB ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} + ${FEATURE_OPTIONS} -DBUILD_TZ_LIB=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake TARGET_PATH share/date) + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/date TARGET_PATH share/date) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/date) endif() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/date RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/date/vcpkg.json b/ports/date/vcpkg.json index cbca5d9b0495c8..46e059b5e8a0b3 100644 --- a/ports/date/vcpkg.json +++ b/ports/date/vcpkg.json @@ -1,9 +1,18 @@ { "name": "date", - "version-string": "3.0.0", - "port-version": 3, + "version": "3.0.1", "description": "A date and time library based on the C++17 header", "homepage": "https://github.com/HowardHinnant/date", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "remote-api": { "description": "support automatic download of tz data", diff --git a/versions/baseline.json b/versions/baseline.json index 9c822f790cb809..3adb9d9bd6907c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1717,8 +1717,8 @@ "port-version": 1 }, "date": { - "baseline": "3.0.0", - "port-version": 3 + "baseline": "3.0.1", + "port-version": 0 }, "dav1d": { "baseline": "0.8.2", diff --git a/versions/d-/date.json b/versions/d-/date.json index 05e4bbc9c2415c..c5d967f1b70046 100644 --- a/versions/d-/date.json +++ b/versions/d-/date.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d9a771765181237930138b7c4809babbd814cfb", + "version": "3.0.1", + "port-version": 0 + }, { "git-tree": "6dc2054fe09235f06cd75f4acaf570145672a86a", "version-string": "3.0.0", From e796f09442a4ed601f4dd102a64f193b3d8e5c7c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:16:42 +0200 Subject: [PATCH 0744/1858] [uwebsockets] Update to 20.5.0 (#20513) * Update uwebsockets to 20.5.0 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/uwebsockets/portfile.cmake | 5 ++--- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index 5b479c18e248d8..da004d02aea3a6 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF v19.9.0 - SHA512 A79C454AC37B279220C8B158434FD794512EECDE882C0FE3DC7047275B2FDF31E50B319A4D01B983C2C4EBCF3E1FD383D2D9AB977185326E6AE5B47685C0A048 + REF v20.5.0 + SHA512 B2AA6528DCF252DFFBEE99A7D9263037444ADE2EA473EC45C54EBCC39F3E795CB9E26D54147D72745576F09A3663AFA7EA46955133FA60BC4942EACEF4468DFE HEAD_REF master ) @@ -10,4 +10,3 @@ file(COPY "${SOURCE_PATH}/src" DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(RENAME "${CURRENT_PACKAGES_DIR}/include/src" "${CURRENT_PACKAGES_DIR}/include/uwebsockets") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index ef83022c5de792..b09ad89386ce2f 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version": "19.9.0", + "version-semver": "20.5.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 3adb9d9bd6907c..87fe6524e50b4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6877,7 +6877,7 @@ "port-version": 1 }, "uwebsockets": { - "baseline": "19.9.0", + "baseline": "20.5.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 52dbfa79ac1a9e..1df6a47ae25917 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e66651f28bc4bcd5edb5360e96f42ad666076d6b", + "version-semver": "20.5.0", + "port-version": 0 + }, { "git-tree": "3a4914dce094328bc8cf2040025268c96f10fc30", "version": "19.9.0", From b3e046cddd8dcb5dd72b2d35a52d433aed7fd085 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Oct 2021 01:22:00 +0200 Subject: [PATCH 0745/1858] [libspatialite] Revise portfile and update to 5.0.1 (#20445) * Modernize portfile * Update indentation * Update to 5.0.1 * Don't enable legacy PROJ API on Windows * Fix copyright * Update versions Co-authored-by: Billy Robert O'Neal III --- ports/libspatialite/portfile.cmake | 224 +++++++++++++++-------------- ports/libspatialite/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/l-/libspatialite.json | 5 + 4 files changed, 125 insertions(+), 111 deletions(-) diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 5d73679bedc8ce..0865dda66de08d 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -1,128 +1,138 @@ -set(LIBSPATIALITE_VERSION_STR "5.0.0") +set(LIBSPATIALITE_VERSION_STR "5.0.1") vcpkg_download_distfile(ARCHIVE - URLS "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" + URLS "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" FILENAME "libspatialite-${LIBSPATIALITE_VERSION_STR}.tar.gz" - SHA512 df72a3434d6e49f8836a9de2340f343a53f0673d0d17693cdb0f4971928b7c8bf40df44b21c0861945a9c81058e939acd1714b0b426ce9aa2ff7b0e8e6b196a7 + SHA512 c2552994bc30d69d1e80aa274760f048cd384f71e8350a1e48a47cb8222ba71a1554a69c6534eedde9a09dc582c39c089967bcc1c57bf158cc91a3e7b1840ddf ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES fix-makefiles.patch fix-linux-configure.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_CRT_LINKAGE STREQUAL dynamic) - set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib") - set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib") - set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib") - set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") - set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") - else() - set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib") - set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib") - set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") - set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") - set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") - endif() +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") + set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib") + set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib") + set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib") + set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") + set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") + else() + set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib") + set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib") + set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") + set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") + set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") + set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") + endif() - set(LIBS_ALL_DBG - "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ - ${LIBXML2_LIBS_DBG} \ - ${GEOS_LIBS_DBG} \ - ${LIBRTTOPO_LIBS_DBG} \ - ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" - ) - set(LIBS_ALL_REL - "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \ - ${CURRENT_INSTALLED_DIR}/lib/charset.lib \ - ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ - ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \ - ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ - ${LIBXML2_LIBS_REL} \ - ${GEOS_LIBS_REL} \ - ${LIBRTTOPO_LIBS_REL} \ - ${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib" - ) + set(LIBS_ALL_DBG + "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \ + ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ + ${LIBXML2_LIBS_DBG} \ + ${GEOS_LIBS_DBG} \ + ${LIBRTTOPO_LIBS_DBG} \ + ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" + ) + set(LIBS_ALL_REL + "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \ + ${CURRENT_INSTALLED_DIR}/lib/charset.lib \ + ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ + ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \ + ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ + ${LIBXML2_LIBS_REL} \ + ${GEOS_LIBS_REL} \ + ${LIBRTTOPO_LIBS_REL} \ + ${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib" + ) - string(REPLACE "/" "\\\\" INST_DIR ${CURRENT_PACKAGES_DIR}) - list(APPEND OPTIONS_RELEASE - "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_REL}" - ) - list(APPEND OPTIONS_DEBUG - "LINK_FLAGS=/debug" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DBG}" - ) + string(REPLACE "/" "\\\\" INST_DIR "${CURRENT_PACKAGES_DIR}") + list(APPEND OPTIONS_RELEASE + "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_REL}" + ) + list(APPEND OPTIONS_DEBUG + "LINK_FLAGS=/debug" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DBG}" + ) - vcpkg_install_nmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - "CL_FLAGS=/DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" - OPTIONS_RELEASE - ${OPTIONS_RELEASE} - OPTIONS_DEBUG - ${OPTIONS_DEBUG} - ) + vcpkg_install_nmake( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + ) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + vcpkg_copy_pdbs() - if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib) - else() - file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/spatialite.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/lib/spatialite.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib) - endif() -else () # Build in UNIX - if(VCPKG_TARGET_IS_LINUX) - set(STDLIB stdc++) - else() - set(STDLIB c++) - endif() - if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - SET(EXTRALIBS "-lpthread") - endif() - list(APPEND OPTIONS_RELEASE - "LIBXML2_LIBS=-lxml2 -llzma" - "GEOS_LDFLAGS=-lgeos_c -lgeos -l${STDLIB}" - ) - list(APPEND OPTIONS_DEBUG - "LIBXML2_LIBS=-lxml2 -llzmad" - "GEOS_LDFLAGS=-lgeos_cd -lgeosd -l${STDLIB}" - ) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - "LIBS=${EXTRALIBS} -ldl -lm -l${STDLIB}" - "LIBXML2_CFLAGS=-I\"${CURRENT_INSTALLED_DIR}/include\"" - "--enable-rttopo" - "--enable-gcp" - "--enable-geocallbacks" - "--disable-examples" - "--disable-minizip" - OPTIONS_DEBUG - ${OPTIONS_DEBUG} - OPTIONS_RELEASE - ${OPTIONS_RELEASE} - ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib") + else() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") + endif() +else() # Build in UNIX + if(VCPKG_TARGET_IS_LINUX) + set(STDLIB stdc++) + else() + set(STDLIB c++) + endif() + if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) + SET(EXTRALIBS "-lpthread") + endif() + list(APPEND OPTIONS_RELEASE + "LIBXML2_LIBS=-lxml2 -llzma" + "GEOS_LDFLAGS=-lgeos_c -lgeos -l${STDLIB}" + ) + list(APPEND OPTIONS_DEBUG + "LIBXML2_LIBS=-lxml2 -llzmad" + "GEOS_LDFLAGS=-lgeos_cd -lgeosd -l${STDLIB}" + ) - vcpkg_install_make() - vcpkg_fixup_pkgconfig() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + "LIBS=${EXTRALIBS} -ldl -lm -l${STDLIB}" + "LIBXML2_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include" + "--enable-rttopo" + "--enable-gcp" + "--enable-geocallbacks" + "--disable-examples" + "--disable-minizip" + OPTIONS_DEBUG + ${OPTIONS_DEBUG} + OPTIONS_RELEASE + ${OPTIONS_RELEASE} + ) + + # automake adds the basedir of the generated config to `DEFAULT_INCLUDES`, + # but libspatialite uses `#include `. + file(GLOB_RECURSE makefiles + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Makefile" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Makefile" + ) + foreach(makefile IN LISTS makefiles) + vcpkg_replace_string("${makefile}" " -I$(top_builddir)/./src/headers/spatialite" " -I$(top_builddir)/./src/headers") + endforeach() + + vcpkg_install_make() + vcpkg_fixup_pkgconfig() endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +# With rttopo and ground control points enabled, the license is GPLv2+. +file(INSTALL "${SOURCE_PATH}/src/control_points/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index 98c634786d129a..e8fd1d30cf3d3d 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libspatialite", - "version-string": "5.0.0", - "port-version": 3, + "version": "5.0.1", "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 87fe6524e50b4f..f9118e93d8bf77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3793,8 +3793,8 @@ "port-version": 0 }, "libspatialite": { - "baseline": "5.0.0", - "port-version": 3 + "baseline": "5.0.1", + "port-version": 0 }, "libspnav": { "baseline": "0.2.3", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index e415f501fb2fc5..1e8dd8dd84c1ec 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "22ad27813f5f3bc3382718115ce3eb5a45174afd", + "version": "5.0.1", + "port-version": 0 + }, { "git-tree": "d7d124e4fcb212dba3d650817056ce23b6dc2a2f", "version-string": "5.0.0", From aa6913833c8e6c935778a6ad52b732eaa1472431 Mon Sep 17 00:00:00 2001 From: Mathis Date: Wed, 6 Oct 2021 01:23:37 +0200 Subject: [PATCH 0746/1858] [gstreamer, gst-rtsp-server] update and add port (#20474) * update gstreamer, add gst-rtsp-server * format * versions * update description * verison --- ports/gst-rtsp-server/portfile.cmake | 34 ++++++++++++++++++++++++++++ ports/gst-rtsp-server/vcpkg.json | 8 +++++++ ports/gstreamer/portfile.cmake | 27 +++++++++++----------- ports/gstreamer/vcpkg.json | 2 +- versions/baseline.json | 6 ++++- versions/g-/gst-rtsp-server.json | 9 ++++++++ versions/g-/gstreamer.json | 5 ++++ 7 files changed, 76 insertions(+), 15 deletions(-) create mode 100644 ports/gst-rtsp-server/portfile.cmake create mode 100644 ports/gst-rtsp-server/vcpkg.json create mode 100644 versions/g-/gst-rtsp-server.json diff --git a/ports/gst-rtsp-server/portfile.cmake b/ports/gst-rtsp-server/portfile.cmake new file mode 100644 index 00000000000000..d184c1affc5d1d --- /dev/null +++ b/ports/gst-rtsp-server/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.freedesktop.org + OUT_SOURCE_PATH SOURCE_PATH + REPO gstreamer/gst-rtsp-server + REF 1.19.2 + SHA512 a227471c790ea4f399748233128558cbd43e941ad9774b99ecd88c1b521a0adfe2932212e7d854f041892a7c3bfc63a1b3ea9dd06d2f0b75b7eee38e392d8c51 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -Dgstreamer:examples=disabled + -Dgstreamer:tests=disabled + -Dpackage-origin="vcpkg" +) + +vcpkg_install_meson() + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(GLOB DBG_BINS ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.dll + ${CURRENT_PACKAGES_DIR}/debug/lib/gstreamer-1.0/*.pdb + ) + file(COPY ${DBG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB REL_BINS ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.dll + ${CURRENT_PACKAGES_DIR}/lib/gstreamer-1.0/*.pdb + ) + file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE ${DBG_BINS} ${REL_BINS}) +endif() + +vcpkg_fixup_pkgconfig() + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gst-rtsp-server/vcpkg.json b/ports/gst-rtsp-server/vcpkg.json new file mode 100644 index 00000000000000..f9f495c64b760e --- /dev/null +++ b/ports/gst-rtsp-server/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "gst-rtsp-server", + "version": "1.19.2", + "description": "gst-rtsp-server is a library on top of GStreamer for building an RTSP server", + "dependencies": [ + "gstreamer" + ] +} diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index add14ef7ddb88f..3aecf5c297ccee 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -3,15 +3,15 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp" "emscripten" "wasm32" "and vcpkg_from_github( OUT_SOURCE_PATH GST_BUILD_SOURCE_PATH REPO gstreamer/gst-build - REF 1.18.4 - SHA512 9b3927ba1a2ba1e384f2141c454978f582087795a70246709ed60875bc983a42eef54f3db7617941b8dacc20c434f81ef9931834861767d7a4dc09d42beeb900 + REF 1.19.2 + SHA512 d6b8e9fc195a60dfb83fe8a49040c21ca5603e3ada2036d56851e6e61a1cd2653ad45f33e39388bde859dfb4806f4a60d9dbfac5fe41b6d2a8b395c44d4525e3 HEAD_REF master ) vcpkg_from_github( OUT_SOURCE_PATH GST_SOURCE_PATH REPO gstreamer/gstreamer - REF 1.18.4 - SHA512 684a7ce93143a0c3e0ce627ab2bf1451d49735b4bab273f308bc3b48d8312f7c13c0afa7e71f3a3a7274b90373215636dd8ff0076f143cbe26061de0c4efa102 + REF 1.19.2 + SHA512 6070f1febf2a1bcc6e68f1e03c1b76891db210773065696e26fac20f0bd3ff47e1634222a49f93a10f6e47717ff21084c9ae0feed6a20facb9650aeb879cc380 HEAD_REF master ) if(VCPKG_TARGET_IS_WINDOWS) @@ -21,31 +21,31 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_BASE_SOURCE_PATH REPO gstreamer/gst-plugins-base - REF 1.18.4 - SHA512 b89924e90f880195740421f2eec3f2a667b96f6ca92ccaf87da246e9c9fd13646bf6235376844c012414a79d38dfaea8f10d56ffec900fe0b9cb8f19e722f05e + REF 1.19.2 + SHA512 d2005e6a3bda5f08395b131347e8f4054c2469e04e65d1acc1a1572bf10d81d4dad4e43d6a8600346b6175a2310f81157a0cd27398ef69b5363b16346febfb39 HEAD_REF master PATCHES ${PLUGIN_BASE_PATCHES} ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_GOOD_SOURCE_PATH REPO gstreamer/gst-plugins-good - REF 1.18.4 - SHA512 d97f4b76b6fc089b7675a9b10cabf4c704d71d663a23f34133a2671761d98e931aa87df7158f663cd9ebb6a8febd9ab1833aef7eb8be2ef2b54fad288bd0ae66 + REF 1.19.2 + SHA512 71e9f36d407db3b75d9a68f6447093aa011b2b586b06e0a1bb79c7db37c9114de505699e99a4dad06d8d9c742e91f48dd35457283babe440f88a9e40d3da465b HEAD_REF master PATCHES ${PLUGIN_GOOD_PATCHES} ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_BAD_SOURCE_PATH REPO gstreamer/gst-plugins-bad - REF 1.18.4 - SHA512 0bf5344fbef883dbe0908495c9a50cd3bf915c5d328cf2768532ff077a9aa4255747f417a310c16c3ea86fcb79ac6ba4bf37375ff84776985451ab47b9d9ac6e + REF 1.19.2 + SHA512 f63ca3abf380bba92dca4ac3a51cba5ea95093693cf64d167a7a9c0bf6341c35a74fd42332673dbd1581ea70da0a35026aa3e2ce99b5e573268ccb55b5491c1d HEAD_REF master ) vcpkg_from_github( OUT_SOURCE_PATH GST_PLUGIN_UGLY_SOURCE_PATH REPO gstreamer/gst-plugins-ugly - REF 1.18.4 - SHA512 01413155d21f654a90bcf7235b5605c244d3700632ae6c56cafbbabfb11192a09c2ab01c4662ab452eabb004b09c9ec2efa72024db8be5863054d25569034a03 + REF 1.19.2 + SHA512 70dcd4a36d3bd35f680eaa3c980842fbb57f55f17d1453c6a95640709b1b33a263689bf54caa367154267d281e5474686fedaa980de24094de91886a57b6547a HEAD_REF master ) vcpkg_from_gitlab( @@ -259,4 +259,5 @@ if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") ) file(COPY ${REL_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE ${DBG_BINS} ${REL_BINS}) -endif() \ No newline at end of file +endif() +vcpkg_fixup_pkgconfig() diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index b1207ae3748e0d..7d3c171cb12fbc 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gstreamer", - "version": "1.18.4", + "version": "1.19.2", "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index f9118e93d8bf77..6fba45209bc4b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2544,8 +2544,12 @@ "baseline": "2.8.112", "port-version": 0 }, + "gst-rtsp-server": { + "baseline": "1.19.2", + "port-version": 0 + }, "gstreamer": { - "baseline": "1.18.4", + "baseline": "1.19.2", "port-version": 0 }, "gtest": { diff --git a/versions/g-/gst-rtsp-server.json b/versions/g-/gst-rtsp-server.json new file mode 100644 index 00000000000000..e16a6ef93b8b40 --- /dev/null +++ b/versions/g-/gst-rtsp-server.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "0c628b2e09422aa3c82fc3d06757cdef559e9ce4", + "version": "1.19.2", + "port-version": 0 + } + ] +} diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index e38c1dcec04d42..d936260486d824 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "25482bf1d9dd85257c13e394b45745f77a29bf51", + "version": "1.19.2", + "port-version": 0 + }, { "git-tree": "308df77361916f76938e3a022feab2520e2ce2a3", "version": "1.18.4", From e376cb3d813f8b1c980dbd7b5a0c2ee81012fefd Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 5 Oct 2021 19:34:40 -0400 Subject: [PATCH 0747/1858] [crc32c] update to latest release (1.1.2) (#20534) * [crc32c] update to latest release (1.1.2) * Use version rather than version-string. Co-authored-by: Billy Robert O'Neal III --- ports/crc32c/portfile.cmake | 11 +++++------ ports/crc32c/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/c-/crc32c.json | 5 +++++ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ports/crc32c/portfile.cmake b/ports/crc32c/portfile.cmake index ccd8ca47b00ac6..63a61302858da7 100644 --- a/ports/crc32c/portfile.cmake +++ b/ports/crc32c/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/crc32c - REF ba741856254e3c6f6c7bcf0704fe1344a668a227 # 1.1.1 - SHA512 129e7cf36a92f6d953b4545e673860b0d956aa0ecf89ae98dfcfdff03031482d03f9036d11d0546446f1e73f65548cdd87065759dc6efd39f0fd9c58234ebb24 + REF 1.1.2 + SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCRC32C_BUILD_TESTS=OFF -DCRC32C_BUILD_BENCHMARKS=OFF -DCRC32C_USE_GLOG=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Crc32c) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Crc32c) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/crc32c/vcpkg.json b/ports/crc32c/vcpkg.json index b8bd8e5b9ec348..ac03f93e31b5a2 100644 --- a/ports/crc32c/vcpkg.json +++ b/ports/crc32c/vcpkg.json @@ -1,7 +1,16 @@ { "name": "crc32c", - "version-string": "1.1.1", - "port-version": 1, + "version": "1.1.2", "description": "CRC32C implementation with support for CPU-specific acceleration instructions.", - "homepage": "https://github.com/google/crc32c" + "homepage": "https://github.com/google/crc32c", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6fba45209bc4b9..d144a49eebd1e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1605,8 +1605,8 @@ "port-version": 1 }, "crc32c": { - "baseline": "1.1.1", - "port-version": 1 + "baseline": "1.1.2", + "port-version": 0 }, "crfsuite": { "baseline": "2019-07-21", diff --git a/versions/c-/crc32c.json b/versions/c-/crc32c.json index 7d5b91efaa05b9..3b1f56ad4586f4 100644 --- a/versions/c-/crc32c.json +++ b/versions/c-/crc32c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dcfaa85ef9b67b94cf51378922832fff7cf43333", + "version": "1.1.2", + "port-version": 0 + }, { "git-tree": "c170749f5731ca44674e241167fa0955a461256a", "version-string": "1.1.1", From 782b7a4aa1775c12241fcfb1ce4022a04c9a2b3f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 01:36:01 +0200 Subject: [PATCH 0748/1858] [usockets] Update to 0.8.1 (#20517) * Update usockets to 0.8.1 * Update CI baseline * Minor tweaks * Update git-tree hash Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/usockets/CMakeLists.txt | 3 +-- ports/usockets/portfile.cmake | 41 ++++++++++++++++++----------------- ports/usockets/vcpkg.json | 12 ++++++++-- versions/baseline.json | 2 +- versions/u-/usockets.json | 5 +++++ 5 files changed, 38 insertions(+), 25 deletions(-) diff --git a/ports/usockets/CMakeLists.txt b/ports/usockets/CMakeLists.txt index a57ce6b08a626e..69a742db13307c 100644 --- a/ports/usockets/CMakeLists.txt +++ b/ports/usockets/CMakeLists.txt @@ -3,7 +3,6 @@ project(uSockets C CXX) option(INSTALL_HEADERS "Install header files" ON) -# To enable this feature, OpenSSL 1.1+ is required and is currently disabled due to issue 4267 if (CMAKE_USE_OPENSSL) find_package(OpenSSL REQUIRED) set(USE_OPENSSL "-DUSE_OPENSSL -DLIBUS_USE_OPENSSL") @@ -24,7 +23,7 @@ set(USOCKETS_EXT_INCLUDE_DIR ) set(USOCKETS_EXT_LIBS ) if (CMAKE_USE_OPENSSL) - # It requires C++17 or later, see https://github.com/uNetworking/uSockets/blob/master/Makefile#L43 + # It requires C++17 or later, see https://github.com/uNetworking/uSockets/blob/0ebdde0601cc82349fc11a7c4bbb6dc5c9f28f42/Makefile#L55 set(CMAKE_CXX_STANDARD 17) find_package(OpenSSL REQUIRED) file(GLOB SSL_SOURCES src/crypto/*.c*) diff --git a/ports/usockets/portfile.cmake b/ports/usockets/portfile.cmake index cdb75c5d3d8f6d..867a4e7a9b74b3 100644 --- a/ports/usockets/portfile.cmake +++ b/ports/usockets/portfile.cmake @@ -1,38 +1,39 @@ -IF (NOT VCPKG_TARGET_IS_LINUX) +if(NOT VCPKG_TARGET_IS_LINUX) set(USE_LIBUV ON) -EndIF () +endif() + +if ("network" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature 'network' is only supported on Windows") +endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uSockets - REF 5440dbac79bd76444175b76ee95dfcade12a6aac # 0.7.1 - SHA512 d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11 + REF v0.8.1 + SHA512 B3AD6387E20731831A3A6086D7DE320CCD8F720FAD3237B65EE165236E3F30CBEC3E3B1384BF53BF0F274D7E57665DE79E3244F841455D2ADAFBF954B453437F HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -if ("network" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature network only support Windows") -endif() - vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - ssl CMAKE_USE_OPENSSL - event CMAKE_USE_EVENT - network CMAKE_USE_NETWORK + FEATURES + ssl CMAKE_USE_OPENSSL + event CMAKE_USE_EVENT + network CMAKE_USE_NETWORK ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} - -DLIBUS_USE_LIBUV=${USE_LIBUV} +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + "-DLIBUS_USE_LIBUV=${USE_LIBUV}" OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/usockets/vcpkg.json b/ports/usockets/vcpkg.json index 49a66360296cdd..9300c6e9467790 100644 --- a/ports/usockets/vcpkg.json +++ b/ports/usockets/vcpkg.json @@ -1,10 +1,18 @@ { "name": "usockets", - "version": "0.7.1", + "version": "0.8.1", "description": "Miniscule cross-platform eventing, networking & crypto for async applications", "homepage": "https://github.com/uNetworking/uSockets", "dependencies": [ - "libuv" + "libuv", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "event": { diff --git a/versions/baseline.json b/versions/baseline.json index d144a49eebd1e1..cdbb9f26c26f08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6841,7 +6841,7 @@ "port-version": 1 }, "usockets": { - "baseline": "0.7.1", + "baseline": "0.8.1", "port-version": 0 }, "usrsctp": { diff --git a/versions/u-/usockets.json b/versions/u-/usockets.json index f610eb9bc03f84..efac4caed8cbef 100644 --- a/versions/u-/usockets.json +++ b/versions/u-/usockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de62ce303388342f83a490f69bdb92ec41ecc0f2", + "version": "0.8.1", + "port-version": 0 + }, { "git-tree": "ec6a7f57141a0df8d899f38374682a87f381d1ed", "version": "0.7.1", From 8707f889708e612846fa9e7ae90fff4b7a85f7bf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Oct 2021 03:39:42 +0200 Subject: [PATCH 0749/1858] [geos] Install pc file also for Windows (#20502) * Install pc file for msvc * Fix warning about unused cmake variable * Update version Co-authored-by: Billy Robert O'Neal III --- ports/geos/pc-file-for-msvc.patch | 15 +++++++++++++++ ports/geos/portfile.cmake | 4 +++- ports/geos/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/geos.json | 5 +++++ 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 ports/geos/pc-file-for-msvc.patch diff --git a/ports/geos/pc-file-for-msvc.patch b/ports/geos/pc-file-for-msvc.patch new file mode 100644 index 00000000000000..ad79be0720f9f7 --- /dev/null +++ b/ports/geos/pc-file-for-msvc.patch @@ -0,0 +1,15 @@ +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index d9267e8..26713f9 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -36,6 +36,10 @@ if(NOT MSVC) + OWNER_READ OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE) ++else() ++ set(cxx_libs "") ++endif() ++if(1) + + # pkg-config support + configure_file( diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index 017db495338b5a..fe8f8b0a582b74 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex( dont-build-docs.patch dont-build-astyle.patch pc-file-libs-private.patch + pc-file-for-msvc.patch make-geos-config-relocatable.patch fix-static-deps.patch ) @@ -29,10 +30,11 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DCMAKE_DEBUG_POSTFIX=d -DBUILD_TESTING=OFF -DBUILD_BENCHMARKS=OFF ${_CMAKE_EXTRA_OPTIONS} + OPTIONS_DEBUG + -DCMAKE_DEBUG_POSTFIX=d # Legacy decision, hard coded in depending ports ) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/GEOS) diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index 0df73d3c4906bd..851c5dcdc38e62 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,7 +1,7 @@ { "name": "geos", "version": "3.9.1", - "port-version": 2, + "port-version": 3, "description": "Geometry Engine Open Source", "homepage": "https://www.osgeo.org/projects/geos/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index cdbb9f26c26f08..ccfde840cc7108 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2354,7 +2354,7 @@ }, "geos": { "baseline": "3.9.1", - "port-version": 2 + "port-version": 3 }, "geotrans": { "baseline": "3.8", diff --git a/versions/g-/geos.json b/versions/g-/geos.json index dbe7c058acec69..0f7002ddbb0671 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a0a3db2edc588598505038b452c9c7c91c1be6e", + "version": "3.9.1", + "port-version": 3 + }, { "git-tree": "149daa68785ac3796019e4489a6d966fb8cc4cc5", "version": "3.9.1", From aaf9a91e4e7223b228d1e7ccb34c28b416782f3c Mon Sep 17 00:00:00 2001 From: Alvin Date: Wed, 6 Oct 2021 09:42:39 +0800 Subject: [PATCH 0750/1858] update co to v2.0.2 (#20500) * update co to v2.0.2 * fix gitree in co.json * add install-dll.patch for co * update version * fix CRT linkage * update version * minimal patch * update version --- ports/co/install-dll.patch | 10 ++++++++++ ports/co/portfile.cmake | 16 ++++++++++------ ports/co/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/co.json | 5 +++++ 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 ports/co/install-dll.patch diff --git a/ports/co/install-dll.patch b/ports/co/install-dll.patch new file mode 100644 index 00000000000000..9332f3296762e1 --- /dev/null +++ b/ports/co/install-dll.patch @@ -0,0 +1,10 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9e03c9a..499b550 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -112,4 +112,5 @@ install( + TARGETS co + LIBRARY DESTINATION lib # shared lib installed to ${CMAKE_INSTALL_PREFIX}/lib + ARCHIVE DESTINATION lib # static lib installed to ${CMAKE_INSTALL_PREFIX}/lib ++ RUNTIME DESTINATION bin + ) diff --git a/ports/co/portfile.cmake b/ports/co/portfile.cmake index a4b4a08d5799d9..08ed5d4a347cf2 100644 --- a/ports/co/portfile.cmake +++ b/ports/co/portfile.cmake @@ -2,17 +2,18 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_fail_port_install(ON_ARCH "arm" ON_TAREGT "uwp") endif() -# It's not safe to use dynamic library, as we hooked some system APIs in CO. -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO idealvin/co - REF 82b9f75dcd114c69d2b9c2c5a13ce2c3b95ba99f #v2.0.1 - SHA512 ec33c5b920adf8b5e5500ed7c9768bd595ba2b568b604f26f953ddb5d04e411e8a2ea05b213595a44cafbadf90c1e1661208855301b2b47295ccc6e20f36e8d8 + REF 25915760f5cbcde1c5af625dd4d19a632ae43f12 #v2.0.2 + SHA512 892d70923409306ab548cf4568f15ffd13949047a5a7810c68d60c1afd184eafd2076f62eb6249ae64b38c409255cb873fa28740ceab37b908b70174ddf6d077 HEAD_REF master + PATCHES + install-dll.patch ) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) + vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES libcurl WITH_LIBCURL @@ -21,7 +22,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + -DSTATIC_VS_CRT=${STATIC_CRT} + DISABLE_PARALLEL_CONFIGURE ) vcpkg_cmake_install() diff --git a/ports/co/vcpkg.json b/ports/co/vcpkg.json index 70adff17214b58..1fcc2b0dce38cb 100644 --- a/ports/co/vcpkg.json +++ b/ports/co/vcpkg.json @@ -1,6 +1,6 @@ { "name": "co", - "version-semver": "2.0.1", + "version-semver": "2.0.2", "description": "A go-style coroutine library in C++11 and more", "homepage": "https://github.com/idealvin/co", "supports": "!uwp & !(arm & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index ccfde840cc7108..8cb7de32c881ae 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1417,7 +1417,7 @@ "port-version": 1 }, "co": { - "baseline": "2.0.1", + "baseline": "2.0.2", "port-version": 0 }, "coin": { diff --git a/versions/c-/co.json b/versions/c-/co.json index 165d9e3ff01d92..889b6bb11beefb 100644 --- a/versions/c-/co.json +++ b/versions/c-/co.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b21d0aa5397dedda9219671af687afacab91a6c", + "version-semver": "2.0.2", + "port-version": 0 + }, { "git-tree": "c9f30ca17733d2c0f4b071ca90d6500c456ac7d0", "version-semver": "2.0.1", From 0b74d8e8f076fba18f73fddadfff9482fef2045f Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 5 Oct 2021 22:14:35 -0700 Subject: [PATCH 0751/1858] [geogram, ccfits, chartdir] Build fixes discovered by CI on 2021-10-01 (#20518) * REGRESSION: chartdir:x64-linux. If expected, add chartdir:x64-linux=fail to .\scripts\ci.baseline.txt. -- Note: chartdir only supports dynamic library linkage. Building dynamic library. -- Downloading http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz -> chartdir_cpp_linux_64-7.0.0.tar.gz... [DEBUG] Feature flag 'binarycaching' unset [DEBUG] Feature flag 'manifests' = off [DEBUG] Feature flag 'compilertracking' unset [DEBUG] Feature flag 'registries' unset [DEBUG] Feature flag 'versions' unset [DEBUG] popen(curl --fail -L "https://vcpkgassetcache.blob.core.windows.net/assets/e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa?sp=racwl&st=2021-06-29T20:09:46Z&se=2021-10-02T04:09:46Z&spr=https&sv=2020-08-04&sr=c&sig=g3shlIpD0R923OUzfIsrTwjX0vc6OzNXGEDO3URXmYc%3D" --create-dirs --output /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part 2>&1) [DEBUG] cmd_execute_and_stream_data() returned 5632 after 31162 us [DEBUG] popen(curl --fail -L http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz --create-dirs --output /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part 2>&1) [DEBUG] cmd_execute_and_stream_data() returned 0 after 8512565 us Error: Failed to download from mirror set: https://vcpkgassetcache.blob.core.windows.net/assets/e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa?*** SECRET ***: % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (22) The requested URL returned error: 403 Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature. File does not have the expected hash: url : [ http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz ] File path : [ /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part ] Expected hash : [ e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa ] Actual hash : [ ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467 ] Updated SHAs and added quotes. These are the changes made by upstream: ``` diff --git a/new_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp b/old_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp index 79f15be..302eb78 100644 --- a/new_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp +++ b/old_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp @@ -108,7 +108,9 @@ void createChart(int chartIndex, const char *filename) const int dataZ_size = dataX_size * dataY_size; double dataZ[dataZ_size]; for(int yIndex = 0; yIndex < dataY_size; ++yIndex) { + double y = dataY[yIndex]; for(int xIndex = 0; xIndex < dataX_size; ++xIndex) { + double x = dataX[xIndex]; dataZ[yIndex * dataX_size + xIndex] = dataX[xIndex] * dataY[yIndex]; } } @@ -176,7 +178,7 @@ void createChart(int chartIndex, const char *filename) // Use a DrawArea to load the image DrawArea* d = new DrawArea(); d->load("maptexture.png"); - d->resize(c->getPlotRegionWidth(), c->getPlotRegionDepth()); + d->resize(240, 210); // Set the DrawArea as a resource c->setResource("texture", d); diff --git a/new_sha/ChartDirector/lib/libchartdir.so.7.0.0 b/old_sha/ChartDirector/lib/libchartdir.so.7.0.0 index b1ea97f..bfb1d4b 100644 Binary files a/new_sha/ChartDirector/lib/libchartdir.so.7.0.0 and b/old_sha/ChartDirector/lib/libchartdir.so.7.0.0 differ diff --git a/new_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp b/old_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp index 5736d60..423120f 100644 --- a/new_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp +++ b/old_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp @@ -107,9 +107,9 @@ private: QCursor *hZoomOutCursor; QCursor *hNoZoomCursor; - QCursor &getZoomCursor(QCursor **cache, double scale, int flags) + QCursor &getZoomCursor(QCursor *cache, double scale, int flags) { - if (0 == *cache) + if (0 == cache) { DrawArea d; d.setSize(32, 32, Chart::Transparent); @@ -127,9 +127,9 @@ private: MemBlock m = d.outPNG(); QImage img = QImage::fromData((const uchar*)m.data, m.len); img.setDevicePixelRatio(scale); - *cache = new QCursor(QPixmap::fromImage(img), 15, 15); + cache = new QCursor(QPixmap::fromImage(img), 15, 15); } - return **cache; + return *cache; } public: @@ -145,15 +145,15 @@ public: } QCursor &getZoomInCursor(double scale) { - return getZoomCursor(&hZoomInCursor, scale, 3); + return getZoomCursor(hZoomInCursor, scale, 3); } QCursor &getZoomOutCursor(double scale) { - return getZoomCursor(&hZoomOutCursor, scale, 1); + return getZoomCursor(hZoomOutCursor, scale, 1); } QCursor &getNoZoomCursor(double scale) { - return getZoomCursor(&hNoZoomCursor, scale, 0); + return getZoomCursor(hNoZoomCursor, scale, 0); } } cursorManager; diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp index a3b7962..d706853 100644 --- a/new_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp +++ b/old_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp @@ -10954,7 +10954,9 @@ void surfacetexture(QChartViewer *viewer, int chartIndex) const int dataZ_size = dataX_size * dataY_size; double dataZ[dataZ_size]; for(int yIndex = 0; yIndex < dataY_size; ++yIndex) { + double y = dataY[yIndex]; for(int xIndex = 0; xIndex < dataX_size; ++xIndex) { + double x = dataX[xIndex]; dataZ[yIndex * dataX_size + xIndex] = dataX[xIndex] * dataY[yIndex]; } } @@ -11022,7 +11024,7 @@ void surfacetexture(QChartViewer *viewer, int chartIndex) // Use a DrawArea to load the image DrawArea* d = new DrawArea(); d->load("@/images/maptexture.png"); - d->resize(c->getPlotRegionWidth(), c->getPlotRegionDepth()); + d->resize(240, 210); // Set the DrawArea as a resource c->setResource("texture", d); @@ -12304,6 +12306,11 @@ void treemapcolors(QChartViewer *viewer, int /* chartIndex */) void treemaplayout(QChartViewer *viewer, int chartIndex) { + // Labels for the tree map + const char* energy_types[] = {"Coal", "Oil", "Gas", "Nuclear", "Hydro", "Solar", "Wind", + "Biomass", "Geothermal", "Wave"}; + const int energy_types_size = (int)(sizeof(energy_types)/sizeof(*energy_types)); + // Random data for the tree map RanSeries* r = new RanSeries(3); DoubleArray data = r->getSeries(20, 20, 400); @@ -14163,10 +14170,7 @@ void circularbarmeter2(QChartViewer *viewer, int chartIndex) m->setCap(0, Chart::Transparent); // In this example, the circular bar has 20 segments - int segmentCount = 20; - - // The angular step - double angleStep = 360.0 / segmentCount; + int angleStep = 360 / 20; // The gap between segments is 4.5 degrees double angleGap = 4.5; @@ -14205,39 +14209,28 @@ void circularbarmeter2(QChartViewer *viewer, int chartIndex) stepColorScale_size)); } - // - // Now we draw the segments of the bar meter - // - - // The segment that contains the value - int currentSegment = (int)(angle / angleStep); - - // Segments after the current segment is colored with the blank color - for(int i = currentSegment + 1; i < segmentCount; ++i) { - m->addRingSector(radius, radius - 20, i * angleStep, (i + 1) * angleStep - angleGap, - blankColor); + // Draw the blank part of the circular bar + if (angle < 360) { + // Iterate the segments in the blank part of the circular bar + for(int startAngle = (int)(angle / angleStep) * angleStep; startAngle < 360; startAngle += + angleStep) { + // The first segment may be partially filled + double partialAngle = (startAngle >= angle ? 0 : (angle - startAngle) * (1 - angleGap / + angleStep)); + m->addRingSector(radius, radius - 20, startAngle + partialAngle, startAngle + angleStep + - angleGap, blankColor); } - - // Segments before the current segment is colored with the fill color - for(int i = 0; i < currentSegment; ++i) { - m->addRingSector(radius, radius - 20, i * angleStep, (i + 1) * angleStep - angleGap, - fillColor); } - // Segment that contains the angle will be partially filled and partially blank. We need to - // adjust the angle to compensated for the angle gap. - double adjustedAngle = currentSegment * angleStep + (angle - currentSegment * angleStep) * (1 - - angleGap / angleStep); - - // The blank part of the segment - if ((currentSegment + 1) * angleStep > angle) { - m->addRingSector(radius, radius - 20, adjustedAngle, (currentSegment + 1) * angleStep - - angleGap, blankColor); + // Draw the fill part of the circular bar + if (angle > 0) { + // Iterate the segments in the fill part of the circular bar + for(int startAngle = 0; startAngle < angle; startAngle += angleStep) { + // The last segment may be partially filled + double angleSpan = (angleStep - angleGap) * (angle >= startAngle + angleStep ? 1 : ( + angle - startAngle) / angleStep); + m->addRingSector(radius, radius - 20, startAngle, startAngle + angleSpan, fillColor); } - - // The filled part of the segment. - if (angle > currentSegment * angleStep) { - m->addRingSector(radius, radius - 20, currentSegment * angleStep, adjustedAngle, fillColor); } // Add a label at the center to display the value diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp index 7b8c1f5..b029776 100644 --- a/new_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp +++ b/old_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp @@ -315,13 +315,6 @@ void FinanceDemo::onLineEditChanged() int new_avgPeriod2 = m_MovAvg2->text().toInt(); QString tickerKey = m_TickerSymbol->text(); - if (tickerKey.isEmpty()) - { - // Default tickerKey - tickerKey = "ASE"; - m_TickerSymbol->setText(tickerKey); - } - QString compareKey = m_CompareWith->text(); bool needReloadData = (m_tickerKey != tickerKey) || (m_compareKey != compareKey); @@ -367,16 +360,12 @@ void FinanceDemo::loadData(const QString& ticker, const QString& compare) if (m_compareKey != compare) { m_compareKey = compare; - if (m_compareKey.isEmpty()) - m_dailyPrice.compareData.clear(); - else - { + // Simulator to generate realistic random OHLC values FinanceSimulator db2(compare.toUtf8().data(), Chart::chartTime(2010, 1, 1), Chart::chartTime(2020, 12, 31), 86400); m_dailyPrice.compareData = arrayToVector(db2.getCloseData()); } - } // In this example, we will compute the weekly and monthly prices on demand. We just // need to clear the old data here. diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp index 5736d60..423120f 100644 --- a/new_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp +++ b/old_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp @@ -107,9 +107,9 @@ private: QCursor *hZoomOutCursor; QCursor *hNoZoomCursor; - QCursor &getZoomCursor(QCursor **cache, double scale, int flags) + QCursor &getZoomCursor(QCursor *cache, double scale, int flags) { - if (0 == *cache) + if (0 == cache) { DrawArea d; d.setSize(32, 32, Chart::Transparent); @@ -127,9 +127,9 @@ private: MemBlock m = d.outPNG(); QImage img = QImage::fromData((const uchar*)m.data, m.len); img.setDevicePixelRatio(scale); - *cache = new QCursor(QPixmap::fromImage(img), 15, 15); + cache = new QCursor(QPixmap::fromImage(img), 15, 15); } - return **cache; + return *cache; } public: @@ -145,15 +145,15 @@ public: } QCursor &getZoomInCursor(double scale) { - return getZoomCursor(&hZoomInCursor, scale, 3); + return getZoomCursor(hZoomInCursor, scale, 3); } QCursor &getZoomOutCursor(double scale) { - return getZoomCursor(&hZoomOutCursor, scale, 1); + return getZoomCursor(hZoomOutCursor, scale, 1); } QCursor &getNoZoomCursor(double scale) { - return getZoomCursor(&hNoZoomCursor, scale, 0); + return getZoomCursor(hNoZoomCursor, scale, 0); } } cursorManager; ``` * REGRESSION: ccfits:arm64-windows. If expected, add ccfits:arm64-windows=fail to .\scripts\ci.baseline.txt. REGRESSION: ccfits:x64-linux. If expected, add ccfits:x64-linux=fail to .\scripts\ci.baseline.txt. REGRESSION: ccfits:x64-osx. If expected, add ccfits:x64-osx=fail to .\scripts\ci.baseline.txt. REGRESSION: ccfits:x64-windows-static-md. If expected, add ccfits:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. REGRESSION: ccfits:x64-windows-static. If expected, add ccfits:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: ccfits:x64-windows. If expected, add ccfits:x64-windows=fail to .\scripts\ci.baseline.txt. REGRESSION: ccfits:x86-windows. If expected, add ccfits:x86-windows=fail to .\scripts\ci.baseline.txt. >[DEBUG] popen(curl --fail -L https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz --create-dirs --output /Users/bion/vcpkg/downloads/CCfits-2.5.tar.gz.15183.part 2>&1) >[DEBUG] cmd_execute_and_stream_data() returned 5632 after 415053 us >Error: Failed to download from mirror set: >https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz: % Total % Received % Xferd Average Speed Time Time Time Current > Dload Upload Total Spent Left Speed > 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 >curl: (22) The requested URL returned error: 404 Not Found Fixed link and modernized portfile. * REGRESSION: geogram:x64-linux. If expected, add geogram:x64-linux=fail to .\scripts\ci.baseline.txt. REGRESSION: geogram:x64-osx. If expected, add geogram:x64-osx=fail to .\scripts\ci.baseline.txt. REGRESSION: geogram:x64-windows-static-md. If expected, add geogram:x64-windows-static-md=fail to .\scripts\ci.baseline.txt. REGRESSION: geogram:x64-windows-static. If expected, add geogram:x64-windows-static=fail to .\scripts\ci.baseline.txt. REGRESSION: geogram:x64-windows. If expected, add geogram:x64-windows=fail to .\scripts\ci.baseline.txt. REGRESSION: geogram:x86-windows. If expected, add geogram:x86-windows=fail to .\scripts\ci.baseline.txt. Upstream is gone: https://gforge.inria.fr/frs/download.php/file/38314/geogram_1.7.5.tar.gz: % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (60) SSL: no alternative certificate subject name matches target host name 'gforge.inria.fr' More details here: https://curl.haxx.se/docs/sslcerts.html curl failed to verify the legitimacy of the server and therefore could not establish a secure connection to it. To learn more about this situation and how to fix it, please visit the web page mentioned above. [DEBUG] /agent/_work/1/s/buildtrees/_vcpkg/src/vcpkg-tool-2021-09-10/src/vcpkg/base/downloads.cpp(626) [DEBUG] Exiting after 583.7 ms us (582562 us) CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:83 (message): Failed to download file with error: 1 If you use a proxy, please check your proxy setting. Possible causes are: 1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable to `https://address:port`. This is not correct, because `https://` prefix claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr , etc..) is an HTTP proxy. Try setting `http://address:port` to both HTTP_PROXY and HTTPS_PROXY instead. 2. You are using Fiddler. Currently a bug (https://github.com/microsoft/vcpkg/issues/17752) will set HTTPS_PROXY to `https://fiddler_address:port` which lead to problem 1 above. Workaround is open Windows 10 Settings App, and search for Proxy Configuration page, Change `http=address:port;https=address:port` to `address`, and fill the port number. 3. You proxy's remote server is out of service. In future vcpkg releases, if you are using Windows, you no longer need to set HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy Settings set by your proxy software. See (https://github.com/microsoft/vcpkg-tool/pull/49) and (https://github.com/microsoft/vcpkg-tool/pull/77) Otherwise, please submit an issue at https://github.com/Microsoft/vcpkg/issues Call Stack (most recent call first): scripts/cmake/vcpkg_download_distfile.cmake:274 (z_vcpkg_download_distfile_show_proxy_and_fail) ports/geogram/portfile.cmake:4 (vcpkg_download_distfile) scripts/ports.cmake:141 (include) Skipped in ci.baseline.txt. --- ports/ccfits/portfile.cmake | 34 +++++++++++--------------- ports/ccfits/vcpkg.json | 10 +++++--- ports/chartdir/portfile.cmake | 45 +++++++++++++++++------------------ ports/chartdir/vcpkg.json | 1 + scripts/ci.baseline.txt | 6 +++++ versions/baseline.json | 4 ++-- versions/c-/ccfits.json | 5 ++++ versions/c-/chartdir.json | 5 ++++ 8 files changed, 62 insertions(+), 48 deletions(-) diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake index e1876040130819..7c1f7e88afcb3e 100644 --- a/ports/ccfits/portfile.cmake +++ b/ports/ccfits/portfile.cmake @@ -1,47 +1,41 @@ vcpkg_download_distfile(ARCHIVE - URLS "https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz" + URLS "https://heasarc.gsfc.nasa.gov/fitsio/CCfits-2.5/CCfits-2.5.tar.gz" FILENAME "CCfits-2.5.tar.gz" SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5 ) vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES dll_exports.patch fix-dependency.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DCFITSIO_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/cfitsio +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/CCfits.dll ${CURRENT_PACKAGES_DIR}/bin/CCfits.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll ${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll) +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/bin/CCfits.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll") endif() # Remove duplicate include files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Patch installed headers to look in the correct subdirectory -file(GLOB HEADERS ${CURRENT_PACKAGES_DIR}/include/CCfits/*) +file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/CCfits/*") foreach(HEADER IN LISTS HEADERS) - file(READ "${HEADER}" _contents) - string(REPLACE "\"fitsio.h\"" "\"cfitsio/fitsio.h\"" _contents "${_contents}") - file(WRITE "${HEADER}" "${_contents}") + vcpkg_replace_string("${HEADER}" "\"fitsio.h\"" "\"cfitsio/fitsio.h\"") endforeach() vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\"" ) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json index d8280a15816d2b..7124381b9978bd 100644 --- a/ports/ccfits/vcpkg.json +++ b/ports/ccfits/vcpkg.json @@ -1,10 +1,14 @@ { "name": "ccfits", "version": "2.5", - "port-version": 7, + "port-version": 8, "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.", - "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/ccfits", + "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/", "dependencies": [ - "cfitsio" + "cfitsio", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake index b8447ca8457bf3..6a9f786102bba2 100644 --- a/ports/chartdir/portfile.cmake +++ b/ports/chartdir/portfile.cmake @@ -7,14 +7,14 @@ if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Window elseif(VCPKG_TARGET_IS_WINDOWS) vcpkg_download_distfile(ARCHIVE_FILE - URLS "http://www.advsofteng.net/chartdir_cpp_win.zip" + URLS "https://www.advsofteng.net/chartdir_cpp_win.zip" FILENAME "chartdir_cpp_win-7.0.0.zip" SHA512 38d9dae641c0341ccee4709138afd37ad4718c34def70a0dc569956bf9c3488d0d66072f604dca4663dc80bd09446a2ba27ef3806fc3b87dda6aaa5453a7316f ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE_FILE} + ARCHIVE "${ARCHIVE_FILE}" REF 7.0.0 ) @@ -24,10 +24,10 @@ elseif(VCPKG_TARGET_IS_WINDOWS) set(LIBDIR "${SOURCE_PATH}/lib32") endif() - file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") set(CHARTDIR_LIB "chartdir70.lib") @@ -41,12 +41,12 @@ elseif(VCPKG_TARGET_IS_OSX) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE_FILE} + ARCHIVE "${ARCHIVE_FILE}" REF 7.0.0 ) - file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") set(CHARTDIR_LIB "libchartdir.7.dylib") @@ -55,40 +55,39 @@ elseif(VCPKG_TARGET_IS_LINUX) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") vcpkg_download_distfile(ARCHIVE_FILE - URLS "http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz" + URLS "https://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz" FILENAME "chartdir_cpp_linux_64-7.0.0.tar.gz" - SHA512 e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa + SHA512 ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467 ) else() vcpkg_download_distfile(ARCHIVE_FILE - URLS "http://www.advsofteng.net/chartdir_cpp_linux.tar.gz" + URLS "https://www.advsofteng.net/chartdir_cpp_linux.tar.gz" FILENAME "chartdir_cpp_linux-7.0.0.tar.gz" - SHA512 bf749c9821a901a7071964f22aabb606f90dc853907720a05252165d63d27aa31d10f0aa62995ab92085bb790f3830063fd8042331195b0153a9d49e8a92e871 + SHA512 54720fb431fa0fb34be3a187ec3886b0f2a7307ea52a0415fab8513117a157f64a8c0e0b01304aac1d313e4557768242e6b12002509fde2e5303d930c78c0e03 ) endif() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE_FILE} + ARCHIVE "${ARCHIVE_FILE}" REF 7.0.0 ) - file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") set(CHARTDIR_LIB "libchartdir.so.7.0.0") - file(COPY ${SOURCE_PATH}/lib/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + file(COPY "${SOURCE_PATH}/lib/fonts" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") endif() file(GLOB HEADERS "${SOURCE_PATH}/include/*.h") -file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/chartdir.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) -configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/chartdir-config.cmake @ONLY) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/chartdir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/chartdir-config.cmake" @ONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/chartdir/vcpkg.json b/ports/chartdir/vcpkg.json index 800a311cbbf728..f10b4d17111695 100644 --- a/ports/chartdir/vcpkg.json +++ b/ports/chartdir/vcpkg.json @@ -1,6 +1,7 @@ { "name": "chartdir", "version": "7.0.0", + "port-version": 1, "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.", "homepage": "https://www.advsofteng.com/" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 89b05d34211777..7d954810b58597 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -352,6 +352,12 @@ gainput:x64-uwp=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail +geogram:x64-linux=fail +geogram:x64-osx=fail +geogram:x64-windows-static-md=fail +geogram:x64-windows-static=fail +geogram:x64-windows=fail +geogram:x86-windows=fail geos:arm-uwp=fail geos:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 8cb7de32c881ae..3aa7be4c82f428 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1242,7 +1242,7 @@ }, "ccfits": { "baseline": "2.5", - "port-version": 7 + "port-version": 8 }, "cctag": { "baseline": "1.0.0", @@ -1306,7 +1306,7 @@ }, "chartdir": { "baseline": "7.0.0", - "port-version": 0 + "port-version": 1 }, "check": { "baseline": "0.15.2", diff --git a/versions/c-/ccfits.json b/versions/c-/ccfits.json index d7b390aa7622e3..7bf0a662a0a9c6 100644 --- a/versions/c-/ccfits.json +++ b/versions/c-/ccfits.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebcb81196a7e63b3b7c4b78f67ebc4e5f20c97c3", + "version": "2.5", + "port-version": 8 + }, { "git-tree": "adb43da4a1d72e0924081e4699d81337d649400e", "version": "2.5", diff --git a/versions/c-/chartdir.json b/versions/c-/chartdir.json index 9a03f20dc782e4..13afedbde2ad4d 100644 --- a/versions/c-/chartdir.json +++ b/versions/c-/chartdir.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc56555cd56d261127f985f6208cb23258dcb262", + "version": "7.0.0", + "port-version": 1 + }, { "git-tree": "433c4a83452c8867b63d012a46109a4e3992e13f", "version": "7.0.0", From 7743eff952a9654a9cd874360ee1f63dbdc5f785 Mon Sep 17 00:00:00 2001 From: omartijn <44672243+omartijn@users.noreply.github.com> Date: Wed, 6 Oct 2021 20:06:35 +0200 Subject: [PATCH 0752/1858] [ffmpeg] Honor macosx deployment target for ffmpeg (#18460) * Honor macosx deployment target for ffmpeg * fixup! Honor macosx deployment target for ffmpeg Co-authored-by: Martijn Otto Co-authored-by: Martijn Otto --- ports/ffmpeg/portfile.cmake | 11 ++++++++--- ports/ffmpeg/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index d4451b4029f44a..5f6b8d98af94bd 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -220,6 +220,14 @@ else() set(SHELL /bin/sh) endif() +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +if(VCPKG_TARGET_IS_OSX AND VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET) + set(OPTIONS "--extra-cflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") + set(OPTIONS "--extra-ldflags=-mmacosx-version-min=${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET} ${OPTIONS}") +endif() + set(ENV{${INCLUDE_VAR}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}$ENV{${INCLUDE_VAR}}") set(_csc_PROJECT_PATH ffmpeg) @@ -544,9 +552,6 @@ else() set(OPTIONS "${OPTIONS} --disable-zlib") endif() -vcpkg_cmake_get_vars(cmake_vars_file) -include("${cmake_vars_file}") - if (VCPKG_TARGET_IS_OSX) # if the sysroot isn't set in the triplet we fall back to whatever CMake detected for us if ("${VCPKG_OSX_SYSROOT}" STREQUAL "") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 29870bdc9e0b65..a83c6ea2533466 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 14, + "port-version": 15, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index 3aa7be4c82f428..ba8c37dbea28bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2102,7 +2102,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 14 + "port-version": 15 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 4fb6cbd411c06a..35a46648b00358 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24cb6ddcd146248cb3758ec1aa4c038b28d4c0c5", + "version": "4.4", + "port-version": 15 + }, { "git-tree": "5d893a1c421f553fbdd9c1f79530a6a84bd0eb76", "version": "4.4", From 4e0cec18c3e7095bc22deabdccff56fd775a1bf7 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 6 Oct 2021 20:12:42 +0200 Subject: [PATCH 0753/1858] [sdl2] Fix calling `find_packages` from different directories (#20542) * Fix multiple calls to `find_package` * Update versions --- ports/sdl2/0004-sdl2-alias-on-static-build.patch | 9 ++++++--- ports/sdl2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sdl2.json | 5 +++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ports/sdl2/0004-sdl2-alias-on-static-build.patch b/ports/sdl2/0004-sdl2-alias-on-static-build.patch index 4fffb18027ee17..6bb4eb061eb420 100644 --- a/ports/sdl2/0004-sdl2-alias-on-static-build.patch +++ b/ports/sdl2/0004-sdl2-alias-on-static-build.patch @@ -1,13 +1,16 @@ --- a/SDL2Config.cmake +++ b/SDL2Config.cmake -@@ -2,5 +2,14 @@ +@@ -1,5 +1,17 @@ include("${CMAKE_CURRENT_LIST_DIR}/SDL2Targets.cmake") +# on static-only builds create an alias +if(NOT TARGET SDL2::SDL2 AND TARGET SDL2::SDL2-static) -+ if(CMAKE_VERSION VERSION_LESS "3.18") -+ # Aliasing local targets is not supported on CMake < 3.18, so make it global. ++ if(CMAKE_VERSION VERSION_LESS "3.11") ++ message(FATAL_ERROR "At least CMake 3.11 is required for this configuration.") ++ elseif(CMAKE_VERSION VERSION_LESS "3.18") ++ # Aliasing local targets is not supported on CMake < 3.18, so make all targets global. + set_target_properties(SDL2::SDL2-static PROPERTIES IMPORTED_GLOBAL TRUE) ++ set_target_properties(SDL2::SDL2main PROPERTIES IMPORTED_GLOBAL TRUE) + endif() + add_library(SDL2::SDL2 ALIAS SDL2::SDL2-static) +endif() diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 56e6aa57ed94b4..6c0ce100ab8ae1 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sdl2", "version": "2.0.16", + "port-version": 1, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index ba8c37dbea28bb..ebb805f2b804c2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6034,7 +6034,7 @@ }, "sdl2": { "baseline": "2.0.16", - "port-version": 0 + "port-version": 1 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 59df83a08ad262..41c18aecccb5e2 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f39203f93b1c068fca2dd7b7501891d8aca3b65d", + "version": "2.0.16", + "port-version": 1 + }, { "git-tree": "66a51e068567b3b76ebb844ba7b4336abc7c35ce", "version": "2.0.16", From 229686bdfcd0557cdc38604c7bc30829ddd1f0da Mon Sep 17 00:00:00 2001 From: Pavel Kisliak <37534137+PavelKisliak@users.noreply.github.com> Date: Wed, 6 Oct 2021 21:17:26 +0300 Subject: [PATCH 0754/1858] [BitSerializer] Upgrade to new version 0.44 (#20544) * [BitSerializer] Update to version 0.9 * [bitserializer] Update port to new version 0.44 * [bitserializer] Update deprecated VCPKG Cmake functions * [bitserializer] Remove default features list Co-authored-by: Pavel_Kisliak --- ports/bitserializer-rapidyaml/vcpkg.json | 4 ++-- ports/bitserializer/portfile.cmake | 10 +++++----- ports/bitserializer/vcpkg.json | 20 ++++++++++++-------- scripts/ci.baseline.txt | 2 -- versions/b-/bitserializer-rapidyaml.json | 5 +++++ versions/b-/bitserializer.json | 5 +++++ versions/baseline.json | 6 +++--- 7 files changed, 32 insertions(+), 20 deletions(-) diff --git a/ports/bitserializer-rapidyaml/vcpkg.json b/ports/bitserializer-rapidyaml/vcpkg.json index 590519df0b4620..c6fc4961ec5619 100644 --- a/ports/bitserializer-rapidyaml/vcpkg.json +++ b/ports/bitserializer-rapidyaml/vcpkg.json @@ -1,9 +1,9 @@ { "name": "bitserializer-rapidyaml", "version-string": "alias", - "port-version": 1, + "port-version": 2, "description": "Deprecated alias for bitserializer-rapidyaml", - "supports": "!(arm | arm64 | osx)", + "supports": "!osx", "dependencies": [ { "name": "bitserializer", diff --git a/ports/bitserializer/portfile.cmake b/ports/bitserializer/portfile.cmake index 3b8e4184fdafad..7e0f67a1d480b7 100644 --- a/ports/bitserializer/portfile.cmake +++ b/ports/bitserializer/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_bitbucket( OUT_SOURCE_PATH SOURCE_PATH REPO Pavel_Kisliak/BitSerializer - REF 0.10 - SHA512 a8a5acf4f9cc83d3090a3b06efbca682f4e022b5206bc7859ba6738e4d49a7678aa55f431f1721d50b28d8bde126b672396baae27cbaa79f62e3dc237ae678e1 + REF 0.44 + SHA512 0629acc93807254bd51d9eed761a92be4780d01604a9ae4bf8a933af70fdb206ea9b4f4db3489805b4163f5071246529ea22f8b3e7fbcd77ed936c3ab24697b2 HEAD_REF master ) @@ -14,14 +14,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "rapidyaml-archive" BUILD_RAPIDYAML_ARCHIVE ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/bitserializer) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/bitserializer) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/bitserializer/vcpkg.json b/ports/bitserializer/vcpkg.json index 7bf83a25ea77f2..09a3a8b1b331d8 100644 --- a/ports/bitserializer/vcpkg.json +++ b/ports/bitserializer/vcpkg.json @@ -1,13 +1,17 @@ { "name": "bitserializer", - "version": "0.10", - "port-version": 2, - "description": "Core part of C++ 17 library for serialization to JSON, XML, YAML", + "version": "0.44", + "description": "C++ 17 library for serialization to JSON, XML, YAML", "homepage": "https://bitbucket.org/Pavel_Kisliak/bitserializer", - "default-features": [ - "cpprestjson-archive", - "pugixml-archive", - "rapidjson-archive" + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cpprestjson-archive": { @@ -33,7 +37,7 @@ "dependencies": [ { "name": "ryml", - "platform": "!arm & !arm64 & !osx" + "platform": "!osx" } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7d954810b58597..7658ee42089214 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -55,8 +55,6 @@ aubio:x64-uwp=fail # broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937 bde:x64-linux=fail bitserializer:x64-osx=fail -bitserializer:arm64-windows=fail -bitserializer:arm-uwp=fail blend2d:arm64-windows=fail blend2d:arm-uwp=fail blend2d:x64-uwp=fail diff --git a/versions/b-/bitserializer-rapidyaml.json b/versions/b-/bitserializer-rapidyaml.json index 0b0fe0398c2542..da58b49d7813b8 100644 --- a/versions/b-/bitserializer-rapidyaml.json +++ b/versions/b-/bitserializer-rapidyaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08097fe26fb2b85b77ee6df81ba666201b1dd991", + "version-string": "alias", + "port-version": 2 + }, { "git-tree": "7680ebf3a5a68b67ce532cb52faae1c37535c69a", "version-string": "alias", diff --git a/versions/b-/bitserializer.json b/versions/b-/bitserializer.json index 15487c81d4dffe..a58466de15e4c7 100644 --- a/versions/b-/bitserializer.json +++ b/versions/b-/bitserializer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66c9246073510ab554418a0b63ef9ee471b05b76", + "version": "0.44", + "port-version": 0 + }, { "git-tree": "ea63e330fbf462f7d5ab3fa119d105501366ea9c", "version": "0.10", diff --git a/versions/baseline.json b/versions/baseline.json index ebb805f2b804c2..ef4baea73ece07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -445,8 +445,8 @@ "port-version": 0 }, "bitserializer": { - "baseline": "0.10", - "port-version": 2 + "baseline": "0.44", + "port-version": 0 }, "bitserializer-cpprestjson": { "baseline": "alias", @@ -462,7 +462,7 @@ }, "bitserializer-rapidyaml": { "baseline": "alias", - "port-version": 1 + "port-version": 2 }, "bitsery": { "baseline": "5.2.2", From adcb3c3a59f2b5ccbeb5c71b953773f6a1e609fe Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 21:28:24 +0200 Subject: [PATCH 0755/1858] [distorm] Update to 3.5.2b (#20488) * Update distorm to 3.5.2b * Update CI baseline * Fix compilation * Update git-tree hash * Fix ARM builds * Update git-tree hash Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/distorm/CMakeLists.txt | 3 ++- ports/distorm/fix-arm-builds.patch | 12 ++++++++++++ ports/distorm/portfile.cmake | 17 +++++++++-------- ports/distorm/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/d-/distorm.json | 5 +++++ 6 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 ports/distorm/fix-arm-builds.patch diff --git a/ports/distorm/CMakeLists.txt b/ports/distorm/CMakeLists.txt index 6f6e2045264a41..80fc9202b1b2ad 100644 --- a/ports/distorm/CMakeLists.txt +++ b/ports/distorm/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.8.0) project(distorm C) +set(CMAKE_C_STANDARD 99) + if(MSVC) add_compile_options(/W3 /wd4005 /wd4996 /wd4018 -D_CRT_SECURE_NO_WARNINGS -DNOMINMAX) endif() @@ -16,7 +18,6 @@ add_library(distorm src/operands.c src/prefix.c src/textdefs.c - src/wstring.c ) if(BUILD_SHARED_LIBS) diff --git a/ports/distorm/fix-arm-builds.patch b/ports/distorm/fix-arm-builds.patch new file mode 100644 index 00000000000000..cf292126688c38 --- /dev/null +++ b/ports/distorm/fix-arm-builds.patch @@ -0,0 +1,12 @@ +--- a/src/textdefs.c ++++ b/src/textdefs.c +@@ -42,7 +42,8 @@ + s->length = len * 2; + s->p[len * 2] = 0; + do { +- RSHORT(&s->p[i]) = RSHORT(&TextBTable[(*buf) * 2]); ++ s->p[i] = TextBTable[(*buf) * 2]; ++ s->p[i + 1] = TextBTable[(*buf) * 2 + 1]; + buf++; + i += 2; + } while (i < len * 2); diff --git a/ports/distorm/portfile.cmake b/ports/distorm/portfile.cmake index 0b3cc5046ee1fd..bcdcbadb17c670 100644 --- a/ports/distorm/portfile.cmake +++ b/ports/distorm/portfile.cmake @@ -1,21 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gdabah/distorm - REF v3.4.1 - SHA512 0e9f8b62bc190ef7d516f1902b6003adef9c7d5d4a5f985fb0bdfc5d4838b2805e2b8836b02d5eccdb3401e814417de615dec675aed9e606c93122ca8a0d2083 + REF 3.5.2b + SHA512 8AAD0C51E8D9DFAEAA069A3D4FADE4BDF87CCE464C85898B6B4888FA51A9BB6EC1221FAF32ACF59EBD047CCEB9A535B2FF93D196FD14FA834D8ECE5685417A55 HEAD_REF master + PATCHES + fix-arm-builds.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/distorm RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/distorm/vcpkg.json b/ports/distorm/vcpkg.json index e83775d893ada3..c4daddc217bfad 100644 --- a/ports/distorm/vcpkg.json +++ b/ports/distorm/vcpkg.json @@ -1,6 +1,15 @@ { "name": "distorm", - "version-string": "3.4.1", - "port-version": 1, - "description": "Powerful Disassembler Library For x86/AMD64" + "version-string": "3.5.2b", + "description": "Powerful Disassembler Library For x86/AMD64", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ef4baea73ece07..91a9ba1d25f2f2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1829,8 +1829,8 @@ "port-version": 1 }, "distorm": { - "baseline": "3.4.1", - "port-version": 1 + "baseline": "3.5.2b", + "port-version": 0 }, "dlfcn-win32": { "baseline": "1.1.1", diff --git a/versions/d-/distorm.json b/versions/d-/distorm.json index a4300671b067f6..c8cacd5940a329 100644 --- a/versions/d-/distorm.json +++ b/versions/d-/distorm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "703f2fc39b6b60af3a301a3db7cbffcd95445e75", + "version-string": "3.5.2b", + "port-version": 0 + }, { "git-tree": "ac14ace119d357f555286753afa0bbced4b643e7", "version-string": "3.4.1", From bcf82147b58a1816ff4264228c5472f33338c9e3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 6 Oct 2021 21:50:25 +0200 Subject: [PATCH 0756/1858] [simde] Update to 0.7.2 (#20495) * Update simde to 0.7.2 * Update CI baseline Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/simde/portfile.cmake | 9 ++++----- ports/simde/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/simde.json | 5 +++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/simde/portfile.cmake b/ports/simde/portfile.cmake index 67c87d79faaea2..68020a27a30ad7 100644 --- a/ports/simde/portfile.cmake +++ b/ports/simde/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nemequ/simde - REF f68981de04072012dcc888716dedae2a345d0e45 #v0.7.0 - SHA512 63a00e8a3e0adbd3192f7416f4c163b8b671943042e4f64a91e6865d434a0d5949e97bca1e40d854b9868911ff8d93ac845ac25baa763554447d6be7cdfb084e + REF v0.7.2 + SHA512 E4EE5A4A7E8453F116F1325D147F91D358A300F41EA5566EA30FC19649BABABF3B87E3DC838D5608B578BD152207DF4156200FFC7FB98141BC7C0BB60C75F1F5 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/simde DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/simde" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/simde/vcpkg.json b/ports/simde/vcpkg.json index 159e857688c42d..d26159fe78b3ac 100644 --- a/ports/simde/vcpkg.json +++ b/ports/simde/vcpkg.json @@ -1,7 +1,6 @@ { "name": "simde", - "version-string": "0.7.0", - "port-version": 1, + "version": "0.7.2", "description": "Implementations of SIMD instruction sets for systems which don't natively support them", "homepage": "https://github.com/simd-everywhere/simde" } diff --git a/versions/baseline.json b/versions/baseline.json index 91a9ba1d25f2f2..9049c7f5673b18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6145,8 +6145,8 @@ "port-version": 1 }, "simde": { - "baseline": "0.7.0", - "port-version": 1 + "baseline": "0.7.2", + "port-version": 0 }, "simdjson": { "baseline": "1.0.0", diff --git a/versions/s-/simde.json b/versions/s-/simde.json index 8b4ab37bce8474..e55f5f331387b2 100644 --- a/versions/s-/simde.json +++ b/versions/s-/simde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cf62acaf3648a8f0c2d866263788dc413f2beba", + "version": "0.7.2", + "port-version": 0 + }, { "git-tree": "0caa37f83bd1276d984e5ae1f67ce0cb47e1f62e", "version-string": "0.7.0", From 75fbd4413a9cab5091405e3cbe0b66847bca0a4c Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 6 Oct 2021 15:53:06 -0400 Subject: [PATCH 0757/1858] [python3] Upgrade to Python 3.10.0 (#20519) * [python3] Update to Python 3.10.0rc2 (for testing). * [python3] Revert trivial patch changes. * [python3] Bump to 3.10.0 final. * x-add-version * update python tools to 3.10.0 * [ecm] Add patch from upstream for Python 3.10. Remove this on the next release. * x-add-version * [python3] Add patch to fix static interpreter. * x-add-version --- ports/ecm/fix_python_version.patch | 61 +++++++++++++++++++ ports/ecm/portfile.cmake | 1 + ports/ecm/vcpkg.json | 2 +- ports/python3/0001-static-library.patch | 14 +++++ .../python3/0006-fix-duplicate-symbols.patch | 39 ------------ ... 0006-restore-support-for-windows-7.patch} | 0 ...nd-windows-11-sdk-rc-compiler-error.patch} | 0 ports/python3/portfile.cmake | 11 ++-- ports/python3/vcpkg.json | 3 +- .../cmake/vcpkg_find_acquire_program.cmake | 8 +-- scripts/vcpkgTools.xml | 8 +-- versions/baseline.json | 6 +- versions/e-/ecm.json | 5 ++ versions/p-/python3.json | 5 ++ 14 files changed, 104 insertions(+), 59 deletions(-) create mode 100644 ports/ecm/fix_python_version.patch delete mode 100644 ports/python3/0006-fix-duplicate-symbols.patch rename ports/python3/{0007-restore-support-for-windows-7.patch => 0006-restore-support-for-windows-7.patch} (100%) rename ports/python3/{0008-workaround-windows-11-sdk-rc-compiler-error.patch => 0007-workaround-windows-11-sdk-rc-compiler-error.patch} (100%) diff --git a/ports/ecm/fix_python_version.patch b/ports/ecm/fix_python_version.patch new file mode 100644 index 00000000000000..a443bb1a64faa3 --- /dev/null +++ b/ports/ecm/fix_python_version.patch @@ -0,0 +1,61 @@ +From 12f4266eb71b30da1df92a5d628d402ea1a45b3b Mon Sep 17 00:00:00 2001 +From: Michael Pyne +Date: Sun, 4 Jul 2021 18:47:45 -0400 +Subject: [PATCH] python: Bump maximum version for Python 3 module generator + check. + +The proximate problem is that the Python Module generator cmake script +has started failing for people with Python 3.10, which a CMake backtrace +pointing into FindPythonModuleGeneration.cmake with an error of the form +"The max python version in PythonModuleGeneration must be updated." + +At least one distro has addressed this by simply patching out modules +that happen to use this CMake module [1]. + +From what I can tell and the testing I've done, the cause is pretty +simple: The CMake script attempts to find the best Python 3 version by +starting from an impossible version and working backwards until it finds +a version that is installed. + +As a sanity check, if the "impossible" version is actually present, it +aborts. But this appears to be just a sanity check, and not any sort of +guard against buggy version handling code later. + +While the best fix is probably to start from a known *good* version and +move up until we stop finding better versions, there's problems here +(e.g. a user with 3.6 and 3.8 installed would fail to see 3.7 and so be +left with 3.6 as the "best" match), so I opted just to increase the max +version significantly, and improve the documentation as to what's +happening and whether it is safe to repeat the step again later. + +[1]: https://bugs.gentoo.org/746866 +--- + find-modules/FindPythonModuleGeneration.cmake | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake +index 210ba662..6104c1f4 100644 +--- a/find-modules/FindPythonModuleGeneration.cmake ++++ b/find-modules/FindPythonModuleGeneration.cmake +@@ -162,14 +162,19 @@ endif() + + if (NOT GPB_PYTHON3_LIBRARY) + set(_PYTHON3_MIN_VERSION 4) +- set(_PYTHON3_MAX_VERSION 10) + +- _find_python(3 ${_PYTHON3_MAX_VERSION}) # Canary check ++ # This value is safe to increment over time, it is used only as a reasonable ++ # upper bound to start searching from ++ set(_PYTHON3_MAX_VERSION 50) ++ ++ _find_python(3 ${_PYTHON3_MAX_VERSION}) + + if (GPB_PYTHON3_LIBRARY) + message(FATAL_ERROR "The max python version in ${CMAKE_FIND_PACKAGE_NAME} must be updated.") + endif() + ++ # Look for the highest supported version of Python 3 by looking for a minor ++ # version that doesn't exist and decrementing until we find a match. + set(_PYTHON3_FIND_VERSION ${_PYTHON3_MAX_VERSION}) + + while(NOT GPB_PYTHON3_LIBRARY diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 53acd4d8dd1d43..19105838303a6e 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_canberra.patch + fix_python_version.patch # Remove on next release ) vcpkg_cmake_configure( diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json index bc120806eed8cb..11a544924b15ae 100644 --- a/ports/ecm/vcpkg.json +++ b/ports/ecm/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ecm", "version": "5.84.0", - "port-version": 1, + "port-version": 2, "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", "homepage": "https://github.com/KDE/extra-cmake-modules", "dependencies": [ diff --git a/ports/python3/0001-static-library.patch b/ports/python3/0001-static-library.patch index 93a89a2e3c6e27..eef3875742f7b0 100644 --- a/ports/python3/0001-static-library.patch +++ b/ports/python3/0001-static-library.patch @@ -58,6 +58,20 @@ index 2625d0293d..2f8bdaa931 100644 _Py_HAVE_ZLIB;%(PreprocessorDefinitions) +diff --git a/Python/sysmodule.c b/Python/sysmodule.c +index ac49f7867a..f3583345ff 100644 +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c +@@ -2804,6 +2804,9 @@ _PySys_InitCore(PyThreadState *tstate, PyObject *sysdict) + #ifdef MS_COREDLL + SET_SYS("dllhandle", PyLong_FromVoidPtr(PyWin_DLLhModule)); + SET_SYS_FROM_STRING("winver", PyWin_DLLVersionString); ++#elif defined(MS_WINDOWS) ++ SET_SYS("dllhandle", PyLong_FromVoidPtr(NULL)); ++ SET_SYS_FROM_STRING("winver", MS_DLL_ID); + #endif + #ifdef ABIFLAGS + SET_SYS_FROM_STRING("abiflags", ABIFLAGS); -- 2.28.0.windows.1 diff --git a/ports/python3/0006-fix-duplicate-symbols.patch b/ports/python3/0006-fix-duplicate-symbols.patch deleted file mode 100644 index 251c0186abf282..00000000000000 --- a/ports/python3/0006-fix-duplicate-symbols.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 62e082c1eba79d46ba8ab4b7a556a57a2253d555 Mon Sep 17 00:00:00 2001 -From: Adam Johnson -Date: Fri, 11 Sep 2020 12:35:36 -0400 -Subject: [PATCH 6/6] fix duplicate symbols - ---- - Modules/_winapi.c | 2 +- - Modules/overlapped.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Modules/_winapi.c b/Modules/_winapi.c -index e1672c4785..27148094d2 100644 ---- a/Modules/_winapi.c -+++ b/Modules/_winapi.c -@@ -304,7 +304,7 @@ static PyMemberDef overlapped_members[] = { - {NULL} - }; - --PyTypeObject OverlappedType = { -+static PyTypeObject OverlappedType = { - PyVarObject_HEAD_INIT(NULL, 0) - /* tp_name */ "_winapi.Overlapped", - /* tp_basicsize */ sizeof(OverlappedObject), -diff --git a/Modules/overlapped.c b/Modules/overlapped.c -index cd7869fa8a..319ea0a4b7 100644 ---- a/Modules/overlapped.c -+++ b/Modules/overlapped.c -@@ -1756,7 +1756,7 @@ static PyGetSetDef Overlapped_getsets[] = { - {NULL}, - }; - --PyTypeObject OverlappedType = { -+static PyTypeObject OverlappedType = { - PyVarObject_HEAD_INIT(NULL, 0) - /* tp_name */ "_overlapped.Overlapped", - /* tp_basicsize */ sizeof(OverlappedObject), --- -2.28.0.windows.1 - diff --git a/ports/python3/0007-restore-support-for-windows-7.patch b/ports/python3/0006-restore-support-for-windows-7.patch similarity index 100% rename from ports/python3/0007-restore-support-for-windows-7.patch rename to ports/python3/0006-restore-support-for-windows-7.patch diff --git a/ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch b/ports/python3/0007-workaround-windows-11-sdk-rc-compiler-error.patch similarity index 100% rename from ports/python3/0008-workaround-windows-11-sdk-rc-compiler-error.patch rename to ports/python3/0007-workaround-windows-11-sdk-rc-compiler-error.patch diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 8967d5a3d757e1..b57de25bbbf065 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -4,8 +4,8 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_CRT_LINKAGE STREQUAL static endif() set(PYTHON_VERSION_MAJOR 3) -set(PYTHON_VERSION_MINOR 9) -set(PYTHON_VERSION_PATCH 7) +set(PYTHON_VERSION_MINOR 10) +set(PYTHON_VERSION_PATCH 0) set(PYTHON_VERSION ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.${PYTHON_VERSION_PATCH}) set(PATCHES @@ -13,7 +13,6 @@ set(PATCHES 0003-devendor-external-dependencies.patch 0004-dont-copy-vcruntime.patch 0005-only-build-required-projects.patch - 0006-fix-duplicate-symbols.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(PREPEND PATCHES 0001-static-library.patch) @@ -22,7 +21,7 @@ endif() # Python 3.9 removed support for Windows 7. This patch re-adds support for Windows 7 and is therefore # required to build this port on Windows 7 itself due to Python using itself in its own build system. if("deprecated-win7-support" IN_LIST FEATURES) - list(APPEND PATCHES 0007-restore-support-for-windows-7.patch) + list(APPEND PATCHES 0006-restore-support-for-windows-7.patch) message(WARNING "Windows 7 support is deprecated and may be removed at any time.") elseif(VCPKG_TARGET_IS_WINDOWS AND CMAKE_SYSTEM_VERSION EQUAL 6.1) message(FATAL_ERROR "python3 requires the feature deprecated-win7-support when building on Windows 7.") @@ -32,7 +31,7 @@ endif() if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_get_windows_sdk(WINSDK_VERSION) if("${WINSDK_VERSION}" VERSION_GREATER_EQUAL "10.0.22000") - list(APPEND PATCHES "0008-workaround-windows-11-sdk-rc-compiler-error.patch") + list(APPEND PATCHES "0007-workaround-windows-11-sdk-rc-compiler-error.patch") endif() endif() @@ -40,7 +39,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO python/cpython REF v${PYTHON_VERSION} - SHA512 05de4e485fb6f5f21e4e48fb4d7ec0e9a420fab243cba08663e52b8062f86df3e4f57b8afd49ad94d363ca0972ab85efe132b980a7f84188c82814b6df0ba191 + SHA512 d83e0685c274be09da7833a3c24b7379ae0e43b43c131f11bfaccd5902f6a1c510a3ae67c42471a4281922ead3bd34856608ec47be7dd76ddd734e59906ba03b HEAD_REF master PATCHES ${PATCHES} ) diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index c3bec2e6b80daa..22ec71666224cd 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "python3", - "version-semver": "3.9.7", - "port-version": 2, + "version-semver": "3.10.0", "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index a75e3c6be81310..d8b1de614b0c6c 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -149,20 +149,20 @@ function(vcpkg_find_acquire_program VAR) elseif(VAR MATCHES "PYTHON3") if(CMAKE_HOST_WIN32) set(PROGNAME python) - set(PYTHON_VERSION 3.9.7) + set(PYTHON_VERSION 3.10.0) if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) set(SUBDIR "python-${PYTHON_VERSION}-x86") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip") - set(HASH 5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870) + set(HASH 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd) else() set(SUBDIR "python-${PYTHON_VERSION}-x64") set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip") set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip") - set(HASH 482765de165863f86637591d57141930e2c4ca6e210d0c2569bd0e5fe63157966fb44dea0d5adf249ff15ec9c50cb2dddb704c4ea79369d598f348ee5406f160) + set(HASH 23d81d007698383d8dc088da532dcb86c6ceca7eb78ba5688fc2e18ee7f33f53a5632282873762293b8164556dfb15870f8ffb7abd368faba0a3d8d5d5bc6297) endif() set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python39._pth) + set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python310._pth) else() set(PROGNAME python3) set(BREW_PACKAGE_NAME "python") diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index fc07adeb51206c..ad691adbb9ddf5 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -1,11 +1,11 @@ - 3.9.7 + 3.10.0 python.exe - https://www.python.org/ftp/python/3.9.7/python-3.9.7-embed-win32.zip - 5f12f693c6df68b75f96b797740a156f2dcd471e96e7980a6e297bbfd064467ba2b2cc9d2f450296388402a8a0b716fce1c4a25b94b50615503d528e33fea870 - python-3.9.7-embed-win32.zip + https://www.python.org/ftp/python/3.10.0/python-3.10.0-embed-win32.zip + 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd + python-3.10.0-embed-win32.zip 3.21.1 diff --git a/versions/baseline.json b/versions/baseline.json index 9049c7f5673b18..7864ae7b1eb97d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1930,7 +1930,7 @@ }, "ecm": { "baseline": "5.84.0", - "port-version": 1 + "port-version": 2 }, "ecos": { "baseline": "2.0.8", @@ -5337,8 +5337,8 @@ "port-version": 1 }, "python3": { - "baseline": "3.9.7", - "port-version": 2 + "baseline": "3.10.0", + "port-version": 0 }, "qca": { "baseline": "2.3.1", diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index 5ce5bb02b05c1e..82859b55a4dbab 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e01bd7b91852c7fa2dffc588bad45167d8d45c6b", + "version": "5.84.0", + "port-version": 2 + }, { "git-tree": "5832b19b778f60eb0fb24654e0c8b665f0f8fb20", "version": "5.84.0", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 64e2590cd11a83..007cb9431c05af 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "08e4258968ff551133ae315eb8ed207f87f085b6", + "version-semver": "3.10.0", + "port-version": 0 + }, { "git-tree": "3975ee0659914edc75d63f914ac91bb3b7453f0c", "version-semver": "3.9.7", From d1d092894c0d544a17c78677ac3a0991a3ddd72c Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Wed, 6 Oct 2021 16:53:40 -0400 Subject: [PATCH 0758/1858] [google-cloud-cpp] update to latest release (v1.32.1) (#20561) * [google-cloud-cpp] update to latest release (v1.32.1) * Argh, this was sitting in my workspace --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index cc29525cc8455c..b8e1012afe3232 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.32.0 - SHA512 ffec5a4f76fc4232f15940afea137c38f12e395d0b04cf49838e53f04ba28c151c05470191dc9648b5ae9be5bdcc5b449379b3dbb51552917625a9a87b97c8e2 + REF v1.32.1 + SHA512 385adb0e39ed0b3474609d90524bb3fe8c42d92d34626cde7b70b1eb4cd76dd22e9b5b9d0933d600ce7a585c63382d764a038fd8152a39bbbd8010524eb40e9b HEAD_REF main ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 5b3f62ef4207b5..1ef1ea448a8147 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.32.0", - "port-version": 1, + "version": "1.32.1", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7864ae7b1eb97d..88db3497470b38 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2473,8 +2473,8 @@ "port-version": 7 }, "google-cloud-cpp": { - "baseline": "1.32.0", - "port-version": 1 + "baseline": "1.32.1", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 94dbefbdc3c273..2728635df3e800 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42240e5f4653d8ce17158c706e232de8a57a4c6e", + "version": "1.32.1", + "port-version": 0 + }, { "git-tree": "2b53c52b812f1d7fe8ada0a6d938b047b5a3dbd2", "version": "1.32.0", From 28f08c457654bc38272c6fe01236b0dbb71651eb Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Thu, 7 Oct 2021 01:54:21 +0200 Subject: [PATCH 0759/1858] Fix compilation on Emscripten / WebAssembly (#20551) --- .../fix-emscripten-compilation.patch | 31 +++++++++++++++++++ ports/boost-config/portfile.cmake | 2 ++ ports/boost-config/vcpkg.json | 1 + versions/b-/boost-config.json | 5 +++ versions/baseline.json | 2 +- 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ports/boost-config/fix-emscripten-compilation.patch diff --git a/ports/boost-config/fix-emscripten-compilation.patch b/ports/boost-config/fix-emscripten-compilation.patch new file mode 100644 index 00000000000000..f85fa3c478341d --- /dev/null +++ b/ports/boost-config/fix-emscripten-compilation.patch @@ -0,0 +1,31 @@ +From 85292621ece3409a80929add91c971400ba724f3 Mon Sep 17 00:00:00 2001 +From: jzmaddock +Date: Fri, 10 Sep 2021 11:36:29 +0100 +Subject: [PATCH] Add emscripten testing and support. (#403) + +* Tentatively add emscripten testing and support. +Fixes https://github.com/boostorg/config/issues/402. +--- + include/boost/config/platform/wasm.hpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/include/boost/config/platform/wasm.hpp b/include/boost/config/platform/wasm.hpp +index c307812d..682b8485 100644 +--- a/include/boost/config/platform/wasm.hpp ++++ b/include/boost/config/platform/wasm.hpp +@@ -9,6 +9,12 @@ + + #define BOOST_PLATFORM "Wasm" + ++#ifdef __has_include ++#if __has_include() ++# define BOOST_HAS_UNISTD_H ++#endif ++#endif ++ + // boilerplate code: + #include + // +-- +2.21.1 (Apple Git-122.3) + diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 3576a717b10e7f..2fdbf55046404a 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF boost-1.77.0 SHA512 c6df16825b7bb27412667e00b6b6cdecbf56ee0707aa1df3505637c7de5c39c87335fabd7cd4361b29625d71c7664e6af865fc271ad0b3e70cc8872825f6155e HEAD_REF master + PATCHES + fix-emscripten-compilation.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index d8e52641dad4d1..fd0c8713af6a25 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-config", "version": "1.77.0", + "port-version": 1, "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "dependencies": [ diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 6e93f18fe62e2a..920bf11882a50f 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6aa6932068c1fbc812d545502f60c3a7cef80dde", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "2a93a4c962b961f617c133389c18a994e3c27af1", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 88db3497470b38..b47f7e924d9182 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -582,7 +582,7 @@ }, "boost-config": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-container": { "baseline": "1.77.0", From 18102b949196b18974a3b0d7f0bc470c8bc26338 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Oct 2021 01:58:41 +0200 Subject: [PATCH 0760/1858] [opencv4,opencv3] Control exported protobuf dependency (#20550) * Control exported protobuf dependency * Update versions * Control exported protobuf dependency * Update versions --- ports/opencv3/portfile.cmake | 4 ++-- ports/opencv3/vcpkg.json | 2 +- ports/opencv4/portfile.cmake | 4 ++-- ports/opencv4/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/o-/opencv3.json | 5 +++++ versions/o-/opencv4.json | 5 +++++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 36d012663f37a5..2a435a97ef37c0 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -353,8 +353,8 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(Protobuf CONFIG) -if(protobuf_FOUND) +if(${BUILD_opencv_flann}) + find_dependency(Protobuf CONFIG REQUIRED) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) set_target_properties(libprotobuf PROPERTIES diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index f750ae57b19b05..b08ac1c20e9f5f 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv3", "version": "3.4.15", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 760cfbea7efa09..45cf964d54d6d3 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -413,8 +413,8 @@ vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ "${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake" OPENCV_MODULES) set(DEPS_STRING "include(CMakeFindDependencyMacro) -find_dependency(Protobuf CONFIG) -if(protobuf_FOUND) +if(${BUILD_opencv_dnn}) + find_dependency(Protobuf CONFIG REQUIRED) if(TARGET protobuf::libprotobuf) add_library (libprotobuf INTERFACE IMPORTED) set_target_properties(libprotobuf PROPERTIES diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 54ae370087f6a2..ce572115d220c4 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.5.3", - "port-version": 2, + "port-version": 3, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b47f7e924d9182..519a538bedf0e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4818,11 +4818,11 @@ }, "opencv3": { "baseline": "3.4.15", - "port-version": 2 + "port-version": 3 }, "opencv4": { "baseline": "4.5.3", - "port-version": 2 + "port-version": 3 }, "opendnp3": { "baseline": "3.1.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index 0e9d565c6c91d0..835620406cd5b5 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dee8e4cb055e92ed1708903f73dcca96b0793fe5", + "version": "3.4.15", + "port-version": 3 + }, { "git-tree": "27a6a94907d72955e9d473dfbce89ae851ee1bda", "version": "3.4.15", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 9493353a53dcc4..8c909b6e4ab342 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d48f3aabd1d417854360efb92874f3b533f83966", + "version": "4.5.3", + "port-version": 3 + }, { "git-tree": "6b5539ab3cd468944f8d46698c610285319bf0f7", "version": "4.5.3", From d675185e999c6eae62531d583083d0f05b2d630a Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Thu, 7 Oct 2021 05:57:42 +0200 Subject: [PATCH 0761/1858] [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422) * [OpenMVS] restore deprecated cmake scripts * [OpenMVS] fix references * switch back to vcpkg_cmake_* Co-authored-by: nicole mazzuca --- ports/openmvs/portfile.cmake | 3 +-- ports/openmvs/vcpkg.json | 5 +---- versions/baseline.json | 2 +- versions/o-/openmvs.json | 5 +++++ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index ef4f8eac3d6595..eaf1c4a056c02b 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -23,7 +23,6 @@ file(REMOVE "${SOURCE_PATH}/build/Modules/FindEIGEN.cmake") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - GENERATOR Ninja OPTIONS ${FEATURE_OPTIONS} -DOpenMVS_USE_NONFREE=ON -DOpenMVS_USE_CERES=OFF @@ -43,7 +42,7 @@ vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_cmake_config_fixup() +vcpkg_fixup_cmake_targets() file(READ ${CURRENT_PACKAGES_DIR}/share/openmvs/OpenMVSTargets-release.cmake TARGETS_CMAKE) string(REPLACE "bin/InterfaceCOLMAP" "tools/openmvs/InterfaceCOLMAP" TARGETS_CMAKE "${TARGETS_CMAKE}") string(REPLACE "bin/InterfaceVisualSFM" "tools/openmvs/InterfaceVisualSFM" TARGETS_CMAKE "${TARGETS_CMAKE}") diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index 6e482076c17b0e..fa03e4dae91c12 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openmvs", "version": "1.1.1", + "port-version": 1, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "dependencies": [ @@ -31,10 +32,6 @@ "name": "vcpkg-cmake", "host": true }, - { - "name": "vcpkg-cmake-config", - "host": true - }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 519a538bedf0e5..426cbae90fd6f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4874,7 +4874,7 @@ }, "openmvs": { "baseline": "1.1.1", - "port-version": 0 + "port-version": 1 }, "openni2": { "baseline": "2.2.0.33", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 2c4ba8b5f4d664..8ce9dd4c994ca5 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "168233263a9b959a9a19f1eb2d6f462d5257d18f", + "version": "1.1.1", + "port-version": 1 + }, { "git-tree": "cda3b971b05a5519ef36759d8f3f49045fa6445e", "version": "1.1.1", From 12307b828ccc59c427254bf88ec708ddeb88c6f8 Mon Sep 17 00:00:00 2001 From: Lars Glud Date: Thu, 7 Oct 2021 12:22:47 +0200 Subject: [PATCH 0762/1858] [libffi] Don't replace string in file that doesn't exist. (#20554) * Don't replace string in file that doesn't exist. * Update per bot. * Update per bot again. * Address comments. --- ports/libffi/portfile.cmake | 19 ++++++++++++------- ports/libffi/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/l-/libffi.json | 5 +++++ 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/ports/libffi/portfile.cmake b/ports/libffi/portfile.cmake index ba5d4d88cef156..4f6a7b99a86c58 100644 --- a/ports/libffi/portfile.cmake +++ b/ports/libffi/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_from_github( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/libffiConfig.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS @@ -20,7 +20,7 @@ vcpkg_configure_cmake( -DFFI_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Create pkgconfig file set(PACKAGE_VERSION ${VERSION}) @@ -43,12 +43,17 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") endif() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() + if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" - "-lffi" "-llibffi") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" - "-lffi" "-llibffi") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libffi.pc" + "-lffi" "-llibffi") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libffi.pc" + "-lffi" "-llibffi") + endif() endif() vcpkg_fixup_pkgconfig() diff --git a/ports/libffi/vcpkg.json b/ports/libffi/vcpkg.json index 80481cdb7ab012..4525cee7b98bae 100644 --- a/ports/libffi/vcpkg.json +++ b/ports/libffi/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libffi", "version": "3.4.2", - "port-version": 1, + "port-version": 2, "description": "Portable, high level programming interface to various calling conventions", - "homepage": "https://github.com/libffi/libffi" + "homepage": "https://github.com/libffi/libffi", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 426cbae90fd6f4..7ba4b253787961 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3354,7 +3354,7 @@ }, "libffi": { "baseline": "3.4.2", - "port-version": 1 + "port-version": 2 }, "libfido2": { "baseline": "1.7.0", diff --git a/versions/l-/libffi.json b/versions/l-/libffi.json index 52f85d99dbdd82..5454fe15be112d 100644 --- a/versions/l-/libffi.json +++ b/versions/l-/libffi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8fbd8bfde2d551ad1be625223a92997704469a8e", + "version": "3.4.2", + "port-version": 2 + }, { "git-tree": "f9f43cad9f7bd65719c32b242d330492ad326456", "version": "3.4.2", From 17a51204b868e9610d17aac63828d82aef7d0f61 Mon Sep 17 00:00:00 2001 From: eao197 Date: Thu, 7 Oct 2021 13:30:31 +0300 Subject: [PATCH 0763/1858] [json-dto] Update to 0.2.14 (#20570) * json-dto updated to v.0.2.14. * json-dto-0.2.14 added to baseline. * Change deprecated commands. * Update baseline for fresh json-dto-0.2.14. --- ports/json-dto/portfile.cmake | 11 +++++------ ports/json-dto/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/j-/json-dto.json | 5 +++++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ports/json-dto/portfile.cmake b/ports/json-dto/portfile.cmake index dd888973ab9ea6..feb9e3f652a883 100644 --- a/ports/json-dto/portfile.cmake +++ b/ports/json-dto/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/json_dto - REF 7fce92cd3bdacdcd0b41ed26d2cc981e3f70956e # v.0.2.13 - SHA512 f678545cc60828ab76d6e8532ac9dbf8e4e68d873d0a98f17d62934dd0b3a3e255b38adf838b65a12e0d954edc7866eb6393f6783709f6f7fac29167886e7bf3 + REF ea2786711187d6301df9d5a2deb6974f05c5ef44 # v.0.2.14 + SHA512 6c8a664148e65e347cd793f4f03be4d01612691cc4a69a4f84b906e582ea50a42db606c04e33cedb431f4ac45bf112460f109ab581ff2f34e97c2257534b9b40 ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/dev - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS -DJSON_DTO_INSTALL=ON -DJSON_DTO_TEST=OFF @@ -15,9 +14,9 @@ vcpkg_configure_cmake( -DJSON_DTO_INSTALL_SAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/json-dto) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/json-dto) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/debug) diff --git a/ports/json-dto/vcpkg.json b/ports/json-dto/vcpkg.json index 8681bd20fc10e7..41106704e6cd5d 100644 --- a/ports/json-dto/vcpkg.json +++ b/ports/json-dto/vcpkg.json @@ -1,10 +1,18 @@ { "name": "json-dto", - "version": "0.2.13", + "version": "0.2.14", "description": "A small header-only library for converting data between json representation and c++ structs.", "homepage": "https://github.com/Stiffstream/json_dto", "license": "BSD-3-Clause", "dependencies": [ - "rapidjson" + "rapidjson", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7ba4b253787961..d6abcd445ada89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2913,7 +2913,7 @@ "port-version": 2 }, "json-dto": { - "baseline": "0.2.13", + "baseline": "0.2.14", "port-version": 0 }, "json-schema-validator": { diff --git a/versions/j-/json-dto.json b/versions/j-/json-dto.json index d04ece23db4d60..a265dae54fbc5e 100644 --- a/versions/j-/json-dto.json +++ b/versions/j-/json-dto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "171dd3158b291f899517b1bab85f4c76c95a4d56", + "version": "0.2.14", + "port-version": 0 + }, { "git-tree": "a4576b8566a843cf16e9a38143d1a99ae832d130", "version": "0.2.13", From 4c16324c32fe225f0ef5500be4a3f048ba6f15ad Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Thu, 7 Oct 2021 13:34:38 +0300 Subject: [PATCH 0764/1858] [sail] Update to 0.9.0-pre17 (#20562) * [sail] Update to 0.9.0-pre17 * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Update pre17 hash * [sail] vcpkg x-add-version --all --overwrite-version --- ports/sail/portfile.cmake | 4 ++-- ports/sail/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 5be00ca62fbeef..38b45f7141604f 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-pre16 - SHA512 dca4b930c78d0d330cde0a0255efae6042e11914eec37be35b1fc39eaf3855a47f5b2d07be17c8b4c67f569acfab2cfe7ff86aaeba60eed4bbf2be637b1bf192 + REF v0.9.0-pre17 + SHA512 5efa1d56049d84515a92ae2df76476afcfd53ed4ea1f406851bcd86683c3b5390ee53fcd5d1dac233b855a1445496fda7fd7612a157596b0b4d088bacb5dd0fd HEAD_REF master ) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index df5d694f2d81ea..13d3a73659ec66 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,11 +1,12 @@ { "name": "sail", - "version-semver": "0.9.0-pre16", + "version-semver": "0.9.0-pre17", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "supports": "!uwp", "dependencies": [ "giflib", + "jasper", "libavif", "libjpeg-turbo", "libpng", diff --git a/versions/baseline.json b/versions/baseline.json index d6abcd445ada89..3c90da1bfd434d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5969,7 +5969,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre16", + "baseline": "0.9.0-pre17", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index e4789877b31422..d9ec23bef5da8b 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38fab5a13ed3f5e76ec41af54676cd6c5aa4047d", + "version-semver": "0.9.0-pre17", + "port-version": 0 + }, { "git-tree": "a75976401bd0120fec82782d41c53d60fe525ca9", "version-semver": "0.9.0-pre16", From f969f4282492beffc40dcd40bd313297000fee40 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 7 Oct 2021 12:56:57 +0200 Subject: [PATCH 0765/1858] [freexl] Update to 1.0.6 (#20520) * Reformat portfile * Minimize makefiles patch * Update to 1.0.6 * Fix uwp builds, remove skip from baseline * Install pc file for windows * Update versions Co-authored-by: Billy Robert O'Neal III --- ports/freexl/fix-makefiles.patch | 29 +--------- ports/freexl/fix-sources.patch | 22 -------- ports/freexl/portfile.cmake | 96 +++++++++++++++++++------------- ports/freexl/vcpkg.json | 3 +- scripts/ci.baseline.txt | 2 - versions/baseline.json | 4 +- versions/f-/freexl.json | 5 ++ 7 files changed, 65 insertions(+), 96 deletions(-) diff --git a/ports/freexl/fix-makefiles.patch b/ports/freexl/fix-makefiles.patch index 5cf2c470f38039..f6e8251c71d233 100644 --- a/ports/freexl/fix-makefiles.patch +++ b/ports/freexl/fix-makefiles.patch @@ -1,16 +1,7 @@ diff --git a/makefile.vc b/makefile.vc -index 0aacbc7..d95d859 100644 +index cb8bd36..85c0352 100644 --- a/makefile.vc +++ b/makefile.vc -@@ -7,7 +7,7 @@ - LIBOBJ = freexl.obj - FREEXL_DLL = freexl$(VERSION).dll - --CFLAGS = /nologo -IC:\OSGeo4W\include -I. -Iheaders $(OPTFLAGS) -+CFLAGS = /nologo -I$(INSTALLED_ROOT)\include -I. -Iheaders $(OPTFLAGS) - - default: all - @@ -23,9 +23,9 @@ freexl.lib: $(LIBOBJ) $(FREEXL_DLL): freexl_i.lib @@ -23,21 +14,3 @@ index 0aacbc7..d95d859 100644 if exist $(FREEXL_DLL).manifest mt -manifest \ $(FREEXL_DLL).manifest -outputresource:$(FREEXL_DLL);2 -diff --git a/nmake.opt b/nmake.opt -index 35f9242..efb6f77 100644 ---- a/nmake.opt -+++ b/nmake.opt -@@ -1,10 +1,10 @@ - # Directory tree where FreeXL will be installed. --INSTDIR=C:\OSGeo4W -+INSTDIR=$(INST_DIR) - - # Uncomment the first for an optimized build, or the second for debug. --OPTFLAGS= /nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \ -+OPTFLAGS= /nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \ - /DDLL_EXPORT --#OPTFLAGS= /nologo /Zi /MD /Fdfreexl.pdb /DDLL_EXPORT -+#OPTFLAGS= /nologo $(CL_FLAGS) /Fdfreexl.pdb /DDLL_EXPORT - - # Set the version number for the DLL. Normally we leave this blank since - # we want software that is dynamically loading the DLL to have no problem diff --git a/ports/freexl/fix-sources.patch b/ports/freexl/fix-sources.patch index 89a36f3b3bf400..ffac02751a3168 100644 --- a/ports/freexl/fix-sources.patch +++ b/ports/freexl/fix-sources.patch @@ -11,25 +11,3 @@ index a39d4e7..37f1c0b 100644 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. */ -diff --git a/src/freexl.c b/src/freexl.c -index a0b255a..92163a9 100644 ---- a/src/freexl.c -+++ b/src/freexl.c -@@ -92,7 +92,7 @@ freexl_version (void) - #if defined(_WIN32) && !defined(__MINGW32__) - /* MSVC compiler doesn't support lround() at all */ - static double --round (double num) -+round_old (double num) - { - double integer = ceil (num); - if (num > 0) -@@ -101,7 +101,7 @@ round (double num) - } - - static long --lround (double num) -+lround_old (double num) - { - long integer = (long) round (num); - return integer; diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake index 12834382f8a214..b337c80301a040 100644 --- a/ports/freexl/portfile.cmake +++ b/ports/freexl/portfile.cmake @@ -1,70 +1,86 @@ -set(FREEXL_VERSION_STR "1.0.4") +set(FREEXL_VERSION_STR "1.0.6") vcpkg_download_distfile(ARCHIVE - URLS "http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${FREEXL_VERSION_STR}.tar.gz" + URLS "https://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-${FREEXL_VERSION_STR}.tar.gz" FILENAME "freexl-${FREEXL_VERSION_STR}.tar.gz" - SHA512 d72561f7b82e0281cb211fbf249e5e45411a7cdd009cfb58da3696f0a0341ea7df210883bfde794be28738486aeb4ffc67ec2c98fd2acde5280e246e204ce788 + SHA512 efbbe261e57d5c05167ad8e1d5a5b348a7e702c0a4030b18dd2a8c60a38332caccbb073ff604bdf5bafac827310b41c7b79f9fa519ea512d6de2eafd9c1f71f6 ) vcpkg_extract_source_archive_ex( - ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH - PATCHES - fix-makefiles.patch - fix-sources.patch - fix-pc-file.patch + ARCHIVE "${ARCHIVE}" + OUT_SOURCE_PATH SOURCE_PATH + PATCHES + fix-makefiles.patch + fix-sources.patch + fix-pc-file.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(LIBS_ALL_DBG - "\"${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib\" \ - \"${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib\"" - ) - set(LIBS_ALL_REL - "\"${CURRENT_INSTALLED_DIR}/lib/iconv.lib\" \ - \"${CURRENT_INSTALLED_DIR}/lib/charset.lib\"" - ) - + set(OPTFLAGS "/nologo /fp:precise /W3 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT") + set(LIBS_ALL "iconv.lib charset.lib") + if(VCPKG_TARGET_IS_UWP) + string(APPEND OPTFLAGS " /DWINAPI_FAMILY=WINAPI_FAMILY_APP") + string(APPEND LIBS_ALL " WindowsApp.lib /APPCONTAINER") + endif() + cmake_path(NATIVE_PATH CURRENT_PACKAGES_DIR INSTDIR) vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "OPTFLAGS=${OPTFLAGS}" + "CFLAGS=-I. -Iheaders ${OPTFLAGS}" + "LIBS_ALL=${LIBS_ALL}" OPTIONS_DEBUG - INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}/debug" - INST_DIR="${CURRENT_PACKAGES_DIR}/debug" - "LINK_FLAGS=/debug" - "LIBS_ALL=${LIBS_ALL_DBG}" + "INSTDIR=${INSTDIR}\\debug" + "LINK_FLAGS=/debug /LIBPATH:\"${CURRENT_INSTALLED_DIR}/debug/lib\"" OPTIONS_RELEASE - INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" - INST_DIR="${CURRENT_PACKAGES_DIR}" - "LINK_FLAGS=" - "LIBS_ALL=${LIBS_ALL_REL}" + "INSTDIR=${INSTDIR}" + "LINK_FLAGS=/LIBPATH:\"${CURRENT_INSTALLED_DIR}/lib\"" ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib") else() - file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") - endif() + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/lib/freexl.lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/freexl_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/freexl.lib") + endif() + endif() + + set(VERSION "${FREEXL_VERSION_STR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix [[${prefix}]]) + set(ICONV_LIBS "-liconv -lcharset") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freexl.pc") + configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lm" "") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/freexl.pc") + configure_file("${SOURCE_PATH}/freexl.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lm" "") endif() -else() # Build in UNIX +else() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG ) vcpkg_install_make() - vcpkg_fixup_pkgconfig() endif() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/freexl/vcpkg.json b/ports/freexl/vcpkg.json index 3a19e577078c0a..39faf316c990b3 100644 --- a/ports/freexl/vcpkg.json +++ b/ports/freexl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "freexl", - "version-string": "1.0.4", - "port-version": 12, + "version-string": "1.0.6", "description": "FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet", "homepage": "https://www.gaia-gis.it/gaia-sins/freexl-sources", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 7658ee42089214..bc54523900e4af 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -332,8 +332,6 @@ freeglut:x64-osx=fail # Needs /bigobj freeopcua:arm64-windows=fail freetype-gl:x64-uwp=fail -freexl:arm-uwp=fail -freexl:x64-uwp=fail fribidi:arm64-windows=fail fribidi:arm-uwp=fail fribidi:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 3c90da1bfd434d..59a3e9facb0526 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2241,8 +2241,8 @@ "port-version": 1 }, "freexl": { - "baseline": "1.0.4", - "port-version": 12 + "baseline": "1.0.6", + "port-version": 0 }, "fribidi": { "baseline": "1.0.10", diff --git a/versions/f-/freexl.json b/versions/f-/freexl.json index 8df61ab9670b08..05ef3a3a09c5b7 100644 --- a/versions/f-/freexl.json +++ b/versions/f-/freexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9635355d8831e1f9628ecbb8935a8e89813ff51", + "version-string": "1.0.6", + "port-version": 0 + }, { "git-tree": "26e9d42e555e69bf1ea1747739daf3d6551bb46b", "version-string": "1.0.4", From d96f23e43b0dfa3fb328458bf5a9f6a5b470e8ab Mon Sep 17 00:00:00 2001 From: Akash Date: Thu, 7 Oct 2021 14:39:57 -0500 Subject: [PATCH 0766/1858] [dartsim] Update to 6.11.0 (#20566) * Update dartsim * Use newer vcpkg functions * Update version number * Update ports/dartsim/portfile.cmake Co-authored-by: Robert Schumacher * Update versions Co-authored-by: Robert Schumacher --- ports/dartsim/1478.patch | 25 ---------- ports/dartsim/1497.patch | 50 ------------------- ...le_unit_tests_examples_and_tutorials.patch | 33 +++++------- ports/dartsim/portfile.cmake | 18 +++---- ports/dartsim/vcpkg.json | 12 ++++- versions/baseline.json | 2 +- versions/d-/dartsim.json | 5 ++ 7 files changed, 35 insertions(+), 110 deletions(-) delete mode 100644 ports/dartsim/1478.patch delete mode 100644 ports/dartsim/1497.patch diff --git a/ports/dartsim/1478.patch b/ports/dartsim/1478.patch deleted file mode 100644 index ce6dbd1268addd..00000000000000 --- a/ports/dartsim/1478.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6d03ee61c38e2b07b2dbb85f0ba61d2a76956e3b Mon Sep 17 00:00:00 2001 -From: Steve Peters -Date: Fri, 24 Jul 2020 17:24:42 -0700 -Subject: [PATCH] Don't force CMAKE_INSTALL_PREFIX on windows - -Fixes #1477. - -Signed-off-by: Steve Peters ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6552bedc162..47df721559b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ initialize_component_helpers(${PROJECT_NAME}) - - # System install paths on Windows - if(WIN32) -- set(CMAKE_INSTALL_PREFIX "C:/Golems" CACHE PATH "Install prefix" FORCE) -+ set(CMAKE_INSTALL_PREFIX "C:/Golems" CACHE PATH "Install prefix") - endif() - - #=============================================================================== diff --git a/ports/dartsim/1497.patch b/ports/dartsim/1497.patch deleted file mode 100644 index 3f2b6b5b31151c..00000000000000 --- a/ports/dartsim/1497.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 9fde9124927789ca2399f99c1be9b101ed1e8550 Mon Sep 17 00:00:00 2001 -From: Silvio Traversaro -Date: Thu, 3 Sep 2020 17:28:01 +0200 -Subject: [PATCH] CMake: Add DART_SKIP_ advanced option - -Add DART_SKIP_ option to permit to specify that -a dependecy should not used even if it is found in the system. ---- - cmake/DARTMacros.cmake | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/cmake/DARTMacros.cmake b/cmake/DARTMacros.cmake -index 8b1a89292ee..409b02bd742 100644 ---- a/cmake/DARTMacros.cmake -+++ b/cmake/DARTMacros.cmake -@@ -127,7 +127,9 @@ endfunction() - - #=============================================================================== - macro(dart_check_optional_package variable component dependency) -- if(${${variable}_FOUND}) -+ option(DART_SKIP_${variable} "If ON, do not use ${variable} even if it is found." OFF) -+ mark_as_advanced(DART_SKIP_${variable}) -+ if(${${variable}_FOUND} AND NOT ${DART_SKIP_${variable}}) - set(HAVE_${variable} TRUE CACHE BOOL "Check if ${variable} found." FORCE) - if(DART_VERBOSE) - message(STATUS "Looking for ${dependency} - version ${${variable}_VERSION}" -@@ -135,12 +137,17 @@ macro(dart_check_optional_package variable component dependency) - endif() - else() - set(HAVE_${variable} FALSE CACHE BOOL "Check if ${variable} found." FORCE) -- if(ARGV3) # version -- message(STATUS "Looking for ${dependency} - NOT found, to use" -- " ${component}, please install ${dependency} (>= ${ARGV3})") -- else() -- message(STATUS "Looking for ${dependency} - NOT found, to use" -- " ${component}, please install ${dependency}") -+ if(NOT ${${variable}_FOUND}) -+ if(ARGV3) # version -+ message(STATUS "Looking for ${dependency} - NOT found, to use" -+ " ${component}, please install ${dependency} (>= ${ARGV3})") -+ else() -+ message(STATUS "Looking for ${dependency} - NOT found, to use" -+ " ${component}, please install ${dependency}") -+ endif() -+ elseif(${DART_SKIP_${variable}} AND DART_VERBOSE) -+ message(STATUS "Not using ${dependency} - version ${${variable}_VERSION}" -+ " even if found because DART_SKIP_${variable} is ON.") - endif() - return() - endif() diff --git a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch index 08119ce39f457d..e20d8de079b60a 100644 --- a/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch +++ b/ports/dartsim/disable_unit_tests_examples_and_tutorials.patch @@ -1,20 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e32147d..5c85186 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -279,6 +279,7 @@ add_subdirectory(dart) - - set(DART_IN_SOURCE_BUILD TRUE) - -+if (0) - if(TARGET dart AND NOT DART_BUILD_DARTPY) - - # Add a "tests" target to build unit tests. -@@ -330,6 +331,7 @@ if(TARGET dart AND NOT DART_BUILD_DARTPY) - endif(DART_VERBOSE) - - endif() -+endif() - - if (DART_BUILD_DARTPY) - add_subdirectory(python) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9940065eb8..b25fa4919a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -298,7 +298,7 @@ add_subdirectory(dart) + + set(DART_IN_SOURCE_BUILD TRUE) + +-if(TARGET dart) ++if(false) + + # Add a "tests" target to build unit tests. + enable_testing() diff --git a/ports/dartsim/portfile.cmake b/ports/dartsim/portfile.cmake index c208482f1f44fa..d2a7b276fdc637 100644 --- a/ports/dartsim/portfile.cmake +++ b/ports/dartsim/portfile.cmake @@ -4,16 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dartsim/dart - REF v6.9.4 - SHA512 a9e8712a294286772ee1e3c3899aac7d202f1d3c2b9242ebeaddb2a142787b192d5421a6e3f889dd9ff9ca9e9106b1f893a0c8ab2e1656b04fac6d0be13494ba - HEAD_REF release-6.9 + REF v6.11.0 + SHA512 01fbff039bcec71d41334db2d07d0973b1ba58d30d05b29e35e1e3cee853917753b64e1101881113a33adb801559855d38d274fbb3383cfb24d85565254d112d + HEAD_REF main PATCHES - 1478.patch - 1497.patch disable_unit_tests_examples_and_tutorials.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DDART_VERBOSE=ON @@ -26,13 +24,9 @@ vcpkg_configure_cmake( -DDART_SKIP_pagmo=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/dart/cmake TARGET_PATH share/dart) - -# Remove pkg-config file as they are broken upstream (https://github.com/dartsim/dart/issues/1496) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +vcpkg_cmake_config_fixup(CONFIG_PATH share/dart/cmake PACKAGE_NAME dart) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/dartsim/vcpkg.json b/ports/dartsim/vcpkg.json index 5f4c00b1865905..6590d1814070b5 100644 --- a/ports/dartsim/vcpkg.json +++ b/ports/dartsim/vcpkg.json @@ -1,6 +1,6 @@ { "name": "dartsim", - "version": "6.9.4", + "version": "6.11.0", "port-version": 1, "description": "Dynamic Animation and Robotics Toolkit", "homepage": "https://dartsim.github.io/", @@ -21,6 +21,14 @@ "octomap", "ode", "tinyxml2", - "urdfdom" + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 59a3e9facb0526..780884083f52f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1709,7 +1709,7 @@ "port-version": 2 }, "dartsim": { - "baseline": "6.9.4", + "baseline": "6.11.0", "port-version": 1 }, "dataframe": { diff --git a/versions/d-/dartsim.json b/versions/d-/dartsim.json index f5b4f03e25affe..f8a560e40015e3 100644 --- a/versions/d-/dartsim.json +++ b/versions/d-/dartsim.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "000785fa5fa81a597b18c374b887ff476182aa50", + "version": "6.11.0", + "port-version": 1 + }, { "git-tree": "104efce0932ef1a1e1e01358a442cfff637b285e", "version": "6.9.4", From 18f1bf02c3a639c2a7f3f345366650a36dd4fc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Mon, 11 Oct 2021 19:17:16 +0200 Subject: [PATCH 0767/1858] [kf5kio] new port (#19779) * Add kf5kio port [WIP] * Fixed kf5kio for windows * [kf5*] update to 5.75.0 * [kf5kio] fix clang errors on macOS * [kf5kio] add missing dependencies * [kf5kio] use current spec * [kf5kio] install tools, don't remove them * [kf5kio] install data to standard /share location * [kf5kio] only remove what's needed * [kf5kio] wrap paths in quotes * [kf5kio] use semVer * [kf5kio] update versions * [kf5kio] update to 5.84.0 * [kf5kio] fix libiconv for static builds * [kf5kio] libiconv patches only for windows static builds * [kf5kio] update versions * [kf5kio] fix copying tools on Windows * [kf5kio] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5kio] update versions * [kf5kio] update versions * [kf5kio] add comment with a link to a PR * [kf5kio] update versions * [kf5kio] fix CMake Config for static builds * [kf5kio] update versions * [kf5kio] disable notifications if not explicitly enabled * [kf5kio] add kf5wallet feature * [kf5kio] update versions * [kf5kio] knotifications is non-Windows and non-Android * [kf5kio] update versions * [kf5io] re-enable parallel configure * [kf5io] use generic, non-semver versioning * [kf5kio] update versions * [kf5kio] remove the 5.75 version info Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Kuntal Majumder Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/kf5kio/fix_config_cmake.patch | 46 ++++++ ports/kf5kio/fix_dbusmetatypes.patch | 58 ++++++++ ports/kf5kio/fix_libiconv.patch | 202 +++++++++++++++++++++++++++ ports/kf5kio/portfile.cmake | 68 +++++++++ ports/kf5kio/vcpkg.json | 87 ++++++++++++ versions/baseline.json | 4 + versions/k-/kf5kio.json | 9 ++ 7 files changed, 474 insertions(+) create mode 100644 ports/kf5kio/fix_config_cmake.patch create mode 100644 ports/kf5kio/fix_dbusmetatypes.patch create mode 100644 ports/kf5kio/fix_libiconv.patch create mode 100644 ports/kf5kio/portfile.cmake create mode 100644 ports/kf5kio/vcpkg.json create mode 100644 versions/k-/kf5kio.json diff --git a/ports/kf5kio/fix_config_cmake.patch b/ports/kf5kio/fix_config_cmake.patch new file mode 100644 index 00000000000000..608ee5367550d0 --- /dev/null +++ b/ports/kf5kio/fix_config_cmake.patch @@ -0,0 +1,46 @@ +From 0202616076e6b05b7100ae67d7d012e2c22f79fb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Tue, 31 Aug 2021 03:40:09 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5KIOConfig.cmake.in | 23 ++++++++++++++++------- + 1 file changed, 16 insertions(+), 7 deletions(-) + +diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in +index 41699cb03..05922f769 100644 +--- a/KF5KIOConfig.cmake.in ++++ b/KF5KIOConfig.cmake.in +@@ -11,13 +11,22 @@ find_dependency(KF5Config "@KF_DEP_VERSION@") + find_dependency(KF5Service "@KF_DEP_VERSION@") + + if (NOT @KIOCORE_ONLY@) +-find_dependency(KF5Bookmarks "@KF_DEP_VERSION@") +-find_dependency(KF5Completion "@KF_DEP_VERSION@") +-find_dependency(KF5ItemViews "@KF_DEP_VERSION@") +-find_dependency(KF5JobWidgets "@KF_DEP_VERSION@") +-find_dependency(KF5Solid "@KF_DEP_VERSION@") +-find_dependency(KF5XmlGui "@KF_DEP_VERSION@") +-find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") ++ find_dependency(KF5Bookmarks "@KF_DEP_VERSION@") ++ find_dependency(KF5Completion "@KF_DEP_VERSION@") ++ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") ++ find_dependency(KF5JobWidgets "@KF_DEP_VERSION@") ++ find_dependency(KF5Solid "@KF_DEP_VERSION@") ++ find_dependency(KF5XmlGui "@KF_DEP_VERSION@") ++ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") ++ ++ if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") ++ find_dependency(KF5Crash "@KF_DEP_VERSION@") ++ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") ++ find_dependency(KF5DBusAddons "@KF_DEP_VERSION@") ++ endif() + endif() + + find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") +-- +GitLab + diff --git a/ports/kf5kio/fix_dbusmetatypes.patch b/ports/kf5kio/fix_dbusmetatypes.patch new file mode 100644 index 00000000000000..d59f19a60bc52d --- /dev/null +++ b/ports/kf5kio/fix_dbusmetatypes.patch @@ -0,0 +1,58 @@ +diff --git a/src/core/kssld_dbusmetatypes.h b/src/core/kssld_dbusmetatypes.h +index 2fb9fa25..958f4ff7 100644 +--- a/src/core/kssld_dbusmetatypes.h ++++ b/src/core/kssld_dbusmetatypes.h +@@ -17,7 +17,7 @@ + Q_DECLARE_METATYPE(KSslCertificateRule) + Q_DECLARE_METATYPE(QSslError::SslError) + +-QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert) ++inline QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert) + { + argument.beginStructure(); + argument << cert.toDer(); +@@ -25,7 +25,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert) + return argument; + } + +-const QDBusArgument &operator>>(const QDBusArgument &argument, QSslCertificate &cert) ++inline const QDBusArgument &operator>>(const QDBusArgument &argument, QSslCertificate &cert) + { + QByteArray data; + argument.beginStructure(); +@@ -35,7 +35,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QSslCertificate & + return argument; + } + +-QDBusArgument &operator<<(QDBusArgument &argument, const KSslCertificateRule &rule) ++inline QDBusArgument &operator<<(QDBusArgument &argument, const KSslCertificateRule &rule) + { + argument.beginStructure(); + argument << rule.certificate() << rule.hostName() << rule.isRejected() << rule.expiryDateTime().toString(Qt::ISODate) +@@ -44,7 +44,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const KSslCertificateRule &ru + return argument; + } + +-const QDBusArgument &operator>>(const QDBusArgument &argument, KSslCertificateRule &rule) ++inline const QDBusArgument &operator>>(const QDBusArgument &argument, KSslCertificateRule &rule) + { + QSslCertificate cert; + QString hostName; +@@ -63,7 +63,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, KSslCertificateRu + return argument; + } + +-QDBusArgument &operator<<(QDBusArgument &argument, const QSslError::SslError &error) ++inline QDBusArgument &operator<<(QDBusArgument &argument, const QSslError::SslError &error) + { + argument.beginStructure(); // overhead ho! + argument << static_cast(error); +@@ -71,7 +71,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const QSslError::SslError &er + return argument; + } + +-const QDBusArgument &operator>>(const QDBusArgument &argument, QSslError::SslError &error) ++inline const QDBusArgument &operator>>(const QDBusArgument &argument, QSslError::SslError &error) + { + int data; + argument.beginStructure(); diff --git a/ports/kf5kio/fix_libiconv.patch b/ports/kf5kio/fix_libiconv.patch new file mode 100644 index 00000000000000..7212b906ce15be --- /dev/null +++ b/ports/kf5kio/fix_libiconv.patch @@ -0,0 +1,202 @@ +diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt +index 20fca30..bcd795e 100644 +--- a/src/ioslaves/file/CMakeLists.txt ++++ b/src/ioslaves/file/CMakeLists.txt +@@ -33,7 +33,9 @@ ecm_qt_export_logging_category( + EXPORT KIO + ) + +-target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::DBus Qt5::Network) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::DBus Qt5::Network ${Iconv_LIBRARIES}) + + if(UNIX) + target_link_libraries(kio_file Qt5::Network KF5::AuthCore) +diff --git a/src/ioslaves/ftp/CMakeLists.txt b/src/ioslaves/ftp/CMakeLists.txt +index b9602fa..e80f7ce 100644 +--- a/src/ioslaves/ftp/CMakeLists.txt ++++ b/src/ioslaves/ftp/CMakeLists.txt +@@ -21,6 +21,8 @@ ecm_qt_export_logging_category( + EXPORT KIO + ) + +-target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n KF5::ConfigCore) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n KF5::ConfigCore ${Iconv_LIBRARIES}) + + install(TARGETS kio_ftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio) +diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt +index 51bd392..db43701 100644 +--- a/src/ioslaves/http/CMakeLists.txt ++++ b/src/ioslaves/http/CMakeLists.txt +@@ -37,11 +37,15 @@ target_sources(kio_http_cache_cleaner PRIVATE + http_cache_cleaner.cpp + ) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(kio_http_cache_cleaner + Qt5::DBus + Qt5::Network # QLocalSocket + KF5::KIOCore # KProtocolManager +- KF5::I18n) ++ KF5::I18n ++ ${Iconv_LIBRARIES} ++) + + install(TARGETS kio_http_cache_cleaner DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} ) + +@@ -96,6 +100,7 @@ target_link_libraries(kio_http + KF5::KIONTLM + KF5::Archive + KF5::I18n ++ ${Iconv_LIBRARIES} + ) + if(GSSAPI_FOUND) + target_link_libraries(kio_http ${GSSAPI_LIBS} ) +diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt +index 0f770ae..2600d2d 100644 +--- a/src/ioslaves/http/kcookiejar/CMakeLists.txt ++++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt +@@ -13,10 +13,13 @@ target_sources(kcookiejar5 PRIVATE + main.cpp + ) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries( kcookiejar5 + Qt5::DBus + KF5::I18n + KF5::WidgetsAddons ++ ${Iconv_LIBRARIES} + ) + + install(TARGETS kcookiejar5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) +@@ -55,6 +58,7 @@ target_link_libraries(kded_kcookiejar + KF5::DBusAddons + KF5::I18n + KF5::WidgetsAddons ++ ${Iconv_LIBRARIES} + ) + + ########### install files ############### +diff --git a/src/ioslaves/remote/CMakeLists.txt b/src/ioslaves/remote/CMakeLists.txt +index 36a97cf..9319a61 100644 +--- a/src/ioslaves/remote/CMakeLists.txt ++++ b/src/ioslaves/remote/CMakeLists.txt +@@ -21,4 +21,6 @@ ecm_qt_declare_logging_category(kio_remote + EXPORT KIO + ) + +-target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::Network) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::Network ${Iconv_LIBRARIES}) +diff --git a/src/ioslaves/remote/kdedmodule/CMakeLists.txt b/src/ioslaves/remote/kdedmodule/CMakeLists.txt +index 4e40d21..7ba0d91 100644 +--- a/src/ioslaves/remote/kdedmodule/CMakeLists.txt ++++ b/src/ioslaves/remote/kdedmodule/CMakeLists.txt +@@ -1,7 +1,9 @@ + add_library(remotedirnotify MODULE remotedirnotify.cpp remotedirnotifymodule.cpp ../debug.cpp) + kcoreaddons_desktop_to_json(remotedirnotify remotedirnotify.desktop) + +-target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore ${Iconv_LIBRARIES}) + # Rename target to allow co-installability with plasma-workspace <= 5.9 + set_target_properties(remotedirnotify PROPERTIES OUTPUT_NAME "remotenotifier") + +diff --git a/src/ioslaves/telnet/CMakeLists.txt b/src/ioslaves/telnet/CMakeLists.txt +index ffee12c..0b03c21 100644 +--- a/src/ioslaves/telnet/CMakeLists.txt ++++ b/src/ioslaves/telnet/CMakeLists.txt +@@ -2,10 +2,13 @@ + add_executable(ktelnetservice5 ktelnetservice.cpp) + ecm_mark_nongui_executable(ktelnetservice5) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(ktelnetservice5 + Qt5::Widgets + KF5::I18n + KF5::KIOGui ++ ${Iconv_LIBRARIES} + ) + + install(TARGETS ktelnetservice5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +diff --git a/src/ioslaves/trash/CMakeLists.txt b/src/ioslaves/trash/CMakeLists.txt +index 80489d9..364ecb4 100644 +--- a/src/ioslaves/trash/CMakeLists.txt ++++ b/src/ioslaves/trash/CMakeLists.txt +@@ -55,6 +55,8 @@ else() + ) + endif() + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(kio_trash + KF5::ConfigCore + KF5::Solid +@@ -63,6 +65,7 @@ target_link_libraries(kio_trash + Qt5::Network + KF5::I18n + KF5::ConfigCore ++ ${Iconv_LIBRARIES} + ) + if(APPLE) + target_link_libraries(kio_trash "-framework DiskArbitration -framework CoreFoundation") +@@ -84,6 +87,7 @@ target_link_libraries(ktrash5 + KF5::KIOCore + KF5::I18n + KF5::ConfigCore ++ ${Iconv_LIBRARIES} + ) + + install(TARGETS ktrash5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt +index 92eeafe..8ae8742 100644 +--- a/src/kioexec/CMakeLists.txt ++++ b/src/kioexec/CMakeLists.txt +@@ -19,7 +19,9 @@ ecm_qt_declare_logging_category(kioexecd + EXPORT KIO + ) + +-target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore) ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) ++target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore ${Iconv_LIBRARIES}) + + kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kioexecd ${KDE_INSTALL_FULL_LIBEXECDIR_KF5}) + +@@ -45,6 +47,7 @@ target_link_libraries(kioexec + KF5::WidgetsAddons # KMessageBox + KF5::WindowSystem # KStartupInfo + KF5::DBusAddons # KDBusService ++ ${Iconv_LIBRARIES} + ) + + if (HAVE_X11) +diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt +index c268e03..c1a562a 100644 +--- a/src/kpasswdserver/CMakeLists.txt ++++ b/src/kpasswdserver/CMakeLists.txt +@@ -39,6 +39,8 @@ ecm_qt_export_logging_category( + EXPORT KIO + ) + ++find_package(Iconv REQUIRED) ++include_directories(${Iconv_INCLUDE_DIRS}) + target_link_libraries(kiod_kpasswdserver + KF5::DBusAddons # KDED Module + Qt5::DBus +@@ -46,6 +48,7 @@ target_link_libraries(kiod_kpasswdserver + KF5::WidgetsAddons # KPasswordDialog + KF5::I18n + KF5::WindowSystem ++ ${Iconv_LIBRARIES} + ${WALLET_LIB} + ) + diff --git a/ports/kf5kio/portfile.cmake b/ports/kf5kio/portfile.cmake new file mode 100644 index 00000000000000..b38e88b6aaa4f2 --- /dev/null +++ b/ports/kf5kio/portfile.cmake @@ -0,0 +1,68 @@ +set(PATCHES + fix_dbusmetatypes.patch # https://invent.kde.org/frameworks/kio/-/merge_requests/563 + fix_config_cmake.patch # https://invent.kde.org/frameworks/kio/-/merge_requests/565 +) + +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) + list(APPEND PATCHES fix_libiconv.patch) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kio + REF v5.84.0 + SHA512 6c2d57a31e64ff1475b21d7fb2556d37b061dae319ddfe57a36f0bfc9627db624b1ac8fa4b2851681cb90d218255d0444c1403329d88f34a23e8ddffe99ca5b4 + HEAD_REF master + PATCHES ${PATCHES} +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "kf5notifications" CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications + "kf5wallet" CMAKE_DISABLE_FIND_PACKAGE_KF5Wallet +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DCMAKE_VERBOSE_MAKEFILE=ON + -DKDE_INSTALL_QTPLUGINDIR=plugins + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_LIBEXECDIR=bin + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5KIO CONFIG_PATH lib/cmake/KF5KIO) +vcpkg_copy_pdbs() + +set(LIBEXEC_TOOLS kio_http_cache_cleaner kiod5 kioexec kioslave5) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + if(NOT VCPKG_TARGET_IS_ANDROID) + list(APPEND LIBEXEC_TOOLS kpac_dhcp_helper) + endif() + + list(TRANSFORM LIBEXEC_TOOLS PREPEND "kf5/") +endif() + +vcpkg_copy_tools( + TOOL_NAMES kcookiejar5 ktelnetservice5 ktrash5 protocoltojson ${LIBEXEC_TOOLS} + AUTO_CLEAN +) + +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5kio/vcpkg.json b/ports/kf5kio/vcpkg.json new file mode 100644 index 00000000000000..1c0cc8f73f3810 --- /dev/null +++ b/ports/kf5kio/vcpkg.json @@ -0,0 +1,87 @@ +{ + "name": "kf5kio", + "version": "5.84.0", + "description": "Network transparent access to files and data", + "homepage": "https://api.kde.org/frameworks/kio/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + { + "name": "kf5auth", + "platform": "!windows" + }, + "kf5bookmarks", + "kf5completion", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5crash", + "kf5dbusaddons", + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5jobwidgets", + "kf5service", + "kf5solid", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5windowsystem", + "kf5xmlgui", + { + "name": "libiconv", + "platform": "windows & static" + }, + "qt5-base", + { + "name": "qt5-macextras", + "platform": "osx" + }, + { + "name": "qt5-x11extras", + "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "kf5notifications": { + "description": "Required to have error notification support in kpac", + "dependencies": [ + { + "name": "kf5kio", + "default-features": false, + "features": [ + "unixkf5notifications" + ], + "platform": "!(windows | android)" + } + ] + }, + "kf5wallet": { + "description": "Required to have permanent storage of passwords for kpasswdserver", + "dependencies": [ + "kf5wallet" + ] + }, + "unixkf5notifications": { + "description": "Required to have error notification support in kpac (windows only)", + "dependencies": [ + "kf5notifications" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 780884083f52f8..80b99c5fa37d83 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3056,6 +3056,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5kio": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5notifications": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5kio.json b/versions/k-/kf5kio.json new file mode 100644 index 00000000000000..b3e07774dfb2cf --- /dev/null +++ b/versions/k-/kf5kio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4a9411ad4abdf7acb9b7a7ef98dd9b966f8b58d5", + "version": "5.84.0", + "port-version": 0 + } + ] +} From 261296bdf7e6cff44cba238b4f002ab1c1fc6143 Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Mon, 11 Oct 2021 13:19:49 -0400 Subject: [PATCH 0768/1858] [activemq-cpp] support linux (#19789) @PhoebeHui > * I think we need a discussion about unofficial being in the namespace I still want to discuss this --- ports/activemq-cpp/activemq-cppConfig.cmake | 319 +++++++++++++++++++ ports/activemq-cpp/fix-crt-linkage-dyn.patch | 36 +++ ports/activemq-cpp/portfile.cmake | 177 +++++----- ports/activemq-cpp/vcpkg.json | 6 +- scripts/ci.baseline.txt | 1 - versions/a-/activemq-cpp.json | 5 + versions/baseline.json | 2 +- 7 files changed, 470 insertions(+), 76 deletions(-) create mode 100644 ports/activemq-cpp/activemq-cppConfig.cmake create mode 100644 ports/activemq-cpp/fix-crt-linkage-dyn.patch diff --git a/ports/activemq-cpp/activemq-cppConfig.cmake b/ports/activemq-cpp/activemq-cppConfig.cmake new file mode 100644 index 00000000000000..5719f9b6bb30a1 --- /dev/null +++ b/ports/activemq-cpp/activemq-cppConfig.cmake @@ -0,0 +1,319 @@ +set(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_DIR}") +foreach(i RANGE 1 2) + get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) + if (_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") + break() + endif() +endforeach() + +# Macro to find OS dependencies for windows builds. +# Sets up for failure find_package() failure if dependencies not found. +# On success, creates targets unofficial::activemq-cpp::ws2, unofficial::activemq-cpp::rpcrt4, and unofficial::activemq-cpp::mswsock. +# Sets boolean ${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND to TRUE or FALSE to indicate success or failure. +macro(_activemq_cpp_windows_dependencies) + find_library(ACTIVEMQ_CPP_LIBWS2 WS2_32) + find_file(ACTIVEMQ_CPP_DLLWS2 WS2_32.dll) + find_library(ACTIVEMQ_CPP_LIBRPCRT4 RpcRT4) + find_file(ACTIVEMQ_CPP_DLLRPCRT4 RpcRT4.dll) + find_library(ACTIVEMQ_CPP_LIBMSWSOCK MsWsock) + find_file(ACTIVEMQ_CPP_DLLMSWSOCK MsWsock.dll) + if(ACTIVEMQ_CPP_LIBWS2 AND ACTIVEMQ_CPP_DLLWS2 AND ACTIVEMQ_CPP_LIBRPCRT4 AND ACTIVEMQ_CPP_DLLRPCRT4 AND ACTIVEMQ_CPP_LIBMSWSOCK AND ACTIVEMQ_CPP_DLLMSWSOCK) + add_library(unofficial::activemq-cpp::ws2 SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::ws2 + PROPERTIES + IMPORTED_LOCATION "${ACTIVEMQ_CPP_DLLWS2}" + IMPORTED_IMPLIB "${ACTIVEMQ_CPP_LIBWS2}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + ) + add_library(unofficial::activemq-cpp::rpcrt4 SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::rpcrt4 + PROPERTIES + IMPORTED_LOCATION "${ACTIVEMQ_CPP_DLLRPCRT4}" + IMPORTED_IMPLIB "${ACTIVEMQ_CPP_LIBRPCRT4}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + ) + add_library(unofficial::activemq-cpp::mswsock SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::mswsock + PROPERTIES + IMPORTED_LOCATION "${ACTIVEMQ_CPP_DLLMSWSOCK}" + IMPORTED_IMPLIB "${ACTIVEMQ_CPP_LIBMSWSOCK}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + ) + set(${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND TRUE) + else() + if (NOT ACTIVEMQ_CPP_LIBWS2) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "WS2_32.lib") + endif() + if (NOT ACTIVEMQ_CPP_DLLWS2) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "WS2_32.dll") + endif() + if (NOT ACTIVEMQ_CPP_LIBRPCRT4) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "RpcRT4.lib") + endif() + if (NOT ACTIVEMQ_CPP_DLLRPCRT4) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "RpcRT4.dll") + endif() + if (NOT ACTIVEMQ_CPP_LIBMSWSOCK) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "MsWsock.lib") + endif() + if (NOT ACTIVEMQ_CPP_DLLMSWSOCK) + list(APPEND _ACTIVEMQ_CPP_MISSINGS "MsWsock.dll") + endif() + list(JOIN _ACTIVEMQ_CPP_MISSINGS ", " _ACTIVEMQ_CPP_MISSINGS_STR) + list(LENGTH _ACTIVEMQ_CPP_MISSINGS _ACTIVEMQ_CPP_MISSINGS_COUNT) + if(_ACTIVEMQ_CPP_MISSINGS_COUNT EQUALS 1) + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependency: ${_ACTIVEMQ_CPP_MISSINGS_STR}") + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: Did not find windows dependencies: ${_ACTIVEMQ_CPP_MISSINGS_STR}") + endif() + set(_ACTIVEMQ_CPP_MISSINGS_COUNT) + set(_ACTIVEMQ_CPP_MISSINGS_STR) + set(_ACTIVEMQ_CPP_MISSINGS) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND FALSE) + endif() +endmacro() + +# Set the variable named VARNAME to "${FILE}" if the file FILE exists; clears it +# otherwise. Opposite for VARNAME_MISSING. +function(_set_exists VARNAME VARNAME_MISSING FILE) + if (EXISTS "${FILE}") + set(${VARNAME} "${FILE}" PARENT_SCOPE) + unset(${VARNAME_MISSING} PARENT_SCOPE) + else() + set(${VARNAME_MISSING} "${FILE}" PARENT_SCOPE) + unset(${VARNAME} PARENT_SCOPE) + endif() +endfunction() + +# Add the unofficial::activemq-cpp::apr and unofficial::activemq-cpp::activemq-cpp targets +# Doesn't work for Windows DLL installs because that takes more args... +function(_add_apr_and_amq_targets INC_PARENT LIB_TYPE APR_REL APR_DEB AMQ_REL AMQ_DEB DEPS) + # the APR port doesn't have a CMake config target so create one + add_library(unofficial::activemq-cpp::apr ${LIB_TYPE} IMPORTED) + set_target_properties(unofficial::activemq-cpp::apr + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_RELEASE "${APR_REL}" + IMPORTED_LOCATION_DEBUG "${APR_DEB}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${INC_PARENT}/include" + ) + + # the create the activemq-cpp CMake config target with a dependency on apr + add_library(unofficial::activemq-cpp::activemq-cpp ${LIB_TYPE} IMPORTED) + set_target_properties(unofficial::activemq-cpp::activemq-cpp + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_DEBUG "${AMQ_DEB}" + IMPORTED_LOCATION_RELEASE "${AMQ_REL}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${INC_PARENT}/include" + INTERFACE_LINK_LIBRARIES "${DEPS}" + ) +endfunction() + +# +# Since this is a CMake config file for a non-CMake project, and one that is +# for vcpkg to as well, the config file has to cover the various products of +# the builds on the various platforms. +# +# Below, Windows and Linux are covered for static and shared libraries. +# +_set_exists(ACTIVEMQ_CPP_DLL_RELEASE _ACTIVEMQ_CPP_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/bin/activemq-cpp.dll") +_set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/activemq-cpp.lib") +_set_exists(ACTIVEMQ_CPP_DLL_DEBUG _ACTIVEMQ_CPP_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/bin/activemq-cppd.dll") +_set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/activemq-cppd.lib") +if (ACTIVEMQ_CPP_DLL_RELEASE) + # + # Windows shared install + # + if (ACTIVEMQ_CPP_LIB_RELEASE AND ACTIVEMQ_CPP_DLL_DEBUG AND ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.lib") + _set_exists(ACTIVEMQ_CPP_APR_DLL_RELEASE _ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.dll") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.lib") + _set_exists(ACTIVEMQ_CPP_APR_DLL_DEBUG _ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.dll") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_DLL_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG AND ACTIVEMQ_CPP_APR_DLL_DEBUG) + _activemq_cpp_windows_dependencies() + if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND) + # the APR port doesn't have a CMake config target so create one + add_library(unofficial::activemq-cpp::apr SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::apr + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_RELEASE "${ACTIVEMQ_CPP_APR_DLL_RELEASE}" + IMPORTED_IMPLIB_RELEASE "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + IMPORTED_LOCATION_DEBUG "${ACTIVEMQ_CPP_APR_DLL_DEBUG}" + IMPORTED_IMPLIB_DEBUG "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + ) + + # the create the activemq-cpp CMake config target with a dependency on apr + add_library(unofficial::activemq-cpp::activemq-cpp SHARED IMPORTED) + set_target_properties(unofficial::activemq-cpp::activemq-cpp + PROPERTIES + MAP_IMPORTED_CONFIG_MINSIZEREL Release + MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release + IMPORTED_LOCATION_RELEASE "${ACTIVEMQ_CPP_DLL_RELEASE}" + IMPORTED_IMPLIB_RELEASE "${ACTIVEMQ_CPP_LIB_RELEASE}" + IMPORTED_LOCATION_DEBUG "${ACTIVEMQ_CPP_DLL_DEBUG}" + IMPORTED_IMPLIB_DEBUG "${ACTIVEMQ_CPP_LIB_DEBUG}" + IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" + INTERFACE_LINK_LIBRARIES "unofficial::activemq-cpp::apr;unofficial::activemq-cpp::ws2;unofficial::activemq-cpp::rpcrt4;unofficial::activemq-cpp::mswsock" + ) + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING + ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} + ${_ACTIVEMQ_CPP_APR_DLL_RELEASE_MISSING} + ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING} + ${_ACTIVEMQ_CPP_APR_DLL_DEBUG_MISSING} + ) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + set(activemq-cppConfig_FOUND TRUE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${_IMPORT_PREFIX}debug/bin/activemq-cppd.dll.") + foreach(_MISSING + ${_ACTIVEMQ_CPP_LIB_RELEASE_MISSING} + ${_ACTIVEMQ_CPP_DLL_DEBUG_MISSING} + ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() +else() + # + # not Windows shared install + # + _set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libactivemq-cpp.lib") + _set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libactivemq-cpp.lib") + if (ACTIVEMQ_CPP_LIB_RELEASE) + # + # Windows static install + # + if (ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/apr-1.lib") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/apr-1.lib") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG) + _activemq_cpp_windows_dependencies() + if (${CMAKE_FIND_PACKAGE_NAME}_WINDOWS_DEPENDENCIES_FOUND) + _add_apr_and_amq_targets("${_IMPORT_PREFIX}" + STATIC + "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + "${ACTIVEMQ_CPP_LIB_RELEASE}" + "${ACTIVEMQ_CPP_LIB_DEBUG}" + "unofficial::activemq-cpp::apr;unofficial::activemq-cpp::ws2;unofficial::activemq-cpp::rpcrt4;unofficial::activemq-cpp::mswsock") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${ACTIVEMQ_CPP_LIB_RELEASE} but not ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + # + # not Windows shared or static install + # + _set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libactivemq-cpp.so.19.0.5") + _set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libactivemq-cpp.so.19.0.5") + if(ACTIVEMQ_CPP_LIB_RELEASE) + # + # Linux shared install (this may pick up some other Unix-like installs) + # + if (ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.so") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.so") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG) + find_package(Threads) + if (Threads_FOUND) + _add_apr_and_amq_targets("${_IMPORT_PREFIX}" + SHARED + "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + "${ACTIVEMQ_CPP_LIB_RELEASE}" + "${ACTIVEMQ_CPP_LIB_DEBUG}" + "unofficial::activemq-cpp::apr;Threads::Threads") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: threads library not found.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${ACTIVEMQ_CPP_LIB_RELEASE} but not ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + # + # not Windows shared or static or Linux shared install + # + _set_exists(ACTIVEMQ_CPP_LIB_RELEASE _ACTIVEMQ_CPP_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libactivemq-cpp.a") + _set_exists(ACTIVEMQ_CPP_LIB_DEBUG _ACTIVEMQ_CPP_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libactivemq-cpp.a") + if (ACTIVEMQ_CPP_LIB_RELEASE) + # + # Linux static install (this may pick up some other Unix-like installs) + # + if (ACTIVEMQ_CPP_LIB_DEBUG) + _set_exists(ACTIVEMQ_CPP_APR_LIB_RELEASE _ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING "${_IMPORT_PREFIX}/lib/libapr-1.a") + _set_exists(ACTIVEMQ_CPP_APR_LIB_DEBUG _ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING "${_IMPORT_PREFIX}/debug/lib/libapr-1.a") + if (ACTIVEMQ_CPP_APR_LIB_RELEASE AND ACTIVEMQ_CPP_APR_LIB_DEBUG) + find_package(Threads) + if (Threads_FOUND) + _add_apr_and_amq_targets("${_IMPORT_PREFIX}" + STATIC + "${ACTIVEMQ_CPP_APR_LIB_RELEASE}" + "${ACTIVEMQ_CPP_APR_LIB_DEBUG}" + "${ACTIVEMQ_CPP_LIB_RELEASE}" + "${ACTIVEMQ_CPP_LIB_DEBUG}" + "unofficial::activemq-cpp::apr;Threads::Threads") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND TRUE) + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: threads library not found.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install dependency failure: apr vcpkg port not found in ${_IMPORT_PREFIX}.") + foreach(_MISSING ${_ACTIVEMQ_CPP_APR_LIB_RELEASE_MISSING} ${_ACTIVEMQ_CPP_APR_LIB_DEBUG_MISSING}) + string(APPEND ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE " \"${_MISSING}\" not found.") + endforeach() + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg install error: Found ${ACTIVEMQ_CPP_LIB_RELEASE} but not ${_ACTIVEMQ_CPP_LIB_DEBUG_MISSING}") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + else() + # + # Some other configuration... + # (not Windows shared or static or Linux shared or static install) + # + set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Activemq-cpp vcpkg unexpected install: could not find any expected activemq-cpp libraries under ${_IMPORT_PREFIX}. The CMake configuration file only understands Windows and Linux static and shared installs from vcpkg.") + set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) + endif() + endif() + endif() +endif() diff --git a/ports/activemq-cpp/fix-crt-linkage-dyn.patch b/ports/activemq-cpp/fix-crt-linkage-dyn.patch new file mode 100644 index 00000000000000..c2a3a399e95085 --- /dev/null +++ b/ports/activemq-cpp/fix-crt-linkage-dyn.patch @@ -0,0 +1,36 @@ +diff --git a/vs2010-build/activemq-cpp.vcxproj b/vs2010-build/activemq-cpp.vcxproj +index 54b4822..6b35511 100644 +--- a/vs2010-build/activemq-cpp.vcxproj ++++ b/vs2010-build/activemq-cpp.vcxproj +@@ -2578,6 +2578,7 @@ + Default + true + false ++ MultiThreadedDebugDLL + true + + +@@ -2687,6 +2688,7 @@ + true + false + true ++ MultiThreadedDebugDLL + + + +@@ -2794,6 +2796,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + true ++ MultiThreadedDLL + + + +@@ -2906,6 +2909,7 @@ + ../src/main;$(APR_DIST)\$(PlatformName)\include;$(OPENSSL_DIST)\$(PlatformName)\include;$(PLATFORM_SDK)\include;%(AdditionalIncludeDirectories) + false + true ++ MultiThreadedDLL + + + diff --git a/ports/activemq-cpp/portfile.cmake b/ports/activemq-cpp/portfile.cmake index 6afa95b7914c74..4700c5c3df60f4 100644 --- a/ports/activemq-cpp/portfile.cmake +++ b/ports/activemq-cpp/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx") +vcpkg_fail_port_install( ON_TARGET "uwp" "osx") set(VERSION 3.9.5) @@ -8,92 +8,127 @@ vcpkg_download_distfile(ARCHIVE SHA512 83692d3dfd5ecf557fc88d204a03bf169ce6180bcff27be41b09409b8f7793368ffbeed42d98ef6374c6b6b477d9beb8a4a9ac584df9e56725ec59ceceaa6ae2 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES - FunctionLevelLinkingOn.diff - fix-crt-linkage.patch -) +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + ) -set(ACTIVEMQCPP_MSVC_PROJ ${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj) + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + "--with-openssl=${CURRENT_INSTALLED_DIR}" + "--with-apr=${CURRENT_INSTALLED_DIR}/tools/apr" + ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ACTIVEMQCPP_SHARED_LIB) + vcpkg_install_make() + file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/activemq" "${CURRENT_PACKAGES_DIR}/include/activemq") + file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/cms" "${CURRENT_PACKAGES_DIR}/include/cms") + file(RENAME "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}/decaf" "${CURRENT_PACKAGES_DIR}/include/decaf") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/activemq-cpp-${VERSION}") -if (ACTIVEMQCPP_SHARED_LIB) - set(RELEASE_CONF "ReleaseDLL") - set(DEBUG_CONF "DebugDLL") - - set(ACTIVEMQCPP_LIB_PREFFIX ) - set(ACTIVEMQCPP_LIB_SUFFIX d) - vcpkg_replace_string(${ACTIVEMQCPP_MSVC_PROJ} ";apr-1.lib" ";libapr-1.lib") + vcpkg_copy_pdbs() else() - set(RELEASE_CONF "Release") - set(DEBUG_CONF "Debug") - - set(ACTIVEMQCPP_LIB_PREFFIX lib) - set(ACTIVEMQCPP_LIB_SUFFIX ) - vcpkg_replace_string(${ACTIVEMQCPP_MSVC_PROJ} ";libapr-1.lib" ";apr-1.lib") -endif() + set(PATCHES FunctionLevelLinkingOn.diff) + if(VCPKG_CRT_LINKAGE STREQUAL "static") + list(APPEND PATCHES fix-crt-linkage.patch) + else() + list(APPEND PATCHES fix-crt-linkage-dyn.patch) + endif() -if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") - set(BUILD_ARCH "Win32") - set(OUTPUT_DIR "Win32") -elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") - set(BUILD_ARCH "x64") - set(OUTPUT_DIR "Win64") -else() - message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") -endif() + vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES ${PATCHES} + ) -vcpkg_build_msbuild( - PROJECT_PATH ${ACTIVEMQCPP_MSVC_PROJ} - RELEASE_CONFIGURATION ${RELEASE_CONF} - DEBUG_CONFIGURATION ${DEBUG_CONF} - PLATFORM ${BUILD_ARCH} - USE_VCPKG_INTEGRATION -) + set(ACTIVEMQCPP_MSVC_PROJ "${SOURCE_PATH}/vs2010-build/activemq-cpp.vcxproj") -vcpkg_copy_pdbs() + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ACTIVEMQCPP_SHARED_LIB) -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY - ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - ) - if (ACTIVEMQCPP_SHARED_LIB) - file(COPY - ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) - file(COPY - ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) + set(RELEASE_CONF "ReleaseDLL") + set(DEBUG_CONF "DebugDLL") + + set(ACTIVEMQCPP_LIB_PREFFIX ) + set(ACTIVEMQCPP_LIB_SUFFIX d) + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";apr-1.lib" ";libapr-1.lib") + else() + set(RELEASE_CONF "Release") + set(DEBUG_CONF "Debug") + + set(ACTIVEMQCPP_LIB_PREFFIX lib) + set(ACTIVEMQCPP_LIB_SUFFIX ) + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" ";libapr-1.lib" ";apr-1.lib") endif() -endif() -if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY - ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(BUILD_ARCH "Win32") + elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(BUILD_ARCH "x64") + else() + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") + endif() + + string(REPLACE "/" "\\" WIN_SOURCE_PATH "${SOURCE_PATH}") + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClCompile Include=\"..\\src" "ClCompile Include=\"${WIN_SOURCE_PATH}\\src") + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "ClInclude Include=\"..\\src" "ClInclude Include=\"${WIN_SOURCE_PATH}\\src") + vcpkg_replace_string("${ACTIVEMQCPP_MSVC_PROJ}" "../src/main" "${WIN_SOURCE_PATH}\\src\\main") + vcpkg_install_msbuild( + SOURCE_PATH "${SOURCE_PATH}/vs2010-build" + PROJECT_SUBPATH "activemq-cpp.vcxproj" + RELEASE_CONFIGURATION ${RELEASE_CONF} + DEBUG_CONFIGURATION ${DEBUG_CONF} + PLATFORM ${BUILD_ARCH} + USE_VCPKG_INTEGRATION + ALLOW_ROOT_INCLUDES + SKIP_CLEAN ) - - if (ACTIVEMQCPP_SHARED_LIB) + + vcpkg_copy_pdbs() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(COPY - ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) + + if (ACTIVEMQCPP_SHARED_LIB) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vs2010-build/${BUILD_ARCH}/${RELEASE_CONF}/activemq-cpp.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/bin" + ) + endif() + endif() + + if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(COPY - ${SOURCE_PATH}/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.pdb - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/${ACTIVEMQCPP_LIB_PREFFIX}activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) + + if (ACTIVEMQCPP_SHARED_LIB) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.dll" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(COPY + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/vs2010-build/${BUILD_ARCH}/${DEBUG_CONF}/activemq-cpp${ACTIVEMQCPP_LIB_SUFFIX}.pdb" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + endif() endif() -endif() -file(COPY ${SOURCE_PATH}/src/main/activemq DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(COPY ${SOURCE_PATH}/src/main/cms DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) -file(COPY ${SOURCE_PATH}/src/main/decaf DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.h) + file(COPY "${SOURCE_PATH}/src/main/activemq" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) + file(COPY "${SOURCE_PATH}/src/main/cms" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) + file(COPY "${SOURCE_PATH}/src/main/decaf" DESTINATION "${CURRENT_PACKAGES_DIR}/include" FILES_MATCHING PATTERN *.h) + vcpkg_clean_msbuild() +endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CURRENT_PORT_DIR}/activemq-cppConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/activemq-cpp") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json index f950dba6736f19..9a804bf4bf7487 100644 --- a/ports/activemq-cpp/vcpkg.json +++ b/ports/activemq-cpp/vcpkg.json @@ -1,9 +1,9 @@ { "name": "activemq-cpp", - "version-string": "3.9.5", - "port-version": 4, + "version-semver": "3.9.5", + "port-version": 5, "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.", - "supports": "!(uwp | linux | osx)", + "supports": "!(uwp | osx)", "dependencies": [ "apr" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bc54523900e4af..25c6ef1fe760ae 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1697,7 +1697,6 @@ lapack-reference:arm-uwp=skip # failures for x64-windows-static-md ace:x64-windows-static-md=fail -activemq-cpp:x64-windows-static-md=fail akali:x64-windows-static-md=fail chromium-base:x64-windows-static-md=fail clockutils:x64-windows-static-md=fail diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json index 2507ec7aa90b24..e08320929ec621 100644 --- a/versions/a-/activemq-cpp.json +++ b/versions/a-/activemq-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bce9f87e7df6f4e8a9c3121018ffc032e3d2603e", + "version-semver": "3.9.5", + "port-version": 5 + }, { "git-tree": "13f5f938c4d12bf4a62061f9891f77e7fc03fc23", "version-string": "3.9.5", diff --git a/versions/baseline.json b/versions/baseline.json index 80b99c5fa37d83..eda7ee2539e669 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -22,7 +22,7 @@ }, "activemq-cpp": { "baseline": "3.9.5", - "port-version": 4 + "port-version": 5 }, "ade": { "baseline": "0.1.1f", From c106a8953b4e10a6e6a1b038c538d8dc36aa8cdc Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 11 Oct 2021 19:21:07 +0200 Subject: [PATCH 0769/1858] [zlib] Fix wrapper message (#19999) * Fix wrapper message * x-add-version * Ease wrapper warning condition * Avoid CMP0074 warning * Update versions * CR request: Modify validation * Update versions Co-authored-by: Billy Robert O'Neal III --- ports/zlib/vcpkg-cmake-wrapper.cmake | 11 +++++------ ports/zlib/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/z-/zlib.json | 5 +++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/zlib/vcpkg-cmake-wrapper.cmake b/ports/zlib/vcpkg-cmake-wrapper.cmake index 5060c550257696..8624b70867e9c8 100644 --- a/ports/zlib/vcpkg-cmake-wrapper.cmake +++ b/ports/zlib/vcpkg-cmake-wrapper.cmake @@ -1,9 +1,8 @@ -set(ZLIB_ROOT "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}") -find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${ZLIB_ROOT}/include" NO_DEFAULT_PATH) -find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${ZLIB_ROOT}/lib" NO_DEFAULT_PATH) -find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${ZLIB_ROOT}/debug/lib" NO_DEFAULT_PATH) -if(NOT ZLIB_INCLUDE_DIR OR NOT ZLIB_LIBRARY_RELEASE OR (NOT ZLIB_LIBRARY_DEBUG AND EXISTS "${ZLIB_ROOT}/debug/lib")) - message("Broken installation of vcpkg port zlib") +find_path(ZLIB_INCLUDE_DIR NAMES zlib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_RELEASE NAMES zlib z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH) +find_library(ZLIB_LIBRARY_DEBUG NAMES zlibd z PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib" NO_DEFAULT_PATH) +if(NOT ZLIB_INCLUDE_DIR OR NOT (ZLIB_LIBRARY_RELEASE OR ZLIB_LIBRARY_DEBUG)) + message(FATAL_ERROR "Broken installation of vcpkg port zlib") endif() if(CMAKE_VERSION VERSION_LESS 3.4) include(SelectLibraryConfigurations) diff --git a/ports/zlib/vcpkg.json b/ports/zlib/vcpkg.json index fd85f6b122ec1f..4308e45a4b8273 100644 --- a/ports/zlib/vcpkg.json +++ b/ports/zlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zlib", - "version-string": "1.2.11", - "port-version": 12, + "version": "1.2.11", + "port-version": 13, "description": "A compression library", "homepage": "https://www.zlib.net/" } diff --git a/versions/baseline.json b/versions/baseline.json index eda7ee2539e669..9c9abee6321a4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7250,7 +7250,7 @@ }, "zlib": { "baseline": "1.2.11", - "port-version": 12 + "port-version": 13 }, "zlib-ng": { "baseline": "2.0.3", diff --git a/versions/z-/zlib.json b/versions/z-/zlib.json index 41bec9d225ec37..7c0d68f33de55e 100644 --- a/versions/z-/zlib.json +++ b/versions/z-/zlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92cfe30c807d343c6359d272242f0765ad906740", + "version": "1.2.11", + "port-version": 13 + }, { "git-tree": "89dce3592d1a0a275009278b14bd85fd817b4ad9", "version-string": "1.2.11", From 22a8aafda5f22b98c1bac632765d8cb54864b938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 12 Oct 2021 01:22:36 +0800 Subject: [PATCH 0770/1858] [openimageio/libsquish] Export libsquish cmake target and fix find dependency libsquish (#20240) * [libsquish] Export cmake target * [openimageio] Fix find dependency libsquish * version * Rename the target * Re-fix dependency libsquish, apply official changes * version stuff * more version * Change namespace * Update patch * version * Remove unused patch * version Co-authored-by: Billy Robert O'Neal III --- ports/libsquish/export-target.patch | 19 +++++ ports/libsquish/portfile.cmake | 15 ++-- ports/libsquish/vcpkg.json | 14 +++- ports/openimageio/fix-dependencies.patch | 95 ++++++++++++++++++++++-- ports/openimageio/portfile.cmake | 1 - ports/openimageio/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/l-/libsquish.json | 5 ++ versions/o-/openimageio.json | 5 ++ 9 files changed, 141 insertions(+), 19 deletions(-) create mode 100644 ports/libsquish/export-target.patch diff --git a/ports/libsquish/export-target.patch b/ports/libsquish/export-target.patch new file mode 100644 index 00000000000000..78f5f30f584504 --- /dev/null +++ b/ports/libsquish/export-target.patch @@ -0,0 +1,19 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3ecdde..94c7b3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,8 +120,14 @@ INCLUDE(GNUInstallDirs) + + INSTALL( + TARGETS squish ++ EXPORT unofficial-libsquishConfig + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) ++ ++INSTALL(EXPORT unofficial-libsquishConfig ++ NAMESPACE unofficial::libsquish:: ++ DESTINATION share/unofficial-libsquish ++) diff --git a/ports/libsquish/portfile.cmake b/ports/libsquish/portfile.cmake index a7ff15594387b6..80c4ef54ba7663 100644 --- a/ports/libsquish/portfile.cmake +++ b/ports/libsquish/portfile.cmake @@ -4,17 +4,20 @@ vcpkg_from_sourceforge( FILENAME "libsquish-1.15.tgz" NO_REMOVE_ONE_LEVEL SHA512 5b569b7023874c7a43063107e2e428ea19e6eb00de045a4a13fafe852ed5402093db4b65d540b5971ec2be0d21cb97dfad9161ebfe6cf6e5376174ff6c6c3e7a - PATCHES fix-export-symbols.patch + PATCHES + fix-export-symbols.patch + export-target.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libsquish CONFIG_PATH share/unofficial-libsquish) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsquish/vcpkg.json b/ports/libsquish/vcpkg.json index 9cb40167af3d88..3d247cb935b6db 100644 --- a/ports/libsquish/vcpkg.json +++ b/ports/libsquish/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libsquish", "version-string": "1.15", - "port-version": 8, + "port-version": 9, "description": "Open source DXT compression library.", - "homepage": "https://sourceforge.net/projects/libsquish" + "homepage": "https://sourceforge.net/projects/libsquish", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/openimageio/fix-dependencies.patch b/ports/openimageio/fix-dependencies.patch index 81b95ff9c6f49f..433d960e3ee300 100644 --- a/ports/openimageio/fix-dependencies.patch +++ b/ports/openimageio/fix-dependencies.patch @@ -1,22 +1,22 @@ diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in -index 740da06..1a326f7 100644 +index 740da06..a34d4c9 100644 --- a/src/cmake/Config.cmake.in +++ b/src/cmake/Config.cmake.in @@ -11,6 +11,9 @@ elseif (@OpenEXR_VERSION@ VERSION_GREATER_EQUAL 2.4 AND @FOUND_OPENEXR_WITH_CONF HINTS @IlmBase_DIR@ @OpenEXR_DIR@) find_dependency(OpenEXR @OpenEXR_VERSION@ HINTS @OpenEXR_DIR@) -+ find_dependency(libpng CONFIG) -+ find_dependency(libheif CONFIG) -+ find_dependency(Libsquish) ++ find_dependency(libpng CONFIG REQUIRED) ++ find_dependency(libheif CONFIG REQUIRED) ++ find_dependency(unofficial-libsquish CONFIG REQUIRED) find_dependency(ZLIB @ZLIB_VERSION@) # Because OpenEXR doesn't do it find_dependency(Threads) # Because OpenEXR doesn't do it endif () diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 21e18b5..badee4b 100644 +index 957abe3..2c093dd 100644 --- a/src/cmake/externalpackages.cmake +++ b/src/cmake/externalpackages.cmake -@@ -151,7 +151,7 @@ find_python() +@@ -148,7 +148,7 @@ find_python() # Dependencies for optional formats and features. If these are not found, # we will continue building, but the related functionality will be disabled. @@ -25,7 +25,25 @@ index 21e18b5..badee4b 100644 checked_find_package (BZip2) # Used by ffmpeg and freetype if (NOT BZIP2_FOUND) -@@ -185,7 +185,8 @@ checked_find_package (GIF +@@ -158,8 +158,6 @@ endif () + checked_find_package (Freetype + DEFINITIONS -DUSE_FREETYPE=1 ) + +-checked_find_package (HDF5 +- ISDEPOF Field3D) + checked_find_package (OpenColorIO + DEFINITIONS -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1 + # PREFER_CONFIG +@@ -176,15 +174,15 @@ checked_find_package (TBB 2017 + checked_find_package (DCMTK VERSION_MIN 3.6.1) # For DICOM images + checked_find_package (FFmpeg VERSION_MIN 3.0) + checked_find_package (Field3D +- DEPS HDF5 +- DEFINITIONS -DUSE_FIELD3D=1) ++ DEFINITIONS -DUSE_FIELD3D=1) + checked_find_package (GIF + VERSION_MIN 4 + RECOMMEND_MIN 5.0 RECOMMEND_MIN_REASON "for stability and thread safety") # For HEIF/HEIC/AVIF formats @@ -35,6 +53,42 @@ index 21e18b5..badee4b 100644 RECOMMEND_MIN 1.7 RECOMMEND_MIN_REASON "for AVIF support") if (APPLE AND LIBHEIF_VERSION VERSION_GREATER_EQUAL 1.10 AND LIBHEIF_VERSION VERSION_LESS 1.11) +@@ -291,7 +289,8 @@ endmacro() + option (USE_EMBEDDED_LIBSQUISH + "Force use of embedded Libsquish, even if external is found" OFF) + if (NOT USE_EMBEDDED_LIBSQUISH) +- checked_find_package (Libsquish) ++ checked_find_package (unofficial-libsquish PREFER_CONFIG) ++ set(Libsquish_FOUND 1) + endif () + + +diff --git a/src/dds.imageio/CMakeLists.txt b/src/dds.imageio/CMakeLists.txt +index d693453..9bef055 100644 +--- a/src/dds.imageio/CMakeLists.txt ++++ b/src/dds.imageio/CMakeLists.txt +@@ -5,7 +5,7 @@ + if (Libsquish_FOUND) + # External libsquish was found -- use it + add_oiio_plugin (ddsinput.cpp +- LINK_LIBRARIES Libsquish::Libsquish ++ LINK_LIBRARIES unofficial::libsquish::squish + ) + else () + # No external libsquish was found -- use the embedded version. +diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt +index a9e54e3..cc73ac4 100644 +--- a/src/field3d.imageio/CMakeLists.txt ++++ b/src/field3d.imageio/CMakeLists.txt +@@ -9,7 +9,7 @@ if (Field3D_FOUND) + endif () + add_oiio_plugin (field3dinput.cpp field3doutput.cpp + INCLUDE_DIRS ${FIELD3D_INCLUDES} +- LINK_LIBRARIES Field3D::Field3D ++ LINK_LIBRARIES ${FIELD3D_LIBRARIES} + # ${HDF5_LIBRARIES} + ${SZIP_LIBRARY}) + endif() diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt index fed8001..15e87ae 100644 --- a/src/heif.imageio/CMakeLists.txt @@ -73,3 +127,30 @@ index 9ba76ac..13db4ac 100644 else () message (WARNING "libpng not found, so ICO support will not work") set (format_plugin_definitions ${format_plugin_definitions} DISABLE_ICO=1 PARENT_SCOPE) +diff --git a/src/openvdb.imageio/CMakeLists.txt b/src/openvdb.imageio/CMakeLists.txt +index 57a0f62..3a07c31 100644 +--- a/src/openvdb.imageio/CMakeLists.txt ++++ b/src/openvdb.imageio/CMakeLists.txt +@@ -4,6 +4,6 @@ + + if (OpenVDB_FOUND) + add_oiio_plugin (openvdbinput.cpp +- INCLUDE_DIRS ${TBB_INCLUDE_DIRS} +- LINK_LIBRARIES OpenVDB::OpenVDB ${TBB_tbb_LIBRARY} ${BOOST_LIBRARIES}) ++ INCLUDE_DIRS ${OPENVDB_INCLUDES} ${TBB_INCLUDE_DIRS} ++ LINK_LIBRARIES ${OPENVDB_LIBRARIES} ${TBB_tbb_LIBRARY} ${BOOST_LIBRARIES}) + endif() +diff --git a/src/webp.imageio/CMakeLists.txt b/src/webp.imageio/CMakeLists.txt +index 44462c4..e1cb068 100644 +--- a/src/webp.imageio/CMakeLists.txt ++++ b/src/webp.imageio/CMakeLists.txt +@@ -4,7 +4,8 @@ + + if (WebP_FOUND) + add_oiio_plugin (webpinput.cpp webpoutput.cpp +- LINK_LIBRARIES WebP::WebP WebP::WebPDemux ++ INCLUDE_DIRS ${WEBP_INCLUDES} ++ LINK_LIBRARIES ${WEBP_LIBRARIES} + DEFINITIONS "-DUSE_WEBP=1") + else () + message (STATUS "WebP plugin will not be built") diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 124c7183b84bc5..55a1535b071a4d 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -84,7 +84,6 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc" "${CURRENT_PACKAGES_DIR}/debug/share") file(COPY "${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") -file(COPY "${SOURCE_PATH}/src/cmake/modules/FindLibsquish.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/OpenImageIO") file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Handle copyright diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 35ac6101109e12..0dc7c2edd28d87 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.3.7.2", - "port-version": 2, + "port-version": 3, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9c9abee6321a4c..156461138538e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3810,7 +3810,7 @@ }, "libsquish": { "baseline": "1.15", - "port-version": 8 + "port-version": 9 }, "libsrt": { "baseline": "1.3.4", @@ -4854,7 +4854,7 @@ }, "openimageio": { "baseline": "2.3.7.2", - "port-version": 2 + "port-version": 3 }, "openjpeg": { "baseline": "2.4.0", diff --git a/versions/l-/libsquish.json b/versions/l-/libsquish.json index d1b63846048295..4c70c7dece1950 100644 --- a/versions/l-/libsquish.json +++ b/versions/l-/libsquish.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97da7fd0b127d2b07821950e5aee7acadbcd9d17", + "version-string": "1.15", + "port-version": 9 + }, { "git-tree": "9e7c8060fb2b0499a31df98ef1e8652081e18944", "version-string": "1.15", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 827012dfdb8015..1b67c28e9e71ad 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7643bd1ea5b962a2b98a9c6c991a15021fab17d", + "version": "2.3.7.2", + "port-version": 3 + }, { "git-tree": "6084a6398514fc24fd450a7b9290937b1274d7b6", "version": "2.3.7.2", From ee5106db9e6b39c1431902474ad3dc4caa15a721 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 11 Oct 2021 19:26:07 +0200 Subject: [PATCH 0771/1858] [libssh2] Update to 1.10.0 (#20364) * Update libssh2 to 1.10.0 * Update CI baseline * Fix patch * Change version-string to version * Update git-tree hash * Switch to new CMake portfile commands * Fix UWP build * Format vcpkg.json * Update git-tree hash * Switch back to legacy CMake commands to fix build validation issues * Update git-tree hash * Fix IS_UWP define in patch * Update git-tree hash Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/libssh2/0001-Fix-UWP.patch | 26 +++++++++++++++++++++----- ports/libssh2/portfile.cmake | 18 +++++++++--------- ports/libssh2/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/l-/libssh2.json | 5 +++++ 5 files changed, 39 insertions(+), 19 deletions(-) diff --git a/ports/libssh2/0001-Fix-UWP.patch b/ports/libssh2/0001-Fix-UWP.patch index 270dd7b9038fc5..8a7190f8982947 100644 --- a/ports/libssh2/0001-Fix-UWP.patch +++ b/ports/libssh2/0001-Fix-UWP.patch @@ -15,9 +15,9 @@ diff --git a/src/agent.c b/src/agent.c index c2ba422..f1799f8 100644 --- a/src/agent.c +++ b/src/agent.c -@@ -51,6 +51,10 @@ - #include "userauth.h" - #include "session.h" +@@ -55,6 +55,10 @@ + #include + #endif +#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) +#define IS_UWP 1 @@ -42,7 +42,23 @@ index c2ba422..f1799f8 100644 -#ifdef WIN32 - {"Pageant", &agent_ops_pageant}, +#if defined(WIN32) && !defined(IS_UWP) -+ {"Pageant", &agent_ops_pageant}, ++ {"Pageant", &agent_ops_pageant}, + {"OpenSSH", &agent_ops_openssh}, #endif /* WIN32 */ #ifdef PF_UNIX - {"Unix", &agent_ops_unix}, +diff --git a/src/agent_win.c b/src/agent_win.c +--- a/src/agent_win.c ++++ b/src/agent_win.c +@@ -55,7 +55,11 @@ + #include + #endif + +-#ifdef WIN32 ++#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY != WINAPI_FAMILY_DESKTOP_APP) ++#define IS_UWP 1 ++#endif /* #if defined(WINAPI_FAMILY) */ ++ ++#if defined(WIN32) && !defined(IS_UWP) + /* Code to talk to OpenSSH was taken and modified from the Win32 port of + * Portable OpenSSH by the PowerShell team. Commit + * 8ab565c53f3619d6a1f5ac229e212cad8a52852c of diff --git a/ports/libssh2/portfile.cmake b/ports/libssh2/portfile.cmake index 0922bb7c8bcabe..7949dc64e69755 100644 --- a/ports/libssh2/portfile.cmake +++ b/ports/libssh2/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libssh2/libssh2 - REF 42d37aa63129a1b2644bf6495198923534322d64 - SHA512 e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231 + REF libssh2-1.10.0 + SHA512 615E28880695911F5700CC7AC3DDA6B894384C0B1D8B02B53C2EB58F1839F47211934A292F490AD7DDEF7E63F332E0EBF44F8E6334F64BE8D143C72032356C1F HEAD_REF master PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Fix-UWP.patch" ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF @@ -19,14 +19,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libssh2) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libssh2 RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libssh2" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libssh2/vcpkg.json b/ports/libssh2/vcpkg.json index c5692d464608df..9dc048318fad39 100644 --- a/ports/libssh2/vcpkg.json +++ b/ports/libssh2/vcpkg.json @@ -1,8 +1,7 @@ { "name": "libssh2", - "version-string": "1.9.0", - "port-version": 1, - "description": "The SSH library", + "version": "1.10.0", + "description": "libssh2 is a client-side C library implementing the SSH2 protocol.", "homepage": "https://www.libssh2.org", "dependencies": [ "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index 156461138538e1..8b009980844705 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3825,8 +3825,8 @@ "port-version": 0 }, "libssh2": { - "baseline": "1.9.0", - "port-version": 1 + "baseline": "1.10.0", + "port-version": 0 }, "libstemmer": { "baseline": "2017-9", diff --git a/versions/l-/libssh2.json b/versions/l-/libssh2.json index 3dca2e58596e93..0d3fbfbeb86152 100644 --- a/versions/l-/libssh2.json +++ b/versions/l-/libssh2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "996df01b95684f41e8870b9154aeea3bffc63840", + "version": "1.10.0", + "port-version": 0 + }, { "git-tree": "d448a6d5c97053355abbfa84171fcc7624dcd509", "version-string": "1.9.0", From 71cd96632863530819597c97caafcb7955b190e9 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Tue, 12 Oct 2021 02:28:01 +0900 Subject: [PATCH 0772/1858] [farmhash] support Windows build (#20506) * [farmhash] support windows build * [farmhash] update baseline JSON * [farmhash] patch from PR diff * [farmhash] patch from all PR changes Co-authored-by: Billy Robert O'Neal III --- ports/farmhash/farmhashConfig.cmake | 5 ++++- ports/farmhash/portfile.cmake | 34 +++++++++++++++++++---------- ports/farmhash/vcpkg.json | 2 +- scripts/ci.baseline.txt | 7 ------ versions/baseline.json | 2 +- versions/f-/farmhash.json | 5 +++++ 6 files changed, 33 insertions(+), 22 deletions(-) diff --git a/ports/farmhash/farmhashConfig.cmake b/ports/farmhash/farmhashConfig.cmake index b7b4cd1b0e8229..e091d5c0514532 100644 --- a/ports/farmhash/farmhashConfig.cmake +++ b/ports/farmhash/farmhashConfig.cmake @@ -13,4 +13,7 @@ get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(ROOT "${ROOT}" PATH) get_filename_component(ROOT "${ROOT}" PATH) -set_library_target("GOOGLE" "farmhash" "${ROOT}/debug/lib/libfarmhash.a" "${ROOT}/lib/libfarmhash.a" "${ROOT}/include/") +set_library_target("GOOGLE" "farmhash" + "${ROOT}/debug/lib/${CMAKE_STATIC_LIBRARY_PREFIX}farmhash${CMAKE_STATIC_LIBRARY_SUFFIX}" + "${ROOT}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}farmhash${CMAKE_STATIC_LIBRARY_SUFFIX}" + "${ROOT}/include/") diff --git a/ports/farmhash/portfile.cmake b/ports/farmhash/portfile.cmake index 801e0570651319..496e5e317ec4f1 100644 --- a/ports/farmhash/portfile.cmake +++ b/ports/farmhash/portfile.cmake @@ -1,12 +1,19 @@ #Requires a compiler which understands '__builtin_unreachable': vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +vcpkg_download_distfile(WIN_PR_PATCH + URLS "https://github.com/google/farmhash/pull/40.diff" + FILENAME farmhash-pr-40.patch + SHA512 265f5c15c17da2b88c82e6016a181abe73d2d94492cdb0cba892acf67a9d40815d54fa81e07351254fe2a39aea143b125924db0e7df14aac84a7469a78612cbd +) + vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO google/farmhash - REF 0d859a811870d10f53a594927d0d0b97573ad06d - SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO google/farmhash + REF 0d859a811870d10f53a594927d0d0b97573ad06d + SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1 + HEAD_REF master + PATCHES ${WIN_PR_PATCH} ) if((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) AND NOT ENV{CXX_FLAGS}) # This should be a compiler check @@ -14,14 +21,17 @@ if((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) AND NOT ENV{CXX_FLAGS}) # This endif() file(REMOVE_RECURSE "${SOURCE_PATH}/configure") vcpkg_configure_make( - AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} + AUTOCONFIG + SOURCE_PATH ${SOURCE_PATH} ) - vcpkg_install_make() - vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/farmhashConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share" # eliminate unused files +) +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/farmhashConfig.cmake" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/farmhash/vcpkg.json b/ports/farmhash/vcpkg.json index 1d85ed1a1a219f..9624088907b812 100644 --- a/ports/farmhash/vcpkg.json +++ b/ports/farmhash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "farmhash", "version-string": "1.1", - "port-version": 3, + "port-version": 4, "description": "FarmHash, a family of hash functions.", "homepage": "https://github.com/google/farmhash", "supports": "!arm" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 25c6ef1fe760ae..a8543d49ca7a69 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -279,13 +279,6 @@ epsilon:x64-windows-static=fail faad2:x64-linux=fail faad2:x64-osx=fail fann:x64-windows-static=fail -farmhash:arm64-windows=fail -farmhash:arm-uwp=fail -farmhash:x64-uwp=fail -farmhash:x64-windows=fail -farmhash:x64-windows-static=fail -farmhash:x64-windows-static-md=fail -farmhash:x86-windows=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail fastrtps:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 8b009980844705..a1adb4c6c0225b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2050,7 +2050,7 @@ }, "farmhash": { "baseline": "1.1", - "port-version": 3 + "port-version": 4 }, "fast-cpp-csv-parser": { "baseline": "2021-01-03", diff --git a/versions/f-/farmhash.json b/versions/f-/farmhash.json index b80cf8bcf1c84e..399d97dad86f21 100644 --- a/versions/f-/farmhash.json +++ b/versions/f-/farmhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46e338897fcb9436d4ac7f7cba2efd12df98567b", + "version-string": "1.1", + "port-version": 4 + }, { "git-tree": "9b4c6dc1b8fbb33fcca66dcb10c7186980e7058e", "version-string": "1.1", From 6bdacb858f5ee86d89749aeef2ae3f888d2c5f5f Mon Sep 17 00:00:00 2001 From: Zheng Xueke <46664191+xiaoke0O@users.noreply.github.com> Date: Tue, 12 Oct 2021 01:33:21 +0800 Subject: [PATCH 0773/1858] [gdal] add hdf5 support on windows (#20540) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add gdal hdf5 format support on windows * add gdal hdf5 format support on windows:run x-add-version * remove lib EXISTS check Co-authored-by: Billy O'Neal * remove lib EXISTS check : fix git-tree * Delete ports/gdal/dependency_win.cmake extra Spaces Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * delete unnecessary blank lines： update git-tree Co-authored-by: Billy O'Neal Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/gdal/dependency_win.cmake | 12 +++++++++++- ports/gdal/portfile.cmake | 6 +++--- ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index 6bb6202d2f04d2..c9c81ec1ec147e 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -94,7 +94,7 @@ macro(find_dependency_win) if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib") file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" JPEG_INCLUDE) file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/jpeg.lib" JPEG_LIBRARY_REL) - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/jpegd.lib" JPEG_LIBRARY_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/jpeg.lib" JPEG_LIBRARY_DBG) list(APPEND NMAKE_OPTIONS JPEG_EXTERNAL_LIB=1) list(APPEND NMAKE_OPTIONS JPEGDIR=${JPEG_INCLUDE}) list(APPEND NMAKE_OPTIONS_REL JPEG_LIB=${JPEG_LIBRARY_REL}) @@ -178,6 +178,16 @@ macro(find_dependency_win) list(APPEND NMAKE_OPTIONS_DBG NETCDF_LIB=${NETCDF_LIBRARY_DBG}) endif() endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" HDF5_DIR) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/hdf5_D.lib" HDF5_LIBRARY_DBG) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/hdf5.lib" HDF5_LIBRARY_REL) + list(APPEND NMAKE_OPTIONS HDF5_PLUGIN=NO) + list(APPEND NMAKE_OPTIONS HDF5_H5_IS_DLL=YES) + list(APPEND NMAKE_OPTIONS HDF5_DIR=${HDF5_DIR}) + list(APPEND NMAKE_OPTIONS_REL HDF5_LIB=${HDF5_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG HDF5_LIB=${HDF5_LIBRARY_DBG}) + endif() # Setup libkml libraries if(EXISTS "${CURRENT_INSTALLED_DIR}/lib/kmlbase.lib") diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 10d1e42fca12a7..e3268d31fb901e 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -32,13 +32,13 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") set(NATIVE_HTML_DIR "${CURRENT_PACKAGES_DIR}/share/gdal/html") - include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") - find_dependency_win() - set(NMAKE_OPTIONS "") set(NMAKE_OPTIONS_REL "") set(NMAKE_OPTIONS_DBG "") + include("${CMAKE_CURRENT_LIST_DIR}/dependency_win.cmake") + find_dependency_win() + if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES) list(APPEND NMAKE_OPTIONS "MYSQL_INC_DIR=${MYSQL_INCLUDE_DIR}") list(APPEND NMAKE_OPTIONS_REL "MYSQL_LIB=${MYSQL_LIBRARY_REL}") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 12e83cb84d850b..a0200858dc1640 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 5, + "port-version": 6, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index a1adb4c6c0225b..ca60196debc3fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2322,7 +2322,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 5 + "port-version": 6 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index bf73dab76cd942..732c1533e57600 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15009f5f5d2867c594d8148d79cccbe964432465", + "version-semver": "3.2.2", + "port-version": 6 + }, { "git-tree": "3f821ae473a38c3ceac861552f560da4a9109ff8", "version-semver": "3.2.2", From 58b2496c851e0d1a974bec47e5690cb2e25a3d6b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 11 Oct 2021 19:52:33 +0200 Subject: [PATCH 0774/1858] [log4cplus] Update to 2.0.7 (#20646) * Update log4cplus to 2.0.7 * Update CI baseline Co-authored-by: chausner --- ports/log4cplus/portfile.cmake | 35 +++++++++++++++++----------------- ports/log4cplus/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/l-/log4cplus.json | 5 +++++ 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake index 975e030d04fd80..3b26122e235d25 100644 --- a/ports/log4cplus/portfile.cmake +++ b/ports/log4cplus/portfile.cmake @@ -1,37 +1,36 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO log4cplus/log4cplus - REF 9d00f7d10f2507f68f9ab5fea8b842735d9c6cfe # REL_2_0_5 - SHA512 b64a1d3a60584b2ba3a58470a0b0ec4c22eb0c054c0ef8ef3808fcba5604860fbd5b2d96148939ea15d3bf2ff1e40e684710dc81b57b73232851a486251f648d + REF REL_2_0_7 + SHA512 FE5FCEB346AC19A6D953661A20E8AA02AB48E872F427D958EA99C62F534DDF1FA4511FFD67A662605B1F225E3A6C06B0EE2C1B0EB62DE3AA0316F47F778DF06D HEAD_REF master ) vcpkg_from_github( OUT_SOURCE_PATH THREADPOOL_SOURCE_PATH REPO log4cplus/ThreadPool - REF cc0b6371d3963f7028c2da5fc007733f9f3bf205 - SHA512 ad4d287c1f83acac4c127136bc92489c43bb5293613dc54b878b8e75a8583f7eefda6434d09789dad47b87a5d38f10a07a746d42d299410c11f2dbcce8af3012 + REF 3507796e172d36555b47d6191f170823d9f6b12c + SHA512 6b46ce287d68fd0cda0c69fda739eaeda89e1ed4f086e28a591f4e50aaf80ee2defc28ee14a5bf65be005c1a6ec4f2848d5723740726c54d5cc1d20f8e98aa0c HEAD_REF master ) file( COPY - ${THREADPOOL_SOURCE_PATH}/COPYING - ${THREADPOOL_SOURCE_PATH}/example.cpp - ${THREADPOOL_SOURCE_PATH}/README.md - ${THREADPOOL_SOURCE_PATH}/ThreadPool.h - DESTINATION ${SOURCE_PATH}/threadpool + "${THREADPOOL_SOURCE_PATH}/COPYING" + "${THREADPOOL_SOURCE_PATH}/example.cpp" + "${THREADPOOL_SOURCE_PATH}/README.md" + "${THREADPOOL_SOURCE_PATH}/ThreadPool.h" + DESTINATION "${SOURCE_PATH}/threadpool" ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - unicode UNICODE + unicode UNICODE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLOG4CPLUS_BUILD_TESTING=OFF -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF @@ -40,14 +39,14 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/log4cplus) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/log4cplus) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/log4cplus/vcpkg.json b/ports/log4cplus/vcpkg.json index e80dd9e46f0d45..9ba37aec96aba5 100644 --- a/ports/log4cplus/vcpkg.json +++ b/ports/log4cplus/vcpkg.json @@ -1,11 +1,18 @@ { "name": "log4cplus", - "version-string": "2.0.5", - "port-version": 2, + "version": "2.0.7", "description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration", "homepage": "https://github.com/log4cplus/log4cplus", "dependencies": [ - "catch" + "catch", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "unicode": { diff --git a/versions/baseline.json b/versions/baseline.json index ca60196debc3fe..5a9ed2eccb290c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4045,8 +4045,8 @@ "port-version": 1 }, "log4cplus": { - "baseline": "2.0.5", - "port-version": 2 + "baseline": "2.0.7", + "port-version": 0 }, "log4cpp": { "baseline": "2.9.1", diff --git a/versions/l-/log4cplus.json b/versions/l-/log4cplus.json index ee2c67af403820..474c940f56b699 100644 --- a/versions/l-/log4cplus.json +++ b/versions/l-/log4cplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "765ee7e801e35c4c77e890bb4af363042e9384ae", + "version": "2.0.7", + "port-version": 0 + }, { "git-tree": "0fab754f152f45627bbebb4629e2f508eeccb690", "version-string": "2.0.5", From dbbfb8f621e2c3ea3d7f8745d65acc72b4fd9005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 12 Oct 2021 02:01:04 +0800 Subject: [PATCH 0775/1858] [vtk] Add feature gdal and geojson, re-factory the feature select part (#20147) * [vtk] Add feature gdal and geojson, re-factory the feature select part * version stuff * Fix feature option MPI * Fix find and use gdal. * version * Handle some of the same parameters * version --- ports/vtk/fix-gdal.patch | 39 ++++++++ ports/vtk/portfile.cmake | 194 ++++++++++++++++++--------------------- ports/vtk/vcpkg.json | 21 ++++- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 + 5 files changed, 153 insertions(+), 108 deletions(-) create mode 100644 ports/vtk/fix-gdal.patch diff --git a/ports/vtk/fix-gdal.patch b/ports/vtk/fix-gdal.patch new file mode 100644 index 00000000000000..9a249efd1c570e --- /dev/null +++ b/ports/vtk/fix-gdal.patch @@ -0,0 +1,39 @@ +diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake +index bcb2044..c87bb9c 100644 +--- a/CMake/vtkInstallCMakePackage.cmake ++++ b/CMake/vtkInstallCMakePackage.cmake +@@ -113,7 +113,6 @@ set(vtk_cmake_patch_files + patches/3.18/FindPython/Support.cmake + patches/3.18/FindPython2.cmake + patches/3.18/FindPython3.cmake +- patches/99/FindGDAL.cmake + patches/99/FindHDF5.cmake + patches/99/FindJPEG.cmake + patches/99/FindLibArchive.cmake +diff --git a/Geovis/GDAL/CMakeLists.txt b/Geovis/GDAL/CMakeLists.txt +index dfd58f0..f46177f 100644 +--- a/Geovis/GDAL/CMakeLists.txt ++++ b/Geovis/GDAL/CMakeLists.txt +@@ -9,4 +9,7 @@ vtk_module_add_module(VTK::GeovisGDAL + CLASSES ${classes}) + vtk_module_link(VTK::GeovisGDAL + PRIVATE +- GDAL::GDAL) ++ ${GDAL_LIBRARIES}) ++vtk_module_include(VTK::GeovisGDAL ++ PRIVATE ++ ${GDAL_INCLUDE_DIRS}) +diff --git a/IO/GDAL/CMakeLists.txt b/IO/GDAL/CMakeLists.txt +index 0a1248a..621a060 100644 +--- a/IO/GDAL/CMakeLists.txt ++++ b/IO/GDAL/CMakeLists.txt +@@ -9,4 +9,7 @@ vtk_module_add_module(VTK::IOGDAL + CLASSES ${classes}) + vtk_module_link(VTK::IOGDAL + PRIVATE +- GDAL::GDAL) ++ ${GDAL_LIBRARIES}) ++vtk_module_include(VTK::IOGDAL ++ PRIVATE ++ ${GDAL_INCLUDE_DIRS}) +\ No newline at end of file diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index adfb0f3a0bf09d..89a55a25d9be2a 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -2,35 +2,86 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") endif() -# TODO: -# - add loguru as a dependency requires #8682 +# ============================================================================= +# Clone & patch +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Kitware/VTK + REF 2959413ff190bc6e3ff40f5b6c1342edd2e5233f # v9.0.x used by ParaView 5.9.1 + SHA512 16229c107ed904e8fa6850c3814b8bdcdf9700ef44f6ff5b3a77e7d793ce19954fc2c7b1219a0162cf588def6e990883cd3f808c316a4db6e65bd6cd1769dd3f + HEAD_REF master + PATCHES + FindLZMA.patch + FindLZ4.patch + Findproj.patch + pegtl.patch + pythonwrapper.patch # Required by ParaView to Wrap required classes + NoUndefDebug.patch # Required to link against correct Python library depending on build type. + python_debug.patch + fix-using-hdf5.patch + # CHECK: module-name-mangling.patch + # Last patch TODO: Patch out internal loguru + FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat + # upstream vtkm patches to make it work with vtkm 1.6 + vtkm.patch # To include an external VTKm build + 1f00a0c9.patch + 156fb524.patch + d107698a.patch + fix-gdal.patch +) + +# ============================================================================= +#Overwrite outdated modules if they have not been patched: +file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c +# ============================================================================= # ============================================================================= # Options: # Collect CMake options for optional components -if("qt" IN_LIST FEATURES) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_GROUP_ENABLE_Qt=YES - -DVTK_MODULE_ENABLE_VTK_GUISupportQt=YES - -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL=YES - -DVTK_MODULE_ENABLE_VTK_RenderingQt=YES - -DVTK_MODULE_ENABLE_VTK_ViewsQt=YES - ) -endif() -if("atlmfc" IN_LIST FEATURES) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_GUISupportMFC=YES - ) -endif() -if("vtkm" IN_LIST FEATURES) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES - -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES - -DVTK_MODULE_ENABLE_VTK_vtkm=YES - ) -endif() +# TODO: +# - add loguru as a dependency requires #8682 +vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS + FEATURES + "qt" VTK_GROUP_ENABLE_Qt + "qt" VTK_MODULE_ENABLE_VTK_GUISupportQt + "qt" VTK_MODULE_ENABLE_VTK_GUISupportQtSQL + "qt" VTK_MODULE_ENABLE_VTK_RenderingQt + "qt" VTK_MODULE_ENABLE_VTK_ViewsQt + "atlmfc" VTK_MODULE_ENABLE_VTK_GUISupportMFC + "vtkm" VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore + "vtkm" VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel + "vtkm" VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters + "vtkm" VTK_MODULE_ENABLE_VTK_vtkm + "python" VTK_MODULE_ENABLE_VTK_Python + "python" VTK_MODULE_ENABLE_VTK_PythonContext2D + "python" VTK_MODULE_ENABLE_VTK_PythonInterpreter + "paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelStatistics + "paraview" VTK_MODULE_ENABLE_VTK_IOParallelExodus + "paraview" VTK_MODULE_ENABLE_VTK_RenderingParallel + "paraview" VTK_MODULE_ENABLE_VTK_RenderingVolumeAMR + "paraview" VTK_MODULE_ENABLE_VTK_IOXdmf2 + "paraview" VTK_MODULE_ENABLE_VTK_IOH5part + "paraview" VTK_MODULE_ENABLE_VTK_IOParallelLSDyna + "paraview" VTK_MODULE_ENABLE_VTK_IOTRUCHAS + "paraview" VTK_MODULE_ENABLE_VTK_IOVPIC + "paraview" VTK_MODULE_ENABLE_VTK_RenderingAnnotation + "paraview" VTK_MODULE_ENABLE_VTK_DomainsChemistry + "paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelDIY2 + "mpi" VTK_GROUP_ENABLE_MPI + "opengl" VTK_MODULE_ENABLE_VTK_ImagingOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_RenderingOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2 + "opengl" VTK_MODULE_ENABLE_VTK_opengl + "openvr" VTK_MODULE_ENABLE_VTK_RenderingOpenVR + "gdal" VTK_MODULE_ENABLE_VTK_IOGDAL + "geojson" VTK_MODULE_ENABLE_VTK_IOGeoJSON +) + +# Replace common value to vtk value +list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=ON" "=YES") +list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=OFF" "=DONT_WANT") if("python" IN_LIST FEATURES) vcpkg_find_acquire_program(PYTHON3) @@ -39,42 +90,21 @@ if("python" IN_LIST FEATURES) -DVTK_PYTHON_VERSION=3 -DPython3_FIND_REGISTRY=NEVER "-DPython3_EXECUTABLE:PATH=${PYTHON3}" - -DVTK_MODULE_ENABLE_VTK_Python=YES - -DVTK_MODULE_ENABLE_VTK_PythonContext2D=YES - -DVTK_MODULE_ENABLE_VTK_PythonInterpreter=YES ) #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages endif() -if("paraview" IN_LIST FEATURES) +if ("paraview" IN_LIST FEATURES OR "opengl" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_FiltersParallelStatistics=YES - -DVTK_MODULE_ENABLE_VTK_IOParallelExodus=YES -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingParallel=YES - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeAMR=YES - -DVTK_MODULE_ENABLE_VTK_IOXdmf2=YES - -DVTK_MODULE_ENABLE_VTK_IOH5part=YES - -DVTK_MODULE_ENABLE_VTK_IOParallelLSDyna=YES - -DVTK_MODULE_ENABLE_VTK_IOTRUCHAS=YES - -DVTK_MODULE_ENABLE_VTK_IOVPIC=YES -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES - -DVTK_MODULE_ENABLE_VTK_DomainsChemistry=YES -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=YES ) - if("python" IN_LIST FEATURES) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES - ) - endif() endif() -if("mpi" IN_LIST FEATURES) +if("paraview" IN_LIST FEATURES AND "python" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS - -DVTK_GROUP_ENABLE_MPI=YES - -DVTK_USE_MPI=YES + -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES ) endif() @@ -84,25 +114,6 @@ if("mpi" IN_LIST FEATURES AND "python" IN_LIST FEATURES) ) endif() -if("opengl" IN_LIST FEATURES) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_RenderingVolumeOpenGL2=YES - -DVTK_MODULE_ENABLE_VTK_opengl=YES - ) -endif() - -if ("openvr" IN_LIST FEATURES) - list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_RenderingOpenVR=YES - ) -endif() - if("cuda" IN_LIST FEATURES AND CMAKE_HOST_WIN32) vcpkg_add_to_path("$ENV{CUDA_PATH}/bin") endif() @@ -116,61 +127,32 @@ endif() if("all" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS -DVTK_USE_TK=OFF # TCL/TK currently not included in vcpkg + -DVTK_FORBID_DOWNLOADS=OFF + ) +else() + list(APPEND ADDITIONAL_OPTIONS + -DVTK_FORBID_DOWNLOADS=ON ) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "cuda" VTK_USE_CUDA + "mpi" VTK_USE_MPI "all" VTK_BUILD_ALL_MODULES ) - - -# ============================================================================= -# Clone & patch - - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO Kitware/VTK - REF 2959413ff190bc6e3ff40f5b6c1342edd2e5233f # v9.0.x used by ParaView 5.9.1 - SHA512 16229c107ed904e8fa6850c3814b8bdcdf9700ef44f6ff5b3a77e7d793ce19954fc2c7b1219a0162cf588def6e990883cd3f808c316a4db6e65bd6cd1769dd3f - HEAD_REF master - PATCHES - FindLZMA.patch - FindLZ4.patch - Findproj.patch - pegtl.patch - pythonwrapper.patch # Required by ParaView to Wrap required classes - NoUndefDebug.patch # Required to link against correct Python library depending on build type. - python_debug.patch - fix-using-hdf5.patch - # CHECK: module-name-mangling.patch - # Last patch TODO: Patch out internal loguru - FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat - # upstream vtkm patches to make it work with vtkm 1.6 - vtkm.patch # To include an external VTKm build - 1f00a0c9.patch - 156fb524.patch - d107698a.patch -) - -# ============================================================================= -#Overwrite outdated modules if they have not been patched: -file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake/patches/99") # due to usage of targets in netcdf-c -# ============================================================================= - # ============================================================================= # Configure & Install # We set all libraries to "system" and explicitly list the ones that should use embedded copies vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${FEATURE_OPTIONS} + OPTIONS + ${FEATURE_OPTIONS} + ${VTK_FEATURE_OPTIONS} -DBUILD_TESTING=OFF -DVTK_BUILD_TESTING=OFF -DVTK_BUILD_EXAMPLES=OFF - -DVTK_FORBID_DOWNLOADS=ON -DVTK_ENABLE_REMOTE_MODULES=OFF # VTK groups to enable -DVTK_GROUP_ENABLE_StandAlone=YES @@ -182,6 +164,8 @@ vcpkg_cmake_configure( -DVTK_USE_EXTERNAL:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG ${ADDITIONAL_OPTIONS} + -DVTK_DEBUG_MODULE_ALL=ON + -DVTK_DEBUG_MODULE=ON ) vcpkg_cmake_install() diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 2437c229223187..ca0058ec87c2ca 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 2, + "port-version": 3, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "dependencies": [ @@ -50,12 +50,13 @@ "description": "Build all vtk modules", "dependencies": [ "ffmpeg", - "gdal", "libmysql", { "name": "vtk", "default-features": false, "features": [ + "gdal", + "geojson", "mpi", "python", "qt" @@ -87,6 +88,22 @@ "cuda" ] }, + "gdal": { + "description": "Support GDAL compilation", + "dependencies": [ + "gdal", + { + "name": "vtk", + "default-features": false, + "features": [ + "mpi" + ] + } + ] + }, + "geojson": { + "description": "Convert Geo JSON format to vtkPolyData" + }, "mpi": { "description": "MPI functionality for VTK", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5a9ed2eccb290c..d1898e68f57387 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6966,7 +6966,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 2 + "port-version": 3 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 6022f3fefc12ae..6ab4ccbbe22240 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b201a8e060b6c2688ccc2e96cae175f2d8af205", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 3 + }, { "git-tree": "5e50a05b2ff0cc2f4df601ddb146c75a2f266a6a", "version-semver": "9.0.3-pv5.9.1", From 4eeec39d198d76e5ea4a891b18cdc421b3be9a66 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 11 Oct 2021 20:02:24 +0200 Subject: [PATCH 0776/1858] [msdfgen] Update to 1.9.1 (#20639) * Update msdfgen to 1.9.1 * Update CI baseline Co-authored-by: chausner --- ports/msdfgen/compatibility.patch | 15 ----------- ports/msdfgen/portfile.cmake | 42 +++++++++++++++---------------- ports/msdfgen/vcpkg.json | 15 +++++++++-- versions/baseline.json | 2 +- versions/m-/msdfgen.json | 5 ++++ 5 files changed, 39 insertions(+), 40 deletions(-) delete mode 100644 ports/msdfgen/compatibility.patch diff --git a/ports/msdfgen/compatibility.patch b/ports/msdfgen/compatibility.patch deleted file mode 100644 index f1662549a79243..00000000000000 --- a/ports/msdfgen/compatibility.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/ext/import-font.cpp b/ext/import-font.cpp -index 8f23620..ed26f54 100644 ---- a/ext/import-font.cpp -+++ b/ext/import-font.cpp -@@ -7,10 +7,6 @@ - #include FT_FREETYPE_H - #include FT_OUTLINE_H - --#ifdef _WIN32 -- #pragma comment(lib, "freetype.lib") --#endif -- - namespace msdfgen { - - #define REQUIRE(cond) { if (!(cond)) return false; } diff --git a/ports/msdfgen/portfile.cmake b/ports/msdfgen/portfile.cmake index cfe688c44d2bf3..16bb48a7e3d628 100644 --- a/ports/msdfgen/portfile.cmake +++ b/ports/msdfgen/portfile.cmake @@ -1,44 +1,42 @@ # No symbols are exported in msdfgen source vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if ("tools" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Tools cannot be built on UWP.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Chlumsky/msdfgen - REF 9af250c7d6780a41dcaf536c05e3e1987a1bdcd7 - SHA512 6b1dadd386aedf1e2de927dc83fe1f7fd7e053b0e9829ea0609a193ab8d9f92ecf08d2a6225b76a4f7bf9344b2935f38bbd00c4cc0c6627c1d95f67d2db728fe + REF v1.9.1 + SHA512 7A721B38027548F66D1C3EB862C1F27EA0A431C325119504D072BA6D7ED87539BA4D6020C663354B7B82BA48725D77CC642DB05FB596749292A2A12BE21CE528 HEAD_REF master - PATCHES - compatibility.patch ) -set(BUILD_TOOLS OFF) -if ("tools" IN_LIST FEATURES) - if (VCPKG_TARGET_IS_UWP) - message("Tools couldn't be built on UWP, disable it automatically.") - else() - set(BUILD_TOOLS ON) - endif() -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools MSDFGEN_BUILD_MSDFGEN_STANDALONE + openmp MSDFGEN_USE_OPENMP +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DMSDFGEN_BUILD_MSDFGEN_STANDALONE=${BUILD_TOOLS} + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/msdfgen) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/msdfgen) # move exe to tools -if(BUILD_TOOLS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if("tools" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_copy_tools(TOOL_NAMES msdfgen AUTO_CLEAN) endif() - # cleanup -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # license -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/msdfgen/vcpkg.json b/ports/msdfgen/vcpkg.json index 5c8d9628c72c0a..ebc4372eec1a4a 100644 --- a/ports/msdfgen/vcpkg.json +++ b/ports/msdfgen/vcpkg.json @@ -1,12 +1,23 @@ { "name": "msdfgen", - "version-string": "1.8", + "version": "1.9.1", "description": "Multi-channel signed distance field generator", "homepage": "https://github.com/Chlumsky/msdfgen", "dependencies": [ - "freetype" + "freetype", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { + "openmp": { + "description": "Build with OpenMP support for multi-threaded code." + }, "tools": { "description": "Generates an executable inside the tools folder. Not supported on UWP." } diff --git a/versions/baseline.json b/versions/baseline.json index d1898e68f57387..f50c2f5fd37cec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4433,7 +4433,7 @@ "port-version": 0 }, "msdfgen": { - "baseline": "1.8", + "baseline": "1.9.1", "port-version": 0 }, "msgpack": { diff --git a/versions/m-/msdfgen.json b/versions/m-/msdfgen.json index 1ae233d43bdb91..333d04e5c842cd 100644 --- a/versions/m-/msdfgen.json +++ b/versions/m-/msdfgen.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eade2edd986173003ec960fa30d29226a35ddb68", + "version": "1.9.1", + "port-version": 0 + }, { "git-tree": "8b15da4b26ea13caeba60337d49e6d5ec17c3e11", "version-string": "1.8", From 4ff183d33766afd23c022554116d56ff3398dfd6 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 11 Oct 2021 20:03:50 +0200 Subject: [PATCH 0777/1858] [qt] Fix qtmultimedia with gstreamer on windows (#20555) * apply patches to make qtmultimedia work with gestreamer on windows * version stuff * remove libnice from ci.baseline * move gstreamer on osx as fail to baseline * add supports field to qtmultimedia. Qt does not officially support x86 on windows * version stuff * remove duplicated patch * version stuff * add upstream patch to fix x86-windows * [skip actions] version stuff --- ports/qtbase/fix_qthread_max.patch | 13 +++ ports/qtbase/portfile.cmake | 1 + ports/qtbase/vcpkg.json | 2 +- ports/qtmultimedia/3c74340.diff | 128 +++++++++++++++++++++++++ ports/qtmultimedia/FindGObject.patch | 20 ++++ ports/qtmultimedia/FindGStreamer.patch | 36 +++++++ ports/qtmultimedia/portfile.cmake | 6 +- ports/qtmultimedia/remove_unistd.patch | 24 +++++ ports/qtmultimedia/vcpkg.json | 6 ++ scripts/ci.baseline.txt | 9 +- versions/baseline.json | 4 +- versions/q-/qtbase.json | 5 + versions/q-/qtmultimedia.json | 5 + 13 files changed, 247 insertions(+), 12 deletions(-) create mode 100644 ports/qtbase/fix_qthread_max.patch create mode 100644 ports/qtmultimedia/3c74340.diff create mode 100644 ports/qtmultimedia/FindGObject.patch create mode 100644 ports/qtmultimedia/FindGStreamer.patch create mode 100644 ports/qtmultimedia/remove_unistd.patch diff --git a/ports/qtbase/fix_qthread_max.patch b/ports/qtbase/fix_qthread_max.patch new file mode 100644 index 00000000000000..9138c3c8891119 --- /dev/null +++ b/ports/qtbase/fix_qthread_max.patch @@ -0,0 +1,13 @@ +diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h +index 5dc4d2222..1696dbc80 100644 +--- a/src/corelib/thread/qthread.h ++++ b/src/corelib/thread/qthread.h +@@ -120,7 +120,7 @@ public: + bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever)); + bool wait(unsigned long time) + { +- if (time == std::numeric_limits::max()) ++ if (time == (std::numeric_limits::max)()) + return wait(QDeadlineTimer(QDeadlineTimer::Forever)); + return wait(QDeadlineTimer(time)); + } diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 60a2472544a5c2..fb3eca7c34db81 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -17,6 +17,7 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch + fix_qthread_max.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 25f24be83c74fb..56b49db0096ee7 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version-semver": "6.2.0", - "port-version": 1, + "port-version": 2, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtmultimedia/3c74340.diff b/ports/qtmultimedia/3c74340.diff new file mode 100644 index 00000000000000..05935f6237a7df --- /dev/null +++ b/ports/qtmultimedia/3c74340.diff @@ -0,0 +1,128 @@ +From 3c7434025c5e14c2b3027a13ce90aab49712156c Mon Sep 17 00:00:00 2001 +From: André de la Rocha +Date: Wed, 06 Oct 2021 02:45:14 +0200 +Subject: [PATCH] Fix function declarations + +Adding missing QT_WIN_CALLBACK / QT_FASTCALL + +Pick-to: 6.2 +Change-Id: I5ba5a6341a988f162b9562c9fd328b9d90c6e1ab +Reviewed-by: Lars Knoll +--- + +diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp +index 067c2bb..a525569 100644 +--- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp ++++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp +@@ -190,7 +190,7 @@ + } + }; + +-LRESULT deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) ++LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) + { + if (message == WM_DEVICECHANGE) { + auto b = (PDEV_BROADCAST_HDR)lParam; +diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +index 29e214d..0dc06a4 100644 +--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h ++++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +@@ -65,7 +65,7 @@ + class QWindowsEngine; + class CMMNotificationClient; + +-LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); ++LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); + + class QWindowsMediaDevices : public QPlatformMediaDevices + { +@@ -88,7 +88,7 @@ + HDEVNOTIFY m_videoDeviceNotification; + + friend CMMNotificationClient; +- friend LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); ++ friend LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); + }; + + QT_END_NAMESPACE +diff --git a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp +index c17f8a6..cada965 100644 +--- a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp ++++ b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp +@@ -114,17 +114,17 @@ + convert_to_ARGB32_avx2<0, 1, 2, 3>(frame, output); + } + +-void qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_avx2<0, 3, 2, 1>(frame, output); + } + +-void qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_avx2<3, 0, 1, 2>(frame, output); + } + +-void qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_avx2<3, 2, 1, 0>(frame, output); + } +diff --git a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp +index 8c0092e..68abf04 100644 +--- a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp ++++ b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp +@@ -96,22 +96,22 @@ + + } + +-void qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_sse2<0, 1, 2, 3>(frame, output); + } + +-void qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_sse2<0, 3, 2, 1>(frame, output); + } + +-void qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_sse2<3, 0, 1, 2>(frame, output); + } + +-void qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_sse2<3, 2, 1, 0>(frame, output); + } +diff --git a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp +index c1acb9b..a5dfdda 100644 +--- a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp ++++ b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp +@@ -105,17 +105,17 @@ + convert_to_ARGB32_ssse3<0, 1, 2, 3>(frame, output); + } + +-void qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_ssse3<0, 3, 2, 1>(frame, output); + } + +-void qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_ssse3<3, 0, 1, 2>(frame, output); + } + +-void qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) ++void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) + { + convert_to_ARGB32_ssse3<3, 2, 1, 0>(frame, output); + } diff --git a/ports/qtmultimedia/FindGObject.patch b/ports/qtmultimedia/FindGObject.patch new file mode 100644 index 00000000000000..d8af8a7b582d5a --- /dev/null +++ b/ports/qtmultimedia/FindGObject.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake +index dc207a2..19a8a67 100644 +--- a/cmake/FindGObject.cmake ++++ b/cmake/FindGObject.cmake +@@ -27,13 +27,13 @@ + GLIB2::GLIB2 + ) + else() +- find_path(GGObject_INCLUDE_DIR ++ find_path(GObject_INCLUDE_DIR + NAMES gobject.h + PATH_SUFFIXES glib-2.0/gobject/ + ) + find_library(GObject_LIBRARY NAMES gobject-2.0) + if (GObject_LIBRARY AND GObject_INCLUDE_DIR) +- add_library(GObject::GObject IMPORTED) ++ add_library(GObject::GObject INTERFACE IMPORTED) + target_include_directories(GObject::GObject INTERFACE + ${GObject_INCLUDE_DIR} + ) diff --git a/ports/qtmultimedia/FindGStreamer.patch b/ports/qtmultimedia/FindGStreamer.patch new file mode 100644 index 00000000000000..f958c4150db863 --- /dev/null +++ b/ports/qtmultimedia/FindGStreamer.patch @@ -0,0 +1,36 @@ +From 375d2c0ccb602df38ef8f49c5b3e0bf09c24bf46 Mon Sep 17 00:00:00 2001 +From: Joerg Bornemann +Date: Mon, 13 Sep 2021 10:50:03 +0200 +Subject: Fix build without pkg-config support + +Fix several issues in cmake/Find* in the code path that's hit when +pkg-config is not used. + +Pick-to: 6.2 +Task-number: QTBUG-96401 +Change-Id: Iac6af560976ba6408d877027ed44a0354d32d2b7 +Reviewed-by: Alexey Edelev +Reviewed-by: Doris Verria +--- + cmake/FindGStreamer.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +(limited to 'cmake/FindGStreamer.cmake') + +diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake +index 0624c1a77..c3becd731 100644 +--- a/cmake/FindGStreamer.cmake ++++ b/cmake/FindGStreamer.cmake +@@ -53,8 +53,8 @@ function(find_gstreamer_component component prefix header library) + endif() + if(GStreamer_${component}_LIBRARY AND GStreamer_${component}_INCLUDE_DIR) + add_library(GStreamer::${component} INTERFACE IMPORTED) +- target_include_directories(GStreamer::${component} INTERFACE GStreamer_${component}_INCLUDE_DIR) +- target_link_libraries(GStreamer::${component} INTERFACE GStreamer_${component}_LIBRARY) ++ target_include_directories(GStreamer::${component} INTERFACE ${GStreamer_${component}_INCLUDE_DIR}) ++ target_link_libraries(GStreamer::${component} INTERFACE ${GStreamer_${component}_LIBRARY}) + endif() + mark_as_advanced(GStreamer_${component}_INCLUDE_DIR GStreamer_${component}_LIBRARY) + endif() +-- +cgit v1.2.1 diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 35d706187b12b1..45b1e99b8a1786 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -1,7 +1,11 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES fix_windows_header_include.patch) +set(${PORT}_PATCHES fix_windows_header_include.patch + FindGObject.patch + FindGStreamer.patch + remove_unistd.patch + 3c74340.diff) #Maybe TODO: ALSA + PulseAudio? (Missing Ports) diff --git a/ports/qtmultimedia/remove_unistd.patch b/ports/qtmultimedia/remove_unistd.patch new file mode 100644 index 00000000000000..0f6d3ab15c0458 --- /dev/null +++ b/ports/qtmultimedia/remove_unistd.patch @@ -0,0 +1,24 @@ +diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp +index d4806b23a..f985a973b 100644 +--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp ++++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp +@@ -45,7 +45,6 @@ + #include "qgstreameraudiosink_p.h" + #include "qgstreameraudiodevice_p.h" + #include +-#include + + #include + #include +diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp +index 51fc26c42..3b04a77bb 100644 +--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp ++++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp +@@ -45,7 +45,6 @@ + #include "qgstreameraudiosource_p.h" + #include "qgstreameraudiodevice_p.h" + #include +-#include + + #include + Q_DECLARE_OPAQUE_POINTER(GstSample *); diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index f354e57afa8d83..ac882b76dd5200 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtmultimedia", "version-semver": "6.2.0", + "port-version": 1, "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "dependencies": [ @@ -11,6 +12,11 @@ "gui", "network" ] + }, + { + "name": "qtshadertools", + "host": true, + "default-features": false } ], "default-features": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a8543d49ca7a69..1b69b56d9a0af5 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -413,6 +413,7 @@ graphqlparser:arm-uwp=fail graphqlparser:x64-uwp=fail gsl:arm-uwp=fail gsl:x64-uwp=fail +gstreamer:x64-osx=fail gtk:x64-windows-static=fail gtk:x64-windows-static-md=fail gts:x64-osx=fail @@ -647,14 +648,6 @@ libmpeg2:x64-uwp=fail libmupdf:x64-osx=fail libmysql:x86-windows=fail libmysql:arm64-windows=fail -#The official website of libnice https://nice.freedesktop.org cannot be accessed -libnice:x86-windows=skip -libnice:x64-windows=skip -libnice:x64-windows-static=skip -libnice:x64-uwp=skip -libnice:arm64-windows=skip -libnice:x64-linux=skip -libnice:x64-osx=skip libopenmpt:x64-linux=fail libopenmpt:x64-osx=fail libopusenc:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index f50c2f5fd37cec..074755bb4afb30 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5562,7 +5562,7 @@ }, "qtbase": { "baseline": "6.2.0", - "port-version": 1 + "port-version": 2 }, "qtcharts": { "baseline": "6.2.0", @@ -5610,7 +5610,7 @@ }, "qtmultimedia": { "baseline": "6.2.0", - "port-version": 0 + "port-version": 1 }, "qtnetworkauth": { "baseline": "6.2.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 657fa7a5e6abda..c7b1a0fa7f8ac5 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7c78fd7fe6600eb96712f151670efc765bf5c31", + "version-semver": "6.2.0", + "port-version": 2 + }, { "git-tree": "01075dfd8097c54bd832400553958c2ff9bebf31", "version-semver": "6.2.0", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 7d485febd12c92..91d75b2b4dd5c6 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e632d54bc7aea99a619c091cd43ea42e16ccefc2", + "version-semver": "6.2.0", + "port-version": 1 + }, { "git-tree": "3ddc9abc52e8df720dd1799b3ecaabe36bb5b7f3", "version-semver": "6.2.0", From a9da84c241118094f1da04b01085833338fc209c Mon Sep 17 00:00:00 2001 From: Dmitriy Fishman Date: Tue, 12 Oct 2021 03:22:32 +0300 Subject: [PATCH 0778/1858] Update manifests.md (#20598) --- docs/specifications/manifests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/specifications/manifests.md b/docs/specifications/manifests.md index 91acfea58a7888..a71db2d8b59989 100644 --- a/docs/specifications/manifests.md +++ b/docs/specifications/manifests.md @@ -49,7 +49,7 @@ CMake). The specification uses definitions from the [Definitions](#definitions) section in order to specify the shape of a value. Note that any object may contain any directives, written as -a field key that starts with a `$`; these directive shall be ignored by `vcpkg`. Common +a field key that starts with a `$`; these directives shall be ignored by `vcpkg`. Common directives may include `"$schema"`, `"$comment"`, `"$reason"`. A manifest must be a top-level object, and must have at least: From 8efec4e189fdbdcfc34d57bee1d8d139550c6c97 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 02:53:14 +0200 Subject: [PATCH 0779/1858] Remove tmxlite from ci.baseline.txt (#20605) UWP builds were fixed in #20492 --- scripts/ci.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 1b69b56d9a0af5..01a7bf39f5557f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1509,8 +1509,6 @@ tinyexif:arm-uwp=fail tinyexif:x64-uwp=fail tiny-process-library:arm-uwp=fail tiny-process-library:x64-uwp=fail -tmxlite:arm-uwp=fail -tmxlite:x64-uwp=fail tmxparser:arm64-windows=fail tmxparser:arm-uwp=fail tmxparser:x64-uwp=fail From 65027fc8ec127cedde7c1d1e9749879bff93cb53 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Tue, 12 Oct 2021 04:21:08 +0300 Subject: [PATCH 0780/1858] [boost] bugfix and new features after update to 1.77.0 (#20432) * [scripts/boost] fix issue #20417 [boost-iostreams] replace explicit dependencies with default-features, allow to disable compression filters * add versions * [scripts/boost] update port version after #20421 * [boost-odeint] move boost-mpi dependency to the feature * add version * [boost-modular-build-helper] rework user-config generation * [boost-python] move python3 from explicit dependency to default feature * [boost-modular-build-helper] update version * add verions * [boost-modular-build-helper] fix empty flags * update version * Fix compilation on Emscripten / WebAssembly (#20551) * [opencv4,opencv3] Control exported protobuf dependency (#20550) * Control exported protobuf dependency * Update versions * Control exported protobuf dependency * Update versions * [OpenMVS] restore deprecated cmake scripts for configure, build & fixup targets (#20422) * [OpenMVS] restore deprecated cmake scripts * [OpenMVS] fix references * switch back to vcpkg_cmake_* Co-authored-by: nicole mazzuca * [libffi] Don't replace string in file that doesn't exist. (#20554) * Don't replace string in file that doesn't exist. * Update per bot. * Update per bot again. * Address comments. * [json-dto] Update to 0.2.14 (#20570) * json-dto updated to v.0.2.14. * json-dto-0.2.14 added to baseline. * Change deprecated commands. * Update baseline for fresh json-dto-0.2.14. * [sail] Update to 0.9.0-pre17 (#20562) * [sail] Update to 0.9.0-pre17 * [sail] vcpkg x-add-version --all --overwrite-version * [sail] Update pre17 hash * [sail] vcpkg x-add-version --all --overwrite-version * [freexl] Update to 1.0.6 (#20520) * Reformat portfile * Minimize makefiles patch * Update to 1.0.6 * Fix uwp builds, remove skip from baseline * Install pc file for windows * Update versions Co-authored-by: Billy Robert O'Neal III * [dartsim] Update to 6.11.0 (#20566) * Update dartsim * Use newer vcpkg functions * Update version number * Update ports/dartsim/portfile.cmake Co-authored-by: Robert Schumacher * Update versions Co-authored-by: Robert Schumacher * [scripts/boost] update Boost version in boost-modular-build.cmake to avoid manual changes * update version * [boost-modular-build-helper] fix USER_CONFIG_EXTRA_LINES variable name and rename generated files * update version * Resolve differences from rerunning generate-ports.ps1. Co-authored-by: Billy Robert O'Neal III Co-authored-by: Tobias Markus Co-authored-by: Kai Pastor Co-authored-by: Stefano Sinigardi Co-authored-by: nicole mazzuca Co-authored-by: Lars Glud Co-authored-by: eao197 Co-authored-by: Dmitry Baryshev Co-authored-by: Akash Co-authored-by: Robert Schumacher --- ports/boost-config/portfile.cmake | 3 +- ports/boost-config/vcpkg.json | 2 +- ports/boost-iostreams/b2-options.cmake | 102 ++++++++++--- ports/boost-iostreams/vcpkg.json | 37 ++++- .../boost-modular-build-helper/CMakeLists.txt | 99 +++++++----- .../{Jamroot.jam => Jamroot.jam.in} | 4 +- .../boost-modular-build.cmake | 31 ++-- .../boost-modular-build-helper/portfile.cmake | 6 +- .../{user-config.jam => user-config.jam.in} | 37 +---- ports/boost-modular-build-helper/vcpkg.json | 1 + ports/boost-odeint/vcpkg.json | 15 +- ports/boost-process/portfile.cmake | 3 +- ports/boost-process/vcpkg.json | 2 +- ports/boost-python/b2-options.cmake | 42 +++-- ports/boost-python/vcpkg.json | 11 +- ports/boost/vcpkg.json | 9 +- scripts/boost/generate-ports.ps1 | 144 ++++++++++++------ versions/b-/boost-config.json | 5 + versions/b-/boost-iostreams.json | 5 + versions/b-/boost-modular-build-helper.json | 5 + versions/b-/boost-odeint.json | 5 + versions/b-/boost-process.json | 5 + versions/b-/boost-python.json | 5 + versions/b-/boost.json | 5 + versions/baseline.json | 14 +- 25 files changed, 397 insertions(+), 200 deletions(-) rename ports/boost-modular-build-helper/{Jamroot.jam => Jamroot.jam.in} (96%) rename ports/boost-modular-build-helper/{user-config.jam => user-config.jam.in} (69%) diff --git a/ports/boost-config/portfile.cmake b/ports/boost-config/portfile.cmake index 2fdbf55046404a..c32b1dcb7e1e66 100644 --- a/ports/boost-config/portfile.cmake +++ b/ports/boost-config/portfile.cmake @@ -6,8 +6,7 @@ vcpkg_from_github( REF boost-1.77.0 SHA512 c6df16825b7bb27412667e00b6b6cdecbf56ee0707aa1df3505637c7de5c39c87335fabd7cd4361b29625d71c7664e6af865fc271ad0b3e70cc8872825f6155e HEAD_REF master - PATCHES - fix-emscripten-compilation.patch + PATCHES fix-emscripten-compilation.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-config/vcpkg.json b/ports/boost-config/vcpkg.json index fd0c8713af6a25..3b56236a548af7 100644 --- a/ports/boost-config/vcpkg.json +++ b/ports/boost-config/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-config", "version": "1.77.0", - "port-version": 1, + "port-version": 2, "description": "Boost config module", "homepage": "https://github.com/boostorg/config", "dependencies": [ diff --git a/ports/boost-iostreams/b2-options.cmake b/ports/boost-iostreams/b2-options.cmake index 5a10a4ae1ea87a..1271c81305a7aa 100644 --- a/ports/boost-iostreams/b2-options.cmake +++ b/ports/boost-iostreams/b2-options.cmake @@ -1,30 +1,86 @@ -list(APPEND B2_OPTIONS - -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" - -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" -) - if(CMAKE_BUILD_TYPE STREQUAL "Release") - set(lib_suffix lib) + set(lib_path_suffix lib) +else() + set(lib_path_suffix debug/lib) +endif() + +if("bzip2" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sBZIP2_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + # Overwride debug library name + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND B2_OPTIONS + -sBZIP2_NAME=bz2d + ) + endif() + list(APPEND B2_OPTIONS + -sBZIP2_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) +else() + list(APPEND B2_OPTIONS + -sNO_BZIP2=1 + ) +endif() + +if("lzma" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sLZMA_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + # Overwride debug library name + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND B2_OPTIONS + -sLZMA_NAME=lzmad + ) + endif() + list(APPEND B2_OPTIONS + -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) else() - set(lib_suffix debug/lib) - if(WIN32) - set(ZLIB_NAME zlibd) - else() - set(ZLIB_NAME z) + list(APPEND B2_OPTIONS + -sNO_LZMA=1 + ) +endif() + +if("zlib" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sZLIB_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + # Overwride debug library name + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + if(WIN32) + set(ZLIB_NAME zlibd) + else() + set(ZLIB_NAME z) + endif() + list(APPEND B2_OPTIONS + -sZLIB_NAME=${ZLIB_NAME} + ) endif() list(APPEND B2_OPTIONS - -sZLIB_NAME=${ZLIB_NAME} - -sBZIP2_NAME=bz2d - -sLZMA_NAME=lzmad - -sZSTD_BINARY=zstdd + -sZLIB_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) +else() + list(APPEND B2_OPTIONS + -sNO_ZLIB=1 ) endif() -list(APPEND B2_OPTIONS - -sZLIB_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" - -sBZIP2_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" - -sLZMA_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" - -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_suffix}" -) +if("zstd" IN_LIST FEATURES) + list(APPEND B2_OPTIONS + -sZSTD_INCLUDE="${CURRENT_INSTALLED_DIR}/include" + ) + # Overwride debug library name + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND B2_OPTIONS + -sZSTD_NAME=zstdd + ) + endif() + list(APPEND B2_OPTIONS + -sZSTD_LIBRARY_PATH="${CURRENT_INSTALLED_DIR}/${lib_path_suffix}" + ) +else() + list(APPEND B2_OPTIONS + -sNO_ZSTD=1 + ) +endif() \ No newline at end of file diff --git a/ports/boost-iostreams/vcpkg.json b/ports/boost-iostreams/vcpkg.json index 6077718372062f..4d694c8178d40d 100644 --- a/ports/boost-iostreams/vcpkg.json +++ b/ports/boost-iostreams/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-iostreams", "version": "1.77.0", + "port-version": 1, "description": "Boost iostreams module", "homepage": "https://github.com/boostorg/iostreams", "supports": "!uwp", @@ -32,13 +33,41 @@ "boost-type-traits", "boost-utility", "boost-vcpkg-helpers", - "bzip2", - "liblzma", { "name": "vcpkg-cmake", "host": true - }, + } + ], + "default-features": [ + "bzip2", + "lzma", "zlib", "zstd" - ] + ], + "features": { + "bzip2": { + "description": "Support bzip2 filters", + "dependencies": [ + "bzip2" + ] + }, + "lzma": { + "description": "Support LZMA/xz filters", + "dependencies": [ + "liblzma" + ] + }, + "zlib": { + "description": "Support zlib filters", + "dependencies": [ + "zlib" + ] + }, + "zstd": { + "description": "Support zstd filters", + "dependencies": [ + "zstd" + ] + } + } } diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index 8b2f5910a56044..f4a0f90530dcdb 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -1,17 +1,14 @@ cmake_minimum_required(VERSION 3.9) project(boost CXX) -set(B2_OPTIONS) +# The following variables are used in user-config.jam file +set(USER_CONFIG_TOOLSET) +set(USER_CONFIG_TOOLSET_VERSION) +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND) +set(USER_CONFIG_TOOLSET_OPTIONS) +set(USER_CONFIG_EXTRA_LINES) -if(MSVC) - if(MSVC_VERSION LESS 1900) - math(EXPR BOOST_MSVC_VERSION "${MSVC_VERSION} / 10 - 60") - else() - math(EXPR BOOST_MSVC_VERSION "${MSVC_VERSION} / 10 - 50") - endif() -else() - set(VCPKG_PLATFORM_TOOLSET external) -endif() +set(B2_OPTIONS) #### Handle ICU if(WIN32) @@ -24,10 +21,8 @@ endif() # Add build type specific options if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") list(APPEND B2_OPTIONS runtime-link=shared) - set(LIB_RUNTIME_LINK "shared") else() list(APPEND B2_OPTIONS runtime-link=static) - set(LIB_RUNTIME_LINK "static") endif() if(BUILD_SHARED_LIBS) @@ -56,31 +51,28 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND WIN32) list(APPEND B2_OPTIONS "asmflags=/safeseh") endif() -file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) - if(MSVC) - set(B2_TOOLSET msvc) + set(USER_CONFIG_TOOLSET msvc) + if(MSVC_VERSION LESS 1900) + math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 60") + else() + math(EXPR USER_CONFIG_TOOLSET_VERSION "${MSVC_VERSION} / 10 - 50") + endif() list(APPEND B2_OPTIONS target-os=windows) elseif(APPLE) - set(B2_TOOLSET clang) + set(USER_CONFIG_TOOLSET clang) list(APPEND B2_OPTIONS target-os=darwin) elseif(WIN32) - set(B2_TOOLSET gcc) + set(USER_CONFIG_TOOLSET gcc) list(APPEND B2_OPTIONS target-os=windows) elseif(ANDROID) - set(B2_TOOLSET gcc) + set(USER_CONFIG_TOOLSET gcc) list(APPEND B2_OPTIONS target-os=android) else() - set(B2_TOOLSET gcc) + set(USER_CONFIG_TOOLSET gcc) list(APPEND B2_OPTIONS target-os=linux) endif() -if(WIN32) - list(APPEND B2_OPTIONS threadapi=win32) -else() - list(APPEND B2_OPTIONS threadapi=pthread) -endif() - # Properly handle compiler and linker flags passed by VCPKG if(CMAKE_BUILD_TYPE STREQUAL "Release") set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") @@ -122,9 +114,12 @@ if(APPLE) endforeach() endif() +string(REGEX REPLACE "[ \t\r\n]+" " " CXXFLAGS "${CXXFLAGS}") string(STRIP "${CXXFLAGS}" CXXFLAGS) -string(STRIP "${CFLAGS}" CFLAGS) -string(STRIP "${LDFLAGS}" LDFLAGS) +string(REGEX REPLACE "[ \t\r\n]+" " " CFLAGS "${CFLAGS}") +string(STRIP "${CFLAGS}" CFLAGS) +string(REGEX REPLACE "[ \t\r\n]+" " " LDFLAGS "${LDFLAGS}") +string(STRIP "${LDFLAGS}" LDFLAGS) if(NOT CXXFLAGS STREQUAL "") string(REPLACE " " " " CXXFLAGS "${CXXFLAGS}") @@ -187,6 +182,39 @@ if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) endif() +set(USER_CONFIG_TOOLSET_INVOCATION_COMMAND "\"${CMAKE_CXX_COMPILER}\"") + +if(USER_CONFIG_TOOLSET STREQUAL "msvc") + file(TO_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/nothing.bat" NOTHING_BAT) + string(APPEND USER_CONFIG_TOOLSET_OPTIONS + " \"${NOTHING_BAT}\"\n" + " ${CXXFLAGS}\n" + " ${CFLAGS}\n" + " ${LDFLAGS}\n" + ) +else() + string(APPEND USER_CONFIG_TOOLSET_OPTIONS + " \"${CMAKE_RANLIB}\"\n" + " \"${CMAKE_AR}\"\n" + " ${CXXFLAGS}\n" + " ${CFLAGS}\n" + " ${LDFLAGS}\n" + ) +endif() + +if(WIN32 AND NOT USER_CONFIG_TOOLSET STREQUAL "msvc") + # MINGW here causes b2 to not run cygpath + string(APPEND USER_CONFIG_TOOLSET_OPTIONS + " mingw\n" + ) +endif() + +if(WIN32) + list(APPEND B2_OPTIONS threadapi=win32) +else() + list(APPEND B2_OPTIONS threadapi=pthread) +endif() + if(CMAKE_BUILD_TYPE STREQUAL "Release") list(APPEND B2_OPTIONS variant=release) else() @@ -197,23 +225,23 @@ if(NOT WIN32) list(APPEND B2_OPTIONS "--layout=system") endif() +include(ProcessorCount) +ProcessorCount(NUMBER_OF_PROCESSORS) +if(NOT NUMBER_OF_PROCESSORS) + set(NUMBER_OF_PROCESSORS 1) +endif() + # Include port specific CMake fragment if(DEFINED BOOST_CMAKE_FRAGMENT) message(STATUS "Including ${BOOST_CMAKE_FRAGMENT}") include(${BOOST_CMAKE_FRAGMENT}) endif() -configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam ${CMAKE_CURRENT_BINARY_DIR}/user-config.jam @ONLY) - -include(ProcessorCount) -ProcessorCount(NUMBER_OF_PROCESSORS) -if(NOT NUMBER_OF_PROCESSORS) - set(NUMBER_OF_PROCESSORS 1) -endif() +configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam.in ${CMAKE_CURRENT_BINARY_DIR}/user-config.jam @ONLY) add_custom_target(boost ALL COMMAND "${B2_EXE}" - toolset=${B2_TOOLSET} + toolset=${USER_CONFIG_TOOLSET} --user-config=${CMAKE_CURRENT_BINARY_DIR}/user-config.jam --stagedir=${CMAKE_CURRENT_BINARY_DIR}/stage --build-dir=${CMAKE_CURRENT_BINARY_DIR} @@ -235,6 +263,7 @@ add_custom_target(boost ALL --hash -q debug-symbols=on + # Enable debugging level 2. -d +2 threading=multi diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam.in similarity index 96% rename from ports/boost-modular-build-helper/Jamroot.jam rename to ports/boost-modular-build-helper/Jamroot.jam.in index 2a70c7ebdda985..6094cc8d1ccf89 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam.in @@ -1,5 +1,5 @@ -constant BOOST_VERSION : 1.77.0 ; -constant BOOST_VERSION_ABI_TAG : 1_77 ; +constant BOOST_VERSION : @BOOST_VERSION@ ; +constant BOOST_VERSION_ABI_TAG : @BOOST_VERSION_ABI_TAG@ ; constant BOOST_JAMROOT_MODULE : $(__name__) ; import boostcpp ; diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index e4a4fd9f35c2b6..4e7dfb4563c97e 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -1,6 +1,14 @@ get_filename_component(BOOST_BUILD_INSTALLED_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) get_filename_component(BOOST_BUILD_INSTALLED_DIR "${BOOST_BUILD_INSTALLED_DIR}" DIRECTORY) +set(BOOST_VERSION 1.77.0) +string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" BOOST_VERSION_MATCH "${BOOST_VERSION}") +if("${CMAKE_MATCH_3}" GREATER 0) + set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}_${CMAKE_MATCH_3}") +else() + set(BOOST_VERSION_ABI_TAG "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}") +endif() + function(boost_modular_build) cmake_parse_arguments(_bm "" "SOURCE_PATH;BOOST_CMAKE_FRAGMENT" "" ${ARGN}) @@ -8,9 +16,10 @@ function(boost_modular_build) message(FATAL_ERROR "SOURCE_PATH is a required argument to boost_modular_build.") endif() - # Next CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT} - set(B2_REQUIREMENTS) # this variable is used in the Jamroot.jam + # The following variables are used in the Jamroot.jam + set(B2_REQUIREMENTS) + # Some CMake variables may be overridden in the file specified in ${_bm_BOOST_CMAKE_FRAGMENT} if(DEFINED _bm_BOOST_CMAKE_FRAGMENT) message(STATUS "Including ${_bm_BOOST_CMAKE_FRAGMENT}") include(${_bm_BOOST_CMAKE_FRAGMENT}) @@ -28,13 +37,13 @@ function(boost_modular_build) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") set(BOOST_LIB_PREFIX) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.") - set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib) - set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib) - elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") - set(BOOST_LIB_RELEASE_SUFFIX -vc120-mt.lib) - set(BOOST_LIB_DEBUG_SUFFIX -vc120-mt-gd.lib) - endif() + if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.") + set(BOOST_LIB_RELEASE_SUFFIX -vc140-mt.lib) + set(BOOST_LIB_DEBUG_SUFFIX -vc140-mt-gd.lib) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120") + set(BOOST_LIB_RELEASE_SUFFIX -vc120-mt.lib) + set(BOOST_LIB_DEBUG_SUFFIX -vc120-mt-gd.lib) + endif() else() set(BOOST_LIB_PREFIX lib) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -70,7 +79,7 @@ function(boost_modular_build) file(WRITE "${_jamfile}" "${_contents}") endif() - configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) + configure_file(${BOOST_BUILD_INSTALLED_DIR}/share/boost-build/Jamroot.jam.in ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY) set(configure_options) if(_bm_BOOST_CMAKE_FRAGMENT) @@ -112,7 +121,7 @@ function(boost_modular_build) string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries - string(REPLACE "-1_77" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries + string(REPLACE "-${BOOST_VERSION_ABI_TAG}" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") # nothing to do elseif(EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) diff --git a/ports/boost-modular-build-helper/portfile.cmake b/ports/boost-modular-build-helper/portfile.cmake index 8224bb9575579a..3caa70b6c2a05c 100644 --- a/ports/boost-modular-build-helper/portfile.cmake +++ b/ports/boost-modular-build-helper/portfile.cmake @@ -3,11 +3,11 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) file( COPY ${CMAKE_CURRENT_LIST_DIR}/boost-modular-build.cmake - ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam - ${CMAKE_CURRENT_LIST_DIR}/nothing.bat - ${CMAKE_CURRENT_LIST_DIR}/user-config.jam ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt + ${CMAKE_CURRENT_LIST_DIR}/Jamroot.jam.in + ${CMAKE_CURRENT_LIST_DIR}/nothing.bat ${CMAKE_CURRENT_LIST_DIR}/usage + ${CMAKE_CURRENT_LIST_DIR}/user-config.jam.in DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost-build ) \ No newline at end of file diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam.in similarity index 69% rename from ports/boost-modular-build-helper/user-config.jam rename to ports/boost-modular-build-helper/user-config.jam.in index aabe51b01036d4..fbd6f8d36e5e0b 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam.in @@ -1,36 +1,11 @@ import toolset ; -if "@VCPKG_PLATFORM_TOOLSET@" != "external" -{ - using msvc : @BOOST_MSVC_VERSION@ : cl.exe - : - "@NOTHING_BAT@" - @CXXFLAGS@ - @CFLAGS@ - @LDFLAGS@ - ; -} -else -{ - using @B2_TOOLSET@ : : @CMAKE_CXX_COMPILER@ - : - @CMAKE_RANLIB@ - @CMAKE_AR@ - @CXXFLAGS@ - @CFLAGS@ - @LDFLAGS@ - # MINGW here causes b2 to not run cygpath - mingw - ; -} +using @USER_CONFIG_TOOLSET@ : @USER_CONFIG_TOOLSET_VERSION@ : @USER_CONFIG_TOOLSET_INVOCATION_COMMAND@ + : +@USER_CONFIG_TOOLSET_OPTIONS@ + ; -if "@PORT@" = "boost-python" -{ - using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_RELEASE@" ; - using python : @VCPKG_PYTHON3_VERSION@ : : "@VCPKG_PYTHON3_INCLUDE@" : "@VCPKG_PYTHON3_LIBS_DEBUG@" : on ; - using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_RELEASE@" ; - using python : @VCPKG_PYTHON2_VERSION@ : : "@VCPKG_PYTHON2_INCLUDE@" : "@VCPKG_PYTHON2_LIBS_DEBUG@" : on ; -} +@USER_CONFIG_EXTRA_LINES@ if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel" { @@ -42,7 +17,7 @@ if "@PORT@" = "boost-mpi" || "@PORT@" = "boost-graph-parallel" project user-config : ; -if "@VCPKG_PLATFORM_TOOLSET@" != "external" +if "@USER_CONFIG_TOOLSET@" = "msvc" { lib advapi32 ; diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 63251aa3c46d47..e81e9a0fce0b15 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", + "port-version": 1, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/ports/boost-odeint/vcpkg.json b/ports/boost-odeint/vcpkg.json index 618b34f68ba550..ffab599347768e 100644 --- a/ports/boost-odeint/vcpkg.json +++ b/ports/boost-odeint/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-odeint", "version": "1.77.0", + "port-version": 1, "description": "Boost odeint module", "homepage": "https://github.com/boostorg/odeint", "dependencies": [ @@ -14,10 +15,6 @@ "boost-fusion", "boost-iterator", "boost-math", - { - "name": "boost-mpi", - "platform": "!uwp" - }, "boost-mpl", "boost-multi-array", "boost-preprocessor", @@ -29,5 +26,13 @@ "boost-units", "boost-utility", "boost-vcpkg-helpers" - ] + ], + "features": { + "mpi": { + "description": "Support parallelization with MPI", + "dependencies": [ + "boost-mpi" + ] + } + } } diff --git a/ports/boost-process/portfile.cmake b/ports/boost-process/portfile.cmake index 262e9f07d02687..efb0a5f91f6e1d 100644 --- a/ports/boost-process/portfile.cmake +++ b/ports/boost-process/portfile.cmake @@ -6,8 +6,7 @@ vcpkg_from_github( REF boost-1.77.0 SHA512 00eb27f702f092a20fdf1669b8c9c993b751971592d0bc5aa50b02d99d985a75361621b624aa51eb550c9e7905e15877168ae9d0feb1957fc85f99c264b152fd HEAD_REF master - PATCHES - fix_include.patch + PATCHES fix_include.patch ) include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake) diff --git a/ports/boost-process/vcpkg.json b/ports/boost-process/vcpkg.json index 904e902383c8b4..84dd98d52064f7 100644 --- a/ports/boost-process/vcpkg.json +++ b/ports/boost-process/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-process", "version": "1.77.0", - "port-version": 1, + "port-version": 2, "description": "Boost process module", "homepage": "https://github.com/boostorg/process", "supports": "!emscripten", diff --git a/ports/boost-python/b2-options.cmake b/ports/boost-python/b2-options.cmake index 3713424ed64706..f9f2e0f6ae7f8c 100644 --- a/ports/boost-python/b2-options.cmake +++ b/ports/boost-python/b2-options.cmake @@ -1,28 +1,38 @@ -set(BUILD_PYTHON_VERSIONS) +set(build_python_versions) if("python2" IN_LIST FEATURES) # Find Python2 libraries. Can't use find_package here, but we already know where everything is - file(GLOB VCPKG_PYTHON2_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python2.*") - set(VCPKG_PYTHON2_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib") - set(VCPKG_PYTHON2_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib") - string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON2_VERSION "${VCPKG_PYTHON2_INCLUDE}") - list(APPEND BUILD_PYTHON_VERSIONS "${VCPKG_PYTHON2_VERSION}") + file(GLOB python2_include_dir "${CURRENT_INSTALLED_DIR}/include/python2.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python2_version "${python2_include_dir}") + + string(APPEND USER_CONFIG_EXTRA_LINES + "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" + "using python : ${python2_version} : : \"${python2_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n") + list(APPEND build_python_versions "${python2_version}") endif() -# Find Python3 libraries. Can't use find_package here, but we already know where everything is -file(GLOB VCPKG_PYTHON3_INCLUDE "${CURRENT_INSTALLED_DIR}/include/python3.*") -set(VCPKG_PYTHON3_LIBS_RELEASE "${CURRENT_INSTALLED_DIR}/lib") -set(VCPKG_PYTHON3_LIBS_DEBUG "${CURRENT_INSTALLED_DIR}/debug/lib") -string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" VCPKG_PYTHON3_VERSION "${VCPKG_PYTHON3_INCLUDE}") -list(APPEND BUILD_PYTHON_VERSIONS "${VCPKG_PYTHON3_VERSION}") +if("python3" IN_LIST FEATURES) + # Find Python3 libraries. Can't use find_package here, but we already know where everything is + file(GLOB python3_include_dir "${CURRENT_INSTALLED_DIR}/include/python3.*") + string(REGEX REPLACE ".*python([0-9\.]+).*" "\\1" python3_version "${python3_include_dir}") -string(REPLACE ";" "," BUILD_PYTHON_VERSIONS "${BUILD_PYTHON_VERSIONS}") + string(APPEND USER_CONFIG_EXTRA_LINES + "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/lib\" ;\n" + "using python : ${python3_version} : : \"${python3_include_dir}\" : \"${CURRENT_INSTALLED_DIR}/debug/lib\" : on ;\n") + list(APPEND build_python_versions "${python3_version}") +endif() +if(NOT build_python_versions) + message(FATAL_ERROR "Boost.Python requires at least one Python specified as a feature.") +endif() + +string(REPLACE ";" "," build_python_versions "${build_python_versions}") list(APPEND B2_OPTIONS - python=${BUILD_PYTHON_VERSIONS} + python=${build_python_versions} ) -if(VCPKG_CXX_FLAGS_DEBUG MATCHES "BOOST_DEBUG_PYTHON") - list(APPEND B2_OPTIONS_DBG + +if(CMAKE_CXX_FLAGS_DEBUG MATCHES "BOOST_DEBUG_PYTHON" AND CMAKE_BUILD_TYPE STREQUAL "Debug") + list(APPEND B2_OPTIONS python-debugging=on ) endif() diff --git a/ports/boost-python/vcpkg.json b/ports/boost-python/vcpkg.json index 0ba6de705c49f2..51d50389b48ffb 100644 --- a/ports/boost-python/vcpkg.json +++ b/ports/boost-python/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-python", "version": "1.77.0", + "port-version": 1, "description": "Boost python module", "homepage": "https://github.com/boostorg/python", "supports": "!uwp & !(arm & windows) & !emscripten", @@ -35,18 +36,26 @@ "boost-type-traits", "boost-utility", "boost-vcpkg-helpers", - "python3", { "name": "vcpkg-cmake", "host": true } ], + "default-features": [ + "python3" + ], "features": { "python2": { "description": "Build with Python2 support", "dependencies": [ "python2" ] + }, + "python3": { + "description": "Build with Python3 support", + "dependencies": [ + "python3" + ] } } } diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index cf925fe92c1ca8..679f1b7528ba16 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost", "version": "1.77.0", + "port-version": 1, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "dependencies": [ @@ -73,10 +74,6 @@ "boost-geometry", "boost-gil", "boost-graph", - { - "name": "boost-graph-parallel", - "platform": "!uwp" - }, "boost-hana", "boost-heap", "boost-histogram", @@ -112,10 +109,6 @@ "boost-metaparse", "boost-move", "boost-mp11", - { - "name": "boost-mpi", - "platform": "!uwp" - }, "boost-mpl", "boost-msm", "boost-multi-array", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index e7d258d509ac13..902d8644951e55 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -23,10 +23,25 @@ else { # Clear this array when moving to a new boost version $portVersions = @{ - #e.g. "boost-asio" = 1; + #e.g. "boost-asio" = 1; + "boost" = 1; + "boost-config" = 2; + "boost-iostreams" = 1; + "boost-modular-build-helper" = 1; + "boost-odeint" = 1; + "boost-python" = 1; + "boost-process" = 2; } $portData = @{ + "boost" = @{ + "features" = @{ + "mpi" = @{ + "description" = "Build with MPI support"; + "dependencies" = @("boost-mpi", "boost-graph-parallel"); + } + } + }; "boost-asio" = @{ "dependencies" = @("openssl"); "supports" = "!emscripten" @@ -35,8 +50,26 @@ $portData = @{ "boost-fiber" = @{ "supports" = "!osx&!uwp&!arm&!emscripten" }; "boost-filesystem" = @{ "supports" = "!uwp" }; "boost-iostreams" = @{ - "dependencies" = @("zlib", "bzip2", "liblzma", "zstd"); - "supports" = "!uwp"; + "default-features" = @("bzip2", "lzma", "zlib", "zstd"); + "supports" = "!uwp"; + "features" = @{ + "bzip2" = @{ + "dependencies" = @("bzip2"); + "description" = "Support bzip2 filters" + }; + "lzma" = @{ + "dependencies" = @("liblzma"); + "description" = "Support LZMA/xz filters" + }; + "zlib" = @{ + "dependencies" = @("zlib"); + "description" = "Support zlib filters" + }; + "zstd" = @{ + "dependencies" = @("zstd"); + "description" = "Support zstd filters" + }; + }; }; "boost-context" = @{ "supports" = "!uwp&!emscripten" }; "boost-stacktrace" = @{ "supports" = "!uwp" }; @@ -46,12 +79,12 @@ $portData = @{ "boost-wave" = @{ "supports" = "!uwp" }; "boost-log" = @{ "supports" = "!uwp&!emscripten" }; "boost-locale" = @{ - "dependencies" = @(@{ name = "libiconv"; platform = "!uwp&!windows&!mingw" }); + "dependencies" = @(@{ "name" = "libiconv"; "platform" = "!uwp&!windows&!mingw" }); "supports" = "!uwp"; "features" = @{ - icu = @{ - dependencies = @("icu") - description = "ICU backend for Boost.Locale" + "icu" = @{ + "dependencies" = @("icu"); + "description" = "ICU backend for Boost.Locale" } } }; @@ -63,23 +96,35 @@ $portData = @{ "dependencies" = @("mpi"); "supports" = "!uwp"; }; + "boost-odeint" = @{ + "features" = @{ + "mpi" = @{ + "dependencies" = @("boost-mpi"); + "description" = "Support parallelization with MPI" + } + } + }; "boost-parameter-python" = @{ "supports" = "!emscripten" }; "boost-process" = @{ "supports" = "!emscripten" }; "boost-python" = @{ - "dependencies" = @("python3"); - "supports" = "!uwp&!(arm&windows)&!emscripten"; - "features" = @{ - python2 = @{ - dependencies = @("python2") - description = "Build with Python2 support" + "default-features" = @("python3"); + "supports" = "!uwp&!(arm&windows)&!emscripten"; + "features" = @{ + "python2" = @{ + "dependencies" = @("python2"); + "description" = "Build with Python2 support" + }; + "python3" = @{ + "dependencies" = @("python3"); + "description" = "Build with Python3 support" } } }; "boost-regex" = @{ "features" = @{ - icu = @{ - dependencies = @("icu") - description = "ICU backend for Boost.Regex" + "icu" = @{ + "dependencies" = @("icu"); + "description" = "ICU backend for Boost.Regex" } } } @@ -104,36 +149,47 @@ function GeneratePortDependency() { $portName } } + function GeneratePortManifest() { param ( - [string]$Library, [string]$PortName, [string]$Homepage, [string]$Description, - $Dependencies = @(), - $Features = @() + $Dependencies = @() ) - if ([string]::IsNullOrEmpty($PortName)) { - $PortName = GeneratePortName $Library - } $manifest = @{ - name = $PortName - "version" = $version - homepage = $Homepage - description = $Description - } - if ($portVersions.Contains($PortName)) { - $manifest["port-version"] = $portVersions[$PortName] + "name" = $PortName + "version" = $version + "homepage" = $Homepage + "description" = $Description } if ($portData.Contains($PortName)) { $manifest += $portData[$PortName] } + if ($portVersions.Contains($PortName)) { + $manifest["port-version"] = $portVersions[$PortName] + } if ($Dependencies.Count -gt 0) { $manifest["dependencies"] += $Dependencies } - if ($Features.Count -gt 0) { - $manifest["features"] += $Features + # Remove from the dependencies the ports that are included in the feature dependencies + if ($manifest.Contains('features') -and $manifest.Contains('dependencies')) { + foreach ($feature in $manifest.features.Keys) { + $feature_dependencies = $manifest.features.$feature["dependencies"] + foreach ($dependency in $feature_dependencies) { + if ($dependency.Contains("name")) { + $dep_name = $dependency.name + } + else { + $dep_name = $dependency + } + $manifest["dependencies"] = $manifest["dependencies"] ` + | Where-Object { $_ -notmatch "$dep_name" } ` + | Where-Object { $_.name -notmatch "$dep_name" } + } + } } + $manifest | ConvertTo-Json -Depth 10 -Compress ` | Out-File -Encoding UTF8 "$portsDir/$PortName/vcpkg.json" & $vcpkg format-manifest "$portsDir/$PortName/vcpkg.json" @@ -153,8 +209,7 @@ function GeneratePort() { # Generate vcpkg.json GeneratePortManifest ` - -Library $Library ` - -PortName $PortName ` + -PortName $portName ` -Homepage "https://github.com/boostorg/$Library" ` -Description "Boost $Library module" ` -Dependencies $Dependencies @@ -197,7 +252,7 @@ function GeneratePort() { ) if (Test-Path "$scriptsDir/post-source-stubs/$Library.cmake") { - $portfileLines += @(get-content "$scriptsDir/post-source-stubs/$Library.cmake") + $portfileLines += @(Get-Content "$scriptsDir/post-source-stubs/$Library.cmake") } if ($NeedsBuild) { @@ -242,7 +297,7 @@ function GeneratePort() { ) if (Test-Path "$scriptsDir/post-build-stubs/$Library.cmake") { - $portfileLines += @(get-content "$scriptsDir/post-build-stubs/$Library.cmake") + $portfileLines += @(Get-Content "$scriptsDir/post-build-stubs/$Library.cmake") } $portfileLines += @("") @@ -310,7 +365,7 @@ foreach ($library in $libraries) { if ($hash -is [Object[]]) { $hash = $hash[1] } - + $unpacked = "$scriptsDir/libs/$library-boost-$version" if (!(Test-Path $unpacked)) { "Unpacking boost/$library..." @@ -481,27 +536,17 @@ foreach ($library in $libraries) { if ($updateServicePorts) { # Generate manifest file for master boost port which depends on each individual library - # mpi and graph-parallel are excluded due to they having a dependency on msmpi/openmpi - $boostPortDependencies = $boostPortDependencies | Where-Object { $_ -notmatch "boost-mpi|boost-graph-parallel" } - $boostPortFeatures = @( - @{ - name = "mpi" - description = "Build with MPI support" - dependencies = @("boost-mpi", "boost-graph-parallel") - } - ) GeneratePortManifest ` -PortName "boost" ` -Homepage "https://boost.org" ` -Description "Peer-reviewed portable C++ source libraries" ` - -Dependencies $boostPortDependencies ` - -Features $boostPortFeatures + -Dependencies $boostPortDependencies Set-Content -LiteralPath "$portsDir/boost/portfile.cmake" ` -Value "set(VCPKG_POLICY_EMPTY_PACKAGE enabled)`n" ` -Encoding UTF8 ` -NoNewline - + # Generate manifest files for boost-uninstall GeneratePortManifest ` -PortName "boost-uninstall" ` @@ -519,4 +564,7 @@ if ($updateServicePorts) { -Description "Internal vcpkg port used to build Boost libraries" ` -Dependencies @("boost-uninstall") + # Update Boost version in boost-modular-build.cmake + $boost_modular_build = "$portsDir/boost-modular-build-helper/boost-modular-build.cmake" + (Get-Content -LiteralPath "$boost_modular_build") -replace "set\(BOOST_VERSION ([0-9\.]+)\)", "set(BOOST_VERSION $version)" | Set-Content -LiteralPath "$boost_modular_build" } diff --git a/versions/b-/boost-config.json b/versions/b-/boost-config.json index 920bf11882a50f..9b10718d98adf8 100644 --- a/versions/b-/boost-config.json +++ b/versions/b-/boost-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f7b70c02bfb43bbdc8f62bd49c8a5339a65f48c", + "version": "1.77.0", + "port-version": 2 + }, { "git-tree": "6aa6932068c1fbc812d545502f60c3a7cef80dde", "version": "1.77.0", diff --git a/versions/b-/boost-iostreams.json b/versions/b-/boost-iostreams.json index 9a6380b1ddee38..490d00e1bc1cc8 100644 --- a/versions/b-/boost-iostreams.json +++ b/versions/b-/boost-iostreams.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "286c74896c6f2a6057bfbce333304f279bb38aac", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "9ff4027cebb3423a41814a8c2da942ea959b17ad", "version": "1.77.0", diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 6d8bd59a618190..867e62be31815b 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c076291c3d44f7cea167e469748ead6270e1c424", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "b14ac826c44c030a65af10732269f379b856f76f", "version": "1.77.0", diff --git a/versions/b-/boost-odeint.json b/versions/b-/boost-odeint.json index 17884143b5d86e..f4aa9284bc088f 100644 --- a/versions/b-/boost-odeint.json +++ b/versions/b-/boost-odeint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "effd1406c513ca8f20a1e2b6de0cd299be92d74e", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "9ef1ae6d236984a5cdb1cb5dbc76067648461231", "version": "1.77.0", diff --git a/versions/b-/boost-process.json b/versions/b-/boost-process.json index d30c66c9ebcbca..342aecc27a7cc8 100644 --- a/versions/b-/boost-process.json +++ b/versions/b-/boost-process.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e476269a7091861c1db7379d4e925df6d184044", + "version": "1.77.0", + "port-version": 2 + }, { "git-tree": "e70acbb855538f95200b341b1cf26d9c1dc6e6cd", "version": "1.77.0", diff --git a/versions/b-/boost-python.json b/versions/b-/boost-python.json index d58ad4b7d66b0f..da1303cc4fd1fe 100644 --- a/versions/b-/boost-python.json +++ b/versions/b-/boost-python.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "879991d36cfdcdb57b176b9dac08b55c3c69a9a1", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "9f6fba6abc29e2084469c11ba2f2f1f745b08137", "version": "1.77.0", diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 50252e7391bec0..4fef045312ef73 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fe225d8d76e70968014f7ddab050d7e520709e6", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "c2e18442532ea17f03c775323f53a3b03ade0b6d", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 074755bb4afb30..4634582c98ab1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -502,7 +502,7 @@ }, "boost": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-accumulators": { "baseline": "1.77.0", @@ -582,7 +582,7 @@ }, "boost-config": { "baseline": "1.77.0", - "port-version": 1 + "port-version": 2 }, "boost-container": { "baseline": "1.77.0", @@ -750,7 +750,7 @@ }, "boost-iostreams": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-iterator": { "baseline": "1.77.0", @@ -806,7 +806,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-move": { "baseline": "1.77.0", @@ -850,7 +850,7 @@ }, "boost-odeint": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-optional": { "baseline": "1.77.0", @@ -898,7 +898,7 @@ }, "boost-process": { "baseline": "1.77.0", - "port-version": 1 + "port-version": 2 }, "boost-program-options": { "baseline": "1.77.0", @@ -926,7 +926,7 @@ }, "boost-python": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-qvm": { "baseline": "1.77.0", From ee4d5dcccc80d1168c4ae3ba05b63faa2974567b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:11:45 +0200 Subject: [PATCH 0781/1858] [replxx] Update to 0.0.3 (#20606) * Update replxx to 0.0.3 * Update CI baseline Co-authored-by: chausner --- ports/replxx/add-stdexcept.patch | 17 ----------------- ports/replxx/portfile.cmake | 26 +++++++++++--------------- ports/replxx/replxxConfig.cmake | 20 -------------------- ports/replxx/usage | 4 ---- ports/replxx/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/r-/replxx.json | 5 +++++ 7 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 ports/replxx/add-stdexcept.patch delete mode 100644 ports/replxx/replxxConfig.cmake delete mode 100644 ports/replxx/usage diff --git a/ports/replxx/add-stdexcept.patch b/ports/replxx/add-stdexcept.patch deleted file mode 100644 index 51fe01447f0dd0..00000000000000 --- a/ports/replxx/add-stdexcept.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/io.cxx b/src/io.cxx -index a098867..6159e4b 100644 ---- a/src/io.cxx -+++ b/src/io.cxx -@@ -2,6 +2,7 @@ - #include - #include - #include -+#include - #include - - #ifdef _WIN32 -@@ -671,4 +672,3 @@ int Terminal::read_verbatim( char32_t* buffer_, int size_ ) { - #endif - - } -- diff --git a/ports/replxx/portfile.cmake b/ports/replxx/portfile.cmake index cbf2c646a78987..9dfbbe06191be9 100644 --- a/ports/replxx/portfile.cmake +++ b/ports/replxx/portfile.cmake @@ -1,26 +1,22 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO AmokHuginnsson/replxx - REF 45696c250ce39ab21dedeea962b94d7827007a8c - SHA512 7beec508fa3049fe5a736a487728506d646d26d7194ef7453fc07bceade1982430808fab0a10ca9b1c43a8b87bf3a973f5cfe4aa22ed06927647c9a7244167fd - HEAD_REF master - PATCHES - add-stdexcept.patch + OUT_SOURCE_PATH SOURCE_PATH + REPO AmokHuginnsson/replxx + REF release-0.0.3 + SHA512 039812B65D96C44907105D409E608132A115314BEA8616F79DA928BFEECEBFF64381F063D7B1C971B61C449FA24552E001767D61C57F65AF9EBD8F0B3AC62B18 + HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/replxx") vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/replxxConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/replxx/replxxConfig.cmake b/ports/replxx/replxxConfig.cmake deleted file mode 100644 index 680ffc3eea630b..00000000000000 --- a/ports/replxx/replxxConfig.cmake +++ /dev/null @@ -1,20 +0,0 @@ -function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) - add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) - set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES - IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" - IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" - IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" - INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" - ) - set(${NAMESPACE}_${LIB_NAME}_FOUND 1) -endfunction() - -get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(ROOT "${ROOT}" PATH) -get_filename_component(ROOT "${ROOT}" PATH) - -if (CMAKE_HOST_WIN32) - set_library_target("REPLXX" "replxx" "${ROOT}/debug/lib/replxx-d.lib" "${ROOT}/lib/replxx.lib" "${ROOT}/include/") -else () - set_library_target("REPLXX" "replxx" "${ROOT}/debug/lib/libreplxx-d.a" "${ROOT}/lib/libreplxx.a" "${ROOT}/include/") -endif () diff --git a/ports/replxx/usage b/ports/replxx/usage deleted file mode 100644 index 5be648855a9ed1..00000000000000 --- a/ports/replxx/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package replxx is compatible with built-in CMake targets: - - FIND_PACKAGE(replxx REQUIRED) - TARGET_LINK_LIBRARIES(main PRIVATE REPLXX::replxx) diff --git a/ports/replxx/vcpkg.json b/ports/replxx/vcpkg.json index 7e84aebc603db4..b82ef13a11f1bd 100644 --- a/ports/replxx/vcpkg.json +++ b/ports/replxx/vcpkg.json @@ -1,8 +1,17 @@ { "name": "replxx", - "version-string": "0.0.2", - "port-version": 3, + "version": "0.0.3", "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", "homepage": "https://github.com/AmokHuginnsson/replxx", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4634582c98ab1f..d6131933278463 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5829,8 +5829,8 @@ "port-version": 1 }, "replxx": { - "baseline": "0.0.2", - "port-version": 3 + "baseline": "0.0.3", + "port-version": 0 }, "reproc": { "baseline": "14.2.3", diff --git a/versions/r-/replxx.json b/versions/r-/replxx.json index 2e1901ca75f1ad..30716375770733 100644 --- a/versions/r-/replxx.json +++ b/versions/r-/replxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6d52564217b918d799280703fdfde6e600272d4", + "version": "0.0.3", + "port-version": 0 + }, { "git-tree": "5e56bb5dd211e60671da16308a06e0738b7854c2", "version-string": "0.0.2", From 6d27a26a46cec8626d0c6f5ce920604cb7e02c8a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:12:26 +0200 Subject: [PATCH 0782/1858] [tinyxml2] Update to 9.0.0 (#20607) * Update tinyxml2 to 9.0.0 * Update CI baseline Co-authored-by: chausner --- ports/tinyxml2/fix-debug-postfix.patch | 43 ------------------------- ports/tinyxml2/fix-symbol-exports.patch | 36 --------------------- ports/tinyxml2/portfile.cmake | 21 +++++------- ports/tinyxml2/vcpkg.json | 15 +++++++-- versions/baseline.json | 4 +-- versions/t-/tinyxml2.json | 5 +++ 6 files changed, 27 insertions(+), 97 deletions(-) delete mode 100644 ports/tinyxml2/fix-debug-postfix.patch delete mode 100644 ports/tinyxml2/fix-symbol-exports.patch diff --git a/ports/tinyxml2/fix-debug-postfix.patch b/ports/tinyxml2/fix-debug-postfix.patch deleted file mode 100644 index 8021e0f633ee85..00000000000000 --- a/ports/tinyxml2/fix-debug-postfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1e384d50313a08dd36a43df1925588741dc33301 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= -Date: Wed, 17 Jun 2020 06:17:06 +0200 -Subject: [PATCH] Fix debug postfix in pkgconfig file - -CMakeLists.txt uses set(CMAKE_DEBUG_POSTFIX "d") to distinguish -between debug and release lib. Use this postfix also in the -generated tinyxml2.pc file in case of a CMake Debug build. -This results in the following contents of tinyxml2.pc -- Release: - Libs: -L${libdir} -ltinyxml2 -- Debug: - Libs: -L${libdir} -ltinyxml2d ---- - CMakeLists.txt | 3 +++ - tinyxml2.pc.in | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f9ab07..7085276 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,9 @@ endif() - - install(FILES tinyxml2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT tinyxml2_headers) - -+if(CMAKE_BUILD_TYPE MATCHES Debug) -+ set(LIB_POSTFIX ${CMAKE_DEBUG_POSTFIX}) -+endif() - configure_file(tinyxml2.pc.in tinyxml2.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT tinyxml2_config) - -diff --git a/tinyxml2.pc.in b/tinyxml2.pc.in -index b040b0e..b100f60 100644 ---- a/tinyxml2.pc.in -+++ b/tinyxml2.pc.in -@@ -6,5 +6,5 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ - Name: TinyXML2 - Description: simple, small, C++ XML parser - Version: @GENERIC_LIB_VERSION@ --Libs: -L${libdir} -ltinyxml2 -+Libs: -L${libdir} -ltinyxml2@LIB_POSTFIX@ - Cflags: -I${includedir} diff --git a/ports/tinyxml2/fix-symbol-exports.patch b/ports/tinyxml2/fix-symbol-exports.patch deleted file mode 100644 index 7108d054064e6a..00000000000000 --- a/ports/tinyxml2/fix-symbol-exports.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f8b048656b9937252ce5fb4ebea9e5df5b203bdb Mon Sep 17 00:00:00 2001 -From: Owen Rudge -Date: Wed, 27 May 2020 09:40:59 +0100 -Subject: [PATCH] cmake: Don't export symbols if building static library - ---- - CMakeLists.txt | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f9ab07..67b4f33 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -50,10 +50,16 @@ set(CMAKE_DEBUG_POSTFIX "d") - - add_library(tinyxml2 tinyxml2.cpp tinyxml2.h) - --set_target_properties(tinyxml2 PROPERTIES -+if(BUILD_SHARED_LIBS) -+ set_target_properties(tinyxml2 PROPERTIES - COMPILE_DEFINITIONS "TINYXML2_EXPORT" -- VERSION "${GENERIC_LIB_VERSION}" -- SOVERSION "${GENERIC_LIB_SOVERSION}") -+ VERSION "${GENERIC_LIB_VERSION}" -+ SOVERSION "${GENERIC_LIB_SOVERSION}") -+else() -+ set_target_properties(tinyxml2 PROPERTIES -+ VERSION "${GENERIC_LIB_VERSION}" -+ SOVERSION "${GENERIC_LIB_SOVERSION}") -+endif() - - target_compile_definitions(tinyxml2 PUBLIC $<$:TINYXML2_DEBUG>) - --- -2.25.1.windows.1 - diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index d4fb1c3f97f260..3c4d0e7d7d0d39 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -1,27 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO leethomason/tinyxml2 - REF 8.0.0 - SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6 + REF 9.0.0 + SHA512 9C5CE8131984690DF302CA3E32314573B137180ED522C92FD631692979C942372A28F697FDB3D5E56BCF2D3DC596262B724D088153F3E1D721C9536F2A883367 HEAD_REF master - PATCHES - fix-symbol-exports.patch - fix-debug-postfix.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tinyxml2) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinyxml2) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/readme.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinyxml2/vcpkg.json b/ports/tinyxml2/vcpkg.json index 83d8b3fc3782d3..c059fc80919957 100644 --- a/ports/tinyxml2/vcpkg.json +++ b/ports/tinyxml2/vcpkg.json @@ -1,7 +1,16 @@ { "name": "tinyxml2", - "version-string": "8.0.0", - "port-version": 2, + "version-semver": "9.0.0", "description": "A simple, small, efficient, C++ XML parser", - "homepage": "https://github.com/leethomason/tinyxml2" + "homepage": "https://github.com/leethomason/tinyxml2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index d6131933278463..b575bf12cfb664 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6665,8 +6665,8 @@ "port-version": 8 }, "tinyxml2": { - "baseline": "8.0.0", - "port-version": 2 + "baseline": "9.0.0", + "port-version": 0 }, "tl-expected": { "baseline": "1.0.0", diff --git a/versions/t-/tinyxml2.json b/versions/t-/tinyxml2.json index 0d16235d08f056..aebfd80f0e5e6e 100644 --- a/versions/t-/tinyxml2.json +++ b/versions/t-/tinyxml2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8b086bdb3eaa94fea466bf8565d7c98b00c9f94", + "version-semver": "9.0.0", + "port-version": 0 + }, { "git-tree": "6c434072d7cd45db70c50b5553673f174b981eee", "version-string": "8.0.0", From 8ba13576302d98bc48b039f02639e52b5e824f6d Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:13:00 +0200 Subject: [PATCH 0783/1858] [wildmidi] Update to 0.4.4 (#20609) * Update wildmidi to 0.4.4 * Update CI baseline * Remove double quotes * update version * Remove obsolete patch file * Update git-tree hash Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/wildmidi/0001-add-install-target.patch | 30 ---------------- ports/wildmidi/portfile.cmake | 37 ++++++-------------- ports/wildmidi/vcpkg.json | 15 ++++++-- versions/baseline.json | 4 +-- versions/w-/wildmidi.json | 5 +++ 5 files changed, 30 insertions(+), 61 deletions(-) delete mode 100644 ports/wildmidi/0001-add-install-target.patch diff --git a/ports/wildmidi/0001-add-install-target.patch b/ports/wildmidi/0001-add-install-target.patch deleted file mode 100644 index 8270cd9eacc116..00000000000000 --- a/ports/wildmidi/0001-add-install-target.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/CMakeLists.txt 2017-10-02 14:06:57.163881000 +0000 -+++ b/src/CMakeLists.txt 2017-10-02 14:08:52.815977600 +0000 -@@ -313,6 +313,27 @@ - ENDIF (WIN32 AND CMAKE_COMPILER_IS_MINGW) - - IF (WIN32 AND MSVC) -+ # install our libraries -+ IF (WANT_STATIC) -+ INSTALL(TARGETS libwildmidi_static DESTINATION ${WILDMIDILIB_INSTALLDIR}) -+ IF (WANT_PLAYERSTATIC) -+ INSTALL(TARGETS wildmidi-static DESTINATION bin) -+ ENDIF () -+ ENDIF (WANT_STATIC) -+ -+ IF (BUILD_SHARED_LIBS) -+ INSTALL(TARGETS libwildmidi_dynamic -+ ARCHIVE DESTINATION ${WILDMIDILIB_INSTALLDIR} -+ LIBRARY DESTINATION ${WILDMIDILIB_INSTALLDIR} -+ RUNTIME DESTINATION ${WILDMIDIDLL_INSTALLDIR} -+ ) -+ IF (WANT_PLAYER) -+ INSTALL(TARGETS wildmidi DESTINATION bin) -+ ENDIF () -+ ENDIF () -+ -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wildmidi_lib.h DESTINATION include) -+ - IF (WANT_MP_BUILD) - SET(MT_BUILD "/MP") - ENDIF () diff --git a/ports/wildmidi/portfile.cmake b/ports/wildmidi/portfile.cmake index 2280c4aca05f2e..6dbfb7557992aa 100644 --- a/ports/wildmidi/portfile.cmake +++ b/ports/wildmidi/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Mindwerks/wildmidi - REF wildmidi-0.4.3 - SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f + REF wildmidi-0.4.4 + SHA512 5B74EE83F1D7CE3B45D2F996AAA30EC6E7D7808EAB294A3EAF6FCEF77443523DF1F54BB0FB1B3105EDD0D72D75885FDA1A2E97C68DEFB5BBD687BDA5077D3454 HEAD_REF master - PATCHES - 0001-add-install-target.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -14,33 +12,20 @@ else() set(WANT_STATIC "ON") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWANT_PLAYER=OFF -DWANT_STATIC=${WANT_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME WildMidi CONFIG_PATH lib/cmake/WildMidi) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# Rename library to get rid of _dynamic and _static suffix -if(NOT VCPKG_CMAKE_SYSTEM_NAME) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/bin/wildmidi.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi.dll) - else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib) - endif() -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/docs/license/LGPLv3.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wildmidi RENAME copyright) +file(INSTALL "${SOURCE_PATH}/docs/license/LGPLv3.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wildmidi/vcpkg.json b/ports/wildmidi/vcpkg.json index 8831d91f0c1390..389ae48816eb25 100644 --- a/ports/wildmidi/vcpkg.json +++ b/ports/wildmidi/vcpkg.json @@ -1,7 +1,16 @@ { "name": "wildmidi", - "version-string": "0.4.3", - "port-version": 2, + "version": "0.4.4", "description": "MIDI software synthesizer library.", - "homepage": "https://github.com/Mindwerks/wildmidi" + "homepage": "https://github.com/Mindwerks/wildmidi", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index b575bf12cfb664..5e6731ddb83482 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7029,8 +7029,8 @@ "port-version": 1 }, "wildmidi": { - "baseline": "0.4.3", - "port-version": 2 + "baseline": "0.4.4", + "port-version": 0 }, "wincrypt": { "baseline": "0.0", diff --git a/versions/w-/wildmidi.json b/versions/w-/wildmidi.json index 42a28b6c60e908..24cb0fe0a37464 100644 --- a/versions/w-/wildmidi.json +++ b/versions/w-/wildmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28dabf2a1d7a07e567c4d6a0b482d44a4994d17b", + "version": "0.4.4", + "port-version": 0 + }, { "git-tree": "4270f5e1f8fdb45bf562991ab9cf42e52fbc7437", "version-string": "0.4.3", From 3644a37a20b492a026cccb09e9a90f1bedfe219f Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 12 Oct 2021 11:13:48 +0800 Subject: [PATCH 0784/1858] [quazip] update to 1.1 (#20611) * [quazip] update to 1.1 * update version * change version-string to version * update version --- ports/quazip/portfile.cmake | 17 +++++------ ports/quazip/vcpkg.json | 11 +++++-- ports/quazip/vcpkg_remove_extra_static.patch | 30 -------------------- versions/baseline.json | 4 +-- versions/q-/quazip.json | 5 ++++ 5 files changed, 23 insertions(+), 44 deletions(-) delete mode 100644 ports/quazip/vcpkg_remove_extra_static.patch diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake index 4c8602b69234a2..d074c780c9b918 100644 --- a/ports/quazip/portfile.cmake +++ b/ports/quazip/portfile.cmake @@ -1,20 +1,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stachenov/quazip - REF v0.9.1 - SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 - PATCHES - vcpkg_remove_extra_static.patch + REF v1.1 + SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/QuaZip5/) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/QuaZip-Qt5-1.1) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) \ No newline at end of file diff --git a/ports/quazip/vcpkg.json b/ports/quazip/vcpkg.json index cf2a01f8a1e9d5..deae1dcae42c6b 100644 --- a/ports/quazip/vcpkg.json +++ b/ports/quazip/vcpkg.json @@ -1,11 +1,18 @@ { "name": "quazip", - "version-string": "0.9.1", - "port-version": 1, + "version": "1.1", "description": "Qt/C++ wrapper over minizip", "homepage": "https://stachenov.github.io/quazip/", "dependencies": [ "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/quazip/vcpkg_remove_extra_static.patch b/ports/quazip/vcpkg_remove_extra_static.patch deleted file mode 100644 index e600424751c1d1..00000000000000 --- a/ports/quazip/vcpkg_remove_extra_static.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt -index 1efb5e2..2412b8a 100644 ---- a/quazip/CMakeLists.txt -+++ b/quazip/CMakeLists.txt -@@ -10,22 +10,13 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) - qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) - set(SRCS ${SRCS} ${MOC_SRCS}) - --add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) --add_library(quazip_static STATIC ${SRCS}) -- --# Windows uses .lib extension for both static and shared library --# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name --if (NOT WIN32) -- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) --endif () -+add_library(${QUAZIP_LIB_TARGET_NAME} ${SRCS}) - - target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) --target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) --set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) -+set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) - - # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) - target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) --target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) - - install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) --install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) -+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/versions/baseline.json b/versions/baseline.json index 5e6731ddb83482..06aecbde6d469d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5705,8 +5705,8 @@ "port-version": 1 }, "quazip": { - "baseline": "0.9.1", - "port-version": 1 + "baseline": "1.1", + "port-version": 0 }, "quickfast": { "baseline": "1.5", diff --git a/versions/q-/quazip.json b/versions/q-/quazip.json index ddd267561ca765..c1aac224fd751d 100644 --- a/versions/q-/quazip.json +++ b/versions/q-/quazip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fcb780cdf45dcb2a99c42837d9be27f5d07615e", + "version": "1.1", + "port-version": 0 + }, { "git-tree": "eb05336d7d482b98ab3e83dbbc58116707f547d6", "version-string": "0.9.1", From 130398abbd861a8d4ee2aac0421be4ff7b406515 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 12 Oct 2021 11:14:06 +0800 Subject: [PATCH 0785/1858] [kcp] update to 1.7 (#20612) * [kcp] update to 1.7 * update version * change version-string to version * update version --- ports/kcp/portfile.cmake | 17 ++++++++--------- ports/kcp/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/k-/kcp.json | 5 +++++ 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/ports/kcp/portfile.cmake b/ports/kcp/portfile.cmake index 283b9fd669336d..09c28886f79e8b 100644 --- a/ports/kcp/portfile.cmake +++ b/ports/kcp/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO skywind3000/kcp - REF 4c58607c917c2a82bf116489c3eb89e4e9aa696d - SHA512 6689d6c2393eb96bba276de90aec584dae9da0dad5c7bd15519bc61de16de9123e19a945a9e29c5b5cc88bf844ebfb9681b27eb425e3a59a354f13488516cdcc + REF 38e0c9366e4a72c749ff0bcdf911d1fe9bdfe9f5 + SHA512 1a05a692719f7f7bfa2e20df81c68af991bd01fe7236ab637a10644abfed425b9f46fd9ad399b8edca152d7bb617c37533b183bda2cf4a0cc1c3ce47031ba37f HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/kcp/vcpkg.json b/ports/kcp/vcpkg.json index edc61d2307892a..7fd78483a26b02 100644 --- a/ports/kcp/vcpkg.json +++ b/ports/kcp/vcpkg.json @@ -1,7 +1,16 @@ { "name": "kcp", - "version-string": "2019-09-20", - "port-version": 1, + "version": "1.7", "description": "A fast and reliable ARQ protocol", - "homepage": "https://github.com/skywind3000/kcp" + "homepage": "https://github.com/skywind3000/kcp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 06aecbde6d469d..ced1b09bce0d92 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2957,8 +2957,8 @@ "port-version": 1 }, "kcp": { - "baseline": "2019-09-20", - "port-version": 1 + "baseline": "1.7", + "port-version": 0 }, "kd-soap": { "baseline": "1.9.0", diff --git a/versions/k-/kcp.json b/versions/k-/kcp.json index a8b4710910ce06..d72e8f6afcc625 100644 --- a/versions/k-/kcp.json +++ b/versions/k-/kcp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "207f189653fe92e80478cf69c7f115758b1eafe9", + "version": "1.7", + "port-version": 0 + }, { "git-tree": "9f3475cb5c05e93e3309e51cb104653bab486eb4", "version-string": "2019-09-20", From 258838219b3bbf3003338f8c67f59fb1a8071a8e Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:14:35 +0200 Subject: [PATCH 0786/1858] [optional-lite] Update to 3.5.0 (#20625) * Update optional-lite to 3.5.0 * Update CI baseline Co-authored-by: chausner --- ports/optional-lite/portfile.cmake | 21 ++++++++++----------- ports/optional-lite/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/o-/optional-lite.json | 5 +++++ 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/ports/optional-lite/portfile.cmake b/ports/optional-lite/portfile.cmake index 1817a54a9a6d03..1bf0762b5196f1 100644 --- a/ports/optional-lite/portfile.cmake +++ b/ports/optional-lite/portfile.cmake @@ -1,29 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/optional-lite - REF v3.2.0 - SHA512 7c3f93dc718953118ab18edb55f6c8dc1555febb6ee491d3f7df4a8d06aba245bbfba31883a711995bb6b8d6de9f44c805cbba44b9e322f3bb5c3272106f66ec + REF v3.5.0 + SHA512 E578D391BC95E2A5302B4B02E0B17659026B2743FC5C1E16CD83F6227FA9B5990FA3FA23E808A4EA0F5BDAFBF80834B0C462D563AB615907F113EE5A09AE88F5 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DOPTIONAL_LITE_OPT_BUILD_TESTS=OFF -DOPTIONAL_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/optional-lite/vcpkg.json b/ports/optional-lite/vcpkg.json index 452f75670e083c..ce1df3fe3378ee 100644 --- a/ports/optional-lite/vcpkg.json +++ b/ports/optional-lite/vcpkg.json @@ -1,6 +1,16 @@ { "name": "optional-lite", - "version-string": "3.2.0", - "port-version": 1, - "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library" + "version": "3.5.0", + "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library", + "homepage": "https://github.com/martinmoene/optional-lite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ced1b09bce0d92..74267b5dd846f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4937,8 +4937,8 @@ "port-version": 1 }, "optional-lite": { - "baseline": "3.2.0", - "port-version": 1 + "baseline": "3.5.0", + "port-version": 0 }, "opus": { "baseline": "1.3.1", diff --git a/versions/o-/optional-lite.json b/versions/o-/optional-lite.json index 4f2c3b26030db5..4ed173bfb981eb 100644 --- a/versions/o-/optional-lite.json +++ b/versions/o-/optional-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "121b3133b75062823ca1c6d41b22019c4bc78999", + "version": "3.5.0", + "port-version": 0 + }, { "git-tree": "d6434c7b71c70b8ce50c3a1cc38aa35afc9bdf73", "version-string": "3.2.0", From d0f7f655234ee093dee4ec73571b5c1b1573aee8 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:16:07 +0200 Subject: [PATCH 0787/1858] [numactl] Update to 2.0.14 (#20626) * Update numactl to 2.0.14 * Update CI baseline Co-authored-by: chausner --- ports/numactl/portfile.cmake | 4 ++-- ports/numactl/vcpkg.json | 7 ++++--- versions/baseline.json | 4 ++-- versions/n-/numactl.json | 5 +++++ 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/numactl/portfile.cmake b/ports/numactl/portfile.cmake index 73215a441edc86..302f1ba7f8b75d 100644 --- a/ports/numactl/portfile.cmake +++ b/ports/numactl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO numactl/numactl - REF v2.0.12 - SHA512 3814efd924d1c9152a30f6ae5b665afc20648226cd475d72b933c0ec4f30249af4e25110de17f144734b787ed765644dca09a657219806ab5c9c550abd45bf8e + REF v2.0.14 + SHA512 ADAF405F092FD9653F26D00F8C80CB83852C56EBD5D00E714E20D505008E74AA7105B0FB7AA55A605DEAC0D1491CEFF57DE931037D33E7944FCA105BC6510ED4 HEAD_REF master ) diff --git a/ports/numactl/vcpkg.json b/ports/numactl/vcpkg.json index 062e737eafa5cf..62684dd4d82505 100644 --- a/ports/numactl/vcpkg.json +++ b/ports/numactl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "numactl", - "version-string": "2.0.12", - "port-version": 1, - "description": "NUMA support for Linux" + "version": "2.0.14", + "description": "NUMA support for Linux", + "homepage": "https://github.com/numactl/numactl", + "supports": "linux" } diff --git a/versions/baseline.json b/versions/baseline.json index 74267b5dd846f8..9852d405816a08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4645,8 +4645,8 @@ "port-version": 1 }, "numactl": { - "baseline": "2.0.12", - "port-version": 1 + "baseline": "2.0.14", + "port-version": 0 }, "numcpp": { "baseline": "2.6.0", diff --git a/versions/n-/numactl.json b/versions/n-/numactl.json index e934d4317e0e31..f80d95f6e941ef 100644 --- a/versions/n-/numactl.json +++ b/versions/n-/numactl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58815aa974d9ab14d768576ade86c2e3b43d20a3", + "version": "2.0.14", + "port-version": 0 + }, { "git-tree": "7b58d763ea0a2c64e755c647c115d6e63ea44617", "version-string": "2.0.12", From 96ccbf7a16286ae2d1b3accd9d4e3ab523ca7c9f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:21:49 +0200 Subject: [PATCH 0788/1858] [libsvm] Update to 3.25 (#20629) * Update libsvm to 3.2.5 * Update CI baseline * Fix version * Update git-tree hash Co-authored-by: chausner --- ports/libsvm/portfile.cmake | 33 ++++++++++++++++----------------- ports/libsvm/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/l-/libsvm.json | 5 +++++ 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/ports/libsvm/portfile.cmake b/ports/libsvm/portfile.cmake index a89b838e1ed021..674014c0f62441 100644 --- a/ports/libsvm/portfile.cmake +++ b/ports/libsvm/portfile.cmake @@ -1,42 +1,41 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cjlin1/libsvm - REF v323 - SHA512 c4abd408acf860c76cfc743e6c65d241fcb18443e741fc0f557f7cf7b4d0913c05f3afc5d49de8a42ff88db6fc7b046d08bcb0a3d2a24ba23e297ed1cfbb9131 + REF v325 + SHA512 D5323B128DFCDC7F64B2161E70FA7999C0A93D47C90B366BE066AA01EA92B5817F04812DEF2E05469DEE1F26C6A83DA5E50EEAE3F50B4062D9B24AC0944C6203 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools SVM_BUILD_TOOLS + FEATURES + tools SVM_BUILD_TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DSVM_BUILD_TOOLS=OFF OPTIONS_RELEASE ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}") -if ("tools" IN_LIST FEATURES) - if (WIN32) +if("tools" IN_LIST FEATURES) + if(WIN32) vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-toy svm-train AUTO_CLEAN) - else () + else() vcpkg_copy_tools(TOOL_NAMES svm-predict svm-scale svm-train AUTO_CLEAN) - endif () -endif () + endif() +endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -# Handle copyright -configure_file(${SOURCE_PATH}/COPYRIGHT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsvm/vcpkg.json b/ports/libsvm/vcpkg.json index fe2003e4d0d371..d99a9112d899bc 100644 --- a/ports/libsvm/vcpkg.json +++ b/ports/libsvm/vcpkg.json @@ -1,9 +1,18 @@ { "name": "libsvm", - "version-string": "323", - "port-version": 2, + "version": "3.25", "description": "A library for Support Vector Machines.", "homepage": "https://www.csie.ntu.edu.tw/~cjlin/libsvm/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "tools": { "description": "build libsvm CLI tools." diff --git a/versions/baseline.json b/versions/baseline.json index 9852d405816a08..7b75de895e7b5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3837,8 +3837,8 @@ "port-version": 1 }, "libsvm": { - "baseline": "323", - "port-version": 2 + "baseline": "3.25", + "port-version": 0 }, "libtasn1": { "baseline": "4.17.0", diff --git a/versions/l-/libsvm.json b/versions/l-/libsvm.json index 8f919ee33bbd6f..aba9aa6c2e58d0 100644 --- a/versions/l-/libsvm.json +++ b/versions/l-/libsvm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a5bcb4cdaf7906a6e12948dcb5b170f79fba900e", + "version": "3.25", + "port-version": 0 + }, { "git-tree": "14f75f50d38f27beddb27fb54bf0927942db9954", "version-string": "323", From 4aaff447571f65f4847f8a6be5901c889037ce4b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:22:16 +0200 Subject: [PATCH 0789/1858] [libhv] Update to 1.2.2 (#20637) * Update libhv to 1.2.2 * Update CI baseline Co-authored-by: chausner --- ports/libhv/portfile.cmake | 13 ++++++------- ports/libhv/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/l-/libhv.json | 5 +++++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ports/libhv/portfile.cmake b/ports/libhv/portfile.cmake index 2661a45667ef26..cb13974b9e5ea7 100644 --- a/ports/libhv/portfile.cmake +++ b/ports/libhv/portfile.cmake @@ -3,17 +3,16 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ithewei/libhv - REF v1.2.1 - SHA512 c917b50a2def643b808782631cae33289b62193b9ccb95f4f7736f4d1256de72358931263d5cc06f4581950d91656e700941cb0b929d2f73f650f5297d358b38 + REF v1.2.2 + SHA512 D0CB0BE3901E282E642FE454ADF0CAAF1840DD0CD340B6558E40270CF32608FF0773AAAD0BE1B9EA97BE5BD41B4CEB00FA92CDDA1590B71900A3D8EE4AB2358F HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_EXAMPLES=OFF @@ -22,11 +21,11 @@ vcpkg_configure_cmake( -DBUILD_SHARED=${BUILD_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/hv.dll") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") diff --git a/ports/libhv/vcpkg.json b/ports/libhv/vcpkg.json index 80978ea7de2599..6df137e120de9f 100644 --- a/ports/libhv/vcpkg.json +++ b/ports/libhv/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libhv", - "version": "1.2.1", + "version": "1.2.2", "description": "Libhv is a C/C++ network library similar to libevent/libuv.", "homepage": "https://github.com/ithewei/libhv", - "supports": "!(arm | uwp)" + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7b75de895e7b5b..32c1acbe7dca33 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3449,7 +3449,7 @@ "port-version": 0 }, "libhv": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "libhydrogen": { diff --git a/versions/l-/libhv.json b/versions/l-/libhv.json index a291410e7a0ec6..ad084ec2c57427 100644 --- a/versions/l-/libhv.json +++ b/versions/l-/libhv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49dd8455e873417e8c6e336cdac63bc40cae8342", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "70132ddc099b347cfea66a4ed2de435abafb9c6f", "version": "1.2.1", From 66e4aa31c36fd44075df8824dbc39a268bca78f2 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:23:19 +0200 Subject: [PATCH 0790/1858] [nmslib] Update to 2.1.1 (#20638) * Update nmslib to 2.1.1 * Update CI baseline Co-authored-by: chausner --- ports/nmslib/fix-headers.patch | 77 ---------------------------------- ports/nmslib/portfile.cmake | 36 +++++++--------- ports/nmslib/vcpkg.json | 11 +++-- versions/baseline.json | 4 +- versions/n-/nmslib.json | 5 +++ 5 files changed, 31 insertions(+), 102 deletions(-) delete mode 100644 ports/nmslib/fix-headers.patch diff --git a/ports/nmslib/fix-headers.patch b/ports/nmslib/fix-headers.patch deleted file mode 100644 index f06fd06a837e8d..00000000000000 --- a/ports/nmslib/fix-headers.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc -index 2741701..7587f7f 100644 ---- a/similarity_search/src/method/hnsw.cc -+++ b/similarity_search/src/method/hnsw.cc -@@ -27,7 +27,7 @@ - #include - #include - // This is only for _mm_prefetch --#include -+#include - - #include "portable_simd.h" - #include "knnquery.h" -diff --git a/similarity_search/src/method/hnsw_distfunc_opt.cc b/similarity_search/src/method/hnsw_distfunc_opt.cc -index 4c691bd..6f1a9e6 100644 ---- a/similarity_search/src/method/hnsw_distfunc_opt.cc -+++ b/similarity_search/src/method/hnsw_distfunc_opt.cc -@@ -30,7 +30,7 @@ - #include "rangequery.h" - #include "portable_intrinsics.h" - // This is only for _mm_prefetch --#include -+#include - #include "space.h" - - #include "sort_arr_bi.h" -diff --git a/similarity_search/src/method/pivot_neighb_invindx.cc b/similarity_search/src/method/pivot_neighb_invindx.cc -index c6113c7..a7d818b 100644 ---- a/similarity_search/src/method/pivot_neighb_invindx.cc -+++ b/similarity_search/src/method/pivot_neighb_invindx.cc -@@ -21,7 +21,7 @@ - #include - - // This is only for _mm_prefetch --#include -+#include - - #include "portable_simd.h" - #include "space.h" -diff --git a/similarity_search/src/method/small_world_rand.cc b/similarity_search/src/method/small_world_rand.cc -index e67ea97..92fe70a 100644 ---- a/similarity_search/src/method/small_world_rand.cc -+++ b/similarity_search/src/method/small_world_rand.cc -@@ -17,7 +17,7 @@ - #include - #include - // This is only for _mm_prefetch --#include -+#include - - #if defined(_WIN32) || defined(WIN32) - #include -diff --git a/similarity_search/src/method/vptree.cc b/similarity_search/src/method/vptree.cc -index 4da3b5f..d77e419 100644 ---- a/similarity_search/src/method/vptree.cc -+++ b/similarity_search/src/method/vptree.cc -@@ -20,7 +20,7 @@ - #include - - // This is only for _mm_prefetch --#include -+#include - #if defined(_WIN32) || defined(WIN32) - #include - #endif -diff --git a/similarity_search/test/test_overlap.cc b/similarity_search/test/test_overlap.cc -index 326b26b..413d66d 100644 ---- a/similarity_search/test/test_overlap.cc -+++ b/similarity_search/test/test_overlap.cc -@@ -12,7 +12,6 @@ - * Apache License Version 2.0 http://www.apache.org/licenses/. - * - */ --#include - - #include - #include diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake index fc5b3d145b915f..1ca78c8119ff73 100644 --- a/ports/nmslib/portfile.cmake +++ b/ports/nmslib/portfile.cmake @@ -5,41 +5,37 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nmslib/nmslib - REF 5482e077d1c8637499f86231bcd3979cb7fa6aef # v2.0.6 - SHA512 e529c8d1d97e972f8314be9837e10f4ebab57d4a5f19a66341bb8e163dfe53d1d640a3909a708b021a52d0e6c2537954d749cb80e71757469700a3e9e173ceca + REF v2.1.1 + SHA512 62BBB965EA4BF1D416ED78231B1BA4B41C0F46327D7BE16D1F98095DB63EF0E0D893B70040009711BC9C68555B1B8C4038F5032ABD66B759E955E2CBB0553EC3 HEAD_REF master - PATCHES - fix-headers.patch ) -# TODO: check SSE and AVX avability and set corresponding tags -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/similarity_search - PREFER_NINJA +# TODO: check SSE and AVX availability and set corresponding tags +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/similarity_search" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Move headers into separate folder set(SUBFOLDERS factory method space) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/nmslib) -foreach(SUBFOLER ${SUBFOLDERS}) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include/nmslib/${SUBFOLER}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/nmslib") +foreach(SUBFOLDER ${SUBFOLDERS}) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include/nmslib/${SUBFOLDER}") endforeach() -file(GLOB HEADERS ${CURRENT_PACKAGES_DIR}/include/*.h ${CURRENT_PACKAGES_DIR}/include/*/*.h) +file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/*.h" "${CURRENT_PACKAGES_DIR}/include/*/*.h") foreach(HEADER ${HEADERS}) - string(REPLACE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include/nmslib" - MOVED_HEADER ${HEADER}) - file(RENAME ${HEADER} ${MOVED_HEADER}) + string(REPLACE "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include/nmslib" MOVED_HEADER "${HEADER}") + file(RENAME "${HEADER}" "${MOVED_HEADER}") endforeach(HEADER ${HEADERS}) -foreach(SUBFOLER ${SUBFOLDERS}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/${SUBFOLER}/) +foreach(SUBFOLDER ${SUBFOLDERS}) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${SUBFOLDER}/") endforeach() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Put the license file where vcpkg expects it -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nmslib/vcpkg.json b/ports/nmslib/vcpkg.json index 55af27add03f7d..1d53e2e02f4b6a 100644 --- a/ports/nmslib/vcpkg.json +++ b/ports/nmslib/vcpkg.json @@ -1,8 +1,13 @@ { "name": "nmslib", - "version-string": "2.0.6", - "port-version": 1, + "version": "2.1.1", "description": "Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.", "homepage": "https://github.com/searchivarius/nmslib", - "supports": "!(arm | uwp)" + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 32c1acbe7dca33..a4b7ca0dd05bb6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4605,8 +4605,8 @@ "port-version": 5 }, "nmslib": { - "baseline": "2.0.6", - "port-version": 1 + "baseline": "2.1.1", + "port-version": 0 }, "nng": { "baseline": "1.5.1", diff --git a/versions/n-/nmslib.json b/versions/n-/nmslib.json index e81d611bf6cabe..83c6d4e864f932 100644 --- a/versions/n-/nmslib.json +++ b/versions/n-/nmslib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b0256cb272ca0fe86ee427cdd64ad08f41c656b8", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "cc690326d2976978fc71bb8c0e5a631e6cec0064", "version-string": "2.0.6", From 0d5d9c0c5f986f7a62253d3d55191dcb1d93fb20 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:23:56 +0200 Subject: [PATCH 0791/1858] [oniguruma] Update to 6.9.7.1 (#20642) * Update oniguruma to 6.9.7.1 * Update CI baseline Co-authored-by: chausner --- ports/oniguruma/fix-uwp.patch | 7 +++---- ports/oniguruma/portfile.cmake | 31 ++++++++++++++++++------------- ports/oniguruma/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/o-/oniguruma.json | 5 +++++ 5 files changed, 39 insertions(+), 21 deletions(-) diff --git a/ports/oniguruma/fix-uwp.patch b/ports/oniguruma/fix-uwp.patch index 5f3fb51e9bc216..5a2f801d1367d6 100644 --- a/ports/oniguruma/fix-uwp.patch +++ b/ports/oniguruma/fix-uwp.patch @@ -1,5 +1,4 @@ diff --git a/src/regcomp.c b/src/regcomp.c -index 69d4b95..380f441 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -3880,7 +3880,7 @@ reduce_string_list(Node* node) @@ -18,9 +17,9 @@ index ce498c6..6848c0f 100644 @@ -4216,7 +4216,7 @@ regset_search_body_position_lead(OnigRegSet* set, { int r, n, i; - UChar *s, *prev; -- UChar *low, *high, *low_prev; -+ UChar *low, *high, *low_prev = NULL; + UChar *s; +- UChar *low, *high; ++ UChar *low, *high = NULL; UChar* sch_range; regex_t* reg; OnigEncoding enc; diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake index aa19762cb790e0..d1089e8af3a739 100644 --- a/ports/oniguruma/portfile.cmake +++ b/ports/oniguruma/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kkos/oniguruma - REF e03900b038a274ee2f1341039e9003875c11e47d # v6.9.4 - SHA512 77772e3994acbdde86a7405d24423fff101061e24cc8cd85975d3ab092935fc91c0c3b991fe2fa9e9a857b5254db7d923256cdb29a2e2d8a3cdd41837ed690f6 + REF v6.9.7.1 + SHA512 CE22050E04E51843E894D2D534D062FDD23CC2BAAC9BA43DA1843EC928F6CE5ED3D4407FE945F4D34ADADF3167DFD943CD81AE4556F7C5EC51E7331C35EAD479 HEAD_REF master PATCHES fix-uwp.patch ) @@ -12,36 +12,41 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "non-posix" ENABLE_POSIX_API ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if(VCPKG_CRT_LINKAGE STREQUAL "static") + set(MSVC_STATIC_RUNTIME ON) +else() + set(MSVC_STATIC_RUNTIME OFF) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} + -DMSVC_STATIC_RUNTIME=${MSVC_STATIC_RUNTIME} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h" "#if defined(ONIGURUMA_EXPORT)" "#if 0 // defined(ONIGURUMA_EXPORT)" ) else() # oniguruma.h uses `\n` as line break. - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/oniguruma.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/oniguruma.h" "#ifndef ONIG_EXTERN\n#if defined(_WIN32) && !defined(__GNUC__)" "#if 0\n#if defined(_WIN32) && !defined(__GNUC__)" ) endif() -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/oniguruma/vcpkg.json b/ports/oniguruma/vcpkg.json index 8b73eea8d81f82..a0211d3c836aa4 100644 --- a/ports/oniguruma/vcpkg.json +++ b/ports/oniguruma/vcpkg.json @@ -1,9 +1,18 @@ { "name": "oniguruma", - "version-string": "6.9.4", - "port-version": 1, + "version": "6.9.7.1", "description": "Modern and flexible regular expressions library", "homepage": "https://github.com/kkos/oniguruma", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "non-posix": { "description": "Disable POSIX API" diff --git a/versions/baseline.json b/versions/baseline.json index a4b7ca0dd05bb6..cd1e884a8220a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4757,8 +4757,8 @@ "port-version": 0 }, "oniguruma": { - "baseline": "6.9.4", - "port-version": 1 + "baseline": "6.9.7.1", + "port-version": 0 }, "onnx": { "baseline": "1.9.0", diff --git a/versions/o-/oniguruma.json b/versions/o-/oniguruma.json index c81566eec2c02a..36bf67599a5429 100644 --- a/versions/o-/oniguruma.json +++ b/versions/o-/oniguruma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9f6ae35330e50d5e767e67141441506c26a832fb", + "version": "6.9.7.1", + "port-version": 0 + }, { "git-tree": "5bdcd32cc762467cca4b13b2ed11e6dd5c515cf8", "version-string": "6.9.4", From 407fe056c0d19ff3097ce259829c31c14cbd6a41 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:24:18 +0200 Subject: [PATCH 0792/1858] [greatest] Update to 1.5.0 (#20643) * Update greatest to 1.5.0 * Update CI baseline Co-authored-by: chausner --- ports/greatest/portfile.cmake | 9 ++++----- ports/greatest/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/g-/greatest.json | 5 +++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/greatest/portfile.cmake b/ports/greatest/portfile.cmake index 2fcfd0645ce046..676e4cd5a270dd 100644 --- a/ports/greatest/portfile.cmake +++ b/ports/greatest/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO silentbicycle/greatest - REF v1.4.2 - SHA512 8f2767ac2be017d2ecee3a903ab79834e783df464e3fd0e1e8c4397fdf8dabcc4fb2367163dcb9e944c404d00cf8960ec56c0345f43836182a6e058d9eaf6b0a + REF v1.5.0 + SHA512 836392A7C9C56C6A5658FD18B4BBB146304B1997DFD9CB59F2A83C18A5EC140C8DDE64A2C0CF9A169C426B9E586D37E2ED7D7FB792402DBB4149CC424EC2DB2E HEAD_REF master ) -file(COPY ${SOURCE_PATH}/greatest.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/greatest.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/greatest/vcpkg.json b/ports/greatest/vcpkg.json index c7a179ff5d3221..dce04ff5e21946 100644 --- a/ports/greatest/vcpkg.json +++ b/ports/greatest/vcpkg.json @@ -1,7 +1,6 @@ { "name": "greatest", - "version-string": "1.4.2", - "port-version": 1, + "version": "1.5.0", "description": "Single-file testing system for C", "homepage": "https://github.com/silentbicycle/greatest" } diff --git a/versions/baseline.json b/versions/baseline.json index cd1e884a8220a6..ac2c662c8538fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2521,8 +2521,8 @@ "port-version": 2 }, "greatest": { - "baseline": "1.4.2", - "port-version": 1 + "baseline": "1.5.0", + "port-version": 0 }, "grpc": { "baseline": "1.37.0", diff --git a/versions/g-/greatest.json b/versions/g-/greatest.json index 4c012f0fc9ad65..77ad8eae5fb16f 100644 --- a/versions/g-/greatest.json +++ b/versions/g-/greatest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4105b786aa9c76ff08996de18cdcfccc2fa98e4", + "version": "1.5.0", + "port-version": 0 + }, { "git-tree": "8a09c8e785b2d722b16c6e38ba4c8a3a4b46c20f", "version-string": "1.4.2", From e89e66a93a419fe5a58c1d37a08ac389d6ab4f55 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 05:25:26 +0200 Subject: [PATCH 0793/1858] [jsonnet] Update to 0.17.0 (#20627) * Update jsonnet to 0.17.0 * Update CI baseline * add supports * update version * revert portfile.cmake * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/jsonnet/0004-incorporate-md5.patch | 3 +-- ports/jsonnet/001-enable-msvc.patch | 5 ++--- .../002-fix-dependency-and-install.patch | 12 +++++------- ports/jsonnet/portfile.cmake | 18 +++++++++--------- ports/jsonnet/vcpkg.json | 10 +++++++--- versions/baseline.json | 4 ++-- versions/j-/jsonnet.json | 5 +++++ 7 files changed, 31 insertions(+), 26 deletions(-) diff --git a/ports/jsonnet/0004-incorporate-md5.patch b/ports/jsonnet/0004-incorporate-md5.patch index 2f62c13f95fe7d..830fb8d98db351 100644 --- a/ports/jsonnet/0004-incorporate-md5.patch +++ b/ports/jsonnet/0004-incorporate-md5.patch @@ -1,5 +1,4 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index d4e77a8..5d36314 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -15,7 +15,8 @@ set(LIBJSONNET_HEADERS @@ -39,4 +38,4 @@ index d4e77a8..5d36314 100644 + target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json) set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet) install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}") - endif() + target_include_directories(libjsonnet_static INTERFACE diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch index 499c6713d14767..d5ec55149a3bdc 100644 --- a/ports/jsonnet/001-enable-msvc.patch +++ b/ports/jsonnet/001-enable-msvc.patch @@ -40,7 +40,6 @@ index c032f02..d80d2a0 100644 + install(TARGETS jsonnetfmt DESTINATION tools/jsonnet) endif() diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index d277872..bbf67f7 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE @@ -59,8 +58,8 @@ index d277872..bbf67f7 100644 - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") - - if (BUILD_STATIC_LIBS) + target_include_directories(libjsonnet INTERFACE + $) diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt index a481d9f..2f58d2f 100644 --- a/stdlib/CMakeLists.txt diff --git a/ports/jsonnet/002-fix-dependency-and-install.patch b/ports/jsonnet/002-fix-dependency-and-install.patch index 90640e56cea682..51b63134b0fd87 100644 --- a/ports/jsonnet/002-fix-dependency-and-install.patch +++ b/ports/jsonnet/002-fix-dependency-and-install.patch @@ -1,5 +1,4 @@ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt -index bbf67f7..7238a59 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE @@ -11,9 +10,9 @@ index bbf67f7..7238a59 100644 add_dependencies(libjsonnet md5 stdlib) target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json) @@ -48,6 +49,7 @@ install(TARGETS libjsonnet - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}" PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet INTERFACE + $) +endif() if (BUILD_STATIC_LIBS) @@ -25,7 +24,6 @@ index bbf67f7..7238a59 100644 + +install(FILES ${LIB_HEADER} DESTINATION include) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 6b7b8c3..6dfa1fa 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE @@ -40,10 +38,10 @@ index 6b7b8c3..6dfa1fa 100644 # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without # this step the output would be |liblibjsonnet|. -@@ -22,6 +22,7 @@ install(TARGETS libjsonnet++ - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +@@ -24,6 +24,7 @@ install(TARGETS libjsonnet++ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + target_include_directories(libjsonnet++ INTERFACE + $) +endif() if (BUILD_STATIC_LIBS) diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake index 6542aba75df895..f7821c1b470713 100644 --- a/ports/jsonnet/portfile.cmake +++ b/ports/jsonnet/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/jsonnet - REF 3f58aa551c917d6a7a2c6d042ee27f93d895ac0b # v0.16.0 - SHA512 448f4ff433a43ec21c3b67ea508d624e03dac420878e453e908a465cd517c79ae657f107c92e28a4ae2d2527baaf9a3ae1c6ea4c7e7e4f5062d3fad4e76e668c + REF v0.17.0 + SHA512 D3EE6947163D8ABCED504FF37ECF365C0311164CBF243D4C635D34944F0831CA9FCE2470ACF00EB9A218F82A2E553B3F885DB9BD21BB9DCEFBD707FA0202925D HEAD_REF master PATCHES 001-enable-msvc.patch @@ -15,6 +15,7 @@ vcpkg_from_github( 0004-incorporate-md5.patch ) +# see https://github.com/google/jsonnet/blob/v0.17.0/Makefile#L214 if(VCPKG_TARGET_IS_WINDOWS) find_program(PWSH_PATH pwsh) vcpkg_execute_required_process( @@ -38,9 +39,8 @@ else() set(BUILD_STATIC ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_SHARED_BINARIES=${BUILD_SHARED} -DBUILD_STATIC_LIBS=${BUILD_STATIC} @@ -50,10 +50,10 @@ vcpkg_configure_cmake( -DUSE_SYSTEM_JSON=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/jsonnet) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/jsonnet") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jsonnet/vcpkg.json b/ports/jsonnet/vcpkg.json index fd4541d3f8c2e6..92984b1dddcc5c 100644 --- a/ports/jsonnet/vcpkg.json +++ b/ports/jsonnet/vcpkg.json @@ -1,10 +1,14 @@ { "name": "jsonnet", - "version-string": "0.16.0", - "port-version": 3, + "version": "0.17.0", "description": "Jsonnet - The data templating language", "homepage": "https://github.com/google/jsonnet", + "supports": "!(windows & !static)", "dependencies": [ - "nlohmann-json" + "nlohmann-json", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index ac2c662c8538fd..c0f6c9ba3211b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2941,8 +2941,8 @@ "port-version": 1 }, "jsonnet": { - "baseline": "0.16.0", - "port-version": 3 + "baseline": "0.17.0", + "port-version": 0 }, "jwt-cpp": { "baseline": "0.5.1", diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json index 58d630609c0a20..f3dcfe0c21ac52 100644 --- a/versions/j-/jsonnet.json +++ b/versions/j-/jsonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24a514c5bcece6b71ac13744ec40f92f285fc689", + "version": "0.17.0", + "port-version": 0 + }, { "git-tree": "c6d19c002863644237c3ac276db26c576664f56d", "version-string": "0.16.0", From 0b06e5aa59cc50bc5a39d50a52f3ed7f0707d687 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 12 Oct 2021 11:27:42 +0800 Subject: [PATCH 0794/1858] [vcpkg baseline][rply] Skip all triplets check on ci for temporatory fix (#20653) * [rply] Skip all triplets check on ci for temporatory fix * Add x64-windows-static-md --- scripts/ci.baseline.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 01a7bf39f5557f..8a4765fecdad50 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1332,6 +1332,15 @@ rocksdb:x64-uwp=fail rpclib:arm64-windows=fail rpclib:arm-uwp=fail rpclib:x64-uwp=fail +#The website of rply http://w3.impa.br/~diego/software/rply cannot be accessed +rply:x86-windows=skip +rply:x64-windows=skip +rply:x64-windows-static=skip +rply:x64-uwp=skip +rply:arm64-windows=skip +rply:x64-linux=skip +rply:x64-osx=skip +rply:x64-windows-static-md=skip rsasynccpp:arm64-windows=fail rsasynccpp:arm-uwp=fail rsasynccpp:x64-linux=fail From 66b231e7a8b243aabfbbd211899be21ba8524e1b Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 12 Oct 2021 06:28:23 +0300 Subject: [PATCH 0795/1858] [boost-gil] remove dependency boost-filesystem (#20575) * [boost-gil] remove dependency boost-filesystem This dependency is optional and only used to build and run tests and examples. See https://github.com/boostorg/gil#requirements However, there is also BOOST_GIL_IO_ADD_FS_PATH_SUPPORT which enables boost::filesystem::path support for IO functions, but since users have to define it manually, they must install the dependency manually, too. * fix spacing * fix generate-ports.ps1 Co-authored-by: nicole mazzuca Co-authored-by: Billy Robert O'Neal III --- ports/boost-gil/vcpkg.json | 5 +---- scripts/boost/generate-ports.ps1 | 7 +++++++ versions/b-/boost-gil.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 2f3d1c8e81cea5..991dc51d6e4690 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-gil", "version": "1.77.0", + "port-version": 1, "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "dependencies": [ @@ -8,10 +9,6 @@ "boost-concept-check", "boost-config", "boost-core", - { - "name": "boost-filesystem", - "platform": "!uwp" - }, "boost-integer", "boost-iterator", "boost-mp11", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 902d8644951e55..7a32a0a8c34172 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -26,6 +26,7 @@ $portVersions = @{ #e.g. "boost-asio" = 1; "boost" = 1; "boost-config" = 2; + "boost-gil" = 1; "boost-iostreams" = 1; "boost-modular-build-helper" = 1; "boost-odeint" = 1; @@ -508,6 +509,12 @@ foreach ($library in $libraries) { " [unknown] " + $($usedLibraries | Where-Object { $foundLibraries -notcontains $_ }) $deps = @($usedLibraries | Where-Object { $foundLibraries -contains $_ }) + # break unnecessary dependencies + $deps = @($deps | ? { + -not ( + ($library -eq 'gil' -and $_ -eq 'filesystem') # PR #20575 + ) + }) $deps = @($deps | ForEach-Object { GeneratePortDependency $_ }) $deps += @("boost-vcpkg-helpers") diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 4b38949a22594e..d81ef54fea3641 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6607eb56e9f61771dbd6915d2e5d4b3b2976a7e", + "version": "1.77.0", + "port-version": 1 + }, { "git-tree": "2f4d4429e10ce2721dc48a01588fbf200c683bc5", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index c0f6c9ba3211b3..f5a50b541d3793 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -698,7 +698,7 @@ }, "boost-gil": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-graph": { "baseline": "1.77.0", From cd296da4de0b89f50e8fba393b7ce65918a0b16b Mon Sep 17 00:00:00 2001 From: Gleb Ignatev <44399142+GlebIgnatevEmlid@users.noreply.github.com> Date: Tue, 12 Oct 2021 06:29:57 +0300 Subject: [PATCH 0796/1858] [sentry-native] Add missing `CMakeFindDependencyMacro` for `find_dependency` (#20597) * ports: sentry-native: Add CMakeFindDependencyMacro for find_dependency find_dependency requires CMakeFindDependencyMacro to be included, otherwise there is a CMake error when using find_package(sentry). * versions: update sentry-native port-version to 2 --- ports/sentry-native/fix-config-cmake.patch | 10 +++++++--- ports/sentry-native/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ports/sentry-native/fix-config-cmake.patch b/ports/sentry-native/fix-config-cmake.patch index 3e7a33120bdd87..3d8db2a0e1e646 100644 --- a/ports/sentry-native/fix-config-cmake.patch +++ b/ports/sentry-native/fix-config-cmake.patch @@ -1,9 +1,13 @@ diff --git a/sentry-config.cmake.in b/sentry-config.cmake.in -index 89ea345..21d8732 100644 +index 89ea345..c14b31c 100644 --- a/sentry-config.cmake.in +++ b/sentry-config.cmake.in -@@ -5,7 +5,7 @@ set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) +@@ -3,9 +3,11 @@ + set(SENTRY_BACKEND @SENTRY_BACKEND@) + set(SENTRY_TRANSPORT @SENTRY_TRANSPORT@) ++include(CMakeFindDependencyMacro) ++ if(SENTRY_BACKEND STREQUAL "crashpad") if(@SENTRY_CRASHPAD_SYSTEM@) - find_package(crashpad REQUIRED) @@ -11,7 +15,7 @@ index 89ea345..21d8732 100644 else() include("${CMAKE_CURRENT_LIST_DIR}/sentry_crashpad-targets.cmake") endif() -@@ -14,7 +14,7 @@ endif() +@@ -14,7 +16,7 @@ endif() include("${CMAKE_CURRENT_LIST_DIR}/sentry-targets.cmake") if(SENTRY_TRANSPORT STREQUAL "curl" AND NOT @BUILD_SHARED_LIBS@) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index 012a0d2e6321f1..0cd2e1499d970f 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sentry-native", "version-semver": "0.4.12", - "port-version": 1, + "port-version": 2, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", "supports": "!(arm | (arm64 & !osx) | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index f5a50b541d3793..7d5da3bb304d65 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6082,7 +6082,7 @@ }, "sentry-native": { "baseline": "0.4.12", - "port-version": 1 + "port-version": 2 }, "septag-sx": { "baseline": "2019-05-07", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index a8f936318430e6..a68a56869f3de4 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02751ec1af944b27f69c9b50a8df4017cc24add3", + "version-semver": "0.4.12", + "port-version": 2 + }, { "git-tree": "6281c2a09a664a34db72684ff944c5920925e33e", "version-semver": "0.4.12", From a26b701d185938f49beb5f5b6c0c631b14b0ee47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 12 Oct 2021 11:41:51 +0800 Subject: [PATCH 0797/1858] [vcpkg_configure_make] Fix environment variable _LINK_ (#20652) --- scripts/cmake/vcpkg_configure_make.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index 0b8e88be1cc4d5..c8bdcb554b2e23 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -783,9 +783,9 @@ function(vcpkg_configure_make) set(ENV{LDFLAGS} "-avoid-version $ENV{LDFLAGS}") endif() - if(LINK_ENV_${_VAR_SUFFIX}) + if(LINK_ENV_${_buildtype}) set(_LINK_CONFIG_BACKUP "$ENV{_LINK_}") - set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}") + set(ENV{_LINK_} "${LINK_ENV_${_buildtype}}") endif() set(ENV{PKG_CONFIG} "${PKGCONFIG}") From d9e2e416d4b69d4d7a8449ef77685bcd614d2a88 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 12 Oct 2021 11:43:05 +0800 Subject: [PATCH 0798/1858] [corrade] Fix build error on vs2019 (#20655) --- ports/corrade/fix-vs2019.patch | 2 +- ports/corrade/portfile.cmake | 22 +++++++++++----------- ports/corrade/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/corrade.json | 5 +++++ 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ports/corrade/fix-vs2019.patch b/ports/corrade/fix-vs2019.patch index abf9a3a6e5c995..b7e6599135a91e 100644 --- a/ports/corrade/fix-vs2019.patch +++ b/ports/corrade/fix-vs2019.patch @@ -7,7 +7,7 @@ index e0cc288..e5a4648 100644 message(WARNING "MSVC 2017 detected, automatically enabling MSVC2017_COMPATIBILITY. Note that some features may not be available with this compiler.") endif() - elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.30") -+ elseif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.31") ++ elseif(CMAKE_CXX_COMPILER_VERSION GREATER "19.20") if(NOT MSVC2019_COMPATIBILITY) set(MSVC2019_COMPATIBILITY ON) message(WARNING "MSVC 2019 detected, automatically enabling MSVC2019_COMPATIBILITY. Note that some features may not be available with this compiler.") diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 187374a6de1999..2d6b4920daf2d9 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -25,7 +25,7 @@ endforeach() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS ${FEATURE_OPTIONS} @@ -36,8 +36,8 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # Debug includes and share are the same as release -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Install tools if("utility" IN_LIST FEATURES) @@ -49,22 +49,22 @@ endif() if(NOT FEATURES) # No features, no binaries (only Corrade.h). file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/lib - ${CURRENT_PACKAGES_DIR}/debug) + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/lib" + "${CURRENT_PACKAGES_DIR}/debug") # debug is completely empty, as include and share # have already been removed. elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") # No dlls file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin) + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} +file(INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() +vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/corrade/vcpkg.json b/ports/corrade/vcpkg.json index 83940abbc521ca..d727769a188036 100644 --- a/ports/corrade/vcpkg.json +++ b/ports/corrade/vcpkg.json @@ -1,7 +1,7 @@ { "name": "corrade", "version-string": "2020.06", - "port-version": 2, + "port-version": 3, "description": "C++11/C++14 multiplatform utility library.", "homepage": "https://magnum.graphics/corrade/", "default-features": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7d5da3bb304d65..0d6cb9e7c67392 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1482,7 +1482,7 @@ }, "corrade": { "baseline": "2020.06", - "port-version": 2 + "port-version": 3 }, "cpp-base64": { "baseline": "V2.rc.08", diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json index 08452c7336027b..6a1a88a1a19834 100644 --- a/versions/c-/corrade.json +++ b/versions/c-/corrade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "087770e2a196c44cb1b56473bd57797ed9b9bc87", + "version-string": "2020.06", + "port-version": 3 + }, { "git-tree": "ec9f53411152ed98e9d591afed7e34e65fb7abeb", "version-string": "2020.06", From 4001a1a9874297a92674593375c81db72da27cd5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Oct 2021 05:51:03 +0200 Subject: [PATCH 0799/1858] [librttopo] Revise windows build (#20584) * Use common indentation of 4 spaces * Minimize makefiles patch * Fix single-config build * Install pc file for windows * Update versions --- ports/librttopo/fix-makefiles.patch | 26 +--------- ports/librttopo/portfile.cmake | 78 +++++++++++++++++++---------- ports/librttopo/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/librttopo.json | 5 ++ 5 files changed, 61 insertions(+), 52 deletions(-) diff --git a/ports/librttopo/fix-makefiles.patch b/ports/librttopo/fix-makefiles.patch index 41c6c8f9268772..f86d35dd7520a0 100644 --- a/ports/librttopo/fix-makefiles.patch +++ b/ports/librttopo/fix-makefiles.patch @@ -1,8 +1,8 @@ diff --git a/makefile.vc b/makefile.vc -index 1f790f0de..2f7e00f7b 100644 +index 1f790f0..f78d0c9 100644 --- a/makefile.vc +++ b/makefile.vc -@@ -17,11 +17,11 @@ LIBOBJ = src\box2d.obj src\bytebuffer.obj src\g_box.obj \ +@@ -17,7 +17,7 @@ LIBOBJ = src\box2d.obj src\bytebuffer.obj src\g_box.obj \ src\rtout_kml.obj src\rtout_svg.obj src\rtout_twkb.obj src\rtout_wkb.obj \ src\rtout_wkt.obj src\rtout_x3d.obj src\rtpoint.obj src\rtpoly.obj src\rtprint.obj \ src\rtpsurface.obj src\rtspheroid.obj src\rtstroke.obj src\rttin.obj src\rttree.obj \ @@ -11,25 +11,3 @@ index 1f790f0de..2f7e00f7b 100644 LIBRTTOPO_DLL = librttopo$(VERSION).dll --CFLAGS = /nologo -IC:\OSGeo4W\include -I. -Iheaders $(OPTFLAGS) -+CFLAGS = /nologo -I. -Iheaders $(OPTFLAGS) - - default: all - - -diff --git a/nmake.opt b/nmake.opt -index 938979df1..ea80dab00 100644 ---- a/nmake.opt -+++ b/nmake.opt -@@ -1,9 +1,8 @@ - # Directory tree where RTTOPO will be installed. --INSTDIR=C:\OSGeo4W -+INSTDIR=$(INSTALLDIR) - - # Uncomment the first for an optimized build, or the second for debug. --OPTFLAGS= /nologo /Ox /fp:precise /W4 /MD /D_CRT_SECURE_NO_WARNINGS \ -- /DDLL_EXPORT -+OPTFLAGS= /nologo /fp:precise /W4 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS - #OPTFLAGS= /nologo /Zi /MD /Fdlibrttopo.pdb /DDLL_EXPORT - - # Set the version number for the DLL. Normally we leave this blank since diff --git a/ports/librttopo/portfile.cmake b/ports/librttopo/portfile.cmake index a1939b8631501f..1024f3af5c390f 100644 --- a/ports/librttopo/portfile.cmake +++ b/ports/librttopo/portfile.cmake @@ -18,33 +18,59 @@ vcpkg_extract_source_archive_ex( ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - - file(REMOVE "${SOURCE_PATH}/src/rttopo_config.h") - configure_file("${CMAKE_CURRENT_LIST_DIR}/rttopo_config.h.in" "${SOURCE_PATH}/src/rttopo_config.h" @ONLY) - - vcpkg_build_nmake( - SOURCE_PATH "${SOURCE_PATH}" - TARGET librttopo.lib - ) - - file(GLOB LIBRTTOPO_INCLUDE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/headers/*.h") - file(COPY ${LIBRTTOPO_INCLUDE} DESTINATION "${CURRENT_PACKAGES_DIR}/include") - - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") -else() # Build in UNIX - vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - OPTIONS_DEBUG - "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/debug/bin/geos-config" - OPTIONS_RELEASE - "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/bin/geos-config" - ) - vcpkg_install_make() - vcpkg_fixup_pkgconfig() + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + + file(REMOVE "${SOURCE_PATH}/src/rttopo_config.h") + configure_file("${CMAKE_CURRENT_LIST_DIR}/rttopo_config.h.in" "${SOURCE_PATH}/src/rttopo_config.h" @ONLY) + + set(OPTFLAGS "/nologo /fp:precise /W4 /D_CRT_SECURE_NO_WARNINGS /DDLL_EXPORT") + vcpkg_build_nmake( + SOURCE_PATH "${SOURCE_PATH}" + TARGET librttopo.lib + OPTIONS + "OPTFLAGS=${OPTFLAGS}" + "CFLAGS=-I. -Iheaders ${OPTFLAGS}" + ) + + file(GLOB LIBRTTOPO_INCLUDE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/headers/*.h") + file(COPY ${LIBRTTOPO_INCLUDE} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/librttopo.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() + + set(VERSION "${LIBRTTOPO_VERSION_STR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix [[${prefix}]]) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/rttopo.pc") + configure_file("${SOURCE_PATH}/rttopo.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lrttopo -lm" " -llibrttopo") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/rttopo.pc") + configure_file("${SOURCE_PATH}/rttopo.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" " -lrttopo -lm" " -llibrttopo") + endif() +else() + vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS_DEBUG + "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/debug/bin/geos-config" + OPTIONS_RELEASE + "--with-geosconfig=${CURRENT_INSTALLED_DIR}/tools/geos/bin/geos-config" + ) + vcpkg_install_make() endif() +vcpkg_fixup_pkgconfig() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/librttopo/vcpkg.json b/ports/librttopo/vcpkg.json index 16e12134e5bfdf..73e72959b3700c 100644 --- a/ports/librttopo/vcpkg.json +++ b/ports/librttopo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librttopo", "version": "1.1.0", - "port-version": 4, + "port-version": 5, "description": "The RT Topology Library exposes an API to create and manage standard (ISO 13249 aka SQL/MM) topologies using user-provided data stores.", "homepage": "https://git.osgeo.org/gitea/rttopo/librttopo", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0d6cb9e7c67392..1cb4341f350f3b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3750,7 +3750,7 @@ }, "librttopo": { "baseline": "1.1.0", - "port-version": 4 + "port-version": 5 }, "libsamplerate": { "baseline": "0.2.2", diff --git a/versions/l-/librttopo.json b/versions/l-/librttopo.json index 88bbabc82ea50a..5c3773f059b578 100644 --- a/versions/l-/librttopo.json +++ b/versions/l-/librttopo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d747c88d429ff781b11627623d0958967f912a41", + "version": "1.1.0", + "port-version": 5 + }, { "git-tree": "fae3fefb29d1972caa2643351ebf83ca47f7d04a", "version": "1.1.0", From 91bb5a5bc62156a71918f659d45d3e65b8ca5881 Mon Sep 17 00:00:00 2001 From: Dennis Date: Tue, 12 Oct 2021 06:05:57 +0200 Subject: [PATCH 0800/1858] [asio-grpc] new port (#20602) * Add asio-grpc * Migrate deprecated functions in ports/asio-grpc/portfile.cmake --- ports/asio-grpc/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/asio-grpc/vcpkg.json | 29 +++++++++++++++++++++++++++++ versions/a-/asio-grpc.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 68 insertions(+) create mode 100644 ports/asio-grpc/portfile.cmake create mode 100644 ports/asio-grpc/vcpkg.json create mode 100644 versions/a-/asio-grpc.json diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake new file mode 100644 index 00000000000000..7dd32692bd46ed --- /dev/null +++ b/ports/asio-grpc/portfile.cmake @@ -0,0 +1,26 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Tradias/asio-grpc + REF v1.1.2 + SHA512 f55b219b9805f193b5673e91e58c3c5fc98957110fadf523c1729c92a06c8befe4ad58052c6e9aaabcf8327f2df31780d7e072a0923d77598974fa0145bf9e7f + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + boost-container ASIO_GRPC_USE_BOOST_CONTAINER +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asio-grpc) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json new file mode 100644 index 00000000000000..2b33b17ff72e89 --- /dev/null +++ b/ports/asio-grpc/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "asio-grpc", + "version": "1.1.2", + "description": "Asynchronous gRPC with Boost.Asio executors", + "homepage": "https://github.com/Tradias/asio-grpc", + "dependencies": [ + "boost-asio", + "boost-core", + "boost-intrusive", + "boost-lockfree", + "grpc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "boost-container": { + "description": "Use Boost.Container instead of ", + "dependencies": [ + "boost-container" + ] + } + } +} diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json new file mode 100644 index 00000000000000..6da80deb3ffb47 --- /dev/null +++ b/versions/a-/asio-grpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "39ad0d8203c21698ba153d6951de8295954028eb", + "version": "1.1.2", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1cb4341f350f3b..1aaaea54a7df22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -176,6 +176,10 @@ "baseline": "1.19.2", "port-version": 0 }, + "asio-grpc": { + "baseline": "1.1.2", + "port-version": 0 + }, "asiosdk": { "baseline": "2.3.3", "port-version": 3 From 8445345403931747e8ec3c6104bd8315309e4380 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 12 Oct 2021 20:27:30 +0200 Subject: [PATCH 0801/1858] [pffft] new port (#20624) * Add new port pffft * Add pffft to baseline Co-authored-by: chausner --- ports/pffft/CMakeLists.txt | 25 ++++++++++++++++++ ports/pffft/copyright | 52 ++++++++++++++++++++++++++++++++++++++ ports/pffft/portfile.cmake | 22 ++++++++++++++++ ports/pffft/vcpkg.json | 17 +++++++++++++ versions/baseline.json | 4 +++ versions/p-/pffft.json | 9 +++++++ 6 files changed, 129 insertions(+) create mode 100644 ports/pffft/CMakeLists.txt create mode 100644 ports/pffft/copyright create mode 100644 ports/pffft/portfile.cmake create mode 100644 ports/pffft/vcpkg.json create mode 100644 versions/p-/pffft.json diff --git a/ports/pffft/CMakeLists.txt b/ports/pffft/CMakeLists.txt new file mode 100644 index 00000000000000..40f447ae54b6b7 --- /dev/null +++ b/ports/pffft/CMakeLists.txt @@ -0,0 +1,25 @@ +cmake_minimum_required(VERSION 3.12.4) +project(pffft C) + +add_library(pffft pffft.c) + +if(MSVC) + target_compile_definitions(pffft PRIVATE _USE_MATH_DEFINES) +endif() + +target_include_directories(pffft PUBLIC $ $) + +install( + TARGETS pffft + EXPORT pffft-config +) + +install( + EXPORT pffft-config + NAMESPACE pffft:: + DESTINATION share/pffft +) + +if(NOT DISABLE_INSTALL_HEADERS) + install(FILES pffft.h DESTINATION include/pffft) +endif() \ No newline at end of file diff --git a/ports/pffft/copyright b/ports/pffft/copyright new file mode 100644 index 00000000000000..871b42e831a93e --- /dev/null +++ b/ports/pffft/copyright @@ -0,0 +1,52 @@ +Copyright (c) 2013 Julien Pommier ( pommier@modartt.com ) + +Based on original fortran 77 code from FFTPACKv4 from NETLIB +(http://www.netlib.org/fftpack), authored by Dr Paul Swarztrauber +of NCAR, in 1985. + +As confirmed by the NCAR fftpack software curators, the following +FFTPACKv5 license applies to FFTPACKv4 sources. My changes are +released under the same terms. + +FFTPACK license: + +http://www.cisl.ucar.edu/css/software/fftpack5/ftpk.html + +Copyright (c) 2004 the University Corporation for Atmospheric +Research ("UCAR"). All rights reserved. Developed by NCAR's +Computational and Information Systems Laboratory, UCAR, +www.cisl.ucar.edu. + +Redistribution and use of the Software in source and binary forms, +with or without modification, is permitted provided that the +following conditions are met: + +- Neither the names of NCAR's Computational and Information Systems +Laboratory, the University Corporation for Atmospheric Research, +nor the names of its sponsors or contributors may be used to +endorse or promote products derived from this Software without +specific prior written permission. + +- Redistributions of source code must retain the above copyright +notices, this list of conditions, and the disclaimer below. + +- Redistributions in binary form must reproduce the above copyright +notice, this list of conditions, and the disclaimer below in the +documentation and/or other materials provided with the +distribution. + +THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE +SOFTWARE. + + +PFFFT : a Pretty Fast FFT. + +This file is largerly based on the original FFTPACK implementation, modified in +order to take advantage of SIMD instructions of modern CPUs. diff --git a/ports/pffft/portfile.cmake b/ports/pffft/portfile.cmake new file mode 100644 index 00000000000000..32d4f833f2c296 --- /dev/null +++ b/ports/pffft/portfile.cmake @@ -0,0 +1,22 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_bitbucket( + OUT_SOURCE_PATH SOURCE_PATH + REPO jpommier/pffft + REF ed78751d751e51bbd94c41d24f748b400f272d69 + SHA512 44f65c7f7e5b71f549dca2e03d58b1fd64e698858f79e4c2833a9ae3dff8a835cf9d5e14be2341c6370f800012cb69b05b9226d6918b12e67f7f7e81ed8e9ad4 + HEAD_REF master +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS_DEBUG + -DDISABLE_INSTALL_HEADERS=ON +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") \ No newline at end of file diff --git a/ports/pffft/vcpkg.json b/ports/pffft/vcpkg.json new file mode 100644 index 00000000000000..5ea7a3bd204846 --- /dev/null +++ b/ports/pffft/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "pffft", + "version-date": "2021-10-09", + "description": "PFFFT, a pretty fast Fourier Transform.", + "homepage": "https://bitbucket.org/jpommier/pffft/", + "supports": "static", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1aaaea54a7df22..25a33f20245630 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5096,6 +5096,10 @@ "baseline": "2.8.3", "port-version": 1 }, + "pffft": { + "baseline": "2021-10-09", + "port-version": 0 + }, "pfring": { "baseline": "2019-10-17", "port-version": 3 diff --git a/versions/p-/pffft.json b/versions/p-/pffft.json new file mode 100644 index 00000000000000..9defc01344321a --- /dev/null +++ b/versions/p-/pffft.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c425b1091069b34450a9b7e524f1cad202e4e709", + "version-date": "2021-10-09", + "port-version": 0 + } + ] +} From 61a0da993ecabcebae7ce7e4f15de6bd7c973081 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 12 Oct 2021 20:27:43 +0200 Subject: [PATCH 0802/1858] [boost-modular-build-helper] Fixup mingw lib names (#20576) * Fixup mingw lib names on windows * Update versions * Bump boost-modular-build-helper port-version. Co-authored-by: Billy Robert O'Neal III --- .../boost-modular-build.cmake | 14 ++++++++++++++ ports/boost-modular-build-helper/vcpkg.json | 2 +- scripts/boost/generate-ports.ps1 | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 4e7dfb4563c97e..8d082b26b74bad 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -130,6 +130,20 @@ function(boost_modular_build) file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}) endif() endforeach() + # Similar for mingw + file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*-mgw10-*.a" "${CURRENT_PACKAGES_DIR}/lib/*-mgw10-*.a") + foreach(LIB IN LISTS INSTALLED_LIBS) + get_filename_component(OLD_FILENAME "${LIB}" NAME) + get_filename_component(DIRECTORY_OF_LIB_FILE "${LIB}" DIRECTORY) + string(REGEX REPLACE "-mgw[0-9]+-.*[0-9](\\.dll\\.a|\\.a)$" "\\1" NEW_FILENAME "${OLD_FILENAME}") + if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") + # nothing to do + elseif(EXISTS "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") + file(REMOVE "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}") + else() + file(RENAME "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}" "${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}") + endif() + endforeach() # boost-regex[icu] and boost-locale[icu] generate has_icu.lib if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/has_icu.lib") diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index e81e9a0fce0b15..71d528590f78c7 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 1, + "port-version": 2, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 7a32a0a8c34172..a626daf34f45db 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -28,7 +28,7 @@ $portVersions = @{ "boost-config" = 2; "boost-gil" = 1; "boost-iostreams" = 1; - "boost-modular-build-helper" = 1; + "boost-modular-build-helper" = 2; "boost-odeint" = 1; "boost-python" = 1; "boost-process" = 2; diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 867e62be31815b..7985f1f490d835 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9795fd3f465461fea28201a773909b6fd0e3400b", + "version": "1.77.0", + "port-version": 2 + }, { "git-tree": "c076291c3d44f7cea167e469748ead6270e1c424", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 25a33f20245630..16ea1895cd0a68 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -810,7 +810,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 1 + "port-version": 2 }, "boost-move": { "baseline": "1.77.0", From 8f9793c1c81a3bc9982072fbe7df5124c79a6345 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 13 Oct 2021 01:30:40 +0700 Subject: [PATCH 0803/1858] [vcpkg.cmake] Add default triplet for mingw compilers (#19020) --- scripts/buildsystems/vcpkg.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 9769b611328b20..b5422cb64e8624 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -346,6 +346,8 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_H set(Z_VCPKG_TARGET_TRIPLET_PLAT osx) elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS") set(Z_VCPKG_TARGET_TRIPLET_PLAT ios) +elseif(MINGW) + set(Z_VCPKG_TARGET_TRIPLET_PLAT mingw-dynamic) elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")) set(Z_VCPKG_TARGET_TRIPLET_PLAT windows) elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR (NOT CMAKE_SYSTEM_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")) From 9fd482460c82f8265abb0b047796aa5c8fce76fc Mon Sep 17 00:00:00 2001 From: Akash Date: Tue, 12 Oct 2021 19:02:59 -0500 Subject: [PATCH 0804/1858] [graphviz] new port (#20564) * Add graphviz * Address bot feedback * Add python3 dep and fix pkgconf var * Acquire python3 program * Specify python3 executable * Move bison earlier in path * Add bison executable as var * Add other deps as var * Fix formatting * Apply suggestions from code review Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update to 2.49.1 Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/graphviz/0001-Fix-build.patch | 94 +++++++++++++++++++++++++++++ ports/graphviz/portfile.cmake | 44 ++++++++++++++ ports/graphviz/vcpkg.json | 18 ++++++ versions/baseline.json | 4 ++ versions/g-/graphviz.json | 9 +++ 5 files changed, 169 insertions(+) create mode 100644 ports/graphviz/0001-Fix-build.patch create mode 100644 ports/graphviz/portfile.cmake create mode 100644 ports/graphviz/vcpkg.json create mode 100644 versions/g-/graphviz.json diff --git a/ports/graphviz/0001-Fix-build.patch b/ports/graphviz/0001-Fix-build.patch new file mode 100644 index 00000000000000..4accf3e9432fbb --- /dev/null +++ b/ports/graphviz/0001-Fix-build.patch @@ -0,0 +1,94 @@ +diff --git a/cmake/FindCairo.cmake b/cmake/FindCairo.cmake +index dce05ea96..cbd879fee 100644 +--- a/cmake/FindCairo.cmake ++++ b/cmake/FindCairo.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-if (WIN32) ++if (false) + find_path(Cairo_INCLUDE_DIR cairo/cairo.h) + + find_library(Cairo_LIBRARY NAMES cairo) +diff --git a/cmake/FindPangoCairo.cmake b/cmake/FindPangoCairo.cmake +index 0937e41ef..bb876ce46 100644 +--- a/cmake/FindPangoCairo.cmake ++++ b/cmake/FindPangoCairo.cmake +@@ -1,6 +1,6 @@ + include(FindPackageHandleStandardArgs) + +-if (WIN32) ++if (false) + find_path(PangoCairo_INCLUDE_DIR pango/pangocairo.h PATH_SUFFIXES pango-1.0) + find_path(GLIB_INCLUDE_DIR glib.h PATH_SUFFIXES glib-2.0) + find_path(GLIBCONFIG_INCLUDE_DIR glibconfig.h PATH_SUFFIXES glib-2.0/include) +@@ -69,6 +69,9 @@ if (WIN32) + else() + find_package(PkgConfig) + pkg_check_modules(PangoCairo pangocairo) ++ list(REMOVE_ITEM PangoCairo_LINK_LIBRARIES ffi) ++ find_library(ACTUAL_FFI libffi PangoCairo_LIBRARY_DIRS) ++ list(APPEND PangoCairo_LINK_LIBRARIES ${ACTUAL_FFI}) + + # prior to CMake 3.12, PkgConfig does not set *_LINK_LIBRARIES, so do it + # manually +diff --git a/cmd/tools/CMakeLists.txt b/cmd/tools/CMakeLists.txt +index 8d7b88484..58f8d80fe 100644 +--- a/cmd/tools/CMakeLists.txt ++++ b/cmd/tools/CMakeLists.txt +@@ -392,14 +392,14 @@ tool_defaults(sccmap) + + # ===================== Install third party DLLs on Windows ==================== + +-if (WIN32 AND EXPAT_FOUND) ++if (false) + install( + FILES ${EXPAT_RUNTIME_LIBRARIES} + DESTINATION ${BINARY_INSTALL_DIR} + ) +-endif(WIN32 AND EXPAT_FOUND) ++endif(false) + +-if (WIN32) ++if (false) + install( + FILES ${Getopt_RUNTIME_LIBRARIES} + DESTINATION ${BINARY_INSTALL_DIR} +diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt +index 144c442ae..fa56739b0 100644 +--- a/lib/common/CMakeLists.txt ++++ b/lib/common/CMakeLists.txt +@@ -93,6 +93,7 @@ target_include_directories(common_obj PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ++ ${EXPAT_INCLUDE_DIRS} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/gvc +diff --git a/lib/gvc/CMakeLists.txt b/lib/gvc/CMakeLists.txt +index 745841176..57e2dd32b 100644 +--- a/lib/gvc/CMakeLists.txt ++++ b/lib/gvc/CMakeLists.txt +@@ -134,7 +134,7 @@ set_target_properties(gvc PROPERTIES + ) + + # Include DLLs with this library on Windows +-if (WIN32 AND EXPAT_FOUND) ++if (false) + install( + FILES + ${EXPAT_RUNTIME_LIBRARIES} +diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt +index fe7ed264d..dce635185 100644 +--- a/plugin/gd/CMakeLists.txt ++++ b/plugin/gd/CMakeLists.txt +@@ -36,7 +36,7 @@ install( + ) + + # Include DLLs with this library on Windows +-if (WIN32) ++if (false) + install( + FILES + ${GD_RUNTIME_LIBRARIES} diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake new file mode 100644 index 00000000000000..93692bd8ddb469 --- /dev/null +++ b/ports/graphviz/portfile.cmake @@ -0,0 +1,44 @@ +vcpkg_from_gitlab( + GITLAB_URL https://gitlab.com + OUT_SOURCE_PATH SOURCE_PATH + REPO graphviz/graphviz + REF 2.49.1 + SHA512 ac14303f67d0840b260c5f2f99c53049a1e444a963d31387ae7a44ffc24757bd44f1c40ddd3fdb6a8d0e0bb1dde0e15d320f613729fb631efd4f078fcb3a4f62 + HEAD_REF main + PATCHES + 0001-Fix-build.patch +) + +vcpkg_acquire_msys(MSYS_ROOT PACKAGES gawk) +vcpkg_add_to_path("${MSYS_ROOT}/usr/bin") + +vcpkg_find_acquire_program(BISON) +vcpkg_find_acquire_program(FLEX) +vcpkg_find_acquire_program(GIT) +vcpkg_find_acquire_program(PYTHON3) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + + DISABLE_PARALLEL_CONFIGURE + OPTIONS + -DBISON_EXECUTABLE=${BISON} + -DFLEX_EXECUTABLE=${FLEX} + -DGIT_EXECUTABLE=${GIT} + -DPython3_EXECUTABLE=${PYTHON3} + -DPKG_CONFIG_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/pkgconf/pkgconf + -Denable_ltdl=OFF +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_copy_tools( + TOOL_NAMES acyclic bcomps ccomps circo dijkstra dot fdp gc gml2gv graphml2gv gv2gml gvcolor gvgen gvpack gvpr gxl2gv mm2gv neato nop osage patchwork sccmap sfdp tred twopi unflatten + AUTO_CLEAN +) + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json new file mode 100644 index 00000000000000..88243e941299eb --- /dev/null +++ b/ports/graphviz/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "graphviz", + "version-semver": "2.49.1", + "description": "Graph Visualization Tools", + "homepage": "https://graphviz.org/", + "dependencies": [ + "cairo", + "getopt", + "libffi", + "libgd", + "pango", + "pkgconf", + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 16ea1895cd0a68..5ff90bde9008d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2524,6 +2524,10 @@ "baseline": "0.7.0", "port-version": 2 }, + "graphviz": { + "baseline": "2.49.1", + "port-version": 0 + }, "greatest": { "baseline": "1.5.0", "port-version": 0 diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json new file mode 100644 index 00000000000000..f1a81d1cbfb5c0 --- /dev/null +++ b/versions/g-/graphviz.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3d90393fc2bdb3a481e1a371fbbb8e816d0317b6", + "version-semver": "2.49.1", + "port-version": 0 + } + ] +} From c20fcb752f7df2ccedb81137bc0f8958f31cd8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Guzm=C3=A1n?= Date: Tue, 12 Oct 2021 18:05:05 -0600 Subject: [PATCH 0805/1858] [vcpkg docs][ES] Sync with English readme (#20412) (#20647) --- README_es.md | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/README_es.md b/README_es.md index 0ed0474f63d1d2..abd17c1bb83ecf 100644 --- a/README_es.md +++ b/README_es.md @@ -25,25 +25,25 @@ una vez instalado Vcpkg puede ejecutar `vcpkg help`, o ## Tabla de contenido -* [Vcpkg: General](#vcpkg-general) -* [Tabla de contenidos](#tabla-de-contenidos) -* ["Primeros pasos"](#primeros-pasos) - + [Inicio rápido: Windows](#inicio-rápido-windows) - + [Inicio rápido: Unix](#inicio-rápido-unix) - + [Instalando herramientas de desarrollo en Linux](#instalando-herramientas-de-desarrollo-en-Linux) - + [Instalando herramientas de desarrollo en macOS](#instalando-herramientas-de-desarrollo-en-macos) - - [Instalando GCC en MacOS previo a 10.15](#instalando-gcc-en-macos-previo-a-10.15) - + [Usando Vcpkg con CMake](#usando-vcpkg-con-cmake) - - [Visual Studio Code con CMake Tools](#visual-studio-code-con-cmake-tools) - - [Vcpkg con proyectos de Visual Studio (CMake)](#vcpkg-con-proyectos-de-visual-studio\(CMake\)) - - [Vcpkg con CLion](#vcpkg-con-clion) - - [Vcpkg como submódulo](#vcpkg-como-submódulo) - + [Inicio rápido: archivos de Manifiesto](#inicio-rápido-manifiestos) -* [Tab-Completado/Autocompletado](#Completado-TabAutocompletado) -* [Ejemplos](#ejemplos) -* [Contribuyendo](#contribuyendo) -* [Licencia](#licencia) -* [telemetría](#telemetría) +- [Vcpkg](#vcpkg) + - [Tabla de contenido](#tabla-de-contenido) + - [Primeros pasos](#primeros-pasos) + - [Inicio Rápido: Windows](#inicio-rápido-windows) + - [Inicio rápido: Unix](#inicio-rápido-unix) + - [Instalando Herramientas de desarrollo en Linux](#instalando-herramientas-de-desarrollo-en-linux) + - [Instalando Herramientas de desarrollo en macOS](#instalando-herramientas-de-desarrollo-en-macos) + - [Instalando GCC en macOS previo a 10.15](#instalando-gcc-en-macos-previo-a-1015) + - [Usando Vcpkg con CMake](#usando-vcpkg-con-cmake) + - [Visual Studio Code con CMake Tools](#visual-studio-code-con-cmake-tools) + - [Vcpkg con proyectos de Visual Studio(CMake)](#vcpkg-con-proyectos-de-visual-studiocmake) + - [Vcpkg con CLion](#vcpkg-con-clion) + - [Vcpkg como Submódulo](#vcpkg-como-submódulo) + - [Inicio rápido: Manifiestos](#inicio-rápido-manifiestos) + - [Completado-Tab/Autocompletado](#completado-tabautocompletado) + - [Ejemplos](#ejemplos) + - [Contribuyendo](#contribuyendo) + - [Licencia](#licencia) + - [Telemetría](#telemetría) ## Primeros pasos @@ -411,8 +411,10 @@ El código en este repositorio se encuentra licenciado mediante la [Licencia MIT vcpkg recolecta datos de uso para mejorar su experiencia. La información obtenida por Microsoft es anónima. -puede ser dado de baja de la telemetría ejecutando de nuevo el script `bootstrap-vcpkg` con `-disableMetrics`, -pasando `--disable-metrics` a vcpkg en la línea de comandos, -o creando la variable de entorno `VCPKG_DISABLE_METRICS`. +puede ser dado de baja de la telemetría realizando lo siguiente: + +- ejecutar el script `bootstrap-vcpkg` con el parametro `-disableMetrics` +- agregar el parametro `--disable-metrics` a vcpkg en la línea de comandos +- agregar la variable de entorno `VCPKG_DISABLE_METRICS` Se puede leer más sobre la telemetría de vcpkg en docs/about/privacy.md From bedfd0a562f889198f1777e566ca2703116d4eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 13 Oct 2021 08:07:28 +0800 Subject: [PATCH 0806/1858] [vcpkg_from_github] Fix parse error on OSX (#20650) --- scripts/cmake/vcpkg_from_github.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_from_github.cmake b/scripts/cmake/vcpkg_from_github.cmake index 2dae0ba501a941..f587b20ae568ff 100644 --- a/scripts/cmake/vcpkg_from_github.cmake +++ b/scripts/cmake/vcpkg_from_github.cmake @@ -160,7 +160,7 @@ function(vcpkg_from_github) # Parse the github refs response with regex. # TODO: add json-pointer support to vcpkg file(READ "${archive_version}" version_contents) - if(NOT version_contents MATCHES [["sha":"([a-f0-9]+)"]]) + if(NOT version_contents MATCHES [["sha":(\ *)"([a-f0-9]+)"]]) message(FATAL_ERROR "Failed to parse API response from '${version_url}': ${version_contents} From 38820e1a5c9742cd29e8b2975d7d7307d44e648f Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 13 Oct 2021 08:09:17 +0800 Subject: [PATCH 0807/1858] [ryml] Support osx (#20661) * [ryml] Support osx * Update deprecated functions * Remove supports field --- ports/ryml/portfile.cmake | 23 ++++++++--------------- ports/ryml/vcpkg.json | 10 +++++++++- scripts/ci.baseline.txt | 1 - versions/baseline.json | 2 +- versions/r-/ryml.json | 5 +++++ 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake index f3e2bf5c29dc91..152c7c9e8de327 100644 --- a/ports/ryml/portfile.cmake +++ b/ports/ryml/portfile.cmake @@ -1,9 +1,5 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -vcpkg_fail_port_install( - ON_TARGET "OSX" -) - # Get rapidyaml src vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -38,21 +34,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS dbg RYML_DBG ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ryml) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ryml) +if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/ryml") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ryml) endif() # Move headers and natvis to own dir @@ -72,6 +67,4 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/ryml/rymlConfig.cmake" "${_contents}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL - "${SOURCE_PATH}/LICENSE.txt" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json index 01ec79dea3f659..a11054bd462256 100644 --- a/ports/ryml/vcpkg.json +++ b/ports/ryml/vcpkg.json @@ -1,13 +1,21 @@ { "name": "ryml", "version-date": "2021-07-24", + "port-version": 1, "description": "Rapid YAML library", "homepage": "https://github.com/biojppm/rapidyaml", - "supports": "!osx", "dependencies": [ { "name": "c4core", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "default-features": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 8a4765fecdad50..6fe14819e2999c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1359,7 +1359,6 @@ rtlsdr:x64-linux=fail rtlsdr:x64-osx=fail rttr:arm-uwp=fail rttr:x64-uwp=fail -ryml:x64-osx=fail ryu:arm-uwp=fail ryu:x64-uwp=fail ryu:x64-windows-static=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5ff90bde9008d1..f0d042d2fcef5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5970,7 +5970,7 @@ }, "ryml": { "baseline": "2021-07-24", - "port-version": 0 + "port-version": 1 }, "ryu": { "baseline": "2.0", diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json index f977ffb5c7f8f1..13c188a17fdcaf 100644 --- a/versions/r-/ryml.json +++ b/versions/r-/ryml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "599ab36a18b1a0c439fdc6dc740bf0575a06641e", + "version-date": "2021-07-24", + "port-version": 1 + }, { "git-tree": "d97344132c58ae2aafb8c0ed1f23acde843404b5", "version-date": "2021-07-24", From 6f3ad11ccc67c6cbaca0e86072f60b33bbcf3e98 Mon Sep 17 00:00:00 2001 From: gllebede <36988895+gllebede@users.noreply.github.com> Date: Wed, 13 Oct 2021 01:11:26 +0100 Subject: [PATCH 0808/1858] V8Config-shared compatibility issue fixed for VS generator (#20560) * V8Config-shared compatibility issue fixed for VS generator * Version updated * port version fix * update version * adjust first entry * update version * Use version rather than version-string. * Picking V8 snapshot via cmake generator expression * version fix Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III --- ports/v8/V8Config-shared.cmake | 3 +-- ports/v8/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/v-/v8.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/v8/V8Config-shared.cmake b/ports/v8/V8Config-shared.cmake index a27074ea37cdcb..fadfdb5acdc50f 100644 --- a/ports/v8/V8Config-shared.cmake +++ b/ports/v8/V8Config-shared.cmake @@ -15,8 +15,7 @@ endif() if(EXISTS ${_IMPORT_PREFIX}/debug/bin/snapshot_blob.bin) set(V8_SNAPSHOT_BLOB_DEBUG ${_IMPORT_PREFIX}/debug/bin/snapshot_blob.bin CACHE FILEPATH "Debug version of V8 snapshot blob location") endif() -string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE) -set(V8_SNAPSHOT_BLOB ${V8_SNAPSHOT_BLOB_${BUILD_TYPE}}) +set(V8_SNAPSHOT_BLOB "$,${V8_SNAPSHOT_BLOB_DEBUG},${V8_SNAPSHOT_BLOB_RELEASE}>") if(EXISTS "${_IMPORT_PREFIX}/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") set(V8_LIBRARY_RELEASE "${_IMPORT_PREFIX}/lib/v8${CMAKE_SHARED_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}" CACHE FILEPATH "Release version of the V8 library location") diff --git a/ports/v8/vcpkg.json b/ports/v8/vcpkg.json index 2478ba4f9e1e57..ba8cfa771402bb 100644 --- a/ports/v8/vcpkg.json +++ b/ports/v8/vcpkg.json @@ -1,6 +1,7 @@ { "name": "v8", - "version-string": "9.1.269.39", + "version": "9.1.269.39", + "port-version": 1, "description": "Google Chrome's JavaScript engine", "homepage": "https://v8.dev", "supports": "!(arm | arm64 | uwp | osx)", diff --git a/versions/baseline.json b/versions/baseline.json index f0d042d2fcef5b..8ed97446984cfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6906,7 +6906,7 @@ }, "v8": { "baseline": "9.1.269.39", - "port-version": 0 + "port-version": 1 }, "valijson": { "baseline": "0.6", diff --git a/versions/v-/v8.json b/versions/v-/v8.json index c89d116cf05a51..9a859f286bc93a 100644 --- a/versions/v-/v8.json +++ b/versions/v-/v8.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d179f8f99ecce385eab497b2850e605976f4d9d5", + "version": "9.1.269.39", + "port-version": 1 + }, { "git-tree": "1cd6a72ff77695151205fb2d2e55ed93d2f4193d", "version-string": "9.1.269.39", From cada1aabd01c57f38ef01f1499a21dc5f4daf35d Mon Sep 17 00:00:00 2001 From: Simone Gasparini Date: Wed, 13 Oct 2021 23:05:51 +0200 Subject: [PATCH 0809/1858] [CCTag] Update to v1.0.1 (#20603) * [cctag] fix find cuda * [cctag] upgrade to 1.0.1 * [cctag] migrating to new vcpkg_cmake_* functions * [cctag] update baseline and version --- ports/cctag/portfile.cmake | 15 +++++++-------- ports/cctag/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/c-/cctag.json | 5 +++++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ports/cctag/portfile.cmake b/ports/cctag/portfile.cmake index 36cf48c04c4950..a217d98f7c6520 100644 --- a/ports/cctag/portfile.cmake +++ b/ports/cctag/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alicevision/cctag - REF v1.0.0 - SHA512 49028356215dd703727b2eedd6aa72d81af84e5ca36f8dc7e9caf85a85c7f500b3eeaaa7369314a40049a72593d70049b709b453c30ff352d98ab0dea3afef76 + REF v1.0.1 + SHA512 94992141094162d44cf45ad85324517638bf794d693c6a059d6ba5d5ccbedea4f98664a0cc49ebca78f85d2860b637dfcb9d5315114493643a6c7f8fabab3073 HEAD_REF develop ) @@ -13,21 +13,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS ) if("cuda" IN_LIST FEATURES) - include(${CURRENT_INSTALLED_DIR}/share/vcpkg_find_cuda/vcpkg_find_cuda.cmake) + include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT) message(STATUS "CUDA_TOOLKIT_ROOT ${CUDA_TOOLKIT_ROOT}") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCCTAG_BUILD_TESTS:BOOL=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CCTag) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CCTag) vcpkg_copy_pdbs() diff --git a/ports/cctag/vcpkg.json b/ports/cctag/vcpkg.json index b90383fc79d1ed..37d3e6460952d1 100644 --- a/ports/cctag/vcpkg.json +++ b/ports/cctag/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cctag", - "version-semver": "1.0.0", + "version-semver": "1.0.1", "maintainers": "alicevision-team@googlegroups.com", "description": "Computer vision library for detecting CCTag markers made up of concentric circles", "homepage": "https://github.com/alicevision/CCTag", @@ -32,7 +32,15 @@ "boost-unordered", "eigen3", "opencv3", - "tbb" + "tbb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "apps": { diff --git a/versions/baseline.json b/versions/baseline.json index 8ed97446984cfa..79dae143f8150d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1249,7 +1249,7 @@ "port-version": 8 }, "cctag": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "cctz": { diff --git a/versions/c-/cctag.json b/versions/c-/cctag.json index fafc644be20c20..fd2de346b08e94 100644 --- a/versions/c-/cctag.json +++ b/versions/c-/cctag.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffcc7bde96142c2bc54827e3a2280accc592452e", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "8abc2227c7e5fc5232f928d407d5dac772afb48b", "version-semver": "1.0.0", From c50dc35beaa1290ef713d314cc9438cd02e12f33 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 13 Oct 2021 23:08:56 +0200 Subject: [PATCH 0810/1858] [tinyspline] Update to 0.3.0 (#20608) * Update tinyspline to 0.3.0 * Update CI baseline * Fixes * Update git-tree hash * Fix lib output folder on 64-bit architectures * Update git-tree hash * Add homepage * Update git-tree hash Co-authored-by: chausner --- .../001-do-not-treat-warnings-as-errors.patch | 18 ------------ ports/tinyspline/portfile.cmake | 29 +++++++++++-------- ports/tinyspline/vcpkg.json | 16 ++++++++-- versions/baseline.json | 4 +-- versions/t-/tinyspline.json | 5 ++++ 5 files changed, 37 insertions(+), 35 deletions(-) delete mode 100644 ports/tinyspline/001-do-not-treat-warnings-as-errors.patch diff --git a/ports/tinyspline/001-do-not-treat-warnings-as-errors.patch b/ports/tinyspline/001-do-not-treat-warnings-as-errors.patch deleted file mode 100644 index 576174891bcd7d..00000000000000 --- a/ports/tinyspline/001-do-not-treat-warnings-as-errors.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 02dfb83..52f5125 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -386,11 +386,11 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - - # TINYSPLINE_LIBRARY_C_FLAGS - set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /Wall") -- set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX") -+ # set(TINYSPLINE_LIBRARY_C_FLAGS "${TINYSPLINE_LIBRARY_C_FLAGS} /WX") - - # TINYSPLINE_LIBRARY_CXX_FLAGS - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /Wall") -- set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /WX") -+ # set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /WX") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4514") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4710") - set(TINYSPLINE_LIBRARY_CXX_FLAGS "${TINYSPLINE_LIBRARY_CXX_FLAGS} /wd4350") diff --git a/ports/tinyspline/portfile.cmake b/ports/tinyspline/portfile.cmake index a62d2f42c4427e..1bf5180b3ee003 100644 --- a/ports/tinyspline/portfile.cmake +++ b/ports/tinyspline/portfile.cmake @@ -1,25 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO msteinbeck/tinyspline - REF 0.2.0 - SHA512 50cf4927b311eeca6de7954f1b8d585cbf71355f5e5b0aac2f92f5f4ba37986df16eb3251f94a2304d27dab27d4f6b838b410f53e30de28bab53facf194eb640 + REF v0.3.0 + SHA512 9B02ACA5C56341E8DDC057E2AEB78632695DAC3A4D2C628A43028E4216FC79942F68DD3105B1B92ACAE0D009109C56EC437AB638FB7334EBDD68543BE2D8D7F6 HEAD_REF master - PATCHES - "001-do-not-treat-warnings-as-errors.patch" ) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DTINYSPLINE_BUILD_EXAMPLES=OFF + -DTINYSPLINE_BUILD_TESTS=OFF + -DTINYSPLINE_BUILD_DOCS=OFF + -DTINYSPLINE_WARNINGS_AS_ERRORS=OFF + -DTINYSPLINE_INSTALL_LIBRARY_DIR=lib ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinyspline DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tinysplinecxx) +vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyspline/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tinyspline/vcpkg.json b/ports/tinyspline/vcpkg.json index bd01f70b978f85..91ed149d618c6a 100644 --- a/ports/tinyspline/vcpkg.json +++ b/ports/tinyspline/vcpkg.json @@ -1,6 +1,16 @@ { "name": "tinyspline", - "version-string": "0.2.0", - "port-version": 4, - "description": "Library for NURBS, B-Splines, and B?zier curves, allowing you to handle splines with ease" + "version": "0.3.0", + "description": "Library for NURBS, B-Splines, and Bézier curves, allowing you to handle splines with ease", + "homepage": "https://github.com/msteinbeck/tinyspline", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 79dae143f8150d..dcda89aac6151e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6657,8 +6657,8 @@ "port-version": 1 }, "tinyspline": { - "baseline": "0.2.0", - "port-version": 4 + "baseline": "0.3.0", + "port-version": 0 }, "tinythread": { "baseline": "1.1", diff --git a/versions/t-/tinyspline.json b/versions/t-/tinyspline.json index 5958c4062b5905..0b3978c2b21b41 100644 --- a/versions/t-/tinyspline.json +++ b/versions/t-/tinyspline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e3b92c86bcbdd44171e07b3421d56f07e302fe4", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "393f891a892f72ee95dde573dbc6ec87992e564a", "version-string": "0.2.0", From 3bc033addbc8f1e4f6b24d195cb70779f47c2693 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 13 Oct 2021 23:10:44 +0200 Subject: [PATCH 0811/1858] [libsass] Update to 3.6.5 (#20628) * Update libsass to 3.6.5 * Update CI baseline * Add vcpkg_fail_port_install for UWP Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update git-tree hash * Add back vcpkg_copy_pdbs * Update git-tree hash Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/libsass/portfile.cmake | 14 ++++++-------- ports/libsass/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libsass.json | 5 +++++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ports/libsass/portfile.cmake b/ports/libsass/portfile.cmake index 09b2282371fc74..9195b45628ad64 100644 --- a/ports/libsass/portfile.cmake +++ b/ports/libsass/portfile.cmake @@ -1,22 +1,20 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sass/libsass - REF 8d312a1c91bb7dd22883ebdfc829003f75a82396 # 3.6.4 - SHA512 41e532c081804c889c3e7f9169bd90d7fc944d13817d5e3a4f8c19608ebb630db2b2b0e9c61a59a2446076f4093d5ec4cb4f767aa06fa0bf0f0687094e1a2913 + REF 3.6.5 + SHA512 98CC7E12FDF74CD9E92D8D4A62B821956D3AD186FCEE9A8D77B677A621342AA161B73D9ADAD4C1849678A3BAC890443120CC8FEBE1B7429AAB374321D635B8F7 HEAD_REF master PATCHES remove_compiler_flags.patch ) vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG - OPTIONS - ) vcpkg_install_make(MAKEFILE GNUmakefile) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsass/vcpkg.json b/ports/libsass/vcpkg.json index a67da017e96bc3..1b7f9e1ce8c3ff 100644 --- a/ports/libsass/vcpkg.json +++ b/ports/libsass/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsass", - "version-string": "3.6.4", - "port-version": 1, + "version": "3.6.5", "description": "LibSass - Sass compiler written in C++", "homepage": "https://github.com/sass/libsass", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index dcda89aac6151e..d3a80c3952abd5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3765,8 +3765,8 @@ "port-version": 0 }, "libsass": { - "baseline": "3.6.4", - "port-version": 1 + "baseline": "3.6.5", + "port-version": 0 }, "libsbml": { "baseline": "5.19.0", diff --git a/versions/l-/libsass.json b/versions/l-/libsass.json index 40ee99dd8e19d5..1e5b38e6cef095 100644 --- a/versions/l-/libsass.json +++ b/versions/l-/libsass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6568e763bc2718b27a5dc2d3d1db4d3cf651572", + "version": "3.6.5", + "port-version": 0 + }, { "git-tree": "124a73deb4e0b7677411ab0285b70013c26782c8", "version-string": "3.6.4", From 87587df380994007fe232d8f58be65bdc923ac12 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 13 Oct 2021 23:17:25 +0200 Subject: [PATCH 0812/1858] [libsrt] Update to 1.4.4 (#20641) * Update libsrt to 1.4.4 * Update CI baseline Co-authored-by: chausner --- ports/libsrt/fix-dependency-install.patch | 50 ++++------------------- ports/libsrt/portfile.cmake | 23 +++++------ ports/libsrt/vcpkg.json | 8 ++-- versions/baseline.json | 4 +- versions/l-/libsrt.json | 5 +++ 5 files changed, 29 insertions(+), 61 deletions(-) diff --git a/ports/libsrt/fix-dependency-install.patch b/ports/libsrt/fix-dependency-install.patch index 12967e6bec68c8..a81ae4561d7eb5 100644 --- a/ports/libsrt/fix-dependency-install.patch +++ b/ports/libsrt/fix-dependency-install.patch @@ -1,36 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index ec91d08..f19d28d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -234,6 +234,10 @@ if (ENABLE_ENCRYPTION) - # fall back to find_package method otherwise - if (USE_OPENSSL_PC) - pkg_check_modules(SSL ${SSL_REQUIRED_MODULES}) -+ else() -+ find_package(OpenSSL REQUIRED) -+ set(SSL_FOUND ${OpenSSL_FOUND}) -+ set(SSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) - endif() - if (SSL_FOUND) - # We have some cases when pkg-config is improperly configured -@@ -438,7 +442,7 @@ elseif (WIN32 AND NOT MINGW) - message(FATAL_ERROR "Failed to find pthread.h. Specify PTHREAD_INCLUDE_DIR.") - endif() - -- find_library(PTHREAD_LIBRARY NAMES pthread pthread_dll pthread_lib HINTS C:/pthread-win32/lib C:/pthread-win64/lib) -+ find_library(PTHREAD_LIBRARY NAMES pthreadVC3 REQUIRED) - if (PTHREAD_LIBRARY) - message(STATUS "Pthread library: ${PTHREAD_LIBRARY}") - else() -@@ -637,6 +641,7 @@ if (ENABLE_SHARED) - target_compile_definitions(srt_virtual PUBLIC -DSRT_DYNAMIC) - target_compile_definitions(haicrypt_virtual PRIVATE -DHAICRYPT_EXPORTS) - endif() -+target_link_libraries(haicrypt_virtual PRIVATE ${SSL_LIBRARIES}) - - if (srt_libspec_shared) - if (MICROSOFT) -@@ -650,6 +655,7 @@ set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_LIBDIR}) +@@ -1008,6 +1008,7 @@ set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_LIBDIR}) if (CYGWIN) set (INSTALL_SHARED_DIR ${CMAKE_INSTALL_BINDIR}) endif() @@ -38,16 +9,16 @@ index ec91d08..f19d28d 100644 message(STATUS "INSTALL DIRS: bin=${CMAKE_INSTALL_BINDIR} lib=${CMAKE_INSTALL_LIBDIR} shlib=${INSTALL_SHARED_DIR} include=${CMAKE_INSTALL_INCLUDEDIR}") -@@ -730,7 +736,7 @@ macro(srt_add_program name) - add_executable(${name} ${ARGN}) - target_include_directories(${name} PRIVATE apps) - target_include_directories(${name} PRIVATE common) +@@ -1085,7 +1085,7 @@ + + macro(srt_add_program name) + srt_add_program_dont_install(${name} ${ARGN}) - install(TARGETS ${name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS ${name} RUNTIME DESTINATION tools) endmacro() macro(srt_make_application name) -@@ -769,7 +775,7 @@ endmacro() +@@ -1124,7 +1124,7 @@ endmacro() macro(srt_add_application name) # ARGN=sources... srt_add_program(${name} apps/${name}.cpp ${ARGN}) srt_make_application(${name}) @@ -56,7 +27,7 @@ index ec91d08..f19d28d 100644 endmacro() ## FIXME: transmitmedia.cpp does not build on OpenBSD -@@ -923,7 +929,7 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11) +@@ -1324,7 +1324,7 @@ if (ENABLE_UNITTESTS AND ENABLE_CXX11) endif() @@ -65,10 +36,3 @@ index ec91d08..f19d28d 100644 if (DEFINED SRT_EXTRA_APPS_INC) -@@ -939,5 +945,5 @@ if ( ENABLE_SUFLIP ) - ) - srt_add_program(suflip ${SOURCES_suflip}) - target_link_libraries(suflip ${srt_link_library}) -- install(TARGETS suflip RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS suflip RUNTIME DESTINATION tools) - endif () diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index d18551ea8a21e1..5e806994b6ec16 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Haivision/srt - REF v1.3.4 - SHA512 3a9f9a8fd8ba56ae9ca04203bdea9e9a25275e1f531ca10deee0e760e6beaf44e83ee7a616cfe3ade9676082d9cc8611214de876f64d141e1e8c3b1e16273001 + REF v1.4.4 + SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA HEAD_REF master PATCHES fix-dependency-install.patch ) @@ -17,25 +17,24 @@ else() set(BUILD_STATIC ON) endif() -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tool ENABLE_APPS +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tool ENABLE_APPS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DENABLE_SHARED=${BUILD_DYNAMIC} -DENABLE_STATIC=${BUILD_STATIC} - -DINSTALL_DOCS=ON - -DINSTALL_PKG_CONFIG_MODULE=ON - -DENABLE_SUFLIP=OFF # Since there are some file not found, disable this feature -DENABLE_UNITTESTS=OFF -DUSE_OPENSSL_PC=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index 16d20929af47e5..6ca30d7db8873f 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,14 +1,14 @@ { "name": "libsrt", - "version-string": "1.3.4", - "port-version": 1, + "version": "1.4.4", "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", + "supports": "!uwp", "dependencies": [ "openssl", { - "name": "pthreads", - "platform": "windows" + "name": "vcpkg-cmake", + "host": true } ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index d3a80c3952abd5..8f8869151e892d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3821,8 +3821,8 @@ "port-version": 9 }, "libsrt": { - "baseline": "1.3.4", - "port-version": 1 + "baseline": "1.4.4", + "port-version": 0 }, "libsrtp": { "baseline": "2.4.2", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index be907099a9e105..4b2c1dca1f45e6 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8187d1dc57e7d3632bdabee7516a94e0ab2a0afb", + "version": "1.4.4", + "port-version": 0 + }, { "git-tree": "9e446dfb7ecd2ec36c5b960c00bbc8ac9da43673", "version-string": "1.3.4", From bf5957984416de7038c2afa92d96277633287b99 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 13 Oct 2021 23:34:08 +0200 Subject: [PATCH 0813/1858] [tiff] Fix find_package in cmake wrapper (#18473) * Revise tiff cmake wrapper * x-add-version * Use variables from vcpkg_check_features * x-add-version * Set CMP0012 to allow 'if(ON)' * x-add-version * Restore early call to _find_package * Move wrapper vars to z_vcpkg namespace * Use more common conditional dependency configuration * Don't touch TIFF_LIBRARY * Pass on QUIET option * Update versions --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 99 ++++++++++++++----------- ports/tiff/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tiff.json | 5 ++ 4 files changed, 62 insertions(+), 46 deletions(-) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index cd356483a7d0a7..b722944ea1dc9f 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -1,49 +1,60 @@ -_find_package(${ARGS}) - -set(_tiff_features ";@FEATURES@;") -set(_tiff_link_libraries "") -set(_tiff_libraries "") -if(_tiff_features MATCHES ";webp;") - find_package(WebP CONFIG REQUIRED) - list(APPEND _tiff_link_libraries WebP::WebP) - list(APPEND _tiff_libraries ${WEBP_LIBRARIES}) -endif() -if(_tiff_features MATCHES ";lzma;") - find_package(LibLZMA CONFIG REQUIRED) - list(APPEND _tiff_link_libraries LibLZMA::LibLZMA) - list(APPEND _tiff_libraries ${LZMA_LIBRARIES}) +cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) +cmake_policy(SET CMP0057 NEW) +set(z_vcpkg_tiff_find_options "") +if("REQUIRED" IN_LIST ARGS) + list(APPEND z_vcpkg_tiff_find_options "REQUIRED") endif() -if(_tiff_features MATCHES ";jpeg;") - find_package(JPEG REQUIRED) - list(APPEND _tiff_link_libraries JPEG::JPEG) - list(APPEND _tiff_libraries ${JPEG_LIBRARIES}) +if("QUIET" IN_LIST ARGS) + list(APPEND z_vcpkg_tiff_find_options "QUIET") endif() -if(_tiff_features MATCHES ";zstd;") - find_package(ZSTD CONFIG REQUIRED) - if(TARGET zstd::libzstd_shared) - set(_tiff_zstd zstd::libzstd_shared) - else() - set(_tiff_zstd zstd::libzstd_static) + +_find_package(${ARGS}) + +if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(z_vcpkg_tiff_link_libraries "") + set(z_vcpkg_tiff_libraries "") + if(@webp@) + find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP) + list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) + endif() + if(@lzma@) + find_package(LibLZMA CONFIG ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA) + list(APPEND z_vcpkg_tiff_libraries ${LZMA_LIBRARIES}) + endif() + if(@jpeg@) + find_package(JPEG ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries JPEG::JPEG) + list(APPEND z_vcpkg_tiff_libraries ${JPEG_LIBRARIES}) + endif() + if(@zstd@) + find_package(ZSTD CONFIG ${z_vcpkg_tiff_find_options}) + if(TARGET zstd::libzstd_shared) + set(z_vcpkg_tiff_zstd zstd::libzstd_shared) + else() + set(z_vcpkg_tiff_zstd zstd::libzstd_static) + endif() + list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd}) + list(APPEND z_vcpkg_tiff_libraries ${z_vcpkg_tiff_zstd}) + endif() + if(@zlib@) + find_package(ZLIB ${z_vcpkg_tiff_find_options}) + list(APPEND z_vcpkg_tiff_link_libraries ZLIB::ZLIB) + list(APPEND z_vcpkg_tiff_libraries ${ZLIB_LIBRARIES}) + endif() + if(UNIX) + list(APPEND z_vcpkg_tiff_link_libraries m) + list(APPEND z_vcpkg_tiff_libraries m) endif() - list(APPEND _tiff_link_libraries ${_tiff_zstd}) - list(APPEND _tiff_libraries ${_tiff_zstd}) -endif() -if(_tiff_features MATCHES ";zip;") - find_package(ZLIB REQUIRED) - list(APPEND _tiff_link_libraries ZLIB::ZLIB) - list(APPEND _tiff_libraries ${ZLIB_LIBRARIES}) -endif() -if(UNIX) - list(APPEND _tiff_link_libraries m) - list(APPEND _tiff_libraries m) -endif() -if(TARGET TIFF::TIFF) - set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${_tiff_link_libraries}) -endif() -if(TIFF_LIBRARIES) - list(APPEND TIFF_LIBRARIES ${_tiff_libraries}) -endif() -if(TIFF_LIBRARY) - list(APPEND TIFF_LIBRARY ${_tiff_libraries}) + if(TARGET TIFF::TIFF) + set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_link_libraries}) + endif() + list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries}) + unset(z_vcpkg_tiff_link_libraries) + unset(z_vcpkg_tiff_libraries) endif() +unset(z_vcpkg_tiff_find_options) +cmake_policy(POP) diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index f31b99cdce643e..764fcf55dec36c 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", "version": "4.3.0", - "port-version": 1, + "port-version": 2, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8f8869151e892d..d759b6c875d9c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6590,7 +6590,7 @@ }, "tiff": { "baseline": "4.3.0", - "port-version": 1 + "port-version": 2 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index fb7ecc60db664c..29367b7306d910 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f147253c84ad1d911393d8b5496f30574a07c780", + "version": "4.3.0", + "port-version": 2 + }, { "git-tree": "c8d1b0803b30c4fd2ea762d62b8d43cd09ff40f0", "version": "4.3.0", From 7ef62e96a226a6a23f4de6bcf773f5e4094326e6 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 13 Oct 2021 23:39:39 +0200 Subject: [PATCH 0814/1858] [fastrtps] Update to 2.4.0 (#20645) * Update fastrtps to 2.4.0 * Update CI baseline * Fix installation of fast-discovery-server.exe tool * Update git-tree hash * Another fix * Update git-tree hash * Use vcpkg_replace_string Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Fix indentation * Update git-tree hash * Remove double quotes * update version * Disable symlinks * Update git-tree hash Co-authored-by: chausner Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/fastrtps/disable-symlink.patch | 16 ++++++ ports/fastrtps/fix-find-package-asio.patch | 12 ++++ ports/fastrtps/portfile.cmake | 67 ++++++++++++++++++---- ports/fastrtps/vcpkg.json | 13 ++++- versions/baseline.json | 4 +- versions/f-/fastrtps.json | 5 ++ 6 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 ports/fastrtps/disable-symlink.patch create mode 100644 ports/fastrtps/fix-find-package-asio.patch diff --git a/ports/fastrtps/disable-symlink.patch b/ports/fastrtps/disable-symlink.patch new file mode 100644 index 00000000000000..a35558a19b1497 --- /dev/null +++ b/ports/fastrtps/disable-symlink.patch @@ -0,0 +1,16 @@ +Normally, the build script attempts to create a symlink to fast-discovery-server on Windows +and only falls back to a batch file if the necessary administrator privileges are not available. +Since symlinks do not work well with vcpkg binary caching, +we force the build script to create a batch file in any case. +diff --git a/tools/fds/CMakeLists.txt b/tools/fds/CMakeLists.txt +--- a/tools/fds/CMakeLists.txt ++++ b/tools/fds/CMakeLists.txt +@@ -124,7 +124,7 @@ if(NOT BUILD_SHARED_LIBS) + if( WIN32 ) + # Use powershell to generate the link + install( +- CODE "execute_process( COMMAND PowerShell -Command \"if( test-path ${PROJECT_NAME}.exe -PathType Leaf ) { rm ${PROJECT_NAME}.exe } ; New-Item -ItemType SymbolicLink -Target $ -Path ${PROJECT_NAME}.exe \" ERROR_QUIET RESULTS_VARIABLE SYMLINK_FAILED WORKING_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}\") \n if( SYMLINK_FAILED ) \n message(STATUS \"Windows requires admin installation rights to create symlinks. A bat script will be provided instead.\") \n set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n endif()" ++ CODE "set(FAST_SERVER_BINARY_NAME $) \n configure_file(${CMAKE_CURRENT_LIST_DIR}/fast-discovery-server.bat.in ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}${MSVCARCH_DIR_EXTENSION}/${PROJECT_NAME}.bat @ONLY) \n" + COMPONENT discovery) + else() + # Use ln to create the symbolic link. We remove the version from the file name but keep the debug suffix diff --git a/ports/fastrtps/fix-find-package-asio.patch b/ports/fastrtps/fix-find-package-asio.patch new file mode 100644 index 00000000000000..4592311e2a55aa --- /dev/null +++ b/ports/fastrtps/fix-find-package-asio.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,7 +141,7 @@ if(NOT BUILD_SHARED_LIBS) + endif() + + eprosima_find_package(fastcdr REQUIRED) +-eprosima_find_thirdparty(Asio asio VERSION 1.10.8) ++find_package(asio CONFIG REQUIRED) + eprosima_find_thirdparty(TinyXML2 tinyxml2) + + find_package(foonathan_memory REQUIRED) diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 9f72b5d6f9cce4..48342bd53a2f97 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -1,22 +1,69 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eProsima/Fast-DDS - REF 40568fa4784e846f95c461608d43a2b57eaef55b # v2.0.1 - SHA512 a0cb48713a41ba3562c98dfc176508779e70e35b573428ac0a74c74254aa34c583bd545169f3a3961172bfc9e7bb14d08b5d56569e176fe8248d714bec5813a4 + REF v2.4.0 + SHA512 2E9C0378AF86DD657391D577F6951096DD45970A2C4D9C384EE5A452A1DD129E6E0AED91E0B908A35A04CAF979253700560561D34082DA81FE737FE104C149AF HEAD_REF master + PATCHES + fix-find-package-asio.patch + disable-symlink.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastrtps/cmake TARGET_PATH share/fastrtps) +vcpkg_cmake_config_fixup(CONFIG_PATH share/fastrtps/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +if(VCPKG_TARGET_IS_WINDOWS) + # copy tools from "bin" to "tools" folder + foreach(TOOL "fast-discovery-server-1.0.0.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") + endforeach() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + # remove tools from debug builds + foreach(TOOL "fast-discovery-serverd-1.0.0.exe" "fast-discovery-server.bat" "fastdds.bat" "ros-discovery.bat") + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}") + endif() + endforeach() + + # adjust paths in batch files + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fastdds.bat" "%dir%\\..\\tools\\fastdds\\fastdds.py" "%dir%\\..\\fastdds\\fastdds.py") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/ros-discovery.bat" "%dir%\\..\\tools\\fastdds\\fastdds.py" "%dir%\\..\\fastdds\\fastdds.py") + + vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") +elseif(VCPKG_TARGET_IS_LINUX) + # copy tools from "bin" to "tools" folder + foreach(TOOL "fast-discovery-server-1.0.0" "fast-discovery-server" "fastdds" "ros-discovery") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${TOOL}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${TOOL}") + endforeach() + + # replace symlink by a copy because symlinks do not work well together with vcpkg binary caching + file(REMOVE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fast-discovery-server") + file(INSTALL "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fast-discovery-server-1.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}" RENAME "fast-discovery-server") + + # remove tools from debug builds + foreach(TOOL "fast-discovery-serverd-1.0.0" "fast-discovery-server" "fastdds" "ros-discovery") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL}") + endforeach() + + # adjust paths in batch files + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fastdds" "$dir/../tools/fastdds/fastdds.py" "$dir/../fastdds/fastdds.py") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/ros-discovery" "$dir/../tools/fastdds/fastdds.py" "$dir/../fastdds/fastdds.py") +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fastrtps/vcpkg.json b/ports/fastrtps/vcpkg.json index c214822af39368..6c846645cb813e 100644 --- a/ports/fastrtps/vcpkg.json +++ b/ports/fastrtps/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fastrtps", - "version-string": "2.0.1", - "port-version": 1, + "version": "2.4.0", "description": "Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.", "homepage": "https://www.eprosima.com/", "dependencies": [ @@ -9,6 +8,14 @@ "fastcdr", "foonathan-memory", "openssl", - "tinyxml2" + "tinyxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index d759b6c875d9c1..3666faf8b35f0d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2081,8 +2081,8 @@ "port-version": 0 }, "fastrtps": { - "baseline": "2.0.1", - "port-version": 1 + "baseline": "2.4.0", + "port-version": 0 }, "fbgemm": { "baseline": "2021-03-18", diff --git a/versions/f-/fastrtps.json b/versions/f-/fastrtps.json index f137e607c7549d..c8285d3e1e1fad 100644 --- a/versions/f-/fastrtps.json +++ b/versions/f-/fastrtps.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54873b953029cdd41ffee26b13af0c661de41462", + "version": "2.4.0", + "port-version": 0 + }, { "git-tree": "d48d4af7b7082b1a162b136643f6d51dd5b8beba", "version-string": "2.0.1", From c57eabee35f22647b8e69c69b69d03715b34fcb3 Mon Sep 17 00:00:00 2001 From: Alvin Date: Thu, 14 Oct 2021 05:41:13 +0800 Subject: [PATCH 0815/1858] Add a patch for co v2.0.2 (#20657) * add a patch for co v2.0.2 * update port version * update version * version Co-authored-by: JackBoosY --- ports/co/fix-event-destruct.patch | 13 +++++++++++++ ports/co/portfile.cmake | 1 + ports/co/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/co.json | 5 +++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/co/fix-event-destruct.patch diff --git a/ports/co/fix-event-destruct.patch b/ports/co/fix-event-destruct.patch new file mode 100644 index 00000000000000..b5abc57e78c116 --- /dev/null +++ b/ports/co/fix-event-destruct.patch @@ -0,0 +1,13 @@ +diff --git a/src/co/co.cc b/src/co/co.cc +index 8921296..838ac16 100644 +--- a/src/co/co.cc ++++ b/src/co/co.cc +@@ -8,7 +8,7 @@ namespace co { + class EventImpl { + public: + EventImpl() : _counter(0), _signaled(false), _has_cond(false) {} +- ~EventImpl() { co::xx::cond_destroy(&_cond); } ++ ~EventImpl() { if (_has_cond) co::xx::cond_destroy(&_cond); } + + bool wait(uint32 ms); + diff --git a/ports/co/portfile.cmake b/ports/co/portfile.cmake index 08ed5d4a347cf2..9e7dd7e1996c36 100644 --- a/ports/co/portfile.cmake +++ b/ports/co/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( HEAD_REF master PATCHES install-dll.patch + fix-event-destruct.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) diff --git a/ports/co/vcpkg.json b/ports/co/vcpkg.json index 1fcc2b0dce38cb..e9f94ed5f75f0e 100644 --- a/ports/co/vcpkg.json +++ b/ports/co/vcpkg.json @@ -1,6 +1,7 @@ { "name": "co", "version-semver": "2.0.2", + "port-version": 1, "description": "A go-style coroutine library in C++11 and more", "homepage": "https://github.com/idealvin/co", "supports": "!uwp & !(arm & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index 3666faf8b35f0d..6197f1366cb578 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1422,7 +1422,7 @@ }, "co": { "baseline": "2.0.2", - "port-version": 0 + "port-version": 1 }, "coin": { "baseline": "4.0.0", diff --git a/versions/c-/co.json b/versions/c-/co.json index 889b6bb11beefb..b11d5ac76b2f75 100644 --- a/versions/c-/co.json +++ b/versions/c-/co.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2b668ad241e0a4453f7a4f0a7c0b35e8c922e3b", + "version-semver": "2.0.2", + "port-version": 1 + }, { "git-tree": "2b21d0aa5397dedda9219671af687afacab91a6c", "version-semver": "2.0.2", From 6bde0a2dc1a3df7464efd47ec02e8d9768254ace Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 14 Oct 2021 05:41:53 +0800 Subject: [PATCH 0816/1858] [nanodbc] Add missing include (#20668) --- ports/nanodbc/add-missing-include.patch | 12 ++++++++++++ ports/nanodbc/portfile.cmake | 19 ++++++++++--------- ports/nanodbc/vcpkg.json | 10 +++++++++- versions/baseline.json | 2 +- versions/n-/nanodbc.json | 5 +++++ 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 ports/nanodbc/add-missing-include.patch diff --git a/ports/nanodbc/add-missing-include.patch b/ports/nanodbc/add-missing-include.patch new file mode 100644 index 00000000000000..2841c7d96b4010 --- /dev/null +++ b/ports/nanodbc/add-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/nanodbc/nanodbc.cpp b/nanodbc/nanodbc.cpp +index e6ca73f..3ad724a 100644 +--- a/nanodbc/nanodbc.cpp ++++ b/nanodbc/nanodbc.cpp +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index dfdba7caa9ff2e..7397bc75bb1e9c 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -8,7 +8,9 @@ vcpkg_from_github( REF 7404a4dd7697e188df5724ab95a7553d2fc404eb # v2.13.0 SHA512 35ca098e783d771f3df611bce84e9b8207a6a5b72c492d2f3909977bc91a7c22bb262c34768b0d97ebfbdf12eeda0214064a8ea171e7bdda7b759f93ff346f45 HEAD_REF master - PATCHES rename-version.patch + PATCHES + rename-version.patch + add-missing-include.patch ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") @@ -16,9 +18,8 @@ if(DEFINED NANODBC_ODBC_VERSION) set(NANODBC_ODBC_VERSION -DNANODBC_ODBC_VERSION=${NANODBC_ODBC_VERSION}) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DNANODBC_DISABLE_EXAMPLES=ON -DNANODBC_DISABLE_TESTS=ON @@ -26,13 +27,13 @@ vcpkg_configure_cmake( ${NANODBC_ODBC_VERSION} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/nanodbc/vcpkg.json b/ports/nanodbc/vcpkg.json index d577f7e8afd38a..bc62f207d11846 100644 --- a/ports/nanodbc/vcpkg.json +++ b/ports/nanodbc/vcpkg.json @@ -1,13 +1,21 @@ { "name": "nanodbc", "version": "2.13.0", - "port-version": 4, + "port-version": 5, "description": "A small C++ wrapper for the native C ODBC API.", "homepage": "https://github.com/nanodbc/nanodbc", "dependencies": [ { "name": "unixodbc", "platform": "!windows" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6197f1366cb578..ca710e4a78e6a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4506,7 +4506,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 4 + "port-version": 5 }, "nanoflann": { "baseline": "1.3.2", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index 28b825696bbe19..163962a437d25d 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82bfc56de1430aa6fec9c27925d46a72e1b800a0", + "version": "2.13.0", + "port-version": 5 + }, { "git-tree": "3549b9a15615f77ec718e9071309482707ad3779", "version": "2.13.0", From 0a98c56a696f3470c28cf8982ffa266c74642836 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 13 Oct 2021 23:45:37 +0200 Subject: [PATCH 0817/1858] [tcl] make it possible to uninstall tcl (#20675) --- ports/tcl/portfile.cmake | 8 ++++++++ ports/tcl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tcl.json | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ports/tcl/portfile.cmake b/ports/tcl/portfile.cmake index 7dbfe7b271545e..146682d26259e2 100644 --- a/ports/tcl/portfile.cmake +++ b/ports/tcl/portfile.cmake @@ -120,6 +120,14 @@ if (VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(CHMOD_RECURSE + "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/msgs" "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/tzdata" + "${CURRENT_PACKAGES_DIR}/tools/tcl/lib/tcl9.0/msgs" "${CURRENT_PACKAGES_DIR}/tools/tcl/lib/tcl9.0/tzdata" + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ GROUP_WRITE + WORLD_READ WORLD_WRITE + ) else() file(REMOVE "${SOURCE_PATH}/unix/configure") vcpkg_configure_make( diff --git a/ports/tcl/vcpkg.json b/ports/tcl/vcpkg.json index c4f28240fdb9c7..4449957408ab0c 100644 --- a/ports/tcl/vcpkg.json +++ b/ports/tcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tcl", "version-string": "core-9-0-a1", - "port-version": 2, + "port-version": 3, "description": "Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.", "homepage": "https://github.com/tcltk/tcl", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index ca710e4a78e6a1..9316987a6b5f7b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6510,7 +6510,7 @@ }, "tcl": { "baseline": "core-9-0-a1", - "port-version": 2 + "port-version": 3 }, "tclap": { "baseline": "1.2.2", diff --git a/versions/t-/tcl.json b/versions/t-/tcl.json index 39889c3789f155..3933fe028ac4e8 100644 --- a/versions/t-/tcl.json +++ b/versions/t-/tcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "178e263715acedbd584a7390566df8f6e75e5a9c", + "version-string": "core-9-0-a1", + "port-version": 3 + }, { "git-tree": "b1307e2d115e01cedde54662115ff363e46b6fe5", "version-string": "core-9-0-a1", From 847d817ea68280906a926a74f324a4683c8a8910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 13 Oct 2021 23:47:17 +0200 Subject: [PATCH 0818/1858] [imgui] Update to 1.85 (#20679) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [imgui] Update to 1.85 * [imgui] Update version files * [imgui] Replace deprecated vcpkg functions * [imgui] Update version files Co-authored-by: Rémy Tassoux --- ports/imgui/CMakeLists.txt | 10 ++++++++++ ports/imgui/imgui-config.cmake.in | 2 +- ports/imgui/portfile.cmake | 16 ++++++++-------- ports/imgui/vcpkg.json | 19 +++++++++++++++++-- versions/baseline.json | 4 ++-- versions/i-/imgui.json | 5 +++++ 6 files changed, 43 insertions(+), 13 deletions(-) diff --git a/ports/imgui/CMakeLists.txt b/ports/imgui/CMakeLists.txt index 61f9cb8ee510a3..b8c8dacf94efc0 100644 --- a/ports/imgui/CMakeLists.txt +++ b/ports/imgui/CMakeLists.txt @@ -85,6 +85,12 @@ if(IMGUI_BUILD_SDL2_BINDING) target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.cpp) endif() +if(IMGUI_BUILD_SDL2_RENDERER_BINDING) + find_package(SDL2 CONFIG REQUIRED) + target_link_libraries(${PROJECT_NAME} PUBLIC SDL2::SDL2) + target_sources(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.cpp) +endif() + if(IMGUI_BUILD_VULKAN_BINDING) find_package(Vulkan REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC Vulkan::Vulkan) @@ -197,6 +203,10 @@ if(NOT IMGUI_SKIP_HEADERS) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdl.h DESTINATION include) endif() + if(IMGUI_BUILD_SDL2_RENDERER_BINDING) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_sdlrenderer.h DESTINATION include) + endif() + if(IMGUI_BUILD_VULKAN_BINDING) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/backends/imgui_impl_vulkan.h DESTINATION include) endif() diff --git a/ports/imgui/imgui-config.cmake.in b/ports/imgui/imgui-config.cmake.in index d2bdfbdaa21eb7..1ea694a10beb46 100644 --- a/ports/imgui/imgui-config.cmake.in +++ b/ports/imgui/imgui-config.cmake.in @@ -12,7 +12,7 @@ if (@IMGUI_BUILD_GLUT_BINDING@) find_dependency(GLUT) endif() -if (@IMGUI_BUILD_SDL2_BINDING@) +if (@IMGUI_BUILD_SDL2_BINDING@ OR @IMGUI_BUILD_SDL2_RENDERER_BINDING@) find_dependency(SDL2 CONFIG) endif() diff --git a/ports/imgui/portfile.cmake b/ports/imgui/portfile.cmake index 45add6cc0f6ead..12fcbb7863838d 100644 --- a/ports/imgui/portfile.cmake +++ b/ports/imgui/portfile.cmake @@ -4,16 +4,16 @@ if ("docking-experimental" IN_LIST FEATURES) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF dedb381c510cc0b87164e16b9e7ef6bf50ffccec - SHA512 0b331cbf81fed15cdceb84ccf1962b5db19af1b6dc75a19460810919b7f61088a9ba46acf3e6fcadfda6297204b03f1be0ab08fa427f89e504d70be8da1f2281 + REF 1b215ecb018ba0fd170618366ddc4be9bd45f283 + SHA512 afd79082c4439b47d5943df5f7ddbdf80dcf23cd120b8da99b67b2979728e604436dd656ef8e8ae0af2a9050f8ea56b2f8c109243326fb842d684027616843e7 HEAD_REF docking ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ocornut/imgui - REF v1.84.2 - SHA512 ea62d03ffc4c8d3dbc6be0076fb93158d464f4f02e88028c2bc64768f72e3117297854816bb7a776bd750c003013fe1d2871a1b505d04dd0922dfb2f214dd0a3 + REF v1.85 + SHA512 830ff36681a661d77754fb7818bb13cc63da58a293d343a8d6847a586f00c6e0bfc3ffe51cdf882849e5083d4ddca52cdbdc1b3abc9b794a96f89ae7628f1fc2 HEAD_REF master ) endif() @@ -40,6 +40,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS opengl3-binding IMGUI_BUILD_OPENGL3_BINDING osx-binding IMGUI_BUILD_OSX_BINDING sdl2-binding IMGUI_BUILD_SDL2_BINDING + sdl2-renderer-binding IMGUI_BUILD_SDL2_RENDERER_BINDING vulkan-binding IMGUI_BUILD_VULKAN_BINDING win32-binding IMGUI_BUILD_WIN32_BINDING freetype IMGUI_FREETYPE @@ -59,9 +60,8 @@ if ("libigl-imgui" IN_LIST FEATURES) file(INSTALL ${IMGUI_FONTS_DROID_SANS_H} DESTINATION ${CURRENT_PACKAGES_DIR}/include) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} OPTIONS_DEBUG @@ -70,7 +70,7 @@ vcpkg_configure_cmake( IMGUI_COPY_MARMALADE_BINDING ) -vcpkg_install_cmake() +vcpkg_cmake_install() if ("freetype" IN_LIST FEATURES) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/imconfig.h" "//#define IMGUI_ENABLE_FREETYPE" "#define IMGUI_ENABLE_FREETYPE") @@ -80,6 +80,6 @@ if ("wchar32" IN_LIST FEATURES) endif() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/imgui/vcpkg.json b/ports/imgui/vcpkg.json index c41b330b944437..c926875959e4d6 100644 --- a/ports/imgui/vcpkg.json +++ b/ports/imgui/vcpkg.json @@ -1,9 +1,18 @@ { "name": "imgui", - "version": "1.84.2", - "port-version": 1, + "version": "1.85", "description": "Bloat-free Immediate Mode Graphical User interface for C++ with minimal dependencies.", "homepage": "https://github.com/ocornut/imgui", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "allegro5-binding": { "description": "Make available Allegro5 binding", @@ -68,6 +77,12 @@ "sdl2" ] }, + "sdl2-renderer-binding": { + "description": "Make available SDL2 Renderer binding", + "dependencies": [ + "sdl2" + ] + }, "vulkan-binding": { "description": "Make available Vulkan binding", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9316987a6b5f7b..e8caa34e893e0b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2789,8 +2789,8 @@ "port-version": 1 }, "imgui": { - "baseline": "1.84.2", - "port-version": 1 + "baseline": "1.85", + "port-version": 0 }, "imgui-sfml": { "baseline": "2.1", diff --git a/versions/i-/imgui.json b/versions/i-/imgui.json index 7ca2d71226f743..9f0a13f236f4b1 100644 --- a/versions/i-/imgui.json +++ b/versions/i-/imgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9ae62261d966705924645bc3a057fe748c24d290", + "version": "1.85", + "port-version": 0 + }, { "git-tree": "0d0f402c97029e9c2021ca776e2bebc645cc5ecc", "version": "1.84.2", From ee84e4ea199ac0dd8de755cd02bae935210bf9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Wed, 13 Oct 2021 23:48:09 +0200 Subject: [PATCH 0819/1858] [mimalloc] Update to 2.0.2 (#20680) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [mimalloc] Update to 2.0.2 * [mimalloc] Update version files Co-authored-by: Rémy Tassoux --- ports/mimalloc/portfile.cmake | 8 ++++---- ports/mimalloc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mimalloc.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/mimalloc/portfile.cmake b/ports/mimalloc/portfile.cmake index b334bcad6dec06..7703c5a419196b 100644 --- a/ports/mimalloc/portfile.cmake +++ b/ports/mimalloc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/mimalloc - REF 752594e76423526e108413731518a26e3322b9ca # v1.7.2 - SHA512 fc96f6aa6972c167a956d8f928d9becd546689356d86e800df0f54c9c46cedf74d686168f44566fb4d0aa9cddf7a9444327acd2180cc91386c53658c6a5018f1 + REF v2.0.2 + SHA512 d6f1749a6df86346220fc190a3fd6aa67deff5439b26846c33ff95e91ce5fea73837ee39348dd432db3592575298e6e87856329d0236d2c6959abd8bf7756cdc HEAD_REF master PATCHES fix-cmake.patch @@ -22,9 +22,9 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MI_BUILD_SHARED) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG - -DMI_CHECK_FULL=ON + -DMI_DEBUG_FULL=ON OPTIONS_RELEASE - -DMI_CHECK_FULL=OFF + -DMI_DEBUG_FULL=OFF OPTIONS -DMI_INTERPOSE=ON -DMI_USE_CXX=OFF diff --git a/ports/mimalloc/vcpkg.json b/ports/mimalloc/vcpkg.json index ecb642a739d576..dfa772aaabefa9 100644 --- a/ports/mimalloc/vcpkg.json +++ b/ports/mimalloc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mimalloc", - "version": "1.7.2", + "version": "2.0.2", "description": "Compact general purpose allocator with excellent performance", "homepage": "https://github.com/microsoft/mimalloc", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index e8caa34e893e0b..10e3bea8596f40 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4273,7 +4273,7 @@ "port-version": 3 }, "mimalloc": { - "baseline": "1.7.2", + "baseline": "2.0.2", "port-version": 0 }, "minc": { diff --git a/versions/m-/mimalloc.json b/versions/m-/mimalloc.json index be6c7a4785aaf1..caf7f5c8d006a4 100644 --- a/versions/m-/mimalloc.json +++ b/versions/m-/mimalloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dab9a2e508bca4575fc8f26df59f3f01735a3dbb", + "version": "2.0.2", + "port-version": 0 + }, { "git-tree": "180bb46f618db60da2f6aa4accca24cdb90570e8", "version": "1.7.2", From e8b44a76b1f6d99090f111b1f4831f4757bab2e4 Mon Sep 17 00:00:00 2001 From: Yury Bura Date: Thu, 14 Oct 2021 00:50:03 +0300 Subject: [PATCH 0820/1858] [boost] fix boost-mpi dependency (#20681) * [boost] fix #20676 * update version --- ports/boost/vcpkg.json | 6 +++--- scripts/boost/generate-ports.ps1 | 4 ++-- versions/b-/boost.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/boost/vcpkg.json b/ports/boost/vcpkg.json index 679f1b7528ba16..9dca95aea8e42c 100644 --- a/ports/boost/vcpkg.json +++ b/ports/boost/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost", "version": "1.77.0", - "port-version": 1, + "port-version": 2, "description": "Peer-reviewed portable C++ source libraries", "homepage": "https://boost.org", "dependencies": [ @@ -137,7 +137,6 @@ }, "boost-program-options", "boost-property-map", - "boost-property-map-parallel", "boost-property-tree", "boost-proto", "boost-ptr-container", @@ -202,7 +201,8 @@ "description": "Build with MPI support", "dependencies": [ "boost-graph-parallel", - "boost-mpi" + "boost-mpi", + "boost-property-map-parallel" ] } } diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index a626daf34f45db..361480f040a9bf 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -24,7 +24,7 @@ else { # Clear this array when moving to a new boost version $portVersions = @{ #e.g. "boost-asio" = 1; - "boost" = 1; + "boost" = 2; "boost-config" = 2; "boost-gil" = 1; "boost-iostreams" = 1; @@ -39,7 +39,7 @@ $portData = @{ "features" = @{ "mpi" = @{ "description" = "Build with MPI support"; - "dependencies" = @("boost-mpi", "boost-graph-parallel"); + "dependencies" = @("boost-mpi", "boost-graph-parallel", "boost-property-map-parallel"); } } }; diff --git a/versions/b-/boost.json b/versions/b-/boost.json index 4fef045312ef73..d3f77c2acc4c67 100644 --- a/versions/b-/boost.json +++ b/versions/b-/boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19bdc0542dd287e39768144ba2719723a7818750", + "version": "1.77.0", + "port-version": 2 + }, { "git-tree": "5fe225d8d76e70968014f7ddab050d7e520709e6", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 10e3bea8596f40..06e289b23a7494 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -506,7 +506,7 @@ }, "boost": { "baseline": "1.77.0", - "port-version": 1 + "port-version": 2 }, "boost-accumulators": { "baseline": "1.77.0", From 8ec92b29677145dfdb5acd4ec1307436bc636411 Mon Sep 17 00:00:00 2001 From: 7FrogTW Date: Thu, 14 Oct 2021 05:50:36 +0800 Subject: [PATCH 0821/1858] [nghttp2] v1.45.1 (#20688) --- ports/nghttp2/portfile.cmake | 4 ++-- ports/nghttp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index a13769280369e0..911db59dc483b7 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF b799b063f882cc97f8484e95b41d0326260d9b93 # v1.44.0 - SHA512 8e4a5d0b146606d1150b43c539244f615540bc25eab30bf67c673cccecdb3d4a02d99fb0136d81dc7ad4a579d9b38e62d91b1431884a8891c0d325c036cc4073 + REF 53dfaad925dc2274488dd61bb47e613a9539371a # v1.45.1 + SHA512 35e92195434c1668b457374a4d0800d103947de1942f447a1adc5d243efad0a0b09911bfe30c62f1df9946246d61de9891529f1399c75db6ad6643e1fbd72a38 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index 6528683f293d74..c8ae19e7212d70 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.44.0", + "version": "1.45.1", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 06e289b23a7494..48ed54798129a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4585,7 +4585,7 @@ "port-version": 2 }, "nghttp2": { - "baseline": "1.44.0", + "baseline": "1.45.1", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 4cd034bb3dae0f..49b7596b444efd 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e765c53ede7876249ec80ae256b96c468d394734", + "version": "1.45.1", + "port-version": 0 + }, { "git-tree": "7d98b71b7948db8173a563483081700e706268b0", "version": "1.44.0", From 933baddba7034881152f9b8e7d40bce60a39d33b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 15 Oct 2021 00:03:14 +0200 Subject: [PATCH 0822/1858] [hfsm2] Update to 1.10.1 (#20729) * Update hfsm2 to 1.10.1 * Update CI baseline * Fix include path * Update git-tree hash Co-authored-by: chausner --- ports/hfsm2/portfile.cmake | 11 +++++++---- ports/hfsm2/usage | 4 ++++ ports/hfsm2/vcpkg.json | 8 ++------ versions/baseline.json | 4 ++-- versions/h-/hfsm2.json | 5 +++++ 5 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 ports/hfsm2/usage diff --git a/ports/hfsm2/portfile.cmake b/ports/hfsm2/portfile.cmake index 48275078bf789e..09e71e139f1622 100644 --- a/ports/hfsm2/portfile.cmake +++ b/ports/hfsm2/portfile.cmake @@ -1,13 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO andrew-gresyk/HFSM2 - REF Beta7 - SHA512 f3365c0823fa63f7e6b82bd2dc84f8871eb58ffd9485753a60ea8f956856cbec7c5da3929ab8fe8b5902a7c840334a1d421417984124adf109f96756490ac437 + REF 1_10_1 + SHA512 49ae09a3e4052c7a70390510d128d4d0a41f3c2b6bb9cf2c0b36d272ca1a2524c1d2b544e4c36655681255ce6a5e2f3f90f8c4e9957e8c49e49a62927134a718 HEAD_REF master ) # Install include directory -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy usage file +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/hfsm2/usage b/ports/hfsm2/usage new file mode 100644 index 00000000000000..9c7b99766efaee --- /dev/null +++ b/ports/hfsm2/usage @@ -0,0 +1,4 @@ +The package hfsm2 is header only and can be used from CMake via: + + find_path(HFSM2_INCLUDE_DIRS "hfsm2/machine.hpp") + target_include_directories(main PRIVATE ${HFSM2_INCLUDE_DIRS}) diff --git a/ports/hfsm2/vcpkg.json b/ports/hfsm2/vcpkg.json index 6486dfaa5f7e81..78e243c50a6fff 100644 --- a/ports/hfsm2/vcpkg.json +++ b/ports/hfsm2/vcpkg.json @@ -1,10 +1,6 @@ { "name": "hfsm2", - "version-string": "beta7", - "port-version": 1, + "version": "1.10.1", "description": "Header-only heriarchical FSM framework in C++14, with fully statically-defined structure (no dynamic allocations), built with variadic templates.", - "homepage": "https://github.com/andrew-gresyk/HFSM2", - "dependencies": [ - "catch2" - ] + "homepage": "https://github.com/andrew-gresyk/HFSM2" } diff --git a/versions/baseline.json b/versions/baseline.json index 48ed54798129a0..b74e960259e300 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2641,8 +2641,8 @@ "port-version": 1 }, "hfsm2": { - "baseline": "beta7", - "port-version": 1 + "baseline": "1.10.1", + "port-version": 0 }, "hidapi": { "baseline": "0.11.0", diff --git a/versions/h-/hfsm2.json b/versions/h-/hfsm2.json index 34bd8835420fab..84c8672c3c53df 100644 --- a/versions/h-/hfsm2.json +++ b/versions/h-/hfsm2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5f096dede4a8567200188df695cdbf2cb19c6d5", + "version": "1.10.1", + "port-version": 0 + }, { "git-tree": "278f7b5b00418376ce4e8777cd5fddb927ec3686", "version-string": "beta7", From c1727c55d9dfc68770d8adc1ea1035a2b7f82282 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 15 Oct 2021 02:47:11 +0200 Subject: [PATCH 0823/1858] [bext-wintls] add new port (#20719) * [bext-wintls] add new port * delete extra blank lines * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/bext-wintls/portfile.cmake | 11 +++++++++++ ports/bext-wintls/vcpkg.json | 18 ++++++++++++++++++ versions/b-/bext-wintls.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 42 insertions(+) create mode 100644 ports/bext-wintls/portfile.cmake create mode 100644 ports/bext-wintls/vcpkg.json create mode 100644 versions/b-/bext-wintls.json diff --git a/ports/bext-wintls/portfile.cmake b/ports/bext-wintls/portfile.cmake new file mode 100644 index 00000000000000..14ac5c893e4698 --- /dev/null +++ b/ports/bext-wintls/portfile.cmake @@ -0,0 +1,11 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO laudrup/boost-wintls + REF v0.9.5 + SHA512 5b6a88d64225c0f065d18f65319d44b90eb594431c53d9fbff72edfe2fc909613a966062b5636db7a3d0e36a389a0948dada0fbfa61b21b7b52b1af952d93071 + HEAD_REF master +) + +file(COPY "${SOURCE_PATH}/include/boost/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost/") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/" RENAME copyright) diff --git a/ports/bext-wintls/vcpkg.json b/ports/bext-wintls/vcpkg.json new file mode 100644 index 00000000000000..cb39e3137c97f7 --- /dev/null +++ b/ports/bext-wintls/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "bext-wintls", + "version": "0.9.5", + "description": "Native Windows TLS stream wrapper for use with boost::asio", + "homepage": "https://github.com/laudrup/boost-wintls", + "supports": "windows", + "dependencies": [ + "boost-asio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/b-/bext-wintls.json b/versions/b-/bext-wintls.json new file mode 100644 index 00000000000000..b57b166726ec7d --- /dev/null +++ b/versions/b-/bext-wintls.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "1bed92afff8085f2d8f888b35ce0049e5986aa8a", + "version": "0.9.5", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index b74e960259e300..c8ececc9244d4e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -432,6 +432,10 @@ "baseline": "1.1.8", "port-version": 0 }, + "bext-wintls": { + "baseline": "0.9.5", + "port-version": 0 + }, "bfgroup-lyra": { "baseline": "1.5", "port-version": 1 From 187f3972a9466632119f1af3e8eafe52579cf09f Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 14 Oct 2021 17:49:18 -0700 Subject: [PATCH 0824/1858] [libigl] Update to 2.3.0 (#20662) * [libigl] Update to 2.3.0 * remove the change in fix-config.patch * restore to the original state Co-authored-by: Cheney-Wang --- ports/libigl/fix-dependency.patch | 56 +++++++++++++++------------ ports/libigl/fix-imgui-set-cond.patch | 26 ------------- ports/libigl/portfile.cmake | 36 +++++++++-------- ports/libigl/vcpkg.json | 14 +++++-- versions/baseline.json | 4 +- versions/l-/libigl.json | 5 +++ 6 files changed, 68 insertions(+), 73 deletions(-) delete mode 100644 ports/libigl/fix-imgui-set-cond.patch diff --git a/ports/libigl/fix-dependency.patch b/ports/libigl/fix-dependency.patch index 94ce7aea980a02..f7ed9f7f2245b4 100644 --- a/ports/libigl/fix-dependency.patch +++ b/ports/libigl/fix-dependency.patch @@ -9,7 +9,7 @@ index b98aa55..46c68a7 100644 if(IGL_STATIC_RUNTIME) message(STATUS "MSVC -> forcing use of statically-linked runtime.") diff --git a/cmake/libigl.cmake b/cmake/libigl.cmake -index d07bbb3..a33cefa 100644 +index 6de1b41..46ecbf0 100644 --- a/cmake/libigl.cmake +++ b/cmake/libigl.cmake @@ -107,7 +107,8 @@ if(HUNTER_ENABLED) @@ -33,21 +33,22 @@ index d07bbb3..a33cefa 100644 + if(0) igl_download_embree() - set(EMBREE_TESTING_INTENSITY 0 CACHE STRING "") -@@ -315,8 +315,11 @@ if(LIBIGL_WITH_EMBREE) - endif() + # Note: On macOS, building embree as a static lib can only be done with a single ISA target. +@@ -317,8 +318,11 @@ if(LIBIGL_WITH_EMBREE) compile_igl_module("embree") target_link_libraries(igl_embree ${IGL_SCOPE} embree) - target_include_directories(igl_embree ${IGL_SCOPE} ${EMBREE_DIR}/include) +- target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB) + if(LIBIGL_USE_STATIC_LIBRARY) -+ find_package(TBB CONFIG REQUIRED) -+ target_link_libraries(igl_embree ${IGL_SCOPE} TBB::tbb) - target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB) ++ find_package(TBB CONFIG REQUIRED) ++ target_link_libraries(igl_embree ${IGL_SCOPE} TBB::tbb) ++ target_compile_definitions(igl_embree ${IGL_SCOPE} -DEMBREE_STATIC_LIB) + endif() endif() -@@ -358,11 +359,12 @@ if(LIBIGL_WITH_OPENGL) + ################################################################################ +@@ -359,11 +363,12 @@ if(LIBIGL_WITH_OPENGL) endif() # glad module @@ -62,7 +63,7 @@ index d07bbb3..a33cefa 100644 endif() ################################################################################ -@@ -371,7 +373,8 @@ if(LIBIGL_WITH_OPENGL_GLFW) +@@ -372,7 +377,8 @@ if(LIBIGL_WITH_OPENGL_GLFW) if(TARGET igl::opengl) # GLFW module compile_igl_module("opengl/glfw") @@ -72,7 +73,7 @@ index d07bbb3..a33cefa 100644 igl_download_glfw() option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" OFF) option(GLFW_BUILD_TESTS "Build the GLFW test programs" OFF) -@@ -394,11 +397,12 @@ if(LIBIGL_WITH_OPENGL_GLFW_IMGUI) +@@ -395,17 +401,19 @@ if(LIBIGL_WITH_OPENGL_GLFW_IMGUI) if(TARGET igl::opengl_glfw) # ImGui module compile_igl_module("opengl/glfw/imgui") @@ -82,12 +83,20 @@ index d07bbb3..a33cefa 100644 igl_download_imgui() add_subdirectory(${LIBIGL_EXTERNAL}/libigl-imgui imgui) endif() -- target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui) -+ target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui::imgui) +- if(NOT TARGET imguizmo) ++ find_package(imguizmo CONFIG REQUIRED) ++ if(0) + igl_download_imguizmo() + add_library(imguizmo ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.cpp ${LIBIGL_EXTERNAL}/imguizmo/ImGuizmo.h) + target_compile_features(imguizmo PUBLIC cxx_std_11) + target_link_libraries(imguizmo PUBLIC imgui) + endif() +- target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui imguizmo) ++ target_link_libraries(igl_opengl_glfw_imgui ${IGL_SCOPE} igl_opengl_glfw imgui::imgui imguizmo::imguizmo) endif() endif() -@@ -408,12 +412,22 @@ if(LIBIGL_WITH_PNG) +@@ -415,12 +423,22 @@ if(LIBIGL_WITH_PNG) # png/ module is anomalous because it also depends on opengl it really should # be moved into the opengl/ directory and namespace ... if(TARGET igl_opengl) @@ -112,7 +121,7 @@ index d07bbb3..a33cefa 100644 endif() endif() -@@ -461,7 +475,8 @@ endif() +@@ -468,7 +486,8 @@ endif() ### Compile the xml part ### if(LIBIGL_WITH_XML) set(TINYXML2_DIR "${LIBIGL_EXTERNAL}/tinyxml2") @@ -122,18 +131,18 @@ index d07bbb3..a33cefa 100644 igl_download_tinyxml2() add_library(tinyxml2 STATIC ${TINYXML2_DIR}/tinyxml2.cpp ${TINYXML2_DIR}/tinyxml2.h) target_include_directories(tinyxml2 PUBLIC ${TINYXML2_DIR}) -@@ -471,7 +486,7 @@ if(LIBIGL_WITH_XML) +@@ -478,8 +497,7 @@ if(LIBIGL_WITH_XML) SOVERSION "3") endif() compile_igl_module("xml") - target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2) +- target_include_directories(igl_xml ${IGL_SCOPE} ${TINYXML2_DIR}) + target_link_libraries(igl_xml ${IGL_SCOPE} tinyxml2::tinyxml2) -- target_include_directories(igl_xml ${IGL_SCOPE} ${TINYXML2_DIR}) -+ endif() + ################################################################################ diff --git a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h -index 1d3e3bc..682b6d7 100644 +index 0663390..f35f097 100644 --- a/include/igl/opengl/glfw/imgui/ImGuiHelpers.h +++ b/include/igl/opengl/glfw/imgui/ImGuiHelpers.h @@ -10,7 +10,7 @@ @@ -146,10 +155,10 @@ index 1d3e3bc..682b6d7 100644 #include #include diff --git a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp -index 47de487..6c607de 100644 +index c91c1cc..0836142 100644 --- a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp +++ b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp -@@ -9,9 +9,9 @@ +@@ -9,7 +9,7 @@ #include "ImGuiMenu.h" #include "ImGuiHelpers.h" #include @@ -158,9 +167,6 @@ index 47de487..6c607de 100644 #include #include #include - #include - #include - //////////////////////////////////////////////////////////////////////////////// diff --git a/include/igl/opengl/glfw/imgui/ImGuiTraits.h b/include/igl/opengl/glfw/imgui/ImGuiTraits.h index 7dae22a..e6911c5 100644 --- a/include/igl/opengl/glfw/imgui/ImGuiTraits.h @@ -175,7 +181,7 @@ index 7dae22a..e6911c5 100644 // Extend ImGui by populating its namespace directly namespace ImGui diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 273324d..cefbd52 100644 +index 2410c19..a7659a3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -15,12 +15,11 @@ igl_download_test_data() @@ -193,7 +199,7 @@ index 273324d..cefbd52 100644 # Create test executable diff --git a/tutorial/106_ViewerMenu/main.cpp b/tutorial/106_ViewerMenu/main.cpp -index cc514e5..f1be538 100644 +index a8e49d6..c7946f9 100644 --- a/tutorial/106_ViewerMenu/main.cpp +++ b/tutorial/106_ViewerMenu/main.cpp @@ -2,7 +2,7 @@ diff --git a/ports/libigl/fix-imgui-set-cond.patch b/ports/libigl/fix-imgui-set-cond.patch deleted file mode 100644 index 964f6f3f4980f1..00000000000000 --- a/ports/libigl/fix-imgui-set-cond.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp -index 47de4870..7e6f13a8 100644 ---- a/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp -+++ b/include/igl/opengl/glfw/imgui/ImGuiMenu.cpp -@@ -167,8 +167,8 @@ IGL_INLINE void ImGuiMenu::draw_menu() - IGL_INLINE void ImGuiMenu::draw_viewer_window() - { - float menu_width = 180.f * menu_scaling(); -- ImGui::SetNextWindowPos(ImVec2(0.0f, 0.0f), ImGuiSetCond_FirstUseEver); -- ImGui::SetNextWindowSize(ImVec2(0.0f, 0.0f), ImGuiSetCond_FirstUseEver); -+ ImGui::SetNextWindowPos(ImVec2(0.0f, 0.0f), ImGuiCond_FirstUseEver); -+ ImGui::SetNextWindowSize(ImVec2(0.0f, 0.0f), ImGuiCond_FirstUseEver); - ImGui::SetNextWindowSizeConstraints(ImVec2(menu_width, -1.0f), ImVec2(menu_width, -1.0f)); - bool _viewer_menu_visible = true; - ImGui::Begin( -@@ -310,8 +310,8 @@ IGL_INLINE void ImGuiMenu::draw_viewer_menu() - IGL_INLINE void ImGuiMenu::draw_labels_window() - { - // Text labels -- ImGui::SetNextWindowPos(ImVec2(0,0), ImGuiSetCond_Always); -- ImGui::SetNextWindowSize(ImGui::GetIO().DisplaySize, ImGuiSetCond_Always); -+ ImGui::SetNextWindowPos(ImVec2(0,0), ImGuiCond_Always); -+ ImGui::SetNextWindowSize(ImGui::GetIO().DisplaySize, ImGuiCond_Always); - bool visible = true; - ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0,0,0,0)); - ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0); diff --git a/ports/libigl/portfile.cmake b/ports/libigl/portfile.cmake index 7d636a73f85462..5917425cec5cb6 100644 --- a/ports/libigl/portfile.cmake +++ b/ports/libigl/portfile.cmake @@ -3,29 +3,29 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libigl/libigl - REF 3cb4894eaf8ea4610467189ca292be349425d44b #2.2.0 - SHA512 339f96e36b6a99ae8301ec2e234e18cecba7b7c42289ed68a26c20b279dce3135405f9b49e292c321fba962d56c083ae61831057bec9a19ad1495e2afa379b8b + REF e60423e28c86b6aa2a3f6eb0112e8fd881f96777 #2.3.0 + SHA512 3fecb710825e58745c1d67eab694ee365a5b86151a5a1ca3758c1000c124059d38dbc78e8c6e941be6d85a716f928ed8fea42bb6007b8e24da0123332c2c96da HEAD_REF master PATCHES fix-dependency.patch - fix-imgui-set-cond.patch install-extra-headers.patch fix-config.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - embree LIBIGL_WITH_EMBREE - opengl LIBIGL_WITH_OPENGL - glfw LIBIGL_WITH_OPENGL_GLFW - imgui LIBIGL_WITH_OPENGL_GLFW_IMGUI - #png LIBIGL_WITH_PNG # Disable this feature due to issue https://github.com/libigl/libigl/issues/1199 - xml LIBIGL_WITH_XML - #python LIBIGL_WITH_PYTHON # Python binding are in the process of being redone. + FEATURES + embree LIBIGL_WITH_EMBREE + opengl LIBIGL_WITH_OPENGL + glfw LIBIGL_WITH_OPENGL_GLFW + imgui LIBIGL_WITH_OPENGL_GLFW_IMGUI + #png LIBIGL_WITH_PNG # Disable this feature due to issue https://github.com/libigl/libigl/issues/1199 + xml LIBIGL_WITH_XML + #python LIBIGL_WITH_PYTHON # Python binding are in the process of being redone. ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} -DLIBIGL_BUILD_PYTHON=OFF -DLIBIGL_EXPORT_TARGETS=ON @@ -38,14 +38,16 @@ vcpkg_configure_cmake( -DLIBIGL_WITH_PNG=OFF -DLIBIGL_BUILD_TESTS=OFF -DPYTHON_EXECUTABLE=${PYTHON2} + MAYBE_UNUSED_VARIABLES + PYTHON_EXECUTABLE ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/libigl/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/libigl/cmake) vcpkg_copy_pdbs() # libigl is a header-only library. -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE.GPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.GPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libigl/vcpkg.json b/ports/libigl/vcpkg.json index 2a4a9797df5e1a..22f523168347ec 100644 --- a/ports/libigl/vcpkg.json +++ b/ports/libigl/vcpkg.json @@ -1,12 +1,19 @@ { "name": "libigl", - "version-string": "2.2.0", - "port-version": 6, + "version": "2.3.0", "description": "libigl is a simple C++ geometry processing library. We have a wide functionality including construction of sparse discrete differential geometry operators and finite-elements matrices such as the cotangent Laplacian and diagonalized mass matrix, simple facet and edge-based topology data structures, mesh-viewing utilities for OpenGL and GLSL, and many core functions for matrix manipulation which make Eigen feel a lot more like MATLAB.", "homepage": "https://github.com/libigl/libigl", "supports": "!(arm | uwp)", "dependencies": [ - "eigen3" + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "embree": { @@ -40,6 +47,7 @@ "opengl3-binding" ] }, + "imguizmo", { "name": "libigl", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index c8ececc9244d4e..65f30a0e53876e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3485,8 +3485,8 @@ "port-version": 4 }, "libigl": { - "baseline": "2.2.0", - "port-version": 6 + "baseline": "2.3.0", + "port-version": 0 }, "libilbc": { "baseline": "3.0.3", diff --git a/versions/l-/libigl.json b/versions/l-/libigl.json index 103341c9f3607d..6498ecd346afe4 100644 --- a/versions/l-/libigl.json +++ b/versions/l-/libigl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ddb181a509d6897a3e29b7a1a696af1db2e044f", + "version": "2.3.0", + "port-version": 0 + }, { "git-tree": "ced3bf6b1438690d7b1b3d1f0fa40eacbc78f1ca", "version-string": "2.2.0", From fb564e9d8d1213d57a82fda4dc922abbc7d726b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 15 Oct 2021 08:54:32 +0800 Subject: [PATCH 0825/1858] [log4cxx] Update to 0.12.0 (#19963) * [log4cxx] Update to 0.12.0 * version * Replace depreciate functions * version --- ports/log4cxx/expat.patch | 40 +++++++++++++---------------------- ports/log4cxx/pkgconfig.patch | 15 ++++++++++--- ports/log4cxx/portfile.cmake | 25 +++++++++++----------- ports/log4cxx/vcpkg.json | 13 +++++++++--- versions/baseline.json | 4 ++-- versions/l-/log4cxx.json | 5 +++++ 6 files changed, 56 insertions(+), 46 deletions(-) diff --git a/ports/log4cxx/expat.patch b/ports/log4cxx/expat.patch index 250035021d63dd..7dfb0f0097f862 100644 --- a/ports/log4cxx/expat.patch +++ b/ports/log4cxx/expat.patch @@ -1,32 +1,31 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d30a71b..3ecf5f0 100644 +index e5b44ef..e84e497 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -23,6 +23,9 @@ find_package(APR REQUIRED) - # Find Apache Runtime Utilities - find_package(APR-Util REQUIRED) +@@ -33,7 +33,7 @@ find_package(APR-Util REQUIRED) + find_package( Threads REQUIRED ) -+# Find expat for XML parsing + # Find expat for XML parsing +-find_package(EXPAT REQUIRED) +find_package(expat CONFIG REQUIRED) -+ - # Building - add_subdirectory(src) + # Request C++17, if available + # This *should* fallback to an older standard if it is not available diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3e0cb17..9a450b7 100644 +index b60e54f..b6138b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -1,7 +1,7 @@ +@@ -3,7 +3,7 @@ cmake_policy(SET CMP0079 NEW) add_subdirectory(main) target_compile_definitions(log4cxx PRIVATE ${LOG4CXX_COMPILE_DEFINITIONS} ${APR_COMPILE_DEFINITIONS} ${APR_UTIL_COMPILE_DEFINITIONS} ) target_include_directories(log4cxx INTERFACE $ PRIVATE ${APR_INCLUDE_DIR} ${APR_UTIL_INCLUDE_DIR}) --target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES} ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) +-target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) +target_link_libraries(log4cxx PRIVATE ${APR_UTIL_LIBRARIES} expat::expat ${APR_LIBRARIES} ${APR_SYSTEM_LIBS}) if(WIN32) - # The ODBC appender is always enabled in the Windows configuration - target_link_libraries(log4cxx PRIVATE odbc32.lib) + # The ODBC appender is always enabled in the Windows configuration + target_link_libraries(log4cxx PRIVATE odbc32.lib) diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake -index bb4e951..75093d8 100644 +index d9cf4df..17a2457 100644 --- a/src/cmake/FindAPR-Util.cmake +++ b/src/cmake/FindAPR-Util.cmake @@ -38,7 +38,6 @@ if(EXISTS ${APR_UTIL_CONFIG_EXECUTABLE}) @@ -37,23 +36,14 @@ index bb4e951..75093d8 100644 set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC) else() _apu_invoke(APR_UTIL_LIBRARIES --link-ld) -@@ -48,8 +47,6 @@ else() - if (APU_STATIC OR NOT BUILD_SHARED_LIBS) - set(APR_UTIL_COMPILE_DEFINITIONS APU_DECLARE_STATIC) - find_library(APR_UTIL_LIBRARIES NAMES aprutil-1) -- find_library(XMLLIB_LIBRARIES NAMES libexpat) -- find_program(XMLLIB_DLL libexpat.dll) - else() - find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1) - find_program(APR_UTIL_DLL libaprutil-1.dll) diff --git a/src/test/cpp/xml/CMakeLists.txt b/src/test/cpp/xml/CMakeLists.txt -index bddfe48..138c489 100644 +index 138c489..7b62f3e 100644 --- a/src/test/cpp/xml/CMakeLists.txt +++ b/src/test/cpp/xml/CMakeLists.txt @@ -4,5 +4,5 @@ add_executable(xmltests xmllayouttestcase ) --target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} ${XMLLIB_LIBRARIES}) +-target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} EXPAT::EXPAT) +target_link_libraries(xmltests PRIVATE ${APR_UTIL_LIBRARIES} expat::expat) set(ALL_LOG4CXX_TESTS ${ALL_LOG4CXX_TESTS} xmltests PARENT_SCOPE) diff --git a/ports/log4cxx/pkgconfig.patch b/ports/log4cxx/pkgconfig.patch index 06eb7c00e73da0..ee109775c4e818 100644 --- a/ports/log4cxx/pkgconfig.patch +++ b/ports/log4cxx/pkgconfig.patch @@ -1,13 +1,22 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 523fbd9..0467470 100644 +index e84e497..ff8b920 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,7 +66,7 @@ if(UNIX) +@@ -94,7 +94,7 @@ if(UNIX) ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx.pc" - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + if(LOG4CXX_QT_SUPPORT) + set(prefix "${CMAKE_INSTALL_PREFIX}") +@@ -107,7 +107,7 @@ if(UNIX) + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/liblog4cxx-qt.pc" +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif(LOG4CXX_QT_SUPPORT) endif(UNIX) - # Support for find_package(log4cxx) in consuming CMake projects using diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 7292c0007295f4..102d5eb3edbdd7 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -1,8 +1,8 @@ -set(VERSION 0.11.0) +set(VERSION 0.12.0) vcpkg_download_distfile(ARCHIVE URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz" FILENAME "apache-log4cxx-${VERSION}.tar.gz" - SHA512 f8aa37c9c094e7a4d6ca92dff13c032f69f1e078c51ea55e284fcb931c13256b08950af3ea6eaf7a12282240f6073e9acab19bfe217f88dbd62a5d2360f3fbdd + SHA512 00fe571f9c511bf93b17cac8269ce00f7e817e8d723acf62bddff1bbe0e7facd0ab2fd75c01a93870f7e5c66718b2b73fc22c5f193bfd204e34d052b1123e60d ) vcpkg_extract_source_archive_ex( @@ -15,31 +15,30 @@ vcpkg_extract_source_archive_ex( pkgconfig.patch ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DLOG4CXX_INSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/log4cxx) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/log4cxx) if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_fixup_pkgconfig() endif() -file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake _contents) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake" _contents) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cxxConfig.cmake" "include(CMakeFindDependencyMacro) find_dependency(expat CONFIG) -${_contents}") - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +${_contents}" +) -vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index c10ca296041510..e0092cba635ac9 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,13 +1,20 @@ { "name": "log4cxx", - "version-string": "0.11.0", - "port-version": 3, + "version-string": "0.12.0", "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", "homepage": "https://logging.apache.org/log4cxx", "supports": "!uwp", "dependencies": [ "apr", "apr-util", - "expat" + "expat", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 65f30a0e53876e..e321afb99daf36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4065,8 +4065,8 @@ "port-version": 5 }, "log4cxx": { - "baseline": "0.11.0", - "port-version": 3 + "baseline": "0.12.0", + "port-version": 0 }, "loguru": { "baseline": "2.1.0", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 7b2598b2a00898..dcc83c47125ca3 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a0d34c9d2f6f0d0811bdb43d1a233e025963185", + "version-string": "0.12.0", + "port-version": 0 + }, { "git-tree": "406017355e07d94a41999c3db5e015be8bf0fbbd", "version-string": "0.11.0", From 3a371fe9e319e81f80f64d212b2acf3bc3e7d2db Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Fri, 15 Oct 2021 03:56:06 +0300 Subject: [PATCH 0826/1858] [bdwgc] Update to v8.2.0 (#20580) * Remove 001-install-libraries.patch (all changes are in upstream) * Change REF from 0c8905e84 (old master) to 59f15da55 (v8.2.0-20211013) * Remove -Dbuild_tests=OFF which is default one * Kill spaces at EOLn in portfile.cmake * Update version, reset port-version --- ports/bdwgc/001-install-libraries.patch | 257 ------------------------ ports/bdwgc/portfile.cmake | 25 +-- ports/bdwgc/vcpkg.json | 3 +- versions/b-/bdwgc.json | 5 + versions/baseline.json | 4 +- 5 files changed, 19 insertions(+), 275 deletions(-) delete mode 100644 ports/bdwgc/001-install-libraries.patch diff --git a/ports/bdwgc/001-install-libraries.patch b/ports/bdwgc/001-install-libraries.patch deleted file mode 100644 index 2cc87f5be1fdc2..00000000000000 --- a/ports/bdwgc/001-install-libraries.patch +++ /dev/null @@ -1,257 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8d386ca5..b94d6358 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,6 +27,10 @@ include(CTest) - - cmake_minimum_required(VERSION 3.1) - -+# Customize CMake options by passing "-D=ON|OFF" in your command line -+option(build_cord "Install cord" ON) -+option(build_tests "Install library tests" ON) -+option(install_headers "Install header files" ON) - option(enable_threads "TODO" OFF) #TODO Support it - option(enable_parallel_mark "Parallelize marking and free list construction" ON) - option(enable_thread_local_alloc "Turn on thread-local allocation optimization" ON) -@@ -52,22 +56,13 @@ add_definitions("-DALL_INTERIOR_POINTERS -DNO_EXECUTE_PERMISSION") - - if (APPLE) - if ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "") -- set(CMAKE_OSX_ARCHITECTURES "ppc;i386;x86_64" -+ set(CMAKE_OSX_ARCHITECTURES "x86_64;i386" - CACHE STRING "Build architectures for Mac OS X" FORCE) - endif() --elseif (WIN32) -+elseif (MSVC) - add_definitions("-D_CRT_SECURE_NO_DEPRECATE") - endif() - --#LIBATOMIC #TODO --#ADD_LIBRARY(atomic_ops STATIC ) --#SET_TARGET_PROPERTIES(atomic_ops PROPERTIES COMPILE_FLAGS -DNO_DEBUGGING) -- -- --#LIBGC -- --include_directories(include) --include_directories(libatomic_ops/src) - - set(SRC alloc.c reclaim.c allchblk.c misc.c mach_dep.c os_dep.c - mark_rts.c headers.c mark.c obj_map.c blacklst.c finalize.c -@@ -82,12 +77,6 @@ if (enable_threads) - set(LIBS ${LIBS} ${Threads_LIBRARIES}) - endif() - --#IF(Threads_FOUND) --# ADD_DEFINITIONS("") --#ELSE --# MESSAGE("Parallel mark requires enable_threads ON" ) --#ENDIF(Threads_FOUND) -- - if (enable_cplusplus) - set(SRC ${SRC} gc_cpp.cc) - endif() -@@ -141,7 +130,7 @@ if (CMAKE_USE_PTHREADS_INIT) - if (enable_parallel_mark) - add_definitions("-DHANDLE_FORK") - endif() -- endif(enable_handle_fork) -+ endif() - set(SRC ${SRC} darwin_stop_world.c) - #TODO darwin_threads=true - endif() -@@ -158,10 +147,10 @@ if (CMAKE_USE_WIN32_THREADS_INIT) - add_definitions("-DTHREAD_LOCAL_ALLOC") - set(SRC ${SRC} thread_local_alloc.c) - endif() -- endif(enable_parallel_mark) -+ endif() - add_definitions("-DEMPTY_GETENV_RESULTS") - set(SRC ${SRC} win32_threads.c) --endif(CMAKE_USE_WIN32_THREADS_INIT) -+endif() - - if (enable_gcj_support) - add_definitions("-DGC_GCJ_SUPPORT") -@@ -169,7 +158,7 @@ if (enable_gcj_support) - add_definitions("-DGC_ENABLE_SUSPEND_THREAD") - endif() - set(SRC ${SRC} gcj_mlc.c) --endif(enable_gcj_support) -+endif() - - if (enable_disclaim) - add_definitions("-DENABLE_DISCLAIM") -@@ -195,7 +184,7 @@ if (enable_gc_debug) - add_definitions("-DMAKE_BACK_GRAPH") - set(SRC ${SRC} backgraph.c) - endif() --endif(enable_gc_debug) -+endif() - - if (enable_redirect_malloc) - if (enable_gc_debug) -@@ -206,7 +195,7 @@ if (enable_redirect_malloc) - add_definitions("-DREDIRECT_MALLOC=GC_malloc") - endif() - add_definitions("-DGC_USE_DLOPEN_WRAP") --endif(enable_redirect_malloc) -+endif() - - if (enable_munmap) - add_definitions("-DUSE_MMAP -DUSE_MUNMAP") -@@ -240,19 +229,44 @@ if (enable_checksums) - endif() - add_definitions("-DCHECKSUMS") - set(SRC ${SRC} checksums.c) --endif(enable_checksums) -- --add_library(gc-lib STATIC ${SRC}) --set_target_properties(gc-lib PROPERTIES -- COMPILE_DEFINITIONS GC_NOT_DLL) --#TODO TARGET_LINK_LIBRARIES(... ... ${LIBS}) -+endif() - --add_library(gcmt-lib STATIC ${SRC}) --set_target_properties(gcmt-lib PROPERTIES -- COMPILE_DEFINITIONS GC_NOT_DLL) -+# Create target -+add_library(gc ${SRC}) -+target_include_directories(gc -+ PUBLIC -+ $ -+ $ -+) -+if (NOT BUILD_SHARED_LIBS) -+ target_compile_definitions(gc PRIVATE GC_NOT_DLL) -+else() -+ target_compile_definitions(gc PRIVATE GC_DLL) -+endif() - --add_library(gcmt-dll SHARED ${SRC}) -+# Install library -+install( -+ TARGETS gc -+ EXPORT gcExports -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+ RUNTIME DESTINATION bin -+ INCLUDES DESTINATION include -+) -+ -+# Install headers -+if (install_headers) -+ file(GLOB BDWGC_HEADERS "include/*.h") -+ install(FILES ${BDWGC_HEADERS} DESTINATION include/gc) -+ -+ file(GLOB BDWGC_EXTRA_HEADERS "include/extra/*.h") -+ install(FILES ${BDWGC_EXTRA_HEADERS} DESTINATION include) -+endif() - --add_subdirectory(cord) -+if (build_cord) -+ add_subdirectory(cord) -+endif() - --add_subdirectory(tests) -+if (build_tests) -+ add_subdirectory(tests) -+endif() -diff --git a/cord/CMakeLists.txt b/cord/CMakeLists.txt -index 17077370..21818d4e 100644 ---- a/cord/CMakeLists.txt -+++ b/cord/CMakeLists.txt -@@ -11,11 +11,11 @@ - # modified is included with the above copyright notice. - ## - -+add_executable(cord cordbscs.c cordxtra.c tests/de.c tests/de_win.c) -+set_target_properties(cord PROPERTIES COMPILE_DEFINITIONS GC_NOT_DLL) -+target_link_libraries(cord PRIVATE gc) -+ - if (WIN32) -- add_executable(cord cordbscs.c cordxtra.c -- tests/de.c tests/de_win.c) - set_target_properties(cord PROPERTIES WIN32_EXECUTABLE TRUE) -- set_target_properties(cord PROPERTIES COMPILE_DEFINITIONS GC_NOT_DLL) -- target_link_libraries(cord gc-lib) -- target_link_libraries(cord gdi32) -+ target_link_libraries(cord PRIVATE gdi32) - endif() -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index c6bcc7d7..32a021e7 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -14,8 +14,6 @@ - # modified is included with the above copyright notice. - ## - --add_definitions("-DGC_NOT_DLL") -- - # Compile some tests as C++ to test extern "C" in header files. - if (enable_cplusplus) - set_source_files_properties(leak_test.c test.c -@@ -23,51 +21,51 @@ if (enable_cplusplus) - endif() - - add_executable(gctest WIN32 test.c) --target_link_libraries(gctest gc-lib) -+target_link_libraries(gctest PRIVATE gc) - add_test(NAME gctest COMMAND gctest) - - add_executable(hugetest huge_test.c) --target_link_libraries(hugetest gc-lib) -+target_link_libraries(hugetest PRIVATE gc) - add_test(NAME hugetest COMMAND hugetest) - - add_executable(leaktest leak_test.c) --target_link_libraries(leaktest gc-lib) -+target_link_libraries(leaktest PRIVATE gc) - add_test(NAME leaktest COMMAND leaktest) - - add_executable(middletest middle.c) --target_link_libraries(middletest gc-lib) -+target_link_libraries(middletest PRIVATE gc) - add_test(NAME middletest COMMAND middletest) - - add_executable(realloc_test realloc_test.c) --target_link_libraries(realloc_test gc-lib) -+target_link_libraries(realloc_test PRIVATE gc) - add_test(NAME realloc_test COMMAND realloc_test) - - add_executable(smashtest smash_test.c) --target_link_libraries(smashtest gc-lib) -+target_link_libraries(smashtest PRIVATE gc) - add_test(NAME smashtest COMMAND smashtest) - - if (enable_gc_debug) - add_executable(tracetest trace_test.c) -- target_link_libraries(tracetest gc-lib) -+ target_link_libraries(tracetest PRIVATE gc) - add_test(NAME tracetest COMMAND tracetest) - endif() - - if (enable_cplusplus) - # TODO add_executable(test_cpp test_cpp.cc) -- # target_link_libraries(test_cpp gc-lib) -+ # target_link_libraries(test_cpp PRIVATE gc) - # add_test(NAME test_cpp COMMAND test_cpp) - endif() - - if (enable_disclaim) - add_executable(disclaim_bench disclaim_bench.c) -- target_link_libraries(disclaim_bench gc-lib) -+ target_link_libraries(disclaim_bench PRIVATE gc) - add_test(NAME disclaim_bench COMMAND disclaim_bench) - - add_executable(disclaim_test disclaim_test.c) -- target_link_libraries(disclaim_test gc-lib) -+ target_link_libraries(disclaim_test PRIVATE gc) - add_test(NAME disclaim_test COMMAND disclaim_test) - - add_executable(disclaim_weakmap_test disclaim_weakmap_test.c) -- target_link_libraries(disclaim_weakmap_test gc-lib) -+ target_link_libraries(disclaim_weakmap_test PRIVATE gc) - add_test(NAME disclaim_weakmap_test COMMAND disclaim_weakmap_test) - endif() - \ No newline at end of file diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 656de1d33faab9..6a9a7c1da9b33d 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -1,29 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/bdwgc - # REF v8.0.4 - # SHA512 f3c178c9cab9d9df9ecdad5ac5661c916518d29b0eaca24efe569cb757c386c118ad4389851107597d99ff1bbe99b46383cce73dfd01be983196aa57c9626a4a - REF 0c8905e84d16bd5e14ed91e21904fd7ab9d197e2 - SHA512 b38fe86d0dfaacd502971e39ea7df83a3dbf5542711f6b0462b7a6d48dbcf43da07a41a60ee96bca6403a2d2adaac0815a64667f3c80549ca57c5ebbe0e9672d + REF 59f15da55961928b05972d386054fb980bdc8cf0 # v8.2.0-20211013 + SHA512 f6b91f0ad9691d02b04d609d06b9d9aaf30a6e0bb93a5985f9e178128bc3a0b180a3366ecddafab43697fb28c6d0d5e814f99a7bbacad8da4550d3b6ea92bef6 HEAD_REF master - PATCHES - 001-install-libraries.patch ) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA - OPTIONS - -Dbuild_tests=OFF + OPTIONS -Dbuild_cord=OFF - OPTIONS_DEBUG - -Dinstall_headers=OFF + -Denable_threads=OFF # TODO: add libatomic_ops package and turn on threads + OPTIONS_DEBUG + -Dinstall_headers=OFF ) vcpkg_install_cmake() - +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/bdwgc) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/README.QUICK DESTINATION ${CURRENT_PACKAGES_DIR}/share/bdwgc RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index ed88dc2a5ca837..e752f91c0d3310 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,6 +1,5 @@ { "name": "bdwgc", - "version-string": "8.0.4", - "port-version": 2, + "version": "8.2.0", "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)" } diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 4d06f17d3a68f3..50dc59430a4a1b 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea1da0228494df421f826c098fdf574a93afbb66", + "version": "8.2.0", + "port-version": 0 + }, { "git-tree": "5777be074f852a1c7c5920d1cb8639b6fc1659be", "version-string": "8.0.4", diff --git a/versions/baseline.json b/versions/baseline.json index e321afb99daf36..7bd7b5cbfe9242 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -401,8 +401,8 @@ "port-version": 3 }, "bdwgc": { - "baseline": "8.0.4", - "port-version": 2 + "baseline": "8.2.0", + "port-version": 0 }, "beast": { "baseline": "0", From d3e232ab19db6fa725cd0bea8a633975805174b8 Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Thu, 14 Oct 2021 21:08:50 -0400 Subject: [PATCH 0827/1858] [google-cloud-cpp] fix backwards compatibility package files (#20723) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index b8e1012afe3232..08caef6dd6b352 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -63,8 +63,8 @@ foreach(package pubsub_client spanner_client storage_client) - set(config_path "lib/cmake/google_cloud_cpp_${suffix}") - if(NOT IS_DIRECTORY "${config_path}") + set(config_path "lib/cmake/${package}") + if(NOT IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/${config_path}") continue() endif() vcpkg_cmake_config_fixup(PACKAGE_NAME "${package}" diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index 1ef1ea448a8147..b88bfe428dcbc3 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "google-cloud-cpp", "version": "1.32.1", + "port-version": 1, "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 7bd7b5cbfe9242..af499edca8b1be 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2482,7 +2482,7 @@ }, "google-cloud-cpp": { "baseline": "1.32.1", - "port-version": 0 + "port-version": 1 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 2728635df3e800..722c9006d02ac8 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "793c4f8aafbed21274611812020a3a4c01517fc2", + "version": "1.32.1", + "port-version": 1 + }, { "git-tree": "42240e5f4653d8ce17158c706e232de8a57a4c6e", "version": "1.32.1", From 29f115132719497c5c361cfc18f572bbe42ef159 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 15 Oct 2021 03:12:23 +0200 Subject: [PATCH 0828/1858] docs: You can use the msbuild interation with multiple triplets since #19767 (#20717) --- docs/users/manifests.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/users/manifests.md b/docs/users/manifests.md index 0018ff375d4007..89dcc25b30e563 100644 --- a/docs/users/manifests.md +++ b/docs/users/manifests.md @@ -445,14 +445,10 @@ Then, add a vcpkg.json above your project file (such as in the root of your sour property `VcpkgEnableManifest` to `true`. You can set this property via the IDE in `Project Properties -> Vcpkg -> Use Vcpkg Manifest`. -As part of your project's build, vcpkg automatically be run and install any listed dependencies to `vcpkg_installed/` +As part of your project's build, vcpkg automatically be run and install any listed dependencies to `vcpkg_installed/$(VcpkgTriplet)/` adjacent to the `vcpkg.json` file; these files will then automatically be included in and linked to your MSBuild projects. -Note: It is critical that all project files in a single build consuming the same `vcpkg.json` use the same triplet; if -you need to use different triplets for different projects in your solution, they must consume from different -`vcpkg.json` files. - ### Known issues * Visual Studio 2015 does not correctly track edits to the `vcpkg.json` and `vcpkg-configuration.json` files, and will From dfb035943f06c8abc233bb33d020a664ac769102 Mon Sep 17 00:00:00 2001 From: Erik Sohns Date: Fri, 15 Oct 2021 03:13:06 +0200 Subject: [PATCH 0829/1858] [ace] Added missing 'xml' feature implementation (#20032) * added missing 'xml' feature implementation * updated versions * Update version database * small fixes and update version database * merged changes * Update version database * add version-port * update version * fixed [tao] feature * updated version database * forgot to merge this * update version * another small change * update version database * pass the same ACE features to ACEXML as well * update version * fixed zlib feature * update version * fixed x64-windows-static triplet * update version * incorporated requested changes after review * update version * updated "version" string * updated version * use current_install_dir * update version Co-authored-by: Erik Sohns Co-authored-by: Jonliu1993 <13720414433@163.com> Co-authored-by: Billy Robert O'Neal III --- ports/ace/portfile.cmake | 94 ++++++++++++++++++++++++++++++++++++++-- ports/ace/vcpkg.json | 2 +- versions/a-/ace.json | 4 +- 3 files changed, 94 insertions(+), 6 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 239cc279aab484..7cfd84321fcafb 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -118,14 +118,36 @@ vcpkg_execute_build_process( LOGNAME mwc-${TARGET_TRIPLET} ) +if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND ${PERL} ${ACE_ROOT}/bin/mwc.pl -type ${SOLUTION_TYPE} -features "${ACE_FEATURES}" ${ACE_ROOT}/ACEXML/ACEXML.mwc ${MPC_STATIC_FLAG} ${MPC_VALUE_TEMPLATE} + WORKING_DIRECTORY ${ACE_ROOT}/ACEXML + LOGNAME mwc-xml-${TARGET_TRIPLET} + ) +endif() + if(VCPKG_TARGET_IS_WINDOWS) + if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) + file(WRITE ${SOURCE_PATH}/Directory.Build.props " + + + + /MP + ${ACE_ROOT} + + + ${CURRENT_PACKAGES_DIR}/lib;${CURRENT_PACKAGES_DIR}/debug/lib;${CURRENT_INSTALLED_DIR}/lib;${CURRENT_INSTALLED_DIR}/debug/lib + + + ") + endif() + file(RELATIVE_PATH PROJECT_SUBPATH ${SOURCE_PATH} ${WORKSPACE}.sln) vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH ${PROJECT_SUBPATH} LICENSE_SUBPATH COPYING PLATFORM ${MSBUILD_PLATFORM} - USE_VCPKG_INTEGRATION SKIP_CLEAN ) @@ -262,9 +284,24 @@ if(VCPKG_TARGET_IS_WINDOWS) install_includes(${SOURCE_COPY_PATH}/TAO "${TAO_INCLUDE_FOLDERS}") endif() + if("xml" IN_LIST FEATURES) + file(RELATIVE_PATH PROJECT_SUBPATH_XML ${SOURCE_PATH} ${ACE_ROOT}/ACEXML/ACEXML.sln) + vcpkg_install_msbuild( + SOURCE_PATH ${SOURCE_PATH} + PROJECT_SUBPATH ${PROJECT_SUBPATH_XML} + LICENSE_SUBPATH COPYING + PLATFORM ${MSBUILD_PLATFORM} + SKIP_CLEAN + ) + + set(ACEXML_INCLUDE_FOLDERS "ACEXML/common" + "ACEXML/parser/parser") + install_includes(${SOURCE_COPY_PATH} "${ACEXML_INCLUDE_FOLDERS}") + endif() + # Remove dlls without any export - if("tao" IN_LIST FEATURES) - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + if("tao" IN_LIST FEATURES OR "xml" IN_LIST FEATURES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.dll ${CURRENT_PACKAGES_DIR}/bin/ACEXML_XML_Svc_Conf_Parser.pdb @@ -273,6 +310,22 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() + # remove (erroneous) duplicate libs + if("tao" IN_LIST FEATURES) + if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + file(REMOVE + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosconcurrency.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosevent.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_coslifecycle.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosnaming.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosnotification.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_costrading.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_imr_activator.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_imr_locator.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/tao_rtevent.lib) + endif() + endif() + vcpkg_clean_msbuild() elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) FIND_PROGRAM(MAKE make) @@ -296,6 +349,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) WORKING_DIRECTORY ${WORKING_DIR} LOGNAME make-${TARGET_TRIPLET}-dbg ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + LOGNAME make-xml-${TARGET_TRIPLET}-dbg + ) + endif() message(STATUS "Building ${TARGET_TRIPLET}-dbg done") message(STATUS "Packaging ${TARGET_TRIPLET}-dbg") vcpkg_execute_build_process( @@ -303,6 +363,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) WORKING_DIRECTORY ${WORKING_DIR} LOGNAME install-${TARGET_TRIPLET}-dbg ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} install + WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + LOGNAME install-xml-${TARGET_TRIPLET}-dbg + ) + endif() file(COPY ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) @@ -319,6 +386,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) WORKING_DIRECTORY ${WORKING_DIR} LOGNAME realclean-${TARGET_TRIPLET}-dbg ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} realclean + WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg + ) + endif() message(STATUS "Building ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( @@ -326,6 +400,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) WORKING_DIRECTORY ${WORKING_DIR} LOGNAME make-${TARGET_TRIPLET}-rel ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}" + WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + LOGNAME make-xml-${TARGET_TRIPLET}-rel + ) + endif() message(STATUS "Building ${TARGET_TRIPLET}-rel done") message(STATUS "Packaging ${TARGET_TRIPLET}-rel") vcpkg_execute_build_process( @@ -333,6 +414,13 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) WORKING_DIRECTORY ${WORKING_DIR} LOGNAME install-${TARGET_TRIPLET}-rel ) + if("xml" IN_LIST FEATURES) + vcpkg_execute_build_process( + COMMAND make ${_ace_makefile_macros} install + WORKING_DIRECTORY ${WORKING_DIR}/ACEXML + LOGNAME install-xml-${TARGET_TRIPLET}-rel + ) + endif() if("tao" IN_LIST FEATURES) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools) file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tools/${PORT}) diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index dd48feba3030c8..5a77820e02ba04 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,6 +1,6 @@ { "name": "ace", - "version-string": "7.0.3", + "version": "7.0.3", "port-version": 1, "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 8451a8a8c191eb..bac72f23262530 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "5001f42225c6e566471b02dcffeb45467368514a", - "version-string": "7.0.3", + "git-tree": "d4585581f988569d9428b693540dbd6f8305be8d", + "version": "7.0.3", "port-version": 1 }, { From 386863a13629db1db9097234acfce3ced707043d Mon Sep 17 00:00:00 2001 From: Heiko Hund <15199641+d12fk@users.noreply.github.com> Date: Sat, 16 Oct 2021 04:10:32 +0200 Subject: [PATCH 0830/1858] [openssl] fix cross compilation with mingw (#17246) * [openssl] fix cross compilation with mingw When cross compiling openssl on Linux, e.g. ./vcpkg install openssl:x64-mingw-dynamic failed, because 'windres' was not found. The call to openssl's Configure was missing the WINDRES environment variable, which is needed in case it is prefixed. On Ubuntu the binutils-mingw-w64-x86-64 package installed it as /usr/bin/x86_64-w64-mingw32-windres. Since mingw uses openssl-unix to build, it's worth mentioning that the WINDRES env has no impact for non-mingw and is ignored there. * Handle conflicts * Update version files * Update ports/openssl/unix/CMakeLists.txt * Update versions/o-/openssl.json * Update versions/o-/openssl.json Co-authored-by: NancyLi1013 Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/openssl/unix/CMakeLists.txt | 1 + ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index d434cf1f8a6655..be9c23d0032bff 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -167,6 +167,7 @@ if(NOT IOS) COMMAND ${ENV_COMMAND} RANLIB=${CMAKE_RANLIB} COMMAND ${ENV_COMMAND} MAKE=${MAKE} COMMAND ${ENV_COMMAND} MAKEDEPPROG=${CMAKE_C_COMPILER} + COMMAND ${ENV_COMMAND} WINDRES=${CMAKE_RC_COMPILER} VERBATIM APPEND ) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 3a4a62dda2d58e..c1c4e0125c7cd0 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1l", - "port-version": 1, + "port-version": 2, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/versions/baseline.json b/versions/baseline.json index af499edca8b1be..bbd226e9017318 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4902,7 +4902,7 @@ }, "openssl": { "baseline": "1.1.1l", - "port-version": 1 + "port-version": 2 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index caf3958130a9a1..69a54b37451c64 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5310e60291032390ab8c893794f6044a7b9ae04", + "version-string": "1.1.1l", + "port-version": 2 + }, { "git-tree": "6d19a647704efae9398b178a0012140c1f1ee8b8", "version-string": "1.1.1l", From 50839b2986e8bf2d70cc9323c6bc5f5a0f1f8808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Sat, 16 Oct 2021 04:13:00 +0200 Subject: [PATCH 0831/1858] [kf5newstuff] new port (#20198) * Add kf5newstuff port * [kf5newstuff] match the lower case * [kf5*] update to 5.75.0 * [kf5newstuff] convert manifest to JSON * [kf5newstuff] use gettext port * [kf5newstuff] only remove what's needed * [kf5newstuff] wrap paths in quotes * [kf5newstuff] remove unused options * [kf5newstuff] use current spec * [kf5newstuff] use KDE_INSTALL_QMLDIR instead of manual renaming * [kf5newstuff] update to 5.84 * [kf5newstuff] fix versioning * [kf5newstuff] update versions * [kf5newstuff] fix static builds * [kf5newstuff] update versions * [kf5newstuff] fix tool handling on macOS * [kf5newstuff] update versions * [kf5newstuff] fix static builds - continued * [kf5newstuff] update versions * [kf5newstuff] reduce patch size 1/3 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5newstuff] reduce patch size 2/3 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5newstuff] reduce patch size 3/3 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5newstuff] update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5newstuff/fix_static_builds.patch | 49 ++++++++++++++++++++ ports/kf5newstuff/fix_static_builds2.patch | 53 ++++++++++++++++++++++ ports/kf5newstuff/portfile.cmake | 39 ++++++++++++++++ ports/kf5newstuff/vcpkg.json | 40 ++++++++++++++++ versions/baseline.json | 4 ++ versions/k-/kf5newstuff.json | 9 ++++ 6 files changed, 194 insertions(+) create mode 100644 ports/kf5newstuff/fix_static_builds.patch create mode 100644 ports/kf5newstuff/fix_static_builds2.patch create mode 100644 ports/kf5newstuff/portfile.cmake create mode 100644 ports/kf5newstuff/vcpkg.json create mode 100644 versions/k-/kf5newstuff.json diff --git a/ports/kf5newstuff/fix_static_builds.patch b/ports/kf5newstuff/fix_static_builds.patch new file mode 100644 index 00000000000000..a8c8e9727b5994 --- /dev/null +++ b/ports/kf5newstuff/fix_static_builds.patch @@ -0,0 +1,49 @@ +diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in +index e4ef2944..063b83ca 100644 +--- a/KF5NewStuffConfig.cmake.in ++++ b/KF5NewStuffConfig.cmake.in +@@ -10,5 +10,25 @@ find_dependency(KF5Service "@KF_DEP_VERSION@") + find_dependency(KF5NewStuffCore "@KF_VERSION@") + find_dependency(KF5NewStuffQuick "@KF_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Qml @REQUIRED_QT_VERSION@) ++ find_dependency(Qt5Quick @REQUIRED_QT_VERSION@) ++ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) ++ ++ find_dependency(KF5KIO "@KF_DEP_VERSION@") ++ find_dependency(KF5Completion "@KF_DEP_VERSION@") ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") ++ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") ++ find_dependency(KF5TextWidgets "@KF_DEP_VERSION@") ++ find_dependency(KF5Archive "@KF_DEP_VERSION@") ++ find_dependency(KF5Package "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ ++ if(@KF5Syndication_FOUND@) ++ find_dependency(KF5Syndication "@KF_VERSION@") ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c7022663..d2ead74a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ include(KDECMakeSettings) + include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + + set(REQUIRED_QT_VERSION 5.15.0) +-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Xml) ++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui Widgets Xml) + find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE COMPONENTS Qml Quick) + + find_package(KF5Archive ${KF_DEP_VERSION} REQUIRED) +-- +GitLab + diff --git a/ports/kf5newstuff/fix_static_builds2.patch b/ports/kf5newstuff/fix_static_builds2.patch new file mode 100644 index 00000000000000..7d29ff7b556c36 --- /dev/null +++ b/ports/kf5newstuff/fix_static_builds2.patch @@ -0,0 +1,53 @@ +diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in +index 063b83ca..1be53741 100644 +--- a/KF5NewStuffConfig.cmake.in ++++ b/KF5NewStuffConfig.cmake.in +@@ -13,7 +13,6 @@ find_dependency(KF5NewStuffQuick "@KF_VERSION@") + if (NOT @BUILD_SHARED_LIBS@) + find_dependency(Qt5Qml @REQUIRED_QT_VERSION@) + find_dependency(Qt5Quick @REQUIRED_QT_VERSION@) +- find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) + + find_dependency(KF5KIO "@KF_DEP_VERSION@") + find_dependency(KF5Completion "@KF_DEP_VERSION@") +@@ -21,13 +20,6 @@ if (NOT @BUILD_SHARED_LIBS@) + find_dependency(KF5ItemViews "@KF_DEP_VERSION@") + find_dependency(KF5IconThemes "@KF_DEP_VERSION@") + find_dependency(KF5TextWidgets "@KF_DEP_VERSION@") +- find_dependency(KF5Archive "@KF_DEP_VERSION@") +- find_dependency(KF5Package "@KF_DEP_VERSION@") +- find_dependency(KF5Config "@KF_DEP_VERSION@") +- +- if(@KF5Syndication_FOUND@) +- find_dependency(KF5Syndication "@KF_VERSION@") +- endif() + endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake") +diff --git a/KF5NewStuffCoreConfig.cmake.in b/KF5NewStuffCoreConfig.cmake.in +index c65c7c42..b395f8cd 100644 +--- a/KF5NewStuffCoreConfig.cmake.in ++++ b/KF5NewStuffCoreConfig.cmake.in +@@ -3,6 +3,19 @@ + include(CMakeFindDependencyMacro) + find_dependency(KF5Attica "@KF_DEP_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) ++ ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5Archive "@KF_DEP_VERSION@") ++ find_dependency(KF5Package "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ ++ if(@KF5Syndication_FOUND@) ++ find_dependency(KF5Syndication "@KF_VERSION@") ++ endif() ++endif() ++ + set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles") + + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffCoreTargets.cmake") +-- +GitLab + diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake new file mode 100644 index 00000000000000..94ccfb5f1b1c38 --- /dev/null +++ b/ports/kf5newstuff/portfile.cmake @@ -0,0 +1,39 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/knewstuff + REF v5.84.0 + SHA512 107f8c7915f5a7656ed729d03b59e5f53f8751d771487b96e517358f1149801981e27d5cafdf86f759be539305fc8f847c51a28a35947766200cc912072f5c8d + HEAD_REF master + PATCHES + fix_static_builds.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/139 + fix_static_builds2.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/140 +) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml + -DBUNDLE_INSTALL_DIR=bin +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuff CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffCore CONFIG_PATH lib/cmake/KF5NewStuffCore DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffQuick CONFIG_PATH lib/cmake/KF5NewStuffQuick) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES knewstuff-dialog + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json new file mode 100644 index 00000000000000..09551fd9e2c750 --- /dev/null +++ b/ports/kf5newstuff/vcpkg.json @@ -0,0 +1,40 @@ +{ + "name": "kf5newstuff", + "version": "5.84.0", + "description": "Framework for downloading and sharing additional application data", + "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5archive", + "kf5attica", + "kf5completion", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5itemviews", + "kf5kio", + "kf5package", + "kf5service", + "kf5textwidgets", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index bbd226e9017318..a56d19fbd9a185 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3072,6 +3072,10 @@ "baseline": "5.84.0", "port-version": 0 }, + "kf5newstuff": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5notifications": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json new file mode 100644 index 00000000000000..52226138dffa1a --- /dev/null +++ b/versions/k-/kf5newstuff.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "39c986b0766ffb962beb7022b74e1e1037bdc203", + "version": "5.84.0", + "port-version": 0 + } + ] +} From 17470996e1909a7a5f30dbddbb7e6ca4a46b725e Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Sat, 16 Oct 2021 04:14:06 +0200 Subject: [PATCH 0832/1858] [mapnik] update port (#20557) * update to latest commit * remove demo feature * update to latest * fix pkgconfig * speed up copy tools * update mapnik * update sha * remove debug messages * update version * add coretext to harfbuzz for osx * version * [skip actions] Trigger CI * fix issue on macos * version database * apply ras0219-msft suggestions * remove core * version * version * [skip actions] Trigger CI * test latest commit * v * update to latest * version * update to latest master * version * revert portfile.cmake format * update version Co-authored-by: nicole mazzuca Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/mapnik/portfile.cmake | 50 ++++++++++++++++++------------------- ports/mapnik/usage | 4 +-- ports/mapnik/use-proj.patch | 28 --------------------- ports/mapnik/vcpkg.json | 13 ++++++---- versions/baseline.json | 4 +-- versions/m-/mapnik.json | 5 ++++ 6 files changed, 41 insertions(+), 63 deletions(-) delete mode 100644 ports/mapnik/use-proj.patch diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index bc19d4ab9641b7..307f8d5bbc86d1 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 1ccbbf95b5e7bf254ab5b4dc21bdc373978c36a1 - SHA512 21b4fc6e64d9b53550a046c5c9bcc32524324d7df39816b74b23a7ce2a64c4eeb291ad1c1aa09a3d5d79158f889ba8b7182cd0bf3435c39d1f17f33e4ffdce05 + REF 0edb018465790cd156d6849557fa7fd568755ebb + SHA512 cd6180b96dbfbc1bafbc8f2a4ff2091a0e8c0c42b0569ef83640ad1f5766ff74ea95f8c6cef53f879396cbceebc6396c1a977676eca67c401b8e145a9ceae7e2 HEAD_REF master - PATCHES - use-proj.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -34,7 +32,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "input-sqlite" USE_PLUGIN_INPUT_SQLITE "input-topojson" USE_PLUGIN_INPUT_TOPOJSON "viewer" BUILD_DEMO_VIEWER - "demo" BUILD_DEMO_CPP "utility-geometry-to-wkb" BUILD_UTILITY_GEOMETRY_TO_WKB "utility-mapnik-index" BUILD_UTILITY_MAPNIK_INDEX "utility-mapnik-render" BUILD_UTILITY_MAPNIK_RENDER @@ -53,61 +50,64 @@ vcpkg_cmake_configure( -DINSTALL_DEPENDENCIES=OFF -DBUILD_TEST=OFF -DBUILD_BENCHMARK=OFF + -DBUILD_DEMO_CPP=OFF -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON -DUSE_EXTERNAL_MAPBOX_POLYLABEL=ON -DUSE_EXTERNAL_MAPBOX_PROTOZERO=ON -DUSE_EXTERNAL_MAPBOX_VARIANT=ON - -DINSTALL_CMAKE_DIR=share/mapnik/cmake + -DMAPNIK_CMAKE_DIR=share/mapnik/cmake -DFONTS_INSTALL_DIR=share/mapnik/fonts + -DMAPNIK_PKGCONF_DIR=lib/pkgconfig ) vcpkg_cmake_install() - # copy plugins into tool path, if any plugin is installed if(IS_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin/plugins") - file(COPY "${CURRENT_PACKAGES_DIR}/bin/plugins" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + file(COPY "${CURRENT_PACKAGES_DIR}/bin/plugins" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") endif() vcpkg_copy_pdbs() -if("demo" IN_LIST FEATURES) - file(COPY "${SOURCE_PATH}/demo/data" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/demo") - vcpkg_copy_tools(TOOL_NAMES mapnik-demo AUTO_CLEAN) -endif() - +set(_tool_names "") if("viewer" IN_LIST FEATURES) - # copy the ini file to reference the plugins correctly - file(COPY "${CURRENT_PACKAGES_DIR}/bin/viewer.ini" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - vcpkg_copy_tools(TOOL_NAMES mapnik-viewer AUTO_CLEAN) + # copy the ini file to reference the plugins correctly + file(COPY "${CURRENT_PACKAGES_DIR}/bin/viewer.ini" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + list(APPEND _tool_names mapnik-viewer) endif() if("utility-geometry-to-wkb" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES geometry_to_wkb AUTO_CLEAN) + list(APPEND _tool_names geometry_to_wkb) endif() if("utility-mapnik-index" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES mapnik-index AUTO_CLEAN) + list(APPEND _tool_names mapnik-index) endif() if("utility-mapnik-render" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES mapnik-render AUTO_CLEAN) + list(APPEND _tool_names mapnik-render) endif() if("utility-ogrindex" IN_LIST FEATURES) - # build is currently not supported - # vcpkg_copy_tools(TOOL_NAMES ogrindex AUTO_CLEAN) + # build is currently not supported + # vcpkg_copy_tools(TOOL_NAMES ogrindex AUTO_CLEAN) endif() if("utility-pgsql2sqlite" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES pgsql2sqlite AUTO_CLEAN) + list(APPEND _tool_names pgsql2sqlite) endif() if("utility-shapeindex" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES shapeindex AUTO_CLEAN) + list(APPEND _tool_names shapeindex) endif() if("utility-svg2png" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES svg2png AUTO_CLEAN) + list(APPEND _tool_names svg2png) +endif() +if(_tool_names) + vcpkg_copy_tools(TOOL_NAMES ${_tool_names} AUTO_CLEAN) endif() - vcpkg_cmake_config_fixup(CONFIG_PATH share/mapnik/cmake) +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/mapnik/mapnikPlugins-debug.cmake" "set(MAPNIK_PLUGINS_DIR_DEBUG \"\${PACKAGE_PREFIX_DIR}/debug/bin/mapnik/input\" CACHE STRING \"\")") + file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${SOURCE_PATH}/fonts/unifont_license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME fonts_copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mapnik/usage b/ports/mapnik/usage index 3bd0f4a014c75d..40583046082701 100644 --- a/ports/mapnik/usage +++ b/ports/mapnik/usage @@ -4,6 +4,4 @@ The package mapnik provides CMake targets: target_link_libraries(main PRIVATE mapnik::mapnik mapnik::json mapnik::wkt) If you only need the compile definitions without any sources, use target mapnik::core. - -If any plugins were installed, the variable ${MAPNIK_PLUGINS_DIR} contains the plugin directory -Fonts are available with the variable ${MAPNIK_FONTS_DIR} +If any plugins were installed, call the function `mapnik_find_plugin_dir(MAPNIK_PLUGIN_DIR)` to get the plugin installation folder for the currently used configuration. See the docs for more information. diff --git a/ports/mapnik/use-proj.patch b/ports/mapnik/use-proj.patch deleted file mode 100644 index 35e588e37fc494..00000000000000 --- a/ports/mapnik/use-proj.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 54dda37..e82a817 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -254,21 +254,21 @@ endif() - - if(USE_PROJ) - #https://proj.org/development/cmake.html - mapnik_find_package(PROJ QUIET) - # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config - if(NOT PROJ_FOUND) - message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...") - pkg_check_modules(PROJ REQUIRED IMPORTED_TARGET proj) - string(REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _dummy "${PROJ_VERSION}") - set(PROJ_VERSION_MAJOR "${CMAKE_MATCH_1}") - set(PROJ_VERSION_MINOR "${CMAKE_MATCH_2}") - set(PROJ_VERSION_PATCH "${CMAKE_MATCH_3}") - endif() - math(EXPR MAPNIK_PROJ_VERSION "${PROJ_VERSION_MAJOR}*10000 + ${PROJ_VERSION_MINOR}*100 + ${PROJ_VERSION_PATCH}" OUTPUT_FORMAT DECIMAL) - message(STATUS "Using mapnik PROJ version: ${MAPNIK_PROJ_VERSION}") - list(APPEND MAPNIK_COMPILE_DEFS MAPNIK_USE_PROJ MAPNIK_PROJ_VERSION=${MAPNIK_PROJ_VERSION}) -- list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) -- list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) -+ list(APPEND MAPNIK_OPTIONAL_LIBS ${PROJ_LIBRARIES}) -+ # list(APPEND MAPNIK_OPTIONAL_LIBS_INCLUDE ${PROJ_INCLUDE_DIRS}) # this adds some non existent directory when building with vcpgk -> commented out - endif() - - if(USE_GRID_RENDERER) diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index b9f2c7d4a1fac6..0dce76d7ae15e7 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mapnik", - "version-date": "2021-09-15", - "port-version": 1, + "version-date": "2021-10-13", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", @@ -41,6 +40,13 @@ "icu" ] }, + { + "name": "harfbuzz", + "features": [ + "coretext" + ], + "platform": "osx" + }, "icu", "mapbox-geometry", "mapbox-polylabel", @@ -73,9 +79,6 @@ "cairomm" ] }, - "demo": { - "description": "Make demo application" - }, "grid-renderer": { "description": "Grid renderer" }, diff --git a/versions/baseline.json b/versions/baseline.json index a56d19fbd9a185..48fd0e34ea0ec7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4177,8 +4177,8 @@ "port-version": 0 }, "mapnik": { - "baseline": "2021-09-15", - "port-version": 1 + "baseline": "2021-10-13", + "port-version": 0 }, "marble": { "baseline": "19.08.2", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 1445956f5a7ff5..66d2bbbc16682e 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7f061c560ab0a4c5c137f88ab43826c05ece6ad", + "version-date": "2021-10-13", + "port-version": 0 + }, { "git-tree": "d75a684e7f654d0fc2485c4fa501a8821056c92b", "version-date": "2021-09-15", From 51b35b56c03f65b7b56bc11b0a4ea7f82d26f546 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Sat, 16 Oct 2021 04:18:51 +0200 Subject: [PATCH 0833/1858] [hiredis] Update to 1.0.2 (#20724) * Update hiredis to 1.0.2 * Update CI baseline * Fix static builds of examples * Update git-tree hash Co-authored-by: chausner --- ports/hiredis/fix-feature-example.patch | 11 +++-------- ports/hiredis/fix-ssize_t.patch | 11 +++++++++++ ports/hiredis/portfile.cmake | 25 +++++++++++++------------ ports/hiredis/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 4 ++-- versions/h-/hiredis.json | 5 +++++ 6 files changed, 46 insertions(+), 24 deletions(-) create mode 100644 ports/hiredis/fix-ssize_t.patch diff --git a/ports/hiredis/fix-feature-example.patch b/ports/hiredis/fix-feature-example.patch index 2e5259930f2c67..eecca4086bfa9f 100644 --- a/ports/hiredis/fix-feature-example.patch +++ b/ports/hiredis/fix-feature-example.patch @@ -2,7 +2,7 @@ diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index dd3a313..8c69d3a 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt -@@ -19,16 +19,30 @@ if (LIBEV) +@@ -19,16 +19,25 @@ if (LIBEV) TARGET_LINK_LIBRARIES(example-libev hiredis ev) ENDIF() @@ -10,15 +10,10 @@ index dd3a313..8c69d3a 100644 -if (LIBEVENT) +FIND_PACKAGE(Libevent CONFIG REQUIRED) +FIND_PATH(LIBEVENT_INCLUDES evutil.h) -+if (BUILD_SHARED_LIBS) -+ set(LIBEVENT_LIBS ${LIBEVENT_SHARED_LIBRARIES}) -+else() -+ set(LIBEVENT_LIBS ${LIBEVENT_STATIC_LIBRARIES}) -+endif() +if (UNIX) ADD_EXECUTABLE(example-libevent example-libevent) - TARGET_LINK_LIBRARIES(example-libevent hiredis event) -+ TARGET_LINK_LIBRARIES(example-libevent hiredis ${LIBEVENT_LIBS}) ++ TARGET_LINK_LIBRARIES(example-libevent hiredis ${LIBEVENT_LIBRARIES}) + TARGET_INCLUDE_DIRECTORIES(example-libevent PRIVATE ${LIBEVENT_INCLUDES}) ENDIF() @@ -60,7 +55,7 @@ index dd3a313..8c69d3a 100644 ADD_EXECUTABLE(example example.c) -TARGET_LINK_LIBRARIES(example hiredis) -+TARGET_LINK_LIBRARIES(example hiredis ${LIBEVENT_LIBS}) ++TARGET_LINK_LIBRARIES(example hiredis ${LIBEVENT_LIBRARIES}) ADD_EXECUTABLE(example-push example-push.c) TARGET_LINK_LIBRARIES(example-push hiredis) diff --git a/ports/hiredis/fix-ssize_t.patch b/ports/hiredis/fix-ssize_t.patch new file mode 100644 index 00000000000000..521313a687a8d4 --- /dev/null +++ b/ports/hiredis/fix-ssize_t.patch @@ -0,0 +1,11 @@ +diff --git a/hiredis.h b/hiredis.h +--- a/hiredis.h ++++ b/hiredis.h +@@ -40,6 +40,7 @@ + #else + struct timeval; /* forward declaration */ + typedef long long ssize_t; ++#define _SSIZE_T_ /* for compatibility with libuv */ + #endif + #include /* uintXX_t, etc */ + #include "sds.h" /* for sds */ diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index d0b273c77197c4..ebd8179b34c0b3 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -5,36 +5,37 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redis/hiredis - REF v1.0.0 - SHA512 eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69 + REF v1.0.2 + SHA512 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b HEAD_REF master PATCHES fix-feature-example.patch support-static-in-win.patch fix-timeval.patch fix-include-path.patch + fix-ssize_t.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - ssl ENABLE_SSL - example ENABLE_EXAMPLES + FEATURES + ssl ENABLE_SSL + example ENABLE_EXAMPLES ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() if("ssl" IN_LIST FEATURES) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/hiredis_ssl TARGET_PATH share/hiredis_ssl) + vcpkg_cmake_config_fixup(PACKAGE_NAME hiredis_ssl CONFIG_PATH share/hiredis_ssl) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index 862214eb8b0944..68627dc901681a 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,9 +1,19 @@ { "name": "hiredis", - "version": "1.0.0", - "port-version": 1, + "version": "1.0.2", "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", + "supports": "!(windows & !static)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "example": { "description": "Build example", diff --git a/versions/baseline.json b/versions/baseline.json index 48fd0e34ea0ec7..a305901fe9651f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2657,8 +2657,8 @@ "port-version": 0 }, "hiredis": { - "baseline": "1.0.0", - "port-version": 1 + "baseline": "1.0.2", + "port-version": 0 }, "hpx": { "baseline": "1.7.1", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index 50d4361ee4c3eb..92fd218b8065a0 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "934af68bcc045c77d7b46cef46b6a8cdf97ce2b8", + "version": "1.0.2", + "port-version": 0 + }, { "git-tree": "3ce136eecabedaebd15eb4a454c2ecf89f90e9c3", "version": "1.0.0", From 8743d1bb75f986fc460f5dd506081fee4a1f2e9a Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 15 Oct 2021 19:20:07 -0700 Subject: [PATCH 0834/1858] Add data lifecycle management to binary caching docs (#20733) ... as suggested by Robert @ras0219 / @ras0219-msft --- docs/users/binarycaching.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/users/binarycaching.md b/docs/users/binarycaching.md index b058a6bf63c21f..c37fd96fd82435 100644 --- a/docs/users/binarycaching.md +++ b/docs/users/binarycaching.md @@ -10,7 +10,7 @@ Binary caching is especially effective when using Continuous Integration, since Caches can be hosted in a variety of environments. The most basic examples are a folder on the local machine or a network file share. Caches can also be stored in any NuGet feed (such as GitHub or Azure DevOps Artifacts), Azure Blob Storage*, or Google Cloud Storage*. -\* (experimental) +\* (experimental) If your CI provider offers a native "caching" function, we recommend using both vcpkg binary caching and the native method for the most performant results. @@ -131,7 +131,7 @@ Next, you will need to create a feed for your project; see the [Azure DevOps Art variables: - name: VCPKG_BINARY_SOURCES value: 'clear;nuget,,readwrite' - + steps: # Remember to add this task to allow vcpkg to upload archives via NuGet - task: NuGetAuthenticate@0 @@ -171,6 +171,8 @@ Vcpkg will attempt to avoid revealing the SAS during normal operations, however: 1. It will be printed in full if `--debug` is passed 2. It will be passed as a command line parameter to subprocesses, such as `curl.exe` +Azure Blob Storage includes a feature to remove cache entries that haven't been accessed in a given number of days which can be used to reduce the size of your cache. See [Data Lifecycle Management on Microsoft Docs](https://docs.microsoft.com/en-us/azure/storage/blobs/lifecycle-management-overview) for more information, or look for "Data management > Lifecycle management" in the Azure Portal for your storage account. If you wish to be able to be resilient to upstream libraries' servers but still want to remove entries from the binary cache, consider using [asset caching](assetcaching.md#x-azurl) in a different storage account without a lifecycle management policy. + ### Google Cloud Storage (experimental) > Note: This is an experimental feature and may change or be removed at any time From f89b0a380dfa72aab42451bbc18f359aa5733762 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 15 Oct 2021 19:23:14 -0700 Subject: [PATCH 0835/1858] [easyhook] Use /Z7 rather than /Zi to avoid mspdbsrv crashes. (#20757) --- ports/easyhook/portfile.cmake | 13 ++++++++++++- ports/easyhook/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/easyhook.json | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index 378c2d5d04736f..554146281841e6 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -19,10 +19,21 @@ else() message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() +# Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" +foreach(VCXPROJ IN ITEMS + "${SOURCE_PATH}/EasyHookDll/EasyHookDll.vcxproj" + "${SOURCE_PATH}/Examples/UnmanagedHook/UnmanagedHook.vcxproj") + vcpkg_replace_string( + "${VCXPROJ}" + "ProgramDatabase" + "OldStyle" + ) +endforeach() + vcpkg_install_msbuild( SOURCE_PATH ${SOURCE_PATH} PROJECT_SUBPATH EasyHook.sln - TARGET EasyHookDll + TARGET EasyHookDll RELEASE_CONFIGURATION "netfx4-Release" DEBUG_CONFIGURATION "netfx4-Debug" PLATFORM ${BUILD_ARCH} diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json index 3a9e6c00cd9265..aa8e430409854c 100644 --- a/ports/easyhook/vcpkg.json +++ b/ports/easyhook/vcpkg.json @@ -1,6 +1,7 @@ { "name": "easyhook", "version": "2.7.7097.0", + "port-version": 1, "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", "supports": "windows & !(static | arm | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index a305901fe9651f..8f6d1c93f23188 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1922,7 +1922,7 @@ }, "easyhook": { "baseline": "2.7.7097.0", - "port-version": 0 + "port-version": 1 }, "easyloggingpp": { "baseline": "9.97.0", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index 0e249a7e076bee..6531b3b3865e5f 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5dc14a4f006221297cad1ea84143aeae33f30284", + "version": "2.7.7097.0", + "port-version": 1 + }, { "git-tree": "efa456841ef4446343c908f3ed36217b7a1d75a3", "version": "2.7.7097.0", From 8e09931350ac3d24aea15dc9ed6deb0877877908 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 15 Oct 2021 19:24:21 -0700 Subject: [PATCH 0836/1858] [vcpkg baseline][libosip2] Use /Z7 rather than /Zi to avoid mspdbsrv crashes. (#20758) * [libosip2] Use /Z7 rather than /Zi to avoid mspdbsrv crashes. * Fix version database --- ports/libosip2/portfile.cmake | 36 +++++++++++++++++++++-------------- ports/libosip2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libosip2.json | 5 +++++ 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/ports/libosip2/portfile.cmake b/ports/libosip2/portfile.cmake index bf3fdc5384345d..c46102a6563db4 100644 --- a/ports/libosip2/portfile.cmake +++ b/ports/libosip2/portfile.cmake @@ -6,27 +6,39 @@ vcpkg_download_distfile(ARCHIVE SHA512 cc714ab5669c466ee8f0de78cf74a8b7633f3089bf104c9c1474326840db3d791270159456f9deb877af2df346b04493e8f796b2bb7d2be134f6c08b25a29f83 ) +set(PATCHES) if(VCPKG_TARGET_IS_WINDOWS) list(APPEND PATCHES fix-path-in-project.patch) endif() vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" OUT_SOURCE_PATH SOURCE_PATH PATCHES ${PATCHES} ) -if(VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_TARGET_IS_WINDOWS) vcpkg_fail_port_install(ON_ARCH "arm" "arm64") - + + # Use /Z7 rather than /Zi to avoid "fatal error C1090: PDB API call failed, error code '23': (0x00000006)" + foreach(VCXPROJ IN ITEMS + "${SOURCE_PATH}/platform/vsnet/osip2.vcxproj" + "${SOURCE_PATH}/platform/vsnet/osipparser2.vcxproj") + vcpkg_replace_string( + "${VCXPROJ}" + "ProgramDatabase" + "OldStyle" + ) + endforeach() + vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "platform/vsnet/osip2.vcxproj" INCLUDES_SUBPATH include USE_VCPKG_INTEGRATION - REMOVE_ROOT_INCLUDES + REMOVE_ROOT_INCLUDES ) - + vcpkg_install_msbuild( SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH "platform/vsnet/osipparser2.vcxproj" @@ -34,18 +46,14 @@ if(VCPKG_TARGET_IS_WINDOWS) ) elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${OPTIONS} - ) - + vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}") vcpkg_install_make() vcpkg_fixup_pkgconfig() - - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libosip2/vcpkg.json b/ports/libosip2/vcpkg.json index e7c34ef99b37bb..8b3d9ecc804f7e 100644 --- a/ports/libosip2/vcpkg.json +++ b/ports/libosip2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libosip2", "version": "5.2.0", + "port-version": 1, "description": "oSIP is an LGPL implementation of SIP. It's stable, portable, flexible and compliant! -may be more-! It is used mostly with eXosip2 stack (GPL) which provides simpler API for User-Agent implementation.", "homepage": "https://www.gnu.org/software/osip/", "supports": "!(windows & arm)", diff --git a/versions/baseline.json b/versions/baseline.json index 8f6d1c93f23188..8dbe4d97815c99 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3662,7 +3662,7 @@ }, "libosip2": { "baseline": "5.2.0", - "port-version": 0 + "port-version": 1 }, "libosmium": { "baseline": "2.17.0", diff --git a/versions/l-/libosip2.json b/versions/l-/libosip2.json index 236338329efda8..b3dd2aa3420762 100644 --- a/versions/l-/libosip2.json +++ b/versions/l-/libosip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "918421395ccee5a5d894f2720b4a779369eb0f97", + "version": "5.2.0", + "port-version": 1 + }, { "git-tree": "468e53f1a4709f0b1b2b83efe23a2a4bc9dd63c2", "version": "5.2.0", From 0ac28caf2c8d2632357988132b03f8aed467665a Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 16 Oct 2021 10:27:54 +0800 Subject: [PATCH 0837/1858] [libwebsockets] remove restriction for arm platform (#20738) * [libwebsockets] remove restriction for arm platform * format vcpkg.json * update version --- ports/libwebsockets/portfile.cmake | 2 +- ports/libwebsockets/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/l-/libwebsockets.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index f01ef280f4ab3d..29692ab0771cdd 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index 677e02c2e54785..8d993fee9af96e 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,10 +1,10 @@ { "name": "libwebsockets", "version-semver": "4.2.2", - "port-version": 1, + "port-version": 2, "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", - "supports": "!(arm | uwp)", + "supports": "!uwp", "dependencies": [ "libuv", "openssl", diff --git a/versions/baseline.json b/versions/baseline.json index 8dbe4d97815c99..cf185ea4ca1661 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3966,7 +3966,7 @@ }, "libwebsockets": { "baseline": "4.2.2", - "port-version": 1 + "port-version": 2 }, "libxdiff": { "baseline": "0.23", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index 4d2d9b9d75f4b4..54c474063fd05e 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea372a08d75d1a3a7c37a99b1daf9e85ba017ccf", + "version-semver": "4.2.2", + "port-version": 2 + }, { "git-tree": "30615e7ce9a1ce09d473a05260da695fb0ee56d3", "version-semver": "4.2.2", From 5c0a1554aa2a076220ddd4aa076677def61f6ff6 Mon Sep 17 00:00:00 2001 From: Luca Schlecker Date: Sat, 16 Oct 2021 04:28:24 +0200 Subject: [PATCH 0838/1858] [crow] update to 0.3.3 (v0.3+3) (#20766) Signed-off-by: Luca Schlecker --- ports/crow/portfile.cmake | 4 ++-- ports/crow/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/c-/crow.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/crow/portfile.cmake b/ports/crow/portfile.cmake index ea9d0f80b71994..c1b710fffeea44 100644 --- a/ports/crow/portfile.cmake +++ b/ports/crow/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CrowCpp/crow - REF 7e47d4c7ee548c5fd954efd82cfeed330a7823ea #0.3+2 - SHA512 47822ccdfb259a65bde8fed0c29bb8e58bc2f29896ff186c03098eb897985307e7477aa03808a42db01df245054411f05f95c6d9ae6477d75dd94399af3bb130 + REF a166a6d3cb08b10e9b00b57fd2216b9c4329d4e6 #0.3+3 + SHA512 5a32f66c96376c9c17f82492a7bc6f77417aa9dd808c082a2aeae983d05e895c27c2a01c46f8b5fdf9d30267ad14e8ba64a629ba354dce6ce0f7a2ff5d0a7fb2 FILE_DISAMBIGUATOR 1 HEAD_REF master ) diff --git a/ports/crow/vcpkg.json b/ports/crow/vcpkg.json index 0e75a7943ecf29..dc57251d7c302f 100644 --- a/ports/crow/vcpkg.json +++ b/ports/crow/vcpkg.json @@ -1,7 +1,6 @@ { "name": "crow", - "version": "0.3.2", - "port-version": 1, + "version": "0.3.3", "description": "Very fast and easy to use C++ micro web framework", "homepage": "https://github.com/CrowCpp/crow" } diff --git a/versions/baseline.json b/versions/baseline.json index cf185ea4ca1661..e0ca3c5561ed48 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1629,8 +1629,8 @@ "port-version": 2 }, "crow": { - "baseline": "0.3.2", - "port-version": 1 + "baseline": "0.3.3", + "port-version": 0 }, "cryptopp": { "baseline": "8.5.0", diff --git a/versions/c-/crow.json b/versions/c-/crow.json index 1a27e804d6998e..2a3174ddd2a319 100644 --- a/versions/c-/crow.json +++ b/versions/c-/crow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a843201119b89aaf74f30b1b74e1309b71ce0310", + "version": "0.3.3", + "port-version": 0 + }, { "git-tree": "d2719e110ecca722270c61d66f274dee1a1eb1e4", "version": "0.3.2", From 65c4cc0162e34ed32078a036850b57ca879068b8 Mon Sep 17 00:00:00 2001 From: Be Date: Fri, 15 Oct 2021 21:29:26 -0500 Subject: [PATCH 0839/1858] [soundtouch] switch download to Codeberg (#20747) https://gitlab.com/soundtouch/ has been banned from GitLab.com without explanation. The maintainer moved the repository to https://codeberg.org/soundtouch/soundtouch/ --- ports/soundtouch/portfile.cmake | 6 +++--- ports/soundtouch/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/soundtouch.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/soundtouch/portfile.cmake b/ports/soundtouch/portfile.cmake index 609876d88a6e0f..36217c43bea3a3 100644 --- a/ports/soundtouch/portfile.cmake +++ b/ports/soundtouch/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_fail_port_install(ON_TARGET "UWP") -vcpkg_from_gitlab( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - GITLAB_URL https://gitlab.com + GITHUB_HOST https://codeberg.org REPO soundtouch/soundtouch REF 2.3.1 - SHA512 1eea5c06dc5af633b5c16902c6a951593190daf75bd6aa12e00c745080f9363e9c45ab52ddc434bd905e4195b306cc38c9143e813430c15c19a275ae1a82df24 + SHA512 c9d110b06cafb79968c94c4d206360b9ea9673d63eaf1470b097a39acf18b5b9cd53759f2656ff8963c6eee6a36fecdf1ea9aa7dc014fbf8bbee0dcfb8e4e438 HEAD_REF master ) diff --git a/ports/soundtouch/vcpkg.json b/ports/soundtouch/vcpkg.json index a16786f0378806..5bfd5d29530da6 100644 --- a/ports/soundtouch/vcpkg.json +++ b/ports/soundtouch/vcpkg.json @@ -1,6 +1,7 @@ { "name": "soundtouch", "version": "2.3.1", + "port-version": 1, "description": "SoundTouch is an open-source audio processing library for changing the Tempo, Pitch and Playback Rates of audio streams or audio files.", "homepage": "https://www.surina.net/soundtouch", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index e0ca3c5561ed48..df7b62783af00b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6286,7 +6286,7 @@ }, "soundtouch": { "baseline": "2.3.1", - "port-version": 0 + "port-version": 1 }, "soxr": { "baseline": "0.1.3", diff --git a/versions/s-/soundtouch.json b/versions/s-/soundtouch.json index 330e1d1a549798..81b7f378c52056 100644 --- a/versions/s-/soundtouch.json +++ b/versions/s-/soundtouch.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a91341e5eb80526c64b263e5b10e0a6c800daa7e", + "version": "2.3.1", + "port-version": 1 + }, { "git-tree": "8b6b644eb3ae55d7e56413e9cd88ca5ccc814c33", "version": "2.3.1", From 2cc4add58ad1d2243fe6b3211b374a3f7afd53c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 16 Oct 2021 10:32:08 +0800 Subject: [PATCH 0840/1858] [vcpkg baseline][gstreamer] Disable feature pango (#20737) * [vcpkg baseline][gstreamer] Disable feature pango * version --- ports/gstreamer/portfile.cmake | 1 + ports/gstreamer/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gstreamer.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake index 3aecf5c297ccee..20d94fef7842a2 100644 --- a/ports/gstreamer/portfile.cmake +++ b/ports/gstreamer/portfile.cmake @@ -147,6 +147,7 @@ vcpkg_configure_meson( -Dgst-plugins-base:introspection=disabled -Dgst-plugins-base:nls=disabled -Dgst-plugins-base:orc=disabled + -Dgst-plugins-base:pango=disabled # gst-plugins-good -Dgst-plugins-good:default_library=${LIBRARY_LINKAGE} -Dgst-plugins-good:qt5=disabled diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json index 7d3c171cb12fbc..d6d984817953b5 100644 --- a/ports/gstreamer/vcpkg.json +++ b/ports/gstreamer/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gstreamer", "version": "1.19.2", + "port-version": 1, "description": "GStreamer open-source multimedia framework core library", "homepage": "https://gstreamer.freedesktop.org/", "license": "LGPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index df7b62783af00b..1c3decd46c6b8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2562,7 +2562,7 @@ }, "gstreamer": { "baseline": "1.19.2", - "port-version": 0 + "port-version": 1 }, "gtest": { "baseline": "1.11.0", diff --git a/versions/g-/gstreamer.json b/versions/g-/gstreamer.json index d936260486d824..c4906802ae6d42 100644 --- a/versions/g-/gstreamer.json +++ b/versions/g-/gstreamer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e1e058b933a63ff71eeaa2a7a59fa713d0ba51b", + "version": "1.19.2", + "port-version": 1 + }, { "git-tree": "25482bf1d9dd85257c13e394b45745f77a29bf51", "version": "1.19.2", From ede74b3fa831e00e15d3cce17cb8f55bd5a56abb Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Fri, 15 Oct 2021 19:34:23 -0700 Subject: [PATCH 0841/1858] [directxtex, directxtk, directxtk12] port updates for October 2021 releases (#20760) * [directxtex, directxtk, directxtk12] ports updated * Updated port version * add path double quotes * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/directxtex/portfile.cmake | 35 ++++++++++++++++---------------- ports/directxtex/vcpkg.json | 12 +++++++++-- ports/directxtk/portfile.cmake | 35 ++++++++++++++++---------------- ports/directxtk/vcpkg.json | 12 +++++++++-- ports/directxtk12/portfile.cmake | 33 +++++++++++++++--------------- ports/directxtk12/vcpkg.json | 12 +++++++++-- versions/baseline.json | 6 +++--- versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ 10 files changed, 98 insertions(+), 62 deletions(-) diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 08b59649fb8c6f..9c7419241533e0 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF sept2021 - SHA512 5fe5ed64fd58d9b881b186d3ca0fcac7980afc214eb219f842607d4b868b14c1411613a46d74d3cd9ab242d533dfa0ac8c181d083391c665a4577e4c3b931100 + REF oct2021 + SHA512 3fc1f8267a4708babe91e94f2062cd9d475b3682273e5c4f704cdb6093a5aae269cf573ad75fdd3dce59a6a79e6892a4cf5630a3160257e542edde9eb9dbb51a HEAD_REF master ) @@ -25,11 +25,11 @@ if("openexr" IN_LIST FEATURES) SHA512 fbf5a330961f3ac80e4425e8451e9a696240cd89fabca744a19f1f110ae188bae7d8eb5b058aaf66015066d919d4f581b14494d78d280147b23355d8a32745b9 ) - file(COPY ${DIRECTXTEX_EXR_HEADER} DESTINATION ${SOURCE_PATH}/DirectXTex) - file(COPY ${DIRECTXTEX_EXR_SOURCE} DESTINATION ${SOURCE_PATH}/DirectXTex) - file(RENAME ${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.h ${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h) - file(RENAME ${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.cpp ${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp) - vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES enable_openexr_support.patch) + file(COPY ${DIRECTXTEX_EXR_HEADER} DESTINATION "${SOURCE_PATH}/DirectXTex") + file(COPY ${DIRECTXTEX_EXR_SOURCE} DESTINATION "${SOURCE_PATH}/DirectXTex") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.h" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.h") + file(RENAME "${SOURCE_PATH}/DirectXTex/DirectXTexEXR-2.cpp" "${SOURCE_PATH}/DirectXTex/DirectXTexEXR.cpp") + vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}" PATCHES enable_openexr_support.patch) endif() vcpkg_check_features( @@ -49,9 +49,8 @@ else() set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} @@ -59,8 +58,8 @@ vcpkg_configure_cmake( -DBUILD_DX11=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( @@ -90,21 +89,21 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXASSEMBLE_EXE} ${TEXCONV_EXE} ${TEXDIAG_EXE} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtex/) + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe) + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-sept2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-sept2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-sept2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) vcpkg_copy_tools( TOOL_NAMES texassemble texconv texdiag - SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake" ) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 05b5775c61a770..688da8e0502457 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-string": "sept2021", + "version-string": "oct2021", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", @@ -8,7 +8,15 @@ "supports": "windows | linux", "dependencies": [ "directx-headers", - "directxmath" + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "dx12": { diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 528615e6159553..e13516d8f12cb2 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF sept2021 - SHA512 57fb4cf54b09abee87ff2471c1b504b071a9d3229a09d01d5de58fa3e8bfc956262f21ace88cf05b13f4ff4184b2f7c3b018f9b95d0cac55825c4e3c6549ee89 + REF oct2021 + SHA512 5203ca6fe479359615e9d775d3e378669d1fbbb828915ed6b475d58e85f597cbbdbe23425e3c77df33291a806a3865131e7c1d1001ec92f16747958f3cf251bf HEAD_REF master ) @@ -24,28 +24,27 @@ else() set(EXTRA_OPTIONS -DBUILD_TOOLS=ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ${EXTRA_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/sept2021/MakeSpriteFont.exe" - FILENAME "makespritefont-sept2021.exe" - SHA512 a22ec8e7d283585574a5aec82c937c2844e89e66ded01fea92bb278beb7ff32c8070fa3016192029ed8c106db7ef0356f867521a2603a4de7c085cd8db693d0a + URLS "https://github.com/Microsoft/DirectXTK/releases/download/oct2021/MakeSpriteFont.exe" + FILENAME "makespritefont-oct2021.exe" + SHA512 abff446bfd4cbddbca45816ec3a2230e52d9afb81c100966e4bce7e52a6e02620fd8cdcb416943090564885f63d33c4a246f43ff585c8f5686c2c9877ec50698 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/sept2021/XWBTool.exe" - FILENAME "xwbtool-sept2021.exe" - SHA512 40f33af95bfdaf60a41564dc347d51768774ad7caa8529046e3f87256e80e165aa124b21193d0ffa1e94644343006d6de01807df317dfdf13377a31275b973ef + URLS "https://github.com/Microsoft/DirectXTK/releases/download/oct2021/XWBTool.exe" + FILENAME "xwbtool-oct2021.exe" + SHA512 fda62e06fb9998c41795c6be42f00a1048dcae302b20437f2a39350215789f77acfc77c0f1ebbc5bedeb986229c94f35bd1a03be37cdf4fcf4c007110f7efaa4 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -53,20 +52,20 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) file(INSTALL ${MAKESPRITEFONT_EXE} ${XWBTOOL_EXE} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/) + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe) + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) vcpkg_copy_tools( TOOL_NAMES XWBTool - SEARCH_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake + SEARCH_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin/CMake" ) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index 317cafb7702c12..c732153875a31f 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,13 +1,21 @@ { "name": "directxtk", - "version-string": "sept2021", + "version-string": "oct2021", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", "license": "MIT", "supports": "windows", "dependencies": [ - "directxmath" + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "xaudio2-8": { diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index 3a1bdc23435b34..abdc7e415caad6 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -5,33 +5,32 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF sept2021 - SHA512 bb8a8a81381a6638e33cefc0c058126843df79cf84fd9a248606e965048ba6faae23e8167eb91dd6b8e9a11a788b188067877ef26852c6530ef6fc3c50b221b4 + REF oct2021 + SHA512 b5b6b7d42967463bf941b41c9407417068761000344506b720e038f82b3a1aa6f44893695b2391075495d6a63eeb1d80cb011ed87e8f54430de3a77baa8cb570 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_XAUDIO_WIN10=ON -DBUILD_DXIL_SHADERS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/sept2021/MakeSpriteFont.exe" - FILENAME "makespritefont-sept2021.exe" - SHA512 a22ec8e7d283585574a5aec82c937c2844e89e66ded01fea92bb278beb7ff32c8070fa3016192029ed8c106db7ef0356f867521a2603a4de7c085cd8db693d0a + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/oct2021/MakeSpriteFont.exe" + FILENAME "makespritefont-oct2021.exe" + SHA512 abff446bfd4cbddbca45816ec3a2230e52d9afb81c100966e4bce7e52a6e02620fd8cdcb416943090564885f63d33c4a246f43ff585c8f5686c2c9877ec50698 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/sept2021/XWBTool.exe" - FILENAME "xwbtool-sept2021.exe" - SHA512 40f33af95bfdaf60a41564dc347d51768774ad7caa8529046e3f87256e80e165aa124b21193d0ffa1e94644343006d6de01807df317dfdf13377a31275b973ef + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/oct2021/XWBTool.exe" + FILENAME "xwbtool-oct2021.exe" + SHA512 fda62e06fb9998c41795c6be42f00a1048dcae302b20437f2a39350215789f77acfc77c0f1ebbc5bedeb986229c94f35bd1a03be37cdf4fcf4c007110f7efaa4 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -39,12 +38,12 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) file(INSTALL ${MAKESPRITEFONT_EXE} ${XWBTOOL_EXE} - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/) + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe) + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index a09232f4fd9b73..da564385669f1f 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-string": "sept2021", + "version-string": "oct2021", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", @@ -8,6 +8,14 @@ "supports": "windows", "dependencies": [ "directx-headers", - "directxmath" + "directxmath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1c3decd46c6b8e..3fc13fb060daf2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1805,15 +1805,15 @@ "port-version": 4 }, "directxtex": { - "baseline": "sept2021", + "baseline": "oct2021", "port-version": 0 }, "directxtk": { - "baseline": "sept2021", + "baseline": "oct2021", "port-version": 0 }, "directxtk12": { - "baseline": "sept2021", + "baseline": "oct2021", "port-version": 0 }, "dirent": { diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index 348d3e159aea46..ea46acb13451a0 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02cba4df9bb3dab0d73b32a41dcfaa624ef53044", + "version-string": "oct2021", + "port-version": 0 + }, { "git-tree": "1dea5cbc125f2e87484afcd19c59b9c2955ce12d", "version-string": "sept2021", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index b0513dea1664da..4df6619e48dec0 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6356a5599a11c8670068358b150033e9da82b55", + "version-string": "oct2021", + "port-version": 0 + }, { "git-tree": "8fa980b193db947e6a803ed413e87df23ee315c7", "version-string": "sept2021", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index f5175d4d188f60..6dfc0d295c7c85 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3c3a04e2a9b6d1b85341e3d2dcc09d5a04df160", + "version-string": "oct2021", + "port-version": 0 + }, { "git-tree": "22e26ef3a716ae717ef2e972ce47ea6436d7025b", "version-string": "sept2021", From 472c5d4737032f3ccd224c0a975bac9f679f188d Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 15 Oct 2021 20:29:08 -0700 Subject: [PATCH 0842/1858] [wildmidi] Change baseline to pass (#20731) --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6fe14819e2999c..c7d3065329a904 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1593,7 +1593,6 @@ vxl:x64-windows-static = skip vxl:x64-windows-static-md=skip vxl:x86-windows = skip wampcc:arm64-windows=fail -wildmidi:x64-osx=fail wincrypt:x64-linux=fail wincrypt:x64-osx=fail winpcap:arm64-windows = skip From e093efb90e1e6be866eb8e7080b21be891947b57 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Sat, 16 Oct 2021 12:14:34 -0700 Subject: [PATCH 0843/1858] [geogram] Switch to a GitHub mirror since upstream download is broken (#20778) * [geogram] Switch to github mirror (alicevision/geogram) * [geogram] Update version files * Clean portfile and use correct version scheme * [geogram] Update versions file --- ...-install.patch => fix-vcpkg-install.patch} | 421 +++++++++--------- ports/geogram/fix-windows-dynamic.patch | 11 - ports/geogram/portfile.cmake | 18 +- ports/geogram/vcpkg.json | 3 +- versions/baseline.json | 4 +- versions/g-/geogram.json | 5 + 6 files changed, 224 insertions(+), 238 deletions(-) rename ports/geogram/{fix-cmake-config-and-install.patch => fix-vcpkg-install.patch} (85%) delete mode 100644 ports/geogram/fix-windows-dynamic.patch diff --git a/ports/geogram/fix-cmake-config-and-install.patch b/ports/geogram/fix-vcpkg-install.patch similarity index 85% rename from ports/geogram/fix-cmake-config-and-install.patch rename to ports/geogram/fix-vcpkg-install.patch index 8eb16c364bec17..e859b7890e4a1f 100644 --- a/ports/geogram/fix-cmake-config-and-install.patch +++ b/ports/geogram/fix-vcpkg-install.patch @@ -1,210 +1,211 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2e54997..169e33c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ set(VORPALINE_VERSION_MINOR 7) - set(VORPALINE_VERSION_PATCH 5) - set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH}) - --set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR}) -+set(VORPALINE_INCLUDE_SUBPATH ./) - - # Determine the current Build-OS (Build-platform without the compiler info) - string(REGEX REPLACE "-[^-]+$" "" VORPALINE_OS ${VORPALINE_PLATFORM}) -@@ -113,6 +113,11 @@ if(GEOGRAM_WITH_VORPALINE) - add_subdirectory(src/lib/vorpalib) - endif() - -+# find this library in the outside scope -+if(GEOGRAM_WITH_GRAPHICS) -+ find_package(GLFW3 REQUIRED) -+endif(GEOGRAM_WITH_GRAPHICS) -+ - add_subdirectory(src/lib/third_party) - - if(GEOGRAM_WITH_GRAPHICS) -@@ -145,8 +150,44 @@ file(REMOVE ${CMAKE_BINARY_DIR}/doc/LICENSE.txt) - - - # FindGeogram.cmake -+# This installation is not suitable for vcpkg -+# install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) -+ -+set(config_install_dir "share/geogram") -+set(include_install_dir "include") -+set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") -+ -+# Configuration -+set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") -+set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") -+set(targets_export_name "${PROJECT_NAME}Targets") -+set(namespace "${PROJECT_NAME}::") -+ -+# Include module with fuction 'write_basic_package_version_file' -+include(CMakePackageConfigHelpers) -+ -+write_basic_package_version_file( -+ "${version_config}" COMPATIBILITY SameMajorVersion VERSION ${VORPALINE_VERSION} -+) -+ -+configure_package_config_file( -+ "cmake/Config.cmake.in" -+ "${project_config}" -+ INSTALL_DESTINATION "${config_install_dir}" -+) - --install(FILES cmake/FindGeogram.cmake DESTINATION lib/cmake/modules COMPONENT devkit) -+# Config -+install( -+ FILES "${project_config}" "${version_config}" -+ DESTINATION "${config_install_dir}" -+) -+ -+# Config -+install( -+ EXPORT "${targets_export_name}" -+ NAMESPACE "${namespace}" -+ DESTINATION "${config_install_dir}" -+) - - # Configure CPack - -diff --git a/src/lib/geogram/CMakeLists.txt b/src/lib/geogram/CMakeLists.txt -index 49cb2ba..82c2f39 100755 ---- a/src/lib/geogram/CMakeLists.txt -+++ b/src/lib/geogram/CMakeLists.txt -@@ -62,7 +62,14 @@ if(WIN32) - endif() - - # Install the library --install_devkit_targets(geogram) -+install( -+ TARGETS geogram -+ EXPORT "${PROJECT_NAME}Targets" -+ LIBRARY DESTINATION "lib" -+ ARCHIVE DESTINATION "lib" -+ RUNTIME DESTINATION "bin" -+ INCLUDES DESTINATION "include" -+) - - # Install include files for the standard devkit - install( -diff --git a/src/lib/geogram_gfx/CMakeLists.txt b/src/lib/geogram_gfx/CMakeLists.txt -index b155975..ad66440 100755 ---- a/src/lib/geogram_gfx/CMakeLists.txt -+++ b/src/lib/geogram_gfx/CMakeLists.txt -@@ -47,14 +47,21 @@ if(VORPALINE_BUILD_DYNAMIC) - endif() - - # Install the library --install_devkit_targets(geogram_gfx) -+install( -+ TARGETS geogram_gfx -+ EXPORT "${PROJECT_NAME}Targets" -+ LIBRARY DESTINATION "lib" -+ ARCHIVE DESTINATION "lib" -+ RUNTIME DESTINATION "bin" -+ INCLUDES DESTINATION "include" -+) - - # Install include files for the standard devkit - install( - DIRECTORY . - DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx - COMPONENT devkit -- FILES_MATCHING PATTERN *.h -+ FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file - ) - - # Install include files for the full devkit -@@ -62,7 +69,7 @@ install( - DIRECTORY . - DESTINATION include/${VORPALINE_INCLUDE_SUBPATH}/geogram_gfx - COMPONENT devkit-full -- FILES_MATCHING PATTERN *.h -+ FILES_MATCHING PATTERN *.h PATTERN *.xpm # xpm is the colrbar file - ) - - install( -diff --git a/src/lib/third_party/numerics/CMakeLists.txt b/src/lib/third_party/numerics/CMakeLists.txt -index c9c3a6e..f16d7ec 100644 ---- a/src/lib/third_party/numerics/CMakeLists.txt -+++ b/src/lib/third_party/numerics/CMakeLists.txt -@@ -10,16 +10,19 @@ endif() - - include_directories(${GEOGRAM_SOURCE_DIR}/src/lib/third_party/numerics/INCLUDE) - -+set(LAPACK_lapack_WORKS TRUE) -+find_package(BLAS REQUIRED) -+find_package(LAPACK REQUIRED) - aux_source_directories(SOURCES "Source Files" .) - aux_source_directories(SOURCES "Source Files\\LIBF2C" LIBF2C) --aux_source_directories(SOURCES "Source Files\\CBLAS" CBLAS) --aux_source_directories(SOURCES "Source Files\\CLAPACK" CLAPACK) -+# aux_source_directories(SOURCES "Source Files\\CBLAS" CBLAS) -+# aux_source_directories(SOURCES "Source Files\\CLAPACK" CLAPACK) - aux_source_directories(SOURCES "Source Files\\SUPERLU" SUPERLU) - aux_source_directories(SOURCES "Source Files\\ARPACK" ARPACK) - aux_source_directories(SOURCES "Source Files\\ARPACK_UTIL" ARPACK_UTIL) - - add_library(geogram_num_3rdparty ${SOURCES}) -- -+target_link_libraries(geogram_num_3rdparty ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}) - if(UNIX) - target_link_libraries(geogram_num_3rdparty m) - endif() -diff --git a/src/lib/third_party/numerics/LIBF2C/getarg_.c b/src/lib/third_party/numerics/LIBF2C/getarg_.c -index 2b69a1e..1cde8b6 100755 ---- a/src/lib/third_party/numerics/LIBF2C/getarg_.c -+++ b/src/lib/third_party/numerics/LIBF2C/getarg_.c -@@ -17,20 +17,20 @@ VOID getarg_(n, s, ls) ftnint *n; char *s; ftnlen ls; - void getarg_(ftnint *n, char *s, ftnlen ls) - #endif - { -- extern int xargc; -- extern char **xargv; -- Const char *t; -- int i; -- -- if(*n>=0 && *n=0 && *n=0 && *n=0 && *n Date: Sat, 16 Oct 2021 12:14:53 -0700 Subject: [PATCH 0844/1858] [vcpkg] Update VMs for October Patch Tuesday and Server 2022 (#20730) * Patch tuesday and switch to Server 2022. * Update pools. --- scripts/azure-pipelines/azure-pipelines.yml | 4 ++-- scripts/azure-pipelines/windows/create-image.ps1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 49d30c2bc578ab..2381887f4e1b9e 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-09-08' - linux-pool: 'PrLin-2021-09-08' + windows-pool: 'PrWin-2021-10-13' + linux-pool: 'PrLin-2021-10-13' osx-pool: 'PrOsx-2021-07-27' jobs: diff --git a/scripts/azure-pipelines/windows/create-image.ps1 b/scripts/azure-pipelines/windows/create-image.ps1 index 9a03fe8ed60ccd..21fb8c19a835a6 100644 --- a/scripts/azure-pipelines/windows/create-image.ps1 +++ b/scripts/azure-pipelines/windows/create-image.ps1 @@ -19,7 +19,7 @@ $Prefix = 'Win-' $Prefix += (Get-Date -Format 'yyyy-MM-dd') $VMSize = 'Standard_D32as_v4' $ProtoVMName = 'PROTOTYPE' -$WindowsServerSku = '2019-datacenter-gensecond' +$WindowsServerSku = '2022-datacenter-g2' $ErrorActionPreference = 'Stop' $CudnnBaseUrl = 'https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-11.2-windows-x64-v8.1.1.33.zip' From 335075e1f6b00658a121c96c4e2a642ad9b4030f Mon Sep 17 00:00:00 2001 From: Ryan Mast <3969255+nightlark@users.noreply.github.com> Date: Mon, 18 Oct 2021 14:21:39 -0700 Subject: [PATCH 0845/1858] [cpr] update repository location (#20801) * [cpr] update repository location * [cpr] replace deprecated vcpkg cmake functions with new ones * [cpr] increment port-version * Update CI baseline --- ports/cpr/portfile.cmake | 13 ++++++------- ports/cpr/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/c-/cpr.json | 5 +++++ 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/ports/cpr/portfile.cmake b/ports/cpr/portfile.cmake index 9d99ebe045ee04..49c6ef4dfcc75e 100644 --- a/ports/cpr/portfile.cmake +++ b/ports/cpr/portfile.cmake @@ -6,18 +6,17 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO whoshuu/cpr - REF f4622efcb59d84071ae11404ae61bd821c1c344b # v1.6.2 - SHA512 7835b7613529798b5edaefc99c907bbc7144133a1fac62a2c9af09c8c7a09b2ea1864544c4c0385969ad3dc64806b8d258abbcd39add2004ed8428741286ff20 + REPO libcpr/cpr + REF 1.6.2 + SHA512 77afd1dc81274aa1d37bf17abaf2614b63802f17fc08bdf8453d96d8fa2bd4b025511db9fadbde51160d7dde31a0363694422d3407ca9cdac3cd79b744a82888 HEAD_REF master PATCHES 001-cpr-config.patch ${UWP_PATCH} ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCPR_BUILD_TESTS=OFF -DCPR_FORCE_USE_SYSTEM_CURL=ON @@ -25,10 +24,10 @@ vcpkg_configure_cmake( -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/cprConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/lib/cmake/cpr) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cpr) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cpr) vcpkg_copy_pdbs() diff --git a/ports/cpr/vcpkg.json b/ports/cpr/vcpkg.json index 5a648e2908cf04..27b1a87af4fc1e 100644 --- a/ports/cpr/vcpkg.json +++ b/ports/cpr/vcpkg.json @@ -1,12 +1,21 @@ { "name": "cpr", "version-semver": "1.6.2", + "port-version": 1, "description": "C++ Requests is a simple wrapper around libcurl inspired by the excellent Python Requests project.", - "homepage": "https://github.com/whoshuu/cpr", + "homepage": "https://github.com/libcpr/cpr", "dependencies": [ { "name": "curl", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 91f1fea11174d0..cdf47d1da9c92a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1586,7 +1586,7 @@ }, "cpr": { "baseline": "1.6.2", - "port-version": 0 + "port-version": 1 }, "cpu-features": { "baseline": "0.6.0", diff --git a/versions/c-/cpr.json b/versions/c-/cpr.json index 0bbf0b63feafb9..62211198125bfc 100644 --- a/versions/c-/cpr.json +++ b/versions/c-/cpr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc224c4615958fa1105b29a9d973555fda345de8", + "version-semver": "1.6.2", + "port-version": 1 + }, { "git-tree": "96762dddaeb7d520833ddc1d47a30f26c35c9f67", "version-semver": "1.6.2", From 2a0a527a077f5b015448e3c658c57aeac3bea0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 19 Oct 2021 05:22:23 +0800 Subject: [PATCH 0846/1858] [libraw] Re-fix non-thread-safe library installation, always export pkgconfig files, add usage (#19593) * [libraw] Re-fix non-thread-safe library installation, always export pkgconfig files, add usage * format manifest and version * Update ports/libraw/portfile.cmake * Update ports/libraw/portfile.cmake * Update ports/libraw/portfile.cmake * update version * version * Fix wrapper and usage * version * apply suggestions * version * Fix cmake install path * version * Fix usage * version --- ports/libraw/fix-install.patch | 36 +++++++++++++ ports/libraw/portfile.cmake | 71 +++++++++----------------- ports/libraw/usage | 11 ++++ ports/libraw/vcpkg-cmake-wrapper.cmake | 15 ++++-- ports/libraw/vcpkg.json | 8 ++- versions/baseline.json | 2 +- versions/l-/libraw.json | 5 ++ 7 files changed, 92 insertions(+), 56 deletions(-) create mode 100644 ports/libraw/fix-install.patch create mode 100644 ports/libraw/usage diff --git a/ports/libraw/fix-install.patch b/ports/libraw/fix-install.patch new file mode 100644 index 00000000000000..9c10ae4cacccf4 --- /dev/null +++ b/ports/libraw/fix-install.patch @@ -0,0 +1,36 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47f3869..136549b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -544,7 +544,7 @@ SET_TARGET_PROPERTIES(raw_r PROPERTIES OUTPUT_NAME "raw_r") + # -- Files to install ------------------------------------------------------------------------------------- + + # Configure and install data file for packaging. +-IF(NOT WIN32) ++IF(1) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/data/libraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libraw.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) + +@@ -570,8 +570,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libraw/libraw.h + # Install Shared binary files. + INSTALL(TARGETS raw + RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib${LIB_SUFFIX} +- ARCHIVE DESTINATION lib${LIB_SUFFIX} ++ LIBRARY DESTINATION lib${LIB_SUFFIX}/manual-link ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}/manual-link + ) + + INSTALL(TARGETS raw_r +diff --git a/cmake/data/libraw.pc.cmake b/cmake/data/libraw.pc.cmake +index aede5f2..ffeefc2 100644 +--- a/cmake/data/libraw.pc.cmake ++++ b/cmake/data/libraw.pc.cmake +@@ -1,6 +1,6 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/lib@LIB_SUFFIX@ ++libdir=${prefix}/lib@LIB_SUFFIX@/manual-link + includedir=${prefix}/include/libraw + + Name: @PROJECT_NAME@ diff --git a/ports/libraw/portfile.cmake b/ports/libraw/portfile.cmake index ffedcf0d21dabb..ea5df3b855a139 100644 --- a/ports/libraw/portfile.cmake +++ b/ports/libraw/portfile.cmake @@ -15,66 +15,41 @@ vcpkg_from_github( PATCHES findlibraw_debug_fix.patch lcms2_debug_fix.patch + # Move the non-thread-safe library to manual-link. This is unfortunately needed + # because otherwise libraries that build on top of libraw have to choose. + fix-install.patch ) -file(COPY ${LIBRAW_CMAKE_SOURCE_PATH}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${LIBRAW_CMAKE_SOURCE_PATH}/cmake DESTINATION ${SOURCE_PATH}) +file(COPY "${LIBRAW_CMAKE_SOURCE_PATH}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${LIBRAW_CMAKE_SOURCE_PATH}/cmake" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DINSTALL_CMAKE_MODULE_PATH=${CURRENT_PACKAGES_DIR}/share/libraw + -DINSTALL_CMAKE_MODULE_PATH=share/${PORT} + -DENABLE_EXAMPLES=OFF -DCMAKE_DEBUG_POSTFIX=d ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(READ ${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h LIBRAW_H) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - string(REPLACE "#ifdef LIBRAW_NODLL" "#if 1" LIBRAW_H "${LIBRAW_H}") -else() - string(REPLACE "#ifdef LIBRAW_NODLL" "#if 0" LIBRAW_H "${LIBRAW_H}") -endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h "${LIBRAW_H}") - -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - # Rename thread-safe version to be "raw.lib". This is unfortunately needed - # because otherwise libraries that build on top of libraw have to choose. - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/raw.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/raw_r.lib ${CURRENT_PACKAGES_DIR}/lib/raw.lib) - if(NOT VCPKG_BUILD_TYPE STREQUAL "release") - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/raw_rd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/rawd.lib) - endif() - - # Cleanup - file(GLOB RELEASE_EXECUTABLES ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(REMOVE ${RELEASE_EXECUTABLES}) - if(NOT VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB DEBUG_EXECUTABLES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${DEBUG_EXECUTABLES}) - endif() -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -else() - if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/raw.dll ${CURRENT_PACKAGES_DIR}/debug/bin/rawd.dll) - endif() -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_copy_pdbs() -# Rename cmake module into a config in order to allow more flexible lookup rules -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libraw/FindLibRaw.cmake ${CURRENT_PACKAGES_DIR}/share/libraw/libraw-config.cmake) +vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/libraw) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h" + "#ifdef LIBRAW_NODLL" "#if 1" + ) +else() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libraw/libraw_types.h" + "#ifdef LIBRAW_NODLL" "#if 0" + ) endif() -vcpkg_copy_pdbs() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libraw/usage b/ports/libraw/usage new file mode 100644 index 00000000000000..6c68aadf3e745f --- /dev/null +++ b/ports/libraw/usage @@ -0,0 +1,11 @@ +The package libraw is compatible with built-in CMake targets: + + find_package(LibRaw REQUIRED) + # For non-thread-safe version + target_compile_definitions(main PRIVATE ${LibRaw_DEFINITIONS}) + target_include_directories(main PRIVATE ${LibRaw_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${LibRaw_LIBRARIES}) + # For thread-safe version + target_compile_definitions(main PRIVATE ${LibRaw_r_DEFINITIONS}) + target_include_directories(main PRIVATE ${LibRaw_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${LibRaw_r_LIBRARIES}) diff --git a/ports/libraw/vcpkg-cmake-wrapper.cmake b/ports/libraw/vcpkg-cmake-wrapper.cmake index c0ecc48f0b115e..5a9a047c38ed3e 100644 --- a/ports/libraw/vcpkg-cmake-wrapper.cmake +++ b/ports/libraw/vcpkg-cmake-wrapper.cmake @@ -1,7 +1,12 @@ +set(LIBRAW_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) _find_package(${ARGS}) -find_package(Jasper REQUIRED) -if (Jasper_FOUND) - list(APPEND LibRaw_LIBRARIES ${JASPER_LIBRARIES}) - list(APPEND LibRaw_r_LIBRARIES ${JASPER_LIBRARIES}) -endif () +set(CMAKE_MODULE_PATH ${LIBRAW_PREV_MODULE_PATH}) +if (@VCPKG_LIBRARY_LINKAGE@ STREQUAL "static") + find_package(Jasper REQUIRED) + if (Jasper_FOUND) + list(APPEND LibRaw_LIBRARIES ${JASPER_LIBRARIES}) + list(APPEND LibRaw_r_LIBRARIES ${JASPER_LIBRARIES}) + endif () +endif() diff --git a/ports/libraw/vcpkg.json b/ports/libraw/vcpkg.json index 01b3babe00ead0..552b4d82e55b05 100644 --- a/ports/libraw/vcpkg.json +++ b/ports/libraw/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libraw", "version-string": "201903", - "port-version": 4, + "port-version": 5, "description": "raw image decoder library", "homepage": "https://www.libraw.org", "dependencies": [ "jasper", - "lcms" + "lcms", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index cdf47d1da9c92a..ad08aaa6e6ebb0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3742,7 +3742,7 @@ }, "libraw": { "baseline": "201903", - "port-version": 4 + "port-version": 5 }, "librdkafka": { "baseline": "1.7.0", diff --git a/versions/l-/libraw.json b/versions/l-/libraw.json index aeddb40b290af6..9e4216a52f3fcd 100644 --- a/versions/l-/libraw.json +++ b/versions/l-/libraw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa490349ec4e8e8d8854c18725068a8a8474b3ac", + "version-string": "201903", + "port-version": 5 + }, { "git-tree": "80a0638bcb03f5e4c53f4b35562da7b8485fda11", "version-string": "201903", From 883439af5f39ccf18733aef7ec3f4f01e7e60696 Mon Sep 17 00:00:00 2001 From: Kilidsch <62540829+Kilidsch@users.noreply.github.com> Date: Mon, 18 Oct 2021 23:23:19 +0200 Subject: [PATCH 0847/1858] [ezc3d] Update to 1.4.6 (#20444) * Update ezc3d-port to 1.4.6 * Use different settings for non-windows platfom * Reformat manifest * Bump version * Apply suggestions from code review Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Format vcpkg.json * Update versionsfile Co-authored-by: Billy Robert O'Neal III Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/ezc3d/portfile.cmake | 33 +++++++++++++++++++++------------ ports/ezc3d/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/e-/ezc3d.json | 5 +++++ 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/ports/ezc3d/portfile.cmake b/ports/ezc3d/portfile.cmake index 0972f6f56f2577..3c402b6f9cb6d7 100644 --- a/ports/ezc3d/portfile.cmake +++ b/ports/ezc3d/portfile.cmake @@ -1,24 +1,33 @@ vcpkg_from_github(ARCHIVE OUT_SOURCE_PATH SOURCE_PATH REPO pyomeca/ezc3d - REF Release_1.3.7 - SHA512 5beb0909a4ddc56f5965b5f2edcfd2c8d68d473b172778ebe21bc134e1b4931cac1e6529676866d4238b41041658041a72ccd44879b9685d85f857a4e0df23ec + REF Release_1.4.6 + SHA512 f63da7e715c09c6a757fe923fd397c09e1cbd0a58a78b1d8fa52bd1a41230ecab2cbb17ecc3d4f66656f3234bfe4c8588164f1d4964dcce729da091e99daab2d HEAD_REF dev ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_EXAMPLE=OFF -) +if(WIN32) + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLE=OFF + -Dezc3d_LIB_FOLDER="lib" + -Dezc3d_BIN_FOLDER="bin" + ) +else() + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLE=OFF + ) +endif() -vcpkg_install_cmake() +vcpkg_cmake_install() -if (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/ezc3d/cmake") +if(WIN32) + vcpkg_cmake_config_fixup(CONFIG_PATH "CMake") else() - vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake") endif() # # Handle copyright diff --git a/ports/ezc3d/vcpkg.json b/ports/ezc3d/vcpkg.json index 57fb3b5d9fa7cc..36a9afbf17dc69 100644 --- a/ports/ezc3d/vcpkg.json +++ b/ports/ezc3d/vcpkg.json @@ -1,6 +1,16 @@ { "name": "ezc3d", - "version-string": "1.3.7", + "version": "1.4.6", "description": "C3D reader/writer", - "homepage": "https://github.com/pyomeca/ezc3d" + "homepage": "https://github.com/pyomeca/ezc3d", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ad08aaa6e6ebb0..34e4f1d05c67c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2033,7 +2033,7 @@ "port-version": 1 }, "ezc3d": { - "baseline": "1.3.7", + "baseline": "1.4.6", "port-version": 0 }, "faad2": { diff --git a/versions/e-/ezc3d.json b/versions/e-/ezc3d.json index 606952a6d1021f..27adf4358083a5 100644 --- a/versions/e-/ezc3d.json +++ b/versions/e-/ezc3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "555219f96920ec01fc38ecd89e0a19188206be22", + "version": "1.4.6", + "port-version": 0 + }, { "git-tree": "ef3430033f1d62974ad03b445cee043327516a05", "version-string": "1.3.7", From 0002eeb4f5fc9757c3f0df2171e9b71553be87dc Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 18 Oct 2021 23:25:31 +0200 Subject: [PATCH 0848/1858] [Many ports] Remove/fix unused patch files (#20620) * Remove/fix unused patch files * Bump port versions * Update git-tree hash * Fix corrupt patch * Update git-tree hash * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update git-tree hash Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/3fd/portfile.cmake | 2 +- ports/3fd/vcpkg.json | 3 +- ports/cppad/pkgconfig-fix.patch | 63 ------------------- ports/cppad/vcpkg.json | 1 + .../cppitertools/fix-cmake-install-dir.patch | 20 ------ ports/cppitertools/vcpkg.json | 4 +- ports/cpuid/fix-install-headers.patch | 13 ---- ports/cpuid/vcpkg.json | 1 + ports/ctemplate/fix-msvc.patch | 17 ----- ports/ctemplate/vcpkg.json | 4 +- ports/dimcli/fix-NameBoolean.patch | 63 ------------------- ports/dimcli/vcpkg.json | 4 +- ports/freerdp/install-dirs.patch | 2 +- ports/freerdp/portfile.cmake | 1 + ports/freerdp/vcpkg.json | 3 +- ports/openni2/disable_kinect.patch | 40 ------------ ports/openni2/vcpkg.json | 2 +- ports/osg/fix-builderror-with-libtiff.patch | 26 -------- ports/osg/vcpkg.json | 2 +- ports/osgearth/deprecated_cpp_fix.patch | 28 --------- ports/osgearth/vcpkg.json | 1 + ports/sparsehash/00001-windows-use-std.patch | 17 ----- ports/sparsehash/vcpkg.json | 1 + ports/systemc/tlm_correct_dependency.patch | 8 --- ports/systemc/vcpkg.json | 2 +- versions/3-/3fd.json | 5 ++ versions/baseline.json | 24 +++---- versions/c-/cppad.json | 5 ++ versions/c-/cppitertools.json | 5 ++ versions/c-/cpuid.json | 5 ++ versions/c-/ctemplate.json | 5 ++ versions/d-/dimcli.json | 5 ++ versions/f-/freerdp.json | 5 ++ versions/o-/openni2.json | 5 ++ versions/o-/osg.json | 5 ++ versions/o-/osgearth.json | 5 ++ versions/s-/sparsehash.json | 5 ++ versions/s-/systemc.json | 5 ++ 38 files changed, 92 insertions(+), 320 deletions(-) delete mode 100644 ports/cppad/pkgconfig-fix.patch delete mode 100644 ports/cppitertools/fix-cmake-install-dir.patch delete mode 100644 ports/cpuid/fix-install-headers.patch delete mode 100644 ports/ctemplate/fix-msvc.patch delete mode 100644 ports/dimcli/fix-NameBoolean.patch delete mode 100644 ports/openni2/disable_kinect.patch delete mode 100644 ports/osg/fix-builderror-with-libtiff.patch delete mode 100644 ports/osgearth/deprecated_cpp_fix.patch delete mode 100644 ports/sparsehash/00001-windows-use-std.patch delete mode 100644 ports/systemc/tlm_correct_dependency.patch diff --git a/ports/3fd/portfile.cmake b/ports/3fd/portfile.cmake index 03cc7d3626cafc..294b0370cbd9f9 100644 --- a/ports/3fd/portfile.cmake +++ b/ports/3fd/portfile.cmake @@ -22,7 +22,7 @@ vcpkg_from_github( SHA512 70630291b4055de2044ad76ef21e99d6ab6fd3468debb2a864a461cf8513642fe87f116e9dfff96ecff96f4577108493dc25aa40eeefcd93ee75990b13bb7b20 HEAD_REF master PATCHES - rapidxml.patch + RapidXML.patch ) # Build: diff --git a/ports/3fd/vcpkg.json b/ports/3fd/vcpkg.json index 9bbfbe83072517..286cb8aa3cc56b 100644 --- a/ports/3fd/vcpkg.json +++ b/ports/3fd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "3fd", - "version-string": "2.6.3", + "version": "2.6.3", + "port-version": 1, "description": "C++ Framework For Fast Development", "supports": "windows & !static & !arm64", "dependencies": [ diff --git a/ports/cppad/pkgconfig-fix.patch b/ports/cppad/pkgconfig-fix.patch deleted file mode 100644 index 6688fc9d7f90f1..00000000000000 --- a/ports/cppad/pkgconfig-fix.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt -index db8b65902..b1224a01d 100644 ---- a/pkgconfig/CMakeLists.txt -+++ b/pkgconfig/CMakeLists.txt -@@ -42,8 +42,9 @@ ENDIF( cppad_has_ipopt ) - # cppad_pkgconfig_cflags - # cppad_pkgconfig_cflags_uninstalled - # --SET(cppad_pkgconfig_cflags "-I${cppad_abs_includedir}" ) --SET(cppad_pkgconfig_cflags_uninstalled "-I${cppad_SOURCE_DIR}" ) -+SET(cppad_pkgconfig_includedir "${cmake_install_includedirs}" ) -+SET(cppad_pkgconfig_cflags_uninstalled "-I${cppad_SOURCE_DIR}" ) -+SET(cppad_pkgconfig_libdir "${cmake_install_libdirs}" ) - # ---------------------------------------------------------------------------- - # cppad_pkgconfig_libs - # cppad_pkgconfig_libs_uninstalled -@@ -74,7 +75,7 @@ IF( "${libs}" STREQUAL "" ) - SET(cppad_pkgconfig_libs "") - SET(cppad_pkgconfig_libs_uninstalled "") - ELSE( "${libs}" STREQUAL "" ) -- SET(cppad_pkgconfig_libs "-L${cppad_abs_libdir} ${libs}") -+ SET(cppad_pkgconfig_libs "-L\${libdir} ${libs}") - SET(cppad_pkgconfig_libs_uninstalled "${uninstalled} ${libs}") - ENDIF( "${libs}" STREQUAL "" ) - # -@@ -84,10 +85,12 @@ ENDIF( "${libs}" STREQUAL "" ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/cppad.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc -+ @ONLY - ) - CONFIGURE_FILE( - ${CMAKE_CURRENT_SOURCE_DIR}/cppad-uninstalled.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/cppad-uninstalled.pc -+ @ONLY - ) - # During install copy cppad.pc to datadir and libdir - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppad.pc -diff --git a/pkgconfig/cppad.pc.in b/pkgconfig/cppad.pc.in -index a202e3fb3..1c34c1e08 100644 ---- a/pkgconfig/cppad.pc.in -+++ b/pkgconfig/cppad.pc.in -@@ -12,12 +12,19 @@ - # This file is used with pkg-config to include CppAD after it is installed - # - # Entries set by top source directory CMakeLists.txt file -+ -+prefix=${pcfiledir}/../.. -+exec_prefix=${prefix} -+libdir=${exec_prefix}/@cppad_pkgconfig_libdir@ -+includedir=${prefix}/@cppad_pkgconfig_includedir@ -+ - Name: cppad - Description: @cppad_description@ - Version: @cppad_version@ - URL: @cppad_url@ -+ - # - # Entries set by pkgconfig/CMakeLists.txt file --Cflags: @cppad_pkgconfig_cflags@ -+Cflags: -I${includedir} - Libs: @cppad_pkgconfig_libs@ - Requires: @cppad_pkgconfig_requires@ diff --git a/ports/cppad/vcpkg.json b/ports/cppad/vcpkg.json index fdc3cad7a44d2f..a8c2d15910e2a4 100644 --- a/ports/cppad/vcpkg.json +++ b/ports/cppad/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cppad", "version-string": "20210000.7", + "port-version": 1, "description": "CppAD: A Package for Differentiation of C++ Algorithms", "homepage": "https://github.com/coin-or/CppAD", "supports": "!(arm | uwp)", diff --git a/ports/cppitertools/fix-cmake-install-dir.patch b/ports/cppitertools/fix-cmake-install-dir.patch deleted file mode 100644 index e3591f9baa01d6..00000000000000 --- a/ports/cppitertools/fix-cmake-install-dir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3caa411..775ce02 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -14,7 +14,7 @@ add_library(cppitertools::cppitertools ALIAS cppitertools) - - target_include_directories(cppitertools INTERFACE - $ -- $ -+ $ - ) - - -@@ -37,5 +37,5 @@ install(EXPORT cppitertools-targets - DESTINATION ${cppitertools_INSTALL_CMAKE_DIR}/cppitertools - ) - --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppitertools-config-version.cmake DESTINATION ${cppitertools_INSTALL_CMAKE_DIR}) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppitertools-config-version.cmake DESTINATION ${cppitertools_INSTALL_CMAKE_DIR}/cppitertools) - install(DIRECTORY . DESTINATION ${cppitertools_INSTALL_INCLUDE_DIR}/cppitertools) diff --git a/ports/cppitertools/vcpkg.json b/ports/cppitertools/vcpkg.json index 8f643e6bc1b66f..936e372f98810f 100644 --- a/ports/cppitertools/vcpkg.json +++ b/ports/cppitertools/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppitertools", - "version-string": "2.1", - "port-version": 1, + "version": "2.1", + "port-version": 2, "description": "Range-based for loop add-ons inspired by the Python builtins and itertools library", "homepage": "https://github.com/ryanhaining/cppitertools", "dependencies": [ diff --git a/ports/cpuid/fix-install-headers.patch b/ports/cpuid/fix-install-headers.patch deleted file mode 100644 index d5c9c8641d30e2..00000000000000 --- a/ports/cpuid/fix-install-headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libcpuid/CMakeLists.txt b/libcpuid/CMakeLists.txt -index 96533ac..d71953f 100644 ---- a/libcpuid/CMakeLists.txt -+++ b/libcpuid/CMakeLists.txt -@@ -75,7 +75,7 @@ install(TARGETS cpuid - LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib" - RUNTIME DESTINATION "bin" -- INCLUDES DESTINATION "include") -+ PUBLIC_HEADER DESTINATION "include") - - install(FILES "${project_config}" "${version_config}" - DESTINATION "${config_install_dir}" diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index 7e8a6aa4eef397..cae732ea586a44 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cpuid", "version": "0.5.1", + "port-version": 1, "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", "supports": "x86 | x64", diff --git a/ports/ctemplate/fix-msvc.patch b/ports/ctemplate/fix-msvc.patch deleted file mode 100644 index acfbce4bfb9d7f..00000000000000 --- a/ports/ctemplate/fix-msvc.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/per_expand_data.cc b/src/per_expand_data.cc -index f8f3025..0a468cf 100644 ---- a/src/per_expand_data.cc -+++ b/src/per_expand_data.cc -@@ -42,10 +42,12 @@ namespace ctemplate { - - using std::string; - -+#ifndef _MSC_VER - bool PerExpandData::DataEq::operator()(const char* s1, const char* s2) const { - return ((s1 == 0 && s2 == 0) || - (s1 && s2 && *s1 == *s2 && strcmp(s1, s2) == 0)); - } -+#endif - - PerExpandData::~PerExpandData() { - delete map_; diff --git a/ports/ctemplate/vcpkg.json b/ports/ctemplate/vcpkg.json index 110b0c58ae1474..2f3d6bd4133236 100644 --- a/ports/ctemplate/vcpkg.json +++ b/ports/ctemplate/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ctemplate", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2020-09-14", + "port-version": 2, "description": "C++ CTemplate system", "homepage": "https://github.com/OlafvdSpek/ctemplate" } diff --git a/ports/dimcli/fix-NameBoolean.patch b/ports/dimcli/fix-NameBoolean.patch deleted file mode 100644 index a0d9afb5615609..00000000000000 --- a/ports/dimcli/fix-NameBoolean.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/libs/dimcli/cli.cpp b/libs/dimcli/cli.cpp -index 45dac3b..6129884 100644 ---- a/libs/dimcli/cli.cpp -+++ b/libs/dimcli/cli.cpp -@@ -392,8 +392,8 @@ GroupConfig const & Cli::Config::findGrpOrDie(Cli const & cli) { - ***/ - - //=========================================================================== --Cli::OptBase::OptBase(string const & names, bool boolean) -- : m_bool{boolean} -+Cli::OptBase::OptBase(string const & names, bool in_boolean) -+ : m_bool{in_boolean} - , m_names{names} - { - // set m_fromName and assert if names is malformed -@@ -526,12 +526,12 @@ static bool includeName( - OptName const & name, - NameListType type, - Cli::OptBase const & opt, -- bool boolean, -+ bool in_boolean, - bool inverted - ) { - if (name.opt != &opt) - return false; -- if (boolean) { -+ if (in_boolean) { - if (type == kNameEnable) - return !name.invert; - if (type == kNameDisable) -diff --git a/libs/dimcli/cli.h b/libs/dimcli/cli.h -index d4941dc..fa8d526 100644 ---- a/libs/dimcli/cli.h -+++ b/libs/dimcli/cli.h -@@ -777,7 +777,7 @@ public: - }; - - public: -- OptBase(std::string const & keys, bool boolean); -+ OptBase(std::string const & keys, bool in_boolean); - virtual ~OptBase() {} - - //----------------------------------------------------------------------- -@@ -1062,7 +1062,7 @@ std::string Cli::OptBase::toValueDesc() const { - template - class Cli::OptShim : public OptBase { - public: -- OptShim(std::string const & keys, bool boolean); -+ OptShim(std::string const & keys, bool in_boolean); - OptShim(OptShim const &) = delete; - OptShim & operator=(OptShim const &) = delete; - -@@ -1249,8 +1249,8 @@ protected: - - //=========================================================================== - template --Cli::OptShim::OptShim(std::string const & keys, bool boolean) -- : OptBase(keys, boolean) -+Cli::OptShim::OptShim(std::string const & keys, bool in_boolean) -+ : OptBase(keys, in_boolean) - { - if (std::is_arithmetic::value) - this->imbue(std::locale("")); diff --git a/ports/dimcli/vcpkg.json b/ports/dimcli/vcpkg.json index 319d33cc888fe7..6845445db5ea1e 100644 --- a/ports/dimcli/vcpkg.json +++ b/ports/dimcli/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dimcli", - "version-string": "5.0.2", - "port-version": 1, + "version-semver": "5.0.2", + "port-version": 2, "description": "C++ command line parser toolkit", "homepage": "https://github.com/gknowles/dimcli" } diff --git a/ports/freerdp/install-dirs.patch b/ports/freerdp/install-dirs.patch index 175be0ecf7525a..5b5e178beb07be 100644 --- a/ports/freerdp/install-dirs.patch +++ b/ports/freerdp/install-dirs.patch @@ -10,4 +10,4 @@ index 5e67ef9..4ef3e8e 100644 +cmake_minimum_required(VERSION 3.11) project(FreeRDP C CXX) - \ No newline at end of file + diff --git a/ports/freerdp/portfile.cmake b/ports/freerdp/portfile.cmake index 3bce91d81f570a..e2367700d4aaad 100644 --- a/ports/freerdp/portfile.cmake +++ b/ports/freerdp/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( openssl_threads.patch fix-include-path.patch fix-libusb.patch + install-dirs.patch ) if (NOT VCPKG_TARGET_IS_WINDOWS) diff --git a/ports/freerdp/vcpkg.json b/ports/freerdp/vcpkg.json index 7186615cda4255..f93e95b23a3d6b 100644 --- a/ports/freerdp/vcpkg.json +++ b/ports/freerdp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freerdp", - "version-semver": "2.4.0", + "version": "2.4.0", + "port-version": 1, "description": "A free implementation of the Remote Desktop Protocol (RDP)", "homepage": "https://github.com/FreeRDP/FreeRDP", "supports": "!(arm | uwp)", diff --git a/ports/openni2/disable_kinect.patch b/ports/openni2/disable_kinect.patch deleted file mode 100644 index 593ca079a06293..00000000000000 --- a/ports/openni2/disable_kinect.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/OpenNI.sln b/OpenNI.sln -index 9af176a..3786850 100644 ---- a/OpenNI.sln -+++ b/OpenNI.sln -@@ -86,12 +86,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Install", "Packaging\Instal - {5B74F010-8B79-46B5-B906-C2B56CDB3386} = {5B74F010-8B79-46B5-B906-C2B56CDB3386} - {D5709FB9-909D-415F-8F86-2F25BEF6CE23} = {D5709FB9-909D-415F-8F86-2F25BEF6CE23} - {1723CBBA-8EE7-439A-93FB-2E94B4DB2E63} = {1723CBBA-8EE7-439A-93FB-2E94B4DB2E63} -- {E636BACA-795F-41CF-BC52-14C727BF014E} = {E636BACA-795F-41CF-BC52-14C727BF014E} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kinect", "Source\Drivers\Kinect\Kinect.vcxproj", "{E636BACA-795F-41CF-BC52-14C727BF014E}" -- ProjectSection(ProjectDependencies) = postProject -- {72D595BB-8C52-449B-91DB-0E9F6AEAF5BB} = {72D595BB-8C52-449B-91DB-0E9F6AEAF5BB} - EndProjectSection - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DepthUtils", "Source\DepthUtils\DepthUtils.vcxproj", "{72D595BB-8C52-449B-91DB-0E9F6AEABBBB}" -@@ -252,14 +246,6 @@ Global - {BAEB9C48-562C-4D56-A6CD-18932265480A}.Debug|x86.ActiveCfg = Debug|x86 - {BAEB9C48-562C-4D56-A6CD-18932265480A}.Release|x64.ActiveCfg = Release|x64 - {BAEB9C48-562C-4D56-A6CD-18932265480A}.Release|x86.ActiveCfg = Release|x86 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x64.ActiveCfg = Debug|x64 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x64.Build.0 = Debug|x64 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x86.ActiveCfg = Debug|Win32 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x86.Build.0 = Debug|Win32 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x64.ActiveCfg = Release|x64 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x64.Build.0 = Release|x64 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x86.ActiveCfg = Release|Win32 -- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x86.Build.0 = Release|Win32 - {72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x64.ActiveCfg = Debug|x64 - {72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x64.Build.0 = Debug|x64 - {72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x86.ActiveCfg = Debug|Win32 -@@ -317,7 +303,6 @@ Global - {9F6652AF-35F2-452E-A2D3-08D05F5C075E} = {238D091D-1A85-4A61-9DCD-483768C51804} - {31F0F25B-A84A-48AC-9716-5DF9137F3855} = {238D091D-1A85-4A61-9DCD-483768C51804} - {15ECC029-90DE-4D1D-B00A-4A8E647D8C24} = {238D091D-1A85-4A61-9DCD-483768C51804} -- {E636BACA-795F-41CF-BC52-14C727BF014E} = {238D091D-1A85-4A61-9DCD-483768C51804} - {5B74F010-8B79-46B5-B906-C2B56CDB3386} = {238D091D-1A85-4A61-9DCD-483768C51804} - {BDA3BF24-550A-4BF9-83E5-0056134EED40} = {20285393-1DB1-4300-8AD3-30AEAE3C5DA6} - {D39A4248-3985-41DE-AFD5-AEC58D29291F} = {20285393-1DB1-4300-8AD3-30AEAE3C5DA6} diff --git a/ports/openni2/vcpkg.json b/ports/openni2/vcpkg.json index 6cb6c7c367fe78..5110fbc072c16c 100644 --- a/ports/openni2/vcpkg.json +++ b/ports/openni2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openni2", "version-string": "2.2.0.33", - "port-version": 12, + "port-version": 13, "description": "OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.", "homepage": "https://github.com/OpenNI/OpenNI2", "supports": "!uwp", diff --git a/ports/osg/fix-builderror-with-libtiff.patch b/ports/osg/fix-builderror-with-libtiff.patch deleted file mode 100644 index d3a938e423fbb5..00000000000000 --- a/ports/osg/fix-builderror-with-libtiff.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeModules/OsgAndroidMacroUtils.cmake b/CMakeModules/OsgAndroidMacroUtils.cmake -index 50c22e0..8e79b09 100644 ---- a/CMakeModules/OsgAndroidMacroUtils.cmake -+++ b/CMakeModules/OsgAndroidMacroUtils.cmake -@@ -118,7 +118,7 @@ MACRO(ANDROID_3RD_PARTY) - #set(ENV{AND_OSG_LIB_PATHS} "$ENV{AND_OSG_LIB_PATHS}include ${TIFF_INCLUDE_DIR}/Android.mk \n") - if(TIFF_INCLUDE_DIR) - message(STATUS "TIF found ${TIFF_INCLUDE_DIR}" ) -- set(TIFF_FOUND "Yes") -+ #set(TIFF_FOUND "Yes") - install(DIRECTORY 3rdparty/build/libtiff/ DESTINATION ./ ) - else(TIFF_INCLUDE_DIR) - message(STATUS "TIF missing" ) -diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt -index 77d66f8..1504bf9 100644 ---- a/src/osgPlugins/CMakeLists.txt -+++ b/src/osgPlugins/CMakeLists.txt -@@ -115,7 +115,7 @@ IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE) - ADD_PLUGIN_DIRECTORY(png) - ENDIF() - IF(TIFF_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE) -- ADD_PLUGIN_DIRECTORY(tiff) -+ #ADD_PLUGIN_DIRECTORY(tiff) - ENDIF() - IF(GDAL_FOUND) - ADD_PLUGIN_DIRECTORY(gdal) diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index 8ad7f03b1621c5..b1f62b5da6ec3c 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version-string": "3.6.5", - "port-version": 8, + "port-version": 9, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://github.com/openscenegraph/OpenSceneGraph", "dependencies": [ diff --git a/ports/osgearth/deprecated_cpp_fix.patch b/ports/osgearth/deprecated_cpp_fix.patch deleted file mode 100644 index 7a56041983f2bd..00000000000000 --- a/ports/osgearth/deprecated_cpp_fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 89bea8378ae632b0caa134293f713b927774ab50 Mon Sep 17 00:00:00 2001 -From: ankurv -Date: Sun, 3 Jan 2021 11:05:32 -0800 -Subject: [PATCH] Patch - ---- - src/osgEarth/Threading | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/osgEarth/Threading b/src/osgEarth/Threading -index 9093ca6..0fbd9ce 100644 ---- a/src/osgEarth/Threading -+++ b/src/osgEarth/Threading -@@ -602,7 +602,11 @@ namespace osgEarth { namespace Threading - template - constexpr auto cpp11invoke(Fn&& f, Args&&... args) - noexcept(noexcept(std::forward(f)(std::forward(args)...))) -+#if defined(__cpp_lib_is_invocable) && __cpp_lib_is_invocable >= 201703 -+ -> typename std::invoke_result::type -+#else - -> typename std::result_of::type -+#endif - { - return std::forward(f)(std::forward(args)...); - } --- -2.29.2.windows.3 - diff --git a/ports/osgearth/vcpkg.json b/ports/osgearth/vcpkg.json index 090f11f5c92a5a..57cc6af2682dd2 100644 --- a/ports/osgearth/vcpkg.json +++ b/ports/osgearth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "osgearth", "version": "3.2", + "port-version": 1, "description": "osgEarth - Dynamic map generation toolkit for OpenSceneGraph Copyright 2021 Pelican Mapping.", "homepage": "https://github.com/gwaldron/osgearth", "supports": "!(x86 | wasm32)", diff --git a/ports/sparsehash/00001-windows-use-std.patch b/ports/sparsehash/00001-windows-use-std.patch deleted file mode 100644 index 69d1966f895103..00000000000000 --- a/ports/sparsehash/00001-windows-use-std.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/windows/sparsehash/internal/sparseconfig.h b/src/windows/sparsehash/internal/sparseconfig.h -index 3091559..f96e08c 100644 ---- a/src/windows/sparsehash/internal/sparseconfig.h -+++ b/src/windows/sparsehash/internal/sparseconfig.h -@@ -7,10 +7,10 @@ - #define GOOGLE_NAMESPACE ::google - - /* the location of the header defining hash functions */ --#define HASH_FUN_H -+#define HASH_FUN_H - - /* the namespace of the hash<> function */ --#define HASH_NAMESPACE stdext -+#define HASH_NAMESPACE std - - /* Define to 1 if you have the header file. */ - #undef HAVE_INTTYPES_H diff --git a/ports/sparsehash/vcpkg.json b/ports/sparsehash/vcpkg.json index f43d9bd41cdd7b..a2306e43dcb3a8 100644 --- a/ports/sparsehash/vcpkg.json +++ b/ports/sparsehash/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sparsehash", "version": "2.0.4", + "port-version": 1, "description": "The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.", "homepage": "https://github.com/sparsehash/sparsehash" } diff --git a/ports/systemc/tlm_correct_dependency.patch b/ports/systemc/tlm_correct_dependency.patch deleted file mode 100644 index 56a4a466f55ad3..00000000000000 --- a/ports/systemc/tlm_correct_dependency.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- cmake\SystemCTLMConfig.cmake.in Sat Oct 13 00:19:07 2018 -+++ cmake\SystemCTLMConfig.cmake.in.fixed Mon Jan 28 15:23:44 2019 -@@ -2,4 +2,4 @@ - - # TLM is part of the SystemC language library. - include(CMakeFindDependencyMacro) --find_dependency (SystemC @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT) -+find_dependency (SystemCLanguage @SystemCLanguage_VERSION_MAJOR@.@SystemCLanguage_VERSION_MINOR@.@SystemCLanguage_VERSION_PATCH@.@SystemCLanguage_VERSION_RELEASE_DATE@ EXACT) diff --git a/ports/systemc/vcpkg.json b/ports/systemc/vcpkg.json index 6c456295db39c6..9f9d743fee6653 100644 --- a/ports/systemc/vcpkg.json +++ b/ports/systemc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "systemc", "version-string": "2.3.3", - "port-version": 5, + "port-version": 6, "description": "A set of C++ classes and macros which provide an event-driven simulation kernel in C++" } diff --git a/versions/3-/3fd.json b/versions/3-/3fd.json index d10496a29adb41..2a20264ea9ae88 100644 --- a/versions/3-/3fd.json +++ b/versions/3-/3fd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "622078647d4fff0a51a26a4ecff2ba9109e5764d", + "version": "2.6.3", + "port-version": 1 + }, { "git-tree": "73ad3c823ef701c37421b450a34271d6beaf7b07", "version-string": "2.6.3", diff --git a/versions/baseline.json b/versions/baseline.json index 34e4f1d05c67c0..40fe351d75b56b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2,7 +2,7 @@ "default": { "3fd": { "baseline": "2.6.3", - "port-version": 0 + "port-version": 1 }, "7zip": { "baseline": "19.00", @@ -1526,7 +1526,7 @@ }, "cppad": { "baseline": "20210000.7", - "port-version": 0 + "port-version": 1 }, "cppcms": { "baseline": "1.2.1", @@ -1550,7 +1550,7 @@ }, "cppitertools": { "baseline": "2.1", - "port-version": 1 + "port-version": 2 }, "cppkafka": { "baseline": "0.3.1", @@ -1594,7 +1594,7 @@ }, "cpuid": { "baseline": "0.5.1", - "port-version": 0 + "port-version": 1 }, "cpuinfo": { "baseline": "2021-04-04", @@ -1646,7 +1646,7 @@ }, "ctemplate": { "baseline": "2020-09-14", - "port-version": 1 + "port-version": 2 }, "ctp": { "baseline": "6.6.1_P1_20210406_se", @@ -1786,7 +1786,7 @@ }, "dimcli": { "baseline": "5.0.2", - "port-version": 1 + "port-version": 2 }, "directx-headers": { "baseline": "1.4.9", @@ -2234,7 +2234,7 @@ }, "freerdp": { "baseline": "2.4.0", - "port-version": 0 + "port-version": 1 }, "freetds": { "baseline": "1.2.11", @@ -4898,7 +4898,7 @@ }, "openni2": { "baseline": "2.2.0.33", - "port-version": 12 + "port-version": 13 }, "openscap": { "baseline": "1.3.1", @@ -4974,7 +4974,7 @@ }, "osg": { "baseline": "3.6.5", - "port-version": 8 + "port-version": 9 }, "osg-qt": { "baseline": "Qt5", @@ -4982,7 +4982,7 @@ }, "osgearth": { "baseline": "3.2", - "port-version": 0 + "port-version": 1 }, "osi": { "baseline": "0.108.6", @@ -6302,7 +6302,7 @@ }, "sparsehash": { "baseline": "2.0.4", - "port-version": 0 + "port-version": 1 }, "sparsepp": { "baseline": "1.22", @@ -6482,7 +6482,7 @@ }, "systemc": { "baseline": "2.3.3", - "port-version": 5 + "port-version": 6 }, "szip": { "baseline": "2.1.1", diff --git a/versions/c-/cppad.json b/versions/c-/cppad.json index bfe05de38ce429..20c81ce9560679 100644 --- a/versions/c-/cppad.json +++ b/versions/c-/cppad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd043aed2197ac43f337a7806061460728cf56a8", + "version-string": "20210000.7", + "port-version": 1 + }, { "git-tree": "00e184c8de4368f8ee0b6b5dd0c16034d7a99a8f", "version-string": "20210000.7", diff --git a/versions/c-/cppitertools.json b/versions/c-/cppitertools.json index a2ad3bc3b51904..fe5a24f75c1005 100644 --- a/versions/c-/cppitertools.json +++ b/versions/c-/cppitertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8373c4fe2df5953309d3fc443ceed59553d35824", + "version": "2.1", + "port-version": 2 + }, { "git-tree": "ee578d4182af8702a89a87b361e192d634055352", "version-string": "2.1", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index 4ba992173808f6..955c93f17b1a71 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b5a58587efff685ef5c166bcfba98542606f8ca", + "version": "0.5.1", + "port-version": 1 + }, { "git-tree": "65cb7ff3fc46a78367e4c700b587e8093386e4b3", "version": "0.5.1", diff --git a/versions/c-/ctemplate.json b/versions/c-/ctemplate.json index cdd3ca2422dc97..d9e9f8ecb4b78a 100644 --- a/versions/c-/ctemplate.json +++ b/versions/c-/ctemplate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "491ab782407b38835b9a555dc77e6d3af485fdae", + "version-date": "2020-09-14", + "port-version": 2 + }, { "git-tree": "49845dc04f38d16b9c148162fc1457ed78608ae7", "version-string": "2020-09-14", diff --git a/versions/d-/dimcli.json b/versions/d-/dimcli.json index 26e47bfd0dcaeb..f6e8eab856ef3a 100644 --- a/versions/d-/dimcli.json +++ b/versions/d-/dimcli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9901ca1f1a121a702d4fb4c73ad6a482adff6c3f", + "version-semver": "5.0.2", + "port-version": 2 + }, { "git-tree": "025db5cad1969933359bac4047e0dea962fb692b", "version-string": "5.0.2", diff --git a/versions/f-/freerdp.json b/versions/f-/freerdp.json index 641369100c387d..738592d7be39cb 100644 --- a/versions/f-/freerdp.json +++ b/versions/f-/freerdp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "501668a8e37d5fc800fbf2f82729507a0af386cd", + "version": "2.4.0", + "port-version": 1 + }, { "git-tree": "504bdd8f860f4e4b091de21a76999261bff207da", "version-semver": "2.4.0", diff --git a/versions/o-/openni2.json b/versions/o-/openni2.json index 2cfe48f9e33a25..45f539ce40cf66 100644 --- a/versions/o-/openni2.json +++ b/versions/o-/openni2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b99fb68dafe4b930248e5ba4d39a7a2c4a4fc9ea", + "version-string": "2.2.0.33", + "port-version": 13 + }, { "git-tree": "7fd7382fff870dcc4920d0ff72e5ba00ad74fa6f", "version-string": "2.2.0.33", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index c2199541729c70..2100c623efcc74 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "786c1469d92ebae55703e2be690bd72083a800a3", + "version-string": "3.6.5", + "port-version": 9 + }, { "git-tree": "2a5b4c77e1ac62bb98a0deb970fc39a4976cc528", "version-string": "3.6.5", diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json index bd416102cdcbe0..60da91a0b332b0 100644 --- a/versions/o-/osgearth.json +++ b/versions/o-/osgearth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3ac1cffb36f0b0b2b531af29145de695cee2291", + "version": "3.2", + "port-version": 1 + }, { "git-tree": "a77075c3ff1a0372588cb78af6f4f08352b82896", "version": "3.2", diff --git a/versions/s-/sparsehash.json b/versions/s-/sparsehash.json index 558dd9bf1853b8..2b77e12c0bb931 100644 --- a/versions/s-/sparsehash.json +++ b/versions/s-/sparsehash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bb73fddc7adde82c92bad4cd03ad629d978db6b", + "version": "2.0.4", + "port-version": 1 + }, { "git-tree": "833f95be52924049168376714c59fd022ef9568c", "version": "2.0.4", diff --git a/versions/s-/systemc.json b/versions/s-/systemc.json index aff42b966da707..4102645c3897be 100644 --- a/versions/s-/systemc.json +++ b/versions/s-/systemc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c07c9aedd9229f1583602afe462aa9894562462c", + "version-string": "2.3.3", + "port-version": 6 + }, { "git-tree": "f10aa24af3ad40a22d15a729df5d64695c141226", "version-string": "2.3.3", From 33f39855700ef22fd9441be0afa6513dd50a9b1c Mon Sep 17 00:00:00 2001 From: Dominik Wernberger Date: Mon, 18 Oct 2021 23:26:19 +0200 Subject: [PATCH 0849/1858] [compoundfilereader] new port (#20800) * Add compoundfilereader * Add versions file * Adjust SHA * Integrate suggestion Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Integrate suggestion Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Adjust versions Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/compoundfilereader/portfile.cmake | 10 ++++++++++ ports/compoundfilereader/vcpkg.json | 6 ++++++ versions/baseline.json | 4 ++++ versions/c-/compoundfilereader.json | 9 +++++++++ 4 files changed, 29 insertions(+) create mode 100644 ports/compoundfilereader/portfile.cmake create mode 100644 ports/compoundfilereader/vcpkg.json create mode 100644 versions/c-/compoundfilereader.json diff --git a/ports/compoundfilereader/portfile.cmake b/ports/compoundfilereader/portfile.cmake new file mode 100644 index 00000000000000..aba7039f188574 --- /dev/null +++ b/ports/compoundfilereader/portfile.cmake @@ -0,0 +1,10 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Microsoft/compoundfilereader + REF v0.1.0 + SHA512 0ebb3ad02e4723d5e00a553d608dd8760614a3d83785c0e96a6d9a04df7e92486f6a4ecc0f7327a593776865abe697d21125554d547e89c838c69ab2da24d906 +) + +file(COPY "${SOURCE_PATH}/src/include/compoundfilereader.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(COPY "${SOURCE_PATH}/src/include/utf.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/compoundfilereader/vcpkg.json b/ports/compoundfilereader/vcpkg.json new file mode 100644 index 00000000000000..577b43c2b6da65 --- /dev/null +++ b/ports/compoundfilereader/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "compoundfilereader", + "version": "0.1.0", + "description": "Simple standalone c++ header file to read compound file (Structured Storage File) content.", + "homepage": "https://github.com/microsoft/compoundfilereader" +} diff --git a/versions/baseline.json b/versions/baseline.json index 40fe351d75b56b..052eca64df65a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1456,6 +1456,10 @@ "baseline": "3.6.4", "port-version": 0 }, + "compoundfilereader": { + "baseline": "0.1.0", + "port-version": 0 + }, "concurrencpp": { "baseline": "0.1.3", "port-version": 0 diff --git a/versions/c-/compoundfilereader.json b/versions/c-/compoundfilereader.json new file mode 100644 index 00000000000000..ad7e955095fbac --- /dev/null +++ b/versions/c-/compoundfilereader.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b91bf9e4b5d94c93ac2ffdfc8785c2ec4d99c9ec", + "version": "0.1.0", + "port-version": 0 + } + ] +} From 2de55dcab6d7202020ebabea859e60150eae4e22 Mon Sep 17 00:00:00 2001 From: Ryan Mast <3969255+nightlark@users.noreply.github.com> Date: Mon, 18 Oct 2021 14:27:04 -0700 Subject: [PATCH 0850/1858] [toml11] update to 3.7.0 (#20798) * [toml11] update to 3.7.0 * [toml11] change deprecated to new vcpkg functions * Update CI baseline * update portfile.cmake * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/toml11/portfile.cmake | 23 +++++++++++------------ ports/toml11/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/t-/toml11.json | 5 +++++ 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/ports/toml11/portfile.cmake b/ports/toml11/portfile.cmake index 46e042e2a4b26b..3e5729bc78b62a 100644 --- a/ports/toml11/portfile.cmake +++ b/ports/toml11/portfile.cmake @@ -1,28 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ToruNiina/toml11 - REF v3.5.0 - SHA512 19c6ee42aa1e186689062e5d2be05f375c8ae4be40be4b6a8e803a642f37214270d5600ccec3d06b4e69aec6896d823e3a8faea29a41643279922d1fe9fae70a + REF v3.7.0 + SHA512 093833ea4354ab91f54c0a346e51d38e297b8c347241f679c023e65fe580edca7852d934a0a0d371524426f61e58ee3a9638061b1230cd72be7ff55fcf12370c HEAD_REF master ) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS -Dtoml11_BUILD_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/toml11 TARGET_PATH share/toml11) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/toml11) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/share/toml11/toml11Config.cmake + "${CURRENT_PACKAGES_DIR}/share/toml11/toml11Config.cmake" "\${PACKAGE_PREFIX_DIR}/lib/cmake/toml11/toml11Targets.cmake" "\${PACKAGE_PREFIX_DIR}/share/toml11/toml11Targets.cmake" ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) \ No newline at end of file +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/toml11/vcpkg.json b/ports/toml11/vcpkg.json index b6577aafd4e71e..de82e84e0dd77f 100644 --- a/ports/toml11/vcpkg.json +++ b/ports/toml11/vcpkg.json @@ -1,7 +1,16 @@ { "name": "toml11", - "version-string": "3.5.0", - "port-version": 2, + "version": "3.7.0", "description": "A C++11 header-only toml parser/encoder depending only on C++ standard library.", - "homepage": "https://github.com/ToruNiina/toml11" + "homepage": "https://github.com/ToruNiina/toml11", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 052eca64df65a3..0bfb07959e24c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6725,8 +6725,8 @@ "port-version": 5 }, "toml11": { - "baseline": "3.5.0", - "port-version": 2 + "baseline": "3.7.0", + "port-version": 0 }, "tomlplusplus": { "baseline": "2.5.0", diff --git a/versions/t-/toml11.json b/versions/t-/toml11.json index 1cc599ac7f0e29..6012bfd5188c70 100644 --- a/versions/t-/toml11.json +++ b/versions/t-/toml11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab8e69aef0551e2e862e74ec70b5c2dd58aac36b", + "version": "3.7.0", + "port-version": 0 + }, { "git-tree": "dabcb8338003184011c1b13e49561f9c112a9735", "version-string": "3.5.0", From a1582c398c3b8588e26f81b1b1db9c65942f8cec Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Tue, 19 Oct 2021 05:30:48 +0800 Subject: [PATCH 0851/1858] [libjuice] Update to 0.9.1 (#20667) * [libjuice] Update to 0.9.1 * Small changes * [libdatachannel] Update the usage of libjuice --- ports/libdatachannel/0001-fix-for-vcpkg.patch | 2 +- ports/libdatachannel/portfile.cmake | 2 +- ports/libdatachannel/vcpkg.json | 1 + ports/libjuice/fix-for-vcpkg.patch | 15 +++++++-------- ports/libjuice/portfile.cmake | 17 ++++++++--------- ports/libjuice/vcpkg.json | 12 +++++++++++- versions/baseline.json | 4 ++-- versions/l-/libdatachannel.json | 5 +++++ versions/l-/libjuice.json | 5 +++++ 9 files changed, 41 insertions(+), 22 deletions(-) diff --git a/ports/libdatachannel/0001-fix-for-vcpkg.patch b/ports/libdatachannel/0001-fix-for-vcpkg.patch index 1d859d814d2844..4bce9aa8874f04 100644 --- a/ports/libdatachannel/0001-fix-for-vcpkg.patch +++ b/ports/libdatachannel/0001-fix-for-vcpkg.patch @@ -60,7 +60,7 @@ index 02b688c..03b185f 100644 target_link_libraries(datachannel-static PRIVATE LibJuice::LibJuice) else() - add_subdirectory(deps/libjuice EXCLUDE_FROM_ALL) -+ find_package(libjuice CONFIG REQUIRED) ++ find_package(LibJuice CONFIG REQUIRED) target_compile_definitions(datachannel PRIVATE RTC_SYSTEM_JUICE=0) target_compile_definitions(datachannel-static PRIVATE RTC_SYSTEM_JUICE=0) - target_link_libraries(datachannel PRIVATE LibJuice::LibJuiceStatic) diff --git a/ports/libdatachannel/portfile.cmake b/ports/libdatachannel/portfile.cmake index c6158794255968..0426c1a662444d 100644 --- a/ports/libdatachannel/portfile.cmake +++ b/ports/libdatachannel/portfile.cmake @@ -35,7 +35,7 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/LibDataChannel/LibDataChannelConfig.cm include(CMakeFindDependencyMacro) find_dependency(Threads) find_dependency(OpenSSL) -find_dependency(libjuice) +find_dependency(LibJuice) ${DATACHANNEL_CONFIG}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libdatachannel/vcpkg.json b/ports/libdatachannel/vcpkg.json index cffe9b8a24d3ad..1767760c272f6f 100644 --- a/ports/libdatachannel/vcpkg.json +++ b/ports/libdatachannel/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libdatachannel", "version-semver": "0.15.1", + "port-version": 1, "description": "libdatachannel is a standalone implementation of WebRTC Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings for POSIX platforms (including GNU/Linux, Android, and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libdatachannel", "dependencies": [ diff --git a/ports/libjuice/fix-for-vcpkg.patch b/ports/libjuice/fix-for-vcpkg.patch index 75ab492a06990d..97d0acf542bbe5 100644 --- a/ports/libjuice/fix-for-vcpkg.patch +++ b/ports/libjuice/fix-for-vcpkg.patch @@ -1,26 +1,26 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index aedb557..89c701b 100644 +index 3e2a2dc..011a4ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -72,7 +72,7 @@ set(TESTS_SOURCES +@@ -66,7 +66,7 @@ set(TESTS_SOURCES set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -add_library(juice SHARED ${LIBJUICE_SOURCES}) +add_library(juice ${LIBJUICE_SOURCES}) set_target_properties(juice PROPERTIES VERSION ${PROJECT_VERSION}) - target_compile_definitions(juice PRIVATE $<$:RELEASE=1>) - -@@ -100,11 +100,15 @@ if(WIN32) + target_include_directories(juice PUBLIC + $ +@@ -96,11 +96,15 @@ if(WIN32) endif() if (USE_NETTLE) - find_package(Nettle REQUIRED) -+ find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED) ++ find_path(NETTLE_INCLUDE_PATH "nettle/hmac.h" REQUIRED) + find_library(NETTLE_LIBRARY_PATH NAMES nettle libnettle REQUIRED) + target_include_directories(juice PRIVATE ${NETTLE_INCLUDE_PATH}) + target_include_directories(juice-static PRIVATE ${NETTLE_INCLUDE_PATH}) -+ ++ target_compile_definitions(juice PRIVATE USE_NETTLE=1) - target_link_libraries(juice PRIVATE Nettle::Nettle) + target_link_libraries(juice PRIVATE ${NETTLE_LIBRARY_PATH}) @@ -30,4 +30,3 @@ index aedb557..89c701b 100644 else() target_compile_definitions(juice PRIVATE USE_NETTLE=0) target_compile_definitions(juice-static PRIVATE USE_NETTLE=0) - diff --git a/ports/libjuice/portfile.cmake b/ports/libjuice/portfile.cmake index bbe0d1db25d8dc..f6e383a5d11669 100644 --- a/ports/libjuice/portfile.cmake +++ b/ports/libjuice/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO paullouisageneau/libjuice - REF v0.8.4 - SHA512 c33fc237ff0acb6b9cb37143d1f5a22f20670c8e32200d79c45c8473e1b0e1174926706876a1c37a51ba9ec6ec935337fd87512211eaaf8652f73d4934038834 + REF 026b3dd68db33143db8a5a9b16af3923733a8b61 #v0.9.1 + SHA512 050e92df2e3f24da465ffd4e57d35ffc7a4e13042dc0b829627a09c3f8c7898c7b066f3e386004b579e7416adf4885f5f7a8da46f34c76e9bc63747616f34f9d HEAD_REF master PATCHES fix-for-vcpkg.patch @@ -10,22 +10,21 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - nettle USE_NETTLE + nettle USE_NETTLE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DNO_TESTS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libjuice) +vcpkg_cmake_config_fixup(PACKAGE_NAME LibJuice CONFIG_PATH lib/cmake/LibJuice) vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libjuice/vcpkg.json b/ports/libjuice/vcpkg.json index 6ba94b4cc7a5b9..d3a226ba9a768d 100644 --- a/ports/libjuice/vcpkg.json +++ b/ports/libjuice/vcpkg.json @@ -1,8 +1,18 @@ { "name": "libjuice", - "version": "0.8.4", + "version": "0.9.1", "description": "The library is a simplified implementation of the Interactive Connectivity Establishment (ICE) protocol in C for POSIX platforms (including Linux and Apple macOS) and Microsoft Windows.", "homepage": "https://github.com/paullouisageneau/libjuice", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "nettle": { "description": "Use nettle for HMAC computation instead of the Builtin", diff --git a/versions/baseline.json b/versions/baseline.json index 0bfb07959e24c8..bfab630c91d28b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3322,7 +3322,7 @@ }, "libdatachannel": { "baseline": "0.15.1", - "port-version": 0 + "port-version": 1 }, "libdatrie": { "baseline": "0.2.10", @@ -3513,7 +3513,7 @@ "port-version": 2 }, "libjuice": { - "baseline": "0.8.4", + "baseline": "0.9.1", "port-version": 0 }, "libkeyfinder": { diff --git a/versions/l-/libdatachannel.json b/versions/l-/libdatachannel.json index cb6963b987a981..b5cd817fb9156d 100644 --- a/versions/l-/libdatachannel.json +++ b/versions/l-/libdatachannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ef71c270b3ea4205b878248ade5e50c03fd54b4", + "version-semver": "0.15.1", + "port-version": 1 + }, { "git-tree": "eb99868eb60c37127a98ff943da771edb8002a29", "version-semver": "0.15.1", diff --git a/versions/l-/libjuice.json b/versions/l-/libjuice.json index acff7a4748cc11..78d57ea555b599 100644 --- a/versions/l-/libjuice.json +++ b/versions/l-/libjuice.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "564ac624cbbabb45356d592264c090a0e6f64669", + "version": "0.9.1", + "port-version": 0 + }, { "git-tree": "077151e85bf11cabc11d0f1c46b778b5a21829dd", "version": "0.8.4", From bbb5cefaf267bda8ea62a3a76b8b1e795a04f981 Mon Sep 17 00:00:00 2001 From: Ryan Mast <3969255+nightlark@users.noreply.github.com> Date: Mon, 18 Oct 2021 14:31:29 -0700 Subject: [PATCH 0852/1858] [cli11] update to 2.1.1 (#20796) * [cli11] update to 2.1.1 * Update CI baseline --- ports/cli11/portfile.cmake | 4 ++-- ports/cli11/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cli11.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 43cb23df563acc..b560b91a70ea90 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v2.1.0 - SHA512 22c75e6b55d5320656ca2f65bf7c1dc82546fa65458f66a3d6401d002e83f12a0ee93a572637f5daa8daed9e0ce11fbf4aabf864caadc851f75bced63814ba10 + REF v2.1.1 + SHA512 9bfd1c297422985171501b81f48bb89e2a3314ce86de930e06f1d0d580c9d31969d758dfc1435d1d5bb2ce957cd3c9bee9e433c9f6cc8ae8c24d05ac8841e3a9 HEAD_REF master ) diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json index dc20fd1e19650c..ba2ea942f25a82 100644 --- a/ports/cli11/vcpkg.json +++ b/ports/cli11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cli11", - "version": "2.1.0", + "version": "2.1.1", "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", "homepage": "https://github.com/CLIUtils/CLI11", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index bfab630c91d28b..ddd2280861aa2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1381,7 +1381,7 @@ "port-version": 0 }, "cli11": { - "baseline": "2.1.0", + "baseline": "2.1.1", "port-version": 0 }, "clickhouse-cpp": { diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json index 2406a85a9c64d9..965b6891600f6e 100644 --- a/versions/c-/cli11.json +++ b/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7110589331620372b824efe58e1c3eb5c89c41e7", + "version": "2.1.1", + "port-version": 0 + }, { "git-tree": "07b6e6eba954d7f9300768c354e650ae32582c90", "version": "2.1.0", From 191f34b5ca10f9e16eab2e99c49256dd429b37cf Mon Sep 17 00:00:00 2001 From: Ryan Mast <3969255+nightlark@users.noreply.github.com> Date: Mon, 18 Oct 2021 14:31:57 -0700 Subject: [PATCH 0853/1858] [sundials] update to 5.8.0 (#20793) * [sundials] update to 5.8.0 * Update CI baseline * [sundials] migrate from deprecated to new functions * Update CI baseline --- ports/sundials/portfile.cmake | 11 +++++------ ports/sundials/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/s-/sundials.json | 5 +++++ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index ae72b89a24cc67..34ceecc99bd5d0 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO LLNL/sundials - REF 73c280cd55ca2b42019c8a9aa54af10e41e27b9d # v5.7.0 - SHA512 c70c53e5f5efe47255d23f36e71ffd75d61905a13a634a26bfbbd43c3c8764b7805db9a8cbe48c6cf69b2a1028701cb7118074bbbc01de71faf4f30bf0be22f9 + REF v5.8.0 + SHA512 30f6a7bddf813634e4266c36331673b52448b719f938f45a4efb6a96cfbeea4fe168fdded89309672b148f8ef8bc05997d838627e828573900ec169a41472372 HEAD_REF master PATCHES install-dlls-in-bin.patch @@ -11,16 +11,15 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -D_BUILD_EXAMPLES=OFF -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC} -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED} ) -vcpkg_install_cmake(DISABLE_PARALLEL) +vcpkg_cmake_install(DISABLE_PARALLEL) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) @@ -29,4 +28,4 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) diff --git a/ports/sundials/vcpkg.json b/ports/sundials/vcpkg.json index 9245e80d2228ce..df5c71f1478792 100644 --- a/ports/sundials/vcpkg.json +++ b/ports/sundials/vcpkg.json @@ -1,7 +1,16 @@ { "name": "sundials", - "version-semver": "5.7.0", - "port-version": 1, + "version-semver": "5.8.0", "description": "SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)", - "homepage": "https://computation.llnl.gov/projects/sundials" + "homepage": "https://computation.llnl.gov/projects/sundials", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ddd2280861aa2d..5b5915c3a8e0d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6473,8 +6473,8 @@ "port-version": 1 }, "sundials": { - "baseline": "5.7.0", - "port-version": 1 + "baseline": "5.8.0", + "port-version": 0 }, "superlu": { "baseline": "2020-01-07", diff --git a/versions/s-/sundials.json b/versions/s-/sundials.json index 2a5f79d5ffc922..f9d1be6be58a74 100644 --- a/versions/s-/sundials.json +++ b/versions/s-/sundials.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "206df7509167e6e89bdac2e9252e9e57615e18a4", + "version-semver": "5.8.0", + "port-version": 0 + }, { "git-tree": "5acf78bcee903986a02aef256e969f1f7f7a87fa", "version-semver": "5.7.0", From 55416b817219565b37973c73bbe3d1a45be3a468 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 18 Oct 2021 14:32:19 -0700 Subject: [PATCH 0854/1858] [geogram] Remove ci.baseline.txt skip. (#20825) Victor and I forgot to remove geogram from ci.baseline.txt in https://github.com/microsoft/vcpkg/pull/20778 --- scripts/ci.baseline.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c7d3065329a904..dfb0e1afdf03e8 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -341,12 +341,6 @@ gainput:x64-uwp=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail -geogram:x64-linux=fail -geogram:x64-osx=fail -geogram:x64-windows-static-md=fail -geogram:x64-windows-static=fail -geogram:x64-windows=fail -geogram:x86-windows=fail geos:arm-uwp=fail geos:x64-uwp=fail From 97901cfa9dbedf3acb32e8c946e91ed4f6e04305 Mon Sep 17 00:00:00 2001 From: Ryan Mast <3969255+nightlark@users.noreply.github.com> Date: Mon, 18 Oct 2021 14:32:32 -0700 Subject: [PATCH 0855/1858] [nlohmann-json] update to 3.10.4 (#20792) * [nlohmann-json] update to 3.10.4 * Update CI baseline * CI --- ports/nlohmann-json/portfile.cmake | 4 ++-- ports/nlohmann-json/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nlohmann-json.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nlohmann-json/portfile.cmake b/ports/nlohmann-json/portfile.cmake index e6c34a526ce508..623392a7805994 100644 --- a/ports/nlohmann-json/portfile.cmake +++ b/ports/nlohmann-json/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nlohmann/json - REF v3.10.2 - SHA512 9a399dfc8aab19c9fc12470e8087895b1c05d48a9bcc731b483d8670c361cffb2adc3ccced822b7f17255e88387a441d619c4e1f1afeb702d1d035ad24fe22ed + REF v3.10.4 + SHA512 f78592db6218165cbc74c10bcba40366f1bfea84405b7ee25fe97a056d5b7a15aeeb956d93296673928dcbd6e26ffcfb152f885b4a44d5d55751396ccf090835 HEAD_REF master ) diff --git a/ports/nlohmann-json/vcpkg.json b/ports/nlohmann-json/vcpkg.json index 10650043fa0646..1b13bdbbcfa783 100644 --- a/ports/nlohmann-json/vcpkg.json +++ b/ports/nlohmann-json/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nlohmann-json", - "version-semver": "3.10.2", + "version-semver": "3.10.4", "description": "JSON for Modern C++", "homepage": "https://github.com/nlohmann/json", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5b5915c3a8e0d5..1058cc45e5bf85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4613,7 +4613,7 @@ "port-version": 2 }, "nlohmann-json": { - "baseline": "3.10.2", + "baseline": "3.10.4", "port-version": 0 }, "nlopt": { diff --git a/versions/n-/nlohmann-json.json b/versions/n-/nlohmann-json.json index 435786805131be..29cfd19384c4c7 100644 --- a/versions/n-/nlohmann-json.json +++ b/versions/n-/nlohmann-json.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f948131b4bc6e2e9ae67cb7d40f5e930991fba21", + "version-semver": "3.10.4", + "port-version": 0 + }, { "git-tree": "8221e7cbc0745629018b122f192835bed642e844", "version-semver": "3.10.2", From 964f18f4d0cbcbb4b3ec058ea07f826efe066bca Mon Sep 17 00:00:00 2001 From: Ryan Mast <3969255+nightlark@users.noreply.github.com> Date: Mon, 18 Oct 2021 14:32:53 -0700 Subject: [PATCH 0856/1858] [asio] update to 1.20.0 (#20791) * [asio] update to 1.20.0 * Update CI baseline --- ports/asio/portfile.cmake | 4 ++-- ports/asio/vcpkg.json | 4 ++-- versions/a-/asio.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake index c3c2a22e50a167..53621f4bf0204f 100644 --- a/ports/asio/portfile.cmake +++ b/ports/asio/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO chriskohlhoff/asio - REF asio-1-19-2 - SHA512 a6d1c5534fef0fe5ac549e1bd20919d180fbfe4c146be40ec6ebfa862534b8551778b0e79a5ba822ed645535e010646909f02f9e1d1f385ed758f07f57351ea8 + REF asio-1-20-0 + SHA512 dc2def1f2b93866100b5d645f77c4a231fe3feae457010abf4e659df76b08b46870d608cf792a2f82e1b28c69c320055862647fb29aa0677a58d6141d58e76b2 HEAD_REF master ) diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json index 380eaea25da977..7dce132e14c728 100644 --- a/ports/asio/vcpkg.json +++ b/ports/asio/vcpkg.json @@ -1,9 +1,9 @@ { "name": "asio", - "version": "1.19.2", + "version": "1.20.0", "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.", "homepage": "https://github.com/chriskohlhoff/asio", - "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/", + "documentation": "https://think-async.com/Asio/asio-1.20.0/doc/", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/a-/asio.json b/versions/a-/asio.json index 813f1a7864b4fe..be1048231d48ba 100644 --- a/versions/a-/asio.json +++ b/versions/a-/asio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b16ad8ba502540b3b34a29552f6937951e08e5e6", + "version": "1.20.0", + "port-version": 0 + }, { "git-tree": "c6bba20de9d8e7d6278ab8d7b333bb14bd35f21f", "version": "1.19.2", diff --git a/versions/baseline.json b/versions/baseline.json index 1058cc45e5bf85..c2b54cdc8d3749 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -173,7 +173,7 @@ "port-version": 0 }, "asio": { - "baseline": "1.19.2", + "baseline": "1.20.0", "port-version": 0 }, "asio-grpc": { From adb5a7905a76255205f075b43c705a9032a97080 Mon Sep 17 00:00:00 2001 From: Oskari Timperi <808235+oskaritimperi@users.noreply.github.com> Date: Tue, 19 Oct 2021 00:33:31 +0300 Subject: [PATCH 0857/1858] [aws-lambda-cpp] Update to 0.2.7 (#20770) Co-authored-by: Oskari Timperi --- ports/aws-lambda-cpp/portfile.cmake | 16 ++++++++++------ ports/aws-lambda-cpp/vcpkg.json | 13 ++++++++++--- versions/a-/aws-lambda-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/ports/aws-lambda-cpp/portfile.cmake b/ports/aws-lambda-cpp/portfile.cmake index 7c2cc06d72a71c..714296ed18c6b9 100644 --- a/ports/aws-lambda-cpp/portfile.cmake +++ b/ports/aws-lambda-cpp/portfile.cmake @@ -3,22 +3,26 @@ vcpkg_fail_port_install(ON_TARGET "Windows" "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-lambda-cpp - REF 55276cef2efe18fe13457ebf85df53a81d68be59 # v0.2.6 - SHA512 a865b8c5715e884c0aeb0972d88919084a37b4837ade55d7f4373422c1ffa06a550f6bfe62b6f69b9eb3a352b9a1d4114c72d754bce2d6d3727bebd029fe6631 + REF 8bcd8a201f9da613581a2748ca737ab09adbdae5 # v0.2.7 + SHA512 c59310dd839622cfc9ac2a1df5a492e9a6d629b671ed929813dbe51dfe76d4a4e381e78b11b206b66c2bee131a1544c3c8dfc4644981b708b589492763c7ed59 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME aws-lambda-runtime CONFIG_PATH lib/aws-lambda-runtime/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/aws-lambda-runtime") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/aws-lambda-runtime") + # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - diff --git a/ports/aws-lambda-cpp/vcpkg.json b/ports/aws-lambda-cpp/vcpkg.json index c466c11a7c8689..7d65385fef50d6 100644 --- a/ports/aws-lambda-cpp/vcpkg.json +++ b/ports/aws-lambda-cpp/vcpkg.json @@ -1,10 +1,17 @@ { "name": "aws-lambda-cpp", - "version-string": "0.2.6", - "port-version": 1, + "version-string": "0.2.7", "description": "C++ Runtime for AWS Lambda.", "supports": "linux", "dependencies": [ - "curl" + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/a-/aws-lambda-cpp.json b/versions/a-/aws-lambda-cpp.json index e269f0264dea6a..7856f5dd945072 100644 --- a/versions/a-/aws-lambda-cpp.json +++ b/versions/a-/aws-lambda-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9c58661b9a838e782997f03ee3af449260ece4f", + "version-string": "0.2.7", + "port-version": 0 + }, { "git-tree": "3e586ea66476a0d9ce91ae630e1966724794ef2f", "version-string": "0.2.6", diff --git a/versions/baseline.json b/versions/baseline.json index c2b54cdc8d3749..98c8f02ca9f56b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -297,8 +297,8 @@ "port-version": 1 }, "aws-lambda-cpp": { - "baseline": "0.2.6", - "port-version": 1 + "baseline": "0.2.7", + "port-version": 0 }, "aws-sdk-cpp": { "baseline": "1.9.96", From bd28418b39665bcd9670e5ddf351168cb99e4515 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 18 Oct 2021 15:04:49 -0700 Subject: [PATCH 0858/1858] [ci] Skip attempting to upload failure logs if there is no failure logs directory. (#20826) --- scripts/azure-pipelines/test-modified-ports.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index 6f25eb4c561563..a972c461152ecd 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -141,7 +141,7 @@ if ($null -ne $OnlyTest) } } - $failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0) + $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" } else @@ -157,7 +157,7 @@ else & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs } - $failureLogsEmpty = ((Test-Path $failureLogs) -and (Get-ChildItem $failureLogs).count -eq 0) + $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" if ($LASTEXITCODE -ne 0) From c03fbbcbc970f1dc85b022345c72745d59f189e0 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 19 Oct 2021 18:20:29 -0700 Subject: [PATCH 0859/1858] [easyhook] Also disable /ZI (#20853) In https://github.com/microsoft/vcpkg/pull/20757 I patch easyhook to remove /Zi in release builds, but in our most recent nightly build we got another failure https://dev.azure.com/vcpkg/public/_build/results?buildId=61519&view=artifacts&pathAsName=false&type=publishedArtifacts ``` C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\cderr.h : fatal error C1073: Internal error involving incremental compilation(compiler file 'd:\a01\_work\6\s\src\vctools\Compiler\CxxFE\sl\p1\c\p0io.c', line 1257) [D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\EasyHookDll\EasyHookDll.vcxproj] C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um\ddeml.h(37,1): fatal error C1001: Internal compiler error. [D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\EasyHookDll\EasyHookDll.vcxproj] D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\DriverShared\LocalHook\install.c(618,1): error C2471: cannot update program database '???' [D:\buildtrees\easyhook\x86-windows-dbg\2.7.7097.0-e2e62d41f5.clean\EasyHookDll\EasyHookDll.vcxproj] ``` This change also removes /ZI (which was used in debug builds) and /Gm (which is irrelevant since we aren't doing development work on Easyhook) --- ports/easyhook/portfile.cmake | 10 ++++++++++ ports/easyhook/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/easyhook.json | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ports/easyhook/portfile.cmake b/ports/easyhook/portfile.cmake index 554146281841e6..9b34f51a9c4735 100644 --- a/ports/easyhook/portfile.cmake +++ b/ports/easyhook/portfile.cmake @@ -28,6 +28,16 @@ foreach(VCXPROJ IN ITEMS "ProgramDatabase" "OldStyle" ) + vcpkg_replace_string( + "${VCXPROJ}" + "EditAndContinue" + "OldStyle" + ) + vcpkg_replace_string( + "${VCXPROJ}" + "true" + "" + ) endforeach() vcpkg_install_msbuild( diff --git a/ports/easyhook/vcpkg.json b/ports/easyhook/vcpkg.json index aa8e430409854c..5e6093aabdbadd 100644 --- a/ports/easyhook/vcpkg.json +++ b/ports/easyhook/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easyhook", "version": "2.7.7097.0", - "port-version": 1, + "port-version": 2, "description": "This project supports extending (hooking) unmanaged code (APIs) with pure managed ones, from within a fully managed environment on 32- or 64-bit Windows Vista x64, Windows Server 2008 x64, Windows 7, Windows 8.1, and Windows 10.", "homepage": "https://github.com/EasyHook/EasyHook", "supports": "windows & !(static | arm | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index 98c8f02ca9f56b..449b5f5aeaadaf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1926,7 +1926,7 @@ }, "easyhook": { "baseline": "2.7.7097.0", - "port-version": 1 + "port-version": 2 }, "easyloggingpp": { "baseline": "9.97.0", diff --git a/versions/e-/easyhook.json b/versions/e-/easyhook.json index 6531b3b3865e5f..8ac276162fa027 100644 --- a/versions/e-/easyhook.json +++ b/versions/e-/easyhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c217a47b595d2a002a72ff621846a7445329b42f", + "version": "2.7.7097.0", + "port-version": 2 + }, { "git-tree": "5dc14a4f006221297cad1ea84143aeae33f30284", "version": "2.7.7097.0", From 38bf607e8ca6960d762c24b8af07ef6979ab7bad Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 20 Oct 2021 03:26:37 +0200 Subject: [PATCH 0860/1858] [gdal] Update to 3.3.2 (#20765) * Update gdal to 3.3.2, switch to github * Don't use absl::string_view * Update versions * [skip actions] CI * Mingw needs json-c * Update versions --- ports/gdal/0001-Fix-debug-crt-flags.patch | 8 ++-- ports/gdal/0002-Fix-build.patch | 6 +-- ports/gdal/0004-Fix-cfitsio.patch | 8 ++-- ports/gdal/0005-Fix-configure.patch | 48 +++++++++++----------- ports/gdal/0006-Fix-mingw-dllexport.patch | 8 ++-- ports/gdal/0007-Control-tools.patch | 32 +++++++-------- ports/gdal/0008-Fix-absl-string_view.patch | 13 ++++++ ports/gdal/portfile.cmake | 31 ++++++-------- ports/gdal/vcpkg.json | 5 +-- versions/baseline.json | 4 +- versions/g-/gdal.json | 5 +++ 11 files changed, 89 insertions(+), 79 deletions(-) create mode 100644 ports/gdal/0008-Fix-absl-string_view.patch diff --git a/ports/gdal/0001-Fix-debug-crt-flags.patch b/ports/gdal/0001-Fix-debug-crt-flags.patch index 4640cf7f04d022..76af77b9085067 100644 --- a/ports/gdal/0001-Fix-debug-crt-flags.patch +++ b/ports/gdal/0001-Fix-debug-crt-flags.patch @@ -1,7 +1,7 @@ -diff --git a/nmake.opt b/nmake.opt -index 468d2ba1a..e75a081f7 100644 ---- a/nmake.opt -+++ b/nmake.opt +diff --git a/gdal/nmake.opt b/gdal/nmake.opt +index 8253ae2..9456b79 100644 +--- a/gdal/nmake.opt ++++ b/gdal/nmake.opt @@ -148,16 +148,26 @@ GDAL_PDB = $(GDAL_ROOT)\gdal$(VERSION)$(POSTFIX).pdb !ENDIF diff --git a/ports/gdal/0002-Fix-build.patch b/ports/gdal/0002-Fix-build.patch index 13fa32562d74ab..9b62737d228e9c 100644 --- a/ports/gdal/0002-Fix-build.patch +++ b/ports/gdal/0002-Fix-build.patch @@ -1,7 +1,7 @@ -diff --git a/makefile.vc b/makefile.vc +diff --git a/gdal/makefile.vc b/gdal/makefile.vc index 9e0bd44..8559f79 100644 ---- a/makefile.vc -+++ b/makefile.vc +--- a/gdal/makefile.vc ++++ b/gdal/makefile.vc @@ -84,7 +84,7 @@ staticlib: $(LIB_DEPENDS) call <= 3.1.0,HAVE_GEOS=yes,AC_MSG_ERROR([vcpkg geos not found])) - HAVE_GEOS_RESULT="no" if test "${HAVE_GEOS}" = "yes" ; then - -@@ -4812,6 +4923,16 @@ dnl --------------------------------------------------------------------------- + AC_MSG_NOTICE([Using C API from GEOS $GEOS_VERSION]) + STRIP_SYSTEM_LIBRARY_PATHS("${GEOS_LIBS}") +@@ -4779,6 +4890,16 @@ dnl --------------------------------------------------------------------------- AC_ARG_WITH(libjson-c,[ --with-libjson-c[=ARG] Include libjson-c support (ARG=internal or libjson-c directory)],,) @@ -292,7 +292,7 @@ index bd85e06..b88676a 100644 if test "$with_libjson_c" = "external" -o "$with_libjson_c" = "" -o "$with_libjson_c" = "yes" ; then AC_CHECK_LIB(json-c,json_object_set_serializer,LIBJSONC_SETTING=external,LIBJSONC_SETTING=internal,) elif test "$with_libjson_c" = "internal" ; then -@@ -4840,6 +4961,8 @@ else +@@ -4807,6 +4928,8 @@ else AC_MSG_RESULT([using internal libjson-c code]) fi diff --git a/ports/gdal/0006-Fix-mingw-dllexport.patch b/ports/gdal/0006-Fix-mingw-dllexport.patch index 7091f921ab58f5..a07dc0ec3b2a8e 100644 --- a/ports/gdal/0006-Fix-mingw-dllexport.patch +++ b/ports/gdal/0006-Fix-mingw-dllexport.patch @@ -1,7 +1,7 @@ -diff --git a/port/cpl_port.h b/port/cpl_port.h -index 9e3ebbb..130af04 100644 ---- a/port/cpl_port.h -+++ b/port/cpl_port.h +diff --git a/gdal/port/cpl_port.h b/gdal/port/cpl_port.h +index 98805cf..a6a1846 100644 +--- a/gdal/port/cpl_port.h ++++ b/gdal/port/cpl_port.h @@ -343,7 +343,7 @@ typedef unsigned int GUIntptr_t; #endif diff --git a/ports/gdal/0007-Control-tools.patch b/ports/gdal/0007-Control-tools.patch index 7c2b8ce7243e2a..b4e708c6d5de8e 100644 --- a/ports/gdal/0007-Control-tools.patch +++ b/ports/gdal/0007-Control-tools.patch @@ -1,8 +1,8 @@ -diff --git a/GDALmake.opt.in b/GDALmake.opt.in -index 07955b2..0d79ac3 100644 ---- a/GDALmake.opt.in -+++ b/GDALmake.opt.in -@@ -660,3 +660,6 @@ O_OBJ = $(foreach file,$(OBJ),../o/$(file)) +diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in +index e8d2b05..1f19a4b 100644 +--- a/gdal/GDALmake.opt.in ++++ b/gdal/GDALmake.opt.in +@@ -662,3 +662,6 @@ O_OBJ = $(foreach file,$(OBJ),../o/$(file)) %-clean: $(MAKE) -C $* clean @@ -10,10 +10,10 @@ index 07955b2..0d79ac3 100644 + +BUILD_TOOLS = @BUILD_TOOLS@ \ No newline at end of file -diff --git a/apps/GNUmakefile b/apps/GNUmakefile +diff --git a/gdal/apps/GNUmakefile b/gdal/apps/GNUmakefile index 9624cf7..f91403d 100644 ---- a/apps/GNUmakefile -+++ b/apps/GNUmakefile +--- a/gdal/apps/GNUmakefile ++++ b/gdal/apps/GNUmakefile @@ -43,6 +43,11 @@ NON_DEFAULT_LIST = multireadtest$(EXE) dumpoverviews$(EXE) \ gdaltorture$(EXE) gdal2ogr$(EXE) test_ogrsf$(EXE) \ gdalasyncread$(EXE) testreprojmulti$(EXE) @@ -26,10 +26,10 @@ index 9624cf7..f91403d 100644 default: gdal-config-inst gdal-config $(BIN_LIST) all: default $(NON_DEFAULT_LIST) -diff --git a/apps/makefile.vc b/apps/makefile.vc +diff --git a/gdal/apps/makefile.vc b/gdal/apps/makefile.vc index 6e1fc9b..66f9b29 100644 ---- a/apps/makefile.vc -+++ b/apps/makefile.vc +--- a/gdal/apps/makefile.vc ++++ b/gdal/apps/makefile.vc @@ -20,6 +20,7 @@ GNM_PROGRAMS = gnmmanage.exe gnmanalyse.exe !ENDIF @@ -60,11 +60,11 @@ index 6e1fc9b..66f9b29 100644 +install: +!ENDIF \ No newline at end of file -diff --git a/configure.ac b/configure.ac -index b88676a..0a46a9c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6150,6 +6150,16 @@ case "${host_os}" in +diff --git a/gdal/configure.ac b/gdal/configure.ac +index 1098b39..e4d985e 100644 +--- a/gdal/configure.ac ++++ b/gdal/configure.ac +@@ -6165,6 +6165,16 @@ case "${host_os}" in ;; esac diff --git a/ports/gdal/0008-Fix-absl-string_view.patch b/ports/gdal/0008-Fix-absl-string_view.patch new file mode 100644 index 00000000000000..ff5af90f6dcf31 --- /dev/null +++ b/ports/gdal/0008-Fix-absl-string_view.patch @@ -0,0 +1,13 @@ +diff --git a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h +index 9557380..17edcf8 100644 +--- a/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h ++++ b/gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h +@@ -213,7 +213,7 @@ namespace flatbuffers { + } + #define FLATBUFFERS_HAS_STRING_VIEW 1 + // Check for absl::string_view +- #elif __has_include("absl/strings/string_view.h") ++ #elif __has_include("absl/strings/string_view.h") && 0 + #include "absl/strings/string_view.h" + namespace flatbuffers { + typedef absl::string_view string_view; diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index e3268d31fb901e..0698defb224704 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,32 +1,25 @@ vcpkg_fail_port_install(ON_ARCH "arm") -# NOTE: update the version and checksum for new GDAL release -set(GDAL_VERSION_STR "3.2.2") -set(GDAL_VERSION_PKG "322") -set(GDAL_PACKAGE_SUM "ce319e06c78bd076228b3710c127cdbd37c7d6fb23966b47df7287eaffe86a05d4ddcc78494c8bfcaf4db98a71f2ed50a01fb3ca2fe1c10cf0d2e812683c8e53") - -vcpkg_download_distfile(ARCHIVE - URLS "http://download.osgeo.org/gdal/${GDAL_VERSION_STR}/gdal${GDAL_VERSION_PKG}.zip" - FILENAME "gdal${GDAL_VERSION_PKG}.zip" - SHA512 ${GDAL_PACKAGE_SUM} - ) - set(GDAL_PATCHES 0001-Fix-debug-crt-flags.patch 0002-Fix-build.patch 0004-Fix-cfitsio.patch 0005-Fix-configure.patch 0007-Control-tools.patch - ) + 0008-Fix-absl-string_view.patch +) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") list(APPEND GDAL_PATCHES 0006-Fix-mingw-dllexport.patch) endif() -vcpkg_extract_source_archive_ex( - ARCHIVE "${ARCHIVE}" +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH + REPO OSGeo/gdal + REF 348075f26f8e4c200a34818123beeb4abe53c876 # 3.3.2 + SHA512 84bd7c74a079c4aa8cbefbbb1c4ab782e74a85d37d4c875a203760939f4f7c9175c40abc5184d8c1c521fd3b37bb90bc7bf046021ade22e510810535e3f61bd2 + HEAD_REF master PATCHES ${GDAL_PATCHES} - ) +) if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") @@ -134,7 +127,7 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) # Begin build process vcpkg_install_nmake( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/gdal" TARGET devinstall OPTIONS_RELEASE "${NMAKE_OPTIONS_REL}" @@ -191,7 +184,7 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) else() # See https://github.com/microsoft/vcpkg/issues/16990 - file(TOUCH "${SOURCE_PATH}/config.rpath") + file(TOUCH "${SOURCE_PATH}/gdal/config.rpath") set(CONF_OPTS --with-hide-internal-symbols=yes @@ -323,7 +316,7 @@ else() endif() vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" + SOURCE_PATH "${SOURCE_PATH}/gdal" AUTOCONFIG COPY_SOURCE OPTIONS @@ -375,4 +368,4 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_D configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) # Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/gdal/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index a0200858dc1640..6de8a75b5aafeb 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,6 @@ { "name": "gdal", - "version-semver": "3.2.2", - "port-version": 6, + "version-semver": "3.3.2", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", @@ -14,7 +13,7 @@ "hdf5", { "name": "json-c", - "platform": "!windows" + "platform": "!windows | mingw" }, "libgeotiff", "libjpeg-turbo", diff --git a/versions/baseline.json b/versions/baseline.json index 449b5f5aeaadaf..77ccf4959468f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2333,8 +2333,8 @@ "port-version": 1 }, "gdal": { - "baseline": "3.2.2", - "port-version": 6 + "baseline": "3.3.2", + "port-version": 0 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 732c1533e57600..32c90ed3d24836 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcc73ebd09ec91402d610074046785d7432f99fa", + "version-semver": "3.3.2", + "port-version": 0 + }, { "git-tree": "15009f5f5d2867c594d8148d79cccbe964432465", "version-semver": "3.2.2", From bdbc6421562da0aa0a8e1b32982672d069d50560 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 20 Oct 2021 03:29:10 +0200 Subject: [PATCH 0861/1858] [soxr] Add features, fix VCRT runtime linkage (#20797) * Add features lsr-bindings and openmp to soxr, set BUILD_SHARED_RUNTIME * Update git-tree hash * Convert tabs to spaces * Update git-tree hash * Use string(COMPARE * Update git-tree hash Co-authored-by: chausner --- ports/soxr/portfile.cmake | 44 +++++++++++++++++++++++---------------- ports/soxr/vcpkg.json | 20 +++++++++++++++--- versions/baseline.json | 2 +- versions/s-/soxr.json | 5 +++++ 4 files changed, 49 insertions(+), 22 deletions(-) diff --git a/ports/soxr/portfile.cmake b/ports/soxr/portfile.cmake index 193eaecd484b85..15fbce5a263125 100644 --- a/ports/soxr/portfile.cmake +++ b/ports/soxr/portfile.cmake @@ -3,27 +3,35 @@ vcpkg_from_sourceforge( REPO soxr FILENAME "soxr-0.1.3-Source.tar.xz" SHA512 f4883ed298d5650399283238aac3dbe78d605b988246bea51fa343d4a8ce5ce97c6e143f6c3f50a3ff81795d9c19e7a07217c586d4020f6ced102aceac46aaa8 - PATCHES - 001_initialize-resampler.patch - 002_disable_warning.patch - 003_detect_arm_on_windows.patch + PATCHES + 001_initialize-resampler.patch + 002_disable_warning.patch + 003_detect_arm_on_windows.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_TESTS=OFF - -DBUILD_EXAMPLES=OFF - -DWITH_OPENMP=OFF - -DWITH_LSR_BINDINGS=OFF +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + openmp WITH_OPENMP + lsr-bindings WITH_LSR_BINDINGS ) -vcpkg_install_cmake() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" BUILD_SHARED_RUNTIME) -file(INSTALL ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/soxr RENAME copyright) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTS=OFF + -DBUILD_EXAMPLES=OFF + -DBUILD_SHARED_RUNTIME=${BUILD_SHARED_RUNTIME} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +file(INSTALL "${SOURCE_PATH}/LICENCE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") diff --git a/ports/soxr/vcpkg.json b/ports/soxr/vcpkg.json index acf2fc35ccc42b..4887394e562060 100644 --- a/ports/soxr/vcpkg.json +++ b/ports/soxr/vcpkg.json @@ -1,7 +1,21 @@ { "name": "soxr", - "version-string": "0.1.3", - "port-version": 4, + "version": "0.1.3", + "port-version": 5, "description": "High quality audio resampling", - "homepage": "https://sourceforge.net/projects/soxr/" + "homepage": "https://sourceforge.net/projects/soxr/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "lsr-bindings": { + "description": "Include a `libsamplerate'-like interface." + }, + "openmp": { + "description": "Include OpenMP threading." + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 77ccf4959468f4..aa4b943774359c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6294,7 +6294,7 @@ }, "soxr": { "baseline": "0.1.3", - "port-version": 4 + "port-version": 5 }, "spaceland": { "baseline": "7.8.2", diff --git a/versions/s-/soxr.json b/versions/s-/soxr.json index f0062178205ac6..99dea5a0cfa9de 100644 --- a/versions/s-/soxr.json +++ b/versions/s-/soxr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ea0e47df2ab6381e68ffae49c05c4de0a37f665", + "version": "0.1.3", + "port-version": 5 + }, { "git-tree": "5719977bf7a0fcc0ac88151327dcddda23648594", "version-string": "0.1.3", From 93e8e74685f3d280259098a5ddb2e938c9d37b06 Mon Sep 17 00:00:00 2001 From: Buck Yeh Date: Wed, 20 Oct 2021 09:29:44 +0800 Subject: [PATCH 0862/1858] [buck-yeh-bux] Update to 1.6.0 (#20813) * [bux] Add new port * Corrections according to Create Pull Request suggested questions * SHA512 * Mark fails into .\scripts\ci.baseline.txt * Mark fails into .\scripts\ci.baseline.txt * No need of "port-version": 1 in vcpkg.json * Update version database * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update bux.json * Update ports/bux/vcpkg.json * update version * Update scripts/ci.baseline.txt Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update bux support * update version * update version * Rename bux to buck-yeh-bux * Update version database * [buck-yeh-bux] upgrade to v1.5.0 1. [New] `bux::C_ParaLog` is ready for a variety of parallel logging configurations, filtered or unfiltered. 2. [New] Necessary helper classes for implementation _s.t_ logger users no longer need to declare child source instances explicitly. 3. [New] Add methods to `ParaLog.h` & `SyncLog.h` to support testability. 4. [New] Add unit test cases to `ParaLog.h` & `SyncLog.h` (test_paralog & test_logger) 5. [New] Update what are found in `test/` to `test/archlinux/aur_poc/` 6. [Bug] `std::uniform_int_distribution` no longer allowed. 7. [Change] `CUR_FUNC_` for Windows (MSVC) 8. [Change] `tbb` is no longer implicitly needed by C++ standard library. 9. [Change] `smoke_filtlog.cpp` verifies 2-level log filters ok. * Missing comma in versions/b-/buck-yeh-bux.json * buck-yeh-bux 1.6.0 * Corrections made according to NancyLi1013's requests in PR #20813 * Fix SHA key in versions/b-/buck-yeh-bux.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/buck-yeh-bux/portfile.cmake | 7 +++---- ports/buck-yeh-bux/vcpkg.json | 6 +----- versions/b-/buck-yeh-bux.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index 1613d213a5d6e4..0e9c75cf5fb9df 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -1,10 +1,9 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64") -vcpkg_fail_port_install(ON_TARGET "linux" "uwp" "osx") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux - REF 7cd3bb2b563dbc907d64ade6dc66f1fcae282067 # v1.5.0 - SHA512 06ed00ce627a49dc9d36ac769e9b4a1851489248c57f24a4850ab28d0f2d63d2fc3e7b9712d954752e212476322b7a5f708838ed440364173b71a648dced2eb4 + REF 9e971731ec8c50425754af030fbe16ec603c3d22 # v1.6.0 + SHA512 2e689b4e1ffc2f5e472e0ee8c87857336b4e049969600c82c8f576e2c82939d65658bb6ef62fbe751c03b92f6f14d1b9bcf7a085d2848c0556e3039a5906261d HEAD_REF main ) diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index 6cda15750dbe8d..9e8492a0e7a911 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,6 +1,6 @@ { "name": "buck-yeh-bux", - "version": "1.5.0", + "version": "1.6.0", "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "supports": "!(arm | uwp | osx | linux)", @@ -9,10 +9,6 @@ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index c81ba8cd23e87a..66df1a49d0a47a 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa8f4e2afd3a69f94ed947a1dfc0dcb4006ae9c9", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "b420b8fe7a8712cee4a2317433902c32d4b6634d", "version": "1.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index aa4b943774359c..e5f74ff93f5e72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1157,7 +1157,7 @@ "port-version": 0 }, "buck-yeh-bux": { - "baseline": "1.5.0", + "baseline": "1.6.0", "port-version": 0 }, "bullet3": { From 0ab2a63ce23ed3baac8482ef80113aeee3982ad0 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 20 Oct 2021 09:30:16 +0800 Subject: [PATCH 0863/1858] [effolkronium-random] Fix the usage (#20816) --- ports/effolkronium-random/portfile.cmake | 6 +++--- ports/effolkronium-random/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/effolkronium-random.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/effolkronium-random/portfile.cmake b/ports/effolkronium-random/portfile.cmake index 94a18fec88079a..0afcc104360ecc 100644 --- a/ports/effolkronium-random/portfile.cmake +++ b/ports/effolkronium-random/portfile.cmake @@ -9,11 +9,11 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DRandom_BuildTests=OFF + -DRandom_BuildTests=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +vcpkg_cmake_config_fixup(PACKAGE_NAME effolkronium_random CONFIG_PATH cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/effolkronium-random/vcpkg.json b/ports/effolkronium-random/vcpkg.json index 86d3fcf718ffa6..2e7502540c7466 100644 --- a/ports/effolkronium-random/vcpkg.json +++ b/ports/effolkronium-random/vcpkg.json @@ -1,6 +1,7 @@ { "name": "effolkronium-random", "version": "1.4.0", + "port-version": 1, "description": "Random with a modern C++ API", "homepage": "https://github.com/effolkronium/random", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e5f74ff93f5e72..ff150e67c6a04e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1962,7 +1962,7 @@ }, "effolkronium-random": { "baseline": "1.4.0", - "port-version": 0 + "port-version": 1 }, "efsw": { "baseline": "2020-06-08", diff --git a/versions/e-/effolkronium-random.json b/versions/e-/effolkronium-random.json index 245c72ac7f40df..c2d4671aea46e4 100644 --- a/versions/e-/effolkronium-random.json +++ b/versions/e-/effolkronium-random.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0083b3439b06f6c6e2b5fbd48260cd5b54692bad", + "version": "1.4.0", + "port-version": 1 + }, { "git-tree": "6f870445e1974665f94fd66bc79c4bec3f33d090", "version": "1.4.0", From cab7726fd7d0d692ccbb5d0eb8e9f051f50db514 Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Wed, 20 Oct 2021 12:30:40 +1100 Subject: [PATCH 0864/1858] [fribidi][harfbuzz] Update to latest versions (#20818) * [fribidi] Update to 1.0.11 * [harfbuzz] Update to 3.0.0 * update vcpkg.json * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/fribidi/portfile.cmake | 4 ++-- ports/fribidi/vcpkg.json | 3 +-- ports/harfbuzz/portfile.cmake | 4 ++-- ports/harfbuzz/vcpkg.json | 2 +- versions/baseline.json | 6 +++--- versions/f-/fribidi.json | 5 +++++ versions/h-/harfbuzz.json | 5 +++++ 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 7e71fe68e2ba2c..351681839d5a8a 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fribidi/fribidi - REF 5464c284034da9c058269377b7f5013bb089f553 # v1.0.10 - SHA512 82e42b022f23d6ecebac5071f997c9f46db6aa41c36f87a7f1a28a79b4ccaada10d68b233bbf687c552fc94d91f4b47161e0ef4909fd1de0b483089f1d1377f9 + REF v1.0.11 + SHA512 9ddb0dbfb28ee4f1d9dd5d46fe1fff75c5446bfdacaabf8647847c36ef72eec823f6e6d6d1369d67c292d680004f7113c9e69114a8fae1d73ab11a58c66a8b8a HEAD_REF master ) diff --git a/ports/fribidi/vcpkg.json b/ports/fribidi/vcpkg.json index 130fbe0de0f9cb..486571ca17b405 100644 --- a/ports/fribidi/vcpkg.json +++ b/ports/fribidi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fribidi", - "version-string": "1.0.10", - "port-version": 3, + "version": "1.0.11", "description": "GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)", "supports": "!(uwp | arm)", "dependencies": [ diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index bb5cdc37f68a78..816dec15a75cff 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz - REF 9aa6f8a93f035dd0a1e3978da495d830049480c8 # 2.9.0 - SHA512 7ef82298e6f5e0d8a78bb6a408e2ec0a4016c7931ef69d52e75ed8e9e0b31628f2ae5ea913dcbfa7d5159412ae487400ea1391254477064ba8fb1aa0cdbe5ed9 + REF 3.0.0 + SHA512 69999ad86bde56ef689392a521143b6ad14b6719860772c3d4c343358997049a48c79e8f302fe0a7f3b0d930b476ddf440def874a1269b50ae79d020bcd073b5 HEAD_REF master PATCHES # This patch is a workaround that is needed until the following issues are resolved upstream: diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 4bab551741e0e2..13207c7228ebd8 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,6 +1,6 @@ { "name": "harfbuzz", - "version-semver": "2.9.0", + "version-semver": "3.0.0", "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index ff150e67c6a04e..e8e77a69ff60a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2257,8 +2257,8 @@ "port-version": 0 }, "fribidi": { - "baseline": "1.0.10", - "port-version": 3 + "baseline": "1.0.11", + "port-version": 0 }, "frozen": { "baseline": "2021-04-22", @@ -2617,7 +2617,7 @@ "port-version": 0 }, "harfbuzz": { - "baseline": "2.9.0", + "baseline": "3.0.0", "port-version": 0 }, "hayai": { diff --git a/versions/f-/fribidi.json b/versions/f-/fribidi.json index 5a3f12f4a8cbdc..86abb9f8683bd8 100644 --- a/versions/f-/fribidi.json +++ b/versions/f-/fribidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e040a494c14a4fade7878bf200a0463abc21e96", + "version": "1.0.11", + "port-version": 0 + }, { "git-tree": "88696509b4e846e3f04283bcf928db39800cc4eb", "version-string": "1.0.10", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 928a7b385e0edb..84a3c02af7913b 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec7e9e00eba714984a7c4b22b5c51ce0fe1c4e08", + "version-semver": "3.0.0", + "port-version": 0 + }, { "git-tree": "7bc55c4f88d240855ec6c7da3907811600e61b28", "version-semver": "2.9.0", From 28ee4ae2074d20b65dd574019bbfa71daa8f6444 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 20 Oct 2021 03:31:22 +0200 Subject: [PATCH 0865/1858] [mapnik] update port (#20824) * update mapnik * version --- ports/mapnik/cairo-find-fix.patch | 21 +++++++++++++++++++++ ports/mapnik/portfile.cmake | 6 ++++-- ports/mapnik/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mapnik.json | 5 +++++ 5 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 ports/mapnik/cairo-find-fix.patch diff --git a/ports/mapnik/cairo-find-fix.patch b/ports/mapnik/cairo-find-fix.patch new file mode 100644 index 00000000000000..9d151ceea3b86c --- /dev/null +++ b/ports/mapnik/cairo-find-fix.patch @@ -0,0 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47bbaa1..43f384d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -296,9 +296,14 @@ if(USE_WEBP) + endif() + + if(USE_CAIRO) +- mapnik_find_package(Cairo REQUIRED) ++ if(WIN32) ++ mapnik_find_package(Cairo REQUIRED) ++ list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo) ++ else() ++ pkg_check_modules(Cairo REQUIRED IMPORTED_TARGET cairo) ++ list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::Cairo) ++ endif() + list(APPEND MAPNIK_COMPILE_DEFS HAVE_CAIRO) +- list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo) + endif() + + if(USE_PROJ) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index 307f8d5bbc86d1..ed83b3694c67bb 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -4,9 +4,11 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 0edb018465790cd156d6849557fa7fd568755ebb - SHA512 cd6180b96dbfbc1bafbc8f2a4ff2091a0e8c0c42b0569ef83640ad1f5766ff74ea95f8c6cef53f879396cbceebc6396c1a977676eca67c401b8e145a9ceae7e2 + REF 4695c42b51bc633e10b15c30ba580093ca0dda4f + SHA512 c0e6c77b6c859ac03a2169d8f71ee2d68e6b76dd0295a0656f278f31ccf531b02f2a5bc5cce7e78177872fba2e5dda95dc00685d6157043fa3a246a072ab7075 HEAD_REF master + PATCHES + cairo-find-fix.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 0dce76d7ae15e7..42d5b3680359f9 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapnik", - "version-date": "2021-10-13", + "version-date": "2021-10-18", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index e8e77a69ff60a6..f334952134f54d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4181,7 +4181,7 @@ "port-version": 0 }, "mapnik": { - "baseline": "2021-10-13", + "baseline": "2021-10-18", "port-version": 0 }, "marble": { diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 66d2bbbc16682e..63b745dfa264f8 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1702be859d2d61c42ba67c3d4e2c474db6a2d874", + "version-date": "2021-10-18", + "port-version": 0 + }, { "git-tree": "b7f061c560ab0a4c5c137f88ab43826c05ece6ad", "version-date": "2021-10-13", From afcb4223f657d540509ad5ef8c83e604ec198df8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 21 Oct 2021 05:12:58 +0800 Subject: [PATCH 0866/1858] [scripts-audit] Make buildsystem (#20165) * [script-audit] Make buildsystem * Fix wrongly merge * Fix rename * Format * Apply suggestions * Apply suggestion * Fix bug * Change the function names * Fix command line * Apply suggestions * version * typo * Apply suggestions * Fix bug * Fix path * Fix bug * Fix un=parser code, move macros to the top * Apply suggestions * Update docs * update doc * CRLF * add docs and add a PARENT_SCOPE * Update doc Co-authored-by: Billy Robert O'Neal III Co-authored-by: nicole mazzuca --- docs/maintainers/portfile-functions.md | 1 + .../vcpkg_backup_restore_env_vars.md | 26 + ports/x264/portfile.cmake | 4 +- ports/x264/vcpkg.json | 2 +- .../cmake/vcpkg_backup_restore_env_vars.cmake | 59 ++ scripts/cmake/vcpkg_build_make.cmake | 203 +++--- scripts/cmake/vcpkg_configure_make.cmake | 688 +++++++++--------- scripts/cmake/vcpkg_install_make.cmake | 6 +- scripts/ports.cmake | 1 + versions/baseline.json | 2 +- versions/x-/x264.json | 5 + 11 files changed, 530 insertions(+), 467 deletions(-) create mode 100644 docs/maintainers/vcpkg_backup_restore_env_vars.md create mode 100644 scripts/cmake/vcpkg_backup_restore_env_vars.cmake diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index 6527d8e0bbbf14..dd97511c0a35c1 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -5,6 +5,7 @@ - [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md) - [vcpkg\_add\_to\_path](vcpkg_add_to_path.md) - [vcpkg\_apply\_patches](vcpkg_apply_patches.md) (deprecated) +- [vcpkg\_backup\_restore\_env\_vars](vcpkg_backup_restore_env_vars.md) - [vcpkg\_build\_cmake](vcpkg_build_cmake.md) (deprecated, use [vcpkg\_cmake\_build](ports/vcpkg-cmake/vcpkg_cmake_build.md)) - [vcpkg\_build\_make](vcpkg_build_make.md) - [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md) diff --git a/docs/maintainers/vcpkg_backup_restore_env_vars.md b/docs/maintainers/vcpkg_backup_restore_env_vars.md new file mode 100644 index 00000000000000..d1591d06eb3650 --- /dev/null +++ b/docs/maintainers/vcpkg_backup_restore_env_vars.md @@ -0,0 +1,26 @@ +# vcpkg_backup_restore_env_vars + +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_backup_restore_env_vars.md). + +Backup or restore the environment variables + +## Usage: +```cmake +vcpkg_backup_env_variables(VARS [...]) +vcpkg_restore_env_variables(VARS [...]) +``` + +### VARS +The variables to back up or restore. +These are placed in the parent scope, so you must backup and restore +from the same scope. + +## Notes +One must always call `vcpkg_backup_env_variables` before +`vcpkg_restore_env_variables`; however, `vcpkg_restore_env_variables` +does not change the back up variables, and so you may call `restore` +multiple times for one `backup`. + + +## Source +[scripts/cmake/vcpkg\_backup\_restore\_env\_vars.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_backup_restore_env_vars.cmake) diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index abd2f1d558a41f..b64c9ad6e55384 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -17,8 +17,8 @@ get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY) vcpkg_add_to_path(${NASM_EXE_PATH}) if(VCPKG_TARGET_IS_WINDOWS) - _vcpkg_determine_autotools_host_cpu(BUILD_ARCH) - _vcpkg_determine_autotools_target_cpu(HOST_ARCH) + z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) + z_vcpkg_determine_autotools_target_cpu(HOST_ARCH) list(APPEND OPTIONS --build=${BUILD_ARCH}-pc-mingw32) list(APPEND OPTIONS --host=${HOST_ARCH}-pc-mingw32) set(ENV{AS} "${NASM}") diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 128d8ccf410125..41aa4b91809fab 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,7 @@ { "name": "x264", "version-string": "157-303c484ec828ed0", - "port-version": 15, + "port-version": 16, "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://github.com/mirror/x264", "supports": "!arm", diff --git a/scripts/cmake/vcpkg_backup_restore_env_vars.cmake b/scripts/cmake/vcpkg_backup_restore_env_vars.cmake new file mode 100644 index 00000000000000..d7eb5f3839679e --- /dev/null +++ b/scripts/cmake/vcpkg_backup_restore_env_vars.cmake @@ -0,0 +1,59 @@ +#[===[.md: +# vcpkg_backup_restore_env_vars + +Backup or restore the environment variables + +## Usage: +```cmake +vcpkg_backup_env_variables(VARS [...]) +vcpkg_restore_env_variables(VARS [...]) +``` + +### VARS +The variables to back up or restore. +These are placed in the parent scope, so you must backup and restore +from the same scope. + +## Notes +One must always call `vcpkg_backup_env_variables` before +`vcpkg_restore_env_variables`; however, `vcpkg_restore_env_variables` +does not change the back up variables, and so you may call `restore` +multiple times for one `backup`. + +#]===] + +function(vcpkg_backup_env_variables) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "VARS") + if(NOT DEFINED arg_VARS) + message(FATAL_ERROR "VARS must be defined.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(envvar IN LISTS arg_VARS) + if(DEFINED ENV{${envvar}}) + set("z_vcpkg_env_backup_${envvar}" "$ENV{${envvar}}" PARENT_SCOPE) + else() + unset("z_vcpkg_env_backup_${envvar}" PARENT_SCOPE) + endif() + endforeach() +endfunction() + +function(vcpkg_restore_env_variables) + cmake_parse_arguments(PARSE_ARGV 0 arg "" "" "VARS") + if(NOT DEFINED arg_VARS) + message(FATAL_ERROR "VARS must be defined.") + endif() + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + foreach(envvar IN LISTS arg_VARS) + if(DEFINED z_vcpkg_env_backup_${envvar}) + set("ENV{${envvar}}" "${z_vcpkg_env_backup_${envvar}}") + else() + unset("ENV{${envvar}}") + endif() + endforeach() +endfunction() diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake index 18f857fcede233..aa105fe6cd4fee 100755 --- a/scripts/cmake/vcpkg_build_make.cmake +++ b/scripts/cmake/vcpkg_build_make.cmake @@ -55,48 +55,54 @@ function(vcpkg_build_make) include("${cmake_vars_file}") # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET" "") + cmake_parse_arguments(PARSE_ARGV 0 arg + "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" + "LOGFILE_ROOT;BUILD_TARGET;SUBPATH;MAKEFILE;INSTALL_TARGET" + "OPTIONS" + ) + + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "vcpkg_make_build was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() - if(NOT _bc_LOGFILE_ROOT) - set(_bc_LOGFILE_ROOT "build") + if(NOT DEFINED arg_LOGFILE_ROOT) + set(arg_LOGFILE_ROOT "build") endif() - if(NOT _bc_BUILD_TARGET) - set(_bc_BUILD_TARGET "all") + if(NOT DEFINED arg_BUILD_TARGET) + set(arg_BUILD_TARGET "all") endif() - if (NOT _bc_MAKEFILE) - set(_bc_MAKEFILE Makefile) + if (NOT DEFINED arg_MAKEFILE) + set(arg_MAKEFILE Makefile) endif() - if(NOT _bc_INSTALL_TARGET) - set(_bc_INSTALL_TARGET "install") + if(NOT DEFINED arg_INSTALL_TARGET) + set(arg_INSTALL_TARGET "install") endif() if(WIN32) - set(_VCPKG_PREFIX ${CURRENT_PACKAGES_DIR}) - set(_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) + set(Z_VCPKG_INSTALLED ${CURRENT_INSTALLED_DIR}) else() - string(REPLACE " " "\ " _VCPKG_PREFIX "${CURRENT_PACKAGES_DIR}") - string(REPLACE " " "\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + string(REPLACE " " "\ " Z_VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") endif() - set(MAKE_OPTS ) - set(INSTALL_OPTS ) + vcpkg_list(SET make_opts) + vcpkg_list(SET install_opts) if (CMAKE_HOST_WIN32) - set(PATH_GLOBAL "$ENV{PATH}") + set(path_backup "$ENV{PATH}") vcpkg_add_to_path(PREPEND "${SCRIPTS}/buildsystems/make_wrapper") if(NOT DEFINED Z_VCPKG_MAKE) vcpkg_acquire_msys(MSYS_ROOT) find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED) endif() - set(MAKE_COMMAND "${Z_VCPKG_MAKE}") - set(MAKE_OPTS ${_bc_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) - set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} -j 1 --trace -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) + set(make_command "${Z_VCPKG_MAKE}") + vcpkg_list(SET make_opts ${arg_OPTIONS} ${arg_MAKE_OPTIONS} -j ${VCPKG_CONCURRENCY} --trace -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) + vcpkg_list(SET no_parallel_make_opts ${arg_OPTIONS} ${arg_MAKE_OPTIONS} -j 1 --trace -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) - string(REPLACE " " "\\\ " _VCPKG_PACKAGE_PREFIX ${CURRENT_PACKAGES_DIR}) - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PACKAGE_PREFIX "${_VCPKG_PACKAGE_PREFIX}") - set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} --trace -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${_VCPKG_PACKAGE_PREFIX}) + string(REPLACE " " [[\ ]] vcpkg_package_prefix "${CURRENT_PACKAGES_DIR}") + string(REGEX REPLACE [[([a-zA-Z]):/]] [[/\1/]] vcpkg_package_prefix "${vcpkg_package_prefix}") + vcpkg_list(SET install_opts -j ${VCPKG_CONCURRENCY} --trace -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${vcpkg_package_prefix}) #TODO: optimize for install-data (release) and install-exec (release/debug) else() if(VCPKG_HOST_IS_OPENBSD) @@ -104,144 +110,127 @@ function(vcpkg_build_make) else() find_program(Z_VCPKG_MAKE make REQUIRED) endif() - set(MAKE_COMMAND "${Z_VCPKG_MAKE}") - set(MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) - set(NO_PARALLEL_MAKE_OPTS ${_bc_MAKE_OPTIONS} V=1 -j 1 -f ${_bc_MAKEFILE} ${_bc_BUILD_TARGET}) - set(INSTALL_OPTS -j ${VCPKG_CONCURRENCY} -f ${_bc_MAKEFILE} ${_bc_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) + set(make_command "${Z_VCPKG_MAKE}") + vcpkg_list(SET make_opts ${arg_MAKE_OPTIONS} V=1 -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) + vcpkg_list(SET no_parallel_make_opts ${arg_MAKE_OPTIONS} V=1 -j 1 -f ${arg_MAKEFILE} ${arg_BUILD_TARGET}) + vcpkg_list(SET install_opts -j ${VCPKG_CONCURRENCY} -f ${arg_MAKEFILE} ${arg_INSTALL_TARGET} DESTDIR=${CURRENT_PACKAGES_DIR}) endif() # Since includes are buildtype independent those are setup by vcpkg_configure_make - _vcpkg_backup_env_variables(LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) - - foreach(BUILDTYPE "debug" "release") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) - if(BUILDTYPE STREQUAL "debug") - # Skip debug generate - if (_VCPKG_NO_DEBUG) - continue() - endif() - set(SHORT_BUILDTYPE "-dbg") - set(CMAKE_BUILDTYPE "DEBUG") - set(PATH_SUFFIX "/debug") + vcpkg_backup_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + + foreach(buildtype IN ITEMS "debug" "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "${buildtype}") + if("${buildtype}" STREQUAL "debug") + set(short_buildtype "-dbg") + set(cmake_buildtype "DEBUG") + set(path_suffix "/debug") else() # In NO_DEBUG mode, we only use ${TARGET_TRIPLET} directory. - if (_VCPKG_NO_DEBUG) - set(SHORT_BUILDTYPE "") - else() - set(SHORT_BUILDTYPE "-rel") - endif() - set(CMAKE_BUILDTYPE "RELEASE") - set(PATH_SUFFIX "") + set(short_buildtype "-rel") + set(cmake_buildtype "RELEASE") + set(path_suffix "") endif() - set(WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${SHORT_BUILDTYPE}${_bc_SUBPATH}") - message(STATUS "Building ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") + set(working_directory "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}${short_buildtype}${arg_SUBPATH}") + message(STATUS "Building ${TARGET_TRIPLET}${short_buildtype}") - _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${CMAKE_BUILDTYPE}) + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags("${cmake_buildtype}") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${CMAKE_BUILDTYPE} "${VCPKG_DETECTED_STATIC_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_STATIC_LINKER_FLAGS_${cmake_buildtype}}") else() # dynamic - set(LINKER_FLAGS_${CMAKE_BUILDTYPE} "${VCPKG_DETECTED_SHARED_LINKER_FLAGS_${CMAKE_BUILDTYPE}}") + set(LINKER_FLAGS_${cmake_buildtype} "${VCPKG_DETECTED_SHARED_LINKER_FLAGS_${cmake_buildtype}}") endif() - if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_C_COMPILER MATCHES "cl.exe") - set(LDFLAGS_${CMAKE_BUILDTYPE} "-L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib -L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link") - set(LINK_ENV_${CMAKE_BUILDTYPE} "$ENV{_LINK_} ${LINKER_FLAGS_${CMAKE_BUILDTYPE}}") + if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") + set(LDFLAGS_${cmake_buildtype} "-L${Z_VCPKG_INSTALLED}${path_suffix}/lib -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link") + set(LINK_ENV_${cmake_buildtype} "$ENV{_LINK_} ${LINKER_FLAGS_${cmake_buildtype}}") else() - set(LDFLAGS_${CMAKE_BUILDTYPE} "-L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib -L${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link ${LINKER_FLAGS_${CMAKE_BUILDTYPE}}") + set(LDFLAGS_${cmake_buildtype} "-L${Z_VCPKG_INSTALLED}${path_suffix}/lib -L${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link ${LINKER_FLAGS_${cmake_buildtype}}") endif() # Setup environment - set(ENV{CPPFLAGS} "${CPPFLAGS_${CMAKE_BUILDTYPE}}") - set(ENV{CFLAGS} "${CFLAGS_${CMAKE_BUILDTYPE}}") - set(ENV{CXXFLAGS} "${CXXFLAGS_${CMAKE_BUILDTYPE}}") - set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${CMAKE_BUILDTYPE}}") - set(ENV{LDFLAGS} "${LDFLAGS_${CMAKE_BUILDTYPE}}") - set(ENV{LIB} "${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link/${LIB_PATHLIKE_CONCAT}") - set(ENV{LIBPATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link/${LIBPATH_PATHLIKE_CONCAT}") - set(ENV{LIBRARY_PATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX}/lib/manual-link/${LIBRARY_PATH_PATHLIKE_CONCAT}") - #set(ENV{LD_LIBRARY_PATH} "${_VCPKG_INSTALLED}${PATH_SUFFIX_${BUILDTYPE}}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_VCPKG_INSTALLED}${PATH_SUFFIX_${BUILDTYPE}}/lib/manual-link/${LD_LIBRARY_PATH_PATHLIKE_CONCAT}") + set(ENV{CPPFLAGS} "${CPPFLAGS_${cmake_buildtype}}") + set(ENV{CFLAGS} "${CFLAGS_${cmake_buildtype}}") + set(ENV{CXXFLAGS} "${CXXFLAGS_${cmake_buildtype}}") + set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${cmake_buildtype}}") + set(ENV{LDFLAGS} "${LDFLAGS_${cmake_buildtype}}") + vcpkg_host_path_list(PREPEND ENV{LIB} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") + vcpkg_host_path_list(PREPEND ENV{LIBPATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") + vcpkg_host_path_list(PREPEND ENV{LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix}/lib/manual-link/") + #vcpkg_host_path_list(PREPEND ENV{LD_LIBRARY_PATH} "${Z_VCPKG_INSTALLED}${path_suffix}/lib/" "${Z_VCPKG_INSTALLED}${path_suffix_${buildtype}}/lib/manual-link/") if(LINK_ENV_${_VAR_SUFFIX}) - set(_LINK_CONFIG_BACKUP "$ENV{_LINK_}") + set(config_link_backup "$ENV{_LINK_}") set(ENV{_LINK_} "${LINK_ENV_${_VAR_SUFFIX}}") endif() - if(_bc_ADD_BIN_TO_PATH) - set(_BACKUP_ENV_PATH "$ENV{PATH}") - vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX}/bin") + if(arg_ADD_BIN_TO_PATH) + set(env_backup_path "$ENV{PATH}") + vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}${path_suffix}/bin") endif() - if(MAKE_BASH) - set(MAKE_CMD_LINE "${MAKE_COMMAND} ${MAKE_OPTS}") - set(NO_PARALLEL_MAKE_CMD_LINE "${MAKE_COMMAND} ${NO_PARALLEL_MAKE_OPTS}") - else() - set(MAKE_CMD_LINE ${MAKE_COMMAND} ${MAKE_OPTS}) - set(NO_PARALLEL_MAKE_CMD_LINE ${MAKE_COMMAND} ${NO_PARALLEL_MAKE_OPTS}) - endif() + vcpkg_list(SET make_cmd_line ${make_command} ${make_opts}) + vcpkg_list(SET no_parallel_make_cmd_line ${make_command} ${no_parallel_make_opts}) - if (_bc_DISABLE_PARALLEL) + if (arg_DISABLE_PARALLEL) vcpkg_execute_build_process( - COMMAND ${MAKE_BASH} ${NO_PARALLEL_MAKE_CMD_LINE} - WORKING_DIRECTORY "${WORKING_DIRECTORY}" - LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" + COMMAND ${no_parallel_make_cmd_line} + WORKING_DIRECTORY "${working_directory}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}" ) else() vcpkg_execute_build_process( - COMMAND ${MAKE_BASH} ${MAKE_CMD_LINE} - NO_PARALLEL_COMMAND ${MAKE_BASH} ${NO_PARALLEL_MAKE_CMD_LINE} - WORKING_DIRECTORY "${WORKING_DIRECTORY}" - LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" + COMMAND ${make_cmd_line} + NO_PARALLEL_COMMAND ${no_parallel_make_cmd_line} + WORKING_DIRECTORY "${working_directory}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}" ) endif() - file(READ "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}-out.log" LOGDATA) - if(LOGDATA MATCHES "Warning: linker path does not have real file for library") + file(READ "${CURRENT_BUILDTREES_DIR}/${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}${short_buildtype}-out.log" logdata) + if(logdata MATCHES "Warning: linker path does not have real file for library") message(FATAL_ERROR "libtool could not find a file being linked against!") endif() - if (_bc_ENABLE_INSTALL) - message(STATUS "Installing ${TARGET_TRIPLET}${SHORT_BUILDTYPE}") - if(MAKE_BASH) - set(MAKE_CMD_LINE "${MAKE_COMMAND} ${INSTALL_OPTS}") - else() - set(MAKE_CMD_LINE ${MAKE_COMMAND} ${INSTALL_OPTS}) - endif() + if (arg_ENABLE_INSTALL) + message(STATUS "Installing ${TARGET_TRIPLET}${short_buildtype}") + vcpkg_list(SET make_cmd_line ${make_command} ${install_opts}) vcpkg_execute_build_process( - COMMAND ${MAKE_BASH} ${MAKE_CMD_LINE} - WORKING_DIRECTORY "${WORKING_DIRECTORY}" - LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}" + COMMAND ${make_cmd_line} + WORKING_DIRECTORY "${working_directory}" + LOGNAME "install-${TARGET_TRIPLET}${short_buildtype}" ) endif() - if(_LINK_CONFIG_BACKUP) - set(ENV{_LINK_} "${_LINK_CONFIG_BACKUP}") - unset(_LINK_CONFIG_BACKUP) + if(config_link_backup) + set(ENV{_LINK_} "${config_link_backup}") + unset(config_link_backup) endif() - if(_bc_ADD_BIN_TO_PATH) - set(ENV{PATH} "${_BACKUP_ENV_PATH}") + if(arg_ADD_BIN_TO_PATH) + set(ENV{PATH} "${env_backup_path}") endif() endif() endforeach() - if (_bc_ENABLE_INSTALL) - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_INSTALL_PREFIX "${CURRENT_INSTALLED_DIR}") + if (arg_ENABLE_INSTALL) + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" Z_VCPKG_INSTALL_PREFIX "${CURRENT_INSTALLED_DIR}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp") file(RENAME "${CURRENT_PACKAGES_DIR}" "${CURRENT_PACKAGES_DIR}_tmp") - file(RENAME "${CURRENT_PACKAGES_DIR}_tmp${_VCPKG_INSTALL_PREFIX}" "${CURRENT_PACKAGES_DIR}") + file(RENAME "${CURRENT_PACKAGES_DIR}_tmp${Z_VCPKG_INSTALL_PREFIX}" "${CURRENT_PACKAGES_DIR}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}_tmp") endif() # Remove libtool files since they contain absolute paths and are not necessary. - file(GLOB_RECURSE LIBTOOL_FILES "${CURRENT_PACKAGES_DIR}/**/*.la") - if(LIBTOOL_FILES) - file(REMOVE ${LIBTOOL_FILES}) + file(GLOB_RECURSE libtool_files "${CURRENT_PACKAGES_DIR}/**/*.la") + if(libtool_files) + file(REMOVE ${libtool_files}) endif() if (CMAKE_HOST_WIN32) - set(ENV{PATH} "${PATH_GLOBAL}") + set(ENV{PATH} "${path_backup}") endif() - _vcpkg_restore_env_variables(LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_restore_env_variables(VARS LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) endfunction() diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index c8bdcb554b2e23..da0fd2aad39159 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -89,46 +89,46 @@ This command supplies many common arguments to configure. To see the full list, * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake) #]===] -macro(_vcpkg_determine_host_mingw out_var) +macro(z_vcpkg_determine_host_mingw out_var) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) - set(HOST_ARCH $ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch $ENV{PROCESSOR_ARCHITEW6432}) else() - set(HOST_ARCH $ENV{PROCESSOR_ARCHITECTURE}) + set(host_arch $ENV{PROCESSOR_ARCHITECTURE}) endif() - if(HOST_ARCH MATCHES "(amd|AMD)64") + if(host_arch MATCHES "(amd|AMD)64") set(${out_var} mingw64) - elseif(HOST_ARCH MATCHES "(x|X)86") + elseif(host_arch MATCHES "(x|X)86") set(${out_var} mingw32) else() - message(FATAL_ERROR "Unsupported mingw architecture ${HOST_ARCH} in _vcpkg_determine_autotools_host_cpu!" ) + message(FATAL_ERROR "Unsupported mingw architecture ${host_arch} in z_vcpkg_determine_autotools_host_cpu!" ) endif() - unset(HOST_ARCH) + unset(host_arch) endmacro() -macro(_vcpkg_determine_autotools_host_cpu out_var) +macro(z_vcpkg_determine_autotools_host_cpu out_var) # TODO: the host system processor architecture can differ from the host triplet target architecture if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) - set(HOST_ARCH $ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch $ENV{PROCESSOR_ARCHITEW6432}) elseif(DEFINED ENV{PROCESSOR_ARCHITECTURE}) - set(HOST_ARCH $ENV{PROCESSOR_ARCHITECTURE}) + set(host_arch $ENV{PROCESSOR_ARCHITECTURE}) else() - set(HOST_ARCH "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") + set(host_arch "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") endif() - if(HOST_ARCH MATCHES "(amd|AMD)64") + if(host_arch MATCHES "(amd|AMD)64") set(${out_var} x86_64) - elseif(HOST_ARCH MATCHES "(x|X)86") + elseif(host_arch MATCHES "(x|X)86") set(${out_var} i686) - elseif(HOST_ARCH MATCHES "^(ARM|arm)64$") + elseif(host_arch MATCHES "^(ARM|arm)64$") set(${out_var} aarch64) - elseif(HOST_ARCH MATCHES "^(ARM|arm)$") + elseif(host_arch MATCHES "^(ARM|arm)$") set(${out_var} arm) else() - message(FATAL_ERROR "Unsupported host architecture ${HOST_ARCH} in _vcpkg_determine_autotools_host_cpu!" ) + message(FATAL_ERROR "Unsupported host architecture ${host_arch} in z_vcpkg_determine_autotools_host_cpu!" ) endif() - unset(HOST_ARCH) + unset(host_arch) endmacro() -macro(_vcpkg_determine_autotools_target_cpu out_var) +macro(z_vcpkg_determine_autotools_target_cpu out_var) if(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)64") set(${out_var} x86_64) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") @@ -138,19 +138,19 @@ macro(_vcpkg_determine_autotools_target_cpu out_var) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") set(${out_var} arm) else() - message(FATAL_ERROR "Unsupported VCPKG_TARGET_ARCHITECTURE architecture ${VCPKG_TARGET_ARCHITECTURE} in _vcpkg_determine_autotools_target_cpu!" ) + message(FATAL_ERROR "Unsupported VCPKG_TARGET_ARCHITECTURE architecture ${VCPKG_TARGET_ARCHITECTURE} in z_vcpkg_determine_autotools_target_cpu!" ) endif() endmacro() -macro(_vcpkg_determine_autotools_host_arch_mac out_var) +macro(z_vcpkg_determine_autotools_host_arch_mac out_var) set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") endmacro() -macro(_vcpkg_determine_autotools_target_arch_mac out_var) - list(LENGTH VCPKG_OSX_ARCHITECTURES _num_osx_archs) - if(_num_osx_archs EQUAL 0) +macro(z_vcpkg_determine_autotools_target_arch_mac out_var) + list(LENGTH VCPKG_OSX_ARCHITECTURES osx_archs_num) + if(osx_archs_num EQUAL 0) set(${out_var} "${VCPKG_DETECTED_CMAKE_HOST_SYSTEM_PROCESSOR}") - elseif(_num_osx_archs GREATER_EQUAL 2) + elseif(osx_archs_num GREATER_EQUAL 2) set(${out_var} "universal") else() # Better match the arch behavior of config.guess @@ -161,128 +161,125 @@ macro(_vcpkg_determine_autotools_target_arch_mac out_var) set(${out_var} "${VCPKG_OSX_ARCHITECTURES}") endif() endif() - unset(_num_osx_archs) + unset(osx_archs_num) endmacro() -macro(_vcpkg_backup_env_variable envvar) - if(DEFINED ENV{${envvar}}) - set(${envvar}_BACKUP "$ENV{${envvar}}") - set(${envvar}_PATHLIKE_CONCAT "${VCPKG_HOST_PATH_SEPARATOR}$ENV{${envvar}}") +macro(z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags flag_suffix) + string(REGEX MATCHALL "( |^)-D[^ ]+" CPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") + string(REGEX MATCHALL "( |^)-D[^ ]+" CXXPPFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") + list(JOIN CXXPPFLAGS_${flag_suffix} "|" CXXREGEX) + if(CXXREGEX) + list(FILTER CPPFLAGS_${flag_suffix} INCLUDE REGEX "(${CXXREGEX})") else() - set(${envvar}_BACKUP) - set(${envvar}_PATHLIKE_CONCAT) + set(CPPFLAGS_${flag_suffix}) endif() -endmacro() - -macro(_vcpkg_backup_env_variables) - foreach(_var ${ARGV}) - _vcpkg_backup_env_variable(${_var}) - endforeach() -endmacro() - -macro(_vcpkg_restore_env_variable envvar) - if(${envvar}_BACKUP) - set(ENV{${envvar}} "${${envvar}_BACKUP}") + list(JOIN CPPFLAGS_${flag_suffix} "|" CPPREGEX) + list(JOIN CPPFLAGS_${flag_suffix} " " CPPFLAGS_${flag_suffix}) + set(CPPFLAGS_${flag_suffix} "${CPPFLAGS_${flag_suffix}}") + if(CPPREGEX) + string(REGEX REPLACE "(${CPPREGEX})" "" CFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") + string(REGEX REPLACE "(${CPPREGEX})" "" CXXFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") else() - unset(ENV{${envvar}}) + set(CFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${flag_suffix}}") + set(CXXFLAGS_${flag_suffix} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${flag_suffix}}") endif() + string(REGEX REPLACE " +" " " CPPFLAGS_${flag_suffix} "${CPPFLAGS_${flag_suffix}}") + string(REGEX REPLACE " +" " " CFLAGS_${flag_suffix} "${CFLAGS_${flag_suffix}}") + string(REGEX REPLACE " +" " " CXXFLAGS_${flag_suffix} "${CXXFLAGS_${flag_suffix}}") + # libtool has and -R option so we need to guard against -RTC by using -Xcompiler + # while configuring there might be a lot of unknown compiler option warnings due to that + # just ignore them. + string(REGEX REPLACE "((-|/)RTC[^ ]+)" "-Xcompiler \\1" CFLAGS_${flag_suffix} "${CFLAGS_${flag_suffix}}") + string(REGEX REPLACE "((-|/)RTC[^ ]+)" "-Xcompiler \\1" CXXFLAGS_${flag_suffix} "${CXXFLAGS_${flag_suffix}}") + string(STRIP "${CPPFLAGS_${flag_suffix}}" CPPFLAGS_${flag_suffix}) + string(STRIP "${CFLAGS_${flag_suffix}}" CFLAGS_${flag_suffix}) + string(STRIP "${CXXFLAGS_${flag_suffix}}" CXXFLAGS_${flag_suffix}) + debug_message("CPPFLAGS_${flag_suffix}: ${CPPFLAGS_${flag_suffix}}") + debug_message("CFLAGS_${flag_suffix}: ${CFLAGS_${flag_suffix}}") + debug_message("CXXFLAGS_${flag_suffix}: ${CXXFLAGS_${flag_suffix}}") endmacro() -macro(_vcpkg_restore_env_variables) - foreach(_var ${ARGV}) - _vcpkg_restore_env_variable(${_var}) - endforeach() -endmacro() - -macro(_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags _SUFFIX) - string(REGEX MATCHALL "( |^)-D[^ ]+" CPPFLAGS_${_SUFFIX} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_SUFFIX}}") - string(REGEX MATCHALL "( |^)-D[^ ]+" CXXPPFLAGS_${_SUFFIX} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_SUFFIX}}") - list(JOIN CXXPPFLAGS_${_SUFFIX} "|" CXXREGEX) - if(CXXREGEX) - list(FILTER CPPFLAGS_${_SUFFIX} INCLUDE REGEX "(${CXXREGEX})") +macro(z_vcpkg_append_to_configure_environment inoutstring var defaultval) + # Allows to overwrite settings in custom triplets via the environment on windows + if(CMAKE_HOST_WIN32 AND DEFINED ENV{${var}}) + string(APPEND ${inoutstring} " ${var}='$ENV{${var}}'") else() - set(CPPFLAGS_${_SUFFIX}) + string(APPEND ${inoutstring} " ${var}='${defaultval}'") endif() - list(JOIN CPPFLAGS_${_SUFFIX} "|" CPPREGEX) - list(JOIN CPPFLAGS_${_SUFFIX} " " CPPFLAGS_${_SUFFIX}) - set(CPPFLAGS_${_SUFFIX} "${CPPFLAGS_${_SUFFIX}}") - if(CPPREGEX) - string(REGEX REPLACE "(${CPPREGEX})" "" CFLAGS_${_SUFFIX} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_SUFFIX}}") - string(REGEX REPLACE "(${CPPREGEX})" "" CXXFLAGS_${_SUFFIX} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_SUFFIX}}") +endmacro() + +# Setup include environment (since these are buildtype independent restoring them is unnecessary) +macro(z_prepend_include_path var) + unset(ENV{${var}}) + if(NOT DEFINED z_vcpkg_env_backup_${var} OR "${z_vcpkg_env_backup_${var}}" STREQUAL "") + vcpkg_host_path_list(APPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") else() - set(CFLAGS_${_SUFFIX} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_SUFFIX}}") - set(CXXFLAGS_${_SUFFIX} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_SUFFIX}}") + foreach (one_bk IN ITEMS ${z_vcpkg_env_backup_${var}}) + vcpkg_host_path_list(PREPEND ENV{${var}} "${one_bk}") + endforeach() + vcpkg_host_path_list(PREPEND ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") endif() - string(REGEX REPLACE " +" " " CPPFLAGS_${_SUFFIX} "${CPPFLAGS_${_SUFFIX}}") - string(REGEX REPLACE " +" " " CFLAGS_${_SUFFIX} "${CFLAGS_${_SUFFIX}}") - string(REGEX REPLACE " +" " " CXXFLAGS_${_SUFFIX} "${CXXFLAGS_${_SUFFIX}}") - # libtool has and -R option so we need to guard against -RTC by using -Xcompiler - # while configuring there might be a lot of unknown compiler option warnings due to that - # just ignore them. - string(REGEX REPLACE "((-|/)RTC[^ ]+)" "-Xcompiler \\1" CFLAGS_${_SUFFIX} "${CFLAGS_${_SUFFIX}}") - string(REGEX REPLACE "((-|/)RTC[^ ]+)" "-Xcompiler \\1" CXXFLAGS_${_SUFFIX} "${CXXFLAGS_${_SUFFIX}}") - string(STRIP "${CPPFLAGS_${_SUFFIX}}" CPPFLAGS_${_SUFFIX}) - string(STRIP "${CFLAGS_${_SUFFIX}}" CFLAGS_${_SUFFIX}) - string(STRIP "${CXXFLAGS_${_SUFFIX}}" CXXFLAGS_${_SUFFIX}) - debug_message("CPPFLAGS_${_SUFFIX}: ${CPPFLAGS_${_SUFFIX}}") - debug_message("CFLAGS_${_SUFFIX}: ${CFLAGS_${_SUFFIX}}") - debug_message("CXXFLAGS_${_SUFFIX}: ${CXXFLAGS_${_SUFFIX}}") +endmacro() + +macro(z_convert_to_list input output) + string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}") endmacro() function(vcpkg_configure_make) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _csc + cmake_parse_arguments(PARSE_ARGV 0 arg "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET" "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES" ) + z_vcpkg_get_cmake_vars(cmake_vars_file) debug_message("Including cmake vars from: ${cmake_vars_file}") include("${cmake_vars_file}") if(DEFINED VCPKG_MAKE_BUILD_TRIPLET) - set(_csc_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling + set(arg_BUILD_TRIPLET ${VCPKG_MAKE_BUILD_TRIPLET}) # Triplet overwrite for crosscompiling endif() - set(SRC_DIR "${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}") + set(src_dir "${arg_SOURCE_PATH}/${arg_PROJECT_SUBPATH}") - set(REQUIRES_AUTOGEN FALSE) # use autogen.sh - set(REQUIRES_AUTOCONFIG FALSE) # use autotools and configure.ac - if(EXISTS "${SRC_DIR}/configure" AND "${SRC_DIR}/configure.ac") # remove configure; rerun autoconf + set(requires_autogen OFF) # use autogen.sh + set(requires_autoconfig OFF) # use autotools and configure.ac + if(EXISTS "${src_dir}/configure" AND "${src_dir}/configure.ac") # remove configure; rerun autoconf if(NOT VCPKG_MAINTAINER_SKIP_AUTOCONFIG) # If fixing bugs skipping autoconfig saves a lot of time - set(REQUIRES_AUTOCONFIG TRUE) + set(requires_autoconfig ON) file(REMOVE "${SRC_DIR}/configure") # remove possible autodated configure scripts - set(_csc_AUTOCONFIG ON) - endif() - elseif(EXISTS "${SRC_DIR}/configure" AND NOT _csc_SKIP_CONFIGURE) # run normally; no autoconf or autgen required - elseif(EXISTS "${SRC_DIR}/configure.ac") # Run autoconfig - set(REQUIRES_AUTOCONFIG TRUE) - set(_csc_AUTOCONFIG ON) - elseif(EXISTS "${SRC_DIR}/autogen.sh") # Run autogen - set(REQUIRES_AUTOGEN TRUE) + set(arg_AUTOCONFIG ON) + endif() + elseif(EXISTS "${src_dir}/configure" AND NOT arg_SKIP_CONFIGURE) # run normally; no autoconf or autogen required + elseif(EXISTS "${src_dir}/configure.ac") # Run autoconfig + set(requires_autoconfig ON) + set(arg_AUTOCONFIG ON) + elseif(EXISTS "${src_dir}/autogen.sh") # Run autogen + set(requires_autogen ON) else() message(FATAL_ERROR "Could not determine method to configure make") endif() - debug_message("REQUIRES_AUTOGEN:${REQUIRES_AUTOGEN}") - debug_message("REQUIRES_AUTOCONFIG:${REQUIRES_AUTOCONFIG}") + debug_message("requires_autogen:${requires_autogen}") + debug_message("requires_autoconfig:${requires_autoconfig}") if(CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") #only applies to windows (clang-)cl and lib - if(_csc_AUTOCONFIG) - set(_csc_USE_WRAPPERS TRUE) + if(arg_AUTOCONFIG) + set(arg_USE_WRAPPERS ON) else() # Keep the setting from portfiles. # Without autotools we assume a custom configure script which correctly handles cl and lib. # Otherwise the port needs to set CC|CXX|AR and probably CPP. endif() else() - set(_csc_USE_WRAPPERS FALSE) + set(arg_USE_WRAPPERS OFF) endif() # Backup environment variables # CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJCXX R UPC Y - set(_cm_FLAGS AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC) - list(TRANSFORM _cm_FLAGS APPEND "FLAGS") - _vcpkg_backup_env_variables(${_cm_FLAGS}) + set(cm_FLAGS AS CCAS CC C CPP CXX FC FF GC LD LF LIBTOOL OBJC OBJXX R UPC Y RC) + list(TRANSFORM cm_FLAGS APPEND "FLAGS") + vcpkg_backup_env_variables(VARS ${cm_FLAGS}) # FC fotran compiler | FF Fortran 77 compiler @@ -290,68 +287,59 @@ function(vcpkg_configure_make) # LIBS -> pass -l flags #Used by gcc/linux - _vcpkg_backup_env_variables(C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_backup_env_variables(VARS C_INCLUDE_PATH CPLUS_INCLUDE_PATH LIBRARY_PATH LD_LIBRARY_PATH) #Used by cl - _vcpkg_backup_env_variables(INCLUDE LIB LIBPATH) + vcpkg_backup_env_variables(VARS INCLUDE LIB LIBPATH) - set(_vcm_paths_with_spaces FALSE) + set(vcm_paths_with_spaces OFF) if(CURRENT_PACKAGES_DIR MATCHES " " OR CURRENT_INSTALLED_DIR MATCHES " ") # Don't bother with whitespace. The tools will probably fail and I tried very hard trying to make it work (no success so far)! message(WARNING "Detected whitespace in root directory. Please move the path to one without whitespaces! The required tools do not handle whitespaces correctly and the build will most likely fail") - set(_vcm_paths_with_spaces TRUE) + set(vcm_paths_with_spaces ON) endif() - set(CONFIGURE_ENV "V=1") + set(configure_env "V=1") # Pre-processing windows configure requirements if (VCPKG_TARGET_IS_WINDOWS) if(CMAKE_HOST_WIN32) - list(APPEND MSYS_REQUIRE_PACKAGES binutils libtool autoconf automake-wrapper automake1.16 m4) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES} ${_csc_ADDITIONAL_MSYS_PACKAGES}) + list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) endif() - if (_csc_AUTOCONFIG AND NOT _csc_BUILD_TRIPLET OR _csc_DETERMINE_BUILD_TRIPLET OR VCPKG_CROSSCOMPILING AND NOT _csc_BUILD_TRIPLET) - _vcpkg_determine_autotools_host_cpu(BUILD_ARCH) # VCPKG_HOST => machine you are building on => --build= - _vcpkg_determine_autotools_target_cpu(TARGET_ARCH) + if (arg_AUTOCONFIG AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET OR VCPKG_CROSSCOMPILING AND NOT arg_BUILD_TRIPLET) + z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) # VCPKG_HOST => machine you are building on => --build= + z_vcpkg_determine_autotools_target_cpu(TARGET_ARCH) # --build: the machine you are building on # --host: the machine you are building for # --target: the machine that CC will produce binaries for # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host if(CMAKE_HOST_WIN32) - set(_csc_BUILD_TRIPLET "--build=${BUILD_ARCH}-pc-mingw32") # This is required since we are running in a msys + set(arg_BUILD_TRIPLET "--build=${BUILD_ARCH}-pc-mingw32") # This is required since we are running in a msys # shell which will be otherwise identified as ${BUILD_ARCH}-pc-msys endif() if(NOT TARGET_ARCH MATCHES "${BUILD_ARCH}" OR NOT CMAKE_HOST_WIN32) # we don't need to specify the additional flags if we build nativly, this does not hold when we are not on windows - string(APPEND _csc_BUILD_TRIPLET " --host=${TARGET_ARCH}-pc-mingw32") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + string(APPEND arg_BUILD_TRIPLET " --host=${TARGET_ARCH}-pc-mingw32") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) endif() - if(VCPKG_TARGET_IS_UWP AND NOT _csc_BUILD_TRIPLET MATCHES "--host") + if(VCPKG_TARGET_IS_UWP AND NOT arg_BUILD_TRIPLET MATCHES "--host") # Needs to be different from --build to enable cross builds. - string(APPEND _csc_BUILD_TRIPLET " --host=${TARGET_ARCH}-unknown-mingw32") + string(APPEND arg_BUILD_TRIPLET " --host=${TARGET_ARCH}-unknown-mingw32") endif() - debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}") + debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") endif() if(CMAKE_HOST_WIN32) - set(APPEND_ENV) - if(_csc_USE_WRAPPERS) - set(APPEND_ENV ";${MSYS_ROOT}/usr/share/automake-1.16") - string(APPEND APPEND_ENV ";${SCRIPTS}/buildsystems/make_wrapper") # Other required wrappers are also located there + set(append_env) + if(arg_USE_WRAPPERS) + set(append_env ";${MSYS_ROOT}/usr/share/automake-1.16") + string(APPEND append_env ";${SCRIPTS}/buildsystems/make_wrapper") # Other required wrappers are also located there endif() # This inserts msys before system32 (which masks sort.exe and find.exe) but after MSVC (which avoids masking link.exe) - string(REPLACE ";$ENV{SystemRoot}\\System32;" "${APPEND_ENV};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}") - string(REPLACE ";$ENV{SystemRoot}\\system32;" "${APPEND_ENV};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") + string(REPLACE ";$ENV{SystemRoot}\\System32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\System32;" NEWPATH "$ENV{PATH}") + string(REPLACE ";$ENV{SystemRoot}\\system32;" "${append_env};${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") set(ENV{PATH} "${NEWPATH}") - set(BASH "${MSYS_ROOT}/usr/bin/bash.exe") + set(bash_executable "${MSYS_ROOT}/usr/bin/bash.exe") endif() - macro(_vcpkg_append_to_configure_environment inoutstring var defaultval) - # Allows to overwrite settings in custom triplets via the environment on windows - if(CMAKE_HOST_WIN32 AND DEFINED ENV{${var}}) - string(APPEND ${inoutstring} " ${var}='$ENV{${var}}'") - else() - string(APPEND ${inoutstring} " ${var}='${defaultval}'") - endif() - endmacro() - # Remove full filepaths due to spaces and prepend filepaths to PATH (cross-compiling tools are unlikely on path by default) set(progs VCPKG_DETECTED_CMAKE_C_COMPILER VCPKG_DETECTED_CMAKE_CXX_COMPILER VCPKG_DETECTED_CMAKE_AR VCPKG_DETECTED_CMAKE_LINKER VCPKG_DETECTED_CMAKE_RANLIB VCPKG_DETECTED_CMAKE_OBJDUMP @@ -368,66 +356,66 @@ function(vcpkg_configure_make) endif() endif() endforeach() - if (_csc_USE_WRAPPERS) - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CPP "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") - - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CXX "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV RC "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV WINDRES "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + if (arg_USE_WRAPPERS) + z_vcpkg_append_to_configure_environment(configure_env CPP "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + + z_vcpkg_append_to_configure_environment(configure_env CC "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "compile ${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CXX "compile ${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env RC "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env WINDRES "windres-rc ${VCPKG_DETECTED_CMAKE_RC_COMPILER}") if(VCPKG_DETECTED_CMAKE_AR) - _vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "ar-lib ${VCPKG_DETECTED_CMAKE_AR}") + z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib ${VCPKG_DETECTED_CMAKE_AR}") else() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "ar-lib lib.exe -verbose") + z_vcpkg_append_to_configure_environment(configure_env AR "ar-lib lib.exe -verbose") endif() else() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CPP "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") - _vcpkg_append_to_configure_environment(CONFIGURE_ENV WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CPP "${VCPKG_DETECTED_CMAKE_C_COMPILER} -E") + z_vcpkg_append_to_configure_environment(configure_env CC "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CC_FOR_BUILD "${VCPKG_DETECTED_CMAKE_C_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env CXX "${VCPKG_DETECTED_CMAKE_CXX_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env RC "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") + z_vcpkg_append_to_configure_environment(configure_env WINDRES "${VCPKG_DETECTED_CMAKE_RC_COMPILER}") if(VCPKG_DETECTED_CMAKE_AR) - _vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "${VCPKG_DETECTED_CMAKE_AR}") + z_vcpkg_append_to_configure_environment(configure_env AR "${VCPKG_DETECTED_CMAKE_AR}") else() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV AR "lib.exe -verbose") + z_vcpkg_append_to_configure_environment(configure_env AR "lib.exe -verbose") endif() endif() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV LD "${VCPKG_DETECTED_CMAKE_LINKER} -verbose") + z_vcpkg_append_to_configure_environment(configure_env LD "${VCPKG_DETECTED_CMAKE_LINKER} -verbose") if(VCPKG_DETECTED_CMAKE_RANLIB) - _vcpkg_append_to_configure_environment(CONFIGURE_ENV RANLIB "${VCPKG_DETECTED_CMAKE_RANLIB}") # Trick to ignore the RANLIB call + z_vcpkg_append_to_configure_environment(configure_env RANLIB "${VCPKG_DETECTED_CMAKE_RANLIB}") # Trick to ignore the RANLIB call else() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV RANLIB ":") + z_vcpkg_append_to_configure_environment(configure_env RANLIB ":") endif() if(VCPKG_DETECTED_CMAKE_OBJDUMP) #Objdump is required to make shared libraries. Otherwise define lt_cv_deplibs_check_method=pass_all - _vcpkg_append_to_configure_environment(CONFIGURE_ENV OBJDUMP "${VCPKG_DETECTED_CMAKE_OBJDUMP}") # Trick to ignore the RANLIB call + z_vcpkg_append_to_configure_environment(configure_env OBJDUMP "${VCPKG_DETECTED_CMAKE_OBJDUMP}") # Trick to ignore the RANLIB call endif() if(VCPKG_DETECTED_CMAKE_STRIP) # If required set the ENV variable STRIP in the portfile correctly - _vcpkg_append_to_configure_environment(CONFIGURE_ENV STRIP "${VCPKG_DETECTED_CMAKE_STRIP}") + z_vcpkg_append_to_configure_environment(configure_env STRIP "${VCPKG_DETECTED_CMAKE_STRIP}") else() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV STRIP ":") - list(APPEND _csc_OPTIONS ac_cv_prog_ac_ct_STRIP=:) + z_vcpkg_append_to_configure_environment(configure_env STRIP ":") + list(APPEND arg_OPTIONS ac_cv_prog_ac_ct_STRIP=:) endif() if(VCPKG_DETECTED_CMAKE_NM) # If required set the ENV variable NM in the portfile correctly - _vcpkg_append_to_configure_environment(CONFIGURE_ENV NM "${VCPKG_DETECTED_CMAKE_NM}") + z_vcpkg_append_to_configure_environment(configure_env NM "${VCPKG_DETECTED_CMAKE_NM}") else() # Would be better to have a true nm here! Some symbols (mainly exported variables) get not properly imported with dumpbin as nm # and require __declspec(dllimport) for some reason (same problem CMake has with WINDOWS_EXPORT_ALL_SYMBOLS) - _vcpkg_append_to_configure_environment(CONFIGURE_ENV NM "dumpbin.exe -symbols -headers") + z_vcpkg_append_to_configure_environment(configure_env NM "dumpbin.exe -symbols -headers") endif() if(VCPKG_DETECTED_CMAKE_DLLTOOL) # If required set the ENV variable DLLTOOL in the portfile correctly - _vcpkg_append_to_configure_environment(CONFIGURE_ENV DLLTOOL "${VCPKG_DETECTED_CMAKE_DLLTOOL}") + z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "${VCPKG_DETECTED_CMAKE_DLLTOOL}") else() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV DLLTOOL "link.exe -verbose -dll") + z_vcpkg_append_to_configure_environment(configure_env DLLTOOL "link.exe -verbose -dll") endif() - _vcpkg_append_to_configure_environment(CONFIGURE_ENV CCAS ":") # If required set the ENV variable CCAS in the portfile correctly - _vcpkg_append_to_configure_environment(CONFIGURE_ENV AS ":") # If required set the ENV variable AS in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env CCAS ":") # If required set the ENV variable CCAS in the portfile correctly + z_vcpkg_append_to_configure_environment(configure_env AS ":") # If required set the ENV variable AS in the portfile correctly - foreach(_env IN LISTS _csc_CONFIGURE_ENVIRONMENT_VARIABLES) - _vcpkg_append_to_configure_environment(CONFIGURE_ENV ${_env} "${${_env}}") + foreach(_env IN LISTS arg_CONFIGURE_ENVIRONMENT_VARIABLES) + z_vcpkg_append_to_configure_environment(configure_env ${_env} "${${_env}}") endforeach() - debug_message("CONFIGURE_ENV: '${CONFIGURE_ENV}'") + debug_message("configure_env: '${configure_env}'") # Other maybe interesting variables to control # COMPILE This is the command used to actually compile a C source file. The file name is appended to form the complete command line. # LINK This is the command used to actually link a C program. @@ -435,45 +423,45 @@ function(vcpkg_configure_make) # CXXLINK The command used to actually link a C++ program. # Variables not correctly detected by configure. In release builds. - list(APPEND _csc_OPTIONS gl_cv_double_slash_root=yes + list(APPEND arg_OPTIONS gl_cv_double_slash_root=yes ac_cv_func_memmove=yes) - #list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks + #list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks if(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]64$") - list(APPEND _csc_OPTIONS gl_cv_host_cpu_c_abi=no) + list(APPEND arg_OPTIONS gl_cv_host_cpu_c_abi=no) # Currently needed for arm64 because objdump yields: "unrecognised machine type (0xaa64) in Import Library Format archive" - list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) + list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^[Aa][Rr][Mm]$") # Currently needed for arm because objdump yields: "unrecognised machine type (0x1c4) in Import Library Format archive" - list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) + list(APPEND arg_OPTIONS lt_cv_deplibs_check_method=pass_all) endif() endif() # Some PATH handling for dealing with spaces....some tools will still fail with that! # In particular, the libtool install command is unable to install correctly to paths with spaces. # CURRENT_INSTALLED_DIR: Pristine native path (unprotected spaces, Windows drive letters) - # _VCPKG_INSTALLED: Native path with escaped space characters - # _VCPKG_PREFIX: Path with unprotected spaces, but drive letters transformed for mingw/msys - string(REPLACE " " "\\ " _VCPKG_INSTALLED "${CURRENT_INSTALLED_DIR}") + # z_vcpkg_installed_path: Native path with escaped space characters + # z_vcpkg_prefix_path: Path with unprotected spaces, but drive letters transformed for mingw/msys + string(REPLACE " " "\\ " z_vcpkg_installed_path "${CURRENT_INSTALLED_DIR}") if(CMAKE_HOST_WIN32) - string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" _VCPKG_PREFIX "${CURRENT_INSTALLED_DIR}") + string(REGEX REPLACE "([a-zA-Z]):/" "/\\1/" z_vcpkg_prefix_path "${CURRENT_INSTALLED_DIR}") else() - set(_VCPKG_PREFIX "${CURRENT_INSTALLED_DIR}") + set(z_vcpkg_prefix_path "${CURRENT_INSTALLED_DIR}") endif() # macOS - cross-compiling support if(VCPKG_TARGET_IS_OSX) - if (_csc_AUTOCONFIG AND NOT _csc_BUILD_TRIPLET OR _csc_DETERMINE_BUILD_TRIPLET) - _vcpkg_determine_autotools_host_arch_mac(BUILD_ARCH) # machine you are building on => --build= - _vcpkg_determine_autotools_target_arch_mac(TARGET_ARCH) + if (requires_autoconfig AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET) + z_vcpkg_determine_autotools_host_arch_mac(BUILD_ARCH) # machine you are building on => --build= + z_vcpkg_determine_autotools_target_arch_mac(TARGET_ARCH) # --build: the machine you are building on # --host: the machine you are building for # --target: the machine that CC will produce binaries for # https://stackoverflow.com/questions/21990021/how-to-determine-host-value-for-configure-when-using-cross-compiler # Only for ports using autotools so we can assume that they follow the common conventions for build/target/host if(NOT "${TARGET_ARCH}" STREQUAL "${BUILD_ARCH}") # we don't need to specify the additional flags if we build natively. - set(_csc_BUILD_TRIPLET "--host=${TARGET_ARCH}-apple-darwin") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) + set(arg_BUILD_TRIPLET "--host=${TARGET_ARCH}-apple-darwin") # (Host activates crosscompilation; The name given here is just the prefix of the host tools for the target) endif() - debug_message("Using make triplet: ${_csc_BUILD_TRIPLET}") + debug_message("Using make triplet: ${arg_BUILD_TRIPLET}") endif() endif() @@ -483,11 +471,11 @@ function(vcpkg_configure_make) "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}") # Set configure paths - set(_csc_OPTIONS_RELEASE ${_csc_OPTIONS_RELEASE} "--prefix=${_VCPKG_PREFIX}") - set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} "--prefix=${_VCPKG_PREFIX}/debug") - if(NOT _csc_NO_ADDITIONAL_PATHS) + set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE} "--prefix=${z_vcpkg_prefix_path}") + set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG} "--prefix=${z_vcpkg_prefix_path}/debug") + if(NOT arg_NO_ADDITIONAL_PATHS) # ${prefix} has an extra backslash to prevent early expansion when calling `bash -c configure "..."`. - set(_csc_OPTIONS_RELEASE ${_csc_OPTIONS_RELEASE} + set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE} # Important: These should all be relative to prefix! "--bindir=\\\${prefix}/tools/${PORT}/bin" "--sbindir=\\\${prefix}/tools/${PORT}/sbin" @@ -496,7 +484,7 @@ function(vcpkg_configure_make) "--mandir=\\\${prefix}/share/${PORT}" "--docdir=\\\${prefix}/share/${PORT}" "--datarootdir=\\\${prefix}/share/${PORT}") - set(_csc_OPTIONS_DEBUG ${_csc_OPTIONS_DEBUG} + set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG} # Important: These should all be relative to prefix! "--bindir=\\\${prefix}/../tools/${PORT}/debug/bin" "--sbindir=\\\${prefix}/../tools/${PORT}/debug/sbin" @@ -505,53 +493,45 @@ function(vcpkg_configure_make) "--datarootdir=\\\${prefix}/share/${PORT}") endif() # Setup common options - if(NOT DISABLE_VERBOSE_FLAGS) - list(APPEND _csc_OPTIONS --disable-silent-rules --verbose) + if(NOT arg_DISABLE_VERBOSE_FLAGS) + list(APPEND arg_OPTIONS --disable-silent-rules --verbose) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - list(APPEND _csc_OPTIONS --enable-shared --disable-static) + list(APPEND arg_OPTIONS --enable-shared --disable-static) else() - list(APPEND _csc_OPTIONS --disable-shared --enable-static) + list(APPEND arg_OPTIONS --disable-shared --enable-static) endif() # Can be set in the triplet to append options for configure - if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS) - list(APPEND _csc_OPTIONS ${VCPKG_MAKE_CONFIGURE_OPTIONS}) + if(DEFINED VCPKG_CONFIGURE_MAKE_OPTIONS) + list(APPEND arg_OPTIONS ${VCPKG_CONFIGURE_MAKE_OPTIONS}) endif() - if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE) - list(APPEND _csc_OPTIONS_RELEASE ${VCPKG_MAKE_CONFIGURE_OPTIONS_RELEASE}) + if(DEFINED VCPKG_CONFIGURE_MAKE_OPTIONS_RELEASE) + list(APPEND arg_OPTIONS_RELEASE ${VCPKG_CONFIGURE_MAKE_OPTIONS_RELEASE}) endif() - if(DEFINED VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG) - list(APPEND _csc_OPTIONS_DEBUG ${VCPKG_MAKE_CONFIGURE_OPTIONS_DEBUG}) + if(DEFINED VCPKG_CONFIGURE_MAKE_OPTIONS_DEBUG) + list(APPEND arg_OPTIONS_DEBUG ${VCPKG_CONFIGURE_MAKE_OPTIONS_DEBUG}) endif() - file(RELATIVE_PATH RELATIVE_BUILD_PATH "${CURRENT_BUILDTREES_DIR}" "${_csc_SOURCE_PATH}/${_csc_PROJECT_SUBPATH}") + file(RELATIVE_PATH relative_build_path "${CURRENT_BUILDTREES_DIR}" "${arg_SOURCE_PATH}/${arg_PROJECT_SUBPATH}") set(base_cmd) if(CMAKE_HOST_WIN32) - set(base_cmd ${BASH} --noprofile --norc --debug) + set(base_cmd ${bash_executable} --noprofile --norc --debug) else() find_program(base_cmd bash REQUIRED) endif() - - # Setup include environment (since these are buildtype independent restoring them is unnecessary) - macro(prepend_include_path var) - if("${${var}_BACKUP}" STREQUAL "") - set(ENV{${var}} "${CURRENT_INSTALLED_DIR}/include") - else() - set(ENV{${var}} "${CURRENT_INSTALLED_DIR}/include${VCPKG_HOST_PATH_SEPARATOR}${${var}_BACKUP}") - endif() - endmacro() + # Used by CL - prepend_include_path(INCLUDE) + z_prepend_include_path(INCLUDE) # Used by GCC - prepend_include_path(C_INCLUDE_PATH) - prepend_include_path(CPLUS_INCLUDE_PATH) + z_prepend_include_path(C_INCLUDE_PATH) + z_prepend_include_path(CPLUS_INCLUDE_PATH) # Flags should be set in the toolchain instead (Setting this up correctly requires a function named vcpkg_determined_cmake_compiler_flags which can also be used to setup CC and CXX etc.) if(VCPKG_TARGET_IS_WINDOWS) - _vcpkg_backup_env_variables(_CL_ _LINK_) + vcpkg_backup_env_variables(VARS _CL_ _LINK_) # TODO: Should be CPP flags instead -> rewrite when vcpkg_determined_cmake_compiler_flags defined if(VCPKG_TARGET_IS_UWP) # Be aware that configure thinks it is crosscompiling due to: @@ -569,45 +549,42 @@ function(vcpkg_configure_make) endif() endif() - macro(convert_to_list input output) - string(REGEX MATCHALL "(( +|^ *)[^ ]+)" ${output} "${${input}}") - endmacro() - convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES C_LIBS_LIST) - convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES CXX_LIBS_LIST) - set(ALL_LIBS_LIST ${C_LIBS_LIST} ${CXX_LIBS_LIST}) - list(REMOVE_DUPLICATES ALL_LIBS_LIST) - list(TRANSFORM ALL_LIBS_LIST STRIP) + z_convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES c_libs_list) + z_convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES cxx_libs_list) + set(all_libs_list ${c_libs_list} ${cxx_libs_list}) + list(REMOVE_DUPLICATES all_libs_list) + list(TRANSFORM all_libs_list STRIP) #Do lib list transformation from name.lib to -lname if necessary - set(_VCPKG_TRANSFORM_LIBS TRUE) + set(x_vcpkg_transform_libs ON) if(VCPKG_TARGET_IS_UWP) - set(_VCPKG_TRANSFORM_LIBS FALSE) + set(x_vcpkg_transform_libs OFF) # Avoid libtool choke: "Warning: linker path does not have real file for library -lWindowsApp." # The problem with the choke is that libtool always falls back to built a static library even if a dynamic was requested. # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. # It even does unix/dos-short/unix transformation with the path to get rid of spaces. endif() - set(_lprefix) - if(_VCPKG_TRANSFORM_LIBS) - set(_lprefix "-l") - list(TRANSFORM ALL_LIBS_LIST REPLACE "(.dll.lib|.lib|.a|.so)$" "") + set(l_prefix) + if(x_vcpkg_transform_libs) + set(l_prefix "-l") + list(TRANSFORM all_libs_list REPLACE "(.dll.lib|.lib|.a|.so)$" "") if(VCPKG_TARGET_IS_WINDOWS) - list(REMOVE_ITEM ALL_LIBS_LIST "uuid") + list(REMOVE_ITEM all_libs_list "uuid") endif() - list(TRANSFORM ALL_LIBS_LIST REPLACE "^(${_lprefix})" "") + list(TRANSFORM all_libs_list REPLACE "^(${l_prefix})" "") endif() - list(JOIN ALL_LIBS_LIST " ${_lprefix}" ALL_LIBS_STRING) + list(JOIN all_libs_list " ${l_prefix}" all_libs_string) if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") # libtool must be told explicitly that there is no dynamic linkage for uuid. # The "-Wl,..." syntax is understood by libtool and gcc, but no by ld. - string(REPLACE " -luuid" " -Wl,-Bstatic,-luuid,-Bdynamic" ALL_LIBS_STRING "${ALL_LIBS_STRING}") + string(REPLACE " -luuid" " -Wl,-Bstatic,-luuid,-Bdynamic" all_libs_string "${all_libs_string}") endif() - if(ALL_LIBS_STRING) - set(ALL_LIBS_STRING "${_lprefix}${ALL_LIBS_STRING}") + if(all_libs_string) + set(all_libs_string "${l_prefix}${all_libs_string}") if(DEFINED ENV{LIBS}) - set(ENV{LIBS} "$ENV{LIBS} ${ALL_LIBS_STRING}") + set(ENV{LIBS} "$ENV{LIBS} ${all_libs_string}") else() - set(ENV{LIBS} "${ALL_LIBS_STRING}") + set(ENV{LIBS} "${all_libs_string}") endif() endif() debug_message("ENV{LIBS}:$ENV{LIBS}") @@ -617,8 +594,7 @@ function(vcpkg_configure_make) endif() # Run autoconf if necessary - set(_GENERATED_CONFIGURE FALSE) - if (_csc_AUTOCONFIG OR REQUIRES_AUTOCONFIG) + if (arg_AUTOCONFIG OR requires_autoconfig) find_program(AUTORECONF autoreconf) if(NOT AUTORECONF) message(FATAL_ERROR "${PORT} requires autoconf from the system package manager (example: \"sudo apt-get install autoconf\")") @@ -627,113 +603,121 @@ function(vcpkg_configure_make) if (CMAKE_HOST_WIN32) vcpkg_execute_required_process( COMMAND ${base_cmd} -c "autoreconf -vfi" - WORKING_DIRECTORY "${SRC_DIR}" - LOGNAME autoconf-${TARGET_TRIPLET} + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" ) else() vcpkg_execute_required_process( - COMMAND ${AUTORECONF} -vfi - WORKING_DIRECTORY "${SRC_DIR}" - LOGNAME autoconf-${TARGET_TRIPLET} + COMMAND "${AUTORECONF}" -vfi + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" ) endif() message(STATUS "Finished generating configure for ${TARGET_TRIPLET}") endif() - if(REQUIRES_AUTOGEN) + if(requires_autogen) message(STATUS "Generating configure for ${TARGET_TRIPLET} via autogen.sh") if (CMAKE_HOST_WIN32) vcpkg_execute_required_process( COMMAND ${base_cmd} -c "./autogen.sh" - WORKING_DIRECTORY "${SRC_DIR}" - LOGNAME autoconf-${TARGET_TRIPLET} + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" ) else() vcpkg_execute_required_process( COMMAND "./autogen.sh" - WORKING_DIRECTORY "${SRC_DIR}" - LOGNAME autoconf-${TARGET_TRIPLET} + WORKING_DIRECTORY "${src_dir}" + LOGNAME "autoconf-${TARGET_TRIPLET}" ) endif() message(STATUS "Finished generating configure for ${TARGET_TRIPLET}") endif() - if (_csc_PRERUN_SHELL) + if (arg_PRERUN_SHELL) message(STATUS "Prerun shell with ${TARGET_TRIPLET}") - vcpkg_execute_required_process( - COMMAND ${base_cmd} -c "${_csc_PRERUN_SHELL}" - WORKING_DIRECTORY "${SRC_DIR}" - LOGNAME prerun-${TARGET_TRIPLET} - ) - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT _csc_NO_DEBUG) - set(_VAR_SUFFIX DEBUG) - set(PATH_SUFFIX_${_VAR_SUFFIX} "/debug") - set(SHORT_NAME_${_VAR_SUFFIX} "dbg") - list(APPEND _buildtypes ${_VAR_SUFFIX}) + if (CMAKE_HOST_WIN32) + vcpkg_execute_required_process( + COMMAND ${base_cmd} -c "${arg_PRERUN_SHELL}" + WORKING_DIRECTORY "${src_dir}" + LOGNAME "prerun-${TARGET_TRIPLET}" + ) + else() + vcpkg_execute_required_process( + COMMAND "${base_cmd}" -c "${arg_PRERUN_SHELL}" + WORKING_DIRECTORY "${src_dir}" + LOGNAME "prerun-${TARGET_TRIPLET}" + ) + endif() + endif() + + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug" AND NOT arg_NO_DEBUG) + set(var_suffix DEBUG) + set(path_suffix_${var_suffix} "/debug") + set(short_name_${var_suffix} "dbg") + list(APPEND all_buildtypes ${var_suffix}) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${_VAR_SUFFIX} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") else() # dynamic - set(LINKER_FLAGS_${_VAR_SUFFIX} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") endif() - _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${_VAR_SUFFIX}) + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") - if(NOT _vcm_paths_with_spaces) - set(LDFLAGS_${_VAR_SUFFIX} "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + if(NOT vcm_paths_with_spaces) + set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() if(DEFINED ENV{_LINK_}) - set(LINK_ENV_${_VAR_SUFFIX} "$ENV{_LINK_} ${LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") else() - set(LINK_ENV_${_VAR_SUFFIX} "${LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") endif() else() - set(_link_dirs) - if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") - set(_link_dirs "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") + set(link_required_dirs) + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") + set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") endif() - if(EXISTS "{CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") - set(_link_dirs "${_link_dirs} -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + if(EXISTS "{CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link") + set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() - string(STRIP "${_link_dirs}" _link_dirs) - set(LDFLAGS_${_VAR_SUFFIX} "${_link_dirs} ${LINKER_FLAGS_${_VAR_SUFFIX}}") + string(STRIP "${link_required_dirs}" link_required_dirs) + set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") endif() - unset(_VAR_SUFFIX) + unset(var_suffix) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(_VAR_SUFFIX RELEASE) - set(PATH_SUFFIX_${_VAR_SUFFIX} "") - set(SHORT_NAME_${_VAR_SUFFIX} "rel") - list(APPEND _buildtypes ${_VAR_SUFFIX}) + set(var_suffix RELEASE) + set(path_suffix_${var_suffix} "") + set(short_name_${var_suffix} "rel") + list(APPEND all_buildtypes ${var_suffix}) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - set(LINKER_FLAGS_${_VAR_SUFFIX} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${var_suffix}}") else() # dynamic - set(LINKER_FLAGS_${_VAR_SUFFIX} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINKER_FLAGS_${var_suffix} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${var_suffix}}") endif() - _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${_VAR_SUFFIX}) + z_vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${var_suffix}) if (CMAKE_HOST_WIN32 AND VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") - if(NOT _vcm_paths_with_spaces) - set(LDFLAGS_${_VAR_SUFFIX} "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + if(NOT vcm_paths_with_spaces) + set(LDFLAGS_${var_suffix} "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() if(DEFINED ENV{_LINK_}) - set(LINK_ENV_${_VAR_SUFFIX} "$ENV{_LINK_} ${LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINK_ENV_${var_suffix} "$ENV{_LINK_} ${LINKER_FLAGS_${var_suffix}}") else() - set(LINK_ENV_${_VAR_SUFFIX} "${LINKER_FLAGS_${_VAR_SUFFIX}}") + set(LINK_ENV_${var_suffix} "${LINKER_FLAGS_${var_suffix}}") endif() else() - set(_link_dirs) - if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") - set(_link_dirs "-L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib") + set(link_required_dirs) + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib") + set(link_required_dirs "-L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib") endif() - if(EXISTS "{CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") - set(_link_dirs "${_link_dirs} -L${_VCPKG_INSTALLED}${PATH_SUFFIX_${_VAR_SUFFIX}}/lib/manual-link") + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${var_suffix}}/lib/manual-link") + set(link_required_dirs "${link_required_dirs} -L${z_vcpkg_installed_path}${path_suffix_${var_suffix}}/lib/manual-link") endif() - string(STRIP "${_link_dirs}" _link_dirs) - set(LDFLAGS_${_VAR_SUFFIX} "${_link_dirs} ${LINKER_FLAGS_${_VAR_SUFFIX}}") + string(STRIP "${link_required_dirs}" link_required_dirs) + set(LDFLAGS_${var_suffix} "${link_required_dirs} ${LINKER_FLAGS_${var_suffix}}") endif() - unset(_VAR_SUFFIX) + unset(var_suffix) endif() - foreach(var IN ITEMS _csc_OPTIONS _csc_OPTIONS_RELEASE _csc_OPTIONS_DEBUG) + foreach(var IN ITEMS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) vcpkg_list(SET tmp) foreach(element IN LISTS "${var}") string(REPLACE [["]] [[\"]] element "${element}") @@ -742,39 +726,39 @@ function(vcpkg_configure_make) vcpkg_list(JOIN tmp " " "${var}") endforeach() - foreach(_buildtype IN LISTS _buildtypes) - foreach(ENV_VAR ${_csc_CONFIG_DEPENDENT_ENVIRONMENT}) + foreach(current_buildtype IN LISTS all_buildtypes) + foreach(ENV_VAR ${arg_CONFIG_DEPENDENT_ENVIRONMENT}) if(DEFINED ENV{${ENV_VAR}}) - set(BACKUP_CONFIG_${ENV_VAR} "$ENV{${ENV_VAR}}") + set(backup_config_${ENV_VAR} "$ENV{${ENV_VAR}}") endif() - set(ENV{${ENV_VAR}} "${${ENV_VAR}_${_buildtype}}") + set(ENV{${ENV_VAR}} "${${ENV_VAR}_${current_buildtype}}") endforeach() - set(TAR_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_NAME_${_buildtype}}") - file(MAKE_DIRECTORY "${TAR_DIR}") - file(RELATIVE_PATH RELATIVE_BUILD_PATH "${TAR_DIR}" "${SRC_DIR}") + set(target_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_name_${current_buildtype}}") + file(MAKE_DIRECTORY "${target_dir}") + file(RELATIVE_PATH relative_build_path "${target_dir}" "${src_dir}") - if(_csc_COPY_SOURCE) - file(COPY "${SRC_DIR}/" DESTINATION "${TAR_DIR}") - set(RELATIVE_BUILD_PATH .) + if(arg_COPY_SOURCE) + file(COPY "${src_dir}/" DESTINATION "${target_dir}") + set(relative_build_path .) endif() # Setup PKG_CONFIG_PATH - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib/pkgconfig") - set(PKGCONFIG_INSTALLED_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig") + set(pkgconfig_installed_dir "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/pkgconfig") + set(pkgconfig_installed_share_dir "${CURRENT_INSTALLED_DIR}/share/pkgconfig") if(ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH_${_buildtype} $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") + set(backup_env_pkg_config_path_${current_buildtype} $ENV{PKG_CONFIG_PATH}) + set(ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}${VCPKG_HOST_PATH_SEPARATOR}${pkgconfig_installed_share_dir}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}") + set(ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}${VCPKG_HOST_PATH_SEPARATOR}${pkgconfig_installed_share_dir}") endif() # Setup environment - set(ENV{CPPFLAGS} "${CPPFLAGS_${_buildtype}}") - set(ENV{CFLAGS} "${CFLAGS_${_buildtype}}") - set(ENV{CXXFLAGS} "${CXXFLAGS_${_buildtype}}") - set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${_buildtype}}") - set(ENV{LDFLAGS} "${LDFLAGS_${_buildtype}}") + set(ENV{CPPFLAGS} "${CPPFLAGS_${current_buildtype}}") + set(ENV{CFLAGS} "${CFLAGS_${current_buildtype}}") + set(ENV{CXXFLAGS} "${CXXFLAGS_${current_buildtype}}") + set(ENV{RCFLAGS} "${VCPKG_DETECTED_CMAKE_RC_FLAGS_${current_buildtype}}") + set(ENV{LDFLAGS} "${LDFLAGS_${current_buildtype}}") # https://www.gnu.org/software/libtool/manual/html_node/Link-mode.html # -avoid-version is handled specially by libtool link mode, this flag is not forwarded to linker, @@ -783,76 +767,70 @@ function(vcpkg_configure_make) set(ENV{LDFLAGS} "-avoid-version $ENV{LDFLAGS}") endif() - if(LINK_ENV_${_buildtype}) - set(_LINK_CONFIG_BACKUP "$ENV{_LINK_}") - set(ENV{_LINK_} "${LINK_ENV_${_buildtype}}") + if(LINK_ENV_${current_buildtype}) + set(link_config_backup "$ENV{_LINK_}") + set(ENV{_LINK_} "${LINK_ENV_${current_buildtype}}") endif() set(ENV{PKG_CONFIG} "${PKGCONFIG}") - set(_lib_env_vars LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) - foreach(_lib_env_var IN LISTS _lib_env_vars) - set(_link_path) - if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib") - set(_link_path "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib") + vcpkg_list(APPEND lib_env_vars LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + foreach(lib_env_var IN LISTS lib_env_vars) + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib") endif() - if(EXISTS "${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib/manual-link") - if(_link_path) - set(_link_path "${_link_path}${VCPKG_HOST_PATH_SEPARATOR}") - endif() - set(_link_path "${_link_path}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/lib/manual-link") + if(EXISTS "${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/lib/manual-link") + vcpkg_host_path_list(PREPEND ENV{${lib_env_var}} "${CURRENT_INSTALLED_DIR}" "${path_suffix_${current_buildtype}}/lib/manual-link") endif() - set(ENV{${_lib_env_var}} "${_link_path}${${_lib_env_var}_PATHLIKE_CONCAT}") endforeach() - unset(_link_path) - unset(_lib_env_vars) + unset(lib_env_vars) - set(command "${base_cmd}" -c "${CONFIGURE_ENV} ./${RELATIVE_BUILD_PATH}/configure ${_csc_BUILD_TRIPLET} ${_csc_OPTIONS} ${_csc_OPTIONS_${_buildtype}}") + set(command "${base_cmd}" -c "${configure_env} ./${relative_build_path}/configure ${arg_BUILD_TRIPLET} ${arg_OPTIONS} ${arg_OPTIONS_${current_buildtype}}") - if(_csc_ADD_BIN_TO_PATH) - set(PATH_BACKUP $ENV{PATH}) - vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_buildtype}}/bin") + if(arg_ADD_BIN_TO_PATH) + set(path_backup $ENV{PATH}) + vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}${path_suffix_${current_buildtype}}/bin") endif() debug_message("Configure command:'${command}'") - if (NOT _csc_SKIP_CONFIGURE) - message(STATUS "Configuring ${TARGET_TRIPLET}-${SHORT_NAME_${_buildtype}}") + if (NOT arg_SKIP_CONFIGURE) + message(STATUS "Configuring ${TARGET_TRIPLET}-${short_name_${current_buildtype}}") vcpkg_execute_required_process( COMMAND ${command} - WORKING_DIRECTORY "${TAR_DIR}" - LOGNAME config-${TARGET_TRIPLET}-${SHORT_NAME_${_buildtype}} + WORKING_DIRECTORY "${target_dir}" + LOGNAME "config-${TARGET_TRIPLET}-${short_name_${current_buildtype}}" ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(GLOB_RECURSE LIBTOOL_FILES "${TAR_DIR}*/libtool") - foreach(lt_file IN LISTS LIBTOOL_FILES) + file(GLOB_RECURSE libtool_files "${target_dir}*/libtool") + foreach(lt_file IN LISTS libtool_files) file(READ "${lt_file}" _contents) string(REPLACE ".dll.lib" ".lib" _contents "${_contents}") file(WRITE "${lt_file}" "${_contents}") endforeach() endif() - if(EXISTS "${TAR_DIR}/config.log") - file(RENAME "${TAR_DIR}/config.log" "${CURRENT_BUILDTREES_DIR}/config.log-${TARGET_TRIPLET}-${SHORT_NAME_${_buildtype}}.log") + if(EXISTS "${target_dir}/config.log") + file(RENAME "${target_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/config.log-${TARGET_TRIPLET}-${short_name_${current_buildtype}}.log") endif() endif() - if(BACKUP_ENV_PKG_CONFIG_PATH_${_buildtype}) - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_${_buildtype}}") + if(backup_env_pkg_config_path_${current_buildtype}) + set(ENV{PKG_CONFIG_PATH} "${backup_env_pkg_config_path_${current_buildtype}}") else() unset(ENV{PKG_CONFIG_PATH}) endif() - unset(BACKUP_ENV_PKG_CONFIG_PATH_${_buildtype}) + unset(backup_env_pkg_config_path_${current_buildtype}) - if(_LINK_CONFIG_BACKUP) - set(ENV{_LINK_} "${_LINK_CONFIG_BACKUP}") - unset(_LINK_CONFIG_BACKUP) + if(link_config_backup) + set(ENV{_LINK_} "${link_config_backup}") + unset(link_config_backup) endif() - if(_csc_ADD_BIN_TO_PATH) - set(ENV{PATH} "${PATH_BACKUP}") + if(arg_ADD_BIN_TO_PATH) + set(ENV{PATH} "${path_backup}") endif() # Restore environment (config dependent) - foreach(ENV_VAR ${_csc_CONFIG_DEPENDENT_ENVIRONMENT}) - if(BACKUP_CONFIG_${ENV_VAR}) - set(ENV{${ENV_VAR}} "${BACKUP_CONFIG_${ENV_VAR}}") + foreach(ENV_VAR IN LISTS ${arg_CONFIG_DEPENDENT_ENVIRONMENT}) + if(backup_config_${ENV_VAR}) + set(ENV{${ENV_VAR}} "${backup_config_${ENV_VAR}}") else() unset(ENV{${ENV_VAR}}) endif() @@ -869,8 +847,8 @@ function(vcpkg_configure_make) endif() # Restore environment - _vcpkg_restore_env_variables(${_cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) + vcpkg_restore_env_variables(VARS ${cm_FLAGS} LIB LIBPATH LIBRARY_PATH LD_LIBRARY_PATH) - SET(_VCPKG_PROJECT_SOURCE_PATH ${_csc_SOURCE_PATH} PARENT_SCOPE) - set(_VCPKG_PROJECT_SUBPATH ${_csc_PROJECT_SUBPATH} PARENT_SCOPE) + set(_VCPKG_PROJECT_SOURCE_PATH ${arg_SOURCE_PATH} PARENT_SCOPE) + set(_VCPKG_PROJECT_SUBPATH ${arg_PROJECT_SUBPATH} PARENT_SCOPE) endfunction() diff --git a/scripts/cmake/vcpkg_install_make.cmake b/scripts/cmake/vcpkg_install_make.cmake index ce8a782d3c5953..f622edd406ad6b 100644 --- a/scripts/cmake/vcpkg_install_make.cmake +++ b/scripts/cmake/vcpkg_install_make.cmake @@ -23,5 +23,9 @@ This command transparently forwards to [`vcpkg_build_make()`](vcpkg_build_make.m #]===] function(vcpkg_install_make) - vcpkg_build_make(${ARGN} LOGFILE_ROOT ENABLE_INSTALL) + vcpkg_build_make( + ${ARGN} + LOGFILE_ROOT + ENABLE_INSTALL + ) endfunction() diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 914c47cae9c5b8..53ac2ac9991478 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -6,6 +6,7 @@ include("${SCRIPTS}/cmake/execute_process.cmake") include("${SCRIPTS}/cmake/vcpkg_acquire_msys.cmake") include("${SCRIPTS}/cmake/vcpkg_add_to_path.cmake") include("${SCRIPTS}/cmake/vcpkg_apply_patches.cmake") +include("${SCRIPTS}/cmake/vcpkg_backup_restore_env_vars.cmake") include("${SCRIPTS}/cmake/vcpkg_build_cmake.cmake") include("${SCRIPTS}/cmake/vcpkg_build_make.cmake") include("${SCRIPTS}/cmake/vcpkg_build_msbuild.cmake") diff --git a/versions/baseline.json b/versions/baseline.json index f334952134f54d..7f31dc2ca58bac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7122,7 +7122,7 @@ }, "x264": { "baseline": "157-303c484ec828ed0", - "port-version": 15 + "port-version": 16 }, "x265": { "baseline": "3.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index d129da3b53d5ad..7ca11279e98699 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8f14328cb425b2a7450bf36f731f97d41564fed", + "version-string": "157-303c484ec828ed0", + "port-version": 16 + }, { "git-tree": "e766671c5f64574235784ce45b1668daf4cb9b44", "version-string": "157-303c484ec828ed0", From 7f3be49f545b0df6d727590f168ee21fe76583a4 Mon Sep 17 00:00:00 2001 From: Yuriy O'Donnell <36282596+yuriy-odonnell-epic@users.noreply.github.com> Date: Wed, 20 Oct 2021 23:43:30 +0200 Subject: [PATCH 0867/1858] [cli11] update to 2.1.2 (#20847) --- ports/cli11/portfile.cmake | 4 ++-- ports/cli11/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cli11.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index b560b91a70ea90..716ebf4bff8138 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CLIUtils/CLI11 - REF v2.1.1 - SHA512 9bfd1c297422985171501b81f48bb89e2a3314ce86de930e06f1d0d580c9d31969d758dfc1435d1d5bb2ce957cd3c9bee9e433c9f6cc8ae8c24d05ac8841e3a9 + REF v2.1.2 + SHA512 3b21d015e046666d2e3df2b7cf1a6247c2daa26bf583e714dc1f0a94518785bf90993cd8530f88078b4daac02530dc517db0d5ad452d2a91521b3007f270ea55 HEAD_REF master ) diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json index ba2ea942f25a82..366eda769262a2 100644 --- a/ports/cli11/vcpkg.json +++ b/ports/cli11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cli11", - "version": "2.1.1", + "version": "2.1.2", "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", "homepage": "https://github.com/CLIUtils/CLI11", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7f31dc2ca58bac..577bb59f605f4a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1381,7 +1381,7 @@ "port-version": 0 }, "cli11": { - "baseline": "2.1.1", + "baseline": "2.1.2", "port-version": 0 }, "clickhouse-cpp": { diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json index 965b6891600f6e..8eddf8a49eb431 100644 --- a/versions/c-/cli11.json +++ b/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e17d430383dcb0eb48b08e57cb33503fc181c3b", + "version": "2.1.2", + "port-version": 0 + }, { "git-tree": "7110589331620372b824efe58e1c3eb5c89c41e7", "version": "2.1.1", From e28c1c47a62598f2d77dd0b719b25b2b1cb7d146 Mon Sep 17 00:00:00 2001 From: Dennis Date: Wed, 20 Oct 2021 23:45:31 +0200 Subject: [PATCH 0868/1858] [cpp-jwt] new port (#20634) * Add cpp-jwt * Update ports/cpp-jwt/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * overwrite cpp-jwt version * Update cpp-jwt which no longer requires to remove include/jwt/test * Use version-date in cpp-jwt port Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/cpp-jwt/portfile.cmake | 23 +++++++++++++++++++++++ ports/cpp-jwt/vcpkg.json | 18 ++++++++++++++++++ versions/baseline.json | 4 ++++ versions/c-/cpp-jwt.json | 9 +++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/cpp-jwt/portfile.cmake create mode 100644 ports/cpp-jwt/vcpkg.json create mode 100644 versions/c-/cpp-jwt.json diff --git a/ports/cpp-jwt/portfile.cmake b/ports/cpp-jwt/portfile.cmake new file mode 100644 index 00000000000000..148fbb395ddcb1 --- /dev/null +++ b/ports/cpp-jwt/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO arun11299/cpp-jwt + REF 0d662241daf54d8b9911bf8f54784bd2da5a3d19 + SHA512 06a508872f0920ed078b5f9250fe1d5011ad41773c4b8631d7c7947d9f9be4d5e24ca4a7d98c79eb8cd14118effa8893a862089bdc90af6d75031bbb9fc2ee5f + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCPP_JWT_BUILD_EXAMPLES=off + -DCPP_JWT_BUILD_TESTS=off + -DCPP_JWT_USE_VENDORED_NLOHMANN_JSON=off +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpp-jwt/vcpkg.json b/ports/cpp-jwt/vcpkg.json new file mode 100644 index 00000000000000..88e12684f66f12 --- /dev/null +++ b/ports/cpp-jwt/vcpkg.json @@ -0,0 +1,18 @@ +{ + "name": "cpp-jwt", + "version-date": "2021-10-18", + "description": "JSON Web Token library for C++", + "homepage": "https://github.com/arun11299/cpp-jwt", + "dependencies": [ + "nlohmann-json", + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 577bb59f605f4a..c3c0831a956f52 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1508,6 +1508,10 @@ "baseline": "1.0.0", "port-version": 0 }, + "cpp-jwt": { + "baseline": "2021-10-18", + "port-version": 0 + }, "cpp-netlib": { "baseline": "0.13.0", "port-version": 5 diff --git a/versions/c-/cpp-jwt.json b/versions/c-/cpp-jwt.json new file mode 100644 index 00000000000000..fa8158e8072b73 --- /dev/null +++ b/versions/c-/cpp-jwt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f72451ac7e5d62f249b02f79f6e3c9ef8720fc6b", + "version-date": "2021-10-18", + "port-version": 0 + } + ] +} From 7ea33d2b47f4e3c86c2a9d500f110985a870b6cf Mon Sep 17 00:00:00 2001 From: Pavel Curtis Date: Wed, 20 Oct 2021 14:48:11 -0700 Subject: [PATCH 0869/1858] Detours respects build type (#20776) * Fix detours port to respect VCPKG_BUILD_TYPE If the target triplet sets VCPKG_BUILD_TYPE, we can't assume that both '-rel' and 'dbg' build trees exist. * Bump the port version number. * Fix tree hash * Add requested double-quotes around file paths. * Update tree hash. Co-authored-by: Pavel Curtis --- ports/detours/portfile.cmake | 17 +++++++++++++---- ports/detours/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/d-/detours.json | 5 +++++ 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ports/detours/portfile.cmake b/ports/detours/portfile.cmake index 9b57b1326dda59..c09d61b7f84732 100644 --- a/ports/detours/portfile.cmake +++ b/ports/detours/portfile.cmake @@ -19,8 +19,17 @@ vcpkg_build_nmake( OPTIONS_DEBUG "DETOURS_CONFIG=Debug" ) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib.${VCPKG_TARGET_ARCHITECTURE}Release/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib.${VCPKG_TARGET_ARCHITECTURE}Debug/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/include DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME detours) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib.${VCPKG_TARGET_ARCHITECTURE}Release/" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib.${VCPKG_TARGET_ARCHITECTURE}Debug/" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME detours) +else() + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME detours) +endif() + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/detours/vcpkg.json b/ports/detours/vcpkg.json index 2813febbd9d93d..269215381c0937 100644 --- a/ports/detours/vcpkg.json +++ b/ports/detours/vcpkg.json @@ -1,7 +1,7 @@ { "name": "detours", "version-string": "4.0.1", - "port-version": 3, + "port-version": 4, "description": "Detours is a software package for monitoring and instrumenting API calls on Windows.", "homepage": "https://github.com/microsoft/Detours" } diff --git a/versions/baseline.json b/versions/baseline.json index c3c0831a956f52..8b3d44a539a1d9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1782,7 +1782,7 @@ }, "detours": { "baseline": "4.0.1", - "port-version": 3 + "port-version": 4 }, "devicenameresolver": { "baseline": "2016-06-26-0850d88fa6", diff --git a/versions/d-/detours.json b/versions/d-/detours.json index 4dafbf79116062..d5b7471a31a528 100644 --- a/versions/d-/detours.json +++ b/versions/d-/detours.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5399f9185e9e7d815bf3c8380e745b5be77c2258", + "version-string": "4.0.1", + "port-version": 4 + }, { "git-tree": "c2b285f4028fc968bc2b4b04f7c3be5a9070d9df", "version-string": "4.0.1", From 7ef219ec41b82a396673d21b5c7f96228b94a4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 21 Oct 2021 00:29:23 +0200 Subject: [PATCH 0870/1858] [libcanberra] Linux static .pc fix & other improvements (#20782) * [libcanberra] fix Linux static consumption * [libcanberra] add Debian patches * [libcanberra] make all backends features * [libcanberra] bump port version * [libcanberra] update versions --- ports/libcanberra/03_onlyshowin_unity.patch | 19 +++++ ports/libcanberra/gtk_dont_assume_x11.patch | 70 +++++++++++++++++++ ...{macos_pkgconfig.patch => pkgconfig.patch} | 0 ports/libcanberra/portfile.cmake | 36 ++++++++-- ports/libcanberra/undefined_reference.diff | 40 +++++++++++ ports/libcanberra/vcpkg.json | 45 +++++++++++- versions/baseline.json | 2 +- versions/l-/libcanberra.json | 5 ++ 8 files changed, 209 insertions(+), 8 deletions(-) create mode 100644 ports/libcanberra/03_onlyshowin_unity.patch create mode 100644 ports/libcanberra/gtk_dont_assume_x11.patch rename ports/libcanberra/{macos_pkgconfig.patch => pkgconfig.patch} (100%) create mode 100644 ports/libcanberra/undefined_reference.diff diff --git a/ports/libcanberra/03_onlyshowin_unity.patch b/ports/libcanberra/03_onlyshowin_unity.patch new file mode 100644 index 00000000000000..6e33ee1e5a015e --- /dev/null +++ b/ports/libcanberra/03_onlyshowin_unity.patch @@ -0,0 +1,19 @@ +Description: Play login sound in Unity too + if it's enabled (it's disabled by default in Ubuntu) +Author: Michael Terry +Bug-Ubuntu: https://launchpad.net/bugs/803519 +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=38883 + +Index: libcanberra/src/libcanberra-login-sound.desktop.in +=================================================================== +--- libcanberra.orig/src/libcanberra-login-sound.desktop.in 2011-07-01 15:02:59.870772598 +0100 ++++ libcanberra/src/libcanberra-login-sound.desktop.in 2011-07-01 15:03:03.554772637 +0100 +@@ -3,7 +3,7 @@ + Name=GNOME Login Sound + Comment=Plays a sound whenever you log in + Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login" +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;Unity; + AutostartCondition=GSettings org.gnome.desktop.sound event-sounds + X-GNOME-Autostart-Phase=Application + X-GNOME-Provides=login-sound diff --git a/ports/libcanberra/gtk_dont_assume_x11.patch b/ports/libcanberra/gtk_dont_assume_x11.patch new file mode 100644 index 00000000000000..efbc15367724bb --- /dev/null +++ b/ports/libcanberra/gtk_dont_assume_x11.patch @@ -0,0 +1,70 @@ +From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001 +From: Michael Meeks +Date: Fri, 9 Nov 2012 16:16:40 +0000 +Subject: gtk: Don't assume all GdkDisplays are GdkX11Displays: + broadway/wayland + +--- + src/canberra-gtk-module.c | 15 +++++++++++++++ + src/canberra-gtk.c | 5 +++++ + 2 files changed, 20 insertions(+) + +diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c +index 67791f0..c1532ab 100644 +--- a/src/canberra-gtk-module.c ++++ b/src/canberra-gtk-module.c +@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDisplay *d) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisplay *d, GdkWindow *w) { + gboolean ret = FALSE; + Atom xembed; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return FALSE; ++#endif ++ + /* Gnome Panel applets are XEMBED windows. We need to make sure we + * ignore them */ + +diff --git a/src/canberra-gtk.c b/src/canberra-gtk.c +index 34446f5..08cb668 100644 +--- a/src/canberra-gtk.c ++++ b/src/canberra-gtk.c +@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDisplay *d, GdkWindow *w) { + guchar *data = NULL; + gint ret = -1; + ++#ifdef GDK_IS_X11_DISPLAY ++ if (!GDK_IS_X11_DISPLAY(d)) ++ return 0; ++#endif ++ + if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w), + gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"), + 0, G_MAXLONG, False, XA_CARDINAL, &type_return, +-- +cgit v0.12 + diff --git a/ports/libcanberra/macos_pkgconfig.patch b/ports/libcanberra/pkgconfig.patch similarity index 100% rename from ports/libcanberra/macos_pkgconfig.patch rename to ports/libcanberra/pkgconfig.patch diff --git a/ports/libcanberra/portfile.cmake b/ports/libcanberra/portfile.cmake index 49095e63a30fa0..6fa7f3221bc188 100644 --- a/ports/libcanberra/portfile.cmake +++ b/ports/libcanberra/portfile.cmake @@ -1,9 +1,14 @@ vcpkg_fail_port_install(ON_TARGET "Windows" "UWP") set(VERSION 0.30) -set(PATCHES) +set(PATCHES + pkgconfig.patch + undefined_reference.diff # https://sources.debian.org/patches/libcanberra/0.30-7/ + gtk_dont_assume_x11.patch # likewise + 03_onlyshowin_unity.patch # likewise +) if(VCPKG_TARGET_IS_OSX) - list(APPEND PATCHES macos_fix.patch macos_pkgconfig.patch) + list(APPEND PATCHES macos_fix.patch) endif() if(VCPKG_TARGET_IS_OSX) @@ -40,8 +45,27 @@ if(VCPKG_TARGET_IS_OSX) set(CFLAGS_PRIVATE "-I${BREW_LIBTOOL_PATH}/include") set(EXTRA_LDFLAGS "LDFLAGS=${LIBS_PRIVATE}") set(EXTRA_CPPFLAGS "CPPFLAGS=${CFLAGS_PRIVATE}") +else() + set(LIBS_PRIVATE "-lltdl") endif() +if (NOT "alsa" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-alsa") +endif() +if (NOT "gstreamer" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-gstreamer") +endif() +if (NOT "null" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-null") +endif() +if (NOT "oss" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-oss") +endif() +if (NOT "pulse" IN_LIST FEATURES) + list(APPEND FEATURES_BACKENDS "--disable-pulse") +endif() + + set(ENV{GTKDOCIZE} true) vcpkg_configure_make( AUTOCONFIG @@ -50,16 +74,16 @@ vcpkg_configure_make( --disable-gtk-doc --disable-lynx --disable-silent-rules + --disable-tdb + ${FEATURES_BACKENDS} ${EXTRA_CPPFLAGS} ${EXTRA_LDFLAGS} ) vcpkg_install_make() -if(VCPKG_TARGET_IS_OSX) - configure_file("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY) - configure_file("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) -endif() +configure_file("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${PORT}.pc" @ONLY) +configure_file("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${PORT}.pc" @ONLY) vcpkg_fixup_pkgconfig() diff --git a/ports/libcanberra/undefined_reference.diff b/ports/libcanberra/undefined_reference.diff new file mode 100644 index 00000000000000..138fc19fc74f62 --- /dev/null +++ b/ports/libcanberra/undefined_reference.diff @@ -0,0 +1,40 @@ +Description: Fix FTBFS with binutils-gold +Author: Bart Martens +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=555081 + +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -341,6 +341,7 @@ libcanberra_gtk3_la_CFLAGS = \ + $(GTK3_CFLAGS) + libcanberra_gtk3_la_LIBADD = \ + $(GTK3_LIBS) \ ++ -lX11 \ + libcanberra.la + libcanberra_gtk3_la_LDFLAGS = \ + -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO) +@@ -351,6 +352,8 @@ libcanberra_gtk3_module_la_CFLAGS = \ + $(GTK3_CFLAGS) + libcanberra_gtk3_module_la_LIBADD = \ + $(GTK3_LIBS) \ ++ -lX11 \ ++ -lgmodule-2.0 \ + libcanberra.la \ + libcanberra-gtk3.la + libcanberra_gtk3_module_la_LDFLAGS = \ +@@ -379,6 +382,7 @@ libcanberra_gtk_la_CFLAGS = \ + $(GTK_CFLAGS) + libcanberra_gtk_la_LIBADD = \ + $(GTK_LIBS) \ ++ -lX11 \ + libcanberra.la + libcanberra_gtk_la_LDFLAGS = \ + -export-dynamic -version-info $(LIBCANBERRA_GTK_VERSION_INFO) +@@ -389,6 +393,8 @@ libcanberra_gtk_module_la_CFLAGS = \ + $(GTK_CFLAGS) + libcanberra_gtk_module_la_LIBADD = \ + $(GTK_LIBS) \ ++ -lX11 \ ++ -lgmodule-2.0 \ + libcanberra.la \ + libcanberra-gtk.la + libcanberra_gtk_module_la_LDFLAGS = \ diff --git a/ports/libcanberra/vcpkg.json b/ports/libcanberra/vcpkg.json index 1e914c1429a385..7ddde042164511 100644 --- a/ports/libcanberra/vcpkg.json +++ b/ports/libcanberra/vcpkg.json @@ -1,10 +1,53 @@ { "name": "libcanberra", "version": "0.30", + "port-version": 1, "description": "An implementation of the XDG Sound Theme and Name Specifications, for generating event sounds on free desktops", "homepage": "http://0pointer.de/lennart/projects/libcanberra/", "supports": "!(windows | uwp)", "dependencies": [ "libvorbis" - ] + ], + "default-features": [ + "defaults" + ], + "features": { + "alsa": { + "description": "Enable optional ALSA support" + }, + "defaults": { + "description": "Default features", + "dependencies": [ + { + "name": "libcanberra", + "features": [ + "null" + ], + "platform": "osx" + }, + { + "name": "libcanberra", + "features": [ + "alsa" + ], + "platform": "linux" + } + ] + }, + "gstreamer": { + "description": "Enable optional GStreamer support", + "dependencies": [ + "gstreamer" + ] + }, + "null": { + "description": "Enable optional null output" + }, + "oss": { + "description": "Enable optional OSS support" + }, + "pulse": { + "description": "Enable optional PulseAudio support" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 8b3d44a539a1d9..366e0e2bace79b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3286,7 +3286,7 @@ }, "libcanberra": { "baseline": "0.30", - "port-version": 0 + "port-version": 1 }, "libcbor": { "baseline": "0.8.0", diff --git a/versions/l-/libcanberra.json b/versions/l-/libcanberra.json index 8a3cc523c62d9f..6a3eb68e9469d8 100644 --- a/versions/l-/libcanberra.json +++ b/versions/l-/libcanberra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18398f54e696bb43cf68dc7efc3e32304487057e", + "version": "0.30", + "port-version": 1 + }, { "git-tree": "9332e8b3945451a2776337d41c54c7200d187a28", "version": "0.30", From b4045db9d665609a87ff262e165f0e34d49748c1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 21 Oct 2021 06:57:13 +0200 Subject: [PATCH 0871/1858] [gdal] Workaround for `vcpkg clean` issue (#20890) * Remove autotest source dir * Update versions --- ports/gdal/portfile.cmake | 2 ++ ports/gdal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 0698defb224704..5ccf4e8e61072d 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -20,6 +20,8 @@ vcpkg_from_github( HEAD_REF master PATCHES ${GDAL_PATCHES} ) +# `vcpkg clean` stumbles over one subdir +file(REMOVE_RECURSE "${SOURCE_PATH}/autotest") if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(NATIVE_DATA_DIR "${CURRENT_PACKAGES_DIR}/share/gdal") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 6de8a75b5aafeb..00706b7676a181 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.3.2", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index 366e0e2bace79b..9538fea24cb181 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2338,7 +2338,7 @@ }, "gdal": { "baseline": "3.3.2", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 32c90ed3d24836..af74f9006bc504 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e90412cd51170a5ea63a0067005bb3afc3c6c36", + "version-semver": "3.3.2", + "port-version": 1 + }, { "git-tree": "bcc73ebd09ec91402d610074046785d7432f99fa", "version-semver": "3.3.2", From 1ff504f544c217870c58bea137181a2b90b1d5e1 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 20 Oct 2021 22:51:29 -0700 Subject: [PATCH 0872/1858] [ci] Attempt to make CI more reliable by using robocopy to delete (#20889) --- scripts/azure-pipelines/test-modified-ports.ps1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index a972c461152ecd..faebe4522e5e7e 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -116,6 +116,15 @@ $xmlFile = Join-Path $xmlResults "$Triplet.xml" $failureLogs = Join-Path $ArtifactStagingDirectory 'failure-logs' +if ($IsWindows) +{ + mkdir empty + cmd /c "robocopy.exe empty `"$buildtreesRoot`" /MIR /NFL /NDL /NC /NP > nul" + cmd /c "robocopy.exe empty `"$packagesRoot`" /MIR /NFL /NDL /NC /NP > nul" + cmd /c "robocopy.exe empty `"$installRoot`" /MIR /NFL /NDL /NC /NP > nul" + rmdir empty +} + & "./vcpkg$executableExtension" x-ci-clean @commonArgs if ($LASTEXITCODE -ne 0) { From 878cf71eac51b30df0b2a8e3256acbe34ceaeeab Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 07:34:37 +0200 Subject: [PATCH 0873/1858] [brunocodutra-metal] Update to 2.1.3 (#20914) * Update brunocodutra-metal to 2.1.3 * Update CI baseline Co-authored-by: chausner --- ports/brunocodutra-metal/portfile.cmake | 20 +++++++++----------- ports/brunocodutra-metal/vcpkg.json | 15 ++++++++++++--- versions/b-/brunocodutra-metal.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ports/brunocodutra-metal/portfile.cmake b/ports/brunocodutra-metal/portfile.cmake index 92aa6d20446551..8e43dca25a8e03 100644 --- a/ports/brunocodutra-metal/portfile.cmake +++ b/ports/brunocodutra-metal/portfile.cmake @@ -3,24 +3,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO brunocodutra/metal - REF 43256d2c7f5715d9dc029037bcd8512624ec7865 # v2.1.1 - SHA512 fc69e60b9c21d0215ca2c9ec27ab65d59115397e1d27c90fcdc35ccf8675546b1fbc3be0e6b8f69cd8eb848bac348ca0fe116f50a36ce8d1cbff0d646c4f05cb + REF 2.1.3 + SHA512 7a71f8bdbdb8a19084d0cabd4c78a4f2990514f2da56312aec8dfac02f6781c95f28bc33815ecbb3d9e3e8d2b47cc5dbcd4917751195a8318bea7c08fca29b23 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( + PACKAGE_NAME Metal CONFIG_PATH lib/cmake/Metal - TARGET_PATH share/metal ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -# Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/brunocodutra-metal/vcpkg.json b/ports/brunocodutra-metal/vcpkg.json index a4934eb54350a7..b2d73955d64953 100644 --- a/ports/brunocodutra-metal/vcpkg.json +++ b/ports/brunocodutra-metal/vcpkg.json @@ -1,6 +1,15 @@ { "name": "brunocodutra-metal", - "version-string": "2.1.1", - "port-version": 1, - "description": "A single header C++11 library designed to make you love template metaprogramming" + "version": "2.1.3", + "description": "A single header C++11 library designed to make you love template metaprogramming", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/brunocodutra-metal.json b/versions/b-/brunocodutra-metal.json index 8a1c75580ce790..49c93e2f2f7e58 100644 --- a/versions/b-/brunocodutra-metal.json +++ b/versions/b-/brunocodutra-metal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54b5610e8e1541618650eec938a77148866716cc", + "version": "2.1.3", + "port-version": 0 + }, { "git-tree": "0fbaac9587c177beb827afa12d74cd40005cc20a", "version-string": "2.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 9538fea24cb181..1b69af3161b289 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1141,8 +1141,8 @@ "port-version": 2 }, "brunocodutra-metal": { - "baseline": "2.1.1", - "port-version": 1 + "baseline": "2.1.3", + "port-version": 0 }, "brynet": { "baseline": "1.11.0", From c1360d5e146ffe76c505bc71424c8c5aabaa744f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 07:36:39 +0200 Subject: [PATCH 0874/1858] [sassc] Update to 3.6.2 (#20913) * Update sassc to 3.6.2 * Update CI baseline Co-authored-by: chausner --- ports/sassc/portfile.cmake | 6 +++--- ports/sassc/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/s-/sassc.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/sassc/portfile.cmake b/ports/sassc/portfile.cmake index 764873d043e629..45982e835bdca1 100644 --- a/ports/sassc/portfile.cmake +++ b/ports/sassc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sass/sassc - REF 46748216ba0b60545e814c07846ca10c9fefc5b6 # 3.6.1 - SHA512 98c5943ec485251fd5e3f41bcfe80dbbc6e2f334d4b6947895d3821b30009c40fb7cb944403304cede70360a5dd0ac103262644ef37a56e0fa76163657fbcc32 + REF 3.6.2 + SHA512 fff3995ce8608bdaed5f4f1352ae4f1f882de58663b932c598d6168df421e4dbf907ec0f8caebb1e56490a71ca11105726f291b475816dd53e705bc53121969f HEAD_REF master PATCHES remove_compiler_flags.patch ) @@ -13,7 +13,7 @@ if(VCPKG_TARGET_IS_WINDOWS) set(ENV{LIBS} "$ENV{LIBS} -lgetopt") endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS --with-libsass-include='${CURRENT_INSTALLED_DIR}/include' diff --git a/ports/sassc/vcpkg.json b/ports/sassc/vcpkg.json index 8b89777bc1c1df..84158ee4df63c5 100644 --- a/ports/sassc/vcpkg.json +++ b/ports/sassc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "sassc", - "version-string": "3.6.1", - "port-version": 1, + "version": "3.6.2", "description": "SassC is a wrapper around libsass (http://github.com/sass/libsass) used to generate a useful command-line application that can be installed and packaged for several operating systems.", "homepage": "https://github.com/sass/sassc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1b69af3161b289..3c88ff0c8a3438 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6013,8 +6013,8 @@ "port-version": 1 }, "sassc": { - "baseline": "3.6.1", - "port-version": 1 + "baseline": "3.6.2", + "port-version": 0 }, "sbp": { "baseline": "3.4.10", diff --git a/versions/s-/sassc.json b/versions/s-/sassc.json index f407f5dc18b578..b72f7981a8d15e 100644 --- a/versions/s-/sassc.json +++ b/versions/s-/sassc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ac068d38115fa4710289d76d3a02a1b6c2650785", + "version": "3.6.2", + "port-version": 0 + }, { "git-tree": "f0ba14a2c2014c843031b0c442627fce5710003b", "version-string": "3.6.1", From 3b7a2729d5b17876291ea5e8a406a17df3d8fd95 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 07:37:40 +0200 Subject: [PATCH 0875/1858] [string-view-lite] Update to 1.6.0 (#20912) * Update string-view-lite to 1.6.0 * Update CI baseline Co-authored-by: chausner --- ports/string-view-lite/portfile.cmake | 21 ++++++++++----------- ports/string-view-lite/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/s-/string-view-lite.json | 5 +++++ 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ports/string-view-lite/portfile.cmake b/ports/string-view-lite/portfile.cmake index 95e18d68a0ff01..007185ffbf868b 100644 --- a/ports/string-view-lite/portfile.cmake +++ b/ports/string-view-lite/portfile.cmake @@ -1,29 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/string-view-lite - REF v1.3.0 - SHA512 52fb76198249ade5352d95af4a4e305b3e22b464a5d0a702e4b2228b1ca30df98b90bb01d5bfd16ae6ebb7bab5aecac5bd4a867898c362e82e57c2aaf938e07a + REF v1.6.0 + SHA512 a21c4c956360b76cf6f530ae7c26d97777d4c37164e6fc0da0dc931d41378aa020a235e40d7f8e8160c1b9dab552c6d7bf3aa7697e9048effef2b3cee8573553 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSTRING_VIEW_LITE_OPT_BUILD_TESTS=OFF -DSTRING_VIEW_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/string-view-lite/vcpkg.json b/ports/string-view-lite/vcpkg.json index 1e15f0164572c8..1d1bfc18f19c3a 100644 --- a/ports/string-view-lite/vcpkg.json +++ b/ports/string-view-lite/vcpkg.json @@ -1,6 +1,15 @@ { "name": "string-view-lite", - "version-string": "1.3.0", - "port-version": 1, - "description": "A C++17-like string_view for C++98, C++11 and later in a single-file header-only library" + "version": "1.6.0", + "description": "A C++17-like string_view for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 3c88ff0c8a3438..bf76668ace15f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6457,8 +6457,8 @@ "port-version": 1 }, "string-view-lite": { - "baseline": "1.3.0", - "port-version": 1 + "baseline": "1.6.0", + "port-version": 0 }, "strtk": { "baseline": "2020-09-14", diff --git a/versions/s-/string-view-lite.json b/versions/s-/string-view-lite.json index 8a706e55df7d6d..8b2a2439030060 100644 --- a/versions/s-/string-view-lite.json +++ b/versions/s-/string-view-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48fa93dc01e7035c62d200c96fbe6d6d28a3c6fb", + "version": "1.6.0", + "port-version": 0 + }, { "git-tree": "ca0acc44ac920ca460f95c75da6b05c2fa92447c", "version-string": "1.3.0", From a45e90f643fb2e964e51150090d279cf83d505d9 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 07:38:46 +0200 Subject: [PATCH 0876/1858] [variant-lite] Update to 2.0.0 (#20911) * Update variant-lite to 2.0.0 * Update CI baseline Co-authored-by: chausner --- ports/variant-lite/portfile.cmake | 21 ++++++++++----------- ports/variant-lite/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/v-/variant-lite.json | 5 +++++ 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ports/variant-lite/portfile.cmake b/ports/variant-lite/portfile.cmake index 0bb4fc48df9b19..eb312453297875 100644 --- a/ports/variant-lite/portfile.cmake +++ b/ports/variant-lite/portfile.cmake @@ -1,29 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/variant-lite - REF v1.2.2 - SHA512 f0a0760b858d5fdd3cbd6be29e64fdca69222c4e3f6f4f856fa99e7352ede817648c6d698ebde25dec10bf99fc304b1b5ce232c5ffd4fab12aaf444b68c04f02 + REF v2.0.0 + SHA512 dd255d3664b42305e58c14a0bfc7d6ba54462656001e4e79c14fdb64a6f54b57a00ec3cf10d006614c849528529c6897031df4b52a49ecb91531e89d366d6a9c ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DVARIANT_LITE_OPT_BUILD_TESTS=OFF -DVARIANT_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} +vcpkg_cmake_config_fixup( + CONFIG_PATH "lib/cmake/${PORT}" ) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright + "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/variant-lite/vcpkg.json b/ports/variant-lite/vcpkg.json index ad3bad903a56ae..a4fe1183861a5b 100644 --- a/ports/variant-lite/vcpkg.json +++ b/ports/variant-lite/vcpkg.json @@ -1,6 +1,15 @@ { "name": "variant-lite", - "version-string": "1.2.2", - "port-version": 1, - "description": "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library" + "version": "2.0.0", + "description": "A C++17-like variant, a type-safe union for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index bf76668ace15f0..e5c2deeed92ec3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6937,8 +6937,8 @@ "port-version": 1 }, "variant-lite": { - "baseline": "1.2.2", - "port-version": 1 + "baseline": "2.0.0", + "port-version": 0 }, "vc": { "baseline": "1.4.2", diff --git a/versions/v-/variant-lite.json b/versions/v-/variant-lite.json index b77ba2b9690003..759a3b0f3bc05c 100644 --- a/versions/v-/variant-lite.json +++ b/versions/v-/variant-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "827279cee8fcc1e2cfc6fd195ebf523cba2917c5", + "version": "2.0.0", + "port-version": 0 + }, { "git-tree": "a932d3f3a9d2390536663cefe804b881408cef11", "version-string": "1.2.2", From f7c73994b174afe6a7ab8b56239a00dbeaabc9fb Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 07:40:07 +0200 Subject: [PATCH 0877/1858] [type-safe] Update to 0.2.2 (#20906) * Update type-safe to 0.2.2 * Update CI baseline Co-authored-by: chausner --- ports/type-safe/disable_tests.patch | 12 ------------ ports/type-safe/portfile.cmake | 21 +++++++++------------ ports/type-safe/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/t-/type-safe.json | 5 +++++ 5 files changed, 25 insertions(+), 27 deletions(-) delete mode 100644 ports/type-safe/disable_tests.patch diff --git a/ports/type-safe/disable_tests.patch b/ports/type-safe/disable_tests.patch deleted file mode 100644 index f18d2ebbfaa2a1..00000000000000 --- a/ports/type-safe/disable_tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -136,7 +136,7 @@ - # other subdirectories - # only add if not inside add_subdirectory() - option(TYPE_SAFE_BUILD_TEST_EXAMPLE "build test and example" OFF) --if(${TYPE_SAFE_BUILD_TEST_EXAMPLE} OR (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)) -+if(${TYPE_SAFE_BUILD_TEST_EXAMPLE}) - enable_testing() - add_subdirectory(example/) - add_subdirectory(test/) diff --git a/ports/type-safe/portfile.cmake b/ports/type-safe/portfile.cmake index 8930f3f9247288..025cc3973d6b37 100644 --- a/ports/type-safe/portfile.cmake +++ b/ports/type-safe/portfile.cmake @@ -1,26 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO foonathan/type_safe - REF da1d15abc612afbdc81d70c817b49ba1752177de - SHA512 5b344af89378e34f05d96bff2de61615bc16e21601d9fe9d0886c71db211bd3b42afb2467dd2eb7f3d11176dc9adc2d71c6dc0b60722e12aaf8c1d79ea869289 - HEAD_REF v0.2.1 - PATCHES - disable_tests.patch + REF v0.2.2 + SHA512 5dbc9e906e066cfc5eb8fd9a308e952e33c7463b5d2abaadd4303ebe8c38a1d8e79865076ad6422f4c56ffa23113b291e3c11d6dd28e73ec3d6fe2e3e7a233a3 + HEAD_REF main ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTYPE_SAFE_BUILD_TEST_EXAMPLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/type_safe TARGET_PATH share/type_safe) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/type_safe) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/type-safe/vcpkg.json b/ports/type-safe/vcpkg.json index 3b16d3c7b101eb..175055c131aebc 100644 --- a/ports/type-safe/vcpkg.json +++ b/ports/type-safe/vcpkg.json @@ -1,9 +1,17 @@ { "name": "type-safe", - "version-string": "0.2.1", + "version": "0.2.2", "description": "Zero overhead abstractions that use the C++ type system to prevent bugs.", "homepage": "https://github.com/foonathan/type_safe", "dependencies": [ - "debug-assert" + "debug-assert", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index e5c2deeed92ec3..563a0bf6e55e15 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6805,7 +6805,7 @@ "port-version": 1 }, "type-safe": { - "baseline": "0.2.1", + "baseline": "0.2.2", "port-version": 0 }, "uchardet": { diff --git a/versions/t-/type-safe.json b/versions/t-/type-safe.json index 086a78c3a4f9b7..56d1b800351d8f 100644 --- a/versions/t-/type-safe.json +++ b/versions/t-/type-safe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c46af3efa54c55f23076777fb7c276886f1dd1ce", + "version": "0.2.2", + "port-version": 0 + }, { "git-tree": "b8a081a46706947bbef195669f57707aa2a9d393", "version-string": "0.2.1", From bcf4a059280d0c079c70a80cb3b25787f9dc102f Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Thu, 21 Oct 2021 22:43:44 -0700 Subject: [PATCH 0878/1858] [boost-modular-build-helper] Add quotes to path (#20896) --- ports/boost-modular-build-helper/CMakeLists.txt | 4 ++-- ports/boost-modular-build-helper/vcpkg.json | 2 +- scripts/boost/generate-ports.ps1 | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt index f4a0f90530dcdb..efddc5c9149d1a 100644 --- a/ports/boost-modular-build-helper/CMakeLists.txt +++ b/ports/boost-modular-build-helper/CMakeLists.txt @@ -275,11 +275,11 @@ add_custom_target(boost ALL set(SUBDIR ${CMAKE_CURRENT_BINARY_DIR}/stage/lib) install( CODE " -file(GLOB LIBS ${SUBDIR}/*.so.* ${SUBDIR}/*.so ${SUBDIR}/*.a ${SUBDIR}/*.dylib ${SUBDIR}/*.dylib.* ${SUBDIR}/*.lib) +file(GLOB LIBS \"${SUBDIR}/*.so.*\" \"${SUBDIR}/*.so\" \"${SUBDIR}/*.a\" \"${SUBDIR}/*.dylib\" \"${SUBDIR}/*.dylib.*\" \"${SUBDIR}/*.lib\") if(LIBS) file(INSTALL \${LIBS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/lib\") endif() -file(GLOB DLLS ${SUBDIR}/*.dll) +file(GLOB DLLS \"${SUBDIR}/*.dll\") if(DLLS) file(INSTALL \${DLLS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/bin\") endif() diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index 71d528590f78c7..fa9a03db290b9f 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 2, + "port-version": 3, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 361480f040a9bf..3e9ec8f6b963de 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -28,7 +28,7 @@ $portVersions = @{ "boost-config" = 2; "boost-gil" = 1; "boost-iostreams" = 1; - "boost-modular-build-helper" = 2; + "boost-modular-build-helper" = 3; "boost-odeint" = 1; "boost-python" = 1; "boost-process" = 2; diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 7985f1f490d835..0a0fcb81bfd25e 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cc6728723151712d8007e882bc2ad9a4649b2cf", + "version": "1.77.0", + "port-version": 3 + }, { "git-tree": "9795fd3f465461fea28201a773909b6fd0e3400b", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index 563a0bf6e55e15..2312fbcb0c64df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -814,7 +814,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 2 + "port-version": 3 }, "boost-move": { "baseline": "1.77.0", From ceb5ae44bed6523b9ba40f526aa65bdfcd0f495f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 22 Oct 2021 07:44:17 +0200 Subject: [PATCH 0879/1858] [proj4] Install pc file (#20458) * Install pc file * Update versions * Export windows debug lib postfix * Don't use VCPKG_SYSTEM_LIBRARIES * Update versions --- ports/proj4/portfile.cmake | 44 +++++++++++++++++++++++++++++++++++++- ports/proj4/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/proj4.json | 5 +++++ 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 73a458e84fcf62..7933cf711939af 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,7 +1,8 @@ +set(VERSION 7.2.1) # Variable used for pc file vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ - REF 7.2.1 + REF "${VERSION}" SHA512 e6e77266dcd70c939c16667c916cccab8de161221d2ef600cfca43382f50da2dc8d790561556b4416adbb4ac6fba939004e0cc936c278e0e808dc3566e9a70d4 HEAD_REF master PATCHES @@ -63,5 +64,46 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() +set(PACKAGE "${PORT}") +set(requires_private "sqlite3") +if(ENABLE_CURL) + string(APPEND requires_private " libcurl") +endif() +if(ENABLE_TIFF) + string(APPEND requires_private " libtiff-4") +endif() +set(libs_private "") +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + string(APPEND libs_private " -lole32 -lshell32") +elseif(VCPKG_TARGET_IS_OSX) + string(APPEND libs_private " -lc++ -lm") +else() + string(APPEND libs_private " -lstdc++ -lm") +endif() +set(libdir [[${prefix}/lib]]) +set(exec_prefix [[${prefix}]]) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(datarootdir [[${prefix}/share]]) + set(datadir [[${prefix}/share]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/proj.pc") + configure_file("${SOURCE_PATH}/proj.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" "Requires:" "Requires.private: ${requires_private}") + vcpkg_replace_string("${outfile}" " -lstdc++" "${libs_private}") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(datarootdir [[${prefix}/../share]]) + set(datadir [[${prefix}/../share]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/proj.pc") + configure_file("${SOURCE_PATH}/proj.pc.in" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" "Requires:" "Requires.private: ${requires_private}") + vcpkg_replace_string("${outfile}" " -lstdc++" "${libs_private}") + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${outfile}" " -lproj" " -lproj_d") + endif() +endif() +vcpkg_fixup_pkgconfig() + file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 2f497276326d99..9aed018aa871bd 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proj4", "version-semver": "7.2.1", - "port-version": 6, + "port-version": 7, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 2312fbcb0c64df..04121c2cfc6876 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5302,7 +5302,7 @@ }, "proj4": { "baseline": "7.2.1", - "port-version": 6 + "port-version": 7 }, "prometheus-cpp": { "baseline": "0.13.0", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index 43d8f699e25857..da6bb80887ba84 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "991dc069b2b9acb50da346e27f48100d5d8f8186", + "version-semver": "7.2.1", + "port-version": 7 + }, { "git-tree": "a7d82e5f8d67636114f179f44b7277f818e3754c", "version-semver": "7.2.1", From dd02666b6ed8bff22c2b0b0e6b91286ceb89791b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 22 Oct 2021 07:51:06 +0200 Subject: [PATCH 0880/1858] [libopensp] new port (#20391) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [libopensp] initial port * [libopensp] update versions * [libopensp] fix license file location * [libopensp] update versions * [libopensp] need autopoint on Windows * [libopensp] update versions * [libopensp] also remove debug/include * [libopensp] use KDE's CMakeLists on Windows * [libopensp] remove /bin for static builds * [libopensp] update versions * [libopensp] fix Windows/UWP condition * [libopensp] update versions * [libopensp] align *Nix functionality with Windows * [libopensp] update versions * [libopensp] fix compilation on arm64-osx * [libopensp] update versions * [libopensp] fix getenv failures on UWP * [libopensp] update versions * [libopensp] add comment on LDFLAGS usage * [libopensp] update versions * [libopensp] reduce patch size * [libopensp] update versions * [libopensp] further reduce patch size * [libopensp] update versions * [libopensp] don't overwrite vcpkg's own LDFLAGS * [libopensp] backport Debian patch with several fixes * [libopensp] update versions * [libopensp] fix library name on Windows * [libopensp] update versions * [libopensp] don't force shared lib on Windows * [libopensp] update versions * [libopensp] reduce Debian patch size * [libopensp] update versions * [libopensp] UWP in platform definition is redundant Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [libopensp] update versions Co-authored-by: Billy Robert O'Neal III Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/libopensp/opensp_1.5.2-13.diff | 37 ++++++ ports/libopensp/portfile.cmake | 56 +++++++++ ports/libopensp/uwp_getenv_fix.diff | 13 +++ ports/libopensp/vcpkg.json | 22 ++++ ports/libopensp/windows_cmake_build.diff | 142 +++++++++++++++++++++++ versions/baseline.json | 4 + versions/l-/libopensp.json | 9 ++ 7 files changed, 283 insertions(+) create mode 100644 ports/libopensp/opensp_1.5.2-13.diff create mode 100644 ports/libopensp/portfile.cmake create mode 100644 ports/libopensp/uwp_getenv_fix.diff create mode 100644 ports/libopensp/vcpkg.json create mode 100644 ports/libopensp/windows_cmake_build.diff create mode 100644 versions/l-/libopensp.json diff --git a/ports/libopensp/opensp_1.5.2-13.diff b/ports/libopensp/opensp_1.5.2-13.diff new file mode 100644 index 00000000000000..92781232fd4861 --- /dev/null +++ b/ports/libopensp/opensp_1.5.2-13.diff @@ -0,0 +1,37 @@ +--- opensp-1.5.2.orig/sx/XmlOutputEventHandler.cxx ++++ opensp-1.5.2/sx/XmlOutputEventHandler.cxx +@@ -1199,12 +1199,22 @@ + // Check to make sure we haven't passed outside of the + // output directory + char *dirs = strdup (filePath); ++#ifdef MAXPATHLEN + char realDirs[MAXPATHLEN]; + char realOutputDir[MAXPATHLEN]; ++#else ++ char *realDirs; ++ char *realOutputDir; ++#endif + char *outputDir = strdup(outputDir_); + ++#ifdef MAXPATHLEN + realpath((const char *)dirname(dirs), realDirs); + realpath((const char *)dirname(outputDir), realOutputDir); ++#else ++ realDirs = realpath((const char *)dirname(dirs), NULL); ++ realOutputDir = realpath((const char *)dirname(outputDir), NULL); ++#endif + + if (strncmp(realDirs, realOutputDir, strlen (realOutputDir)) != 0) { + app_->message(XmlOutputMessages::pathOutsideOutputDirectory, +@@ -1214,6 +1224,11 @@ + } + } + ++#ifndef MAXPATHLEN ++ free(realDirs); ++ free(realOutputDir); ++#endif ++ + // Make the necessary directories + maybeCreateDirectories(dirname(dirs)); + diff --git a/ports/libopensp/portfile.cmake b/ports/libopensp/portfile.cmake new file mode 100644 index 00000000000000..aa7fdadfffb46d --- /dev/null +++ b/ports/libopensp/portfile.cmake @@ -0,0 +1,56 @@ +set(OPENSP_VERSION 1.5.2) + +set(PATCHES opensp_1.5.2-13.diff) # http://deb.debian.org/debian/pool/main/o/opensp/opensp_1.5.2-13.diff.gz +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + list(APPEND PATCHES windows_cmake_build.diff) # https://invent.kde.org/packaging/craft-blueprints-kde/-/tree/master/libs/libopensp +endif() +if (VCPKG_TARGET_IS_UWP) + list(APPEND PATCHES uwp_getenv_fix.diff) +endif() + +vcpkg_download_distfile(ARCHIVE + URLS "https://downloads.sourceforge.net/project/openjade/opensp/${OPENSP_VERSION}/OpenSP-${OPENSP_VERSION}.tar.gz" + FILENAME "OpenSP-${OPENSP_VERSION}.tar.gz" + SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE "${ARCHIVE}" + REF ${OPENSP_VERSION} + PATCHES ${PATCHES} +) + +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + ) + + vcpkg_cmake_install() +else() + set(EXTRA_OPTS "") + if(VCPKG_TARGET_IS_OSX) + list(APPEND EXTRA_OPTS "LDFLAGS=-framework CoreFoundation \$LDFLAGS") # libintl links to it + endif() + + vcpkg_configure_make( + AUTOCONFIG + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + --disable-doc-build + ${EXTRA_OPTS} + ) + + vcpkg_install_make() +endif() + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libopensp/uwp_getenv_fix.diff b/ports/libopensp/uwp_getenv_fix.diff new file mode 100644 index 00000000000000..806ac1ba86e76e --- /dev/null +++ b/ports/libopensp/uwp_getenv_fix.diff @@ -0,0 +1,13 @@ +diff --git a/config.h b/config.h +index 6a2b097..7db8a93 100644 +--- a/config.h ++++ b/config.h +@@ -64,6 +64,8 @@ + #pragma warning ( disable : 4251 ) // __declspec(dllexport) + #pragma warning ( disable : 4275 ) + #pragma warning ( disable : 4237 ) // future reserved keyword ++#pragma warning ( disable : 4996 ) // 'getenv': This function or variable may be unsafe (on UWP) ++#pragma warning ( disable : 4703 ) // potentially uninitialized local pointer variable 'declaredValue' + #define huge verybig + #if _MSC_VER == 900 + #define SP_DECLARE_PLACEMENT_OPERATOR_NEW diff --git a/ports/libopensp/vcpkg.json b/ports/libopensp/vcpkg.json new file mode 100644 index 00000000000000..b61ba7152520df --- /dev/null +++ b/ports/libopensp/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libopensp", + "version": "1.5.2", + "description": "SGML parser algorithm", + "homepage": "http://openjade.sourceforge.net", + "dependencies": [ + { + "name": "gettext", + "platform": "!(windows | uwp)" + }, + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" + } + ] +} diff --git a/ports/libopensp/windows_cmake_build.diff b/ports/libopensp/windows_cmake_build.diff new file mode 100644 index 00000000000000..2c9e8253732993 --- /dev/null +++ b/ports/libopensp/windows_cmake_build.diff @@ -0,0 +1,142 @@ +diff -Nru -x '*~' OpenSP-1.5.2.orig/CMakeLists.txt OpenSP-1.5.2/CMakeLists.txt +--- OpenSP-1.5.2.orig/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 ++++ OpenSP-1.5.2/CMakeLists.txt 2014-08-24 17:23:19.941495700 +0300 +@@ -0,0 +1,24 @@ ++project(opensp) ++ ++set (VERSION_MAJOR 1) ++set (VERSION_MINOR 5) ++set (VERSION_PATH 2) ++ ++cmake_minimum_required(VERSION 2.6) ++ ++include_directories( ++ . ++ include ++ generic ++) ++ ++file(GLOB SRC_SOURCES lib/*.cxx) ++file(GLOB libopensp_HEADERS config.h generic/*.h include/*.h) ++ ++add_library(opensp ${SRC_SOURCES}) ++set_target_properties(opensp PROPERTIES OUTPUT_NAME "osp") ++target_link_libraries(opensp) ++ ++install(TARGETS opensp RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) ++install(FILES ${libopensp_HEADERS} DESTINATION include/opensp) ++ +diff -Nru -x '*~' OpenSP-1.5.2.orig/config.h OpenSP-1.5.2/config.h +--- OpenSP-1.5.2.orig/config.h 2005-12-23 16:16:30.000000000 +0200 ++++ OpenSP-1.5.2/config.h 2014-08-24 17:26:33.724698900 +0300 +@@ -26,6 +26,12 @@ + #endif + #endif /* __GNUG__ */ + ++#ifdef __MINGW32__ ++#define SP_HAVE_BOOL ++#define SP_HAVE_TYPENAME ++#define SP_DEFINE_TEMPLATES ++#endif /* __MINGW32__ */ ++ + #if defined(sun) || defined(__sun) + // struct stat has st_blksize member + #define SP_STAT_BLKSIZE +@@ -80,6 +86,11 @@ + #define SP_HAVE_TYPENAME + #endif + ++#if _MSC_VER >=1800 ++// Visual Studio 2013 ++#define SP_ANSI_FOR_SCOPE ++#endif ++ + #define SP_HAVE_SETMODE + #define SP_DLLEXPORT __declspec(dllexport) + #define SP_DLLIMPORT __declspec(dllimport) +@@ -301,15 +312,8 @@ + #define PATH_SEPARATOR ':' + #endif + +- +-/* new stuff */ +- +-#ifndef HAVE_MUTABLE +-#define mutable +-#endif +- + // NOTE: This is processed as a Makefile, not as a header by autoconf. +-#define SP_PACKAGE "OpenSP" +-#define SP_VERSION "1.5.2" ++#define SP_PACKAGE "@PACKAGE@" ++#define SP_VERSION "@VERSION@" + + #endif /* not config_INCLUDED */ +diff -Nru -x '*~' OpenSP-1.5.2.orig/generic/SGMLApplication.h OpenSP-1.5.2/generic/SGMLApplication.h +--- OpenSP-1.5.2.orig/generic/SGMLApplication.h 2005-05-14 12:17:41.000000000 +0300 ++++ OpenSP-1.5.2/generic/SGMLApplication.h 2014-08-24 17:23:19.957120700 +0300 +@@ -269,6 +269,7 @@ + unsigned count_; + friend class OpenEntityPtr; + }; ++ SGMLApplication(); + virtual ~SGMLApplication(); + virtual void appinfo(const AppinfoEvent &); + virtual void startDtd(const StartDtdEvent &); +diff -Nru -x '*~' OpenSP-1.5.2.orig/include/OutputCharStream.h OpenSP-1.5.2/include/OutputCharStream.h +--- OpenSP-1.5.2.orig/include/OutputCharStream.h 2005-07-21 17:04:39.000000000 +0300 ++++ OpenSP-1.5.2/include/OutputCharStream.h 2014-08-24 17:23:19.957120700 +0300 +@@ -31,6 +31,7 @@ + OutputCharStream &operator<<(const char *); + OutputCharStream &operator<<(const StringC &); + OutputCharStream &operator<<(unsigned long); ++ OutputCharStream &operator<<(unsigned long long); + OutputCharStream &operator<<(int); + OutputCharStream &operator<<(Newline); + private: +diff -Nru -x '*~' OpenSP-1.5.2.orig/lib/MessageReporter.cxx OpenSP-1.5.2/lib/MessageReporter.cxx +--- OpenSP-1.5.2.orig/lib/MessageReporter.cxx 2005-07-21 17:05:17.000000000 +0300 ++++ OpenSP-1.5.2/lib/MessageReporter.cxx 2014-08-24 17:23:19.957120700 +0300 +@@ -123,7 +123,11 @@ + os() << ':'; + } + if (options_ & messageNumbers) ++#ifdef _WIN64 ++ os() << (unsigned long long)message.type->module() << "." ++#else + os() << (unsigned long)message.type->module() << "." ++#endif + << (unsigned long)message.type->number() << ":"; + switch (message.type->severity()) { + case MessageType::info: +diff -Nru -x '*~' OpenSP-1.5.2.orig/lib/OutputCharStream.cxx OpenSP-1.5.2/lib/OutputCharStream.cxx +--- OpenSP-1.5.2.orig/lib/OutputCharStream.cxx 2005-07-21 17:05:17.000000000 +0300 ++++ OpenSP-1.5.2/lib/OutputCharStream.cxx 2014-08-24 17:23:19.957120700 +0300 +@@ -61,6 +61,13 @@ + return *this << buf; + } + ++OutputCharStream &OutputCharStream::operator<<(unsigned long long n) ++{ ++ char buf[sizeof(unsigned long long)*3 + 1]; ++ sprintf(buf, "%I64u", n); ++ return *this << buf; ++} ++ + OutputCharStream &OutputCharStream::operator<<(int n) + { + char buf[sizeof(int)*3 + 2]; +diff -Nru -x '*~' OpenSP-1.5.2.orig/lib/SGMLApplication.cxx OpenSP-1.5.2/lib/SGMLApplication.cxx +--- OpenSP-1.5.2.orig/lib/SGMLApplication.cxx 2005-07-21 17:05:18.000000000 +0300 ++++ OpenSP-1.5.2/lib/SGMLApplication.cxx 2014-08-24 17:23:19.972745700 +0300 +@@ -9,6 +9,10 @@ + #include "Boolean.h" + #include "SGMLApplication.h" + ++SGMLApplication::SGMLApplication() ++{ ++} ++ + SGMLApplication::~SGMLApplication() + { + } diff --git a/versions/baseline.json b/versions/baseline.json index 04121c2cfc6876..1433fedf80f89a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3664,6 +3664,10 @@ "baseline": "2017-01-28-cf2390140", "port-version": 2 }, + "libopensp": { + "baseline": "1.5.2", + "port-version": 0 + }, "libopusenc": { "baseline": "0.2.1", "port-version": 1 diff --git a/versions/l-/libopensp.json b/versions/l-/libopensp.json new file mode 100644 index 00000000000000..168ab8b2513a97 --- /dev/null +++ b/versions/l-/libopensp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "c52391221569480b2e639b0e07a9e809e7711320", + "version": "1.5.2", + "port-version": 0 + } + ] +} From 28e2ae2fa064b067d69f00b7714e0dd390c64ed1 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 07:51:39 +0200 Subject: [PATCH 0881/1858] [neargye-semver] Update to 0.3.0 (#20916) * Update neargye-semver to 0.3.0 * Update CI baseline * Revert back to configure_file * Update git-tree hash Co-authored-by: chausner --- ports/neargye-semver/portfile.cmake | 8 ++++---- ports/neargye-semver/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/n-/neargye-semver.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/neargye-semver/portfile.cmake b/ports/neargye-semver/portfile.cmake index 8a74ee93a98e2b..adb905b935e689 100644 --- a/ports/neargye-semver/portfile.cmake +++ b/ports/neargye-semver/portfile.cmake @@ -3,11 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Neargye/semver - REF v0.2.2 - SHA512 f299e6d74f0232f40e20959ed3d7138d5faff924f60748827849e21951d76d34070bac2479a35f3ea6e801ec5e23ebf8391adedc70d778c4aa5e4c89b20c332c + REF v0.3.0 + SHA512 b620a27d31ca2361e243e4def890ddfc4dfb65a507187c918fabc332d48c420fb10b0e6fb38c83c4c3998a047201e81b70a164c66675351cf4ff9475defc6287 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/include/semver.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/neargye) +file(COPY "${SOURCE_PATH}/include/semver.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/neargye") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/neargye-semver/vcpkg.json b/ports/neargye-semver/vcpkg.json index 925b02892f2fb0..e27641bd4d132d 100644 --- a/ports/neargye-semver/vcpkg.json +++ b/ports/neargye-semver/vcpkg.json @@ -1,7 +1,6 @@ { "name": "neargye-semver", - "version-string": "0.2.2", - "port-version": 1, + "version": "0.3.0", "description": "C++17 header-only dependency-free versioning library complying with Semantic Versioning 2.0.0", "homepage": "https://github.com/Neargye/semver" } diff --git a/versions/baseline.json b/versions/baseline.json index 1433fedf80f89a..50555f777c26c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4573,8 +4573,8 @@ "port-version": 1 }, "neargye-semver": { - "baseline": "0.2.2", - "port-version": 1 + "baseline": "0.3.0", + "port-version": 0 }, "ned14-internal-quickcpplib": { "baseline": "0.0.0-e691a6dc", diff --git a/versions/n-/neargye-semver.json b/versions/n-/neargye-semver.json index a4c61e9cc44d18..bae0ce501e5e65 100644 --- a/versions/n-/neargye-semver.json +++ b/versions/n-/neargye-semver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00131d8f7cbb5461d1cb707d853857082129777a", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "8cc7cede702d8dfd563701819a5e8ed3d0778236", "version-string": "0.2.2", From 2def364e2df472d2848af9c4c7ad23618d839fec Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:46:24 +0200 Subject: [PATCH 0882/1858] [byte-lite] Update to 0.3.0 (#20908) * Update byte-lite to 0.3.0 * Update CI baseline Co-authored-by: chausner --- ports/byte-lite/portfile.cmake | 23 +++++++++-------------- ports/byte-lite/vcpkg.json | 15 ++++++++++++--- versions/b-/byte-lite.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ports/byte-lite/portfile.cmake b/ports/byte-lite/portfile.cmake index d95c0cf4502ff9..0e744d9e52a209 100644 --- a/ports/byte-lite/portfile.cmake +++ b/ports/byte-lite/portfile.cmake @@ -1,29 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/byte-lite - REF v0.2.0 - SHA512 eefc730a39453dfc367a4478a84d4825cd85721d3c332a57321d0a5c3040a4d45921603ff24220f968dd21df61acea856ae30db8bae6c1e835a1755fb03c84b7 + REF v0.3.0 + SHA512 a49c7cf820db2bcf63f231324bca72642161fcaa4ecd9e4b18aa752902f393a3983014feae824fa4f5dea0e7182eadded1a9a83c469fa4039d4d17b3c814b2ef ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBYTE_LITE_OPT_BUILD_TESTS=OFF -DBYTE_LITE_OPT_BUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets( - CONFIG_PATH lib/cmake/${PORT} -) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) -file(INSTALL - ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/byte-lite/vcpkg.json b/ports/byte-lite/vcpkg.json index 64639b6867d684..66eb8426594536 100644 --- a/ports/byte-lite/vcpkg.json +++ b/ports/byte-lite/vcpkg.json @@ -1,6 +1,15 @@ { "name": "byte-lite", - "version-string": "0.2.0", - "port-version": 1, - "description": "A C++17-like byte type for C++98, C++11 and later in a single-file header-only library" + "version": "0.3.0", + "description": "A C++17-like byte type for C++98, C++11 and later in a single-file header-only library", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/byte-lite.json b/versions/b-/byte-lite.json index 6fd79ba48f6648..94dbbafec1db92 100644 --- a/versions/b-/byte-lite.json +++ b/versions/b-/byte-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5bc136e43764a88f51b7750b1937cd548177c79c", + "version": "0.3.0", + "port-version": 0 + }, { "git-tree": "d83b7cf23d9a7b17c28fda5fcd36a25dd8a085ef", "version-string": "0.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 50555f777c26c1..3a45852eb936e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1173,8 +1173,8 @@ "port-version": 2 }, "byte-lite": { - "baseline": "0.2.0", - "port-version": 1 + "baseline": "0.3.0", + "port-version": 0 }, "bzip2": { "baseline": "1.0.8", From e2d1ff04773dcfb444f901d5c336d93d98c016a3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:47:32 +0200 Subject: [PATCH 0883/1858] [fmi4cpp] Update to 0.8.0 (#20907) * Update fmi4cpp to 0.8.0 * Update CI baseline Co-authored-by: chausner --- ports/fmi4cpp/fix-build_error.patch | 25 -------------------- ports/fmi4cpp/portfile.cmake | 36 ++++++++--------------------- ports/fmi4cpp/vcpkg.json | 26 ++++++++------------- versions/baseline.json | 4 ++-- versions/f-/fmi4cpp.json | 5 ++++ 5 files changed, 25 insertions(+), 71 deletions(-) delete mode 100644 ports/fmi4cpp/fix-build_error.patch diff --git a/ports/fmi4cpp/fix-build_error.patch b/ports/fmi4cpp/fix-build_error.patch deleted file mode 100644 index ef0950e87122d2..00000000000000 --- a/ports/fmi4cpp/fix-build_error.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/include/fmi4cpp/fmu_resource.hpp b/include/fmi4cpp/fmu_resource.hpp -index 98f2067..8e88dcf 100644 ---- a/include/fmi4cpp/fmu_resource.hpp -+++ b/include/fmi4cpp/fmu_resource.hpp -@@ -24,6 +24,7 @@ - - #ifndef FMI4CPP_FMURESOURCE_HPP - #define FMI4CPP_FMURESOURCE_HPP -+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING - - #include - #include -diff --git a/src/fmi2/fmu.cpp b/src/fmi2/fmu.cpp -index a0d5f75..bd01487 100644 ---- a/src/fmi2/fmu.cpp -+++ b/src/fmi2/fmu.cpp -@@ -26,6 +26,8 @@ - #include - #endif - -+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING -+ - #include - #include - diff --git a/ports/fmi4cpp/portfile.cmake b/ports/fmi4cpp/portfile.cmake index 02a9bdc31251b0..32a3e220fd3040 100644 --- a/ports/fmi4cpp/portfile.cmake +++ b/ports/fmi4cpp/portfile.cmake @@ -1,42 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NTNU-IHB/FMI4cpp - REF v0.7.0 - SHA512 5846f5b28badb5b4836ffd9d284f602dd243df20d3c82cab5e2b62b8be37e0ab05b7422bca066f37ca67ee0d5b35abd2febe87f623fc3b9854d245e86e1e21fe + REF 0.8.0 + SHA512 547f61dfbd57593ff8839fbed3f8a5624551ee4be5e0dd7773384a869086af8a4483cfe17dc087e3f03c9ea2038b537c8c4998a405687c1a353d08e52dac411e HEAD_REF master - PATCHES - fix-build_error.patch ) -set(WITH_CURL OFF) -if("curl" IN_LIST FEATURES) - set(WITH_CURL ON) -endif() - -set(WITH_ODEINT OFF) -if("odeint" IN_LIST FEATURES) - set(WITH_ODEINT ON) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DFMI4CPP_BUILD_TOOL=OFF -DFMI4CPP_BUILD_TESTS=OFF -DFMI4CPP_BUILD_EXAMPLES=OFF - -DFMI4CPP_WITH_CURL=${WITH_CURL} - -DFMI4CPP_WITH_ODEINT=${WITH_ODEINT} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - - +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fmi4cpp/vcpkg.json b/ports/fmi4cpp/vcpkg.json index 298fa7cf41f2ec..399c65f1f5ddd6 100644 --- a/ports/fmi4cpp/vcpkg.json +++ b/ports/fmi4cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "fmi4cpp", - "version-string": "0.7.0", - "port-version": 3, + "version": "0.8.0", "description": "FMI 2.0 implementation written in modern C++", "homepage": "https://github.com/NTNU-IHB/FMI4cpp", "dependencies": [ @@ -11,21 +10,14 @@ "features": [ "openssl" ] - } - ], - "features": { - "curl": { - "description": "Allows loading FMUs from URL", - "dependencies": [ - "curl" - ] }, - "odeint": { - "description": "Adds support for wrapping Model Exchange models as Co-simulation models using odeint solvers", - "dependencies": [ - "boost-odeint", - "boost-ublas" - ] + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } - } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 3a45852eb936e2..57ef209c553af3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2181,8 +2181,8 @@ "port-version": 1 }, "fmi4cpp": { - "baseline": "0.7.0", - "port-version": 3 + "baseline": "0.8.0", + "port-version": 0 }, "fmilib": { "baseline": "2.0.3", diff --git a/versions/f-/fmi4cpp.json b/versions/f-/fmi4cpp.json index a6ebcdd4028f53..9a136d44a70f0c 100644 --- a/versions/f-/fmi4cpp.json +++ b/versions/f-/fmi4cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4686387d546df76f71bd0086c3570d8061157cd", + "version": "0.8.0", + "port-version": 0 + }, { "git-tree": "694ccc48c8fdade1beda9a7f87c923c8153a7735", "version-string": "0.7.0", From 0f5c5a45970a2add9e8c2f64a77feadcd0ebdc32 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 22 Oct 2021 14:48:04 +0800 Subject: [PATCH 0884/1858] [FakeIt] update to 2.0.9 (#20893) * [FakeIt] update to 2.0.9 * update version --- ports/fakeit/portfile.cmake | 11 ++++------- ports/fakeit/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fakeit.json | 5 +++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ports/fakeit/portfile.cmake b/ports/fakeit/portfile.cmake index c65b97f893a633..9e649c04ba65e4 100644 --- a/ports/fakeit/portfile.cmake +++ b/ports/fakeit/portfile.cmake @@ -1,14 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eranpeer/FakeIt - REF 2.0.7 - SHA512 b718c2283217a643b7b67ba4c141cc8ea4d18835181d261abfe6f09e9be99af755fa482c0fa17def0e99c97dc11bb95b2da390e9a55c9a50a50c4d98c0071168 + REF 514ca290b78d15f4fb46e1696f47189cf2524376 #v2.0.9 + SHA512 679808f5f7e036bdb465a4a8ded79e539e4d9992f27e87de1a23be221bc983146183c26087f16a8c7dafab58e337a050b78402c23189ce02cad0afc7ab7718b5 HEAD_REF master ) -file( - COPY ${SOURCE_PATH}/single_header/ - DESTINATION ${CURRENT_PACKAGES_DIR}/include -) +file(COPY "${SOURCE_PATH}/single_header/" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fakeit/vcpkg.json b/ports/fakeit/vcpkg.json index a4021968275226..8be673e3e3c9e3 100644 --- a/ports/fakeit/vcpkg.json +++ b/ports/fakeit/vcpkg.json @@ -1,6 +1,6 @@ { "name": "fakeit", - "version": "2.0.7", + "version": "2.0.9", "description": "FakeIt is a simple mocking framework for C++. It supports GCC, Clang and MS Visual C++.", "homepage": "https://github.com/eranpeer/FakeIt" } diff --git a/versions/baseline.json b/versions/baseline.json index 57ef209c553af3..ed77f7961731e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2057,7 +2057,7 @@ "port-version": 0 }, "fakeit": { - "baseline": "2.0.7", + "baseline": "2.0.9", "port-version": 0 }, "fann": { diff --git a/versions/f-/fakeit.json b/versions/f-/fakeit.json index b52b7cc861400c..c849a4fd32abac 100644 --- a/versions/f-/fakeit.json +++ b/versions/f-/fakeit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7be74886e3d0e180a2abc712c1f95f26f6f3c67", + "version": "2.0.9", + "port-version": 0 + }, { "git-tree": "ccb43fb91f79fd2fbc7c95251b46f55b9ba9f364", "version": "2.0.7", From 5e1aab4ee1ff1bae4d61047b7c593bd39a7c9b5c Mon Sep 17 00:00:00 2001 From: QuellaZhang <36754348+QuellaZhang@users.noreply.github.com> Date: Fri, 22 Oct 2021 14:49:13 +0800 Subject: [PATCH 0885/1858] [folly] Change from master branch to main branch (#20892) * [folly] Change from master branch to main * update vcpkg.json * update version Co-authored-by: QuellaZhang Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/folly/portfile.cmake | 2 +- ports/folly/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/folly.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 21df520bf86dd1..09266888e43952 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -16,7 +16,7 @@ vcpkg_from_github( REPO facebook/folly REF v2021.06.14.00 SHA512 aee5adc1a44d9b193f3f41b5fc9fa7575c677d8bf27ed3a3b612a2fbe53505f82481ce78f13fb41ae3ca81ca25446426fbdfdc578f503f919b4af5abe56ad71c - HEAD_REF master + HEAD_REF main PATCHES reorder-glog-gflags.patch disable-non-underscore-posix-names.patch diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 453e08e9c36c1e..6b1908125b470f 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,7 @@ { "name": "folly", "version-string": "2021.06.14.00", - "port-version": 1, + "port-version": 2, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "supports": "x64 | (arm64 & !windows)", diff --git a/versions/baseline.json b/versions/baseline.json index ed77f7961731e5..6cac37e8e52b9a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2194,7 +2194,7 @@ }, "folly": { "baseline": "2021.06.14.00", - "port-version": 1 + "port-version": 2 }, "font-chef": { "baseline": "1.0.1", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 473a4c1c694c94..8a92dabc1f4892 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "747fc5abd957e03e89acad08f28925927fb5f33b", + "version-string": "2021.06.14.00", + "port-version": 2 + }, { "git-tree": "92b7d618fda609b74ea8862c9950e40a9f03418d", "version-string": "2021.06.14.00", From 5047b186b79123d62fd5810ef262928f99aec4cf Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:50:39 +0200 Subject: [PATCH 0886/1858] [cpp-httplib] Update to 0.9.7 (#20882) * Update cpp-httplib to 0.9.7 * Update CI baseline * add double quotes * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/cpp-httplib/portfile.cmake | 11 ++++------- ports/cpp-httplib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-httplib.json | 5 +++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ports/cpp-httplib/portfile.cmake b/ports/cpp-httplib/portfile.cmake index 966e7189bbd662..07c0cfda97b7de 100644 --- a/ports/cpp-httplib/portfile.cmake +++ b/ports/cpp-httplib/portfile.cmake @@ -2,15 +2,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yhirose/cpp-httplib - REF v0.9.4 - SHA512 472f4ce4ff5ba4b2e175120deb0a3ccc4c7b124e9349fd7709e1439fcdcfbc83ff0fb71d58367f38e042c4a64600936755432bd4de3e0065b2810dc5bc7d3c86 + REF v0.9.7 + SHA512 7c12ff7b5cfba1a814cb14bdc28c949a97817668e1e6cee030fe1ea5e8748460677908ddb83fd1d06d96dd79a910004071076d1486d39103b6280f628ba38e2d HEAD_REF master ) -file( - COPY ${SOURCE_PATH}/httplib.h - DESTINATION ${CURRENT_PACKAGES_DIR}/include -) +file(COPY "${SOURCE_PATH}/httplib.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cpp-httplib/vcpkg.json b/ports/cpp-httplib/vcpkg.json index 9b1f01585eb0f4..20b17553942e17 100644 --- a/ports/cpp-httplib/vcpkg.json +++ b/ports/cpp-httplib/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-httplib", - "version": "0.9.4", + "version": "0.9.7", "description": "A single file C++11 header-only HTTP/HTTPS server and client library", "homepage": "https://github.com/yhirose/cpp-httplib" } diff --git a/versions/baseline.json b/versions/baseline.json index 6cac37e8e52b9a..823263d21ccf1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1501,7 +1501,7 @@ "port-version": 0 }, "cpp-httplib": { - "baseline": "0.9.4", + "baseline": "0.9.7", "port-version": 0 }, "cpp-ipc": { diff --git a/versions/c-/cpp-httplib.json b/versions/c-/cpp-httplib.json index db6568e7244178..230748b4ad3b6b 100644 --- a/versions/c-/cpp-httplib.json +++ b/versions/c-/cpp-httplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bfee573e08d3e240e345491ca8e9df1d4f86b05c", + "version": "0.9.7", + "port-version": 0 + }, { "git-tree": "46525b4cf2481e5bd66df0899c0c1fd4f05a0c33", "version": "0.9.4", From fd554ef572a5aa58b9395d4f0d51bd94339832d8 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:51:01 +0200 Subject: [PATCH 0887/1858] [libgit2] Update to 1.3.0 (#20881) * Update libgit2 to 1.3.0 * Update CI baseline Co-authored-by: chausner --- ports/libgit2/portfile.cmake | 4 ++-- ports/libgit2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libgit2.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index c8b1dec1a4a51c..8455ab52cad697 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF 4fd32be01c79a5c003bb47674ac1d76d948518b7#version 1.2.0 - SHA512 f9defe0dd51537ae374fe25ef3ccea74d8d05588f26b1865275067e63ad65a7cd283ee83099b97cea50ef5c367036734ba34be73a06b030be2903344b2778fff + REF v1.3.0 + SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e HEAD_REF master ) diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index c82e7024980e5c..93889c78e5365b 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libgit2", - "version-semver": "1.2.0", + "version-semver": "1.3.0", "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 823263d21ccf1c..8cf395376c22ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3421,7 +3421,7 @@ "port-version": 4 }, "libgit2": { - "baseline": "1.2.0", + "baseline": "1.3.0", "port-version": 0 }, "libgnutls": { diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index cdfb0785081687..6bc62f56a96a71 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20883074dd1404f4170f03b1c4d04d7a0e05b0fe", + "version-semver": "1.3.0", + "port-version": 0 + }, { "git-tree": "daddb751c1ff040d820dd32d62f08c94482b49ae", "version-semver": "1.2.0", From c46f16386300ddb310bbd577046aee01c139db8c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:51:19 +0200 Subject: [PATCH 0888/1858] [pybind11] Update to 2.8.0 (#20880) * Update pybind11 to 2.8.0 * Update CI baseline Co-authored-by: chausner --- ports/pybind11/portfile.cmake | 4 ++-- ports/pybind11/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pybind11.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index 14e4d5a9a60804..d3277509138563 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.7.1 - SHA512 f09f46622b394d3990ab82aa7ea15a06e298df109cd2df263ba9d6ac7fb248217df7450e1954a9679a8360335d5bbf662926a34c8b7c61b6e4c396bbdfd88305 + REF v2.8.0 + SHA512 2f066ab1a3d4a22513625f52b55d7722f953007876e800b4a08d6341b9ae70f73a3b0fd57f76cee443e7b8cf0eecdaafc032a23ddad2b8bca2c8108ac4090a82 HEAD_REF master ) diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index cf79d75138670e..89d67f89e9eadc 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pybind11", - "version-semver": "2.7.1", + "version-semver": "2.8.0", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 8cf395376c22ec..2e56e99d303855 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5361,7 +5361,7 @@ "port-version": 1 }, "pybind11": { - "baseline": "2.7.1", + "baseline": "2.8.0", "port-version": 0 }, "pystring": { diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index 2a54f4b5a54139..55b75d3be8713d 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6b211738705fc8bb09ad24e39d6239f8b719aae", + "version-semver": "2.8.0", + "port-version": 0 + }, { "git-tree": "a8d7e31e74a9d73e4956e70efbcc0c3490968883", "version-semver": "2.7.1", From 16501a84c96212c3ee58403eff7b10636325f3b3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:52:08 +0200 Subject: [PATCH 0889/1858] [onnx] Update to 1.10.1 (#20878) * Update onnx to 1.10.1 * Update CI baseline Co-authored-by: chausner --- ports/onnx/portfile.cmake | 65 +++++++++++++++++++-------------------- ports/onnx/vcpkg.json | 4 +-- versions/baseline.json | 2 +- versions/o-/onnx.json | 5 +++ 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index 1c565ab0d5f302..d523a0eedc0cad 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/onnx - REF v1.9.0 - SHA512 a3eecc74ce4f22524603fb86367d21c87a143ba27eef93ef4bd2e2868c2cadeb724b84df58a429286e7824adebdeba7fa059095b7ab29df8dcea8777bd7f4101 + REF v1.10.1 + SHA512 927b6d74dcf41b62c1290674cebb8e6c054acf101214352a0c5414d9b2eafa2d1e144f4d361452cd7494fb228e26c2ce2676fb1212aff1eeb3f889dc2faf5438 PATCHES fix-cmakelists.patch wrap-onnxifi-targets.patch @@ -20,9 +20,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() # ONNX_USE_PROTOBUF_SHARED_LIBS: find the library and check its file extension -find_library(PROTOBUF_LIBPATH NAMES protobuf PATHS ${CURRENT_INSTALLED_DIR}/bin ${CURRENT_INSTALLED_DIR}/lib REQUIRED) -get_filename_component(PROTOBUF_LIBNAME ${PROTOBUF_LIBPATH} NAME) -if(PROTOBUF_LIBNAME MATCHES ${CMAKE_SHARED_LIBRARY_SUFFIX}) +find_library(PROTOBUF_LIBPATH NAMES protobuf PATHS "${CURRENT_INSTALLED_DIR}/bin" "${CURRENT_INSTALLED_DIR}/lib" REQUIRED) +get_filename_component(PROTOBUF_LIBNAME "${PROTOBUF_LIBPATH}" NAME) +if(PROTOBUF_LIBNAME MATCHES "${CMAKE_SHARED_LIBRARY_SUFFIX}") set(USE_PROTOBUF_SHARED ON) else() set(USE_PROTOBUF_SHARED OFF) @@ -37,13 +37,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_find_acquire_program(PYTHON3) # PATH for .bat scripts can find 'python' -get_filename_component(PYTHON_DIR ${PYTHON3} PATH) -vcpkg_add_to_path(PREPEND ${PYTHON_DIR}) +get_filename_component(PYTHON_DIR "${PYTHON3}" PATH) +vcpkg_add_to_path(PREPEND "${PYTHON_DIR}") if("pybind11" IN_LIST FEATURES) # When BUILD_ONNX_PYTHON, we need Development component. Give a hint for FindPython3 list(APPEND FEATURE_OPTIONS - -DPython3_ROOT_DIR=${CURRENT_INSTALLED_DIR} + "-DPython3_ROOT_DIR=${CURRENT_INSTALLED_DIR}" ) endif() @@ -70,29 +70,28 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ONNX) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - # the others are empty - "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_ml" - "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_data" - "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_operators_ml" - "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_cpp2py_export" - "${CURRENT_PACKAGES_DIR}/include/onnx/backend" - "${CURRENT_PACKAGES_DIR}/include/onnx/tools" - "${CURRENT_PACKAGES_DIR}/include/onnx/test" - "${CURRENT_PACKAGES_DIR}/include/onnx/bin" - "${CURRENT_PACKAGES_DIR}/include/onnx/examples" - "${CURRENT_PACKAGES_DIR}/include/onnx/frontend" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/math" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/object_detection" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/quantization" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml" - "${CURRENT_PACKAGES_DIR}/include/onnx/defs/training" +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + # the others are empty + "${CURRENT_PACKAGES_DIR}/include/onnx/backend" + "${CURRENT_PACKAGES_DIR}/include/onnx/bin" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/controlflow" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/generator" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/logical" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/math" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/nn" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/object_detection" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/optional" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/quantization" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/reduction" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/rnn" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/sequence" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/traditionalml" + "${CURRENT_PACKAGES_DIR}/include/onnx/defs/training" + "${CURRENT_PACKAGES_DIR}/include/onnx/examples" + "${CURRENT_PACKAGES_DIR}/include/onnx/frontend" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_cpp2py_export" + "${CURRENT_PACKAGES_DIR}/include/onnx/test" + "${CURRENT_PACKAGES_DIR}/include/onnx/tools" ) diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 6f9ee73238067e..36da8b39b19124 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "onnx", - "version-semver": "1.9.0", + "version-semver": "1.10.1", "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", - "supports": "!uwp", + "supports": "!uwp & static", "dependencies": [ "protobuf", { diff --git a/versions/baseline.json b/versions/baseline.json index 2e56e99d303855..a3c6451a7ee510 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4789,7 +4789,7 @@ "port-version": 0 }, "onnx": { - "baseline": "1.9.0", + "baseline": "1.10.1", "port-version": 0 }, "onnx-optimizer": { diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index 5f4fc6e16a5846..6ca70e229024f9 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a526e5d7f54e5fc32529bf72b29457f408af0e28", + "version-semver": "1.10.1", + "port-version": 0 + }, { "git-tree": "b53c9c9e969928def925c57ea5ddcdfb09293693", "version-semver": "1.9.0", From a0b09bd6ce3e0bb59b42ff9aaae5b2e31674b3e7 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:52:30 +0200 Subject: [PATCH 0890/1858] [uwebsockets] Update to 20.6.0 (#20877) * Update uwebsockets to 20.6.0 * Update CI baseline Co-authored-by: chausner --- ports/uwebsockets/portfile.cmake | 4 ++-- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index da004d02aea3a6..c23249d0af9e71 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF v20.5.0 - SHA512 B2AA6528DCF252DFFBEE99A7D9263037444ADE2EA473EC45C54EBCC39F3E795CB9E26D54147D72745576F09A3663AFA7EA46955133FA60BC4942EACEF4468DFE + REF v20.6.0 + SHA512 cd20e72511c1365a65be55dfdfa40b2476de2e31b90a287b69c0772fedc9b92956924f6fd3261b131ef47494a0b9710fa4ecb71eb5fbca400b67645f63568de9 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index b09ad89386ce2f..794979b49bed7e 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.5.0", + "version-semver": "20.6.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a3c6451a7ee510..a10188e8b35020 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6917,7 +6917,7 @@ "port-version": 1 }, "uwebsockets": { - "baseline": "20.5.0", + "baseline": "20.6.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 1df6a47ae25917..23108e64241fb4 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b0511c1faa806578f8dc21cc3ac881db3f30aae", + "version-semver": "20.6.0", + "port-version": 0 + }, { "git-tree": "e66651f28bc4bcd5edb5360e96f42ad666076d6b", "version-semver": "20.5.0", From 5d2e32788c8c6baaf51ae12606fabaa3ea203988 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 22 Oct 2021 08:54:19 +0200 Subject: [PATCH 0891/1858] [simdjson] Update to 1.0.1 (#20876) * Update simdjson to 1.0.1 * Update CI baseline Co-authored-by: chausner --- ports/simdjson/portfile.cmake | 6 +++--- ports/simdjson/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simdjson.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 1f14e309058e8e..a4d3af58cfdef2 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO simdjson/simdjson - REF 3bd8b0b575f43403705dcce57d427944c11421f8 # v1.0.0 + REF v1.0.1 HEAD_REF master - SHA512 61c5db9bdf331cc692d85f135fda29ad5db7ee23d9518153adfd44cf26d76dae834a3071bd6c9e9b2a99a27a2881899162ac146750f444e9829a6dbbe986f769 + SHA512 ecf67b145f1269225483a64b5ff9de826a8124fbae60dec1e6fe99aa974a29e07037a9318ae2dfc657971695ffa5e4fbcdff4c855365c074971d34c69dd77561 ) vcpkg_check_features( @@ -34,7 +34,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/simdjson/vcpkg.json b/ports/simdjson/vcpkg.json index 010a5a73403d5a..7e5cfdc790e1e2 100644 --- a/ports/simdjson/vcpkg.json +++ b/ports/simdjson/vcpkg.json @@ -1,6 +1,6 @@ { "name": "simdjson", - "version-semver": "1.0.0", + "version-semver": "1.0.1", "description": "A extremely fast JSON library that can parse gigabytes of JSON per second", "homepage": "https://simdjson.org/", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a10188e8b35020..2b6fb92400065c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6185,7 +6185,7 @@ "port-version": 0 }, "simdjson": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "simdutf": { diff --git a/versions/s-/simdjson.json b/versions/s-/simdjson.json index 3052efe238093e..d1c1da0c2ccf42 100644 --- a/versions/s-/simdjson.json +++ b/versions/s-/simdjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b733cbc907ee3f0af57e0a84247cade1b55f861", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "80800c0596226b9d3a818cf8ddf903b2e66e279c", "version-semver": "1.0.0", From 0f5d91b13d976c56f2fc258f5b35c310f52ac7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 22 Oct 2021 08:55:18 +0200 Subject: [PATCH 0892/1858] [implot] Update to 0.12 (#20873) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [implot] Update to 0.12 * [implot] Update version files * [implot] Replace deprecated vcpkg functions * [implot] Fix port formatting * [implot] Update version files * [implot] Update implot to 0.12 * [implot] Update version files * [implot] Update version database * update portfile.cmake * update version Co-authored-by: Rémy Tassoux Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/implot/portfile.cmake | 17 ++++++++--------- ports/implot/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/i-/implot.json | 5 +++++ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ports/implot/portfile.cmake b/ports/implot/portfile.cmake index f0195be8c1202d..ba1241c5edc291 100644 --- a/ports/implot/portfile.cmake +++ b/ports/implot/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO epezent/implot - REF v0.11 - SHA512 161e709fcd872abd414129915501261085df531a0b5a9b33ed40422a082603627242467de59b11116948352fdb62b5d28131658b603f48692edd43429513ba29 + REF v0.12 + SHA512 972bb831150a8b7c5fddb828c9d6928b493186ae587c8c5ea679c4fe499459892f175181c529e37195f72e09854ec8c698b77ae39e60295f831ad67e4a5f3358 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DIMPLOT_SKIP_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/implot/vcpkg.json b/ports/implot/vcpkg.json index be6d42b8d794b0..0bd23ce03721d3 100644 --- a/ports/implot/vcpkg.json +++ b/ports/implot/vcpkg.json @@ -1,9 +1,17 @@ { "name": "implot", - "version": "0.11", + "version": "0.12", "description": "Advanced 2D Plotting for Dear ImGui", "homepage": "https://github.com/epezent/implot", "dependencies": [ - "imgui" + "imgui", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 2b6fb92400065c..386ca906cda0ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2817,7 +2817,7 @@ "port-version": 0 }, "implot": { - "baseline": "0.11", + "baseline": "0.12", "port-version": 0 }, "indicators": { diff --git a/versions/i-/implot.json b/versions/i-/implot.json index e14ae4e9381bf3..a25aff5b1a7e12 100644 --- a/versions/i-/implot.json +++ b/versions/i-/implot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab3bc9b82bfc7fbd1808cc55559ed58b648ed964", + "version": "0.12", + "port-version": 0 + }, { "git-tree": "0cd65daef775cef7aa1fef67949dc644a4b42b73", "version": "0.11", From 220278b94dcad9f79f8fc7de3fce7495f5c14888 Mon Sep 17 00:00:00 2001 From: Guekka <39066502+Guekka@users.noreply.github.com> Date: Fri, 22 Oct 2021 06:55:50 +0000 Subject: [PATCH 0893/1858] [utf8h] Update utf8h to the latest commmit (#20863) * [utf8h] Update to 23 august 2021 * [utf8h] Update versions database * update utf8h to latest version * update version * CI Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/utf8h/portfile.cmake | 8 ++++---- ports/utf8h/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/u-/utf8h.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/utf8h/portfile.cmake b/ports/utf8h/portfile.cmake index e8167fe466f752..a8980161b8202d 100644 --- a/ports/utf8h/portfile.cmake +++ b/ports/utf8h/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sheredom/utf8.h - REF 817789676b1c3ac9b117a0f9e04378d3e33a79be - SHA512 3e8455cbc03fa02b1f6f87832c89104510012e8dda968fd56ad5661ffb1c40498e59ea7b65f41f551233f28ee526974086efad3dd767bf944844a3ffede04e1d + REF 146be69f88575d753317d8ef13b16f80e0656fc7 + SHA512 3ce20a440aa6c83b2079cad1385ba96688c2ae866b9dee013bc461f3ba180154231e3a18d3d020b4617b1c17b2cb36ea10c53656a48dd1294ed8324ed5b9acfb HEAD_REF master ) -file(COPY ${SOURCE_PATH}/utf8.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/utf8h) +file(COPY "${SOURCE_PATH}/utf8.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/utf8h") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/utf8h/vcpkg.json b/ports/utf8h/vcpkg.json index 06b6c330ae3d69..41f29797257253 100644 --- a/ports/utf8h/vcpkg.json +++ b/ports/utf8h/vcpkg.json @@ -1,7 +1,6 @@ { "name": "utf8h", - "version-string": "2020-06-14", - "port-version": 1, + "version-date": "2021-10-21", "description": "Single header utf8 string functions for C and C++", "homepage": "https://github.com/sheredom/utf8.h" } diff --git a/versions/baseline.json b/versions/baseline.json index 386ca906cda0ed..6da328764fec70 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6885,8 +6885,8 @@ "port-version": 0 }, "utf8h": { - "baseline": "2020-06-14", - "port-version": 1 + "baseline": "2021-10-21", + "port-version": 0 }, "utf8proc": { "baseline": "2.6.1", diff --git a/versions/u-/utf8h.json b/versions/u-/utf8h.json index 9551f2eea2c4e8..e6d95f597bf460 100644 --- a/versions/u-/utf8h.json +++ b/versions/u-/utf8h.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e54d88f6fff213e5e7ab15eefffc3e2674f1da63", + "version-date": "2021-10-21", + "port-version": 0 + }, { "git-tree": "9cb92a16c8bbfc76bc505b90f55d116ea789c49e", "version-string": "2020-06-14", From 09eec8469dc9b3d9dfc1ac0a31686dd357181072 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Fri, 22 Oct 2021 03:36:19 -0400 Subject: [PATCH 0894/1858] Fix awssdk usage and silence libcrypto messages (#20848) * [0.5.12] Update aws-c-cal version. * [1.1.1] Update s2n version * Clarify AWSSDK package usage. * Fix port versions. * [aws-c-cal] Fix libcrypto patch. * [s2n] Fix remove libcrpyto messages patch. --- ports/aws-c-cal/portfile.cmake | 5 +++-- ports/aws-c-cal/remove-libcrypto-messages.patch | 14 ++++++++++++++ ports/aws-c-cal/vcpkg.json | 2 +- ports/aws-sdk-cpp/usage | 7 +++++++ ports/aws-sdk-cpp/vcpkg.json | 2 +- ports/s2n/portfile.cmake | 5 +++-- ports/s2n/remove-libcrypto-messages.patch | 14 ++++++++++++++ ports/s2n/vcpkg.json | 2 +- versions/a-/aws-c-cal.json | 5 +++++ versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 6 +++--- versions/s-/s2n.json | 5 +++++ 12 files changed, 62 insertions(+), 10 deletions(-) create mode 100644 ports/aws-c-cal/remove-libcrypto-messages.patch create mode 100644 ports/s2n/remove-libcrypto-messages.patch diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake index 20da8a95623321..c2eb3816c6a047 100644 --- a/ports/aws-c-cal/portfile.cmake +++ b/ports/aws-c-cal/portfile.cmake @@ -1,10 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO awslabs/aws-c-cal - REF aa89aa4950074babe84762413f39bd364ecaf944 # v0.5.11 - SHA512 b92ae3cb14d26dfe48cb903df56f7df91a4dc0ab2e5ea4f095c72b0b7e0a2582f1324c73eb42c080bcb0a59a3dfc37cd2912037fc8e5f7df8433899749fca63c + REF c4c5b175e05f2affe5e3f0203ca6c8bc5cdd8f51 # v0.5.12 + SHA512 25dd1d7f207f1324aed418555dda1c3d4ec64baf76431c9efd88fd3c34b163a2e5a6778192d2c0caf937f3efd31b2f21e6a0d0f7230684d176164da0e8bcc92e HEAD_REF master PATCHES fix-cmake-target-path.patch + remove-libcrypto-messages.patch ) vcpkg_cmake_configure( diff --git a/ports/aws-c-cal/remove-libcrypto-messages.patch b/ports/aws-c-cal/remove-libcrypto-messages.patch new file mode 100644 index 00000000000000..6115bb1d33683a --- /dev/null +++ b/ports/aws-c-cal/remove-libcrypto-messages.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake +index 564ba97..f748212 100644 +--- a/cmake/modules/FindLibCrypto.cmake ++++ b/cmake/modules/FindLibCrypto.cmake +@@ -89,9 +89,6 @@ else() + set(LIBCRYPTO_FOUND true) + set(LibCrypto_FOUND true) + +- message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") +- message(STATUS "LibCrypto Shared Lib: ${LibCrypto_SHARED_LIBRARY}") +- message(STATUS "LibCrypto Static Lib: ${LibCrypto_STATIC_LIBRARY}") + if (NOT TARGET crypto AND + (EXISTS "${LibCrypto_LIBRARY}") + ) diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json index 1045509244475d..0f6d8c826a9f33 100644 --- a/ports/aws-c-cal/vcpkg.json +++ b/ports/aws-c-cal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aws-c-cal", - "version": "0.5.11", + "version": "0.5.12", "description": "C99 wrapper for cryptography primitives.", "homepage": "https://github.com/awslabs/aws-c-cal", "supports": "!arm & !uwp", diff --git a/ports/aws-sdk-cpp/usage b/ports/aws-sdk-cpp/usage index 13a822f1c0f4e2..c526d2c456125d 100644 --- a/ports/aws-sdk-cpp/usage +++ b/ports/aws-sdk-cpp/usage @@ -1,5 +1,12 @@ The package @PORT@:@TARGET_TRIPLET@ provides CMake targets: + When using AWSSDK, AWSSDK_ROOT_DIR must be defined by the user. find_package(AWSSDK CONFIG COMPONENTS core dynamodb kinesis s3 REQUIRED) target_include_directories(main PRIVATE ${AWSSDK_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${AWSSDK_LIBRARIES}) + + OR + + find_package(aws-cpp-sdk-core REQUIRED) + target_include_directories(main PRIVATE aws-cpp-sdk-core) + target_link_libraries(main PRIVATE aws-cpp-sdk-core) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 211e80e6ddd747..73ba3557e91060 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,7 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.9.96", - "port-version": 2, + "port-version": 3, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "supports": "!arm & !uwp", diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake index e3cdaf142d16af..db40a08d733d22 100644 --- a/ports/s2n/portfile.cmake +++ b/ports/s2n/portfile.cmake @@ -1,9 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO aws/s2n-tls - REF 4de98dcf20c476519c15241f92122b99fd2a9297 # v1.1.0 - SHA512 99c973912dc1a4db5ef36c24aa69134bf901101ce2ef749f7492f965f65f62b76c0e3935075881530f0828025ce20caa392afd9ad3bbdba157173dd5bb9f8163 + REF 4513f8d707a68388990886d353e7cfe46cc6454b # v1.1.1 + SHA512 6586e330733982ed3b70fd320e63575639d5793d69ffa06b2a46ed487d55d8271b46df611d62cc48410654b394d599de65edd9cdc860dea13255161d843f1f48 PATCHES fix-cmake-target-path.patch + remove-libcrypto-messages.patch ) vcpkg_cmake_configure( diff --git a/ports/s2n/remove-libcrypto-messages.patch b/ports/s2n/remove-libcrypto-messages.patch new file mode 100644 index 00000000000000..58ceb575694dea --- /dev/null +++ b/ports/s2n/remove-libcrypto-messages.patch @@ -0,0 +1,14 @@ +diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake +index 1ba8473..b486a1a 100644 +--- a/cmake/modules/FindLibCrypto.cmake ++++ b/cmake/modules/FindLibCrypto.cmake +@@ -88,9 +88,6 @@ else() + set(LIBCRYPTO_FOUND true) + set(LibCrypto_FOUND true) + +- message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}") +- message(STATUS "LibCrypto Shared Lib: ${LibCrypto_SHARED_LIBRARY}") +- message(STATUS "LibCrypto Static Lib: ${LibCrypto_STATIC_LIBRARY}") + if (NOT TARGET crypto AND + (EXISTS "${LibCrypto_LIBRARY}") + ) diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json index 4ee7f70834032a..bae45af959c47b 100644 --- a/ports/s2n/vcpkg.json +++ b/ports/s2n/vcpkg.json @@ -1,6 +1,6 @@ { "name": "s2n", - "version": "1.1.0", + "version": "1.1.1", "description": "C99 implementation of the TLS/SSL protocols.", "homepage": "https://github.com/aws/s2n-tls", "supports": "!uwp & !windows", diff --git a/versions/a-/aws-c-cal.json b/versions/a-/aws-c-cal.json index 4f0b9810c2090c..bdddc4177539d9 100644 --- a/versions/a-/aws-c-cal.json +++ b/versions/a-/aws-c-cal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f3ed6a5199c30560f46d1be38cee72e3a77d62a", + "version": "0.5.12", + "port-version": 0 + }, { "git-tree": "7495a338fdd1313d3cdfb67e69406eb4ecea02e9", "version": "0.5.11", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index e3c650d03934cd..cf6fdc1da22270 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74ac36ae24b2c852423a57305005fd86d23d51d9", + "version": "1.9.96", + "port-version": 3 + }, { "git-tree": "1c6b4335305034bea75f07f368e51142abddb789", "version": "1.9.96", diff --git a/versions/baseline.json b/versions/baseline.json index 6da328764fec70..ec415384f29af5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -257,7 +257,7 @@ "port-version": 0 }, "aws-c-cal": { - "baseline": "0.5.11", + "baseline": "0.5.12", "port-version": 0 }, "aws-c-common": { @@ -302,7 +302,7 @@ }, "aws-sdk-cpp": { "baseline": "1.9.96", - "port-version": 2 + "port-version": 3 }, "azmq": { "baseline": "2020-03-03", @@ -5997,7 +5997,7 @@ "port-version": 5 }, "s2n": { - "baseline": "1.1.0", + "baseline": "1.1.1", "port-version": 0 }, "safeint": { diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json index 1e0fd9003ab096..c974721885c153 100644 --- a/versions/s-/s2n.json +++ b/versions/s-/s2n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1f3fbca47339363713845a0e8e06c52c1198a2a", + "version": "1.1.1", + "port-version": 0 + }, { "git-tree": "13b9d04cbee992cf866560de89551ceaf7dfc277", "version": "1.1.0", From 8d73d715552a4964fbb4cd986d8c41a449d1b053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 22 Oct 2021 09:39:52 +0200 Subject: [PATCH 0895/1858] [kf5declarative] new port (#19813) * Add kf5declarative port [WIP] * Fixed kf5declarative for windows * [kf5*] update to 5.75.0 * [kf5declarative] update to current spec * [kf5declarative] copy tools, don't remove them * [kf5declarative] remove redundant options * [kf5declarative] nothing is copied to /etc, no need to remove it * [kf5declarative] wrap paths in quotes * [kf5declarative] use default /share location for data * [kf5declarative] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5declarative] update to 5.84.0 * [kf5declarative] update versions * [kf5declarative] add gettext tools dependency * [kf5declarative] update versions * [kf5declarative] add kf5notifications dependency * [kf5declarative] update versions * [kf5declarative] fix tool handling on macOS * [kf5declarative] fix cmake config for static builds * [kf5declarative] update versions * [kf5declarative] AUTO_CLEAN tools * [kf5declarative] update versions * [kf5declarative] explicitly control epoxy feature * [kf5declarative] KDE_INSTALL_QMLDIR instead moving by hand * [kf5declarative] update versions * [kf5declarative] minimize patch size Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5declarative] fix indentation Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5declarative] drop semVer versioning Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5declarative] enable parallel builds * [kf5declarative] update versions * [kf5declarative] mark CMAKE_DISABLE_FIND_PACKAGE_EPOXY as maybe unused * [kf5declarative] update versions * [kf5declarative] formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5declarative] mark BUNDLE_INSTALL_DIR as maybe unused * [kf5declarative] update versions Co-authored-by: Kuntal Majumder Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/kf5declarative/fix_config_cmake.patch | 23 ++++++++++ ports/kf5declarative/portfile.cmake | 48 +++++++++++++++++++++ ports/kf5declarative/vcpkg.json | 44 +++++++++++++++++++ versions/baseline.json | 4 ++ versions/k-/kf5declarative.json | 9 ++++ 5 files changed, 128 insertions(+) create mode 100644 ports/kf5declarative/fix_config_cmake.patch create mode 100644 ports/kf5declarative/portfile.cmake create mode 100644 ports/kf5declarative/vcpkg.json create mode 100644 versions/k-/kf5declarative.json diff --git a/ports/kf5declarative/fix_config_cmake.patch b/ports/kf5declarative/fix_config_cmake.patch new file mode 100644 index 00000000000000..1ca8e9ed64136f --- /dev/null +++ b/ports/kf5declarative/fix_config_cmake.patch @@ -0,0 +1,23 @@ +diff --git a/KF5DeclarativeConfig.cmake.in b/KF5DeclarativeConfig.cmake.in +index d66617c..1bf4e0a 100644 +--- a/KF5DeclarativeConfig.cmake.in ++++ b/KF5DeclarativeConfig.cmake.in +@@ -6,5 +6,15 @@ find_dependency(KF5Config "@KF_DEP_VERSION@") + find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") + find_dependency(KF5Package "@KF_DEP_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5KIO "@KF_DEP_VERSION@") ++ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") ++ ++ if (ANDROID) ++ find_dependency(epoxy) ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5DeclarativeTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5declarative/portfile.cmake b/ports/kf5declarative/portfile.cmake new file mode 100644 index 00000000000000..38088571879b91 --- /dev/null +++ b/ports/kf5declarative/portfile.cmake @@ -0,0 +1,48 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kdeclarative + REF v5.84.0 + SHA512 5785c49173ccd22aaed040b2590d0f44b6e138bd5c8980ce0d4a31e2bd364f830a256be3dfb7806d206b2197d882c791f73c60f7c973749c4c3e1c7bbf541822 + HEAD_REF master + PATCHES + fix_config_cmake.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "opengl" CMAKE_DISABLE_FIND_PACKAGE_EPOXY +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + -DKDE_INSTALL_QTPLUGINDIR=plugins + -DBUNDLE_INSTALL_DIR=bin + -DKDE_INSTALL_QMLDIR=qml + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_EPOXY + BUNDLE_INSTALL_DIR +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Declarative CONFIG_PATH lib/cmake/KF5Declarative) +vcpkg_copy_pdbs() + +vcpkg_copy_tools( + TOOL_NAMES kpackagelauncherqml + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5declarative/vcpkg.json b/ports/kf5declarative/vcpkg.json new file mode 100644 index 00000000000000..ff59f24981d1df --- /dev/null +++ b/ports/kf5declarative/vcpkg.json @@ -0,0 +1,44 @@ +{ + "name": "kf5declarative", + "version": "5.84.0", + "description": "Integration of QML and KDE work spaces", + "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5config", + "kf5globalaccel", + "kf5guiaddons", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5notifications", + "kf5package", + "kf5widgetsaddons", + "kf5windowsystem", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "opengl": { + "description": "Enables OpenGl support", + "dependencies": [ + "libepoxy" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index ec415384f29af5..99be33c2d5025b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3040,6 +3040,10 @@ "baseline": "5.84.0", "port-version": 2 }, + "kf5declarative": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5diagram": { "baseline": "2.8.0", "port-version": 0 diff --git a/versions/k-/kf5declarative.json b/versions/k-/kf5declarative.json new file mode 100644 index 00000000000000..caca8bbb8fdd61 --- /dev/null +++ b/versions/k-/kf5declarative.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "165b2c1ebe6c3268e4bf32668da9c78c0b097f24", + "version": "5.84.0", + "port-version": 0 + } + ] +} From cbedcbc335f8e4d186ce0141d5afb38933922c64 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 22 Oct 2021 09:42:41 +0200 Subject: [PATCH 0896/1858] [freetype] Fix building Freetype 2.11 on MSVC. (#20674) * Fix building Freetype 2.11 on MSVC. * [freetype] Change tab to spaces. Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [freetype] Remove comments from patch. * [freetype] Quote file paths. * [freetype] Update versions after force push. * [freetype] Update ports/freetype/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [freetype] x-add-version Co-authored-by: Bartosz Taudul Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III --- ports/freetype/fix-2.11-msvc-build.patch | 152 +++++++++++++++++++++++ ports/freetype/portfile.cmake | 29 ++--- ports/freetype/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/freetype.json | 5 + 5 files changed, 174 insertions(+), 15 deletions(-) create mode 100644 ports/freetype/fix-2.11-msvc-build.patch diff --git a/ports/freetype/fix-2.11-msvc-build.patch b/ports/freetype/fix-2.11-msvc-build.patch new file mode 100644 index 00000000000000..49b7e8f2cd6400 --- /dev/null +++ b/ports/freetype/fix-2.11-msvc-build.patch @@ -0,0 +1,152 @@ +diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c +index aedb74ddd..5d53dfb71 100644 +--- a/src/autofit/afglobal.c ++++ b/src/autofit/afglobal.c +@@ -19,6 +19,7 @@ + #include "afglobal.h" + #include "afranges.h" + #include "afshaper.h" ++#include "afws_dec.h" + #include + + +@@ -32,11 +33,6 @@ + #define FT_COMPONENT afglobal + + +- /* get writing system specific header files */ +-#undef WRITING_SYSTEM +-#define WRITING_SYSTEM( ws, WS ) /* empty */ +-#include "afwrtsys.h" +- + #include "aferrors.h" + + +@@ -74,7 +70,7 @@ + af_writing_system_classes[] = + { + +-#include "afwrtsys.h" ++#include "afws_itr.h" + + NULL /* do not remove */ + }; +diff --git a/src/autofit/aftypes.h b/src/autofit/aftypes.h +index e76b103ed..a036a0f56 100644 +--- a/src/autofit/aftypes.h ++++ b/src/autofit/aftypes.h +@@ -198,7 +198,6 @@ extern void* _af_debug_hints; + * outline according to the results of the glyph analyzer. + */ + +-#define AFWRTSYS_H_ /* don't load header files */ + #undef WRITING_SYSTEM + #define WRITING_SYSTEM( ws, WS ) \ + AF_WRITING_SYSTEM_ ## WS, +@@ -207,14 +206,12 @@ extern void* _af_debug_hints; + typedef enum AF_WritingSystem_ + { + +-#include "afwrtsys.h" ++#include "afws_itr.h" + + AF_WRITING_SYSTEM_MAX /* do not remove */ + + } AF_WritingSystem; + +-#undef AFWRTSYS_H_ +- + + typedef struct AF_WritingSystemClassRec_ + { +diff --git a/src/autofit/afws_dec.h b/src/autofit/afws_dec.h +new file mode 100644 +index 000000000..39e707c5a +--- /dev/null ++++ b/src/autofit/afws_dec.h +@@ -0,0 +1,30 @@ ++/**************************************************************************** ++ * ++ * afws_dec.h ++ * ++ * Auto-fitter writing systems (specification only). ++ * ++ * Copyright (C) 2013-2021 by ++ * David Turner, Robert Wilhelm, and Werner Lemberg. ++ * ++ * This file is part of the FreeType project, and may only be used, ++ * modified, and distributed under the terms of the FreeType project ++ * license, LICENSE.TXT. By continuing to use, modify, or distribute ++ * this file you indicate that you have read the license and ++ * understand and accept it fully. ++ * ++ */ ++ ++ ++#ifndef AFWS_DEC_H_ ++#define AFWS_DEC_H_ ++ ++ /* Since preprocessor directives can't create other preprocessor */ ++ /* directives, we have to include the header files manually. */ ++ ++#include "afdummy.h" ++#include "aflatin.h" ++#include "afcjk.h" ++#include "afindic.h" ++ ++#endif /* AFWS_DEC_H_ */ +diff --git a/src/autofit/afwrtsys.h b/src/autofit/afws_itr.h +similarity index 66% +rename from src/autofit/afwrtsys.h +rename to src/autofit/afws_itr.h +index 39aa12112..2da77d459 100644 +--- a/src/autofit/afwrtsys.h ++++ b/src/autofit/afws_itr.h +@@ -1,6 +1,6 @@ + /**************************************************************************** + * +- * afwrtsys.h ++ * afws_itr.h + * + * Auto-fitter writing systems (specification only). + * +@@ -15,23 +15,8 @@ + * + */ + +- +-#ifndef AFWRTSYS_H_ +-#define AFWRTSYS_H_ +- +- /* Since preprocessor directives can't create other preprocessor */ +- /* directives, we have to include the header files manually. */ +- +-#include "afdummy.h" +-#include "aflatin.h" +-#include "afcjk.h" +-#include "afindic.h" +- +-#endif /* AFWRTSYS_H_ */ +- +- +- /* The following part can be included multiple times. */ +- /* Define `WRITING_SYSTEM' as needed. */ ++ /* This header may be included multiple times. */ ++ /* Define `WRITING_SYSTEM' as needed. */ + + + /* Add new writing systems here. The arguments are the writing system */ +diff --git a/src/autofit/rules.mk b/src/autofit/rules.mk +index 19b3bcadb..a5438ecba 100644 +--- a/src/autofit/rules.mk ++++ b/src/autofit/rules.mk +@@ -48,7 +48,8 @@ AUTOF_DRV_H := $(AUTOF_DRV_SRC:%c=%h) \ + $(AUTOF_DIR)/afscript.h \ + $(AUTOF_DIR)/afstyles.h \ + $(AUTOF_DIR)/aftypes.h \ +- $(AUTOF_DIR)/afwrtsys.h ++ $(AUTOF_DIR)/afws_dec.h \ ++ $(AUTOF_DIR)/afws_itr.h + + + # AUTOF driver object(s) diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index bac143343e2c20..7cf312572fac44 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_sourceforge( fix-bzip2-pc.patch # we have a bzip2 file that we can use - https://gitlab.freedesktop.org/freetype/freetype/-/commit/b2aeca5fda870751f3c9d645e0dca4c80fa1ae5a brotli-static.patch fix-exports.patch + fix-2.11-msvc-build.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -38,13 +39,13 @@ vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/freetype) # Rename for easy usage (VS integration; CMake and autotools will not care) -file(RENAME ${CURRENT_PACKAGES_DIR}/include/freetype2/freetype ${CURRENT_PACKAGES_DIR}/include/freetype) -file(RENAME ${CURRENT_PACKAGES_DIR}/include/freetype2/ft2build.h ${CURRENT_PACKAGES_DIR}/include/ft2build.h) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/freetype2) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(RENAME "${CURRENT_PACKAGES_DIR}/include/freetype2/freetype" "${CURRENT_PACKAGES_DIR}/include/freetype") +file(RENAME "${CURRENT_PACKAGES_DIR}/include/freetype2/ft2build.h" "${CURRENT_PACKAGES_DIR}/include/ft2build.h") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/freetype2") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Fix the include dir [freetype2 -> freetype] -file(READ ${CURRENT_PACKAGES_DIR}/share/freetype/freetype-targets.cmake CONFIG_MODULE) +file(READ "${CURRENT_PACKAGES_DIR}/share/freetype/freetype-targets.cmake" CONFIG_MODULE) string(REPLACE "\${_IMPORT_PREFIX}/include/freetype2" "\${_IMPORT_PREFIX}/include" CONFIG_MODULE "${CONFIG_MODULE}") string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlicommon-static.lib" [[\$<\$>:${_IMPORT_PREFIX}/lib/brotlicommon-static.lib>;\$<\$:${_IMPORT_PREFIX}/debug/lib/brotlicommon-static.lib>]] CONFIG_MODULE "${CONFIG_MODULE}") string(REPLACE "\${_IMPORT_PREFIX}/lib/brotlidec-static.lib" [[\$<\$>:${_IMPORT_PREFIX}/lib/brotlidec-static.lib>;\$<\$:${_IMPORT_PREFIX}/debug/lib/brotlidec-static.lib>]] CONFIG_MODULE "${CONFIG_MODULE}") @@ -67,10 +68,10 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freetype2.pc") file(WRITE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/freetype2.pc" "${_contents}") endif() -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") if("zlib" IN_LIST FEATURES) @@ -89,13 +90,13 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(USE_BROTLI ON) endif() - configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) endif() file(COPY - ${SOURCE_PATH}/docs/FTL.TXT - ${SOURCE_PATH}/docs/GPLv2.TXT - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + "${SOURCE_PATH}/docs/FTL.TXT" + "${SOURCE_PATH}/docs/GPLv2.TXT" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" ) -file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index 137163537ab7a6..d9e49300a21e4b 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,6 +1,7 @@ { "name": "freetype", "version-semver": "2.11.0", + "port-version": 1, "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 99be33c2d5025b..d335d070a92f9b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2250,7 +2250,7 @@ }, "freetype": { "baseline": "2.11.0", - "port-version": 0 + "port-version": 1 }, "freetype-gl": { "baseline": "2020-09-14", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index b3b5e8c7308fb5..950afdff05c529 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a314ebd21048f1cf17a6b4330d9970c661f8fea7", + "version-semver": "2.11.0", + "port-version": 1 + }, { "git-tree": "6814e10440bcdc58c4bd29a0373d2f902783ba54", "version-semver": "2.11.0", From 5df6b62ada8ad5c83fd0433917c2767872805094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 22 Oct 2021 15:49:45 +0800 Subject: [PATCH 0897/1858] [opencascade] Add feature rapidjson (#20855) * [opencascade] Add feature rapidjson * version * Update ports/opencascade/portfile.cmake * Update versions/o-/opencascade.json --- ports/opencascade/portfile.cmake | 59 ++++++++++++++++---------------- ports/opencascade/vcpkg.json | 18 ++++++++-- versions/baseline.json | 2 +- versions/o-/opencascade.json | 5 +++ 4 files changed, 52 insertions(+), 32 deletions(-) diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 86fc2a34eb80f4..5188e6b0532919 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -19,8 +19,10 @@ else() endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "freeimage" USE_FREEIMAGE - "tbb" USE_TBB + FEATURES + "freeimage" USE_FREEIMAGE + "tbb" USE_TBB + "rapidjson" USE_RAPIDJSON ) # VTK option in opencascade not currently supported because only 6.1.0 is supported but vcpkg has >= 9.0 @@ -29,9 +31,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0 # And pre-built ActiveTCL binaries are behind a marketing wall :( # We use the Unix install layout for Windows as it matches vcpkg -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DBUILD_LIBRARY_TYPE=${BUILD_TYPE} -DBUILD_MODULE_Draw=OFF @@ -43,9 +44,9 @@ vcpkg_configure_cmake( -DINSTALL_SAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/opencascade) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/opencascade) #make occt includes relative to source_file list(APPEND ADDITIONAL_HEADERS @@ -59,52 +60,52 @@ list(APPEND ADDITIONAL_HEADERS ) file(GLOB files "${CURRENT_PACKAGES_DIR}/include/opencascade/[a-zA-Z0-9_]*\.[hgl]xx") -foreach(file_name ${files}) - file(READ ${file_name} filedata) +foreach(file_name IN LISTS files) + file(READ "${file_name}" filedata) string(REGEX REPLACE "# *include \<([a-zA-Z0-9_]*\.[hgl]xx)\>" "#include \"\\1\"" filedata "${filedata}") - foreach(extra_header ${ADDITIONAL_HEADERS}) + foreach(extra_header IN LISTS ADDITIONAL_HEADERS) string(REGEX REPLACE "# *include \<${extra_header}\>" "#include \"${extra_header}\"" filedata "${filedata}") endforeach() - file(WRITE ${file_name} "${filedata}") + file(WRITE "${file_name}" "${filedata}") endforeach() # Remove libd to lib, libd just has cmake files we dont want too -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/libd ${CURRENT_PACKAGES_DIR}/debug/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/lib") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) # debug creates libd and bind directories that need moving - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bind ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bind" "${CURRENT_PACKAGES_DIR}/debug/bin") # fix paths in target files list(APPEND TARGET_FILES - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake - ${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEApplicationFrameworkTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADECompileDefinitionsAndFlags-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEDataExchangeTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEFoundationClassesTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingAlgorithmsTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEModelingDataTargets-debug.cmake" + "${CURRENT_PACKAGES_DIR}/share/opencascade/OpenCASCADEVisualizationTargets-debug.cmake" ) - foreach(TARGET_FILE ${TARGET_FILES}) - file(READ ${TARGET_FILE} filedata) + foreach(TARGET_FILE IN LISTS TARGET_FILES) + file(READ "${TARGET_FILE}" filedata) string(REGEX REPLACE "libd" "lib" filedata "${filedata}") string(REGEX REPLACE "bind" "bin" filedata "${filedata}") - file(WRITE ${TARGET_FILE} ${filedata}) + file(WRITE "${TARGET_FILE}" "${filedata}") endforeach() # the bin directory ends up with bat files that are noise, let's clean that up - file(GLOB BATS ${CURRENT_PACKAGES_DIR}/bin/*.bat) + file(GLOB BATS "${CURRENT_PACKAGES_DIR}/bin/*.bat") file(REMOVE_RECURSE ${BATS}) else() # remove scripts in bin dir - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/OCCT_LGPL_EXCEPTION.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index 8296c5a98ccefc..f3ffe14611ffa5 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,11 +1,19 @@ { "name": "opencascade", "version-string": "7.5.0", - "port-version": 2, + "port-version": 3, "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", "supports": "!(uwp | osx | linux | arm)", "dependencies": [ - "freetype" + "freetype", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "freeimage": { @@ -14,6 +22,12 @@ "freeimage" ] }, + "rapidjson": { + "description": "Enable optional usage of rapidjson", + "dependencies": [ + "rapidjson" + ] + }, "tbb": { "description": "Enable optional usage of tbb", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d335d070a92f9b..08c5a894b0cec7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4818,7 +4818,7 @@ }, "opencascade": { "baseline": "7.5.0", - "port-version": 2 + "port-version": 3 }, "opencc": { "baseline": "2020-04-26", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 84d4ff52937b05..7f8934729a98ec 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc0aab2d38343a9640300fb0f46c67f5313cf16c", + "version-string": "7.5.0", + "port-version": 3 + }, { "git-tree": "c7237c216387119d00fe5d113c6c666f1572b2f0", "version-string": "7.5.0", From 2e27037f1f695c1346075cbb873ecfba09649848 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 25 Oct 2021 13:35:56 -0700 Subject: [PATCH 0898/1858] [libopenmpt] Upgrade to 0.5.10, include author feedback (#18933) * [libopenmpt] Upgrade to 0.5.10, include author feedback * [libopenmpt] Add version info * [mpg123] Switch to CMake build for all platforms. Fixes#15551 * [libopenmpt] Address CR feedback * [libopenmpt] Update to 0.5.12 * Update version db Co-authored-by: Billy Robert O'Neal III --- ports/libopenmpt/CMakeLists.txt | 256 +++--------------- ...2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch | 13 - ports/libopenmpt/portfile.cmake | 36 +-- ports/libopenmpt/vcpkg.json | 16 +- .../mpg123/0003-fix-libout123-uwp-build.patch | 2 +- ports/mpg123/no-executables.patch | 13 + ports/mpg123/portfile.cmake | 58 +--- ports/mpg123/vcpkg.json | 1 + versions/baseline.json | 6 +- versions/l-/libopenmpt.json | 5 + versions/m-/mpg123.json | 5 + 11 files changed, 110 insertions(+), 301 deletions(-) delete mode 100644 ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch create mode 100644 ports/mpg123/no-executables.patch diff --git a/ports/libopenmpt/CMakeLists.txt b/ports/libopenmpt/CMakeLists.txt index 6f4ad1b57627a4..35094e8f44a9d4 100644 --- a/ports/libopenmpt/CMakeLists.txt +++ b/ports/libopenmpt/CMakeLists.txt @@ -10,28 +10,11 @@ if(MSVC) endif() find_package(ZLIB REQUIRED) - -find_package(MPG123 REQUIRED) +find_package(mpg123 CONFIG REQUIRED) find_package(Vorbis REQUIRED) -find_package(FLAC REQUIRED) - -find_package(portaudio REQUIRED) -set( - lib_headers - libopenmpt/libopenmpt.h - libopenmpt/libopenmpt.hpp - libopenmpt/libopenmpt_config.h - libopenmpt/libopenmpt_ext.h - libopenmpt/libopenmpt_ext.hpp - libopenmpt/libopenmpt_ext_impl.hpp - libopenmpt/libopenmpt_impl.hpp - libopenmpt/libopenmpt_internal.h - libopenmpt/libopenmpt_stream_callbacks_buffer.h - libopenmpt/libopenmpt_stream_callbacks_fd.h - libopenmpt/libopenmpt_stream_callbacks_file.h - libopenmpt/libopenmpt_version.h -) +file(GLOB HEADERS libopenmpt/*.h libopenmpt/*.hpp) +list(FILTER HEADERS EXCLUDE REGEX "_impl\\.hpp$|_internal\\.h$") include_directories( . @@ -44,224 +27,69 @@ include_directories( openmpt123 ) -set( - lib_sources - common/ComponentManager.cpp - common/FileReader.cpp - common/Logging.cpp - common/Profiler.cpp - common/misc_util.cpp - common/mptCPU.cpp - common/mptFileIO.cpp - common/mptIO.cpp - common/mptLibrary.cpp - common/mptOS.cpp - common/mptPathString.cpp - common/mptRandom.cpp - common/mptString.cpp - common/mptStringFormat.cpp - common/mptStringParse.cpp - common/mptTime.cpp - common/mptUUID.cpp - common/mptWine.cpp - common/serialization_utils.cpp - common/stdafx.cpp - common/typedefs.cpp - common/version.cpp +file(GLOB_RECURSE SOURCES + common/*.cpp + soundbase/*.cpp + sounddsp/*.cpp + # Because this is a GLOB_RECURSE, soundlib/plugins/*.cpp will be included + soundlib/*.cpp libopenmpt/libopenmpt_c.cpp libopenmpt/libopenmpt_cxx.cpp libopenmpt/libopenmpt_ext_impl.cpp libopenmpt/libopenmpt_impl.cpp - sounddsp/AGC.cpp - sounddsp/DSP.cpp - sounddsp/EQ.cpp - sounddsp/Reverb.cpp - soundlib/AudioCriticalSection.cpp - soundlib/ContainerMMCMP.cpp - soundlib/ContainerPP20.cpp - soundlib/ContainerUMX.cpp - soundlib/ContainerXPK.cpp - soundlib/Dither.cpp - soundlib/Dlsbank.cpp - soundlib/Fastmix.cpp - soundlib/ITCompression.cpp - soundlib/ITTools.cpp - soundlib/InstrumentExtensions.cpp - soundlib/Load_669.cpp - soundlib/Load_amf.cpp - soundlib/Load_ams.cpp - soundlib/Load_dbm.cpp - soundlib/Load_digi.cpp - soundlib/Load_dmf.cpp - soundlib/Load_dsm.cpp - soundlib/Load_dtm.cpp - soundlib/Load_far.cpp - soundlib/Load_gdm.cpp - soundlib/Load_imf.cpp - soundlib/Load_it.cpp - soundlib/Load_itp.cpp - soundlib/Load_mdl.cpp - soundlib/Load_med.cpp - soundlib/Load_mid.cpp - soundlib/Load_mo3.cpp - soundlib/Load_mod.cpp - soundlib/Load_mt2.cpp - soundlib/Load_mtm.cpp - soundlib/Load_okt.cpp - soundlib/Load_plm.cpp - soundlib/Load_psm.cpp - soundlib/Load_ptm.cpp - soundlib/Load_s3m.cpp - soundlib/Load_sfx.cpp - soundlib/Load_stm.cpp - soundlib/Load_stp.cpp - soundlib/Load_uax.cpp - soundlib/Load_ult.cpp - soundlib/Load_wav.cpp - soundlib/Load_xm.cpp - soundlib/MIDIEvents.cpp - soundlib/MIDIMacros.cpp - soundlib/MPEGFrame.cpp - soundlib/Message.cpp - soundlib/MixFuncTable.cpp - soundlib/MixerLoops.cpp - soundlib/MixerSettings.cpp - soundlib/ModChannel.cpp - soundlib/ModInstrument.cpp - soundlib/ModSample.cpp - soundlib/ModSequence.cpp - soundlib/OggStream.cpp - soundlib/Paula.cpp - soundlib/RowVisitor.cpp - soundlib/S3MTools.cpp - soundlib/SampleFormatFLAC.cpp - soundlib/SampleFormatMP3.cpp - soundlib/SampleFormatMediaFoundation.cpp - soundlib/SampleFormatOpus.cpp - soundlib/SampleFormatVorbis.cpp - soundlib/SampleFormats.cpp - soundlib/SampleIO.cpp - soundlib/Snd_flt.cpp - soundlib/Snd_fx.cpp - soundlib/Sndfile.cpp - soundlib/Sndmix.cpp - soundlib/SoundFilePlayConfig.cpp - soundlib/Tables.cpp - soundlib/Tagging.cpp - soundlib/UMXTools.cpp - soundlib/UpgradeModule.cpp - soundlib/WAVTools.cpp - soundlib/WindowedFIR.cpp - soundlib/XMTools.cpp - soundlib/load_j2b.cpp - soundlib/mod_specifications.cpp - soundlib/modcommand.cpp - soundlib/modsmp_ctrl.cpp - soundlib/pattern.cpp - soundlib/patternContainer.cpp - soundlib/plugins/DigiBoosterEcho.cpp - soundlib/plugins/LFOPlugin.cpp - soundlib/plugins/PlugInterface.cpp - soundlib/plugins/PluginManager.cpp - soundlib/plugins/dmo/Chorus.cpp - soundlib/plugins/dmo/Compressor.cpp - soundlib/plugins/dmo/DMOPlugin.cpp - soundlib/plugins/dmo/Distortion.cpp - soundlib/plugins/dmo/Echo.cpp - soundlib/plugins/dmo/Flanger.cpp - soundlib/plugins/dmo/Gargle.cpp - soundlib/plugins/dmo/I3DL2Reverb.cpp - soundlib/plugins/dmo/ParamEq.cpp - soundlib/plugins/dmo/WavesReverb.cpp - soundlib/tuning.cpp - soundlib/tuningCollection.cpp - soundlib/tuningbase.cpp -) - -add_library(libopenmpt ${lib_sources}) - -target_compile_definitions(libopenmpt PRIVATE - -DMPT_WITH_MPG123 -DMPT_WITH_OGG - -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE - -DMPT_WITH_ZLIB -DMPT_BUILD_VCPKG - -DLIBOPENMPT_BUILD ) -set(cli_srcs openmpt123/openmpt123.cpp) +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) -add_executable(openmpt123 ${cli_srcs}) +add_library(libopenmpt ${SOURCES}) -target_compile_definitions(openmpt123 PRIVATE +target_compile_definitions(libopenmpt PRIVATE -DMPT_WITH_MPG123 -DMPT_WITH_OGG -DMPT_WITH_VORBIS -DMPT_WITH_VORBISFILE -DMPT_WITH_ZLIB -DMPT_BUILD_VCPKG -DLIBOPENMPT_BUILD ) - - if(BUILD_SHARED_LIBS) target_compile_definitions( libopenmpt - PRIVATE - -DMPT_BUILD_MSVC_SHARED -DLIBOPENMPT_BUILD_DLL - ) - target_compile_definitions( - openmpt123 - PRIVATE - -DMPT_BUILD_MSVC_SHARED -DLIBOPENMPT_BUILD_DLL - ) -else() - target_compile_definitions( - libopenmpt - PRIVATE - -DMPT_BUILD_MSVC_STATIC - ) - target_compile_definitions( - openmpt123 - PRIVATE - -DMPT_BUILD_MSVC_STATIC + PRIVATE -DLIBOPENMPT_BUILD_DLL ) endif() -target_link_libraries( +target_include_directories( libopenmpt - PRIVATE - MPG123::libmpg123 - Vorbis::vorbisfile - FLAC::FLAC - ZLIB::ZLIB + PUBLIC + $ ) -if(BUILD_SHARED_LIBS) - set(PORTAUDIO_TARGET portaudio) -else() - set(PORTAUDIO_TARGET portaudio_static) -endif() - target_link_libraries( - openmpt123 - PRIVATE libopenmpt - Winmm - ZLIB::ZLIB - ${PORTAUDIO_TARGET} -) - -install( - TARGETS libopenmpt - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib + PRIVATE + MPG123::libmpg123 + Vorbis::vorbisfile + Vorbis::vorbis + ZLIB::ZLIB ) -if(NOT DISABLE_INSTALL_HEADERS) - install(FILES ${lib_headers} DESTINATION include/libopenmpt) -endif() - -if(NOT DISABLE_INSTALL_TOOLS) - install ( - TARGETS openmpt123 - RUNTIME DESTINATION tools/libopenmpt - ) -endif() +set(LIBOPENMPT_REQUIRES_PRIVATE "zlib vorbis vorbisfile libmpg123") +set(LIBOPENMPT_LIBS_PRIVATE "") +set(prefix "${CMAKE_INSTALL_PREFIX}") +set(exec_prefix [[${prefix}]]) +set(includedir [[${prefix}/include]]) +set(libdir [[${prefix}/lib]]) +configure_file(libopenmpt/libopenmpt.pc.in libopenmpt.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt.pc DESTINATION lib/pkgconfig) + +install(TARGETS libopenmpt EXPORT libopenmpt-targets) +install(EXPORT libopenmpt-targets DESTINATION share/libopenmpt NAMESPACE libopenmpt::) +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake [[ +include(CMakeFindDependencyMacro) +find_dependency(ZLIB) +find_dependency(mpg123 CONFIG) +find_dependency(Vorbis) +include(${CMAKE_CURRENT_LIST_DIR}/libopenmpt-targets.cmake) +]]) +install(FILES ${HEADERS} DESTINATION include/libopenmpt) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenmpt-config.cmake DESTINATION share/libopenmpt) diff --git a/ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch b/ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch deleted file mode 100644 index cece6f839272d4..00000000000000 --- a/ports/libopenmpt/deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common/mptUUID.h b/common/mptUUID.h -index a683fdcab..be7d4cb61 100644 ---- a/common/mptUUID.h -+++ b/common/mptUUID.h -@@ -13,6 +13,8 @@ - - #include "Endianness.h" - -+#include -+ - #if MPT_OS_WINDOWS - #if defined(MODPLUG_TRACKER) || !defined(NO_DMO) - #include diff --git a/ports/libopenmpt/portfile.cmake b/ports/libopenmpt/portfile.cmake index 76cb968dc513ec..77e2a823ff6bca 100644 --- a/ports/libopenmpt/portfile.cmake +++ b/ports/libopenmpt/portfile.cmake @@ -1,27 +1,31 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - message(FATAL_ERROR "Windowstore not supported") -endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OpenMPT/openmpt - REF cf2390140c37a53ecf7d5fe73412982d346efba4 - SHA512 6401bac7a899eaacebb601591f982fabde6351f1c0dc0c2d24f1f303b78592e7883a84463bdf3cf0fd029eb38d7b7085fdfadafea2931b307b43d0b601db863e + REF 7da598b28acdb8ee8ea0ed93bcb57d680424f5cc # libopenmpt-0.5.12 + SHA512 0f5441518dbbbbae194c724c47238a3cad876d8eb81e6a89fed3801724a6ae023d6d8806f792dc2f44082f3849cd4e1130081db3668f9974170171227f70e879 HEAD_REF master - PATCHES - deaf2e3837fb08b1a53fd21bb53adbafe0a84e7d.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(READ ${CMAKE_CURRENT_LIST_DIR}/vcpkg.json vcpkg_json) +string(JSON version GET "${vcpkg_json}" "version") +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DVERSION=${version} ) - -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/libopenmpt) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libopenmpt RENAME copyright) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libopenmpt/libopenmpt_config.h "defined(LIBOPENMPT_USE_DLL)" "0") +else() + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libopenmpt/libopenmpt_config.h "defined(LIBOPENMPT_USE_DLL)" "1") +endif() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/libopenmpt/vcpkg.json b/ports/libopenmpt/vcpkg.json index 3668ed848b6a70..d050598a1a3f5f 100644 --- a/ports/libopenmpt/vcpkg.json +++ b/ports/libopenmpt/vcpkg.json @@ -1,16 +1,20 @@ { "name": "libopenmpt", - "version-string": "2017-01-28-cf2390140", - "port-version": 2, + "version": "0.5.12", "description": "a library to render tracker music", - "homepage": "https://github.com/OpenMPT/openmpt", - "supports": "!uwp", + "homepage": "https://openmpt.org/", "dependencies": [ - "libflac", "libogg", "libvorbis", "mpg123", - "portaudio", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/mpg123/0003-fix-libout123-uwp-build.patch b/ports/mpg123/0003-fix-libout123-uwp-build.patch index 2302c4283d276f..b1b37f5e5ea347 100644 --- a/ports/mpg123/0003-fix-libout123-uwp-build.patch +++ b/ports/mpg123/0003-fix-libout123-uwp-build.patch @@ -263,4 +263,4 @@ index b843152..3945c7e 100644 +endif() add_subdirectory("libsyn123") - if(UNIX) + if(0) diff --git a/ports/mpg123/no-executables.patch b/ports/mpg123/no-executables.patch new file mode 100644 index 00000000000000..7ceb8b9979caff --- /dev/null +++ b/ports/mpg123/no-executables.patch @@ -0,0 +1,13 @@ +diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt +index b843152..00f8012 100644 +--- a/ports/cmake/src/CMakeLists.txt ++++ b/ports/cmake/src/CMakeLists.txt +@@ -365,7 +365,7 @@ add_subdirectory("libmpg123") + add_subdirectory("libout123") + add_subdirectory("libsyn123") + +-if(UNIX) ++if(0) + add_subdirectory("tests") + + add_executable(${PROJECT_NAME} diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index dd12ddc0d595e5..d89cda0de1ca87 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -18,60 +18,22 @@ vcpkg_from_sourceforge( SHA512 ${MPG123_HASH} PATCHES 0001-fix-checkcpuarch-path.patch + no-executables.patch ${PATCHES} ) include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake) yasm_tool_helper(APPEND_TO_PATH) -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/ports/cmake - OPTIONS -DUSE_MODULES=OFF - ) - vcpkg_install_cmake() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) - vcpkg_fixup_pkgconfig() - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -elseif(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) - set(MPG123_OPTIONS - --disable-dependency-tracking - ) - - # Find cross-compiler prefix - if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") - endif() - if(CMAKE_C_COMPILER) - vcpkg_execute_required_process( - COMMAND ${CMAKE_C_COMPILER} -dumpmachine - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME dumpmachine-${TARGET_TRIPLET} - ) - file(READ ${CURRENT_BUILDTREES_DIR}/dumpmachine-${TARGET_TRIPLET}-out.log MPG123_HOST) - string(REPLACE "\n" "" MPG123_HOST "${MPG123_HOST}") - message(STATUS "Cross-compiling with ${CMAKE_C_COMPILER}") - message(STATUS "Detected autoconf triplet --host=${MPG123_HOST}") - set(MPG123_OPTIONS - --host=${MPG123_HOST} - ${MPG123_OPTIONS} - ) - endif() +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH}/ports/cmake + OPTIONS -DUSE_MODULES=OFF +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${MPG123_OPTIONS} - ) - vcpkg_install_make() - vcpkg_fixup_pkgconfig() - - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -message(STATUS "Installing done") diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json index e699f891557b0e..3d0246a8c1efff 100644 --- a/ports/mpg123/vcpkg.json +++ b/ports/mpg123/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mpg123", "version": "1.28.0", + "port-version": 1, "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).", "homepage": "https://sourceforge.net/projects/mpg123/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 08c5a894b0cec7..bba77839b01bce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3665,8 +3665,8 @@ "port-version": 0 }, "libopenmpt": { - "baseline": "2017-01-28-cf2390140", - "port-version": 2 + "baseline": "0.5.12", + "port-version": 0 }, "libopensp": { "baseline": "1.5.2", @@ -4430,7 +4430,7 @@ }, "mpg123": { "baseline": "1.28.0", - "port-version": 0 + "port-version": 1 }, "mpi": { "baseline": "1", diff --git a/versions/l-/libopenmpt.json b/versions/l-/libopenmpt.json index 30e4512e13ead9..73690c864657a8 100644 --- a/versions/l-/libopenmpt.json +++ b/versions/l-/libopenmpt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cb8a2342ad5552d311c9f38d399b2ca55726f8a", + "version": "0.5.12", + "port-version": 0 + }, { "git-tree": "465b2d6e597952e0ef962af05dce08769dba11e7", "version-string": "2017-01-28-cf2390140", diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json index 098759f80d31ab..bc7bc7d9df166a 100644 --- a/versions/m-/mpg123.json +++ b/versions/m-/mpg123.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe2d74c3ff7d3dc66eaaf61d64a950c566798dcd", + "version": "1.28.0", + "port-version": 1 + }, { "git-tree": "b34c661c7e28355ade113c330d1c3b93a77a4e13", "version": "1.28.0", From 417fc5ae621ec4fc2763d90d16b33858cc0defd8 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 25 Oct 2021 14:34:38 -0700 Subject: [PATCH 0899/1858] [xaudio2redist, directxtk] updated XAudio2 port to 1.2.8 and added cmake find (#20780) * [xaudio2redist] updated for new version and added find_package support * 1.2.7 didn't last long... on to 1.2.8 * baseline update * Upstream change for directxtk port to use new find package * update baseline * Updated vcpkg_fail_port_install for Linux and OSX * Update ports/xaudio2redist/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * update baseline * Added quotes per request * Update baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/directxtk/portfile.cmake | 4 +- ports/directxtk/vcpkg.json | 2 +- ports/xaudio2redist/Findxaudio2redist.cmake | 54 +++++++++++++++++++ ports/xaudio2redist/portfile.cmake | 40 +++++++------- ports/xaudio2redist/vcpkg-cmake-wrapper.cmake | 11 ++++ ports/xaudio2redist/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/d-/directxtk.json | 5 ++ versions/x-/xaudio2redist.json | 5 ++ 9 files changed, 102 insertions(+), 25 deletions(-) create mode 100644 ports/xaudio2redist/Findxaudio2redist.cmake create mode 100644 ports/xaudio2redist/vcpkg-cmake-wrapper.cmake diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index e13516d8f12cb2..4d4e5a5b900eb3 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF oct2021 - SHA512 5203ca6fe479359615e9d775d3e378669d1fbbb828915ed6b475d58e85f597cbbdbe23425e3c77df33291a806a3865131e7c1d1001ec92f16747958f3cf251bf + REF oct2021b + SHA512 203e930a9d7fb8dbf3a9e9266f00ee847ceaecb462a3c0450fac54fa2e36fda206d35ab7a1eac59eb83dd433f64e4c353a38dfa40691cd7326ba76b052931bf2 HEAD_REF master ) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index c732153875a31f..22470b7ed8521c 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-string": "oct2021", + "version-string": "oct2021b", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/ports/xaudio2redist/Findxaudio2redist.cmake b/ports/xaudio2redist/Findxaudio2redist.cmake new file mode 100644 index 00000000000000..18de7bfa40803e --- /dev/null +++ b/ports/xaudio2redist/Findxaudio2redist.cmake @@ -0,0 +1,54 @@ +include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake) + +set(XAUDIO2REDIST_VERSION "1.2.8") + +if(NOT xaudio2redist_INCLUDE_DIR) + find_path(xaudio2redist_INCLUDE_DIR + NAMES xaudio2redist.h + PATH_SUFFIXES xaudio2redist) +endif() + +find_package_handle_standard_args(xaudio2redist + REQUIRED_VARS xaudio2redist_INCLUDE_DIR + VERSION_VAR XAUDIO2REDIST_VERSION) +mark_as_advanced(xaudio2redist_INCLUDE_DIR) + +string(REPLACE "/include/xaudio2redist" "/lib" xaudio2redist_LIB_DIR ${xaudio2redist_INCLUDE_DIR}) +string(REPLACE "/include/xaudio2redist" "/bin" xaudio2redist_BIN_DIR ${xaudio2redist_INCLUDE_DIR}) +string(REPLACE "/include/xaudio2redist" "/debug/lib" xaudio2redist_DEBUG_LIB_DIR ${xaudio2redist_INCLUDE_DIR}) +string(REPLACE "/include/xaudio2redist" "/debug/bin" xaudio2redist_DEBUG_BIN_DIR ${xaudio2redist_INCLUDE_DIR}) + +if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XAudio2Redist) + set(XAUDIO2_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xaudio2_9redist.lib") + set(XAUDIO2_RELEASE_DLL "${xaudio2redist_BIN_DIR}/xaudio2_9redist.dll") + + set(XAUDIO2_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xaudio2_9redist.lib") + set(XAUDIO2_DEBUG_DLL "${xaudio2redist_DEBUG_BIN_DIR}/xaudio2_9redist.dll") + + add_library(Microsoft::XAudio2Redist SHARED IMPORTED) + set_target_properties(Microsoft::XAudio2Redist PROPERTIES + IMPORTED_LOCATION_RELEASE "${XAUDIO2_RELEASE_DLL}" + IMPORTED_IMPLIB_RELEASE "${XAUDIO2_RELEASE_LIB}" + IMPORTED_LOCATION_DEBUG "${XAUDIO2_DEBUG_DLL}" + IMPORTED_IMPLIB_DEBUG "${XAUDIO2_DEBUG_LIB}" + INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS "Debug;Release" + IMPORTED_LINK_INTERFACE_LANGUAGES "C") +endif() + +if(XAUDIO2REDIST_FOUND AND NOT TARGET Microsoft::XApoBase) + set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist_md.lib") + set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist_md.lib") + + if(NOT EXISTS ${XAPOBASE_RELEASE_LIB}) + set(XAPOBASE_RELEASE_LIB "${xaudio2redist_LIB_DIR}/xapobaseredist.lib") + set(XAPOBASE_DEBUG_LIB "${xaudio2redist_DEBUG_LIB_DIR}/xapobaseredist.lib") + endif() + + add_library(Microsoft::XApoBase STATIC IMPORTED) + set_target_properties(Microsoft::XApoBase PROPERTIES + IMPORTED_LOCATION_RELEASE "${XAPOBASE_RELEASE_LIB}" + IMPORTED_LOCATION_DEBUG "${XAPOBASE_DEBUG_LIB}" + INTERFACE_INCLUDE_DIRECTORIES "${xaudio2redist_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS "Debug;Release") +endif() diff --git a/ports/xaudio2redist/portfile.cmake b/ports/xaudio2redist/portfile.cmake index 005791cc94a83c..2e8b479ca2a813 100644 --- a/ports/xaudio2redist/portfile.cmake +++ b/ports/xaudio2redist/portfile.cmake @@ -1,15 +1,11 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") - -if(NOT VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "${PORT} only supports Windows.") -endif() +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "Linux" "OSX") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(ARCHIVE - URLS "https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/1.2.6" - FILENAME "xaudio2redist.1.2.6.zip" - SHA512 f9b0bacb5787e0239cbf1ffed8e1e8896aa32f69755b084995b2fd1bfe4d49a876d9a69e26469e8779a461e8ff74dc9d5ea86e1ff045dfe2770dfb08b8ba16c3 + URLS "https://www.nuget.org/api/v2/package/Microsoft.XAudio2.Redist/1.2.8" + FILENAME "xaudio2redist.1.2.8.zip" + SHA512 509b2783457b86ed1878fd4e14a01fa7288591925a2bb3cad4d68afd597fbff1f1349b619dad628b5d685169825a775120e1611559e9097837cff0fb6d39acf0 ) vcpkg_extract_source_archive_ex( @@ -18,18 +14,24 @@ vcpkg_extract_source_archive_ex( NO_REMOVE_ONE_LEVEL ) -file(GLOB HEADER_FILES ${PACKAGE_PATH}/build/native/include/*.h) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(GLOB HEADER_FILES "${PACKAGE_PATH}/build/native/include/*.h") +file(INSTALL ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") -file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) -file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + +if(VCPKG_CRT_LINKAGE STREQUAL dynamic) + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") +else() + file(INSTALL "${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") +endif() -file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) -file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) -file(COPY ${PACKAGE_PATH}/build/native/release/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib/) -file(COPY ${PACKAGE_PATH}/build/native/debug/lib/${VCPKG_TARGET_ARCHITECTURE}/xapobaseredist_md.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) +file(COPY "${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") +file(COPY "${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") -file(COPY ${PACKAGE_PATH}/build/native/release/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin/) -file(COPY ${PACKAGE_PATH}/build/native/debug/bin/${VCPKG_TARGET_ARCHITECTURE}/xaudio2_9redist.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/) +file(INSTALL "${PACKAGE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL ${PACKAGE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/Findxaudio2redist.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake b/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake new file mode 100644 index 00000000000000..32610b66f9fee4 --- /dev/null +++ b/ports/xaudio2redist/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,11 @@ +message(STATUS "Using VCPKG Findxaudio2redist") +set(XAUDIO2_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + +list(REMOVE_ITEM ARGS "NO_MODULE") +list(REMOVE_ITEM ARGS "CONFIG") +list(REMOVE_ITEM ARGS "MODULE") + +_find_package(${ARGS}) + +set(CMAKE_MODULE_PATH ${XAUDIO2_PREV_MODULE_PATH}) diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index 846499500a2d24..cb596c2fa7dbfa 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xaudio2redist", - "version-string": "1.2.6", + "version-string": "1.2.8", "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "supports": "windows & !arm & !uwp & !static" diff --git a/versions/baseline.json b/versions/baseline.json index bba77839b01bce..01c1c06f0f7c20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1817,7 +1817,7 @@ "port-version": 0 }, "directxtk": { - "baseline": "oct2021", + "baseline": "oct2021b", "port-version": 0 }, "directxtk12": { @@ -7145,7 +7145,7 @@ "port-version": 0 }, "xaudio2redist": { - "baseline": "1.2.6", + "baseline": "1.2.8", "port-version": 0 }, "xbyak": { diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 4df6619e48dec0..84e15298120c0f 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09200c3486444bbcce57ec680606781b5e16175c", + "version-string": "oct2021b", + "port-version": 0 + }, { "git-tree": "e6356a5599a11c8670068358b150033e9da82b55", "version-string": "oct2021", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index f2a219fe953b77..f87be3dcc11cd2 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71315ed933daddc996ecb863c39fc178b3f80771", + "version-string": "1.2.8", + "port-version": 0 + }, { "git-tree": "e33a929ddbf8ebc95959d6650a38d351aafea07c", "version-string": "1.2.6", From f045b5bba3c5c920ef9c6f15af50fb3b0dbc484c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 27 Oct 2021 01:03:33 +0200 Subject: [PATCH 0900/1858] many ports: Fix pkgconfig files location (#20943) * many ports: Fix pkgconfig files location * Use rename in botan rather than install plus delete. * Delete the duplicate share/pkgconfig files in cppad *after* vcpkg_fixup_pkgconfig. Co-authored-by: Billy Robert O'Neal III --- ports/botan/portfile.cmake | 6 ++++++ ports/botan/vcpkg.json | 1 + ports/cppad/portfile.cmake | 10 +--------- ports/cppad/vcpkg.json | 2 +- ports/gtest/fix-main-lib-path.patch | 9 --------- ports/gtest/portfile.cmake | 31 +++++------------------------ ports/gtest/vcpkg.json | 1 + ports/log4cpp/portfile.cmake | 3 ++- ports/log4cpp/vcpkg.json | 2 +- ports/openmesh/portfile.cmake | 5 +++++ ports/openmesh/vcpkg.json | 2 +- ports/polyclipping/portfile.cmake | 4 ++++ ports/polyclipping/vcpkg.json | 2 +- ports/quill/portfile.cmake | 4 ++++ ports/quill/vcpkg.json | 2 +- versions/b-/botan.json | 5 +++++ versions/baseline.json | 14 ++++++------- versions/c-/cppad.json | 5 +++++ versions/g-/gtest.json | 5 +++++ versions/l-/log4cpp.json | 5 +++++ versions/o-/openmesh.json | 5 +++++ versions/p-/polyclipping.json | 5 +++++ versions/q-/quill.json | 5 +++++ 23 files changed, 76 insertions(+), 57 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index 4351791f3f1c15..ea5fae8de06bac 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -120,6 +120,12 @@ endfunction() BOTAN_BUILD(rel) BOTAN_BUILD(dbg) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") +vcpkg_fixup_pkgconfig() + file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") vcpkg_copy_pdbs() diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 939b8399010a78..809346855a2a65 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,6 +1,7 @@ { "name": "botan", "version": "2.18.1", + "port-version": 1, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/ports/cppad/portfile.cmake b/ports/cppad/portfile.cmake index 1a041d48f4c86e..3de2570379bb4d 100644 --- a/ports/cppad/portfile.cmake +++ b/ports/cppad/portfile.cmake @@ -25,16 +25,8 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() - -# Install the pkgconfig file -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -endif() -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/pkgconfig/cppad.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -endif() - vcpkg_fixup_pkgconfig() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") # Add the copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cppad/vcpkg.json b/ports/cppad/vcpkg.json index a8c2d15910e2a4..48ae8fa4eb06fa 100644 --- a/ports/cppad/vcpkg.json +++ b/ports/cppad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cppad", "version-string": "20210000.7", - "port-version": 1, + "port-version": 2, "description": "CppAD: A Package for Differentiation of C++ Algorithms", "homepage": "https://github.com/coin-or/CppAD", "supports": "!(arm | uwp)", diff --git a/ports/gtest/fix-main-lib-path.patch b/ports/gtest/fix-main-lib-path.patch index 8b4349f7f1daa8..c2998f3e4479d9 100644 --- a/ports/gtest/fix-main-lib-path.patch +++ b/ports/gtest/fix-main-lib-path.patch @@ -57,12 +57,3 @@ index 8d8d60a..b08ce28 100644 OPTIONAL) endforeach() endif() -@@ -338,7 +342,7 @@ function(install_project) - configure_file("${PROJECT_SOURCE_DIR}/cmake/${t}.pc.in" - "${configured_pc}" @ONLY) - install(FILES "${configured_pc}" -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ DESTINATION "${LIB_INSTALL_DST}/pkgconfig") - endforeach() - endif() - endfunction() diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 0053f5d5b4544b..97086c5bc30031 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -46,32 +46,11 @@ file( file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gtest_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gtest_maind.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gmock_maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/gmock_maind.lib) - - file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake DEBUG_CONFIG) - string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gtest_maind.lib" - "\${_IMPORT_PREFIX}/debug/lib/manual-link/gtest_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}") - string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/gmock_maind.lib" - "\${_IMPORT_PREFIX}/debug/lib/manual-link/gmock_maind.lib" DEBUG_CONFIG "${DEBUG_CONFIG}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-debug.cmake "${DEBUG_CONFIG}") -endif() - -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gtest_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gtest_main.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gmock_main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/gmock_main.lib) - - file(READ ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake RELEASE_CONFIG) - string(REPLACE "\${_IMPORT_PREFIX}/lib/gtest_main.lib" - "\${_IMPORT_PREFIX}/lib/manual-link/gtest_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}") - string(REPLACE "\${_IMPORT_PREFIX}/lib/gmock_main.lib" - "\${_IMPORT_PREFIX}/lib/manual-link/gmock_main.lib" RELEASE_CONFIG "${RELEASE_CONFIG}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/gtest/GTestTargets-release.cmake "${RELEASE_CONFIG}") -endif() - +vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index 1d2a266ccdb79d..b90a78d676bffc 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gtest", "version-semver": "1.11.0", + "port-version": 1, "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest" } diff --git a/ports/log4cpp/portfile.cmake b/ports/log4cpp/portfile.cmake index 9c9bc600e72015..e36923d62e508a 100644 --- a/ports/log4cpp/portfile.cmake +++ b/ports/log4cpp/portfile.cmake @@ -20,8 +20,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pkgconfig TARGET_PATH share/${PORT}) vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) diff --git a/ports/log4cpp/vcpkg.json b/ports/log4cpp/vcpkg.json index 18c56ff490eabe..e2e16680553d77 100644 --- a/ports/log4cpp/vcpkg.json +++ b/ports/log4cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "log4cpp", "version-string": "2.9.1", - "port-version": 5, + "port-version": 6, "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.", "homepage": "https://github.com/orocos-toolchain/log4cpp", "supports": "!uwp" diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake index 7ff6cf13a31841..08f173929e6270 100644 --- a/ports/openmesh/portfile.cmake +++ b/ports/openmesh/portfile.cmake @@ -32,6 +32,11 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake) +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata") +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm) # Only move dynamic libraries to bin on Windows diff --git a/ports/openmesh/vcpkg.json b/ports/openmesh/vcpkg.json index 9d64ee9cac047d..80c5f197b61dd3 100644 --- a/ports/openmesh/vcpkg.json +++ b/ports/openmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openmesh", "version-string": "8.1", - "port-version": 1, + "port-version": 2, "description": "A generic and efficient polygon mesh data structure" } diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake index 8eb73a6353ccab..8ba349173f30b6 100644 --- a/ports/polyclipping/portfile.cmake +++ b/ports/polyclipping/portfile.cmake @@ -19,6 +19,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets() +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindCLIPPER.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipper) diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json index 8e524232f81085..919342867e6b7e 100644 --- a/ports/polyclipping/vcpkg.json +++ b/ports/polyclipping/vcpkg.json @@ -1,7 +1,7 @@ { "name": "polyclipping", "version-string": "6.4.2", - "port-version": 7, + "port-version": 8, "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", "homepage": "https://sourceforge.net/projects/polyclipping/" } diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 2902e76edd29c7..2d1699be8abfb1 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -21,6 +21,10 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +vcpkg_fixup_pkgconfig() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index b180656a73cf98..e01b4e275a7849 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quill", "version-semver": "1.6.3", - "port-version": 1, + "port-version": 2, "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "supports": "!(uwp | android)", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index d4bca81679e5df..870044f3599375 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9257baaf49b708cde128ff31e74fe848ef30a264", + "version": "2.18.1", + "port-version": 1 + }, { "git-tree": "5233d2cda62be282a698410ebf3f70f5f2cda8cf", "version": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index 01c1c06f0f7c20..389900a757d9dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1118,7 +1118,7 @@ }, "botan": { "baseline": "2.18.1", - "port-version": 0 + "port-version": 1 }, "box2d": { "baseline": "2.4.1", @@ -1534,7 +1534,7 @@ }, "cppad": { "baseline": "20210000.7", - "port-version": 1 + "port-version": 2 }, "cppcms": { "baseline": "1.2.1", @@ -2574,7 +2574,7 @@ }, "gtest": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "gtk": { "baseline": "4.3.0", @@ -4082,7 +4082,7 @@ }, "log4cpp": { "baseline": "2.9.1", - "port-version": 5 + "port-version": 6 }, "log4cxx": { "baseline": "0.12.0", @@ -4898,7 +4898,7 @@ }, "openmesh": { "baseline": "8.1", - "port-version": 1 + "port-version": 2 }, "openmpi": { "baseline": "4.1.0", @@ -5246,7 +5246,7 @@ }, "polyclipping": { "baseline": "6.4.2", - "port-version": 7 + "port-version": 8 }, "polyhook2": { "baseline": "2021-05-09", @@ -5754,7 +5754,7 @@ }, "quill": { "baseline": "1.6.3", - "port-version": 1 + "port-version": 2 }, "quirc": { "baseline": "1.1", diff --git a/versions/c-/cppad.json b/versions/c-/cppad.json index 20c81ce9560679..38aadae7bedb11 100644 --- a/versions/c-/cppad.json +++ b/versions/c-/cppad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ec54e982dd160ae43272613536a53de6884d6d4", + "version-string": "20210000.7", + "port-version": 2 + }, { "git-tree": "fd043aed2197ac43f337a7806061460728cf56a8", "version-string": "20210000.7", diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 9afd832b7293a5..1bbfb499706189 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e95c8da96b4a206c21d0197e5547e921d748d166", + "version-semver": "1.11.0", + "port-version": 1 + }, { "git-tree": "8dd6b8fb34e78fd1646f5d98720dd563d4a38a33", "version-semver": "1.11.0", diff --git a/versions/l-/log4cpp.json b/versions/l-/log4cpp.json index a6201194383dbe..44f7d5172941fa 100644 --- a/versions/l-/log4cpp.json +++ b/versions/l-/log4cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c68e17d674484b6ec48269fb47eb711f0e2fcbab", + "version-string": "2.9.1", + "port-version": 6 + }, { "git-tree": "e0dcd61960233e62367f4944e294ae90300d82e4", "version-string": "2.9.1", diff --git a/versions/o-/openmesh.json b/versions/o-/openmesh.json index 28109452d75a1d..164c3fbf16c166 100644 --- a/versions/o-/openmesh.json +++ b/versions/o-/openmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "19e385c7e6a18248b06db012c7ba0a68e98921a7", + "version-string": "8.1", + "port-version": 2 + }, { "git-tree": "c243179bd63b698826adde0be25dae93a9afd26a", "version-string": "8.1", diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json index 4871d33c9e3e17..178f2f0d4f4954 100644 --- a/versions/p-/polyclipping.json +++ b/versions/p-/polyclipping.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "715616bd21d5d75a9101ac86da0188263b9774c9", + "version-string": "6.4.2", + "port-version": 8 + }, { "git-tree": "25fcf0404b9a7c414b238c0973b4aa43d7bbd6e2", "version-string": "6.4.2", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index d2cbe00bffa2e9..a300b7fe2f252f 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1d6790b5d6faf5173c73ea42e07acea665aebffc", + "version-semver": "1.6.3", + "port-version": 2 + }, { "git-tree": "53bbd43b741956bcb2d1e74cb34bca27b51b7d11", "version-semver": "1.6.3", From 0c15df6c3d39c7413a15cbd1c3e2cd0960546a17 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 27 Oct 2021 07:14:34 +0200 Subject: [PATCH 0901/1858] [fluidsynth] fix installation location (#20950) --- ports/fluidsynth/portfile.cmake | 1 + ports/fluidsynth/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/f-/fluidsynth.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/fluidsynth/portfile.cmake b/ports/fluidsynth/portfile.cmake index d5f4030fa7de29..a92c17268b56fc 100644 --- a/ports/fluidsynth/portfile.cmake +++ b/ports/fluidsynth/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_configure_cmake( OPTIONS ${FEATURE_OPTIONS} -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + -DLIB_INSTALL_DIR=lib OPTIONS_DEBUG -Denable-debug:BOOL=ON ) diff --git a/ports/fluidsynth/vcpkg.json b/ports/fluidsynth/vcpkg.json index cdb9226e7c5827..c248a67cce37e0 100644 --- a/ports/fluidsynth/vcpkg.json +++ b/ports/fluidsynth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fluidsynth", "version": "2.2.1", + "port-version": 1, "description": "FluidSynth reads and handles MIDI events from the MIDI input device. It is the software analogue of a MIDI synthesizer. FluidSynth can also play midifiles using a Soundfont.", "homepage": "https://github.com/FluidSynth/fluidsynth", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 389900a757d9dc..b5d3618b905b66 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2174,7 +2174,7 @@ }, "fluidsynth": { "baseline": "2.2.1", - "port-version": 0 + "port-version": 1 }, "fmem": { "baseline": "c-libs-2ccee3d2fb", diff --git a/versions/f-/fluidsynth.json b/versions/f-/fluidsynth.json index 3321f5977e6b4c..d129246ee45859 100644 --- a/versions/f-/fluidsynth.json +++ b/versions/f-/fluidsynth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9e09f93f0880db415faf7f65f4dd483a5b2882a", + "version": "2.2.1", + "port-version": 1 + }, { "git-tree": "226d8e9bba548bfb4592dfe5979797e3ffde0f69", "version": "2.2.1", From 160177d23b8029b0c28b7707276d5bfab4d800de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 27 Oct 2021 07:24:18 +0200 Subject: [PATCH 0902/1858] [vcpkg_acquire_msys] Add gzip to default packages (#20393) Fixes #20392 --- docs/maintainers/vcpkg_acquire_msys.md | 2 +- scripts/cmake/vcpkg_acquire_msys.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/maintainers/vcpkg_acquire_msys.md b/docs/maintainers/vcpkg_acquire_msys.md index fbd43b8e32aa48..5093f90fa0bb06 100644 --- a/docs/maintainers/vcpkg_acquire_msys.md +++ b/docs/maintainers/vcpkg_acquire_msys.md @@ -25,7 +25,7 @@ To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make au ### NO_DEFAULT_PACKAGES Exclude the normal base packages. -The list of base packages includes: bash, coreutils, sed, grep, gawk, diffutils, make, and pkg-config +The list of base packages includes: bash, coreutils, sed, grep, gawk, gzip, diffutils, make, and pkg-config ### DIRECT_PACKAGES A list of URL/SHA512 pairs to acquire in msys. diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index c07fe7d62c1ca0..90704ca45053e5 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -24,7 +24,7 @@ To ensure a package is available: `vcpkg_acquire_msys(MSYS_ROOT PACKAGES make au ### NO_DEFAULT_PACKAGES Exclude the normal base packages. -The list of base packages includes: bash, coreutils, sed, grep, gawk, diffutils, make, and pkg-config +The list of base packages includes: bash, coreutils, sed, grep, gawk, gzip, diffutils, make, and pkg-config ### DIRECT_PACKAGES A list of URL/SHA512 pairs to acquire in msys. @@ -150,7 +150,7 @@ function(vcpkg_acquire_msys out_msys_root) set(Z_VCPKG_MSYS_PACKAGES "${arg_PACKAGES}") if(NOT arg_NO_DEFAULT_PACKAGES) - list(APPEND Z_VCPKG_MSYS_PACKAGES bash coreutils sed grep gawk diffutils make pkg-config) + list(APPEND Z_VCPKG_MSYS_PACKAGES bash coreutils sed grep gawk gzip diffutils make pkg-config) endif() if(DEFINED arg_DIRECT_PACKAGES AND NOT arg_DIRECT_PACKAGES STREQUAL "") From 10d367201fb5a4c0837ebc37680d6bbd5cf9086b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Oct 2021 07:25:12 +0200 Subject: [PATCH 0903/1858] [capnproto] Update to 0.9.1 (#20436) * Update capnproto to 0.9.1 * Update CI baseline * Fix indentation * Update git-tree hash Co-authored-by: chausner --- ports/capnproto/portfile.cmake | 31 +++++++++++++++++++------------ ports/capnproto/vcpkg.json | 21 ++++++++++++++++++--- versions/baseline.json | 4 ++-- versions/c-/capnproto.json | 5 +++++ 4 files changed, 44 insertions(+), 17 deletions(-) diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index 2a3aecc137de6f..62f7950eee8df1 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -8,26 +8,33 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO capnproto/capnproto - REF 57a4ca5af5a7f55b768a9d9d6655250bffb1257f # v0.8.0 - SHA512 6550356a40a13d41fbeef3887027de1134c4bc37e4d79435e67da1f65665f3856f7cd663be392135cf4a08fffcfd4e171614026c20bfc5727adfd624b2d33e35 + REF v0.9.1 + SHA512 BDC5960F26214139744D768CA4558B085E2D359C375A8849CA532A4C458A2DAF0EE1A1F4D00745DE5ABF353AA1E4084A2D85E5523006F23F591F21FAC2D847FD HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "openssl" OPENSSL_FEATURE ) -vcpkg_install_cmake() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + "-DWITH_OPENSSL=${OPENSSL_FEATURE}" +) + +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CapnProto) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CapnProto) vcpkg_copy_tools(TOOL_NAMES capnp capnpc-c++ capnpc-capnp AUTO_CLEAN) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json index 49b619ee57f1d3..0f65a548579223 100644 --- a/ports/capnproto/vcpkg.json +++ b/ports/capnproto/vcpkg.json @@ -1,11 +1,26 @@ { "name": "capnproto", - "version-string": "0.8.0", - "port-version": 2, + "version": "0.9.1", "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", "supports": "!uwp & !((arm | arm64) & windows)", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" - ] + ], + "features": { + "openssl": { + "description": "Build libkj-tls by linking against OpenSSL.", + "dependencies": [ + "openssl" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index b5d3618b905b66..7d7a31a1bec33e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1213,8 +1213,8 @@ "port-version": 1 }, "capnproto": { - "baseline": "0.8.0", - "port-version": 2 + "baseline": "0.9.1", + "port-version": 0 }, "capstone": { "baseline": "4.0.2", diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index 28f0e5e5a5da11..86c7d903bfae28 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "408771ff99776c9b25fd1121da589b720b7081c0", + "version": "0.9.1", + "port-version": 0 + }, { "git-tree": "3e33e9cf7ec5a8166ea3e33801645d731d119e25", "version-string": "0.8.0", From 1a0c3037b3c570830c07ccd6b4af5f3e05856370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 27 Oct 2021 07:27:18 +0200 Subject: [PATCH 0904/1858] [kf5codecs] add explicit gperf dependency (#20266) * [kf5codecs] add explicit gperf dependency * [kf5codecs] wrap paths in quotes; no need to remove /etc * [kf5codecs] update versions * [kf5codecs] make gperf host dependency Co-authored-by: Billy O'Neal * [kf5codecs] pass the gperf host executable path * [kf5codecs] update versions * [kf5codecs] fix a typo in find_program() * [kf5codecs] quote the Gperf_EXECUTABLE path * [kf5codecs] update versions Co-authored-by: Billy O'Neal --- ports/kf5codecs/portfile.cmake | 18 ++++++++---------- ports/kf5codecs/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/k-/kf5codecs.json | 5 +++++ 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 6637557aa80113..a8178e2b62f5f5 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -6,17 +6,16 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_find_acquire_program(GPERF) -get_filename_component(GPERF_EXE_PATH ${GPERF} DIRECTORY) -vcpkg_add_to_path(${GPERF_EXE_PATH}) - # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") +find_program(GPERF_EXE NAMES gperf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH) + vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + "-DGperf_EXECUTABLE=${GPERF_EXE}" ) vcpkg_cmake_install() @@ -28,9 +27,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/data") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index 94958f804bd5eb..5b23da83c45a64 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,11 +1,15 @@ { "name": "kf5codecs", "version": "5.84.0", - "port-version": 2, + "port-version": 3, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ "ecm", + { + "name": "gperf", + "host": true + }, "qt5-base", "qt5-tools", { diff --git a/versions/baseline.json b/versions/baseline.json index 7d7a31a1bec33e..811288e0a98f99 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3014,7 +3014,7 @@ }, "kf5codecs": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5completion": { "baseline": "5.84.0", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index 532248c9352187..7731245b671281 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54b65a5af21a97ee1a73591b5e83d26cc6898d12", + "version": "5.84.0", + "port-version": 3 + }, { "git-tree": "0997fde9753e1e3c745eca599c116ef3a511bece", "version": "5.84.0", From d8e753c3b29e30e43df1573bdf7bb674b2135bd6 Mon Sep 17 00:00:00 2001 From: bucurb Date: Wed, 27 Oct 2021 06:31:19 +0100 Subject: [PATCH 0905/1858] [libbson] [mongo-c-driver] [mongo-cxx-driver] Updated to latest (#18751) * get latest version * libbson 1.17.6 * Updated patches * bson sha * Mongoc upgraded to 1.17.6 * updated sha * Updated mongoc to latest * updated sha * upgraded mongo-cxx * manifest fix * updated sha * PR comments * updated sha * fixed missing dependency. deleted unused patch * sha * PR comments * sha * Use modern cmake helpers for mongo-cxx-driver. * Rebuild version database. Co-authored-by: Billy Robert ONeal III Co-authored-by: NancyLi1013 --- ports/libbson/fix-include-directory.patch | 6 +- ports/libbson/fix-static-cmake.patch | 2 +- ports/libbson/fix-uwp.patch | 90 +++------ ports/libbson/portfile.cmake | 16 +- ports/libbson/usage | 11 +- ports/libbson/vcpkg.json | 3 +- .../disable-static-when-dynamic-build.patch | 45 ++--- ports/mongo-c-driver/fix-arm-build.patch | 26 +-- ports/mongo-c-driver/fix-dependencies.patch | 176 ++++++++++++++++++ .../fix-dependency-libbson.patch | 74 +++----- ports/mongo-c-driver/portfile.cmake | 40 ++-- ports/mongo-c-driver/usage | 10 +- ports/mongo-c-driver/vcpkg.json | 9 +- .../disable-c2338-mongo-cxx-driver.patch | 5 +- .../disable_test_and_example.patch | 31 +-- ports/mongo-cxx-driver/fix-android.patch | 13 -- ports/mongo-cxx-driver/fix-dependencies.patch | 11 ++ .../fix-dependency-libbson.patch | 25 --- .../fix-dependency-mongocdriver.patch | 19 -- ports/mongo-cxx-driver/fix-uwp.patch | 5 +- ports/mongo-cxx-driver/github-654.patch | 34 +--- ports/mongo-cxx-driver/portfile.cmake | 74 ++++---- ports/mongo-cxx-driver/vcpkg.json | 13 +- versions/baseline.json | 12 +- versions/l-/libbson.json | 5 + versions/m-/mongo-c-driver.json | 5 + versions/m-/mongo-cxx-driver.json | 5 + 27 files changed, 420 insertions(+), 345 deletions(-) create mode 100644 ports/mongo-c-driver/fix-dependencies.patch delete mode 100644 ports/mongo-cxx-driver/fix-android.patch create mode 100644 ports/mongo-cxx-driver/fix-dependencies.patch delete mode 100644 ports/mongo-cxx-driver/fix-dependency-libbson.patch delete mode 100644 ports/mongo-cxx-driver/fix-dependency-mongocdriver.patch diff --git a/ports/libbson/fix-include-directory.patch b/ports/libbson/fix-include-directory.patch index beead37bd36625..64ff404ca6dbdc 100644 --- a/ports/libbson/fix-include-directory.patch +++ b/ports/libbson/fix-include-directory.patch @@ -1,8 +1,8 @@ diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index d383424..cc633f6 100644 +index 0197af0..422b051 100644 --- a/src/libbson/CMakeLists.txt +++ b/src/libbson/CMakeLists.txt -@@ -326,7 +326,7 @@ if (ENABLE_EXAMPLES) +@@ -341,7 +341,7 @@ if (ENABLE_EXAMPLES) endif () # ENABLE_EXAMPLES set (BSON_HEADER_INSTALL_DIR @@ -10,4 +10,4 @@ index d383424..cc633f6 100644 + "${CMAKE_INSTALL_INCLUDEDIR}" ) - if (ENABLE_STATIC MATCHES "ON|AUTO") + if (MONGOC_ENABLE_STATIC_INSTALL) diff --git a/ports/libbson/fix-static-cmake.patch b/ports/libbson/fix-static-cmake.patch index 11e11dcbadbb0c..7de9c5eacc596f 100644 --- a/ports/libbson/fix-static-cmake.patch +++ b/ports/libbson/fix-static-cmake.patch @@ -1,5 +1,5 @@ diff --git a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in -index 92933fe..d98ebd3 100644 +index 92933fe01..931a829ae 100644 --- a/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in +++ b/src/libbson/build/cmake/libbson-static-1.0-config.cmake.in @@ -36,3 +36,7 @@ foreach (LIB @LIBBSON_LIBRARIES@) diff --git a/ports/libbson/fix-uwp.patch b/ports/libbson/fix-uwp.patch index 9342e81bd0d95e..92d7d9ae2591df 100644 --- a/ports/libbson/fix-uwp.patch +++ b/ports/libbson/fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/src/libbson/CMakeLists.txt b/src/libbson/CMakeLists.txt -index 7c479d8..d383424 100644 +index bb8259b85..0197af068 100644 --- a/src/libbson/CMakeLists.txt +++ b/src/libbson/CMakeLists.txt -@@ -226,6 +226,9 @@ set (HEADERS_FORWARDING +@@ -230,6 +230,9 @@ set (HEADERS_FORWARDING ${PROJECT_SOURCE_DIR}/src/bson/forwarding/bson.h ) @@ -12,13 +12,13 @@ index 7c479d8..d383424 100644 add_library (bson_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) set (CMAKE_CXX_VISIBILITY_PRESET hidden) target_compile_definitions (bson_shared PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN) -@@ -268,9 +271,13 @@ if (WIN32) +@@ -279,9 +282,13 @@ if (WIN32) # must be handled specially since we can't resolve them set (BSON_SYSTEM_LIBRARIES ${BSON_SYSTEM_LIBRARIES} ws2_32) endif () +endif () - if (ENABLE_STATIC MATCHES "ON|AUTO") + if (MONGOC_ENABLE_STATIC_BUILD) add_library (bson_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + set(CMAKE_CXX_VISIBILITY_PRESET hidden) + set(THREADS_PREFER_PTHREAD_FLAG 1) @@ -26,7 +26,7 @@ index 7c479d8..d383424 100644 target_compile_definitions (bson_static PUBLIC BSON_STATIC PRIVATE BSON_COMPILATION JSONSL_PARSE_NAN -@@ -284,6 +291,7 @@ if (ENABLE_STATIC MATCHES "ON|AUTO") +@@ -299,6 +306,7 @@ if (MONGOC_ENABLE_STATIC_BUILD) if (RT_LIBRARY) target_link_libraries (bson_static ${RT_LIBRARY}) endif () @@ -34,7 +34,7 @@ index 7c479d8..d383424 100644 if (M_LIBRARY) target_link_libraries (bson_static ${M_LIBRARY}) endif () -@@ -298,7 +306,7 @@ function (add_example bin src) +@@ -313,7 +321,7 @@ function (add_example bin src) add_executable (${bin} ${BSON_EXAMPLE_SOURCES}) # Link against the shared lib like normal apps @@ -43,60 +43,36 @@ index 7c479d8..d383424 100644 set (EXAMPLES ${EXAMPLES} ${bin}) endfunction () -@@ -322,7 +330,7 @@ set (BSON_HEADER_INSTALL_DIR +@@ -337,7 +345,7 @@ set (BSON_HEADER_INSTALL_DIR ) - if (ENABLE_STATIC MATCHES "ON|AUTO") + if (MONGOC_ENABLE_STATIC_INSTALL) - set (TARGETS_TO_INSTALL bson_shared bson_static) + set (TARGETS_TO_INSTALL bson_static) else () set (TARGETS_TO_INSTALL bson_shared) endif () -@@ -337,6 +345,7 @@ install ( - ) - - if (MSVC) -+ if (NOT ENABLE_STATIC MATCHES "ON|AUTO") - add_custom_command ( - TARGET bson_shared - POST_BUILD -@@ -348,6 +357,7 @@ if (MSVC) - FILES $/lib$ - DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+ else() - if (TARGET bson_static) - add_custom_command ( - TARGET bson_static -@@ -361,6 +371,7 @@ if (MSVC) - DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endif () -+ endif() - endif () - - install ( diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 0f9e50c..85eb429 100644 +index af5a398a9..78d02bdee 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -694,6 +694,7 @@ if (WIN32) - set (LIBRARIES ${LIBRARIES} ws2_32) +@@ -725,6 +725,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) + endif() endif () +if (NOT MONGOC_ENABLE_STATIC) add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) -@@ -704,6 +705,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION) +@@ -744,6 +745,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION ${KMS_MSG_D set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") +endif () - if (MONGOC_ENABLE_STATIC) + if (MONGOC_ENABLE_STATIC_BUILD) add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) -@@ -731,7 +733,11 @@ if (ENABLE_APPLE_FRAMEWORK) +@@ -778,7 +780,11 @@ if (ENABLE_APPLE_FRAMEWORK) endif () add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) @@ -108,41 +84,17 @@ index 0f9e50c..85eb429 100644 # mongoc-stat works if shared memory performance counters are enabled. if (ENABLE_SHM_COUNTERS STREQUAL "ON") -@@ -977,7 +983,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} +@@ -1040,7 +1046,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) - if (MONGOC_ENABLE_STATIC) + if (MONGOC_ENABLE_STATIC_INSTALL) - set (TARGETS_TO_INSTALL mongoc_shared mongoc_static) + set (TARGETS_TO_INSTALL mongoc_static) else () set (TARGETS_TO_INSTALL mongoc_shared) endif () -@@ -997,6 +1003,7 @@ install ( - ) - - if (MSVC) -+ if (NOT ENABLE_STATIC MATCHES "ON|AUTO") - add_custom_command ( - TARGET mongoc_shared - POST_BUILD -@@ -1008,6 +1015,7 @@ if (MSVC) - FILES $/lib$ - DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+ else() - if (TARGET mongoc_static) - add_custom_command ( - TARGET mongoc_static -@@ -1021,6 +1029,7 @@ if (MSVC) - DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) - endif () -+ endif() - endif () - - install ( diff --git a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c -index 0690b86..98721df 100644 +index 0690b8680..98721df86 100644 --- a/src/libmongoc/src/mongoc/mongoc-gridfs-file.c +++ b/src/libmongoc/src/mongoc/mongoc-gridfs-file.c @@ -765,7 +765,7 @@ _mongoc_gridfs_file_refresh_page (mongoc_gridfs_file_t *file) @@ -155,10 +107,10 @@ index 0690b86..98721df 100644 bson_iter_t iter; int64_t existing_chunks; diff --git a/src/libmongoc/src/mongoc/mongoc-handshake.c b/src/libmongoc/src/mongoc/mongoc-handshake.c -index 8374af2..5491595 100644 +index 5378015b8..c8e6dd6a7 100644 --- a/src/libmongoc/src/mongoc/mongoc-handshake.c +++ b/src/libmongoc/src/mongoc/mongoc-handshake.c -@@ -286,7 +286,8 @@ _get_os_version (void) +@@ -290,7 +290,8 @@ _get_os_version (void) char *ret = bson_malloc (HANDSHAKE_OS_VERSION_MAX); bool found = false; @@ -169,10 +121,10 @@ index 8374af2..5491595 100644 ZeroMemory (&osvi, sizeof (OSVERSIONINFO)); osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); diff --git a/src/libmongoc/src/mongoc/mongoc-util.c b/src/libmongoc/src/mongoc/mongoc-util.c -index 99939ff..3c25e19 100644 +index 0bbee03ef..6b66da741 100644 --- a/src/libmongoc/src/mongoc/mongoc-util.c +++ b/src/libmongoc/src/mongoc/mongoc-util.c -@@ -84,7 +84,11 @@ _mongoc_hex_md5 (const char *input) +@@ -85,7 +85,11 @@ _mongoc_hex_md5 (const char *input) void _mongoc_usleep (int64_t usec) { diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index eb534a26028846..e9f48e7f1867bf 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver - REF 99d422877c5b5ea52006c13ee3b48297251b2b2d # debian/1.16.1 - SHA512 e2f129439ff3697981774e0de35586a6afe98838acfc52d8a115bcb298350f2779b886dc6b27130e78b3b81f9b0a85b2bc6bcef246f9685c05f6789747c4739d + REF 00c59aa4a1f72e49e55b211f28650c66c542739e # 1.17.6 + SHA512 9191c64def45ff268cb5d2ce08782265fb8e0567237c8d3311b91e996bd938d629578a7b50e8db29c4b3aa5bc96f93361f6d918e9cfd4861e5f5c5554cf4616d HEAD_REF master PATCHES fix-uwp.patch @@ -13,7 +13,11 @@ vcpkg_from_github( fix-static-cmake-2.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ENABLE_STATIC ON) +else() + set(ENABLE_STATIC OFF) +endif() file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _contents) string(JSON BUILD_VERSION GET "${_contents}" version) @@ -37,10 +41,12 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME bson-1.0 CONFIG_PATH "lib/cmake/bson-1.0" DO_NOT_DELETE_PARENT_CONFIG_PATH) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libbson-static-1.0" PACKAGE_NAME "libbson-1.0") + vcpkg_cmake_config_fixup(PACKAGE_NAME libbson-1.0 CONFIG_PATH "lib/cmake/libbson-static-1.0") else() - vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libbson-1.0" PACKAGE_NAME "libbson-1.0") + vcpkg_cmake_config_fixup(PACKAGE_NAME libbson-1.0 CONFIG_PATH "lib/cmake/libbson-1.0") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libbson/usage b/ports/libbson/usage index 873243c81481cd..a0a125327f6869 100644 --- a/ports/libbson/usage +++ b/ports/libbson/usage @@ -1,6 +1,9 @@ The package libbson is compatible with built-in CMake targets: - find_package(libbson-1.0 CONFIG REQUIRED) - target_include_directories(main PRIVATE ${BSON_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${BSON_LIBRARIES}) - target_compile_definitions(main PRIVATE ${BSON_DEFINITIONS}) + find_package(bson-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::bson_static) + +or: + + find_package(bson-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::bson_shared) diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index c9ab96124e6420..a35c4c3967cfa9 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libbson", - "version": "1.16.1", - "port-version": 3, + "version": "1.17.6", "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/libbson", "dependencies": [ diff --git a/ports/mongo-c-driver/disable-static-when-dynamic-build.patch b/ports/mongo-c-driver/disable-static-when-dynamic-build.patch index 5652d7bd7ea732..c2da5a93b6aa8a 100644 --- a/ports/mongo-c-driver/disable-static-when-dynamic-build.patch +++ b/ports/mongo-c-driver/disable-static-when-dynamic-build.patch @@ -1,61 +1,42 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 797aaec..91d97dc 100644 +index de96ab864..5b7f448f2 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -694,6 +694,7 @@ if (WIN32) - set (LIBRARIES ${LIBRARIES} ws2_32) +@@ -725,6 +725,7 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) + endif() endif () -+if (NOT MONGOC_ENABLE_STATIC) ++if (NOT MONGOC_ENABLE_STATIC_BUILD) add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) - target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) -@@ -706,7 +707,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION) + target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC mongo::bson_shared) +@@ -745,7 +746,7 @@ target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION ${KMS_MSG_D set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}") --if (MONGOC_ENABLE_STATIC) +-if (MONGOC_ENABLE_STATIC_BUILD) +else () add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - target_link_libraries (mongoc_static ${STATIC_LIBRARIES} ${BSON_LIBRARIES}) - target_include_directories (mongoc_static BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS}) -@@ -733,8 +734,13 @@ if (ENABLE_APPLE_FRAMEWORK) + target_link_libraries (mongoc_static ${STATIC_LIBRARIES} mongo::bson_static) + if (NOT WIN32 AND ENABLE_PIC) +@@ -778,7 +779,11 @@ if (ENABLE_APPLE_FRAMEWORK) endif () add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) -+if (NOT MONGOC_ENABLE_STATIC) - target_include_directories (mongoc-stat PRIVATE ${BSON_INCLUDE_DIRS}) ++if (NOT MONGOC_ENABLE_STATIC_BUILD) target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) +else() -+target_include_directories (mongoc-stat PRIVATE ${BSON_INCLUDE_DIRS}) +target_link_libraries (mongoc-stat mongoc_static ${LIBRARIES}) +endif() # mongoc-stat works if shared memory performance counters are enabled. if (ENABLE_SHM_COUNTERS STREQUAL "ON") -@@ -980,7 +986,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} +@@ -1040,7 +1045,7 @@ file (COPY ${PROJECT_SOURCE_DIR}/tests/x509gen DESTINATION ${PROJECT_BINARY_DIR} file (COPY ${PROJECT_SOURCE_DIR}/tests/release_files DESTINATION ${PROJECT_BINARY_DIR}/tests) - if (MONGOC_ENABLE_STATIC) + if (MONGOC_ENABLE_STATIC_INSTALL) - set (TARGETS_TO_INSTALL mongoc_shared mongoc_static) + set (TARGETS_TO_INSTALL mongoc_static) else () set (TARGETS_TO_INSTALL mongoc_shared) endif () -@@ -1000,6 +1006,7 @@ install ( - ) - - if (MSVC) -+ if (NOT MONGOC_ENABLE_STATIC) - add_custom_command ( - TARGET mongoc_shared - POST_BUILD -@@ -1011,7 +1018,7 @@ if (MSVC) - FILES $/lib$ - DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -- if (TARGET mongoc_static) -+ else () - add_custom_command ( - TARGET mongoc_static - POST_BUILD diff --git a/ports/mongo-c-driver/fix-arm-build.patch b/ports/mongo-c-driver/fix-arm-build.patch index 8d61b745eff2af..5e997498a3e29a 100644 --- a/ports/mongo-c-driver/fix-arm-build.patch +++ b/ports/mongo-c-driver/fix-arm-build.patch @@ -1,24 +1,24 @@ diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 91d97dc..ccebc2a 100644 +index 5b7f448f2..8881f5194 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -698,6 +698,9 @@ if (NOT MONGOC_ENABLE_STATIC) +@@ -729,6 +729,9 @@ if (NOT MONGOC_ENABLE_STATIC_BUILD) add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) - target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) + target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC mongo::bson_shared) +if (WIN32) -+ target_link_libraries (mongoc_shared PRIVATE Advapi32) ++ target_link_libraries (mongoc_shared PRIVATE Advapi32) +endif() target_include_directories (mongoc_shared BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS}) - target_include_directories (mongoc_shared PRIVATE ${PRIVATE_ZLIB_INCLUDES}) + target_include_directories (mongoc_shared PRIVATE ${ZLIB_INCLUDE_DIRS}) target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}) -@@ -710,6 +713,9 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS +@@ -749,6 +752,9 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS else () add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - target_link_libraries (mongoc_static ${STATIC_LIBRARIES} ${BSON_LIBRARIES}) -+ if (WIN32) -+ target_link_libraries (mongoc_static Advapi32) -+ endif() - target_include_directories (mongoc_static BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS}) - target_include_directories (mongoc_static PRIVATE ${PRIVATE_ZLIB_INCLUDES}) - target_include_directories (mongoc_static PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}) + target_link_libraries (mongoc_static ${STATIC_LIBRARIES} mongo::bson_static) ++ if (WIN32) ++ target_link_libraries (mongoc_static Advapi32) ++ endif() + if (NOT WIN32 AND ENABLE_PIC) + target_compile_options (mongoc_static PUBLIC -fPIC) + message ("Adding -fPIC to compilation of mongoc_static components") diff --git a/ports/mongo-c-driver/fix-dependencies.patch b/ports/mongo-c-driver/fix-dependencies.patch new file mode 100644 index 00000000000000..a03e870c65e7d7 --- /dev/null +++ b/ports/mongo-c-driver/fix-dependencies.patch @@ -0,0 +1,176 @@ +diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt +index 8881f5194..c366f160a 100644 +--- a/src/libmongoc/CMakeLists.txt ++++ b/src/libmongoc/CMakeLists.txt +@@ -58,8 +58,9 @@ configure_file ( + set (ZLIB_INCLUDE_DIRS "") + if (ENABLE_ZLIB MATCHES "SYSTEM|AUTO") + message (STATUS "Searching for zlib CMake packages") +- include (FindZLIB) ++ find_package(ZLIB REQUIRED) + if (ZLIB_FOUND) ++ set(VCPKG_ZLIB_LIBRARIES "ZLIB::ZLIB") + message ("-- zlib found version \"${ZLIB_VERSION_STRING}\"") + message ("-- zlib include path \"${ZLIB_INCLUDE_DIRS}\"") + message ("-- zlib libraries \"${ZLIB_LIBRARIES}\"") +@@ -100,32 +101,31 @@ endif () + + if (NOT ENABLE_ZSTD STREQUAL OFF) + message (STATUS "Searching for compression library zstd") +- find_package(PkgConfig) +- pkg_check_modules (ZSTD libzstd) ++ find_package(zstd CONFIG REQUIRED) + +- if (NOT ZSTD_FOUND) ++ if (NOT zstd_FOUND) + if (ENABLE_ZSTD MATCHES "ON") + message (FATAL_ERROR " Not found") + else () + message (STATUS " Not found") + endif () + # The compression format below this version isn't supported. See SERVER-43070 +- elseif (${ZSTD_VERSION} VERSION_LESS "0.8.0") ++ elseif (${zstd_VERSION} VERSION_LESS "0.8.0") + if (ENABLE_ZSTD MATCHES "ON") +- message (FATAL_ERROR "Detected zstd version ${ZSTD_VERSION} but version 0.8.0 required") ++ message (FATAL_ERROR "Detected zstd version ${zstd_VERSION} but version 0.8.0 required") + else () +- message (STATUS "Detected zstd version ${ZSTD_VERSION} but version 0.8.0 required") ++ message (STATUS "Detected zstd version ${zstd_VERSION} but version 0.8.0 required") + endif () + else () +- message (STATUS " Found zstd version ${ZSTD_VERSION} in ${ZSTD_INCLUDE_DIRS}") ++ message (STATUS " Found zstd version ${zstd_VERSION} in ${ZSTD_INCLUDE_DIRS}") + set (MONGOC_ENABLE_COMPRESSION 1) + set (MONGOC_ENABLE_COMPRESSION_ZSTD 1) + + include_directories (${ZSTD_INCLUDE_DIRS}) +- if (${CMAKE_VERSION} VERSION_LESS "3.12.0") +- set (MONGOC_ZSTD_LIBRARIES ${ZSTD_LIBRARIES}) ++ if (MONGOC_ENABLE_STATIC_BUILD) ++ set (MONGOC_ZSTD_LIBRARIES "zstd::libzstd_static") + else () +- set (MONGOC_ZSTD_LIBRARIES ${ZSTD_LINK_LIBRARIES}) ++ set (MONGOC_ZSTD_LIBRARIES "zstd::libzstd_shared") + endif () + endif() + endif() +@@ -134,8 +134,8 @@ if (NOT ENABLE_SSL STREQUAL OFF) + # Try OpenSSL automatically everywhere but Mac and Windows. + if (ENABLE_SSL STREQUAL "OPENSSL" + OR (NOT APPLE AND NOT WIN32 AND ENABLE_SSL STREQUAL "AUTO")) +- # Sets OPENSSL_FOUND on success. +- include (FindOpenSSL) ++ # Sets OpenSSL_FOUND on success. ++ find_package(OpenSSL REQUIRED) + endif () + + if (ENABLE_SSL STREQUAL LIBRESSL) +@@ -171,7 +171,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + endif () + endif () + +- if (NOT OPENSSL_FOUND AND NOT SECURE_TRANSPORT AND NOT SECURE_CHANNEL AND NOT LIBRESSL) ++ if (NOT OpenSSL_FOUND AND NOT SECURE_TRANSPORT AND NOT SECURE_CHANNEL AND NOT LIBRESSL) + if (ENABLE_SSL STREQUAL AUTO) + set (ENABLE_SSL OFF) + else () +@@ -180,8 +180,8 @@ if (NOT ENABLE_SSL STREQUAL OFF) + endif () + endif () + +-if (OPENSSL_FOUND) +- if (WIN32 AND OPENSSL_VERSION GREATER 1.1 AND NOT ++if (OpenSSL_FOUND) ++ if (WIN32 AND OpenSSL_VERSION GREATER 1.1 AND NOT + ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.7) + message (FATAL_ERROR "Building against OpenSSL 1.1.0 and later requires CMake 3.7 or later (hint:" + " You can also compile against Windows Secure Transport with -DENABLE_SSL=WINDOWS") +@@ -220,7 +220,7 @@ elseif (LIBRESSL) + endif () + + if (ENABLE_CRYPTO_SYSTEM_PROFILE) +- if (OPENSSL_FOUND) ++ if (OpenSSL_FOUND) + set (MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE 1) + else () + message (FATAL_ERROR "ENABLE_CRYPTO_SYSTEM_PROFILE only available with OpenSSL") +@@ -349,10 +349,10 @@ if (ENABLE_TRACING) + endif () + + # Sets SNAPPY_LIBRARIES and SNAPPY_INCLUDE_DIRS. +-include (FindSnappy) +-if (SNAPPY_INCLUDE_DIRS) ++if (ENABLE_SNAPPY) ++ find_package(Snappy CONFIG REQUIRED) + set (MONGOC_ENABLE_COMPRESSION 1) +- include_directories ("${SNAPPY_INCLUDE_DIRS}") ++ set (VCPKG_SNAPPY_LIBRARIES "Snappy::snappy") + endif () + + set (MONGOC_ENABLE_SHM_COUNTERS 0) +@@ -393,6 +393,7 @@ if (NOT ENABLE_ICU STREQUAL OFF) + endif() + if (ICU_FOUND) + set (MONGOC_ENABLE_ICU 1) ++ set(VCPKG_ICU_LIBRARIES "ICU::uc") + include_directories ("${ICU_INCLUDE_DIR}") + elseif (ENABLE_ICU STREQUAL ON) + message (FATAL_ERROR "No ICU library found. If ICU is installed in a non-standard directory, define ICU_ROOT as the ICU installation path.") +@@ -623,7 +624,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-ssl.c + ) + +- if (OPENSSL_FOUND) ++ if (OpenSSL_FOUND) + message (STATUS "Compiling against OpenSSL") + set (SOURCES ${SOURCES} + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-crypto-openssl.c +@@ -633,7 +634,7 @@ if (NOT ENABLE_SSL STREQUAL OFF) + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-openssl.c + ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-ocsp-cache.c + ) +- set (SSL_LIBRARIES ${OPENSSL_LIBRARIES}) ++ set (SSL_LIBRARIES "OpenSSL::SSL") + include_directories (${OPENSSL_INCLUDE_DIR}) + if (WIN32) + set (SSL_LIBRARIES ${SSL_LIBRARIES} crypt32.lib) +@@ -696,11 +697,11 @@ endif () + + set (LIBRARIES + ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES} +- ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} Threads::Threads ${ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} ++ ${VCPKG_SNAPPY_LIBRARIES} ${VCPKG_ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} Threads::Threads ${VCPKG_ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} + ) + set (STATIC_LIBRARIES + ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES} +- ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} ++ ${VCPKG_SNAPPY_LIBRARIES} ${VCPKG_ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${VCPKG_ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} + ) + + if (WIN32) +diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake +index 9224178e6..6e449c109 100644 +--- a/src/libmongoc/src/mongoc-config.cmake ++++ b/src/libmongoc/src/mongoc-config.cmake +@@ -1,3 +1,20 @@ + include(CMakeFindDependencyMacro) + find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@ CONFIG REQUIRED) ++ ++if("@Threads_FOUND@") ++ find_dependency(Threads REQUIRED) ++endif() ++if("@ZLIB_FOUND@") ++ find_dependency(ZLIB REQUIRED) ++endif() ++if("@zstd_FOUND@") ++ find_dependency(zstd CONFIG REQUIRED) ++endif() ++if("@OpenSSL_FOUND@") ++ find_dependency(OpenSSL REQUIRED) ++endif() ++if("@Snappy_FOUND@") ++ find_dependency(Snappy CONFIG REQUIRED) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake") diff --git a/ports/mongo-c-driver/fix-dependency-libbson.patch b/ports/mongo-c-driver/fix-dependency-libbson.patch index 2411212714657b..65c05ca68aea84 100644 --- a/ports/mongo-c-driver/fix-dependency-libbson.patch +++ b/ports/mongo-c-driver/fix-dependency-libbson.patch @@ -1,30 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1a2b7bad7..7ff8bbf32 100644 +index 91fd663da..fc9565770 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -151,16 +151,15 @@ if (ENABLE_BSON STREQUAL SYSTEM) - # The input variable BSON_ROOT_DIR is respected for backwards compatibility, - # but you should use the standard CMAKE_PREFIX_PATH instead. - message (STATUS "Searching for libbson CMake packages") -- find_package (bson-1.0 -- "${MONGOC_MAJOR_VERSION}.${MONGOC_MINOR_VERSION}.${MONGOC_MICRO_VERSION}" -+ find_package (libbson-1.0 CONFIG - HINTS - ${BSON_ROOT_DIR}) - -- if (NOT bson-1.0_FOUND) -+ if (NOT libbson-1.0_FOUND) - message (FATAL_ERROR "System libbson not found") - endif () - -- message ("-- libbson found version \"${bson-1.0_VERSION}\"") -+ message ("-- libbson found version \"${libbson-1.0_VERSION}\"") - message ("-- disabling test-libmongoc since using system libbson") +@@ -179,14 +179,6 @@ if (ENABLE_BSON STREQUAL SYSTEM) SET (ENABLE_TESTS OFF) -@@ -169,14 +168,6 @@ if (ENABLE_BSON STREQUAL SYSTEM) - endif () - set (USING_SYSTEM_BSON TRUE) - if (NOT TARGET mongo::bson_shared) - message (FATAL_ERROR "System libbson built without shared library target") @@ -38,40 +18,29 @@ index 1a2b7bad7..7ff8bbf32 100644 unset (dist_generated CACHE) diff --git a/src/libmongoc/CMakeLists.txt b/src/libmongoc/CMakeLists.txt -index 0f9e50c..797aaec 100644 +index af5a398a9..de96ab864 100644 --- a/src/libmongoc/CMakeLists.txt +++ b/src/libmongoc/CMakeLists.txt -@@ -700,6 +700,7 @@ target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIE +@@ -727,7 +727,7 @@ endif () + + add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) +-target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES}) ++target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC mongo::bson_shared) target_include_directories (mongoc_shared BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS}) - target_include_directories (mongoc_shared PRIVATE ${PRIVATE_ZLIB_INCLUDES}) + target_include_directories (mongoc_shared PRIVATE ${ZLIB_INCLUDE_DIRS}) target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}) -+target_include_directories (mongoc_shared PRIVATE ${BSON_INCLUDE_DIRS}) - target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION) +@@ -747,7 +747,7 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS - set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0) -@@ -707,10 +708,11 @@ set_target_properties (mongoc_shared PROPERTIES OUTPUT_NAME "${MONGOC_OUTPUT_BAS - - if (MONGOC_ENABLE_STATIC) + if (MONGOC_ENABLE_STATIC_BUILD) add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - target_link_libraries (mongoc_static ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES}) -+ target_link_libraries (mongoc_static ${STATIC_LIBRARIES} ${BSON_LIBRARIES}) - target_include_directories (mongoc_static BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS}) - target_include_directories (mongoc_static PRIVATE ${PRIVATE_ZLIB_INCLUDES}) - target_include_directories (mongoc_static PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}) -+ target_include_directories (mongoc_static PRIVATE ${BSON_INCLUDE_DIRS}) - target_compile_definitions (mongoc_static - PUBLIC MONGOC_STATIC ${BSON_STATIC_PUBLIC_DEFINITIONS} - PRIVATE MONGOC_COMPILATION -@@ -731,6 +733,7 @@ if (ENABLE_APPLE_FRAMEWORK) - endif () - - add_executable (mongoc-stat ${PROJECT_SOURCE_DIR}/../../src/tools/mongoc-stat.c) -+target_include_directories (mongoc-stat PRIVATE ${BSON_INCLUDE_DIRS}) - target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) - - # mongoc-stat works if shared memory performance counters are enabled. ++ target_link_libraries (mongoc_static ${STATIC_LIBRARIES} mongo::bson_static) + if (NOT WIN32 AND ENABLE_PIC) + target_compile_options (mongoc_static PUBLIC -fPIC) + message ("Adding -fPIC to compilation of mongoc_static components") diff --git a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in -index 6f05b0c..113804e 100644 +index 6f05b0c18..c23da9f61 100644 --- a/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in +++ b/src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in @@ -19,7 +19,7 @@ set (MONGOC_STATIC_MINOR_VERSION @MONGOC_MINOR_VERSION@) @@ -92,3 +61,12 @@ index 6f05b0c..113804e 100644 +set (MONGOC_LIBRARIES ${MONGOC_STATIC_LIBRARIES}) +set (MONGOC_DEFINITIONS ${MONGOC_STATIC_DEFINITIONS}) \ No newline at end of file +diff --git a/src/libmongoc/src/mongoc-config.cmake b/src/libmongoc/src/mongoc-config.cmake +index 7fe7cf42d..9224178e6 100644 +--- a/src/libmongoc/src/mongoc-config.cmake ++++ b/src/libmongoc/src/mongoc-config.cmake +@@ -1,3 +1,3 @@ + include(CMakeFindDependencyMacro) +-find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@) ++find_dependency(bson-1.0 @MONGOC_MAJOR_VERSION@.@MONGOC_MINOR_VERSION@.@MONGOC_MICRO_VERSION@ CONFIG REQUIRED) + include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake") diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index b95266f5dc916e..c223980a26c33c 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -2,13 +2,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-c-driver - REF 99d422877c5b5ea52006c13ee3b48297251b2b2d # debian/1.16.1 - SHA512 e2f129439ff3697981774e0de35586a6afe98838acfc52d8a115bcb298350f2779b886dc6b27130e78b3b81f9b0a85b2bc6bcef246f9685c05f6789747c4739d + REF 00c59aa4a1f72e49e55b211f28650c66c542739e # 1.17.6 + SHA512 9191c64def45ff268cb5d2ce08782265fb8e0567237c8d3311b91e996bd938d629578a7b50e8db29c4b3aa5bc96f93361f6d918e9cfd4861e5f5c5554cf4616d HEAD_REF master PATCHES fix-dependency-libbson.patch disable-static-when-dynamic-build.patch fix-arm-build.patch + fix-dependencies.patch disable-source-write.patch fix-include-directory.patch fix-static-cmake.patch @@ -16,11 +17,16 @@ vcpkg_from_github( vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "snappy" ENABLE_SNAPPY - "icu" ENABLE_ICU + "snappy" ENABLE_SNAPPY + "icu" ENABLE_ICU + "zstd" ENABLE_ZSTD ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(ENABLE_STATIC ON) +else() + set(ENABLE_STATIC OFF) +endif() if(VCPKG_TARGET_IS_WINDOWS) set(ENABLE_SSL "WINDOWS") @@ -64,17 +70,19 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME mongoc-1.0 CONFIG_PATH "lib/cmake/mongoc-1.0" DO_NOT_DELETE_PARENT_CONFIG_PATH) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libmongoc-static-1.0" PACKAGE_NAME libmongoc-1.0) + vcpkg_cmake_config_fixup(PACKAGE_NAME libmongoc-1.0 CONFIG_PATH "lib/cmake/libmongoc-static-1.0") else() - vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libmongoc-1.0" PACKAGE_NAME libmongoc-1.0) + vcpkg_cmake_config_fixup(PACKAGE_NAME libmongoc-1.0 CONFIG_PATH "lib/cmake/libmongoc-1.0") endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if (VCPKG_LIBRARY_LINKAGE STREQUAL static) # drop the __declspec(dllimport) when building static - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/mongoc/mongoc-macros.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/mongoc/mongoc-macros.h" "define MONGOC_API __declspec(dllimport)" "define MONGOC_API") file(RENAME @@ -84,7 +92,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-static-1.0-config-version.cmake" "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config-version.cmake") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() # Create cmake files for _both_ find_package(mongo-c-driver) and find_package(libmongoc-static-1.0)/find_package(libmongoc-1.0) @@ -106,18 +114,8 @@ endif() ]] LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") string(REPLACE [[PACKAGE_PREFIX_DIR]] [[_IMPORT_PREFIX]] LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") - -string(REPLACE "/include/libmongoc-1.0" "/include" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") -string(REPLACE "mongoc-static-1.0" "mongoc-1.0" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") -#Something similar is probably required for windows too! -if (NOT VCPKG_TARGET_IS_WINDOWS) - string(REPLACE "/lib/libssl.a" "\$<\$:/debug>/lib/libssl.a" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") - string(REPLACE "/lib/libcrypto.a" "\$<\$:/debug>/lib/libcrypto.a" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") - string(REPLACE "/lib/libz.a" "\$<\$:/debug>/lib/libz.a" LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") -endif() - -file(WRITE "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake" "${LIBMONGOC_CONFIG_CMAKE}") +file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake "${LIBMONGOC_CONFIG_CMAKE}") file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mongo-c-driver/usage b/ports/mongo-c-driver/usage index 561dc7ac80df9d..7176a8f4d5faa6 100644 --- a/ports/mongo-c-driver/usage +++ b/ports/mongo-c-driver/usage @@ -1,7 +1,9 @@ The package mongo-c-driver is compatible with built-in CMake targets: - find_package(libmongoc-1.0 CONFIG REQUIRED) + find_package(mongoc-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::mongoc_shared) - target_include_directories(main PRIVATE ${MONGOC_INCLUDE_DIRS}) - target_link_libraries(main PRIVATE ${MONGOC_LIBRARIES}) - target_compile_definitions(main PRIVATE ${MONGOC_DEFINITIONS}) +or: + + find_package(mongoc-1.0 CONFIG REQUIRED) + target_link_libraries(main PRIVATE mongo::mongoc_static) diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index ba3779b2a8519a..1fa6e983a5a299 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mongo-c-driver", - "version": "1.16.1", - "port-version": 6, + "version": "1.17.6", "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "dependencies": [ @@ -32,6 +31,12 @@ "dependencies": [ "snappy" ] + }, + "zstd": { + "description": "Enables zstd compressor support", + "dependencies": [ + "zstd" + ] } } } diff --git a/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch b/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch index 04bbcd6384aa9c..eb4245c4bd627d 100644 --- a/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch +++ b/ports/mongo-cxx-driver/disable-c2338-mongo-cxx-driver.patch @@ -1,11 +1,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a019eb1..8ab0f71 100644 +index 2f7a16aa1..326edd332 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -14,5 +14,6 @@ +@@ -14,6 +14,7 @@ add_definitions(-DMONGO_CXX_DRIVER_COMPILING) add_definitions(-D_SCL_SECURE_NO_WARNINGS) +add_definitions(-D_DISABLE_EXTENDED_ALIGNED_STORAGE) add_subdirectory(bsoncxx) add_subdirectory(mongocxx) + diff --git a/ports/mongo-cxx-driver/disable_test_and_example.patch b/ports/mongo-cxx-driver/disable_test_and_example.patch index 2c24024a8c1061..dde496df424d4b 100644 --- a/ports/mongo-cxx-driver/disable_test_and_example.patch +++ b/ports/mongo-cxx-driver/disable_test_and_example.patch @@ -1,17 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c6f56e4..5601f90 100644 +index b2bc2a17c..347faa5ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -89,6 +89,8 @@ endif() +@@ -190,6 +190,7 @@ set (BUILD_SOURCE_DIR ${CMAKE_BINARY_DIR}) - set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + include (MakeDistFiles) +if(0) -+ add_custom_target(hugo_dir COMMAND ${CMAKE_COMMAND} -E make_directory hugo ) -@@ -147,6 +149,8 @@ add_custom_target(docs +@@ -248,6 +249,8 @@ add_custom_target(docs set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party) @@ -21,22 +20,28 @@ index c6f56e4..5601f90 100644 add_subdirectory(src) diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index 50085d0..5966d21 100644 +index 480b7cd32..b890c36b6 100644 --- a/src/bsoncxx/CMakeLists.txt +++ b/src/bsoncxx/CMakeLists.txt -@@ -249,4 +249,4 @@ install( - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${BSONCXX_VERSION} - ) +@@ -204,7 +204,7 @@ if(BSONCXX_BUILD_STATIC) + endif() + bsoncxx_install("${bsoncxx_target_list}" "${bsoncxx_pkg_dep}") -add_subdirectory(test) +# add_subdirectory(test) + + set_local_dist (src_bsoncxx_DIST_local + CMakeLists.txt diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt -index 3cba62d..64ff936 100644 +index f67ae35f7..b783a4716 100644 --- a/src/mongocxx/CMakeLists.txt +++ b/src/mongocxx/CMakeLists.txt -@@ -259,4 +259,4 @@ install( - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${MONGOCXX_VERSION} - ) +@@ -231,7 +231,7 @@ if(MONGOCXX_BUILD_STATIC) + endif() + mongocxx_install("${mongocxx_target_list}" "${mongocxx_pkg_dep}") -add_subdirectory(test) +# add_subdirectory(test) + + set_local_dist (src_mongocxx_DIST_local + CMakeLists.txt diff --git a/ports/mongo-cxx-driver/fix-android.patch b/ports/mongo-cxx-driver/fix-android.patch deleted file mode 100644 index 01527392f6a410..00000000000000 --- a/ports/mongo-cxx-driver/fix-android.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git "a/src/mongocxx/options/change_stream.cpp" "b/src/mongocxx/options/change_stream.cpp" -index 2c651a7e0..2e9c34eb6 100644 ---- "a/src/mongocxx/options/change_stream.cpp" -+++ "b/src/mongocxx/options/change_stream.cpp" -@@ -108,7 +108,7 @@ bsoncxx::document::value change_stream::as_bson() const { - if ((count < 0) || (count >= std::numeric_limits::max())) { - throw mongocxx::logic_error{mongocxx::error_code::k_invalid_parameter}; - } -- out.append(bsoncxx::builder::basic::kvp("maxAwaitTimeMS", count)); -+ out.append(bsoncxx::builder::basic::kvp("maxAwaitTimeMS", static_cast(count))); - } - - return out.extract(); diff --git a/ports/mongo-cxx-driver/fix-dependencies.patch b/ports/mongo-cxx-driver/fix-dependencies.patch new file mode 100644 index 00000000000000..09d9f06e7542a0 --- /dev/null +++ b/ports/mongo-cxx-driver/fix-dependencies.patch @@ -0,0 +1,11 @@ +diff --git a/src/bsoncxx/cmake/bsoncxx-config.cmake.in b/src/bsoncxx/cmake/bsoncxx-config.cmake.in +index 768f3dde6..6dc7f064b 100644 +--- a/src/bsoncxx/cmake/bsoncxx-config.cmake.in ++++ b/src/bsoncxx/cmake/bsoncxx-config.cmake.in +@@ -1,3 +1,6 @@ + include(CMakeFindDependencyMacro) + @BSONCXX_PKG_DEP@ ++if("@Boost_FOUND@") ++ find_dependency(Boost 1.56.0 REQUIRED) ++endif() + include("${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets.cmake") diff --git a/ports/mongo-cxx-driver/fix-dependency-libbson.patch b/ports/mongo-cxx-driver/fix-dependency-libbson.patch deleted file mode 100644 index de9b9d7b63e7d5..00000000000000 --- a/ports/mongo-cxx-driver/fix-dependency-libbson.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt -index 69b53b3..655b33a 100644 ---- a/src/bsoncxx/CMakeLists.txt -+++ b/src/bsoncxx/CMakeLists.txt -@@ -78,15 +78,15 @@ set(LIBBSON_REQUIRED_VERSION 1.13.0) - set(LIBBSON_REQUIRED_ABI_VERSION 1.0) - - if (BUILD_SHARED_LIBS) -- find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} ${LIBBSON_REQUIRED_VERSION} REQUIRED) -+ find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} ${LIBBSON_REQUIRED_VERSION} CONFIG REQUIRED) - set(libbson_libraries ${BSON_LIBRARIES}) - set(libbson_include_directories ${BSON_INCLUDE_DIRS}) - set(libbson_definitions ${BSON_DEFINITIONS}) - else() -- find_package(libbson-static-${LIBBSON_REQUIRED_ABI_VERSION} ${LIBBSON_REQUIRED_VERSION} REQUIRED) -- set(libbson_libraries ${BSON_STATIC_LIBRARIES}) -- set(libbson_include_directories ${BSON_STATIC_INCLUDE_DIRS}) -- set(libbson_definitions ${BSON_STATIC_DEFINITIONS}) -+ find_package(libbson-${LIBBSON_REQUIRED_ABI_VERSION} ${LIBBSON_REQUIRED_VERSION} CONFIG REQUIRED) -+ set(libbson_libraries ${BSON_LIBRARIES}) -+ set(libbson_include_directories ${BSON_INCLUDE_DIRS}) -+ set(libbson_definitions ${BSON_DEFINITIONS}) - endif() - - add_subdirectory(third_party) diff --git a/ports/mongo-cxx-driver/fix-dependency-mongocdriver.patch b/ports/mongo-cxx-driver/fix-dependency-mongocdriver.patch deleted file mode 100644 index 99a6a8efc2cddd..00000000000000 --- a/ports/mongo-cxx-driver/fix-dependency-mongocdriver.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt -index 64ff936..e4d4e14 100644 ---- a/src/mongocxx/CMakeLists.txt -+++ b/src/mongocxx/CMakeLists.txt -@@ -39,10 +39,10 @@ if (BUILD_SHARED_LIBS) - set(libmongoc_include_directories ${MONGOC_INCLUDE_DIRS}) - set(libmongoc_definitions ${MONGOC_DEFINITIONS}) - else() -- find_package(libmongoc-static-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} REQUIRED) -- set(libmongoc_libraries ${MONGOC_STATIC_LIBRARIES}) -- set(libmongoc_include_directories ${MONGOC_STATIC_INCLUDE_DIRS}) -- set(libmongoc_definitions ${MONGOC_STATIC_DEFINITIONS}) -+ find_package(libmongoc-${LIBMONGOC_REQUIRED_ABI_VERSION} ${LIBMONGOC_REQUIRED_VERSION} REQUIRED) -+ set(libmongoc_libraries ${MONGOC_LIBRARIES}) -+ set(libmongoc_include_directories ${MONGOC_INCLUDE_DIRS}) -+ set(libmongoc_definitions ${MONGOC_DEFINITIONS}) - endif() - - add_subdirectory(config) diff --git a/ports/mongo-cxx-driver/fix-uwp.patch b/ports/mongo-cxx-driver/fix-uwp.patch index fffaa8337070bb..84a1d6ae321bc3 100644 --- a/ports/mongo-cxx-driver/fix-uwp.patch +++ b/ports/mongo-cxx-driver/fix-uwp.patch @@ -1,11 +1,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 40cd480..08cd37f 100644 +index d1bf5e944..2f7a16aa1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -13,5 +13,6 @@ +@@ -13,6 +13,7 @@ # limitations under the License. add_definitions(-DMONGO_CXX_DRIVER_COMPILING) +add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_subdirectory(bsoncxx) add_subdirectory(mongocxx) + diff --git a/ports/mongo-cxx-driver/github-654.patch b/ports/mongo-cxx-driver/github-654.patch index f0eda2923b85aa..61ce426e04210b 100644 --- a/ports/mongo-cxx-driver/github-654.patch +++ b/ports/mongo-cxx-driver/github-654.patch @@ -1,30 +1,16 @@ -From e1a92d8bf8f07abc89350a956819b78df05bc4fe Mon Sep 17 00:00:00 2001 -From: Billy Robert O'Neal III -Date: Mon, 25 May 2020 20:47:58 -0700 -Subject: [PATCH] Disable trivially_constructible test for atomic on MSVC++. - -MSVC++ implements P0883 unconditionally, which changes the rules for std::atomic. It removes atomic's trivial constructor, and makes the default constructor value initialize the T. - -Note that Mongo was not following the C++11 rules, because it used the atomic before calling atomic_init first. MSVC++ never implemented the C++11 rules and previously default initialized the T. - -All versions of MSVC++ will provide constant initialization of the guarded value "current_instance". In old versions, atomic didn't implement P0883 due to bugs in the constexpr evaluator; in current versions the constexpr evaluator was fixed and atomic value initializes unconditionally. Therefore, this PR disables the check whenever MSVC++'s standard library is detected. - -See https://github.com/microsoft/STL/issues/661 for further discussion. ---- - src/mongocxx/instance.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - diff --git a/src/mongocxx/instance.cpp b/src/mongocxx/instance.cpp -index e67d41ec7..6eb456c65 100644 +index f12bd84a8..acc570fa9 100644 --- a/src/mongocxx/instance.cpp +++ b/src/mongocxx/instance.cpp -@@ -75,7 +75,8 @@ typename std::aligned_storage::type sentine +@@ -75,9 +75,10 @@ typename std::aligned_storage::type sentine std::atomic current_instance{nullptr}; static_assert(std::is_standard_layout::value, "Must be standard layout"); --#if (!defined(__GNUC__) || (defined(__clang__) && !defined(__GLIBCXX__))) || (__GNUC__ >= 5) -+#if (!defined(_MSVC_STL_VERSION)) \ -+ && ((!defined(__GNUC__) || (defined(__clang__) && !defined(__GLIBCXX__))) || (__GNUC__ >= 5)) - static_assert(std::is_trivially_constructible::value, - "Must be trivially constructible"); - #endif ++#if (!defined(_MSVC_STL_VERSION)) + static_assert(std::is_trivially_destructible::value, + "Must be trivially destructible"); +- ++#endif + } // namespace + + class instance::impl { diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index dc409fcfdfb680..ffbf83ce60dfcc 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,27 +1,25 @@ set(VERSION_MAJOR 3) -set(VERSION_MINOR 4) -set(VERSION_PATCH 0) +set(VERSION_MINOR 6) +set(VERSION_PATCH 5) set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mongodb/mongo-cxx-driver REF r${VERSION_FULL} - SHA512 28c052904f1b456b92482097166238eae1ad50c3ed207496f09366b46f2c9465c7e98c7219f4f10314e4d8fdd01c36b70a2221891bb75231adcc1edf013d43ce + SHA512 fe304d2f406f65d79a030dcfd1509543a9ab3057e46328d5ca1fc58da04758b9a2c6666a6194d574f9b42022324972d41c37d00d6fba87dfba63fbfb99e821de HEAD_REF master PATCHES fix-uwp.patch disable-c2338-mongo-cxx-driver.patch disable_test_and_example.patch - fix-dependency-libbson.patch - fix-dependency-mongocdriver.patch github-654.patch - fix-android.patch + fix-dependencies.patch ) if ("mnmlstc" IN_LIST FEATURES) if (VCPKG_TARGET_IS_WINDOWS) - message(FATAL_ERROR "Feature mnmlstc only support UNIX") + message(FATAL_ERROR "Feature mnmlstc only supports UNIX") endif() set(BSONCXX_POLY MNMLSTC) elseif ("system-mnmlstc" IN_LIST FEATURES) @@ -39,23 +37,26 @@ else() endif() endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS - -DLIBBSON_DIR=${CURRENT_INSTALLED_DIR} - -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR} -DMONGOCXX_HEADER_INSTALL_DIR=include -DBSONCXX_HEADER_INSTALL_DIR=include -DBSONCXX_POLY_USE_${BSONCXX_POLY}=1 + -DBUILD_VERSION=${VERSION_FULL} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libbsoncxx/libbsoncxx-config.cmake +vcpkg_cmake_config_fixup(PACKAGE_NAME bsoncxx CONFIG_PATH "lib/cmake/bsoncxx-${VERSION_FULL}" DO_NOT_DELETE_PARENT_CONFIG_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME mongocxx CONFIG_PATH "lib/cmake/mongocxx-${VERSION_FULL}") + +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libbsoncxx/libbsoncxx-config.cmake" " +message(WARNING \"This CMake target is deprecated. Use mongo::bsoncxx instead.\") + set(LIBBSONCXX_VERSION_MAJOR ${VERSION_MAJOR}) set(LIBBSONCXX_VERSION_MINOR ${VERSION_MINOR}) set(LIBBSONCXX_VERSION_PATCH ${VERSION_PATCH}) @@ -71,6 +72,8 @@ set(LIBBSONCXX_LIBRARIES optimized \${LIBBSONCXX_LIBRARY_PATH_RELEASE} debug \${ ) file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongocxx/libmongocxx-config.cmake " +message(WARNING \"This CMake target is deprecated. Use mongo::mongocxx instead.\") + set(LIBMONGOCXX_VERSION_MAJOR ${VERSION_MAJOR}) set(LIBMONGOCXX_VERSION_MINOR ${VERSION_MINOR}) set(LIBMONGOCXX_VERSION_PATCH ${VERSION_PATCH}) @@ -89,30 +92,33 @@ set(LIBMONGOCXX_LIBRARIES optimized \${LIBMONGOCXX_LIBRARY_PATH_RELEASE} debug \ " ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) - if (NOT BSONCXX_POLY STREQUAL MNMLSTC) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party") endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/private - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test_util - - ${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake - ${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/exception/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/options/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/gridfs/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/test - ${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util - - ${CURRENT_PACKAGES_DIR}/debug/include + "${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake" + "${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private" + "${CURRENT_PACKAGES_DIR}/include/bsoncxx/private" + "${CURRENT_PACKAGES_DIR}/include/bsoncxx/test" + "${CURRENT_PACKAGES_DIR}/include/bsoncxx/test_util" + + "${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake" + "${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private" + "${CURRENT_PACKAGES_DIR}/include/mongocxx/exception/private" + "${CURRENT_PACKAGES_DIR}/include/mongocxx/options/private" + "${CURRENT_PACKAGES_DIR}/include/mongocxx/gridfs/private" + "${CURRENT_PACKAGES_DIR}/include/mongocxx/private" + "${CURRENT_PACKAGES_DIR}/include/mongocxx/test" + "${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util" + + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/lib/cmake" ) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${SOURCE_PATH}/THIRD-PARTY-NOTICES DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${SOURCE_PATH}/THIRD-PARTY-NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index 60e374eba8ebb8..a140be68a14037 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mongo-cxx-driver", - "version-string": "3.4.0-5", - "port-version": 3, + "version": "3.6.5", "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "dependencies": [ @@ -9,7 +8,15 @@ "boost-smart-ptr", "boost-utility", "libbson", - "mongo-c-driver" + "mongo-c-driver", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "boost": { diff --git a/versions/baseline.json b/versions/baseline.json index 811288e0a98f99..1c77dd1ae440f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3285,8 +3285,8 @@ "port-version": 2 }, "libbson": { - "baseline": "1.16.1", - "port-version": 3 + "baseline": "1.17.6", + "port-version": 0 }, "libcanberra": { "baseline": "0.30", @@ -4369,12 +4369,12 @@ "port-version": 1 }, "mongo-c-driver": { - "baseline": "1.16.1", - "port-version": 6 + "baseline": "1.17.6", + "port-version": 0 }, "mongo-cxx-driver": { - "baseline": "3.4.0-5", - "port-version": 3 + "baseline": "3.6.5", + "port-version": 0 }, "mongoose": { "baseline": "7.1", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index 6aedc49e53f574..f9e63d686572ab 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2f9da5cc55e652deed81d0feb7aa71be2a1fdef", + "version": "1.17.6", + "port-version": 0 + }, { "git-tree": "6e6782528f3e1d88372ebe20fa82128419ab0c1c", "version": "1.16.1", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index 6d90ec4a22976c..644ab6b2429ff1 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9982d4176e1480433444ecace3b389bb8ca8570", + "version": "1.17.6", + "port-version": 0 + }, { "git-tree": "c13a612d9a93a8a338b5a32d14338683065813fd", "version": "1.16.1", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index 9382f6603d3ec4..a9d2f8802c5b4b 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13a9e7a7e597324f6cf72f7e9389604109888567", + "version": "3.6.5", + "port-version": 0 + }, { "git-tree": "afde1764bdbdc03cc32ffcb580bb587faa36b0c5", "version-string": "3.4.0-5", From 93c61e0a853a7f20cb5487b94a1824c0cf91e161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 27 Oct 2021 13:38:05 +0800 Subject: [PATCH 0906/1858] [hdf5] update to 1.12.1 (#20734) * [hdf5] update to 1.12.1 * version * Re-fix pkgconfig and szip, re-factory tool install, add feature utils * version * Fix debug lib name in pkgconfig files * Re-fix debug lib name in pkgconfig files, re-fix szip * Re-fix pkgconfig * version * Re-fix static szip, fix non-Windows installation * version * Apply suggestions * version * Apply suggestion * version --- ports/hdf5/hdf5_config.patch | 10 +- ports/hdf5/mingw-import-libs.patch | 30 ---- ports/hdf5/pkgconfig-link-order.patch | 6 +- ports/hdf5/pkgconfig-requires.patch | 198 ++++++++++++++++++++++---- ports/hdf5/portfile.cmake | 130 +++++++---------- ports/hdf5/szip.patch | 38 +++-- ports/hdf5/vcpkg.json | 6 +- versions/baseline.json | 4 +- versions/h-/hdf5.json | 5 + 9 files changed, 267 insertions(+), 160 deletions(-) delete mode 100644 ports/hdf5/mingw-import-libs.patch diff --git a/ports/hdf5/hdf5_config.patch b/ports/hdf5/hdf5_config.patch index 553a02346abc6c..85196507e65271 100644 --- a/ports/hdf5/hdf5_config.patch +++ b/ports/hdf5/hdf5_config.patch @@ -1,8 +1,8 @@ diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in -index b5a12a650..a8cbacb1c 100644 ---- a/config/cmake/hdf5-config.cmake.in +index 4d02c9c..8c10d2d 100644 +--- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in -@@ -54,7 +54,10 @@ set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@") +@@ -55,7 +55,10 @@ set (${HDF5_PACKAGE_NAME}_PARALLEL_FILTERED_WRITES "@PARALLEL_FILTERED_WRITES@") #----------------------------------------------------------------------------- # Dependencies #----------------------------------------------------------------------------- @@ -13,7 +13,7 @@ index b5a12a650..a8cbacb1c 100644 set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@") set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES "@MPI_C_LIBRARIES@") if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN) -@@ -110,11 +113,11 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@) +@@ -111,11 +114,11 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR @HDF5_VERSION_MINOR@) # project which has already built hdf5 as a subproject #----------------------------------------------------------------------------- if (NOT TARGET "@HDF5_PACKAGE@") @@ -23,7 +23,7 @@ index b5a12a650..a8cbacb1c 100644 + find_dependency(ZLIB) endif () - if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS) -- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) +- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZ_PACKAGE_NAME@/@SZ_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake) + if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT) + find_dependency(szip) endif () diff --git a/ports/hdf5/mingw-import-libs.patch b/ports/hdf5/mingw-import-libs.patch deleted file mode 100644 index f328fa1d2a5302..00000000000000 --- a/ports/hdf5/mingw-import-libs.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urw a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake ---- a/config/cmake_ext_mod/HDFMacros.cmake 2020-03-03 00:03:12.000000000 +0100 -+++ b/config/cmake_ext_mod/HDFMacros.cmake 2021-05-12 07:56:13.703041807 +0200 -@@ -144,7 +144,7 @@ - endif () - - #----- Use MSVC Naming conventions for Shared Libraries -- if (MINGW AND ${libtype} MATCHES "SHARED") -+ if (FALSE AND MINGW AND ${libtype} MATCHES "SHARED") - set_target_properties (${libtarget} PROPERTIES - IMPORT_SUFFIX ".lib" - IMPORT_PREFIX "" -@@ -168,7 +168,7 @@ - - if (${libtype} MATCHES "SHARED") - if (WIN32) -- if (MINGW) -+ if (FALSE AND MINGW) - set_target_properties (${libtarget} PROPERTIES - IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib" - IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" -@@ -180,7 +180,7 @@ - ) - endif () - else () -- if (MINGW) -+ if (FALSE AND MINGW) - set_target_properties (${libtarget} PROPERTIES - IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib" - IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}" diff --git a/ports/hdf5/pkgconfig-link-order.patch b/ports/hdf5/pkgconfig-link-order.patch index 66349c66c9b108..a3bcbb08005cf8 100644 --- a/ports/hdf5/pkgconfig-link-order.patch +++ b/ports/hdf5/pkgconfig-link-order.patch @@ -1,7 +1,7 @@ -diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in +diff --git a/config/libhdf5.pc.in b/config/libhdf5.pc.in index 4a2ebaa..3cb42d2 100644 ---- a/config/cmake/libhdf5.pc.in -+++ b/config/cmake/libhdf5.pc.in +--- a/config/libhdf5.pc.in ++++ b/config/libhdf5.pc.in @@ -10,5 +10,5 @@ Version: @_PKG_CONFIG_VERSION@ Cflags: -I${includedir} Libs: -L${libdir} @_PKG_CONFIG_SH_LIBS@ diff --git a/ports/hdf5/pkgconfig-requires.patch b/ports/hdf5/pkgconfig-requires.patch index 5c670b422e22d0..14ef3cf6d060c1 100644 --- a/ports/hdf5/pkgconfig-requires.patch +++ b/ports/hdf5/pkgconfig-requires.patch @@ -1,7 +1,31 @@ -diff -urN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2020-03-03 00:03:12.000000000 +0100 -+++ b/CMakeLists.txt 2021-05-15 15:02:03.496210691 +0200 -@@ -682,6 +682,9 @@ +diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake +index 141ab44..66b7efa 100644 +--- a/CMakeFilters.cmake ++++ b/CMakeFilters.cmake +@@ -74,6 +74,7 @@ if (HDF5_ENABLE_Z_LIB_SUPPORT) + set (H5_ZLIB_HEADER "zlib.h") + set (ZLIB_INCLUDE_DIR_GEN ${ZLIB_INCLUDE_DIR}) + set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR}) ++ set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}") + else () + if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) +@@ -128,8 +129,10 @@ if (HDF5_ENABLE_SZIP_SUPPORT) + else() + get_target_property(SZIP_STATIC_LIBRARY szip-shared IMPORTED_LOCATION_${upper_build_type}) + endif() ++ set(szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}") + elseif (TARGET szip-static) + get_target_property(SZIP_STATIC_LIBRARY szip-static IMPORTED_LOCATION_${upper_build_type}) ++ set(szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}") + elseif (SZIP_FOUND) + set (H5_HAVE_FILTER_SZIP 1) + set (H5_HAVE_SZLIB_H 1) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b75fdd2..a2e88fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -750,6 +750,9 @@ if (H5_HAVE_PARALLEL) if (MPI_C_LINK_FLAGS) set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") endif () @@ -11,29 +35,149 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt endif () #option (DEFAULT_API_VERSION "Enable v1.12 API (v16, v18, v110, v112)" "v112") -diff -urN a/CMakeFilters.cmake b/CMakeFilters.cmake ---- a/CMakeFilters.cmake 2020-03-03 00:03:12.000000000 +0100 -+++ b/CMakeFilters.cmake 2021-05-15 12:35:58.453641554 +0200 -@@ -55,6 +55,7 @@ - if (ZLIB_FOUND) - set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES}) - set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${ZLIB_LIBRARIES}) -+ set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}") - endif () - endif () - endif () -@@ -130,6 +131,7 @@ - set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_SHARED_LIBRARY}) +diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt +index 835d422..9a7176f 100644 +--- a/c++/src/CMakeLists.txt ++++ b/c++/src/CMakeLists.txt +@@ -188,14 +188,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake +index ae0ebca..095fae4 100644 +--- a/config/cmake_ext_mod/HDFMacros.cmake ++++ b/config/cmake_ext_mod/HDFMacros.cmake +@@ -384,7 +384,7 @@ macro (HDF_DIR_PATHS package_prefix) endif () - set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY}) -+ set (szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}") - INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS}) - message (STATUS "Filter SZIP is ON") - if (H5_HAVE_FILTER_SZIP) -diff -urN a/src/CMakeLists.txt b/src/CMakeLists.txt ---- a/src/CMakeLists.txt 2020-03-03 00:03:12.000000000 +0100 -+++ b/src/CMakeLists.txt 2021-05-15 12:41:34.762354040 +0200 -@@ -1259,6 +1259,15 @@ + + #set the default debug suffix for all library targets +- if(NOT CMAKE_DEBUG_POSTFIX) ++ if(NOT DEFINED CMAKE_DEBUG_POSTFIX) + if (WIN32) + set (CMAKE_DEBUG_POSTFIX "_D") + else () +diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt +index e59a829..8da64dd 100644 +--- a/fortran/src/CMakeLists.txt ++++ b/fortran/src/CMakeLists.txt +@@ -545,14 +545,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt +index c516df1..89bd31f 100644 +--- a/hl/c++/src/CMakeLists.txt ++++ b/hl/c++/src/CMakeLists.txt +@@ -99,14 +99,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt +index 973299f..8eadfe5 100644 +--- a/hl/fortran/src/CMakeLists.txt ++++ b/hl/fortran/src/CMakeLists.txt +@@ -332,14 +332,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt +index 7678de8..2d398cc 100644 +--- a/hl/src/CMakeLists.txt ++++ b/hl/src/CMakeLists.txt +@@ -131,14 +131,14 @@ set (_PKG_CONFIG_VERSION "${HDF5_PACKAGE_VERSION}") + set (_PKG_CONFIG_LIBS_PRIVATE) + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + +-set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") +-set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}") ++set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}") ++set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}") + + configure_file ( + ${HDF_CONFIG_DIR}/libhdf5.pc.in +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index b3c2226..ea80d60 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1321,14 +1321,23 @@ foreach (libs ${LINK_LIBS} ${LINK_COMP_LIBS}) + endforeach () + + if (NOT ONLY_SHARED_LIBS) +- set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}") ++ set (_PKG_CONFIG_LIBS "${_PKG_CONFIG_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () + if (BUILD_SHARED_LIBS) +- set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}") ++ set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_LIB_CORENAME}${CMAKE_DEBUG_POSTFIX}") + endif () set (_PKG_CONFIG_REQUIRES) set (_PKG_CONFIG_REQUIRES_PRIVATE) @@ -48,4 +192,4 @@ diff -urN a/src/CMakeLists.txt b/src/CMakeLists.txt +endforeach() configure_file ( - ${HDF_RESOURCES_DIR}/libhdf5.pc.in + ${HDF_CONFIG_DIR}/libhdf5.pc.in diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake index cd85ab359c5dcd..23263c7d77b48a 100644 --- a/ports/hdf5/portfile.cmake +++ b/ports/hdf5/portfile.cmake @@ -5,23 +5,33 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HDFGroup/hdf5 - REF hdf5-1_12_0 - SHA512 d84df1ea72dc6fa038440a370e1b1ff523364474e7f214b967edc26d3191b2ef4fe1d9273c4a086a5945f1ad1ab6aa8dbcda495898e7967b2b73fd93dd5071e0 + REF hdf5-1_12_1 + SHA512 8a736b6a66bf4ec904a0e0dd9e8e0e791d8a04c996c5ea6b73b7d6f8145c4bfa4ed5c6e4f11740ceb1d1226a333c8242968e604dbdac2b7b561a1bd265423434 HEAD_REF develop PATCHES hdf5_config.patch szip.patch - mingw-import-libs.patch pkgconfig-requires.patch pkgconfig-link-order.patch ) +set(ALLOW_UNSUPPORTED OFF) if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES) - message(FATAL_ERROR "Feature Parallel and C++ options are mutually exclusive.") + message(WARNING "Feature 'Parallel' and 'cpp' are mutually exclusive, enable feature ALLOW_UNSUPPORTED automatically to enable them both.") + set(ALLOW_UNSUPPORTED ON) +endif() + +if ("threadsafe" IN_LIST FEATURES AND + ("parallel" IN_LIST FEATURES + OR "fortran" IN_LIST FEATURES + OR "cpp" IN_LIST FEATURES) + ) + message(WARNING "Feture 'threadsafe' and other features are mutually exclusive, enable feature ALLOW_UNSUPPORTED automatically to enable them both.") + set(ALLOW_UNSUPPORTED ON) endif() if ("fortran" IN_LIST FEATURE) - message(WARNING "Fortran is not yet official supported within VCPKG. Build will most likly fail if ninja 1.10 and a Fortran compiler are not available.") + message(WARNING "Feature 'fortran' is not yet official supported within VCPKG. Build will most likly fail if ninja 1.10 and a Fortran compiler are not available.") endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -34,6 +44,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS zlib HDF5_ENABLE_Z_LIB_SUPPORT fortran HDF5_BUILD_FORTRAN threadsafe HDF5_ENABLE_THREADSAFE + utils HDF5_BUILD_UTILS ) file(REMOVE "${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake")#Outdated; does not find debug szip @@ -48,11 +59,9 @@ if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") -DONLY_SHARED_LIBS=ON) endif() - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} -DBUILD_TESTING=OFF @@ -60,6 +69,11 @@ vcpkg_cmake_configure( -DHDF5_INSTALL_DATA_DIR=share/hdf5/data -DHDF5_INSTALL_CMAKE_DIR=share -DHDF_PACKAGE_NAMESPACE:STRING=hdf5:: + -DHDF5_MSVC_NAMING_CONVENTION=OFF + -DSZIP_USE_EXTERNAL=ON + -DALLOW_UNSUPPORTED=${ALLOW_UNSUPPORTED} + OPTIONS_RELEASE + -DCMAKE_DEBUG_POSTFIX= # For lib name in pkgconfig files ) vcpkg_cmake_install() @@ -70,89 +84,51 @@ set(debug_suffix debug) if(VCPKG_TARGET_IS_WINDOWS) set(debug_suffix D) endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5-1.12.0.pc") - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5-1.12.0.pc" - "-lhdf5" - "-lhdf5_${debug_suffix}" - ) -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5_hl-1.12.0.pc") - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5_hl-1.12.0.pc" - "-lhdf5_hl" - "-lhdf5_hl_${debug_suffix}" - ) -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5_cpp-1.12.0.pc") - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5_cpp-1.12.0.pc" - "-lhdf5_cpp" - "-lhdf5_cpp_${debug_suffix}" - ) - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5_cpp-1.12.0.pc" - "Requires.private: hdf5" - "" - ) -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/hdf5_cpp-1.12.0.pc") - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/hdf5_cpp-1.12.0.pc" - "Requires.private: hdf5" - "" - ) -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5_hl_cpp-1.12.0.pc") - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5_hl_cpp-1.12.0.pc" - "-lhdf5_hl_cpp" - "-lhdf5_hl_cpp_${debug_suffix}" - ) -endif() -set(PKG_FILES hdf5 hdf5_hl hdf5_cpp hdf5_hl_cpp) -foreach(PC_FILE IN LISTS PKG_FILES) - set(SUBPATHS "/debug/lib/pkgconfig" "/lib/pkgconfig") - foreach(SUBPATH IN LISTS SUBPATHS) - if(EXISTS "${CURRENT_PACKAGES_DIR}${SUBPATH}/${PC_FILE}-1.12.0.pc") - file(RENAME "${CURRENT_PACKAGES_DIR}${SUBPATH}/${PC_FILE}-1.12.0.pc" "${CURRENT_PACKAGES_DIR}${SUBPATH}/${PC_FILE}.pc") - endif() - endforeach() -endforeach() + vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents) -string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/tools/hdf5"]] contents ${contents}) +string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]] + [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/tools/hdf5"]] + contents ${contents} +) file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents}) if(FEATURES MATCHES "tools") - set(TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import) + set(HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug + h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import + ) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(TOOL_SUFFIXES "-shared${VCPKG_TARGET_EXECUTABLE_SUFFIX};${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(TRANSFORM HDF5_TOOLS REPLACE "^(.+)$" "\\1-shared") else() - set(TOOL_SUFFIXES "-static${VCPKG_TARGET_EXECUTABLE_SUFFIX};${VCPKG_TARGET_EXECUTABLE_SUFFIX}") endif() - - foreach(tool IN LISTS TOOLS) - foreach(suffix IN LISTS TOOL_SUFFIXES) - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/${tool}${suffix}") - endif() - if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") - file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}" - DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") - file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}") - endif() - endforeach() + + foreach(HDF5_TOOL IN LISTS HDF5_TOOLS) + if (NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}" + OR NOT EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/${HDF5_TOOL}${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + list(REMOVE_ITEM HDF5_TOOLS "${HDF5_TOOL}") + endif() endforeach() - vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") + + vcpkg_copy_tools(TOOL_NAMES ${HDF5_TOOLS} AUTO_CLEAN) +endif() + +if ("utils" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES mirror_server mirror_server_stop + AUTO_CLEAN + ) endif() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +# Clean up +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) + +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/hdf5/szip.patch b/ports/hdf5/szip.patch index 9dede42470d33e..27b9c3dde47c7b 100644 --- a/ports/hdf5/szip.patch +++ b/ports/hdf5/szip.patch @@ -1,16 +1,26 @@ -diff -urN a/CMakeFilters.cmake b/CMakeFilters.cmake ---- a/CMakeFilters.cmake 2021-05-15 19:07:48.160044927 +0200 -+++ b/CMakeFilters.cmake 2021-05-15 19:22:56.993970332 +0200 -@@ -104,7 +104,11 @@ - find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared) - if (NOT SZIP_FOUND) - find_package (SZIP) # Legacy find -- if (SZIP_FOUND) -+ if (DEFINED SZIP_SHARED_LIBRARY AND NOT DEFINED SZIP_STATIC_LIBRARY) -+ set (SZIP_STATIC_LIBRARY "${SZIP_SHARED_LIBRARY}") -+ elseif (DEFINED SZIP_STATIC_LIBRARY AND NOT DEFINED SZIP_SHARED_LIBRARY) -+ set (SZIP_SHARED_LIBRARY "${SZIP_STATIC_LIBRARY}") -+ elseif (SZIP_FOUND) +diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake +index d5f801e..141ab44 100644 +--- a/CMakeFilters.cmake ++++ b/CMakeFilters.cmake +@@ -117,8 +117,20 @@ if (HDF5_ENABLE_SZIP_SUPPORT) set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES}) - set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_LIBRARIES}) endif () + endif () ++ else() ++ find_package(szip CONFIG REQUIRED) + endif () +- if (SZIP_FOUND) ++ string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type) ++ # SZIP_STATIC_LIBRARY will be used in cmake and pkgconfig, so it must be a absolute path ++ if (TARGET szip-shared) ++ if (WIN32) ++ get_target_property(SZIP_STATIC_LIBRARY szip-shared IMPORTED_IMPLIB_${upper_build_type}) ++ else() ++ get_target_property(SZIP_STATIC_LIBRARY szip-shared IMPORTED_LOCATION_${upper_build_type}) ++ endif() ++ elseif (TARGET szip-static) ++ get_target_property(SZIP_STATIC_LIBRARY szip-static IMPORTED_LOCATION_${upper_build_type}) ++ elseif (SZIP_FOUND) + set (H5_HAVE_FILTER_SZIP 1) + set (H5_HAVE_SZLIB_H 1) + set (H5_HAVE_LIBSZ 1) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 3912a629ea26c9..28d7104d137e97 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,7 +1,6 @@ { "name": "hdf5", - "version": "1.12.0", - "port-version": 4, + "version": "1.12.1", "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", @@ -47,6 +46,9 @@ "tools": { "description": "Build hdf tools" }, + "utils": { + "description": "Build HDF5 Utils" + }, "zlib": { "description": "Build with zlib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1c77dd1ae440f8..b5a8a98b0b3609 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2633,8 +2633,8 @@ "port-version": 0 }, "hdf5": { - "baseline": "1.12.0", - "port-version": 4 + "baseline": "1.12.1", + "port-version": 0 }, "healpix": { "baseline": "1.12.10", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 0440a7f6fd933e..76be320bdbfd15 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf638074020559930d6e73c72bc9937bfef5ba57", + "version": "1.12.1", + "port-version": 0 + }, { "git-tree": "77eb81be380363280c67a3b15043696f6cee2001", "version": "1.12.0", From 5548a7f5e148b0a361ce461d86a683586b3f1b48 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 27 Oct 2021 07:48:21 +0200 Subject: [PATCH 0907/1858] [openssl] Fix exported config (#20831) * Install openssl.pc * Add pc files for Windows * Use pkg-config friendly lib names without extension * Update versions --- ports/openssl/install-pc-files.cmake | 32 ++++++++++++++++++++++ ports/openssl/openssl.pc.in | 6 ++++ ports/openssl/portfile.cmake | 2 ++ ports/openssl/unix/CMakeLists.txt | 1 + ports/openssl/vcpkg-cmake-wrapper.cmake.in | 6 ++-- ports/openssl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openssl.json | 5 ++++ 8 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 ports/openssl/install-pc-files.cmake create mode 100644 ports/openssl/openssl.pc.in diff --git a/ports/openssl/install-pc-files.cmake b/ports/openssl/install-pc-files.cmake new file mode 100644 index 00000000000000..eb8d2b8c288473 --- /dev/null +++ b/ports/openssl/install-pc-files.cmake @@ -0,0 +1,32 @@ +function(install_pc_file name pc_data) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/${name}.pc" @ONLY) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + configure_file("${CMAKE_CURRENT_LIST_DIR}/openssl.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/${name}.pc" @ONLY) + endif() +endfunction() + +install_pc_file(openssl [[ +Name: OpenSSL +Description: Secure Sockets Layer and cryptography libraries and tools +Requires: libssl libcrypto +]]) + +install_pc_file(libssl [[ +Name: OpenSSL-libssl +Description: Secure Sockets Layer and cryptography libraries +Libs: -L"${libdir}" -llibssl +Requires: libcrypto +Cflags: -I"${includedir}" +]]) + +install_pc_file(libcrypto [[ +Name: OpenSSL-libcrypto +Description: OpenSSL cryptography library +Libs: -L"${libdir}" -llibcrypto +Libs.private: -lcrypt32 -lws2_32 +Cflags: -I"${includedir}" +]]) + +vcpkg_fixup_pkgconfig() diff --git a/ports/openssl/openssl.pc.in b/ports/openssl/openssl.pc.in new file mode 100644 index 00000000000000..3033e1804da0f4 --- /dev/null +++ b/ports/openssl/openssl.pc.in @@ -0,0 +1,6 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include +Version: @OPENSSL_VERSION@ +@pc_data@ diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake index be6029c71054fb..85e5a544b3b008 100644 --- a/ports/openssl/portfile.cmake +++ b/ports/openssl/portfile.cmake @@ -15,8 +15,10 @@ vcpkg_add_to_path("${PERL_EXE_PATH}") if(VCPKG_TARGET_IS_UWP) include("${CMAKE_CURRENT_LIST_DIR}/uwp/portfile.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") elseif(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) include("${CMAKE_CURRENT_LIST_DIR}/windows/portfile.cmake") + include("${CMAKE_CURRENT_LIST_DIR}/install-pc-files.cmake") else() include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake") endif() diff --git a/ports/openssl/unix/CMakeLists.txt b/ports/openssl/unix/CMakeLists.txt index be9c23d0032bff..7bf45e27bb73e0 100644 --- a/ports/openssl/unix/CMakeLists.txt +++ b/ports/openssl/unix/CMakeLists.txt @@ -128,6 +128,7 @@ else() set(SHARED no-shared) set(LIB_EXTS a) endif() +set(INSTALL_PKG_CONFIGS "${BUILDDIR}/openssl.pc") foreach(lib ssl crypto) foreach(ext ${LIB_EXTS}) list(APPEND INSTALL_LIBS "${BUILDDIR}/lib${lib}.${ext}") diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in index f1c3176cf175ae..4d9957c861c1b7 100644 --- a/ports/openssl/vcpkg-cmake-wrapper.cmake.in +++ b/ports/openssl/vcpkg-cmake-wrapper.cmake.in @@ -38,12 +38,12 @@ set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK}) if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") if(WIN32) - list(APPEND OPENSSL_LIBRARIES Crypt32.lib ws2_32.lib) + list(APPEND OPENSSL_LIBRARIES crypt32 ws2_32) if(TARGET OpenSSL::Crypto) - set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib") + set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32") endif() if(TARGET OpenSSL::SSL) - set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib") + set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32") endif() else() cmake_policy(PUSH) diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index c1c4e0125c7cd0..0c09f7d0da9104 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openssl", "version-string": "1.1.1l", - "port-version": 2, + "port-version": 3, "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.", "homepage": "https://www.openssl.org" } diff --git a/versions/baseline.json b/versions/baseline.json index b5a8a98b0b3609..ac8c6524977041 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4922,7 +4922,7 @@ }, "openssl": { "baseline": "1.1.1l", - "port-version": 2 + "port-version": 3 }, "openssl-unix": { "baseline": "1.1.1h", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 69a54b37451c64..2fb7de83e05a32 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83369bdefab234d8570ac2c0f3b616b0c4ab6cdf", + "version-string": "1.1.1l", + "port-version": 3 + }, { "git-tree": "d5310e60291032390ab8c893794f6044a7b9ae04", "version-string": "1.1.1l", From 2368a85648ebaff3ccdd94b36bc813120ff9c019 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 27 Oct 2021 07:49:56 +0200 Subject: [PATCH 0908/1858] [liblzma] Generally fix output name (#20751) * Really fix output names * Fix parameter warning * Update versions --- ports/liblzma/portfile.cmake | 11 ++++------- ports/liblzma/vcpkg.json | 2 +- ports/liblzma/win_output_name.patch | 20 ++++++++------------ versions/baseline.json | 2 +- versions/l-/liblzma.json | 5 +++++ 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index e653cbcce461a3..b7d08179410927 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github( vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS_DEBUG "-DCMAKE_DEBUG_POSTFIX=d" # This was in the old vcpkg CMakeLists.txt and I don't intend to fix it all over vcpkg ) vcpkg_cmake_install() @@ -45,13 +45,10 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzma-config.cmake" "include file(APPEND "${CURRENT_PACKAGES_DIR}/share/liblzma/liblzmaConfig.cmake" " include(\${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake) -find_path(LibLZMA_INCLUDE_DIR - NAMES lzma.h - PATH_SUFFIXES lzma -) +find_path(LibLZMA_INCLUDE_DIR NAMES lzma.h PATHS \"\${_IMPORT_PREFIX}/include\" NO_DEFAULT_PATH REQUIRED) if(NOT LibLZMA_LIBRARY) - find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma LZMA LibLZMA liblzma PATHS \${_IMPORT_PREFIX}/lib/) - find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad LZMAd LibLZMAd lzma LZMA LibLZMA liblzma PATHS \${_IMPORT_PREFIX}/debug/lib/) + find_library(LibLZMA_LIBRARY_RELEASE NAMES lzma PATHS \"\${_IMPORT_PREFIX}/lib\" NO_DEFAULT_PATH) + find_library(LibLZMA_LIBRARY_DEBUG NAMES lzmad PATHS \"\${_IMPORT_PREFIX}/debug/lib\" NO_DEFAULT_PATH) select_library_configurations(LibLZMA) endif() set(LibLZMA_INCLUDE_DIRS \${LibLZMA_INCLUDE_DIR} CACHE PATH \"\") diff --git a/ports/liblzma/vcpkg.json b/ports/liblzma/vcpkg.json index fb6c4097e25a2e..5c1874023eda29 100644 --- a/ports/liblzma/vcpkg.json +++ b/ports/liblzma/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblzma", "version-semver": "5.2.5", - "port-version": 3, + "port-version": 4, "description": "Compression library with an API similar to that of zlib.", "homepage": "hhttps://github.com/xz-mirror/xz", "dependencies": [ diff --git a/ports/liblzma/win_output_name.patch b/ports/liblzma/win_output_name.patch index b6e3cd8ee86bb7..e1da52a46e8031 100644 --- a/ports/liblzma/win_output_name.patch +++ b/ports/liblzma/win_output_name.patch @@ -1,17 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 120dc7548..728ca3591 100644 +index e80b524..1ecf908 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -398,11 +398,12 @@ else() - endif() +@@ -429,7 +429,7 @@ set_target_properties(liblzma PROPERTIES - if(WIN32) -+ set_target_properties(liblzma PROPERTIES OUTPUT_NAME lzma) - if(BUILD_SHARED_LIBS) - # Add the Windows resource file for liblzma.dll. - target_sources(liblzma PRIVATE src/liblzma/liblzma_w32res.rc) - target_include_directories(liblzma PRIVATE windows/vs2019) + # It's liblzma.so or liblzma.dll, not libliblzma.so or lzma.dll. + # Avoid the name lzma.dll because it would conflict with LZMA SDK. +- PREFIX "" ++ OUTPUT_NAME lzma + ) - # Export the public API symbols with __declspec(dllexport). - target_compile_definitions(liblzma PRIVATE DLL_EXPORT) - else() + # Create liblzmaConfigVersion.cmake. diff --git a/versions/baseline.json b/versions/baseline.json index ac8c6524977041..c86a213cea6229 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3558,7 +3558,7 @@ }, "liblzma": { "baseline": "5.2.5", - "port-version": 3 + "port-version": 4 }, "libmad": { "baseline": "0.15.1", diff --git a/versions/l-/liblzma.json b/versions/l-/liblzma.json index 9825016e361ff7..aa67e4602e48fe 100644 --- a/versions/l-/liblzma.json +++ b/versions/l-/liblzma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "273eaeff533f90bc42394cca9f1ea23ff6b49534", + "version-semver": "5.2.5", + "port-version": 4 + }, { "git-tree": "2c5f893c8d78d30c4641e9f4d0c7818386f8c8c9", "version-semver": "5.2.5", From b9630d7a837d6e4808faec5a14e5a0e33bad19bc Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Wed, 27 Oct 2021 07:53:21 +0200 Subject: [PATCH 0909/1858] [freetype] Fix wrong brotli linkage (#20849) * [freetype] fix brotli module * [skip actions] version stuff * bump port version * version stuff --- ports/freetype/brotli-static.patch | 15 +++++++-------- ports/freetype/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/freetype.json | 5 +++++ 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ports/freetype/brotli-static.patch b/ports/freetype/brotli-static.patch index 8ef7fd5e3b3c8a..6d657aa5a3ca22 100644 --- a/ports/freetype/brotli-static.patch +++ b/ports/freetype/brotli-static.patch @@ -2,21 +2,20 @@ diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake index 46356b1fd..ed4cc2409 100644 --- a/builds/cmake/FindBrotliDec.cmake +++ b/builds/cmake/FindBrotliDec.cmake -@@ -35,10 +35,18 @@ find_path(BROTLIDEC_INCLUDE_DIRS +@@ -35,10 +35,17 @@ find_path(BROTLIDEC_INCLUDE_DIRS PATH_SUFFIXES brotli) find_library(BROTLIDEC_LIBRARIES - NAMES brotlidec -+ NAMES brotlidec brotlidec-static ++ NAMES brotlidec brotlidec-static NAMES_PER_DIR HINTS ${PC_BROTLIDEC_LIBDIR} ${PC_BROTLIDEC_LIBRARY_DIRS}) -+find_library(BROTLICOMMON_LIBRARIES -+ NAMES brotlicommon-static -+ HINTS ${PC_BROTLIDEC_LIBDIR} -+ ${PC_BROTLIDEC_LIBRARY_DIRS}) -+ -+if(BROTLICOMMON_LIBRARIES) ++if(BROTLIDEC_LIBRARIES MATCHES "-static") ++ find_library(BROTLICOMMON_LIBRARIES ++ NAMES brotlicommon-static ++ HINTS ${PC_BROTLIDEC_LIBDIR} ++ ${PC_BROTLIDEC_LIBRARY_DIRS}) + set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) +endif() diff --git a/ports/freetype/vcpkg.json b/ports/freetype/vcpkg.json index d9e49300a21e4b..23f9e81339e7e4 100644 --- a/ports/freetype/vcpkg.json +++ b/ports/freetype/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype", "version-semver": "2.11.0", - "port-version": 1, + "port-version": 2, "description": "A library to render fonts.", "homepage": "https://www.freetype.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c86a213cea6229..00a234e36b4b04 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2250,7 +2250,7 @@ }, "freetype": { "baseline": "2.11.0", - "port-version": 1 + "port-version": 2 }, "freetype-gl": { "baseline": "2020-09-14", diff --git a/versions/f-/freetype.json b/versions/f-/freetype.json index 950afdff05c529..55c9b9b2f703ec 100644 --- a/versions/f-/freetype.json +++ b/versions/f-/freetype.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d21ff9f7071d83c1e04eca8cae21b99438400d8", + "version-semver": "2.11.0", + "port-version": 2 + }, { "git-tree": "a314ebd21048f1cf17a6b4330d9970c661f8fea7", "version-semver": "2.11.0", From 9e7b7b35c28ac53a92c4b568eed1e1a6c251ffdc Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Wed, 27 Oct 2021 00:54:57 -0500 Subject: [PATCH 0910/1858] [bext-sml] Adding new port of boost::sml (#20851) * [bext-sml] Adding new port * [bext-sml] Running x-add-version --- ports/bext-sml/portfile.cmake | 15 +++++++++++++++ ports/bext-sml/vcpkg.json | 6 ++++++ versions/b-/bext-sml.json | 9 +++++++++ versions/baseline.json | 4 ++++ 4 files changed, 34 insertions(+) create mode 100644 ports/bext-sml/portfile.cmake create mode 100644 ports/bext-sml/vcpkg.json create mode 100644 versions/b-/bext-sml.json diff --git a/ports/bext-sml/portfile.cmake b/ports/bext-sml/portfile.cmake new file mode 100644 index 00000000000000..75d8f36aa98f37 --- /dev/null +++ b/ports/bext-sml/portfile.cmake @@ -0,0 +1,15 @@ +# Header-only library +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO boost-ext/sml + REF v1.1.4 + SHA512 0ded162e5d9d7cc9d8769fd9131d7a5cfc98187c8e9d98393eda9e0804c282e510707de38fe7229d2fe16aea70c9a8e300f14e992fff3ddedd0fa1b6a66ab1ba + HEAD_REF master +) + +file(INSTALL "${SOURCE_PATH}/include/boost/sml.hpp" + DESTINATION "${CURRENT_PACKAGES_DIR}/include/boost" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bext-sml/vcpkg.json b/ports/bext-sml/vcpkg.json new file mode 100644 index 00000000000000..774e04321a704f --- /dev/null +++ b/ports/bext-sml/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "bext-sml", + "version": "1.1.4", + "description": "Your scalable C++14 one header only State Machine Library with no dependencies", + "homepage": "https://github.com/boost-ext/sml" +} diff --git a/versions/b-/bext-sml.json b/versions/b-/bext-sml.json new file mode 100644 index 00000000000000..56b065fc341dda --- /dev/null +++ b/versions/b-/bext-sml.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5e5941cb1ecd7988a9f52c1ace73823a4a20743c", + "version": "1.1.4", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 00a234e36b4b04..d0065b512d0904 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -428,6 +428,10 @@ "baseline": "1.2.0", "port-version": 0 }, + "bext-sml": { + "baseline": "1.1.4", + "port-version": 0 + }, "bext-ut": { "baseline": "1.1.8", "port-version": 0 From cb550f79d19f3ffd8d3a4b840eea141d2d9861f2 Mon Sep 17 00:00:00 2001 From: Angus Comrie Date: Wed, 27 Oct 2021 07:56:35 +0200 Subject: [PATCH 0911/1858] [cminpack] add new port (#20772) * initial port commit * version info added * removed exmples from compilation * git-tree update * fixed reviewer comments * git tree hash update --- ports/cminpack/portfile.cmake | 19 +++++++++++++++++++ ports/cminpack/vcpkg.json | 12 ++++++++++++ versions/baseline.json | 4 ++++ versions/c-/cminpack.json | 9 +++++++++ 4 files changed, 44 insertions(+) create mode 100644 ports/cminpack/portfile.cmake create mode 100644 ports/cminpack/vcpkg.json create mode 100644 versions/c-/cminpack.json diff --git a/ports/cminpack/portfile.cmake b/ports/cminpack/portfile.cmake new file mode 100644 index 00000000000000..097f64feeae9df --- /dev/null +++ b/ports/cminpack/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO devernay/cminpack + REF v1.3.8 + SHA512 0cab275074a31af69dbaf3ef6d41b20184c7cf9f33c78014a69ae7a022246fa79e7b4851341c6934ca1e749955b7e1096a40b4300a109ad64ebb1b2ea5d1d8ae +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +# # Handle copyright +file(INSTALL "${SOURCE_PATH}/CopyrightMINPACK.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cminpack/vcpkg.json b/ports/cminpack/vcpkg.json new file mode 100644 index 00000000000000..4d6d699656ab1b --- /dev/null +++ b/ports/cminpack/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "cminpack", + "version": "1.3.8", + "description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems", + "homepage": "http://devernay.free.fr/hacks/cminpack/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index d0065b512d0904..943397c927b540 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1420,6 +1420,10 @@ "baseline": "2019-07-20", "port-version": 1 }, + "cminpack": { + "baseline": "1.3.8", + "port-version": 0 + }, "cmocka": { "baseline": "2020-08-01", "port-version": 0 diff --git a/versions/c-/cminpack.json b/versions/c-/cminpack.json new file mode 100644 index 00000000000000..b76e3c2b7e9c69 --- /dev/null +++ b/versions/c-/cminpack.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "aa9af4c20d069d7b14c99b5877fd782255cde21e", + "version": "1.3.8", + "port-version": 0 + } + ] +} From 53e4fea6e6f2d9caaa79c304a698836783dcab31 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 27 Oct 2021 07:58:36 +0200 Subject: [PATCH 0912/1858] [zstd] Fix mingw pc file (#20852) * Don't add _static suffix to mingw pc file * Update versions * Update portfile.cmake Small changes for the format * Fix name of exported version file * Update versions * [skip actions] CI Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/zstd/portfile.cmake | 12 +++++------- ports/zstd/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/z-/zstd.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index f15e717100fab9..af3a9d6b9c5c00 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_from_github( SHA512 659576d0f52d2271b6b53f638b407b873888b1cffe4f014c3149d33a961653c2fcf7ff270bc669a5647205b573ef2809907645a4c89ab6c030ad65bce15547ae HEAD_REF dev PATCHES - install_pkgpc.patch - fix-c4703-error.patch + install_pkgpc.patch + fix-c4703-error.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZSTD_BUILD_STATIC) @@ -38,12 +38,12 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/zstd) # This enables find_package(ZSTD) and find_package(zstd) to find zstd on Linux(case sensitive filesystems) file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfig.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config.cmake") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfigVersion.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-configVersion.cmake") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstdConfigVersion.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/zstd-config-version.cmake") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(static_suffix "_static") else() - set(static_suffix ) + set(static_suffix "") endif() if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libzstd.pc" "-lzstd" "-lzstd${static_suffix}") @@ -65,5 +65,3 @@ endif() file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(COPY "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" "ZSTD is dual licensed - see LICENSE and COPYING files\n") - - diff --git a/ports/zstd/vcpkg.json b/ports/zstd/vcpkg.json index b0f5e21a8c55fb..b8cef005a2ec14 100644 --- a/ports/zstd/vcpkg.json +++ b/ports/zstd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "zstd", "version-semver": "1.5.0", + "port-version": 1, "description": "Zstandard - Fast real-time compression algorithm", "homepage": "https://facebook.github.io/zstd/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 943397c927b540..34d54697a38d08 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7314,7 +7314,7 @@ }, "zstd": { "baseline": "1.5.0", - "port-version": 0 + "port-version": 1 }, "zstr": { "baseline": "1.0.4", diff --git a/versions/z-/zstd.json b/versions/z-/zstd.json index 112ca03bd132df..3ba7ad7e74deab 100644 --- a/versions/z-/zstd.json +++ b/versions/z-/zstd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1260425f27dec6dd2e795369d4c28de5a676daef", + "version-semver": "1.5.0", + "port-version": 1 + }, { "git-tree": "b605e1bf30a124c99845c16733aac48289ae6a87", "version-semver": "1.5.0", From 49dffdded118ea278eb54169dd55a63194f6ea3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 27 Oct 2021 07:59:35 +0200 Subject: [PATCH 0913/1858] [libgcrypt] update to 1.9.4, fix arm64-osx compilation (#20854) * [libgcrypt] update to 1.9.3 * [libgcrypt] use numeric versioning * [libgcrypt] fix description * [libgcrypt] update to 1.9.4 Use upstream Git repo, since the GitHub mirror appears out-of-sync * [libgcrypt] update versions --- ports/libgcrypt/fix-flags.patch | 13 ------------- ports/libgcrypt/fix-pkgconfig.patch | 11 ----------- ports/libgcrypt/portfile.cmake | 11 ++++------- ports/libgcrypt/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/l-/libgcrypt.json | 5 +++++ 6 files changed, 13 insertions(+), 36 deletions(-) delete mode 100644 ports/libgcrypt/fix-flags.patch delete mode 100644 ports/libgcrypt/fix-pkgconfig.patch diff --git a/ports/libgcrypt/fix-flags.patch b/ports/libgcrypt/fix-flags.patch deleted file mode 100644 index 7ccf41c63e40dd..00000000000000 --- a/ports/libgcrypt/fix-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cipher/Makefile.am b/cipher/Makefile.am -index 95c4510..d43350c 100644 ---- a/cipher/Makefile.am -+++ b/cipher/Makefile.am -@@ -112,7 +112,7 @@ gost-sb.h: gost-s-box - ./gost-s-box $@ - - gost-s-box: gost-s-box.c -- $(CC_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c -+ $(CC_FOR_BUILD) $(CFLAGS) -o $@ $(srcdir)/gost-s-box.c - - - if ENABLE_O_FLAG_MUNGING diff --git a/ports/libgcrypt/fix-pkgconfig.patch b/ports/libgcrypt/fix-pkgconfig.patch deleted file mode 100644 index 0c269b2a6b64b5..00000000000000 --- a/ports/libgcrypt/fix-pkgconfig.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in -index ec68fa2..6bf7a07 100644 ---- a/src/libgcrypt.pc.in -+++ b/src/libgcrypt.pc.in -@@ -13,5 +13,5 @@ Description: General purpose cryptographic library - Requires: gpg-error - Version: @PACKAGE_VERSION@ - Cflags: @LIBGCRYPT_CONFIG_CFLAGS@ --Libs: @LIBGCRYPT_CONFIG_LIBS@ -+Libs: -L${libdir} @LIBGCRYPT_CONFIG_LIBS@ - URL: https://www.gnupg.org/software/libgcrypt/index.html diff --git a/ports/libgcrypt/portfile.cmake b/ports/libgcrypt/portfile.cmake index 658418e2c29adc..5455cb0eae5b16 100644 --- a/ports/libgcrypt/portfile.cmake +++ b/ports/libgcrypt/portfile.cmake @@ -1,14 +1,11 @@ vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports unix platform" ON_TARGET "Windows") -vcpkg_from_github( +vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - REPO gpg/libgcrypt - REF libgcrypt-1.8.7 - SHA512 43e50a1b8a3cdbf420171c785fe558f443b414b708defa585277ac5ea59f9d8ae7f4555ed291c16fa004e7d4dd93a5ab2011c3c591e784ce3c6662a3193fd3e1 + URL git://git.gnupg.org/libgcrypt.git + FETCH_REF libgcrypt-1.9.4 + REF 05422ca24a0391dad2a0b7790a904ce348819c10 # https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=05422ca24a0391dad2a0b7790a904ce348819c10 HEAD_REF master - PATCHES - fix-pkgconfig.patch - fix-flags.patch ) vcpkg_configure_make( diff --git a/ports/libgcrypt/vcpkg.json b/ports/libgcrypt/vcpkg.json index 40a0566446fa3a..efc6cdda816e1e 100644 --- a/ports/libgcrypt/vcpkg.json +++ b/ports/libgcrypt/vcpkg.json @@ -1,8 +1,7 @@ { "name": "libgcrypt", - "version-string": "1.8.7", - "port-version": 2, - "description": "A library implementing the so-called Assuan protocol", + "version": "1.9.4", + "description": "A general purpose cryptographic library", "homepage": "https://gnupg.org/software/libgcrypt/index.html", "supports": "linux | osx", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 34d54697a38d08..9c8b2d500fe854 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3421,8 +3421,8 @@ "port-version": 1 }, "libgcrypt": { - "baseline": "1.8.7", - "port-version": 2 + "baseline": "1.9.4", + "port-version": 0 }, "libgd": { "baseline": "2.3.2", diff --git a/versions/l-/libgcrypt.json b/versions/l-/libgcrypt.json index 75cf88e8707fa8..06e8a93b02863f 100644 --- a/versions/l-/libgcrypt.json +++ b/versions/l-/libgcrypt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b99b42dfc0f469a13d4e39d9802012b9a7e78d1", + "version": "1.9.4", + "port-version": 0 + }, { "git-tree": "43a3a46962e0195eefd661d621f1a69c267d067e", "version-string": "1.8.7", From 5d7b96289ea905f001ef6c505733726fe0410554 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:00:36 +0800 Subject: [PATCH 0914/1858] [libuv] Remove the platform restrictions for threads (#20857) * [libuv] Remove the platform restrictions for threads * Update version files * Only remove the limit for WIN32 --- ports/libuv/unofficial-libuv-config.in.cmake | 2 +- ports/libuv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libuv.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libuv/unofficial-libuv-config.in.cmake b/ports/libuv/unofficial-libuv-config.in.cmake index 7ff66b12c277ef..a591d4cdf23245 100644 --- a/ports/libuv/unofficial-libuv-config.in.cmake +++ b/ports/libuv/unofficial-libuv-config.in.cmake @@ -1,5 +1,5 @@ -if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT WIN32) +if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") include(CMakeFindDependencyMacro) find_dependency(Threads) endif() diff --git a/ports/libuv/vcpkg.json b/ports/libuv/vcpkg.json index 5033ece2a1009e..c1ebc4f1ac44e0 100644 --- a/ports/libuv/vcpkg.json +++ b/ports/libuv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libuv", "version-semver": "1.42.0", - "port-version": 1, + "port-version": 2, "description": "libuv is a multi-platform support library with a focus on asynchronous I/O.", "homepage": "https://github.com/libuv/libuv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9c8b2d500fe854..11c30c1923a912 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3958,7 +3958,7 @@ }, "libuv": { "baseline": "1.42.0", - "port-version": 1 + "port-version": 2 }, "libuvc": { "baseline": "2020-11-24", diff --git a/versions/l-/libuv.json b/versions/l-/libuv.json index 349c6570946795..56c9a2b88873a1 100644 --- a/versions/l-/libuv.json +++ b/versions/l-/libuv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2cb9ed135277e1b121fbf0a391be6a8d5cb2ddcf", + "version-semver": "1.42.0", + "port-version": 2 + }, { "git-tree": "41003bf038eb10b7fd29029954d42a05fb3c1a86", "version-semver": "1.42.0", From d4a2dcbffe3fa6ed60213ef84f46914ff9afcdfa Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Wed, 27 Oct 2021 17:02:23 +1100 Subject: [PATCH 0915/1858] [ffmpeg] Add libaom support. (#20867) * [aom] Update to 3.2.0 * [ffmpeg] Add libaom support. * fixup --- ports/aom/aom-install.diff | 12 ++++----- ports/aom/portfile.cmake | 6 +++-- ports/aom/vcpkg.json | 2 +- ...ibaom-Dont-use-aom_codec_av1_dx_algo.patch | 26 +++++++++++++++++++ ports/ffmpeg/portfile.cmake | 13 ++++++++++ ports/ffmpeg/vcpkg.json | 16 +++++++++++- versions/a-/aom.json | 5 ++++ versions/baseline.json | 4 +-- versions/f-/ffmpeg.json | 5 ++++ 9 files changed, 77 insertions(+), 12 deletions(-) create mode 100644 ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch diff --git a/ports/aom/aom-install.diff b/ports/aom/aom-install.diff index 64c45df5489685..e24b8c536ee68a 100644 --- a/ports/aom/aom-install.diff +++ b/ports/aom/aom-install.diff @@ -9,10 +9,10 @@ index 18190f647..f4b1b359d 100644 +include(GNUInstallDirs) +include(CMakePackageConfigHelpers) + - if(NOT EMSCRIPTEN) - if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_BUILD_TYPE -@@ -289,6 +292,52 @@ if(BUILD_SHARED_LIBS) + # GENERATED source property global visibility. + if(POLICY CMP0118) + cmake_policy(SET CMP0118 NEW) +@@ -302,6 +305,52 @@ if(BUILD_SHARED_LIBS) set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_static) endif() @@ -63,8 +63,8 @@ index 18190f647..f4b1b359d 100644 + DESTINATION lib/cmake/aom) + # Setup dependencies. - setup_aom_dsp_targets() - setup_aom_mem_targets() + if(CONFIG_THREE_PASS) + setup_ivf_dec_targets() diff --git a/cmake/aom-config.cmake.in b/cmake/aom-config.cmake.in new file mode 100644 index 000000000..91cac3b5b diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index a3f84e8b295545..86a10e902723d1 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -13,8 +13,8 @@ vcpkg_add_to_path(${PERL_PATH}) vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH URL "https://aomedia.googlesource.com/aom" - REF 8f85bb1d686647d0f7dc1e7220f94f55193d2c89 - TAG v3.1.2 + REF 6bbe6ae701d65bdf36bb72053db9b71f9739a083 + TAG v3.2.0 PATCHES aom-rename-static.diff # Can be dropped when https://bugs.chromium.org/p/aomedia/issues/detail?id=3029 is merged into the upstream @@ -35,6 +35,8 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + # Move cmake configs vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index 39edcf982d16ae..d3b84fcd2afa04 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,6 +1,6 @@ { "name": "aom", - "version-semver": "3.1.2", + "version-semver": "3.2.0", "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "supports": "!uwp & !arm", diff --git a/ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch b/ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch new file mode 100644 index 00000000000000..f70c2a0297cfd6 --- /dev/null +++ b/ports/ffmpeg/0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch @@ -0,0 +1,26 @@ +From 6ff9f56f2b0bface43c6b0810cfda458695600f3 Mon Sep 17 00:00:00 2001 +From: Matt Oliver +Date: Wed, 20 Oct 2021 06:55:48 +1100 +Subject: [PATCH] libaom: Dont use aom_codec_av1_dx_algo. + +This fixes linking errors where variables cannot be correctly linked in from an external shared library such as with msvc. +--- + libavcodec/libaomdec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c +index 75ecc08970..d6b822fda2 100644 +--- a/libavcodec/libaomdec.c ++++ b/libavcodec/libaomdec.c +@@ -223,7 +223,7 @@ static av_cold int aom_free(AVCodecContext *avctx) + + static av_cold int av1_init(AVCodecContext *avctx) + { +- return aom_init(avctx, &aom_codec_av1_dx_algo); ++ return aom_init(avctx, aom_codec_av1_dx()); + } + + AVCodec ff_libaom_av1_decoder = { +-- +2.33.1.windows.1 + diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 5f6b8d98af94bd..128726c2d453f5 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -13,6 +13,12 @@ if("ffprobe" IN_LIST FEATURES) endif() +if("aom" IN_LIST FEATURES) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Feature 'aom' does not support 'uwp | arm'") + endif() +endif() + if("ass" IN_LIST FEATURES) if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP) message(FATAL_ERROR "Feature 'ass' does not support 'uwp | arm'") @@ -145,6 +151,7 @@ vcpkg_from_github( 0015-Fix-xml2-detection.patch 0016-configure-dnn-needs-avformat.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html ${PATCHES} + 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch ) if (SOURCE_PATH MATCHES " ") @@ -341,6 +348,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(STATIC_LINKAGE ON) endif() +if("aom" IN_LIST FEATURES) + set(OPTIONS "${OPTIONS} --enable-libaom") +else() + set(OPTIONS "${OPTIONS} --disable-libaom") +endif() + if("ass" IN_LIST FEATURES) set(OPTIONS "${OPTIONS} --enable-libass") else() diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index a83c6ea2533466..fbf802114b5503 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 15, + "port-version": 16, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -105,6 +105,14 @@ ], "platform": "!(arm & uwp)" }, + { + "name": "ffmpeg", + "default-features": false, + "features": [ + "aom" + ], + "platform": "!(uwp | arm)" + }, { "name": "ffmpeg", "default-features": false, @@ -232,6 +240,12 @@ } ] }, + "aom": { + "description": "AV1 video encoding/decoding via libaom support in ffmpeg", + "dependencies": [ + "aom" + ] + }, "ass": { "description": "Libass subtitles rendering, needed for subtitles and ass filter support in ffmpeg", "dependencies": [ diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 2bf33521699e89..1091b77be60683 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04432e0fa953e42790ff74f6d927130d9a4e28a7", + "version-semver": "3.2.0", + "port-version": 0 + }, { "git-tree": "d55b62e714b84f2c3f2df02299f4a708a705c21f", "version-semver": "3.1.2", diff --git a/versions/baseline.json b/versions/baseline.json index 11c30c1923a912..ff2213be473800 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -97,7 +97,7 @@ "port-version": 0 }, "aom": { - "baseline": "3.1.2", + "baseline": "3.2.0", "port-version": 0 }, "approval-tests-cpp": { @@ -2126,7 +2126,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 15 + "port-version": 16 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 35a46648b00358..83a90b0ae3b27a 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a144dc0552d005429d8d6641608744883dee2ff", + "version": "4.4", + "port-version": 16 + }, { "git-tree": "24cb6ddcd146248cb3758ec1aa4c038b28d4c0c5", "version": "4.4", From f41b4d06d8d7d6a238f754a7c7b7ed9069b1bebf Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:03:22 +0800 Subject: [PATCH 0916/1858] [crossguid] update to latest commit (#20922) * [crossguid] update to latest commit * [crossguid] update to latest commit * update version * add * update version --- ports/crossguid/portfile.cmake | 17 ++++++++--------- ports/crossguid/vcpkg.json | 11 +++++++++-- versions/baseline.json | 4 ++-- versions/c-/crossguid.json | 5 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ports/crossguid/portfile.cmake b/ports/crossguid/portfile.cmake index 7e9b0c76f1ba84..f390d92c1bcd84 100644 --- a/ports/crossguid/portfile.cmake +++ b/ports/crossguid/portfile.cmake @@ -3,23 +3,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO graeme-hill/crossguid - REF c4f8e9b21f779abe287c022e73eeac365d430337 - SHA512 38876f410d0014ad930b720312cecc99be1361b9810a21d5ffc1deba6221ea0e2aebd0da332adb18fd314d0477fd33410403120629b8df405bb64a9884e3d0b0 + REF ca1bf4b810e2d188d04cb6286f957008ee1b7681 #2021-10-22 + SHA512 f0a80d8e99b10473bcfdfde3d1c5fd7b766959819f0d1c0595ac84ce46db9007a5fbfde9a55aca60530c46cb7f8ef4c7e472c6191559ded92f868589c141ccaf HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DCROSSGUID_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/crossguid/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/crossguid/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(RENAME ${CURRENT_PACKAGES_DIR}/share/crossguid/LICENSE ${CURRENT_PACKAGES_DIR}/share/crossguid/copyright) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/crossguid/vcpkg.json b/ports/crossguid/vcpkg.json index 0532bad6633d36..d8fe3c1076dbdc 100644 --- a/ports/crossguid/vcpkg.json +++ b/ports/crossguid/vcpkg.json @@ -1,12 +1,19 @@ { "name": "crossguid", - "version-string": "0.2.2-2018-06-16", - "port-version": 2, + "version-date": "2021-10-22", "description": "CrossGuid is a minimal, cross platform, C++ GUID library.", "dependencies": [ { "name": "libuuid", "platform": "!windows & !uwp & !osx & !android" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index ff2213be473800..4e4e0eac3c61fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1641,8 +1641,8 @@ "port-version": 2 }, "crossguid": { - "baseline": "0.2.2-2018-06-16", - "port-version": 2 + "baseline": "2021-10-22", + "port-version": 0 }, "crow": { "baseline": "0.3.3", diff --git a/versions/c-/crossguid.json b/versions/c-/crossguid.json index 0bed5bcf10b1b0..e516a9d08122ed 100644 --- a/versions/c-/crossguid.json +++ b/versions/c-/crossguid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5880c01322b2c2cd08e9b573b769260696b2365d", + "version-date": "2021-10-22", + "port-version": 0 + }, { "git-tree": "42cc44d6649705d3c104e9753f3ba1bb4217ebc8", "version-string": "0.2.2-2018-06-16", From 66c56677096fc0328541e4650740b2a5876f5bfc Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 27 Oct 2021 07:04:29 +0100 Subject: [PATCH 0917/1858] Add more debug output when finding gdal deps (#20869) * Add more debug output when finding gdal deps * x-add-version --- ports/gdal/vcpkg-cmake-wrapper.cmake | 1 + ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 77e48eb4ad90e7..ee4580d5b609bf 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -66,6 +66,7 @@ function(_gdal_add_dependency target package) set(GDAL_FOUND false PARENT_SCOPE) endif() else() + message(WARNING "Could not find package ${package}") set(GDAL_FOUND false PARENT_SCOPE) endif() endfunction() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 00706b7676a181..77d8cbf287227a 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.3.2", - "port-version": 1, + "port-version": 2, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index 4e4e0eac3c61fd..a5a2fd37e08822 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2346,7 +2346,7 @@ }, "gdal": { "baseline": "3.3.2", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index af74f9006bc504..ecf85e5587787b 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "354c2bfa5d4de64d6894cb74f47e6801fd02af8d", + "version-semver": "3.3.2", + "port-version": 2 + }, { "git-tree": "6e90412cd51170a5ea63a0067005bb3afc3c6c36", "version-semver": "3.3.2", From 57594f6d5f12ad499e716ddef1802bf8965ac2a4 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:34:56 +0200 Subject: [PATCH 0918/1858] [socket-io-client] Update to 3.1.0 (#20883) * Update socket-io-client to 3.1.0 * Update CI baseline Co-authored-by: chausner --- ports/socket-io-client/fix-error-C3321.patch | 13 ------------- .../socket-io-client/fix-file-not-found.patch | 18 +++++++++++------- ports/socket-io-client/portfile.cmake | 16 +++++++--------- ports/socket-io-client/vcpkg.json | 8 ++++++-- versions/baseline.json | 4 ++-- versions/s-/socket-io-client.json | 5 +++++ 6 files changed, 31 insertions(+), 33 deletions(-) delete mode 100644 ports/socket-io-client/fix-error-C3321.patch diff --git a/ports/socket-io-client/fix-error-C3321.patch b/ports/socket-io-client/fix-error-C3321.patch deleted file mode 100644 index 6a36e9d979f87d..00000000000000 --- a/ports/socket-io-client/fix-error-C3321.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp -index f78aea4..6780e26 100644 ---- a/src/internal/sio_client_impl.cpp -+++ b/src/internal/sio_client_impl.cpp -@@ -286,7 +286,7 @@ namespace sio - if(ec || m_con.expired()) - { - if (ec != asio::error::operation_aborted) -- LOG("ping exit,con is expired?"< Date: Wed, 27 Oct 2021 08:36:06 +0200 Subject: [PATCH 0919/1858] [miniz] Update to 2.2.0 (#20910) * Update miniz to 2.2.0 * Update CI baseline Co-authored-by: chausner --- ports/miniz/CMakeLists-targets.patch | 55 ---------------------------- ports/miniz/portfile.cmake | 25 +++++++------ ports/miniz/vcpkg.json | 15 ++++++-- versions/baseline.json | 4 +- versions/m-/miniz.json | 5 +++ 5 files changed, 32 insertions(+), 72 deletions(-) delete mode 100644 ports/miniz/CMakeLists-targets.patch diff --git a/ports/miniz/CMakeLists-targets.patch b/ports/miniz/CMakeLists-targets.patch deleted file mode 100644 index c9d32e479a01e2..00000000000000 --- a/ports/miniz/CMakeLists-targets.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f3e453a..094a4e8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,13 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "") - CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) - endif () - --set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin) -- - set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c) - --add_library(miniz ${miniz_SOURCE}) --target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") -- -+add_library(miniz STATIC ${miniz_SOURCE}) -+target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS) -+ -+if(FALSE) - set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c") - set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c") - set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c") -@@ -41,12 +40,28 @@ if(${UNIX}) - target_link_libraries(example6 m) - endif() - -+target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS) -+target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS) -+ - # add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST}) - # target_link_libraries(miniz_tester miniz) -+endif() - --install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets -- ARCHIVE DESTINATION lib -- LIBRARY DESTINATION lib -+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ) -+export(TARGETS ${PROJECT_NAME} -+ NAMESPACE miniz:: -+ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" -+) -+install(EXPORT ${PROJECT_NAME}Config -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz" -+ NAMESPACE miniz:: -+) - file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h) - install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME}) -\ No newline at end of file diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake index b932b69f24541b..21d7720184e9d3 100644 --- a/ports/miniz/portfile.cmake +++ b/ports/miniz/portfile.cmake @@ -1,22 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO richgel999/miniz - REF a4264837ae37384b1d7a205a6732db322f0f3769 - SHA512 88f0e03cccfe66c796db7594b93c667bd52cd7f4d13803181e9d86b4aa26f214fd2907a45a752da603d3e87f8d53c40bfc0956b279c0d49016f7b943aeb9cd33 + REF 2.2.0 + SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 HEAD_REF master - PATCHES - CMakeLists-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_EXAMPLES=OFF + -DINSTALL_PROJECT=ON ) -vcpkg_install_cmake() -vcpkg_copy_pdbs() +vcpkg_cmake_install() +vcpkg_copy_pdbs(BUILD_PATHS "${CURRENT_PACKAGES_DIR}/bin/*.dll") -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/miniz) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/miniz/vcpkg.json b/ports/miniz/vcpkg.json index 5719d162170c29..130a74fe8a911a 100644 --- a/ports/miniz/vcpkg.json +++ b/ports/miniz/vcpkg.json @@ -1,7 +1,16 @@ { "name": "miniz", - "version-string": "2.1.0", - "port-version": 2, + "version": "2.2.0", "description": "Single C source file zlib-replacement library", - "homepage": "https://github.com/richgel999/miniz" + "homepage": "https://github.com/richgel999/miniz", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 3beed6e8ccc4bb..b41223aac1b109 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4337,8 +4337,8 @@ "port-version": 2 }, "miniz": { - "baseline": "2.1.0", - "port-version": 2 + "baseline": "2.2.0", + "port-version": 0 }, "minizip": { "baseline": "1.2.11", diff --git a/versions/m-/miniz.json b/versions/m-/miniz.json index ab806223e6354f..b8bdf545fdbf51 100644 --- a/versions/m-/miniz.json +++ b/versions/m-/miniz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a146337e0416425fb7a412027c755681cf88921", + "version": "2.2.0", + "port-version": 0 + }, { "git-tree": "76f01b924fd6003cc4d2a12b8e849444a7bbdd6e", "version-string": "2.1.0", From 2d246745264f380763266f0f6b00afb9563b0603 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:39:12 +0200 Subject: [PATCH 0920/1858] [fcl] Update to 0.7.0 (#20917) * Update fcl to 0.7.0 * Update CI baseline Co-authored-by: chausner --- ports/fcl/portfile.cmake | 27 +++++++++++---------------- ports/fcl/vcpkg.json | 14 +++++++++++--- versions/baseline.json | 4 ++-- versions/f-/fcl.json | 5 +++++ 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index 0bd74661d48ebd..ea76835c381f00 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -3,16 +3,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO flexible-collision-library/fcl - REF 97455a46de121fb7c0f749e21a58b1b54cd2c6be # 0.6.1 - SHA512 1ed1f43866a2da045fcb82ec54a7812c3fc46306386bc04ccf33b5e169773743b2985997373a63bf480098a321600321fdf5061b1448b48e993cf92cad032891 + REF 0.7.0 + SHA512 95612476f4706fcd60812204ec7495a956c4e318cc6ace9526ac93dc765605ddf73b2d0d9ff9f4c9c739e43c5f8e24670113c86e02868a2949ab234c3bf82374 HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(FCL_STATIC_LIBRARY ON) -else() - set(FCL_STATIC_LIBRARY OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FCL_STATIC_LIBRARY) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(FCL_USE_X64_SSE ON) @@ -20,24 +16,23 @@ else() set(FCL_USE_X64_SSE OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DFCL_STATIC_LIBRARY=${FCL_STATIC_LIBRARY} -DFCL_BUILD_TESTS=OFF -DFCL_USE_X64_SSE=${FCL_USE_X64_SSE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/fcl) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/fcl) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fcl/vcpkg.json b/ports/fcl/vcpkg.json index e722e46d2329cc..255d59d887aefa 100644 --- a/ports/fcl/vcpkg.json +++ b/ports/fcl/vcpkg.json @@ -1,12 +1,20 @@ { "name": "fcl", - "version-string": "0.6.1", - "port-version": 1, + "version": "0.7.0", "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles", "homepage": "https://github.com/flexible-collision-library/fcl", + "supports": "static", "dependencies": [ "ccd", "eigen3", - "octomap" + "octomap", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index b41223aac1b109..5b602d50435a88 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2113,8 +2113,8 @@ "port-version": 0 }, "fcl": { - "baseline": "0.6.1", - "port-version": 1 + "baseline": "0.7.0", + "port-version": 0 }, "fdk-aac": { "baseline": "2.0.2", diff --git a/versions/f-/fcl.json b/versions/f-/fcl.json index b59f28a041b139..d1d2324f4dc8f3 100644 --- a/versions/f-/fcl.json +++ b/versions/f-/fcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b42fbc15486c71cabb2db25ccea7032240b87201", + "version": "0.7.0", + "port-version": 0 + }, { "git-tree": "882ea9cab4a482db6b23eae2592a5f93f4f27035", "version-string": "0.6.1", From ab2d31b9fdad414f485f29e424212b29182e909d Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:40:12 +0200 Subject: [PATCH 0921/1858] [pe-parse] Update to 1.3.0, [uthenticode] Update to 1.0.6 (#20918) * Update pe-parse to 1.3.0 * Update CI baseline * Update uthenticode to 1.0.6 * Update git-tree hash * Fix ARM64 Windows build * Update git-tree hash Co-authored-by: chausner --- ports/pe-parse/arm64-windows-fix.patch | 13 ++++++++++++ ports/pe-parse/portfile.cmake | 29 ++++++++++++-------------- ports/pe-parse/vcpkg.json | 15 ++++++++++--- ports/uthenticode/portfile.cmake | 29 +++++++++++++------------- ports/uthenticode/vcpkg.json | 13 +++++++++--- versions/baseline.json | 8 +++---- versions/p-/pe-parse.json | 5 +++++ versions/u-/uthenticode.json | 5 +++++ 8 files changed, 76 insertions(+), 41 deletions(-) create mode 100644 ports/pe-parse/arm64-windows-fix.patch diff --git a/ports/pe-parse/arm64-windows-fix.patch b/ports/pe-parse/arm64-windows-fix.patch new file mode 100644 index 00000000000000..44907c096e1365 --- /dev/null +++ b/ports/pe-parse/arm64-windows-fix.patch @@ -0,0 +1,13 @@ +find_package(Filesystem) fails on arm64 Windows. +We can remove it as it is only used for tests which are not built in vcpkg. +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,7 +15,6 @@ endif () + include(cmake/compilation_flags.cmake) + # Greater c++17 filesystem compatibility (like with experimental) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") +-find_package(Filesystem COMPONENTS Experimental Final REQUIRED) + list(APPEND GLOBAL_CXXFLAGS ${DEFAULT_CXX_FLAGS}) + + option(BUILD_SHARED_LIBS "Build Shared Libraries" ON) diff --git a/ports/pe-parse/portfile.cmake b/ports/pe-parse/portfile.cmake index f0dc4de83a4f1e..c38c8726b93339 100644 --- a/ports/pe-parse/portfile.cmake +++ b/ports/pe-parse/portfile.cmake @@ -1,27 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO trailofbits/pe-parse - REF v1.2.0 - SHA512 916ec515585ba1e83e2c6ae29667fd25bd4cac90c39e587ae6847dc9d503186e8853bd80f4e2a99177a3214f5c51eceff85fa610cadbc2bc1d3a79251e8ce942 + REF v1.3.0 + SHA512 b723e90821e0ac67b4d6b15e5a46cf13544f21380a4d2add013eedcaa309e1be2cff6789247397c6fb4a938e4a240a835cbe21c8221bd558a4fccf8e93ce1548 HEAD_REF master + PATCHES + arm64-windows-fix.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DBUILD_COMMAND_LINE_TOOLS=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_COMMAND_LINE_TOOLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/pe-parse TARGET_PATH share/pe-parse) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/pe-parse") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file( - INSTALL - "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/pe-parse" - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pe-parse/vcpkg.json b/ports/pe-parse/vcpkg.json index 9243b0eb3362fe..8c16ca2fa8ee22 100644 --- a/ports/pe-parse/vcpkg.json +++ b/ports/pe-parse/vcpkg.json @@ -1,8 +1,17 @@ { "name": "pe-parse", - "version-string": "1.2.0", - "port-version": 1, + "version": "1.3.0", "description": "pe-parse is a principled, lightweight C/C++ PE parser", "homepage": "https://github.com/trailofbits/pe-parse", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/uthenticode/portfile.cmake b/ports/uthenticode/portfile.cmake index 236d72bf20dfa7..730d411fdd165e 100644 --- a/ports/uthenticode/portfile.cmake +++ b/ports/uthenticode/portfile.cmake @@ -3,26 +3,25 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO trailofbits/uthenticode - REF v1.0.4 - SHA512 82d5ff61071adefec886a140d253b733cb2318ccf34e831087973b05f7e274b207031e606303f65269a5ed1b45c3c599d79e217cf6229d60c8cc2396e842f32e + REF v1.0.6 + SHA512 6C9C4DD9E1FE7C329E10BC39E41927C8B82DD004275A88385C691AD85EF4079EBE2922083D5252019B8B25CC540F48E544B42B8178F256AE987D6B677713B063 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +# compatibility fix for newer versions of pe-parse +foreach(FILE IN ITEMS test/wincert-test.cpp test/signeddata-test.cpp test/uthenticode-test.cpp test/certificate-test.cpp src/include/uthenticode.h) + vcpkg_replace_string("${SOURCE_PATH}/${FILE}" "#include " "#include ") +endforeach() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/uthenticode TARGET_PATH share/uthenticode) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/uthenticode) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file( - INSTALL - ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/uthenticode/vcpkg.json b/ports/uthenticode/vcpkg.json index 5bca1b7437e905..9ed6e1f7c60cd8 100644 --- a/ports/uthenticode/vcpkg.json +++ b/ports/uthenticode/vcpkg.json @@ -1,12 +1,19 @@ { "name": "uthenticode", - "version-string": "1.0.4", - "port-version": 1, + "version-string": "1.0.6", "description": "A cross-platform library for verifying Authenticode signatures", "homepage": "https://github.com/trailofbits/uthenticode", "supports": "!uwp", "dependencies": [ "openssl", - "pe-parse" + "pe-parse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5b602d50435a88..357d0084cb7b9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5121,8 +5121,8 @@ "port-version": 1 }, "pe-parse": { - "baseline": "1.2.0", - "port-version": 1 + "baseline": "1.3.0", + "port-version": 0 }, "pegtl": { "baseline": "3.2.1", @@ -6917,8 +6917,8 @@ "port-version": 0 }, "uthenticode": { - "baseline": "1.0.4", - "port-version": 1 + "baseline": "1.0.6", + "port-version": 0 }, "uvatlas": { "baseline": "sept2021", diff --git a/versions/p-/pe-parse.json b/versions/p-/pe-parse.json index 2ca590326bf607..82b2b23396582b 100644 --- a/versions/p-/pe-parse.json +++ b/versions/p-/pe-parse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46ac74f817dcb2fed549ac83eca39761bae2c4ae", + "version": "1.3.0", + "port-version": 0 + }, { "git-tree": "10de7a27c9512d2267067cc442507ee91839fb07", "version-string": "1.2.0", diff --git a/versions/u-/uthenticode.json b/versions/u-/uthenticode.json index bca2a57b820678..8bb7320735cd52 100644 --- a/versions/u-/uthenticode.json +++ b/versions/u-/uthenticode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd27c0f342a4c62251b30f323be232c86bc999af", + "version-string": "1.0.6", + "port-version": 0 + }, { "git-tree": "8c815664232505dde8a5dd299d4ad562f47b7d43", "version-string": "1.0.4", From 0c841c84fbded053b9fea1bc4e55574ef3972e52 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:42:55 +0800 Subject: [PATCH 0922/1858] [libheif] update to v1.12.0 (#20924) * [libheif] update to v1.12.0 * update version --- ports/libheif/disable-depend-dav1d.patch | 14 -------------- ports/libheif/portfile.cmake | 14 ++++++-------- ports/libheif/vcpkg.json | 11 +++++++++-- versions/baseline.json | 4 ++-- versions/l-/libheif.json | 5 +++++ 5 files changed, 22 insertions(+), 26 deletions(-) delete mode 100644 ports/libheif/disable-depend-dav1d.patch diff --git a/ports/libheif/disable-depend-dav1d.patch b/ports/libheif/disable-depend-dav1d.patch deleted file mode 100644 index 88859272e6e713..00000000000000 --- a/ports/libheif/disable-depend-dav1d.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 05afd5d..1e7f36f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,7 +65,9 @@ if (WITH_AOM) - find_package(LibAOM) - endif() - find_package(Rav1e) -+if (WITH_DAV1D) - find_package(Dav1d) -+endif() - - if (LIBDE265_FOUND) - message("HEIF decoder, libde265: found") diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 58c50d1dea9524..0d598245816fb7 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -1,25 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF 667eeabb553ce73094eb29faea3f31fb8610fec2 #v1.10.0 - SHA512 937290310ec6dda8840262d4bad5e3628033fa2caa6e9cc4a0df7a372cacf38c9b55cf29d2cb7ea2183641e263298fc2e87167c1b0f04f8697023f123d78aa9d + REF 56c8a2613370562fc330af2c70c1510aa5fd9ff6 #v1.12.0 + SHA512 11ac7f32d1f49963046b1a4479a41f39004475211563ba7f41b2398f07f7b4d90339ea663e528b3cc80deeef1fff374987208d48b447116a806564ef05487e97 HEAD_REF master PATCHES gdk-pixbuf.patch - disable-depend-dav1d.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWITH_EXAMPLES=OFF -DWITH_DAV1D=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libheif/) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libheif/) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 9b7922ff2be5d1..fc0a62d155291a 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libheif", - "version": "1.10.0", - "port-version": 3, + "version": "1.12.0", "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "dependencies": [ @@ -10,6 +9,14 @@ "platform": "!windows" }, "libde265", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "x265" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 357d0084cb7b9e..c1bfe99003c5fe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3477,8 +3477,8 @@ "port-version": 1 }, "libheif": { - "baseline": "1.10.0", - "port-version": 3 + "baseline": "1.12.0", + "port-version": 0 }, "libhsplasma": { "baseline": "2021.06.08", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 5d418b70588a5f..eb025a8a3d709e 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d62a94252d06f84e8011c02793458b43d9f5cd2", + "version": "1.12.0", + "port-version": 0 + }, { "git-tree": "a05aafcbf48befb78710d61cee5d64aa37788a83", "version": "1.10.0", From 82837cfd2aa66e72e1d57d705f958a11671fdffd Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:43:45 +0800 Subject: [PATCH 0923/1858] [imgui-sfml] update to v2.3 (#20926) * [imgui-sfml] update to v2.3 * update version * change patch format from CRLF to CF * update version * Finish suggested change * update version --- ports/imgui-sfml/0001-fix_find_package.patch | 12 ++++++------ ports/imgui-sfml/0002-fix_imgui_config.patch | 9 ++++----- ports/imgui-sfml/0003-fix_osx.patch | 13 ------------- ports/imgui-sfml/004-fix-find-sfml.patch | 4 ++-- ports/imgui-sfml/portfile.cmake | 18 ++++++++---------- ports/imgui-sfml/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/i-/imgui-sfml.json | 5 +++++ 8 files changed, 37 insertions(+), 41 deletions(-) delete mode 100644 ports/imgui-sfml/0003-fix_osx.patch diff --git a/ports/imgui-sfml/0001-fix_find_package.patch b/ports/imgui-sfml/0001-fix_find_package.patch index d5dc24456c282a..0ece62b40534ca 100644 --- a/ports/imgui-sfml/0001-fix_find_package.patch +++ b/ports/imgui-sfml/0001-fix_find_package.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 53500fd..cb98701 100644 +index 3a974c4..8a1c6cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -35,34 +35,14 @@ if (IMGUI_SFML_FIND_SFML) +@@ -41,34 +41,14 @@ if (IMGUI_SFML_FIND_SFML) if (NOT BUILD_SHARED_LIBS) set(SFML_STATIC_LIBRARIES ON) endif() @@ -23,7 +23,7 @@ index 53500fd..cb98701 100644 -endif() - -# This uses FindImGui.cmake provided in ImGui-SFML repo for now --find_package(ImGui 1.68 REQUIRED) +-find_package(ImGui 1.80 REQUIRED) - -# these headers will be installed alongside ImGui-SFML -set(IMGUI_PUBLIC_HEADERS @@ -37,9 +37,9 @@ index 53500fd..cb98701 100644 -) +find_package(imgui CONFIG REQUIRED) - # CMake 3.11 and later prefer to choose GLVND, but we choose legacy OpenGL just because it's safer - # (unless the OpenGL_GL_PREFERENCE was explicitly set) -@@ -82,7 +62,7 @@ add_library(ImGui-SFML + if (IMGUI_SFML_IMGUI_DEMO) + list(APPEND IMGUI_SOURCES ${IMGUI_DEMO_SOURCES}) +@@ -92,7 +72,7 @@ add_library(ImGui-SFML add_library(ImGui-SFML::ImGui-SFML ALIAS ImGui-SFML) target_link_libraries(ImGui-SFML diff --git a/ports/imgui-sfml/0002-fix_imgui_config.patch b/ports/imgui-sfml/0002-fix_imgui_config.patch index 6966b63c7322c1..f5b7c7fc37d8ea 100644 --- a/ports/imgui-sfml/0002-fix_imgui_config.patch +++ b/ports/imgui-sfml/0002-fix_imgui_config.patch @@ -1,11 +1,10 @@ diff --git a/imconfig-SFML.h b/imconfig-SFML.h -index f66ba20..0f43ce6 100644 +index ddfe05d..4e7634e 100644 --- a/imconfig-SFML.h +++ b/imconfig-SFML.h -@@ -28,5 +28,3 @@ - static_cast(z * 255.f), \ - static_cast(w * 255.f)); \ +@@ -23,5 +23,3 @@ + return sf::Color(static_cast(x * 255.f), static_cast(y * 255.f), \ + static_cast(z * 255.f), static_cast(w * 255.f)); \ } - -#define ImTextureID unsigned int -\ No newline at end of file diff --git a/ports/imgui-sfml/0003-fix_osx.patch b/ports/imgui-sfml/0003-fix_osx.patch deleted file mode 100644 index 8181ee8e1f2cdc..00000000000000 --- a/ports/imgui-sfml/0003-fix_osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/imconfig-SFML.h b/imconfig-SFML.h -index 0f43ce6..1fce2c1 100644 ---- a/imconfig-SFML.h -+++ b/imconfig-SFML.h -@@ -19,7 +19,7 @@ - - #define IM_VEC4_CLASS_EXTRA \ - ImVec4(const sf::Color & c) \ -- : ImVec4(c.r / 255.f, c.g / 255.f, c.b / 255.f, c.a / 255.f) { \ -+ : x(c.r / 255.f), y(c.g / 255.f), z(c.b / 255.f), w(c.a / 255.f) { \ - } \ - operator sf::Color() const { \ - return sf::Color( \ diff --git a/ports/imgui-sfml/004-fix-find-sfml.patch b/ports/imgui-sfml/004-fix-find-sfml.patch index 51cc0634b50c41..372f7b1d9ab6ce 100644 --- a/ports/imgui-sfml/004-fix-find-sfml.patch +++ b/ports/imgui-sfml/004-fix-find-sfml.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4d7a3fa..614564f 100644 +index 8a1c6cd..7156f51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -32,9 +32,6 @@ set(IMGUI_SFML_CONFIG_INSTALL_DIR "" CACHE PATH "Path where user's config header +@@ -38,9 +38,6 @@ set(IMGUI_SFML_CONFIG_INSTALL_DIR "" CACHE PATH "Path where user's config header list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") if (IMGUI_SFML_FIND_SFML) diff --git a/ports/imgui-sfml/portfile.cmake b/ports/imgui-sfml/portfile.cmake index aedb31ced7abfe..be89c847ca3d9f 100644 --- a/ports/imgui-sfml/portfile.cmake +++ b/ports/imgui-sfml/portfile.cmake @@ -3,25 +3,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliasdaler/imgui-sfml - REF v2.1 - SHA512 134c49e9c57bc4d3882d99a52ec87f74c11d2f3134501c79b20bce4612f315f2e3f33a521597b387ca8f91942cf2b82ec9f4a8b1672a700e7233a9758897b6d0 + REF 82dc2033e51b8323857c3ae1cf1f458b3a933c35 #v2.3 + SHA512 f27a0e65aa20229c73b27c4232269908dfeb5d78b1cef7299a179ecac6194d9829e148e95ed54b4500ffd36ada09fdbfadf67588c78bee87aff446ae80347bcf HEAD_REF master PATCHES 0001-fix_find_package.patch 0002-fix_imgui_config.patch - 0003-fix_osx.patch 004-fix-find-sfml.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ImGui-SFML) +vcpkg_cmake_config_fixup(PACKAGE_NAME ImGui-SFML CONFIG_PATH lib/cmake/ImGui-SFML) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/imgui-sfml/vcpkg.json b/ports/imgui-sfml/vcpkg.json index e12799de8cd36b..807fdd125c005d 100644 --- a/ports/imgui-sfml/vcpkg.json +++ b/ports/imgui-sfml/vcpkg.json @@ -1,12 +1,19 @@ { "name": "imgui-sfml", - "version-string": "2.1", - "port-version": 3, + "version": "2.3", "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", "dependencies": [ "imgui", "opengl", - "sfml" + "sfml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index c1bfe99003c5fe..d07cf0131d5c64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2813,8 +2813,8 @@ "port-version": 0 }, "imgui-sfml": { - "baseline": "2.1", - "port-version": 3 + "baseline": "2.3", + "port-version": 0 }, "imguizmo": { "baseline": "1.83", diff --git a/versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json index e32995e675ad97..f801f774d0b7ea 100644 --- a/versions/i-/imgui-sfml.json +++ b/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ece5bd925368d6ef9b7295b31f7f2de86179f4e", + "version": "2.3", + "port-version": 0 + }, { "git-tree": "57e3ab9f08cd10a7d66717044636c02349ee2ea3", "version-string": "2.1", From 0c69080939980bff61458d4ce5a9d8b0bd57d392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 27 Oct 2021 08:44:20 +0200 Subject: [PATCH 0924/1858] [kf5declarative] shared plugins fix (#20934) * [kf5declarative] don't force SHARED on plugins * [kf5declarative] update versions --- ports/kf5declarative/dont_force_shared.diff | 117 ++++++++++++++++++++ ports/kf5declarative/portfile.cmake | 1 + ports/kf5declarative/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/k-/kf5declarative.json | 5 + 5 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 ports/kf5declarative/dont_force_shared.diff diff --git a/ports/kf5declarative/dont_force_shared.diff b/ports/kf5declarative/dont_force_shared.diff new file mode 100644 index 00000000000000..6fcae5ef072598 --- /dev/null +++ b/ports/kf5declarative/dont_force_shared.diff @@ -0,0 +1,117 @@ +diff --git a/src/calendarevents/CMakeLists.txt b/src/calendarevents/CMakeLists.txt +index e2e6e6f808e0e4f3569c0f1225f7d5b50798833c..aa0868118b64acaefd7c54add624e589cb0976a0 100644 +--- a/src/calendarevents/CMakeLists.txt ++++ b/src/calendarevents/CMakeLists.txt +@@ -3,7 +3,7 @@ set(calendar-integration_SRCS + eventdata_p.cpp + ) + +-add_library(KF5CalendarEvents SHARED ${calendar-integration_SRCS}) ++add_library(KF5CalendarEvents ${calendar-integration_SRCS}) + generate_export_header(KF5CalendarEvents BASE_NAME CalendarEvents) + add_library(KF5::CalendarEvents ALIAS KF5CalendarEvents) + +diff --git a/src/qmlcontrols/draganddrop/CMakeLists.txt b/src/qmlcontrols/draganddrop/CMakeLists.txt +index e8127e44f7ed51514fc94337c9de524343e2a4bd..e649c4fe421f12e5f3a3d7833004886bf6a40dd6 100644 +--- a/src/qmlcontrols/draganddrop/CMakeLists.txt ++++ b/src/qmlcontrols/draganddrop/CMakeLists.txt +@@ -9,7 +9,7 @@ set(declarativedragdrop_SRCS + MimeDataWrapper.cpp + ) + +-add_library(draganddropplugin SHARED ${declarativedragdrop_SRCS}) ++add_library(draganddropplugin ${declarativedragdrop_SRCS}) + target_link_libraries(draganddropplugin + Qt5::Core + Qt5::Quick +diff --git a/src/qmlcontrols/kcmcontrols/CMakeLists.txt b/src/qmlcontrols/kcmcontrols/CMakeLists.txt +index a2e107ff7ae776f584f05b1d94130be6d2de4382..eec89dd219c345f50236f4d2d8e0004d4fb0741c 100644 +--- a/src/qmlcontrols/kcmcontrols/CMakeLists.txt ++++ b/src/qmlcontrols/kcmcontrols/CMakeLists.txt +@@ -6,7 +6,7 @@ set(kcmcontrols_SRCS + settinghighlighterprivate.cpp + ) + +-add_library(kcmcontrolsplugin SHARED ${kcmcontrols_SRCS}) ++add_library(kcmcontrolsplugin ${kcmcontrols_SRCS}) + target_link_libraries(kcmcontrolsplugin + Qt5::Core + Qt5::Quick +diff --git a/src/qmlcontrols/kconfig/CMakeLists.txt b/src/qmlcontrols/kconfig/CMakeLists.txt +index 59a68b2277dee3532d39b40d2240a1ba2d3e041d..73658100ce4d832088d8bf6479b3a04853addecb 100644 +--- a/src/qmlcontrols/kconfig/CMakeLists.txt ++++ b/src/qmlcontrols/kconfig/CMakeLists.txt +@@ -5,7 +5,7 @@ set(kconfigplugin_SRCS + kauthorizedproxy.cpp + ) + +-add_library(kconfigplugin SHARED ${kconfigplugin_SRCS}) ++add_library(kconfigplugin ${kconfigplugin_SRCS}) + target_link_libraries(kconfigplugin + Qt5::Core + Qt5::Qml +diff --git a/src/qmlcontrols/kcoreaddons/CMakeLists.txt b/src/qmlcontrols/kcoreaddons/CMakeLists.txt +index 3f77f2d1bf067a545f74f31423a8facff8e38ff7..3c27e3bb3db2c8686ef97ef093051a3ead7ad475 100644 +--- a/src/qmlcontrols/kcoreaddons/CMakeLists.txt ++++ b/src/qmlcontrols/kcoreaddons/CMakeLists.txt +@@ -6,7 +6,7 @@ set(kcoreaddonsplugin_SRCS + kuserproxy.cpp + ) + +-add_library(kcoreaddonsplugin SHARED ${kcoreaddonsplugin_SRCS}) ++add_library(kcoreaddonsplugin ${kcoreaddonsplugin_SRCS}) + target_link_libraries(kcoreaddonsplugin + Qt5::Core + Qt5::Quick +diff --git a/src/qmlcontrols/kioplugin/CMakeLists.txt b/src/qmlcontrols/kioplugin/CMakeLists.txt +index 22a4f1e4326a2dbb721fd94ebbf74bdc0f8a7acf..2afcbdd3ef4aeee55da5a0800f7da0ce78edc909 100644 +--- a/src/qmlcontrols/kioplugin/CMakeLists.txt ++++ b/src/qmlcontrols/kioplugin/CMakeLists.txt +@@ -5,7 +5,7 @@ set(kioplugin_SRCS + krunproxy.cpp + ) + +-add_library(kio SHARED ${kioplugin_SRCS}) ++add_library(kio ${kioplugin_SRCS}) + target_link_libraries(kio + Qt5::Core + Qt5::Qml +diff --git a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt +index 61fae96bb475af320a5f12d7b5c4178a0bf293f9..5afb253e4a4fce5f1448f8f74b966ea4ec387041 100644 +--- a/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt ++++ b/src/qmlcontrols/kquickcontrols/private/CMakeLists.txt +@@ -6,7 +6,7 @@ set(kquickcontrolsprivate_SRCS + translationcontext.cpp + ) + +-add_library(kquickcontrolsprivateplugin SHARED ${kquickcontrolsprivate_SRCS}) ++add_library(kquickcontrolsprivateplugin ${kquickcontrolsprivate_SRCS}) + + target_link_libraries(kquickcontrolsprivateplugin + Qt5::Core +diff --git a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt +index 71aacc6920e126e271b9192ed384d9753f469520..513eebfb18b8b6e093db540fb5e964cf8b1cbbe2 100644 +--- a/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt ++++ b/src/qmlcontrols/kquickcontrolsaddons/CMakeLists.txt +@@ -17,7 +17,7 @@ set(kquickcontrolsaddons_SRCS + icondialog.cpp + ) + +-add_library(kquickcontrolsaddonsplugin SHARED ${kquickcontrolsaddons_SRCS}) ++add_library(kquickcontrolsaddonsplugin ${kquickcontrolsaddons_SRCS}) + + target_link_libraries(kquickcontrolsaddonsplugin + Qt5::Core +diff --git a/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt b/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt +index 48378f7e93c5fd9641e11d7dd784992cf7f62f3e..6c8a01d249a67371caba84e8f9a263dcf728b60b 100644 +--- a/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt ++++ b/src/qmlcontrols/kwindowsystemplugin/CMakeLists.txt +@@ -5,7 +5,7 @@ set(kwindowsystemplugin_SRCS + kwindowsystemproxy.cpp + ) + +-add_library(kwindowsystem SHARED ${kwindowsystemplugin_SRCS}) ++add_library(kwindowsystem ${kwindowsystemplugin_SRCS}) + target_link_libraries(kwindowsystem + Qt5::Core + Qt5::Qml diff --git a/ports/kf5declarative/portfile.cmake b/ports/kf5declarative/portfile.cmake index 38088571879b91..6d429c2e87d7d9 100644 --- a/ports/kf5declarative/portfile.cmake +++ b/ports/kf5declarative/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_config_cmake.patch + dont_force_shared.diff ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/kf5declarative/vcpkg.json b/ports/kf5declarative/vcpkg.json index ff59f24981d1df..500af770adb49c 100644 --- a/ports/kf5declarative/vcpkg.json +++ b/ports/kf5declarative/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5declarative", "version": "5.84.0", + "port-version": 1, "description": "Integration of QML and KDE work spaces", "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d07cf0131d5c64..4f8397820e2717 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3050,7 +3050,7 @@ }, "kf5declarative": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5diagram": { "baseline": "2.8.0", diff --git a/versions/k-/kf5declarative.json b/versions/k-/kf5declarative.json index caca8bbb8fdd61..9e53d6474338e0 100644 --- a/versions/k-/kf5declarative.json +++ b/versions/k-/kf5declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6532f8c66e8d9626315958f2f072c43bf6a117ac", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "165b2c1ebe6c3268e4bf32668da9c78c0b097f24", "version": "5.84.0", From 2b51411f5703aadf00c29b81fc9bb35a6c8b32c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Wed, 27 Oct 2021 08:44:43 +0200 Subject: [PATCH 0925/1858] [Docs] vcpkg_copy_tools cleans only copied tools (#20940) Clarify that AUTO_CLEAN only removes the executables previously copied, not all of them. --- docs/maintainers/vcpkg_copy_tools.md | 2 +- scripts/cmake/vcpkg_copy_tools.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/maintainers/vcpkg_copy_tools.md b/docs/maintainers/vcpkg_copy_tools.md index aa9c0735cb97a4..e5a950bde3c17d 100644 --- a/docs/maintainers/vcpkg_copy_tools.md +++ b/docs/maintainers/vcpkg_copy_tools.md @@ -24,7 +24,7 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. ### AUTO_CLEAN -Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. +Auto clean the copied executables from `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. ## Examples diff --git a/scripts/cmake/vcpkg_copy_tools.cmake b/scripts/cmake/vcpkg_copy_tools.cmake index af4a457ffee24d..a9c19870b038c8 100644 --- a/scripts/cmake/vcpkg_copy_tools.cmake +++ b/scripts/cmake/vcpkg_copy_tools.cmake @@ -23,7 +23,7 @@ The path to the directory containing the tools. This will be set to `${CURRENT_P Destination to copy the tools to. This will be set to `${CURRENT_PACKAGES_DIR}/tools/${PORT}` if omitted. ### AUTO_CLEAN -Auto clean executables in `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. +Auto clean the copied executables from `${CURRENT_PACKAGES_DIR}/bin` and `${CURRENT_PACKAGES_DIR}/debug/bin`. ## Examples From 0e91c3b13a4488a3ea3ba582f1941af1317a5f54 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:45:05 +0200 Subject: [PATCH 0926/1858] [rapidcsv] Update to 8.53 (#20941) * Update rapidcsv to 8.53 * Update CI baseline Co-authored-by: chausner --- ports/rapidcsv/portfile.cmake | 8 ++++---- ports/rapidcsv/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rapidcsv.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/rapidcsv/portfile.cmake b/ports/rapidcsv/portfile.cmake index 9e2654e7910e01..94ebf914ad6620 100644 --- a/ports/rapidcsv/portfile.cmake +++ b/ports/rapidcsv/portfile.cmake @@ -1,16 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO d99kris/rapidcsv - REF v8.50 - SHA512 97eb3eb8e2bbd45d128a73129825b0ce28bf36db14ae21f759b46fefce98980743397e1d34df58cb48707cde0fea9b092438d7720bf67a40e8cd5f289395ba40 + REF v8.53 + SHA512 64a6100f1adf90eeaa4a513fbcf4ffd611a40b1f41b6e88eeda6c73c360e26c5a7cc6fc68a65bb2dff5f72ba663a976d2922e3114468dbd8c291c7eef211ae1f HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rapidcsv/vcpkg.json b/ports/rapidcsv/vcpkg.json index 3b5257e01be0a8..79268aa9819683 100644 --- a/ports/rapidcsv/vcpkg.json +++ b/ports/rapidcsv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rapidcsv", - "version": "8.50", + "version": "8.53", "description": "Rapidcsv is a C++ header-only library for CSV parsing.", "homepage": "https://github.com/d99kris/rapidcsv/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 4f8397820e2717..bc2cd41bfb783a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5801,7 +5801,7 @@ "port-version": 1 }, "rapidcsv": { - "baseline": "8.50", + "baseline": "8.53", "port-version": 0 }, "rapidjson": { diff --git a/versions/r-/rapidcsv.json b/versions/r-/rapidcsv.json index 7cc6f9d4c68b42..4785f328cec6fc 100644 --- a/versions/r-/rapidcsv.json +++ b/versions/r-/rapidcsv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "712023c784b983f8f85088dedc94c0d6fa53907e", + "version": "8.53", + "port-version": 0 + }, { "git-tree": "48075cdee869e9fb897cf5a45aa0159cc742b213", "version": "8.50", From 7deed889182c61f77a25c8ebd9c56bc5b2bad326 Mon Sep 17 00:00:00 2001 From: Silver Zachara Date: Wed, 27 Oct 2021 08:45:32 +0200 Subject: [PATCH 0927/1858] [libmysql] Added limits include patch (#20947) * [libmysql] Added limits include patch Fixes numeric_limits is not a member of std build failure on GCC 11.2 in sql-common/sql_string.cc file. * Updated version database * Update portfile.cmake * Update versions/l-/libmysql.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/libmysql/004-added-limits-include.patch | 12 ++++ ports/libmysql/portfile.cmake | 55 ++++++++++--------- ports/libmysql/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmysql.json | 5 ++ 5 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 ports/libmysql/004-added-limits-include.patch diff --git a/ports/libmysql/004-added-limits-include.patch b/ports/libmysql/004-added-limits-include.patch new file mode 100644 index 00000000000000..d02641ad765328 --- /dev/null +++ b/ports/libmysql/004-added-limits-include.patch @@ -0,0 +1,12 @@ +diff --git a/sql-common/sql_string.cc b/sql-common/sql_string.cc +index 40435729..8b6ee827 100644 +--- a/sql-common/sql_string.cc ++++ b/sql-common/sql_string.cc +@@ -23,6 +23,7 @@ + #include "sql_string.h" + + #include ++#include + + #include "my_dbug.h" + #include "my_macros.h" diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index aaffaffe5f3696..2a98b683dcb8a8 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -19,9 +19,10 @@ vcpkg_from_github( system-libs.patch rename-version.patch export-cmake-targets.patch + 004-added-limits-include.patch ) -file(REMOVE_RECURSE ${SOURCE_PATH}/include/boost_1_70_0) +file(REMOVE_RECURSE "${SOURCE_PATH}/include/boost_1_70_0") set(STACK_DIRECTION) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") @@ -37,7 +38,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT_LINKAGE) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DWITHOUT_SERVER=ON @@ -101,45 +102,45 @@ endif() vcpkg_copy_tools(TOOL_NAMES ${MYSQL_TOOLS} AUTO_CLEAN) -file(RENAME ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/libmysql) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/libmysql) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/share) -file(RENAME ${CURRENT_PACKAGES_DIR}/libmysql ${CURRENT_PACKAGES_DIR}/share/libmysql) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/libmysql ${CURRENT_PACKAGES_DIR}/debug/share/libmysql) +file(RENAME "${CURRENT_PACKAGES_DIR}/share" "${CURRENT_PACKAGES_DIR}/libmysql") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/libmysql") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") +file(RENAME "${CURRENT_PACKAGES_DIR}/libmysql" "${CURRENT_PACKAGES_DIR}/share/libmysql") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libmysql" "${CURRENT_PACKAGES_DIR}/debug/share/libmysql") vcpkg_fixup_cmake_targets(CONFIG_PATH share/libmysql/unofficial-libmysql TARGET_PATH share/unofficial-libmysql) # switch mysql into /mysql -file(RENAME ${CURRENT_PACKAGES_DIR}/include ${CURRENT_PACKAGES_DIR}/include2) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/include2 ${CURRENT_PACKAGES_DIR}/include/mysql) +file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/mysql") ## delete useless vcruntime/scripts/bin/msg file file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/docs - ${CURRENT_PACKAGES_DIR}/debug/docs - ${CURRENT_PACKAGES_DIR}/lib/debug - ${CURRENT_PACKAGES_DIR}/lib/plugin - ${CURRENT_PACKAGES_DIR}/lib/plugin/debug + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/docs" + "${CURRENT_PACKAGES_DIR}/debug/docs" + "${CURRENT_PACKAGES_DIR}/lib/debug" + "${CURRENT_PACKAGES_DIR}/lib/plugin" + "${CURRENT_PACKAGES_DIR}/lib/plugin/debug" ) ## remove misc files file(REMOVE - ${CURRENT_PACKAGES_DIR}/LICENSE - ${CURRENT_PACKAGES_DIR}/README - ${CURRENT_PACKAGES_DIR}/debug/LICENSE - ${CURRENT_PACKAGES_DIR}/debug/README + "${CURRENT_PACKAGES_DIR}/LICENSE" + "${CURRENT_PACKAGES_DIR}/README" + "${CURRENT_PACKAGES_DIR}/debug/LICENSE" + "${CURRENT_PACKAGES_DIR}/debug/README" ) -file(READ ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h _contents) +file(READ "${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h" _contents) string(REPLACE "#include " "#include \"mysql/udf_registration_types.h\"" _contents "${_contents}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h "${_contents}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/mysql/mysql_com.h" "${_contents}") -file(INSTALL ${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${CURRENT_PORT_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # copy license -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmysql/vcpkg.json b/ports/libmysql/vcpkg.json index 225ec74956eca1..cd230360b41c3d 100644 --- a/ports/libmysql/vcpkg.json +++ b/ports/libmysql/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmysql", "version": "8.0.20", - "port-version": 2, + "port-version": 3, "description": "A MySQL client library for C development", "homepage": "https://github.com/mysql/mysql-server", "supports": "!(windows & x86) & !uwp", diff --git a/versions/baseline.json b/versions/baseline.json index bc2cd41bfb783a..642f2f31cce1f8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3634,7 +3634,7 @@ }, "libmysql": { "baseline": "8.0.20", - "port-version": 2 + "port-version": 3 }, "libnice": { "baseline": "0.1.15", diff --git a/versions/l-/libmysql.json b/versions/l-/libmysql.json index 6ad4a2384e3ab5..f4cade871656d5 100644 --- a/versions/l-/libmysql.json +++ b/versions/l-/libmysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9fccf9613dee83d48f9ba68a356a8db324224948", + "version": "8.0.20", + "port-version": 3 + }, { "git-tree": "55f99b850b59d83a2bc77a7a3980e96ccb67c875", "version": "8.0.20", From b653f714d3322e10d90cd90acfb21a51e826b2b1 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:53:16 +0200 Subject: [PATCH 0928/1858] [dataframe] Update to 1.19.0 (#20955) * Update dataframe to 1.19.0 * Update CI baseline Co-authored-by: chausner --- ports/dataframe/portfile.cmake | 24 +++++++++--------------- ports/dataframe/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/d-/dataframe.json | 5 +++++ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/ports/dataframe/portfile.cmake b/ports/dataframe/portfile.cmake index a2a453ef0e84bf..0694da42f1bf95 100644 --- a/ports/dataframe/portfile.cmake +++ b/ports/dataframe/portfile.cmake @@ -1,31 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hosseinmoein/DataFrame - REF 1.17.0 - SHA512 8f402c9298d50102984d4b52f830cd995cbbc1cb20f65a8d371e7b013e78c9211b40c2cec38dd97ecfe7d425d54fdaf8a876522db2dc6562194946fc73f7663b + REF 1.19.0 + SHA512 4415644b04d9c3b5ab3487ee896d0f020f0659d71b8bc128a649e14c6edb22c4848d228016a0108a122060d5aa9452260a3936761cf228eb7a7a436a64f031ff HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_TESTING:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/dataframe) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else() - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/DataFrame TARGET_PATH share/dataframe) - + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/DataFrame) endif() vcpkg_fixup_pkgconfig() -file( REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file( INSTALL - ${SOURCE_PATH}/License DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright -) +file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/dataframe/vcpkg.json b/ports/dataframe/vcpkg.json index 902221408efda9..dbfb63e385782c 100644 --- a/ports/dataframe/vcpkg.json +++ b/ports/dataframe/vcpkg.json @@ -1,8 +1,17 @@ { "name": "dataframe", - "version-string": "1.17.0", - "port-version": 1, + "version": "1.19.0", "description": "This is a C++ statistical library that provides an interface similar to Pandas package in Python", "homepage": "https://github.com/hosseinmoein/DataFrame", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 642f2f31cce1f8..5e2d73349dbc0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1737,8 +1737,8 @@ "port-version": 1 }, "dataframe": { - "baseline": "1.17.0", - "port-version": 1 + "baseline": "1.19.0", + "port-version": 0 }, "date": { "baseline": "3.0.1", diff --git a/versions/d-/dataframe.json b/versions/d-/dataframe.json index b0a863e52dcd5e..8babf362d4c5fd 100644 --- a/versions/d-/dataframe.json +++ b/versions/d-/dataframe.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f3b69090a3dce2e274e137efce5c2fb859d25ef", + "version": "1.19.0", + "port-version": 0 + }, { "git-tree": "5a7d6da55d37d2e7415aa8841b06660213e54743", "version-string": "1.17.0", From 3dc9f0c9de5f1f5d6d6449e9560fb48897c398a3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:55:17 +0200 Subject: [PATCH 0929/1858] [xsimd] Update to 8.0.3 (#20956) * Update xsimd to 8.0.3 * Update CI baseline * Remove double quotes * update version Co-authored-by: chausner Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/xsimd/portfile.cmake | 17 ++++++++--------- ports/xsimd/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/x-/xsimd.json | 5 +++++ 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ports/xsimd/portfile.cmake b/ports/xsimd/portfile.cmake index b487d350cc5851..32e59e3553cc30 100644 --- a/ports/xsimd/portfile.cmake +++ b/ports/xsimd/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xsimd - REF 0c8e9e7b67369003ba291a3df8060d605ae3bd4f # 7.4.9 - SHA512 6c22c3a349ff1aa495d0aa66c0159539e10e1b9418eb4c4b7b1b42ce36a8a33e87cc93484daadae7b837f72fb20429ef50461316c6107b2b68c969323d68bcf9 + REF 8.0.3 + SHA512 4c93eea5c5ba7c72f718d7d404b9630850e0805d2698d472b964e4de765678801b369ce1da5e53372f28944f5f647a7ac162995f92535a820c6f4fc9defa7e5f HEAD_REF master ) @@ -12,9 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS xcomplex ENABLE_XTL_COMPLEX ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_FALLBACK=OFF -DBUILD_TESTS=OFF @@ -22,10 +21,10 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xsimd/vcpkg.json b/ports/xsimd/vcpkg.json index 239aa1315044c8..a110b191883ef7 100644 --- a/ports/xsimd/vcpkg.json +++ b/ports/xsimd/vcpkg.json @@ -1,9 +1,18 @@ { "name": "xsimd", - "version-string": "7.4.9", - "port-version": 1, + "version": "8.0.3", "description": "Modern, portable C++ wrappers for SIMD intrinsics", "homepage": "https://github.com/xtensor-stack/xsimd", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "xcomplex": { "description": "xtl complex support", diff --git a/versions/baseline.json b/versions/baseline.json index 5e2d73349dbc0f..023f1f43c11180 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7201,8 +7201,8 @@ "port-version": 1 }, "xsimd": { - "baseline": "7.4.9", - "port-version": 1 + "baseline": "8.0.3", + "port-version": 0 }, "xtensor": { "baseline": "0.23.10", diff --git a/versions/x-/xsimd.json b/versions/x-/xsimd.json index 7983abea45d5ba..70416122909596 100644 --- a/versions/x-/xsimd.json +++ b/versions/x-/xsimd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7b050635a31da5fce9834a6e8e859eb160b3916", + "version": "8.0.3", + "port-version": 0 + }, { "git-tree": "9809d05e16b0047099b1c43c4d81f5f34efe6a8c", "version-string": "7.4.9", From c666c37c8f46ec884b074a43803176b8bc5efd9c Mon Sep 17 00:00:00 2001 From: Dmitry Baryshev Date: Wed, 27 Oct 2021 09:55:40 +0300 Subject: [PATCH 0930/1858] [sail] Update to 0.9.0-pre18 (#20964) * [sail] Update to 0.9.0-pre18 * [sail] vcpkg x-add-version --all --overwrite-version --- ports/sail/portfile.cmake | 5 +++-- ports/sail/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/sail.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake index 38b45f7141604f..cab461de563662 100644 --- a/ports/sail/portfile.cmake +++ b/ports/sail/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO HappySeaFox/sail - REF v0.9.0-pre17 - SHA512 5efa1d56049d84515a92ae2df76476afcfd53ed4ea1f406851bcd86683c3b5390ee53fcd5d1dac233b855a1445496fda7fd7612a157596b0b4d088bacb5dd0fd + REF v0.9.0-pre18 + SHA512 711dd34617982427155eaa4cb39d0d0004ef6bb31ac29ee07899ac0b132ed868ea30d39f424dffd8dd0e1ad8bc1c733dd1ab9e3713b5772100ae1953b4ce6e08 HEAD_REF master ) @@ -16,6 +16,7 @@ vcpkg_cmake_configure( OPTIONS -DSAIL_STATIC=${SAIL_STATIC} -DSAIL_COMBINE_CODECS=ON + -DSAIL_BUILD_APPS=OFF -DSAIL_BUILD_EXAMPLES=OFF -DSAIL_BUILD_TESTS=OFF ) diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json index 13d3a73659ec66..668cc0b7bc14ec 100644 --- a/ports/sail/vcpkg.json +++ b/ports/sail/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sail", - "version-semver": "0.9.0-pre17", + "version-semver": "0.9.0-pre18", "description": "The missing small and fast image decoding library for humans (not for machines)", "homepage": "https://github.com/HappySeaFox/sail", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 023f1f43c11180..b98766a9bc550d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6017,7 +6017,7 @@ "port-version": 0 }, "sail": { - "baseline": "0.9.0-pre17", + "baseline": "0.9.0-pre18", "port-version": 0 }, "sais": { diff --git a/versions/s-/sail.json b/versions/s-/sail.json index d9ec23bef5da8b..f9326142ab419e 100644 --- a/versions/s-/sail.json +++ b/versions/s-/sail.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33ba821b47bf709df78c48f302640cbdfac9860b", + "version-semver": "0.9.0-pre18", + "port-version": 0 + }, { "git-tree": "38fab5a13ed3f5e76ec41af54676cd6c5aa4047d", "version-semver": "0.9.0-pre17", From 72260645a0431b74203eb025a7aa2dc5c1a6641b Mon Sep 17 00:00:00 2001 From: Christopher Schwartz <71826935+ChristopherSchwartzXRITE@users.noreply.github.com> Date: Wed, 27 Oct 2021 08:56:57 +0200 Subject: [PATCH 0931/1858] [boost-modular-build-helper] fixup MinGW lib names for more GCC versions. (#20985) --- ports/boost-modular-build-helper/boost-modular-build.cmake | 2 +- ports/boost-modular-build-helper/vcpkg.json | 2 +- versions/b-/boost-modular-build-helper.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 8d082b26b74bad..d35b4f99112f30 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -131,7 +131,7 @@ function(boost_modular_build) endif() endforeach() # Similar for mingw - file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*-mgw10-*.a" "${CURRENT_PACKAGES_DIR}/lib/*-mgw10-*.a") + file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*-mgw*-*.a" "${CURRENT_PACKAGES_DIR}/lib/*-mgw*-*.a") foreach(LIB IN LISTS INSTALLED_LIBS) get_filename_component(OLD_FILENAME "${LIB}" NAME) get_filename_component(DIRECTORY_OF_LIB_FILE "${LIB}" DIRECTORY) diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json index fa9a03db290b9f..9daad0988434fa 100644 --- a/ports/boost-modular-build-helper/vcpkg.json +++ b/ports/boost-modular-build-helper/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boost-modular-build-helper", "version": "1.77.0", - "port-version": 3, + "port-version": 4, "description": "Internal vcpkg port used to build Boost libraries", "dependencies": [ "boost-uninstall" diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json index 0a0fcb81bfd25e..ef9108decadccb 100644 --- a/versions/b-/boost-modular-build-helper.json +++ b/versions/b-/boost-modular-build-helper.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aea8b4dbb8063db29d8ac843ef6aac35478bebaa", + "version": "1.77.0", + "port-version": 4 + }, { "git-tree": "7cc6728723151712d8007e882bc2ad9a4649b2cf", "version": "1.77.0", diff --git a/versions/baseline.json b/versions/baseline.json index b98766a9bc550d..6d92a12f6d8c86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -818,7 +818,7 @@ }, "boost-modular-build-helper": { "baseline": "1.77.0", - "port-version": 3 + "port-version": 4 }, "boost-move": { "baseline": "1.77.0", From 228e91327a6cc2dd18684885d750d549e4f8afc3 Mon Sep 17 00:00:00 2001 From: Gelila Seifu Date: Tue, 26 Oct 2021 23:57:21 -0700 Subject: [PATCH 0932/1858] [hexl ] Update to v1.2.2 (#20989) * Update to HEXL v1.2.2 * Update version database --- ports/hexl/portfile.cmake | 8 ++++---- ports/hexl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hexl.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/hexl/portfile.cmake b/ports/hexl/portfile.cmake index 74d6735d5264ab..d79ea57b50c704 100644 --- a/ports/hexl/portfile.cmake +++ b/ports/hexl/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl - REF df6c26fdd2f2752e2bfa17981be113ff32946375 - SHA512 c4353410091b019dad05326818d66bc74b438a26ec28192da20f13581781556b7aad11c3e9c2c2c9ed7ec66bc422152e2a2811206109b39939f30c91952ef765 - HEAD_REF 1.2.1 + REF 343acab47f7612c76cc09bfe39ec9435283fb0e6 + SHA512 afaf0c68559547d6617cb75ff465f5c4998f00bda1e5edb399e4a80f8a67628fbbbee6b3b484ec96944c8686b9b2180e6523c1329619454b7752a46ffa2a913c + HEAD_REF 1.2.2 ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -29,7 +29,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.1") +vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.2") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/hexl/vcpkg.json b/ports/hexl/vcpkg.json index 490851451424fc..87742413a5fcd8 100644 --- a/ports/hexl/vcpkg.json +++ b/ports/hexl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hexl", - "version": "1.2.1", + "version": "1.2.2", "description": "Intel® HEXL is an open-source library which provides efficient implementations of integer arithmetic on Galois fields.", "homepage": "https://github.com/intel/hexl", "supports": "x64 & !(windows & !static)", diff --git a/versions/baseline.json b/versions/baseline.json index 6d92a12f6d8c86..2ae25b978e25d5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2653,7 +2653,7 @@ "port-version": 0 }, "hexl": { - "baseline": "1.2.1", + "baseline": "1.2.2", "port-version": 0 }, "hffix": { diff --git a/versions/h-/hexl.json b/versions/h-/hexl.json index 45b391e0530c45..c2d44f3aac758e 100644 --- a/versions/h-/hexl.json +++ b/versions/h-/hexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2780f209491bc30cb3db0bc52a48ed88bf10d9b6", + "version": "1.2.2", + "port-version": 0 + }, { "git-tree": "14a96b80d062ba4dea3d18839c4d737792584a3c", "version": "1.2.1", From 4ea45c68cd695dd9a88ceedd7214b70eb56fdaed Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:57:38 +0800 Subject: [PATCH 0933/1858] [libfabric] Update to 1.31.2 (#20975) --- ports/libfabric/portfile.cmake | 4 ++-- ports/libfabric/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libfabric.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libfabric/portfile.cmake b/ports/libfabric/portfile.cmake index b965173d456eaf..563dc483f0c689 100644 --- a/ports/libfabric/portfile.cmake +++ b/ports/libfabric/portfile.cmake @@ -5,9 +5,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ofiwg/libfabric - REF 9682913a72c982b4a872b6b18cf2889e158a029b # v1.13.1 + REF bcb41c462e1e38559c94096ac06e2f578b466882 # v1.13.2 HEAD_REF master - SHA512 a484126d5f2b6ada1a081af4ae4b60ca00da84814f485cd39746f2ab82948dc68fac5fb47cda39510996e61765d3cf07c409f7a8646f33922d2486b6fb7ee2ab + SHA512 b3ea464a402aa5b470ba5478350e23682488f785a3b2cb34df02f23d1663f097285f6795ab287db40b2a544c8e3969358a23165664e1fc39542038d726212e6c PATCHES add_additional_includes.patch ) diff --git a/ports/libfabric/vcpkg.json b/ports/libfabric/vcpkg.json index 0a3eb02494c2a1..92b5b54bfe815c 100644 --- a/ports/libfabric/vcpkg.json +++ b/ports/libfabric/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libfabric", - "version-semver": "1.13.1", + "version-semver": "1.13.2", "description": "The OpenFabrics Interfaces Working Group (OFIWG) and the Libfabric open-source community are pleased to announce the release of version v1.6.2 of libfabric. See NEWS.md for the list of features and enhancements that have been added since the last release.", "homepage": "https://github.com/ofiwg/libfabric", "supports": "windows & x64 & !static", diff --git a/versions/baseline.json b/versions/baseline.json index 2ae25b978e25d5..fa313176ce82f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3389,7 +3389,7 @@ "port-version": 1 }, "libfabric": { - "baseline": "1.13.1", + "baseline": "1.13.2", "port-version": 0 }, "libffi": { diff --git a/versions/l-/libfabric.json b/versions/l-/libfabric.json index 3b3ef9239f5fb3..dc53985c20459a 100644 --- a/versions/l-/libfabric.json +++ b/versions/l-/libfabric.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2ab311b282b282a5b10a3b52938c08efcdd1fc2", + "version-semver": "1.13.2", + "port-version": 0 + }, { "git-tree": "98605d765b6373e091da7f21b3d43667a9fc9da3", "version-semver": "1.13.1", From f846688cb0a8ec198898dfe10de91ae4e736c83b Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 27 Oct 2021 14:58:24 +0800 Subject: [PATCH 0934/1858] [cli11] Update branch name for HEAD_REF (#20995) * [cli11] Update HEAD_REF as main * Update version files --- ports/cli11/portfile.cmake | 2 +- ports/cli11/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cli11.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/cli11/portfile.cmake b/ports/cli11/portfile.cmake index 716ebf4bff8138..5adfb86314db74 100644 --- a/ports/cli11/portfile.cmake +++ b/ports/cli11/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO CLIUtils/CLI11 REF v2.1.2 SHA512 3b21d015e046666d2e3df2b7cf1a6247c2daa26bf583e714dc1f0a94518785bf90993cd8530f88078b4daac02530dc517db0d5ad452d2a91521b3007f270ea55 - HEAD_REF master + HEAD_REF main ) vcpkg_cmake_configure( diff --git a/ports/cli11/vcpkg.json b/ports/cli11/vcpkg.json index 366eda769262a2..cb780687a6f980 100644 --- a/ports/cli11/vcpkg.json +++ b/ports/cli11/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cli11", "version": "2.1.2", + "port-version": 1, "description": "CLI11 is a command line parser for C++11 and beyond that provides a rich feature set with a simple and intuitive interface.", "homepage": "https://github.com/CLIUtils/CLI11", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fa313176ce82f1..47eaa00d47ceeb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1386,7 +1386,7 @@ }, "cli11": { "baseline": "2.1.2", - "port-version": 0 + "port-version": 1 }, "clickhouse-cpp": { "baseline": "1.5.0", diff --git a/versions/c-/cli11.json b/versions/c-/cli11.json index 8eddf8a49eb431..37e4f6597d5a10 100644 --- a/versions/c-/cli11.json +++ b/versions/c-/cli11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2fa0d3108042d872a50565d15c79d5611bdf0b6", + "version": "2.1.2", + "port-version": 1 + }, { "git-tree": "9e17d430383dcb0eb48b08e57cb33503fc181c3b", "version": "2.1.2", From 305bcebe61053ebd6c9992f9b20026a7037a6ea9 Mon Sep 17 00:00:00 2001 From: Phoebe <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 27 Oct 2021 00:02:03 -0700 Subject: [PATCH 0935/1858] [asmjit] Update to latest commit and fix header (#20997) --- ports/asmjit/portfile.cmake | 35 ++++++++++++++++++----------------- ports/asmjit/vcpkg.json | 15 ++++++++++++--- versions/a-/asmjit.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/ports/asmjit/portfile.cmake b/ports/asmjit/portfile.cmake index a33a61c0d019e8..2914e4e5ffe946 100644 --- a/ports/asmjit/portfile.cmake +++ b/ports/asmjit/portfile.cmake @@ -3,30 +3,31 @@ vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO asmjit/asmjit - REF 5bc166efdb419f88bd5b5774c62cfc4d08a0bfa4 # accessed on 2020-09-14 - SHA512 6e31617e62dccbec5fa4d8aeacb1076167f870578a0dd2915403d414f8fcaab16692968287f912dc41a2ec7d10a343d5b687144f04d2ec7adb2880044752543c + REF d0d14ac774977d0060a351f66e35cb57ba0bf59c # accessed on 2021-10-26 + SHA512 2822763fcb3c18f6699119c1773404667d81f8afb86f8f2e8dbe627526a2877b049d16505557e680e4e310f0e0667263dc4ac442f682e95f2568bf0bf8b61b4b HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(ASMJIT_STATIC 1) -else() - set(ASMJIT_STATIC 0) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ASMJIT_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DASMJIT_STATIC=${ASMJIT_STATIC} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DASMJIT_STATIC=${ASMJIT_STATIC} ) - -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/asmjit) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asmjit) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/asmjit/core/api-config.h" + "#if !defined(ASMJIT_STATIC)" + "#if 0" + ) +endif() -# Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/asmjit/vcpkg.json b/ports/asmjit/vcpkg.json index 929f37b421b192..93eb16b3eb9f60 100644 --- a/ports/asmjit/vcpkg.json +++ b/ports/asmjit/vcpkg.json @@ -1,8 +1,17 @@ { "name": "asmjit", - "version-string": "2020-09-14", - "port-version": 1, + "version-date": "2021-10-26", "description": "Complete x86/x64 JIT and Remote Assembler for C++", "homepage": "https://github.com/asmjit/asmjit", - "supports": "!arm" + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/asmjit.json b/versions/a-/asmjit.json index 90ed6593f38ba9..9f303a291faed8 100644 --- a/versions/a-/asmjit.json +++ b/versions/a-/asmjit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ce58638bee35ef08b3ee8286c1e519b171c39bf", + "version-date": "2021-10-26", + "port-version": 0 + }, { "git-tree": "beb9e328e4d8c0575319af439ec4f810cf0bfa40", "version-string": "2020-09-14", diff --git a/versions/baseline.json b/versions/baseline.json index 47eaa00d47ceeb..b856ca7401f1c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -185,8 +185,8 @@ "port-version": 3 }, "asmjit": { - "baseline": "2020-09-14", - "port-version": 1 + "baseline": "2021-10-26", + "port-version": 0 }, "assimp": { "baseline": "5.0.1", From d143d89065ffed56c095ffac23e0a320b3c7dd49 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 27 Oct 2021 00:03:08 -0700 Subject: [PATCH 0936/1858] [arrayfire] Update to 3.8.0 (#21000) * [arrayfire] Update to 3.8.0 * Modify format Co-authored-by: Cheney-Wang --- ...onstexpr-error-with-vs2019-with-half.patch | 22 +++++++++++ ports/arrayfire/build.patch | 38 ++++++++----------- ports/arrayfire/portfile.cmake | 31 ++++++++------- ports/arrayfire/vcpkg.json | 15 ++++++-- versions/a-/arrayfire.json | 5 +++ versions/baseline.json | 4 +- 6 files changed, 73 insertions(+), 42 deletions(-) create mode 100644 ports/arrayfire/Fix-constexpr-error-with-vs2019-with-half.patch diff --git a/ports/arrayfire/Fix-constexpr-error-with-vs2019-with-half.patch b/ports/arrayfire/Fix-constexpr-error-with-vs2019-with-half.patch new file mode 100644 index 00000000000000..7766c3e75ef78e --- /dev/null +++ b/ports/arrayfire/Fix-constexpr-error-with-vs2019-with-half.patch @@ -0,0 +1,22 @@ +diff --git a/src/backend/common/half.hpp b/src/backend/common/half.hpp +index ce06eed..fb25d03 100644 +--- a/src/backend/common/half.hpp ++++ b/src/backend/common/half.hpp +@@ -879,15 +879,9 @@ class alignas(2) half { + return *this; + } + +-#if defined(NVCC) || defined(__CUDACC_RTC__) +- AF_CONSTEXPR __DH__ explicit half(__half value) noexcept + #ifdef __CUDA_ARCH__ +- : data_(value) { +- } +-#else +- : data_(*reinterpret_cast(&value)) { +- } +-#endif ++ AF_CONSTEXPR __DH__ explicit half(__half value) noexcept : data_(value) {} ++ + AF_CONSTEXPR __DH__ half& operator=(__half value) noexcept { + // NOTE Assignment to ushort from __half only works with device code. + // using memcpy instead diff --git a/ports/arrayfire/build.patch b/ports/arrayfire/build.patch index c5239389144ed4..b102dea9a677b2 100644 --- a/ports/arrayfire/build.patch +++ b/ports/arrayfire/build.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1f30a5b3..7b62e003 100644 +index 682f416..a8cbec8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,8 +104,6 @@ mark_as_advanced( @@ -34,7 +34,7 @@ index 1f30a5b3..7b62e003 100644 DESTINATION LICENSES COMPONENT licenses) diff --git a/CMakeModules/AFInstallDirs.cmake b/CMakeModules/AFInstallDirs.cmake -index 2c7b96ea..b5006ee0 100644 +index 2c7b96e..b5006ee 100644 --- a/CMakeModules/AFInstallDirs.cmake +++ b/CMakeModules/AFInstallDirs.cmake @@ -7,8 +7,12 @@ include(GNUInstallDirs) @@ -53,7 +53,7 @@ index 2c7b96ea..b5006ee0 100644 # Libraries diff --git a/CMakeModules/AFconfigure_forge_submodule.cmake b/CMakeModules/AFconfigure_forge_submodule.cmake -index d16849f0..36ab01b6 100644 +index d16849f..36ab01b 100644 --- a/CMakeModules/AFconfigure_forge_submodule.cmake +++ b/CMakeModules/AFconfigure_forge_submodule.cmake @@ -39,13 +39,13 @@ if(AF_BUILD_FORGE) @@ -75,20 +75,21 @@ index d16849f0..36ab01b6 100644 ) endif(AF_BUILD_FORGE) diff --git a/src/api/unified/CMakeLists.txt b/src/api/unified/CMakeLists.txt -index 967eaa63..ff04392c 100644 +index 967eaa6..16bb633 100644 --- a/src/api/unified/CMakeLists.txt +++ b/src/api/unified/CMakeLists.txt -@@ -96,7 +96,7 @@ target_include_directories(af +@@ -96,7 +96,8 @@ target_include_directories(af target_link_libraries(af PRIVATE cpp_api_interface - spdlog -+ spdlog::spdlog spdlog::spdlog_header_only ++ spdlog::spdlog ++ spdlog::spdlog_header_only Threads::Threads Boost::boost ${CMAKE_DL_LIBS} diff --git a/src/backend/common/CMakeLists.txt b/src/backend/common/CMakeLists.txt -index c9fe0889..f97bf0e8 100644 +index c9fe088..8c128fa 100644 --- a/src/backend/common/CMakeLists.txt +++ b/src/backend/common/CMakeLists.txt @@ -77,12 +77,15 @@ else() @@ -100,8 +101,8 @@ index c9fe0889..f97bf0e8 100644 target_link_libraries(afcommon_interface INTERFACE - spdlog -+ spdlog::spdlog -+ spdlog::spdlog_header_only ++ spdlog::spdlog ++ spdlog::spdlog_header_only Boost::boost - af_glad_interface ${CMAKE_DL_LIBS} @@ -122,7 +123,7 @@ index c9fe0889..f97bf0e8 100644 if(APPLE AND NOT USE_MKL) diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt -index 170bb0f3..c6e20177 100644 +index 170bb0f..c6e2017 100644 --- a/src/backend/cpu/CMakeLists.txt +++ b/src/backend/cpu/CMakeLists.txt @@ -266,9 +266,10 @@ endif(AF_WITH_CPUID) @@ -139,7 +140,7 @@ index 170bb0f3..c6e20177 100644 arrayfire_set_default_cxx_flags(afcpu) diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt -index 7e3e4089..a3a53087 100644 +index 7e3e408..2edaacd 100644 --- a/src/backend/cuda/CMakeLists.txt +++ b/src/backend/cuda/CMakeLists.txt @@ -110,7 +110,11 @@ cuda_include_directories( @@ -155,15 +156,8 @@ index 7e3e4089..a3a53087 100644 endif() file(GLOB jit_src "kernel/jit.cuh") -@@ -240,9 +244,14 @@ if(AF_WITH_NONFREE) - set(cxx_definitions -DAF_WITH_NONFREE_SIFT) - endif() +@@ -242,7 +246,7 @@ endif() -+# New API of cuSparse was introduced in 10.1.168 for Linux and the older -+# 10.1.105 fix version doesn't it. Unfortunately, the new API was introduced in -+# in a fix release of CUDA - unconventionally. As CMake's FindCUDA module -+# doesn't provide patch/fix version number, we use 10.2 as the minimum -+# CUDA version to enable this new cuSparse API. if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR (UNIX AND - CUDA_VERSION_MAJOR VERSION_EQUAL 10 AND CUDA_VERSION_MINOR VERSION_GREATER 0)) @@ -171,7 +165,7 @@ index 7e3e4089..a3a53087 100644 list(APPEND cxx_definitions -DAF_USE_NEW_CUSPARSE_API) endif() -@@ -301,7 +310,7 @@ set_target_properties(af_cuda_static_cuda_library +@@ -301,7 +305,7 @@ set_target_properties(af_cuda_static_cuda_library if(CUDA_VERSION_MAJOR VERSION_GREATER 10 OR (UNIX AND @@ -181,7 +175,7 @@ index 7e3e4089..a3a53087 100644 endif() diff --git a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt -index 9a796c9e..d9864b00 100644 +index 9a796c9..d9864b0 100644 --- a/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt +++ b/src/backend/opencl/kernel/scan_by_key/CMakeLists.txt @@ -27,6 +27,7 @@ foreach(SBK_BINARY_OP ${SBK_BINARY_OPS}) @@ -204,7 +198,7 @@ index 9a796c9e..d9864b00 100644 set_target_properties(opencl_scan_by_key_${SBK_BINARY_OP} diff --git a/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt b/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt -index d618ff2f..9f517398 100644 +index d618ff2..9f51739 100644 --- a/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt +++ b/src/backend/opencl/kernel/sort_by_key/CMakeLists.txt @@ -32,14 +32,13 @@ foreach(SBK_TYPE ${SBK_TYPES}) diff --git a/ports/arrayfire/portfile.cmake b/ports/arrayfire/portfile.cmake index 607d873f7d2cff..29322df6c38d3a 100644 --- a/ports/arrayfire/portfile.cmake +++ b/ports/arrayfire/portfile.cmake @@ -1,10 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO arrayfire/arrayfire - REF 59ac7b980d1ae124aae914fb29cbf086c948954d # v3.7.3 - SHA512 e8c209a5249046cb8d68877463b4f4921cfc363ec2f9b070ba67c9e00cbe7b44d5db209922dabc47e53977ff918e7f0d289f85c7571a826c2050d0ee8deae3e0 + REF d99887ae431fcd58168b653a1e69f027f04d5188 # v3.8.0 + SHA512 d8ddf6ba254744e62acf5ecf680f0ae56b05f8957b5463572923977ba2ffea7fa37cc1b6179421a1188a6f9e66565ca0f8cd00807513ccbe66ba1e9bbd41a3da HEAD_REF master - PATCHES build.patch + PATCHES + build.patch + Fix-constexpr-error-with-vs2019-with-half.patch ) # arrayfire cpu thread lib needed as a submodule for the CPU backend @@ -23,11 +25,11 @@ vcpkg_from_github( # are still runtime dependencies, so the user can use the graphics # library by installing forge and freeimage. vcpkg_from_github( - OUT_SOURCE_PATH FORGE_PATH - REPO arrayfire/forge - REF 1a0f0cb6371a8c8053ab5eb7cbe3039c95132389 # v1.0.5 - SHA512 8f8607421880a0f0013380eb5efb3a4f05331cd415d68c9cd84dd57eb727da1df6223fc6d65b106675d6aa09c3388359fab64443c31fadadf7641161be6b3b89 - HEAD_REF master + OUT_SOURCE_PATH FORGE_PATH + REPO arrayfire/forge + REF 1a0f0cb6371a8c8053ab5eb7cbe3039c95132389 # v1.0.5 + SHA512 8f8607421880a0f0013380eb5efb3a4f05331cd415d68c9cd84dd57eb727da1df6223fc6d65b106675d6aa09c3388359fab64443c31fadadf7641161be6b3b89 + HEAD_REF master ) ################################### Build ################################### @@ -66,20 +68,21 @@ vcpkg_check_features( ) # Build and install -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${AF_DEFAULT_VCPKG_CMAKE_FLAGS} ${AF_BACKEND_FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/examples") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/LICENSES") # Copyright and license -file(INSTALL ${SOURCE_PATH}/COPYRIGHT.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json index e6f2c8874f847d..91a39717c7672a 100644 --- a/ports/arrayfire/vcpkg.json +++ b/ports/arrayfire/vcpkg.json @@ -1,14 +1,21 @@ { "name": "arrayfire", - "version-string": "3.7.3", - "port-version": 3, + "version-semver": "3.8.0", "description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.", "supports": "x64", "dependencies": [ "boost-compute", "boost-stacktrace", "glad", - "spdlog" + "spdlog", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "cpu", @@ -22,7 +29,7 @@ ] }, "cuda": { - "description": "ArrayFire CUDA backend", + "description": "ArrayFire CUDA backend. This feature only supports dynamic because dependency cudnn is dynamic only.", "dependencies": [ "cub", "cuda", diff --git a/versions/a-/arrayfire.json b/versions/a-/arrayfire.json index 18814a994b0837..59f07bb59138c8 100644 --- a/versions/a-/arrayfire.json +++ b/versions/a-/arrayfire.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6c5e8b4e1c52380ebd2050683a185c44a2dbae4", + "version-semver": "3.8.0", + "port-version": 0 + }, { "git-tree": "ec3188e3259a9b123ebbbb0e2ede933a59d42092", "version-string": "3.7.3", diff --git a/versions/baseline.json b/versions/baseline.json index b856ca7401f1c1..8a6344ca26cf7c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -161,8 +161,8 @@ "port-version": 0 }, "arrayfire": { - "baseline": "3.7.3", - "port-version": 3 + "baseline": "3.8.0", + "port-version": 0 }, "arrow": { "baseline": "5.0.0", From e7d943ce80973bae1a9fbabf3a83b45a391c600e Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Wed, 27 Oct 2021 15:03:39 +0800 Subject: [PATCH 0937/1858] [armadillo] Fix the usage (#21002) --- ports/armadillo/portfile.cmake | 2 +- ports/armadillo/vcpkg.json | 1 + versions/a-/armadillo.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 757065f6068047..87a305332b9361 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -27,7 +27,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH share/Armadillo/CMake) +vcpkg_cmake_config_fixup(PACKAGE_NAME Armadillo CONFIG_PATH share/Armadillo/CMake) vcpkg_copy_pdbs() diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index bf9db01cb4cf65..d1846befb9b6ab 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "armadillo", "version": "10.6.2", + "port-version": 1, "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", "dependencies": [ diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 54a94c6a80393d..21920f3b23c173 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34c37cb8151d003da697e9d725033567a4ccb2f7", + "version": "10.6.2", + "port-version": 1 + }, { "git-tree": "66b31fe832e9322876f427f1fec7836bb71c082c", "version": "10.6.2", diff --git a/versions/baseline.json b/versions/baseline.json index 8a6344ca26cf7c..5fdcbb7fc1cadf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -158,7 +158,7 @@ }, "armadillo": { "baseline": "10.6.2", - "port-version": 0 + "port-version": 1 }, "arrayfire": { "baseline": "3.8.0", From 472bff512a3f0fcbbcb858e64b5daeb3f059c83f Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Wed, 27 Oct 2021 00:03:56 -0700 Subject: [PATCH 0938/1858] Update opentelemetry-cpp port to v1.0.1 (#21004) --- ports/opentelemetry-cpp/portfile.cmake | 4 ++-- ports/opentelemetry-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 9025212b49fbaa..a388951a1b5c31 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.0.0 - SHA512 283090b24494caeb148a791b107c4bba2c4891492d3c3df6b1b9b5c3141c5b9e3aaf86f5d80b1ee7737988bcd3e92ff991a48a234503aa63f8cbd43d0f0fe1a6 + REF v1.0.1 + SHA512 ddaf5f52f5c100f385e09a6eb69f08fced2e890145939d35f969b05743733409e43f4747713259b68641511401c2c1e01a498b9b7a20fab0f52ee6f4b5d3c77c HEAD_REF main ) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index bf127127aed867..784fd6ac6566e3 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.0.0", + "version-semver": "1.0.1", "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." diff --git a/versions/baseline.json b/versions/baseline.json index 5fdcbb7fc1cadf..e177578a237802 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4949,7 +4949,7 @@ "port-version": 2 }, "opentelemetry-cpp": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "opentracing": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index cbc1e6bebf9f7b..d1b54ce0efc8d4 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff4e84e96c81b66be8b52bb00f09f79e692db7c4", + "version-semver": "1.0.1", + "port-version": 0 + }, { "git-tree": "929c881d18d9a55eba5985b788fbf8d409fb62c1", "version-semver": "1.0.0", From ab3896b9e47b2a4c94b20db0f538cdc2d50491e7 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Wed, 27 Oct 2021 10:36:59 -0700 Subject: [PATCH 0939/1858] [vcpkg_download_distfile] Check SHA512 for already downloaded files (#20988) * [vcpkg_download_distfile] Check SHA512 for already downloaded files * [vcpkg_download_distfile] Respect SKIP_SHA512 to enable --head --- scripts/cmake/vcpkg_download_distfile.cmake | 39 +++++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 8bbe9e3b574de1..08a039c0518903 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -58,7 +58,7 @@ The helper [`vcpkg_from_github`](vcpkg_from_github.md) should be used for downlo * [freetype](https://github.com/Microsoft/vcpkg/blob/master/ports/freetype/portfile.cmake) #]===] -function(z_vcpkg_download_distfile_test_hash path kind error_advice sha512 skip_sha512) +function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 skip_sha512) if(_VCPKG_INTERNAL_NO_HASH_CHECK) # When using the internal hash skip, do not output an explicit message. return() @@ -68,14 +68,14 @@ function(z_vcpkg_download_distfile_test_hash path kind error_advice sha512 skip_ return() endif() - file(SHA512 "${path}" file_hash) + file(SHA512 "${file_path}" file_hash) if(NOT "${file_hash}" STREQUAL "${sha512}") message(FATAL_ERROR "\nFile does not have expected hash:\n" " File path: [ ${file_path} ]\n" " Expected hash: [ ${sha512} ]\n" " Actual hash: [ ${file_hash} ]\n" - "${CUSTOM_ERROR_ADVICE}\n") + "${error_advice}\n") endif() endfunction() @@ -204,21 +204,38 @@ If you do not know the SHA512, add it as 'SHA512 0' and re-run this command.") file(REMOVE_RECURSE "${DOWNLOADS}/temp") file(MAKE_DIRECTORY "${DOWNLOADS}/temp") + # check if file with same name already exists in downloads + if(EXISTS "${downloaded_file_path}") + set(advice_message "The cached file SHA512 doesn't match. The file may have been corrupted.") + if(_VCPKG_NO_DOWNLOADS) + string(APPEND advice_message " Downloads are disabled please provide a valid file at path ${downloaded_file_path} and retry.") + else() + string(APPEND advice_message " To re-download this file please delete cached file at path ${downloaded_file_path} and retry.") + endif() + + z_vcpkg_download_distfile_test_hash( + "${downloaded_file_path}" + "cached file" + "${advice_message}" + "${arg_SHA512}" + "${arg_SKIP_SHA512}" + ) + + if(NOT vcpkg_download_distfile_QUIET) + message(STATUS "Using cached ${arg_FILENAME}.") + endif() + + # Suppress the "Downloading ${arg_URLS} -> ${arg_FILENAME}..." message + set(vcpkg_download_distfile_QUIET TRUE) + endif() + # vcpkg_download_distfile_ALWAYS_REDOWNLOAD only triggers when NOT _VCPKG_NO_DOWNLOADS # this could be de-morgan'd out but it's more clear this way if(_VCPKG_NO_DOWNLOADS) if(NOT EXISTS "${downloaded_file_path}") message(FATAL_ERROR "Downloads are disabled, but '${downloaded_file_path}' does not exist.") endif() - if(NOT arg_QUIET) - message(STATUS "Using ${downloaded_file_path}") - endif() - z_vcpkg_download_distfile_test_hash( - "${downloaded_file_path}" - "cached file" - "Please delete the file and retry if this file should be downloaded again." - ) set("${out_var}" "${downloaded_file_path}" PARENT_SCOPE) return() endif() From a84b995a26e9f2b6ffe75b691ff52c8413c5b857 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 28 Oct 2021 00:19:28 +0200 Subject: [PATCH 0940/1858] [many ports] call vcpkg_fixup_pkgconfig() (#20953) * [many ports] call vcpkg_fixup_pkgconfig() The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files * Update port-version for armadillo and polyclipping. * Update version database. Co-authored-by: Billy Robert O'Neal III --- ports/ace/portfile.cmake | 2 + ports/ace/vcpkg.json | 2 +- ports/amqpcpp/portfile.cmake | 2 + ports/amqpcpp/vcpkg.json | 1 + ports/aom/portfile.cmake | 2 + ports/aom/vcpkg.json | 1 + ports/aricpp/portfile.cmake | 2 + ports/aricpp/vcpkg.json | 1 + ports/armadillo/portfile.cmake | 2 + ports/armadillo/vcpkg.json | 2 +- ports/arrow/portfile.cmake | 2 + ports/arrow/vcpkg.json | 1 + ports/bcg729/portfile.cmake | 2 + ports/bcg729/vcpkg.json | 1 + ports/bddisasm/portfile.cmake | 2 + ports/bddisasm/vcpkg.json | 1 + ports/bde/portfile.cmake | 2 + ports/bde/vcpkg.json | 2 +- ports/bdwgc/portfile.cmake | 2 + ports/bdwgc/vcpkg.json | 1 + ports/blitz/portfile.cmake | 3 +- ports/blitz/vcpkg.json | 2 +- ports/blosc/portfile.cmake | 2 + ports/blosc/vcpkg.json | 2 +- ports/brpc/portfile.cmake | 2 + ports/brpc/vcpkg.json | 2 +- ports/bullet3/portfile.cmake | 2 + ports/bullet3/vcpkg.json | 2 +- ports/capnproto/portfile.cmake | 2 + ports/capnproto/vcpkg.json | 1 + ports/ccd/portfile.cmake | 2 + ports/ccd/vcpkg.json | 2 +- ports/charls/portfile.cmake | 2 + ports/charls/vcpkg.json | 2 +- ports/check/portfile.cmake | 3 +- ports/check/vcpkg.json | 2 +- ports/cjson/portfile.cmake | 2 + ports/cjson/vcpkg.json | 1 + ports/clblast/portfile.cmake | 2 + ports/clblast/vcpkg.json | 2 +- ports/cli/portfile.cmake | 2 + ports/cli/vcpkg.json | 1 + ports/cmocka/portfile.cmake | 2 + ports/cmocka/vcpkg.json | 1 + ports/coin/portfile.cmake | 2 + ports/coin/vcpkg.json | 2 +- ports/collada-dom/portfile.cmake | 2 + ports/collada-dom/vcpkg.json | 2 +- ports/cpp-redis/portfile.cmake | 3 +- ports/cpp-redis/vcpkg.json | 2 +- ports/cppcodec/portfile.cmake | 2 + ports/cppcodec/vcpkg.json | 2 +- ports/cpuid/portfile.cmake | 2 + ports/cpuid/vcpkg.json | 2 +- ports/curlpp/portfile.cmake | 2 + ports/curlpp/vcpkg.json | 2 +- ports/dlib/portfile.cmake | 2 + ports/dlib/vcpkg.json | 2 +- ports/easyloggingpp/portfile.cmake | 2 + ports/easyloggingpp/vcpkg.json | 1 + ports/edlib/portfile.cmake | 2 + ports/edlib/vcpkg.json | 1 + ports/fcl/portfile.cmake | 2 + ports/fcl/vcpkg.json | 1 + ports/fftw3/portfile.cmake | 2 + ports/fftw3/vcpkg.json | 2 +- ports/flann/portfile.cmake | 2 + ports/flann/vcpkg.json | 2 +- ports/flatbuffers/portfile.cmake | 2 + ports/flatbuffers/vcpkg.json | 2 +- ports/fluidlite/portfile.cmake | 2 + ports/fluidlite/vcpkg.json | 2 +- ports/folly/portfile.cmake | 2 + ports/folly/vcpkg.json | 2 +- ports/freeglut/portfile.cmake | 2 + ports/freeglut/vcpkg.json | 2 +- ports/freeopcua/portfile.cmake | 2 + ports/freeopcua/vcpkg.json | 2 +- ports/functions-framework-cpp/portfile.cmake | 2 + ports/functions-framework-cpp/vcpkg.json | 1 + ports/geogram/portfile.cmake | 2 + ports/geogram/vcpkg.json | 1 + ports/geographiclib/portfile.cmake | 2 + ports/geographiclib/vcpkg.json | 1 + ports/getdns/portfile.cmake | 2 + ports/getdns/vcpkg.json | 2 +- ports/gflags/portfile.cmake | 2 + ports/gflags/vcpkg.json | 2 +- ports/graphite2/portfile.cmake | 2 + ports/graphite2/vcpkg.json | 2 +- ports/graphqlparser/portfile.cmake | 2 + ports/graphqlparser/vcpkg.json | 2 +- ports/graphviz/portfile.cmake | 2 + ports/graphviz/vcpkg.json | 1 + ports/hiredis/portfile.cmake | 3 +- ports/hiredis/vcpkg.json | 1 + ports/hyperscan/portfile.cmake | 2 + ports/hyperscan/vcpkg.json | 2 +- ports/igraph/portfile.cmake | 2 + ports/igraph/vcpkg.json | 1 + ports/iniparser/portfile.cmake | 2 + ports/iniparser/vcpkg.json | 2 +- ports/itpp/portfile.cmake | 2 + ports/itpp/vcpkg.json | 2 +- ports/jansson/portfile.cmake | 2 + ports/jansson/vcpkg.json | 2 +- ports/json11/portfile.cmake | 2 + ports/json11/vcpkg.json | 2 +- ports/libbson/portfile.cmake | 2 + ports/libbson/vcpkg.json | 1 + ports/libcerf/portfile.cmake | 2 + ports/libcerf/vcpkg.json | 2 +- ports/libconfuse/portfile.cmake | 2 + ports/libconfuse/vcpkg.json | 2 +- ports/libevent/portfile.cmake | 2 + ports/libevent/vcpkg.json | 2 +- ports/libevhtp/portfile.cmake | 3 +- ports/libevhtp/vcpkg.json | 2 +- ports/libfort/portfile.cmake | 2 + ports/libfort/vcpkg.json | 1 + ports/libfreenect2/portfile.cmake | 2 + ports/libfreenect2/vcpkg.json | 2 +- ports/libgd/portfile.cmake | 2 + ports/libgd/vcpkg.json | 1 + ports/libgta/portfile.cmake | 2 + ports/libgta/vcpkg.json | 2 +- ports/libkeyfinder/portfile.cmake | 2 + ports/libkeyfinder/vcpkg.json | 1 + ports/libkml/portfile.cmake | 3 +- ports/libkml/vcpkg.json | 2 +- ports/liblemon/portfile.cmake | 3 +- ports/liblemon/vcpkg.json | 2 +- ports/liblo/portfile.cmake | 2 + ports/liblo/vcpkg.json | 2 +- ports/libmikmod/portfile.cmake | 2 + ports/libmikmod/vcpkg.json | 2 +- ports/libmt32emu/portfile.cmake | 2 + ports/libmt32emu/vcpkg.json | 1 + ports/libpqxx/portfile.cmake | 2 + ports/libpqxx/vcpkg.json | 2 +- ports/libproxy/portfile.cmake | 2 + ports/libproxy/vcpkg.json | 1 + ports/libqrencode/portfile.cmake | 2 + ports/libqrencode/vcpkg.json | 1 + ports/librdkafka/portfile.cmake | 2 + ports/librdkafka/vcpkg.json | 2 +- ports/libsbml/portfile.cmake | 3 +- ports/libsbml/vcpkg.json | 1 + ports/libtins/portfile.cmake | 2 + ports/libtins/vcpkg.json | 2 +- ports/libtorrent/portfile.cmake | 2 + ports/libtorrent/vcpkg.json | 1 + ports/libwebsockets/portfile.cmake | 2 + ports/libwebsockets/vcpkg.json | 2 +- ports/libxlsxwriter/portfile.cmake | 3 +- ports/libxlsxwriter/vcpkg.json | 1 + ports/mongo-c-driver/portfile.cmake | 2 + ports/mongo-c-driver/vcpkg.json | 1 + ports/mosquitto/portfile.cmake | 2 + ports/mosquitto/vcpkg.json | 2 +- ports/msgpack/portfile.cmake | 2 + ports/msgpack/vcpkg.json | 2 +- ports/msgpack11/portfile.cmake | 2 + ports/msgpack11/vcpkg.json | 2 +- ports/munit/portfile.cmake | 2 + ports/munit/vcpkg.json | 2 +- ports/muparser/portfile.cmake | 3 +- ports/muparser/vcpkg.json | 2 +- ports/nanoflann/portfile.cmake | 3 +- ports/nanoflann/vcpkg.json | 1 + ports/nanomsg/portfile.cmake | 2 + ports/nanomsg/vcpkg.json | 2 +- ports/nlopt/portfile.cmake | 2 + ports/nlopt/vcpkg.json | 1 + ports/octomap/portfile.cmake | 2 + ports/octomap/vcpkg.json | 2 +- ports/ode/portfile.cmake | 2 + ports/ode/vcpkg.json | 2 +- ports/ois/portfile.cmake | 2 + ports/ois/vcpkg.json | 2 +- ports/oniguruma/portfile.cmake | 2 + ports/oniguruma/vcpkg.json | 1 + ports/opencc/portfile.cmake | 3 +- ports/opencc/vcpkg.json | 2 +- ports/openimageio/portfile.cmake | 2 + ports/openimageio/vcpkg.json | 2 +- ports/orocos-kdl/portfile.cmake | 3 +- ports/orocos-kdl/vcpkg.json | 2 +- ports/osg/portfile.cmake | 2 + ports/osg/vcpkg.json | 2 +- ports/p-ranav-csv2/portfile.cmake | 2 + ports/p-ranav-csv2/vcpkg.json | 2 +- ports/pcl/portfile.cmake | 2 + ports/pcl/vcpkg.json | 2 +- ports/plplot/portfile.cmake | 2 + ports/plplot/vcpkg.json | 2 +- ports/polyclipping/portfile.cmake | 2 + ports/polyclipping/vcpkg.json | 2 +- ports/ponder/portfile.cmake | 2 + ports/ponder/vcpkg.json | 2 +- ports/poppler/portfile.cmake | 3 +- ports/poppler/vcpkg.json | 2 +- ports/portaudio/portfile.cmake | 2 + ports/portaudio/vcpkg.json | 2 +- ports/ppconsul/portfile.cmake | 2 + ports/ppconsul/vcpkg.json | 2 +- ports/raylib/portfile.cmake | 2 + ports/raylib/vcpkg.json | 2 +- ports/rbdl/portfile.cmake | 2 + ports/rbdl/vcpkg.json | 2 +- ports/realsense2/portfile.cmake | 3 +- ports/realsense2/vcpkg.json | 1 + ports/redis-plus-plus/portfile.cmake | 2 + ports/redis-plus-plus/vcpkg.json | 1 + ports/rpclib/portfile.cmake | 2 + ports/rpclib/vcpkg.json | 1 + ports/rtaudio/portfile.cmake | 2 + ports/rtaudio/vcpkg.json | 1 + ports/sais/portfile.cmake | 2 + ports/sais/vcpkg.json | 2 +- ports/sdformat6/portfile.cmake | 2 + ports/sdformat6/vcpkg.json | 2 +- ports/sentencepiece/portfile.cmake | 2 + ports/sentencepiece/vcpkg.json | 1 + ports/simage/portfile.cmake | 2 + ports/simage/vcpkg.json | 2 +- ports/sol2/portfile.cmake | 2 + ports/sol2/vcpkg.json | 2 +- ports/soxr/portfile.cmake | 2 + ports/soxr/vcpkg.json | 2 +- ports/sparsehash/portfile.cmake | 2 + ports/sparsehash/vcpkg.json | 2 +- ports/stxxl/portfile.cmake | 2 + ports/stxxl/vcpkg.json | 2 +- ports/superlu/portfile.cmake | 2 + ports/superlu/vcpkg.json | 2 +- ports/thrift/portfile.cmake | 3 +- ports/thrift/vcpkg.json | 2 +- ports/tidy-html5/portfile.cmake | 2 + ports/tidy-html5/vcpkg.json | 2 +- ports/tinyobjloader/portfile.cmake | 2 + ports/tinyobjloader/vcpkg.json | 2 +- ports/tinyply/portfile.cmake | 2 + ports/tinyply/vcpkg.json | 2 +- ports/tlx/portfile.cmake | 2 + ports/tlx/vcpkg.json | 2 +- ports/tmxparser/portfile.cmake | 2 + ports/tmxparser/vcpkg.json | 2 +- ports/uchardet/portfile.cmake | 2 + ports/uchardet/vcpkg.json | 1 + ports/unittest-cpp/portfile.cmake | 2 + ports/unittest-cpp/vcpkg.json | 2 +- ports/uriparser/portfile.cmake | 2 + ports/uriparser/vcpkg.json | 1 + ports/usrsctp/portfile.cmake | 2 + ports/usrsctp/vcpkg.json | 1 + ports/wampcc/portfile.cmake | 2 + ports/wampcc/vcpkg.json | 2 +- ports/xalan-c/portfile.cmake | 2 + ports/xalan-c/vcpkg.json | 1 + ports/xerces-c/portfile.cmake | 2 + ports/xerces-c/vcpkg.json | 2 +- ports/xlnt/portfile.cmake | 2 + ports/xlnt/vcpkg.json | 2 +- ports/xtensor-fftw/portfile.cmake | 2 + ports/xtensor-fftw/vcpkg.json | 2 +- ports/z3/portfile.cmake | 2 + ports/z3/vcpkg.json | 1 + ports/zeromq/portfile.cmake | 2 + ports/zeromq/vcpkg.json | 2 +- ports/zyre/portfile.cmake | 2 + ports/zyre/vcpkg.json | 2 +- ports/zziplib/portfile.cmake | 2 + ports/zziplib/vcpkg.json | 2 +- versions/a-/ace.json | 5 + versions/a-/amqpcpp.json | 5 + versions/a-/aom.json | 5 + versions/a-/aricpp.json | 5 + versions/a-/armadillo.json | 5 + versions/a-/arrow.json | 5 + versions/b-/bcg729.json | 5 + versions/b-/bddisasm.json | 5 + versions/b-/bde.json | 5 + versions/b-/bdwgc.json | 5 + versions/b-/blitz.json | 5 + versions/b-/blosc.json | 5 + versions/b-/brpc.json | 5 + versions/b-/bullet3.json | 5 + versions/baseline.json | 274 +++++++++---------- versions/c-/capnproto.json | 5 + versions/c-/ccd.json | 5 + versions/c-/charls.json | 5 + versions/c-/check.json | 5 + versions/c-/cjson.json | 5 + versions/c-/clblast.json | 5 + versions/c-/cli.json | 5 + versions/c-/cmocka.json | 5 + versions/c-/coin.json | 5 + versions/c-/collada-dom.json | 5 + versions/c-/cpp-redis.json | 5 + versions/c-/cppcodec.json | 5 + versions/c-/cpuid.json | 5 + versions/c-/curlpp.json | 5 + versions/d-/dlib.json | 5 + versions/e-/easyloggingpp.json | 5 + versions/e-/edlib.json | 5 + versions/f-/fcl.json | 5 + versions/f-/fftw3.json | 5 + versions/f-/flann.json | 5 + versions/f-/flatbuffers.json | 5 + versions/f-/fluidlite.json | 5 + versions/f-/folly.json | 5 + versions/f-/freeglut.json | 5 + versions/f-/freeopcua.json | 5 + versions/f-/functions-framework-cpp.json | 5 + versions/g-/geogram.json | 5 + versions/g-/geographiclib.json | 5 + versions/g-/getdns.json | 5 + versions/g-/gflags.json | 5 + versions/g-/graphite2.json | 5 + versions/g-/graphqlparser.json | 5 + versions/g-/graphviz.json | 5 + versions/h-/hiredis.json | 5 + versions/h-/hyperscan.json | 5 + versions/i-/igraph.json | 5 + versions/i-/iniparser.json | 5 + versions/i-/itpp.json | 5 + versions/j-/jansson.json | 5 + versions/j-/json11.json | 5 + versions/l-/libbson.json | 5 + versions/l-/libcerf.json | 5 + versions/l-/libconfuse.json | 5 + versions/l-/libevent.json | 5 + versions/l-/libevhtp.json | 5 + versions/l-/libfort.json | 5 + versions/l-/libfreenect2.json | 5 + versions/l-/libgd.json | 5 + versions/l-/libgta.json | 5 + versions/l-/libkeyfinder.json | 5 + versions/l-/libkml.json | 5 + versions/l-/liblemon.json | 5 + versions/l-/liblo.json | 5 + versions/l-/libmikmod.json | 5 + versions/l-/libmt32emu.json | 5 + versions/l-/libpqxx.json | 5 + versions/l-/libproxy.json | 5 + versions/l-/libqrencode.json | 5 + versions/l-/librdkafka.json | 5 + versions/l-/libsbml.json | 5 + versions/l-/libtins.json | 5 + versions/l-/libtorrent.json | 5 + versions/l-/libwebsockets.json | 5 + versions/l-/libxlsxwriter.json | 5 + versions/m-/mongo-c-driver.json | 5 + versions/m-/mosquitto.json | 5 + versions/m-/msgpack.json | 5 + versions/m-/msgpack11.json | 5 + versions/m-/munit.json | 5 + versions/m-/muparser.json | 5 + versions/n-/nanoflann.json | 5 + versions/n-/nanomsg.json | 5 + versions/n-/nlopt.json | 5 + versions/o-/octomap.json | 5 + versions/o-/ode.json | 5 + versions/o-/ois.json | 5 + versions/o-/oniguruma.json | 5 + versions/o-/opencc.json | 5 + versions/o-/openimageio.json | 5 + versions/o-/orocos-kdl.json | 5 + versions/o-/osg.json | 5 + versions/p-/p-ranav-csv2.json | 5 + versions/p-/pcl.json | 5 + versions/p-/plplot.json | 5 + versions/p-/polyclipping.json | 5 + versions/p-/ponder.json | 5 + versions/p-/poppler.json | 5 + versions/p-/portaudio.json | 5 + versions/p-/ppconsul.json | 5 + versions/r-/raylib.json | 5 + versions/r-/rbdl.json | 5 + versions/r-/realsense2.json | 5 + versions/r-/redis-plus-plus.json | 5 + versions/r-/rpclib.json | 5 + versions/r-/rtaudio.json | 5 + versions/s-/sais.json | 5 + versions/s-/sdformat6.json | 5 + versions/s-/sentencepiece.json | 5 + versions/s-/simage.json | 5 + versions/s-/sol2.json | 5 + versions/s-/soxr.json | 5 + versions/s-/sparsehash.json | 5 + versions/s-/stxxl.json | 5 + versions/s-/superlu.json | 5 + versions/t-/thrift.json | 5 + versions/t-/tidy-html5.json | 5 + versions/t-/tinyobjloader.json | 5 + versions/t-/tinyply.json | 5 + versions/t-/tlx.json | 5 + versions/t-/tmxparser.json | 5 + versions/u-/uchardet.json | 5 + versions/u-/unittest-cpp.json | 5 + versions/u-/uriparser.json | 5 + versions/u-/usrsctp.json | 5 + versions/w-/wampcc.json | 5 + versions/x-/xalan-c.json | 5 + versions/x-/xerces-c.json | 5 + versions/x-/xlnt.json | 5 + versions/x-/xtensor-fftw.json | 5 + versions/z-/z3.json | 5 + versions/z-/zeromq.json | 5 + versions/z-/zyre.json | 5 + versions/z-/zziplib.json | 5 + 412 files changed, 1233 insertions(+), 246 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 7cfd84321fcafb..b478d120b36664 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -432,3 +432,5 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Handle copyright file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) endif() + +vcpkg_fixup_pkgconfig() diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 5a77820e02ba04..77463fd0714856 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ace", "version": "7.0.3", - "port-version": 1, + "port-version": 2, "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", "features": { diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake index e8c634342fc344..6827a433550259 100644 --- a/ports/amqpcpp/portfile.cmake +++ b/ports/amqpcpp/portfile.cmake @@ -31,3 +31,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json index e248db9cc10765..8252d41bf8dd38 100644 --- a/ports/amqpcpp/vcpkg.json +++ b/ports/amqpcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "amqpcpp", "version": "4.3.14", + "port-version": 1, "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker", "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP", "supports": "!uwp", diff --git a/ports/aom/portfile.cmake b/ports/aom/portfile.cmake index 86a10e902723d1..aaad140a9971e1 100644 --- a/ports/aom/portfile.cmake +++ b/ports/aom/portfile.cmake @@ -46,3 +46,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/aom/vcpkg.json b/ports/aom/vcpkg.json index d3b84fcd2afa04..4c129276311c9c 100644 --- a/ports/aom/vcpkg.json +++ b/ports/aom/vcpkg.json @@ -1,6 +1,7 @@ { "name": "aom", "version-semver": "3.2.0", + "port-version": 1, "description": "AV1 codec library", "homepage": "https://aomedia.googlesource.com/aom", "supports": "!uwp & !arm", diff --git a/ports/aricpp/portfile.cmake b/ports/aricpp/portfile.cmake index 816a9e6f46f02f..f9c96b5bdbfeb7 100644 --- a/ports/aricpp/portfile.cmake +++ b/ports/aricpp/portfile.cmake @@ -17,3 +17,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/aricpp) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/aricpp/vcpkg.json b/ports/aricpp/vcpkg.json index ee76880bff46a3..acfc7e0fb5f162 100644 --- a/ports/aricpp/vcpkg.json +++ b/ports/aricpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "aricpp", "version-semver": "1.1.1", + "port-version": 1, "description": "Asterisk ARI interface bindings for modern C++", "homepage": "https://github.com/daniele77/aricpp", "dependencies": [ diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake index 87a305332b9361..c5d72826d98d59 100644 --- a/ports/armadillo/portfile.cmake +++ b/ports/armadillo/portfile.cmake @@ -43,3 +43,5 @@ endif() file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/armadillo/vcpkg.json b/ports/armadillo/vcpkg.json index d1846befb9b6ab..02e934e2000ee4 100644 --- a/ports/armadillo/vcpkg.json +++ b/ports/armadillo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "armadillo", "version": "10.6.2", - "port-version": 1, + "port-version": 2, "description": "Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use", "homepage": "http://arma.sourceforge.net", "dependencies": [ diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index 221b3e0d9cdb89..e5a1dcc6c6245f 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -100,3 +100,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/shar file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_fixup_pkgconfig() diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index 98b76849430e8e..cdddf011af6dc6 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,6 +1,7 @@ { "name": "arrow", "version": "5.0.0", + "port-version": 1, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", "supports": "x64", diff --git a/ports/bcg729/portfile.cmake b/ports/bcg729/portfile.cmake index 4a6f5c6f63ad70..a7be7799b118ac 100644 --- a/ports/bcg729/portfile.cmake +++ b/ports/bcg729/portfile.cmake @@ -23,3 +23,5 @@ file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/s file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/ports/bcg729/vcpkg.json b/ports/bcg729/vcpkg.json index 5896ad827eb48c..c9a88a49bca0d0 100644 --- a/ports/bcg729/vcpkg.json +++ b/ports/bcg729/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bcg729", "version-string": "1.1.1", + "port-version": 1, "description": "Bcg729 is an open source implementation of the ITU G.729 Annex A and B codec.", "homepage": "https://github.com/BelledonneCommunications/bcg729" } diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 78cb08023b8a24..02a0a0709f622d 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -28,3 +28,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + +vcpkg_fixup_pkgconfig() diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index c48346811fe744..269bc12e06b307 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bddisasm", "version": "1.34.2", + "port-version": 1, "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/ports/bde/portfile.cmake b/ports/bde/portfile.cmake index 3acdd38205aef1..63d4a8422529cb 100644 --- a/ports/bde/portfile.cmake +++ b/ports/bde/portfile.cmake @@ -134,3 +134,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bde RENAME copyright ) + +vcpkg_fixup_pkgconfig() diff --git a/ports/bde/vcpkg.json b/ports/bde/vcpkg.json index 4d7499c2fe0358..7fffab8885a0c5 100644 --- a/ports/bde/vcpkg.json +++ b/ports/bde/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bde", "version-string": "3.2.0.0", - "port-version": 3, + "port-version": 4, "description": "Basic Development Environment - a set of foundational C++ libraries used at Bloomberg.", "supports": "!windows" } diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 6a9a7c1da9b33d..468154cd0b3af4 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -24,3 +24,5 @@ vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/README.QUICK" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index e752f91c0d3310..8923c52721762f 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,5 +1,6 @@ { "name": "bdwgc", "version": "8.2.0", + "port-version": 1, "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)" } diff --git a/ports/blitz/portfile.cmake b/ports/blitz/portfile.cmake index 7e90f2a6456dcc..f8681cf36032fb 100644 --- a/ports/blitz/portfile.cmake +++ b/ports/blitz/portfile.cmake @@ -32,4 +32,5 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/blitz/vcpkg.json b/ports/blitz/vcpkg.json index 22e8dd6e0bd098..2ef9a3c24e0166 100644 --- a/ports/blitz/vcpkg.json +++ b/ports/blitz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "blitz", "version-string": "2020-03-25", - "port-version": 1, + "port-version": 2, "description": "Blitz++ is a C++ template class library that provides high-performance multidimensional array containers for scientific computing.", "homepage": "https://github.com/blitzpp/blitz", "supports": "!(arm | arm64 | uwp)" diff --git a/ports/blosc/portfile.cmake b/ports/blosc/portfile.cmake index 041548b478ae76..01c42a5631ba0a 100644 --- a/ports/blosc/portfile.cmake +++ b/ports/blosc/portfile.cmake @@ -41,3 +41,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSES/BLOSC.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/blosc RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/blosc/vcpkg.json b/ports/blosc/vcpkg.json index f9b3e0513b9dae..47ea38da4861fc 100644 --- a/ports/blosc/vcpkg.json +++ b/ports/blosc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "blosc", "version-string": "1.18.1", - "port-version": 2, + "port-version": 3, "description": "A blocking, shuffling and loss-less compression library that can be faster than `memcpy()`", "homepage": "https://github.com/Blosc/c-blosc", "dependencies": [ diff --git a/ports/brpc/portfile.cmake b/ports/brpc/portfile.cmake index 3547c642337e70..b78f6e4ccc2489 100644 --- a/ports/brpc/portfile.cmake +++ b/ports/brpc/portfile.cmake @@ -30,3 +30,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/butil/third_party/superfast vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/brpc/vcpkg.json b/ports/brpc/vcpkg.json index 2b2e1568916597..8d7e722c7b4e2b 100644 --- a/ports/brpc/vcpkg.json +++ b/ports/brpc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "brpc", "version-string": "0.9.7", - "port-version": 2, + "port-version": 3, "description": "Industrial-grade RPC framework used throughout Baidu, with 1,000,000+ instances and thousands kinds of services, called \"baidu-rpc\" inside Baidu.", "homepage": "https://github.com/apache/incubator-brpc", "supports": "!windows", diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 886535ee995a70..39bb69f8ed2633 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -41,3 +41,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamic vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index 70c9be0ba1a999..7aa0e9feb1acde 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "bullet3", "version": "3.17", - "port-version": 1, + "port-version": 2, "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", "features": { diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake index 62f7950eee8df1..7e12093501067f 100644 --- a/ports/capnproto/portfile.cmake +++ b/ports/capnproto/portfile.cmake @@ -38,3 +38,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/capnproto/vcpkg.json b/ports/capnproto/vcpkg.json index 0f65a548579223..97a39f16cee938 100644 --- a/ports/capnproto/vcpkg.json +++ b/ports/capnproto/vcpkg.json @@ -1,6 +1,7 @@ { "name": "capnproto", "version": "0.9.1", + "port-version": 1, "description": "Data interchange format and capability-based RPC system", "homepage": "https://capnproto.org/", "supports": "!uwp & !((arm | arm64) & windows)", diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake index a465560caca020..c2c294d56d8cc6 100644 --- a/ports/ccd/portfile.cmake +++ b/ports/ccd/portfile.cmake @@ -31,3 +31,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/ccd/vcpkg.json b/ports/ccd/vcpkg.json index 43110c69d5ed9a..15978fb00201ad 100644 --- a/ports/ccd/vcpkg.json +++ b/ports/ccd/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ccd", "version-string": "2.1-4", - "port-version": 2, + "port-version": 3, "description": "Library for collision detection between two convex shapes", "homepage": "https://github.com/danfis/libccd" } diff --git a/ports/charls/portfile.cmake b/ports/charls/portfile.cmake index 436d11a8e06f88..bbb9038c2062c9 100644 --- a/ports/charls/portfile.cmake +++ b/ports/charls/portfile.cmake @@ -22,3 +22,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/charls/vcpkg.json b/ports/charls/vcpkg.json index b03c6bcdd25a8b..3f07ca3c2eba0e 100644 --- a/ports/charls/vcpkg.json +++ b/ports/charls/vcpkg.json @@ -1,7 +1,7 @@ { "name": "charls", "version-string": "2.2.0", - "port-version": 1, + "port-version": 2, "description": "CharLS, a C++ JPEG-LS library implementation.", "homepage": "https://github.com/team-charls/charls" } diff --git a/ports/check/portfile.cmake b/ports/check/portfile.cmake index b01006cf63990c..0553e098195a02 100644 --- a/ports/check/portfile.cmake +++ b/ports/check/portfile.cmake @@ -26,4 +26,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/check/vcpkg.json b/ports/check/vcpkg.json index d94e11b6862262..eb021bead0734b 100644 --- a/ports/check/vcpkg.json +++ b/ports/check/vcpkg.json @@ -1,7 +1,7 @@ { "name": "check", "version-string": "0.15.2", - "port-version": 1, + "port-version": 2, "description": "A unit testing framework for C", "homepage": "https://github.com/libcheck/check" } diff --git a/ports/cjson/portfile.cmake b/ports/cjson/portfile.cmake index f960d83f2fce85..340de48e5b4f76 100644 --- a/ports/cjson/portfile.cmake +++ b/ports/cjson/portfile.cmake @@ -56,3 +56,5 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/include/cjson/cJSON.h" "${_contents}") # Handle copyright configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/cjson/vcpkg.json b/ports/cjson/vcpkg.json index e32c54aed3e663..cfdfb121e120b9 100644 --- a/ports/cjson/vcpkg.json +++ b/ports/cjson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cjson", "version": "1.7.15", + "port-version": 1, "description": "Ultralightweight JSON parser in ANSI C", "homepage": "https://github.com/DaveGamble/cJSON", "dependencies": [ diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake index 6eb78772a5b736..bdb3e5f050d271 100644 --- a/ports/clblast/portfile.cmake +++ b/ports/clblast/portfile.cmake @@ -42,3 +42,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json index 1bf12a26b2e004..06c744fa346fd9 100644 --- a/ports/clblast/vcpkg.json +++ b/ports/clblast/vcpkg.json @@ -1,7 +1,7 @@ { "name": "clblast", "version-string": "1.5.1", - "port-version": 1, + "port-version": 2, "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", "dependencies": [ "opencl" diff --git a/ports/cli/portfile.cmake b/ports/cli/portfile.cmake index e8e1ffc7a4baef..a9dee4d7d59612 100644 --- a/ports/cli/portfile.cmake +++ b/ports/cli/portfile.cmake @@ -17,3 +17,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cli) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/cli/vcpkg.json b/ports/cli/vcpkg.json index dc433aa91304e1..96f9e55556db74 100644 --- a/ports/cli/vcpkg.json +++ b/ports/cli/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cli", "version-semver": "2.0.0", + "port-version": 1, "description": "A library for interactive command line interfaces in modern C++", "homepage": "https://github.com/daniele77/cli", "dependencies": [ diff --git a/ports/cmocka/portfile.cmake b/ports/cmocka/portfile.cmake index 220868ebb3ec26..53c9aee69890ae 100644 --- a/ports/cmocka/portfile.cmake +++ b/ports/cmocka/portfile.cmake @@ -26,3 +26,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/cmocka/vcpkg.json b/ports/cmocka/vcpkg.json index d7bcbcf49635a2..8978acdb42c3da 100644 --- a/ports/cmocka/vcpkg.json +++ b/ports/cmocka/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cmocka", "version-string": "2020-08-01", + "port-version": 1, "description": "An elegant unit testing framework for C with support for mock objects", "homepage": "https://cmocka.org/", "license": "Apache-2.0" diff --git a/ports/coin/portfile.cmake b/ports/coin/portfile.cmake index 830bd64f9770bf..19ac9f120c032b 100644 --- a/ports/coin/portfile.cmake +++ b/ports/coin/portfile.cmake @@ -45,3 +45,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/Coin/profiler) + +vcpkg_fixup_pkgconfig() diff --git a/ports/coin/vcpkg.json b/ports/coin/vcpkg.json index c9f254f77d2243..fbe97369e885e9 100644 --- a/ports/coin/vcpkg.json +++ b/ports/coin/vcpkg.json @@ -1,7 +1,7 @@ { "name": "coin", "version-string": "4.0.0", - "port-version": 3, + "port-version": 4, "description": "A high-level 3D visualization library with Open Inventor 2.1 API", "homepage": "https://github.com/coin3d/coin", "supports": "!(arm | arm64 | uwp)", diff --git a/ports/collada-dom/portfile.cmake b/ports/collada-dom/portfile.cmake index 84c236dab08fc7..a3deb51fd4790a 100644 --- a/ports/collada-dom/portfile.cmake +++ b/ports/collada-dom/portfile.cmake @@ -24,3 +24,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/licenses/license_e.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/collada-dom/vcpkg.json b/ports/collada-dom/vcpkg.json index e929b4a076eed0..66e14efe6a6545 100644 --- a/ports/collada-dom/vcpkg.json +++ b/ports/collada-dom/vcpkg.json @@ -1,7 +1,7 @@ { "name": "collada-dom", "version-string": "2.5.0", - "port-version": 5, + "port-version": 6, "description": "The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.", "homepage": "https://github.com/rdiankov/collada-dom", "dependencies": [ diff --git a/ports/cpp-redis/portfile.cmake b/ports/cpp-redis/portfile.cmake index 6a8144b58a8ce5..033878abff6fe2 100644 --- a/ports/cpp-redis/portfile.cmake +++ b/ports/cpp-redis/portfile.cmake @@ -57,4 +57,5 @@ endif() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/cpp-redis/vcpkg.json b/ports/cpp-redis/vcpkg.json index a0b08e18a7cff3..e04ec8d84b1224 100644 --- a/ports/cpp-redis/vcpkg.json +++ b/ports/cpp-redis/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpp-redis", "version-string": "4.3.1", - "port-version": 3, + "port-version": 4, "description": "cpp-redis is a C++11 Asynchronous Multi-Platform Lightweight Redis Client, with support for synchronous operations and pipelining.", "homepage": "https://github.com/cpp-redis/cpp_redis", "dependencies": [ diff --git a/ports/cppcodec/portfile.cmake b/ports/cppcodec/portfile.cmake index 63e1b95855cebe..792e734f5d4607 100644 --- a/ports/cppcodec/portfile.cmake +++ b/ports/cppcodec/portfile.cmake @@ -20,3 +20,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/cppcodec/vcpkg.json b/ports/cppcodec/vcpkg.json index 0713dfd7f0fd8a..1066a7b85b689c 100644 --- a/ports/cppcodec/vcpkg.json +++ b/ports/cppcodec/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cppcodec", "version-string": "0.2", - "port-version": 1, + "port-version": 2, "description": "Header-only C++11 library to encode/decode base64, base64url, base32, base32hex and hex (a.k.a. base16) as specified in RFC 4648, plus Crockford's base32." } diff --git a/ports/cpuid/portfile.cmake b/ports/cpuid/portfile.cmake index 00f374a928fedd..306ccd5ac4025f 100644 --- a/ports/cpuid/portfile.cmake +++ b/ports/cpuid/portfile.cmake @@ -24,3 +24,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/cpuid/vcpkg.json b/ports/cpuid/vcpkg.json index cae732ea586a44..a2ae5e99bfd2bc 100644 --- a/ports/cpuid/vcpkg.json +++ b/ports/cpuid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cpuid", "version": "0.5.1", - "port-version": 1, + "port-version": 2, "description": "Provides CPU identification for the x86 (and x86_64)", "homepage": "https://github.com/anrieff/libcpuid", "supports": "x86 | x64", diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake index 9611908db85c0a..f589a73bb0d821 100644 --- a/ports/curlpp/portfile.cmake +++ b/ports/curlpp/portfile.cmake @@ -32,3 +32,5 @@ vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/doc/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}) + +vcpkg_fixup_pkgconfig() diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json index 9ca5d29edc3770..4486c433db6be4 100644 --- a/ports/curlpp/vcpkg.json +++ b/ports/curlpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "curlpp", "version-string": "2018-06-15", - "port-version": 4, + "port-version": 5, "description": "C++ wrapper around libcURL", "dependencies": [ "curl" diff --git a/ports/dlib/portfile.cmake b/ports/dlib/portfile.cmake index 481554b90e49e9..29a43c144e189e 100644 --- a/ports/dlib/portfile.cmake +++ b/ports/dlib/portfile.cmake @@ -77,3 +77,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/dlib/config.h "${_contents}") # Handle copyright file(INSTALL ${SOURCE_PATH}/dlib/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) + +vcpkg_fixup_pkgconfig() diff --git a/ports/dlib/vcpkg.json b/ports/dlib/vcpkg.json index bb60944f8d3111..a67b77498f7428 100644 --- a/ports/dlib/vcpkg.json +++ b/ports/dlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "dlib", "version": "19.21", - "port-version": 5, + "port-version": 6, "description": "Modern C++ toolkit containing machine learning algorithms and tools for creating complex software in C++", "homepage": "https://github.com/davisking/dlib", "dependencies": [ diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index a2d04b6ca962b8..bb198a315094bb 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -20,3 +20,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/easyloggingpp" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json index 1dbf4d6e081414..277158eaabe381 100644 --- a/ports/easyloggingpp/vcpkg.json +++ b/ports/easyloggingpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "easyloggingpp", "version": "9.97.0", + "port-version": 1, "description": "Easylogging++ is a single header efficient logging library for C++ applications.", "homepage": "https://github.com/amrayn/easyloggingpp", "dependencies": [ diff --git a/ports/edlib/portfile.cmake b/ports/edlib/portfile.cmake index 96fdcc3bab6b49..60a6cca637486d 100644 --- a/ports/edlib/portfile.cmake +++ b/ports/edlib/portfile.cmake @@ -17,3 +17,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/edlib/vcpkg.json b/ports/edlib/vcpkg.json index 4ac50b3bf21de2..f66b09ff1f777a 100644 --- a/ports/edlib/vcpkg.json +++ b/ports/edlib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "edlib", "version": "1.2.7", + "port-version": 1, "description": "Lightweight, super fast C/C++ (& Python) library for sequence alignment using edit (Levenshtein) distance.", "homepage": "https://github.com/Martinsos/edlib", "dependencies": [ diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index ea76835c381f00..079633dc4eb9de 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -36,3 +36,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/fcl/vcpkg.json b/ports/fcl/vcpkg.json index 255d59d887aefa..2ce7c11ff3a435 100644 --- a/ports/fcl/vcpkg.json +++ b/ports/fcl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "fcl", "version": "0.7.0", + "port-version": 1, "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles", "homepage": "https://github.com/flexible-collision-library/fcl", "supports": "static", diff --git a/ports/fftw3/portfile.cmake b/ports/fftw3/portfile.cmake index 3493d7cdac1646..45a9052e727d1a 100644 --- a/ports/fftw3/portfile.cmake +++ b/ports/fftw3/portfile.cmake @@ -70,3 +70,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/fftw3/vcpkg.json b/ports/fftw3/vcpkg.json index 08b641c4a522b1..53d4932318f809 100644 --- a/ports/fftw3/vcpkg.json +++ b/ports/fftw3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fftw3", "version": "3.3.10", - "port-version": 1, + "port-version": 2, "description": "FFTW is a C subroutine library for computing the discrete Fourier transform (DFT) in one or more dimensions, of arbitrary input size, and of both real and complex data (as well as of even/odd data, i.e. the discrete cosine/sine transforms or DCT/DST).", "homepage": "https://www.fftw.org/", "dependencies": [ diff --git a/ports/flann/portfile.cmake b/ports/flann/portfile.cmake index d70669b5ff8957..4c15477150e0e3 100644 --- a/ports/flann/portfile.cmake +++ b/ports/flann/portfile.cmake @@ -44,3 +44,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/flann/vcpkg.json b/ports/flann/vcpkg.json index 1221c9be98c49c..0074e93dc6ef36 100644 --- a/ports/flann/vcpkg.json +++ b/ports/flann/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flann", "version-date": "2019-04-07", - "port-version": 2, + "port-version": 3, "description": "Fast Library for Approximate Nearest Neighbors", "homepage": "https://github.com/mariusmuja/flann", "dependencies": [ diff --git a/ports/flatbuffers/portfile.cmake b/ports/flatbuffers/portfile.cmake index 5cf7ab6bbae9a1..e0feff81b6aeeb 100644 --- a/ports/flatbuffers/portfile.cmake +++ b/ports/flatbuffers/portfile.cmake @@ -46,3 +46,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bi # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/flatbuffers/vcpkg.json b/ports/flatbuffers/vcpkg.json index 76d6c2a5df1f78..911c5f189cb341 100644 --- a/ports/flatbuffers/vcpkg.json +++ b/ports/flatbuffers/vcpkg.json @@ -1,7 +1,7 @@ { "name": "flatbuffers", "version-string": "2.0.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." diff --git a/ports/fluidlite/portfile.cmake b/ports/fluidlite/portfile.cmake index 707fcd720b8a7c..8e99d8f01d24f7 100644 --- a/ports/fluidlite/portfile.cmake +++ b/ports/fluidlite/portfile.cmake @@ -29,3 +29,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/fluidlite/vcpkg.json b/ports/fluidlite/vcpkg.json index 4e0bb02ad9f921..ea960e89ba005e 100644 --- a/ports/fluidlite/vcpkg.json +++ b/ports/fluidlite/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fluidlite", "version-string": "2020-08-27", - "port-version": 1, + "port-version": 2, "description": "FluidLite is a very light version of FluidSynth designed to be hardware, platform and external dependency independant.", "homepage": "https://github.com/divideconcept/FluidLite" } diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index 09266888e43952..0d195a0552a1ce 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -97,3 +97,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/folly/vcpkg.json b/ports/folly/vcpkg.json index 6b1908125b470f..64d892bf556549 100644 --- a/ports/folly/vcpkg.json +++ b/ports/folly/vcpkg.json @@ -1,7 +1,7 @@ { "name": "folly", "version-string": "2021.06.14.00", - "port-version": 2, + "port-version": 3, "description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows", "homepage": "https://github.com/facebook/folly", "supports": "x64 | (arm64 & !windows)", diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 8a872e6b6edc53..b281d12c7ef1e3 100755 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -75,3 +75,5 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/sh if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut) endif() + +vcpkg_fixup_pkgconfig() diff --git a/ports/freeglut/vcpkg.json b/ports/freeglut/vcpkg.json index 9c53e4f6bcf217..dc95985d8a1d84 100644 --- a/ports/freeglut/vcpkg.json +++ b/ports/freeglut/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeglut", "version-string": "3.2.1", - "port-version": 6, + "port-version": 7, "description": "Open source implementation of GLUT with source and binary backwards compatibility.", "homepage": "https://sourceforge.net/projects/freeglut/" } diff --git a/ports/freeopcua/portfile.cmake b/ports/freeopcua/portfile.cmake index 76e9508370b729..566c7a52744fe3 100644 --- a/ports/freeopcua/portfile.cmake +++ b/ports/freeopcua/portfile.cmake @@ -32,3 +32,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) #Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeopcua RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/freeopcua/vcpkg.json b/ports/freeopcua/vcpkg.json index b2cd24b19acfd2..02da47e65d08bc 100644 --- a/ports/freeopcua/vcpkg.json +++ b/ports/freeopcua/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freeopcua", "version-string": "20190125", - "port-version": 4, + "port-version": 5, "description": "OPC-UA server and client library written in C++ and with a lot of code auto-generated from xml specification using python.", "dependencies": [ "boost-asio", diff --git a/ports/functions-framework-cpp/portfile.cmake b/ports/functions-framework-cpp/portfile.cmake index 73aff324cba56b..58b21e9572e719 100644 --- a/ports/functions-framework-cpp/portfile.cmake +++ b/ports/functions-framework-cpp/portfile.cmake @@ -29,3 +29,5 @@ file( RENAME copyright) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/functions-framework-cpp/vcpkg.json b/ports/functions-framework-cpp/vcpkg.json index 9a11c01441d6bc..dbb15a285e238d 100644 --- a/ports/functions-framework-cpp/vcpkg.json +++ b/ports/functions-framework-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "functions-framework-cpp", "version": "1.0.0", + "port-version": 1, "description": "Functions Framework for C++.", "homepage": "https://github.com/GoogleCloudPlatform/functions-framework-cpp/", "license": "Apache-2.0", diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake index 3dd71429b21318..76a240210da42d 100644 --- a/ports/geogram/portfile.cmake +++ b/ports/geogram/portfile.cmake @@ -79,3 +79,5 @@ vcpkg_replace_string( # Handle copyright file(INSTALL ${SOURCE_PATH}/doc/devkit/license.dox DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/geogram/vcpkg.json b/ports/geogram/vcpkg.json index 4f6012ecf87d5a..79374c8cbdc912 100644 --- a/ports/geogram/vcpkg.json +++ b/ports/geogram/vcpkg.json @@ -1,6 +1,7 @@ { "name": "geogram", "version": "1.7.6", + "port-version": 1, "description": "Geogram is a programming library of geometric algorithms.", "homepage": "https://gforge.inria.fr/projects/geogram/", "supports": "!uwp", diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake index 3b7bd3f51fa256..a5c71f8f730af1 100644 --- a/ports/geographiclib/portfile.cmake +++ b/ports/geographiclib/portfile.cmake @@ -52,3 +52,5 @@ file (INSTALL ${SOURCE_PATH}/LICENSE.txt # Install usage configure_file (${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/geographiclib/vcpkg.json b/ports/geographiclib/vcpkg.json index df18eaf32021b4..69c49bc99c4e3e 100644 --- a/ports/geographiclib/vcpkg.json +++ b/ports/geographiclib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "geographiclib", "version": "1.52", + "port-version": 1, "description": "GeographicLib, a C++ library for performing geographic conversions", "homepage": "https://geographiclib.sourceforge.io", "features": { diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index 6c9a85e56e96ac..3a48f7cf208db3 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -43,3 +43,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json index 05fceec365b2b3..749af94157850f 100644 --- a/ports/getdns/vcpkg.json +++ b/ports/getdns/vcpkg.json @@ -1,7 +1,7 @@ { "name": "getdns", "version-string": "1.6.0", - "port-version": 1, + "port-version": 2, "description": "GetDNS is a modern asynchronous DNS API", "homepage": "https://getdnsapi.net/", "supports": "!uwp & windows", diff --git a/ports/gflags/portfile.cmake b/ports/gflags/portfile.cmake index e0d9e1dab01d2d..f1c22ff1aa6055 100644 --- a/ports/gflags/portfile.cmake +++ b/ports/gflags/portfile.cmake @@ -39,3 +39,5 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_D file(INSTALL "${SOURCE_PATH}/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/gflags/vcpkg.json b/ports/gflags/vcpkg.json index 5b020a81eb4c65..3b8d22a06ff163 100644 --- a/ports/gflags/vcpkg.json +++ b/ports/gflags/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gflags", "version-string": "2.2.2", - "port-version": 4, + "port-version": 5, "description": "A C++ library that implements commandline flags processing", "homepage": "https://github.com/gflags/gflags", "supports": "!uwp" diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake index 44fe08ba6abc1d..428aa3a68c047c 100644 --- a/ports/graphite2/portfile.cmake +++ b/ports/graphite2/portfile.cmake @@ -23,3 +23,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/graphite2/vcpkg.json b/ports/graphite2/vcpkg.json index cd5e479f4029d4..70a6b070fab94a 100644 --- a/ports/graphite2/vcpkg.json +++ b/ports/graphite2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "graphite2", "version-string": "1.3.14", - "port-version": 1, + "port-version": 2, "description": [ "Graphite is a \"smart font\" system developed specifically to handle the complexities of lesser-known languages of the world.", "Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications." diff --git a/ports/graphqlparser/portfile.cmake b/ports/graphqlparser/portfile.cmake index 92e36911089508..308810ba265c51 100644 --- a/ports/graphqlparser/portfile.cmake +++ b/ports/graphqlparser/portfile.cmake @@ -40,3 +40,5 @@ vcpkg_copy_pdbs() # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/graphqlparser/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/graphqlparser/vcpkg.json b/ports/graphqlparser/vcpkg.json index d859a1f19f7567..77770b16d64a62 100644 --- a/ports/graphqlparser/vcpkg.json +++ b/ports/graphqlparser/vcpkg.json @@ -1,6 +1,6 @@ { "name": "graphqlparser", "version-string": "0.7.0", - "port-version": 2, + "port-version": 3, "description": "A GraphQL query parser in C++ with C and C++ APIs" } diff --git a/ports/graphviz/portfile.cmake b/ports/graphviz/portfile.cmake index 93692bd8ddb469..6a4b451063a832 100644 --- a/ports/graphviz/portfile.cmake +++ b/ports/graphviz/portfile.cmake @@ -42,3 +42,5 @@ vcpkg_copy_tools( # # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/graphviz/vcpkg.json b/ports/graphviz/vcpkg.json index 88243e941299eb..249daf03cbcc88 100644 --- a/ports/graphviz/vcpkg.json +++ b/ports/graphviz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "graphviz", "version-semver": "2.49.1", + "port-version": 1, "description": "Graph Visualization Tools", "homepage": "https://graphviz.org/", "dependencies": [ diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake index ebd8179b34c0b3..7ba78cda34dddc 100644 --- a/ports/hiredis/portfile.cmake +++ b/ports/hiredis/portfile.cmake @@ -38,4 +38,5 @@ if("ssl" IN_LIST FEATURES) endif() # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json index 68627dc901681a..32b9954975346c 100644 --- a/ports/hiredis/vcpkg.json +++ b/ports/hiredis/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hiredis", "version": "1.0.2", + "port-version": 1, "description": "Hiredis is a minimalistic C client library for the Redis database.", "homepage": "https://github.com/redis/hiredis", "supports": "!(windows & !static)", diff --git a/ports/hyperscan/portfile.cmake b/ports/hyperscan/portfile.cmake index 2aec198d3a5caa..b69532635f7645 100644 --- a/ports/hyperscan/portfile.cmake +++ b/ports/hyperscan/portfile.cmake @@ -26,3 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/hyperscan/vcpkg.json b/ports/hyperscan/vcpkg.json index bddb221f39bd8f..05f19e116b4441 100644 --- a/ports/hyperscan/vcpkg.json +++ b/ports/hyperscan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "hyperscan", "version-string": "5.3.0", - "port-version": 2, + "port-version": 3, "description": "A regular expression library with O(length of input) match times that takes advantage of Intel hardware to provide blazing speed.", "homepage": "https://www.hyperscan.io", "supports": "!arm", diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index edd1dd242d7e32..2d57f74509d425 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -61,3 +61,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/igraph) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index e7158bff7ab08a..33f6b1df8a74de 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,6 +1,7 @@ { "name": "igraph", "version": "0.9.4", + "port-version": 1, "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "dependencies": [ diff --git a/ports/iniparser/portfile.cmake b/ports/iniparser/portfile.cmake index 94eb59601ede04..30487f815b7648 100644 --- a/ports/iniparser/portfile.cmake +++ b/ports/iniparser/portfile.cmake @@ -24,3 +24,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/iniparser/vcpkg.json b/ports/iniparser/vcpkg.json index a5acd226bd1c4a..88ad1b9f61585a 100644 --- a/ports/iniparser/vcpkg.json +++ b/ports/iniparser/vcpkg.json @@ -1,7 +1,7 @@ { "name": "iniparser", "version-string": "2020-04-06", - "port-version": 1, + "port-version": 2, "description": "C library for parsing INI-style files", "homepage": "ndevilla.free.fr/iniparser" } diff --git a/ports/itpp/portfile.cmake b/ports/itpp/portfile.cmake index a87cedcb7db359..696f333824e9d2 100644 --- a/ports/itpp/portfile.cmake +++ b/ports/itpp/portfile.cmake @@ -34,3 +34,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/itpp/vcpkg.json b/ports/itpp/vcpkg.json index 00ac96b67f2f3f..972f0cd1998219 100644 --- a/ports/itpp/vcpkg.json +++ b/ports/itpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itpp", "version-semver": "4.3.1", - "port-version": 7, + "port-version": 8, "description": "IT++ is a C++ library of mathematical, signal processing and communication classes and functions. Its main use is in simulation of communication systems and for performing research in the area of communications.", "homepage": "http://itpp.sourceforge.net" } diff --git a/ports/jansson/portfile.cmake b/ports/jansson/portfile.cmake index f0233ddacf723b..7d9679ffa0f4a6 100644 --- a/ports/jansson/portfile.cmake +++ b/ports/jansson/portfile.cmake @@ -46,3 +46,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/jansson/vcpkg.json b/ports/jansson/vcpkg.json index d494c8d5df602f..defd7c351629ae 100644 --- a/ports/jansson/vcpkg.json +++ b/ports/jansson/vcpkg.json @@ -1,7 +1,7 @@ { "name": "jansson", "version-string": "2.13.1", - "port-version": 1, + "port-version": 2, "description": "Jansson is a C library for encoding, decoding and manipulating JSON data", "homepage": "https://github.com/akheron/jansson" } diff --git a/ports/json11/portfile.cmake b/ports/json11/portfile.cmake index 9d1c459bc14676..3ff8b0f2951b1e 100644 --- a/ports/json11/portfile.cmake +++ b/ports/json11/portfile.cmake @@ -26,3 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/json11) file(RENAME ${CURRENT_PACKAGES_DIR}/share/json11/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/json11/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/json11/vcpkg.json b/ports/json11/vcpkg.json index f2aad6b8cbbcc4..70fb4f20971d4c 100644 --- a/ports/json11/vcpkg.json +++ b/ports/json11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "json11", "version-string": "2017-06-20", - "port-version": 3, + "port-version": 4, "description": "json11 is a tiny JSON library for C++11, providing JSON parsing and serialization." } diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index e9f48e7f1867bf..afb674f5476ca2 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -72,3 +72,5 @@ file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_D file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_fixup_pkgconfig() diff --git a/ports/libbson/vcpkg.json b/ports/libbson/vcpkg.json index a35c4c3967cfa9..b985071bd12408 100644 --- a/ports/libbson/vcpkg.json +++ b/ports/libbson/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libbson", "version": "1.17.6", + "port-version": 1, "description": "libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.", "homepage": "https://github.com/mongodb/libbson", "dependencies": [ diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake index 199e396e92cff9..1054bf5c8c73d8 100644 --- a/ports/libcerf/portfile.cmake +++ b/ports/libcerf/portfile.cmake @@ -29,3 +29,5 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libcerf/vcpkg.json b/ports/libcerf/vcpkg.json index 73b60013ee8263..3d134faac927e6 100644 --- a/ports/libcerf/vcpkg.json +++ b/ports/libcerf/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libcerf", "version-string": "1.13", - "port-version": 1, + "port-version": 2, "description": "A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.", "homepage": "https://jugit.fz-juelich.de/mlz/libcerf" } diff --git a/ports/libconfuse/portfile.cmake b/ports/libconfuse/portfile.cmake index ac49ff157c7639..239c8dacfd7e3d 100644 --- a/ports/libconfuse/portfile.cmake +++ b/ports/libconfuse/portfile.cmake @@ -36,3 +36,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libconfuse/vcpkg.json b/ports/libconfuse/vcpkg.json index 2a9a604f5775cf..dd7416c670337b 100644 --- a/ports/libconfuse/vcpkg.json +++ b/ports/libconfuse/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libconfuse", "version-string": "2019-07-14", - "port-version": 1, + "port-version": 2, "description": "Small configuration file parser library for C", "homepage": "https://github.com/martinh/libconfuse" } diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index d6b02bbf707e66..30af582dbfb9cb 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -68,3 +68,5 @@ vcpkg_copy_pdbs() #Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libevent/vcpkg.json b/ports/libevent/vcpkg.json index 1ddfa7a44f5ec9..2259af3744bc17 100644 --- a/ports/libevent/vcpkg.json +++ b/ports/libevent/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libevent", "version-string": "2.1.12", - "port-version": 2, + "port-version": 3, "description": "An event notification library", "homepage": "https://github.com/libevent/libevent", "supports": "!uwp", diff --git a/ports/libevhtp/portfile.cmake b/ports/libevhtp/portfile.cmake index ddd97c10c6d4c2..71c17ee533389d 100644 --- a/ports/libevhtp/portfile.cmake +++ b/ports/libevhtp/portfile.cmake @@ -30,4 +30,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/libevhtp/vcpkg.json b/ports/libevhtp/vcpkg.json index 5d95f7901669ff..04f8de1723fb4d 100644 --- a/ports/libevhtp/vcpkg.json +++ b/ports/libevhtp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libevhtp", "version-string": "1.2.18", - "port-version": 1, + "port-version": 2, "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.", "homepage": "https://github.com/criticalstack/libevhtp", "dependencies": [ diff --git a/ports/libfort/portfile.cmake b/ports/libfort/portfile.cmake index 969af67eb1779a..a016161cbd8da5 100644 --- a/ports/libfort/portfile.cmake +++ b/ports/libfort/portfile.cmake @@ -22,3 +22,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libfort) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libfort/vcpkg.json b/ports/libfort/vcpkg.json index 7a13edcc58b104..a12c8b575734bb 100644 --- a/ports/libfort/vcpkg.json +++ b/ports/libfort/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libfort", "version-semver": "0.4.2", + "port-version": 1, "description": "A simple crossplatform library to create formatted text tables", "homepage": "https://github.com/seleznevae/libfort", "license": "MIT", diff --git a/ports/libfreenect2/portfile.cmake b/ports/libfreenect2/portfile.cmake index 3405097713e604..ba35cee15a7216 100644 --- a/ports/libfreenect2/portfile.cmake +++ b/ports/libfreenect2/portfile.cmake @@ -40,3 +40,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/GPL2 DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libfreenect2/vcpkg.json b/ports/libfreenect2/vcpkg.json index a68b6564e4458d..fda7d64da6ee37 100644 --- a/ports/libfreenect2/vcpkg.json +++ b/ports/libfreenect2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libfreenect2", "version-string": "0.2.0", - "port-version": 6, + "port-version": 7, "description": "Open source drivers for the Kinect for Windows v2 device", "homepage": "https://github.com/OpenKinect/libfreenect2", "dependencies": [ diff --git a/ports/libgd/portfile.cmake b/ports/libgd/portfile.cmake index aa5d9deb322fb1..4477e791cab7ef 100644 --- a/ports/libgd/portfile.cmake +++ b/ports/libgd/portfile.cmake @@ -53,3 +53,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libgd/vcpkg.json b/ports/libgd/vcpkg.json index e87ee5bc75cb9e..34ae61fac38ec0 100644 --- a/ports/libgd/vcpkg.json +++ b/ports/libgd/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgd", "version-semver": "2.3.2", + "port-version": 1, "description": "Open source code library for the dynamic creation of images by programmers.", "homepage": "https://github.com/libgd/libgd", "dependencies": [ diff --git a/ports/libgta/portfile.cmake b/ports/libgta/portfile.cmake index 1e4b0f95102f99..65409dc33b186f 100644 --- a/ports/libgta/portfile.cmake +++ b/ports/libgta/portfile.cmake @@ -33,3 +33,5 @@ endif() file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgta) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgta/COPYING ${CURRENT_PACKAGES_DIR}/share/libgta/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libgta/vcpkg.json b/ports/libgta/vcpkg.json index 789978fe468767..40aeadb4c95a73 100644 --- a/ports/libgta/vcpkg.json +++ b/ports/libgta/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgta", "version-string": "1.0.8", - "port-version": 2, + "port-version": 3, "description": "Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.", "homepage": "https://download.savannah.nongnu.org/releases/gta", "dependencies": [ diff --git a/ports/libkeyfinder/portfile.cmake b/ports/libkeyfinder/portfile.cmake index 8b06add324f093..e87077ddf2b17a 100644 --- a/ports/libkeyfinder/portfile.cmake +++ b/ports/libkeyfinder/portfile.cmake @@ -23,3 +23,5 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KeyFinder CONFIG_PATH lib/cmake/KeyFinder) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libkeyfinder/vcpkg.json b/ports/libkeyfinder/vcpkg.json index c52f0c914978a8..6c3fbfca19bf91 100644 --- a/ports/libkeyfinder/vcpkg.json +++ b/ports/libkeyfinder/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libkeyfinder", "version-string": "2.2.5", + "port-version": 1, "description": "Musical key detection for digital audio", "homepage": "https://github.com/mixxxdj/libkeyfinder", "license": "GPL-3.0-or-later", diff --git a/ports/libkml/portfile.cmake b/ports/libkml/portfile.cmake index 581a3b6089b15d..ce54b1c7e39eed 100644 --- a/ports/libkml/portfile.cmake +++ b/ports/libkml/portfile.cmake @@ -27,4 +27,5 @@ elseif (VCPKG_TARGET_IS_OSX) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/libkml/vcpkg.json b/ports/libkml/vcpkg.json index adb47787c4c9f9..fa70197a25326d 100644 --- a/ports/libkml/vcpkg.json +++ b/ports/libkml/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libkml", "version-string": "1.3.0", - "port-version": 7, + "port-version": 8, "description": "Reference implementation of OGC KML 2.2", "homepage": "https://github.com/libkml/libkml", "dependencies": [ diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake index 14eebfe6c66cc5..290b7e715bfc0c 100644 --- a/ports/liblemon/portfile.cmake +++ b/ports/liblemon/portfile.cmake @@ -41,4 +41,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bi file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json index 06e75ebcda66bc..7cbf85eb1a73f2 100644 --- a/ports/liblemon/vcpkg.json +++ b/ports/liblemon/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblemon", "version-string": "2019-06-13", - "port-version": 2, + "port-version": 3, "description": "Library for Efficient Modeling and Optimization in Networks", "homepage": "https://lemon.cs.elte.hu/trac/lemon" } diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake index 3ddfd9e7a0d931..f43a524239ab11 100644 --- a/ports/liblo/portfile.cmake +++ b/ports/liblo/portfile.cmake @@ -28,3 +28,5 @@ endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblo RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/liblo/vcpkg.json b/ports/liblo/vcpkg.json index f013f968c972b0..6d060c75106019 100644 --- a/ports/liblo/vcpkg.json +++ b/ports/liblo/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblo", "version-string": "0.31", - "port-version": 1, + "port-version": 2, "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems", "homepage": "https://github.com/radarsat1/liblo" } diff --git a/ports/libmikmod/portfile.cmake b/ports/libmikmod/portfile.cmake index 55556e2055315c..17d19c755e2f2e 100644 --- a/ports/libmikmod/portfile.cmake +++ b/ports/libmikmod/portfile.cmake @@ -45,3 +45,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libmikmod/vcpkg.json b/ports/libmikmod/vcpkg.json index f981fac5c16e1f..797bcbc03226ec 100644 --- a/ports/libmikmod/vcpkg.json +++ b/ports/libmikmod/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmikmod", "version-string": "3.3.11.1", - "port-version": 9, + "port-version": 10, "description": "Mikmod is a module player and library supporting many formats, including mod, s3m, it, and xm.", "homepage": "https://sourceforge.net/projects/mikmod/", "dependencies": [ diff --git a/ports/libmt32emu/portfile.cmake b/ports/libmt32emu/portfile.cmake index cb9ed893973440..706307693acd88 100644 --- a/ports/libmt32emu/portfile.cmake +++ b/ports/libmt32emu/portfile.cmake @@ -23,3 +23,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") file(INSTALL "${SOURCE_PATH}/mt32emu/COPYING.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libmt32emu/vcpkg.json b/ports/libmt32emu/vcpkg.json index aace79c4e27099..79ead6f26c5b85 100644 --- a/ports/libmt32emu/vcpkg.json +++ b/ports/libmt32emu/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmt32emu", "version": "2.5.3", + "port-version": 1, "description": "A MT-32 emulator", "homepage": "https://github.com/munt/munt/tree/master/mt32emu", "dependencies": [ diff --git a/ports/libpqxx/portfile.cmake b/ports/libpqxx/portfile.cmake index a8bb2c2db9fd47..53d7eea4d43f60 100644 --- a/ports/libpqxx/portfile.cmake +++ b/ports/libpqxx/portfile.cmake @@ -24,3 +24,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libpqxx) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libpqxx/vcpkg.json b/ports/libpqxx/vcpkg.json index 3f493980a4253f..880ccb1974f81a 100644 --- a/ports/libpqxx/vcpkg.json +++ b/ports/libpqxx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpqxx", "version-semver": "7.6.0", - "port-version": 1, + "port-version": 2, "description": "The official C++ client API for PostgreSQL", "homepage": "https://www.postgresql.org/", "dependencies": [ diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake index 94c3ecda3f817e..26842e7979d66d 100644 --- a/ports/libproxy/portfile.cmake +++ b/ports/libproxy/portfile.cmake @@ -47,3 +47,5 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" file(REMOVE_RECURSE "${LIBPROXY_TOOLS}" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json index 15e72c018e6b1a..fb855d40c08877 100644 --- a/ports/libproxy/vcpkg.json +++ b/ports/libproxy/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libproxy", "version": "0.4.17", + "port-version": 1, "description": "libproxy is a library that provides automatic proxy configuration management.", "homepage": "https://github.com/libproxy/libproxy", "dependencies": [ diff --git a/ports/libqrencode/portfile.cmake b/ports/libqrencode/portfile.cmake index 40e383c3cbeb4b..b65c1db51c59c7 100644 --- a/ports/libqrencode/portfile.cmake +++ b/ports/libqrencode/portfile.cmake @@ -52,3 +52,5 @@ vcpkg_copy_pdbs() file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libqrencode/vcpkg.json b/ports/libqrencode/vcpkg.json index e9f572ad9644ed..a32d95184f014e 100644 --- a/ports/libqrencode/vcpkg.json +++ b/ports/libqrencode/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libqrencode", "version-semver": "4.1.1", + "port-version": 1, "description": "libqrencode - a fast and compact QR Code encoding library", "homepage": "https://github.com/fukuchi/libqrencode", "dependencies": [ diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index 9b2d48255c30b8..d565ed28ea08d2 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -75,3 +75,5 @@ configure_file(${SOURCE_PATH}/LICENSES.txt ${CURRENT_PACKAGES_DIR}/share/${PORT} # Install usage configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index 77894d11653221..a4f0ed147cd9f6 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,7 +1,7 @@ { "name": "librdkafka", "version-string": "1.7.0", - "port-version": 1, + "port-version": 2, "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", "features": { diff --git a/ports/libsbml/portfile.cmake b/ports/libsbml/portfile.cmake index 47a1cc601e3ee0..9b88b13b09dc3c 100644 --- a/ports/libsbml/portfile.cmake +++ b/ports/libsbml/portfile.cmake @@ -86,4 +86,5 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/README.md") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/README.md") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/libsbml/vcpkg.json b/ports/libsbml/vcpkg.json index aeb7318e60d237..cc2cc215654fda 100644 --- a/ports/libsbml/vcpkg.json +++ b/ports/libsbml/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsbml", "version": "5.19.0", + "port-version": 1, "description": "A library for reading / writing SBML files", "supports": "!uwp", "dependencies": [ diff --git a/ports/libtins/portfile.cmake b/ports/libtins/portfile.cmake index ae783e53b6bc70..176b9c7b0691cd 100644 --- a/ports/libtins/portfile.cmake +++ b/ports/libtins/portfile.cmake @@ -34,3 +34,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libtins RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libtins/vcpkg.json b/ports/libtins/vcpkg.json index f4f2b274806d2e..864794750b9222 100644 --- a/ports/libtins/vcpkg.json +++ b/ports/libtins/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libtins", "version-string": "4.3", - "port-version": 1, + "port-version": 2, "description": "High-level, multiplatform C++ network packet sniffing and crafting library", "dependencies": [ "boost-any", diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake index e70a78efffba0a..0c11403fc11d0e 100644 --- a/ports/libtorrent/portfile.cmake +++ b/ports/libtorrent/portfile.cmake @@ -58,3 +58,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${ # Do not duplicate include files file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/share/cmake) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libtorrent/vcpkg.json b/ports/libtorrent/vcpkg.json index 39fe5343c423f8..7e0de91ddd6257 100644 --- a/ports/libtorrent/vcpkg.json +++ b/ports/libtorrent/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libtorrent", "version": "1.2.14", + "port-version": 1, "maintainers": "Arvid Norberg ", "description": "An efficient feature complete C++ BitTorrent implementation", "homepage": "https://libtorrent.org", diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index 29692ab0771cdd..e9013c6b56d323 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -182,3 +182,5 @@ endif () vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index 8d993fee9af96e..e674bdd8c42a65 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libwebsockets", "version-semver": "4.2.2", - "port-version": 2, + "port-version": 3, "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", "supports": "!uwp", diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index 20700c76c2e0dd..f2bf4f7e04be53 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -24,4 +24,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json index 2138d56be6f8c6..d54a1f03618565 100644 --- a/ports/libxlsxwriter/vcpkg.json +++ b/ports/libxlsxwriter/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxlsxwriter", "version-semver": "1.1.3", + "port-version": 1, "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.", "homepage": "https://github.com/jmcnamara/libxlsxwriter", "dependencies": [ diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index c223980a26c33c..ff22ec6c2433b6 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -119,3 +119,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmak file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +vcpkg_fixup_pkgconfig() diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index 1fa6e983a5a299..7f75b1c1f23416 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mongo-c-driver", "version": "1.17.6", + "port-version": 1, "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "dependencies": [ diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index 8994d654356a82..7db0e5ee68f7be 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -52,3 +52,5 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PAC file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index b755eff18a1902..78f4999c664d3f 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mosquitto", "version": "2.0.12", - "port-version": 1, + "port-version": 2, "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", "homepage": "https://mosquitto.org/download/", "dependencies": [ diff --git a/ports/msgpack/portfile.cmake b/ports/msgpack/portfile.cmake index 86e2ea37810c11..13a6263046a40a 100644 --- a/ports/msgpack/portfile.cmake +++ b/ports/msgpack/portfile.cmake @@ -35,3 +35,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/msgpack) file(RENAME ${CURRENT_PACKAGES_DIR}/share/msgpack/COPYING ${CURRENT_PACKAGES_DIR}/share/msgpack/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/msgpack/vcpkg.json b/ports/msgpack/vcpkg.json index 6901ce161022b8..a76f2c6fd72bd2 100644 --- a/ports/msgpack/vcpkg.json +++ b/ports/msgpack/vcpkg.json @@ -1,7 +1,7 @@ { "name": "msgpack", "version-string": "3.3.0", - "port-version": 1, + "port-version": 2, "description": "MessagePack is an efficient binary serialization format, which lets you exchange data among multiple languages like JSON, except that it's faster and smaller.", "homepage": "https://github.com/msgpack/msgpack-c" } diff --git a/ports/msgpack11/portfile.cmake b/ports/msgpack11/portfile.cmake index f4dc73c63c4730..d0783dece5c837 100644 --- a/ports/msgpack11/portfile.cmake +++ b/ports/msgpack11/portfile.cmake @@ -25,3 +25,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/msgpack11/vcpkg.json b/ports/msgpack11/vcpkg.json index 0072e7dfd09d04..f76e0a28a542a9 100644 --- a/ports/msgpack11/vcpkg.json +++ b/ports/msgpack11/vcpkg.json @@ -1,7 +1,7 @@ { "name": "msgpack11", "version": "0.0.10", - "port-version": 2, + "port-version": 3, "description": "msgpack11 is a tiny MsgPack library for C++11, providing MsgPack parsing and serialization.This library is inspired by json11.The API of msgpack11 is designed to be similar with json11.", "homepage": "https://msgpack.org", "dependencies": [ diff --git a/ports/munit/portfile.cmake b/ports/munit/portfile.cmake index cf6d0df3cb5fe7..6a8c8e194d2fa8 100644 --- a/ports/munit/portfile.cmake +++ b/ports/munit/portfile.cmake @@ -21,3 +21,5 @@ vcpkg_install_meson() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/munit/vcpkg.json b/ports/munit/vcpkg.json index ca60d49b7040bc..a729d1df72ee14 100644 --- a/ports/munit/vcpkg.json +++ b/ports/munit/vcpkg.json @@ -1,7 +1,7 @@ { "name": "munit", "version-string": "2019-04-06", - "port-version": 2, + "port-version": 3, "description": "A small but full-featured unit testing framework for C", "homepage": "https://github.com/nemequ/munit", "supports": "!(arm | arm64 | uwp)", diff --git a/ports/muparser/portfile.cmake b/ports/muparser/portfile.cmake index db4bc987ef18b8..dcc548737f8532 100644 --- a/ports/muparser/portfile.cmake +++ b/ports/muparser/portfile.cmake @@ -23,4 +23,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/muparser/vcpkg.json b/ports/muparser/vcpkg.json index 2ba2aa091c6494..967c3712e894f3 100644 --- a/ports/muparser/vcpkg.json +++ b/ports/muparser/vcpkg.json @@ -1,7 +1,7 @@ { "name": "muparser", "version-string": "2.3.2", - "port-version": 1, + "port-version": 2, "description": "Fast math parser library", "homepage": "https://github.com/beltoforion/muparser", "supports": "!uwp" diff --git a/ports/nanoflann/portfile.cmake b/ports/nanoflann/portfile.cmake index 0d047c9b6b7667..cd295d76d8ec38 100644 --- a/ports/nanoflann/portfile.cmake +++ b/ports/nanoflann/portfile.cmake @@ -15,4 +15,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") # Handle copyright -file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/nanoflann/vcpkg.json b/ports/nanoflann/vcpkg.json index e8ca03b60fc7d0..cdf0b0cf0220be 100644 --- a/ports/nanoflann/vcpkg.json +++ b/ports/nanoflann/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nanoflann", "version": "1.3.2", + "port-version": 1, "description": "nanoflann is a C++11 header-only library for building KD-Trees of datasets with different topologies: R2, R3 (point clouds), SO(2) and SO(3) (2D and 3D rotation groups).", "homepage": "https://github.com/jlblancoc/nanoflann", "dependencies": [ diff --git a/ports/nanomsg/portfile.cmake b/ports/nanomsg/portfile.cmake index 49fdab38e7c094..5561f2bbb11fe3 100644 --- a/ports/nanomsg/portfile.cmake +++ b/ports/nanomsg/portfile.cmake @@ -61,3 +61,5 @@ endif() configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/nanomsg/vcpkg.json b/ports/nanomsg/vcpkg.json index 4ed0ef1c5f8df4..fb0644ceb8442c 100644 --- a/ports/nanomsg/vcpkg.json +++ b/ports/nanomsg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanomsg", "version-string": "1.1.5", - "port-version": 3, + "port-version": 4, "description": [ "a simple high-performance implementation of several \"scalability protocols\".", "These scalability protocols are light-weight messaging protocols which can be used to solve a number of very common messaging patterns, such as request/reply, publish/subscribe, surveyor/respondent, and so forth. These protocols can run over a variety of transports such as TCP, UNIX sockets, and even WebSocket." diff --git a/ports/nlopt/portfile.cmake b/ports/nlopt/portfile.cmake index 114ee72e5b11a0..e2204c239ff163 100644 --- a/ports/nlopt/portfile.cmake +++ b/ports/nlopt/portfile.cmake @@ -27,3 +27,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/nlopt/vcpkg.json b/ports/nlopt/vcpkg.json index 7097097133dce5..3e895d4a3b2c91 100644 --- a/ports/nlopt/vcpkg.json +++ b/ports/nlopt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nlopt", "version-string": "2.7.0", + "port-version": 1, "description": "a library for nonlinear local and global optimization, for functions with and without gradient information.", "homepage": "https://github.com/stevengj/nlopt" } diff --git a/ports/octomap/portfile.cmake b/ports/octomap/portfile.cmake index 1708296a529f7f..0730461b63ef3c 100644 --- a/ports/octomap/portfile.cmake +++ b/ports/octomap/portfile.cmake @@ -42,3 +42,5 @@ file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION " file(INSTALL ${SOURCE_PATH}/octomap/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/octomap/vcpkg.json b/ports/octomap/vcpkg.json index 8aa0e86d57c540..a68ad430a6bc0f 100644 --- a/ports/octomap/vcpkg.json +++ b/ports/octomap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "octomap", "version-string": "1.9.5", - "port-version": 1, + "port-version": 2, "description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees", "homepage": "https://octomap.github.io/" } diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake index cb10fc9c0369f4..800c2f63189c55 100644 --- a/ports/ode/portfile.cmake +++ b/ports/ode/portfile.cmake @@ -23,3 +23,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) + +vcpkg_fixup_pkgconfig() diff --git a/ports/ode/vcpkg.json b/ports/ode/vcpkg.json index 4d507866a37512..921ec7dd3331b8 100644 --- a/ports/ode/vcpkg.json +++ b/ports/ode/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ode", "version-string": "0.16.1", - "port-version": 1, + "port-version": 2, "description": "Open Dynamics Engine", "homepage": "https://bitbucket.org/odedevs/ode/src/default/" } diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index 84859bb096aed5..3c06999d7ec811 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -27,3 +27,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index 2b6b7140f896fc..00b05789f307dc 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ois", "version-string": "1.5", - "port-version": 2, + "port-version": 3, "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.", "homepage": "https://wgois.github.io/OIS/" } diff --git a/ports/oniguruma/portfile.cmake b/ports/oniguruma/portfile.cmake index d1089e8af3a739..86e9f97c741b4c 100644 --- a/ports/oniguruma/portfile.cmake +++ b/ports/oniguruma/portfile.cmake @@ -50,3 +50,5 @@ else() endif() file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/oniguruma/vcpkg.json b/ports/oniguruma/vcpkg.json index a0211d3c836aa4..7247d3036ce378 100644 --- a/ports/oniguruma/vcpkg.json +++ b/ports/oniguruma/vcpkg.json @@ -1,6 +1,7 @@ { "name": "oniguruma", "version": "6.9.7.1", + "port-version": 1, "description": "Modern and flexible regular expressions library", "homepage": "https://github.com/kkos/oniguruma", "dependencies": [ diff --git a/ports/opencc/portfile.cmake b/ports/opencc/portfile.cmake index c67b2d33fc0e9e..ad68c29b229203 100644 --- a/ports/opencc/portfile.cmake +++ b/ports/opencc/portfile.cmake @@ -49,4 +49,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/opencc/vcpkg.json b/ports/opencc/vcpkg.json index dc346293c31b3d..3645c6d13632e8 100644 --- a/ports/opencc/vcpkg.json +++ b/ports/opencc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencc", "version-string": "2020-04-26", - "port-version": 8, + "port-version": 9, "description": "A project for conversion between Traditional and Simplified Chinese", "homepage": "https://github.com/BYVoid/OpenCC", "supports": "!(arm | arm64 | uwp)", diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 55a1535b071a4d..9d49af03dc2e2d 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -88,3 +88,5 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${C # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index 0dc7c2edd28d87..fd23968aa1d445 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.3.7.2", - "port-version": 3, + "port-version": 4, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "dependencies": [ diff --git a/ports/orocos-kdl/portfile.cmake b/ports/orocos-kdl/portfile.cmake index 784987f7b2256b..6d6764f6cb9bc3 100644 --- a/ports/orocos-kdl/portfile.cmake +++ b/ports/orocos-kdl/portfile.cmake @@ -27,4 +27,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/doc/liborocos-kdl) -file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/orocos_kdl/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/orocos-kdl/vcpkg.json b/ports/orocos-kdl/vcpkg.json index 4535b0f93ad36f..3eeca90301373e 100644 --- a/ports/orocos-kdl/vcpkg.json +++ b/ports/orocos-kdl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "orocos-kdl", "version": "1.4", - "port-version": 4, + "port-version": 5, "description": "Kinematics and Dynamics Library.", "homepage": "https://github.com/orocos/orocos_kinematics_dynamics", "dependencies": [ diff --git a/ports/osg/portfile.cmake b/ports/osg/portfile.cmake index b8aeaa71227085..1ea919dcd4848c 100644 --- a/ports/osg/portfile.cmake +++ b/ports/osg/portfile.cmake @@ -143,3 +143,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/osgPlugins-${OSG_VER}/) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/osg/vcpkg.json b/ports/osg/vcpkg.json index b1f62b5da6ec3c..66d2ee8e566290 100644 --- a/ports/osg/vcpkg.json +++ b/ports/osg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "osg", "version-string": "3.6.5", - "port-version": 9, + "port-version": 10, "description": "The OpenSceneGraph is an open source high performance 3D graphics toolkit.", "homepage": "https://github.com/openscenegraph/OpenSceneGraph", "dependencies": [ diff --git a/ports/p-ranav-csv2/portfile.cmake b/ports/p-ranav-csv2/portfile.cmake index 99196f53d25129..9e03f7ab4334d6 100644 --- a/ports/p-ranav-csv2/portfile.cmake +++ b/ports/p-ranav-csv2/portfile.cmake @@ -23,3 +23,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE.mio DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +vcpkg_fixup_pkgconfig() diff --git a/ports/p-ranav-csv2/vcpkg.json b/ports/p-ranav-csv2/vcpkg.json index 2b3d4dd861591d..957935ad900dfd 100644 --- a/ports/p-ranav-csv2/vcpkg.json +++ b/ports/p-ranav-csv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "p-ranav-csv2", "version-string": "2020-12-14", - "port-version": 1, + "port-version": 2, "description": "CSV for modern C++", "homepage": "https://github.com/p-ranav/csv2" } diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 008b8934e562c9..4af4e0ddfcca83 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -75,3 +75,5 @@ if("tools" IN_LIST FEATURES) endif() file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index 4f0fa3a87576d9..53743da5cff29d 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcl", "version": "1.11.1", - "port-version": 4, + "port-version": 5, "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "supports": "!(arm64 & windows)", diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index eb20f613c5c33e..cc4b7a433a2fc0 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -67,3 +67,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json index a4d0cf1cfe287c..80eed11923c7a1 100644 --- a/ports/plplot/vcpkg.json +++ b/ports/plplot/vcpkg.json @@ -1,7 +1,7 @@ { "name": "plplot", "version-string": "5.13.0", - "port-version": 10, + "port-version": 11, "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", "dependencies": [ "bzip2", diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake index 8ba349173f30b6..9c953825366206 100644 --- a/ports/polyclipping/portfile.cmake +++ b/ports/polyclipping/portfile.cmake @@ -29,3 +29,5 @@ file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/FindCLIPPER.cmake DESTINATION ${CURRENT_P file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/clipper) file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json index 919342867e6b7e..a57d032a8e0475 100644 --- a/ports/polyclipping/vcpkg.json +++ b/ports/polyclipping/vcpkg.json @@ -1,7 +1,7 @@ { "name": "polyclipping", "version-string": "6.4.2", - "port-version": 8, + "port-version": 9, "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", "homepage": "https://sourceforge.net/projects/polyclipping/" } diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake index 5c800cd7e877ab..a19debe8c52286 100644 --- a/ports/ponder/portfile.cmake +++ b/ports/ponder/portfile.cmake @@ -36,3 +36,5 @@ endif() # Handle copyright configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/ponder/vcpkg.json b/ports/ponder/vcpkg.json index 265d12f5f67d77..3959fa165fea61 100644 --- a/ports/ponder/vcpkg.json +++ b/ports/ponder/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ponder", "version-string": "3.0.0", - "port-version": 2, + "port-version": 3, "description": "A C++ multi-purpose reflection library.", "homepage": "https://github.com/billyquith/ponder" } diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake index 74e8b22e269bdc..fcb96f6c666e54 100644 --- a/ports/poppler/portfile.cmake +++ b/ports/poppler/portfile.cmake @@ -41,4 +41,5 @@ vcpkg_install_cmake() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json index b9c59fb01f00bb..2ae9cae7753454 100644 --- a/ports/poppler/vcpkg.json +++ b/ports/poppler/vcpkg.json @@ -1,7 +1,7 @@ { "name": "poppler", "version": "20.12.1", - "port-version": 5, + "port-version": 6, "description": "a PDF rendering library", "homepage": "https://poppler.freedesktop.org/", "dependencies": [ diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 95d047b2432aed..30e9adfa0509a8 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -42,3 +42,5 @@ endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/portaudio/vcpkg.json b/ports/portaudio/vcpkg.json index 4d504978f70684..cbf20bfc6b01aa 100644 --- a/ports/portaudio/vcpkg.json +++ b/ports/portaudio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "portaudio", "version": "19.7", - "port-version": 1, + "port-version": 2, "description": "PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.", "homepage": "http://www.portaudio.com", "supports": "!uwp" diff --git a/ports/ppconsul/portfile.cmake b/ports/ppconsul/portfile.cmake index 9b8c4c4e707efd..cc1692760d07f4 100644 --- a/ports/ppconsul/portfile.cmake +++ b/ports/ppconsul/portfile.cmake @@ -25,3 +25,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/ppconsul/vcpkg.json b/ports/ppconsul/vcpkg.json index 7dd7895a47f2f6..ff2b678c8df8aa 100644 --- a/ports/ppconsul/vcpkg.json +++ b/ports/ppconsul/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ppconsul", "version-string": "0.5", - "port-version": 2, + "port-version": 3, "description": "A C++ client library for Consul. Consul is a distributed tool for discovering and configuring services in your infrastructure.", "homepage": "https://github.com/oliora/ppconsul", "dependencies": [ diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index 7af3d4c36090de..e429052f2c65fb 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -83,3 +83,5 @@ endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index f63f9a7ea9cdf3..2180f2b8c9b01d 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "raylib", "version-semver": "3.7.0", - "port-version": 1, + "port-version": 2, "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "supports": "!(arm | uwp)", diff --git a/ports/rbdl/portfile.cmake b/ports/rbdl/portfile.cmake index 362bb19bdd5de6..be6a63c81a1981 100644 --- a/ports/rbdl/portfile.cmake +++ b/ports/rbdl/portfile.cmake @@ -27,3 +27,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/rbdl/vcpkg.json b/ports/rbdl/vcpkg.json index ee07f6de7664e3..96a3389ae331ea 100644 --- a/ports/rbdl/vcpkg.json +++ b/ports/rbdl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "rbdl", "version": "2.6.0", - "port-version": 1, + "port-version": 2, "description": "Rigid Body Dynamics Library", "homepage": "https://github.com/rbdl/rbdl", "dependencies": [ diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake index bd45c69d2e8283..7d59d891f21db6 100644 --- a/ports/realsense2/portfile.cmake +++ b/ports/realsense2/portfile.cmake @@ -67,4 +67,5 @@ if(BUILD_OPENNI2_BINDINGS) endif() endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json index e5add498a8e339..8eeac97239e159 100644 --- a/ports/realsense2/vcpkg.json +++ b/ports/realsense2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "realsense2", "version": "2.49.0", + "port-version": 1, "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).", "homepage": "https://github.com/IntelRealSense/librealsense", "dependencies": [ diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake index ace6b27f6a0de3..eb5b6b644fd56c 100644 --- a/ports/redis-plus-plus/portfile.cmake +++ b/ports/redis-plus-plus/portfile.cmake @@ -37,3 +37,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) + +vcpkg_fixup_pkgconfig() diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json index b67b176b7c8fe9..a789d9c2727462 100644 --- a/ports/redis-plus-plus/vcpkg.json +++ b/ports/redis-plus-plus/vcpkg.json @@ -1,6 +1,7 @@ { "name": "redis-plus-plus", "version-semver": "1.3.1", + "port-version": 1, "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11", "homepage": "https://github.com/sewenew/redis-plus-plus", "dependencies": [ diff --git a/ports/rpclib/portfile.cmake b/ports/rpclib/portfile.cmake index 053efc179bc9c4..ef13e915061473 100644 --- a/ports/rpclib/portfile.cmake +++ b/ports/rpclib/portfile.cmake @@ -23,3 +23,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/rpclib") vcpkg_copy_pdbs() file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/rpclib/vcpkg.json b/ports/rpclib/vcpkg.json index cff1b08e719ce0..add630ed8631ef 100644 --- a/ports/rpclib/vcpkg.json +++ b/ports/rpclib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rpclib", "version-semver": "2.3.0", + "port-version": 1, "description": "a RPC library for C++, providing both a client and server implementation. It is built using modern C++14.", "homepage": "https://github.com/rpclib/rpclib" } diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake index 2d069486caf28e..42f47fb57b4c0d 100644 --- a/ports/rtaudio/portfile.cmake +++ b/ports/rtaudio/portfile.cmake @@ -40,3 +40,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json index 6c24da39165273..9b9d8ce10a55da 100644 --- a/ports/rtaudio/vcpkg.json +++ b/ports/rtaudio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtaudio", "version-date": "2021-08-15", + "port-version": 1, "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", "homepage": "https://github.com/thestk/rtaudio", "supports": "!uwp", diff --git a/ports/sais/portfile.cmake b/ports/sais/portfile.cmake index 0e5240b0bdc0c0..5c0a0891a6a41a 100644 --- a/ports/sais/portfile.cmake +++ b/ports/sais/portfile.cmake @@ -23,3 +23,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/sais/vcpkg.json b/ports/sais/vcpkg.json index 59f2e9ad80d42e..7b0edbadd3d011 100644 --- a/ports/sais/vcpkg.json +++ b/ports/sais/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sais", "version-string": "2.4.1", - "port-version": 2, + "port-version": 3, "description": "An implementation of the induced sorting algorithm" } diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake index 1b6babd87aa93e..6e32429e37285a 100644 --- a/ports/sdformat6/portfile.cmake +++ b/ports/sdformat6/portfile.cmake @@ -52,3 +52,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json index 84c6969921f3fa..935b1be224ea16 100644 --- a/ports/sdformat6/vcpkg.json +++ b/ports/sdformat6/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdformat6", "version": "6.2.0", - "port-version": 2, + "port-version": 3, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "supports": "!(arm | uwp)", diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake index 38c551cee6ce11..e05fe13f3b3005 100644 --- a/ports/sentencepiece/portfile.cmake +++ b/ports/sentencepiece/portfile.cmake @@ -30,3 +30,5 @@ endif() configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json index 0a621c341b9bac..e13c6f989e94de 100644 --- a/ports/sentencepiece/vcpkg.json +++ b/ports/sentencepiece/vcpkg.json @@ -1,5 +1,6 @@ { "name": "sentencepiece", "version": "0.1.95", + "port-version": 1, "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training" } diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index 247018842c37ab..e5415273f950ed 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -73,3 +73,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json index e302ce701c30c6..0122ad0f151f21 100644 --- a/ports/simage/vcpkg.json +++ b/ports/simage/vcpkg.json @@ -1,7 +1,7 @@ { "name": "simage", "version-semver": "1.8.1", - "port-version": 1, + "port-version": 2, "description": "Image file format library abstraction layer", "homepage": "https://github.com/coin3d/simage", "supports": "!uwp", diff --git a/ports/sol2/portfile.cmake b/ports/sol2/portfile.cmake index cf20001db68d22..901aeb51fc6e08 100644 --- a/ports/sol2/portfile.cmake +++ b/ports/sol2/portfile.cmake @@ -25,3 +25,5 @@ file( file(INSTALL ${SOURCE_PATH}/single/include/sol DESTINATION ${CURRENT_PACKAGES_DIR}/include/) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/sol2/vcpkg.json b/ports/sol2/vcpkg.json index 22de87e461a3fa..54c8837d5b8655 100644 --- a/ports/sol2/vcpkg.json +++ b/ports/sol2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sol2", "version-string": "3.2.2", - "port-version": 1, + "port-version": 2, "description": "Sol v2.0 - a C++ <-> Lua API wrapper with advanced features and top notch performance - is here, and it's great", "homepage": "https://github.com/ThePhD/sol2", "dependencies": [ diff --git a/ports/soxr/portfile.cmake b/ports/soxr/portfile.cmake index 15fbce5a263125..63070fcb4771fe 100644 --- a/ports/soxr/portfile.cmake +++ b/ports/soxr/portfile.cmake @@ -35,3 +35,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc") + +vcpkg_fixup_pkgconfig() diff --git a/ports/soxr/vcpkg.json b/ports/soxr/vcpkg.json index 4887394e562060..ec6f109904f2b1 100644 --- a/ports/soxr/vcpkg.json +++ b/ports/soxr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "soxr", "version": "0.1.3", - "port-version": 5, + "port-version": 6, "description": "High quality audio resampling", "homepage": "https://sourceforge.net/projects/soxr/", "dependencies": [ diff --git a/ports/sparsehash/portfile.cmake b/ports/sparsehash/portfile.cmake index b23df02e6238e3..876726cd42f48c 100644 --- a/ports/sparsehash/portfile.cmake +++ b/ports/sparsehash/portfile.cmake @@ -36,3 +36,5 @@ configure_file( configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/sparsehash/copyright COPYONLY) file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/sparsehash) + +vcpkg_fixup_pkgconfig() diff --git a/ports/sparsehash/vcpkg.json b/ports/sparsehash/vcpkg.json index a2306e43dcb3a8..9882cefac45219 100644 --- a/ports/sparsehash/vcpkg.json +++ b/ports/sparsehash/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sparsehash", "version": "2.0.4", - "port-version": 1, + "port-version": 2, "description": "The sparsehash package consists of two hashtable implementations: sparse, which is designed to be very space efficient, and dense, which is designed to be very time efficient.", "homepage": "https://github.com/sparsehash/sparsehash" } diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake index a45fce791fb945..d11b14015e42d0 100644 --- a/ports/stxxl/portfile.cmake +++ b/ports/stxxl/portfile.cmake @@ -70,3 +70,5 @@ file(REMOVE_RECURSE configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/stxxl/vcpkg.json b/ports/stxxl/vcpkg.json index 1a3847d57b2d0a..e6a4029b0e1056 100644 --- a/ports/stxxl/vcpkg.json +++ b/ports/stxxl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "stxxl", "version-string": "2018-11-15", - "port-version": 3, + "port-version": 4, "description": "Standard Template Library for Extra Large Data Sets" } diff --git a/ports/superlu/portfile.cmake b/ports/superlu/portfile.cmake index 807981f5dd9044..3d21ec510ff9da 100644 --- a/ports/superlu/portfile.cmake +++ b/ports/superlu/portfile.cmake @@ -27,3 +27,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/superlu/vcpkg.json b/ports/superlu/vcpkg.json index 9de4be6746d655..08b6be02a71cb7 100644 --- a/ports/superlu/vcpkg.json +++ b/ports/superlu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "superlu", "version-string": "2020-01-07", - "port-version": 3, + "port-version": 4, "description": "Supernodal sparse direct solver.", "homepage": "https://github.com/xiaoyeli/superlu", "supports": "!(uwp | arm)", diff --git a/ports/thrift/portfile.cmake b/ports/thrift/portfile.cmake index f39ba11b90c674..f2b42b5301e15f 100644 --- a/ports/thrift/portfile.cmake +++ b/ports/thrift/portfile.cmake @@ -70,4 +70,5 @@ if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_fixup_pkgconfig() diff --git a/ports/thrift/vcpkg.json b/ports/thrift/vcpkg.json index ebc179aa157edb..df0a2a109e8f82 100644 --- a/ports/thrift/vcpkg.json +++ b/ports/thrift/vcpkg.json @@ -1,7 +1,7 @@ { "name": "thrift", "version-string": "0.13.0", - "port-version": 1, + "port-version": 2, "description": "Apache Thrift is a software project spanning a variety of programming languages and use cases. Our goal is to make reliable, performant communication and data serialization across languages as efficient and seamless as possible.", "homepage": "https://github.com/apache/thrift", "dependencies": [ diff --git a/ports/tidy-html5/portfile.cmake b/ports/tidy-html5/portfile.cmake index ddf60c6b29131b..159ed86aaa7a16 100644 --- a/ports/tidy-html5/portfile.cmake +++ b/ports/tidy-html5/portfile.cmake @@ -38,3 +38,5 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(INSTALL ${SOURCE_PATH}/README/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tidy-html5 RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_fixup_pkgconfig() diff --git a/ports/tidy-html5/vcpkg.json b/ports/tidy-html5/vcpkg.json index f910fd5f571e18..7071cab8fae270 100644 --- a/ports/tidy-html5/vcpkg.json +++ b/ports/tidy-html5/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tidy-html5", "version-string": "5.7.28", - "port-version": 3, + "port-version": 4, "description": "Tidy tidies HTML and XML. It can tidy your documents by itself, and developers can easily integrate its features into even more powerful tools.", "homepage": "https://github.com/htacg/tidy-html5" } diff --git a/ports/tinyobjloader/portfile.cmake b/ports/tinyobjloader/portfile.cmake index 86f76edb04d083..224947e5b5e5aa 100644 --- a/ports/tinyobjloader/portfile.cmake +++ b/ports/tinyobjloader/portfile.cmake @@ -37,3 +37,5 @@ vcpkg_copy_pdbs() # Put the licence file where vcpkg expects it file(RENAME ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/LICENSE ${CURRENT_PACKAGES_DIR}/share/tinyobjloader/copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/tinyobjloader/vcpkg.json b/ports/tinyobjloader/vcpkg.json index 45ed27c108b4ea..30bd1bb6f00620 100644 --- a/ports/tinyobjloader/vcpkg.json +++ b/ports/tinyobjloader/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyobjloader", "version-string": "2.0.0-rc2", - "port-version": 1, + "port-version": 2, "description": "Tiny but powerful single file wavefront obj loader", "features": { "double": { diff --git a/ports/tinyply/portfile.cmake b/ports/tinyply/portfile.cmake index a5e93530c9d1df..b41fdb0fec2add 100644 --- a/ports/tinyply/portfile.cmake +++ b/ports/tinyply/portfile.cmake @@ -32,3 +32,5 @@ file(READ "${SOURCE_PATH}/readme.md" readme_contents) string(FIND "${readme_contents}" "License" license_line_pos) string(SUBSTRING "${readme_contents}" ${license_line_pos} -1 license_contents) file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "${license_contents}") + +vcpkg_fixup_pkgconfig() diff --git a/ports/tinyply/vcpkg.json b/ports/tinyply/vcpkg.json index 5cf3b739825e59..b369c42455069b 100644 --- a/ports/tinyply/vcpkg.json +++ b/ports/tinyply/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tinyply", "version-string": "2020-05-22", - "port-version": 1, + "port-version": 2, "description": "C++11 ply 3d mesh format importer & exporter", "homepage": "https://github.com/ddiakopoulos/tinyply" } diff --git a/ports/tlx/portfile.cmake b/ports/tlx/portfile.cmake index 525894d28041b9..2ee4ca4f35705f 100644 --- a/ports/tlx/portfile.cmake +++ b/ports/tlx/portfile.cmake @@ -36,3 +36,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/tlx/vcpkg.json b/ports/tlx/vcpkg.json index 072971f8f65a55..5433956b112026 100644 --- a/ports/tlx/vcpkg.json +++ b/ports/tlx/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tlx", "version-string": "0.5.20191212", - "port-version": 1, + "port-version": 2, "description": "tlx is a collection of C++ helpers and extensions universally needed, but not found in the STL", "homepage": "https://github.com/tlx/tlx" } diff --git a/ports/tmxparser/portfile.cmake b/ports/tmxparser/portfile.cmake index 1f1b9e28616144..cf45ef27266826 100644 --- a/ports/tmxparser/portfile.cmake +++ b/ports/tmxparser/portfile.cmake @@ -35,3 +35,5 @@ endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/tmxparser/vcpkg.json b/ports/tmxparser/vcpkg.json index 769ae662bc8c95..9beb4ea250ab42 100644 --- a/ports/tmxparser/vcpkg.json +++ b/ports/tmxparser/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tmxparser", "version-string": "2.1.0", - "port-version": 5, + "port-version": 6, "description": "C++11 library for parsing the maps generated by the Map Editor called Tiled.", "dependencies": [ "tinyxml2", diff --git a/ports/uchardet/portfile.cmake b/ports/uchardet/portfile.cmake index a407fd7831a55f..0e6a69566553e4 100644 --- a/ports/uchardet/portfile.cmake +++ b/ports/uchardet/portfile.cmake @@ -39,3 +39,5 @@ file(REMOVE_RECURSE ) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/uchardet/vcpkg.json b/ports/uchardet/vcpkg.json index 41a2bbe78438e8..6175ae9a45ecca 100644 --- a/ports/uchardet/vcpkg.json +++ b/ports/uchardet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "uchardet", "version-date": "2021-09-03", + "port-version": 1, "description": "An encoding detector library ported from Mozilla.", "homepage": "https://cgit.freedesktop.org/uchardet/uchardet/", "dependencies": [ diff --git a/ports/unittest-cpp/portfile.cmake b/ports/unittest-cpp/portfile.cmake index 4558d8a1769058..f962a5b885546a 100644 --- a/ports/unittest-cpp/portfile.cmake +++ b/ports/unittest-cpp/portfile.cmake @@ -25,3 +25,5 @@ file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${ # Remove duplicate includes file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_pkgconfig() diff --git a/ports/unittest-cpp/vcpkg.json b/ports/unittest-cpp/vcpkg.json index b80cbbad575091..8e48fb8aebb4bf 100644 --- a/ports/unittest-cpp/vcpkg.json +++ b/ports/unittest-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "unittest-cpp", "version-semver": "2.0.0", - "port-version": 2, + "port-version": 3, "description": "A lightweight unit testing framework for C++", "homepage": "https://github.com/unittest-cpp/unittest-cpp" } diff --git a/ports/uriparser/portfile.cmake b/ports/uriparser/portfile.cmake index e09c67d88ddbe2..76fe6f6565ca44 100644 --- a/ports/uriparser/portfile.cmake +++ b/ports/uriparser/portfile.cmake @@ -54,3 +54,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/uriparser/vcpkg.json b/ports/uriparser/vcpkg.json index dab0db2bb09689..52e853d95362ef 100644 --- a/ports/uriparser/vcpkg.json +++ b/ports/uriparser/vcpkg.json @@ -1,6 +1,7 @@ { "name": "uriparser", "version-semver": "0.9.5", + "port-version": 1, "description": "Strictly RFC 3986 compliant URI parsing and handling library written in C89.", "homepage": "https://uriparser.github.io/", "license": "BSD-3-Clause", diff --git a/ports/usrsctp/portfile.cmake b/ports/usrsctp/portfile.cmake index f560279e5e8651..55ea67667acf41 100644 --- a/ports/usrsctp/portfile.cmake +++ b/ports/usrsctp/portfile.cmake @@ -22,3 +22,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/usrsctp/copyright" COPYONLY) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/usrsctp/vcpkg.json b/ports/usrsctp/vcpkg.json index 64d475e3bfda8d..56683423af4653 100644 --- a/ports/usrsctp/vcpkg.json +++ b/ports/usrsctp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "usrsctp", "version": "0.9.5.0", + "port-version": 1, "description": "A userland SCTP stack supporting FreeBSD, Linux, Mac OS X and Windows.", "dependencies": [ { diff --git a/ports/wampcc/portfile.cmake b/ports/wampcc/portfile.cmake index 8b31ecb4670285..e50d780dcd5787 100644 --- a/ports/wampcc/portfile.cmake +++ b/ports/wampcc/portfile.cmake @@ -49,3 +49,5 @@ vcpkg_install_cmake() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/wampcc RENAME copyright) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_fixup_pkgconfig() diff --git a/ports/wampcc/vcpkg.json b/ports/wampcc/vcpkg.json index da8a456f1e77c2..025aed5a301a5c 100644 --- a/ports/wampcc/vcpkg.json +++ b/ports/wampcc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wampcc", "version-string": "2019-09-04", - "port-version": 1, + "port-version": 2, "description": "Wampcc is C++ library that implements the Web Application Messaging Protocol (WAMP) protocol.", "dependencies": [ "jansson", diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake index 33f3edecd036f5..6fa5ca3ab6b69a 100644 --- a/ports/xalan-c/portfile.cmake +++ b/ports/xalan-c/portfile.cmake @@ -36,3 +36,5 @@ file(REMOVE_RECURSE file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/xalan-c/vcpkg.json b/ports/xalan-c/vcpkg.json index faf80bf2bba6e0..425d9bfd286891 100644 --- a/ports/xalan-c/vcpkg.json +++ b/ports/xalan-c/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xalan-c", "version": "1.12", + "port-version": 1, "description": "Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types", "homepage": "https://github.com/apache/xalan-c", "dependencies": [ diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 18a29890b22317..22d44193d804a7 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -64,3 +64,5 @@ file(REMOVE_RECURSE # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/xerces-c/vcpkg.json b/ports/xerces-c/vcpkg.json index fb3ff4cab6bed4..bb836f898b76b5 100644 --- a/ports/xerces-c/vcpkg.json +++ b/ports/xerces-c/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xerces-c", "version-string": "3.2.3", - "port-version": 2, + "port-version": 3, "description": "Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.", "homepage": "https://github.com/apache/xerces-c", "features": { diff --git a/ports/xlnt/portfile.cmake b/ports/xlnt/portfile.cmake index 29101c2010724d..3ad72194a91dd8 100644 --- a/ports/xlnt/portfile.cmake +++ b/ports/xlnt/portfile.cmake @@ -38,3 +38,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) vcpkg_copy_pdbs() + +vcpkg_fixup_pkgconfig() diff --git a/ports/xlnt/vcpkg.json b/ports/xlnt/vcpkg.json index df61b6066421f2..eb2275878f6ccd 100644 --- a/ports/xlnt/vcpkg.json +++ b/ports/xlnt/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xlnt", "version": "1.5.0", - "port-version": 2, + "port-version": 3, "description": "Cross-platform user-friendly xlsx library for C++14", "homepage": "https://github.com/tfussell/xlnt" } diff --git a/ports/xtensor-fftw/portfile.cmake b/ports/xtensor-fftw/portfile.cmake index e22efc2e345b2d..e7e70a729f8827 100644 --- a/ports/xtensor-fftw/portfile.cmake +++ b/ports/xtensor-fftw/portfile.cmake @@ -29,3 +29,5 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/xtensor-fftw/vcpkg.json b/ports/xtensor-fftw/vcpkg.json index 22d6e69a88e7e2..8ba4afb3f1d097 100644 --- a/ports/xtensor-fftw/vcpkg.json +++ b/ports/xtensor-fftw/vcpkg.json @@ -1,7 +1,7 @@ { "name": "xtensor-fftw", "version-string": "2019-11-30", - "port-version": 1, + "port-version": 2, "description": "FFTW bindings for the xtensor C++14 multi-dimensional array library", "homepage": "https://github.com/xtensor-stack/xtensor-fftw", "dependencies": [ diff --git a/ports/z3/portfile.cmake b/ports/z3/portfile.cmake index aab0d9b88492eb..e5d5ec72a6fb60 100644 --- a/ports/z3/portfile.cmake +++ b/ports/z3/portfile.cmake @@ -31,3 +31,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/z3/vcpkg.json b/ports/z3/vcpkg.json index 3020f60f725ced..1ad7aece5c8d0f 100644 --- a/ports/z3/vcpkg.json +++ b/ports/z3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "z3", "version": "4.8.12", + "port-version": 1, "description": "Z3 is a theorem prover from Microsoft Research", "homepage": "https://github.com/Z3Prover/z3", "supports": "!uwp" diff --git a/ports/zeromq/portfile.cmake b/ports/zeromq/portfile.cmake index 01c5aa49cd6426..ba51367e2f5cc2 100644 --- a/ports/zeromq/portfile.cmake +++ b/ports/zeromq/portfile.cmake @@ -63,3 +63,5 @@ endif() file(RENAME "${CURRENT_PACKAGES_DIR}/share/zmq/COPYING.LESSER.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/share/zmq") + +vcpkg_fixup_pkgconfig() diff --git a/ports/zeromq/vcpkg.json b/ports/zeromq/vcpkg.json index 631f9cf784659d..e7d469bf287bca 100644 --- a/ports/zeromq/vcpkg.json +++ b/ports/zeromq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zeromq", "version": "4.3.4", - "port-version": 1, + "port-version": 2, "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", "supports": "!uwp", diff --git a/ports/zyre/portfile.cmake b/ports/zyre/portfile.cmake index e2a3f9878bab27..b73db8ecb51fd3 100644 --- a/ports/zyre/portfile.cmake +++ b/ports/zyre/portfile.cmake @@ -62,3 +62,5 @@ endif() # Handle copyright configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/zyre/vcpkg.json b/ports/zyre/vcpkg.json index ca7068be0f19e3..2abbffdfd4a901 100644 --- a/ports/zyre/vcpkg.json +++ b/ports/zyre/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zyre", "version-string": "2019-07-07", - "port-version": 2, + "port-version": 3, "description": "An open-source framework for proximity-based peer-to-peer applications", "homepage": "https://github.com/zeromq/zyre", "dependencies": [ diff --git a/ports/zziplib/portfile.cmake b/ports/zziplib/portfile.cmake index cc1d4905475b2a..9ee3ee64d6b4f4 100644 --- a/ports/zziplib/portfile.cmake +++ b/ports/zziplib/portfile.cmake @@ -52,3 +52,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_fixup_pkgconfig() diff --git a/ports/zziplib/vcpkg.json b/ports/zziplib/vcpkg.json index 95279853a3dac6..cdbca56158e3ae 100644 --- a/ports/zziplib/vcpkg.json +++ b/ports/zziplib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "zziplib", "version-string": "0.13.71", - "port-version": 2, + "port-version": 3, "description": "library providing read access on ZIP-archives", "homepage": "https://github.com/gdraheim/zziplib", "dependencies": [ diff --git a/versions/a-/ace.json b/versions/a-/ace.json index bac72f23262530..4e05683ae848da 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67c57059b237310a1907da692fc75acb3d8d2726", + "version": "7.0.3", + "port-version": 2 + }, { "git-tree": "d4585581f988569d9428b693540dbd6f8305be8d", "version": "7.0.3", diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json index fa976f7d1ad2fb..4195befef5ae5e 100644 --- a/versions/a-/amqpcpp.json +++ b/versions/a-/amqpcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb3c11de2e142fc43d0c3bbcddc2a56b563de733", + "version": "4.3.14", + "port-version": 1 + }, { "git-tree": "e17952ad85007dbc08e20711b8f5bd462712e4e0", "version": "4.3.14", diff --git a/versions/a-/aom.json b/versions/a-/aom.json index 1091b77be60683..16639b522ef107 100644 --- a/versions/a-/aom.json +++ b/versions/a-/aom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d7bac96c35260b96135bf3ec1d456994d549eb3", + "version-semver": "3.2.0", + "port-version": 1 + }, { "git-tree": "04432e0fa953e42790ff74f6d927130d9a4e28a7", "version-semver": "3.2.0", diff --git a/versions/a-/aricpp.json b/versions/a-/aricpp.json index 36bcbe95b469c7..728221b15af2cd 100644 --- a/versions/a-/aricpp.json +++ b/versions/a-/aricpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "266bfd31b17badea05be9f9859b0ce84f4d9f60e", + "version-semver": "1.1.1", + "port-version": 1 + }, { "git-tree": "6bab43826055b88429107ef725b3c98fdded73ee", "version-semver": "1.1.1", diff --git a/versions/a-/armadillo.json b/versions/a-/armadillo.json index 21920f3b23c173..381c58c27a5a5b 100644 --- a/versions/a-/armadillo.json +++ b/versions/a-/armadillo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a7774c182c273a8d6f350a383f4a3bcf01e308e", + "version": "10.6.2", + "port-version": 2 + }, { "git-tree": "34c37cb8151d003da697e9d725033567a4ccb2f7", "version": "10.6.2", diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 904f3430ca5f31..8d0b86eb61ad1c 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7", + "version": "5.0.0", + "port-version": 1 + }, { "git-tree": "bf5c2b42bb8c4efa09d69a4ce6e75ae3ace45f02", "version": "5.0.0", diff --git a/versions/b-/bcg729.json b/versions/b-/bcg729.json index 07eb8c734a18b9..544f247119b529 100644 --- a/versions/b-/bcg729.json +++ b/versions/b-/bcg729.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "16cf88e26d0bf3ebd469c722cd4df96c59556fb7", + "version-string": "1.1.1", + "port-version": 1 + }, { "git-tree": "666c71eec6573ef70d9f2630962511687723bb0e", "version-string": "1.1.1", diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index 5707d0c4bf6bad..7b4f30795643db 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "615b986c25f902c2053661948092cbfa757fa400", + "version": "1.34.2", + "port-version": 1 + }, { "git-tree": "d6ba1aba5922829f7eb5d8197dbffe5aa8f9722b", "version": "1.34.2", diff --git a/versions/b-/bde.json b/versions/b-/bde.json index c37874aac45179..f587a05e530024 100644 --- a/versions/b-/bde.json +++ b/versions/b-/bde.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "60082ad73e5c9fb9828041183b026fc15e453218", + "version-string": "3.2.0.0", + "port-version": 4 + }, { "git-tree": "b940e98efec0d1f48f2edfe2027d2bce251ec7a8", "version-string": "3.2.0.0", diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 50dc59430a4a1b..7719dfd7208e77 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84653790601fd0e28aaeb12a9a58292b7e3af1bc", + "version": "8.2.0", + "port-version": 1 + }, { "git-tree": "ea1da0228494df421f826c098fdf574a93afbb66", "version": "8.2.0", diff --git a/versions/b-/blitz.json b/versions/b-/blitz.json index b30b87f50efe51..797c31d5c66d7d 100644 --- a/versions/b-/blitz.json +++ b/versions/b-/blitz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6f6a860240cf01fea1a9f90f6970dec75980a1d1", + "version-string": "2020-03-25", + "port-version": 2 + }, { "git-tree": "50cc7fc499a0dd0ea2d61de84ee5875327ffd255", "version-string": "2020-03-25", diff --git a/versions/b-/blosc.json b/versions/b-/blosc.json index ee956cdfadfb46..9f5863b6d0f31b 100644 --- a/versions/b-/blosc.json +++ b/versions/b-/blosc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ae0480271a2db8d001d389b4c62af49ea50770", + "version-string": "1.18.1", + "port-version": 3 + }, { "git-tree": "0d29f4f5d2e2d2fd70c4489149d81cc548d31cc1", "version-string": "1.18.1", diff --git a/versions/b-/brpc.json b/versions/b-/brpc.json index d625bae51605ad..2049b07521ea35 100644 --- a/versions/b-/brpc.json +++ b/versions/b-/brpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "42b5a413e49655d73b772efa7642eefff429b4c1", + "version-string": "0.9.7", + "port-version": 3 + }, { "git-tree": "0b89b1bee5f50f8bdb551ae2373feb51b144fbc2", "version-string": "0.9.7", diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 042edb960a1991..49a5583439717c 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcc42d2c8eb5fc4134c31f6176bc0c0ae3bc46e1", + "version": "3.17", + "port-version": 2 + }, { "git-tree": "5d6e2d765a4cca130170b4a574e99a938ce54818", "version": "3.17", diff --git a/versions/baseline.json b/versions/baseline.json index e177578a237802..df343e6be77b16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -18,7 +18,7 @@ }, "ace": { "baseline": "7.0.3", - "port-version": 1 + "port-version": 2 }, "activemq-cpp": { "baseline": "3.9.5", @@ -70,7 +70,7 @@ }, "amqpcpp": { "baseline": "4.3.14", - "port-version": 0 + "port-version": 1 }, "anax": { "baseline": "2.1.0", @@ -98,7 +98,7 @@ }, "aom": { "baseline": "3.2.0", - "port-version": 0 + "port-version": 1 }, "approval-tests-cpp": { "baseline": "10.12.0", @@ -154,11 +154,11 @@ }, "aricpp": { "baseline": "1.1.1", - "port-version": 0 + "port-version": 1 }, "armadillo": { "baseline": "10.6.2", - "port-version": 1 + "port-version": 2 }, "arrayfire": { "baseline": "3.8.0", @@ -166,7 +166,7 @@ }, "arrow": { "baseline": "5.0.0", - "port-version": 0 + "port-version": 1 }, "ashes": { "baseline": "2021-06-18", @@ -390,19 +390,19 @@ }, "bcg729": { "baseline": "1.1.1", - "port-version": 0 + "port-version": 1 }, "bddisasm": { "baseline": "1.34.2", - "port-version": 0 + "port-version": 1 }, "bde": { "baseline": "3.2.0.0", - "port-version": 3 + "port-version": 4 }, "bdwgc": { "baseline": "8.2.0", - "port-version": 0 + "port-version": 1 }, "beast": { "baseline": "0", @@ -494,11 +494,11 @@ }, "blitz": { "baseline": "2020-03-25", - "port-version": 1 + "port-version": 2 }, "blosc": { "baseline": "1.18.1", - "port-version": 2 + "port-version": 3 }, "boinc": { "baseline": "7.18.1", @@ -1142,7 +1142,7 @@ }, "brpc": { "baseline": "0.9.7", - "port-version": 2 + "port-version": 3 }, "brunocodutra-metal": { "baseline": "2.1.3", @@ -1166,7 +1166,7 @@ }, "bullet3": { "baseline": "3.17", - "port-version": 1 + "port-version": 2 }, "bustache": { "baseline": "1.1.0", @@ -1218,7 +1218,7 @@ }, "capnproto": { "baseline": "0.9.1", - "port-version": 0 + "port-version": 1 }, "capstone": { "baseline": "4.0.2", @@ -1250,7 +1250,7 @@ }, "ccd": { "baseline": "2.1-4", - "port-version": 2 + "port-version": 3 }, "ccfits": { "baseline": "2.5", @@ -1314,7 +1314,7 @@ }, "charls": { "baseline": "2.2.0", - "port-version": 1 + "port-version": 2 }, "chartdir": { "baseline": "7.0.0", @@ -1322,7 +1322,7 @@ }, "check": { "baseline": "0.15.2", - "port-version": 1 + "port-version": 2 }, "chipmunk": { "baseline": "7.0.3", @@ -1354,7 +1354,7 @@ }, "cjson": { "baseline": "1.7.15", - "port-version": 0 + "port-version": 1 }, "clamav": { "baseline": "0.103.0", @@ -1374,7 +1374,7 @@ }, "clblast": { "baseline": "1.5.1", - "port-version": 1 + "port-version": 2 }, "clfft": { "baseline": "2.12.2", @@ -1382,7 +1382,7 @@ }, "cli": { "baseline": "2.0.0", - "port-version": 0 + "port-version": 1 }, "cli11": { "baseline": "2.1.2", @@ -1426,7 +1426,7 @@ }, "cmocka": { "baseline": "2020-08-01", - "port-version": 0 + "port-version": 1 }, "cnl": { "baseline": "1.1.7", @@ -1438,7 +1438,7 @@ }, "coin": { "baseline": "4.0.0", - "port-version": 3 + "port-version": 4 }, "coinutils": { "baseline": "2.11.4", @@ -1446,7 +1446,7 @@ }, "collada-dom": { "baseline": "2.5.0", - "port-version": 5 + "port-version": 6 }, "colmap": { "baseline": "3.6", @@ -1530,7 +1530,7 @@ }, "cpp-redis": { "baseline": "4.3.1", - "port-version": 3 + "port-version": 4 }, "cpp-taskflow": { "baseline": "2.6.0", @@ -1550,7 +1550,7 @@ }, "cppcodec": { "baseline": "0.2", - "port-version": 1 + "port-version": 2 }, "cppcoro": { "baseline": "2020-2-28", @@ -1610,7 +1610,7 @@ }, "cpuid": { "baseline": "0.5.1", - "port-version": 1 + "port-version": 2 }, "cpuinfo": { "baseline": "2021-04-04", @@ -1694,7 +1694,7 @@ }, "curlpp": { "baseline": "2018-06-15", - "port-version": 4 + "port-version": 5 }, "cute-headers": { "baseline": "2019-09-20", @@ -1862,7 +1862,7 @@ }, "dlib": { "baseline": "19.21", - "port-version": 5 + "port-version": 6 }, "dmlc": { "baseline": "2019-08-12", @@ -1942,7 +1942,7 @@ }, "easyloggingpp": { "baseline": "9.97.0", - "port-version": 0 + "port-version": 1 }, "eathread": { "baseline": "1.32.09", @@ -1966,7 +1966,7 @@ }, "edlib": { "baseline": "1.2.7", - "port-version": 0 + "port-version": 1 }, "effects11": { "baseline": "11.26", @@ -2114,7 +2114,7 @@ }, "fcl": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "fdk-aac": { "baseline": "2.0.2", @@ -2134,7 +2134,7 @@ }, "fftw3": { "baseline": "3.3.10", - "port-version": 1 + "port-version": 2 }, "fftwpp": { "baseline": "2019-12-19", @@ -2154,7 +2154,7 @@ }, "flann": { "baseline": "2019-04-07", - "port-version": 2 + "port-version": 3 }, "flashlight-cpu": { "baseline": "0.3", @@ -2166,7 +2166,7 @@ }, "flatbuffers": { "baseline": "2.0.0", - "port-version": 1 + "port-version": 2 }, "flint": { "baseline": "2.5.2", @@ -2178,7 +2178,7 @@ }, "fluidlite": { "baseline": "2020-08-27", - "port-version": 1 + "port-version": 2 }, "fluidsynth": { "baseline": "2.2.1", @@ -2202,7 +2202,7 @@ }, "folly": { "baseline": "2021.06.14.00", - "port-version": 2 + "port-version": 3 }, "font-chef": { "baseline": "1.0.1", @@ -2238,7 +2238,7 @@ }, "freeglut": { "baseline": "3.2.1", - "port-version": 6 + "port-version": 7 }, "freeimage": { "baseline": "3.18.0", @@ -2246,7 +2246,7 @@ }, "freeopcua": { "baseline": "20190125", - "port-version": 4 + "port-version": 5 }, "freerdp": { "baseline": "2.4.0", @@ -2298,7 +2298,7 @@ }, "functions-framework-cpp": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "fuzzylite": { "baseline": "6.0", @@ -2370,11 +2370,11 @@ }, "geogram": { "baseline": "1.7.6", - "port-version": 0 + "port-version": 1 }, "geographiclib": { "baseline": "1.52", - "port-version": 0 + "port-version": 1 }, "geos": { "baseline": "3.9.1", @@ -2386,7 +2386,7 @@ }, "getdns": { "baseline": "1.6.0", - "port-version": 1 + "port-version": 2 }, "getopt": { "baseline": "0", @@ -2406,7 +2406,7 @@ }, "gflags": { "baseline": "2.2.2", - "port-version": 4 + "port-version": 5 }, "ghc-filesystem": { "baseline": "1.5.4", @@ -2538,15 +2538,15 @@ }, "graphite2": { "baseline": "1.3.14", - "port-version": 1 + "port-version": 2 }, "graphqlparser": { "baseline": "0.7.0", - "port-version": 2 + "port-version": 3 }, "graphviz": { "baseline": "2.49.1", - "port-version": 0 + "port-version": 1 }, "greatest": { "baseline": "1.5.0", @@ -2674,7 +2674,7 @@ }, "hiredis": { "baseline": "1.0.2", - "port-version": 0 + "port-version": 1 }, "hpx": { "baseline": "1.7.1", @@ -2698,7 +2698,7 @@ }, "hyperscan": { "baseline": "5.3.0", - "port-version": 2 + "port-version": 3 }, "hypodermic": { "baseline": "2.5.3", @@ -2794,7 +2794,7 @@ }, "igraph": { "baseline": "0.9.4", - "port-version": 0 + "port-version": 1 }, "iir1": { "baseline": "1.8.0", @@ -2846,7 +2846,7 @@ }, "iniparser": { "baseline": "2020-04-06", - "port-version": 1 + "port-version": 2 }, "inja": { "baseline": "3.3.0", @@ -2890,7 +2890,7 @@ }, "itpp": { "baseline": "4.3.1", - "port-version": 7 + "port-version": 8 }, "ixwebsocket": { "baseline": "11.2.6", @@ -2906,7 +2906,7 @@ }, "jansson": { "baseline": "2.13.1", - "port-version": 1 + "port-version": 2 }, "jasper": { "baseline": "2.0.33", @@ -2954,7 +2954,7 @@ }, "json11": { "baseline": "2017-06-20", - "port-version": 3 + "port-version": 4 }, "json5-parser": { "baseline": "1.0.0", @@ -3294,7 +3294,7 @@ }, "libbson": { "baseline": "1.17.6", - "port-version": 0 + "port-version": 1 }, "libcanberra": { "baseline": "0.30", @@ -3310,7 +3310,7 @@ }, "libcerf": { "baseline": "1.13", - "port-version": 1 + "port-version": 2 }, "libconfig": { "baseline": "1.7.3", @@ -3318,7 +3318,7 @@ }, "libconfuse": { "baseline": "2019-07-14", - "port-version": 1 + "port-version": 2 }, "libcopp": { "baseline": "1.4.1", @@ -3378,11 +3378,11 @@ }, "libevent": { "baseline": "2.1.12", - "port-version": 2 + "port-version": 3 }, "libevhtp": { "baseline": "1.2.18", - "port-version": 1 + "port-version": 2 }, "libexif": { "baseline": "0.6.22", @@ -3406,11 +3406,11 @@ }, "libfort": { "baseline": "0.4.2", - "port-version": 0 + "port-version": 1 }, "libfreenect2": { "baseline": "0.2.0", - "port-version": 6 + "port-version": 7 }, "libftdi": { "baseline": "0.20", @@ -3426,7 +3426,7 @@ }, "libgd": { "baseline": "2.3.2", - "port-version": 0 + "port-version": 1 }, "libgeotiff": { "baseline": "1.6.0", @@ -3454,7 +3454,7 @@ }, "libgta": { "baseline": "1.0.8", - "port-version": 2 + "port-version": 3 }, "libguarded": { "baseline": "2019-08-27", @@ -3534,11 +3534,11 @@ }, "libkeyfinder": { "baseline": "2.2.5", - "port-version": 0 + "port-version": 1 }, "libkml": { "baseline": "1.3.0", - "port-version": 7 + "port-version": 8 }, "liblas": { "baseline": "1.8.1", @@ -3550,7 +3550,7 @@ }, "liblemon": { "baseline": "2019-06-13", - "port-version": 2 + "port-version": 3 }, "liblinear": { "baseline": "243", @@ -3558,7 +3558,7 @@ }, "liblo": { "baseline": "0.31", - "port-version": 1 + "port-version": 2 }, "liblsl": { "baseline": "1.14.0", @@ -3598,7 +3598,7 @@ }, "libmikmod": { "baseline": "3.3.11.1", - "port-version": 9 + "port-version": 10 }, "libmodbus": { "baseline": "3.1.6", @@ -3626,7 +3626,7 @@ }, "libmt32emu": { "baseline": "2.5.3", - "port-version": 0 + "port-version": 1 }, "libmupdf": { "baseline": "1.18.1-so-3.11.14", @@ -3734,7 +3734,7 @@ }, "libpqxx": { "baseline": "7.6.0", - "port-version": 1 + "port-version": 2 }, "libprotobuf-mutator": { "baseline": "1.0", @@ -3742,7 +3742,7 @@ }, "libproxy": { "baseline": "0.4.17", - "port-version": 0 + "port-version": 1 }, "libqcow": { "baseline": "20210419", @@ -3754,7 +3754,7 @@ }, "libqrencode": { "baseline": "4.1.1", - "port-version": 0 + "port-version": 1 }, "librabbitmq": { "baseline": "2020-06-03", @@ -3770,7 +3770,7 @@ }, "librdkafka": { "baseline": "1.7.0", - "port-version": 1 + "port-version": 2 }, "libressl": { "baseline": "3.3.4", @@ -3802,7 +3802,7 @@ }, "libsbml": { "baseline": "5.19.0", - "port-version": 0 + "port-version": 1 }, "libsbsms": { "baseline": "2.3.0", @@ -3894,7 +3894,7 @@ }, "libtins": { "baseline": "4.3", - "port-version": 1 + "port-version": 2 }, "libtomcrypt": { "baseline": "1.18.2", @@ -3906,7 +3906,7 @@ }, "libtorrent": { "baseline": "1.2.14", - "port-version": 0 + "port-version": 1 }, "libu2f-server": { "baseline": "1.1.0", @@ -3990,7 +3990,7 @@ }, "libwebsockets": { "baseline": "4.2.2", - "port-version": 2 + "port-version": 3 }, "libxdiff": { "baseline": "0.23", @@ -3998,7 +3998,7 @@ }, "libxlsxwriter": { "baseline": "1.1.3", - "port-version": 0 + "port-version": 1 }, "libxml2": { "baseline": "2.9.12", @@ -4378,7 +4378,7 @@ }, "mongo-c-driver": { "baseline": "1.17.6", - "port-version": 0 + "port-version": 1 }, "mongo-cxx-driver": { "baseline": "3.6.5", @@ -4410,7 +4410,7 @@ }, "mosquitto": { "baseline": "2.0.12", - "port-version": 1 + "port-version": 2 }, "mozjpeg": { "baseline": "2021-09-27", @@ -4478,11 +4478,11 @@ }, "msgpack": { "baseline": "3.3.0", - "port-version": 1 + "port-version": 2 }, "msgpack11": { "baseline": "0.0.10", - "port-version": 2 + "port-version": 3 }, "msinttypes": { "baseline": "2018-02-25", @@ -4506,11 +4506,11 @@ }, "munit": { "baseline": "2019-04-06", - "port-version": 2 + "port-version": 3 }, "muparser": { "baseline": "2.3.2", - "port-version": 1 + "port-version": 2 }, "murmurhash": { "baseline": "2016-01-09", @@ -4542,7 +4542,7 @@ }, "nanoflann": { "baseline": "1.3.2", - "port-version": 0 + "port-version": 1 }, "nanogui": { "baseline": "2019-09-23", @@ -4550,7 +4550,7 @@ }, "nanomsg": { "baseline": "1.1.5", - "port-version": 3 + "port-version": 4 }, "nanopb": { "baseline": "0.4.5", @@ -4638,7 +4638,7 @@ }, "nlopt": { "baseline": "2.7.0", - "port-version": 0 + "port-version": 1 }, "nmap": { "baseline": "7.70", @@ -4758,11 +4758,11 @@ }, "octomap": { "baseline": "1.9.5", - "port-version": 1 + "port-version": 2 }, "ode": { "baseline": "0.16.1", - "port-version": 1 + "port-version": 2 }, "offscale-libetcd-cpp": { "baseline": "2019-07-10", @@ -4782,7 +4782,7 @@ }, "ois": { "baseline": "1.5", - "port-version": 2 + "port-version": 3 }, "ompl": { "baseline": "1.5.1", @@ -4798,7 +4798,7 @@ }, "oniguruma": { "baseline": "6.9.7.1", - "port-version": 0 + "port-version": 1 }, "onnx": { "baseline": "1.10.1", @@ -4830,7 +4830,7 @@ }, "opencc": { "baseline": "2020-04-26", - "port-version": 8 + "port-version": 9 }, "opencensus-cpp": { "baseline": "0.4.0", @@ -4894,7 +4894,7 @@ }, "openimageio": { "baseline": "2.3.7.2", - "port-version": 3 + "port-version": 4 }, "openjpeg": { "baseline": "2.4.0", @@ -4994,11 +4994,11 @@ }, "orocos-kdl": { "baseline": "1.4", - "port-version": 4 + "port-version": 5 }, "osg": { "baseline": "3.6.5", - "port-version": 9 + "port-version": 10 }, "osg-qt": { "baseline": "Qt5", @@ -5026,7 +5026,7 @@ }, "p-ranav-csv2": { "baseline": "2020-12-14", - "port-version": 1 + "port-version": 2 }, "pagmo2": { "baseline": "2.16.1", @@ -5094,7 +5094,7 @@ }, "pcl": { "baseline": "1.11.1", - "port-version": 4 + "port-version": 5 }, "pcre": { "baseline": "8.45", @@ -5218,7 +5218,7 @@ }, "plplot": { "baseline": "5.13.0", - "port-version": 10 + "port-version": 11 }, "plustache": { "baseline": "0.4.0", @@ -5254,7 +5254,7 @@ }, "polyclipping": { "baseline": "6.4.2", - "port-version": 8 + "port-version": 9 }, "polyhook2": { "baseline": "2021-05-09", @@ -5266,11 +5266,11 @@ }, "ponder": { "baseline": "3.0.0", - "port-version": 2 + "port-version": 3 }, "poppler": { "baseline": "20.12.1", - "port-version": 5 + "port-version": 6 }, "popsift": { "baseline": "0.9", @@ -5282,7 +5282,7 @@ }, "portaudio": { "baseline": "19.7", - "port-version": 1 + "port-version": 2 }, "portmidi": { "baseline": "0.234", @@ -5294,7 +5294,7 @@ }, "ppconsul": { "baseline": "0.5", - "port-version": 2 + "port-version": 3 }, "ppmagic": { "baseline": "2020-07-03", @@ -5822,11 +5822,11 @@ }, "raylib": { "baseline": "3.7.0", - "port-version": 1 + "port-version": 2 }, "rbdl": { "baseline": "2.6.0", - "port-version": 1 + "port-version": 2 }, "rbdl-orb": { "baseline": "3.1.2", @@ -5854,7 +5854,7 @@ }, "realsense2": { "baseline": "2.49.0", - "port-version": 0 + "port-version": 1 }, "recast": { "baseline": "1.5.1", @@ -5862,7 +5862,7 @@ }, "redis-plus-plus": { "baseline": "1.3.1", - "port-version": 0 + "port-version": 1 }, "refl-cpp": { "baseline": "0.12.0", @@ -5938,7 +5938,7 @@ }, "rpclib": { "baseline": "2.3.0", - "port-version": 0 + "port-version": 1 }, "rply": { "baseline": "1.1.4", @@ -5974,7 +5974,7 @@ }, "rtaudio": { "baseline": "2021-08-15", - "port-version": 0 + "port-version": 1 }, "rtlsdr": { "baseline": "2020-04-16", @@ -6022,7 +6022,7 @@ }, "sais": { "baseline": "2.4.1", - "port-version": 2 + "port-version": 3 }, "sajson": { "baseline": "2018-09-21", @@ -6066,7 +6066,7 @@ }, "sdformat6": { "baseline": "6.2.0", - "port-version": 2 + "port-version": 3 }, "sdformat9": { "baseline": "9.4.0", @@ -6122,7 +6122,7 @@ }, "sentencepiece": { "baseline": "0.1.95", - "port-version": 0 + "port-version": 1 }, "sentry-native": { "baseline": "0.4.12", @@ -6190,7 +6190,7 @@ }, "simage": { "baseline": "1.8.1", - "port-version": 1 + "port-version": 2 }, "simde": { "baseline": "0.7.2", @@ -6290,7 +6290,7 @@ }, "sol2": { "baseline": "3.2.2", - "port-version": 1 + "port-version": 2 }, "solid3": { "baseline": "3.5.8", @@ -6314,7 +6314,7 @@ }, "soxr": { "baseline": "0.1.3", - "port-version": 5 + "port-version": 6 }, "spaceland": { "baseline": "7.8.2", @@ -6326,7 +6326,7 @@ }, "sparsehash": { "baseline": "2.0.4", - "port-version": 1 + "port-version": 2 }, "sparsepp": { "baseline": "1.22", @@ -6486,7 +6486,7 @@ }, "stxxl": { "baseline": "2018-11-15", - "port-version": 3 + "port-version": 4 }, "suitesparse": { "baseline": "5.8.0", @@ -6498,7 +6498,7 @@ }, "superlu": { "baseline": "2020-01-07", - "port-version": 3 + "port-version": 4 }, "symengine": { "baseline": "0.7.0", @@ -6614,11 +6614,11 @@ }, "thrift": { "baseline": "0.13.0", - "port-version": 1 + "port-version": 2 }, "tidy-html5": { "baseline": "5.7.28", - "port-version": 3 + "port-version": 4 }, "tiff": { "baseline": "4.3.0", @@ -6682,11 +6682,11 @@ }, "tinyobjloader": { "baseline": "2.0.0-rc2", - "port-version": 1 + "port-version": 2 }, "tinyply": { "baseline": "2020-05-22", - "port-version": 1 + "port-version": 2 }, "tinyspline": { "baseline": "0.3.0", @@ -6730,7 +6730,7 @@ }, "tlx": { "baseline": "0.5.20191212", - "port-version": 1 + "port-version": 2 }, "tmx": { "baseline": "1.1.0", @@ -6742,7 +6742,7 @@ }, "tmxparser": { "baseline": "2.1.0", - "port-version": 5 + "port-version": 6 }, "toml11": { "baseline": "3.7.0", @@ -6826,7 +6826,7 @@ }, "uchardet": { "baseline": "2021-09-03", - "port-version": 0 + "port-version": 1 }, "umock-c": { "baseline": "2020-06-17", @@ -6846,7 +6846,7 @@ }, "unittest-cpp": { "baseline": "2.0.0", - "port-version": 2 + "port-version": 3 }, "unixodbc": { "baseline": "2.3.7", @@ -6878,7 +6878,7 @@ }, "uriparser": { "baseline": "0.9.5", - "port-version": 0 + "port-version": 1 }, "usbmuxd": { "baseline": "1.2.235", @@ -6894,7 +6894,7 @@ }, "usrsctp": { "baseline": "0.9.5.0", - "port-version": 0 + "port-version": 1 }, "utf8h": { "baseline": "2021-10-21", @@ -7042,7 +7042,7 @@ }, "wampcc": { "baseline": "2019-09-04", - "port-version": 1 + "port-version": 2 }, "wangle": { "baseline": "2021.06.14.00", @@ -7150,7 +7150,7 @@ }, "xalan-c": { "baseline": "1.12", - "port-version": 0 + "port-version": 1 }, "xaudio2redist": { "baseline": "1.2.8", @@ -7162,7 +7162,7 @@ }, "xerces-c": { "baseline": "3.2.3", - "port-version": 2 + "port-version": 3 }, "xeus": { "baseline": "0.24.3", @@ -7174,7 +7174,7 @@ }, "xlnt": { "baseline": "1.5.0", - "port-version": 2 + "port-version": 3 }, "xlsxio": { "baseline": "2021-03-24", @@ -7214,7 +7214,7 @@ }, "xtensor-fftw": { "baseline": "2019-11-30", - "port-version": 1 + "port-version": 2 }, "xtensor-io": { "baseline": "0.12.8", @@ -7274,7 +7274,7 @@ }, "z3": { "baseline": "4.8.12", - "port-version": 0 + "port-version": 1 }, "z85": { "baseline": "1.0", @@ -7282,7 +7282,7 @@ }, "zeromq": { "baseline": "4.3.4", - "port-version": 1 + "port-version": 2 }, "zfp": { "baseline": "0.5.5", @@ -7334,11 +7334,11 @@ }, "zyre": { "baseline": "2019-07-07", - "port-version": 2 + "port-version": 3 }, "zziplib": { "baseline": "0.13.71", - "port-version": 2 + "port-version": 3 } } } diff --git a/versions/c-/capnproto.json b/versions/c-/capnproto.json index 86c7d903bfae28..cf51d2af2b9fe6 100644 --- a/versions/c-/capnproto.json +++ b/versions/c-/capnproto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "129b6b745372d94f313df0989ad6a8980d7eaef7", + "version": "0.9.1", + "port-version": 1 + }, { "git-tree": "408771ff99776c9b25fd1121da589b720b7081c0", "version": "0.9.1", diff --git a/versions/c-/ccd.json b/versions/c-/ccd.json index 58ea1931eebc9c..9e383a9c1f34d3 100644 --- a/versions/c-/ccd.json +++ b/versions/c-/ccd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e6fc55567d05873ba6f78c3c33363a0fd9a1549", + "version-string": "2.1-4", + "port-version": 3 + }, { "git-tree": "9a10df3929e80702a9e8c110612b1ecd8c32bee9", "version-string": "2.1-4", diff --git a/versions/c-/charls.json b/versions/c-/charls.json index 02c4bd16ebac0a..e2f9510e0f455e 100644 --- a/versions/c-/charls.json +++ b/versions/c-/charls.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "215d96df3e02eb0bfaae991586f4b64fd03c6cf2", + "version-string": "2.2.0", + "port-version": 2 + }, { "git-tree": "9e9e71b04ec39396631b28e98175e4c862cb154d", "version-string": "2.2.0", diff --git a/versions/c-/check.json b/versions/c-/check.json index e518c2ca13233f..c8884ded5ddf3e 100644 --- a/versions/c-/check.json +++ b/versions/c-/check.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f88273666d201fd843e12ba5d98d4ed8a10bd576", + "version-string": "0.15.2", + "port-version": 2 + }, { "git-tree": "889eae1f6ba0c9809e6718e6b15143b65dc6394f", "version-string": "0.15.2", diff --git a/versions/c-/cjson.json b/versions/c-/cjson.json index 8e9a453126e082..d8f68b8d1d1e6a 100644 --- a/versions/c-/cjson.json +++ b/versions/c-/cjson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb79fc0bdbc6754cf6c267d97e2825655929351b", + "version": "1.7.15", + "port-version": 1 + }, { "git-tree": "4a0cbb7810d1e9fda06ff7da2f8deb5249401267", "version": "1.7.15", diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json index 74496d27ad5413..54b2e59d8640ff 100644 --- a/versions/c-/clblast.json +++ b/versions/c-/clblast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f2832bf6fb704f7e83a56c4a1b952287b2ceb49", + "version-string": "1.5.1", + "port-version": 2 + }, { "git-tree": "dcbde8693746ad43009a522210aed6794d6a0a58", "version-string": "1.5.1", diff --git a/versions/c-/cli.json b/versions/c-/cli.json index fa9ecd85596108..4da89892f00631 100644 --- a/versions/c-/cli.json +++ b/versions/c-/cli.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2c5da108b7e41bd3da82fe9b670a308d664b3a0e", + "version-semver": "2.0.0", + "port-version": 1 + }, { "git-tree": "52c57cc23f038ec2f73805b37f42639541036956", "version-semver": "2.0.0", diff --git a/versions/c-/cmocka.json b/versions/c-/cmocka.json index 7d3c2316dd2b97..c1b208e9c499a1 100644 --- a/versions/c-/cmocka.json +++ b/versions/c-/cmocka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b4b3515ae508de2f3eccb509948e8ed20eb877e", + "version-string": "2020-08-01", + "port-version": 1 + }, { "git-tree": "feb5623c3cdb647c97be873f2a625468305d8a5d", "version-string": "2020-08-01", diff --git a/versions/c-/coin.json b/versions/c-/coin.json index 4f7ef31b880d28..6a52852b545626 100644 --- a/versions/c-/coin.json +++ b/versions/c-/coin.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5bf7296f7f3b3655c946280754bbbfbbbf9db2a", + "version-string": "4.0.0", + "port-version": 4 + }, { "git-tree": "e30ae46d4c197521650caf4ca0b407d8f50655e9", "version-string": "4.0.0", diff --git a/versions/c-/collada-dom.json b/versions/c-/collada-dom.json index daa821db21dc2c..05ec0b2a77fdf9 100644 --- a/versions/c-/collada-dom.json +++ b/versions/c-/collada-dom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c33581459a51d5ef7cc436a8aebb9d330224a6f3", + "version-string": "2.5.0", + "port-version": 6 + }, { "git-tree": "478639eba0f0d87ac17cf3b28a072edaeed35ca5", "version-string": "2.5.0", diff --git a/versions/c-/cpp-redis.json b/versions/c-/cpp-redis.json index bfe2327b22d821..866315dc8b6759 100644 --- a/versions/c-/cpp-redis.json +++ b/versions/c-/cpp-redis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ba5958862c17ab2f3943b0134b2ad756ae73613", + "version-string": "4.3.1", + "port-version": 4 + }, { "git-tree": "f412f0e14f585bccfec1add71fd23ad9ea8f1f9f", "version-string": "4.3.1", diff --git a/versions/c-/cppcodec.json b/versions/c-/cppcodec.json index 8e5bae079ca74f..bfdbbaccc7159a 100644 --- a/versions/c-/cppcodec.json +++ b/versions/c-/cppcodec.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb6b230ec592ba7bc54d85013007f501971f03fa", + "version-string": "0.2", + "port-version": 2 + }, { "git-tree": "9546342ff5d08d76abe6774215ae78778494eb55", "version-string": "0.2", diff --git a/versions/c-/cpuid.json b/versions/c-/cpuid.json index 955c93f17b1a71..658b88edbc9566 100644 --- a/versions/c-/cpuid.json +++ b/versions/c-/cpuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad9738f7afc11f1fa0cea524f4d79dd6cc644e7c", + "version": "0.5.1", + "port-version": 2 + }, { "git-tree": "7b5a58587efff685ef5c166bcfba98542606f8ca", "version": "0.5.1", diff --git a/versions/c-/curlpp.json b/versions/c-/curlpp.json index f9f3404fba1693..5c17f5665f4a5e 100644 --- a/versions/c-/curlpp.json +++ b/versions/c-/curlpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c4802498d8b285cc5a3d3bcb574db0fe22267381", + "version-string": "2018-06-15", + "port-version": 5 + }, { "git-tree": "a764bda6f69b8e79e3f3734ceb420d4c814e9605", "version-string": "2018-06-15", diff --git a/versions/d-/dlib.json b/versions/d-/dlib.json index 9d7cd262cf8b8b..bc4a094ae6df12 100644 --- a/versions/d-/dlib.json +++ b/versions/d-/dlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "971541b525e72e4ca19c0e20d7ddf7ce1cd2ee83", + "version": "19.21", + "port-version": 6 + }, { "git-tree": "58207e22ff2355358bee9fb607b03b6cab1030c6", "version": "19.21", diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json index a9b91c65a578d1..ecd4b4cc411504 100644 --- a/versions/e-/easyloggingpp.json +++ b/versions/e-/easyloggingpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9cf908bc2aaf8f7ec50bf54b111aed600ca50282", + "version": "9.97.0", + "port-version": 1 + }, { "git-tree": "3978e3f41876c42b501eb4d246ee98dea886fa36", "version": "9.97.0", diff --git a/versions/e-/edlib.json b/versions/e-/edlib.json index 3ba91696c5020e..b78f396ff8175d 100644 --- a/versions/e-/edlib.json +++ b/versions/e-/edlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65bdc2cad90a351c2f7e0034f3f6acabe54f5e1c", + "version": "1.2.7", + "port-version": 1 + }, { "git-tree": "bbcb572fded319dcbb790d57132513c35be4a9fa", "version": "1.2.7", diff --git a/versions/f-/fcl.json b/versions/f-/fcl.json index d1d2324f4dc8f3..96a11d1afafe23 100644 --- a/versions/f-/fcl.json +++ b/versions/f-/fcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "63fe0d8f64a95e4eef52c44f1e2a6e6240ca53fe", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "b42fbc15486c71cabb2db25ccea7032240b87201", "version": "0.7.0", diff --git a/versions/f-/fftw3.json b/versions/f-/fftw3.json index 6a5b99192bf833..ecf57550990fb0 100644 --- a/versions/f-/fftw3.json +++ b/versions/f-/fftw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3cd11b90c63cec797697dc3235ae1e22e4a509fc", + "version": "3.3.10", + "port-version": 2 + }, { "git-tree": "ecf3602083e88dce78331f58590466c22664c584", "version": "3.3.10", diff --git a/versions/f-/flann.json b/versions/f-/flann.json index 21fc14ccfa3ba7..19f01d96b347cf 100644 --- a/versions/f-/flann.json +++ b/versions/f-/flann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7677f18c73aa0d5216af138b2fba9bcea56e3f1b", + "version-date": "2019-04-07", + "port-version": 3 + }, { "git-tree": "960ba6bf0c3bb6c11b5a4a9bf413a21947927e08", "version-date": "2019-04-07", diff --git a/versions/f-/flatbuffers.json b/versions/f-/flatbuffers.json index 22bcf8a9f91537..f6805b6df702c0 100644 --- a/versions/f-/flatbuffers.json +++ b/versions/f-/flatbuffers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "65234b189b0389dfa2f89f58f33e56037a03b519", + "version-string": "2.0.0", + "port-version": 2 + }, { "git-tree": "8bfd2df96c7250148b6dee28e4cd5be2fa785b60", "version-string": "2.0.0", diff --git a/versions/f-/fluidlite.json b/versions/f-/fluidlite.json index 1598640a8bbbd9..aa2fb6e81f577d 100644 --- a/versions/f-/fluidlite.json +++ b/versions/f-/fluidlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b725769d2d4d23c2bdc4adcc9ca9d02a4421868", + "version-string": "2020-08-27", + "port-version": 2 + }, { "git-tree": "b603d9cfa1d22dac6387ecff4bd32bc0ba8e5331", "version-string": "2020-08-27", diff --git a/versions/f-/folly.json b/versions/f-/folly.json index 8a92dabc1f4892..689c82a265ba9b 100644 --- a/versions/f-/folly.json +++ b/versions/f-/folly.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8bba15fddadde6b40f2984f6928aa24a50aa2b47", + "version-string": "2021.06.14.00", + "port-version": 3 + }, { "git-tree": "747fc5abd957e03e89acad08f28925927fb5f33b", "version-string": "2021.06.14.00", diff --git a/versions/f-/freeglut.json b/versions/f-/freeglut.json index 24bc7f74479cb0..c2006f58908b6f 100644 --- a/versions/f-/freeglut.json +++ b/versions/f-/freeglut.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf1c06d0a07b6bc80a63c3825a4d136f5307a2f4", + "version-string": "3.2.1", + "port-version": 7 + }, { "git-tree": "a7907c76300594175b45a5fa05bacee2b91c9a65", "version-string": "3.2.1", diff --git a/versions/f-/freeopcua.json b/versions/f-/freeopcua.json index 35378c0eaeeb93..1ee029185b51db 100644 --- a/versions/f-/freeopcua.json +++ b/versions/f-/freeopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "15fe1dbb4b4b3283072825b22ef29acdf5835950", + "version-string": "20190125", + "port-version": 5 + }, { "git-tree": "ffcfcd9ddd2551f8ca82752def0ff7a30b6bb2dc", "version-string": "20190125", diff --git a/versions/f-/functions-framework-cpp.json b/versions/f-/functions-framework-cpp.json index 1ab6c47b7bef93..b275187ef7ec8c 100644 --- a/versions/f-/functions-framework-cpp.json +++ b/versions/f-/functions-framework-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45f93916767e8d79db63cc94b8274f98ee1bef1c", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "ea5cc9295e63419251720c34b2bbd02d710333c0", "version": "1.0.0", diff --git a/versions/g-/geogram.json b/versions/g-/geogram.json index 47abac7be8190e..0c7d105d61b8f2 100644 --- a/versions/g-/geogram.json +++ b/versions/g-/geogram.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6d9b9c3652ebbfd846a225ba06a1867e0a6ba25", + "version": "1.7.6", + "port-version": 1 + }, { "git-tree": "3a40b9eb7d73644d89c9987fc0b8da98c7ae2a94", "version": "1.7.6", diff --git a/versions/g-/geographiclib.json b/versions/g-/geographiclib.json index 8fd320c34ee033..120c03144d7ec0 100644 --- a/versions/g-/geographiclib.json +++ b/versions/g-/geographiclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ffcb729874bc667cba2368b92d64dc04effb73c", + "version": "1.52", + "port-version": 1 + }, { "git-tree": "b80d69df97ec60b98b202270c5357b72729fbc90", "version": "1.52", diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index 66e1f854141122..91db8f5628bb8a 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6c0d2d8c997256eff5049eb3fa3447a5387d2f9", + "version-string": "1.6.0", + "port-version": 2 + }, { "git-tree": "b01f8f51c6a395b7a7d44f772bec78a0445e51d6", "version-string": "1.6.0", diff --git a/versions/g-/gflags.json b/versions/g-/gflags.json index e1530e30903bde..e20ff41292fc09 100644 --- a/versions/g-/gflags.json +++ b/versions/g-/gflags.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c1fe35b0a7e9b5b9f58b16c6cc08caa108fb945", + "version-string": "2.2.2", + "port-version": 5 + }, { "git-tree": "16da9eec785be4c0d0ad3e32cc3b39698d0611b1", "version-string": "2.2.2", diff --git a/versions/g-/graphite2.json b/versions/g-/graphite2.json index 3d577c07c594da..8d6de06834a4b2 100644 --- a/versions/g-/graphite2.json +++ b/versions/g-/graphite2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a2078beaafe054dd4f6bd162af48de28f3f9194c", + "version-string": "1.3.14", + "port-version": 2 + }, { "git-tree": "544016171b9bf0c28449d96cfa9ccebdb3c1aecb", "version-string": "1.3.14", diff --git a/versions/g-/graphqlparser.json b/versions/g-/graphqlparser.json index e1240fb532907e..d08ff94d1b12b8 100644 --- a/versions/g-/graphqlparser.json +++ b/versions/g-/graphqlparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "654424cc8d0176569961a4c128fef87478375296", + "version-string": "0.7.0", + "port-version": 3 + }, { "git-tree": "1bddecee3cfbfe8826912f0b5de6bdf0b4f1a880", "version-string": "0.7.0", diff --git a/versions/g-/graphviz.json b/versions/g-/graphviz.json index f1a81d1cbfb5c0..32fd45fe604ccc 100644 --- a/versions/g-/graphviz.json +++ b/versions/g-/graphviz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61316edc3deb64749cf84f70f5b0dbd669c06a9e", + "version-semver": "2.49.1", + "port-version": 1 + }, { "git-tree": "3d90393fc2bdb3a481e1a371fbbb8e816d0317b6", "version-semver": "2.49.1", diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json index 92fd218b8065a0..fb3ee3693dbed9 100644 --- a/versions/h-/hiredis.json +++ b/versions/h-/hiredis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c7e16c5c3a9f612e1b46f96be41389b8ba11e6a", + "version": "1.0.2", + "port-version": 1 + }, { "git-tree": "934af68bcc045c77d7b46cef46b6a8cdf97ce2b8", "version": "1.0.2", diff --git a/versions/h-/hyperscan.json b/versions/h-/hyperscan.json index f8b74cab063a56..7003a010247b76 100644 --- a/versions/h-/hyperscan.json +++ b/versions/h-/hyperscan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14beb85ac3a741f5504afa923832eb651795f530", + "version-string": "5.3.0", + "port-version": 3 + }, { "git-tree": "442b4a5b4350665bc7d9fb3b0f734f1fa088973a", "version-string": "5.3.0", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index fdcdf644dd8e9f..f8db7cf33b15fe 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9814112513cedc4fdc1d0eaf8f633278c792decb", + "version": "0.9.4", + "port-version": 1 + }, { "git-tree": "e03d26f1f8688463fda90a1ace2dc38a1045954d", "version": "0.9.4", diff --git a/versions/i-/iniparser.json b/versions/i-/iniparser.json index 3bd03f7bb2256f..4e334c1bfb4f72 100644 --- a/versions/i-/iniparser.json +++ b/versions/i-/iniparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c89c4448c92e7d793775802d4d6cba832af7457", + "version-string": "2020-04-06", + "port-version": 2 + }, { "git-tree": "203982e2f00de4e77024c34486cae13d34c15779", "version-string": "2020-04-06", diff --git a/versions/i-/itpp.json b/versions/i-/itpp.json index 488d58ee064a9c..9c7418be64bd05 100644 --- a/versions/i-/itpp.json +++ b/versions/i-/itpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "be87bf8b58b5f6b0fb3f19dfc14acf24114332d0", + "version-semver": "4.3.1", + "port-version": 8 + }, { "git-tree": "e10390b026b73c352e32bdf11ea58230a7e51d53", "version-semver": "4.3.1", diff --git a/versions/j-/jansson.json b/versions/j-/jansson.json index f01eec560765ae..6ee4877460ec93 100644 --- a/versions/j-/jansson.json +++ b/versions/j-/jansson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f63fad0d7e1e2a98826543c3b1f671c34b104a72", + "version-string": "2.13.1", + "port-version": 2 + }, { "git-tree": "e03158776f244589d6af861b4ceefabd4cd9fd12", "version-string": "2.13.1", diff --git a/versions/j-/json11.json b/versions/j-/json11.json index e745d3e6d4416e..688a24f272c3cf 100644 --- a/versions/j-/json11.json +++ b/versions/j-/json11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b99e54cd236396200e19e414a7375d0463d5ba5a", + "version-string": "2017-06-20", + "port-version": 4 + }, { "git-tree": "d1c9cec8f84522bd1bb53aae81708000ef8952de", "version-string": "2017-06-20", diff --git a/versions/l-/libbson.json b/versions/l-/libbson.json index f9e63d686572ab..34edeaa0f555d8 100644 --- a/versions/l-/libbson.json +++ b/versions/l-/libbson.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ad46cf0f2a10843d03cfd2e0388527561f9e2f0", + "version": "1.17.6", + "port-version": 1 + }, { "git-tree": "e2f9da5cc55e652deed81d0feb7aa71be2a1fdef", "version": "1.17.6", diff --git a/versions/l-/libcerf.json b/versions/l-/libcerf.json index 254b6011a446b2..7a35564988a5ec 100644 --- a/versions/l-/libcerf.json +++ b/versions/l-/libcerf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4bb4a4b841e96215ccc856fa1b8acc56270a1e4", + "version-string": "1.13", + "port-version": 2 + }, { "git-tree": "c9e514fd4a455016bc077fb0af7703a947868273", "version-string": "1.13", diff --git a/versions/l-/libconfuse.json b/versions/l-/libconfuse.json index d0f3f205f5056f..5d810f7bdbdd98 100644 --- a/versions/l-/libconfuse.json +++ b/versions/l-/libconfuse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0af146d2f574294e6d2da2492203ebd1ddf5e2eb", + "version-string": "2019-07-14", + "port-version": 2 + }, { "git-tree": "aacb676c2698728d17cb0540a3dd4f538bcc2d66", "version-string": "2019-07-14", diff --git a/versions/l-/libevent.json b/versions/l-/libevent.json index 8b985467980002..46161cb6eb17cd 100644 --- a/versions/l-/libevent.json +++ b/versions/l-/libevent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0ac053f302fc802ef35f3349ad4af562a5a806d", + "version-string": "2.1.12", + "port-version": 3 + }, { "git-tree": "16a3ac34416a0b208f97f9a0afdeecdcc60699e1", "version-string": "2.1.12", diff --git a/versions/l-/libevhtp.json b/versions/l-/libevhtp.json index 3324e7fd60607f..a28699da2dccb8 100644 --- a/versions/l-/libevhtp.json +++ b/versions/l-/libevhtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c28b6abc864cbfff6270358471bf9e97fd063710", + "version-string": "1.2.18", + "port-version": 2 + }, { "git-tree": "98227c0bbd789df044f349480c00378c5c56984c", "version-string": "1.2.18", diff --git a/versions/l-/libfort.json b/versions/l-/libfort.json index 319568ce4b8dc5..a4111418ede913 100644 --- a/versions/l-/libfort.json +++ b/versions/l-/libfort.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b7925f1a567ce07e29977e40eb17f2a520922c8", + "version-semver": "0.4.2", + "port-version": 1 + }, { "git-tree": "3323e3e7b75556050db8a8ff3adeb38c3b7bfb98", "version-semver": "0.4.2", diff --git a/versions/l-/libfreenect2.json b/versions/l-/libfreenect2.json index f0c0ee3b1ec8cc..51d96893507f44 100644 --- a/versions/l-/libfreenect2.json +++ b/versions/l-/libfreenect2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cdedefe776984f442e8af70b0e0738d12d56fafa", + "version-string": "0.2.0", + "port-version": 7 + }, { "git-tree": "00c2b86114dcda5bd91f93d83e696b85148037a0", "version-string": "0.2.0", diff --git a/versions/l-/libgd.json b/versions/l-/libgd.json index 1a4733a9317849..9b02569ba0327b 100644 --- a/versions/l-/libgd.json +++ b/versions/l-/libgd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "998c59c287a0d8a172944f46fbfce71c8967394f", + "version-semver": "2.3.2", + "port-version": 1 + }, { "git-tree": "e1e99522d139bf2f72dc030d433117e8f430885f", "version-semver": "2.3.2", diff --git a/versions/l-/libgta.json b/versions/l-/libgta.json index 6db93eda974c9a..cf86d9ae5cae9e 100644 --- a/versions/l-/libgta.json +++ b/versions/l-/libgta.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "18ddcdbec1183e609dbb8a76bddbadd4b3ee6d72", + "version-string": "1.0.8", + "port-version": 3 + }, { "git-tree": "876f40188d1fb98aa9e19123118134f2a58925da", "version-string": "1.0.8", diff --git a/versions/l-/libkeyfinder.json b/versions/l-/libkeyfinder.json index 3ec54157c557a0..04281ace1e201b 100644 --- a/versions/l-/libkeyfinder.json +++ b/versions/l-/libkeyfinder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4b04b3607199759e373764303378ab76ef9c158", + "version-string": "2.2.5", + "port-version": 1 + }, { "git-tree": "d2f8022bca9bc70894c26b7d73437eadfa9b9bca", "version-string": "2.2.5", diff --git a/versions/l-/libkml.json b/versions/l-/libkml.json index 3654170b971468..8b24a120d2d2bf 100644 --- a/versions/l-/libkml.json +++ b/versions/l-/libkml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ce9dd050baf9ae42da2bb0c6d0feae1241b6e01", + "version-string": "1.3.0", + "port-version": 8 + }, { "git-tree": "c2647d8b06542a475e0de99aedc3ce939a10b35d", "version-string": "1.3.0", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index 9e3f9f8e5406f1..054fcfe0c94ecd 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b099f8cb08e44ae21fb5d019369cd4c598e305eb", + "version-string": "2019-06-13", + "port-version": 3 + }, { "git-tree": "fbcfa0caff95b07142e28cd453690c26d62bc025", "version-string": "2019-06-13", diff --git a/versions/l-/liblo.json b/versions/l-/liblo.json index d7bfa72e19441c..2088b8489c3550 100644 --- a/versions/l-/liblo.json +++ b/versions/l-/liblo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00837a43b20b0ccf863f3574b34714f8f7d3bd37", + "version-string": "0.31", + "port-version": 2 + }, { "git-tree": "c4df5a746fe8bc045b2287c0b6122717757a30a3", "version-string": "0.31", diff --git a/versions/l-/libmikmod.json b/versions/l-/libmikmod.json index d096d0cb0e7383..a1735fbbef8965 100644 --- a/versions/l-/libmikmod.json +++ b/versions/l-/libmikmod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed94a83a674fb90d5884515fc763840df2ec0375", + "version-string": "3.3.11.1", + "port-version": 10 + }, { "git-tree": "e0dd535be8f9f4f477cc21a745724b2c42f93d01", "version-string": "3.3.11.1", diff --git a/versions/l-/libmt32emu.json b/versions/l-/libmt32emu.json index dc8386caeb3d83..5fd4ad5af52c40 100644 --- a/versions/l-/libmt32emu.json +++ b/versions/l-/libmt32emu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "da8f12396b75ff5163acd190bf7f79a3d0b5098a", + "version": "2.5.3", + "port-version": 1 + }, { "git-tree": "a1893148ecacd02e10cb14c90539f23687b597b6", "version": "2.5.3", diff --git a/versions/l-/libpqxx.json b/versions/l-/libpqxx.json index 37d3671b44c72c..8166fc426ec7f3 100644 --- a/versions/l-/libpqxx.json +++ b/versions/l-/libpqxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c4df2807e229629d04aecc0a66f11219d4dcbcd", + "version-semver": "7.6.0", + "port-version": 2 + }, { "git-tree": "37cce5f0124f6f870793a650937ca978c1fc4750", "version-semver": "7.6.0", diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json index 7dbd18fd981531..034b48d44842b5 100644 --- a/versions/l-/libproxy.json +++ b/versions/l-/libproxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "159dadd3ff9a4ba3ce1fec74a933980aa895ee02", + "version": "0.4.17", + "port-version": 1 + }, { "git-tree": "ab650ac3327ba4cd214ca5de79a626574594c63f", "version": "0.4.17", diff --git a/versions/l-/libqrencode.json b/versions/l-/libqrencode.json index e078d4768f7a17..1bcd7daf6467e1 100644 --- a/versions/l-/libqrencode.json +++ b/versions/l-/libqrencode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "52b904615b0dcea800292c9eaf2f06da32f2160d", + "version-semver": "4.1.1", + "port-version": 1 + }, { "git-tree": "89b4597328eb8e7399b0cdaf1342c0abc74771c7", "version-semver": "4.1.1", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index 2dfb0785b2287c..bfca292f7a2a64 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d418b5510b8ed058f73035681f3e1de5aa94c28", + "version-string": "1.7.0", + "port-version": 2 + }, { "git-tree": "7a309365a3b06309b47543f15b421ecfe4421d6a", "version-string": "1.7.0", diff --git a/versions/l-/libsbml.json b/versions/l-/libsbml.json index 7faeb17e46b5f0..9dd6c3d51314de 100644 --- a/versions/l-/libsbml.json +++ b/versions/l-/libsbml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12ec3d5ff69d3e8b960c03b9b0ae8127663227f5", + "version": "5.19.0", + "port-version": 1 + }, { "git-tree": "6b31fe78dcb93a9935119d5b9bcefbb1f3950d6a", "version": "5.19.0", diff --git a/versions/l-/libtins.json b/versions/l-/libtins.json index 431224b36190f9..4089a88cfc5e47 100644 --- a/versions/l-/libtins.json +++ b/versions/l-/libtins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b853d9ee6a83bba8f0d0b6e568b664b9729aadea", + "version-string": "4.3", + "port-version": 2 + }, { "git-tree": "bd15852b2fb7471ef3eb99bb1fc827627f9643f8", "version-string": "4.3", diff --git a/versions/l-/libtorrent.json b/versions/l-/libtorrent.json index d1863361dbe367..919372b2ee67ac 100644 --- a/versions/l-/libtorrent.json +++ b/versions/l-/libtorrent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8ee811432c2056d11d9f2d346142c2c1be44a328", + "version": "1.2.14", + "port-version": 1 + }, { "git-tree": "39f5e5060bcc3eafc3c4be164289aaad15027b1d", "version": "1.2.14", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index 54c474063fd05e..e78d116b4012b9 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "579de2367eb835f65d3c480b02af4ee72b6b4f24", + "version-semver": "4.2.2", + "port-version": 3 + }, { "git-tree": "ea372a08d75d1a3a7c37a99b1daf9e85ba017ccf", "version-semver": "4.2.2", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index 6403a027698b25..c68eb249ae2a50 100644 --- a/versions/l-/libxlsxwriter.json +++ b/versions/l-/libxlsxwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "13265cc8f10d1cd14a723dfda351ac6ad6625e60", + "version-semver": "1.1.3", + "port-version": 1 + }, { "git-tree": "6355a7b3fb476841c51ccde98e671ca3b181b000", "version-semver": "1.1.3", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index 644ab6b2429ff1..dd0a4566f94cd1 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1885ed4c6d71d255e97ef46bc1dd3b5353686845", + "version": "1.17.6", + "port-version": 1 + }, { "git-tree": "a9982d4176e1480433444ecace3b389bb8ca8570", "version": "1.17.6", diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index 0fe4043f198df9..d107dafb3ba64d 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a94c1fb81601520c8a9766865574b5e132e1c848", + "version": "2.0.12", + "port-version": 2 + }, { "git-tree": "ef8ae230660456d039888e201ea521f58caf0951", "version": "2.0.12", diff --git a/versions/m-/msgpack.json b/versions/m-/msgpack.json index d21cc8c3e55921..4c220e85a79dbb 100644 --- a/versions/m-/msgpack.json +++ b/versions/m-/msgpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "33927863a8eae2ea7c816389e7ef3dbdcc00382a", + "version-string": "3.3.0", + "port-version": 2 + }, { "git-tree": "ed079e3006a28fcef3dc95c108e03d20027de40c", "version-string": "3.3.0", diff --git a/versions/m-/msgpack11.json b/versions/m-/msgpack11.json index ae8c3847cdd489..d7390a5071c070 100644 --- a/versions/m-/msgpack11.json +++ b/versions/m-/msgpack11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "628d7986a87b3b326796bcacd492aabe846c4ea9", + "version": "0.0.10", + "port-version": 3 + }, { "git-tree": "7d1352df08016b8ba7b2de4fa027e4b37825bb8e", "version": "0.0.10", diff --git a/versions/m-/munit.json b/versions/m-/munit.json index 05267b5019ddf2..36ea7690b0310b 100644 --- a/versions/m-/munit.json +++ b/versions/m-/munit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6489068c02b6a87d45ab01592ef733e22904bd7", + "version-string": "2019-04-06", + "port-version": 3 + }, { "git-tree": "e73f59b95da8f7045c775a0fc263c5d2da26b320", "version-string": "2019-04-06", diff --git a/versions/m-/muparser.json b/versions/m-/muparser.json index 53f8dfd72541b8..481fd9ef30f80e 100644 --- a/versions/m-/muparser.json +++ b/versions/m-/muparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffef8786866359a02e3e50d62bcda523967fddce", + "version-string": "2.3.2", + "port-version": 2 + }, { "git-tree": "60a779cc21e94cf9ef8a7df52a0177d79f298e2d", "version-string": "2.3.2", diff --git a/versions/n-/nanoflann.json b/versions/n-/nanoflann.json index a62b9a89779d93..cda02d8a58aaaa 100644 --- a/versions/n-/nanoflann.json +++ b/versions/n-/nanoflann.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "481ec544fb82ec73f6f0e01d1333f412d3e82d2d", + "version": "1.3.2", + "port-version": 1 + }, { "git-tree": "d9c4ef40eda67ef94cca10e5a50ac679ac0a34ad", "version": "1.3.2", diff --git a/versions/n-/nanomsg.json b/versions/n-/nanomsg.json index 6737ed193034e0..efb1e3ff83f606 100644 --- a/versions/n-/nanomsg.json +++ b/versions/n-/nanomsg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffe814aa129dfc6a1cdfc5d38e7a441d2b2fc47b", + "version-string": "1.1.5", + "port-version": 4 + }, { "git-tree": "6c34a4dcd9b1c045f989cc67c0dad5ac594696d4", "version-string": "1.1.5", diff --git a/versions/n-/nlopt.json b/versions/n-/nlopt.json index e6bc5fb323ec3b..e4eed6a6b5c235 100644 --- a/versions/n-/nlopt.json +++ b/versions/n-/nlopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8307558e59725a365e7139c8e5fd371e5d3481e4", + "version-string": "2.7.0", + "port-version": 1 + }, { "git-tree": "7702c2f9e4c4ef687a026196c6a707c390e676a5", "version-string": "2.7.0", diff --git a/versions/o-/octomap.json b/versions/o-/octomap.json index 0e046deb987047..59c664cca449b2 100644 --- a/versions/o-/octomap.json +++ b/versions/o-/octomap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b192c5e8bc138bffe383afcadf8bc91a0130d58", + "version-string": "1.9.5", + "port-version": 2 + }, { "git-tree": "603822afeb335c9005956f3791668fb4a449d7b4", "version-string": "1.9.5", diff --git a/versions/o-/ode.json b/versions/o-/ode.json index aecb5f5dbe5b92..696381184d9de7 100644 --- a/versions/o-/ode.json +++ b/versions/o-/ode.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a0ed0d341666ec960fd7596bb2ac66737604cd3", + "version-string": "0.16.1", + "port-version": 2 + }, { "git-tree": "1b4c24af36c99cf547f0a2026062a91d1d78f90a", "version-string": "0.16.1", diff --git a/versions/o-/ois.json b/versions/o-/ois.json index 620afbf81ea1e3..bbefaa8d60a12b 100644 --- a/versions/o-/ois.json +++ b/versions/o-/ois.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0d8ca34b4a48f37cf731b920ab96995bcc81a8f4", + "version-string": "1.5", + "port-version": 3 + }, { "git-tree": "def78425a0a4688d94604ff68965f64a024d1aeb", "version-string": "1.5", diff --git a/versions/o-/oniguruma.json b/versions/o-/oniguruma.json index 36bf67599a5429..32d80a4245e00e 100644 --- a/versions/o-/oniguruma.json +++ b/versions/o-/oniguruma.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "107a3e6619a149a76b52ef9c9f4dbb1b7343a456", + "version": "6.9.7.1", + "port-version": 1 + }, { "git-tree": "9f6ae35330e50d5e767e67141441506c26a832fb", "version": "6.9.7.1", diff --git a/versions/o-/opencc.json b/versions/o-/opencc.json index 2dff67ec4d53e1..f4b6768bfa4a18 100644 --- a/versions/o-/opencc.json +++ b/versions/o-/opencc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7f1756b470f31ae2da4a2d65eb5c409d4798b8e", + "version-string": "2020-04-26", + "port-version": 9 + }, { "git-tree": "4236b23738ad59b661253bf3a449355d838cb7dc", "version-string": "2020-04-26", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 1b67c28e9e71ad..bfe2c174b14e2f 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b1ce552e00d88857ad35695435b353caf9ad4c2", + "version": "2.3.7.2", + "port-version": 4 + }, { "git-tree": "a7643bd1ea5b962a2b98a9c6c991a15021fab17d", "version": "2.3.7.2", diff --git a/versions/o-/orocos-kdl.json b/versions/o-/orocos-kdl.json index 1dec315b2aea4c..7510517179491c 100644 --- a/versions/o-/orocos-kdl.json +++ b/versions/o-/orocos-kdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "265346d96786cba36fc5ddc4e2a734dfa755746d", + "version": "1.4", + "port-version": 5 + }, { "git-tree": "c882240643c0748d609a52adec04abd93ffc120e", "version": "1.4", diff --git a/versions/o-/osg.json b/versions/o-/osg.json index 2100c623efcc74..6ca076e4782efa 100644 --- a/versions/o-/osg.json +++ b/versions/o-/osg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "233201eee3ebfaaac75ba9696d12209e9a1fbc32", + "version-string": "3.6.5", + "port-version": 10 + }, { "git-tree": "786c1469d92ebae55703e2be690bd72083a800a3", "version-string": "3.6.5", diff --git a/versions/p-/p-ranav-csv2.json b/versions/p-/p-ranav-csv2.json index 6a6708f8ab96f0..722000a3731ecf 100644 --- a/versions/p-/p-ranav-csv2.json +++ b/versions/p-/p-ranav-csv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f944640e81f4ed10db72f2708212b475c3e83b2", + "version-string": "2020-12-14", + "port-version": 2 + }, { "git-tree": "64496087c54cb9b4fec4b566cbfc7f6182a753a2", "version-string": "2020-12-14", diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index 59e677fd34ab71..f149a9d52b07df 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "32f16f4b317bc068cc45259ca36d23ebd16a3099", + "version": "1.11.1", + "port-version": 5 + }, { "git-tree": "7d8ce8bc561fa2b928b9a5075c4f8659c86b5906", "version": "1.11.1", diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json index cce975d7432edf..ebcf8ac2b8d828 100644 --- a/versions/p-/plplot.json +++ b/versions/p-/plplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad6d85b2cc702beabe146047209cb580174ceea8", + "version-string": "5.13.0", + "port-version": 11 + }, { "git-tree": "d3b92bbff064890556b4d4f759d2cea20041e79d", "version-string": "5.13.0", diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json index 178f2f0d4f4954..4c9bf56ae56bb3 100644 --- a/versions/p-/polyclipping.json +++ b/versions/p-/polyclipping.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6701622648b7f5ab04e6552b312d1cd8543de99c", + "version-string": "6.4.2", + "port-version": 9 + }, { "git-tree": "715616bd21d5d75a9101ac86da0188263b9774c9", "version-string": "6.4.2", diff --git a/versions/p-/ponder.json b/versions/p-/ponder.json index 117c9967dc4cae..6dab8444b76c64 100644 --- a/versions/p-/ponder.json +++ b/versions/p-/ponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "84acf8367d19d188309207790cc07c149e0464f3", + "version-string": "3.0.0", + "port-version": 3 + }, { "git-tree": "07af14a9b06787eef8901b771c95aa0633f50c07", "version-string": "3.0.0", diff --git a/versions/p-/poppler.json b/versions/p-/poppler.json index 4ee0511e4a0e8d..0b609a36c975af 100644 --- a/versions/p-/poppler.json +++ b/versions/p-/poppler.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f15f5c09cc977692e0c081d39e7e85f2229efe1", + "version": "20.12.1", + "port-version": 6 + }, { "git-tree": "a864cfe9349a7922e6ce0d44a28f6845a40597e0", "version": "20.12.1", diff --git a/versions/p-/portaudio.json b/versions/p-/portaudio.json index e0640fc378eb5d..a44336cb8ba62e 100644 --- a/versions/p-/portaudio.json +++ b/versions/p-/portaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b090c514cbfce25b342a884efc937ede432df55a", + "version": "19.7", + "port-version": 2 + }, { "git-tree": "d6254fa08fb9fd57617978cdc98a3890bc1205d1", "version": "19.7", diff --git a/versions/p-/ppconsul.json b/versions/p-/ppconsul.json index 505d18a0dceed5..a9592c3a53cf68 100644 --- a/versions/p-/ppconsul.json +++ b/versions/p-/ppconsul.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f08036342cef58a0f47fc01fe02bdf5c8e5d09c", + "version-string": "0.5", + "port-version": 3 + }, { "git-tree": "8c7383164dcbe93141eb683eeeb362381ebbd4cd", "version-string": "0.5", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 493c25123d1f61..6b130f7906d886 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9820d99ae1c7e23e42ee1bb3372ecee0de42c2bc", + "version-semver": "3.7.0", + "port-version": 2 + }, { "git-tree": "e27352fbab2a4e815a478265032a4faa60d34060", "version-semver": "3.7.0", diff --git a/versions/r-/rbdl.json b/versions/r-/rbdl.json index 832ea5af49ba5c..cc9bc2e16bce36 100644 --- a/versions/r-/rbdl.json +++ b/versions/r-/rbdl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48b44c8cf3286f0ce9c87b95e126634997d03137", + "version": "2.6.0", + "port-version": 2 + }, { "git-tree": "44606d1a4e33112ca45274e823041ad877e62623", "version": "2.6.0", diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json index f0b1fa8703fdc8..e8a75384e86625 100644 --- a/versions/r-/realsense2.json +++ b/versions/r-/realsense2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7c65d664a018a4d4922c844e8cbcbb05ba597eb", + "version": "2.49.0", + "port-version": 1 + }, { "git-tree": "196cd1829bb74acd275abdcbc5344238b5414661", "version": "2.49.0", diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json index 02919e2fd4cfbf..76887d28a2ad0d 100644 --- a/versions/r-/redis-plus-plus.json +++ b/versions/r-/redis-plus-plus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4da3b8dd26c05426ae7d2a844f854423e9d0624d", + "version-semver": "1.3.1", + "port-version": 1 + }, { "git-tree": "a8bbde067a459c4fff18d7c63eb682487f1955e5", "version-semver": "1.3.1", diff --git a/versions/r-/rpclib.json b/versions/r-/rpclib.json index a78ca9521f3215..6bf33a47b202d3 100644 --- a/versions/r-/rpclib.json +++ b/versions/r-/rpclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b19a21c8e68b3e689495b961664f63450ffdd35d", + "version-semver": "2.3.0", + "port-version": 1 + }, { "git-tree": "8479e995436633dafc97a4dd951beff832bc3367", "version-semver": "2.3.0", diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json index 9f3a61f0033ee0..41ce62151682ba 100644 --- a/versions/r-/rtaudio.json +++ b/versions/r-/rtaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89b766b5d1b97a4e306dd358db18a2a5d0505824", + "version-date": "2021-08-15", + "port-version": 1 + }, { "git-tree": "551c1a7847652aa574e0af5af18d00b6e55fd034", "version-date": "2021-08-15", diff --git a/versions/s-/sais.json b/versions/s-/sais.json index 4a74c9313f4c25..36b41e722fcc12 100644 --- a/versions/s-/sais.json +++ b/versions/s-/sais.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4fb1d4e7743c5f80f03e1b8fe4f1863b9a12e7d", + "version-string": "2.4.1", + "port-version": 3 + }, { "git-tree": "44efe5647de5509bb4073f3c03305a8bbf4c27f2", "version-string": "2.4.1", diff --git a/versions/s-/sdformat6.json b/versions/s-/sdformat6.json index 7a75fc099cbe60..e664b40922444b 100644 --- a/versions/s-/sdformat6.json +++ b/versions/s-/sdformat6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1273532dcedd66beb82c6ce89024abac0e385761", + "version": "6.2.0", + "port-version": 3 + }, { "git-tree": "9104c5c84ce079686624adeaa3032543415acda2", "version": "6.2.0", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index 5a139553e2fe4e..f4c97fd2a99403 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7469c8030fdd88ef6beb9aef9458c91269a5bb8", + "version": "0.1.95", + "port-version": 1 + }, { "git-tree": "107679132fbb9a52ab4c995583db14a748554565", "version": "0.1.95", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index 3f603aff786625..890ad1c331b088 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0020fb767148212015f8839835689e193060c88e", + "version-semver": "1.8.1", + "port-version": 2 + }, { "git-tree": "f9b941ad6737569ae7c400625b6fc8aac8140683", "version-semver": "1.8.1", diff --git a/versions/s-/sol2.json b/versions/s-/sol2.json index 0a05b4a8c8f9a6..1aa7ab94a61aa1 100644 --- a/versions/s-/sol2.json +++ b/versions/s-/sol2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fca1a728c9f2ff6db12a00fafeae82f69a903b48", + "version-string": "3.2.2", + "port-version": 2 + }, { "git-tree": "1dd17eacaccf75a326029df0e26ad1b20c940ad5", "version-string": "3.2.2", diff --git a/versions/s-/soxr.json b/versions/s-/soxr.json index 99dea5a0cfa9de..5f0f63d391f52f 100644 --- a/versions/s-/soxr.json +++ b/versions/s-/soxr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fca92eeca8f38c1662193dd443e401c5fe7fbfc7", + "version": "0.1.3", + "port-version": 6 + }, { "git-tree": "0ea0e47df2ab6381e68ffae49c05c4de0a37f665", "version": "0.1.3", diff --git a/versions/s-/sparsehash.json b/versions/s-/sparsehash.json index 2b77e12c0bb931..b88c835fdecfd7 100644 --- a/versions/s-/sparsehash.json +++ b/versions/s-/sparsehash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c835b4a393784616327a8e5532769096fc443375", + "version": "2.0.4", + "port-version": 2 + }, { "git-tree": "0bb73fddc7adde82c92bad4cd03ad629d978db6b", "version": "2.0.4", diff --git a/versions/s-/stxxl.json b/versions/s-/stxxl.json index dd71c34f60504a..25fcc439f2d420 100644 --- a/versions/s-/stxxl.json +++ b/versions/s-/stxxl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "081a4c6de6290ce05297cc873fa0fde245133a8a", + "version-string": "2018-11-15", + "port-version": 4 + }, { "git-tree": "dc3442a34aeab30bf9b04d7d49775527303c8811", "version-string": "2018-11-15", diff --git a/versions/s-/superlu.json b/versions/s-/superlu.json index b0fb8c288e5a41..7d13bfe6b5a188 100644 --- a/versions/s-/superlu.json +++ b/versions/s-/superlu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88c6ebaf1337aa31cf3afec8250fd7ee1b990b6e", + "version-string": "2020-01-07", + "port-version": 4 + }, { "git-tree": "610cdc3479021b9cf5608147a656469c0a8e7bf7", "version-string": "2020-01-07", diff --git a/versions/t-/thrift.json b/versions/t-/thrift.json index de82f925644785..2461b1285e6b6e 100644 --- a/versions/t-/thrift.json +++ b/versions/t-/thrift.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5db8f1e2a1a482177c2ff99e74d34e25b60fb7f4", + "version-string": "0.13.0", + "port-version": 2 + }, { "git-tree": "c7225d5805f82b8027c801f08d162bbd41b2b99f", "version-string": "0.13.0", diff --git a/versions/t-/tidy-html5.json b/versions/t-/tidy-html5.json index 976625125f9a1e..372b548580bc74 100644 --- a/versions/t-/tidy-html5.json +++ b/versions/t-/tidy-html5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba5557c5b17df0184bd2ee1eeee06ec1131576f8", + "version-string": "5.7.28", + "port-version": 4 + }, { "git-tree": "6b446932540002cb1b664d7f5286fdb6c0f7af28", "version-string": "5.7.28", diff --git a/versions/t-/tinyobjloader.json b/versions/t-/tinyobjloader.json index a459ab3ab47f9d..b7f2aac5b17548 100644 --- a/versions/t-/tinyobjloader.json +++ b/versions/t-/tinyobjloader.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e64b6f58d80d1ff9b43cd9700c8996d0b5b764d", + "version-string": "2.0.0-rc2", + "port-version": 2 + }, { "git-tree": "42c09a92244dd67f0c8a1a92e688173413517dee", "version-string": "2.0.0-rc2", diff --git a/versions/t-/tinyply.json b/versions/t-/tinyply.json index 9c7c4b10bab283..107004406373de 100644 --- a/versions/t-/tinyply.json +++ b/versions/t-/tinyply.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4b7f95bfaf84b3013c43310740340d8951068f5", + "version-string": "2020-05-22", + "port-version": 2 + }, { "git-tree": "24e53b2ef803576808b7e5176301b979e01fcd1c", "version-string": "2020-05-22", diff --git a/versions/t-/tlx.json b/versions/t-/tlx.json index be300c08c714bb..28d3f7c8d3e86a 100644 --- a/versions/t-/tlx.json +++ b/versions/t-/tlx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "268aa098ddcd207b076e10ebf1ef398aae834243", + "version-string": "0.5.20191212", + "port-version": 2 + }, { "git-tree": "5b51b49c324771227a0c96e16b595496f1094cd9", "version-string": "0.5.20191212", diff --git a/versions/t-/tmxparser.json b/versions/t-/tmxparser.json index 4c2c7eea850f9b..c22057839e5abe 100644 --- a/versions/t-/tmxparser.json +++ b/versions/t-/tmxparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a0f3908517c6bf7656418385bb0fff72314a2a4e", + "version-string": "2.1.0", + "port-version": 6 + }, { "git-tree": "a1d1d7f89ce4ee1ebb8eaea792da1ab3f21367e9", "version-string": "2.1.0", diff --git a/versions/u-/uchardet.json b/versions/u-/uchardet.json index 11892e0a289352..c8c1d09fa58a50 100644 --- a/versions/u-/uchardet.json +++ b/versions/u-/uchardet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bef8f2cbbb385ec635dbca67e3783496a15cb4a0", + "version-date": "2021-09-03", + "port-version": 1 + }, { "git-tree": "46d56e5d20654b04eb3b97cc2ae46b1ae7c07eb9", "version-date": "2021-09-03", diff --git a/versions/u-/unittest-cpp.json b/versions/u-/unittest-cpp.json index fe90fa82995c34..7bbc55419e223e 100644 --- a/versions/u-/unittest-cpp.json +++ b/versions/u-/unittest-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "454c93c4ef93d7661b8bf6743996167f921b687f", + "version-semver": "2.0.0", + "port-version": 3 + }, { "git-tree": "22f6d4e1405162f02c4d25e742fcf0dcc0503146", "version-semver": "2.0.0", diff --git a/versions/u-/uriparser.json b/versions/u-/uriparser.json index e5a5c312417884..b4704cd8998a67 100644 --- a/versions/u-/uriparser.json +++ b/versions/u-/uriparser.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e6605cac24d7d9cc91af51a7ea3b1da2adde159", + "version-semver": "0.9.5", + "port-version": 1 + }, { "git-tree": "cdf383916004ac2ef910b4ea82632d8474763956", "version-semver": "0.9.5", diff --git a/versions/u-/usrsctp.json b/versions/u-/usrsctp.json index f06592bfef660e..44c86c94478843 100644 --- a/versions/u-/usrsctp.json +++ b/versions/u-/usrsctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fcf79007e70c0b2872453841199dae68e7ac01fa", + "version": "0.9.5.0", + "port-version": 1 + }, { "git-tree": "f2af7adab77a27695756a783a27f5c602ded9082", "version": "0.9.5.0", diff --git a/versions/w-/wampcc.json b/versions/w-/wampcc.json index 5d742fa5f6cc7f..6c5eb55af194d3 100644 --- a/versions/w-/wampcc.json +++ b/versions/w-/wampcc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00037d098a709bf36797f4cc768b5e62ad4db387", + "version-string": "2019-09-04", + "port-version": 2 + }, { "git-tree": "720c45bd8d01b9d57a41cc41debd9858a7461654", "version-string": "2019-09-04", diff --git a/versions/x-/xalan-c.json b/versions/x-/xalan-c.json index 2b730965799b9b..b9b318b55cc874 100644 --- a/versions/x-/xalan-c.json +++ b/versions/x-/xalan-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2a2f5f469a510da8d58186fc7f58f8fc9b1e83d6", + "version": "1.12", + "port-version": 1 + }, { "git-tree": "f09497ebb2b151b2ea0576a42ca284bcad3bf70d", "version": "1.12", diff --git a/versions/x-/xerces-c.json b/versions/x-/xerces-c.json index a2a8d80a065ec7..2f515db5c405f2 100644 --- a/versions/x-/xerces-c.json +++ b/versions/x-/xerces-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b920ebcb559e728e512c42e7e27ce5db58aba440", + "version-string": "3.2.3", + "port-version": 3 + }, { "git-tree": "f14ab8d047187d9621974f90d1981534ae7eb58a", "version-string": "3.2.3", diff --git a/versions/x-/xlnt.json b/versions/x-/xlnt.json index c12760bf18991e..cda2e706dbbc4d 100644 --- a/versions/x-/xlnt.json +++ b/versions/x-/xlnt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "225346f8b24e3d09ad6b63b928ed2e6f1cfed4d4", + "version": "1.5.0", + "port-version": 3 + }, { "git-tree": "e6bb2b46d0e6bf4e603c93c974bd2eb704e3a520", "version": "1.5.0", diff --git a/versions/x-/xtensor-fftw.json b/versions/x-/xtensor-fftw.json index 340a6b42790756..b5496821117490 100644 --- a/versions/x-/xtensor-fftw.json +++ b/versions/x-/xtensor-fftw.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ca6e7889f9ae5d1d9a627d7591e22962cde621c4", + "version-string": "2019-11-30", + "port-version": 2 + }, { "git-tree": "a83a72b6737956e551fe4ddbaa12564048141cec", "version-string": "2019-11-30", diff --git a/versions/z-/z3.json b/versions/z-/z3.json index 1f82e94b62a301..ee81c0872d8c9c 100644 --- a/versions/z-/z3.json +++ b/versions/z-/z3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "679ab881c1277be69ffc601a568e3b47d4d55432", + "version": "4.8.12", + "port-version": 1 + }, { "git-tree": "898df3d611ad4a833593adbfd7f2a3b0e686fc2b", "version": "4.8.12", diff --git a/versions/z-/zeromq.json b/versions/z-/zeromq.json index 7c15ff356bbcc3..28e134099eb40c 100644 --- a/versions/z-/zeromq.json +++ b/versions/z-/zeromq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "423c351e8759303bc9ba74a065ce9b983a5f85f5", + "version": "4.3.4", + "port-version": 2 + }, { "git-tree": "43f1c320c2710a2f0efa61b54608a33da707bd43", "version": "4.3.4", diff --git a/versions/z-/zyre.json b/versions/z-/zyre.json index 2ab1d8056cbe70..d32f3b0fd1746e 100644 --- a/versions/z-/zyre.json +++ b/versions/z-/zyre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2efde0db3fd2fb13029cd66d585311ac1d6d146b", + "version-string": "2019-07-07", + "port-version": 3 + }, { "git-tree": "118b2285a26addbacaefb2f573f27e1a13bd4af3", "version-string": "2019-07-07", diff --git a/versions/z-/zziplib.json b/versions/z-/zziplib.json index b17a3621fe7978..708656c376de95 100644 --- a/versions/z-/zziplib.json +++ b/versions/z-/zziplib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af9957469a45f5b512845c4f180af1a7e4e2e886", + "version-string": "0.13.71", + "port-version": 3 + }, { "git-tree": "a83631e1e1b136f52e8367253ef162fb369f36a3", "version-string": "0.13.71", From 8f2e688e2de48b89c9b54f0d159788437e2480d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 28 Oct 2021 07:58:20 +0200 Subject: [PATCH 0941/1858] [kf5kcmutils] new port (#20199) * Add kf5kcmutils port * Fixed kf5kcmutils for windows * [kf5*] update to 5.75.0 * [kf5kcmutils] update to latest spec * [kf5kcmutils] use semVer * [kf5kcmutils] add PACKAGE_NAME to vcpkg_cmake_config_fixup * [kf5kcmutils] update to 5.84.0 * [kf5kcmutils] fix versioning scheme * [kf5kcmutils] fix SHA sum * [kf5kcmutils] fix cmake config for static builds * [kf5kcmutils] add gettext tools dependency * [kf5kcmutils] update versions * [kf5kcmutils] reduce patch size * [kf5kcmutils] update versions Co-authored-by: Kuntal Majumder --- ports/kf5kcmutils/fix_cmake_config.patch | 28 +++++++++++++++++++ ports/kf5kcmutils/portfile.cmake | 30 +++++++++++++++++++++ ports/kf5kcmutils/vcpkg.json | 34 ++++++++++++++++++++++++ versions/baseline.json | 4 +++ versions/k-/kf5kcmutils.json | 9 +++++++ 5 files changed, 105 insertions(+) create mode 100644 ports/kf5kcmutils/fix_cmake_config.patch create mode 100644 ports/kf5kcmutils/portfile.cmake create mode 100644 ports/kf5kcmutils/vcpkg.json create mode 100644 versions/k-/kf5kcmutils.json diff --git a/ports/kf5kcmutils/fix_cmake_config.patch b/ports/kf5kcmutils/fix_cmake_config.patch new file mode 100644 index 00000000000000..0932e46ad39a62 --- /dev/null +++ b/ports/kf5kcmutils/fix_cmake_config.patch @@ -0,0 +1,28 @@ +diff --git a/KF5KCMUtilsConfig.cmake.in b/KF5KCMUtilsConfig.cmake.in +index 9871fba..ddcf6ea 100644 +--- a/KF5KCMUtilsConfig.cmake.in ++++ b/KF5KCMUtilsConfig.cmake.in +@@ -4,6 +4,20 @@ include(CMakeFindDependencyMacro) + find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") + find_dependency(KF5Service "@KF_DEP_VERSION@") + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") ++ find_dependency(Qt5Qml "@REQUIRED_QT_VERSION@") ++ find_dependency(Qt5Quick "@REQUIRED_QT_VERSION@") ++ find_dependency(Qt5QuickWidgets "@REQUIRED_QT_VERSION@") ++ ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5I18n "@KF_DEP_VERSION@") ++ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") ++ find_dependency(KF5XmlGui "@KF_DEP_VERSION@") ++ find_dependency(KF5Declarative "@KF_DEP_VERSION@") ++endif() ++ + @PACKAGE_SETUP_AUTOMOC_VARIABLES@ + + include("${CMAKE_CURRENT_LIST_DIR}/KF5KCMUtilsTargets.cmake") +-- +GitLab + diff --git a/ports/kf5kcmutils/portfile.cmake b/ports/kf5kcmutils/portfile.cmake new file mode 100644 index 00000000000000..58678e71420ce7 --- /dev/null +++ b/ports/kf5kcmutils/portfile.cmake @@ -0,0 +1,30 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcmutils + REF v5.84.0 + SHA512 e5f6347416143775e660430d582db3a60153b75063e7079bb3743043132f2e2f0d01234229f5eb1b4678e29d6981d03bd826622924ec7e385900df9067676f5b + HEAD_REF master + PATCHES + fix_cmake_config.patch +) + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5KCMUtils CONFIG_PATH lib/cmake/KF5KCMUtils) + +vcpkg_copy_pdbs() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file diff --git a/ports/kf5kcmutils/vcpkg.json b/ports/kf5kcmutils/vcpkg.json new file mode 100644 index 00000000000000..ac0a6a3b97eee3 --- /dev/null +++ b/ports/kf5kcmutils/vcpkg.json @@ -0,0 +1,34 @@ +{ + "name": "kf5kcmutils", + "version": "5.84.0", + "description": "Utilities for KDE System Settings modules", + "homepage": "https://api.kde.org/frameworks/kcmutils/html/index.html", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "kf5configwidgets", + "kf5coreaddons", + "kf5declarative", + "kf5guiaddons", + "kf5i18n", + "kf5itemviews", + "kf5service", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index df343e6be77b16..67f3a54316477c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3088,6 +3088,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5kcmutils": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5kio": { "baseline": "5.84.0", "port-version": 0 diff --git a/versions/k-/kf5kcmutils.json b/versions/k-/kf5kcmutils.json new file mode 100644 index 00000000000000..98edb5c2b209d8 --- /dev/null +++ b/versions/k-/kf5kcmutils.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7faf8114473ed03a92c1d5537e4c07cbf31b0ef2", + "version": "5.84.0", + "port-version": 0 + } + ] +} From fe52e5ac8fefc22d1994b5984cff17e913a9d03f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 28 Oct 2021 08:01:45 +0200 Subject: [PATCH 0942/1858] [imath] Add new port (#20968) * Add new port imath 3.1.3 * Update CI baseline * Fix file name casing * Update git-tree hash Co-authored-by: chausner --- ports/imath/portfile.cmake | 23 +++++++++++++++++++++++ ports/imath/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/i-/imath.json | 9 +++++++++ 4 files changed, 52 insertions(+) create mode 100644 ports/imath/portfile.cmake create mode 100644 ports/imath/vcpkg.json create mode 100644 versions/i-/imath.json diff --git a/ports/imath/portfile.cmake b/ports/imath/portfile.cmake new file mode 100644 index 00000000000000..a1c87da56e7ee8 --- /dev/null +++ b/ports/imath/portfile.cmake @@ -0,0 +1,23 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO AcademySoftwareFoundation/Imath + REF v3.1.3 + SHA512 a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DIMATH_INSTALL_SYM_LINK=OFF + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Imath) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/imath/vcpkg.json b/ports/imath/vcpkg.json new file mode 100644 index 00000000000000..3383d617d3c08e --- /dev/null +++ b/ports/imath/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "imath", + "version": "3.1.3", + "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", + "homepage": "https://github.com/AcademySoftwareFoundation/Imath", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 67f3a54316477c..ddf5332c4c4bb0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2808,6 +2808,10 @@ "baseline": "2.3.0", "port-version": 1 }, + "imath": { + "baseline": "3.1.3", + "port-version": 0 + }, "imgui": { "baseline": "1.85", "port-version": 0 diff --git a/versions/i-/imath.json b/versions/i-/imath.json new file mode 100644 index 00000000000000..88b098345fe651 --- /dev/null +++ b/versions/i-/imath.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a244498f54d1b743d54d9d4a89d5ea556346a22e", + "version": "3.1.3", + "port-version": 0 + } + ] +} From df957c11b20b50e9c6471aa10209bcec8716a856 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 28 Oct 2021 08:03:47 +0200 Subject: [PATCH 0943/1858] [alsa] New port (#20954) * Add new port alsa 1.2.5.1 * Update CI baseline * Fix static builds * Update git-tree hash Co-authored-by: chausner --- ...1-control-empty-fix-the-static-build.patch | 28 +++++++++++++ ports/alsa/portfile.cmake | 42 +++++++++++++++++++ ports/alsa/vcpkg.json | 7 ++++ versions/a-/alsa.json | 9 ++++ versions/baseline.json | 4 ++ 5 files changed, 90 insertions(+) create mode 100644 ports/alsa/0001-control-empty-fix-the-static-build.patch create mode 100644 ports/alsa/portfile.cmake create mode 100644 ports/alsa/vcpkg.json create mode 100644 versions/a-/alsa.json diff --git a/ports/alsa/0001-control-empty-fix-the-static-build.patch b/ports/alsa/0001-control-empty-fix-the-static-build.patch new file mode 100644 index 00000000000000..c5ec3d124ac1ac --- /dev/null +++ b/ports/alsa/0001-control-empty-fix-the-static-build.patch @@ -0,0 +1,28 @@ +From 81e7923fbfad45b2f353a4d6e3053af51f5f7d0b Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Tue, 15 Jun 2021 23:21:42 +0200 +Subject: [PATCH] control: empty - fix the static build + +Reported-by: Jan Palus +Fixes: https://github.com/alsa-project/alsa-lib/issues/157 +Signed-off-by: Jaroslav Kysela +--- + src/control/control_empty.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/control/control_empty.c b/src/control/control_empty.c +index 49d1026c..c9b048c1 100644 +--- a/src/control/control_empty.c ++++ b/src/control/control_empty.c +@@ -30,7 +30,7 @@ + + #ifndef PIC + /* entry for static linking */ +-const char *_snd_module_ctl_empty = ""; ++const char *_snd_module_control_empty = ""; + #endif + + /*! \page control_plugins +-- +2.33.0 + diff --git a/ports/alsa/portfile.cmake b/ports/alsa/portfile.cmake new file mode 100644 index 00000000000000..c0e6f2f3dacc6d --- /dev/null +++ b/ports/alsa/portfile.cmake @@ -0,0 +1,42 @@ +if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + message(FATAL_ERROR "Package only supports Linux platform.") +endif() + +message( +"alsa currently requires the following libraries from the system package manager: + autoconf libtool +These can be installed on Ubuntu systems via sudo apt install autoconf libtool" +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO alsa-project/alsa-lib + REF v1.2.5.1 + SHA512 1c8613e520bd24ec2332b677a35d1c49171781f6408be61c79ec90d143d424d8df6e1c9e22e082d331022e0fe858145f7ea214a7b731ed5e306762194b49d50e + HEAD_REF master + PATCHES + 0001-control-empty-fix-the-static-build.patch +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_OPTS --enable-shared=yes --enable-static=no) +else() + set(BUILD_OPTS --enable-shared=no --enable-static=yes) +endif() + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${BUILD_OPTS} + --disable-python +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools/alsa/debug") + +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/alsa/vcpkg.json b/ports/alsa/vcpkg.json new file mode 100644 index 00000000000000..6590e42eb6a6df --- /dev/null +++ b/ports/alsa/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "alsa", + "version": "1.2.5.1", + "description": "The Advanced Linux Sound Architecture (ALSA) - library", + "homepage": "https://www.alsa-project.org/", + "supports": "linux" +} diff --git a/versions/a-/alsa.json b/versions/a-/alsa.json new file mode 100644 index 00000000000000..3da4e4546e5a2c --- /dev/null +++ b/versions/a-/alsa.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "03a04f17b2dfb480de15a07b58188b161dbe6dda", + "version": "1.2.5.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index ddf5332c4c4bb0..582c24fa8b2fe9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -60,6 +60,10 @@ "baseline": "5.2.6.0", "port-version": 1 }, + "alsa": { + "baseline": "1.2.5.1", + "port-version": 0 + }, "ampl-asl": { "baseline": "2020-11-11", "port-version": 1 From ee81fd3a7281bbf26f5881e1cb5956e62d319c2c Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 28 Oct 2021 08:05:10 +0200 Subject: [PATCH 0944/1858] [hwloc] Update to 2.5 and switch to make (#20905) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * hwloc try and error * hwloc fix build. * format manifest * version stuff * remove supports expression. Copy COPYING from src dir * format manifest * overwrite version * update ci baseline hpx uses _mm_pause which seems to be undefined on arm64 maybe hpx requires a supports field? * switch to version in manifest * version stuff * add maintainer Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * version stuff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/hwloc/CMakeLists.txt | 69 -------------------- ports/hwloc/fix_shared_win_build.patch | 56 ++++++++++++++++ ports/hwloc/fix_wrong_ifdef.patch | 13 ++++ ports/hwloc/portfile.cmake | 90 +++++++++++++------------- ports/hwloc/vcpkg.json | 6 +- scripts/ci.baseline.txt | 1 + versions/baseline.json | 4 +- versions/h-/hwloc.json | 5 ++ 8 files changed, 125 insertions(+), 119 deletions(-) delete mode 100644 ports/hwloc/CMakeLists.txt create mode 100644 ports/hwloc/fix_shared_win_build.patch create mode 100644 ports/hwloc/fix_wrong_ifdef.patch diff --git a/ports/hwloc/CMakeLists.txt b/ports/hwloc/CMakeLists.txt deleted file mode 100644 index 9407322a696eed..00000000000000 --- a/ports/hwloc/CMakeLists.txt +++ /dev/null @@ -1,69 +0,0 @@ -cmake_minimum_required(VERSION 3.0) -project(hwloc - LANGUAGES C - VERSION 2.2.0) - -configure_file(contrib/windows/hwloc_config.h include/hwloc/autogen/config.h COPYONLY) -configure_file(contrib/windows/static-components.h include/static-components.h COPYONLY) -configure_file(contrib/windows/private_config.h include/private/autogen/config.h COPYONLY) - -file(READ ${CMAKE_CURRENT_BINARY_DIR}/include/private/autogen/config.h PRIVATE_CONFIG_H) -string(REPLACE "#define HAVE_DECL_SNPRINTF 0" "#define HAVE_DECL_SNPRINTF 1" PRIVATE_CONFIG_H "${PRIVATE_CONFIG_H}") -string(REPLACE "#define HAVE_DECL_STRTOULL 0" "#define HAVE_DECL_STRTOULL 1" PRIVATE_CONFIG_H "${PRIVATE_CONFIG_H}") -if(CMAKE_SIZEOF_VOID_P EQUAL 4) - string(REPLACE "/* #undef HWLOC_X86_32_ARCH */" "#define HWLOC_X86_32_ARCH 1" PRIVATE_CONFIG_H "${PRIVATE_CONFIG_H}") - string(REPLACE "#define HWLOC_X86_64_ARCH 1" "/* #undef HWLOC_X86_64_ARCH */" PRIVATE_CONFIG_H "${PRIVATE_CONFIG_H}") - string(REPLACE "#define SIZEOF_VOID_P 8" "#define SIZEOF_VOID_P 4" PRIVATE_CONFIG_H "${PRIVATE_CONFIG_H}") -endif() -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/include/private/autogen/config.h "${PRIVATE_CONFIG_H}") - -add_library(libhwloc - hwloc/base64.c - hwloc/bind.c - hwloc/bitmap.c - hwloc/components.c - hwloc/distances.c - hwloc/diff.c - hwloc/misc.c - hwloc/pci-common.c - hwloc/shmem.c - hwloc/topology-noos.c - hwloc/topology-synthetic.c - hwloc/topology-windows.c - hwloc/topology-x86.c - hwloc/topology-xml-nolibxml.c - hwloc/topology-xml.c - hwloc/topology.c - hwloc/traversal.c - hwloc/dolib.c) - -set_target_properties(libhwloc PROPERTIES DEFINE_SYMBOL _USRDLL) - -add_executable(hwloc-info - utils/hwloc/hwloc-info.c) - -target_link_libraries(hwloc-info PRIVATE libhwloc) - -foreach(Target IN ITEMS libhwloc hwloc-info) - target_include_directories(${Target} PRIVATE ./include ./hwloc ${CMAKE_CURRENT_BINARY_DIR}/include) - target_compile_definitions(${Target} PRIVATE _CRT_SECURE_NO_WARNINGS) -endforeach(Target) - -install(TARGETS libhwloc - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib) - -install(TARGETS hwloc-info - RUNTIME DESTINATION tools/hwloc) -if(BUILD_SHARED_LIBS) - install(TARGETS libhwloc - RUNTIME DESTINATION tools/hwloc) -endif(BUILD_SHARED_LIBS) - - -if(NOT HWLOC_SKIP_INCLUDES) - install(FILES include/hwloc.h DESTINATION include) - install(DIRECTORY include/hwloc DESTINATION include FILES_MATCHING PATTERN "*.h") - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/hwloc/autogen/config.h DESTINATION include/hwloc/autogen) -endif() diff --git a/ports/hwloc/fix_shared_win_build.patch b/ports/hwloc/fix_shared_win_build.patch new file mode 100644 index 00000000000000..20ce59f7bc1bbe --- /dev/null +++ b/ports/hwloc/fix_shared_win_build.patch @@ -0,0 +1,56 @@ +diff --git a/configure.ac b/configure.ac +index 44180d1aa..6bba9c435 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -101,10 +101,11 @@ AM_PROG_CC_C_O + m4_version_prereq([2.70], [], [AC_PROG_CC_C99]) + CFLAGS=$CFLAGS_save + +-AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) +-AS_IF([test -z "$CC_FOR_BUILD"],[ +- AC_SUBST([CC_FOR_BUILD], [$CC]) +-]) ++# only needed to run/build dolib.exe which can be replaced with a bash script.... ++# AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) ++# AS_IF([test -z "$CC_FOR_BUILD"],[ ++# AC_SUBST([CC_FOR_BUILD], [$CC]) ++# ]) + + #################################################################### + # CLI arguments +@@ -132,6 +133,8 @@ AS_IF([test "$enable_embedded_mode" != "yes"], + #################################################################### + + AC_SUBST([libhwloc_so_version]) ++libhwloc_so_version_current_minus_age=`expr [[ $libhwloc_so_version=~ ([[:digit:]]+):[[:digit:]]+:([[:digit:]]+) ]] && real_so_ver=$(expr ${BASH_REMATCH[1]} - ${BASH_REMATCH[2]})` ++AC_SUBST(libhwloc_so_version_current_minus_age) + + # Setup the hwloc core + HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot build hwloc core])], [1]) +diff --git a/hwloc/Makefile.am b/hwloc/Makefile.am +index 48cc81c5b..5aac67d4f 100644 +--- a/hwloc/Makefile.am ++++ b/hwloc/Makefile.am +@@ -191,16 +191,15 @@ if HWLOC_HAVE_WINDOWS + + LC_MESSAGES=C + export LC_MESSAGES +-ldflags += -Xlinker --output-def -Xlinker .libs/libhwloc.def + + if HWLOC_HAVE_MS_LIB +-dolib$(EXEEXT): dolib.c +- $(CC_FOR_BUILD) $< -o $@ +-.libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT) +- [ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib ++# dolib$(EXEEXT): dolib.c ++# $(CC_FOR_BUILD) $< -o $@ ++# .libs/libhwloc.lib: libhwloc.la dolib$(EXEEXT) ++# [ ! -r .libs/libhwloc.def ] || ./dolib$(EXEEXT) "$(HWLOC_MS_LIB)" $(HWLOC_MS_LIB_ARCH) .libs/libhwloc.def $(libhwloc_so_version) .libs/libhwloc.lib ++.libs/libhwloc.lib: libhwloc.la ++ [ ! -r .libs/libhwloc.def ] || "$(HWLOC_MS_LIB)" /machine:$(HWLOC_MS_LIB_ARCH) /def:.libs/libhwloc.def /name:libhwloc-$(libhwloc_so_version_current_minus_age) /out:.libs/libhwloc.lib + all-local: .libs/libhwloc.lib +-clean-local: +- $(RM) dolib$(EXEEXT) + endif HWLOC_HAVE_MS_LIB + + install-exec-hook: diff --git a/ports/hwloc/fix_wrong_ifdef.patch b/ports/hwloc/fix_wrong_ifdef.patch new file mode 100644 index 00000000000000..490715c815bafe --- /dev/null +++ b/ports/hwloc/fix_wrong_ifdef.patch @@ -0,0 +1,13 @@ +diff --git a/hwloc/topology.c b/hwloc/topology.c +index 01e5a863c..211f2cbd1 100644 +--- a/hwloc/topology.c ++++ b/hwloc/topology.c +@@ -69,7 +69,7 @@ + * it will break in cygwin, we'll have to use both putenv() and SetEnvironmentVariable(). + * Hopefully L0 will be provide a way to enable Sysman without env vars before it happens. + */ +-#ifdef HWLOC_HAVE_ATTRIBUTE_CONSTRUCTOR ++#if HWLOC_HAVE_ATTRIBUTE_CONSTRUCTOR + static void hwloc_constructor(void) __attribute__((constructor)); + static void hwloc_constructor(void) + { diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake index 47036a028b8928..2da5a2f5010e27 100644 --- a/ports/hwloc/portfile.cmake +++ b/ports/hwloc/portfile.cmake @@ -1,54 +1,54 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-mpi/hwloc - REF 263908a2c1f21c0e221a8d1f6472daf3a1fc07b9 # hwloc-2.2.0 - SHA512 87f3d267781fd1f8907b0c080868b56943c7c2caecae5c0fbe9a55f8c5e9453bb6b7892834ba37696c1ebadd8d7bfdd5e513ea72a075211b808a1d5803ea4b8e + REF 5e185ccfff2728fa351cea41f6d9fefebfb88078 # hwloc-2.5.0 + SHA512 96f6421c40eede3a3c273a1ffa06accc43767421d5fb7b402a83caea1ef1a3bb8282c08ed94bc696296f37f3df80cd86403dac1012f2218b674569c8afcf3de9 + PATCHES fix_wrong_ifdef.patch + fix_shared_win_build.patch ) -if (VCPKG_TARGET_IS_WINDOWS) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - ) - - vcpkg_install_cmake() - - file(READ ${CURRENT_PACKAGES_DIR}/include/hwloc/autogen/config.h PUBLIC_CONFIG_H) - string(REPLACE "defined( DECLSPEC_EXPORTS )" "0" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}") - if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "defined( _USRDLL )" "0" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}") - else() - string(REPLACE "defined( _USRDLL )" "1" PUBLIC_CONFIG_H "${PUBLIC_CONFIG_H}") - endif() - file(WRITE ${CURRENT_PACKAGES_DIR}/include/hwloc/autogen/config.h "${PUBLIC_CONFIG_H}") - - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/tools) -else() - message(WARNING "${PORT} currently requires the following tool from the system package manager:\n libtool") - - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG - OPTIONS - --disable-libxml2 - --disable-opencl - ) - - vcpkg_install_make() - - file(GLOB HWLOC_EXEC ${CURRENT_PACKAGES_DIR}/bin) - message("HWLOC_EXEC: ${HWLOC_EXEC}") - if (HWLOC_EXEC) - file(COPY ${HWLOC_EXEC} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(OPTIONS ac_cv_prog_cc_c99= # To avoid the compiler check for C99 which will fail for MSVC + --disable-plugin-dlopen) +endif() +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + list(APPEND OPTIONS "HWLOC_LDFLAGS=-no-undefined") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +vcpkg_configure_make( + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + OPTIONS + ${OPTIONS} + --disable-libxml2 + --disable-opencl + --disable-cairo + --disable-cuda + --disable-libudev + --disable-levelzero + --disable-nvml + --disable-rsmi + --disable-pci + #--disable-cpuid + #--disable-picky +) + +vcpkg_install_make() +vcpkg_fixup_pkgconfig() +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/COPYING.txt" + "${CURRENT_PACKAGES_DIR}/debug/README.txt" + "${CURRENT_PACKAGES_DIR}/debug/NEWS.txt" + "${CURRENT_PACKAGES_DIR}/COPYING.txt" + "${CURRENT_PACKAGES_DIR}/README.txt" + "${CURRENT_PACKAGES_DIR}/NEWS.txt" + ) diff --git a/ports/hwloc/vcpkg.json b/ports/hwloc/vcpkg.json index bcd406ad024ee5..27f599aa0eb157 100644 --- a/ports/hwloc/vcpkg.json +++ b/ports/hwloc/vcpkg.json @@ -1,11 +1,11 @@ { "name": "hwloc", - "version-string": "2.2.0", - "port-version": 1, + "version": "2.5.0", + "maintainers": "bgoglin", "description": [ "Portable Hardware Locality (hwloc)", "The Portable Hardware Locality (hwloc) software package provides a portable abstraction (across OS, versions, architectures, ...) of the hierarchical topology of modern architectures, including NUMA memory nodes, sockets, shared caches, cores and simultaneous multithreading. It also gathers various system attributes such as cache and memory information as well as the locality of I/O devices such as network interfaces, InfiniBand HCAs or GPUs." ], "homepage": "https://github.com/open-mpi/hwloc", - "supports": "!(uwp | arm | arm64)" + "supports": "!uwp" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dfb0e1afdf03e8..e288e7ebe4e2df 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -427,6 +427,7 @@ healpix:x64-osx=fail hiredis:arm-uwp=fail hiredis:x64-uwp=fail hpx:x64-windows-static=fail +hpx:arm64-windows=fail hpx:x64-linux=fail hunspell:x64-windows-static-md=fail ideviceinstaller:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index 582c24fa8b2fe9..a2cc284bd2fb7d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2697,8 +2697,8 @@ "port-version": 5 }, "hwloc": { - "baseline": "2.2.0", - "port-version": 1 + "baseline": "2.5.0", + "port-version": 0 }, "hyperscan": { "baseline": "5.3.0", diff --git a/versions/h-/hwloc.json b/versions/h-/hwloc.json index 985c25776df017..6e03ac905d052b 100644 --- a/versions/h-/hwloc.json +++ b/versions/h-/hwloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f06abb37eb6d851f82bca48c437744fd1c642dc3", + "version": "2.5.0", + "port-version": 0 + }, { "git-tree": "564b5a894249dd831dbb8ad8792fe30d12ac353a", "version-string": "2.2.0", From 34d9926046038494cabc5d63f922b30d7a2bea97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 28 Oct 2021 14:07:18 +0800 Subject: [PATCH 0945/1858] [opensubdiv] Add features (#20895) * [opensubdiv] Add features * version * Add more judgment * version * fix mac build - upstream bug * Re-fix dependency tbb * version * fix judgment * version * In order to remove them, change header file permission * version --- ports/opensubdiv/fix-build-type.patch | 20 ++++ ports/opensubdiv/fix-dependencies.patch | 146 ++++++++++++++++++++++++ ports/opensubdiv/fix-mac-build.patch | 13 +++ ports/opensubdiv/portfile.cmake | 113 +++++++++++++++--- ports/opensubdiv/vcpkg.json | 71 +++++++++++- versions/baseline.json | 2 +- versions/o-/opensubdiv.json | 5 + 7 files changed, 351 insertions(+), 19 deletions(-) create mode 100644 ports/opensubdiv/fix-build-type.patch create mode 100644 ports/opensubdiv/fix-dependencies.patch create mode 100644 ports/opensubdiv/fix-mac-build.patch diff --git a/ports/opensubdiv/fix-build-type.patch b/ports/opensubdiv/fix-build-type.patch new file mode 100644 index 00000000000000..c8ea3e6d06eb1b --- /dev/null +++ b/ports/opensubdiv/fix-build-type.patch @@ -0,0 +1,20 @@ +diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt +index 72c5b7e..ca24488 100644 +--- a/opensubdiv/CMakeLists.txt ++++ b/opensubdiv/CMakeLists.txt +@@ -124,6 +124,7 @@ if (NOT NO_LIB) + + #--------------------------------------------------------------------------- + ++ if (NOT BUILD_SHARED_LIBS) + # Build static libs ------------------------------------ + add_library(osd_static_cpu + STATIC +@@ -146,6 +147,7 @@ if (NOT NO_LIB) + ) + + install( TARGETS osd_static_cpu DESTINATION "${CMAKE_LIBDIR_BASE}" ) ++ endif() + + if( OSD_GPU ) + # this macro uses FindCUDA.cmake to compile .cu kernel files diff --git a/ports/opensubdiv/fix-dependencies.patch b/ports/opensubdiv/fix-dependencies.patch new file mode 100644 index 00000000000000..8b04aa45f3a35a --- /dev/null +++ b/ports/opensubdiv/fix-dependencies.patch @@ -0,0 +1,146 @@ +diff --git a/cmake/FindDXSDK.cmake b/cmake/FindDXSDK.cmake +index a396d97..edd06db 100644 +--- a/cmake/FindDXSDK.cmake ++++ b/cmake/FindDXSDK.cmake +@@ -48,15 +48,8 @@ if (WIN32) + "C:/Program Files/Microsoft DirectX SDK*/Include" + ) + +- if ("${CMAKE_GENERATOR}" MATCHES "[Ww]in64" OR +- "${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64") +- set(ARCH x64) +- else() +- set(ARCH x86) +- endif() +- + find_path(LIBRARY_DIR +- d3d11.lib ++ d3dx11.lib + PATHS + "${DXSDK_LOCATION}/Lib/${ARCH}" + "$ENV{DXSDK_LOCATION}/Lib/${ARCH}" +@@ -70,7 +63,7 @@ if (WIN32) + + set(DXSDK_LIBRARY_DIR ${LIBRARY_DIR}) + +- foreach(DX_LIB d3d11 d3dcompiler) ++ foreach(DX_LIB d3dx11 d3dcompiler) + + find_library(DXSDK_${DX_LIB}_LIBRARY + NAMES +diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake +index 2f4efd3..5f4f85b 100644 +--- a/cmake/FindTBB.cmake ++++ b/cmake/FindTBB.cmake +@@ -30,6 +30,10 @@ + # TBB_LIBRARIES - The libraries needed to use TBB + + # Obtain include directory ++find_package(TBB CONFIG REQUIRED) ++set(TBB_FOUND 1) ++set(TBB_LIBRARIES TBB::tbb) ++if (0) + if (WIN32) + find_path(TBB_INCLUDE_DIR + NAMES +@@ -180,4 +184,4 @@ mark_as_advanced( + TBB_INCLUDE_DIR + TBB_LIBRARIES + ) +- ++endif() +diff --git a/examples/dxPtexViewer/CMakeLists.txt b/examples/dxPtexViewer/CMakeLists.txt +index 2743423..81c8806 100644 +--- a/examples/dxPtexViewer/CMakeLists.txt ++++ b/examples/dxPtexViewer/CMakeLists.txt +@@ -36,6 +36,19 @@ set(PLATFORM_LIBRARIES + "${ZLIB_LIBRARY}" + ) + ++if (OPENCL_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ Opengl32 ++ Cfgmgr32 ++ ) ++endif() ++ ++if (DXSDK_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ D3D11 ++ ) ++endif() ++ + include_directories( + "${OPENSUBDIV_INCLUDE_DIR}" + "${DXSDK_INCLUDE_DIR}" +diff --git a/examples/dxViewer/CMakeLists.txt b/examples/dxViewer/CMakeLists.txt +index 245ecbd..83b39b8 100644 +--- a/examples/dxViewer/CMakeLists.txt ++++ b/examples/dxViewer/CMakeLists.txt +@@ -33,6 +33,19 @@ set(PLATFORM_LIBRARIES + "${DXSDK_LIBRARIES}" + ) + ++if (OPENCL_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ Opengl32 ++ Cfgmgr32 ++ ) ++endif() ++ ++if (DXSDK_FOUND) ++ list(APPEND PLATFORM_LIBRARIES ++ D3D11 ++ ) ++endif() ++ + include_directories( + "${OPENSUBDIV_INCLUDE_DIR}" + "${DXSDK_INCLUDE_DIR}" +diff --git a/examples/glEvalLimit/CMakeLists.txt b/examples/glEvalLimit/CMakeLists.txt +index 1a71f72..8eaaccb 100644 +--- a/examples/glEvalLimit/CMakeLists.txt ++++ b/examples/glEvalLimit/CMakeLists.txt +@@ -41,7 +41,6 @@ if( OPENCL_FOUND ) + endif() + + if( TBB_FOUND ) +- include_directories("${TBB_INCLUDE_DIR}") + list(APPEND PLATFORM_LIBRARIES + "${TBB_LIBRARIES}" + ) +diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt +index adb0191..0f90a37 100644 +--- a/opensubdiv/CMakeLists.txt ++++ b/opensubdiv/CMakeLists.txt +@@ -49,7 +49,6 @@ if (NOT NO_LIB) + endif() + + if( TBB_FOUND ) +- include_directories("${TBB_INCLUDE_DIR}") + list(APPEND PLATFORM_CPU_LIBRARIES + ${TBB_LIBRARIES} + ) +diff --git a/opensubdiv/osd/CMakeLists.txt b/opensubdiv/osd/CMakeLists.txt +index 75f64b6..90d5ea2 100644 +--- a/opensubdiv/osd/CMakeLists.txt ++++ b/opensubdiv/osd/CMakeLists.txt +@@ -88,7 +88,6 @@ set(TBB_PUBLIC_HEADERS + ) + + if( TBB_FOUND ) +- include_directories("${TBB_INCLUDE_DIR}") + + list(APPEND CPU_SOURCE_FILES + tbbEvaluator.cpp +@@ -379,6 +378,10 @@ add_library(osd_cpu_obj + ${PUBLIC_HEADER_FILES} + ) + ++if (TBB_FOUND) ++ target_link_libraries(osd_cpu_obj ${TBB_LIBRARIES}) ++endif() ++ + set_target_properties(osd_cpu_obj + PROPERTIES + FOLDER "opensubdiv" diff --git a/ports/opensubdiv/fix-mac-build.patch b/ports/opensubdiv/fix-mac-build.patch new file mode 100644 index 00000000000000..6aa244f1f4f468 --- /dev/null +++ b/ports/opensubdiv/fix-mac-build.patch @@ -0,0 +1,13 @@ +diff --git a/opensubdiv/CMakeLists.txt b/opensubdiv/CMakeLists.txt +index ca24488..adb0191 100644 +--- a/opensubdiv/CMakeLists.txt ++++ b/opensubdiv/CMakeLists.txt +@@ -241,7 +241,7 @@ if (NOT NO_LIB) + endif() + + # Build frameworks ---------------------------------- +- if(APPLE) ++ if(APPLE AND OSD_GPU) + get_directory_property(OSD_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/osd DEFINITION PUBLIC_HEADER_FILES) + get_directory_property(FAR_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/far DEFINITION PUBLIC_HEADER_FILES) + get_directory_property(SDC_HEADER_FILES DIRECTORY ${CMAKE_SOURCE_DIR}/opensubdiv/sdc DEFINITION PUBLIC_HEADER_FILES) diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index 03ec368c22f1fb..faa42c30907a1a 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -1,3 +1,7 @@ +if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_from_github( @@ -9,6 +13,9 @@ vcpkg_from_github( PATCHES fix_compile-option.patch fix-version-search.patch + fix-build-type.patch + fix-mac-build.patch + fix-dependencies.patch ) if(VCPKG_TARGET_IS_LINUX) @@ -29,28 +36,102 @@ else() set(STATIC_CRT_LNK OFF) endif() -vcpkg_configure_cmake( +if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + message(FATAL_ERROR "Feature 'cuda' can only build on x64 arch.") +endif() + +if (("dx" IN_LIST FEATURES OR "omp" IN_LIST FEATURES) AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature 'dx' and 'omp' only support Windows.") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "true-deriv-eval" OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES + INVERTED_FEATURES + "cuda" NO_CUDA + "dx" NO_DX + "examples" NO_EXAMPLES + "glew" NO_GLEW + "glfw" NO_GLFW + "glfw" NO_GLFW_X11 + "omp" NO_OMP + "opencl" NO_OPENCL + "ptex" NO_PTEX + "tbb" NO_TBB + "tutorials" NO_TUTORIALS +) + +set(OSD_EXTRA_OPTS) +if ("ptex" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DPTEX_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() +if ("glew" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DGLEW_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() +if ("glfw" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DGLFW_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() +if ("dx" IN_LIST FEATURES) + list(APPEND OSD_EXTRA_OPTS -DDXSDK_LOCATION=${CURRENT_INSTALLED_DIR}) +endif() + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS - -DNO_DX=ON - -DNO_CUDA=ON - -DNO_EXAMPLES=ON - -DNO_TUTORIALS=ON + -DMSVC_STATIC_CRT=${STATIC_CRT_LNK} + -DNO_LIB=OFF -DNO_REGRESSION=ON + -DNO_DOC=ON -DNO_TESTS=ON - -DMSVC_STATIC_CRT=${STATIC_CRT_LNK} + -DNO_GLTESTS=ON + -DNO_CLEW=ON + -DNO_METAL=ON + -DNO_OPENGL=ON # missing glloader + ${FEATURE_OPTIONS} + ${OSD_EXTRA_OPTS} + MAYBE_UNUSED_VARIABLES + MSVC_STATIC_CRT ) -vcpkg_install_cmake() +vcpkg_cmake_install() -# # Moves all .cmake files from /debug/share/opensubdiv/ to /share/opensubdiv/ -# # See /docs/maintainers/vcpkg_fixup_cmake_targets.md for more details -# vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/opensubdiv) +if ("opencl" IN_LIST FEATURES OR "dx" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES stringify AUTO_CLEAN) +endif() + +if ("examples" IN_LIST FEATURES) + if ("dx" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES dxViewer AUTO_CLEAN) + if ("ptex" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES dxPtexViewer AUTO_CLEAN) + endif() + endif() +endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if ("tutorials" IN_LIST FEATURES) + file(GLOB TUTORIALS_TOOLS "${CURRENT_PACKAGES_DIR}/bin/tutorials/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + set(TUTORIALS_TOOL_NAMES ) + foreach(TUTORIALS_TOOL IN LISTS TUTORIALS_TOOLS) + get_filename_component(TUTORIALS_TOOL_NAME "${TUTORIALS_TOOL}" NAME_WE) + list(APPEND TUTORIALS_TOOL_NAMES "${TUTORIALS_TOOL_NAME}") + endforeach() + if (TUTORIALS_TOOL_NAMES) + vcpkg_copy_tools(TOOL_NAMES ${TUTORIALS_TOOL_NAMES} SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/tutorials/" AUTO_CLEAN) + endif() +endif() + +# The header files are read only and can't remove when remove this port +file(GLOB_RECURSE OSD_HDRS "${CURRENT_PACKAGES_DIR}/include/*.h") +file(CHMOD_RECURSE ${OSD_HDRS} + PERMISSIONS + OWNER_READ OWNER_WRITE + GROUP_READ GROUP_WRITE + WORLD_READ WORLD_WRITE +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" +) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index dc6b41f65afcab..f535d51b79b789 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,8 +1,75 @@ { "name": "opensubdiv", "version-semver": "3.4.3", - "port-version": 2, + "port-version": 3, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", - "supports": "!arm & !uwp" + "supports": "!arm & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "cuda": { + "description": "Enable CUDA backend", + "dependencies": [ + "cuda" + ] + }, + "dx": { + "description": "Enable DirectX support", + "dependencies": [ + { + "name": "directxsdk", + "features": [ + "xp" + ] + } + ] + }, + "examples": { + "description": "Enable examples build" + }, + "glew": { + "description": "Path to glew", + "dependencies": [ + "glew" + ] + }, + "glfw": { + "description": "Path to glfw", + "dependencies": [ + "glfw3" + ] + }, + "omp": { + "description": "Enable OpenMP backend" + }, + "opencl": { + "description": "Enable OpenCL backend", + "dependencies": [ + "opencl" + ] + }, + "ptex": { + "description": "Path to Ptex", + "dependencies": [ + "ptex" + ] + }, + "tbb": { + "description": "Enable TBB backend", + "dependencies": [ + "tbb" + ] + }, + "true-deriv-eval": { + "description": "Enable true derivative evaluation for Gregory basis patches" + }, + "tutorials": { + "description": "Enable tutorials build" + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index a2cc284bd2fb7d..f3dc535e37619d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4958,7 +4958,7 @@ }, "opensubdiv": { "baseline": "3.4.3", - "port-version": 2 + "port-version": 3 }, "opentelemetry-cpp": { "baseline": "1.0.1", diff --git a/versions/o-/opensubdiv.json b/versions/o-/opensubdiv.json index 6fd0886032aad5..be8519959c357f 100644 --- a/versions/o-/opensubdiv.json +++ b/versions/o-/opensubdiv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "786a994b5a4637b9cd43eaf2b790d913bce9cdce", + "version-semver": "3.4.3", + "port-version": 3 + }, { "git-tree": "a8158645b04f25a236cd3fdf2debc67b10cfd945", "version-semver": "3.4.3", From 1daaf58bc85ade9e1d8062965269f278bdfbd04d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 28 Oct 2021 14:10:49 +0800 Subject: [PATCH 0946/1858] [cityhash] Add feature sse for non-x86-Windows (#20999) * [cityhash] Add feature sse for non-x86-Windows * version * Add missing dependencies. * version --- ports/cityhash/CMakeLists.txt | 46 ++++++++++++++++++++++++++++++++++- ports/cityhash/portfile.cmake | 36 +++++++++++++++++---------- ports/cityhash/vcpkg.json | 21 +++++++++++++--- versions/baseline.json | 2 +- versions/c-/cityhash.json | 5 ++++ 5 files changed, 92 insertions(+), 18 deletions(-) diff --git a/ports/cityhash/CMakeLists.txt b/ports/cityhash/CMakeLists.txt index f2e08336c7c48c..5a5a3120cf07e2 100644 --- a/ports/cityhash/CMakeLists.txt +++ b/ports/cityhash/CMakeLists.txt @@ -1,8 +1,52 @@ cmake_minimum_required(VERSION 3.13) project(cityhash CXX) +option(ENABLE_SSE "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic." OFF) + +set(CMAKE_CXX_STANDARD 11) + +if (ENABLE_SSE) + include (CMakePushCheckState) + cmake_push_check_state() + if (MSVC) + include(CheckCXXSourceCompiles) + + check_cxx_source_compiles( + "#include + int main() { + _mm_crc32_u64(0, 0); + return 0; + }" + USE_SSE) + else() + include(CheckCXXCompilerFlag) + check_cxx_compiler_flag ("-msse4.2" USE_SSE) + if (USE_SSE) + set (SSE2_FLAG "-msse4.2") + endif() + endif() + + cmake_pop_check_state() + + if (NOT USE_SSE) + message(FATAL_ERROR "This platform doesn't support feature SSE4.2") + endif() +else() + set(USE_SSE OFF) +endif() + add_library(cityhash STATIC src/city.cc) +list(APPEND CITY_HEADERS src/city.h) +if (USE_SSE) + list(APPEND CITY_HEADERS src/citycrc.h) + + target_compile_options(cityhash PRIVATE ${SSE2_FLAG}) + if (MSVC) + target_compile_definitions(cityhash PRIVATE __SSE4_2__) + endif() +endif() + target_include_directories(cityhash PUBLIC $ $ @@ -15,4 +59,4 @@ install(TARGETS cityhash EXPORT cityhash-config ) install(EXPORT cityhash-config DESTINATION share/cmake/cityhash) -install(FILES src/city.h DESTINATION include) +install(FILES ${CITY_HEADERS} DESTINATION include) diff --git a/ports/cityhash/portfile.cmake b/ports/cityhash/portfile.cmake index b5b784723842a5..f904d8f4e12cc5 100644 --- a/ports/cityhash/portfile.cmake +++ b/ports/cityhash/portfile.cmake @@ -8,30 +8,40 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") if(VCPKG_TARGET_IS_WINDOWS) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}/src) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}/src") else() - file(MAKE_DIRECTORY ${SOURCE_PATH}/out) + file(MAKE_DIRECTORY "${SOURCE_PATH}/out") vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/configure - WORKING_DIRECTORY ${SOURCE_PATH}/out + COMMAND "${SOURCE_PATH}/configure" + WORKING_DIRECTORY "${SOURCE_PATH}/out" LOGNAME configure-${TARGET_TRIPLET} ) - file(COPY ${SOURCE_PATH}/out/config.h DESTINATION ${SOURCE_PATH}/src) + file(COPY "${SOURCE_PATH}/out/config.h" DESTINATION "${SOURCE_PATH}/src") endif() -vcpkg_configure_cmake( +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND "sse" IN_LIST FEATURES) + message(FATAL_ERROR "Feature 'sse' does not support Windows x86 triplet.") +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "sse" ENABLE_SSE +) + +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/cityhash) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/cityhash) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share") -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/cityhash/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/cityhash/copyright" COPYONLY) diff --git a/ports/cityhash/vcpkg.json b/ports/cityhash/vcpkg.json index bcd255aed32eb9..431de018b83a62 100644 --- a/ports/cityhash/vcpkg.json +++ b/ports/cityhash/vcpkg.json @@ -1,7 +1,22 @@ { "name": "cityhash", - "version-string": "2013-01-08", - "port-version": 1, + "version-date": "2013-01-08", + "port-version": 2, "description": "CityHash, a family of hash functions for strings.", - "homepage": "https://github.com/google/cityhash" + "homepage": "https://github.com/google/cityhash", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "sse": { + "description": "Build CityHash variants that depend on the _mm_crc32_u64 intrinsic." + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index f3dc535e37619d..00e5db587d6a4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1350,7 +1350,7 @@ }, "cityhash": { "baseline": "2013-01-08", - "port-version": 1 + "port-version": 2 }, "civetweb": { "baseline": "1.15", diff --git a/versions/c-/cityhash.json b/versions/c-/cityhash.json index d185af2903be45..8b55fa672a848b 100644 --- a/versions/c-/cityhash.json +++ b/versions/c-/cityhash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c1b6eaaf15c06d436ce42331b84566abd931f53", + "version-date": "2013-01-08", + "port-version": 2 + }, { "git-tree": "423306e7029cfac62069d751bb612e10b3777c13", "version-string": "2013-01-08", From db33edeb58480631bc442ba57c27f646a212d9d5 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Oct 2021 12:01:58 -0700 Subject: [PATCH 0947/1858] [miniz] Install pkgconfig files to the correct location. (#21025) --- ports/miniz/fix-pkgconfig-location.patch | 13 +++++++++++++ ports/miniz/portfile.cmake | 2 ++ ports/miniz/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/miniz.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/miniz/fix-pkgconfig-location.patch diff --git a/ports/miniz/fix-pkgconfig-location.patch b/ports/miniz/fix-pkgconfig-location.patch new file mode 100644 index 00000000000000..7bc5999b7531e5 --- /dev/null +++ b/ports/miniz/fix-pkgconfig-location.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f12435b..edee1f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -163,7 +163,7 @@ if(NOT BUILD_HEADER_ONLY) + if(INSTALL_PROJECT) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + endif() + diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake index 21d7720184e9d3..acf5a7e9924d25 100644 --- a/ports/miniz/portfile.cmake +++ b/ports/miniz/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 2.2.0 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 HEAD_REF master + PATCHES + fix-pkgconfig-location.patch ) vcpkg_cmake_configure( diff --git a/ports/miniz/vcpkg.json b/ports/miniz/vcpkg.json index 130a74fe8a911a..cb24f9b7f6d3bd 100644 --- a/ports/miniz/vcpkg.json +++ b/ports/miniz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "miniz", "version": "2.2.0", + "port-version": 1, "description": "Single C source file zlib-replacement library", "homepage": "https://github.com/richgel999/miniz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 00e5db587d6a4f..fcc35ca42688b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4350,7 +4350,7 @@ }, "miniz": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "minizip": { "baseline": "1.2.11", diff --git a/versions/m-/miniz.json b/versions/m-/miniz.json index b8bdf545fdbf51..ef0f29f0917cd6 100644 --- a/versions/m-/miniz.json +++ b/versions/m-/miniz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49751d73421ae465b278aea471d6c8903837697c", + "version": "2.2.0", + "port-version": 1 + }, { "git-tree": "5a146337e0416425fb7a412027c755681cf88921", "version": "2.2.0", From 79289d776bdca10feae915d6d159108b15417679 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Oct 2021 12:26:38 -0700 Subject: [PATCH 0948/1858] [brigand] Fix pkgconfig file and modernize portfile.cmake. (#21009) * [brigand] Fix pkgconfig file and modernize portfile.cmake. * Undo patch patch and add version. * Depend only on boost-fusion and boost-variant, as suggested by PhoebeHui Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * Update version database. Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> --- ports/brigand/fix-install-targets.patch | 14 ------- ports/brigand/portfile.cmake | 23 ++++------- ports/brigand/remove-tests.patch | 55 +++++++++++++++++++++++++ ports/brigand/vcpkg.json | 9 +++- versions/b-/brigand.json | 5 +++ versions/baseline.json | 2 +- 6 files changed, 76 insertions(+), 32 deletions(-) delete mode 100644 ports/brigand/fix-install-targets.patch create mode 100644 ports/brigand/remove-tests.patch diff --git a/ports/brigand/fix-install-targets.patch b/ports/brigand/fix-install-targets.patch deleted file mode 100644 index 248948ab1a1057..00000000000000 --- a/ports/brigand/fix-install-targets.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13ea689..9d20700 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -292,3 +292,9 @@ install(DIRECTORY ${PROJECT_SOURCE_DIR}/brigand - install(FILES ${CMAKE_BINARY_DIR}/libbrigand.pc - DESTINATION lib/pkgconfig - ) -+ -+install(TARGETS brigand -+ RUNTIME DESTINATION bin -+ LIBRARY DESTINATION lib -+ ARCHIVE DESTINATION lib -+) diff --git a/ports/brigand/portfile.cmake b/ports/brigand/portfile.cmake index 22b7dc08fccb66..1e50b92aadc7d2 100644 --- a/ports/brigand/portfile.cmake +++ b/ports/brigand/portfile.cmake @@ -6,22 +6,15 @@ vcpkg_from_github( REF 1.3.0 SHA512 538d288d84265cc9a4563f1e84d55a174db461ffd1e4f510bfdaef04af9fbf8e7ca79817f9118378bf7d58d578699aae3072bbffa3fd727b2d93ee783337aea6 HEAD_REF master - PATCHES fix-install-targets.patch + PATCHES + remove-tests.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA -) - -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/pkgconfig) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/brigand/remove-tests.patch b/ports/brigand/remove-tests.patch new file mode 100644 index 00000000000000..a50f4b0e5e8363 --- /dev/null +++ b/ports/brigand/remove-tests.patch @@ -0,0 +1,55 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13ea689..e723f85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,11 +24,6 @@ else() + endif() + + # Install pre-commit git hook +-execute_process(COMMAND ${CMAKE_COMMAND} -E copy +- ${PROJECT_SOURCE_DIR}/script/pre-commit +- ${PROJECT_SOURCE_DIR}/.git/hooks +- ) +- + set ( STANDALONE_GROUP + script/embed.py + ) +@@ -204,17 +199,6 @@ source_group(brigand\\sequences FILES ${SEQUENCES_GROUP}) + source_group(brigand\\types FILES ${TYPES_GROUP}) + source_group(placeholder FILES ${PLACEHOLDER_GROUP}) + +-add_library(brigand +- ${BRIGAND_GROUP} +- ${ADAPTED_GROUP} +- ${ALGORITHMS_GROUP} +- ${ALGORITHMS_DETAIL_GROUP} +- ${FUNCTIONS_GROUPS} +- ${SEQUENCES_GROUP} +- ${TYPES_GROUP} +- ${PLACEHOLDER_GROUP} +-) +- + set(test_files + test/always.cpp + test/apply.cpp +@@ -276,10 +260,6 @@ endif() + + source_group(tests FILES ${test_files}) + +-add_executable(brigand_test ${test_files}) +- +-add_test(brigand brigand_test) +- + configure_file(libbrigand.pc.in + libbrigand.pc + @ONLY +diff --git a/libbrigand.pc.in b/libbrigand.pc.in +index 2ed570e..218215b 100644 +--- a/libbrigand.pc.in ++++ b/libbrigand.pc.in +@@ -6,5 +6,4 @@ Name: Brigand + Description: Light-weight, fully functional, instant-compile time C++ 11 meta-programming library + URL: https://github.com/edouarda/brigand + Version: 1.2.0 +-Libs: + Cflags: -I${includedir} diff --git a/ports/brigand/vcpkg.json b/ports/brigand/vcpkg.json index 4f9d994120e30d..99a5e0219c58d6 100644 --- a/ports/brigand/vcpkg.json +++ b/ports/brigand/vcpkg.json @@ -1,10 +1,15 @@ { "name": "brigand", "version-string": "1.3.0", - "port-version": 1, + "port-version": 2, "description": "Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library.", "homepage": "https://github.com/edouarda/brigand", "dependencies": [ - "boost" + "boost-fusion", + "boost-variant", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/versions/b-/brigand.json b/versions/b-/brigand.json index f43f2cf9259d34..d5b9f4b2ff2627 100644 --- a/versions/b-/brigand.json +++ b/versions/b-/brigand.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a27641e46efb007b46792b7bd803f32437fe4178", + "version-string": "1.3.0", + "port-version": 2 + }, { "git-tree": "99395d0e7569b8b32f76d99cf2183a2a92679a7d", "version-string": "1.3.0", diff --git a/versions/baseline.json b/versions/baseline.json index fcc35ca42688b9..46e6ba7f5f75c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1138,7 +1138,7 @@ }, "brigand": { "baseline": "1.3.0", - "port-version": 1 + "port-version": 2 }, "brotli": { "baseline": "1.0.9", From 4a4b45744d10cc7dd4ee676b2540d2d29bef6fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 29 Oct 2021 03:35:04 +0800 Subject: [PATCH 0949/1858] [qca] Fix usage (#20977) * [qca] Fix usage * version * Add double quotes to paths * version * Remove some double quotes * version * Remove depreciate code * version * Try to remove the out-dated code * version * Apply suggestions * version --- ports/qca/portfile.cmake | 77 +++++++++++----------------------------- ports/qca/vcpkg.json | 12 +++++-- versions/baseline.json | 2 +- versions/q-/qca.json | 5 +++ 4 files changed, 36 insertions(+), 60 deletions(-) diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake index 34a80616949eae..b3acc2875742e3 100644 --- a/ports/qca/portfile.cmake +++ b/ports/qca/portfile.cmake @@ -6,11 +6,7 @@ # vcpkg_find_acquire_program(PERL) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) -vcpkg_add_to_path(${PERL_EXE_PATH}) - -if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/.git") - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/src) -endif() +vcpkg_add_to_path("${PERL_EXE_PATH}") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -22,24 +18,6 @@ vcpkg_from_github( 0002-fix-build-error.patch ) -# Remove these files on the cmake next update -vcpkg_download_distfile(ARCHIVE_PKGCONFIG - URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPkgConfig.cmake?inline=false" - FILENAME "FindPkgConfig.cmake" - SHA512 d9aada8107eac9ada197d0b1e9040cd3707de7f5838c90bca80321e8eb35931f520635800bea0e2aafeca7fafb08b8e4752d5c6c2d6b1a5d5b4e3225d7818aa6 -) -vcpkg_download_distfile(ARCHIVE_PKGHSA - URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPackageHandleStandardArgs.cmake?inline=false" - FILENAME "FindPackageHandleStandardArgs.cmake" - SHA512 61a459a9e0797f976fae36ce4fd5a18a30bd13e8bc9d65d165ca760e13ddc27a8c8ad371ad4b41cc36fe227425424fe9bc6e4dfa5cfdc68bd59a3c10005cf3b4 -) -vcpkg_download_distfile(ARCHIVE_PKGMSG - URLS "https://gitlab.kitware.com/cmake/cmake/-/raw/ab8bd48352df060c4ead210fe30dc4736646206b/Modules/FindPackageMessage.cmake?inline=false" - FILENAME "FindPackageMessage.cmake" - SHA512 44af652038ecd98c1e54f440e67994759345290530b36f687b7e6d5c310caa55597f3718901fe7a3f8816b560f03b8f238d90aab6ce9b1b24391ab0bb2aa44a8 -) -file(COPY ${ARCHIVE_PKGCONFIG} ${ARCHIVE_PKGHSA} ${ARCHIVE_PKGMSG} DESTINATION ${SOURCE_PATH}/cmake/modules) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(QCA_FEATURE_INSTALL_DIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug/bin/Qca) set(QCA_FEATURE_INSTALL_DIR_RELEASE ${CURRENT_PACKAGES_DIR}/bin/Qca) @@ -53,30 +31,28 @@ endif() # it is up to developers or admins to maintain CAs. # So we do it here: message(STATUS "Importing certstore") -file(REMOVE ${SOURCE_PATH}/certs/rootcerts.pem) +file(REMOVE "${SOURCE_PATH}/certs/rootcerts.pem") # Using file(DOWNLOAD) to use https file(DOWNLOAD https://raw.githubusercontent.com/mozilla/gecko-dev/master/security/nss/lib/ckfw/builtins/certdata.txt - ${CURRENT_BUILDTREES_DIR}/cert/certdata.txt + "${CURRENT_BUILDTREES_DIR}/cert/certdata.txt" TLS_VERIFY ON ) vcpkg_execute_required_process( - COMMAND ${PERL} ${CMAKE_CURRENT_LIST_DIR}/mk-ca-bundle.pl -n ${SOURCE_PATH}/certs/rootcerts.pem - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/cert + COMMAND "${PERL}" "${CMAKE_CURRENT_LIST_DIR}/mk-ca-bundle.pl" -n "${SOURCE_PATH}/certs/rootcerts.pem" + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/cert" LOGNAME ca-bundle ) message(STATUS "Importing certstore done") # Configure and build -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_RELATIVE_PATHS=ON - -DQT4_BUILD=OFF -DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DQCA_SUFFIX=OFF - -DQCA_FEATURE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/qca/mkspecs/features + -DQCA_FEATURE_INSTALL_DIR=share/qca/mkspecs/features -DOSX_FRAMEWORK=OFF OPTIONS_DEBUG -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_DEBUG} @@ -84,36 +60,23 @@ vcpkg_configure_cmake( -DQCA_PLUGINS_INSTALL_DIR=${QCA_FEATURE_INSTALL_DIR_RELEASE} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -# Patch and copy cmake files -message(STATUS "Patching files") -file(READ - ${CURRENT_PACKAGES_DIR}/debug/share/qca/cmake/QcaTargets-debug.cmake - QCA_DEBUG_CONFIG -) -string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" QCA_DEBUG_CONFIG "${QCA_DEBUG_CONFIG}") -file(WRITE - ${CURRENT_PACKAGES_DIR}/share/qca/cmake/QcaTargets-debug.cmake - "${QCA_DEBUG_CONFIG}" -) - -file(READ ${CURRENT_PACKAGES_DIR}/share/qca/cmake/QcaTargets.cmake - QCA_TARGET_CONFIG -) -string(REPLACE "packages/qca_" "installed/" QCA_TARGET_CONFIG "${QCA_TARGET_CONFIG}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/qca/cmake/QcaTargets.cmake - "${QCA_TARGET_CONFIG}" +vcpkg_cmake_config_fixup(CONFIG_PATH share/qca/cmake) +file(READ "${CURRENT_PACKAGES_DIR}/share/${PORT}/QcaConfig.cmake" QCA_CONFIG_FILE) +string(REGEX REPLACE "PACKAGE_PREFIX_DIR \"(.*)\" ABSOLUTE" + [[PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../" ABSOLUTE]] + QCA_CONFIG_FILE "${QCA_CONFIG_FILE}" ) +file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/QcaConfig.cmake" "${QCA_CONFIG_FILE}") # Remove unneeded dirs file(REMOVE_RECURSE - ${CURRENT_BUILDTREES_DIR}/share/man - ${CURRENT_PACKAGES_DIR}/share/man - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_BUILDTREES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -message(STATUS "Patching files done") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index f4376e6ee75fc0..e3f5fd3e727556 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,13 +1,21 @@ { "name": "qca", - "version-string": "2.3.1", - "port-version": 3, + "version": "2.3.1", + "port-version": 4, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://cgit.kde.org/qca.git/", "dependencies": [ { "name": "qt5-base", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 46e6ba7f5f75c1..48d7b0730835fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5402,7 +5402,7 @@ }, "qca": { "baseline": "2.3.1", - "port-version": 3 + "port-version": 4 }, "qcustomplot": { "baseline": "2.0.1", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index a61062a7ee9ee2..c5f16dea4de348 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8275668aade111ed059ddece14bff490ff47fbc", + "version": "2.3.1", + "port-version": 4 + }, { "git-tree": "8fae15039cc6567f087011f916a1dea07da520cf", "version-string": "2.3.1", From 0d2515cfe5410a354c6cd69abbd019223232a339 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 28 Oct 2021 22:29:45 +0200 Subject: [PATCH 0950/1858] [xorstr] Update to 2021-09-12 (#20949) * Update xorstr to 2021-09-12 * Update CI baseline * Fix version date * Update git-tree hash * Remove phantom version from version database. Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/xorstr/portfile.cmake | 8 ++++---- ports/xorstr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/x-/xorstr.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/xorstr/portfile.cmake b/ports/xorstr/portfile.cmake index 3a227fcbe7be49..b482f276aa9c8b 100644 --- a/ports/xorstr/portfile.cmake +++ b/ports/xorstr/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/xorstr - REF 42464c4fc1c32cb0d15f3656b30bfb38d9b65fc7 - SHA512 e8d6ed2ed64bbd11ca304b6c8a6c2dd14544cedc8b8f7364ef8c34af374ebee76bfddd97258b7ff024f6d9929800158d1b3897d64c2b74d8c6f6f105d2844a1c + REF 3ef854178f3df03c94b83308000ed06760dcc8aa + SHA512 c7599991d819a7bd253e763ecccb270d0c94642e52dda225d986bcc603bef9a5eecdb01bd87bd96c3320152c22f2d1d3312e84ac10b2020aa36a4229f230d7d8 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/include/xorstr.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/include/xorstr.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/xorstr/vcpkg.json b/ports/xorstr/vcpkg.json index 05ce8862e66c93..067c755c3736d9 100644 --- a/ports/xorstr/vcpkg.json +++ b/ports/xorstr/vcpkg.json @@ -1,6 +1,6 @@ { "name": "xorstr", - "version-date": "2020-11-29", + "version-date": "2021-10-23", "description": "Heavily vectorized c++17 compile time string encryption", "homepage": "https://github.com/JustasMasiulis/xorstr" } diff --git a/versions/baseline.json b/versions/baseline.json index 48d7b0730835fd..74d0fb7b4335ba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7205,7 +7205,7 @@ "port-version": 1 }, "xorstr": { - "baseline": "2020-11-29", + "baseline": "2021-10-23", "port-version": 0 }, "xproperty": { diff --git a/versions/x-/xorstr.json b/versions/x-/xorstr.json index 591e44ee464562..c101bca64603ef 100644 --- a/versions/x-/xorstr.json +++ b/versions/x-/xorstr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "37ea1ae54d689346b2edbf358f950e1939a9c66d", + "version-date": "2021-10-23", + "port-version": 0 + }, { "git-tree": "6a02da6c23263a76324be04c21a28f11cc4cfca1", "version-date": "2020-11-29", From 4bff9eb4af6af173919979a088152358898edcfd Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 28 Oct 2021 22:36:36 +0200 Subject: [PATCH 0951/1858] [lazy-importer] Update to 2021-03-09 (#20948) * Update lazy-importer to 2021-03-09 * Update CI baseline * Fix version date * Update git-tree hash * Remove extra phantom version from version database. Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III --- ports/lazy-importer/portfile.cmake | 8 ++++---- ports/lazy-importer/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/lazy-importer.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/lazy-importer/portfile.cmake b/ports/lazy-importer/portfile.cmake index 23efa3c1fd0302..18aac44cf68f80 100644 --- a/ports/lazy-importer/portfile.cmake +++ b/ports/lazy-importer/portfile.cmake @@ -3,12 +3,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO JustasMasiulis/lazy_importer - REF 88186bfce98845eba9050f7597332754f621c0fc - SHA512 04789501ea9c9cf600326b3f8292c441f54d0915452eb29b063fe0a8d56a31157cf338a4ec44aa658e397d754b6593ece51af2736d5980e72d67359a1abc2625 + REF a02a9ed62ea56c614728465b1be9fab812fdf037 + SHA512 d88a7a1df269f2159eb0997f691fb5b71e89d75160b45ce968bd58e0d71e214f03e4c05e44234ace04ba9025b0b7d3ff07cf803753473c51164223a05a61598f HEAD_REF master ) -file(COPY ${SOURCE_PATH}/include/lazy_importer.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/include/lazy_importer.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/lazy-importer/vcpkg.json b/ports/lazy-importer/vcpkg.json index a543eee314ae58..aa9f6c62c54ed9 100644 --- a/ports/lazy-importer/vcpkg.json +++ b/ports/lazy-importer/vcpkg.json @@ -1,7 +1,6 @@ { "name": "lazy-importer", - "version-string": "2019-08-10", - "port-version": 1, + "version-date": "2021-10-23", "description": "Library for importing functions from dlls in a hidden, reverse engineer unfriendly way", "homepage": "https://github.com/JustasMasiulis/lazy_importer" } diff --git a/versions/baseline.json b/versions/baseline.json index 74d0fb7b4335ba..8af6002f60287f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3229,8 +3229,8 @@ "port-version": 1 }, "lazy-importer": { - "baseline": "2019-08-10", - "port-version": 1 + "baseline": "2021-10-23", + "port-version": 0 }, "lcm": { "baseline": "1.4.0", diff --git a/versions/l-/lazy-importer.json b/versions/l-/lazy-importer.json index 9cfa28dfcd2a4a..2885cce7a1e3be 100644 --- a/versions/l-/lazy-importer.json +++ b/versions/l-/lazy-importer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3dba7a5ee217d732847b9906ba01f8571733cc35", + "version-date": "2021-10-23", + "port-version": 0 + }, { "git-tree": "8a2748be94ccc349f17bf4c54af9f574a56e2613", "version-string": "2019-08-10", From 9f68337e2be07843027b7aad511bd00f4776f3f3 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 28 Oct 2021 23:45:06 +0200 Subject: [PATCH 0952/1858] [boinc] Add missed include file and target link library (#20951) Signed-off-by: Vitalii Koshura --- ports/boinc/CMakeLists.txt | 5 +++++ ports/boinc/vcpkg.json | 2 +- versions/b-/boinc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ports/boinc/CMakeLists.txt b/ports/boinc/CMakeLists.txt index 7e45922086f30d..f00a67cdf1ef6d 100644 --- a/ports/boinc/CMakeLists.txt +++ b/ports/boinc/CMakeLists.txt @@ -35,6 +35,7 @@ set(LIBBOINC_HEADERS_GENERIC lib/cal_boinc.h lib/cc_config.h lib/cert_sig.h + lib/cl_boinc.h lib/common_defs.h lib/coproc.h lib/crypt.h @@ -223,6 +224,10 @@ target_link_libraries(boinc PRIVATE OpenSSL::Crypto ) +target_link_libraries(boincapi PRIVATE + boinc +) + install(TARGETS boinc boincapi EXPORT boinc-config RUNTIME DESTINATION bin ARCHIVE DESTINATION lib diff --git a/ports/boinc/vcpkg.json b/ports/boinc/vcpkg.json index f597fb040bad60..cee86817d98042 100644 --- a/ports/boinc/vcpkg.json +++ b/ports/boinc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "boinc", "version": "7.18.1", - "port-version": 1, + "port-version": 2, "description": "Open-source software for volunteer computing and grid computing.", "homepage": "https://boinc.berkeley.edu/", "supports": "!(windows & arm) & !uwp", diff --git a/versions/b-/boinc.json b/versions/b-/boinc.json index 1a417d7685ab46..ae25bcdfcd7804 100644 --- a/versions/b-/boinc.json +++ b/versions/b-/boinc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee6667eb5cf5a3fee75fd35de998ad322c5999ff", + "version": "7.18.1", + "port-version": 2 + }, { "git-tree": "47766741495b79066e3e24b1547684024b9e16b8", "version": "7.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index 8af6002f60287f..dca03f6612b6e3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -506,7 +506,7 @@ }, "boinc": { "baseline": "7.18.1", - "port-version": 1 + "port-version": 2 }, "bond": { "baseline": "9.0.3", From 6af727551af8761533c2fb1a941b9e5cd78c38bd Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Oct 2021 18:10:38 -0700 Subject: [PATCH 0953/1858] [osg-qt] Install to the correct location. (#21048) --- ports/osg-qt/portfile.cmake | 24 +++++++++++------------- ports/osg-qt/use-lib.patch | 13 +++++++++++++ ports/osg-qt/vcpkg.json | 6 +++++- versions/baseline.json | 2 +- versions/o-/osg-qt.json | 5 +++++ 5 files changed, 35 insertions(+), 15 deletions(-) create mode 100644 ports/osg-qt/use-lib.patch diff --git a/ports/osg-qt/portfile.cmake b/ports/osg-qt/portfile.cmake index 97937f13d47ba9..c760ed7d86c938 100644 --- a/ports/osg-qt/portfile.cmake +++ b/ports/osg-qt/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( OsgMacroUtils.patch fix-static-install.patch CMakeLists.patch + use-lib.patch ) if(VCPKG_TARGET_IS_OSX) @@ -21,19 +22,16 @@ else() set(OPTIONS -DDYNAMIC_OPENSCENEGRAPH=OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${OPTIONS} - -DBUILD_OSG_EXAMPLES=OFF - -DOSG_BUILD_APPLICATION_BUNDLES=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${OPTIONS} + -DBUILD_OSG_EXAMPLES=OFF + -DOSG_BUILD_APPLICATION_BUNDLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() -#Debug -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -# Handle License -file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/osg-qt/use-lib.patch b/ports/osg-qt/use-lib.patch new file mode 100644 index 00000000000000..a194c1d719db42 --- /dev/null +++ b/ports/osg-qt/use-lib.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 66e989a..3569cec 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -467,7 +467,7 @@ ENDIF() + + IF(UNIX AND NOT WIN32 AND NOT APPLE) + IF(CMAKE_SIZEOF_VOID_P MATCHES "8") +- SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement") ++ SET(LIB_POSTFIX "" CACHE STRING "suffix for 32/64 dir placement") + MARK_AS_ADVANCED(LIB_POSTFIX) + ENDIF() + ENDIF() diff --git a/ports/osg-qt/vcpkg.json b/ports/osg-qt/vcpkg.json index 06848711055c55..29d55fa16e800b 100644 --- a/ports/osg-qt/vcpkg.json +++ b/ports/osg-qt/vcpkg.json @@ -1,13 +1,17 @@ { "name": "osg-qt", "version-string": "Qt5", - "port-version": 2, + "port-version": 3, "description": "osgQt - Qt project for making use of OpenSceneGraph(OSG)", "dependencies": [ "osg", { "name": "qt5-base", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index dca03f6612b6e3..062cf1b5b5c2e7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5014,7 +5014,7 @@ }, "osg-qt": { "baseline": "Qt5", - "port-version": 2 + "port-version": 3 }, "osgearth": { "baseline": "3.2", diff --git a/versions/o-/osg-qt.json b/versions/o-/osg-qt.json index 699d474b75489f..f922a1a4917e41 100644 --- a/versions/o-/osg-qt.json +++ b/versions/o-/osg-qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e92c5f14fae6b6a69e0818bf1509e03a1389d3c", + "version-string": "Qt5", + "port-version": 3 + }, { "git-tree": "743cc988a45a861fc3de537f6e8720a38a4cf90f", "version-string": "Qt5", From ade22585f6eb51754d815bd0475a4b76432abc95 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Oct 2021 18:10:49 -0700 Subject: [PATCH 0954/1858] [cminpack] Install to the correct location. (#21047) --- ports/cminpack/portfile.cmake | 2 ++ ports/cminpack/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/c-/cminpack.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/cminpack/portfile.cmake b/ports/cminpack/portfile.cmake index 097f64feeae9df..d01068df668d8a 100644 --- a/ports/cminpack/portfile.cmake +++ b/ports/cminpack/portfile.cmake @@ -9,9 +9,11 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_EXAMPLES=OFF + -DCMINPACK_LIB_INSTALL_DIR=lib ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/cminpack/vcpkg.json b/ports/cminpack/vcpkg.json index 4d6d699656ab1b..aa37c1135ba975 100644 --- a/ports/cminpack/vcpkg.json +++ b/ports/cminpack/vcpkg.json @@ -1,6 +1,7 @@ { "name": "cminpack", "version": "1.3.8", + "port-version": 1, "description": "A C/C++ rewrite of the MINPACK software (originally in FORTRAN) for solving nonlinear equations and nonlinear least squares problems", "homepage": "http://devernay.free.fr/hacks/cminpack/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 062cf1b5b5c2e7..9e45d2137ca20c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1426,7 +1426,7 @@ }, "cminpack": { "baseline": "1.3.8", - "port-version": 0 + "port-version": 1 }, "cmocka": { "baseline": "2020-08-01", diff --git a/versions/c-/cminpack.json b/versions/c-/cminpack.json index b76e3c2b7e9c69..5ea16de6da49ea 100644 --- a/versions/c-/cminpack.json +++ b/versions/c-/cminpack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e903be11f8d868d5fb74f597bc0d2890854eb95", + "version": "1.3.8", + "port-version": 1 + }, { "git-tree": "aa9af4c20d069d7b14c99b5877fd782255cde21e", "version": "1.3.8", From 8e0d56a120fbf3e9966453b1ff20b75cb6f5d834 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Oct 2021 18:10:59 -0700 Subject: [PATCH 0955/1858] [avcpp] Install pkgconfig into the correct location. (#21046) --- ports/avcpp/fix-pkgconfig-location.patch | 13 +++++++++++++ ports/avcpp/portfile.cmake | 15 +++++++++------ ports/avcpp/vcpkg.json | 2 ++ versions/a-/avcpp.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 ports/avcpp/fix-pkgconfig-location.patch diff --git a/ports/avcpp/fix-pkgconfig-location.patch b/ports/avcpp/fix-pkgconfig-location.patch new file mode 100644 index 00000000000000..d24d00602baeec --- /dev/null +++ b/ports/avcpp/fix-pkgconfig-location.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e0104f4..dae0942 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -128,7 +128,7 @@ if (AVCPP_NOT_SUBPROJECT) + ) + + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libavcpp.pc" +- DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig") ++ DESTINATION "lib/pkgconfig") + + endif() + endif() diff --git a/ports/avcpp/portfile.cmake b/ports/avcpp/portfile.cmake index fcbf37585e8839..48ff0896b463a8 100644 --- a/ports/avcpp/portfile.cmake +++ b/ports/avcpp/portfile.cmake @@ -9,26 +9,29 @@ vcpkg_from_github( HEAD_REF master PATCHES 0002-av_init_packet_deprecation.patch + fix-pkgconfig-location.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AVCPP_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" AVCPP_ENABLE_SHARED) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC} - -DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED} + "-DAV_ENABLE_STATIC=${AVCPP_ENABLE_STATIC}" + "-DAV_ENABLE_SHARED=${AVCPP_ENABLE_SHARED}" -DAV_BUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") + +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/avcpp/vcpkg.json b/ports/avcpp/vcpkg.json index 9f1e0673844488..e619be0be25d53 100644 --- a/ports/avcpp/vcpkg.json +++ b/ports/avcpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "avcpp", "version-date": "2021-06-14", + "port-version": 1, "description": "Wrapper for the FFmpeg that simplify usage it from C++ projects.", "homepage": "https://github.com/h4tr3d/avcpp", "dependencies": [ @@ -12,6 +13,7 @@ "avdevice", "avfilter", "avformat", + "postproc", "swresample", "swscale" ] diff --git a/versions/a-/avcpp.json b/versions/a-/avcpp.json index 4b4edbcc803fd2..9394cae4e4344e 100644 --- a/versions/a-/avcpp.json +++ b/versions/a-/avcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "caf5460d5bfca1d608b7c7eab2bd2872080bf0d8", + "version-date": "2021-06-14", + "port-version": 1 + }, { "git-tree": "b4e6dcc1706046f3b2b6fca62df98bbc7696eb19", "version-date": "2021-06-14", diff --git a/versions/baseline.json b/versions/baseline.json index 9e45d2137ca20c..011091d02eb500 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -242,7 +242,7 @@ }, "avcpp": { "baseline": "2021-06-14", - "port-version": 0 + "port-version": 1 }, "avisynthplus": { "baseline": "3.7.0", From a2564d140b9651b47cfb4fa527a2934e78ac9965 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Oct 2021 18:11:06 -0700 Subject: [PATCH 0956/1858] [libftdi] Install pkgconfig in the correct location. (#21045) --- ports/libftdi/dont_use_lib64.patch | 13 +++++++++++++ ports/libftdi/portfile.cmake | 20 ++++++++++++++------ ports/libftdi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libftdi.json | 5 +++++ 5 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 ports/libftdi/dont_use_lib64.patch diff --git a/ports/libftdi/dont_use_lib64.patch b/ports/libftdi/dont_use_lib64.patch new file mode 100644 index 00000000000000..cebc17393f1a75 --- /dev/null +++ b/ports/libftdi/dont_use_lib64.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b68de29..2eda29e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -44,7 +44,7 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 4) + SET(LIB_SUFFIX "") + SET(PACK_ARCH "") + ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8) +- SET(LIB_SUFFIX 64) ++ SET(LIB_SUFFIX "") + SET(PACK_ARCH .x86_64) + endif(CMAKE_SIZEOF_VOID_P EQUAL 4) + diff --git a/ports/libftdi/portfile.cmake b/ports/libftdi/portfile.cmake index a4a3b0c87e2ca4..f44801849c70ab 100644 --- a/ports/libftdi/portfile.cmake +++ b/ports/libftdi/portfile.cmake @@ -11,12 +11,13 @@ vcpkg_extract_source_archive_ex( PATCHES libusb-win32.patch shared-static.patch + dont_use_lib64.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src") vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS -DDOCUMENTATION=OFF @@ -27,16 +28,23 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON - -DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include + "-DLIBUSB_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include" + + -DLIB_INSTALL_DIR=lib ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libftdi) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE ${CURRENT_PACKAGES_DIR}/share/libftdi/copyright) +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/libftdi") +file(RENAME "${CURRENT_PACKAGES_DIR}/share/libftdi/LICENSE" "${CURRENT_PACKAGES_DIR}/share/libftdi/copyright") vcpkg_copy_pdbs() + +# Delete pkgconfig files for ftdipp since we did -DFTDIPP=OFF above +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ftdipp.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ftdipp.pc") diff --git a/ports/libftdi/vcpkg.json b/ports/libftdi/vcpkg.json index 953acd0b8690d1..b6300d9dd2814e 100644 --- a/ports/libftdi/vcpkg.json +++ b/ports/libftdi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libftdi", "version-string": "0.20", - "port-version": 2, + "port-version": 3, "description": "FTDI USB driver with bitbang mode (v0.20)", "dependencies": [ "libusb-win32" diff --git a/versions/baseline.json b/versions/baseline.json index 011091d02eb500..cbbdd6004850c6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3426,7 +3426,7 @@ }, "libftdi": { "baseline": "0.20", - "port-version": 2 + "port-version": 3 }, "libftdi1": { "baseline": "1.5", diff --git a/versions/l-/libftdi.json b/versions/l-/libftdi.json index e2fbf946ae18d3..e269393c734777 100644 --- a/versions/l-/libftdi.json +++ b/versions/l-/libftdi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9ba20048c2bbea3f1155e42faad0ab3b8a7e3f2", + "version-string": "0.20", + "port-version": 3 + }, { "git-tree": "432b2ffb3de6957b3569862e61d431171c916624", "version-string": "0.20", From 5beeec592f0780390eb6fe498a6799d3a9a70046 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 29 Oct 2021 16:22:51 +0800 Subject: [PATCH 0957/1858] [re2] Fix hash as lowercase (#21050) --- ports/re2/portfile.cmake | 19 +++++++++---------- ports/re2/vcpkg.json | 13 ++++++++++++- versions/baseline.json | 2 +- versions/r-/re2.json | 5 +++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index b6fef0f6c5e593..677e31fc85c336 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -2,22 +2,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 REF 2021-09-01 - SHA512 D0E13CE3E345EDF7A3927756269EF8670240E364E75AF2386CD03870FEA14D8C957DB46CA6BF7000077ACB1EF4244D8F3F77B654FE0D297D11C5100F3A380C5F + SHA512 d0e13ce3e345edf7a3927756269ef8670240e364e75af2386cd03870fea14d8c957db46ca6bf7000077acb1ef4244d8f3f77b654fe0d297d11c5100f3a380c5f HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DRE2_BUILD_TESTING=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DRE2_BUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/re2) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/re2) vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/re2 RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") \ No newline at end of file diff --git a/ports/re2/vcpkg.json b/ports/re2/vcpkg.json index a55d0392ca51c1..4ae3f218126e59 100644 --- a/ports/re2/vcpkg.json +++ b/ports/re2/vcpkg.json @@ -1,6 +1,17 @@ { "name": "re2", "version-date": "2021-09-01", + "port-version": 1, "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.", - "homepage": "https://github.com/google/re2" + "homepage": "https://github.com/google/re2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index cbbdd6004850c6..fe050f18c732e5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5846,7 +5846,7 @@ }, "re2": { "baseline": "2021-09-01", - "port-version": 0 + "port-version": 1 }, "readerwriterqueue": { "baseline": "1.0.5", diff --git a/versions/r-/re2.json b/versions/r-/re2.json index 2617f99f162b3b..e1b856d9253b90 100644 --- a/versions/r-/re2.json +++ b/versions/r-/re2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3b26aeb23d7c925e205b158b0a05b7d446f154d", + "version-date": "2021-09-01", + "port-version": 1 + }, { "git-tree": "c2062d8577ace1dbccbb4b2a317f0e68571f0e2e", "version-date": "2021-09-01", From fa14eb3a7c118a0a6137ee698fb7f0bd0139e6ed Mon Sep 17 00:00:00 2001 From: MSDuran Date: Fri, 29 Oct 2021 20:10:16 +0300 Subject: [PATCH 0958/1858] [easyloggingpp] Fix hash as lowercase (#21052) * Update portfile.cmake This change resolves the hash error while installing the package. Error: File path: [ D:/vcpkg/downloads/temp/muflihun-easyloggingpp-v9.97.0.tar.gz ] Expected hash: [ E45789EDAF7A43AD6A73861840D24CCCE9B9D6BBA1AAACF93C6AC26FF7449957251D2CA322C9DA85130B893332DD305B13A2499EAFFC65ECFAAAFA3E11F8D63D ] Actual hash: [ e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d ] * Bump version number and fix @NancyLi1013 's comment. Co-authored-by: Billy Robert O'Neal III --- ports/easyloggingpp/portfile.cmake | 9 ++++----- ports/easyloggingpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/easyloggingpp.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/easyloggingpp/portfile.cmake b/ports/easyloggingpp/portfile.cmake index bb198a315094bb..22f8b5ab9f3ecc 100644 --- a/ports/easyloggingpp/portfile.cmake +++ b/ports/easyloggingpp/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO muflihun/easyloggingpp - REF v9.97.0 - SHA512 E45789EDAF7A43AD6A73861840D24CCCE9B9D6BBA1AAACF93C6AC26FF7449957251D2CA322C9DA85130B893332DD305B13A2499EAFFC65ECFAAAFA3E11F8D63D + REF v9.97.0 + SHA512 e45789edaf7a43ad6a73861840d24ccce9b9d6bba1aaacf93c6ac26ff7449957251d2ca322c9da85130b893332dd305b13a2499eaffc65ecfaaafa3e11f8d63d HEAD_REF master ) @@ -18,7 +18,6 @@ vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/easyloggingpp" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() diff --git a/ports/easyloggingpp/vcpkg.json b/ports/easyloggingpp/vcpkg.json index 277158eaabe381..8a5e5bbe1d965a 100644 --- a/ports/easyloggingpp/vcpkg.json +++ b/ports/easyloggingpp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "easyloggingpp", "version": "9.97.0", - "port-version": 1, + "port-version": 2, "description": "Easylogging++ is a single header efficient logging library for C++ applications.", "homepage": "https://github.com/amrayn/easyloggingpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fe050f18c732e5..0e1de0bb9637a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1946,7 +1946,7 @@ }, "easyloggingpp": { "baseline": "9.97.0", - "port-version": 1 + "port-version": 2 }, "eathread": { "baseline": "1.32.09", diff --git a/versions/e-/easyloggingpp.json b/versions/e-/easyloggingpp.json index ecd4b4cc411504..a6e90e0aa8ce5a 100644 --- a/versions/e-/easyloggingpp.json +++ b/versions/e-/easyloggingpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40ca985ab8030ca0daf7c902e413423801d3e3d4", + "version": "9.97.0", + "port-version": 2 + }, { "git-tree": "9cf908bc2aaf8f7ec50bf54b111aed600ca50282", "version": "9.97.0", From a898ba7cbcbf63c99ededd495d34cfa327c0fb42 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 29 Oct 2021 22:39:14 -0700 Subject: [PATCH 0959/1858] Update vcpkg tool, add windows-arm64, and download rather than build on some POSIX (#20838) --- scripts/bootstrap.ps1 | 8 +- scripts/bootstrap.sh | 292 +++++++++++++++------------------------- scripts/ci.baseline.txt | 2 - 3 files changed, 119 insertions(+), 183 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index e6f841647349d8..c3d46a02c33ee4 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,13 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-09-10/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +$versionDate = '2021-10-25' +if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { + & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" +} else { + & "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe" +} + Write-Host "" if ($LASTEXITCODE -ne 0) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index ef8138c9908b55..f012007861a280 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,34 +1,34 @@ #!/bin/sh -# Find .vcpkg-root, which indicates the root of this repo +# Find .vcpkg-root. vcpkgRootDir=$(X= cd -- "$(dirname -- "$0")" && pwd -P) while [ "$vcpkgRootDir" != "/" ] && ! [ -e "$vcpkgRootDir/.vcpkg-root" ]; do vcpkgRootDir="$(dirname "$vcpkgRootDir")" done -# Argument parsing +# Parse arguments. vcpkgDisableMetrics="OFF" vcpkgUseSystem=false -vcpkgAllowAppleClang=false -vcpkgBuildTests="OFF" +vcpkgUseMuslC="OFF" for var in "$@" do if [ "$var" = "-disableMetrics" -o "$var" = "--disableMetrics" ]; then vcpkgDisableMetrics="ON" elif [ "$var" = "-useSystemBinaries" -o "$var" = "--useSystemBinaries" ]; then - vcpkgUseSystem=true + echo "Warning: -useSystemBinaries no longer has any effect; ignored. Note that the VCPKG_USE_SYSTEM_BINARIES environment variable behavior is not changed." elif [ "$var" = "-allowAppleClang" -o "$var" = "--allowAppleClang" ]; then - vcpkgAllowAppleClang=true + echo "Warning: -allowAppleClang no longer has any effect; ignored." elif [ "$var" = "-buildTests" ]; then - vcpkgBuildTests="ON" + echo "Warning: -buildTests no longer has any effect; ignored." + elif [ "$var" = "-musl" ]; then + vcpkgUseMuslC="ON" elif [ "$var" = "-help" -o "$var" = "--help" ]; then echo "Usage: ./bootstrap-vcpkg.sh [options]" echo echo "Options:" echo " -help Display usage help" - echo " -disableMetrics Do not build metrics reporting into the executable" - echo " -useSystemBinaries Force use of the system utilities for building vcpkg" - echo " -allowAppleClang Set VCPKG_ALLOW_APPLE_CLANG to build vcpkg in apple with clang anyway" + echo " -disableMetrics Mark this vcpkg root to disable metrics." + echo " -musl Use the musl binary rather than the glibc binary on Linux." exit 1 else echo "Unknown argument $var. Use '-help' for help." @@ -50,6 +50,7 @@ if [ "$unixName" = "MINGW_NT" ]; then exit 0 fi +# Determine the downloads directory. if [ -z ${VCPKG_DOWNLOADS+x} ]; then downloadsDir="$vcpkgRootDir/downloads" else @@ -61,34 +62,88 @@ else fi -extractStringBetweenDelimiters() -{ - input=$1;leftDelim=$2;rightDelim=$3 - output="${input##*$leftDelim}" - output="${output%%$rightDelim*}" - echo "$output" -} - +# Check for minimal prerequisites. vcpkgCheckRepoTool() { __tool=$1 if ! command -v "$__tool" >/dev/null 2>&1 ; then echo "Could not find $__tool. Please install it (and other dependencies) with:" - echo "sudo apt-get install curl zip unzip tar" + echo "On Debian and Ubuntu derivatives:" + echo " sudo apt-get install curl zip unzip tar" + echo "On recent Red Hat and Fedora derivatives:" + echo " sudo dnf install curl zip unzip tar" + echo "On older Red Hat and Fedora derivatives:" + echo " sudo yum install curl zip unzip tar" + echo "On SUSE Linux and derivatives:" + echo " sudo zypper install curl zip unzip tar" + echo "On Alpine:" + echo " apk add build-base cmake ninja zip unzip curl git" + echo " (and export VCPKG_FORCE_SYSTEM_BINARIES=1)" exit 1 fi } -vcpkgCheckBuildTool() -{ - __tool=$1 - if ! command -v "$__tool" >/dev/null 2>&1 ; then - echo "Could not find $__tool. Please install it (and other dependencies) with:" - echo "sudo apt-get install cmake ninja-build" - exit 1 +vcpkgCheckRepoTool curl +vcpkgCheckRepoTool zip +vcpkgCheckRepoTool unzip +vcpkgCheckRepoTool tar + +UNAME="$(uname)" +ARCH="$(uname -m)" + +if [ -e /etc/alpine-release ]; then + vcpkgUseSystem="ON" + vcpkgUseMuslC="ON" +fi + +if [ "$UNAME" = "OpenBSD" ]; then + vcpkgUseSystem="ON" + + if [ -z "$CXX" ]; then + CXX=/usr/bin/clang++ fi -} + if [ -z "$CC" ]; then + CC=/usr/bin/clang + fi +fi + +if [ "$vcpkgUseSystem" = "ON" ]; then + vcpkgCheckRepoTool cmake + vcpkgCheckRepoTool ninja + vcpkgCheckRepoTool git + vcpkgCheckRepoTool gcc +fi + +# Determine what we are going to do to bootstrap: +# MacOS -> Download vcpkg-macos +# Linux +# useMuslC -> download vcpkg-muslc +# amd64 -> download vcpkg-glibc +# Otherwise +# Download and build from source + +# Choose the vcpkg binary to download +vcpkgDownloadTool="ON" +vcpkgToolReleaseTag="2021-10-25" +if [ "$UNAME" = "Darwin" ]; then + echo "Downloading vcpkg-macos..." + vcpkgToolReleaseSha="09bd5d6bab4d45952f43626562af3e959cb82c96324003f665b902ccf65f4600fa1f1e84cbd54ad1f6e390be99cde5b3a1e640a0c3280aface02fbd1e867773e" + vcpkgToolName="vcpkg-macos" +elif [ "$vcpkgUseMuslC" = "ON" ]; then + echo "Downloading vcpkg-muslc..." + vcpkgToolReleaseSha="a598e37855f72841f3cd36a7b3f67d3cdc25f0577d851cd8dbdd5ff16190972ce5b9d0ca60c6e54ed147d1315bdedcd84005dfabc427fbdaee5b74726a351ec7" + vcpkgToolName="vcpkg-muslc" +elif [ "$ARCH" = "x86_64" ]; then + echo "Downloading vcpkg-glibc..." + vcpkgToolReleaseSha="c8f40cf91512500176ce3f7569ec0c91cfc93693921fac2db04ce8af0a6b65bc9aca880b7ecc44223b814e894fef66147af321c45e1b75a8628a78d499c272a8" + vcpkgToolName="vcpkg-glibc" +else + echo "Unable to determine a binary release of vcpkg; attempting to build from source." + vcpkgDownloadTool="OFF" + vcpkgToolReleaseSha="b12cc1229c93f8745864ac67a76213ecb052fb06a233bad2d6ce7743f40e0e2a72d654660d4dadeae95b9d6dd663a8b6cd83ae723cd90d63e3c795a1f12692bb" +fi +# Do the download or build. vcpkgCheckEqualFileHash() { url=$1; filePath=$2; expectedHash=$3 @@ -117,108 +172,26 @@ vcpkgCheckEqualFileHash() vcpkgDownloadFile() { url=$1; downloadPath=$2 sha512=$3 - vcpkgCheckRepoTool "curl" rm -rf "$downloadPath.part" curl -L $url --tlsv1.2 --create-dirs --retry 3 --output "$downloadPath.part" --silent --show-error --fail || exit 1 vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512 + chmod +x "$downloadPath.part" mv "$downloadPath.part" "$downloadPath" } -vcpkgExtractArchive() +vcpkgExtractTar() { archive=$1; toPath=$2 rm -rf "$toPath" "$toPath.partial" mkdir -p "$toPath.partial" - - archiveType="${archive##*.}" - if [ "$archiveType" = "zip" ]; then - vcpkgCheckRepoTool "unzip" - $(cd "$toPath.partial" && unzip -qqo "$archive") - else - vcpkgCheckRepoTool "tar" - $(cd "$toPath.partial" && tar xzf "$archive") - fi + $(cd "$toPath.partial" && tar xzf "$archive") mv "$toPath.partial" "$toPath" } -fetchTool() -{ - tool=$1; UNAME=$2; __output=$3 - - if [ "$tool" = "" ]; then - echo "No tool name provided" - return 1 - fi - - if [ "$UNAME" = "Linux" ]; then - os="linux" - elif [ "$UNAME" = "Darwin" ]; then - os="osx" - elif [ "$UNAME" = "FreeBSD" ]; then - os="freebsd" - else - echo "Unknown uname: $UNAME" - return 1 - fi - - xmlFileAsString=`cat "$vcpkgRootDir/scripts/vcpkgTools.xml"` - toolRegexStart="" - toolData="$(extractStringBetweenDelimiters "$xmlFileAsString" "$toolRegexStart" "")" - case "$toolData" in - "" | "" "")" - - toolPath="$downloadsDir/tools/$tool-$version-$os" - - exeRelativePath="$(extractStringBetweenDelimiters "$toolData" "" "")" - exePath="$toolPath/$exeRelativePath" - - if [ -e "$exePath" ]; then - eval $__output="'$exePath'" - return 0 - fi - - isArchive=true - if [ $isArchive = true ]; then - archiveName="$(extractStringBetweenDelimiters "$toolData" "" "")" - downloadPath="$downloadsDir/$archiveName" - else - echo "Non-archives not supported yet" - return 1 - fi - - url="$(extractStringBetweenDelimiters "$toolData" "" "")" - sha512="$(extractStringBetweenDelimiters "$toolData" "" "")" - if ! [ -e "$downloadPath" ]; then - echo "Downloading $tool..." - vcpkgDownloadFile $url "$downloadPath" $sha512 - echo "Downloading $tool... done." - else - vcpkgCheckEqualFileHash $url "$downloadPath" $sha512 - fi - - if [ $isArchive = true ]; then - echo "Extracting $tool..." - vcpkgExtractArchive "$downloadPath" "$toolPath" - echo "Extracting $tool... done." - fi - - if ! [ -e "$exePath" ]; then - echo "Could not detect or download $tool" - return 1 - fi - - eval $__output="'$exePath'" - return 0 -} - -selectCXX() -{ +if [ "$vcpkgDownloadTool" = "ON" ]; then + vcpkgDownloadFile "https://github.com/microsoft/vcpkg-tool/releases/download/$vcpkgToolReleaseTag/$vcpkgToolName" "$vcpkgRootDir/vcpkg" $vcpkgToolReleaseSha +else if [ "x$CXX" = "x" ]; then if which g++-11 >/dev/null 2>&1; then CXX=g++-11 @@ -237,81 +210,40 @@ selectCXX() fi # If we can't find g++, allow CMake to do the look-up fi -} - -# Preparation -UNAME="$(uname)" -ARCH="$(uname -m)" -# Force using system utilities for building vcpkg if host arch is arm, arm64, s390x, or ppc64le. -if [ "$ARCH" = "armv7l" -o "$ARCH" = "aarch64" -o "$ARCH" = "s390x" -o "$ARCH" = "ppc64le" ]; then - vcpkgUseSystem=true -fi - -if [ "$UNAME" = "OpenBSD" ]; then - vcpkgUseSystem=true - - if [ -z "$CXX" ]; then - CXX=/usr/bin/clang++ - fi - if [ -z "$CC" ]; then - CC=/usr/bin/clang - fi -fi + vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" + vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" + baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" + buildDir="$baseBuildDir/build" + tarballPath="$downloadsDir/$vcpkgToolReleaseTarball" + srcBaseDir="$baseBuildDir/src" + srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag" -if $vcpkgUseSystem; then - cmakeExe="cmake" - ninjaExe="ninja" - vcpkgCheckBuildTool "$cmakeExe" - vcpkgCheckBuildTool "$ninjaExe" -else - fetchTool "cmake" "$UNAME" cmakeExe || exit 1 - fetchTool "ninja" "$UNAME" ninjaExe || exit 1 -fi -if [ "$os" = "osx" ]; then - if [ "$vcpkgAllowAppleClang" = "true" ] || [[ $(sw_vers -productVersion | awk -F '.' '{print $1}') -ge 11 ]]; then - CXX=clang++ + if [ -e "$tarballPath" ]; then + vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" else - selectCXX + echo "Downloading vcpkg tool sources" + vcpkgDownloadFile "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" fi -else - selectCXX -fi -# Do the build -vcpkgToolReleaseTag="2021-09-10" -vcpkgToolReleaseSha="0bea4c7bdd91933d44a0214e2202eb5ef988826d32ae7a00a8868e510710e7de0b336b1cc6aa1ea20af2f6e24d92f2ab665046089bb4ec43bc2add94a901d5fc" -vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz" -vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball" -baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg" -buildDir="$baseBuildDir/build" -tarballPath="$downloadsDir/$vcpkgToolReleaseTarball" -srcBaseDir="$baseBuildDir/src" -srcDir="$srcBaseDir/vcpkg-tool-$vcpkgToolReleaseTag" + echo "Building vcpkg-tool..." + rm -rf "$baseBuildDir" + mkdir -p "$buildDir" + vcpkgExtractTar "$tarballPath" "$srcBaseDir" + cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DVCPKG_DEVELOPMENT_WARNINGS=OFF" -if [ -e "$tarballPath" ]; then - vcpkgCheckEqualFileHash "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" -else - echo "Downloading vcpkg tool sources" - vcpkgDownloadFile "$vcpkgToolUrl" "$tarballPath" "$vcpkgToolReleaseSha" -fi + if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then + cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' " + fi -echo "Building vcpkg-tool..." -rm -rf "$baseBuildDir" -mkdir -p "$buildDir" -vcpkgExtractArchive "$tarballPath" "$srcBaseDir" -cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DCMAKE_MAKE_PROGRAM='$ninjaExe'" + (cd "$buildDir" && CXX="$CXX" eval cmake "$srcDir" $cmakeConfigOptions) || exit 1 + (cd "$buildDir" && cmake --build .) || exit 1 -if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then - cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' " + rm -rf "$vcpkgRootDir/vcpkg" + cp "$buildDir/vcpkg" "$vcpkgRootDir/" fi -(cd "$buildDir" && CXX="$CXX" eval "$cmakeExe" "$srcDir" $cmakeConfigOptions "-DBUILD_TESTING=$vcpkgBuildTests" "-DVCPKG_DEVELOPMENT_WARNINGS=OFF" "-DVCPKG_ALLOW_APPLE_CLANG=$vcpkgAllowAppleClang") || exit 1 -(cd "$buildDir" && "$cmakeExe" --build .) || exit 1 - -rm -rf "$vcpkgRootDir/vcpkg" -cp "$buildDir/vcpkg" "$vcpkgRootDir/" - +# Apply the disable-metrics marker file. if [ "$vcpkgDisableMetrics" = "ON" ]; then touch "$vcpkgRootDir/vcpkg.disable-metrics" elif ! [ -f "$vcpkgRootDir/vcpkg.disable-metrics" ]; then diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index e288e7ebe4e2df..f1eea42970eb1e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -643,8 +643,6 @@ libmpeg2:x64-uwp=fail libmupdf:x64-osx=fail libmysql:x86-windows=fail libmysql:arm64-windows=fail -libopenmpt:x64-linux=fail -libopenmpt:x64-osx=fail libopusenc:arm-uwp=fail libopusenc:x64-uwp=fail libosip2:x64-windows-static-md=fail From f8019fe04930f62c80430250c96edd6a3ba934c9 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 1 Nov 2021 20:18:28 +0100 Subject: [PATCH 0960/1858] [ci] Remove unaffected ports from pull request builds (#21078) * Rewrite to single invovation of 'vcpkg ci' * Split caching args from common args * Use parent hashes for pull request CI builds * Completely switch to parent revision state and back --- .../azure-pipelines/test-modified-ports.ps1 | 45 ++++++++++++++----- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index faebe4522e5e7e..c17010cab5569a 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -23,9 +23,14 @@ The type and parameters of the binary source. Shared across runs of this script. this parameter is not set, binary caching will not be used. Example: "files,W:\" .PARAMETER BuildReason -The reason Azure Pipelines is running this script (controls in which mode Binary Caching is used). -If BinarySourceStub is not set, this parameter has no effect. If BinarySourceStub is set and this is -not, binary caching will default to read-write mode. +The reason Azure Pipelines is running this script. For invocations caused by `PullRequest`, +modified ports are identified by changed hashes with regard to git HEAD~1 (subject to NoParentHashes), +and ports marked as failing in the CI baseline (or which depend on such ports) are skipped. +If BinarySourceStub is set and this parameter is set to a non-empty value other than `PullRequest`, +binary caching will be in write-only mode. + +.PARAMETER NoParentHashes +Indicates to not use parent hashes even for pull requests. .PARAMETER PassingIsPassing Indicates that 'Passing, remove from fail list' results should not be emitted as failures. (For example, this is used @@ -49,6 +54,7 @@ Param( [String]$BuildReason = $null, [String[]]$AdditionalSkips = @(), [String[]]$OnlyTest = $null, + [switch]$NoParentHashes = $false, [switch]$PassingIsPassing = $false ) @@ -77,12 +83,13 @@ $commonArgs = @( "--x-packages-root=$packagesRoot", "--overlay-ports=scripts/test_ports" ) +$cachingArgs = @() $skipFailures = $false if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { - $commonArgs += @('--no-binarycaching') + $cachingArgs = @('--no-binarycaching') } else { - $commonArgs += @('--binarycaching') + $cachingArgs = @('--binarycaching') $binaryCachingMode = 'readwrite' if ([string]::IsNullOrWhiteSpace($BuildReason)) { Write-Host 'Build reason not specified, defaulting to using binary caching in read write mode.' @@ -96,7 +103,7 @@ if ([string]::IsNullOrWhiteSpace($BinarySourceStub)) { $binaryCachingMode = 'write' } - $commonArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") + $cachingArgs += @("--binarysource=clear;$BinarySourceStub,$binaryCachingMode") } if ($Triplet -eq 'x64-linux') { @@ -141,7 +148,7 @@ if ($null -ne $OnlyTest) { $OnlyTest | % { $portName = $_ - & "./vcpkg$executableExtension" install --triplet $Triplet @commonArgs $portName + & "./vcpkg$executableExtension" install --triplet $Triplet @commonArgs @cachingArgs $portName if (-not $?) { [System.Console]::Error.WriteLine( ` @@ -155,17 +162,35 @@ if ($null -ne $OnlyTest) } else { + $hostArgs = @() if ($Triplet -in @('x64-windows', 'x64-osx', 'x64-linux')) { # WORKAROUND: These triplets are native-targetting which triggers an issue in how vcpkg handles the skip list. # The workaround is to pass the skip list as host-excludes as well. - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --host-exclude=$skipList --failure-logs=$failureLogs @commonArgs + $hostArgs = @("--host-exclude=$skipList") } - else + + $parentHashes = @() + if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) { - & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @commonArgs + # Prefetch tools for better output + & "./vcpkg$executableExtension" fetch cmake + & "./vcpkg$executableExtension" fetch ninja + & "./vcpkg$executableExtension" fetch git + + Write-Host "Determining parent hashes using HEAD~1" + $parentHashesFile = Join-Path $WorkingRoot 'parent-hashes.json' + $parentHashes = @("--parent-hashes=$parentHashesFile") + & git revert -n -m 1 HEAD + & "./vcpkg$executableExtension" ci $Triplet --dry-run --exclude=$skipList @hostArgs @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" ` + | ForEach-Object { if ($_ -match ' dependency information| determine pass') { Write-Host $_ } } + & git reset --hard HEAD + + Write-Host "Running CI using parent hashes" } + & "./vcpkg$executableExtension" ci $Triplet --x-xunit=$xmlFile --exclude=$skipList --failure-logs=$failureLogs @hostArgs @commonArgs @cachingArgs @parentHashes + $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) Write-Host "##vso[task.setvariable variable=FAILURE_LOGS_EMPTY]$failureLogsEmpty" From cac0567d7de05d9201615217b2eb63b64848e41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 2 Nov 2021 05:36:04 +0800 Subject: [PATCH 0961/1858] [fcl] Enable dynamic support (#21106) * [fcl] Enable dynamic support * version --- ports/fcl/vcpkg.json | 3 +-- versions/baseline.json | 2 +- versions/f-/fcl.json | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/fcl/vcpkg.json b/ports/fcl/vcpkg.json index 2ce7c11ff3a435..dd0d8808d8e071 100644 --- a/ports/fcl/vcpkg.json +++ b/ports/fcl/vcpkg.json @@ -1,10 +1,9 @@ { "name": "fcl", "version": "0.7.0", - "port-version": 1, + "port-version": 2, "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles", "homepage": "https://github.com/flexible-collision-library/fcl", - "supports": "static", "dependencies": [ "ccd", "eigen3", diff --git a/versions/baseline.json b/versions/baseline.json index 0e1de0bb9637a8..029eb935b9ed07 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2118,7 +2118,7 @@ }, "fcl": { "baseline": "0.7.0", - "port-version": 1 + "port-version": 2 }, "fdk-aac": { "baseline": "2.0.2", diff --git a/versions/f-/fcl.json b/versions/f-/fcl.json index 96a11d1afafe23..b3d5c5a79c2fb2 100644 --- a/versions/f-/fcl.json +++ b/versions/f-/fcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11b59644379cbae75571423312e0c0971e6d3740", + "version": "0.7.0", + "port-version": 2 + }, { "git-tree": "63fe0d8f64a95e4eef52c44f1e2a6e6240ca53fe", "version": "0.7.0", From ef470bab43548e46de31a3522f080569978b7ad5 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 2 Nov 2021 19:55:33 +0100 Subject: [PATCH 0962/1858] [drlibs] Update to 2021-11-02 (#21120) * Update drlibs to 2021-11-02 * Update CI baseline Co-authored-by: chausner --- ports/drlibs/portfile.cmake | 17 ++++++++--------- ports/drlibs/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/d-/drlibs.json | 5 +++++ 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ports/drlibs/portfile.cmake b/ports/drlibs/portfile.cmake index 79347587e3911c..5e4fa4419a6a01 100644 --- a/ports/drlibs/portfile.cmake +++ b/ports/drlibs/portfile.cmake @@ -1,16 +1,15 @@ -#header-only library +# Header-only library vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mackron/dr_libs - REF b777360d73c10a367d268a8bb51bc0d1f36020b5 - SHA512 65d2c01ea72868e1212dc5af6b8bad7603a40e030a6c6ee59ae4e723de9c974ed31385475e2bcf0f22d424666fc70c7851c3998d0c51afc845785e71ed267a8f + REF f13cbcfd06afe7287f99b1bb5982cefdf3d6a974 + SHA512 c108db409389f912bdcb979bc0dfe31658b8bcd7ce327145a77bdb9a168512e2c1a94cb59677b5d6bfa213e412498360a8ec25d5424bb2ba292edaf88bf5f195 HEAD_REF master ) -# Put the licence file where vcpkg expects it -file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/drlibs) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/drlibs/README.md ${CURRENT_PACKAGES_DIR}/share/drlibs/copyright) - # Copy the header files -file(GLOB HEADER_FILES ${SOURCE_PATH}/*.h) -file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(GLOB HEADER_FILES "${SOURCE_PATH}/*.h") +file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include") + +# Put the licence file where vcpkg expects it +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/drlibs/vcpkg.json b/ports/drlibs/vcpkg.json index 717933aa06d5a2..73a1cb4e2f3cfc 100644 --- a/ports/drlibs/vcpkg.json +++ b/ports/drlibs/vcpkg.json @@ -1,7 +1,6 @@ { "name": "drlibs", - "version-string": "2019-08-12", - "port-version": 1, - "description": "A collection of public domain single-file libraries for C/C++.", + "version-date": "2021-11-02", + "description": "Single-file audio decoding libraries for C/C++", "homepage": "https://github.com/mackron/dr_libs" } diff --git a/versions/baseline.json b/versions/baseline.json index 029eb935b9ed07..e035aa5abde9ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1893,8 +1893,8 @@ "port-version": 0 }, "drlibs": { - "baseline": "2019-08-12", - "port-version": 1 + "baseline": "2021-11-02", + "port-version": 0 }, "drogon": { "baseline": "1.7.1", diff --git a/versions/d-/drlibs.json b/versions/d-/drlibs.json index 51652ae9b83b05..e579979206b50f 100644 --- a/versions/d-/drlibs.json +++ b/versions/d-/drlibs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80b487d4ce97c60609cdba15430c0d8b34fb6235", + "version-date": "2021-11-02", + "port-version": 0 + }, { "git-tree": "f82c3255ba101684781f57429f162b8f8528a972", "version-string": "2019-08-12", From c7a9b7328d164b52c3369d6c01f5a804e86d0cce Mon Sep 17 00:00:00 2001 From: Carlos O'Ryan Date: Tue, 2 Nov 2021 14:56:27 -0400 Subject: [PATCH 0963/1858] [google-cloud-cpp] update to latest release (v1.33.0) (#21118) --- ports/google-cloud-cpp/portfile.cmake | 4 ++-- ports/google-cloud-cpp/vcpkg.json | 6 +----- versions/baseline.json | 4 ++-- versions/g-/google-cloud-cpp.json | 5 +++++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake index 08caef6dd6b352..e860f9e585c74c 100644 --- a/ports/google-cloud-cpp/portfile.cmake +++ b/ports/google-cloud-cpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO googleapis/google-cloud-cpp - REF v1.32.1 - SHA512 385adb0e39ed0b3474609d90524bb3fe8c42d92d34626cde7b70b1eb4cd76dd22e9b5b9d0933d600ce7a585c63382d764a038fd8152a39bbbd8010524eb40e9b + REF v1.33.0 + SHA512 fda083368db3b31dbfa6b6d6b02254a2c2b71a61389c94d8f62a5fcd729691bbe54745e1887fe36b244411af09fcaf7968e535ea9a3dc4833892859e7201bf67 HEAD_REF main ) diff --git a/ports/google-cloud-cpp/vcpkg.json b/ports/google-cloud-cpp/vcpkg.json index b88bfe428dcbc3..9bc82c6c8a9087 100644 --- a/ports/google-cloud-cpp/vcpkg.json +++ b/ports/google-cloud-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "google-cloud-cpp", - "version": "1.32.1", - "port-version": 1, + "version": "1.33.0", "description": "C++ Client Libraries for Google Cloud Platform APIs.", "homepage": "https://github.com/googleapis/google-cloud-cpp", "license": "Apache-2.0", @@ -78,9 +77,6 @@ } ] }, - "firestore": { - "description": "Community contributions to interact with Firestore" - }, "iam": { "description": "The Google Cloud IAM C++ client library", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e035aa5abde9ec..5f7bf5cde28f23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2501,8 +2501,8 @@ "port-version": 7 }, "google-cloud-cpp": { - "baseline": "1.32.1", - "port-version": 1 + "baseline": "1.33.0", + "port-version": 0 }, "google-cloud-cpp-common": { "baseline": "alias", diff --git a/versions/g-/google-cloud-cpp.json b/versions/g-/google-cloud-cpp.json index 722c9006d02ac8..5e4e1739ad5f0a 100644 --- a/versions/g-/google-cloud-cpp.json +++ b/versions/g-/google-cloud-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c272f2136618359a7e387fdc45a434e25e4ce85", + "version": "1.33.0", + "port-version": 0 + }, { "git-tree": "793c4f8aafbed21274611812020a3a4c01517fc2", "version": "1.32.1", From 2c9f78d38d225704e597adb97ed71f2d0352e1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 3 Nov 2021 02:57:02 +0800 Subject: [PATCH 0964/1858] [bullet3] Add support for OSX arm triplet (#21108) * [bullet3] Add support for OSX arm triplet * version * Replace depreciate functions * version --- ports/bullet3/portfile.cmake | 18 +++++++++--------- ports/bullet3/vcpkg.json | 13 ++++++++++++- versions/b-/bullet3.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/ports/bullet3/portfile.cmake b/ports/bullet3/portfile.cmake index 39bb69f8ed2633..79bcf0cda88bd4 100644 --- a/ports/bullet3/portfile.cmake +++ b/ports/bullet3/portfile.cmake @@ -1,4 +1,6 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") +if (NOT VCPKG_TARGET_IS_OSX) + vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP") +endif() vcpkg_check_linkage(ONLY_STATIC_LIBRARY) @@ -16,9 +18,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS multithreading BULLET2_MULTITHREADING ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DUSE_MSVC_RUNTIME_LIBRARY_DLL=ON -DBUILD_CPU_DEMOS=OFF @@ -30,16 +31,15 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(PACKAGE_NAME bullet CONFIG_PATH share/bullet) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/bullet TARGET_PATH share/bullet) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/bullet/BulletInverseDynamics/details") -vcpkg_copy_pdbs() - file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_fixup_pkgconfig() diff --git a/ports/bullet3/vcpkg.json b/ports/bullet3/vcpkg.json index 7aa0e9feb1acde..6de08ff9fcb08f 100644 --- a/ports/bullet3/vcpkg.json +++ b/ports/bullet3/vcpkg.json @@ -1,9 +1,20 @@ { "name": "bullet3", "version": "3.17", - "port-version": 2, + "port-version": 3, "description": "Bullet Physics is a professional collision detection, rigid body, and soft body dynamics library", "homepage": "https://github.com/bulletphysics/bullet3", + "supports": "!((windows | linux) & (arm | uwp))", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "multithreading": { "description": "Multithreading functionality for bullet3" diff --git a/versions/b-/bullet3.json b/versions/b-/bullet3.json index 49a5583439717c..111e48e1a730a9 100644 --- a/versions/b-/bullet3.json +++ b/versions/b-/bullet3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88add55351bf89f89e584924663861c0a827bdf5", + "version": "3.17", + "port-version": 3 + }, { "git-tree": "bcc42d2c8eb5fc4134c31f6176bc0c0ae3bc46e1", "version": "3.17", diff --git a/versions/baseline.json b/versions/baseline.json index 5f7bf5cde28f23..9260e4e079ec0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1170,7 +1170,7 @@ }, "bullet3": { "baseline": "3.17", - "port-version": 2 + "port-version": 3 }, "bustache": { "baseline": "1.1.0", From c0a18b6c9b46e9921cc4d1bec60c555edf16fe4a Mon Sep 17 00:00:00 2001 From: misirlou-tg <39652424+misirlou-tg@users.noreply.github.com> Date: Tue, 2 Nov 2021 13:58:07 -0500 Subject: [PATCH 0965/1858] [libsercomm] Adding new port (#21105) * [libsercomm] Adding new port * [libsercomm] Update portfile to remove deprecated functions * [libsercomm] Addressing comments from pull request - Removing "pic" feature - Removing PREFER_NINJA from vcpkg_cmake_configure * [libsercomm] Running x-add-version --- ports/libsercomm/portfile.cmake | 40 +++++++++++++++++++++++++++++++++ ports/libsercomm/vcpkg.json | 29 ++++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libsercomm.json | 9 ++++++++ 4 files changed, 82 insertions(+) create mode 100644 ports/libsercomm/portfile.cmake create mode 100644 ports/libsercomm/vcpkg.json create mode 100644 versions/l-/libsercomm.json diff --git a/ports/libsercomm/portfile.cmake b/ports/libsercomm/portfile.cmake new file mode 100644 index 00000000000000..937ad7c7bb889e --- /dev/null +++ b/ports/libsercomm/portfile.cmake @@ -0,0 +1,40 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ingeniamc/sercomm + REF 1.3.2 + SHA512 f1581f2dfa262ffb1b3aec5a1e6d32493c322c94541fbacc98efff23b3b42b14c9abdcfb063a78b7c54fb1f9d8dbf59d8064099601de2175af6c6d830708324c + HEAD_REF master +) + +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + errdesc WITH_ERRDESC + devmon WITH_DEVMON +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE + OPTIONS + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +# Fix CMake files +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/sercomm) + +vcpkg_fixup_pkgconfig() + +# Remove includes in debug +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +# Copy pdb files +vcpkg_copy_pdbs() diff --git a/ports/libsercomm/vcpkg.json b/ports/libsercomm/vcpkg.json new file mode 100644 index 00000000000000..81202670d1cf67 --- /dev/null +++ b/ports/libsercomm/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "libsercomm", + "version": "1.3.2", + "description": "Multiplatform serial communications library", + "homepage": "https://github.com/ingeniamc/sercomm", + "license": "MIT", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "devmon", + "errdesc" + ], + "features": { + "devmon": { + "description": "When enabled, device listing and monitoring will be supported" + }, + "errdesc": { + "description": "When enabled, error details description can be obtained" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 9260e4e079ec0f..14d5b963c4048b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3820,6 +3820,10 @@ "baseline": "2.3.0", "port-version": 0 }, + "libsercomm": { + "baseline": "1.3.2", + "port-version": 0 + }, "libsigcpp": { "baseline": "3.0.3", "port-version": 1 diff --git a/versions/l-/libsercomm.json b/versions/l-/libsercomm.json new file mode 100644 index 00000000000000..75c02eec9381af --- /dev/null +++ b/versions/l-/libsercomm.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "85fa53c8aa1927afa7844c01b646a86de8803c30", + "version": "1.3.2", + "port-version": 0 + } + ] +} From a40bd692c79b42ac4519987b0c16e17eed95f34e Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 3 Nov 2021 00:38:49 -0700 Subject: [PATCH 0966/1858] Update vcpkg-tool to 2021-11-02. (#21153) --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index c3d46a02c33ee4..af62fde1b6290e 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2021-10-25' +$versionDate = '2021-11-02' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index f012007861a280..0da88be2a3d79c 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -124,23 +124,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2021-10-25" +vcpkgToolReleaseTag="2021-11-02" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="09bd5d6bab4d45952f43626562af3e959cb82c96324003f665b902ccf65f4600fa1f1e84cbd54ad1f6e390be99cde5b3a1e640a0c3280aface02fbd1e867773e" + vcpkgToolReleaseSha="f60e19bb3c457731b9321580b7b29bde18c103fe6b78bfbeceabdf35ca573f498cf72e09500d9a1805c9f5f8983bd06bc8a1f511d01ece8b38b0b2ae529c8365" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="a598e37855f72841f3cd36a7b3f67d3cdc25f0577d851cd8dbdd5ff16190972ce5b9d0ca60c6e54ed147d1315bdedcd84005dfabc427fbdaee5b74726a351ec7" + vcpkgToolReleaseSha="cbef5be0430d58179882d921d8647b374d377e66b73abe84e6ea6b4333d231e7ef6bd1b2619544548c53cf98af0465e0a5b0ede954305e4f0b17380b79f520b6" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="c8f40cf91512500176ce3f7569ec0c91cfc93693921fac2db04ce8af0a6b65bc9aca880b7ecc44223b814e894fef66147af321c45e1b75a8628a78d499c272a8" + vcpkgToolReleaseSha="9b6836d9d28a7f5e4ed33ea9c22458a6c9ce9cc253c7bb16c3f78ffd9b812b87a53f74f19e575a2005f4c163b0e242809f678f54c5c6871d9c55068391563b63" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="b12cc1229c93f8745864ac67a76213ecb052fb06a233bad2d6ce7743f40e0e2a72d654660d4dadeae95b9d6dd663a8b6cd83ae723cd90d63e3c795a1f12692bb" + vcpkgToolReleaseSha="2c50a5a360ca34eeaf00def29c9092c38225d9c70f1b3ad4b8f81e5a4bab027e215e8a65d28d38422229129959bb7d1c1d709e1f2d8b7c3efed024d67d8c3307" fi # Do the download or build. From 0a388a6b32ebe51d760604478c68e3dd7fe97fb2 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 3 Nov 2021 08:40:17 +0100 Subject: [PATCH 0967/1858] [openmvs] fix sha512 (#21059) * [openmvs] fix hash * [openmvs] fix references --- ports/openmvs/portfile.cmake | 2 +- ports/openmvs/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openmvs.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/openmvs/portfile.cmake b/ports/openmvs/portfile.cmake index eaf1c4a056c02b..f7232ee1be38ed 100644 --- a/ports/openmvs/portfile.cmake +++ b/ports/openmvs/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO cdcseacave/openMVS REF v1.1.1 - SHA512 EEB15D0756F12136A1E7938A0EED97024D564EEF3355F3BB6ABF6C681E38919011E1A133D89CA360F463E7FED5FEB8E0138A0FE9BE4C25B6A13BA4B042AEF3EB + SHA512 eeb15d0756f12136a1e7938a0eed97024d564eef3355f3bb6abf6c681e38919011e1a133d89ca360f463e7fed5feb8e0138a0fe9be4c25b6a13ba4b042aef3eb HEAD_REF master PATCHES fix-build.patch diff --git a/ports/openmvs/vcpkg.json b/ports/openmvs/vcpkg.json index fa03e4dae91c12..14a8c3e63ed3ef 100644 --- a/ports/openmvs/vcpkg.json +++ b/ports/openmvs/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmvs", "version": "1.1.1", - "port-version": 1, + "port-version": 2, "description": "OpenMVS: open Multi-View Stereo reconstruction library", "homepage": "https://cdcseacave.github.io/openMVS", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 14d5b963c4048b..f55f0c5cd62183 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4934,7 +4934,7 @@ }, "openmvs": { "baseline": "1.1.1", - "port-version": 1 + "port-version": 2 }, "openni2": { "baseline": "2.2.0.33", diff --git a/versions/o-/openmvs.json b/versions/o-/openmvs.json index 8ce9dd4c994ca5..228825212966c4 100644 --- a/versions/o-/openmvs.json +++ b/versions/o-/openmvs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a66ad18d59e5ffdd21f5bc1cae0b195ba35aba18", + "version": "1.1.1", + "port-version": 2 + }, { "git-tree": "168233263a9b959a9a19f1eb2d6f462d5257d18f", "version": "1.1.1", From cab4e2e47b098837350d9fe32b9ac6229560f76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 3 Nov 2021 15:43:01 +0800 Subject: [PATCH 0968/1858] [vcpkg] Add aria2 as vcpkg required tool (step 1) (#20971) * Add aria2 as vcpkg required tool * Change exeRelativePath * overwrite * Fix typo * Fix incorrect set * Update scripts/vcpkgTools.xml Co-authored-by: Billy Robert O'Neal III --- scripts/vcpkgTools.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index ad691adbb9ddf5..54ab0a11aa419e 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -126,6 +126,13 @@ 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4 aria2-1.35.0-win-32bit-build1.zip + + 1.35.0 + aria2-1.35.0/bin/aria2c + https://github.com/aria2/aria2/releases/download/release-1.35.0/aria2-1.35.0-osx-darwin.tar.bz2 + 3bb32b7d55347d1af37c6f4ebf0e20b38ce51c37a1baf92f7ad1762000539a03413dd679a6d902fdb1805fa71917300c9692aceee012eb06ecdff10491137aec + aria2-1.35.0-osx-darwin.tar.bz2 + 1.10.2 ninja.exe From 9bdce722e5735da59785965ff51f28424aa1b2b4 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Wed, 3 Nov 2021 08:58:06 +0100 Subject: [PATCH 0969/1858] [NUGET] update to 5.11.0 (#21058) * [NUGET] update to 5.11.0 * [nuget] update hash --- scripts/cmake/vcpkg_find_acquire_program.cmake | 8 ++++---- scripts/vcpkgTools.xml | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index d8b1de614b0c6c..4fa7782e529231 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -243,14 +243,14 @@ function(vcpkg_find_acquire_program VAR) set(VERSION_CMD --version) elseif(VAR MATCHES "NUGET") set(PROGNAME nuget) - set(SUBDIR "5.10.0") + set(SUBDIR "5.11.0") set(PATHS "${DOWNLOADS}/tools/nuget-${SUBDIR}-windows") set(BREW_PACKAGE_NAME "nuget") - set(URL "https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe") + set(URL "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") set(_vfa_RENAME "nuget.exe") - set(ARCHIVE "nuget.5.10.0.exe") + set(ARCHIVE "nuget.5.11.0.exe") set(NOEXTRACT ON) - set(HASH c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e) + set(HASH 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) elseif(VAR MATCHES "MESON") set(MESON_VERSION 0.58.1) set(PROGNAME meson) diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 54ab0a11aa419e..18ecfceb6ef83c 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -88,22 +88,22 @@ 1a98beebd1bb6929cbe98b86a3b77fb1ae4508b86cdcb64696b20c3a3336a2b5c8518e19a21092f1c98a46202c048dba819dc52bef122485ac34b888b77e59b2 - 5.10.0 + 5.11.0 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe - c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e + https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe + 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 - 5.10.0 + 5.11.0 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe - c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e + https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe + 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 - 5.10.0 + 5.11.0 nuget.exe - https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe - c4b7375e46cdb843096ce491b9809e0dc86773ba7b6333f13d49ec414b2953112df82ee8b833fd31be0cc7fe0fff1af88f3c07aa9553ad03f7f6c5a6eec2057e + https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe + 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7 3.1.81 From 900a6223edadecef11e08bab8d518877eb1edac8 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 4 Nov 2021 05:29:29 +0100 Subject: [PATCH 0970/1858] [vcpkg] Always use an autotools build triplet (#18130) * Always use a build triplet for mingw * [vcpkg_configure_make] Always assume cross-compilation Co-authored-by: Robert Schumacher Co-authored-by: NancyLi1013 --- scripts/cmake/vcpkg_configure_make.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake index da0fd2aad39159..aa054222c7dedc 100644 --- a/scripts/cmake/vcpkg_configure_make.cmake +++ b/scripts/cmake/vcpkg_configure_make.cmake @@ -306,7 +306,7 @@ function(vcpkg_configure_make) list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4) vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES}) endif() - if (arg_AUTOCONFIG AND NOT arg_BUILD_TRIPLET OR arg_DETERMINE_BUILD_TRIPLET OR VCPKG_CROSSCOMPILING AND NOT arg_BUILD_TRIPLET) + if (arg_DETERMINE_BUILD_TRIPLET OR NOT arg_BUILD_TRIPLET) z_vcpkg_determine_autotools_host_cpu(BUILD_ARCH) # VCPKG_HOST => machine you are building on => --build= z_vcpkg_determine_autotools_target_cpu(TARGET_ARCH) # --build: the machine you are building on From f84b0c692f43fbfb9a76225499c345cf35ba6277 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 3 Nov 2021 21:42:05 -0700 Subject: [PATCH 0971/1858] [vcpkg_host_path_list] add SET subcommand (#20879) * [vcpkg_host_path_list] add SET subcommand * update docs * try to do something that Billy might like more? * wheee Co-authored-by: nicole mazzuca Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> --- docs/maintainers/vcpkg_host_path_list.md | 9 ++-- scripts/cmake/vcpkg_host_path_list.cmake | 62 +++++++++++++++--------- 2 files changed, 44 insertions(+), 27 deletions(-) diff --git a/docs/maintainers/vcpkg_host_path_list.md b/docs/maintainers/vcpkg_host_path_list.md index 8517e7f56e1e7f..d3f19988988c9e 100644 --- a/docs/maintainers/vcpkg_host_path_list.md +++ b/docs/maintainers/vcpkg_host_path_list.md @@ -7,6 +7,7 @@ Modify a host path list variable (PATH, INCLUDE, LIBPATH, etc.) ```cmake vcpkg_host_path_list(PREPEND [...]) vcpkg_host_path_list(APPEND [...]) +vcpkg_host_path_list(SET [...]) ``` `` may be either a regular variable name, or `ENV{variable-name}`, @@ -15,12 +16,14 @@ in which case `vcpkg_host_path_list` will modify the environment. `vcpkg_host_path_list` adds all of the paths passed to it to ``; `PREPEND` puts them before the existing list, so that they are searched first; `APPEND` places them after the existing list, -so they would be searched after the paths which are already in the variable. +so they would be searched after the paths which are already in the variable, +and `SET` replaces the value of the existing list. -For both `APPEND` and `PREPEND`, +For all of `APPEND`, `PREPEND`, and `SET`, the paths are added (and thus searched) in the order received. -If no paths are passed, then nothing will be done. +If no paths are passed to `APPEND` or `PREPEND`, nothing will be done; +for `SET`, the variable will be set to the empty string. ## Source [scripts/cmake/vcpkg\_host\_path\_list.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_host_path_list.cmake) diff --git a/scripts/cmake/vcpkg_host_path_list.cmake b/scripts/cmake/vcpkg_host_path_list.cmake index d849cd42d35867..3495e803f877e7 100644 --- a/scripts/cmake/vcpkg_host_path_list.cmake +++ b/scripts/cmake/vcpkg_host_path_list.cmake @@ -6,6 +6,7 @@ Modify a host path list variable (PATH, INCLUDE, LIBPATH, etc.) ```cmake vcpkg_host_path_list(PREPEND [...]) vcpkg_host_path_list(APPEND [...]) +vcpkg_host_path_list(SET [...]) ``` `` may be either a regular variable name, or `ENV{variable-name}`, @@ -14,13 +15,36 @@ in which case `vcpkg_host_path_list` will modify the environment. `vcpkg_host_path_list` adds all of the paths passed to it to ``; `PREPEND` puts them before the existing list, so that they are searched first; `APPEND` places them after the existing list, -so they would be searched after the paths which are already in the variable. +so they would be searched after the paths which are already in the variable, +and `SET` replaces the value of the existing list. -For both `APPEND` and `PREPEND`, +For all of `APPEND`, `PREPEND`, and `SET`, the paths are added (and thus searched) in the order received. -If no paths are passed, then nothing will be done. +If no paths are passed to `APPEND` or `PREPEND`, nothing will be done; +for `SET`, the variable will be set to the empty string. #]===] + +function(z_vcpkg_translate_to_host_path_list out_var lst) + if(NOT DEFINED arg_UNPARSED_ARGUMENTS) + set("${out_var}" "" PARENT_SCOPE) + else() + if("${VCPKG_HOST_PATH_SEPARATOR}" STREQUAL ";") + set("${out_var}" "${lst}" PARENT_SCOPE) + + string(FIND "${lst}" [[\;]] index_of_host_path_separator) + else() + vcpkg_list(JOIN lst "${VCPKG_HOST_PATH_SEPARATOR}" arguments) + set("${out_var}" "${arguments}" PARENT_SCOPE) + + string(FIND "${lst}" "${VCPKG_HOST_PATH_SEPARATOR}" index_of_host_path_separator) + endif() + if(NOT "${index_of_host_path_separator}" EQUAL "-1") + message(FATAL_ERROR "Host path separator (${VCPKG_HOST_PATH_SEPARATOR}) in path; this is unsupported.") + endif() + endif() +endfunction() + function(vcpkg_host_path_list) if("${ARGC}" LESS "2") message(FATAL_ERROR "vcpkg_host_path_list requires at least two arguments.") @@ -44,30 +68,20 @@ function(vcpkg_host_path_list) set(operation "${ARGV0}") set(list_var "${ARGV1}") - if("${operation}" MATCHES "^(APPEND|PREPEND)$") - cmake_parse_arguments(PARSE_ARGV 2 arg "" "" "") - if(NOT DEFINED arg_UNPARSED_ARGUMENTS) - return() - endif() - - if("${VCPKG_HOST_PATH_SEPARATOR}" STREQUAL ";") - set(to_add "${arg_UNPARSED_ARGUMENTS}") - string(FIND "${arg_UNPARSED_ARGUMENTS}" [[\;]] index_of_host_path_separator) - else() - vcpkg_list(JOIN arg_UNPARSED_ARGUMENTS "${VCPKG_HOST_PATH_SEPARATOR}" to_add) - string(FIND "${arg_UNPARSED_ARGUMENTS}" "${VCPKG_HOST_PATH_SEPARATOR}" index_of_host_path_separator) - endif() - - if(NOT "${index_of_host_path_separator}" EQUAL "-1") - message(FATAL_ERROR "Host path separator (${VCPKG_HOST_PATH_SEPARATOR}) in path; this is unsupported.") - endif() + cmake_parse_arguments(PARSE_ARGV 2 arg "" "" "") + z_vcpkg_translate_to_host_path_list(arguments "${arg_UNPARSED_ARGUMENTS}") - if("${list}" STREQUAL "") - set(list "${to_add}") + if("${operation}" STREQUAL "SET") + set(list "${arguments}") + elseif("${operation}" MATCHES "^(APPEND|PREPEND)$") + if("${arguments}" STREQUAL "") + # do nothing + elseif("${list}" STREQUAL "") + set(list "${arguments}") elseif(arg_PREPEND) - set(list "${to_add}${VCPKG_HOST_PATH_SEPARATOR}${list}") + set(list "${arguments}${VCPKG_HOST_PATH_SEPARATOR}${list}") else() - set(list "${list}${VCPKG_HOST_PATH_SEPARATOR}${to_add}") + set(list "${list}${VCPKG_HOST_PATH_SEPARATOR}${arguments}") endif() else() message(FATAL_ERROR "Operation ${operation} not recognized.") From 188db2802b04088befeeecb831f5188237afb909 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 4 Nov 2021 05:44:42 +0100 Subject: [PATCH 0972/1858] [clblast] Update to 1.5.2 (#20915) * Update clblast to 1.5.2 * Update CI baseline * Disable static builds * Update git-tree hash * Remove entries from ci.baseline.txt. * update version Co-authored-by: chausner Co-authored-by: Billy Robert O'Neal III Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/clblast/portfile.cmake | 46 ++++++++++++++++-------------------- ports/clblast/vcpkg.json | 15 +++++++++--- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 4 ++-- versions/c-/clblast.json | 5 ++++ 5 files changed, 40 insertions(+), 33 deletions(-) diff --git a/ports/clblast/portfile.cmake b/ports/clblast/portfile.cmake index bdb3e5f050d271..ce749ae739fa43 100644 --- a/ports/clblast/portfile.cmake +++ b/ports/clblast/portfile.cmake @@ -1,46 +1,42 @@ +vcpkg_fail_port_install(ON_LIBRARY_LINKAGE static) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CNugteren/CLBlast - REF 8433985051c0fb9758fd8dfe7d19cc8eaca630e1 # 1.5.1 - SHA512 17eedfc9fff98c9aafc1b47bf2bc0d29fe38e057fa5142cfe534c168b5bafe7ad092cc7fa4db20926101d024caa5ad47cfd2c1d8f18a071195288015f68f12a1 + REF 1.5.2 + SHA512 6693704321bb7623a632ebfc71dcf07bbe4ba6c6f03a2ecf52bc10b401ae546bf82cdd3f6cc28aa9ea10f40dc7b2e86a6530f32cfbd522e24d4cf6a75c8c1100 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") if(VCPKG_TARGET_IS_WINDOWS) - if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/clblast.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/clblast.dll ${CURRENT_PACKAGES_DIR}/bin/clblast.dll) + if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/clblast.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/bin/clblast.dll") endif() - if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll ${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll) + if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/clblast.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/clblast.dll") endif() - file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe") + file(GLOB DEBUG_EXE "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") if(EXE OR DEBUG_EXE) file(REMOVE ${EXE} ${DEBUG_EXE}) endif() endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/clblast) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/clblast) vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/clblast/vcpkg.json b/ports/clblast/vcpkg.json index 06c744fa346fd9..a5915a0daa69de 100644 --- a/ports/clblast/vcpkg.json +++ b/ports/clblast/vcpkg.json @@ -1,9 +1,18 @@ { "name": "clblast", - "version-string": "1.5.1", - "port-version": 2, + "version": "1.5.2", "description": "A modern, lightweight, performant and tunable OpenCL BLAS library written in C++11.", + "homepage": "https://github.com/CNugteren/CLBlast", + "supports": "!static", "dependencies": [ - "opencl" + "opencl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f1eea42970eb1e..26295a93ff02a6 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -127,9 +127,6 @@ civetweb:arm-uwp = skip civetweb:x64-uwp = skip clamav:arm64-windows=fail clblas:arm64-windows=fail -clblast:x64-linux=fail -clblast:x64-windows-static=fail -clblast:x64-windows-static-md=fail clockutils:x64-linux=fail cmcstl2:arm64-windows = skip cmcstl2:arm-uwp = skip diff --git a/versions/baseline.json b/versions/baseline.json index f55f0c5cd62183..7bb94a2795fe83 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1377,8 +1377,8 @@ "port-version": 5 }, "clblast": { - "baseline": "1.5.1", - "port-version": 2 + "baseline": "1.5.2", + "port-version": 0 }, "clfft": { "baseline": "2.12.2", diff --git a/versions/c-/clblast.json b/versions/c-/clblast.json index 54b2e59d8640ff..c73b728261a2eb 100644 --- a/versions/c-/clblast.json +++ b/versions/c-/clblast.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1908d2071402d3175fd77f272005be69ff02abbf", + "version": "1.5.2", + "port-version": 0 + }, { "git-tree": "3f2832bf6fb704f7e83a56c4a1b952287b2ceb49", "version-string": "1.5.1", From 26c1839c3576ee4b1450150d462ae105eeaba4c0 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 4 Nov 2021 12:45:06 +0800 Subject: [PATCH 0973/1858] [eastl] update to 3.18.00 (#21014) * [eastl] update to 3.18.00 * update version * add space * update version --- ports/eastl/portfile.cmake | 25 ++++++++++++------------- ports/eastl/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/e-/eastl.json | 5 +++++ 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index 1bef06c771a740..c8e198f4a095f3 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -7,30 +7,29 @@ vcpkg_from_github( SHA512 3011a0a08701b683e22cc624167b4f65fce8b16d0f7a03675f6a1d5b02313c5b763bcc6c8091f65728ed60ceee8d585cbdb1968a35fb24954f4f66afabb23865 HEAD_REF master PATCHES - fix_cmake_install.patch + fix_cmake_install.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/EASTLConfig.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DEASTL_BUILD_TESTS=OFF - -DEASTL_BUILD_BENCHMARK=OFF + -DEASTL_BUILD_TESTS=OFF + -DEASTL_BUILD_BENCHMARK=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/EASTL) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/EASTL) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/3RDPARTYLICENSES.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # CommonCppFlags used by EAThread -file(INSTALL ${SOURCE_PATH}/scripts/CMake/CommonCppFlags.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/scripts/CMake/CommonCppFlags.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json index 9fd13a0c858b0b..07c9d652a90327 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -1,10 +1,17 @@ { "name": "eastl", - "version-string": "3.17.03", - "port-version": 1, + "version-string": "3.18.00", "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", "homepage": "https://github.com/electronicarts/EASTL", "dependencies": [ - "eabase" + "eabase", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7bb94a2795fe83..4e08f38575cc1d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1933,8 +1933,8 @@ "port-version": 2 }, "eastl": { - "baseline": "3.17.03", - "port-version": 1 + "baseline": "3.18.00", + "port-version": 0 }, "easycl": { "baseline": "0.3", diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json index c525d9baa39569..9115dc8f0aad3e 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9f54d0c4a7a571329fd2ee5e8788c2a5a5414ca", + "version-string": "3.18.00", + "port-version": 0 + }, { "git-tree": "63d695972dd9861a2726ca90361aaafac0f710f6", "version-string": "3.17.03", From b21aa26aff01706e6587a7b965d837e52cc8a96c Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 4 Nov 2021 12:45:24 +0800 Subject: [PATCH 0974/1858] [WinReg] update to v4.1.2 (#21015) * [WinReg] update to v4.1.1 * update version * [WinReg] update to v4.1.2 * update verrsion * change version * update version --- ports/winreg/portfile.cmake | 8 ++++---- ports/winreg/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/w-/winreg.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/winreg/portfile.cmake b/ports/winreg/portfile.cmake index 62f573aaacc8a3..e4c5b08cefc0b6 100644 --- a/ports/winreg/portfile.cmake +++ b/ports/winreg/portfile.cmake @@ -4,13 +4,13 @@ vcpkg_fail_port_install(ON_TARGET "linux" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GiovanniDicanio/WinReg - REF 023ad61dc77c83407e7ae061f177a3ba3d3941e6 #v4.1.0 - SHA512 e62bf4a7926c720ad2c9a56b71b19ff48f566d56ddd5c858c25cec3fc6d8fd829267d3d1789b4841140b95d4e7ed0718af55317f6b4f76c1094bd1c69dda24f1 + REF 2594342b7fe6065430bc377961c37d30614cb4ff #v4.1.2 + SHA512 924cdb77518c3f0843e95cd7e7d4626d4c0c466444cd79fdfa6943975154a54f4eb0d4bd45b8d37d73c650467b1d2728543176688f356c5100d98810e95c9fe8 HEAD_REF master ) # Copy the single reusable library header -file(COPY ${SOURCE_PATH}/WinReg/WinReg.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) +file(COPY "${SOURCE_PATH}/WinReg/WinReg.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/winreg/vcpkg.json b/ports/winreg/vcpkg.json index 76836441ebb03b..7aa2cbf4a9c4ec 100644 --- a/ports/winreg/vcpkg.json +++ b/ports/winreg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "winreg", - "version-string": "4.1.0", - "port-version": 1, + "version": "4.1.2", "description": "High-level C++ wrapper around the Windows Registry C API.", "homepage": "https://github.com/GiovanniDicanio/WinReg", "supports": "windows | uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 4e08f38575cc1d..730118960b31b6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7105,8 +7105,8 @@ "port-version": 5 }, "winreg": { - "baseline": "4.1.0", - "port-version": 1 + "baseline": "4.1.2", + "port-version": 0 }, "winsock2": { "baseline": "0.0", diff --git a/versions/w-/winreg.json b/versions/w-/winreg.json index 42d67959bdf954..de6e0e42d9a790 100644 --- a/versions/w-/winreg.json +++ b/versions/w-/winreg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "000a828ce0f4abd8b4732c7ca7e819e25e82144b", + "version": "4.1.2", + "port-version": 0 + }, { "git-tree": "9aaa215768207c8c514a9a5f8be8e0ec6f5e8f02", "version-string": "4.1.0", From a92d021150975e0fa48f6cf957e64a4c0886b8ff Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Thu, 4 Nov 2021 05:46:14 +0100 Subject: [PATCH 0975/1858] [gdal] New feature "cfitsio" (#21018) * [gdal] New feature cfitsio * version --- ports/gdal/dependency_win.cmake | 12 +++++++++++- ports/gdal/portfile.cmake | 7 ++++++- ports/gdal/vcpkg-cmake-wrapper.cmake | 9 ++++++++- ports/gdal/vcpkg.json | 9 +++++++-- versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/ports/gdal/dependency_win.cmake b/ports/gdal/dependency_win.cmake index c9c81ec1ec147e..c72851a26a26db 100644 --- a/ports/gdal/dependency_win.cmake +++ b/ports/gdal/dependency_win.cmake @@ -244,4 +244,14 @@ macro(find_dependency_win) endif() set(HAVE_SPATIALITE "-DHAVE_SPATIALITE") endif() -endmacro() \ No newline at end of file + + if ("cfitsio" IN_LIST FEATURES) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/include" FITS_INCLUDE) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/cfitsio.lib" FITS_LIBRARY_REL) + file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/cfitsio.lib" FITS_LIBRARY_DBG) + list(APPEND NMAKE_OPTIONS FITS_PLUGIN=YES) + list(APPEND NMAKE_OPTIONS FITS_INC_DIR=${FITS_INCLUDE}) + list(APPEND NMAKE_OPTIONS_REL FITS_LIB=${FITS_LIBRARY_REL}) + list(APPEND NMAKE_OPTIONS_DBG FITS_LIB=${FITS_LIBRARY_DBG}) + endif() +endmacro() diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 5ccf4e8e61072d..3221ba4c43d24a 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -202,7 +202,6 @@ else() set(CONF_CHECKS "${CONF_CHECKS}" PARENT_SCOPE) endfunction() # parameters in the same order as the dependencies in vcpkg.json - add_config("--with-cfitsio=yes" "CFITSIO support: external") add_config("--with-curl=yes" "cURL support .wms/wcs/....:yes") add_config("--with-expat=yes" "Expat support: yes") add_config("--with-geos=yes" "GEOS support: yes") @@ -246,6 +245,12 @@ else() add_config("--with-mysql=no" "MySQL support: no") endif() + if ("cfitsio" IN_LIST FEATURES) + add_config("--with-cfitsio=yes" "CFITSIO support: external") + elseif(DISABLE_SYSTEM_LIBRARIES) + add_config("--with-cfitsio=no" "CFITSIO support: no") + endif() + if(DISABLE_SYSTEM_LIBRARIES) list(APPEND CONF_OPTS # Too much: --disable-all-optional-drivers diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index ee4580d5b609bf..645118c349077b 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -71,7 +71,12 @@ function(_gdal_add_dependency target package) endif() endfunction() if(GDAL_FOUND) - _gdal_add_dependency(cfitsio unofficial-cfitsio CONFIG) + cmake_policy(PUSH) + cmake_policy(SET CMP0057 NEW) + set(Z_VCPKG_PORT_FEATURES "@FEATURES@") + if("cfitsio" IN_LIST Z_VCPKG_PORT_FEATURES) + _gdal_add_dependency(cfitsio unofficial-cfitsio CONFIG) + endif() _gdal_add_dependency(CURL::libcurl CURL CONFIG) _gdal_add_dependency(expat::expat expat CONFIG) _gdal_add_dependency(GEOS::geos_c geos CONFIG) @@ -98,4 +103,6 @@ if(GDAL_FOUND) if(NOT GDAL_FOUND AND NOT required EQUAL "-1") message(FATAL_ERROR "Failed to find dependencies of GDAL") endif() + unset(Z_VCPKG_PORT_FEATURES) + cmake_policy(POP) endif() diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 77d8cbf287227a..676590760c73f8 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,12 +1,11 @@ { "name": "gdal", "version-semver": "3.3.2", - "port-version": 2, + "port-version": 3, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", "dependencies": [ - "cfitsio", "curl", "expat", "geos", @@ -32,6 +31,12 @@ "zstd" ], "features": { + "cfitsio": { + "description": "Enable cfitsio support", + "dependencies": [ + "cfitsio" + ] + }, "libspatialite": { "description": "Create or update SpatiaLite databases using libspatialite", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 730118960b31b6..bb7f583fa6c40f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2350,7 +2350,7 @@ }, "gdal": { "baseline": "3.3.2", - "port-version": 2 + "port-version": 3 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index ecf85e5587787b..47900288a77ea3 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5173c609fafae13d948b1417064517be5bd78c7f", + "version-semver": "3.3.2", + "port-version": 3 + }, { "git-tree": "354c2bfa5d4de64d6894cb74f47e6801fd02af8d", "version-semver": "3.3.2", From 5a8ec9f67801e3dae5ae0d983811abe2ab859872 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Thu, 4 Nov 2021 05:46:49 +0100 Subject: [PATCH 0976/1858] [botan][gtest][openmesh][polyclipping][quill] Fix release-only build (#21023) Signed-off-by: Vitalii Koshura Co-authored-by: Billy Robert O'Neal III --- ports/botan/portfile.cmake | 20 ++++++++++++++------ ports/botan/vcpkg.json | 2 +- ports/gtest/portfile.cmake | 12 ++++++++---- ports/gtest/vcpkg.json | 2 +- ports/openmesh/portfile.cmake | 14 +++++++++++--- ports/openmesh/vcpkg.json | 2 +- ports/polyclipping/portfile.cmake | 8 ++++++-- ports/polyclipping/vcpkg.json | 2 +- ports/quill/portfile.cmake | 8 ++++++-- ports/quill/vcpkg.json | 2 +- versions/b-/botan.json | 5 +++++ versions/baseline.json | 10 +++++----- versions/g-/gtest.json | 5 +++++ versions/o-/openmesh.json | 5 +++++ versions/p-/polyclipping.json | 5 +++++ versions/q-/quill.json | 5 +++++ 16 files changed, 80 insertions(+), 27 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index ea5fae8de06bac..d6b678e6e643c1 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -117,13 +117,21 @@ function(BOTAN_BUILD BOTAN_BUILD_TYPE) message(STATUS "Package ${TARGET_TRIPLET}-${BOTAN_BUILD_TYPE} done") endfunction() -BOTAN_BUILD(rel) -BOTAN_BUILD(dbg) +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + BOTAN_BUILD(rel) +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + BOTAN_BUILD(dbg) +endif() -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") +endif() vcpkg_fixup_pkgconfig() file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 809346855a2a65..09e20ed5ceb87f 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.18.1", - "port-version": 1, + "port-version": 2, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake index 97086c5bc30031..b7e609242c8e41 100644 --- a/ports/gtest/portfile.cmake +++ b/ports/gtest/portfile.cmake @@ -47,10 +47,14 @@ file( file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_fixup_pkgconfig() -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmock_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gtest_main.pc" "libdir=\${prefix}/lib" "libdir=\${prefix}/lib/manual-link") +endif() vcpkg_copy_pdbs() file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/gtest/vcpkg.json b/ports/gtest/vcpkg.json index b90a78d676bffc..5c878ed29ad032 100644 --- a/ports/gtest/vcpkg.json +++ b/ports/gtest/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gtest", "version-semver": "1.11.0", - "port-version": 1, + "port-version": 2, "description": "GoogleTest and GoogleMock testing frameworks", "homepage": "https://github.com/google/googletest" } diff --git a/ports/openmesh/portfile.cmake b/ports/openmesh/portfile.cmake index 08f173929e6270..28ea0e490f92a8 100644 --- a/ports/openmesh/portfile.cmake +++ b/ports/openmesh/portfile.cmake @@ -32,8 +32,12 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH share/OpenMesh/cmake TARGET_PATH share/OpenMesh/cmake) -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/libdata/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libdata" "${CURRENT_PACKAGES_DIR}/libdata") vcpkg_fixup_pkgconfig() @@ -41,12 +45,16 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/OpenMesh/Tools/VDPM/xpm) # Only move dynamic libraries to bin on Windows if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshCore.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshCore.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/OpenMeshTools.dll ${CURRENT_PACKAGES_DIR}/bin/OpenMeshTools.dll) + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshCored.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshCored.dll) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/OpenMeshToolsd.dll ${CURRENT_PACKAGES_DIR}/debug/bin/OpenMeshToolsd.dll) + endif() endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) diff --git a/ports/openmesh/vcpkg.json b/ports/openmesh/vcpkg.json index 80c5f197b61dd3..ab48f6d5f2c992 100644 --- a/ports/openmesh/vcpkg.json +++ b/ports/openmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "openmesh", "version-string": "8.1", - "port-version": 2, + "port-version": 3, "description": "A generic and efficient polygon mesh data structure" } diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake index 9c953825366206..260fb93df32ccf 100644 --- a/ports/polyclipping/portfile.cmake +++ b/ports/polyclipping/portfile.cmake @@ -19,8 +19,12 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets() -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/polyclipping/vcpkg.json b/ports/polyclipping/vcpkg.json index a57d032a8e0475..195a0ae4d57dd3 100644 --- a/ports/polyclipping/vcpkg.json +++ b/ports/polyclipping/vcpkg.json @@ -1,7 +1,7 @@ { "name": "polyclipping", "version-string": "6.4.2", - "port-version": 9, + "port-version": 10, "description": "The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.", "homepage": "https://sourceforge.net/projects/polyclipping/" } diff --git a/ports/quill/portfile.cmake b/ports/quill/portfile.cmake index 2d1699be8abfb1..6bc0398c4240c5 100644 --- a/ports/quill/portfile.cmake +++ b/ports/quill/portfile.cmake @@ -21,8 +21,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/quill) -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") +endif() +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(RENAME "${CURRENT_PACKAGES_DIR}/pkgconfig" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +endif() vcpkg_fixup_pkgconfig() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/quill/TweakMe.h" "// #define QUILL_FMT_EXTERNAL" "#define QUILL_FMT_EXTERNAL") diff --git a/ports/quill/vcpkg.json b/ports/quill/vcpkg.json index e01b4e275a7849..9057a3ec89ebd9 100644 --- a/ports/quill/vcpkg.json +++ b/ports/quill/vcpkg.json @@ -1,7 +1,7 @@ { "name": "quill", "version-semver": "1.6.3", - "port-version": 2, + "port-version": 3, "description": "C++14 Asynchronous Low Latency Logging Library", "homepage": "https://github.com/odygrd/quill/", "supports": "!(uwp | android)", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 870044f3599375..27ad0e37e351b2 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f002dd083e6eedd3bdd1d2bc7882d34d70ed438", + "version": "2.18.1", + "port-version": 2 + }, { "git-tree": "9257baaf49b708cde128ff31e74fe848ef30a264", "version": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index bb7f583fa6c40f..cdfd5030b07673 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1126,7 +1126,7 @@ }, "botan": { "baseline": "2.18.1", - "port-version": 1 + "port-version": 2 }, "box2d": { "baseline": "2.4.1", @@ -2586,7 +2586,7 @@ }, "gtest": { "baseline": "1.11.0", - "port-version": 1 + "port-version": 2 }, "gtk": { "baseline": "4.3.0", @@ -4922,7 +4922,7 @@ }, "openmesh": { "baseline": "8.1", - "port-version": 2 + "port-version": 3 }, "openmpi": { "baseline": "4.1.0", @@ -5270,7 +5270,7 @@ }, "polyclipping": { "baseline": "6.4.2", - "port-version": 9 + "port-version": 10 }, "polyhook2": { "baseline": "2021-05-09", @@ -5778,7 +5778,7 @@ }, "quill": { "baseline": "1.6.3", - "port-version": 2 + "port-version": 3 }, "quirc": { "baseline": "1.1", diff --git a/versions/g-/gtest.json b/versions/g-/gtest.json index 1bbfb499706189..9e36d3358c818e 100644 --- a/versions/g-/gtest.json +++ b/versions/g-/gtest.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c87cf62264002bc0cf2cb772a5588b36576323a9", + "version-semver": "1.11.0", + "port-version": 2 + }, { "git-tree": "e95c8da96b4a206c21d0197e5547e921d748d166", "version-semver": "1.11.0", diff --git a/versions/o-/openmesh.json b/versions/o-/openmesh.json index 164c3fbf16c166..065503d588615d 100644 --- a/versions/o-/openmesh.json +++ b/versions/o-/openmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "27929cc382c7b9cba46891aeed71e44fc5e2c31a", + "version-string": "8.1", + "port-version": 3 + }, { "git-tree": "19e385c7e6a18248b06db012c7ba0a68e98921a7", "version-string": "8.1", diff --git a/versions/p-/polyclipping.json b/versions/p-/polyclipping.json index 4c9bf56ae56bb3..df88ddb4c22759 100644 --- a/versions/p-/polyclipping.json +++ b/versions/p-/polyclipping.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e4c4bb3964361c1db87e2bdc368e5e32d0bb213", + "version-string": "6.4.2", + "port-version": 10 + }, { "git-tree": "6701622648b7f5ab04e6552b312d1cd8543de99c", "version-string": "6.4.2", diff --git a/versions/q-/quill.json b/versions/q-/quill.json index a300b7fe2f252f..da355a2fc5bc1e 100644 --- a/versions/q-/quill.json +++ b/versions/q-/quill.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "037a819f5cf482d84083318e120e076c711a2760", + "version-semver": "1.6.3", + "port-version": 3 + }, { "git-tree": "1d6790b5d6faf5173c73ea42e07acea665aebffc", "version-semver": "1.6.3", From 76057a102afa98fef28f8cd6b22a2c9fca2929f5 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Wed, 3 Nov 2021 21:47:05 -0700 Subject: [PATCH 0977/1858] [Seal] Update to version 3.7.1 (#21024) * Updated ports/seal. * Updated versioning. --- ports/seal/portfile.cmake | 4 ++-- ports/seal/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/seal.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index bea3e7af227084..29535cc2618539 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF 2d2a25c916047d2f356d45ad50c98f0a9695905a - SHA512 81b2be39fca39dbd3a1246d0a1b8474d27eb6b1f3205f2107243bcd883b95814d2b642fa6807ed1f272d321233c2ec7992a256866ae1700c1203575594b42559 + REF 608fb1b9717ec6effe707758a636e0a0df76fc26 + SHA512 4d73e44955dcf7424318d1f46dd2b38b08592fd649a208953dbb9da30e7befdb6bf9f50ab364732d0ded7c9d977fd9bbad9fd1e2d2ff6ea2931d418a87be6d27 HEAD_REF main ) diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index daafafc275e6d2..20ca7bec42cf12 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "seal", - "version-semver": "3.7.0", + "version-semver": "3.7.1", "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "supports": "!windows | (windows & static)", diff --git a/versions/baseline.json b/versions/baseline.json index cdfd5030b07673..0a96ad81818b67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6125,7 +6125,7 @@ "port-version": 1 }, "seal": { - "baseline": "3.7.0", + "baseline": "3.7.1", "port-version": 0 }, "secp256k1": { diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 61c01bb81dcdf3..01951b3b5b2b9b 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc1789c424c644a859870fb66288c5bfacb62d35", + "version-semver": "3.7.1", + "port-version": 0 + }, { "git-tree": "1e0c0c7900d62643f5e83af3a18401d9116d2696", "version-semver": "3.7.0", From 04c465ad4e9392850fe163dd7edc9b95e92ab937 Mon Sep 17 00:00:00 2001 From: Matthew Oliver Date: Thu, 4 Nov 2021 16:07:18 +1100 Subject: [PATCH 0978/1858] [x264] Update to latest stable version. (#21028) * [x264] Update to latest stable version. * [ffmpeg] Fix static x264 linking. --- ...-not-explicitly-set-X264_API_IMPORTS.patch | 47 +++++++++++++++++++ ports/ffmpeg/portfile.cmake | 1 + ports/ffmpeg/vcpkg.json | 2 +- ports/x264/portfile.cmake | 8 ++-- ports/x264/vcpkg.json | 3 +- versions/baseline.json | 6 +-- versions/f-/ffmpeg.json | 5 ++ versions/x-/x264.json | 5 ++ 8 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch diff --git a/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch b/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch new file mode 100644 index 00000000000000..7a0fb4bcacc7f6 --- /dev/null +++ b/ports/ffmpeg/0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch @@ -0,0 +1,47 @@ +From d5fca748d76602a912590b64022560283db6fae6 Mon Sep 17 00:00:00 2001 +From: Matt Oliver +Date: Sat, 30 Oct 2021 14:09:29 +1100 +Subject: [PATCH] libx264: Do not explicitly set X264_API_IMPORTS + +--- + configure | 8 +++----- + libavcodec/libx264.c | 4 ---- + 2 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/configure b/configure +index ede8f9777b..b35728aace 100755 +--- a/configure ++++ b/configure +@@ -6535,11 +6535,9 @@ enabled libvpx && { + enabled libwebp && { + enabled libwebp_encoder && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion + enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; } +-enabled libx264 && { check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode || +- { require libx264 "stdint.h x264.h" x264_encoder_encode "-lx264 $pthreads_extralibs $libm_extralibs -ldl" && +- warn "using libx264 without pkg-config"; } } && +- require_cpp_condition libx264 x264.h "X264_BUILD >= 118" && +- check_cpp_condition libx262 x264.h "X264_MPEG2" ++enabled libx264 && check_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode && ++ require_cpp_condition libx264 x264.h "X264_BUILD >= 158" && ++ check_cpp_condition libx264 x264.h "X264_MPEG2" + enabled libx265 && { check_pkg_config libx265 x265 x265.h x265_api_get || + { { check_lib libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++ -lgcc_s -lgcc -lrt -lnuma" || + require libx265 x265.h x265_api_get "-lx265 $pthreads_extralibs $libm_extralibs -ldl -lstdc++"; } && +diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c +index 21f434d06d..efbc9608c7 100644 +--- a/libavcodec/libx264.c ++++ b/libavcodec/libx264.c +@@ -34,10 +34,6 @@ + #include "packet_internal.h" + #include "atsc_a53.h" + +-#if defined(_MSC_VER) +-#define X264_API_IMPORTS 1 +-#endif +- + #include + #include + #include +-- +2.33.1.windows.1 + diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 128726c2d453f5..9cd4a2ff62f866 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -152,6 +152,7 @@ vcpkg_from_github( 0016-configure-dnn-needs-avformat.patch # http://ffmpeg.org/pipermail/ffmpeg-devel/2021-May/279926.html ${PATCHES} 0018-libaom-Dont-use-aom_codec_av1_dx_algo.patch + 0019-libx264-Do-not-explicitly-set-X264_API_IMPORTS.patch ) if (SOURCE_PATH MATCHES " ") diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index fbf802114b5503..2b060b31aa1617 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 16, + "port-version": 17, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index b64c9ad6e55384..bf725508bede9c 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -1,13 +1,13 @@ -set(X264_VERSION 157) +set(X264_VERSION 164) vcpkg_fail_port_install(ON_ARCH "arm") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mirror/x264 - REF 303c484ec828ed0d8bfe743500e70314d026c3bd - SHA512 faf210a3f9543028ed882c8348b243dd7ae6638e7b3ef43bec1326b717f23370f57c13d0ddb5e1ae94411088a2e33031a137b68ae9f64c18f8f33f601a0da54d - HEAD_REF master + REF 5db6aa6cab1b146e07b60cc1736a01f21da01154 + SHA512 d2cdd40d195fd6507abacc8b8810107567dff2c0a93424ba1eb00b544cb78a5430f00f9bcf8f19bd663ae77849225577da05bfcdb57948a8af9dc32a7c8b9ffd + HEAD_REF stable PATCHES "uwp-cflags.patch" ) diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json index 41aa4b91809fab..a36254294eaec6 100644 --- a/ports/x264/vcpkg.json +++ b/ports/x264/vcpkg.json @@ -1,7 +1,6 @@ { "name": "x264", - "version-string": "157-303c484ec828ed0", - "port-version": 16, + "version-string": "164-5db6aa6cab1b146", "description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format", "homepage": "https://github.com/mirror/x264", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index 0a96ad81818b67..cefa481b7b8d3a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2130,7 +2130,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 16 + "port-version": 17 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -7157,8 +7157,8 @@ "port-version": 0 }, "x264": { - "baseline": "157-303c484ec828ed0", - "port-version": 16 + "baseline": "164-5db6aa6cab1b146", + "port-version": 0 }, "x265": { "baseline": "3.4", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 83a90b0ae3b27a..e288e836faec84 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "795e31317ef58fbe13247af9e8bade71f3edde5e", + "version": "4.4", + "port-version": 17 + }, { "git-tree": "5a144dc0552d005429d8d6641608744883dee2ff", "version": "4.4", diff --git a/versions/x-/x264.json b/versions/x-/x264.json index 7ca11279e98699..20454b471ef407 100644 --- a/versions/x-/x264.json +++ b/versions/x-/x264.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2280334f1235046e20f80586b7d83893f52b23b7", + "version-string": "164-5db6aa6cab1b146", + "port-version": 0 + }, { "git-tree": "e8f14328cb425b2a7450bf36f731f97d41564fed", "version-string": "157-303c484ec828ed0", From c60ccb32336baa185187a6e8372e67f2d9a2adbc Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 18:34:14 +0100 Subject: [PATCH 0979/1858] [cppunit] no absolute paths (#21178) --- ports/cppunit/portfile.cmake | 16 ++++++++-------- ports/cppunit/vcpkg.json | 17 +++++++++++++++-- versions/baseline.json | 2 +- versions/c-/cppunit.json | 5 +++++ 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/ports/cppunit/portfile.cmake b/ports/cppunit/portfile.cmake index 85beec6928dab5..01522579ffb3f9 100644 --- a/ports/cppunit/portfile.cmake +++ b/ports/cppunit/portfile.cmake @@ -9,19 +9,18 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) if(VCPKG_TARGET_IS_WINDOWS) # Use a simple CMakeLists.txt to build CppUnit on windows - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) - vcpkg_install_cmake() + vcpkg_cmake_install() # Move EXE to 'tools' vcpkg_copy_tools(TOOL_NAMES DllPlugInTester AUTO_CLEAN) @@ -51,12 +50,13 @@ else() endif() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Install CppUnitConfig.cmake -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/CppUnitConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/CppUnitConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") # Cleanup file(REMOVE_RECURSE diff --git a/ports/cppunit/vcpkg.json b/ports/cppunit/vcpkg.json index 3dbcc9ccfa1147..221f330a05e254 100644 --- a/ports/cppunit/vcpkg.json +++ b/ports/cppunit/vcpkg.json @@ -1,7 +1,20 @@ { "name": "cppunit", - "version-string": "1.15.1", + "version": "1.15.1", + "port-version": 1, "description": "Unit testing framework module for the C++ programming language", "homepage": "https://www.freedesktop.org/wiki/Software/cppunit", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + }, + { + "name": "vcpkg-cmake-config", + "host": true, + "platform": "windows" + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index cefa481b7b8d3a..32e07e062320f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1590,7 +1590,7 @@ }, "cppunit": { "baseline": "1.15.1", - "port-version": 0 + "port-version": 1 }, "cpputest": { "baseline": "2019-9-16", diff --git a/versions/c-/cppunit.json b/versions/c-/cppunit.json index 83bdc7a1ae5b7d..181fce503f9a38 100644 --- a/versions/c-/cppunit.json +++ b/versions/c-/cppunit.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1384ee0101801f599b23f167aee7cfc733536022", + "version": "1.15.1", + "port-version": 1 + }, { "git-tree": "51029930bf5c3a123e0243de6b00ae385b654d5d", "version-string": "1.15.1", From 009a82adb5b06627d22198ab55dfd9c0c15ccaef Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 18:36:52 +0100 Subject: [PATCH 0980/1858] [gdcm] no absolute paths (#21177) --- ports/gdcm/portfile.cmake | 26 +++++++++++++++----------- ports/gdcm/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/g-/gdcm.json | 5 +++++ 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake index b5c72d619f1746..e5aaf46ccf131d 100644 --- a/ports/gdcm/portfile.cmake +++ b/ports/gdcm/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_from_github( Fix-Cmake_DIR.patch ) -file(REMOVE ${SOURCE_PATH}/CMake/FindOpenJPEG.cmake) +file(REMOVE "${SOURCE_PATH}/CMake/FindOpenJPEG.cmake") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(VCPKG_BUILD_SHARED_LIBS ON) @@ -22,9 +22,8 @@ else() set(VCPKG_BUILD_SHARED_LIBS OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF -DGDCM_BUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS} @@ -35,23 +34,28 @@ vcpkg_configure_cmake( -DGDCM_BUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/gdcm) vcpkg_copy_pdbs() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMTargets.cmake +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/gdcm/GDCMTargets.cmake" "set(CMAKE_IMPORT_FILE_VERSION 1)" "set(CMAKE_IMPORT_FILE_VERSION 1) find_package(OpenJPEG QUIET)" ) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_SOURCE_DIR \"${SOURCE_PATH}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_EXECUTABLE_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_LIBRARY_OUTPUT_PATH \"${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/bin\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/gdcmConfigure.h" "#define GDCM_CMAKE_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gdcm/vcpkg.json b/ports/gdcm/vcpkg.json index 78e3866995ac26..7d09f844eed6e4 100644 --- a/ports/gdcm/vcpkg.json +++ b/ports/gdcm/vcpkg.json @@ -1,13 +1,21 @@ { "name": "gdcm", - "version-string": "3.0.7", - "port-version": 2, + "version": "3.0.7", + "port-version": 3, "description": "Grassroots DICOM library", "homepage": "https://github.com/malaterre/GDCM", "supports": "!uwp & !(windows & (arm | arm64))", "dependencies": [ "expat", "openjpeg", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 32e07e062320f0..b10a422126d3b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2354,7 +2354,7 @@ }, "gdcm": { "baseline": "3.0.7", - "port-version": 2 + "port-version": 3 }, "gdcm2": { "baseline": "deprecated", diff --git a/versions/g-/gdcm.json b/versions/g-/gdcm.json index 038c05140b02ee..7fa0157cf5ec65 100644 --- a/versions/g-/gdcm.json +++ b/versions/g-/gdcm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de7a48decccdda2df7f6878f4002fa661f7a6090", + "version": "3.0.7", + "port-version": 3 + }, { "git-tree": "c072a49eaff02bc7bf83c73a68be9d0f63533352", "version-string": "3.0.7", From 4daeb5bf8724fc63d50fb1be8c376688555c5be0 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 18:39:06 +0100 Subject: [PATCH 0981/1858] [libgit2] no absolute paths (#21172) --- ports/libgit2/portfile.cmake | 5 +++-- ports/libgit2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libgit2.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/libgit2/portfile.cmake b/ports/libgit2/portfile.cmake index 8455ab52cad697..2949be645ba946 100644 --- a/ports/libgit2/portfile.cmake +++ b/ports/libgit2/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libgit2/libgit2 - REF v1.3.0 - SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e + REF v1.3.0 + SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e HEAD_REF master ) @@ -75,6 +75,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libgit2/vcpkg.json b/ports/libgit2/vcpkg.json index 93889c78e5365b..cc19ad4bc17e4b 100644 --- a/ports/libgit2/vcpkg.json +++ b/ports/libgit2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libgit2", "version-semver": "1.3.0", + "port-version": 1, "description": "Git linkable library", "homepage": "https://github.com/libgit2/libgit2", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index b10a422126d3b0..0d67d2680ca868 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3446,7 +3446,7 @@ }, "libgit2": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "libgnutls": { "baseline": "3.6.15", diff --git a/versions/l-/libgit2.json b/versions/l-/libgit2.json index 6bc62f56a96a71..a7276f58631281 100644 --- a/versions/l-/libgit2.json +++ b/versions/l-/libgit2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "608c02285dbac754d7b2a34e67f081879cdee38f", + "version-semver": "1.3.0", + "port-version": 1 + }, { "git-tree": "20883074dd1404f4170f03b1c4d04d7a0e05b0fe", "version-semver": "1.3.0", From ba847830502d890711d5db3c58afac9ddf47aadf Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 18:40:39 +0100 Subject: [PATCH 0982/1858] [qpid-proton] no absolute paths (#21167) --- ports/qpid-proton/portfile.cmake | 37 +++++++++++--------------------- ports/qpid-proton/vcpkg.json | 12 +++++++++-- versions/baseline.json | 2 +- versions/q-/qpid-proton.json | 5 +++++ 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/ports/qpid-proton/portfile.cmake b/ports/qpid-proton/portfile.cmake index e8a91146259f1a..2d206def12219f 100644 --- a/ports/qpid-proton/portfile.cmake +++ b/ports/qpid-proton/portfile.cmake @@ -10,9 +10,8 @@ vcpkg_from_github( HEAD_REF next ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3} -DLIB_SUFFIX= @@ -23,27 +22,17 @@ vcpkg_configure_cmake( -DCMAKE_DISABLE_FIND_PACKAGE_CyrusSASL=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) +vcpkg_fixup_pkgconfig() -file(GLOB SHARE_DIR ${CURRENT_PACKAGES_DIR}/share/*) -file(RENAME ${SHARE_DIR} ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/lib/cmake/tmp/Proton) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/Proton ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/tmp/Proton) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tmp/Proton TARGET_PATH share/proton) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ProtonCpp TARGET_PATH share/protoncpp) - -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE.txt - ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) -file(REMOVE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/CMakeLists.txt) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/tests) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/qpid-proton/examples) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/proton/LICENSE.txt" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/proton") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/proton/version.h" "#define PN_INSTALL_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") diff --git a/ports/qpid-proton/vcpkg.json b/ports/qpid-proton/vcpkg.json index 04bbec9af06e39..cbdd7e4ecd6d0a 100644 --- a/ports/qpid-proton/vcpkg.json +++ b/ports/qpid-proton/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qpid-proton", - "version-string": "0.32.0", - "port-version": 1, + "version": "0.32.0", + "port-version": 2, "description": "Qpid Proton is a high-performance, lightweight messaging library.", "homepage": "https://github.com/apache/qpid-proton", "dependencies": [ @@ -13,6 +13,14 @@ { "name": "openssl", "platform": "!windows & !uwp" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0d67d2680ca868..a13b14084a1d29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5422,7 +5422,7 @@ }, "qpid-proton": { "baseline": "0.32.0", - "port-version": 1 + "port-version": 2 }, "qscintilla": { "baseline": "2.12.0", diff --git a/versions/q-/qpid-proton.json b/versions/q-/qpid-proton.json index faf43e1c7966a8..82017e48c4be54 100644 --- a/versions/q-/qpid-proton.json +++ b/versions/q-/qpid-proton.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6ab0bd896fa44681e2c3d4b325915ddacb38a1a", + "version": "0.32.0", + "port-version": 2 + }, { "git-tree": "b8fcc3b90edf020392d7fb1375c252b932a5e2be", "version-string": "0.32.0", From 759e76305fc1932f5bac2a4ad5de8156ec998e5c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 18:41:45 +0100 Subject: [PATCH 0983/1858] [ponder] fix post build check (#21165) --- ports/ponder/portfile.cmake | 27 +++++++++++++-------------- ports/ponder/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/p-/ponder.json | 5 +++++ 4 files changed, 31 insertions(+), 17 deletions(-) diff --git a/ports/ponder/portfile.cmake b/ports/ponder/portfile.cmake index a19debe8c52286..94eede7e61ec15 100644 --- a/ports/ponder/portfile.cmake +++ b/ports/ponder/portfile.cmake @@ -9,9 +9,8 @@ vcpkg_from_github( github-121.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DUSES_RAPIDJSON=OFF @@ -19,22 +18,22 @@ vcpkg_configure_cmake( -DBUILD_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/${PORT}/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/${PORT}/cmake) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/${PORT} - ${CURRENT_PACKAGES_DIR}/lib/${PORT}) + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/${PORT}" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/${PORT}" +) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(READ ${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp _contents) - string(REPLACE "ifndef PONDER_STATIC" "if 0 //ifndef PONDER_STATIC" _contents "${_contents}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp "${_contents}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/${PORT}/config.hpp" "ifndef PONDER_STATIC" "if 0 //ifndef PONDER_STATIC") endif() # Handle copyright -configure_file(${SOURCE_PATH}/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -vcpkg_fixup_pkgconfig() +configure_file("${SOURCE_PATH}/COPYING.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + diff --git a/ports/ponder/vcpkg.json b/ports/ponder/vcpkg.json index 3959fa165fea61..bd06df5b813353 100644 --- a/ports/ponder/vcpkg.json +++ b/ports/ponder/vcpkg.json @@ -1,7 +1,17 @@ { "name": "ponder", "version-string": "3.0.0", - "port-version": 3, + "port-version": 4, "description": "A C++ multi-purpose reflection library.", - "homepage": "https://github.com/billyquith/ponder" + "homepage": "https://github.com/billyquith/ponder", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a13b14084a1d29..422fe29b2c3e78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5282,7 +5282,7 @@ }, "ponder": { "baseline": "3.0.0", - "port-version": 3 + "port-version": 4 }, "poppler": { "baseline": "20.12.1", diff --git a/versions/p-/ponder.json b/versions/p-/ponder.json index 6dab8444b76c64..0ba234e3eb9249 100644 --- a/versions/p-/ponder.json +++ b/versions/p-/ponder.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "82147bc05cb5c080baabe1085f8ab690f71ba6e2", + "version-string": "3.0.0", + "port-version": 4 + }, { "git-tree": "84acf8367d19d188309207790cc07c149e0464f3", "version-string": "3.0.0", From fb1a81e314c16f41b2e88c8b485a28ec21520f39 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 18:42:10 +0100 Subject: [PATCH 0984/1858] [optional-lite] fix sha (#21156) --- ports/optional-lite/portfile.cmake | 4 ++-- ports/optional-lite/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/o-/optional-lite.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/optional-lite/portfile.cmake b/ports/optional-lite/portfile.cmake index 1bf0762b5196f1..83d5ac23a5afbb 100644 --- a/ports/optional-lite/portfile.cmake +++ b/ports/optional-lite/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO martinmoene/optional-lite - REF v3.5.0 - SHA512 E578D391BC95E2A5302B4B02E0B17659026B2743FC5C1E16CD83F6227FA9B5990FA3FA23E808A4EA0F5BDAFBF80834B0C462D563AB615907F113EE5A09AE88F5 + REF v3.5.0 + SHA512 e578d391bc95e2a5302b4b02e0b17659026b2743fc5c1e16cd83f6227fa9b5990fa3fa23e808a4ea0f5bdafbf80834b0c462d563ab615907f113ee5a09ae88f5 ) vcpkg_cmake_configure( diff --git a/ports/optional-lite/vcpkg.json b/ports/optional-lite/vcpkg.json index ce1df3fe3378ee..4245c02bda472f 100644 --- a/ports/optional-lite/vcpkg.json +++ b/ports/optional-lite/vcpkg.json @@ -1,6 +1,7 @@ { "name": "optional-lite", "version": "3.5.0", + "port-version": 1, "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library", "homepage": "https://github.com/martinmoene/optional-lite", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 422fe29b2c3e78..d4efef5e79596c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4994,7 +4994,7 @@ }, "optional-lite": { "baseline": "3.5.0", - "port-version": 0 + "port-version": 1 }, "opus": { "baseline": "1.3.1", diff --git a/versions/o-/optional-lite.json b/versions/o-/optional-lite.json index 4ed173bfb981eb..99c0906a40ce9e 100644 --- a/versions/o-/optional-lite.json +++ b/versions/o-/optional-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "224a4268fcaf8ff0756fce0de1818939e95cbbc4", + "version": "3.5.0", + "port-version": 1 + }, { "git-tree": "121b3133b75062823ca1c6d41b22019c4bc78999", "version": "3.5.0", From bde09fc4d8962346323d77c4bc948b1d48b2029b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 18:42:34 +0100 Subject: [PATCH 0985/1858] [ftgl] fix cmake config (#21145) --- ports/ftgl/portfile.cmake | 15 +++++++-------- ports/ftgl/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/f-/ftgl.json | 5 +++++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ports/ftgl/portfile.cmake b/ports/ftgl/portfile.cmake index 9208cb086e3fad..0c98215fa242d0 100644 --- a/ports/ftgl/portfile.cmake +++ b/ports/ftgl/portfile.cmake @@ -15,18 +15,17 @@ vcpkg_from_github( 02_enable-cpp11-std.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() if (VCPKG_TARGET_IS_WINDOWS) - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) else () - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ftgl/vcpkg.json b/ports/ftgl/vcpkg.json index e40f6f2cc19a30..d1f92b187439c7 100644 --- a/ports/ftgl/vcpkg.json +++ b/ports/ftgl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ftgl", "version-string": "2.4.0", - "port-version": 3, + "port-version": 4, "description": [ "FTGL is a free open source library to enable developers to use arbitrary fonts in their OpenGL (www.opengl.org) applications.", "Unlike other OpenGL font libraries FTGL uses standard font file formats so doesn't need a preprocessing step to convert the high quality font data into a lesser quality, proprietary format.", @@ -10,6 +10,14 @@ "homepage": "https://github.com/frankheckenbach/ftgl", "dependencies": [ "freetype", - "opengl" + "opengl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index d4efef5e79596c..d8755acd0d8181 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2290,7 +2290,7 @@ }, "ftgl": { "baseline": "2.4.0", - "port-version": 3 + "port-version": 4 }, "ftxui": { "baseline": "2021-06-17", diff --git a/versions/f-/ftgl.json b/versions/f-/ftgl.json index 81c9e95987d4bd..3a4533b9c05a49 100644 --- a/versions/f-/ftgl.json +++ b/versions/f-/ftgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5642730406fc248cae1eaefc9e739b9bf1c13fbf", + "version-string": "2.4.0", + "port-version": 4 + }, { "git-tree": "01f15f385d7c8555935f011a8e32010212764279", "version-string": "2.4.0", From 50acd9bfd1f914b04e64382cc6c99227e6699ea4 Mon Sep 17 00:00:00 2001 From: Julian Scholle Date: Thu, 4 Nov 2021 18:46:05 +0100 Subject: [PATCH 0986/1858] [fcl] Fix fcl 0.7.0 does not configure if Doxygen is found (#21155) * [fcl] Fix fcl 0.7.0 does not configure if Doxygen is found * add new fcl version --- ports/fcl/portfile.cmake | 1 + ports/fcl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fcl.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/fcl/portfile.cmake b/ports/fcl/portfile.cmake index 079633dc4eb9de..b9c9fef7d06777 100644 --- a/ports/fcl/portfile.cmake +++ b/ports/fcl/portfile.cmake @@ -19,6 +19,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1 -DFCL_STATIC_LIBRARY=${FCL_STATIC_LIBRARY} -DFCL_BUILD_TESTS=OFF -DFCL_USE_X64_SSE=${FCL_USE_X64_SSE} diff --git a/ports/fcl/vcpkg.json b/ports/fcl/vcpkg.json index dd0d8808d8e071..e6edbc50a11b04 100644 --- a/ports/fcl/vcpkg.json +++ b/ports/fcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fcl", "version": "0.7.0", - "port-version": 2, + "port-version": 3, "description": "a library for performing three types of proximity queries on a pair of geometric models composed of triangles", "homepage": "https://github.com/flexible-collision-library/fcl", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d8755acd0d8181..abb616d6f50b9e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2118,7 +2118,7 @@ }, "fcl": { "baseline": "0.7.0", - "port-version": 2 + "port-version": 3 }, "fdk-aac": { "baseline": "2.0.2", diff --git a/versions/f-/fcl.json b/versions/f-/fcl.json index b3d5c5a79c2fb2..e8e1312f6277e1 100644 --- a/versions/f-/fcl.json +++ b/versions/f-/fcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a023b16805abecae1b2770df56b4d1a7174493d", + "version": "0.7.0", + "port-version": 3 + }, { "git-tree": "11b59644379cbae75571423312e0c0971e6d3740", "version": "0.7.0", From aeb2352385b8f6abae4715acd1905f841cef687c Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 5 Nov 2021 01:47:10 +0800 Subject: [PATCH 0987/1858] [abseil] Support x86 and arm (#21152) --- ports/abseil/fix-32-bit-arm.patch | 23 +++++++++++++++++++++++ ports/abseil/portfile.cmake | 28 ++++++++++++++-------------- ports/abseil/vcpkg.json | 12 +++++++++++- versions/a-/abseil.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 ports/abseil/fix-32-bit-arm.patch diff --git a/ports/abseil/fix-32-bit-arm.patch b/ports/abseil/fix-32-bit-arm.patch new file mode 100644 index 00000000000000..bc9ba4f1471f67 --- /dev/null +++ b/ports/abseil/fix-32-bit-arm.patch @@ -0,0 +1,23 @@ +diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc +index 7209533..5ab5a59 100644 +--- a/absl/time/internal/cctz/src/zone_info_source.cc ++++ b/absl/time/internal/cctz/src/zone_info_source.cc +@@ -65,7 +65,7 @@ ZoneInfoSourceFactory zone_info_source_factory __attribute__((weak)) = + extern ZoneInfoSourceFactory zone_info_source_factory; + extern ZoneInfoSourceFactory default_factory; + ZoneInfoSourceFactory default_factory = DefaultFactory; +-#if defined(_M_IX86) ++#if defined(_M_IX86) || defined(_M_ARM) + #pragma comment( \ + linker, \ + "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ +@@ -83,8 +83,7 @@ ZoneInfoSourceFactory default_factory = DefaultFactory; + "@@U?$default_delete@VZoneInfoSource@cctz@time_internal@" ABSL_INTERNAL_MANGLED_NS \ + "@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@" ABSL_INTERNAL_MANGLED_BACKREFERENCE \ + "@@ZA") +-#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \ +- defined(_M_ARM64) ++#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64) + #pragma comment( \ + linker, \ + "/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \ diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake index b8e71ada0f9cf3..6539cd271627d6 100644 --- a/ports/abseil/portfile.cmake +++ b/ports/abseil/portfile.cmake @@ -15,6 +15,7 @@ vcpkg_from_github( # detection can cause ABI issues depending on which compiler options # are enabled for consuming user code fix-cxx-standard.patch + fix-32-bit-arm.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -22,35 +23,34 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS cxx17 ABSL_USE_CXX17 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/absl TARGET_PATH share/absl) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/include/absl/copts - ${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata - ${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/include/absl/copts" + "${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata" + "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata" ) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/absl/base/config.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h" "#elif defined(ABSL_CONSUME_DLL)" "#elif 1" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h" "&& !defined(ABSL_CONSUME_DLL)" "&& 0" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h" "!defined(ABSL_CONSUME_DLL)" "0" ) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json index 83f27d1d9f7896..9d6159b210726e 100644 --- a/ports/abseil/vcpkg.json +++ b/ports/abseil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "abseil", "version-string": "20210324.2", + "port-version": 1, "description": [ "an open-source collection designed to augment the C++ standard library.", "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.", @@ -8,7 +9,16 @@ "Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole." ], "homepage": "https://github.com/abseil/abseil-cpp", - "supports": "(x64 | arm64) & (linux | osx | windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "cxx17": { "description": "Enable compiler C++17." diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json index 7dcb532c3c69da..78a07547d7dd6d 100644 --- a/versions/a-/abseil.json +++ b/versions/a-/abseil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "10d137aa21adc696f8469d49f67b90ce0d50e1a1", + "version-string": "20210324.2", + "port-version": 1 + }, { "git-tree": "231cc80bbfb1e54466799ddb6a94dc6d15e7d39b", "version-string": "20210324.2", diff --git a/versions/baseline.json b/versions/baseline.json index abb616d6f50b9e..655f150f5591e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10,7 +10,7 @@ }, "abseil": { "baseline": "20210324.2", - "port-version": 0 + "port-version": 1 }, "absent": { "baseline": "0.3.1", From c626cba180020c7d9162ccf9dd100080f6cd805d Mon Sep 17 00:00:00 2001 From: Anichitei Ionel-Cristinel <49393881+ianichitei@users.noreply.github.com> Date: Thu, 4 Nov 2021 19:48:06 +0200 Subject: [PATCH 0988/1858] [bddisasm] Update to 1.34.7 (#21130) * Add bddisasm port Currently fetching bddisasm from my fork of the project * bddisasm: Build with BDD_INCLUDE_TOOL=OFF * bddisasm: Use PREFER_NINJA * bddisasm: Update REF * bddisasm: Don't use vcpkg_install_msbuild * bddisasm: Switch to release 1.32.1 from the bitdefender repo * Add the result of ./vcpkg x-add-version --all * Replace the control file with a manifest Converted with ./vcpkg format-manifest * Add more details to bddisasm/vcpkg.json Added port-version, license, homepage, documentation, and port mantainers * Fix bddisasm/vcpkg.json * Fix the version file * List arm as not supported * Update version file * Fail install on arm * Use the new vcpkg_cmake_* functions * Remove the LICENSE file * Fix version * Update version file * build only static library bddisasm only supports being built as a static library, so say that in the portfile * bddisasm: Update port to version 1.33.0 * bddisasm: Update port to version 1.34.2 * bddisasm: Update port to version 1.34.7 * bddisasm: Set `port-version` to 1 * Update ports/bddisasm/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Run `vcpkg x-add-version --all` Co-authored-by: nicole mazzuca Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/bddisasm/portfile.cmake | 8 ++++---- ports/bddisasm/vcpkg.json | 3 +-- versions/b-/bddisasm.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/bddisasm/portfile.cmake b/ports/bddisasm/portfile.cmake index 02a0a0709f622d..7d44789c42047b 100644 --- a/ports/bddisasm/portfile.cmake +++ b/ports/bddisasm/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bitdefender/bddisasm - REF v1.34.2 - SHA512 4ddcae67721f6f1c5f0073aca3996325d4fbb148365a63b03e295fc2b00b1f4c73439a1fe6aab60ab9778e182b7acf2807df7c40079a1ca7916fbb5393245717 + REF v1.34.7 + SHA512 e4bd0895b285030f0aba4d5666a5da66cee6e1766e68a9527d1c2ca6160690270d55819ab8f6357b0f61fd52fb13b87ca7c15ee5694185564cc9bb55b62eb9ff HEAD_REF master ) @@ -28,5 +28,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/bddisasm/vcpkg.json b/ports/bddisasm/vcpkg.json index 269bc12e06b307..23aec994670b68 100644 --- a/ports/bddisasm/vcpkg.json +++ b/ports/bddisasm/vcpkg.json @@ -1,7 +1,6 @@ { "name": "bddisasm", - "version": "1.34.2", - "port-version": 1, + "version": "1.34.7", "maintainers": "Cristi Anichitei ", "description": "bddisasm is a fast, lightweight, x86/x64 instruction decoder and emulator.", "homepage": "https://github.com/bitdefender/bddisasm", diff --git a/versions/b-/bddisasm.json b/versions/b-/bddisasm.json index 7b4f30795643db..ae9d39405f8003 100644 --- a/versions/b-/bddisasm.json +++ b/versions/b-/bddisasm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "296988f2d875c4fe41506e163c5c35141c6d35f8", + "version": "1.34.7", + "port-version": 0 + }, { "git-tree": "615b986c25f902c2053661948092cbfa757fa400", "version": "1.34.2", diff --git a/versions/baseline.json b/versions/baseline.json index 655f150f5591e6..7111e0d7feaaa0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -397,8 +397,8 @@ "port-version": 1 }, "bddisasm": { - "baseline": "1.34.2", - "port-version": 1 + "baseline": "1.34.7", + "port-version": 0 }, "bde": { "baseline": "3.2.0.0", From cd627e38e7196a50487590aa601ca03c1fac8209 Mon Sep 17 00:00:00 2001 From: Alexander Smyslov <37107500+alexander-smyslov@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:17:46 +0100 Subject: [PATCH 0989/1858] [librdkafka] Upgrade up to 1.8.2 (#21111) * Add files via upload * [new port] avro-cpp * add boost-format * remove comments * remove comments * [librdkafka] Upgrade up to 1.8.2 * [librdkafka] Upgrade up to 1.8.2 * fix remarks * fix remarks * fix remarks * Update ports/librdkafka/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/librdkafka/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * fix remarks * fix remarks * fix remarks * fix remarks * fix remarks Co-authored-by: Alexander Smyslov Co-authored-by: Smyslov Alexander Nikolayevich Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/librdkafka/portfile.cmake | 29 +++++++++++++++-------------- ports/librdkafka/vcpkg.json | 14 ++++++++++++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 4 ++-- versions/l-/librdkafka.json | 5 +++++ 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake index d565ed28ea08d2..a8c181ec543c85 100644 --- a/ports/librdkafka/portfile.cmake +++ b/ports/librdkafka/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO edenhill/librdkafka - REF 77a013b7a2611f7bdc091afa1e56b1a46d1c52f5 #v1.7.0 - SHA512 3eedfe2dcca90a392b82aa512989cdf5ecde2c7c9779aecdd619375da4e04071fdc868ce37c01948346cfa48cd6f7395cbc074edd6e36c678193791ffe7a9ed1 + REF v1.8.2 + SHA512 8c8ae291129b78e3b8367307ad1b1715af1438cd76d7160d64d13a58adf84c7c9f51efeba4656f55e101c25e4cb744db0d8bb5c01a2decb229e4567d16bdcb22 HEAD_REF master ) @@ -10,16 +10,15 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" RDKAFKA_BUILD_STATIC) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - lz4 ENABLE_LZ4_EXT - ssl WITH_SSL - zlib WITH_ZLIB - zstd WITH_ZSTD - snappy WITH_SNAPPY + lz4 ENABLE_LZ4_EXT + ssl WITH_SSL + zlib WITH_ZLIB + zstd WITH_ZSTD + snappy WITH_SNAPPY ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DRDKAFKA_BUILD_STATIC=${RDKAFKA_BUILD_STATIC} -DRDKAFKA_BUILD_EXAMPLES=OFF @@ -27,24 +26,26 @@ vcpkg_configure_cmake( -DWITH_BUNDLED_SSL=OFF ${FEATURE_OPTIONS} OPTIONS_DEBUG + -DENABLE_SHAREDPTR_DEBUG=ON -DENABLE_DEVEL=ON -DENABLE_REFCNT_DEBUG=ON -DENABLE_SHAREDPTR_DEBUG=ON -DWITHOUT_OPTIMIZATION=ON OPTIONS_RELEASE + -DENABLE_SHAREDPTR_DEBUG=OFF -DENABLE_DEVEL=OFF -DENABLE_REFCNT_DEBUG=OFF -DENABLE_SHAREDPTR_DEBUG=OFF -DWITHOUT_OPTIMIZATION=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( + PACKAGE_NAME RdKafka CONFIG_PATH lib/cmake/RdKafka - TARGET_PATH share/rdkafka ) if("lz4" IN_LIST FEATURES) @@ -75,5 +76,5 @@ configure_file(${SOURCE_PATH}/LICENSES.txt ${CURRENT_PACKAGES_DIR}/share/${PORT} # Install usage configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/librdkafka/vcpkg.json b/ports/librdkafka/vcpkg.json index a4f0ed147cd9f6..75038f4f25484b 100644 --- a/ports/librdkafka/vcpkg.json +++ b/ports/librdkafka/vcpkg.json @@ -1,9 +1,19 @@ { "name": "librdkafka", - "version-string": "1.7.0", - "port-version": 2, + "version": "1.8.2", "description": "The Apache Kafka C/C++ library", "homepage": "https://github.com/edenhill/librdkafka", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "lz4": { "description": "Enable external LZ4 library support", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 26295a93ff02a6..49611c8492d90a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -671,8 +671,6 @@ libqcow:x64-windows=skip libqcow:x64-linux=skip libqcow:x86-windows=skip libqcow:arm64-windows=skip -librdkafka:arm-uwp=fail -librdkafka:x64-uwp=fail # Conflicts with openssl boringssl:arm64-windows = skip boringssl:arm-uwp = skip diff --git a/versions/baseline.json b/versions/baseline.json index 7111e0d7feaaa0..8c54ae9f183dac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3781,8 +3781,8 @@ "port-version": 5 }, "librdkafka": { - "baseline": "1.7.0", - "port-version": 2 + "baseline": "1.8.2", + "port-version": 0 }, "libressl": { "baseline": "3.3.4", diff --git a/versions/l-/librdkafka.json b/versions/l-/librdkafka.json index bfca292f7a2a64..4d4df5405918d2 100644 --- a/versions/l-/librdkafka.json +++ b/versions/l-/librdkafka.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc5076b17ce1f54f6e61560036325ca9f24cda64", + "version": "1.8.2", + "port-version": 0 + }, { "git-tree": "3d418b5510b8ed058f73035681f3e1de5aa94c28", "version-string": "1.7.0", From 5531d3253245847edd8257181fce70a98757fd31 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:18:43 +0100 Subject: [PATCH 0990/1858] [ompl] no absolute paths (#21104) --- ports/ompl/portfile.cmake | 46 +++++++++++++++++---------------------- ports/ompl/vcpkg.json | 12 ++++++++-- versions/baseline.json | 2 +- versions/o-/ompl.json | 5 +++++ 4 files changed, 36 insertions(+), 29 deletions(-) diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index ab02eba31a185d..04d55d7f4427e5 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -2,30 +2,23 @@ vcpkg_buildpath_length_warning(37) set(OMPL_VERSION 1.5.1) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/ompl/ompl/archive/1.5.1.tar.gz" - FILENAME "ompl-${OMPL_VERSION}.tar.gz" - SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570 -) - -vcpkg_extract_source_archive_ex( +vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${OMPL_VERSION} + REPO ompl/ompl + REF 1.5.1 + SHA512 2f28d29f32f3bb03e67b29ce251e4786364847a25e3c4cf66d7663ed38dca4da71d4e03cf9ce647710d9524a3907c76c09795e77f041cb8822f695d28f5ca570 + HEAD_REF master PATCHES 0001_Export_targets.patch 0002_Fix_config.patch ) # Based on selected features different files get downloaded, so use the following command instead of patch. -file(READ ${SOURCE_PATH}/CMakeLists.txt _contents) -string(REPLACE "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)" _contents "${_contents}") -string(REPLACE "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)" _contents "${_contents}") -file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${_contents}") - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)") +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)") + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DOMPL_VERSIONED_INSTALL=OFF @@ -36,18 +29,19 @@ vcpkg_configure_cmake( -DOMPL_BUILD_PYTESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/ompl/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/ompl/cmake) +vcpkg_fixup_pkgconfig() # Remove debug distribution and other, move ompl_benchmark to tools/ dir file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/share/man - ${CURRENT_PACKAGES_DIR}/share/ompl/demos - ${CURRENT_PACKAGES_DIR}/share/ompl/ompl.conf - ${CURRENT_PACKAGES_DIR}/share/ompl/plannerarena + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/man" + "${CURRENT_PACKAGES_DIR}/share/ompl/demos" + "${CURRENT_PACKAGES_DIR}/share/ompl/ompl.conf" + "${CURRENT_PACKAGES_DIR}/share/ompl/plannerarena" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -55,4 +49,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ompl/vcpkg.json b/ports/ompl/vcpkg.json index 81a8c5ff4a332c..25602adc2c5f57 100644 --- a/ports/ompl/vcpkg.json +++ b/ports/ompl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ompl", "version-string": "1.5.1", - "port-version": 2, + "port-version": 3, "description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms", "homepage": "https://ompl.kavrakilab.org/", "dependencies": [ @@ -15,6 +15,14 @@ "boost-test", "boost-timer", "boost-ublas", - "eigen3" + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 8c54ae9f183dac..38035aba843d97 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4802,7 +4802,7 @@ }, "ompl": { "baseline": "1.5.1", - "port-version": 2 + "port-version": 3 }, "omplapp": { "baseline": "1.5.1", diff --git a/versions/o-/ompl.json b/versions/o-/ompl.json index 7330973c5f509b..ac0df1cbe5e421 100644 --- a/versions/o-/ompl.json +++ b/versions/o-/ompl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4385de7645c202d99bb25420d049f15cb54d9ed7", + "version-string": "1.5.1", + "port-version": 3 + }, { "git-tree": "87e475355f626557d8762d014c7f0efa2d2d488e", "version-string": "1.5.1", From 7cd6bbc5e93c019ec635ccd64f4934ea4ec9c0df Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:21:48 +0100 Subject: [PATCH 0991/1858] [highway] Add new port (#21087) * Add highway 0.14.2 port * Update git-tree hash * Fix vcpkg_fixup_pkgconfig by removing libhwy-test.pc * Update git-tree hash Co-authored-by: chausner --- ports/highway/portfile.cmake | 27 +++++++++++++++++++++++++++ ports/highway/vcpkg.json | 13 +++++++++++++ versions/baseline.json | 4 ++++ versions/h-/highway.json | 9 +++++++++ 4 files changed, 53 insertions(+) create mode 100644 ports/highway/portfile.cmake create mode 100644 ports/highway/vcpkg.json create mode 100644 versions/h-/highway.json diff --git a/ports/highway/portfile.cmake b/ports/highway/portfile.cmake new file mode 100644 index 00000000000000..8a7b9c50b620c8 --- /dev/null +++ b/ports/highway/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO google/highway + REF 0.14.2 + SHA512 fc1a35463c95c45b646c53f91a9996112726de1d588dcd4d25a7d366840f704ad9a4c0bb6e0a001e929409f04aad6922cbffcf93774a0c360aff875956c7cc8d + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() + +# remove test-related pkg-config files that break vcpkg_fixup_pkgconfig +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libhwy-test.pc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libhwy-test.pc") + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/highway/vcpkg.json b/ports/highway/vcpkg.json new file mode 100644 index 00000000000000..90cfe5de98e463 --- /dev/null +++ b/ports/highway/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "highway", + "version-semver": "0.14.2", + "description": "Performance-portable, length-agnostic SIMD with runtime dispatch", + "homepage": "https://github.com/google/highway", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 38035aba843d97..1a7034d35fa4ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2676,6 +2676,10 @@ "baseline": "2.3", "port-version": 0 }, + "highway": { + "baseline": "0.14.2", + "port-version": 0 + }, "hiredis": { "baseline": "1.0.2", "port-version": 1 diff --git a/versions/h-/highway.json b/versions/h-/highway.json new file mode 100644 index 00000000000000..b3efe0ceb9df13 --- /dev/null +++ b/versions/h-/highway.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5167bd4fba072a5f09398d913d5e575241c67c5e", + "version-semver": "0.14.2", + "port-version": 0 + } + ] +} From 30c67fededaa9e292302a8702a02daccf6c172f1 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:56:40 +0100 Subject: [PATCH 0992/1858] [minitrace] fix cmake config (#21136) --- ports/minitrace/portfile.cmake | 16 ++++++++-------- ports/minitrace/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/m-/minitrace.json | 5 +++++ 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/ports/minitrace/portfile.cmake b/ports/minitrace/portfile.cmake index 444ae318895a6e..06b43396e63a04 100644 --- a/ports/minitrace/portfile.cmake +++ b/ports/minitrace/portfile.cmake @@ -8,17 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/minitrace RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/minitrace" RENAME copyright) diff --git a/ports/minitrace/vcpkg.json b/ports/minitrace/vcpkg.json index 47484d35d23d86..cb27c98a27b8e4 100644 --- a/ports/minitrace/vcpkg.json +++ b/ports/minitrace/vcpkg.json @@ -1,6 +1,16 @@ { "name": "minitrace", "version-string": "2019.02.06", - "port-version": 1, - "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer." + "port-version": 2, + "description": "Simple C/C++ library for producing JSON traces suitable for Chrome's built-in trace viewer.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1a7034d35fa4ef..2f17dfaf742a48 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4350,7 +4350,7 @@ }, "minitrace": { "baseline": "2019.02.06", - "port-version": 1 + "port-version": 2 }, "miniupnpc": { "baseline": "2.1", diff --git a/versions/m-/minitrace.json b/versions/m-/minitrace.json index 589fa8bdc06fe7..42a7e6e1cd7d4c 100644 --- a/versions/m-/minitrace.json +++ b/versions/m-/minitrace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a108afe478661d93adbf6ca758501a543d89f2b1", + "version-string": "2019.02.06", + "port-version": 2 + }, { "git-tree": "673b7749d7e3be0b8f86b2f8452c5f548068add8", "version-string": "2019.02.06", From 7d2b2661652c191a888a6b1c3cb01a59557bed16 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:57:01 +0100 Subject: [PATCH 0993/1858] [draco] Update to 1.4.3 (#21121) * Update draco to 1.4.3 * Update CI baseline * Disable symlinks * Update git-tree hash Co-authored-by: chausner --- ports/draco/disable-symlinks.patch | 31 +++++++++++++++++++++++++++ ports/draco/portfile.cmake | 34 +++++++++++++++--------------- ports/draco/vcpkg.json | 14 ++++++++++-- versions/baseline.json | 2 +- versions/d-/draco.json | 5 +++++ 5 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 ports/draco/disable-symlinks.patch diff --git a/ports/draco/disable-symlinks.patch b/ports/draco/disable-symlinks.patch new file mode 100644 index 00000000000000..62221b9830dbde --- /dev/null +++ b/ports/draco/disable-symlinks.patch @@ -0,0 +1,31 @@ +diff --git a/cmake/draco_targets.cmake b/cmake/draco_targets.cmake +index f2acc72..fb8ce4a 100644 +--- a/cmake/draco_targets.cmake ++++ b/cmake/draco_targets.cmake +@@ -102,10 +102,6 @@ macro(draco_add_executable) + + add_executable(${exe_NAME} ${exe_SOURCES}) + +- if(NOT EMSCRIPTEN) +- set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) +- endif() +- + if(exe_OUTPUT_NAME) + set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) + endif() +@@ -337,15 +333,6 @@ macro(draco_add_library) + set_target_properties(${lib_NAME} PROPERTIES PREFIX "") + endif() + +- if(NOT EMSCRIPTEN) +- # VERSION and SOVERSION as necessary +- if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC) +- set_target_properties(${lib_NAME} +- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION +- ${DRACO_SOVERSION_MAJOR}) +- endif() +- endif() +- + if(BUILD_SHARED_LIBS AND (MSVC OR WIN32)) + if(lib_TYPE STREQUAL SHARED) + target_compile_definitions(${lib_NAME} PRIVATE "DRACO_BUILDING_DLL=1") diff --git a/ports/draco/portfile.cmake b/ports/draco/portfile.cmake index 201f73cca604b4..bde70c6645538c 100644 --- a/ports/draco/portfile.cmake +++ b/ports/draco/portfile.cmake @@ -3,36 +3,36 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/draco - REF 1.4.1 - SHA512 55B8AF74552987220FB23580F6B167E4610A1341BC36117B6D235C05E126A79981F93787ACB90210127DC779B3134A1D9CC8D6697B1286459F233BF660B890BC + REF 1.4.3 + SHA512 f2220d5e84a4ca2d14c6bbc3dca0a2ed5c988849d3a98ce3dea910efe005e0ccdff06677d782cdb1673db9e158905aa91a9305432dc5621e8947b2d90f5996d3 HEAD_REF master PATCHES fix-compile-error-uwp.patch fix-uwperror.patch + disable-symlinks.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake) vcpkg_fixup_pkgconfig() + # Install tools and plugins -file(GLOB TOOLS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.exe") -if(TOOLS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/draco) - file(COPY ${TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/draco) -endif() +vcpkg_copy_tools( + TOOL_NAMES + draco_encoder + draco_decoder + AUTO_CLEAN +) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/draco/vcpkg.json b/ports/draco/vcpkg.json index 171493214eaf37..288be5537a01b7 100644 --- a/ports/draco/vcpkg.json +++ b/ports/draco/vcpkg.json @@ -1,6 +1,16 @@ { "name": "draco", - "version": "1.4.1", + "version": "1.4.3", "description": " A library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics.", - "homepage": "https://github.com/google/draco" + "homepage": "https://github.com/google/draco", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 2f17dfaf742a48..21ade75931bc63 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1889,7 +1889,7 @@ "port-version": 1 }, "draco": { - "baseline": "1.4.1", + "baseline": "1.4.3", "port-version": 0 }, "drlibs": { diff --git a/versions/d-/draco.json b/versions/d-/draco.json index 2ac33f2df023e4..e3b1eb6d0dab15 100644 --- a/versions/d-/draco.json +++ b/versions/d-/draco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7d67016c671b628353196ef4138cfd91feb2d33", + "version": "1.4.3", + "port-version": 0 + }, { "git-tree": "3289b6aa2981d3fb169f35ca384608b514210401", "version": "1.4.1", From 5b1846c5b55524e3422d69ae0820335b3ace68f1 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:57:21 +0100 Subject: [PATCH 0994/1858] [protopuf] fix cmake config (#21103) --- ports/protopuf/portfile.cmake | 11 ++++++----- ports/protopuf/vcpkg.json | 13 ++++++++++++- versions/baseline.json | 2 +- versions/p-/protopuf.json | 5 +++++ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ports/protopuf/portfile.cmake b/ports/protopuf/portfile.cmake index 80b7535e484873..9b1e9c948feb5e 100644 --- a/ports/protopuf/portfile.cmake +++ b/ports/protopuf/portfile.cmake @@ -6,15 +6,16 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/protopuf/vcpkg.json b/ports/protopuf/vcpkg.json index 82833fd83a84e7..c0063acddd055d 100644 --- a/ports/protopuf/vcpkg.json +++ b/ports/protopuf/vcpkg.json @@ -1,6 +1,17 @@ { "name": "protopuf", "version-semver": "2.1.0", + "port-version": 1, "description": "A little, highly templated, and protobuf-compatible serialization/deserialization library written in C++20", - "homepage": "https://github.com/PragmaTwice/protopuf" + "homepage": "https://github.com/PragmaTwice/protopuf", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 21ade75931bc63..e3eddc61ec7846 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5358,7 +5358,7 @@ }, "protopuf": { "baseline": "2.1.0", - "port-version": 0 + "port-version": 1 }, "protozero": { "baseline": "1.7.0", diff --git a/versions/p-/protopuf.json b/versions/p-/protopuf.json index 824b017b3f93c4..05a2ede0195765 100644 --- a/versions/p-/protopuf.json +++ b/versions/p-/protopuf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57399a25b20d4f3a437118a4bc2fe9a639972bb4", + "version-semver": "2.1.0", + "port-version": 1 + }, { "git-tree": "8ba0da5deda1a9f0acd728f149206d1c1c5644a1", "version-semver": "2.1.0", From 1c0783c47764da160e21554e045d870ff7939449 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:57:43 +0100 Subject: [PATCH 0995/1858] [xtensor-io] no absolute paths (#21099) --- ports/xtensor-io/portfile.cmake | 5 +++++ ports/xtensor-io/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/x-/xtensor-io.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/xtensor-io/portfile.cmake b/ports/xtensor-io/portfile.cmake index d1f1bb1a03cb7e..97141106863bce 100644 --- a/ports/xtensor-io/portfile.cmake +++ b/ports/xtensor-io/portfile.cmake @@ -20,6 +20,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +foreach(bit "64" "32" "") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/xtensor-io/xtensor_io_config.hpp" "#pragma cling add_library_path(\"${CURRENT_PACKAGES_DIR}/lib${bit}\")" "") +endforeach() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xtensor-io/vcpkg.json b/ports/xtensor-io/vcpkg.json index 403c06c79d18bb..78982b3b59e9d5 100644 --- a/ports/xtensor-io/vcpkg.json +++ b/ports/xtensor-io/vcpkg.json @@ -1,6 +1,7 @@ { "name": "xtensor-io", "version": "0.12.8", + "port-version": 1, "description": "xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5", "homepage": "https://github.com/xtensor-stack/xtensor-io", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e3eddc61ec7846..d00a4da782c14f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7238,7 +7238,7 @@ }, "xtensor-io": { "baseline": "0.12.8", - "port-version": 0 + "port-version": 1 }, "xtl": { "baseline": "0.7.2", diff --git a/versions/x-/xtensor-io.json b/versions/x-/xtensor-io.json index f28be0ca7e6405..8bf28e92533383 100644 --- a/versions/x-/xtensor-io.json +++ b/versions/x-/xtensor-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba855025d72826b6462959f0e8f895e62102e626", + "version": "0.12.8", + "port-version": 1 + }, { "git-tree": "0f70c1f44abb24d6d3883b9cd5efd4acc0473787", "version": "0.12.8", From a4f6306383930f21c74dfc42c853b045adafccda Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:58:21 +0100 Subject: [PATCH 0996/1858] [xtensor-blas] no absolute path (#21098) --- ports/xtensor-blas/portfile.cmake | 17 +++++++++-------- ports/xtensor-blas/vcpkg.json | 10 +++++++++- versions/baseline.json | 2 +- versions/x-/xtensor-blas.json | 5 +++++ 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ports/xtensor-blas/portfile.cmake b/ports/xtensor-blas/portfile.cmake index e805340e8a0bd6..4de89d2754b51a 100644 --- a/ports/xtensor-blas/portfile.cmake +++ b/ports/xtensor-blas/portfile.cmake @@ -3,14 +3,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xtensor-stack/xtensor-blas - REF 2876b041a2759f10dfde13ab3a2fc09578ae4b40 # 0.17.2 + REF 2876b041a2759f10dfde13ab3a2fc09578ae4b40 # 0.17.2 SHA512 64c78d093f24fc15715bc7dfa486cfb1342a6752ea497f43553d031fc8be30718d01157e5b6412c516e6ce2be9045a89963d912e60f4eb7431675331b8ed6f90 HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS_RELEASE -DCXXBLAS_DEBUG=OFF OPTIONS_DEBUG -DCXXBLAS_DEBUG=ON @@ -22,11 +21,13 @@ vcpkg_configure_cmake( -DDOWNLOAD_GBENCHMARK=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/xtensor-blas/xblas_config_cling.hpp") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xflens/cxxblas/netlib) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/xflens/cxxblas/netlib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/xtensor-blas/vcpkg.json b/ports/xtensor-blas/vcpkg.json index cdf9ce55ca7643..70c3147273b515 100644 --- a/ports/xtensor-blas/vcpkg.json +++ b/ports/xtensor-blas/vcpkg.json @@ -1,10 +1,18 @@ { "name": "xtensor-blas", "version-string": "0.17.2", - "port-version": 1, + "port-version": 2, "description": "BLAS extension to xtensor", "homepage": "https://github.com/xtensor-stack/xtensor-blas", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "xtensor" ] } diff --git a/versions/baseline.json b/versions/baseline.json index d00a4da782c14f..708624c954feb0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7230,7 +7230,7 @@ }, "xtensor-blas": { "baseline": "0.17.2", - "port-version": 1 + "port-version": 2 }, "xtensor-fftw": { "baseline": "2019-11-30", diff --git a/versions/x-/xtensor-blas.json b/versions/x-/xtensor-blas.json index 84e8e2bb356bd3..f377a2b39e3d6a 100644 --- a/versions/x-/xtensor-blas.json +++ b/versions/x-/xtensor-blas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6524a2462dd339878f2e32de8962576a15097a5e", + "version-string": "0.17.2", + "port-version": 2 + }, { "git-tree": "d046baeae79d8ce5a5c535ad3c60fe4e65db7366", "version-string": "0.17.2", From b95e88efd102344b453f4c501767f6d78901f3f7 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:58:41 +0100 Subject: [PATCH 0997/1858] [libusb] no absolute paths (#21097) --- ports/libusb/portfile.cmake | 1 + ports/libusb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 3aed72d2a880f5..96eb3f5de3a6c7 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -55,6 +55,7 @@ else() AUTOCONFIG ) vcpkg_install_make() + vcpkg_fixup_pkgconfig() endif() configure_file(${CURRENT_PORT_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 07bbd2d8b4818a..76f96492662831 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.24", - "port-version": 5, + "port-version": 6, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 708624c954feb0..b84c30cd3925ec 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3962,7 +3962,7 @@ }, "libusb": { "baseline": "1.0.24", - "port-version": 5 + "port-version": 6 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index 12878e1b7fee43..bc378e31b37455 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "489d07fb5a6ada487532ea3cc5390a50e7feef02", + "version": "1.0.24", + "port-version": 6 + }, { "git-tree": "76a5ebd046d669a93d2a467d87a80efbe85f8226", "version": "1.0.24", From 869dedaf10cbdee214cb45a48355ba22c8123264 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:59:01 +0100 Subject: [PATCH 0998/1858] [mongo-cxx-driver] no absolute paths (#21096) --- ports/mongo-cxx-driver/portfile.cmake | 3 +++ ports/mongo-cxx-driver/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/mongo-cxx-driver.json | 5 +++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index ffbf83ce60dfcc..a570ac689d93c0 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -119,6 +119,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib/cmake" ) +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/uninstall.sh") + +vcpkg_fixup_pkgconfig() file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(COPY "${SOURCE_PATH}/THIRD-PARTY-NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/mongo-cxx-driver/vcpkg.json b/ports/mongo-cxx-driver/vcpkg.json index a140be68a14037..27d8f07beb0e4c 100644 --- a/ports/mongo-cxx-driver/vcpkg.json +++ b/ports/mongo-cxx-driver/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mongo-cxx-driver", "version": "3.6.5", + "port-version": 1, "description": "MongoDB C++ Driver.", "homepage": "https://github.com/mongodb/mongo-cxx-driver", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b84c30cd3925ec..f7c33fdc08ac16 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4402,7 +4402,7 @@ }, "mongo-cxx-driver": { "baseline": "3.6.5", - "port-version": 0 + "port-version": 1 }, "mongoose": { "baseline": "7.1", diff --git a/versions/m-/mongo-cxx-driver.json b/versions/m-/mongo-cxx-driver.json index a9d2f8802c5b4b..696d1d869291e6 100644 --- a/versions/m-/mongo-cxx-driver.json +++ b/versions/m-/mongo-cxx-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2fd38965003b9bc7a653ab8aaabb8172a043d9d0", + "version": "3.6.5", + "port-version": 1 + }, { "git-tree": "13a9e7a7e597324f6cf72f7e9389604109888567", "version": "3.6.5", From a51758bf0f6f0d17b34db39418f41d744d25105b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 4 Nov 2021 20:59:26 +0100 Subject: [PATCH 0999/1858] [sjpeg] Add new port (#21094) * Add new port sjpeg * Update CI baseline * Remove "supports", use vcpkg_check_linkage * Update git-tree hash * Remove man pages * Update git-tree hash Co-authored-by: chausner --- ports/sjpeg/portfile.cmake | 26 ++++++++++++++++++++++++++ ports/sjpeg/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/sjpeg.json | 9 +++++++++ 4 files changed, 56 insertions(+) create mode 100644 ports/sjpeg/portfile.cmake create mode 100644 ports/sjpeg/vcpkg.json create mode 100644 versions/s-/sjpeg.json diff --git a/ports/sjpeg/portfile.cmake b/ports/sjpeg/portfile.cmake new file mode 100644 index 00000000000000..7a4843c2361a35 --- /dev/null +++ b/ports/sjpeg/portfile.cmake @@ -0,0 +1,26 @@ +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO webmproject/sjpeg + REF 676de227d75877eb5863ec805ba0a4b97fc2fc6c + SHA512 cf9e5a744f79996817679dc2e64be2efd64cbc9bb5f505f5c6530f92d60fe99715c57bcf71e0bb80c77732ace1d71fbf1ff9b4e4ec2562a9576c74a4410c2cb1 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSJPEG_BUILD_EXAMPLES=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/sjpeg/cmake) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/sjpeg/vcpkg.json b/ports/sjpeg/vcpkg.json new file mode 100644 index 00000000000000..dd79e9587c1a1f --- /dev/null +++ b/ports/sjpeg/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "sjpeg", + "version-date": "2021-10-31", + "description": "Simple library for encoding baseline JPEG files", + "homepage": "https://github.com/webmproject/sjpeg", + "license": "Apache-2.0", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index f7c33fdc08ac16..3a6f896f619b36 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6232,6 +6232,10 @@ "baseline": "2018-08-31", "port-version": 5 }, + "sjpeg": { + "baseline": "2021-10-31", + "port-version": 0 + }, "skia": { "baseline": "2020-05-18", "port-version": 5 diff --git a/versions/s-/sjpeg.json b/versions/s-/sjpeg.json new file mode 100644 index 00000000000000..22934e52861356 --- /dev/null +++ b/versions/s-/sjpeg.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fe20a97b3cdd0a6ad84ca9543670ea61673d1026", + "version-date": "2021-10-31", + "port-version": 0 + } + ] +} From 62ba34346634df3b6c89433e37e75c22bc88b52e Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Nov 2021 12:59:49 -0700 Subject: [PATCH 1000/1858] [reproc] Update to 14.2.4 (#21085) * update to 14.2.4 * update versioning --- ports/reproc/portfile.cmake | 4 ++-- ports/reproc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/reproc.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/reproc/portfile.cmake b/ports/reproc/portfile.cmake index 0a64711afbc462..ec99b5112ac80b 100644 --- a/ports/reproc/portfile.cmake +++ b/ports/reproc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO DaanDeMeyer/reproc - REF v14.2.3 - SHA512 acb3a0b90aca7bcfd1b0882b7094ba0f2f8dd8aa4a7c4a37d37780cebb23ef3c8842ca9a9aded337f607d832a95eed5cc7ccc120c64daef9a979a9d20aa07aad + REF v14.2.4 + SHA512 c592521960f1950d626261738091d25efdf764ee1a0c72a58c28c66eaebf6073b2c978f1dc2c8dbe89b0be7ec1629a3a45cb1fafa0ebe21b5df8d4d27c992675 HEAD_REF main ) diff --git a/ports/reproc/vcpkg.json b/ports/reproc/vcpkg.json index b0530b3e7ed46b..a4f70dc794d782 100644 --- a/ports/reproc/vcpkg.json +++ b/ports/reproc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "reproc", - "version": "14.2.3", + "version": "14.2.4", "description": "Cross-platform (C99/C++11) process library", "homepage": "https://github.com/DaanDeMeyer/reproc", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 3a6f896f619b36..dec0e39a4aa91b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5897,7 +5897,7 @@ "port-version": 0 }, "reproc": { - "baseline": "14.2.3", + "baseline": "14.2.4", "port-version": 0 }, "rest-rpc": { diff --git a/versions/r-/reproc.json b/versions/r-/reproc.json index cf227e0b23634d..ed13fab3fe3cdf 100644 --- a/versions/r-/reproc.json +++ b/versions/r-/reproc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7fd87804e3a4b51c657b56c1be69d11e29168b89", + "version": "14.2.4", + "port-version": 0 + }, { "git-tree": "9f27a66507c39df365532d526313c247211aaa1d", "version": "14.2.3", From c767ba50040559ff6b9e4fcaa6f643b5f1d7d44a Mon Sep 17 00:00:00 2001 From: Kiba Amor <5093911+kibaamor@users.noreply.github.com> Date: Fri, 5 Nov 2021 04:00:46 +0800 Subject: [PATCH 1001/1858] [knet] Update to v1.0.3 (#21076) * [knet] Update to v1.0.3 * [knet] Update to v1.0.3 * update ci.baseline.txt * Update scripts/ci.baseline.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/knet/portfile.cmake | 17 +++++++++-------- ports/knet/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/k-/knet.json | 5 +++++ 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/ports/knet/portfile.cmake b/ports/knet/portfile.cmake index 2d5082accf7331..49487e6d16d3a3 100644 --- a/ports/knet/portfile.cmake +++ b/ports/knet/portfile.cmake @@ -5,25 +5,26 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kibaamor/knet - REF v1.0.2 - SHA512 fb101d10d3bb08e565618923a10bc39586a934ae562ba7241c079f781baaafbc511e0bd2de13db6263246dede5e602d578e1fbdf45c84a6fecc4d3ddad4735e9 + REF v1.0.3 + SHA512 8bc4fb43b456d86ecae939cfae539432bde1f7ad2261abf9a7654d7476eb6502f53cd314f21dd23f77eb8d2969d293f6cb886729c688ea25911157c7fa3c8b7c HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS - -DKNET_BUILD_EXAMPLE:BOOL=OFF - -DKNET_BUILD_TEST:BOOL=OFF + -DKNET_BUILD_EXAMPLE=OFF + -DKNET_BUILD_TEST=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/knet TARGET_PATH share/knet) +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/knet) +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/knet/vcpkg.json b/ports/knet/vcpkg.json index 003a8d64fcba66..3eb8859bf4b3f2 100644 --- a/ports/knet/vcpkg.json +++ b/ports/knet/vcpkg.json @@ -1,8 +1,18 @@ { "name": "knet", - "version": "1.0.2", + "version": "1.0.3", "description": "A cross platform lock-free and timer-supported C++11 network library.", "homepage": "https://github.com/kibaamor/knet", "license": "MIT", - "supports": "!(arm | uwp)" + "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index dec0e39a4aa91b..a7fa3c4bd320b1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3181,7 +3181,7 @@ "port-version": 0 }, "knet": { - "baseline": "1.0.2", + "baseline": "1.0.3", "port-version": 0 }, "krabsetw": { diff --git a/versions/k-/knet.json b/versions/k-/knet.json index 6aa44ffe5175fc..38b08862c1c6c3 100644 --- a/versions/k-/knet.json +++ b/versions/k-/knet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7dd6abd945d808be664c1b105d16b4ece4e245cf", + "version": "1.0.3", + "port-version": 0 + }, { "git-tree": "d2df3aac3680057cf29e597905199b7a7d7a1c25", "version": "1.0.2", From a1d1bb0ae92a14a5e02eccad387100239dd85a36 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 4 Nov 2021 23:29:53 +0100 Subject: [PATCH 1002/1858] [Qt6] Update qt 6.2.1 (#21037) * [Qt] Update to 6.2.1 * add changes from qtbase in the vcpkg-qmake PR into this PR. (So I don't invalidate everybody in the other PR) * [skip actions] fix qtbase and format of vcpkg.json * remove outdated patch * remove patches and add alsa feature. * version stuff --- ports/qt/vcpkg.json | 2 +- ports/qt5compat/vcpkg.json | 2 +- ports/qtactiveqt/vcpkg.json | 2 +- ports/qtbase/cmake/qt_install_submodule.cmake | 20 +++ ports/qtbase/cmake/qt_port_details.cmake | 68 +++++----- ports/qtbase/fix_qthread_max.patch | 13 -- ports/qtbase/portfile.cmake | 1 - ports/qtbase/qt.conf.in | 4 +- ports/qtbase/vcpkg.json | 3 +- ports/qtcharts/vcpkg.json | 2 +- ports/qtcoap/vcpkg.json | 2 +- ports/qtconnectivity/vcpkg.json | 2 +- ports/qtdatavis3d/vcpkg.json | 2 +- ports/qtdeclarative/vcpkg.json | 2 +- ports/qtdoc/vcpkg.json | 2 +- ports/qtimageformats/vcpkg.json | 2 +- ports/qtlocation/vcpkg.json | 2 +- ports/qtlottie/vcpkg.json | 2 +- ports/qtmqtt/vcpkg.json | 2 +- ports/qtmultimedia/3c74340.diff | 128 ------------------ ports/qtmultimedia/FindGObject.patch | 20 --- ports/qtmultimedia/FindGStreamer.patch | 36 ----- ports/qtmultimedia/portfile.cmake | 12 +- ports/qtmultimedia/vcpkg.json | 7 +- ports/qtnetworkauth/vcpkg.json | 2 +- ports/qtopcua/vcpkg.json | 2 +- ports/qtquick3d/vcpkg.json | 2 +- ports/qtquicktimeline/vcpkg.json | 2 +- ports/qtremoteobjects/vcpkg.json | 2 +- ports/qtscxml/vcpkg.json | 2 +- ports/qtsensors/vcpkg.json | 2 +- ports/qtserialbus/vcpkg.json | 2 +- ports/qtserialport/vcpkg.json | 2 +- ports/qtshadertools/vcpkg.json | 2 +- ports/qtsvg/vcpkg.json | 2 +- ports/qttools/portfile.cmake | 2 +- ports/qttools/vcpkg.json | 3 +- ports/qttranslations/vcpkg.json | 2 +- ports/qtvirtualkeyboard/vcpkg.json | 2 +- ports/qtwayland/vcpkg.json | 2 +- ports/qtwebchannel/vcpkg.json | 2 +- ports/qtwebengine/portfile.cmake | 2 +- ports/qtwebengine/vcpkg.json | 2 +- ports/qtwebsockets/vcpkg.json | 2 +- ports/qtwebview/vcpkg.json | 2 +- versions/baseline.json | 74 +++++----- versions/q-/qt.json | 5 + versions/q-/qt5compat.json | 5 + versions/q-/qtactiveqt.json | 5 + versions/q-/qtbase.json | 5 + versions/q-/qtcharts.json | 5 + versions/q-/qtcoap.json | 5 + versions/q-/qtconnectivity.json | 5 + versions/q-/qtdatavis3d.json | 5 + versions/q-/qtdeclarative.json | 5 + versions/q-/qtdoc.json | 5 + versions/q-/qtimageformats.json | 5 + versions/q-/qtlocation.json | 5 + versions/q-/qtlottie.json | 5 + versions/q-/qtmqtt.json | 5 + versions/q-/qtmultimedia.json | 5 + versions/q-/qtnetworkauth.json | 5 + versions/q-/qtopcua.json | 5 + versions/q-/qtquick3d.json | 5 + versions/q-/qtquicktimeline.json | 5 + versions/q-/qtremoteobjects.json | 5 + versions/q-/qtscxml.json | 5 + versions/q-/qtsensors.json | 5 + versions/q-/qtserialbus.json | 5 + versions/q-/qtserialport.json | 5 + versions/q-/qtshadertools.json | 5 + versions/q-/qtsvg.json | 5 + versions/q-/qttools.json | 5 + versions/q-/qttranslations.json | 5 + versions/q-/qtvirtualkeyboard.json | 5 + versions/q-/qtwayland.json | 5 + versions/q-/qtwebchannel.json | 5 + versions/q-/qtwebengine.json | 5 + versions/q-/qtwebsockets.json | 5 + versions/q-/qtwebview.json | 5 + 80 files changed, 311 insertions(+), 314 deletions(-) delete mode 100644 ports/qtbase/fix_qthread_max.patch delete mode 100644 ports/qtmultimedia/3c74340.diff delete mode 100644 ports/qtmultimedia/FindGObject.patch delete mode 100644 ports/qtmultimedia/FindGStreamer.patch diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 95caf678c49286..67a6953fa2a407 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 9023688dcba6f3..2bad0cc3babb76 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index d92ae9c1b419a3..d173af83d39e45 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 56c40c5791516d..587d6192cf3e0e 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -119,12 +119,32 @@ function(qt_cmake_configure) set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE) endfunction() +function(qt_fix_prl_files) + file(TO_CMAKE_PATH "${CURRENT_PACKAGES_DIR}/lib" package_dir) + file(TO_CMAKE_PATH "${package_dir}/lib" lib_path) + file(TO_CMAKE_PATH "${package_dir}/include/Qt6" include_path) + file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" install_prefix) + file(GLOB_RECURSE prl_files "${CURRENT_PACKAGES_DIR}/*.prl") + foreach(prl_file IN LISTS prl_files) + file(READ "${prl_file}" _contents) + string(REPLACE "${lib_path}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}") + string(REPLACE "${include_path}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}") + string(REPLACE "${install_prefix}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}") + string(REPLACE "[QT_INSTALL_PREFIX]/lib/objects-Debug" "[QT_INSTALL_LIBS]/objects-Debug" _contents "${_contents}") + #Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release + file(WRITE "${prl_file}" "${_contents}") + endforeach() +endfunction() + function(qt_fixup_and_cleanup) cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "" "" "TOOL_NAMES") vcpkg_copy_pdbs() + ## Handle PRL files + qt_fix_prl_files() + ## Handle CMake files. set(COMPONENTS) file(GLOB COMPONENTS_OR_FILES LIST_DIRECTORIES true "${CURRENT_PACKAGES_DIR}/share/Qt6*") diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 88e234e02aebfd..ba6695374657e9 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,4 +1,4 @@ -set(QT_VERSION 6.2.0) +set(QT_VERSION 6.2.1) if(PORT MATCHES "qtquickcontrols2") set(VCPKG_POLICY_EMPTY_PACKAGE enabled) @@ -56,43 +56,43 @@ set(QT_PORTS qt foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG}) endforeach() -set(qtbase_REF 0c2d00de3488116db9f9d657fe18bcb972a83792) -set(qtshadertools_REF 119cd6e9c9e89f93b74db28f261382a2fcfe504e) -set(qtdeclarative_REF 37da36c97d9d557945abca3cea5c68d9985a06e3) -set(qt5compat_REF 291993c7813ec706e54069c7de339edfdd385c0d) -set(qttools_REF 00efbf90f978afefdcece314d19b79459eee2211) # Additional refs in portfile due to submodule -set(qtcoap_REF be7822dc920a3e3eb252d5693a7153aa606d3dc1) -set(qtdoc_REF 48a1fbab30a9f57f011fdea8ec2b47048dce4069) -set(qtimageformats_REF 7bb9dc839c0dd0806445fd475b027a82c961f686) -set(qtmqtt_REF 4fd647e23d95c522c45d86be584d18578f894823) -set(qtnetworkauth_REF aa23db40ca552d60383dea17d703b1cc0cbeace4) -set(qtopcua_REF cfb3767b2a6785e0437b99c015cb6aef7f40189c) -set(qtquicktimeline_REF e9578a6949f6192440df1cb261ed9de98a9de7d7) -set(qtquick3d_REF eaf9c60073b95b03c006279f08d4947699c32a4b) -set(qtsvg_REF cceecea040ca1247db0212217d07ec2c331004ba) -set(qttranslations_REF 03a146236e69ee41c0405a8b5707104b4ac0c6e8) -set(qtwayland_REF 8c4900dda393752faab14e39e60aec6b545c8a0f) +set(qtbase_REF fbdf50b6c6f69ab88d7a53dfb3ab35e2b49a9664) +set(qtshadertools_REF 73deb667b27451340cafc20ead3aeb4ea84a5246) +set(qtdeclarative_REF 3419dd06c5928e292e0c25692427632e124eefea) +set(qt5compat_REF 3f69f4b1e7d07756b9de7629ec22e1c68265c88a) +set(qttools_REF 8e1f1f6e906095a8f2d5ebbf85443e2407d4e07c) # Additional refs in portfile due to submodule +set(qtcoap_REF 1c0bb10d86b43c4b3860cd4526087e644d3f4b07) +set(qtdoc_REF 040ef9a76b5f79d3cf5e42849d5f49a51522dc0f) +set(qtimageformats_REF bd8b167280addfb9b2ee0d493d6cf7b31c03e574) +set(qtmqtt_REF 610543f328127c68ab39960ded51649ad41d3bd4) +set(qtnetworkauth_REF 1987896634a2c4ac23842b366b4704f0b1396de7) +set(qtopcua_REF ae441a8fff3603e7d21957a09a0b3014669bbb0b) +set(qtquicktimeline_REF 6ba89379c0859622d71f75486b8d872cc4a709ca) +set(qtquick3d_REF 7e30ae5f8b6f3c28a2ee2df3788846fc67ec3c1c) +set(qtsvg_REF 30ad9d119079f486817e60025eceffdc0745ffcf) +set(qttranslations_REF 6d297398a2f9b0f7cf67de63369ca7b75ed60034) +set(qtwayland_REF bea7e0ee35211873c90987c905e3fd68d41df4da) # set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2 ### New in 6.1 -set(qtactiveqt_REF 94c924a8501dba7487bf2648bdf06aefc33e726d) -set(qtcharts_REF d56b9f3de193cbf561f4b1ec332d8598dbdaaaca) -set(qtdatavis3d_REF 5c90e6642882b3b7440608f71b96ce28908f0ee8) +set(qtactiveqt_REF 1b710fa0b5e054189b62e2e7fe32fcf1bec0b081) +set(qtcharts_REF 78a74a1fcdc4329c054691021a65ff00dcd09ebb) +set(qtdatavis3d_REF bec62cdb6f800087fd92085984fde389e9091e13) #set(qtdeviceutils_REF 0) #missing tag -set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288) -set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344) -set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f) +set(qtlottie_REF 9c72963a986d921e5c1cbdca6638fa17c9f8fa45) +set(qtscxml_REF 069fb385a21e2f844adeb74fbb06849ef5422c7d) +set(qtvirtualkeyboard_REF b6fe68874ed8ff86202320435a743521a245c515) ### New in 6.2 -set(qtconnectivity_REF 78e7ffbe16469a19fa34cad711e0898d91bd2f30) -set(qtlocation_REF 47a945b0d054539eab3ba1cf3a1d7bf5977051d6) -set(qtmultimedia_REF d7d0e676abd4b280feb0d5105846378b64782487) -set(qtremoteobjects_REF 58932ba10420faa1cc989ed5bf101ff06475a4fc) -set(qtsensors_REF 192ca0fd252066101eb0456b957fdb51618fa7db) -set(qtserialbus_REF ce089bef29ca55d7fe46508d92d3e498eb5bb847) -set(qtserialport_REF 14dc155f3640af94c6ecff2de1489e14cd5b0047) -set(qtwebchannel_REF 09315a8d626e106953723ce68e68d6b4b97c2c52) -set(qtwebengine_REF 261d72c8afc72faf23d169a64749db216db68859) # Additional refs in portfile due to submodule -set(qtwebsockets_REF a01c2d6638fad700db23863258b7fc4a1ecdd542) -set(qtwebview_REF ca0053b6a5320046508e9ba205df775a62c1a211) +set(qtconnectivity_REF e910b93cc161930748260626b414b7f4241e6d58) +set(qtlocation_REF 70c3948264d5e6e3bc9be4f0e5d8fdae8b821a08) +set(qtmultimedia_REF 64bc1b00b2979866d577eb57fd118ae497cf6391) +set(qtremoteobjects_REF 8876b4e07174b7fe3124de74002730684b1d0d82) +set(qtsensors_REF 8a949e9314682e6940f1b38f30f5d5f3fd1d6260) +set(qtserialbus_REF 709110461a843a9a0236f3cde27414157a088235) +set(qtserialport_REF d8b40852053623d44e8a07f4c208ace27dcde925) +set(qtwebchannel_REF c93ddec0eb35707fafd209bee8472fd6ee4a3cb6) +set(qtwebengine_REF b879b3ed6b4bb7d6951cf430d5e9b49898fe6c9a) # Additional refs in portfile due to submodule +set(qtwebsockets_REF 68a4c96964935ada5ae1ca323713b4e3862f010f) +set(qtwebview_REF 7ef6e31dd2ead012f941ddcaf30e5d4c2abf693b) if(QT_UPDATE_VERSION) message(STATUS "Running Qt in automatic version port update mode!") diff --git a/ports/qtbase/fix_qthread_max.patch b/ports/qtbase/fix_qthread_max.patch deleted file mode 100644 index 9138c3c8891119..00000000000000 --- a/ports/qtbase/fix_qthread_max.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h -index 5dc4d2222..1696dbc80 100644 ---- a/src/corelib/thread/qthread.h -+++ b/src/corelib/thread/qthread.h -@@ -120,7 +120,7 @@ public: - bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever)); - bool wait(unsigned long time) - { -- if (time == std::numeric_limits::max()) -+ if (time == (std::numeric_limits::max)()) - return wait(QDeadlineTimer(QDeadlineTimer::Forever)); - return wait(QDeadlineTimer(time)); - } diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index fb3eca7c34db81..60a2472544a5c2 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -17,7 +17,6 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch - fix_qthread_max.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) diff --git a/ports/qtbase/qt.conf.in b/ports/qtbase/qt.conf.in index ba5c0ee2d47240..a26802bc371aca 100644 --- a/ports/qtbase/qt.conf.in +++ b/ports/qtbase/qt.conf.in @@ -12,7 +12,7 @@ Data=share/Qt6 Translations=translations/@QT6_DIRECTORY_PREFIX@ Examples=share/examples/@QT6_DIRECTORY_PREFIX@ [Paths] -Prefix=${CURRENT_HOST_INSTALLED_DIR} +Prefix=${CURRENT_INSTALLED_DIR} Headers=include/@QT6_DIRECTORY_PREFIX@ Libraries=@REL_PATH@lib Plugins=@REL_PATH@@QT6_DIRECTORY_PREFIX@plugins @@ -25,7 +25,7 @@ Data=share/Qt6 Translations=translations/@QT6_DIRECTORY_PREFIX@ Examples=share/examples/@QT6_DIRECTORY_PREFIX@ HostPrefix=${CURRENT_HOST_INSTALLED_DIR} -HostData=share/Qt6 +HostData=${CURRENT_INSTALLED_DIR}/share/Qt6 HostBinaries=@REL_PATH@bin HostLibraries=@REL_PATH@lib HostLibraryExecutables=tools/Qt6/bin diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 56b49db0096ee7..262eb9b46e3abe 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version-semver": "6.2.0", - "port-version": 2, + "version-semver": "6.2.1", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 710907fd98307e..ba4875fa046163 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index b68ddc6401b9b8..0c2763ae3834cb 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 8af8688face9db..0c5bc2fd0d50e8 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index f274834acac69e..b6acb274fd3bf6 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 7a8e82c7af17ec..c8fe1ff3014690 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index c29a93d6512de7..2832c14acd269d 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index f5796058ee0f67..d50ef714aadae1 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index e853751968a91c..c375ccb84bda7e 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Location", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 06a3c1fe876bae..1488f0144868c6 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index db5afd4eaaa4a7..24a9ec196d648c 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtmultimedia/3c74340.diff b/ports/qtmultimedia/3c74340.diff deleted file mode 100644 index 05935f6237a7df..00000000000000 --- a/ports/qtmultimedia/3c74340.diff +++ /dev/null @@ -1,128 +0,0 @@ -From 3c7434025c5e14c2b3027a13ce90aab49712156c Mon Sep 17 00:00:00 2001 -From: André de la Rocha -Date: Wed, 06 Oct 2021 02:45:14 +0200 -Subject: [PATCH] Fix function declarations - -Adding missing QT_WIN_CALLBACK / QT_FASTCALL - -Pick-to: 6.2 -Change-Id: I5ba5a6341a988f162b9562c9fd328b9d90c6e1ab -Reviewed-by: Lars Knoll ---- - -diff --git a/src/multimedia/platform/windows/qwindowsmediadevices.cpp b/src/multimedia/platform/windows/qwindowsmediadevices.cpp -index 067c2bb..a525569 100644 ---- a/src/multimedia/platform/windows/qwindowsmediadevices.cpp -+++ b/src/multimedia/platform/windows/qwindowsmediadevices.cpp -@@ -190,7 +190,7 @@ - } - }; - --LRESULT deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -+LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) - { - if (message == WM_DEVICECHANGE) { - auto b = (PDEV_BROADCAST_HDR)lParam; -diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h -index 29e214d..0dc06a4 100644 ---- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h -+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h -@@ -65,7 +65,7 @@ - class QWindowsEngine; - class CMMNotificationClient; - --LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); -+LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); - - class QWindowsMediaDevices : public QPlatformMediaDevices - { -@@ -88,7 +88,7 @@ - HDEVNOTIFY m_videoDeviceNotification; - - friend CMMNotificationClient; -- friend LRESULT deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); -+ friend LRESULT QT_WIN_CALLBACK deviceNotificationWndProc(HWND, UINT, WPARAM, LPARAM); - }; - - QT_END_NAMESPACE -diff --git a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp -index c17f8a6..cada965 100644 ---- a/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp -+++ b/src/multimedia/video/qvideoframeconversionhelper_avx2.cpp -@@ -114,17 +114,17 @@ - convert_to_ARGB32_avx2<0, 1, 2, 3>(frame, output); - } - --void qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_avx2<0, 3, 2, 1>(frame, output); - } - --void qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_avx2<3, 0, 1, 2>(frame, output); - } - --void qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_avx2(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_avx2<3, 2, 1, 0>(frame, output); - } -diff --git a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp -index 8c0092e..68abf04 100644 ---- a/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp -+++ b/src/multimedia/video/qvideoframeconversionhelper_sse2.cpp -@@ -96,22 +96,22 @@ - - } - --void qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_ARGB8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_sse2<0, 1, 2, 3>(frame, output); - } - --void qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_sse2<0, 3, 2, 1>(frame, output); - } - --void qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_sse2<3, 0, 1, 2>(frame, output); - } - --void qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_sse2(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_sse2<3, 2, 1, 0>(frame, output); - } -diff --git a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp -index c1acb9b..a5dfdda 100644 ---- a/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp -+++ b/src/multimedia/video/qvideoframeconversionhelper_ssse3.cpp -@@ -105,17 +105,17 @@ - convert_to_ARGB32_ssse3<0, 1, 2, 3>(frame, output); - } - --void qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_ABGR8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_ssse3<0, 3, 2, 1>(frame, output); - } - --void qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_RGBA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_ssse3<3, 0, 1, 2>(frame, output); - } - --void qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) -+void QT_FASTCALL qt_convert_BGRA8888_to_ARGB32_ssse3(const QVideoFrame &frame, uchar *output) - { - convert_to_ARGB32_ssse3<3, 2, 1, 0>(frame, output); - } diff --git a/ports/qtmultimedia/FindGObject.patch b/ports/qtmultimedia/FindGObject.patch deleted file mode 100644 index d8af8a7b582d5a..00000000000000 --- a/ports/qtmultimedia/FindGObject.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake -index dc207a2..19a8a67 100644 ---- a/cmake/FindGObject.cmake -+++ b/cmake/FindGObject.cmake -@@ -27,13 +27,13 @@ - GLIB2::GLIB2 - ) - else() -- find_path(GGObject_INCLUDE_DIR -+ find_path(GObject_INCLUDE_DIR - NAMES gobject.h - PATH_SUFFIXES glib-2.0/gobject/ - ) - find_library(GObject_LIBRARY NAMES gobject-2.0) - if (GObject_LIBRARY AND GObject_INCLUDE_DIR) -- add_library(GObject::GObject IMPORTED) -+ add_library(GObject::GObject INTERFACE IMPORTED) - target_include_directories(GObject::GObject INTERFACE - ${GObject_INCLUDE_DIR} - ) diff --git a/ports/qtmultimedia/FindGStreamer.patch b/ports/qtmultimedia/FindGStreamer.patch deleted file mode 100644 index f958c4150db863..00000000000000 --- a/ports/qtmultimedia/FindGStreamer.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 375d2c0ccb602df38ef8f49c5b3e0bf09c24bf46 Mon Sep 17 00:00:00 2001 -From: Joerg Bornemann -Date: Mon, 13 Sep 2021 10:50:03 +0200 -Subject: Fix build without pkg-config support - -Fix several issues in cmake/Find* in the code path that's hit when -pkg-config is not used. - -Pick-to: 6.2 -Task-number: QTBUG-96401 -Change-Id: Iac6af560976ba6408d877027ed44a0354d32d2b7 -Reviewed-by: Alexey Edelev -Reviewed-by: Doris Verria ---- - cmake/FindGStreamer.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -(limited to 'cmake/FindGStreamer.cmake') - -diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake -index 0624c1a77..c3becd731 100644 ---- a/cmake/FindGStreamer.cmake -+++ b/cmake/FindGStreamer.cmake -@@ -53,8 +53,8 @@ function(find_gstreamer_component component prefix header library) - endif() - if(GStreamer_${component}_LIBRARY AND GStreamer_${component}_INCLUDE_DIR) - add_library(GStreamer::${component} INTERFACE IMPORTED) -- target_include_directories(GStreamer::${component} INTERFACE GStreamer_${component}_INCLUDE_DIR) -- target_link_libraries(GStreamer::${component} INTERFACE GStreamer_${component}_LIBRARY) -+ target_include_directories(GStreamer::${component} INTERFACE ${GStreamer_${component}_INCLUDE_DIR}) -+ target_link_libraries(GStreamer::${component} INTERFACE ${GStreamer_${component}_LIBRARY}) - endif() - mark_as_advanced(GStreamer_${component}_INCLUDE_DIR GStreamer_${component}_LIBRARY) - endif() --- -cgit v1.2.1 diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 45b1e99b8a1786..feceb63532f108 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -2,12 +2,10 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES fix_windows_header_include.patch - FindGObject.patch - FindGStreamer.patch remove_unistd.patch - 3c74340.diff) + ) -#Maybe TODO: ALSA + PulseAudio? (Missing Ports) +#Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added # qt_find_package(ALSA PROVIDED_TARGETS ALSA::ALSA MODULE_NAME multimedia QMAKE_LIB alsa) # qt_find_package(AVFoundation PROVIDED_TARGETS AVFoundation::AVFoundation MODULE_NAME multimedia QMAKE_LIB avfoundation) @@ -37,6 +35,12 @@ else() list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") endif() +if(VCPKG_TARGET_IS_LINUX) + list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON") +else() + list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON") +endif() + qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} CONFIGURE_OPTIONS_RELEASE diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index ac882b76dd5200..fe4f81bd71a138 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,10 +1,13 @@ { "name": "qtmultimedia", - "version-semver": "6.2.0", - "port-version": 1, + "version-semver": "6.2.1", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "dependencies": [ + { + "name": "alsa", + "platform": "linux" + }, { "name": "qtbase", "default-features": false, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 9ac791bbe44771..f2e57c09338ee4 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 1021c16d60057c..90bb9f9c1dda71 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index c3a396fbdb6ff4..6b9e50596e9fdb 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index 6ec128e6e4700c..5a996169561127 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index e8160b64a80fdb..8f3a1798728fba 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 8e52fe46e51279..6eb9b452d85886 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index 96ddd1ea241141..041a2e15f4ecb9 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index 9d098a20b6be8c..d1752c40145f1c 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index a79bd280efc2f6..f72e900c345642 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 2919d89ae514e0..759742b7009714 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 8b547f8e358ed3..6bded3bf4a1f91 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index 3f965aa52b9e7e..835e7ffce63238 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -77,7 +77,7 @@ endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git - REF 908670c5b68d3bcf4712019a028079b8b2042dd4 + REF 6af5648d1208ed5760d74bd060c74ffa2bcfef6b FETCH_REF master HEAD_REF master ) diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 9a806339d1c191..f59f733cea234e 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qttools", - "version-semver": "6.2.0", - "port-version": 1, + "version-semver": "6.2.1", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 82fcdc97b60c4e..17aea5fee8062d 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 24385931486855..c712e0f673c214 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index b7dcae0e7c1c0b..149505b3d084f7 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "supports": "!windows", diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index ead77bb550c6ed..2d5bb8722ba831 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index a96399dafdfa5f..0f3370cb1635ff 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -73,7 +73,7 @@ endif() vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE URL git://code.qt.io/qt/qtwebengine-chromium.git - REF 202e34476e934633b3c2e4679a53c4b0847364a8 + REF 6b7b3f1bf9f41c3ae7afc359c90c3cc80687f004 ) ##### qt_install_submodule diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 8b72f15de4a9a3..71faea0ffe1e64 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "supports": "!static & !((arm | x86) & windows)", diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 8570fd72d17e68..c2274ce1c13385 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 14c9dbdcaa5f25..aebc8c27e76e86 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version-semver": "6.2.0", + "version-semver": "6.2.1", "description": "Qt Web View", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a7fa3c4bd320b1..11910b3ba27b34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5433,7 +5433,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5613,7 +5613,7 @@ "port-version": 1 }, "qt5compat": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qt6betablock": { @@ -5621,39 +5621,39 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtbase": { - "baseline": "6.2.0", - "port-version": 2 + "baseline": "6.2.1", + "port-version": 0 }, "qtcharts": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtcoap": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtdoc": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtimageformats": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtkeychain": { @@ -5661,31 +5661,31 @@ "port-version": 1 }, "qtlocation": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtlottie": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtmqtt": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.2.0", - "port-version": 1 + "baseline": "6.2.1", + "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtopcua": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtquick3d": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtquickcontrols2": { @@ -5693,67 +5693,67 @@ "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtscxml": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtsensors": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtserialbus": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtserialport": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtshadertools": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtsvg": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qttools": { - "baseline": "6.2.0", - "port-version": 1 + "baseline": "6.2.1", + "port-version": 0 }, "qttranslations": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtwayland": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtwebengine": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "qtwebview": { - "baseline": "6.2.0", + "baseline": "6.2.1", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 6e24a71f316696..222b019eb75560 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21c442fd3e940a2ee9a83377da9a8e902539b51b", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "420d2198ead04223b9c2901f9c1078b6f956cf44", "version-semver": "6.2.0", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 59b8e7099bfaf5..4127070ebeef79 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aab367de0f2bfab12d47c09e3a5baf3a04be6d1b", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "374ed713fb29fa32bc126a93372be23a0fc85ff3", "version-semver": "6.2.0", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 2244cc69ca7b56..c2a537cd25cd34 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9b4f9c648d93abf2dc5547a0c966f268809eeb58", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "c7d57c70efabceaca7d833b441ad986c4eebb09b", "version-semver": "6.2.0", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index c7b1a0fa7f8ac5..db37fe275f92d8 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85405a7d213571f8da152112d436292099c5a4ab", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "e7c78fd7fe6600eb96712f151670efc765bf5c31", "version-semver": "6.2.0", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 41ece7ea8a5cd8..f04891f67050b2 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68535daef3629a70ff0e5a347580f747aa075070", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "e9849e3eaccce1a69b18aab5c6bd84e952960b3a", "version-semver": "6.2.0", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index f8026bf46d838d..19dc1a4e84139c 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1397bf94a76801daaec069dbbc790dc45957ccaa", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "684cdbc0cd6c1df0f94c3057722649ea22c23d5b", "version-semver": "6.2.0", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index b4d4033df67dad..495095c425c007 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ed1e678661df3b938f67e6d9f8d68e62f8f75b6", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "c646047361feb006e3d5ab1d29412de763c4c505", "version-semver": "6.2.0", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index ce726b2fa3dc28..84326f72687404 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64b4f2709811c4ab542a8534645e0ffdb1ffffe7", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "80e7cb3d96c9ecf079d94b39d06d1eb19fbe6bdc", "version-semver": "6.2.0", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index bdbf33e5bb701a..7c01db2c48c004 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3abe1c5e7e0fee7e89e99635bb1c7b4136854c2e", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "cc859e66bbcb0a45c5476ea8d882ce9c05af1e66", "version-semver": "6.2.0", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 7cadf03ce6de36..d59e821311be94 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2640b87a1d668eeb0021bb55e7957f3d0d507e0", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "1c752aec2e3f90c70b41895bba5165bc86f14f06", "version-semver": "6.2.0", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index bf73643e207bf7..53b64a4d1e8222 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e500b15fc978066e6c781d3d7f54867b31c8a77c", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "524dcbf6d624cf260f30c9c38a9823a089e5795f", "version-semver": "6.2.0", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 4825f43a0b242a..d47c7da968359c 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7aeba7169d9ebb502e2fb276d36eaf0b562cefd7", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "ce4d2a217a74a82545c0ec6f5dcb343bedad3f6a", "version-semver": "6.2.0", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 1e982c7862d325..3cfd7661848c4a 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73dbf3d8520fa5aba164701b37217ec55dbfc16d", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "a1ac4e53ead69723b671e153edd918c818380668", "version-semver": "6.2.0", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index eb924bc06028d8..2d5529578339b1 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "07e0bf2df2183ec6fb51a6f8d11a1ec3fb27a499", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "eca54f4259f492a6898e3108dbb0917eb52ff91f", "version-semver": "6.2.0", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 91d75b2b4dd5c6..1b1b88ae1bb1c6 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5a5554e1e9e997f82d4a90933b6a2edd2d0a2b0", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "e632d54bc7aea99a619c091cd43ea42e16ccefc2", "version-semver": "6.2.0", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 0ab9951f5b0e56..1597acf14c2556 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5aa75624c0e5b7b13380a7c7b6f0a8cc4deec8d8", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "278a506f659c274c02bd9d811510b37f4574fd9c", "version-semver": "6.2.0", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 78734e20b64bd2..bfd34c00c5bdd3 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9e3856e0b345b9b27921eadc6d45115fe70fa26", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "d61483af1def3a289ff148e0389d6d1d11011b13", "version-semver": "6.2.0", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 880c7168756a4c..37d7349628d563 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4431f13552a344e856d7c1486d1cd0b51649b372", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "a916150c6157e85d5d303817cd21e61d59061d73", "version-semver": "6.2.0", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 711cfabb28c230..6641925220d3b6 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8721d7b3901d80a38f30a05a27a9f111356611b5", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "34391c636963d95d64bb987d2edc1f75cbefa322", "version-semver": "6.2.0", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index a00771327cd16e..693022765967aa 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68c5454488b9c71989413817c7be02e3f758b11d", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "ef23f0d4f92edb51f9343655d0e9323395603dd7", "version-semver": "6.2.0", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 698677044087fe..d3d192acfb2a9b 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f614e8155cd17d2720c1d8ad027b6655fbd5a744", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "d174181a7c25a7f71ae1bb4ee31baa3e1c2aae77", "version-semver": "6.2.0", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index e705a9562dc9c6..1976e9a50d83ad 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1aa5854f556f4f448a406daf6fe368a91a5a0b15", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "972ae47281fcab019fe1c4802f207505538177a2", "version-semver": "6.2.0", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 08ba7b76fe7732..d2358241227e37 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce2504f7bda386450268832846376a48529bce73", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "fd16c70a834bf87bd68c99c997beb1765c556e80", "version-semver": "6.2.0", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 9014a17038ef59..2e2d6c06cb3069 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce4ab156356f3dcfe3fabbaf3f447ebbcd83972a", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "a14aaf079ec45dcd20bafaa8634a9474a70902f5", "version-semver": "6.2.0", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index ac8487af3488d0..686e1e19eaaac6 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5831c09c8eaf4936eaef1c9a52079fc4e9ffa0f", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "c6e147b845c4bb60aede54ad9fcd6f6c8daad81b", "version-semver": "6.2.0", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 40eefda368c5e4..e6678ab5b7b7d2 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aa7f5015760b1bc7f653f30b170c1201a437cd86", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "7513170430df20e23c5013792b6c2fed5b82f7ba", "version-semver": "6.2.0", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 8a4d3077287f41..abdb043533e369 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "eb472063be2d7b507cb027c217564f9288b24482", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "7473cbd91e3a1f662866cd695e94ff6a96a9cfb4", "version-semver": "6.2.0", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index eed13d8d895bd1..be4b26011c338a 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9bf7f8aa0d90f72017d2e47f1a5628a93265b824", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "b6d759670e59feae1c8f81cc8e176cdd6f4f0b38", "version-semver": "6.2.0", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index f41540bda94003..c3dfc66c4edcb6 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b26db2df575c2b7a0341c7aaea9b88ee4e017b2", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "19665ad160707c2d22a6a1bc26ff9dc4a31a3304", "version-semver": "6.2.0", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 5ba413c9d7bcf2..04bc447168b401 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5801a51524f383c98f98da3d085cad1ecc338ca6", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "c2cf1a6edea89674bb5bdd2e3d1e9322055da7fd", "version-semver": "6.2.0", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index dcedeb0f7ec1af..295bc65590faa1 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "963ccd119990c7c3ae09e323da25a38b4893df78", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "f1a82a47775e3c354e5b2b6cb5d39aa2317a1e9b", "version-semver": "6.2.0", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index b6f5bf3c8204a0..6d86411f0c3572 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c69c49d9fe8599dd22538d9cef12e09cb29778e", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "47de546e07339c97ba827fa8b5ceba4d7198d561", "version-semver": "6.2.0", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index bc5407ae064f15..912080de8a6622 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c23c3b938eaf83f287a460d95695732a4b784d3", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "929a30289035e2424ecac2ae6c4059ec47820134", "version-semver": "6.2.0", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 1f93e0af0fc26b..fbb56bc088125f 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04d26846445cac21376cf3b80264394fb6a83778", + "version-semver": "6.2.1", + "port-version": 0 + }, { "git-tree": "f2d149cd37a47e54925f0e57aec8cb9816e10473", "version-semver": "6.2.0", From 6fcb86f3946d90d3fad48419fcbe960cdd5c5771 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Thu, 4 Nov 2021 23:32:49 +0100 Subject: [PATCH 1003/1858] [alembic] Update to 1.8.3 (#21041) * Update alembic to 1.8.3, use imath dependency * Update git-tree hash * Various fixes and cleanups * Update git-tree hash * Various fixes * Update git-tree hash * Experimentally enable all platforms * Update git-tree hash * Various improvements * Update git-tree hash * Fix x64 Linux build * Update git-tree hash * Revert "Fix x64 Linux build" This reverts commit 154d51fcca7c413959f9cf78ea021c08399b16e4. * Fix x64 Linux build using patch * Update git-tree hash * Make HDF5 support optional and disabled by default * Update git-tree hash * Fix abcconvert tool * Use alternative method to fix DLL location, also fixes PDB inclusion * Update git-tree hash * Fix supported platforms * Update git-tree hash Co-authored-by: chausner --- ports/alembic/disable-warnings-as-error.patch | 19 ++++ ports/alembic/fix-find-openexr-ilmbase.patch | 50 ----------- ports/alembic/fix-runtime-destination.patch | 31 +++++++ ports/alembic/portfile.cmake | 88 +++++++------------ ports/alembic/vcpkg.json | 26 ++++-- versions/a-/alembic.json | 5 ++ versions/baseline.json | 4 +- 7 files changed, 108 insertions(+), 115 deletions(-) create mode 100644 ports/alembic/disable-warnings-as-error.patch delete mode 100644 ports/alembic/fix-find-openexr-ilmbase.patch create mode 100644 ports/alembic/fix-runtime-destination.patch diff --git a/ports/alembic/disable-warnings-as-error.patch b/ports/alembic/disable-warnings-as-error.patch new file mode 100644 index 00000000000000..48ad94b3036e11 --- /dev/null +++ b/ports/alembic/disable-warnings-as-error.patch @@ -0,0 +1,19 @@ +Workaround for https://github.com/alembic/alembic/issues/309 +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -125,14 +125,6 @@ IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") + ENDIF() + +-# Set some debug vs opt flags +-if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug" AND NOT MSVC) +- add_definitions(-Wall -Werror -Wextra -Wno-unused-parameter -Wno-deprecated) +- if((CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0) OR +- CMAKE_CXX_COMPILER_ID MATCHES "CLANG") +- add_definitions( -Wno-error=implicit-fallthrough) +- endif() +-endif() + + IF (NOT ${WINDOWS}) + SET(EXTERNAL_MATH_LIBS "-lm") diff --git a/ports/alembic/fix-find-openexr-ilmbase.patch b/ports/alembic/fix-find-openexr-ilmbase.patch deleted file mode 100644 index f35f17df35ec4f..00000000000000 --- a/ports/alembic/fix-find-openexr-ilmbase.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/cmake/AlembicIlmBase.cmake b/cmake/AlembicIlmBase.cmake -index cd00d70..0e50512 100644 ---- a/cmake/AlembicIlmBase.cmake -+++ b/cmake/AlembicIlmBase.cmake -@@ -33,11 +33,17 @@ - ## - ##-***************************************************************************** - --FIND_PACKAGE(IlmBase) -+FIND_PACKAGE(OpenEXR) - --IF (ILMBASE_FOUND) -+IF (OPENEXR_FOUND) - SET(ALEMBIC_ILMBASE_FOUND 1 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") - -+ set(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${OpenEXR_INCLUDE_DIRS}/OpenEXR) -+ set(ALEMBIC_ILMBASE_HALF_LIB ${OPENEXR_HALF_LIBRARY}) -+ set(ALEMBIC_ILMBASE_IEX_LIB ${OPENEXR_IEX_LIBRARY}) -+ set(ALEMBIC_ILMBASE_IEXMATH_LIB ${OPENEXR_IEXMATH_LIBRARY} ${OPENEXR_IMATH_LIBRARY}) -+ set(ALEMBIC_ILMBASE_ILMTHREAD_LIB ${OPENEXR_ILMTHREAD_LIBRARY}) -+ set(ALEMBIC_ILMBASE_IMATH_LIB ${OPENEXR_IMATH_LIBRARY}) - SET(ALEMBIC_ILMBASE_LIBS - ${ALEMBIC_ILMBASE_IMATH_LIB} - ${ALEMBIC_ILMBASE_ILMTHREAD_LIB} -@@ -45,9 +59,9 @@ IF (ILMBASE_FOUND) - ${ALEMBIC_ILMBASE_HALF_LIB} - ) - -- if (${ALEMBIC_ILMBASE_IEXMATH_LIB}) -+ if (ALEMBIC_ILMBASE_IEXMATH_LIB) - SET(ALEMBIC_ILMBASE_LIBS ${ALEMBIC_ILMBASE_LIBS} ${ALEMBIC_ILMBASE_IEXMATH_LIB}) -- endif (${ALEMBIC_ILMBASE_IEXMATH_LIB}) -+ endif (ALEMBIC_ILMBASE_IEXMATH_LIB) - - ELSE() - SET(ALEMBIC_ILMBASE_FOUND 0 CACHE STRING "Set to 1 if IlmBase is found, 0 otherwise") -diff --git a/cmake/AlembicOpenEXR.cmake b/cmake/AlembicOpenEXR.cmake -index 0833b32..a9180cd 100644 ---- a/cmake/AlembicOpenEXR.cmake -+++ b/cmake/AlembicOpenEXR.cmake -@@ -38,8 +38,8 @@ - FIND_PACKAGE( OpenEXR ) - - IF( OPENEXR_FOUND ) -- SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS} ) -+ SET( ALEMBIC_OPENEXR_INCLUDE_PATH ${OPENEXR_INCLUDE_PATHS}/OpenEXR ) - SET( ALEMBIC_OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES} ) - # SET( ALEMBIC_OPENEXR_DEFINITIONS ${OPENEXR_DEFINITIONS} ) - - SET( ALEMBIC_OPENEXR_FOUND 1 CACHE STRING "Set to 1 if OpenEXR is found, 0 otherwise" ) diff --git a/ports/alembic/fix-runtime-destination.patch b/ports/alembic/fix-runtime-destination.patch new file mode 100644 index 00000000000000..28a817be20632a --- /dev/null +++ b/ports/alembic/fix-runtime-destination.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -73,7 +73,7 @@ option(DOCS_PATH + + # Set static/dynamic build options + SET(LIB_TYPE STATIC) +-SET(RUNTIME_INSTALL_DIR lib) ++SET(RUNTIME_INSTALL_DIR bin) + SET(LIBRARY_INSTALL_DIR lib) + SET(ARCHIVE_INSTALL_DIR lib) + IF (ALEMBIC_SHARED_LIBS) +diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt +--- a/lib/Alembic/CMakeLists.txt ++++ b/lib/Alembic/CMakeLists.txt +@@ -78,12 +78,11 @@ option(DOCS_PATH + ${ZLIB_LIBRARY} + ) + +-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs") + INSTALL(TARGETS Alembic + EXPORT AlembicTargets +- LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} +- ARCHIVE DESTINATION ${ALEMBIC_LIB_INSTALL_DIR} +- RUNTIME DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}) ++ LIBRARY DESTINATION ${LIBRARY_INSTALL_DIR} ++ ARCHIVE DESTINATION ${ARCHIVE_INSTALL_DIR} ++ RUNTIME DESTINATION ${RUNTIME_INSTALL_DIR}) + + #-****************************************************************************** + # PACKAGE EXPORTS diff --git a/ports/alembic/portfile.cmake b/ports/alembic/portfile.cmake index dd8a3100e5a993..7723a9b34f001a 100644 --- a/ports/alembic/portfile.cmake +++ b/ports/alembic/portfile.cmake @@ -1,80 +1,54 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux") +vcpkg_fail_port_install(ON_TARGET "UWP") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_fail_port_install(ON_ARCH "x86") # see https://github.com/alembic/alembic/issues/372 +endif() vcpkg_buildpath_length_warning(37) -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO alembic/alembic - REF 7e5cf9b896f4299117457f36a7bf47d962cd0ebf # 1.7.16 - SHA512 aeb449890874fa3a89a72245f3e63a3370332d6becdf20bc77bd9c216bbe1e4578018bbe559c06df69db199799d071399f925a91c8fa816e0eec2d2420f091e9 + REF 1.8.3 + SHA512 0049c72d93e66e12d704d27e7ba36cd9c718667f2ce4f7baa1bee1613ed88ba53abea98f457e14f7f2144cb353810a4108d26c7dd1a1543ec2af576272f19036 HEAD_REF master PATCHES - fix-find-openexr-ilmbase.patch + fix-runtime-destination.patch + disable-warnings-as-error.patch ) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindIlmBase.cmake) -file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindOpenEXR.cmake) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ALEMBIC_SHARED_LIBS) -if(NOT VCPKG_TARGET_IS_WINDOWS) - # In debug mode with g++, alembic defines -Werror - # so we need to disable some warnings to avoid build errors - list(APPEND GXX_DEBUG_FLAGS - -DCMAKE_CXX_FLAGS_DEBUG=-Wno-deprecated - -DCMAKE_CXX_FLAGS_DEBUG=-Wno-error=implicit-fallthrough - ) -endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + hdf5 USE_HDF5 +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DUSE_HDF5=ON - OPTIONS_DEBUG - ${GXX_DEBUG_FLAGS} + -DALEMBIC_SHARED_LIBS=${ALEMBIC_SHARED_LIBS} + -DUSE_TESTS=OFF + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Alembic) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Alembic) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -if(VCPKG_TARGET_IS_WINDOWS) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - - file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) - file(REMOVE ${EXE}) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/bin/Alembic.dll) - file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake RELEASE_CONFIG) - string(REPLACE "\${_IMPORT_PREFIX}/lib/Alembic.dll" - "\${_IMPORT_PREFIX}/bin/Alembic.dll" RELEASE_CONFIG "${RELEASE_CONFIG}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-release.cmake "${RELEASE_CONFIG}") - - endif() - - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - - file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${DEBUG_EXE}) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Alembic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/Alembic.dll) - file(READ ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake DEBUG_CONFIG) - string(REPLACE "\${_IMPORT_PREFIX}/debug/lib/Alembic.dll" - "\${_IMPORT_PREFIX}/debug/bin/Alembic.dll" DEBUG_CONFIG "${DEBUG_CONFIG}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/AlembicTargets-debug.cmake "${DEBUG_CONFIG}") - - endif() - -else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +set(TOOLS abcdiff abcecho abcechobounds abcls abcstitcher abctree) +if(USE_HDF5) + list(APPEND TOOLS abcconvert) endif() -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tools( + TOOL_NAMES ${TOOLS} + AUTO_CLEAN +) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/alembic/vcpkg.json b/ports/alembic/vcpkg.json index ca8d213bae4a32..52a28dae10ea40 100644 --- a/ports/alembic/vcpkg.json +++ b/ports/alembic/vcpkg.json @@ -1,12 +1,26 @@ { "name": "alembic", - "version": "1.7.16", - "port-version": 1, + "version": "1.8.3", "description": "Alembic is an open framework for storing and sharing scene data that includes a C++ library, a file format, and client plugins and applications.", "homepage": "https://alembic.io/", - "supports": "windows & !arm & !uwp & !static", + "supports": "!(windows & x86) & !uwp", "dependencies": [ - "hdf5", - "ilmbase" - ] + "imath", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "hdf5": { + "description": "Build with HDF5 support", + "dependencies": [ + "hdf5" + ] + } + } } diff --git a/versions/a-/alembic.json b/versions/a-/alembic.json index 3528cffd29a91e..b2a60245545ed4 100644 --- a/versions/a-/alembic.json +++ b/versions/a-/alembic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cb082c36da272a988b08fe0c4c638ff62cb1ad2", + "version": "1.8.3", + "port-version": 0 + }, { "git-tree": "058a9ce893dbaf6ad6d2743b47a9c633eff3798a", "version": "1.7.16", diff --git a/versions/baseline.json b/versions/baseline.json index 11910b3ba27b34..1a6ef2c4e3d872 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -49,8 +49,8 @@ "port-version": 5 }, "alembic": { - "baseline": "1.7.16", - "port-version": 1 + "baseline": "1.8.3", + "port-version": 0 }, "aliyun-oss-c-sdk": { "baseline": "3.10.0", From 7a18d29e27d1622d08db0415b25a7467afd60476 Mon Sep 17 00:00:00 2001 From: raahilsha-z <52048253+raahilsha-z@users.noreply.github.com> Date: Fri, 5 Nov 2021 03:24:45 -0400 Subject: [PATCH 1004/1858] [pcl] Update to 1.12.0 [rtabmap] Update to 0.20.13 (#18855) * [pcl] Update patches and portfile for PCL 1.12.0.99 * [pcl] Update pcl to 1.12.0.99 * Update rtabmap to 0.20.13, don't build Qt libs when WITH_QT is OFF * [rtabmap] update to 0.20.13 * Use PCL 1.12.0 instead of 1.12.0.99 * [pcl] Use PCL 1.12.0 * Require pcl[vtk] to build rtabmap * Fix rtabmap hash * Go back to ccc8202, where Linux CI was passing, update rtabmap to require pcl[vtk] * test - go back to pcl 1.20.0.99 * That wasn't it - go back to PCL release commit * Go back to pcl 1.12.0 * Remove libpng patch due to updated VTK per https://github.com/microsoft/vcpkg/pull/18855#issuecomment-880989289 * Bump version as per git bot * Fix find dependencies in pcl's dependency * version stuff * version * Replace depreciate functions * version * Add DISABLE_PARALLEL_CONFIGURE to rtabmap * version Co-authored-by: JackBoosY --- ports/pcl/add-gcc-version-check.patch | 18 +++++----- ports/pcl/fix-check-sse.patch | 14 +++++++- .../pcl/fix-cmake_find_library_suffixes.patch | 20 +++++++++++ ports/pcl/fix-find-qhull.patch | 29 ++++++++++----- ports/pcl/fix-link-libpng.patch | 20 ----------- ....patch => fix-numeric-literals-flag.patch} | 16 +++++++-- ports/pcl/pcl_config.patch | 32 +++++++++++------ ports/pcl/pcl_utils.patch | 14 +++++++- ports/pcl/portfile.cmake | 24 ++++++------- ports/pcl/realsense2.patch | 13 ------- ports/pcl/remove-broken-targets.patch | 14 +++++++- ports/pcl/vcpkg.json | 13 +++++-- ports/rtabmap/001_opencv.patch | 36 ------------------- ports/rtabmap/fix-qt.patch | 31 ++++++++++++++++ ports/rtabmap/portfile.cmake | 19 +++++----- ports/rtabmap/vcpkg.json | 18 ++++++++-- versions/baseline.json | 6 ++-- versions/p-/pcl.json | 5 +++ versions/r-/rtabmap.json | 5 +++ 19 files changed, 215 insertions(+), 132 deletions(-) create mode 100644 ports/pcl/fix-cmake_find_library_suffixes.patch delete mode 100644 ports/pcl/fix-link-libpng.patch rename ports/pcl/{boost-1.70.patch => fix-numeric-literals-flag.patch} (53%) delete mode 100644 ports/pcl/realsense2.patch delete mode 100644 ports/rtabmap/001_opencv.patch create mode 100644 ports/rtabmap/fix-qt.patch diff --git a/ports/pcl/add-gcc-version-check.patch b/ports/pcl/add-gcc-version-check.patch index a21b9e4731593e..1a9740faca8326 100644 --- a/ports/pcl/add-gcc-version-check.patch +++ b/ports/pcl/add-gcc-version-check.patch @@ -1,27 +1,27 @@ -From 8a7a883b51e18645974921b1bfe9d3b6ef3c626c Mon Sep 17 00:00:00 2001 -From: Lars Glud -Date: Fri, 19 Mar 2021 22:22:57 +0100 -Subject: [PATCH] Add gcc-version-check +From 116e665df611242ea0575a62478c31ec03e78fcc Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:53:49 -0400 +Subject: [PATCH] add gcc version check --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5aa7f40a..1e346a316 100644 +index 63b38df68..29f79d31b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -304,6 +304,10 @@ if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_FLANN_DY +@@ -311,6 +311,10 @@ if(NOT (${FLANN_LIBRARY_TYPE} MATCHES ${PCL_FLANN_REQUIRED_TYPE}) AND NOT (${PCL + message(FATAL_ERROR "Flann was selected with ${PCL_FLANN_REQUIRED_TYPE} but found as ${FLANN_LIBRARY_TYPE}") endif() - find_package(FLANN 1.7.0 REQUIRED) +if(UNIX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) + set (CMAKE_CXX_STANDARD 17) +endif() + - # libusb-1.0 + # libusb option(WITH_LIBUSB "Build USB RGBD-Camera drivers" TRUE) if(WITH_LIBUSB) -- -2.29.2.windows.2 +2.32.0.windows.1 diff --git a/ports/pcl/fix-check-sse.patch b/ports/pcl/fix-check-sse.patch index 4fd6e676b36a0e..a8bc786678ac0d 100644 --- a/ports/pcl/fix-check-sse.patch +++ b/ports/pcl/fix-check-sse.patch @@ -1,5 +1,14 @@ +From c65e034afb538932f4ff55a93332f875ae43a578 Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:54:33 -0400 +Subject: [PATCH] fix check sse + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index e580b1a..572ea06 100644 +index 29f79d31b..a1d9bb58f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,7 +86,7 @@ endif() @@ -11,3 +20,6 @@ index e580b1a..572ea06 100644 PCL_CHECK_FOR_SSE() endif() +-- +2.32.0.windows.1 + diff --git a/ports/pcl/fix-cmake_find_library_suffixes.patch b/ports/pcl/fix-cmake_find_library_suffixes.patch new file mode 100644 index 00000000000000..b9e5b2572af9c2 --- /dev/null +++ b/ports/pcl/fix-cmake_find_library_suffixes.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/pcl_options.cmake b/cmake/pcl_options.cmake +index 6570d75..1d9b0d8 100644 +--- a/cmake/pcl_options.cmake ++++ b/cmake/pcl_options.cmake +@@ -7,14 +7,13 @@ if(PCL_SHARED_LIBS) + set(PCL_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(PCL_LIB_TYPE "SHARED") + # set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX}) +- if(WIN32) ++ if(0) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_IMPORT_LIBRARY_SUFFIX}) + endif() + else() + set(PCL_LIB_PREFIX ${CMAKE_STATIC_LIBRARY_PREFIX}) + set(PCL_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX}) + set(PCL_LIB_TYPE "STATIC") +- set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) + endif() + mark_as_advanced(PCL_SHARED_LIBS) + diff --git a/ports/pcl/fix-find-qhull.patch b/ports/pcl/fix-find-qhull.patch index 79223eaf39b5f4..00813cdf7c4843 100644 --- a/ports/pcl/fix-find-qhull.patch +++ b/ports/pcl/fix-find-qhull.patch @@ -1,8 +1,18 @@ +From 7e3117fb47f58c7b1fb83e3a062a630b787a43bc Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 16:11:12 -0400 +Subject: [PATCH] fix find qhull + +--- + CMakeLists.txt | 5 +---- + surface/CMakeLists.txt | 9 +++++++-- + 2 files changed, 8 insertions(+), 6 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2c50b8d..c5bdf35 100644 +index a1d9bb58f..7cf86f74b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -354,10 +354,7 @@ if(WITH_QHULL) +@@ -359,10 +359,7 @@ if(WITH_QHULL) if(NOT PCL_SHARED_LIBS OR ((WIN32 AND NOT MINGW) AND NOT PCL_BUILD_WITH_QHULL_DYNAMIC_LINKING_WIN32)) set(QHULL_USE_STATIC ON) endif() @@ -15,7 +25,7 @@ index 2c50b8d..c5bdf35 100644 # Cuda diff --git a/surface/CMakeLists.txt b/surface/CMakeLists.txt -index e5e4231..2fb8a46 100644 +index d8a8566ea..1953c5566 100644 --- a/surface/CMakeLists.txt +++ b/surface/CMakeLists.txt @@ -12,7 +12,7 @@ if(NOT build) @@ -27,10 +37,10 @@ index e5e4231..2fb8a46 100644 set(HULL_INCLUDES "include/pcl/${SUBSYS_NAME}/concave_hull.h" "include/pcl/${SUBSYS_NAME}/convex_hull.h" -@@ -159,7 +159,12 @@ include_directories(SYSTEM - link_directories(${VTK_LIBRARY_DIRS}) - PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${impl_incs} ${VTK_SMOOTHING_INCLUDES} ${POISSON_INCLUDES} ${OPENNURBS_INCLUDES} ${ON_NURBS_INCLUDES}) - target_link_libraries("${LIB_NAME}" pcl_common pcl_search pcl_kdtree pcl_octree ${VTK_LIBRARIES} ${ON_NURBS_LIBRARIES}) +@@ -186,7 +186,12 @@ if(VTK_FOUND) + endif() + endif() + -if(QHULL_FOUND) +if(Qhull_FOUND) + if(QHULL_USE_STATIC) @@ -40,4 +50,7 @@ index e5e4231..2fb8a46 100644 + endif() target_link_libraries("${LIB_NAME}" ${QHULL_LIBRARIES}) endif() - PCL_MAKE_PKGCONFIG(${LIB_NAME} COMPONENT ${SUBSYS_NAME} DESC ${SUBSYS_DESC} PCL_DEPS ${SUBSYS_DEPS}) + +-- +2.32.0.windows.1 + diff --git a/ports/pcl/fix-link-libpng.patch b/ports/pcl/fix-link-libpng.patch deleted file mode 100644 index 2d5ea5f3bd3f98..00000000000000 --- a/ports/pcl/fix-link-libpng.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt -index f234971..86ea242 100644 ---- a/io/CMakeLists.txt -+++ b/io/CMakeLists.txt -@@ -333,12 +333,13 @@ set(LIB_NAME "pcl_${SUBSYS_NAME}") - add_definitions(${VTK_DEFINES}) - PCL_ADD_LIBRARY(${LIB_NAME} COMPONENT ${SUBSYS_NAME} SOURCES ${srcs} ${incs} ${compression_incs} ${impl_incs} ${OPENNI_INCLUDES} ${OPENNI2_INCLUDES}) - target_include_directories(${LIB_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") --link_directories(${VTK_LINK_DIRECTORIES}) --target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES}) - if(PNG_FOUND) - target_link_libraries("${LIB_NAME}" ${PNG_LIBRARIES}) - endif() - -+link_directories(${VTK_LINK_DIRECTORIES}) -+target_link_libraries("${LIB_NAME}" pcl_common pcl_io_ply ${VTK_LIBRARIES}) -+ - if(LIBUSB_1_FOUND) - target_link_libraries("${LIB_NAME}" ${LIBUSB_1_LIBRARIES}) - endif() diff --git a/ports/pcl/boost-1.70.patch b/ports/pcl/fix-numeric-literals-flag.patch similarity index 53% rename from ports/pcl/boost-1.70.patch rename to ports/pcl/fix-numeric-literals-flag.patch index 704b43e1979334..b3db97390e258f 100644 --- a/ports/pcl/boost-1.70.patch +++ b/ports/pcl/fix-numeric-literals-flag.patch @@ -1,8 +1,17 @@ +From 3ea8aa5ded2782cfb10577348fc9f56144c72d7b Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:57:46 -0400 +Subject: [PATCH] fix numeric literals flag + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index b301cf1..789b660 100644 +index 7cf86f74b..e07fd430a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -462,6 +462,9 @@ endif() +@@ -420,6 +420,9 @@ endif() # Boost (required) include("${PCL_SOURCE_DIR}/cmake/pcl_find_boost.cmake") @@ -12,3 +21,6 @@ index b301cf1..789b660 100644 ### ---[ Create the config.h file set(pcl_config_h_in "${CMAKE_CURRENT_SOURCE_DIR}/pcl_config.h.in") +-- +2.32.0.windows.1 + diff --git a/ports/pcl/pcl_config.patch b/ports/pcl/pcl_config.patch index 60bcec8a502efc..96971525a09410 100644 --- a/ports/pcl/pcl_config.patch +++ b/ports/pcl/pcl_config.patch @@ -1,15 +1,25 @@ +From 2f4952e1767ad5b0349a03ee56d676d226102381 Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 15:59:12 -0400 +Subject: [PATCH] pcl_config + +--- + PCLConfig.cmake.in | 12 +++--------- + 1 file changed, 3 insertions(+), 9 deletions(-) + diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index 9f78fcf..0cbe94f 100644 +index a1283a810..4137ed18c 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in -@@ -396,25 +396,16 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR) +@@ -384,6 +384,7 @@ file(TO_CMAKE_PATH "${PCL_DIR}" PCL_DIR) if(WIN32 AND NOT MINGW) # PCLConfig.cmake is installed to PCL_ROOT/cmake get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) + get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH) - else() - # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y - get_filename_component(PCL_ROOT "${CMAKE_CURRENT_LIST_DIR}/../.." ABSOLUTE) + if(EXISTS "${PCL_ROOT}/3rdParty") + set(PCL_ALL_IN_ONE_INSTALLER ON) + endif() +@@ -393,16 +394,9 @@ else() endif() # check whether PCLConfig.cmake is found into a PCL installation or in a build tree @@ -18,9 +28,6 @@ index 9f78fcf..0cbe94f 100644 - # pcl_message("Found a PCL installation") - set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include/pcl-${PCL_VERSION_MAJOR}.${PCL_VERSION_MINOR}") - set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@") -- if(EXISTS "${PCL_ROOT}/3rdParty") -- set(PCL_ALL_IN_ONE_INSTALLER ON) -- endif() -elseif(EXISTS "${PCL_ROOT}/include/pcl/pcl_config.h") - # Found a non-standard (likely ANDROID) PCL installation - # pcl_message("Found a PCL installation") @@ -28,6 +35,9 @@ index 9f78fcf..0cbe94f 100644 set(PCL_CONF_INCLUDE_DIR "${PCL_ROOT}/include") - set(PCL_LIBRARY_DIRS "${PCL_ROOT}/lib") + set(PCL_LIBRARY_DIRS "${PCL_ROOT}/@LIB_INSTALL_DIR@" "${PCL_ROOT}/debug/@LIB_INSTALL_DIR@") - if(EXISTS "${PCL_ROOT}/3rdParty") - set(PCL_ALL_IN_ONE_INSTALLER ON) - endif() + elseif(EXISTS "${PCL_DIR}/include/pcl/pcl_config.h") + # Found PCLConfig.cmake in a build tree of PCL + # pcl_message("PCL found into a build tree.") +-- +2.32.0.windows.1 + diff --git a/ports/pcl/pcl_utils.patch b/ports/pcl/pcl_utils.patch index 21b7593ac2723e..3be0f90fbc99e5 100644 --- a/ports/pcl/pcl_utils.patch +++ b/ports/pcl/pcl_utils.patch @@ -1,5 +1,14 @@ +From 6f4e2fea829b5986863403d6a611c52c5ac8b2a9 Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 16:00:30 -0400 +Subject: [PATCH] pcl_utils + +--- + cmake/pcl_utils.cmake | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + diff --git a/cmake/pcl_utils.cmake b/cmake/pcl_utils.cmake -index d87d02d..7c951bf 100644 +index d87d02da9..7c951bfd5 100644 --- a/cmake/pcl_utils.cmake +++ b/cmake/pcl_utils.cmake @@ -94,21 +94,12 @@ macro(SET_INSTALL_DIRS) @@ -26,3 +35,6 @@ index d87d02d..7c951bf 100644 endmacro() +-- +2.32.0.windows.1 + diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake index 4af4e0ddfcca83..a0d5f4e498a0cd 100644 --- a/ports/pcl/portfile.cmake +++ b/ports/pcl/portfile.cmake @@ -1,19 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PointCloudLibrary/pcl - REF d98313133b014553ab1b1b5b112f9aade837d55c # pcl-1.11.1 - SHA512 4d60f34d4fbf0a4b4caf9cc4391af471ebd260b3bbac106d45e5ff38448894ea4dc82d5320c2e395c537a4414eb13c6a6a0eb6c13e4e1cc1d831d4bf24067966 + REF f36a69a5e89953708990c4669317f989d532cf08 # pcl-1.12.0 + SHA512 dbbd0adbb08949ddef2789e0021b6ca9727be33c7193d0bb135c61def09a42ed6a71333f06b6fad407010ecb4b73c19f087f7520386b92a008e90c254eafe422 HEAD_REF master PATCHES - pcl_utils.patch - pcl_config.patch - boost-1.70.patch - fix-link-libpng.patch - remove-broken-targets.patch - fix-check-sse.patch - realsense2.patch add-gcc-version-check.patch + fix-check-sse.patch fix-find-qhull.patch + fix-numeric-literals-flag.patch + pcl_config.patch + pcl_utils.patch + remove-broken-targets.patch + fix-cmake_find_library_suffixes.patch ) file(REMOVE ${SOURCE_PATH}/cmake/Modules/FindQhull.cmake) @@ -40,9 +39,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vtk WITH_VTK ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS # BUILD -DBUILD_surface_on_nurbs=ON @@ -59,8 +57,8 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/pcl/realsense2.patch b/ports/pcl/realsense2.patch deleted file mode 100644 index cfe2cc41f1b255..00000000000000 --- a/ports/pcl/realsense2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/io/src/real_sense_2_grabber.cpp b/io/src/real_sense_2_grabber.cpp -index d13231e..06d1238 100644 ---- a/io/src/real_sense_2_grabber.cpp -+++ b/io/src/real_sense_2_grabber.cpp -@@ -287,7 +287,7 @@ namespace pcl - cloud->width = sp.width (); - cloud->height = sp.height (); - cloud->is_dense = false; -- cloud->points.resize ( size () ); -+ cloud->points.resize ( points.size () ); - - const auto cloud_vertices_ptr = points.get_vertices (); - const auto cloud_texture_ptr = points.get_texture_coordinates (); diff --git a/ports/pcl/remove-broken-targets.patch b/ports/pcl/remove-broken-targets.patch index b6a583153968ed..826babc28ab6d6 100644 --- a/ports/pcl/remove-broken-targets.patch +++ b/ports/pcl/remove-broken-targets.patch @@ -1,5 +1,14 @@ +From 1b2613e1df507fd868b4971294f9a28183ce2e6c Mon Sep 17 00:00:00 2001 +From: raahilsha-z +Date: Wed, 7 Jul 2021 16:01:03 -0400 +Subject: [PATCH] remove broken targets + +--- + tools/CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) + diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 1911f7b..11566a2 100644 +index 5bfe6e94c..7abf3d746 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -123,15 +123,6 @@ target_link_libraries(pcl_concatenate_points_pcd pcl_common pcl_io) @@ -18,3 +27,6 @@ index 1911f7b..11566a2 100644 PCL_ADD_EXECUTABLE(pcl_fast_bilateral_filter COMPONENT ${SUBSYS_NAME} SOURCES fast_bilateral_filter.cpp) target_link_libraries(pcl_fast_bilateral_filter pcl_common pcl_io pcl_filters) +-- +2.32.0.windows.1 + diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json index 53743da5cff29d..76152d15ecfb46 100644 --- a/ports/pcl/vcpkg.json +++ b/ports/pcl/vcpkg.json @@ -1,7 +1,6 @@ { "name": "pcl", - "version": "1.11.1", - "port-version": 5, + "version": "1.12.0", "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.", "homepage": "https://github.com/PointCloudLibrary/pcl", "supports": "!(arm64 & windows)", @@ -26,7 +25,15 @@ "eigen3", "flann", "libpng", - "qhull" + "qhull", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "cuda": { diff --git a/ports/rtabmap/001_opencv.patch b/ports/rtabmap/001_opencv.patch deleted file mode 100644 index 5d3a9611ed179e..00000000000000 --- a/ports/rtabmap/001_opencv.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1cb24ae36..a5414e26e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -320,6 +320,9 @@ IF(WITH_QT) - ENDIF() - ADD_DEFINITIONS(-DQT_NO_KEYWORDS) # To avoid conflicts with boost signals/foreach and Qt macros - ENDIF(QT4_FOUND OR Qt5_FOUND) -+ELSE() -+ # Unconditionally disable VTK related features since no visualization tools will be built. -+ ADD_DEFINITIONS("-DDISABLE_VTK") - ENDIF(WITH_QT) - - IF(WITH_SUPERPOINT_TORCH) -diff --git a/corelib/src/Features2d.cpp b/corelib/src/Features2d.cpp -index e4048eefb..862cdc68f 100644 ---- a/corelib/src/Features2d.cpp -+++ b/corelib/src/Features2d.cpp -@@ -982,7 +982,7 @@ std::vector SIFT::generateKeypointsImpl(const cv::Mat & image, con - { - UASSERT(!image.empty() && image.channels() == 1 && image.depth() == CV_8U); - std::vector keypoints; --#if defined(RTABMAP_NONFREE) || CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION >= 3) -+#if defined(RTABMAP_NONFREE) && ( CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION >= 3) ) - cv::Mat imgRoi(image, roi); - cv::Mat maskRoi; - if(!mask.empty()) -@@ -1000,7 +1000,7 @@ cv::Mat SIFT::generateDescriptorsImpl(const cv::Mat & image, std::vector 4 || (CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION >= 3) -+#if defined(RTABMAP_NONFREE) && ( CV_MAJOR_VERSION > 4 || (CV_MAJOR_VERSION == 4 && CV_MINOR_VERSION >= 3) ) - _sift->compute(image, keypoints, descriptors); - - if( rootSIFT_ && !descriptors.empty()) diff --git a/ports/rtabmap/fix-qt.patch b/ports/rtabmap/fix-qt.patch new file mode 100644 index 00000000000000..e7baa15dfb3bd8 --- /dev/null +++ b/ports/rtabmap/fix-qt.patch @@ -0,0 +1,31 @@ +From a9f8c032bb7915c075f0fb32a0bbfa633ca3b388 Mon Sep 17 00:00:00 2001 +Date: Wed, 7 Jul 2021 15:13:43 -0400 +Subject: [PATCH] Fix Qt + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5cdae617..fe98199b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -966,13 +966,13 @@ IF(ANDROID) + IF(BUILD_APP) + ADD_SUBDIRECTORY( app ) + ENDIF(BUILD_APP) ++ELSEIF(NOT WITH_QT) ++ MESSAGE(WARNING "the GUI lib and the stand-alone application will not be compiled...") + ELSEIF(Qt5_FOUND OR (QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND)) + ADD_SUBDIRECTORY( guilib ) + IF(BUILD_APP) + ADD_SUBDIRECTORY( app ) + ENDIF(BUILD_APP) +-ELSEIF(WITH_QT) +- MESSAGE(WARNING "Qt not found, the GUI lib and the stand-alone application will not be compiled...") + ENDIF() + + IF(BUILD_TOOLS) +-- +2.32.0.windows.1 + diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index e51690c4ec80e6..548f5e3bc72b95 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -3,20 +3,21 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO introlab/rtabmap - REF 0a9d237ac2968463d36c4c9b4436871a6c3ea0ca # 0.20.3 - SHA512 47438eb07e4687855e89664479644b93f826da722c3556c30ed4b1a51cecb41494582d3ae3337ff4e0925f6db7ebf74fe29871bf930bb2eb51f5198090ac8554 + REF a921d615c5cb4eb55a8dfc608dae6efde13e9126 + SHA512 7787d5f927f53554cec3044221011cbc78b654c504d96af29947266e25058194923c5463aefde73b93dcfb3930eedf731f6af4d0c311d8f2f0d7be2114393e05 HEAD_REF master - PATCHES - 001_opencv.patch + PATCHES + fix-qt.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools BUILD_TOOLS + FEATURES + tools BUILD_TOOLS ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} -DBUILD_APP=OFF @@ -57,8 +58,8 @@ vcpkg_configure_cmake( -DWITH_FASTCV=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH cmake) vcpkg_copy_tools(TOOL_NAMES rtabmap-res_tool AUTO_CLEAN) diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index ef458fd628101f..d0e2fc7fca2160 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,13 +1,27 @@ { "name": "rtabmap", - "version-string": "0.20.3", + "version-string": "0.20.13", "port-version": 1, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "supports": "windows & !static", "dependencies": [ "opencv", - "pcl", + { + "name": "pcl", + "default-features": false, + "features": [ + "vtk" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 1a6ef2c4e3d872..d541cc7ce47c04 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5113,8 +5113,8 @@ "port-version": 1 }, "pcl": { - "baseline": "1.11.1", - "port-version": 5 + "baseline": "1.12.0", + "port-version": 0 }, "pcre": { "baseline": "8.45", @@ -5989,7 +5989,7 @@ "port-version": 2 }, "rtabmap": { - "baseline": "0.20.3", + "baseline": "0.20.13", "port-version": 1 }, "rtaudio": { diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json index f149a9d52b07df..bd9ea8b055d0fb 100644 --- a/versions/p-/pcl.json +++ b/versions/p-/pcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a65773e049bbdfef835781a6a61ee6a3a94dd27", + "version": "1.12.0", + "port-version": 0 + }, { "git-tree": "32f16f4b317bc068cc45259ca36d23ebd16a3099", "version": "1.11.1", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index 5a4d15b968594e..d9d7bb4fb870ed 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93a792dbedcec5e900509396ebbe4461cde51320", + "version-string": "0.20.13", + "port-version": 1 + }, { "git-tree": "07422ec8ed79148e476dbb807db950ed78852ca0", "version-string": "0.20.3", From 4ae1839df1ab0728e15ea2648be7fc5f015b0bda Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 5 Nov 2021 20:55:49 +0100 Subject: [PATCH 1005/1858] [libftdi1] no absolute paths (#21199) --- ports/libftdi1/portfile.cmake | 15 +++++++-------- ports/libftdi1/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/l-/libftdi1.json | 5 +++++ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ports/libftdi1/portfile.cmake b/ports/libftdi1/portfile.cmake index 3b3fdaefe4d9e8..ab3bd898349eeb 100644 --- a/ports/libftdi1/portfile.cmake +++ b/ports/libftdi1/portfile.cmake @@ -14,11 +14,10 @@ vcpkg_extract_source_archive_ex( win32.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}/src) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DDOCUMENTATION=OFF @@ -33,11 +32,11 @@ vcpkg_configure_cmake( -DFTDI_EEPROM=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libftdi1 TARGET_PATH share/libftdi1) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libftdi1) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -45,4 +44,4 @@ endif() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libftdi1/vcpkg.json b/ports/libftdi1/vcpkg.json index aeedcd1bd329e7..e93cae991b6fd4 100644 --- a/ports/libftdi1/vcpkg.json +++ b/ports/libftdi1/vcpkg.json @@ -1,10 +1,18 @@ { "name": "libftdi1", "version": "1.5", - "port-version": 1, + "port-version": 2, "description": "FTDI USB driver with bitbang mode", "dependencies": [ "libconfuse", - "libusb" + "libusb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index d541cc7ce47c04..f3afce1e4f91fd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3434,7 +3434,7 @@ }, "libftdi1": { "baseline": "1.5", - "port-version": 1 + "port-version": 2 }, "libgcrypt": { "baseline": "1.9.4", diff --git a/versions/l-/libftdi1.json b/versions/l-/libftdi1.json index 49bf2665d48d63..46c1a0bb5427e8 100644 --- a/versions/l-/libftdi1.json +++ b/versions/l-/libftdi1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "412a93e6eef636e36b23774f3d132fe4df89d979", + "version": "1.5", + "port-version": 2 + }, { "git-tree": "5e6c7ec4555f72017a8e1982492aa8fc3cabcd83", "version": "1.5", From f8417562a909b6347e28c44efd4d5f4b3586eb03 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 5 Nov 2021 20:56:10 +0100 Subject: [PATCH 1006/1858] [pcre2] fetch from github (#21193) * [pcre2] fetch from github * version --- ports/pcre2/portfile.cmake | 32 +++++++------------------------- ports/pcre2/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/pcre2.json | 5 +++++ 4 files changed, 14 insertions(+), 26 deletions(-) diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index 060fd67b00750c..69f2cfe8408905 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -1,33 +1,15 @@ set(PCRE2_VERSION 10.37) set(EXPECTED_SHA f91760a8e0747f52211612fb0e134d685e224d16bd884eb574718d077a586b1fd7b6435d4e3b75c879b12e02b252467ecc28cdc4bc2903c783dacab089f99c99) -set(PATCHES +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO PhilipHazel/pcre2 + REF pcre2-${PCRE2_VERSION} + SHA512 ${EXPECTED_SHA} + HEAD_REF master + PATCHES pcre2-10.35_fix-uwp.patch ) -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.pcre.org/pub/pcre/pcre2-${PCRE2_VERSION}.zip" - FILENAME "pcre2-${PCRE2_VERSION}.zip" - SHA512 ${EXPECTED_SHA} - SILENT_EXIT -) - -if (EXISTS "${ARCHIVE}") - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES ${PATCHES} - ) -else() - vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO pcre/pcre2 - REF ${PCRE2_VERSION} - FILENAME "pcre2-${PCRE2_VERSION}.zip" - SHA512 ${EXPECTED_SHA} - PATCHES ${PATCHES} - ) -endif() - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") set(JIT OFF) else() diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index 80d87e8feeaa58..f402cc0de3b2fc 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,6 +1,7 @@ { "name": "pcre2", "version-string": "10.37", + "port-version": 1, "description": "PCRE2 is a re-working of the original Perl Compatible Regular Expressions library", "homepage": "https://pcre.org/" } diff --git a/versions/baseline.json b/versions/baseline.json index f3afce1e4f91fd..ca1b290b9f4fb1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5122,7 +5122,7 @@ }, "pcre2": { "baseline": "10.37", - "port-version": 0 + "port-version": 1 }, "pdal": { "baseline": "1.7.1", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index 318f0838ee1288..1c68dcd8e32c34 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f467ee4e8312b3536d9b7af3a181630c9956db5d", + "version-string": "10.37", + "port-version": 1 + }, { "git-tree": "9f61b1640aff6d4d306d30338bbd360c223301b0", "version-string": "10.37", From f8c2a4e960c1491e7846e048db97fc85dc65f658 Mon Sep 17 00:00:00 2001 From: jmanjon <67091862+juandemanjon@users.noreply.github.com> Date: Fri, 5 Nov 2021 13:00:50 -0700 Subject: [PATCH 1007/1858] [opentelemetry-cpp] Add missing features #21124 (#21149) * [opentelemetry-cpp] Add missing features #21124 * add port-version * update version * [opentelemetry-cpp] Add missing features #21124 Add dependencies to OTLP feature * Update version database * fix version issue * update version Co-authored-by: Juande Manjon Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/opentelemetry-cpp/portfile.cmake | 16 ++++++++++++++++ ports/opentelemetry-cpp/vcpkg.json | 11 +++++++++++ versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index a388951a1b5c31..ff17db6aec0f48 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -23,8 +23,24 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS prometheus WITH_PROMETHEUS elasticsearch WITH_ELASTICSEARCH jaeger WITH_JAEGER + otlp WITH_OTLP + zpages WITH_ZPAGES ) +# opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. +if(WITH_OTLP) + set(OTEL_PROTO_VERSION "0.11.0") + vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" + FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" + SHA512 ff6c207fe9cc2b6a344439ab5323b3225cf532358d52caf0afee27d9b4cd89195f6da6b6e383fe94de52f60c772df8b477c1ea943db67a217063c71587b7bb92 + ) + + vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party) + file(REMOVE_RECURSE ${SOURCE_PATH}/third_party/opentelemetry-proto) + file(RENAME ${SOURCE_PATH}/third_party/opentelemetry-proto-${OTEL_PROTO_VERSION} ${SOURCE_PATH}/third_party/opentelemetry-proto) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 784fd6ac6566e3..bbf828464d9b5d 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", "version-semver": "1.0.1", + "port-version": 1, "description": [ "OpenTelemetry is a collection of tools, APIs, and SDKs.", "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." @@ -33,6 +34,13 @@ "thrift" ] }, + "otlp": { + "description": "Whether to include the OpenTelemetry Protocol in the SDK", + "dependencies": [ + "grpc", + "protobuf" + ] + }, "prometheus": { "description": "Whether to include the Prometheus Client in the SDK", "dependencies": [ @@ -41,6 +49,9 @@ }, "zipkin": { "description": "Whether to include the Zipkin exporter in the SDK" + }, + "zpages": { + "description": "Whether to include the Zpages Server in the SDK" } } } diff --git a/versions/baseline.json b/versions/baseline.json index ca1b290b9f4fb1..08adecdf122cb1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4970,7 +4970,7 @@ }, "opentelemetry-cpp": { "baseline": "1.0.1", - "port-version": 0 + "port-version": 1 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index d1b54ce0efc8d4..6b00edcbdda8a1 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "054971acff976718841101e8bad641169cf11a5d", + "version-semver": "1.0.1", + "port-version": 1 + }, { "git-tree": "ff4e84e96c81b66be8b52bb00f09f79e692db7c4", "version-semver": "1.0.1", From 2e9658743263a0a2396969a9709ac0b70e65958f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 5 Nov 2021 21:01:06 +0100 Subject: [PATCH 1008/1858] [bcg729] fix cmake config fixup call (#21147) --- ports/bcg729/portfile.cmake | 7 ++++--- ports/bcg729/vcpkg.json | 16 +++++++++++++--- versions/b-/bcg729.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ports/bcg729/portfile.cmake b/ports/bcg729/portfile.cmake index a7be7799b118ac..2dccea634ca35e 100644 --- a/ports/bcg729/portfile.cmake +++ b/ports/bcg729/portfile.cmake @@ -9,15 +9,16 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DENABLE_STATIC=${ENABLE_STATIC} -DENABLE_SHARED=${ENABLE_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(PACKAGE_NAME Bcg729) file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bcg729/vcpkg.json b/ports/bcg729/vcpkg.json index c9a88a49bca0d0..3f47ddac1b7696 100644 --- a/ports/bcg729/vcpkg.json +++ b/ports/bcg729/vcpkg.json @@ -1,7 +1,17 @@ { "name": "bcg729", - "version-string": "1.1.1", - "port-version": 1, + "version": "1.1.1", + "port-version": 2, "description": "Bcg729 is an open source implementation of the ITU G.729 Annex A and B codec.", - "homepage": "https://github.com/BelledonneCommunications/bcg729" + "homepage": "https://github.com/BelledonneCommunications/bcg729", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/bcg729.json b/versions/b-/bcg729.json index 544f247119b529..39cae81b8863a5 100644 --- a/versions/b-/bcg729.json +++ b/versions/b-/bcg729.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d515bbfce335039dc7edaa083d7ab334888f8254", + "version": "1.1.1", + "port-version": 2 + }, { "git-tree": "16cf88e26d0bf3ebd469c722cd4df96c59556fb7", "version-string": "1.1.1", diff --git a/versions/baseline.json b/versions/baseline.json index 08adecdf122cb1..5c7f7bb3ff866e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -394,7 +394,7 @@ }, "bcg729": { "baseline": "1.1.1", - "port-version": 1 + "port-version": 2 }, "bddisasm": { "baseline": "1.34.7", From ab63fc3c86e4201b4db26937577b3942ab4b80c7 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 5 Nov 2021 21:01:35 +0100 Subject: [PATCH 1009/1858] [drogon] Update to 1.7.3 (#21122) * Update drogon to 1.7.3 * Update CI baseline * Fix vcpkg_check_linkage * Update git-tree hash * Add patch to fix ARM64 builds * Update git-tree hash * Set ADD_BIN_TO_PATH * Update git-tree hash Co-authored-by: chausner --- ...uilding-caused-by-FindFilesystem-105.patch | 58 +++++++++++++++++++ ports/drogon/portfile.cmake | 29 +++++----- ports/drogon/resolv.patch | 13 ----- ports/drogon/vcpkg.json | 15 +++-- ports/drogon/vcpkg.patch | 31 ++++++---- versions/baseline.json | 4 +- versions/d-/drogon.json | 5 ++ 7 files changed, 113 insertions(+), 42 deletions(-) create mode 100644 ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch delete mode 100644 ports/drogon/resolv.patch diff --git a/ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch b/ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch new file mode 100644 index 00000000000000..70adbe2ea73a02 --- /dev/null +++ b/ports/drogon/Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch @@ -0,0 +1,58 @@ +From e2eb67478157bbdf5ff91ca5dea2f9435af4488f Mon Sep 17 00:00:00 2001 +From: Martin Chang +Date: Thu, 21 Oct 2021 19:43:53 +0800 +Subject: [PATCH] Fix Drogon not building caused by FindFilesystem (#1056) + +* fix FindFilesystem not using the correct header for printf + +* fix FS not found on Yocto +--- + CMakeLists.txt | 6 +++++- + cmake_modules/FindFilesystem.cmake | 7 ++++++- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b2b8d4..3f929a4 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,11 @@ if(NEED_BOOST_FS) + option(HAS_STD_FILESYSTEM_PATH "use boost::filesystem" OFF) + else() + option(HAS_STD_FILESYSTEM_PATH "use std::filesystem" ON) +- target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem) ++ # HACK: Needed to be compiled on Yocto Linux ++ get_property(CAN_LINK_FS TARGET std::filesystem PROPERTY INTERFACE_LINK_LIBRARIES DEFINED) ++ if ( CAN_LINK_FS ) ++ target_link_libraries(${PROJECT_NAME} PUBLIC std::filesystem) ++ endif() + endif() + + # jsoncpp +diff --git a/cmake_modules/FindFilesystem.cmake b/cmake_modules/FindFilesystem.cmake +index c8d9a57..73dd763 100644 +--- a/cmake_modules/FindFilesystem.cmake ++++ b/cmake_modules/FindFilesystem.cmake +@@ -194,7 +194,7 @@ set(_found FALSE) + if(CXX_FILESYSTEM_HAVE_FS) + # We have some filesystem library available. Do link checks + string(CONFIGURE [[ +- #include ++ #include + #include <@CXX_FILESYSTEM_HEADER@> + + int main() { +@@ -204,6 +204,11 @@ if(CXX_FILESYSTEM_HAVE_FS) + } + ]] code @ONLY) + ++ # HACK: Needed to compile correctly on Yocto Linux ++ if(CMAKE_CXX_COMPILER_ID STREQUAL "GCC" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" ++ OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang") ++ set(CMAKE_REQUIRED_FLAGS ${prev_req_flags} -std=c++17) ++ endif () + # Check a simple filesystem program without any linker flags + _cmcm_check_cxx_source("${code}" CXX_FILESYSTEM_NO_LINK_NEEDED) + +-- +2.33.0 + diff --git a/ports/drogon/portfile.cmake b/ports/drogon/portfile.cmake index 897b79985d897a..fcb2dc25d7ac2e 100644 --- a/ports/drogon/portfile.cmake +++ b/ports/drogon/portfile.cmake @@ -1,14 +1,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO an-tao/drogon - REF v1.7.1 - SHA512 8a7cb8aa87cc48b130a5b47558b3c9e2a0af13cd8b76681e42d14a366dac75c88e389f2e2fe03b4f0f1e0e31971a47eee2bf5df8fcb4b79f8ed00d2a592315b6 + REF v1.7.3 + SHA512 20146bf59898704f3b44778fa46e919d9124ef8a33eb1cfcce7f437507c20920829a0074e1c9e2493a1764b8a36b1a91b03f117fd78e740253b15d2146dca628 HEAD_REF master PATCHES vcpkg.patch - resolv.patch drogon_config.patch static-brotli.patch + Fix-Drogon-not-building-caused-by-FindFilesystem-105.patch ) vcpkg_check_features( @@ -23,38 +23,41 @@ vcpkg_check_features( sqlite3 BUILD_SQLITE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DROGON_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS + -DBUILD_DROGON_SHARED=${BUILD_DROGON_SHARED} -DBUILD_EXAMPLES=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Boost=ON ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + CMAKE_DISABLE_FIND_PACKAGE_Boost ) -vcpkg_install_cmake() +vcpkg_cmake_install(ADD_BIN_TO_PATH) # Fix CMake files -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Drogon) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Drogon) vcpkg_fixup_pkgconfig() # Copy drogon_ctl if("ctl" IN_LIST FEATURES) - message("copying tools") - vcpkg_copy_tools(TOOL_NAMES drogon_ctl - AUTO_CLEAN) + vcpkg_copy_tools(TOOL_NAMES drogon_ctl AUTO_CLEAN) endif() -# # Remove includes in debug +# Remove includes in debug file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Copy pdb files vcpkg_copy_pdbs() diff --git a/ports/drogon/resolv.patch b/ports/drogon/resolv.patch deleted file mode 100644 index 55bf6e50c25575..00000000000000 --- a/ports/drogon/resolv.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt ---- a/drogon_ctl/CMakeLists.txt -+++ b/drogon_ctl/CMakeLists.txt -@@ -39,6 +39,9 @@ - if(WIN32) - target_link_libraries(drogon_ctl PRIVATE ws2_32 Rpcrt4) - endif(WIN32) -+if(APPLE) -+ target_link_libraries(drogon_ctl PRIVATE resolv) -+endif() - message(STATUS "bin:" ${INSTALL_BIN_DIR}) - install(TARGETS drogon_ctl RUNTIME DESTINATION ${INSTALL_BIN_DIR}) - if(WIN32) diff --git a/ports/drogon/vcpkg.json b/ports/drogon/vcpkg.json index 55544ebccda7ff..7130dca81141d5 100644 --- a/ports/drogon/vcpkg.json +++ b/ports/drogon/vcpkg.json @@ -1,7 +1,6 @@ { "name": "drogon", - "version-semver": "1.7.1", - "port-version": 2, + "version-semver": "1.7.3", "description": "A C++14/17 based HTTP web application framework running on Linux/macOS/Unix/Windows", "homepage": "https://github.com/an-tao/drogon", "documentation": "https://drogon.docsforge.com/master/overview/", @@ -14,6 +13,14 @@ "platform": "!windows" }, "trantor", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { @@ -43,7 +50,7 @@ ] }, "orm": { - "description": "Build with Object-relational mapping support." + "description": "Build with object-relational mapping support." }, "postgres": { "description": "Support reading and writing from/to Postgres databases.", @@ -69,7 +76,7 @@ ] }, "sqlite3": { - "description": "Support reading and writing from/to Sqlite databases.", + "description": "Support reading and writing from/to SQLite databases.", "dependencies": [ { "name": "drogon", diff --git a/ports/drogon/vcpkg.patch b/ports/drogon/vcpkg.patch index 8aedabdec1c7fc..489acd938926ab 100644 --- a/ports/drogon/vcpkg.patch +++ b/ports/drogon/vcpkg.patch @@ -1,8 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7465e46..9650a59 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -99,9 +99,9 @@ if (WIN32) +@@ -120,9 +120,9 @@ if (WIN32) PRIVATE $) endif (WIN32) @@ -12,9 +11,9 @@ index 7465e46..9650a59 100755 -target_link_libraries(${PROJECT_NAME} PUBLIC trantor) +target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor) - if (NOT WIN32) - if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") -@@ -205,11 +205,10 @@ endif (NOT WIN32) + if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") + target_link_libraries(${PROJECT_NAME} PRIVATE network) +@@ -316,11 +316,10 @@ endif (NOT WIN32) if (BUILD_POSTGRESQL) # find postgres @@ -27,15 +26,27 @@ index 7465e46..9650a59 100755 + if(PostgreSQL_FOUND) + set(pg_FOUND true) + target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL) - set(DROGON_SOURCES ${DROGON_SOURCES} + set(DROGON_SOURCES + ${DROGON_SOURCES} orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc) - if (LIBPQ_BATCH_MODE) -@@ -228,7 +227,7 @@ if (BUILD_POSTGRESQL) - set(DROGON_SOURCES ${DROGON_SOURCES} - orm_lib/src/postgresql_impl/PgConnection.cc) +@@ -348,7 +348,7 @@ if (BUILD_POSTGRESQL) + ${private_headers} + orm_lib/src/postgresql_impl/PgConnection.h) endif (libpq_supports_batch) - endif (pg_FOUND) + endif (PostgreSQL_FOUND) endif (BUILD_POSTGRESQL) if (BUILD_MYSQL) +diff --git a/drogon_ctl/CMakeLists.txt b/drogon_ctl/CMakeLists.txt +--- a/drogon_ctl/CMakeLists.txt ++++ b/drogon_ctl/CMakeLists.txt +@@ -19,7 +19,7 @@ add_executable(_drogon_ctl + target_link_libraries(_drogon_ctl ${PROJECT_NAME}) + if (WIN32 AND BUILD_DROGON_SHARED) + set(DROGON_FILE $) +- set(TRANTOR_FILE $) ++ set(TRANTOR_FILE $) + add_custom_command(TARGET _drogon_ctl POST_BUILD + COMMAND ${CMAKE_COMMAND} + -DCTL_FILE=${DROGON_FILE} diff --git a/versions/baseline.json b/versions/baseline.json index 5c7f7bb3ff866e..b75b9e376cab0c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1897,8 +1897,8 @@ "port-version": 0 }, "drogon": { - "baseline": "1.7.1", - "port-version": 2 + "baseline": "1.7.3", + "port-version": 0 }, "dtl": { "baseline": "1.19", diff --git a/versions/d-/drogon.json b/versions/d-/drogon.json index 7ca60b5b71bca8..a93a78ef7eb33b 100644 --- a/versions/d-/drogon.json +++ b/versions/d-/drogon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "35877feed401993a073b537fbd89f8b55b5be6d1", + "version-semver": "1.7.3", + "port-version": 0 + }, { "git-tree": "34e8225c88ebbf0713112235dddbe6eae11121fb", "version-semver": "1.7.1", From e73c2401280a8cff24c969d0381c79e7a057ce18 Mon Sep 17 00:00:00 2001 From: Rayan Date: Sat, 6 Nov 2021 04:02:04 +0800 Subject: [PATCH 1010/1858] [dbg-macro] update version of dbg-macro to 2021-08-08 (#21110) * update dbg-macro version * update dbg-macro version --- ports/dbg-macro/portfile.cmake | 4 ++-- ports/dbg-macro/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/d-/dbg-macro.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/dbg-macro/portfile.cmake b/ports/dbg-macro/portfile.cmake index 5c013e9d110280..15fd2aabd7c4e3 100644 --- a/ports/dbg-macro/portfile.cmake +++ b/ports/dbg-macro/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sharkdp/dbg-macro - REF 4409d8428baf700873bcfee42e63bbca6700b97e - SHA512 f9f936707631bee112566a24c92cbf171e54362099df689253ab38d0489400f65c284df81749376f18cb3ebcefea3cc18844554016798c2542ec73dc2afcc931 + REF 4db61805d90cb66d91bcc56c2703591a0127ed11 + SHA512 68afaedce857f6007edbb65527745aa07ab3dd736e65602b4c6da04646730ef4c09d9a239a9bcae1806c5a0bc0f70b5766edf245b2fd5f84d64cc03a5cadc5c8 HEAD_REF master ) diff --git a/ports/dbg-macro/vcpkg.json b/ports/dbg-macro/vcpkg.json index 23cdf24d15fd63..77d5be57ef0162 100644 --- a/ports/dbg-macro/vcpkg.json +++ b/ports/dbg-macro/vcpkg.json @@ -1,7 +1,6 @@ { "name": "dbg-macro", - "version-string": "2019-07-11", - "port-version": 1, + "version-date": "2021-11-02", "description": "A dbg(...) macro for C++", "homepage": "https://github.com/sharkdp/dbg-macro" } diff --git a/versions/baseline.json b/versions/baseline.json index b75b9e376cab0c..4e102e57b13bb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1765,8 +1765,8 @@ "port-version": 0 }, "dbg-macro": { - "baseline": "2019-07-11", - "port-version": 1 + "baseline": "2021-11-02", + "port-version": 0 }, "dbghelp": { "baseline": "0.0", diff --git a/versions/d-/dbg-macro.json b/versions/d-/dbg-macro.json index e17957f05cee1b..9fa5bd8d38d8f4 100644 --- a/versions/d-/dbg-macro.json +++ b/versions/d-/dbg-macro.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69061b0a26aff6be4f73d8f5fb8e028e5460d34b", + "version-date": "2021-11-02", + "port-version": 0 + }, { "git-tree": "662589707f9cc76d56e9298457a07a267f43f8c4", "version-string": "2019-07-11", From 73a1c445d23c740bb048ff9fd49fc226ea8a5924 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 5 Nov 2021 21:02:58 +0100 Subject: [PATCH 1011/1858] [shapelib] fix cmake export path (#21102) --- ports/shapelib/portfile.cmake | 23 ++++++++++++----------- ports/shapelib/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/s-/shapelib.json | 5 +++++ 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/ports/shapelib/portfile.cmake b/ports/shapelib/portfile.cmake index 3aceff84d7a016..b7fe51a1e35226 100644 --- a/ports/shapelib/portfile.cmake +++ b/ports/shapelib/portfile.cmake @@ -14,21 +14,22 @@ vcpkg_extract_source_archive_ex( option-build-test.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +vcpkg_cmake_config_fixup(PACKAGE_NAME shp) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe") if(EXES) - file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/shapelib) + file(COPY ${EXES} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/shapelib") file(REMOVE ${EXES}) endif() @@ -38,12 +39,12 @@ if(DEBUG_EXES) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/shapelib) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/shapelib") vcpkg_copy_pdbs() diff --git a/ports/shapelib/vcpkg.json b/ports/shapelib/vcpkg.json index 1480abd4f745b5..ae310d8c4b8a03 100644 --- a/ports/shapelib/vcpkg.json +++ b/ports/shapelib/vcpkg.json @@ -1,7 +1,17 @@ { "name": "shapelib", "version-string": "1.5.0", - "port-version": 1, + "port-version": 2, "description": "Shapefile C Library is simple C API for reading and writing ESRI Shapefiles", - "homepage": "https://download.osgeo.org/shapelib" + "homepage": "https://download.osgeo.org/shapelib", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 4e102e57b13bb3..4ab84f5e9cc3e2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6186,7 +6186,7 @@ }, "shapelib": { "baseline": "1.5.0", - "port-version": 1 + "port-version": 2 }, "shiva": { "baseline": "1.0", diff --git a/versions/s-/shapelib.json b/versions/s-/shapelib.json index cf6848474e2eab..e874311a9f3c9d 100644 --- a/versions/s-/shapelib.json +++ b/versions/s-/shapelib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d70a93c1899b5607ca1894c66beacec5c1afec9c", + "version-string": "1.5.0", + "port-version": 2 + }, { "git-tree": "e32017b2f39e66b09726e3207e85486a820b9930", "version-string": "1.5.0", From 95443f7a7e3dba3ed278b29a85f11c4d3e555198 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 5 Nov 2021 21:03:13 +0100 Subject: [PATCH 1012/1858] [simage] no absolute path (#21101) --- ports/simage/portfile.cmake | 1 + ports/simage/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/simage.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake index e5415273f950ed..6cf59953b934c8 100644 --- a/ports/simage/portfile.cmake +++ b/ports/simage/portfile.cmake @@ -71,6 +71,7 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/Coin") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/simage/vcpkg.json b/ports/simage/vcpkg.json index 0122ad0f151f21..e01f4629d33962 100644 --- a/ports/simage/vcpkg.json +++ b/ports/simage/vcpkg.json @@ -1,7 +1,7 @@ { "name": "simage", "version-semver": "1.8.1", - "port-version": 2, + "port-version": 3, "description": "Image file format library abstraction layer", "homepage": "https://github.com/coin3d/simage", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 4ab84f5e9cc3e2..fefadf109944d8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6210,7 +6210,7 @@ }, "simage": { "baseline": "1.8.1", - "port-version": 2 + "port-version": 3 }, "simde": { "baseline": "0.7.2", diff --git a/versions/s-/simage.json b/versions/s-/simage.json index 890ad1c331b088..92165a5c2add04 100644 --- a/versions/s-/simage.json +++ b/versions/s-/simage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "97e1edfae380f76bdb4d6e9a94a91bbccd82c3a2", + "version-semver": "1.8.1", + "port-version": 3 + }, { "git-tree": "0020fb767148212015f8839835689e193060c88e", "version-semver": "1.8.1", From 4513c61f724cafd0b90825442dd4d310aa95d1f3 Mon Sep 17 00:00:00 2001 From: Jeff Thomas Date: Fri, 5 Nov 2021 13:03:52 -0700 Subject: [PATCH 1013/1858] [mdspan] Add new port for kokkos/mdspan (#21170) * [mdspan] Add new port for kokkos/mdspan * [mdspan] Update versions files * [mdspan] Use recent stable branch instead of tag for REF * [mdspan] Update versions files * Apply suggestions from code review [mdspan] accept all reviewer's suggested changes Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update ports/mdspan/vcpkg.json [mdspan] Better description * [mdspan] noideadog, re-running: ./vcpkg x-add-version --all --overwrite-version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/mdspan/portfile.cmake | 19 +++++++++++++++++++ ports/mdspan/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/m-/mdspan.json | 9 +++++++++ 4 files changed, 48 insertions(+) create mode 100644 ports/mdspan/portfile.cmake create mode 100644 ports/mdspan/vcpkg.json create mode 100644 versions/m-/mdspan.json diff --git a/ports/mdspan/portfile.cmake b/ports/mdspan/portfile.cmake new file mode 100644 index 00000000000000..af3df0890fd446 --- /dev/null +++ b/ports/mdspan/portfile.cmake @@ -0,0 +1,19 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kokkos/mdspan + REF aced2cebd362a1e15830da030bd16748131d28bd # stable as of 2021-11-03 + SHA512 a1950430be537497fb84c4a8c5e681cacead93512775098f38ea6c1a20b95d0f7110d9d0802fbdcf8ce3c40ade766cc697773f6ea6fcf8c363b3ebee55620f7c + HEAD_REF stable +) + +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}") + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mdspan) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib" "${CURRENT_PACKAGES_DIR}/debug") + +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mdspan/vcpkg.json b/ports/mdspan/vcpkg.json new file mode 100644 index 00000000000000..8bfe7b88d40e6d --- /dev/null +++ b/ports/mdspan/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "mdspan", + "version-date": "2021-11-03", + "description": "A non-owning multi-dimensional array reference type.", + "homepage": "https://github.com/kokkos/mdspan", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index fefadf109944d8..ad6184ae633e0f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4272,6 +4272,10 @@ "baseline": "878.270.2", "port-version": 0 }, + "mdspan": { + "baseline": "2021-11-03", + "port-version": 0 + }, "mecab": { "baseline": "2019-09-25", "port-version": 2 diff --git a/versions/m-/mdspan.json b/versions/m-/mdspan.json new file mode 100644 index 00000000000000..3eb709742de2cf --- /dev/null +++ b/versions/m-/mdspan.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "3e312b5c0220a832b0deebd7478f044481ebe79c", + "version-date": "2021-11-03", + "port-version": 0 + } + ] +} From 8458ed247c90b583434862db23d63f4d0ce9f046 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 5 Nov 2021 22:23:33 +0100 Subject: [PATCH 1014/1858] [vcpkg_download_distfile] allow uppercase SHA512 (#21157) --- scripts/cmake/vcpkg_download_distfile.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 08a039c0518903..3e0ae4dbbe224c 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -69,7 +69,8 @@ function(z_vcpkg_download_distfile_test_hash file_path kind error_advice sha512 endif() file(SHA512 "${file_path}" file_hash) - if(NOT "${file_hash}" STREQUAL "${sha512}") + string(TOLOWER "${sha512}" sha512_lower) + if(NOT "${file_hash}" STREQUAL "${sha512_lower}") message(FATAL_ERROR "\nFile does not have expected hash:\n" " File path: [ ${file_path} ]\n" From 5496b4cd35c25bbca9585a3ff8e709c43018a694 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Nov 2021 14:23:52 -0700 Subject: [PATCH 1015/1858] [rsm-binary-io] Update to 2.0.4 (#21064) * update to 2.0.4 * update versioning --- ports/rsm-binary-io/portfile.cmake | 4 ++-- ports/rsm-binary-io/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/rsm-binary-io.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/rsm-binary-io/portfile.cmake b/ports/rsm-binary-io/portfile.cmake index a8210e426796e3..28c00b72e610db 100644 --- a/ports/rsm-binary-io/portfile.cmake +++ b/ports/rsm-binary-io/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/binary_io - REF 2.0.2 - SHA512 4b7e725d9143d37481b4a7e4e101c88c3b73628dd2882fa23ef10a602f8a6ca79de111138237d4dd6fc09d1df863b91a949782961f5623fcac1e324b2e301121 + REF 2.0.4 + SHA512 a2025be9db79e2d89ab28fdda98cfe88ae6a7f0f0a7e3b6d9f99a1bf8a7b4d89e8a34db21a9bdf11784c7f01fb27a6b083c8af81743919e04efb0736c151bb7e HEAD_REF main ) diff --git a/ports/rsm-binary-io/vcpkg.json b/ports/rsm-binary-io/vcpkg.json index 3d76fc8d32c5c7..c353ba650f4b13 100644 --- a/ports/rsm-binary-io/vcpkg.json +++ b/ports/rsm-binary-io/vcpkg.json @@ -1,6 +1,6 @@ { "name": "rsm-binary-io", - "version-semver": "2.0.2", + "version-semver": "2.0.4", "description": "A binary i/o library for C++, without the agonizing pain", "homepage": "https://github.com/Ryan-rsm-McKenzie/binary_io", "documentation": "https://ryan-rsm-mckenzie.github.io/binary_io/", diff --git a/versions/baseline.json b/versions/baseline.json index ad6184ae633e0f..ef0a4d2eade3f0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5977,7 +5977,7 @@ "port-version": 0 }, "rsm-binary-io": { - "baseline": "2.0.2", + "baseline": "2.0.4", "port-version": 0 }, "rsm-bsa": { diff --git a/versions/r-/rsm-binary-io.json b/versions/r-/rsm-binary-io.json index e0798008027a0a..168955fe12c314 100644 --- a/versions/r-/rsm-binary-io.json +++ b/versions/r-/rsm-binary-io.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36b0aaf84f89c1ba6e63fe0da7ab72b6c1ccf535", + "version-semver": "2.0.4", + "port-version": 0 + }, { "git-tree": "33782ecb57f5016dbaa8b2a2cd3f66cf80437027", "version-semver": "2.0.2", From d3adf6fd284caa23f12339bdcf36462c936b8a05 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Fri, 5 Nov 2021 22:25:12 +0100 Subject: [PATCH 1016/1858] [opencolorio] Update to 2.1.0 (#21040) * Update opencolorio to 2.1.0 * Update CI baseline * Disable UWP builds * Update git-tree hash * Update CI baseline * Update scripts/ci.baseline.txt Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/opencolorio/fix-pystring-name.patch | 13 ------------ ports/opencolorio/portfile.cmake | 26 +++++++---------------- ports/opencolorio/use-find-openexr.patch | 13 ------------ ports/opencolorio/vcpkg.json | 6 +++--- versions/baseline.json | 4 ++-- versions/o-/opencolorio.json | 5 +++++ 6 files changed, 18 insertions(+), 49 deletions(-) delete mode 100644 ports/opencolorio/fix-pystring-name.patch delete mode 100644 ports/opencolorio/use-find-openexr.patch diff --git a/ports/opencolorio/fix-pystring-name.patch b/ports/opencolorio/fix-pystring-name.patch deleted file mode 100644 index 50a4ef5b7d197b..00000000000000 --- a/ports/opencolorio/fix-pystring-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/share/cmake/modules/Findpystring.cmake b/share/cmake/modules/Findpystring.cmake -index a3e396de..4022ddf5 100644 ---- a/share/cmake/modules/Findpystring.cmake -+++ b/share/cmake/modules/Findpystring.cmake -@@ -50,7 +50,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL) - # Find library - find_library(pystring_LIBRARY - NAMES -- ${_pystring_STATIC} pystring -+ ${_pystring_STATIC} pystring libpystring - HINTS - ${_pystring_SEARCH_DIRS} - PATH_SUFFIXES diff --git a/ports/opencolorio/portfile.cmake b/ports/opencolorio/portfile.cmake index 5967543b01bf71..b5dc0fb29a6c55 100644 --- a/ports/opencolorio/portfile.cmake +++ b/ports/opencolorio/portfile.cmake @@ -1,20 +1,11 @@ - -vcpkg_download_distfile(config_patch_path - URLS https://patch-diff.githubusercontent.com/raw/AcademySoftwareFoundation/OpenColorIO/pull/1397.diff - FILENAME AcademySoftwareFoundation-OpenColorIO-b8e18214b.diff - SHA512 34a1afb79521e43138b8a695817a9eaf6c0de8cc1d85b4640967d0ad531287a4beb41660d461067cb67103fb3ee90e11bc50e1426a0d1ae6050f3ca434dd2f3d -) +vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AcademySoftwareFoundation/OpenColorIO - REF 0645fdd6b5279ab94851af0c56919ff9800e0c38 # v2.0.1 - SHA512 51568e21eaf863747f67fbcffa7f42ba32f5892e8295dac6c9deb0f6205f57c231ea34ce028d84915e4be2f2773e362b74eaf057c2e4cf3ad4b60bf13a0b73db + REF v2.1.0 + SHA512 a0f4fb62c768b392ca1129e2046df96d670d785fc057d4103768440b7adb65d8faf5b7d39729060791794e83e6cd4e67821aed9b30f3f04b410c60809cd72267 HEAD_REF master - PATCHES - ${config_patch_path} - fix-pystring-name.patch - use-find-openexr.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -22,7 +13,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS tools OCIO_BUILD_APPS ) - vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -44,12 +34,12 @@ vcpkg_copy_pdbs() # Clean redundant files file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake - ${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/OpenColorIOConfig.cmake" + "${CURRENT_PACKAGES_DIR}/OpenColorIOConfig.cmake" ) -if (OCIO_BUILD_APPS) +if(OCIO_BUILD_APPS) vcpkg_copy_tools( TOOL_NAMES ociowrite ociomakeclf ociochecklut ociocheck ociobakelut AUTO_CLEAN diff --git a/ports/opencolorio/use-find-openexr.patch b/ports/opencolorio/use-find-openexr.patch deleted file mode 100644 index 24f05e5a3fd8cc..00000000000000 --- a/ports/opencolorio/use-find-openexr.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake -index 8d9bfdd7..cce2fde2 100644 ---- a/share/cmake/modules/FindExtPackages.cmake -+++ b/share/cmake/modules/FindExtPackages.cmake -@@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED) - - # Half (OpenEXR/IlmBase) - # https://github.com/openexr/openexr --find_package(Half 2.4.0 REQUIRED) -+find_package(OpenEXR 2.4.0 CONFIG REQUIRED) - - # pystring - # https://github.com/imageworks/pystring diff --git a/ports/opencolorio/vcpkg.json b/ports/opencolorio/vcpkg.json index f7be1eae537d04..7166c48edce125 100644 --- a/ports/opencolorio/vcpkg.json +++ b/ports/opencolorio/vcpkg.json @@ -1,12 +1,12 @@ { "name": "opencolorio", - "version-semver": "2.0.1", - "port-version": 1, + "version-semver": "2.1.0", "description": "OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation. OCIO provides a straightforward and consistent user experience across all supporting applications while allowing for sophisticated back-end configuration options suitable for high-end production usage. OCIO is compatible with the Academy Color Encoding Specification (ACES) and is LUT-format agnostic, supporting many popular formats.", "homepage": "https://opencolorio.org/", + "supports": "!uwp", "dependencies": [ "expat", - "openexr", + "imath", "pystring", { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index ef0a4d2eade3f0..f1ec4afe6ea314 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4865,8 +4865,8 @@ "port-version": 8 }, "opencolorio": { - "baseline": "2.0.1", - "port-version": 1 + "baseline": "2.1.0", + "port-version": 0 }, "opencolorio-tools": { "baseline": "1.1.1", diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index af8a543682291c..36c009a1b21dc2 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9781e9cd638610cdb11ed9968c7c1ccb1d198e79", + "version-semver": "2.1.0", + "port-version": 0 + }, { "git-tree": "1cb605cb4249c89ebab09079982d8f2b4b249716", "version-semver": "2.0.1", From 8834cf12a9f496541858f4eac5b5cf69dbe5b6d7 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Sat, 6 Nov 2021 00:25:34 +0300 Subject: [PATCH 1017/1858] [snappy] Fix hash and switch to vcpkg_cmake_* (#21054) --- ports/snappy/portfile.cmake | 19 +++++++++---------- ports/snappy/vcpkg.json | 13 ++++++++++++- versions/baseline.json | 2 +- versions/s-/snappy.json | 5 +++++ 4 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ports/snappy/portfile.cmake b/ports/snappy/portfile.cmake index 07bef5ee18c0fe..45b8c706db2d64 100644 --- a/ports/snappy/portfile.cmake +++ b/ports/snappy/portfile.cmake @@ -2,22 +2,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/snappy REF 1.1.9 - SHA512 F1F8A90F5F7F23310423574B1D8C9ACB84C66EA620F3999D1060395205E5760883476837ABA02F0AA913AF60819E34C625D8308C18A5D7A9C4E190F35968B024 + SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF - -DCMAKE_DEBUG_POSTFIX=d) + -DCMAKE_DEBUG_POSTFIX=d +) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Snappy) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Snappy) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/snappy) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/snappy/COPYING ${CURRENT_PACKAGES_DIR}/share/snappy/copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/snappy/vcpkg.json b/ports/snappy/vcpkg.json index f67defb6683791..593b023434c80b 100644 --- a/ports/snappy/vcpkg.json +++ b/ports/snappy/vcpkg.json @@ -1,6 +1,17 @@ { "name": "snappy", "version": "1.1.9", + "port-version": 1, "description": "A fast compressor/decompressor.", - "homepage": "https://github.com/google/snappy" + "homepage": "https://github.com/google/snappy", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index f1ec4afe6ea314..d47d18aefbbee5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6270,7 +6270,7 @@ }, "snappy": { "baseline": "1.1.9", - "port-version": 0 + "port-version": 1 }, "sndfile": { "baseline": "0", diff --git a/versions/s-/snappy.json b/versions/s-/snappy.json index e0fac7ee6f15b2..5e6b9bad1909a3 100644 --- a/versions/s-/snappy.json +++ b/versions/s-/snappy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c92c17d378451a07e9cc974fa31893d1cae61b66", + "version": "1.1.9", + "port-version": 1 + }, { "git-tree": "ca2180e16528c28e8afe86ce0d7cf0e8a053f273", "version": "1.1.9", From 532d5c91765a8da8fec79cf0bc9da57eba3b2867 Mon Sep 17 00:00:00 2001 From: Calum Robinson Date: Fri, 5 Nov 2021 21:26:45 +0000 Subject: [PATCH 1018/1858] [libLAS] Remove dependency on all of boost (#21042) --- ports/liblas/vcpkg.json | 8 ++++++-- versions/baseline.json | 2 +- versions/l-/liblas.json | 5 +++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index eb0674a0a940fe..3971b29d4c70a7 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -1,15 +1,19 @@ { "name": "liblas", "version-string": "1.8.1", - "port-version": 7, + "port-version": 8, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", "dependencies": [ - "boost", "boost-detail", "boost-filesystem", + "boost-interprocess", "boost-iostreams", + "boost-lambda", + "boost-multi-index", + "boost-program-options", "boost-system", "boost-thread", + "boost-uuid", "libgeotiff" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index d47d18aefbbee5..daf97b0de147ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3558,7 +3558,7 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 7 + "port-version": 8 }, "liblbfgs": { "baseline": "1.10", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index a230bd0f3d3560..f4b29132b1a95c 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cab66222be9c25d617f6da9160ca930e0cb069dd", + "version-string": "1.8.1", + "port-version": 8 + }, { "git-tree": "508c56fc68703c0cf2b2c7fe99895fa6cfee5c6a", "version-string": "1.8.1", From 1e8b153777dd28c98159e8761c9f3efd024cf87e Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Nov 2021 14:27:35 -0700 Subject: [PATCH 1019/1858] [pybind11] Update to 2.8.1 (#21033) * update to 2.8.1 * update versioning --- ports/pybind11/portfile.cmake | 4 ++-- ports/pybind11/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pybind11.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/pybind11/portfile.cmake b/ports/pybind11/portfile.cmake index d3277509138563..6277348ad84049 100644 --- a/ports/pybind11/portfile.cmake +++ b/ports/pybind11/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO pybind/pybind11 - REF v2.8.0 - SHA512 2f066ab1a3d4a22513625f52b55d7722f953007876e800b4a08d6341b9ae70f73a3b0fd57f76cee443e7b8cf0eecdaafc032a23ddad2b8bca2c8108ac4090a82 + REF v2.8.1 + SHA512 6738b4551a1ca2fdf6676be78216b9056cecf8b4d125f0d1aaae9929614bcbf4a9b233fc3c52b8f9dfd19a9ca1496515e6748c1afd8968b9c52c9a1e8b28da10 HEAD_REF master ) diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json index 89d67f89e9eadc..3c6faa3c719f77 100644 --- a/ports/pybind11/vcpkg.json +++ b/ports/pybind11/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pybind11", - "version-semver": "2.8.0", + "version-semver": "2.8.1", "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code", "homepage": "https://github.com/pybind/pybind11", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index daf97b0de147ee..c6f0a4819321ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5397,7 +5397,7 @@ "port-version": 1 }, "pybind11": { - "baseline": "2.8.0", + "baseline": "2.8.1", "port-version": 0 }, "pystring": { diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json index 55b75d3be8713d..ee5ae11d7d9bb9 100644 --- a/versions/p-/pybind11.json +++ b/versions/p-/pybind11.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "893da2421e31681611515d8416a8f1a3b4496b5e", + "version-semver": "2.8.1", + "port-version": 0 + }, { "git-tree": "b6b211738705fc8bb09ad24e39d6239f8b719aae", "version-semver": "2.8.0", From d8ceece218a3de5bd954536557ebfb79c326552b Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 5 Nov 2021 14:27:59 -0700 Subject: [PATCH 1020/1858] [libwebm] Update to 1.0.0.28 (#21031) * [libwebm] Update to 1.0.0.28 * add crt linkage option Co-authored-by: Cheney-Wang --- ports/libwebm/0001-fix-cmake.patch | 65 ----------------- ports/libwebm/0003-fix-android-ndk-r22.patch | 25 ------- ports/libwebm/Fix-cmake.patch | 76 ++++++++++++++++++++ ports/libwebm/no-samples.patch | 20 ------ ports/libwebm/portfile.cmake | 27 +++---- ports/libwebm/vcpkg.json | 15 +++- versions/baseline.json | 4 +- versions/l-/libwebm.json | 5 ++ 8 files changed, 109 insertions(+), 128 deletions(-) delete mode 100644 ports/libwebm/0001-fix-cmake.patch delete mode 100644 ports/libwebm/0003-fix-android-ndk-r22.patch create mode 100644 ports/libwebm/Fix-cmake.patch delete mode 100644 ports/libwebm/no-samples.patch diff --git a/ports/libwebm/0001-fix-cmake.patch b/ports/libwebm/0001-fix-cmake.patch deleted file mode 100644 index 6cbbe1cc175734..00000000000000 --- a/ports/libwebm/0001-fix-cmake.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 5bd18b68658c2ba66e358341c159b17d9ba18791 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka -Date: Wed, 15 Mar 2017 00:01:24 +0300 -Subject: [PATCH] fix cmake - -- enable shared lib -- add install target -- set _CRT_SECURE_NO_WARNINGS ---- - CMakeLists.txt | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf99829..a7bf021 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,14 +5,21 @@ - ## tree. An additional intellectual property rights grant can be found - ## in the file PATENTS. All contributing project authors may - ## be found in the AUTHORS file in the root of the source tree. --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.4) - project(LIBWEBM) -+ -+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -+ - include("${CMAKE_CURRENT_SOURCE_DIR}/build/msvc_runtime.cmake") - - set(LIBWEBM_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}") - -+if(MSVC) -+ add_definitions(-D_CRT_SECURE_NO_WARNINGS) -+endif() -+ - # Libwebm section. --add_library(webm STATIC -+add_library(webm - "${LIBWEBM_SRC_DIR}/mkvmuxer.cpp" - "${LIBWEBM_SRC_DIR}/mkvmuxer.hpp" - "${LIBWEBM_SRC_DIR}/mkvmuxertypes.hpp" -@@ -62,3 +69,21 @@ add_executable(webm2pes - "${LIBWEBM_SRC_DIR}/webm2pes.cc" - "${LIBWEBM_SRC_DIR}/webm2pes.h") - target_link_libraries(webm2pes LINK_PUBLIC webm) -+ -+install( -+ TARGETS webm -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) -+ -+install( -+ FILES -+ "mkvmuxer.hpp" -+ "mkvmuxertypes.hpp" -+ "mkvmuxerutil.hpp" -+ "mkvparser.hpp" -+ "mkvreader.hpp" -+ "mkvwriter.hpp" -+ "webmids.hpp" -+ DESTINATION -+ "include/libwebm") --- -2.11.0.windows.1 - diff --git a/ports/libwebm/0003-fix-android-ndk-r22.patch b/ports/libwebm/0003-fix-android-ndk-r22.patch deleted file mode 100644 index b08168ade00bc8..00000000000000 --- a/ports/libwebm/0003-fix-android-ndk-r22.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/mkvmuxerutil.cpp b/mkvmuxerutil.cpp -index 27ab15d..8949c85 100644 ---- a/mkvmuxerutil.cpp -+++ b/mkvmuxerutil.cpp -@@ -10,6 +10,7 @@ - - #ifdef __ANDROID__ - #include -+#include - #endif - - #include -diff --git a/mkvparser.cpp b/mkvparser.cpp -index 4f20148..9cc6971 100644 ---- a/mkvparser.cpp -+++ b/mkvparser.cpp -@@ -4034,7 +4034,7 @@ long SegmentInfo::Parse() { - } - - const double rollover_check = m_duration * m_timecodeScale; -- if (rollover_check > LLONG_MAX) -+ if (rollover_check > static_cast(LLONG_MAX)) - return E_FILE_FORMAT_INVALID; - - if (pos != stop) diff --git a/ports/libwebm/Fix-cmake.patch b/ports/libwebm/Fix-cmake.patch new file mode 100644 index 00000000000000..a188c81ae0efb2 --- /dev/null +++ b/ports/libwebm/Fix-cmake.patch @@ -0,0 +1,76 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a83d23b..0f5ede3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,8 @@ + cmake_minimum_required(VERSION 3.2) + project(LIBWEBM CXX) + ++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) ++ + include(GNUInstallDirs) + include("${CMAKE_CURRENT_SOURCE_DIR}/build/cxx_flags.cmake") + +@@ -330,6 +332,30 @@ add_library(webm ${libwebm_common_sources} + $ + $) + ++install( ++ TARGETS webm ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib ++) ++ ++install( ++ FILES ++ mkvmuxer/mkvmuxer.h ++ mkvmuxer/mkvmuxertypes.h ++ mkvmuxer/mkvmuxerutil.h ++ mkvmuxer/mkvwriter.h ++ mkvparser/mkvparser.h ++ mkvparser/mkvreader.h ++ webvtt/vttreader.h ++ webvtt/webvttparser.h ++ common/file_util.h ++ common/hdr_util.h ++ common/webmids.h ++ DESTINATION ++ "include/libwebm/" ++) ++ + if (WIN32) + # Use libwebm and libwebm.lib for project and library name on Windows (instead + # webm and webm.lib). +@@ -337,18 +363,22 @@ if (WIN32) + set_target_properties(webm PROPERTIES PREFIX lib) + endif () + +-add_executable(mkvparser_sample ${mkvparser_sample_sources}) +-target_link_libraries(mkvparser_sample LINK_PUBLIC webm) ++if (ENABLE_SAMPLES) ++ add_executable(mkvparser_sample ${mkvparser_sample_sources}) ++ target_link_libraries(mkvparser_sample LINK_PUBLIC webm) + +-add_executable(mkvmuxer_sample ${mkvmuxer_sample_sources} +- $) +-target_link_libraries(mkvmuxer_sample LINK_PUBLIC webm) ++ add_executable(mkvmuxer_sample ${mkvmuxer_sample_sources} ++ $) ++ target_link_libraries(mkvmuxer_sample LINK_PUBLIC webm) ++endif() + +-add_executable(dumpvtt ${dumpvtt_sources} $) +-target_link_libraries(dumpvtt LINK_PUBLIC webm) ++if (ENABLE_TOOLS) ++ add_executable(dumpvtt ${dumpvtt_sources} $) ++ target_link_libraries(dumpvtt LINK_PUBLIC webm) + +-add_executable(vttdemux ${vttdemux_sources}) +-target_link_libraries(vttdemux LINK_PUBLIC webm) ++ add_executable(vttdemux ${vttdemux_sources}) ++ target_link_libraries(vttdemux LINK_PUBLIC webm) ++endif() + + if (ENABLE_WEBMINFO) + add_executable(webm_info ${webm_info_sources}) diff --git a/ports/libwebm/no-samples.patch b/ports/libwebm/no-samples.patch deleted file mode 100644 index c160726b916d7f..00000000000000 --- a/ports/libwebm/no-samples.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b48868f..f2fe35b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,7 @@ endif(WIN32) - - include_directories("${LIBWEBM_SRC_DIR}") - -+if(BUILD_SAMPLES) - # Sample section. - add_executable(sample - "${LIBWEBM_SRC_DIR}/sample.cpp") -@@ -69,6 +70,7 @@ add_executable(webm2pes - "${LIBWEBM_SRC_DIR}/webm2pes.cc" - "${LIBWEBM_SRC_DIR}/webm2pes.h") - target_link_libraries(webm2pes LINK_PUBLIC webm) -+endif() - - install( - TARGETS webm diff --git a/ports/libwebm/portfile.cmake b/ports/libwebm/portfile.cmake index a461ae0cbea4c9..8b9c4401296fe9 100644 --- a/ports/libwebm/portfile.cmake +++ b/ports/libwebm/portfile.cmake @@ -1,13 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO webmproject/libwebm - REF libwebm-1.0.0.27 - SHA512 15650b8b121b226654a5abed45a3586ddaf785dee8dac7c72df3f3f9aef76af4e561b75a2ef05328af8dfcfde21948b2edb59cd884dad08b8919cab4ee5a8596 + REF 82a1d2330e113a14e545d806eb5419f09374255f #1.0.0.28 + SHA512 7baf6f702f0e4498c9b0affebeba3ff28192c5f3dadfa5a17db2306816b3a9e31ce7a474e4d344ba136e5acf097c32d4ff61ce99861d427cdfb2f20e317d7e15 HEAD_REF master PATCHES - 0001-fix-cmake.patch - no-samples.patch - 0003-fix-android-ndk-r22.patch + Fix-cmake.patch ) if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") @@ -16,17 +14,20 @@ else() set(LIBWEBM_CRT_LINKAGE -DMSVC_RUNTIME=static) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${LIBWEBM_CRT_LINKAGE} - -DCMAKE_DEBUG_POSTFIX=d +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${LIBWEBM_CRT_LINKAGE} + -DENABLE_SAMPLES=OFF + -DENABLE_TOOLS=OFF + -DENABLE_WEBMTS=OFF + -DENABLE_WEBMINFO=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libwebm/vcpkg.json b/ports/libwebm/vcpkg.json index 018ddc0816a47e..9e0714a8c375fb 100644 --- a/ports/libwebm/vcpkg.json +++ b/ports/libwebm/vcpkg.json @@ -1,7 +1,16 @@ { "name": "libwebm", - "version-string": "1.0.0.27", - "port-version": 7, + "version": "1.0.0.28", "description": "WebM File Parser", - "homepage": "https://github.com/webmproject/libwebm" + "homepage": "https://github.com/webmproject/libwebm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index c6f0a4819321ca..2ab21663b6ea24 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4001,8 +4001,8 @@ "port-version": 4 }, "libwebm": { - "baseline": "1.0.0.27", - "port-version": 7 + "baseline": "1.0.0.28", + "port-version": 0 }, "libwebp": { "baseline": "1.2.1", diff --git a/versions/l-/libwebm.json b/versions/l-/libwebm.json index 4a0f067fe134f9..3834ffdda21955 100644 --- a/versions/l-/libwebm.json +++ b/versions/l-/libwebm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06a8f301505eb69082e8654f0c01d724b2e403e0", + "version": "1.0.0.28", + "port-version": 0 + }, { "git-tree": "551e2b3f3b67283a71c20088413de576c9dc55c2", "version-string": "1.0.0.27", From b671afb83c05e2cbd3d4d9e551d3865f33cb4003 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 5 Nov 2021 14:28:17 -0700 Subject: [PATCH 1021/1858] [args] Update to 6.2.7 (#21030) * update version to 6.2.7 * quote paths * support pkgconfig file * add versioning --- ports/args/portfile.cmake | 11 ++++++----- ports/args/vcpkg.json | 2 +- versions/a-/args.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ports/args/portfile.cmake b/ports/args/portfile.cmake index bb1b755069a053..d91ae99fb16ed3 100644 --- a/ports/args/portfile.cmake +++ b/ports/args/portfile.cmake @@ -2,13 +2,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Taywee/args - REF ae22269df734a2b0957a9ab4e37be41f61866dbe - SHA512 fe44bc6b7b81013ce649e3fa33c3d9503747a3c9044b70cf9eaf8ff780f2feabdabc261a33d29042daec19a598e3d60e318d3d415cbffb5fdcd2aabdd2ef39db + REF 6.2.7 + SHA512 a6491b2680979feb2f09e7ffb4f3c939b75057b6b4b90136b6cb72eaf5a462d3079dfb5836744e53bf4946bd575d4449f87129d6e50045732d7fba11c2be57dd HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARGS_BUILD_UNITTESTS=OFF -DARGS_BUILD_EXAMPLE=OFF @@ -16,10 +16,11 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_fixup_pkgconfig() # Put the licence file where vcpkg expects it -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() diff --git a/ports/args/vcpkg.json b/ports/args/vcpkg.json index 6fa75ad63650b1..720c1be9725121 100644 --- a/ports/args/vcpkg.json +++ b/ports/args/vcpkg.json @@ -1,6 +1,6 @@ { "name": "args", - "version-date": "2021-03-14", + "version": "6.2.7", "description": "A simple header-only C++ argument parser library.", "homepage": "https://github.com/Taywee/args", "dependencies": [ diff --git a/versions/a-/args.json b/versions/a-/args.json index 9b5b06eed1d74c..cba126cefeca7c 100644 --- a/versions/a-/args.json +++ b/versions/a-/args.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f102bf551068e71d94c7d1f21295bb9bf29dcdc", + "version": "6.2.7", + "port-version": 0 + }, { "git-tree": "0b99979813c133a681aedcf4753689f023fbb98b", "version-date": "2021-03-14", diff --git a/versions/baseline.json b/versions/baseline.json index 2ab21663b6ea24..5768cc69099dde 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -141,7 +141,7 @@ "port-version": 0 }, "args": { - "baseline": "2021-03-14", + "baseline": "6.2.7", "port-version": 0 }, "argtable2": { From e99de909c3df3a4b8bc2a8308cf2bf58c24c00db Mon Sep 17 00:00:00 2001 From: yemreinci <18687880+yemreinci@users.noreply.github.com> Date: Sat, 6 Nov 2021 00:28:40 +0300 Subject: [PATCH 1022/1858] [hazelcast-cpp-client] update to v5.0.0 (#21005) * update hazelcast-cpp-client to 5.0.0 * run x-add-version --all * fix deprecated functions * run x-add-version --- ports/hazelcast-cpp-client/portfile.cmake | 11 +++++------ ports/hazelcast-cpp-client/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/h-/hazelcast-cpp-client.json | 5 +++++ 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/ports/hazelcast-cpp-client/portfile.cmake b/ports/hazelcast-cpp-client/portfile.cmake index d7f7278b65fa18..09b7b61e3cdb65 100644 --- a/ports/hazelcast-cpp-client/portfile.cmake +++ b/ports/hazelcast-cpp-client/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hazelcast/hazelcast-cpp-client - REF v4.2.0 - SHA512 7dc91968c95930d966c9bf005c0756c3702b9f27d96543bd6beffd20be36f9d9840676be2e9473b68f5cfa420c39c6feef0d7538270c798633aad5d0714df56c + REF v5.0.0 + SHA512 7cf85eadeed212871d2a6c5c0aa9d9640c9c89e126c3e383981ddd4cb222390e4ce8307b554766666b8d7816bd5e0fed4242bc674e20423570726c261c182559 HEAD_REF master ) @@ -13,19 +13,18 @@ vcpkg_check_features( example BUILD_EXAMPLES ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/hazelcast-cpp-client) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hazelcast-cpp-client) # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/hazelcast-cpp-client/vcpkg.json b/ports/hazelcast-cpp-client/vcpkg.json index 42879c11df3cca..6e3e7e7590e479 100644 --- a/ports/hazelcast-cpp-client/vcpkg.json +++ b/ports/hazelcast-cpp-client/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hazelcast-cpp-client", - "version-semver": "4.2.0", + "version-semver": "5.0.0", "description": "C++ client library for Hazelcast in-memory database.", "homepage": "https://github.com/hazelcast/hazelcast-cpp-client", "documentation": "http://hazelcast.github.io/hazelcast-cpp-client/index.html", @@ -14,7 +14,15 @@ "boost-property-tree", "boost-system", "boost-thread", - "boost-uuid" + "boost-uuid", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "example": { diff --git a/versions/baseline.json b/versions/baseline.json index 5768cc69099dde..678e17fab13540 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2641,7 +2641,7 @@ "port-version": 1 }, "hazelcast-cpp-client": { - "baseline": "4.2.0", + "baseline": "5.0.0", "port-version": 0 }, "hdf5": { diff --git a/versions/h-/hazelcast-cpp-client.json b/versions/h-/hazelcast-cpp-client.json index f1795c7bfaf7d0..f89a6c46734e00 100644 --- a/versions/h-/hazelcast-cpp-client.json +++ b/versions/h-/hazelcast-cpp-client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "64ad522f07220b1765e13f37a8ef1a562c039562", + "version-semver": "5.0.0", + "port-version": 0 + }, { "git-tree": "f3b0181d25656c1a524f51a5aca0279faba58318", "version-semver": "4.2.0", From 67a474c333759ae39b72106f9e5a8e640e3d711e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 6 Nov 2021 05:29:32 +0800 Subject: [PATCH 1023/1858] [libevent] Fix 'install failure empty bin/ folder' (#20981) * [libevent] Fix' install failure empty bin/ folder * update version * fixed if condition * updated version database * update version * update port-version * update version * add port version * update version * revert libevent.json * update baseline.json * update baseline.json * update baseline.json * update baseline.json * fix usage * update version * apply review advice * update version Co-authored-by: silverqx --- ports/libevent/fix-usage.patch | 13 +++++++++++++ ports/libevent/portfile.cmake | 32 +++++++++++++++----------------- ports/libevent/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/l-/libevent.json | 5 +++++ 5 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 ports/libevent/fix-usage.patch diff --git a/ports/libevent/fix-usage.patch b/ports/libevent/fix-usage.patch new file mode 100644 index 00000000000000..1609bd1e9907f8 --- /dev/null +++ b/ports/libevent/fix-usage.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 676727f..c83afae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1453,7 +1453,7 @@ endif() + # + + set(EVENT_INSTALL_CMAKE_DIR +- "${CMAKE_INSTALL_PREFIX}/lib/cmake/libevent") ++ "lib/cmake/libevent") + + export(PACKAGE libevent) + diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake index 30af582dbfb9cb..0a6844c9ac16d8 100644 --- a/ports/libevent/portfile.cmake +++ b/ports/libevent/portfile.cmake @@ -8,12 +8,13 @@ vcpkg_from_github( PATCHES fix-file_path.patch fix-LibeventConfig_cmake_in_path.patch + fix-usage.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - openssl EVENT__DISABLE_OPENSSL - thread EVENT__DISABLE_THREAD_SUPPORT + openssl EVENT__DISABLE_OPENSSL + thread EVENT__DISABLE_THREAD_SUPPORT ) if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") @@ -28,9 +29,8 @@ else() set(LIBEVENT_STATIC_RUNTIME OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DEVENT__LIBRARY_TYPE=${LIBEVENT_LIB_TYPE} -DEVENT__MSVC_STATIC_RUNTIME=${LIBEVENT_STATIC_RUNTIME} @@ -40,17 +40,17 @@ vcpkg_configure_cmake( -DEVENT__DISABLE_SAMPLES=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libevent/) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/event_rpcgen.py ${CURRENT_PACKAGES_DIR}/tools/libevent/event_rpcgen.py) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/libevent/") +file(RENAME "${CURRENT_PACKAGES_DIR}/bin/event_rpcgen.py" "${CURRENT_PACKAGES_DIR}/tools/libevent/event_rpcgen.py") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() set(_target_suffix) @@ -63,10 +63,8 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets-${_t "${CURRENT_PACKAGES_DIR}" "${CURRENT_INSTALLED_DIR}" ) - +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() #Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libevent/vcpkg.json b/ports/libevent/vcpkg.json index 2259af3744bc17..52dd90b20b7238 100644 --- a/ports/libevent/vcpkg.json +++ b/ports/libevent/vcpkg.json @@ -1,10 +1,20 @@ { "name": "libevent", - "version-string": "2.1.12", - "port-version": 3, + "version": "2.1.12", + "port-version": 4, "description": "An event notification library", "homepage": "https://github.com/libevent/libevent", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "thread" ], diff --git a/versions/baseline.json b/versions/baseline.json index 678e17fab13540..1030927d9d63cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3394,7 +3394,7 @@ }, "libevent": { "baseline": "2.1.12", - "port-version": 3 + "port-version": 4 }, "libevhtp": { "baseline": "1.2.18", diff --git a/versions/l-/libevent.json b/versions/l-/libevent.json index 46161cb6eb17cd..308325b018202a 100644 --- a/versions/l-/libevent.json +++ b/versions/l-/libevent.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0405b56180d4920314ae69183ed5184a6017f7a9", + "version": "2.1.12", + "port-version": 4 + }, { "git-tree": "f0ac053f302fc802ef35f3349ad4af562a5a806d", "version-string": "2.1.12", From db98626c728d381ce4628ed08f137598022c1449 Mon Sep 17 00:00:00 2001 From: Artem Shubovych Date: Sat, 6 Nov 2021 10:08:58 +1100 Subject: [PATCH 1024/1858] [new port] squirrel (#18681) * [new port] squirrel * Add versions * Fix squirrel portfile according to new standards * Add version to squirrel * Remove all files from /bin directory * Update squirrel version * Could not fix the execs in bin/ directory hence simply enforced dir removal * Update versions * Remove obsolete version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Remove trailing comma * Remove bin files only when not using squirrel as library * Do not remove bin dir when on win32 and dynamic linking because of dlls * Fixing the bin directory cleanup for various platforms * Update versions * Smart remove bin directory for static vs dynamic build; add note on the binaries there * Update version * Define 'interpreter' feature which controls building sq and sq_static binaries * Update version and revision of squirrel to the most recent one * Update versions database * Remove bin/ directory for static build * Update versions database * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update versions * Fix interpreter tool * Update versions * Add patch to optionally build squirrel interpreter * Update versions * [new port] squirrel Add versions Fix squirrel portfile according to new standards Add version to squirrel Remove all files from /bin directory Update squirrel version Could not fix the execs in bin/ directory hence simply enforced dir removal Update versions Remove obsolete version Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Remove trailing comma Remove bin files only when not using squirrel as library Do not remove bin dir when on win32 and dynamic linking because of dlls Fixing the bin directory cleanup for various platforms Update versions Smart remove bin directory for static vs dynamic build; add note on the binaries there Update version Define 'interpreter' feature which controls building sq and sq_static binaries Update version and revision of squirrel to the most recent one Update versions database Remove bin/ directory for static build Update versions database Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Update versions Fix interpreter tool Update versions Add patch to optionally build squirrel interpreter Update versions Conditionally build sq and sq_static Update versions * Change line endings to LF * Update versions * Change line endings to LF * Update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Artem Shubovych --- ports/squirrel/fix_optionally_build_sq.patch | 41 +++++++++++++++ ports/squirrel/portfile.cmake | 53 ++++++++++++++++++++ ports/squirrel/vcpkg.json | 21 ++++++++ versions/baseline.json | 4 ++ versions/s-/squirrel.json | 9 ++++ 5 files changed, 128 insertions(+) create mode 100644 ports/squirrel/fix_optionally_build_sq.patch create mode 100644 ports/squirrel/portfile.cmake create mode 100644 ports/squirrel/vcpkg.json create mode 100644 versions/s-/squirrel.json diff --git a/ports/squirrel/fix_optionally_build_sq.patch b/ports/squirrel/fix_optionally_build_sq.patch new file mode 100644 index 00000000000000..9566ec870e0472 --- /dev/null +++ b/ports/squirrel/fix_optionally_build_sq.patch @@ -0,0 +1,41 @@ + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc35b6f..628c649 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,7 @@ project(squirrel VERSION 3.1 LANGUAGES C CXX) + + option(DISABLE_STATIC "Avoid building/installing static libraries.") + option(LONG_OUTPUT_NAMES "Use longer names for binaries and libraries: squirrel3 (not sq).") ++option(BUILD_SQ "Build sq interpreter.") + + if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release") +@@ -35,15 +36,24 @@ endif() + + add_subdirectory(squirrel) + add_subdirectory(sqstdlib) +-add_subdirectory(sq) ++ ++if(BUILD_SQ) ++ add_subdirectory(sq) ++endif() + + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(tgts) + if(NOT DISABLE_DYNAMIC) +- list(APPEND tgts squirrel sqstdlib sq) ++ list(APPEND tgts squirrel sqstdlib) ++ if(BUILD_SQ) ++ list(APPEND tgts sq) ++ endif() + endif() + if(NOT DISABLE_STATIC) +- list(APPEND tgts squirrel_static sqstdlib_static sq_static) ++ list(APPEND tgts squirrel_static sqstdlib_static) ++ if(BUILD_SQ) ++ list(APPEND tgts sq_static) ++ endif() + endif() + foreach(t ${tgts}) + target_compile_definitions(${t} PUBLIC -D_SQ64) diff --git a/ports/squirrel/portfile.cmake b/ports/squirrel/portfile.cmake new file mode 100644 index 00000000000000..d344afc4f14fc2 --- /dev/null +++ b/ports/squirrel/portfile.cmake @@ -0,0 +1,53 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO albertodemichelis/squirrel + HEAD_REF master + REF 23a0620658714b996d20da3d4dd1a0dcf9b0bd98 + SHA512 205ba0b2b37ca2133f8c1b3024a3a34186697998714140d409006ae0f5facc76b2664dbbad33bbc51c86199e2524bd0cd905b8941e306db892a50a58f1b96371 + PATCHES fix_optionally_build_sq.patch +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_DYNAMIC) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "interpreter" BUILD_SQ +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_DYNAMIC=${DISABLE_DYNAMIC} + -DDISABLE_STATIC=${DISABLE_STATIC} + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/squirrel) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(BUILD_SQ) + if(BUILD_STATIC) + message(STATUS "Copying sq tool") + vcpkg_copy_tools( + TOOL_NAMES sq + AUTO_CLEAN + ) + elseif(BUILD_DYNAMIC) + message(STATUS "Copying sq and sq_static tool") + vcpkg_copy_tools( + TOOL_NAMES sq sq_static + AUTO_CLEAN + ) + endif() +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/squirrel/vcpkg.json b/ports/squirrel/vcpkg.json new file mode 100644 index 00000000000000..bdf5fb56e86363 --- /dev/null +++ b/ports/squirrel/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "squirrel", + "version-date": "2021-09-17", + "description": "Squirrel is a high level imperative, object-oriented programming language, designed to be a light-weight scripting language that fits in the size, memory bandwidth, and real-time requirements of applications like video games.", + "homepage": "http://www.squirrel-lang.org", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "interpreter": { + "description": "Build sq command-line interpreter" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 1030927d9d63cf..e598e01a2621cc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6456,6 +6456,10 @@ "baseline": "0.30", "port-version": 1 }, + "squirrel": { + "baseline": "2021-09-17", + "port-version": 0 + }, "sratom": { "baseline": "0.6.4", "port-version": 0 diff --git a/versions/s-/squirrel.json b/versions/s-/squirrel.json new file mode 100644 index 00000000000000..6e1a227c24c2f4 --- /dev/null +++ b/versions/s-/squirrel.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a78b663e75b8e4c6e81a9110e3ddacd55a43f0ad", + "version-date": "2021-09-17", + "port-version": 0 + } + ] +} From ef884d275c054404a94fc4f0856cbe4f672a36f0 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 6 Nov 2021 07:09:43 +0800 Subject: [PATCH 1025/1858] [getdns/flint/arb] Update to the latest version (#20050) * [getdns/flint] Update to the latest version * [getdns/flint] Update to the latest version * [flint] Add unsupported on uwp * Update version files * [flint] Handle dllimport macro in header files * [arb] Update to 2.21.0 * [arb] Update to 2.2.1 and use upstream CMakeLists.txt * [arb] App patch * Update versions/a-/arb.json --- ports/arb/CMakeLists.txt | 87 ------------------- ports/arb/fix-build-error.patch | 14 ++++ ports/arb/portfile.cmake | 21 ++--- ports/arb/vcpkg.json | 13 ++- ports/flint/dll_flint.patch | 76 ----------------- ports/flint/fix-cmakelists.patch | 26 ++++++ ports/flint/lib_flint.patch | 40 --------- ports/flint/portfile.cmake | 110 +++++-------------------- ports/flint/vcpkg.json | 15 +++- ports/getdns/ignore_copying.patch | 12 --- ports/getdns/install_dlls.patch | 24 ------ ports/getdns/openssl_depend_libs.patch | 13 --- ports/getdns/portfile.cmake | 30 +++---- ports/getdns/vcpkg.json | 11 ++- scripts/ci.baseline.txt | 2 - versions/a-/arb.json | 5 ++ versions/baseline.json | 12 +-- versions/f-/flint.json | 5 ++ versions/g-/getdns.json | 5 ++ 19 files changed, 136 insertions(+), 385 deletions(-) delete mode 100644 ports/arb/CMakeLists.txt create mode 100644 ports/arb/fix-build-error.patch delete mode 100644 ports/flint/dll_flint.patch create mode 100644 ports/flint/fix-cmakelists.patch delete mode 100644 ports/flint/lib_flint.patch delete mode 100644 ports/getdns/ignore_copying.patch delete mode 100644 ports/getdns/install_dlls.patch delete mode 100644 ports/getdns/openssl_depend_libs.patch diff --git a/ports/arb/CMakeLists.txt b/ports/arb/CMakeLists.txt deleted file mode 100644 index 300c2003b0d3af..00000000000000 --- a/ports/arb/CMakeLists.txt +++ /dev/null @@ -1,87 +0,0 @@ -cmake_minimum_required(VERSION 2.8.12) - -project(arb C) - -set (DEPS mpir mpfr pthreads flint2 gettimeofday) -set (mpir_lib gmp mpir) -set (mpfr_lib mpfr) -set (pthreads_lib pthreads pthread pthreadVC2 pthreadVC3) -set (flint2_lib ${LIBRARY_TYPE}_flint flint) -set (gettimeofday_lib gettimeofday) - -set (mpir_header gmp.h) -set (mpfr_header mpfr.h) -set (pthreads_header pthread.h) -set (flint2_header flint/flint.h) -set (gettimeofday_header gettimeofday.h) - -foreach (LIB ${DEPS}) - string (TOUPPER ${LIB} LIB_UPPER) - find_library(${LIB_UPPER}_LIBRARY NAMES ${${LIB}_lib}) - if (NOT ${LIB_UPPER}_LIBRARY) - message(FATAL_ERROR "${LIB} library not found.") - endif() - add_library(${LIB} UNKNOWN IMPORTED) - set_property(TARGET ${LIB} PROPERTY IMPORTED_LOCATION ${${LIB_UPPER}_LIBRARY}) - message("${LIB} found in ${${LIB_UPPER}_LIBRARY}") -endforeach () - -foreach (LIB ${DEPS}) - string(TOUPPER ${LIB} HEADER_PKG) - set (HEADER ${${LIB}_header}) - find_path(${HEADER_PKG}_INCLUDE_DIR NAMES ${HEADER}) - if (NOT ${HEADER_PKG}_INCLUDE_DIR) - message(FATAL_ERROR "${HEADER} header not found.") - endif() - message("${HEADER} found in ${${HEADER_PKG}_INCLUDE_DIR}") - set (DEP_INCLUDE_DIRS ${DEP_INCLUDE_DIRS} ${${HEADER_PKG}_INCLUDE_DIR}) -endforeach () - -file(GLOB TEMP "*.h") - -foreach (TEMP_H ${TEMP}) - get_filename_component(FOLDER ${TEMP_H} NAME_WE) - set(FOLDERS ${FOLDERS} ${FOLDER}) -endforeach() - -foreach (FOLDER ${FOLDERS}) - file(GLOB TEMP "${FOLDER}/*.c") - set(SRC ${SRC} ${TEMP}) -endforeach () - -include_directories(BEFORE ${arb_SOURCE_DIR}) -include_directories(BEFORE ${DEP_INCLUDE_DIRS}) - -add_library(arb ${SRC}) - -target_compile_definitions(arb PRIVATE HAVE_TLS=1 FLINT_REENTRANT=0) -target_compile_definitions(arb PRIVATE PTW32_STATIC_LIB) -MESSAGE( STATUS "Building static libraries" ) -target_compile_definitions(arb PRIVATE "ARB_BUILD_DLL") - -target_link_libraries(arb ${DEPS}) - -install(TARGETS arb - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - ) - -foreach (FOLDER ${FOLDERS}) - set(HEADERS ${HEADERS} ${FOLDER}.h) -endforeach () - -install(FILES ${HEADERS} DESTINATION include) - -if (BUILD_TESTS) - enable_testing() - foreach (FOLDER ${FOLDERS}) - file(GLOB TEMP "${FOLDER}/test/*.c") - foreach (TEST_SOURCE ${TEMP}) - get_filename_component(TEST_NAME ${TEST_SOURCE} NAME_WE) - add_executable(${FOLDER}-${TEST_NAME} ${TEST_SOURCE}) - target_link_libraries(${FOLDER}-${TEST_NAME} arb) - add_test(${FOLDER}-${TEST_NAME} ${FOLDER}-${TEST_NAME}) - endforeach () - endforeach () -endif () diff --git a/ports/arb/fix-build-error.patch b/ports/arb/fix-build-error.patch new file mode 100644 index 00000000000000..fbebf09586fbdd --- /dev/null +++ b/ports/arb/fix-build-error.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d6136a8..9e260eb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -76,7 +76,8 @@ set (pthreads_header pthread.h) + set (flint2_header flint/flint.h) + + if(MSVC) +- set(DEPS ${DEPS} pthreads) ++ find_package(pthreads REQUIRED) ++ set(PTHREADS_LIBRARIES PThreads4W::PThreads4W) + else() + option(CMAKE_THREAD_PREFER_PTHREAD "Prefer pthreads" yes) + option(THREADS_PREFER_PTHREAD_FLAG "Prefer -pthread flag" yes) diff --git a/ports/arb/portfile.cmake b/ports/arb/portfile.cmake index d4a984b3c7fd44..b6c60304b75ffc 100644 --- a/ports/arb/portfile.cmake +++ b/ports/arb/portfile.cmake @@ -3,24 +3,25 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fredrik-johansson/arb - REF ae6009e3e19bd309a2433467d1b2ddb7001cd1eb # 2.18.1 - SHA512 78e149f0d51ef8ab29afbad99fd24e3b59acfc509f626e89bdcd57d4a8478b84c3aa51e92f5e26f8a10a20c66d72d2eed50f0dfbfda4a5f5277988f9bac3fa48 + REF e3a633dcc1adafeb7ca9648669f2b1fa2f433ee1 # 2.21.1 + SHA512 af864ea4f849d12dbaadec8cda7e6b1a7d349b7aa776966ec7f61ad7a5186dc3f280512218bcff28901e2d55d6c976525746e6de13925a9942ed947ac2253af6 HEAD_REF master + PATCHES fix-build-error.patch ) -file(REMOVE ${SOURCE_PATH}/CMakeLists.txt) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_MT) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DMSVC_USE_MT=${MSVC_USE_MT} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Remove duplicate headers -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/arb/vcpkg.json b/ports/arb/vcpkg.json index 142abb7b9bc502..66b04428a7d41b 100644 --- a/ports/arb/vcpkg.json +++ b/ports/arb/vcpkg.json @@ -1,10 +1,17 @@ { "name": "arb", - "version-string": "2.18.1", - "port-version": 1, + "version": "2.21.1", "description": "a C library for arbitrary-precision interval arithmetic", "homepage": "https://github.com/fredrik-johansson/arb", "dependencies": [ - "flint" + "flint", + { + "name": "pthreads", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/flint/dll_flint.patch b/ports/flint/dll_flint.patch deleted file mode 100644 index c8cecb7bf00a5c..00000000000000 --- a/ports/flint/dll_flint.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/build.vc14/dll_flint/dll_flint.vcxproj b/build.vc14/dll_flint/dll_flint.vcxproj -index 3c8edd3..5c861d2 100644 ---- a/build.vc14/dll_flint/dll_flint.vcxproj -+++ b/build.vc14/dll_flint/dll_flint.vcxproj -@@ -81,7 +81,7 @@ - - Full - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) - MultiThreadedDLL - $(TargetDir)$(TargetName).pdb -@@ -90,7 +90,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL -@@ -105,7 +105,7 @@ - - Disabled - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - _DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - $(TargetDir)$(TargetName).pdb -@@ -114,7 +114,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL -@@ -129,7 +129,7 @@ - - Full - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - NDEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) - MultiThreadedDLL - $(TargetDir)$(TargetName).pdb -@@ -138,7 +138,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL -@@ -153,7 +153,7 @@ - - Disabled - true -- ..\;..\..\;..\..\..\mpir\dll\$(IntDir);..\..\..\mpfr\dll\$(IntDir);..\..\..\pthreads\dll\$(IntDir); -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - _DEBUG;WIN32;HAVE_CONFIG_H;MSC_BUILD_DLL;PTW32_BUILD;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - $(TargetDir)$(TargetName).pdb -@@ -162,7 +162,7 @@ - - true - true -- ..\..\..\mpir\dll\$(IntDir)mpir.lib;..\..\..\mpfr\dll\$(IntDir)mpfr.lib;..\..\..\pthreads\dll\$(IntDir)pthreads.lib;%(AdditionalDependencies) -+ @NATIVE_INSTALLED_DIR@\lib\mpir.lib;@NATIVE_INSTALLED_DIR@\lib\mpfr.lib;@NATIVE_INSTALLED_DIR@\lib\pthreadVC3.lib;%(AdditionalDependencies) - - - postbuild $(IntDir) DLL diff --git a/ports/flint/fix-cmakelists.patch b/ports/flint/fix-cmakelists.patch new file mode 100644 index 00000000000000..0111a0dd30c7a0 --- /dev/null +++ b/ports/flint/fix-cmakelists.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2616d06..4be28ac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,10 +34,11 @@ find_package(MPFR REQUIRED) + if (WITH_NTL) + find_package(NTL REQUIRED) + endif() +-find_package(PythonInterp REQUIRED) + ++if(WITH_CBLAS) + find_package(CBLAS) + set(FLINT_USES_BLAS ${CBLAS_FOUND}) ++endif() + + if(CMAKE_BUILD_TYPE STREQUAL Debug) + set(FLINT_WANT_ASSERT ON) +@@ -47,6 +48,8 @@ endif() + + if(MSVC) + find_package(PThreads REQUIRED) ++ set(PThreads_LIBRARIES ${PThreads4W_LIBRARY}) ++ set(PThreads_INCLUDE_DIRS ${PThreads4W_INCLUDE_DIR}) + set(FLINT_USES_PTHREAD ON CACHE BOOL "Use POSIX Threads.") + else() + option(CMAKE_THREAD_PREFER_PTHREAD "Prefer pthreads" yes) diff --git a/ports/flint/lib_flint.patch b/ports/flint/lib_flint.patch deleted file mode 100644 index 3d0a4caea70a1c..00000000000000 --- a/ports/flint/lib_flint.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/build.vc14/lib_flint/lib_flint.vcxproj b/build.vc14/lib_flint/lib_flint.vcxproj -index c6bd44c0..197d7723 100644 ---- a/build.vc14/lib_flint/lib_flint.vcxproj -+++ b/build.vc14/lib_flint/lib_flint.vcxproj -@@ -81,7 +81,7 @@ - - Full - true -- ..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir) -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) - MultiThreaded - $(TargetDir)$(TargetName).pdb -@@ -100,7 +100,7 @@ - - Disabled - true -- ..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir) -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;%(PreprocessorDefinitions) - MultiThreadedDebug - $(TargetDir)$(TargetName).pdb -@@ -119,7 +119,7 @@ - - Full - true -- ..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir) -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) - MultiThreaded - $(TargetDir)$(TargetName).pdb -@@ -138,7 +138,7 @@ - - Disabled - true -- ..\;..\..\;..\..\..\mpir\lib\$(IntDir);..\..\..\mpfr\lib\$(IntDir);..\..\..\pthreads\lib\$(IntDir) -+ ..\;..\..\;@NATIVE_INSTALLED_DIR@\include - _DEBUG;WIN32;_LIB;HAVE_CONFIG_H;PTW32_STATIC_LIB;FLINT_REENTRANT=0;HAVE_TLS=1;_WIN64;%(PreprocessorDefinitions) - MultiThreadedDebug - $(TargetDir)$(TargetName).pdb diff --git a/ports/flint/portfile.cmake b/ports/flint/portfile.cmake index 4852dcbeceb565..1f78e896ae0789 100644 --- a/ports/flint/portfile.cmake +++ b/ports/flint/portfile.cmake @@ -1,5 +1,7 @@ -set(FLINT_VERSION 2.5.2) -set(FLINT_HASH "8606b369af505d5fcedd05d95fcd04afac2a916fc5291501c56785891cfdb2f9bc98700b2d05afd1d9482fb96df2a8c8bf1cd0e5696df46775df9fa743eb900b") +vcpkg_fail_port_install(ON_TARGET "uwp") + +set(FLINT_VERSION 2.8.0) +set(FLINT_HASH "916285d13a55d12a041236195a9d7bbc5c1c3c30c3aa2f169efee6063b800d34f96ad3235f1c77285b04305ce685e5890169c984108d50d0c9ee7a77c3f6e73d") vcpkg_download_distfile(ARCHIVE URLS "http://www.flintlib.org/flint-${FLINT_VERSION}.zip" @@ -7,103 +9,31 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${FLINT_HASH} ) +vcpkg_find_acquire_program(PYTHON3) + vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} PATCHES - lib_flint.patch - dll_flint.patch + fix-cmakelists.patch ) -set(MSVC_VERSION 14) - -file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -get_filename_component(SOURCE_DIR_NAME "${SOURCE_PATH}" NAME) - -# Use fresh copy of sources for building and modification -set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${SOURCE_DIR_NAME}") - -file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR) -configure_file( - "${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj" "${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj" @ONLY -) -configure_file( - "${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj" "${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj" @ONLY +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DPYTHON_EXECUTABLE=${PYTHON3} + -DWITH_NTL=OFF + -DWITH_CBLAS=OFF ) -file(RENAME "${SOURCE_PATH}/fmpz-conversions-gc.in" "${SOURCE_PATH}/fmpz-conversions.h") +vcpkg_cmake_install() -IF (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") - file(RENAME "${SOURCE_PATH}/fft_tuning32.in" "${SOURCE_PATH}/fft_tuning.h") -ELSE() - file(RENAME "${SOURCE_PATH}/fft_tuning64.in" "${SOURCE_PATH}/fft_tuning.h") -ENDIF() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/dll_flint.vcxproj - ) -else() - vcpkg_build_msbuild( - PROJECT_PATH ${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/lib_flint.vcxproj - ) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic" AND VCPKG_TARGET_IS_WINDOWS) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/flint/flint-config.h" + "#elif defined(MSC_USE_DLL)" "#elif 1" + ) endif() -IF (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") - SET(BUILD_ARCH "Win32") -ELSE() - SET(BUILD_ARCH ${VCPKG_TARGET_ARCHITECTURE}) -ENDIF() - -if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - file(GLOB FLINT_HEADERS "${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/*.h") - file(INSTALL - ${FLINT_HEADERS} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/flint - ) - file(INSTALL - ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Release/dll_flint.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin - ) - file(INSTALL - ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Debug/dll_flint.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin - ) - file(INSTALL - ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Release/dll_flint.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - RENAME flint.lib - ) - file(INSTALL - ${SOURCE_PATH}/build.vc${MSVC_VERSION}/dll_flint/${BUILD_ARCH}/Debug/dll_flint.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - RENAME flint.lib - ) - vcpkg_copy_pdbs() -else() - file(GLOB FLINT_HEADERS "${SOURCE_PATH}/lib/${BUILD_ARCH}/Release/*.h") - file(INSTALL - ${FLINT_HEADERS} - DESTINATION ${CURRENT_PACKAGES_DIR}/include/flint - ) - file(INSTALL - ${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/${BUILD_ARCH}/Release/lib_flint.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - RENAME flint.lib - ) - file(INSTALL - ${SOURCE_PATH}/build.vc${MSVC_VERSION}/lib_flint/${BUILD_ARCH}/Debug/lib_flint.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - RENAME flint.lib - ) -endif() - -file(INSTALL - ${SOURCE_PATH}/gpl-2.0.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/flint - RENAME copyright -) - -message(STATUS "Installing done") +file(INSTALL "${SOURCE_PATH}/gpl-2.0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/flint/vcpkg.json b/ports/flint/vcpkg.json index 520dc5a810f38f..533818fe55bbe2 100644 --- a/ports/flint/vcpkg.json +++ b/ports/flint/vcpkg.json @@ -1,13 +1,20 @@ { "name": "flint", - "version-string": "2.5.2", - "port-version": 5, + "version-semver": "2.8.0", "description": "Fast Library for Number Theory", "homepage": "https://www.flintlib.org/", + "supports": "!uwp", "dependencies": [ "gettimeofday", + "gmp", "mpfr", - "mpir", - "pthreads" + { + "name": "pthreads", + "platform": "windows" + }, + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/getdns/ignore_copying.patch b/ports/getdns/ignore_copying.patch deleted file mode 100644 index 87dc5c6d5047cc..00000000000000 --- a/ports/getdns/ignore_copying.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 10d10b99..fda6fa3c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1087,6 +1087,6 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION include) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man) - - set(docdir share/doc/getdns) --install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir}) -+install(FILES AUTHORS ChangeLog LICENSE NEWS README.md DESTINATION ${docdir}) - install(FILES spec/index.html DESTINATION ${docdir}/spec) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION lib/pkgconfig) diff --git a/ports/getdns/install_dlls.patch b/ports/getdns/install_dlls.patch deleted file mode 100644 index 8c3024b2516430..00000000000000 --- a/ports/getdns/install_dlls.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 10d10b99..35761647 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1065,15 +1065,15 @@ if (ENABLE_STATIC) - endif () - endif () - if (ENABLE_SHARED) -- install(TARGETS getdns_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+ install(TARGETS getdns_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) - if (USE_LIBEV) -- install(TARGETS getdns_ex_ev_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+ install(TARGETS getdns_ex_ev_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) - endif () - if (USE_LIBEVENT2) -- install(TARGETS getdns_ex_event_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+ install(TARGETS getdns_ex_event_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) - endif () - if (USE_LIBUV) -- install(TARGETS getdns_ex_uv_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+ install(TARGETS getdns_ex_uv_shared LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) - endif () - endif () - if (BUILD_GETDNS_QUERY) diff --git a/ports/getdns/openssl_depend_libs.patch b/ports/getdns/openssl_depend_libs.patch deleted file mode 100644 index 6969b431966fca..00000000000000 --- a/ports/getdns/openssl_depend_libs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7d22d3ca..7784ab58 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -335,7 +335,7 @@ check_include_file(openssl/rand.h HAVE_OPENSSL_RAND_H) - check_include_file(openssl/conf.h HAVE_OPENSSL_CONF_H) - check_include_file(openssl/engine.h HAVE_OPENSSL_ENGINE_H) - --set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) -+set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES} ${getdns_system_libs}) - check_function_exists(DSA_SIG_set0 HAVE_DSA_SIG_SET0) - check_function_exists(DSA_set0_pqg HAVE_DSA_SET0_PQG) - check_function_exists(DSA_set0_key HAVE_DSA_SET0_KEY) diff --git a/ports/getdns/portfile.cmake b/ports/getdns/portfile.cmake index 3a48f7cf208db3..c1411e621aa08b 100644 --- a/ports/getdns/portfile.cmake +++ b/ports/getdns/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_fail_port_install(ON_TARGET "uwp") -set(GETDNS_VERSION 1.6.0) -set(GETDNS_HASH 4d3a67cd76e7ce53a31c9b92607d7768381a1f916e7950fe4e69368fa585d38dbfc04975630fbe8d8bd14f4bebf83a3516e063b5b54e0922548edc0952ee7b4e) +set(GETDNS_VERSION 1.7.0) +set(GETDNS_HASH d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" GETDNS_ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" GETDNS_ENABLE_SHARED) @@ -16,32 +16,34 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${GETDNS_VERSION} - PATCHES - "openssl_depend_libs.patch" - "ignore_copying.patch" - "install_dlls.patch" ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - libevent BUILD_LIBEVENT2 - libuv BUILD_LIBUV + FEATURES + libevent BUILD_LIBEVENT2 + libuv BUILD_LIBUV ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_GETDNS_QUERY=OFF -DBUILD_GETDNS_SERVER_MON=OFF -DENABLE_STATIC=${GETDNS_ENABLE_STATIC} -DENABLE_SHARED=${GETDNS_ENABLE_SHARED} ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF + -DENABLE_STUB_ONLY=ON #if setting ON, it will require libunbound to build on Unix platform. ) -vcpkg_install_cmake() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_cmake_install() + vcpkg_copy_pdbs() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/ports/getdns/vcpkg.json b/ports/getdns/vcpkg.json index 749af94157850f..9f657dcd104c8a 100644 --- a/ports/getdns/vcpkg.json +++ b/ports/getdns/vcpkg.json @@ -1,13 +1,16 @@ { "name": "getdns", - "version-string": "1.6.0", - "port-version": 2, + "version": "1.7.0", "description": "GetDNS is a modern asynchronous DNS API", "homepage": "https://getdnsapi.net/", - "supports": "!uwp & windows", + "supports": "!uwp", "dependencies": [ "libidn2", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ], "features": { "libevent": { diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 49611c8492d90a..917c7a47307821 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -284,8 +284,6 @@ fdlibm:arm-uwp=fail fdlibm:x64-uwp=fail fftw3:arm-uwp=fail fftw3:x64-uwp=fail -flint:x64-linux=fail -flint:x64-osx=fail fltk:arm-uwp=fail fltk:x64-uwp=fail fluidsynth:x64-osx=fail diff --git a/versions/a-/arb.json b/versions/a-/arb.json index 5e8084c8b37403..d59b40a282688d 100644 --- a/versions/a-/arb.json +++ b/versions/a-/arb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06326497117fb757651649225284d2fe4100ef79", + "version": "2.21.1", + "port-version": 0 + }, { "git-tree": "8ad21afd78955622e44098428fa7b8b7790f82d8", "version-string": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index e598e01a2621cc..0f584f7c206efd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -121,8 +121,8 @@ "port-version": 0 }, "arb": { - "baseline": "2.18.1", - "port-version": 1 + "baseline": "2.21.1", + "port-version": 0 }, "arcus": { "baseline": "4.10.0", @@ -2173,8 +2173,8 @@ "port-version": 2 }, "flint": { - "baseline": "2.5.2", - "port-version": 5 + "baseline": "2.8.0", + "port-version": 0 }, "fltk": { "baseline": "1.3.7", @@ -2389,8 +2389,8 @@ "port-version": 1 }, "getdns": { - "baseline": "1.6.0", - "port-version": 2 + "baseline": "1.7.0", + "port-version": 0 }, "getopt": { "baseline": "0", diff --git a/versions/f-/flint.json b/versions/f-/flint.json index 12e3bc893f6ed9..266b67e6534e45 100644 --- a/versions/f-/flint.json +++ b/versions/f-/flint.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "270de68a6011ec21e64b76b4db6c99e9fd76930a", + "version-semver": "2.8.0", + "port-version": 0 + }, { "git-tree": "aaa3d79bfb36d6c6280ab6aa2226e4edb8913d11", "version-string": "2.5.2", diff --git a/versions/g-/getdns.json b/versions/g-/getdns.json index 91db8f5628bb8a..091ad9b1939a55 100644 --- a/versions/g-/getdns.json +++ b/versions/g-/getdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fd966770afa413f4502ba69f0c2e0a860b08f967", + "version": "1.7.0", + "port-version": 0 + }, { "git-tree": "d6c0d2d8c997256eff5049eb3fa3447a5387d2f9", "version-string": "1.6.0", From fdeb0a16ff409ed125e8e61b0de027a831131843 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 6 Nov 2021 07:12:19 +0800 Subject: [PATCH 1026/1858] [avro-c] Update to 1.11.0 and also support osx (#21036) * [avro-c] Update to 1.11.0 * Fix linux * Update patch * Update patch and support osx * Small changes in patch --- ports/avro-c/avro.patch | 146 +++++++++++++------------------ ports/avro-c/portfile.cmake | 44 ++++++---- ports/avro-c/snappy-pr-793.patch | 56 ------------ ports/avro-c/vcpkg.json | 9 +- versions/a-/avro-c.json | 5 ++ versions/baseline.json | 4 +- 6 files changed, 103 insertions(+), 161 deletions(-) delete mode 100644 ports/avro-c/snappy-pr-793.patch diff --git a/ports/avro-c/avro.patch b/ports/avro-c/avro.patch index 4f8ae13766e461..e916150024db10 100644 --- a/ports/avro-c/avro.patch +++ b/ports/avro-c/avro.patch @@ -1,92 +1,94 @@ diff --git a/lang/c/CMakeLists.txt b/lang/c/CMakeLists.txt -index 11cbf01..620490d 100644 +index aa923e1..9ee7937 100644 --- a/lang/c/CMakeLists.txt +++ b/lang/c/CMakeLists.txt -@@ -149,7 +149,10 @@ else (ZLIB_FOUND) +@@ -22,6 +22,9 @@ enable_testing() + + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}) + ++option(BUILD_EXAMPLES "Build examples." OFF) ++option(BUILD_TESTS "Build tests." OFF) ++option(BUILD_DOCS "Build docs." OFF) + # Eliminates warning about linker paths when linking both zlib and + # liblzma. + cmake_policy(SET CMP0003 NEW) +@@ -149,50 +152,60 @@ else (ZLIB_FOUND) message("Disabled deflate codec. zlib not found.") endif (ZLIB_FOUND) -find_package(Snappy) -+find_library(SNAPPY_LIBRARY_RELEASE NAMES snappy PATH_SUFFIXES lib) -+find_library(SNAPPY_LIBRARY_DEBUG NAMES snappyd PATH_SUFFIXES debug/lib) -+find_path(SNAPPY_INCLUDE_DIR snappy-c.h) -+select_library_configurations(SNAPPY) - if (SNAPPY_FOUND AND ZLIB_FOUND) # Snappy borrows crc32 from zlib +-if (SNAPPY_FOUND AND ZLIB_FOUND) # Snappy borrows crc32 from zlib ++find_package(Snappy CONFIG REQUIRED) ++if (Snappy_FOUND AND ZLIB_FOUND) # Snappy borrows crc32 from zlib set(SNAPPY_PKG libsnappy) add_definitions(-DSNAPPY_CODEC) -@@ -161,32 +164,36 @@ else (SNAPPY_FOUND AND ZLIB_FOUND) ++ set(SNAPPY_LIBRARIES Snappy::snappy) ++ if (UNIX) ++ set(SNAPPY_LIBRARIES ${SNAPPY_LIBRARIES} -lstdc++) ++ endif () + include_directories(${SNAPPY_INCLUDE_DIRS}) + message("Enabled snappy codec") +-else (SNAPPY_FOUND AND ZLIB_FOUND) ++else (Snappy_FOUND AND ZLIB_FOUND) + set(SNAPPY_PKG "") + set(SNAPPY_LIBRARIES "") message("Disabled snappy codec. libsnappy not found or zlib not found.") - endif (SNAPPY_FOUND AND ZLIB_FOUND) +-endif (SNAPPY_FOUND AND ZLIB_FOUND) ++endif (Snappy_FOUND AND ZLIB_FOUND) -find_package(PkgConfig) -pkg_check_modules(LZMA liblzma) -if (LZMA_FOUND) -+find_package(LibLZMA) ++find_package(LibLZMA REQUIRED) +if (LibLZMA_FOUND) -+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -+ set(SNAPPY_LIBRARIES ${SNAPPY_LIBRARIES} -lstdc++) -+ endif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set(LZMA_PKG liblzma) add_definitions(-DLZMA_CODEC) -- include_directories(${LZMA_INCLUDE_DIRS}) -- link_directories(${LZMA_LIBRARY_DIRS}) -+ include_directories(${LibLZMA_INCLUDE_DIRS}) -+ link_directories(${LibLZMA_LIBRARY_DIRS}) ++ set(LZMA_LIBRARIES LibLZMA::LibLZMA) + include_directories(${LZMA_INCLUDE_DIRS}) + link_directories(${LZMA_LIBRARY_DIRS}) message("Enabled lzma codec") -else (LZMA_FOUND) +else (LibLZMA_FOUND) set(LZMA_PKG "") -- set(LZMA_LIBRARIES "") -+ set(LibLZMA_LIBRARIES "") + set(LZMA_LIBRARIES "") message("Disabled lzma codec. liblzma not found.") -endif (LZMA_FOUND) -+endif (LIBLZMA_FOUND) ++endif (LibLZMA_FOUND) --set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) -+set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LibLZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) + set(CODEC_LIBRARIES ${ZLIB_LIBRARIES} ${LZMA_LIBRARIES} ${SNAPPY_LIBRARIES}) set(CODEC_PKG "@ZLIB_PKG@ @LZMA_PKG@ @SNAPPY_PKG@") # Jansson JSON library -pkg_check_modules(JANSSON jansson>=2.3) -if (JANSSON_FOUND) -+find_path(JANSSON_INCLUDE_DIR NAMES jansson.h) -+find_library(JANSSON_LIBRARY NAMES jansson) -+if (JANSSON_LIBRARY) ++find_package(jansson CONFIG REQUIRED) ++if (jansson_FOUND) set(JANSSON_PKG libjansson) -+ set(JANSSON_LIBRARIES ${JANSSON_LIBRARY}) ++ set(JANSSON_LIBRARIES jansson::jansson) include_directories(${JANSSON_INCLUDE_DIRS}) link_directories(${JANSSON_LIBRARY_DIRS}) -else (JANSSON_FOUND) -+else (JANSSON_LIBRARY) ++else (jansson_FOUND) message(FATAL_ERROR "libjansson >=2.3 not found") -endif (JANSSON_FOUND) -+endif (JANSSON_LIBRARY) ++endif (jansson_FOUND) add_subdirectory(src) -diff --git a/lang/c/examples/quickstop.c b/lang/c/examples/quickstop.c -index f18225b..78e2b1b 100644 ---- a/lang/c/examples/quickstop.c -+++ b/lang/c/examples/quickstop.c -@@ -16,6 +16,7 @@ - */ - - #include -+#include - #include - #include - -@@ -102,7 +103,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema) - - if (avro_record_get(person, "ID", &id_datum) == 0) { - avro_int64_get(id_datum, &i64); -- fprintf(stdout, "%"PRId64" | ", i64); -+ fprintf(stdout, "%" PRId64 " | ", i64); - } - if (avro_record_get(person, "First", &first_datum) == 0) { - avro_string_get(first_datum, &p); ++if(BUILD_EXAMPLES) + add_subdirectory(examples) ++endif() ++if(BUILD_TESTS) + add_subdirectory(tests) ++endif() ++if(BUILD_DOCS) + add_subdirectory(docs) +- ++endif() + add_custom_target(pretty + "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake_pretty.cmake") diff --git a/lang/c/src/avro/msinttypes.h b/lang/c/src/avro/msinttypes.h -index 29be14b..7efc702 100644 +index 29be14b..020346d 100644 --- a/lang/c/src/avro/msinttypes.h +++ b/lang/c/src/avro/msinttypes.h @@ -54,6 +54,10 @@ @@ -96,7 +98,7 @@ index 29be14b..7efc702 100644 +#if (_MSC_VER >= 1900) +# include +#else -+ ++ typedef struct { intmax_t quot; intmax_t rem; @@ -145,7 +147,7 @@ index 9293055..edfe1e0 100644 #define PRIsz "zu" #endif diff --git a/lang/c/src/avro_private.h b/lang/c/src/avro_private.h -index f97ef6b..6b29104 100644 +index f97ef6b..9c47d26 100644 --- a/lang/c/src/avro_private.h +++ b/lang/c/src/avro_private.h @@ -34,7 +34,7 @@ extern "C" { @@ -153,7 +155,7 @@ index f97ef6b..6b29104 100644 #ifdef _WIN32 -#define snprintf _snprintf -+ // #define snprintf _snprintf ++// #define snprintf _snprintf #endif /* Note that AVRO_PLATFORM_IS_BIG_ENDIAN is *always* defined. It is @@ -171,10 +173,10 @@ index 7243c60..39656ff 100644 #include "avro.h" diff --git a/lang/c/src/codec.c b/lang/c/src/codec.c -index 5b55b35..49789f2 100644 +index 613a914..8092326 100644 --- a/lang/c/src/codec.c +++ b/lang/c/src/codec.c -@@ -269,7 +269,7 @@ static int encode_deflate(avro_codec_t c, void * data, int64_t len) +@@ -272,7 +272,7 @@ static int encode_deflate(avro_codec_t c, void * data, int64_t len) s->next_in = (Bytef*)data; s->avail_in = (uInt)len; @@ -183,7 +185,7 @@ index 5b55b35..49789f2 100644 s->avail_out = (uInt)c->block_size; s->total_out = 0; -@@ -313,10 +313,10 @@ static int decode_deflate(avro_codec_t c, void * data, int64_t len) +@@ -316,10 +316,10 @@ static int decode_deflate(avro_codec_t c, void * data, int64_t len) c->used_size = 0; @@ -196,7 +198,7 @@ index 5b55b35..49789f2 100644 s->avail_out = c->block_size; s->total_out = 0; -@@ -337,7 +337,7 @@ static int decode_deflate(avro_codec_t c, void * data, int64_t len) +@@ -340,7 +340,7 @@ static int decode_deflate(avro_codec_t c, void * data, int64_t len) if (err == Z_BUF_ERROR) { c->block_data = avro_realloc(c->block_data, c->block_size, c->block_size * 2); @@ -205,7 +207,7 @@ index 5b55b35..49789f2 100644 s->avail_out += c->block_size; c->block_size = c->block_size * 2; } -@@ -440,7 +440,7 @@ static int encode_lzma(avro_codec_t codec, void * data, int64_t len) +@@ -443,7 +443,7 @@ static int encode_lzma(avro_codec_t codec, void * data, int64_t len) return 1; } @@ -214,7 +216,7 @@ index 5b55b35..49789f2 100644 codec->used_size = written; -@@ -471,8 +471,8 @@ static int decode_lzma(avro_codec_t codec, void * data, int64_t len) +@@ -474,8 +474,8 @@ static int decode_lzma(avro_codec_t codec, void * data, int64_t len) do { @@ -226,7 +228,7 @@ index 5b55b35..49789f2 100644 codec->used_size = write_pos; diff --git a/lang/c/src/schema.c b/lang/c/src/schema.c -index 7b38900..50fa0db 100644 +index 7b38900..e3794d5 100644 --- a/lang/c/src/schema.c +++ b/lang/c/src/schema.c @@ -74,7 +74,7 @@ static int is_avro_id(const char *name) @@ -384,27 +386,3 @@ index 7b38900..50fa0db 100644 check(rval, avro_write_str(out, ".")); } check(rval, avro_write_str(out, avro_schema_name(link->to))); -diff --git a/lang/c/tests/test_avro_data.c b/lang/c/tests/test_avro_data.c -index 1da09e6..714d5d8 100644 ---- a/lang/c/tests/test_avro_data.c -+++ b/lang/c/tests/test_avro_data.c -@@ -28,6 +28,10 @@ avro_writer_t writer; - - typedef int (*avro_test) (void); - -+#ifdef _WIN32 -+# define strcasecmp stricmp -+#endif -+ - /* - * Use a custom allocator that verifies that the size that we use to - * free an object matches the size that we use to allocate it. -@@ -112,7 +116,7 @@ write_read_check(avro_schema_t writers_schema, avro_datum_t datum, - if (size != avro_writer_tell(writer)) { - fprintf(stderr, - "Unable to calculate size %s validate=%d " -- "(%"PRId64" != %"PRId64")\n %s\n", -+ "(%" PRId64 " != %" PRId64 ")\n %s\n", - type, validate, size, avro_writer_tell(writer), - avro_strerror()); - exit(EXIT_FAILURE); diff --git a/ports/avro-c/portfile.cmake b/ports/avro-c/portfile.cmake index 195d85543cae46..07c14553b7a82b 100644 --- a/ports/avro-c/portfile.cmake +++ b/ports/avro-c/portfile.cmake @@ -1,29 +1,41 @@ vcpkg_buildpath_length_warning(37) -vcpkg_fail_port_install(ON_TARGET "uwp" "osx") +vcpkg_fail_port_install(ON_TARGET "uwp") +if(VCPKG_TARGET_IS_WINDOWS) + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO apache/avro - REF release-1.9.2 - SHA512 6a6980901eea964c050eb3d61fadf28712e2f02c36985bf8e5176b668bba48985f6a666554a1964435448de29b18d790ab86b787d0288a22fd9cba00746a7846 - HEAD_REF master - PATCHES + OUT_SOURCE_PATH SOURCE_PATH + REPO apache/avro + REF 4e1fefca493029ace961b7ef8889a3722458565a #release-1.11.0 + SHA512 6e787983d68bc6ecffd14ca585917f695bc1ae554de9146a436d342f32321c3e7878cdfa32989742e682ac12a6eb914b3e3b515ca3164f386c0281c8b50b53ad + HEAD_REF master + PATCHES avro.patch # Private vcpkg build fixes - snappy-pr-793.patch # Snappy build fixes for Windows (PR-793) ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/lang/c - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/lang/c" OPTIONS + -DBUILD_EXAMPLES=OFF + -DBUILD_TESTS=OFF + -DBUILD_DOCS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/lang/c/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_copy_tools(TOOL_NAMES avroappend avrocat AUTO_CLEAN) + +if(NOT VCPKG_TARGET_IS_WINDOWS) + vcpkg_copy_tools(TOOL_NAMES avropipe avromod AUTO_CLEAN) +endif() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" AND NOT VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/lang/c/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/avro-c/snappy-pr-793.patch b/ports/avro-c/snappy-pr-793.patch deleted file mode 100644 index 28909318dad9e2..00000000000000 --- a/ports/avro-c/snappy-pr-793.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ru b/c/src/codec.c a/lang/c/src/codec.c ---- b/lang/c/src/codec.c 2020-01-23 16:18:15.119970300 +0200 -+++ a/lang/c/src/codec.c 2020-01-23 19:31:41.679834300 +0200 -@@ -24,6 +24,9 @@ - # elif defined(__FreeBSD__) - # include - # define __bswap_32 bswap32 -+# elif defined(_WIN32) -+# include -+# define __bswap_32 _byteswap_ulong - # else - # include - # endif -@@ -115,14 +118,14 @@ - return 1; - } - -- if (snappy_compress(data, len, c->block_data, &outlen) != SNAPPY_OK) -+ if (snappy_compress((const char *)data, len, (char*)c->block_data, &outlen) != SNAPPY_OK) - { - avro_set_error("Error compressing block with Snappy"); - return 1; - } - -- crc = __bswap_32(crc32(0, data, len)); -- memcpy(c->block_data+outlen, &crc, 4); -+ crc = __bswap_32(crc32(0, (const Bytef *)data, len)); -+ memcpy((char*)c->block_data+outlen, &crc, 4); - c->used_size = outlen+4; - - return 0; -@@ -133,7 +136,7 @@ - uint32_t crc; - size_t outlen; - -- if (snappy_uncompressed_length(data, len-4, &outlen) != SNAPPY_OK) { -+ if (snappy_uncompressed_length((const char*)data, len-4, &outlen) != SNAPPY_OK) { - avro_set_error("Uncompressed length error in snappy"); - return 1; - } -@@ -152,13 +155,13 @@ - return 1; - } - -- if (snappy_uncompress(data, len-4, c->block_data, &outlen) != SNAPPY_OK) -+ if (snappy_uncompress((const char*)data, len-4, (char*)c->block_data, &outlen) != SNAPPY_OK) - { - avro_set_error("Error uncompressing block with Snappy"); - return 1; - } - -- crc = __bswap_32(crc32(0, c->block_data, outlen)); -+ crc = __bswap_32(crc32(0, (const Bytef *)c->block_data, outlen)); - if (memcmp(&crc, (char*)data+len-4, 4)) - { - avro_set_error("CRC32 check failure uncompressing block with Snappy"); diff --git a/ports/avro-c/vcpkg.json b/ports/avro-c/vcpkg.json index 634b2c9482e21a..19b569541e3f91 100644 --- a/ports/avro-c/vcpkg.json +++ b/ports/avro-c/vcpkg.json @@ -1,14 +1,17 @@ { "name": "avro-c", - "version-string": "1.9.2", - "port-version": 2, + "version": "1.11.0", "description": "Apache Avro is a data serialization system", "homepage": "https://github.com/apache/avro", - "supports": "!(uwp | osx)", + "supports": "!uwp", "dependencies": [ "jansson", "liblzma", "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/versions/a-/avro-c.json b/versions/a-/avro-c.json index ea6e6bfbbaef0d..943c9096cd83b2 100644 --- a/versions/a-/avro-c.json +++ b/versions/a-/avro-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0b07ed910d3ad0ec9a5be71e1b37f0593ab540c9", + "version": "1.11.0", + "port-version": 0 + }, { "git-tree": "0828484bab48f23c09e440f9df3d9d99dd3caaa0", "version-string": "1.9.2", diff --git a/versions/baseline.json b/versions/baseline.json index 0f584f7c206efd..8db642c66cfcd9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -249,8 +249,8 @@ "port-version": 1 }, "avro-c": { - "baseline": "1.9.2", - "port-version": 2 + "baseline": "1.11.0", + "port-version": 0 }, "avro-cpp": { "baseline": "2021-06-01", From f0752307bd185fca8cfd76e334af7cf8ce2b0c5f Mon Sep 17 00:00:00 2001 From: Xanather Date: Sat, 6 Nov 2021 07:34:11 +0800 Subject: [PATCH 1027/1858] Fix aws-checksums not building on Windows (#21082) * Fix aws-checksums not building on Windows https://github.com/microsoft/vcpkg/issues/21081 * add port-version * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/aws-checksums/vcpkg.json | 3 ++- versions/a-/aws-checksums.json | 5 +++++ versions/baseline.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json index 57f6ecc106d7b6..7eb487646441d2 100644 --- a/ports/aws-checksums/vcpkg.json +++ b/ports/aws-checksums/vcpkg.json @@ -1,9 +1,10 @@ { "name": "aws-checksums", "version": "0.1.11", + "port-version": 1, "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.", "homepage": "https://github.com/awslabs/aws-checksums", - "supports": "!arm & !windows", + "supports": "!arm", "dependencies": [ "aws-c-common", { diff --git a/versions/a-/aws-checksums.json b/versions/a-/aws-checksums.json index b0c8fc77d83c72..767f55e344fa6a 100644 --- a/versions/a-/aws-checksums.json +++ b/versions/a-/aws-checksums.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "120921754d48ecb075658abd01dc56b73e7f25f4", + "version": "0.1.11", + "port-version": 1 + }, { "git-tree": "60a67f9776bc5957aa27bf0cd2ad36fb10a7bc04", "version": "0.1.11", diff --git a/versions/baseline.json b/versions/baseline.json index 8db642c66cfcd9..e2b58cb94bc654 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -294,7 +294,7 @@ }, "aws-checksums": { "baseline": "0.1.11", - "port-version": 0 + "port-version": 1 }, "aws-crt-cpp": { "baseline": "0.15.1", From d5345d67dfba193b18a0e94b110f86bb0b6b5481 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sat, 6 Nov 2021 00:34:35 +0100 Subject: [PATCH 1028/1858] [symengine] no absolute paths (#21100) --- ports/symengine/portfile.cmake | 17 +++++++++-------- ports/symengine/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/s-/symengine.json | 5 +++++ 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/ports/symengine/portfile.cmake b/ports/symengine/portfile.cmake index a0677af8a2dcbc..48e21d03287b2c 100644 --- a/ports/symengine/portfile.cmake +++ b/ports/symengine/portfile.cmake @@ -34,7 +34,7 @@ endif() string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MSVC_USE_MT) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS @@ -49,16 +49,17 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) endif() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/symengine/symengine_config_cling.h") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/symengine/vcpkg.json b/ports/symengine/vcpkg.json index 4768ffb5660858..75587297454839 100644 --- a/ports/symengine/vcpkg.json +++ b/ports/symengine/vcpkg.json @@ -1,11 +1,20 @@ { "name": "symengine", "version": "0.7.0", + "port-version": 1, "description": "SymEngine is a fast symbolic manipulation library", "homepage": "https://github.com/symengine/symengine", "dependencies": [ "boost-math", - "boost-random" + "boost-random", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "integer-class-boostmp" diff --git a/versions/baseline.json b/versions/baseline.json index e2b58cb94bc654..fabea522519841 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6534,7 +6534,7 @@ }, "symengine": { "baseline": "0.7.0", - "port-version": 0 + "port-version": 1 }, "systemc": { "baseline": "2.3.3", diff --git a/versions/s-/symengine.json b/versions/s-/symengine.json index d926e2391ee137..313edc93326030 100644 --- a/versions/s-/symengine.json +++ b/versions/s-/symengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "203123b8fd0517f20bada24c6e4430a6425475bd", + "version": "0.7.0", + "port-version": 1 + }, { "git-tree": "33504d33db8201730839751693d6c4f643f7e0c9", "version": "0.7.0", From 0ba997c72a801763d3ff4f41ec0dd33fdee006c2 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Fri, 5 Nov 2021 16:55:01 -0700 Subject: [PATCH 1029/1858] [scripts-audit] nmake buildsystem (#20987) * [scripts-audit] vcpkg_install_nmake * [scripts-audit] vcpkg_build_nmake hoping not to make too many changes, just minor simplifications * is this the issue with gdal? * back-compat hack woot * remove port-specific workaround * dg0yt CR --- docs/maintainers/vcpkg_build_nmake.md | 6 - scripts/cmake/vcpkg_build_nmake.cmake | 192 ++++++++++-------------- scripts/cmake/vcpkg_install_nmake.cmake | 64 +++++--- 3 files changed, 122 insertions(+), 140 deletions(-) diff --git a/docs/maintainers/vcpkg_build_nmake.md b/docs/maintainers/vcpkg_build_nmake.md index 97145b5c28cb3d..408f8fb3981ce1 100644 --- a/docs/maintainers/vcpkg_build_nmake.md +++ b/docs/maintainers/vcpkg_build_nmake.md @@ -34,9 +34,6 @@ Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefil Specifies the name of msvc makefile name. Default is `makefile.vc` -### NO_DEBUG -This port doesn't support debug mode. - ### ENABLE_INSTALL Install binaries after build. @@ -62,9 +59,6 @@ Additional options passed to generate during the Debug generation. These are in The target passed to the nmake build command (`nmake/nmake install`). If not specified, no target will be passed. -### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. - ## Notes: You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the "install" target diff --git a/scripts/cmake/vcpkg_build_nmake.cmake b/scripts/cmake/vcpkg_build_nmake.cmake index 06fb93a6a09453..2a251fded6108e 100755 --- a/scripts/cmake/vcpkg_build_nmake.cmake +++ b/scripts/cmake/vcpkg_build_nmake.cmake @@ -33,9 +33,6 @@ Specifies the sub directory containing the `makefile.vc`/`makefile.mak`/`makefil Specifies the name of msvc makefile name. Default is `makefile.vc` -### NO_DEBUG -This port doesn't support debug mode. - ### ENABLE_INSTALL Install binaries after build. @@ -61,9 +58,6 @@ Additional options passed to generate during the Debug generation. These are in The target passed to the nmake build command (`nmake/nmake install`). If not specified, no target will be passed. -### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. - ## Notes: You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function if your makefile supports the "install" target @@ -75,34 +69,39 @@ You can use the alias [`vcpkg_install_nmake()`](vcpkg_install_nmake.md) function #]===] function(vcpkg_build_nmake) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _bn + cmake_parse_arguments(PARSE_ARGV 0 arg "ADD_BIN_TO_PATH;ENABLE_INSTALL;NO_DEBUG" "SOURCE_PATH;PROJECT_SUBPATH;PROJECT_NAME;LOGFILE_ROOT" "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;PRERUN_SHELL;PRERUN_SHELL_DEBUG;PRERUN_SHELL_RELEASE;TARGET" ) - - if (NOT CMAKE_HOST_WIN32) - message(FATAL_ERROR "vcpkg_build_nmake only support windows.") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - - if (_bn_OPTIONS_DEBUG STREQUAL _bn_OPTIONS_RELEASE) - message(FATAL_ERROR "Detected debug configuration is equal to release configuration, please use NO_DEBUG for vcpkg_build_nmake/vcpkg_install_nmake") + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified") endif() - if(NOT _bn_LOGFILE_ROOT) - set(_bn_LOGFILE_ROOT "build") + if(arg_NO_DEBUG) + message(WARNING "NO_DEBUG argument to ${CMAKE_CURRENT_FUNCTION} is deprecated") endif() - - if (NOT _bn_PROJECT_NAME) - set(MAKEFILE_NAME makefile.vc) - else() - set(MAKEFILE_NAME ${_bn_PROJECT_NAME}) + if(arg_ADD_BIN_TO_PATH) + message(WARNING "ADD_BIN_TO_PATH argument to ${CMAKE_CURRENT_FUNCTION} is deprecated - it never did anything") + endif() + + if(NOT VCPKG_HOST_IS_WINDOWS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} only support windows.") + endif() + + if(NOT DEFINED arg_LOGFILE_ROOT) + set(arg_LOGFILE_ROOT "build") endif() - - set(MAKE ) - set(MAKE_OPTS_BASE ) - + if(NOT DEFINED arg_PROJECT_NAME) + set(arg_PROJECT_NAME makefile.vc) + endif() + if(NOT DEFINED arg_TARGET) + vcpkg_list(SET arg_TARGET all) + endif() + find_program(NMAKE nmake REQUIRED) get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) # Load toolchains @@ -114,119 +113,84 @@ function(vcpkg_build_nmake) set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") # Set make command and install command - set(MAKE ${NMAKE} /NOLOGO /G /U) - set(MAKE_OPTS_BASE -f ${MAKEFILE_NAME}) - if (_bn_ENABLE_INSTALL) - set(INSTALL_COMMAND install) - endif() - if (_bn_TARGET) - set(MAKE_OPTS_BASE ${MAKE_OPTS_BASE} ${_bn_TARGET} ${INSTALL_COMMAND}) - else() - set(MAKE_OPTS_BASE ${MAKE_OPTS_BASE} all ${INSTALL_COMMAND}) + vcpkg_list(SET make_command ${NMAKE} /NOLOGO /G /U) + vcpkg_list(SET make_opts_base -f "${arg_PROJECT_NAME}" ${arg_TARGET}) + if(arg_ENABLE_INSTALL) + vcpkg_list(APPEND make_opts_base install) endif() + + # Add subpath to work directory - if (_bn_PROJECT_SUBPATH) - set(_bn_PROJECT_SUBPATH /${_bn_PROJECT_SUBPATH}) + if(DEFINED arg_PROJECT_SUBPATH) + set(project_subpath "/${arg_PROJECT_SUBPATH}") else() - set(_bn_PROJECT_SUBPATH ) + set(project_subpath "") endif() - - foreach(BUILDTYPE "debug" "release") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) - if(BUILDTYPE STREQUAL "debug") - # Skip debug generate - if (_bn_NO_DEBUG) - continue() - endif() + + vcpkg_backup_env_variables(VARS CL) + foreach(build_type IN ITEMS debug release) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL build_type) + if(build_type STREQUAL "debug") # Generate obj dir suffix - set(SHORT_BUILDTYPE "-dbg") - set(CONFIG "Debug") + set(short_build_type "-dbg") # Add install command and arguments - set(MAKE_OPTS ${MAKE_OPTS_BASE}) - if (_bn_ENABLE_INSTALL) - set(INSTALL_OPTS INSTALLDIR=${CURRENT_PACKAGES_DIR}/debug) - set(MAKE_OPTS ${MAKE_OPTS} ${INSTALL_OPTS}) + set(make_opts "${make_opts_base}") + if (arg_ENABLE_INSTALL) + vcpkg_list(APPEND make_opts "INSTALLDIR=${CURRENT_PACKAGES_DIR}/debug") endif() - set(MAKE_OPTS ${MAKE_OPTS} ${_bn_OPTIONS} ${_bn_OPTIONS_DEBUG}) - - unset(ENV{CL}) - set(TMP_CL_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") - string(REPLACE "/" "-" TMP_CL_FLAGS "${TMP_CL_FLAGS}") - set(ENV{CL} "$ENV{CL} ${TMP_CL_FLAGS}") + vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_DEBUG}) + set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + + set(prerun_variable_name arg_PRERUN_SHELL_DEBUG) else() - # In NO_DEBUG mode, we only use ${TARGET_TRIPLET} directory. - if (_bn_NO_DEBUG) - set(SHORT_BUILDTYPE "") - else() - set(SHORT_BUILDTYPE "-rel") - endif() - set(CONFIG "Release") + set(short_build_type "-rel") # Add install command and arguments - set(MAKE_OPTS ${MAKE_OPTS_BASE}) - if (_bn_ENABLE_INSTALL) - set(INSTALL_OPTS INSTALLDIR=${CURRENT_PACKAGES_DIR}) - set(MAKE_OPTS ${MAKE_OPTS} ${INSTALL_OPTS}) + set(make_opts "${make_opts_base}") + if (arg_ENABLE_INSTALL) + vcpkg_list(APPEND make_opts "INSTALLDIR=${CURRENT_PACKAGES_DIR}") endif() - set(MAKE_OPTS ${MAKE_OPTS} ${_bn_OPTIONS} ${_bn_OPTIONS_RELEASE}) - - unset(ENV{CL}) - set(TMP_CL_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") - string(REPLACE "/" "-" TMP_CL_FLAGS "${TMP_CL_FLAGS}") - set(ENV{CL} "$ENV{CL} ${TMP_CL_FLAGS}") - endif() - - set(CURRENT_TRIPLET_NAME ${TARGET_TRIPLET}${SHORT_BUILDTYPE}) - set(OBJ_DIR ${CURRENT_BUILDTREES_DIR}/${CURRENT_TRIPLET_NAME}) - - file(REMOVE_RECURSE ${OBJ_DIR}) - file(MAKE_DIRECTORY ${OBJ_DIR}) - file(GLOB_RECURSE SOURCE_FILES ${_bn_SOURCE_PATH}/*) - foreach(ONE_SOUCRCE_FILE ${SOURCE_FILES}) - get_filename_component(DST_DIR ${ONE_SOUCRCE_FILE} PATH) - string(REPLACE "${_bn_SOURCE_PATH}" "${OBJ_DIR}" DST_DIR "${DST_DIR}") - file(COPY ${ONE_SOUCRCE_FILE} DESTINATION ${DST_DIR}) - endforeach() - - if (_bn_PRERUN_SHELL) - message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}") - vcpkg_execute_required_process( - COMMAND ${_bn_PRERUN_SHELL} - WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH} - LOGNAME "$prerun-${CURRENT_TRIPLET_NAME}" - ) + vcpkg_list(APPEND make_opts ${arg_OPTIONS} ${arg_OPTIONS_RELEASE}) + + set(ENV{CL} "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") + set(prerun_variable_name arg_PRERUN_SHELL_RELEASE) endif() - if (BUILDTYPE STREQUAL "debug" AND _bn_PRERUN_SHELL_DEBUG) - message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}") + + set(triplet_and_build_type "${TARGET_TRIPLET}${short_build_type}") + set(object_dir "${CURRENT_BUILDTREES_DIR}/${triplet_and_build_type}") + + file(REMOVE_RECURSE "${object_dir}") + file(COPY "${arg_SOURCE_PATH}/" DESTINATION "${object_dir}") + + if(DEFINED arg_PRERUN_SHELL) + message(STATUS "Prerunning ${triplet_and_build_type}") vcpkg_execute_required_process( - COMMAND ${_bn_PRERUN_SHELL_DEBUG} - WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH} - LOGNAME "prerun-${CURRENT_TRIPLET_NAME}-dbg" + COMMAND ${arg_PRERUN_SHELL} + WORKING_DIRECTORY "${object_dir}${project_subpath}" + LOGNAME "prerun-${triplet_and_build_type}" ) endif() - if (BUILDTYPE STREQUAL "release" AND _bn_PRERUN_SHELL_RELEASE) - message(STATUS "Prerunning ${CURRENT_TRIPLET_NAME}") + if(DEFINED "${prerun_variable_name}") + message(STATUS "Prerunning ${triplet_and_build_type}") vcpkg_execute_required_process( - COMMAND ${_bn_PRERUN_SHELL_RELEASE} - WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH} - LOGNAME "prerun-${CURRENT_TRIPLET_NAME}-rel" + COMMAND ${${prerun_variable_name}} + WORKING_DIRECTORY "${object_dir}${project_subpath}" + LOGNAME "prerun-specific-${triplet_and_build_type}" ) endif() - if (NOT _bn_ENABLE_INSTALL) - message(STATUS "Building ${CURRENT_TRIPLET_NAME}") + if (NOT arg_ENABLE_INSTALL) + message(STATUS "Building ${triplet_and_build_type}") else() - message(STATUS "Building and installing ${CURRENT_TRIPLET_NAME}") + message(STATUS "Building and installing ${triplet_and_build_type}") endif() vcpkg_execute_build_process( - COMMAND ${MAKE} ${MAKE_OPTS} - WORKING_DIRECTORY ${OBJ_DIR}${_bn_PROJECT_SUBPATH} - LOGNAME "${_bn_LOGFILE_ROOT}-${CURRENT_TRIPLET_NAME}" + COMMAND ${make_command} ${make_opts} + WORKING_DIRECTORY "${object_dir}${project_subpath}" + LOGNAME "${arg_LOGFILE_ROOT}-${triplet_and_build_type}" ) - if(_bn_ADD_BIN_TO_PATH) - set(ENV{PATH} "${_BACKUP_ENV_PATH}") - endif() + vcpkg_restore_env_variables(VARS CL) endif() endforeach() endfunction() diff --git a/scripts/cmake/vcpkg_install_nmake.cmake b/scripts/cmake/vcpkg_install_nmake.cmake index 5aebdae90ce848..2a3cb827068f73 100644 --- a/scripts/cmake/vcpkg_install_nmake.cmake +++ b/scripts/cmake/vcpkg_install_nmake.cmake @@ -65,32 +65,56 @@ This command transparently forwards to [`vcpkg_build_nmake()`](vcpkg_build_nmake #]===] function(vcpkg_install_nmake) - # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _in + vcpkg_list(SET multi_value_args + TARGET + OPTIONS OPTIONS_DEBUG OPTIONS_RELEASE + PRERUN_SHELL PRERUN_SHELL_DEBUG PRERUN_SHELL_RELEASE) + + cmake_parse_arguments(PARSE_ARGV 0 arg "NO_DEBUG" "SOURCE_PATH;PROJECT_SUBPATH;PROJECT_NAME" - "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;PRERUN_SHELL;PRERUN_SHELL_DEBUG;PRERUN_SHELL_RELEASE;TARGET" + "${multi_value_args}" ) - - if (NOT CMAKE_HOST_WIN32) - message(FATAL_ERROR "vcpkg_install_nmake only support windows.") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - - if (_in_NO_DEBUG) - set(NO_DEBUG NO_DEBUG) + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified") endif() - if (NOT _in_TARGET) - set(INSTALL_TARGET "all") - else() - set(INSTALL_TARGET "${_in_TARGET}") + if(NOT VCPKG_HOST_IS_WINDOWS) + message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} only support windows.") endif() + + # backwards-compatibility hack + # gdal passes `arg_OPTIONS_DEBUG` (and RELEASE) as a single argument, + # so we need to split them again + set(arg_OPTIONS_DEBUG ${arg_OPTIONS_DEBUG}) + set(arg_OPTIONS_RELEASE ${arg_OPTIONS_RELEASE}) - vcpkg_build_nmake(LOGFILE_ROOT ENABLE_INSTALL - ${NO_DEBUG} - TARGET "${INSTALL_TARGET}" - SOURCE_PATH ${_in_SOURCE_PATH} PROJECT_SUBPATH ${_in_PROJECT_SUBPATH} PROJECT_NAME ${_in_PROJECT_NAME} - PRERUN_SHELL ${_in_PRERUN_SHELL} PRERUN_SHELL_DEBUG ${_in_PRERUN_SHELL_DEBUG} PRERUN_SHELL_RELEASE ${_in_PRERUN_SHELL_RELEASE} - OPTIONS ${_in_OPTIONS} OPTIONS_RELEASE ${_in_OPTIONS_RELEASE} OPTIONS_DEBUG ${_in_OPTIONS_DEBUG} - ) + vcpkg_list(SET extra_args) + # switch args + if(arg_NO_DEBUG) + vcpkg_list(APPEND extra_args NO_DEBUG) + endif() + + # single args + foreach(arg IN ITEMS PROJECT_SUBPATH PROJECT_NAME) + if(DEFINED "arg_${arg}") + vcpkg_list(APPEND extra_args ${arg} "${arg_${arg}}") + endif() + endforeach() + + # multi-value args + foreach(arg IN LISTS multi_value_args) + if(DEFINED "arg_${arg}") + vcpkg_list(APPEND extra_args ${arg} ${arg_${arg}}) + endif() + endforeach() + + vcpkg_build_nmake( + SOURCE_PATH "${arg_SOURCE_PATH}" + ENABLE_INSTALL + LOGFILE_ROOT install + ${extra_args}) endfunction() From cd339cdf200e5089e7974affa5c347d786926e73 Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Fri, 5 Nov 2021 16:55:14 -0700 Subject: [PATCH 1030/1858] [scripts-audit] CMake buildsystem (#20885) * [scripts-audit] vcpkg_configure_cmake Start auditing vcpkg_configure_cmake * [scripts-audit] vcpkg_build_cmake * [scripts-audit] vcpkg_install_cmake * wow that was a dumb bug * fix x86 configure, fix `if` guidelines * Billy's CRs Co-authored-by: nicole mazzuca --- docs/maintainers/vcpkg_build_cmake.md | 2 +- scripts/cmake/vcpkg_build_cmake.cmake | 74 ++--- scripts/cmake/vcpkg_configure_cmake.cmake | 333 ++++++++++------------ scripts/cmake/vcpkg_install_cmake.cmake | 6 +- 4 files changed, 199 insertions(+), 216 deletions(-) diff --git a/docs/maintainers/vcpkg_build_cmake.md b/docs/maintainers/vcpkg_build_cmake.md index 8fa40bc71cef95..485a8c9184017b 100644 --- a/docs/maintainers/vcpkg_build_cmake.md +++ b/docs/maintainers/vcpkg_build_cmake.md @@ -20,7 +20,7 @@ The target passed to the cmake build command (`cmake --build . --target be passed. ### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. +Adds the appropriate Release and Debug `bin` directories to the path during the build such that executables can run against the in-tree DLLs. ## Notes: This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake index 637e4a1602902c..b3015ae29e8865 100644 --- a/scripts/cmake/vcpkg_build_cmake.cmake +++ b/scripts/cmake/vcpkg_build_cmake.cmake @@ -18,7 +18,7 @@ The target passed to the cmake build command (`cmake --build . --target be passed. ### ADD_BIN_TO_PATH -Adds the appropriate Release and Debug `bin\` directories to the path during the build such that executables can run against the in-tree DLLs. +Adds the appropriate Release and Debug `bin` directories to the path during the build such that executables can run against the in-tree DLLs. ## Notes: This command should be preceded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md). @@ -44,73 +44,79 @@ function(vcpkg_build_cmake) message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_build_cmake in the same port is unsupported.") endif() - if(NOT arg_LOGFILE_ROOT) + if(NOT DEFINED arg_LOGFILE_ROOT) set(arg_LOGFILE_ROOT "build") endif() - set(PARALLEL_ARG) - set(NO_PARALLEL_ARG) + vcpkg_list(SET build_param) + vcpkg_list(SET parallel_param) + vcpkg_list(SET no_parallel_param) - if(Z_VCPKG_CMAKE_GENERATOR MATCHES "Ninja") - set(BUILD_ARGS "-v") # verbose output - set(PARALLEL_ARG "-j${VCPKG_CONCURRENCY}") - set(NO_PARALLEL_ARG "-j1") - elseif(Z_VCPKG_CMAKE_GENERATOR MATCHES "Visual Studio") - set(BUILD_ARGS + if("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "Ninja") + vcpkg_list(SET build_param "-v") # verbose output + vcpkg_list(SET parallel_param "-j${VCPKG_CONCURRENCY}") + vcpkg_list(SET no_parallel_param "-j1") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" MATCHES "^Visual Studio") + vcpkg_list(SET build_param "/p:VCPkgLocalAppDataDisabled=true" "/p:UseIntelMKL=No" ) - set(PARALLEL_ARG "/m") - elseif(Z_VCPKG_CMAKE_GENERATOR MATCHES "NMake") + vcpkg_list(SET parallel_param "/m") + elseif("${Z_VCPKG_CMAKE_GENERATOR}" STREQUAL "NMake Makefiles") # No options are currently added for nmake builds else() message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles") endif() + vcpkg_list(SET target_param) if(arg_TARGET) - set(TARGET_PARAM "--target" ${arg_TARGET}) - else() - set(TARGET_PARAM) + vcpkg_list(SET target_param "--target" "${arg_TARGET}") endif() - foreach(BUILDTYPE "debug" "release") - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) - if(BUILDTYPE STREQUAL "debug") - set(SHORT_BUILDTYPE "dbg") - set(CONFIG "Debug") + foreach(build_type IN ITEMS debug release) + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "${build_type}") + if("${build_type}" STREQUAL "debug") + set(short_build_type "dbg") + set(config "Debug") else() - set(SHORT_BUILDTYPE "rel") - set(CONFIG "Release") + set(short_build_type "rel") + set(config "Release") endif() - message(STATUS "Building ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") + message(STATUS "Building ${TARGET_TRIPLET}-${short_build_type}") if(arg_ADD_BIN_TO_PATH) - set(_BACKUP_ENV_PATH "$ENV{PATH}") - if(BUILDTYPE STREQUAL "debug") + vcpkg_backup_env_variables(VARS PATH) + if("${build_type}" STREQUAL "debug") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") else() vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") endif() endif() - if (arg_DISABLE_PARALLEL) + if(arg_DISABLE_PARALLEL) vcpkg_execute_build_process( - COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} - LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}" + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_build_type}" ) else() vcpkg_execute_build_process( - COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${PARALLEL_ARG} - NO_PARALLEL_COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG} ${TARGET_PARAM} -- ${BUILD_ARGS} ${NO_PARALLEL_ARG} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} - LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${SHORT_BUILDTYPE}" + COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${parallel_param} + NO_PARALLEL_COMMAND + "${CMAKE_COMMAND}" --build . --config "${config}" ${target_param} + -- ${build_param} ${no_parallel_param} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_build_type}" + LOGNAME "${arg_LOGFILE_ROOT}-${TARGET_TRIPLET}-${short_build_type}" ) endif() if(arg_ADD_BIN_TO_PATH) - set(ENV{PATH} "${_BACKUP_ENV_PATH}") + vcpkg_restore_env_variables(VARS PATH) endif() endif() endforeach() diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 1e0a1100d5fb7f..84a8d1e2786867 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -82,6 +82,23 @@ This command supplies many common arguments to CMake. To see the full list, exam * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake) #]===] +function(z_vcpkg_configure_cmake_both_or_neither_set var1 var2) + if(DEFINED "${var1}" AND NOT DEFINED "${var2}") + message(FATAL_ERROR "If ${var1} is set, ${var2} must be set.") + endif() + if(NOT DEFINED "${var1}" AND DEFINED "${var2}") + message(FATAL_ERROR "If ${var2} is set, ${var1} must be set.") + endif() +endfunction() +function(z_vcpkg_configure_cmake_build_cmakecache out_var whereat build_type) + set(line "build ${whereat}/CMakeCache.txt: CreateProcess\n process = cmd /c \"cd ${whereat} &&") + foreach(arg IN LISTS "${build_type}_command") + string(APPEND line " \"${arg}\"") + endforeach() + set("${out_var}" "${${out_var}}${line}\"\n\n" PARENT_SCOPE) +endfunction() + + function(vcpkg_configure_cmake) cmake_parse_arguments(PARSE_ARGV 0 arg "PREFER_NINJA;DISABLE_PARALLEL_CONFIGURE;NO_CHARSET_FLAG;Z_GET_CMAKE_VARS_USAGE" @@ -93,16 +110,17 @@ function(vcpkg_configure_cmake) message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake; using both vcpkg-cmake and vcpkg_configure_cmake in the same port is unsupported.") endif() - if(NOT VCPKG_PLATFORM_TOOLSET) - message(FATAL_ERROR "Vcpkg has been updated with VS2017 support; " - "however, vcpkg.exe must be rebuilt by re-running bootstrap-vcpkg.bat\n") + if(DEFINED arg_UNPARSED_ARGUMENTS) + message(WARNING "${CMAKE_CURRENT_FUNCTION} was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - - if(NOT arg_LOGNAME) - set(arg_LOGNAME config-${TARGET_TRIPLET}) + if(NOT DEFINED arg_SOURCE_PATH) + message(FATAL_ERROR "SOURCE_PATH must be specified") + endif() + if(NOT DEFINED arg_LOGNAME) + set(arg_LOGNAME "config-${TARGET_TRIPLET}") endif() - set(manually_specified_variables "") + vcpkg_list(SET manually_specified_variables) if(arg_Z_GET_CMAKE_VARS_USAGE) set(configuring_message "Getting CMake variables for ${TARGET_TRIPLET}") @@ -110,153 +128,123 @@ function(vcpkg_configure_cmake) set(configuring_message "Configuring ${TARGET_TRIPLET}") foreach(option IN LISTS arg_OPTIONS arg_OPTIONS_RELEASE arg_OPTIONS_DEBUG) - if(option MATCHES "^-D([^:=]*)[:=]") - list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") + if("${option}" MATCHES "^-D([^:=]*)[:=]") + vcpkg_list(APPEND manually_specified_variables "${CMAKE_MATCH_1}") endif() endforeach() - list(REMOVE_DUPLICATES manually_specified_variables) - list(REMOVE_ITEM manually_specified_variables ${arg_MAYBE_UNUSED_VARIABLES}) + vcpkg_list(REMOVE_DUPLICATES manually_specified_variables) + foreach(maybe_unused_var IN LISTS arg_MAYBE_UNUSED_VARIABLES) + vcpkg_list(REMOVE_ITEM manually_specified_variables "${maybe_unused_var}") + endforeach() debug_message("manually specified variables: ${manually_specified_variables}") endif() - if(CMAKE_HOST_WIN32) + set(ninja_can_be_used ON) # Ninja as generator + set(ninja_host ON) # Ninja as parallel configurator + + if(VCPKG_HOST_IS_WINDOWS) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) - set(arg_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") else() - set(arg_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) + set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}") endif() - endif() - set(NINJA_CAN_BE_USED ON) # Ninja as generator - set(NINJA_HOST ON) # Ninja as parallel configurator - - if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - set(_TARGETTING_UWP 1) + if("${host_arch}" STREQUAL "x86") + # Prebuilt ninja binaries are only provided for x64 hosts + set(ninja_can_be_used OFF) + set(ninja_host OFF) + elseif(VCPKG_TARGET_IS_UWP) + # Ninja and MSBuild have many differences when targeting UWP, so use MSBuild to maximize existing compatibility + set(ninja_can_be_used OFF) + endif() endif() - if(arg_HOST_ARCHITECTURE STREQUAL "x86") - # Prebuilt ninja binaries are only provided for x64 hosts - set(NINJA_CAN_BE_USED OFF) - set(NINJA_HOST OFF) - elseif(_TARGETTING_UWP) - # Ninja and MSBuild have many differences when targetting UWP, so use MSBuild to maximize existing compatibility - set(NINJA_CAN_BE_USED OFF) - endif() + set(generator "") + set(generator_arch "") + if(DEFINED arg_GENERATOR) + set(generator "${arg_GENERATOR}") + elseif(arg_PREFER_NINJA AND ninja_can_be_used) + set(generator "Ninja") + elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + set(generator "Ninja") - if(arg_GENERATOR) - set(GENERATOR ${arg_GENERATOR}) - elseif(arg_PREFER_NINJA AND NINJA_CAN_BE_USED) - set(GENERATOR "Ninja") - elseif(VCPKG_CHAINLOAD_TOOLCHAIN_FILE OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT _TARGETTING_UWP)) - set(GENERATOR "Ninja") - - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120") - set(GENERATOR "Visual Studio 12 2013") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120") - set(GENERATOR "Visual Studio 12 2013 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v120") - set(GENERATOR "Visual Studio 12 2013 ARM") - - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(GENERATOR "Visual Studio 14 2015") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(GENERATOR "Visual Studio 14 2015 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v140") - set(GENERATOR "Visual Studio 14 2015 ARM") - - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(GENERATOR "Visual Studio 15 2017") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(GENERATOR "Visual Studio 15 2017 Win64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(GENERATOR "Visual Studio 15 2017 ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v141") - set(GENERATOR "Visual Studio 15 2017") - set(ARCH "ARM64") - - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(GENERATOR "Visual Studio 16 2019") - set(ARCH "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(GENERATOR "Visual Studio 16 2019") - set(ARCH "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(GENERATOR "Visual Studio 16 2019") - set(ARCH "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v142") - set(GENERATOR "Visual Studio 16 2019") - set(ARCH "ARM64") - - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") - set(GENERATOR "Visual Studio 17 2022") - set(ARCH "Win32") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") - set(GENERATOR "Visual Studio 17 2022") - set(ARCH "x64") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") - set(GENERATOR "Visual Studio 17 2022") - set(ARCH "ARM") - elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET STREQUAL "v143") - set(GENERATOR "Visual Studio 17 2022") - set(ARCH "ARM64") else() - if(NOT VCPKG_CMAKE_SYSTEM_NAME) - set(VCPKG_CMAKE_SYSTEM_NAME Windows) + if("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v120" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 12 2013") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v140" AND NOT "${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator "Visual Studio 14 2015") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v141") + set(generator "Visual Studio 15 2017") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v142") + set(generator "Visual Studio 16 2019") + elseif("${VCPKG_PLATFORM_TOOLSET}" STREQUAL "v143") + set(generator "Visual Studio 17 2022") + endif() + + if("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x86") + set(generator_arch "Win32") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "x64") + set(generator_arch "x64") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm") + set(generator_arch "ARM") + elseif("${VCPKG_TARGET_ARCHITECTURE}" STREQUAL "arm64") + set(generator_arch "ARM64") + endif() + + if("${generator}" STREQUAL "" OR "${generator_arch}" STREQUAL "") + message(FATAL_ERROR + "Unable to determine appropriate generator for triplet ${TARGET_TRIPLET}: + platform toolset: ${VCPKG_PLATFORM_TOOLSET} + architecture : ${VCPKG_TARGET_ARCHITECTURE}") endif() - message(FATAL_ERROR "Unable to determine appropriate generator for: " - "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}-${VCPKG_PLATFORM_TOOLSET}") endif() # If we use Ninja, make sure it's on PATH - if(GENERATOR STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) + if("${generator}" STREQUAL "Ninja" AND NOT DEFINED ENV{VCPKG_FORCE_SYSTEM_BINARIES}) vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY) vcpkg_add_to_path("${NINJA_PATH}") - list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_MAKE_PROGRAM=${NINJA}") endif() - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + file(REMOVE_RECURSE + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") if(DEFINED VCPKG_CMAKE_SYSTEM_NAME) - list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") - if(_TARGETTING_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}") + if(VCPKG_TARGET_IS_UWP AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) - elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android" AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) + elseif(VCPKG_TARGET_IS_ANDROID AND NOT DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(VCPKG_CMAKE_SYSTEM_VERSION 21) endif() endif() if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) - list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}") endif() - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=ON) - elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=OFF) + if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "dynamic") + vcpkg_list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=ON) + elseif("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static") + vcpkg_list(APPEND arg_OPTIONS -DBUILD_SHARED_LIBS=OFF) else() message(FATAL_ERROR - "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". " - "It must be \"static\" or \"dynamic\"") + "Invalid setting for VCPKG_LIBRARY_LINKAGE: \"${VCPKG_LIBRARY_LINKAGE}\". + It must be \"static\" or \"dynamic\"") endif() - macro(check_both_vars_are_set var1 var2) - if((NOT DEFINED ${var1} OR NOT DEFINED ${var2}) AND (DEFINED ${var1} OR DEFINED ${var2})) - message(FATAL_ERROR "Both ${var1} and ${var2} must be set.") - endif() - endmacro() - - check_both_vars_are_set(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) - check_both_vars_are_set(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE) - check_both_vars_are_set(VCPKG_CXX_FLAGS VCPKG_C_FLAGS) + z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS_DEBUG VCPKG_C_FLAGS_DEBUG) + z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS_RELEASE VCPKG_C_FLAGS_RELEASE) + z_vcpkg_configure_cmake_both_or_neither_set(VCPKG_CXX_FLAGS VCPKG_C_FLAGS) - set(VCPKG_SET_CHARSET_FLAG ON) + set(vcpkg_set_charset_flag ON) if(arg_NO_CHARSET_FLAG) - set(VCPKG_SET_CHARSET_FLAG OFF) + set(vcpkg_set_charset_flag OFF) endif() if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - if(NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR _TARGETTING_UWP) + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/windows.cmake") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${SCRIPTS}/toolchains/linux.cmake") @@ -275,11 +263,10 @@ function(vcpkg_configure_cmake) endif() endif() - list(JOIN VCPKG_TARGET_ARCHITECTURE "\;" target_architecure_string) - list(APPEND arg_OPTIONS + vcpkg_list(APPEND arg_OPTIONS "-DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}" "-DVCPKG_TARGET_TRIPLET=${TARGET_TRIPLET}" - "-DVCPKG_SET_CHARSET_FLAG=${VCPKG_SET_CHARSET_FLAG}" + "-DVCPKG_SET_CHARSET_FLAG=${vcpkg_set_charset_flag}" "-DVCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}" "-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON" "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON" @@ -299,118 +286,108 @@ function(vcpkg_configure_cmake) "-DVCPKG_LINKER_FLAGS=${VCPKG_LINKER_FLAGS}" "-DVCPKG_LINKER_FLAGS_RELEASE=${VCPKG_LINKER_FLAGS_RELEASE}" "-DVCPKG_LINKER_FLAGS_DEBUG=${VCPKG_LINKER_FLAGS_DEBUG}" - "-DVCPKG_TARGET_ARCHITECTURE=${target_architecure_string}" + "-DVCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}" "-DCMAKE_INSTALL_LIBDIR:STRING=lib" "-DCMAKE_INSTALL_BINDIR:STRING=bin" "-D_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" + "-DZ_VCPKG_ROOT_DIR=${VCPKG_ROOT_DIR}" "-D_VCPKG_INSTALLED_DIR=${_VCPKG_INSTALLED_DIR}" "-DVCPKG_MANIFEST_INSTALL=OFF" ) - if(DEFINED ARCH) - list(APPEND arg_OPTIONS - "-A${ARCH}" - ) + if(NOT "${generator_arch}" STREQUAL "") + vcpkg_list(APPEND arg_OPTIONS "-A${generator_arch}") endif() # Sets configuration variables for macOS builds - foreach(config_var INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) - if(DEFINED VCPKG_${config_var}) - list(JOIN VCPKG_${config_var} "\;" config_var_value) - list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${config_var_value}") + foreach(config_var IN ITEMS INSTALL_NAME_DIR OSX_DEPLOYMENT_TARGET OSX_SYSROOT OSX_ARCHITECTURES) + if(DEFINED "VCPKG_${config_var}") + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_${config_var}=${VCPKG_${config_var}}") endif() endforeach() - set(rel_command - ${CMAKE_COMMAND} ${arg_SOURCE_PATH} "${arg_OPTIONS}" "${arg_OPTIONS_RELEASE}" - -G ${GENERATOR} + vcpkg_list(SET rel_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} + -G "${generator}" -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}) - set(dbg_command - ${CMAKE_COMMAND} ${arg_SOURCE_PATH} "${arg_OPTIONS}" "${arg_OPTIONS_DEBUG}" - -G ${GENERATOR} + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}") + vcpkg_list(SET dbg_command + "${CMAKE_COMMAND}" "${arg_SOURCE_PATH}" ${arg_OPTIONS} ${arg_OPTIONS_DEBUG} + -G "${generator}" -DCMAKE_BUILD_TYPE=Debug - -DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug) + "-DCMAKE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug") - if(NINJA_HOST AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) - list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") + if(ninja_host AND CMAKE_HOST_WIN32 AND NOT arg_DISABLE_PARALLEL_CONFIGURE) + vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_DISABLE_SOURCE_CHANGES=ON") vcpkg_find_acquire_program(NINJA) - get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) + get_filename_component(NINJA_PATH "${NINJA}" DIRECTORY) vcpkg_add_to_path("${NINJA_PATH}") #parallelize the configure step - set(_contents - "rule CreateProcess\n command = $process\n\n" + set(ninja_configure_contents + "rule CreateProcess\n command = \$process\n\n" ) - macro(_build_cmakecache whereat build_type) - set(${build_type}_line "build ${whereat}/CMakeCache.txt: CreateProcess\n process = cmd /c \"cd ${whereat} &&") - foreach(arg ${${build_type}_command}) - set(${build_type}_line "${${build_type}_line} \"${arg}\"") - endforeach() - set(_contents "${_contents}${${build_type}_line}\"\n\n") - endmacro() - - if(NOT DEFINED VCPKG_BUILD_TYPE) - _build_cmakecache(".." "rel") - _build_cmakecache("../../${TARGET_TRIPLET}-dbg" "dbg") - elseif(VCPKG_BUILD_TYPE STREQUAL "release") - _build_cmakecache(".." "rel") - elseif(VCPKG_BUILD_TYPE STREQUAL "debug") - _build_cmakecache("../../${TARGET_TRIPLET}-dbg" "dbg") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents ".." "rel") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") + z_vcpkg_configure_cmake_build_cmakecache(ninja_configure_contents "../../${TARGET_TRIPLET}-dbg" "dbg") endif() - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure) - file(WRITE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja "${_contents}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure") + file(WRITE + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure/build.ninja" + "${ninja_configure_contents}") message(STATUS "${configuring_message}") vcpkg_execute_required_process( COMMAND ninja -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure - LOGNAME ${arg_LOGNAME} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/vcpkg-parallel-configure" + LOGNAME "${arg_LOGNAME}" ) - list(APPEND config_logs + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-err.log") else() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "debug") message(STATUS "${configuring_message}-dbg") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") vcpkg_execute_required_process( COMMAND ${dbg_command} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME ${arg_LOGNAME}-dbg + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" + LOGNAME "${arg_LOGNAME}-dbg" ) - list(APPEND config_logs + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-dbg-err.log") endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(NOT DEFINED VCPKG_BUILD_TYPE OR "${VCPKG_BUILD_TYPE}" STREQUAL "release") message(STATUS "${configuring_message}-rel") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") vcpkg_execute_required_process( COMMAND ${rel_command} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME ${arg_LOGNAME}-rel + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" + LOGNAME "${arg_LOGNAME}-rel" ) - list(APPEND config_logs + vcpkg_list(APPEND config_logs "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-out.log" "${CURRENT_BUILDTREES_DIR}/${arg_LOGNAME}-rel-err.log") endif() endif() # Check unused variables - set(all_unused_variables) + vcpkg_list(SET all_unused_variables) foreach(config_log IN LISTS config_logs) - if (NOT EXISTS "${config_log}") + if(NOT EXISTS "${config_log}") continue() endif() file(READ "${config_log}" log_contents) debug_message("Reading configure log ${config_log}...") - if(NOT log_contents MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") + if(NOT "${log_contents}" MATCHES "Manually-specified variables were not used by the project:\n\n(( [^\n]*\n)*)") continue() endif() string(STRIP "${CMAKE_MATCH_1}" unused_variables) # remove leading ` ` and trailing `\n` @@ -418,18 +395,18 @@ function(vcpkg_configure_cmake) debug_message("unused variables: ${unused_variables}") foreach(unused_variable IN LISTS unused_variables) - if(unused_variable IN_LIST manually_specified_variables) + if("${unused_variable}" IN_LIST manually_specified_variables) debug_message("manually specified unused variable: ${unused_variable}") - list(APPEND all_unused_variables "${unused_variable}") + vcpkg_list(APPEND all_unused_variables "${unused_variable}") else() debug_message("unused variable (not manually specified): ${unused_variable}") endif() endforeach() endforeach() - if(DEFINED all_unused_variables) - list(REMOVE_DUPLICATES all_unused_variables) - list(JOIN all_unused_variables "\n " all_unused_variables) + if(NOT "${all_unused_variables}" STREQUAL "") + vcpkg_list(REMOVE_DUPLICATES all_unused_variables) + vcpkg_list(JOIN all_unused_variables "\n " all_unused_variables) message(WARNING "The following variables are not used in CMakeLists.txt: ${all_unused_variables} Please recheck them and remove the unnecessary options from the `vcpkg_configure_cmake` call. @@ -437,6 +414,6 @@ If these options should still be passed for whatever reason, please use the `MAY endif() if(NOT arg_Z_GET_CMAKE_VARS_USAGE) - set(Z_VCPKG_CMAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE) + set(Z_VCPKG_CMAKE_GENERATOR "${generator}" PARENT_SCOPE) endif() endfunction() diff --git a/scripts/cmake/vcpkg_install_cmake.cmake b/scripts/cmake/vcpkg_install_cmake.cmake index b94a3a4846448e..9582419ecd4eaa 100644 --- a/scripts/cmake/vcpkg_install_cmake.cmake +++ b/scripts/cmake/vcpkg_install_cmake.cmake @@ -34,15 +34,15 @@ function(vcpkg_install_cmake) message(FATAL_ERROR "vcpkg_cmake_install was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") endif() - set(args) + vcpkg_list(SET params) foreach(arg IN ITEMS DISABLE_PARALLEL ADD_BIN_TO_PATH) if(arg_${arg}) - list(APPEND args "${arg}") + vcpkg_list(APPEND params "${arg}") endif() endforeach() vcpkg_build_cmake(Z_VCPKG_DISABLE_DEPRECATION MESSAGE - ${args} + ${params} LOGFILE_ROOT install TARGET install ) From 69aa23b9ee4b4dbc7c625c75eadc48e83f7c9296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Sat, 6 Nov 2021 07:55:23 +0800 Subject: [PATCH 1031/1858] [scripts-audit] QMake buildsystem (#20322) * [scripts-audit] QMake buildsystem * Apply suggestions * Change qt5-base as a host port * version * Fix installation * Apply suggestions * Update doc * Typo * update doc * Fix bug * fix vcpkg_host_path_list issue * Process more host path * Apply suggestions * Apply suggestions * Apply suggestions from code review * more changes * Apply suggestions Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca --- docs/maintainers/vcpkg_configure_qmake.md | 8 +- ports/qt5-base/vcpkg.json | 7 +- scripts/cmake/vcpkg_build_qmake.cmake | 115 +++++++----------- scripts/cmake/vcpkg_configure_qmake.cmake | 140 +++++++++++----------- scripts/cmake/vcpkg_install_qmake.cmake | 63 +++++----- versions/baseline.json | 2 +- versions/q-/qt5-base.json | 5 + 7 files changed, 171 insertions(+), 169 deletions(-) diff --git a/docs/maintainers/vcpkg_configure_qmake.md b/docs/maintainers/vcpkg_configure_qmake.md index 53526e10321468..6b980b3c0f1c65 100644 --- a/docs/maintainers/vcpkg_configure_qmake.md +++ b/docs/maintainers/vcpkg_configure_qmake.md @@ -10,6 +10,9 @@ vcpkg_configure_qmake( [OPTIONS arg1 [arg2 ...]] [OPTIONS_RELEASE arg1 [arg2 ...]] [OPTIONS_DEBUG arg1 [arg2 ...]] + [BUILD_OPTIONS arg1 [arg2 ...]] + [BUILD_OPTIONS_RELEASE arg1 [arg2 ...]] + [BUILD_OPTIONS_DEBUG arg1 [arg2 ...]] ) ``` @@ -17,7 +20,10 @@ vcpkg_configure_qmake( The path to the *.pro qmake project file. ### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG -The options passed to qmake. +The options passed to qmake to the configure step. + +### BUILD\_OPTIONS, BUILD\_OPTIONS\_RELEASE, BUILD\_OPTIONS\_DEBUG +The options passed to qmake to the build step. ## Source [scripts/cmake/vcpkg\_configure\_qmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_configure_qmake.cmake) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 6115a5e4fd4afa..072baa2f1f1bbc 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 11, + "port-version": 12, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ @@ -25,6 +25,11 @@ "libpng", "openssl", "pcre2", + { + "name": "qt5-base", + "host": true, + "default-features": false + }, "sqlite3", { "name": "vcpkg-pkgconfig-get-modules", diff --git a/scripts/cmake/vcpkg_build_qmake.cmake b/scripts/cmake/vcpkg_build_qmake.cmake index 6b85234c838793..d592a2eeac613a 100644 --- a/scripts/cmake/vcpkg_build_qmake.cmake +++ b/scripts/cmake/vcpkg_build_qmake.cmake @@ -8,102 +8,79 @@ vcpkg_build_qmake() ``` #]===] +function(z_run_jom_build invoke_command targets log_prefix log_suffix) + message(STATUS "Package ${log_prefix}-${TARGET_TRIPLET}-${log_suffix}") + vcpkg_execute_build_process( + COMMAND "${invoke_command}" -j ${VCPKG_CONCURRENCY} ${targets} + NO_PARALLEL_COMMAND "${invoke_command}" -j 1 ${targets} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${log_suffix}" + LOGNAME "package-${log_prefix}-${TARGET_TRIPLET}-${log_suffix}" + ) +endfunction() + function(vcpkg_build_qmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _csc "SKIP_MAKEFILES" "BUILD_LOGNAME" "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS") + cmake_parse_arguments(PARSE_ARGV 0 arg + "SKIP_MAKEFILES" + "BUILD_LOGNAME" + "TARGETS;RELEASE_TARGETS;DEBUG_TARGETS" + ) + + # Make sure that the linker finds the libraries used + vcpkg_backup_env_variables(VARS PATH LD_LIBRARY_PATH CL _CL_) + + # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings + set(ENV{_CL_} "/utf-8") if(CMAKE_HOST_WIN32) if (VCPKG_QMAKE_USE_NMAKE) find_program(NMAKE nmake) - set(INVOKE "${NMAKE}") - get_filename_component(NMAKE_EXE_PATH ${NMAKE} DIRECTORY) - set(PATH_GLOBAL "$ENV{PATH}") - set(ENV{PATH} "$ENV{PATH};${NMAKE_EXE_PATH}") + set(invoke_command "${NMAKE}") + get_filename_component(nmake_exe_path "${NMAKE}" DIRECTORY) + vcpkg_host_path_list(APPEND ENV{PATH} "${nmake_exe_path}") set(ENV{CL} "$ENV{CL} /MP${VCPKG_CONCURRENCY}") else() vcpkg_find_acquire_program(JOM) - set(INVOKE "${JOM}") + set(invoke_command "${JOM}") endif() else() find_program(MAKE make) - set(INVOKE "${MAKE}") + set(invoke_command "${MAKE}") endif() - # Make sure that the linker finds the libraries used - set(ENV_PATH_BACKUP "$ENV{PATH}") - file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR) - if(NOT _csc_BUILD_LOGNAME) - set(_csc_BUILD_LOGNAME build) + if(NOT DEFINED arg_BUILD_LOGNAME) + set(arg_BUILD_LOGNAME build) endif() - function(run_jom TARGETS LOG_PREFIX LOG_SUFFIX) - message(STATUS "Package ${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX}") - vcpkg_execute_build_process( - COMMAND ${INVOKE} -j ${VCPKG_CONCURRENCY} ${TARGETS} - NO_PARALLEL_COMMAND ${INVOKE} -j 1 ${TARGETS} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${LOG_SUFFIX} - LOGNAME package-${LOG_PREFIX}-${TARGET_TRIPLET}-${LOG_SUFFIX} - ) - endfunction() + set(short_name_debug "dbg") + set(path_suffix_debug "/debug") + set(targets_debug "${arg_DEBUG_TARGETS}") - # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings - set(ENV_CL_BACKUP "$ENV{_CL_}") - set(ENV{_CL_} "/utf-8") - - #Replace with VCPKG variables if PR #7733 is merged - unset(BUILDTYPES) - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(_buildname "DEBUG") - list(APPEND BUILDTYPES ${_buildname}) - set(_short_name_${_buildname} "dbg") - set(_path_suffix_${_buildname} "/debug") - endif() - if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(_buildname "RELEASE") - list(APPEND BUILDTYPES ${_buildname}) - set(_short_name_${_buildname} "rel") - set(_path_suffix_${_buildname} "") - endif() - unset(_buildname) + set(short_name_release "rel") + set(path_suffix_release "") + set(targets_release "${arg_RELEASE_TARGETS}") - foreach(_buildname ${BUILDTYPES}) - set(_installed_prefix_ "${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}") - set(_installed_libpath_ "${_installed_prefix_}/lib/${VCPKG_HOST_PATH_SEPARATOR}${_installed_prefix_}/lib/manual-link/") + foreach(build_type IN ITEMS debug release) + set(current_installed_prefix "${CURRENT_INSTALLED_DIR}${path_suffix_${build_type}}") - vcpkg_add_to_path(PREPEND "${_installed_prefix_}/bin") - vcpkg_add_to_path(PREPEND "${_installed_prefix_}/lib") + vcpkg_add_to_path(PREPEND "${current_installed_prefix}/lib" "${current_installed_prefix}/bin") # We set LD_LIBRARY_PATH ENV variable to allow executing Qt tools (rcc,...) even with dynamic linking if(CMAKE_HOST_UNIX) - if(DEFINED ENV{LD_LIBRARY_PATH}) - set(_ld_library_path_defined_ TRUE) - set(_ld_library_path_backup_ $ENV{LD_LIBRARY_PATH}) - set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}${VCPKG_HOST_PATH_SEPARATOR}${_ld_library_path_backup_}") - else() - set(_ld_library_path_defined_ FALSE) - set(ENV{LD_LIBRARY_PATH} "${_installed_libpath_}") - endif() - endif() - - list(APPEND _csc_${_buildname}_TARGETS ${_csc_TARGETS}) - if(NOT _csc_SKIP_MAKEFILES) - run_jom(qmake_all makefiles ${_short_name_${_buildname}}) + set(ENV{LD_LIBRARY_PATH} "") + vcpkg_host_path_list(APPEND ENV{LD_LIBRARY_PATH} "${current_installed_prefix}/lib" "${current_installed_prefix}/lib/manual-link") endif() - run_jom("${_csc_${_buildname}_TARGETS}" ${_csc_BUILD_LOGNAME} ${_short_name_${_buildname}}) - # Restore backup - if(CMAKE_HOST_UNIX) - if(_ld_library_path_defined_) - set(ENV{LD_LIBRARY_PATH} "${_ld_library_path_backup_}") - else() - unset(ENV{LD_LIBRARY_PATH}) - endif() + vcpkg_list(SET targets ${targets_${build_type}} ${arg_TARGETS}) + if(NOT arg_SKIP_MAKEFILES) + z_run_jom_build("${invoke_command}" qmake_all makefiles "${short_name_${build_type}}") endif() + z_run_jom_build("${invoke_command}" "${targets}" "${arg_BUILD_LOGNAME}" "${short_name_${build_type}}") + + vcpkg_restore_env_variables(VARS PATH LD_LIBRARY_PATH) endforeach() - # Restore the original value of ENV{PATH} - set(ENV{PATH} "${ENV_PATH_BACKUP}") - set(ENV{_CL_} "${ENV_CL_BACKUP}") + vcpkg_restore_env_variables(VARS CL _CL_) endfunction() diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index 6fa3a609a5cc50..0bed7567e3c761 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -9,6 +9,9 @@ vcpkg_configure_qmake( [OPTIONS arg1 [arg2 ...]] [OPTIONS_RELEASE arg1 [arg2 ...]] [OPTIONS_DEBUG arg1 [arg2 ...]] + [BUILD_OPTIONS arg1 [arg2 ...]] + [BUILD_OPTIONS_RELEASE arg1 [arg2 ...]] + [BUILD_OPTIONS_DEBUG arg1 [arg2 ...]] ) ``` @@ -16,118 +19,121 @@ vcpkg_configure_qmake( The path to the *.pro qmake project file. ### OPTIONS, OPTIONS\_RELEASE, OPTIONS\_DEBUG -The options passed to qmake. +The options passed to qmake to the configure step. + +### BUILD\_OPTIONS, BUILD\_OPTIONS\_RELEASE, BUILD\_OPTIONS\_DEBUG +The options passed to qmake to the build step. #]===] function(vcpkg_configure_qmake) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _csc "" "SOURCE_PATH" "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;BUILD_OPTIONS;BUILD_OPTIONS_RELEASE;BUILD_OPTIONS_DEBUG") - + cmake_parse_arguments(PARSE_ARGV 0 arg + "" + "SOURCE_PATH" + "OPTIONS;OPTIONS_RELEASE;OPTIONS_DEBUG;BUILD_OPTIONS;BUILD_OPTIONS_RELEASE;BUILD_OPTIONS_DEBUG" + ) + # Find qmake executable - set(_triplet_hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin) - if(DEFINED VCPKG_QT_HOST_TOOLS_ROOT_DIR) - find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir} NO_DEFAULT_PATH) - else() - find_program(QMAKE_COMMAND NAMES qmake PATHS ${_triplet_hostbindir} NO_DEFAULT_PATH) - endif() + find_program(qmake_executable NAMES qmake PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools/qt5/bin" NO_DEFAULT_PATH) - if(NOT QMAKE_COMMAND) + if(NOT qmake_executable) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - list(APPEND _csc_OPTIONS "CONFIG-=shared") - list(APPEND _csc_OPTIONS "CONFIG*=static") + vcpkg_list(APPEND arg_OPTIONS "CONFIG-=shared" "CONFIG*=static") else() - list(APPEND _csc_OPTIONS "CONFIG-=static") - list(APPEND _csc_OPTIONS "CONFIG*=shared") - list(APPEND _csc_OPTIONS_DEBUG "CONFIG*=separate_debug_info") + vcpkg_list(APPEND arg_OPTIONS "CONFIG-=static" "CONFIG*=shared") + vcpkg_list(APPEND arg_OPTIONS_DEBUG "CONFIG*=separate_debug_info") endif() - + if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_CRT_LINKAGE STREQUAL "static") - list(APPEND _csc_OPTIONS "CONFIG*=static-runtime") + vcpkg_list(APPEND arg_OPTIONS "CONFIG*=static-runtime") endif() - # Cleanup build directories - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET) set(ENV{QMAKE_MACOSX_DEPLOYMENT_TARGET} ${VCPKG_OSX_DEPLOYMENT_TARGET}) endif() + vcpkg_backup_env_variables(VARS PKG_CONFIG_PATH) + vcpkg_find_acquire_program(PKGCONFIG) set(ENV{PKG_CONFIG} "${PKGCONFIG}") get_filename_component(PKGCONFIG_PATH "${PKGCONFIG}" DIRECTORY) vcpkg_add_to_path("${PKGCONFIG_PATH}") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(_config RELEASE) - set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig") - set(PKGCONFIG_PACKAGES_DIR "${_VCPKG_PACKAGES_PKGCONF}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_PACKAGES_SHARE_DIR "${_VCPKG_PACKAGES_PKGCONF}/share/pkgconfig") - if(DEFINED ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH_${_config} $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") - else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") - endif() + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} + "${CURRENT_INSTALLED_DIR}/lib/pkgconfig" + "${CURRENT_INSTALLED_DIR}/share/pkgconfig" + "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/share/pkgconfig") - configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf) + set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + + # Cleanup build directories + file(REMOVE_RECURSE "${current_binary_dir}") + + configure_file("${CURRENT_INSTALLED_DIR}/tools/qt5/qt_release.conf" "${current_binary_dir}/qt.conf") message(STATUS "Configuring ${TARGET_TRIPLET}-rel") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - if(DEFINED _csc_BUILD_OPTIONS OR DEFINED _csc_BUILD_OPTIONS_RELEASE) - set(BUILD_OPT -- ${_csc_BUILD_OPTIONS} ${_csc_BUILD_OPTIONS_RELEASE}) + file(MAKE_DIRECTORY "${current_binary_dir}") + + vcpkg_list(SET build_opt_param) + if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_RELEASE) + vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_RELEASE}) endif() + vcpkg_execute_required_process( - COMMAND ${QMAKE_COMMAND} CONFIG-=debug CONFIG+=release - ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE} ${_csc_SOURCE_PATH} - -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/qt.conf" - ${BUILD_OPT} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel - LOGNAME config-${TARGET_TRIPLET}-rel + COMMAND "${qmake_executable}" CONFIG-=debug CONFIG+=release + ${arg_OPTIONS} ${arg_OPTIONS_RELEASE} ${arg_SOURCE_PATH} + -qtconf "${current_binary_dir}/qt.conf" + ${build_opt_param} + WORKING_DIRECTORY "${current_binary_dir}" + LOGNAME "config-${TARGET_TRIPLET}-rel" ) message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log") + if(EXISTS "${current_binary_dir}/config.log") file(REMOVE "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-rel.log") - file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-rel.log") + file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-rel.log") endif() + + vcpkg_restore_env_variables(VARS PKG_CONFIG_PATH) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(_config DEBUG) - set(PATH_SUFFIX_DEBUG /debug) - set(PKGCONFIG_INSTALLED_DIR "${_VCPKG_INSTALLED_PKGCONF}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_INSTALLED_SHARE_DIR "${_VCPKG_INSTALLED_PKGCONF}/share/pkgconfig") - set(PKGCONFIG_PACKAGES_DIR "${_VCPKG_PACKAGES_PKGCONF}${PATH_SUFFIX_${_config}}/lib/pkgconfig") - set(PKGCONFIG_PACKAGES_SHARE_DIR "${_VCPKG_PACKAGES_PKGCONF}/share/pkgconfig") - if(DEFINED ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH_${_config} $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") - else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_INSTALLED_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_PACKAGES_SHARE_DIR}") - endif() + vcpkg_host_path_list(PREPEND ENV{PKG_CONFIG_PATH} + "${CURRENT_INSTALLED_DIR}/debug/lib/pkgconfig" + "${CURRENT_INSTALLED_DIR}/share/pkgconfig" + "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig" + "${CURRENT_PACKAGES_DIR}/share/pkgconfig") + + set(current_binary_dir "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") - configure_file(${CURRENT_INSTALLED_DIR}/tools/qt5/qt_debug.conf ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf) + # Cleanup build directories + file(REMOVE_RECURSE "${current_binary_dir}") + + configure_file("${CURRENT_INSTALLED_DIR}/tools/qt5/qt_debug.conf" "${current_binary_dir}/qt.conf") message(STATUS "Configuring ${TARGET_TRIPLET}-dbg") - file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg) - if(DEFINED _csc_BUILD_OPTIONS OR DEFINED _csc_BUILD_OPTIONS_DEBUG) - set(BUILD_OPT -- ${_csc_BUILD_OPTIONS} ${_csc_BUILD_OPTIONS_DEBUG}) + file(MAKE_DIRECTORY "${current_binary_dir}") + + vcpkg_list(SET build_opt_param) + if(DEFINED arg_BUILD_OPTIONS OR DEFINED arg_BUILD_OPTIONS_DEBUG) + vcpkg_list(SET build_opt_param -- ${arg_BUILD_OPTIONS} ${arg_BUILD_OPTIONS_DEBUG}) endif() vcpkg_execute_required_process( - COMMAND ${QMAKE_COMMAND} CONFIG-=release CONFIG+=debug - ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG} ${_csc_SOURCE_PATH} - -qtconf "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/qt.conf" - ${BUILD_OPT} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg - LOGNAME config-${TARGET_TRIPLET}-dbg + COMMAND "${qmake_executable}" CONFIG-=release CONFIG+=debug + ${arg_OPTIONS} ${arg_OPTIONS_DEBUG} ${arg_SOURCE_PATH} + -qtconf "${current_binary_dir}/qt.conf" + ${build_opt_param} + WORKING_DIRECTORY "${current_binary_dir}" + LOGNAME "config-${TARGET_TRIPLET}-dbg" ) message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log") + if(EXISTS "${current_binary_dir}/config.log") file(REMOVE "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") - file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") + file(RENAME "${current_binary_dir}/config.log" "${CURRENT_BUILDTREES_DIR}/internal-config-${TARGET_TRIPLET}-dbg.log") endif() endif() diff --git a/scripts/cmake/vcpkg_install_qmake.cmake b/scripts/cmake/vcpkg_install_qmake.cmake index d8362697abc762..38d9eacf9d2814 100644 --- a/scripts/cmake/vcpkg_install_qmake.cmake +++ b/scripts/cmake/vcpkg_install_qmake.cmake @@ -23,44 +23,47 @@ staging directories. #]===] function(vcpkg_install_qmake) - vcpkg_build_qmake(${ARGN}) - file(GLOB_RECURSE RELEASE_LIBS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.a - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.so - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.so.* - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dylib + z_vcpkg_function_arguments(args) + + vcpkg_build_qmake(${args}) + + file(GLOB_RECURSE release_libs + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.lib" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.a" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.so" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.so.*" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dylib" ) - file(GLOB_RECURSE RELEASE_BINS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll + file(GLOB_RECURSE release_bins + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*.dll" ) - file(GLOB_RECURSE DEBUG_LIBS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.a - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.so - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.so.* - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dylib + file(GLOB_RECURSE debug_libs + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.lib" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.a" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.so" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.so.*" + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dylib" ) - file(GLOB_RECURSE DEBUG_BINS - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll + file(GLOB_RECURSE debug_bins + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/*.dll" ) - if(NOT RELEASE_LIBS AND NOT DEBUG_LIBS) + if("${release_libs}" STREQUAL "" AND "${debug_libs}" STREQUAL "") message(FATAL_ERROR "Build did not appear to produce any libraries. If this is intended, use `vcpkg_build_qmake()` directly.") endif() - if(RELEASE_LIBS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) - file(COPY ${RELEASE_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + if(NOT "${release_libs}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") + file(COPY ${release_libs} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") endif() - if(DEBUG_LIBS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib) - file(COPY ${DEBUG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + if(NOT "${debug_libs}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") + file(COPY ${debug_libs} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() - if(RELEASE_BINS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(COPY ${RELEASE_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + if(NOT "${release_bins}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(COPY ${release_bins} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") endif() - if(DEBUG_BINS) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(COPY ${DEBUG_BINS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + if(NOT "${debug_bins}" STREQUAL "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(COPY ${debug_bins} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endfunction() diff --git a/versions/baseline.json b/versions/baseline.json index fabea522519841..3843ced9080503 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5462,7 +5462,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 11 + "port-version": 12 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index ad6aee5fd36913..e51f704074b1e3 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a65e1b0d631a1c2879d566140c11d634601fca6", + "version-semver": "5.15.2", + "port-version": 12 + }, { "git-tree": "72ca286ac98e08f2fef35f85a6e393795428d033", "version-semver": "5.15.2", From 11fe225ffadadcc175abf451efe1c80fb4cd33a9 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 8 Nov 2021 11:03:22 -0800 Subject: [PATCH 1032/1858] [azure-core-cpp] Update to 1.3.1 (#21220) ## 1.3.1 (2021-11-05) ### Bugs Fixed - Fixed linking error when Azure SDK is being built as DLL. --- ports/azure-core-cpp/portfile.cmake | 4 ++-- ports/azure-core-cpp/vcpkg.json | 2 +- versions/a-/azure-core-cpp.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake index 2a5471e3e1d012..82279f8f189b31 100644 --- a/ports/azure-core-cpp/portfile.cmake +++ b/ports/azure-core-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-core_1.2.1 - SHA512 3628c4845eb1a842a06339a606fba8ae127f3744a097cc3ecd7552a052b9c932e0a008f8654a4affde68c483be38678a1728bf19d644c6ee04b2cd34f1513b32 + REF azure-core_1.3.1 + SHA512 affdd6387b5b40f0362d4151f91b1a0f3d0269189240baf981e31a9a1860b77d7fcfeb7819f93f9b1e5764ab1ba2190cf1c6261f23345e0928453550f8537de1 ) vcpkg_check_features( diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json index b2dd3697330fb1..91bf1818164b37 100644 --- a/ports/azure-core-cpp/vcpkg.json +++ b/ports/azure-core-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-core-cpp", - "version-semver": "1.2.1", + "version-semver": "1.3.1", "description": [ "Microsoft Azure Core SDK for C++", "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++." diff --git a/versions/a-/azure-core-cpp.json b/versions/a-/azure-core-cpp.json index 64ca6f6d91cc4f..f51e6c6f320473 100644 --- a/versions/a-/azure-core-cpp.json +++ b/versions/a-/azure-core-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b34bd865f3d3caf5b7021d5e9048d775b3e9cfb0", + "version-semver": "1.3.1", + "port-version": 0 + }, { "git-tree": "842ba2028c1b8b50de96e7c27e85959889778ab0", "version-semver": "1.2.1", diff --git a/versions/baseline.json b/versions/baseline.json index 3843ced9080503..35833c1e20e54e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -317,7 +317,7 @@ "port-version": 0 }, "azure-core-cpp": { - "baseline": "1.2.1", + "baseline": "1.3.1", "port-version": 0 }, "azure-identity-cpp": { From fe5370039493dc94c30df79a778a00326f047daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 9 Nov 2021 04:26:22 +0800 Subject: [PATCH 1033/1858] [vcpkg baseline][botan/qca] Fix botan pkgconfig and add botan as a required dependency to qca (#21250) * [vcpkg baseline][botan/qca] Fix botan pkgconfig and add botan as a required dependency to qca * format manifest * version --- ports/botan/portfile.cmake | 12 ++++++++++-- ports/botan/vcpkg.json | 2 +- ports/qca/vcpkg.json | 3 ++- versions/b-/botan.json | 5 +++++ versions/baseline.json | 4 ++-- versions/q-/qca.json | 5 +++++ 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index d6b678e6e643c1..bfc7db36e49f90 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -124,18 +124,26 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") BOTAN_BUILD(dbg) endif() +file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/botan-2.pc" + [[${prefix}/include/botan-2]] + [[${prefix}/include]] + ) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/botan-2.pc" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/botan-2.pc" + [[${prefix}/include/botan-2]] + [[${prefix}/include]] + ) endif() vcpkg_fixup_pkgconfig() -file(RENAME "${CURRENT_PACKAGES_DIR}/include/botan-2/botan" "${CURRENT_PACKAGES_DIR}/include/botan") - vcpkg_copy_pdbs() if(CMAKE_HOST_WIN32) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 09e20ed5ceb87f..01891cc6a8ba08 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.18.1", - "port-version": 2, + "port-version": 3, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/ports/qca/vcpkg.json b/ports/qca/vcpkg.json index e3f5fd3e727556..f8dd9019b91536 100644 --- a/ports/qca/vcpkg.json +++ b/ports/qca/vcpkg.json @@ -1,10 +1,11 @@ { "name": "qca", "version": "2.3.1", - "port-version": 4, + "port-version": 5, "description": "Qt Cryptographic Architecture (QCA).", "homepage": "https://cgit.kde.org/qca.git/", "dependencies": [ + "botan", { "name": "qt5-base", "default-features": false diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 27ad0e37e351b2..78fde907139926 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "045c95bf0e7f1352d91398bc0dc41ce5ec5a288a", + "version": "2.18.1", + "port-version": 3 + }, { "git-tree": "5f002dd083e6eedd3bdd1d2bc7882d34d70ed438", "version": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index 35833c1e20e54e..172e68b861e842 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1126,7 +1126,7 @@ }, "botan": { "baseline": "2.18.1", - "port-version": 2 + "port-version": 3 }, "box2d": { "baseline": "2.4.1", @@ -5414,7 +5414,7 @@ }, "qca": { "baseline": "2.3.1", - "port-version": 4 + "port-version": 5 }, "qcustomplot": { "baseline": "2.0.1", diff --git a/versions/q-/qca.json b/versions/q-/qca.json index c5f16dea4de348..de9cc43aa0c0a5 100644 --- a/versions/q-/qca.json +++ b/versions/q-/qca.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "842dcdd87f56ec4318a5049e95b1eb9807dd2193", + "version": "2.3.1", + "port-version": 5 + }, { "git-tree": "e8275668aade111ed059ddece14bff490ff47fbc", "version": "2.3.1", From 580b1000f58af963ba15bac92f4e1290248ec3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 9 Nov 2021 04:27:18 +0800 Subject: [PATCH 1034/1858] [script audit] Meson buildsystem (#21026) * [script audit] Meson buildsystem * Apply suggestions, fix build * Fix non-Windows build * Fix debug path in meson config * Fix env pkgconfig path * Apply suggestions * Nicole's CRs * oops * Apply suggestions * final changes * fix typoes Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: nicole mazzuca --- scripts/cmake/vcpkg_configure_meson.cmake | 518 +++++++++++----------- scripts/cmake/vcpkg_install_meson.cmake | 84 ++-- 2 files changed, 286 insertions(+), 316 deletions(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index 943631757fa4a9..e0eab209875eaf 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -40,8 +40,8 @@ This command supplies many common arguments to Meson. To see the full list, exam * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake) #]===] -function(vcpkg_internal_meson_generate_native_file _additional_binaries) #https://mesonbuild.com/Native-environments.html - set(NATIVE "[binaries]\n") +function(z_vcpkg_meson_generate_native_file additional_binaries) #https://mesonbuild.com/Native-environments.html + set(native_config "[binaries]\n") #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT) if(VCPKG_TARGET_IS_WINDOWS) set(proglist MT) @@ -51,116 +51,121 @@ function(vcpkg_internal_meson_generate_native_file _additional_binaries) #https: foreach(prog IN LISTS proglist) if(VCPKG_DETECTED_CMAKE_${prog}) string(TOLOWER "${prog}" proglower) - string(APPEND NATIVE "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + string(APPEND native_config "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") endif() endforeach() - set(compiler C CXX RC) - foreach(prog IN LISTS compiler) + set(programs C CXX RC) + foreach(prog IN LISTS programs) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) string(REPLACE "CXX" "CPP" mesonprog "${prog}") string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html string(TOLOWER "${mesonprog}" proglower) - string(APPEND NATIVE "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + string(APPEND native_config "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") endif() endforeach() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - string(APPEND NATIVE "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(APPEND native_config "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() endif() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - string(APPEND NATIVE "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(APPEND native_config "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() endif() - string(APPEND NATIVE "cmake = '${CMAKE_COMMAND}'\n") - foreach(_binary IN LISTS ${_additional_binaries}) - string(APPEND NATIVE "${_binary}\n") + string(APPEND native_config "cmake = '${CMAKE_COMMAND}'\n") + foreach(additional_binary IN LISTS additional_binaries) + string(APPEND native_config "${additional_binary}\n") endforeach() - string(APPEND NATIVE "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html + string(APPEND native_config "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe") # This is currently wrongly documented in the meson docs or buggy. The docs say: 'none' = no flags # In reality however 'none' tries to deactivate eh and meson passes the flags for it resulting in a lot of warnings # about overriden flags. Until this is fixed in meson vcpkg should not pass this here. - # string(APPEND NATIVE "cpp_eh='none'\n") # To make sure meson is not adding eh flags by itself using msvc + # string(APPEND native_config "cpp_eh='none'\n") # To make sure meson is not adding eh flags by itself using msvc endif() if(VCPKG_TARGET_IS_WINDOWS) - string(REGEX REPLACE "( |^)(-|/)" ";\\2" WIN_C_STANDARD_LIBRARIES "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") - string(REGEX REPLACE "\\.lib " ".lib;" WIN_C_STANDARD_LIBRARIES "${WIN_C_STANDARD_LIBRARIES}") - list(TRANSFORM WIN_C_STANDARD_LIBRARIES APPEND "'") - list(TRANSFORM WIN_C_STANDARD_LIBRARIES PREPEND "'") - list(REMOVE_ITEM WIN_C_STANDARD_LIBRARIES "''") - list(JOIN WIN_C_STANDARD_LIBRARIES ", " WIN_C_STANDARD_LIBRARIES) - string(APPEND NATIVE "c_winlibs = [${WIN_C_STANDARD_LIBRARIES}]\n") - string(REGEX REPLACE "( |^)(-|/)" ";\\2" WIN_CXX_STANDARD_LIBRARIES "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") - string(REGEX REPLACE "\\.lib " ".lib;" WIN_CXX_STANDARD_LIBRARIES "${WIN_CXX_STANDARD_LIBRARIES}") - list(TRANSFORM WIN_CXX_STANDARD_LIBRARIES APPEND "'") - list(TRANSFORM WIN_CXX_STANDARD_LIBRARIES PREPEND "'") - list(REMOVE_ITEM WIN_CXX_STANDARD_LIBRARIES "''") - list(JOIN WIN_CXX_STANDARD_LIBRARIES ", " WIN_CXX_STANDARD_LIBRARIES) - string(APPEND NATIVE "cpp_winlibs = [${WIN_CXX_STANDARD_LIBRARIES}]\n") - endif() - - set(_file "${CURRENT_BUILDTREES_DIR}/meson-nativ-${TARGET_TRIPLET}.log") - set(VCPKG_MESON_NATIVE_FILE "${_file}" PARENT_SCOPE) - file(WRITE "${_file}" "${NATIVE}") + set(c_winlibs "${VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES}") + set(cpp_winlibs "${VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES}") + foreach(libvar IN ITEMS c_winlibs cpp_winlibs) + string(REGEX REPLACE "( |^)(-|/)" [[;\2]] "${libvar}" "${${libvar}}") + string(REPLACE ".lib " ".lib;" "${libvar}" "${${libvar}}") + vcpkg_list(REMOVE_ITEM "${libvar}" "") + vcpkg_list(JOIN "${libvar}" "', '" "${libvar}") + string(APPEND native_config "${libvar} = ['${${libvar}}']\n") + endforeach() + endif() + + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-native-${TARGET_TRIPLET}.log") + set(vcpkg_meson_native_file "${native_config_name}" PARENT_SCOPE) + file(WRITE "${native_config_name}" "${native_config}") endfunction() -function(vcpkg_internal_meson_convert_compiler_flags_to_list _out_var _compiler_flags) - string(REPLACE ";" "\\\;" tmp_var "${_compiler_flags}") - string(REGEX REPLACE [=[( +|^)((\"(\\\"|[^"])+\"|\\\"|\\ |[^ ])+)]=] ";\\2" ${_out_var} "${tmp_var}") - list(POP_FRONT ${_out_var}) # The first element is always empty due to the above replacement - list(TRANSFORM ${_out_var} STRIP) # Strip leading trailing whitespaces from each element in the list. - set(${_out_var} "${${_out_var}}" PARENT_SCOPE) +function(z_vcpkg_meson_convert_compiler_flags_to_list out_var compiler_flags) + string(REPLACE ";" [[\;]] tmp_var "${compiler_flags}") + string(REGEX REPLACE [=[( +|^)((\"(\\"|[^"])+"|\\"|\\ |[^ ])+)]=] ";\\2" tmp_var "${tmp_var}") + vcpkg_list(POP_FRONT tmp_var) # The first element is always empty due to the above replacement + list(TRANSFORM tmp_var STRIP) # Strip leading trailing whitespaces from each element in the list. + set("${out_var}" "${tmp_var}" PARENT_SCOPE) endfunction() -function(vcpkg_internal_meson_convert_list_to_python_array _out_var) - set(FLAG_LIST ${ARGN}) - list(TRANSFORM FLAG_LIST APPEND "'") - list(TRANSFORM FLAG_LIST PREPEND "'") - list(JOIN FLAG_LIST ", " ${_out_var}) - string(REPLACE "'', " "" ${_out_var} "${${_out_var}}") # remove empty elements if any - set(${_out_var} "[${${_out_var}}]" PARENT_SCOPE) +function(z_vcpkg_meson_convert_list_to_python_array out_var) + z_vcpkg_function_arguments(flag_list 1) + vcpkg_list(REMOVE_ITEM flag_list "") # remove empty elements if any + vcpkg_list(JOIN flag_list "', '" flag_list) + set("${out_var}" "['${flag_list}']" PARENT_SCOPE) endfunction() # Generates the required compiler properties for meson -function(vcpkg_internal_meson_generate_flags_properties_string _out_var _config) +function(z_vcpkg_meson_generate_flags_properties_string out_var config_type) + set(result "") + if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) - set(L_FLAG /LIBPATH:) + set(libpath_flag /LIBPATH:) + else() + set(libpath_flag -L) + endif() + if(config_type STREQUAL "DEBUG") + set(path_suffix "/debug") else() - set(L_FLAG -L) - endif() - set(PATH_SUFFIX_DEBUG /debug) - set(LIBPATH_${_config} "${L_FLAG}${CURRENT_INSTALLED_DIR}${PATH_SUFFIX_${_config}}/lib") - vcpkg_internal_meson_convert_compiler_flags_to_list(MESON_CFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_C_FLAGS_${_config}}") - list(APPEND MESON_CFLAGS_${_config} "-I${CURRENT_INSTALLED_DIR}/include") - vcpkg_internal_meson_convert_list_to_python_array(MESON_CFLAGS_${_config} ${MESON_CFLAGS_${_config}}) - string(APPEND ${_out_var} "c_args = ${MESON_CFLAGS_${_config}}\n") - vcpkg_internal_meson_convert_compiler_flags_to_list(MESON_CXXFLAGS_${_config} "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${_config}}") - list(APPEND MESON_CXXFLAGS_${_config} "-I${CURRENT_INSTALLED_DIR}/include") - vcpkg_internal_meson_convert_list_to_python_array(MESON_CXXFLAGS_${_config} ${MESON_CXXFLAGS_${_config}}) - string(APPEND ${_out_var} "cpp_args = ${MESON_CXXFLAGS_${_config}}\n") + set(path_suffix "") + endif() + + set(libpath "${libpath_flag}${CURRENT_INSTALLED_DIR}${path_suffix}/lib") + + z_vcpkg_meson_convert_compiler_flags_to_list(cflags "${VCPKG_DETECTED_CMAKE_C_FLAGS_${config_type}}") + vcpkg_list(APPEND cflags "-I${CURRENT_INSTALLED_DIR}/include") + z_vcpkg_meson_convert_list_to_python_array(cflags ${cflags}) + string(APPEND result "c_args = ${cflags}\n") + + z_vcpkg_meson_convert_compiler_flags_to_list(cxxflags "${VCPKG_DETECTED_CMAKE_CXX_FLAGS_${config_type}}") + vcpkg_list(APPEND cxxflags "-I${CURRENT_INSTALLED_DIR}/include") + z_vcpkg_meson_convert_list_to_python_array(cxxflags ${cxxflags}) + string(APPEND result "cpp_args = ${cxxflags}\n") + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${_config}}") + set(linker_flags "${VCPKG_DETECTED_CMAKE_SHARED_LINKER_FLAGS_${config_type}}") else() - set(LINKER_FLAGS_${_config} "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${_config}}") - endif() - vcpkg_internal_meson_convert_compiler_flags_to_list(LINKER_FLAGS_${_config} "${LINKER_FLAGS_${_config}}") - list(APPEND LINKER_FLAGS_${_config} "${LIBPATH_${_config}}") - vcpkg_internal_meson_convert_list_to_python_array(LINKER_FLAGS_${_config} ${LINKER_FLAGS_${_config}}) - string(APPEND ${_out_var} "c_link_args = ${LINKER_FLAGS_${_config}}\n") - string(APPEND ${_out_var} "cpp_link_args = ${LINKER_FLAGS_${_config}}\n") - set(${_out_var} "${${_out_var}}" PARENT_SCOPE) + set(linker_flags "${VCPKG_DETECTED_CMAKE_STATIC_LINKER_FLAGS_${config_type}}") + endif() + z_vcpkg_meson_convert_compiler_flags_to_list(linker_flags "${linker_flags}") + vcpkg_list(APPEND linker_flags "${libpath}") + z_vcpkg_meson_convert_list_to_python_array(linker_flags ${linker_flags}) + string(APPEND result "c_link_args = ${linker_flags}\n") + string(APPEND result "cpp_link_args = ${linker_flags}\n") + set("${out_var}" "${result}" PARENT_SCOPE) endfunction() -function(vcpkg_internal_meson_generate_native_file_config _config) #https://mesonbuild.com/Native-environments.html - set(NATIVE_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - vcpkg_internal_meson_generate_flags_properties_string(NATIVE_PROPERTIES ${_config}) - string(APPEND NATIVE_${_config} "${NATIVE_PROPERTIES}") +function(z_vcpkg_meson_generate_native_file_config config_type) #https://mesonbuild.com/Native-environments.html + set(native_file "[properties]\n") #https://mesonbuild.com/Builtin-options.html + z_vcpkg_meson_generate_flags_properties_string(native_properties "${config_type}") + string(APPEND native_file "${native_properties}") #Setup CMake properties - string(APPEND NATIVE_${_config} "cmake_toolchain_file = '${SCRIPTS}/buildsystems/vcpkg.cmake'\n") - string(APPEND NATIVE_${_config} "[cmake]\n") + string(APPEND native_file "cmake_toolchain_file = '${SCRIPTS}/buildsystems/vcpkg.cmake'\n") + string(APPEND native_file "[cmake]\n") if(NOT VCPKG_CHAINLOAD_TOOLCHAIN_FILE) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -182,49 +187,49 @@ function(vcpkg_internal_meson_generate_native_file_config _config) #https://meso endif() endif() - string(APPEND NATIVE_${_config} "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") - string(APPEND NATIVE_${_config} "VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'\n") - string(APPEND NATIVE_${_config} "VCPKG_CRT_LINKAGE = '${VCPKG_CRT_LINKAGE}'\n") + string(APPEND native_file "VCPKG_TARGET_TRIPLET = '${TARGET_TRIPLET}'\n") + string(APPEND native_file "VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}'\n") + string(APPEND native_file "VCPKG_CRT_LINKAGE = '${VCPKG_CRT_LINKAGE}'\n") - string(APPEND NATIVE_${_config} "[built-in options]\n") + string(APPEND native_file "[built-in options]\n") if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(CRT mt) + set(crt_type mt) else() - set(CRT md) + set(crt_type md) endif() - if(${_config} STREQUAL DEBUG) - set(CRT ${CRT}d) + if("${config_type}" STREQUAL "DEBUG") + string(APPEND crt_type "d") endif() - string(APPEND NATIVE_${_config} "b_vscrt = '${CRT}'\n") + string(APPEND native_file "b_vscrt = '${crt_type}'\n") endif() - string(TOLOWER "${_config}" lowerconfig) - set(_file "${CURRENT_BUILDTREES_DIR}/meson-nativ-${TARGET_TRIPLET}-${lowerconfig}.log") - set(VCPKG_MESON_NATIVE_FILE_${_config} "${_file}" PARENT_SCOPE) - file(WRITE "${_file}" "${NATIVE_${_config}}") + string(TOLOWER "${config_type}" lowerconfig) + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-native-${TARGET_TRIPLET}-${lowerconfig}.log") + file(WRITE "${native_config_name}" "${native_file}") + set("vcpkg_meson_native_file_${config_type}" "${native_config_name}" PARENT_SCOPE) endfunction() -function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https://mesonbuild.com/Cross-compilation.html +function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbuild.com/Cross-compilation.html if(CMAKE_HOST_WIN32) if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) - set(BUILD_ARCH $ENV{PROCESSOR_ARCHITEW6432}) + set(build_arch $ENV{PROCESSOR_ARCHITEW6432}) else() - set(BUILD_ARCH $ENV{PROCESSOR_ARCHITECTURE}) + set(build_arch $ENV{PROCESSOR_ARCHITECTURE}) endif() - if(BUILD_ARCH MATCHES "(amd|AMD)64") - set(BUILD_CPU_FAM x86_64) - set(BUILD_CPU x86_64) - elseif(BUILD_ARCH MATCHES "(x|X)86") - set(BUILD_CPU_FAM x86) - set(BUILD_CPU i686) - elseif(BUILD_ARCH MATCHES "^(ARM|arm)64$") - set(BUILD_CPU_FAM aarch64) - set(BUILD_CPU armv8) - elseif(BUILD_ARCH MATCHES "^(ARM|arm)$") - set(BUILD_CPU_FAM arm) - set(BUILD_CPU armv7hl) + if(build_arch MATCHES "(amd|AMD)64") + set(build_cpu_fam x86_64) + set(build_cpu x86_64) + elseif(build_arch MATCHES "(x|X)86") + set(build_cpu_fam x86) + set(build_cpu i686) + elseif(build_arch MATCHES "^(ARM|arm)64$") + set(build_cpu_fam aarch64) + set(build_cpu armv8) + elseif(build_arch MATCHES "^(ARM|arm)$") + set(build_cpu_fam arm) + set(build_cpu armv7hl) else() - message(FATAL_ERROR "Unsupported host architecture ${BUILD_ARCH}!") + message(FATAL_ERROR "Unsupported host architecture ${build_arch}!") endif() elseif(CMAKE_HOST_UNIX) # at this stage, CMAKE_HOST_SYSTEM_PROCESSOR is not defined @@ -237,21 +242,18 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ debug_message("Machine: ${MACHINE}") if(MACHINE MATCHES "arm64") - set(BUILD_CPU_FAM aarch64) - set(BUILD_CPU armv8) + set(build_cpu_fam aarch64) + set(build_cpu armv8) elseif(MACHINE MATCHES "x86_64|amd64") - set(BUILD_CPU_FAM x86_64) - set(BUILD_CPU x86_64) + set(build_cpu_fam x86_64) + set(build_cpu x86_64) elseif(MACHINE MATCHES "x86|i686") - set(BUILD_CPU_FAM x86) - set(BUILD_CPU i686) + set(build_cpu_fam x86) + set(build_cpu i686) elseif(MACHINE MATCHES "i386") - set(BUILD_CPU_FAM x86) - set(BUILD_CPU i386) + set(build_cpu_fam x86) + set(build_cpu i386) else() - unset(BUILD_CPU_FAM) - unset(BUILD_CPU) - # https://github.com/mesonbuild/meson/blob/master/docs/markdown/Reference-tables.md#cpu-families message(FATAL_ERROR "Unhandled machine: ${MACHINE}") endif() @@ -260,21 +262,21 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ endif() if(VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64") - set(HOST_CPU_FAM x86_64) - set(HOST_CPU x86_64) + set(host_cpu_fam x86_64) + set(host_cpu x86_64) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86") - set(HOST_CPU_FAM x86) - set(HOST_CPU i686) + set(host_cpu_fam x86) + set(host_cpu i686) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)64$") - set(HOST_CPU_FAM aarch64) - set(HOST_CPU armv8) + set(host_cpu_fam aarch64) + set(host_cpu armv8) elseif(VCPKG_TARGET_ARCHITECTURE MATCHES "^(ARM|arm)$") - set(HOST_CPU_FAM arm) - set(HOST_CPU armv7hl) + set(host_cpu_fam arm) + set(host_cpu armv7hl) else() message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" ) endif() - set(CROSS "[binaries]\n") + set(cross_file "[binaries]\n") if(VCPKG_TARGET_IS_WINDOWS) set(proglist MT) else() @@ -283,96 +285,104 @@ function(vcpkg_internal_meson_generate_cross_file _additional_binaries) #https:/ foreach(prog IN LISTS proglist) if(VCPKG_DETECTED_CMAKE_${prog}) string(TOLOWER "${prog}" proglower) - string(APPEND CROSS "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") + string(APPEND cross_file "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n") endif() endforeach() - set(compiler C CXX RC) - foreach(prog IN LISTS compiler) + set(programs C CXX RC) + foreach(prog IN LISTS programs) if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER) string(REPLACE "CXX" "CPP" mesonprog "${prog}") string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html string(TOLOWER "${mesonprog}" proglower) - string(APPEND CROSS "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") + string(APPEND cross_file "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n") endif() endforeach() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - string(APPEND CROSS "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(APPEND cross_file "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() endif() if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS) - if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 - string(APPEND CROSS "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") + # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456 + if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$") + string(APPEND cross_file "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n") endif() endif() - string(APPEND CROSS "cmake = '${CMAKE_COMMAND}'\n") - foreach(_binary IN LISTS ${_additional_binaries}) - string(APPEND CROSS "${_binary}\n") + string(APPEND cross_file "cmake = '${CMAKE_COMMAND}'\n") + foreach(additional_binary IN LISTS additional_binaries) + string(APPEND cross_file "${additional_binary}\n") endforeach() - string(APPEND CROSS "[properties]\n") + string(APPEND cross_file "[properties]\n") - string(APPEND CROSS "[host_machine]\n") - string(APPEND CROSS "endian = 'little'\n") + string(APPEND cross_file "[host_machine]\n") + string(APPEND cross_file "endian = 'little'\n") if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_TARGET_IS_MINGW) - set(MESON_SYSTEM_NAME "windows") + set(meson_system_name "windows") else() - string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" MESON_SYSTEM_NAME) + string(TOLOWER "${VCPKG_CMAKE_SYSTEM_NAME}" meson_system_name) endif() - string(APPEND CROSS "system = '${MESON_SYSTEM_NAME}'\n") - string(APPEND CROSS "cpu_family = '${HOST_CPU_FAM}'\n") - string(APPEND CROSS "cpu = '${HOST_CPU}'\n") + string(APPEND cross_file "system = '${meson_system_name}'\n") + string(APPEND cross_file "cpu_family = '${host_cpu_fam}'\n") + string(APPEND cross_file "cpu = '${host_cpu}'\n") - string(APPEND CROSS "[build_machine]\n") - string(APPEND CROSS "endian = 'little'\n") + string(APPEND cross_file "[build_machine]\n") + string(APPEND cross_file "endian = 'little'\n") if(WIN32) - string(APPEND CROSS "system = 'windows'\n") + string(APPEND cross_file "system = 'windows'\n") elseif(DARWIN) - string(APPEND CROSS "system = 'darwin'\n") + string(APPEND cross_file "system = 'darwin'\n") else() - string(APPEND CROSS "system = 'linux'\n") + string(APPEND cross_file "system = 'linux'\n") endif() - if(DEFINED BUILD_CPU_FAM) - string(APPEND CROSS "cpu_family = '${BUILD_CPU_FAM}'\n") + if(DEFINED build_cpu_fam) + string(APPEND cross_file "cpu_family = '${build_cpu_fam}'\n") endif() - if(DEFINED BUILD_CPU) - string(APPEND CROSS "cpu = '${BUILD_CPU}'\n") + if(DEFINED build_cpu) + string(APPEND cross_file "cpu = '${build_cpu}'\n") endif() - if(NOT BUILD_CPU_FAM MATCHES "${HOST_CPU_FAM}" OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_MINGW AND NOT WIN32)) - set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") - set(VCPKG_MESON_CROSS_FILE "${_file}" PARENT_SCOPE) - file(WRITE "${_file}" "${CROSS}") + if(NOT build_cpu_fam MATCHES "${host_cpu_fam}" + OR VCPKG_TARGET_IS_ANDROID OR VCPKG_TARGET_IS_IOS OR VCPKG_TARGET_IS_UWP + OR (VCPKG_TARGET_IS_MINGW AND NOT WIN32)) + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}.log") + set(vcpkg_meson_cross_file "${native_config_name}" PARENT_SCOPE) + file(WRITE "${native_config_name}" "${cross_file}") endif() endfunction() -function(vcpkg_internal_meson_generate_cross_file_config _config) #https://mesonbuild.com/Native-environments.html - set(CROSS_${_config} "[properties]\n") #https://mesonbuild.com/Builtin-options.html - vcpkg_internal_meson_generate_flags_properties_string(CROSS_PROPERTIES ${_config}) - string(APPEND CROSS_${_config} "${CROSS_PROPERTIES}") - string(APPEND CROSS_${_config} "[built-in options]\n") +function(z_vcpkg_meson_generate_cross_file_config config_type) #https://mesonbuild.com/Native-environments.html + set(cross_${config_type}_log "[properties]\n") #https://mesonbuild.com/Builtin-options.html + z_vcpkg_meson_generate_flags_properties_string(cross_properties ${config_type}) + string(APPEND cross_${config_type}_log "${cross_properties}") + string(APPEND cross_${config_type}_log "[built-in options]\n") if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(CRT mt) + set(crt_type mt) else() - set(CRT md) + set(crt_type md) endif() - if(${_config} STREQUAL DEBUG) - set(CRT ${CRT}d) + if(${config_type} STREQUAL "DEBUG") + set(crt_type ${crt_type}d) endif() - string(APPEND CROSS_${_config} "b_vscrt = '${CRT}'\n") + string(APPEND cross_${config_type}_log "b_vscrt = '${crt_type}'\n") endif() - string(TOLOWER "${_config}" lowerconfig) - set(_file "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}-${lowerconfig}.log") - set(VCPKG_MESON_CROSS_FILE_${_config} "${_file}" PARENT_SCOPE) - file(WRITE "${_file}" "${CROSS_${_config}}") + string(TOLOWER "${config_type}" lowerconfig) + set(native_config_name "${CURRENT_BUILDTREES_DIR}/meson-cross-${TARGET_TRIPLET}-${lowerconfig}.log") + set(VCPKG_MESON_CROSS_FILE_${config_type} "${native_config_name}" PARENT_SCOPE) + file(WRITE "${native_config_name}" "${cross_${config_type}_log}") endfunction() function(vcpkg_configure_meson) # parse parameters such that semicolons in options arguments to COMMAND don't get erased - cmake_parse_arguments(PARSE_ARGV 0 _vcm "NO_PKG_CONFIG" "SOURCE_PATH" "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES") + cmake_parse_arguments(PARSE_ARGV 0 arg + "NO_PKG_CONFIG" + "SOURCE_PATH" + "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;ADDITIONAL_NATIVE_BINARIES;ADDITIONAL_CROSS_BINARIES" + ) file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -384,8 +394,8 @@ function(vcpkg_configure_meson) vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") - list(APPEND _vcm_ADDITIONAL_NATIVE_BINARIES "python = '${PYTHON3}'") - list(APPEND _vcm_ADDITIONAL_CROSS_BINARIES "python = '${PYTHON3}'") + vcpkg_list(APPEND arg_ADDITIONAL_NATIVE_BINARIES "python = '${PYTHON3}'") + vcpkg_list(APPEND arg_ADDITIONAL_CROSS_BINARIES "python = '${PYTHON3}'") vcpkg_find_acquire_program(MESON) @@ -395,158 +405,132 @@ function(vcpkg_configure_meson) vcpkg_find_acquire_program(NINJA) get_filename_component(NINJA_PATH ${NINJA} DIRECTORY) vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Need to prepend so that meson picks up the correct ninja from vcpkg .... - # list(APPEND _vcm_ADDITIONAL_NATIVE_BINARIES "ninja = '${NINJA}'") # This does not work due to meson issues ...... + # vcpkg_list(APPEND arg_ADDITIONAL_NATIVE_BINARIES "ninja = '${NINJA}'") # This does not work due to meson issues ...... - list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) + vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload) - if(NOT VCPKG_MESON_CROSS_FILE) - vcpkg_internal_meson_generate_cross_file("_vcm_ADDITIONAL_CROSS_BINARIES") + if(NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_cross_file("${arg_ADDITIONAL_CROSS_BINARIES}") endif() - if(NOT VCPKG_MESON_CROSS_FILE_DEBUG AND VCPKG_MESON_CROSS_FILE) - vcpkg_internal_meson_generate_cross_file_config(DEBUG) + # We must use uppercase `DEBUG` and `RELEASE` here because they matches the configuration data + if(NOT VCPKG_MESON_CROSS_FILE_DEBUG AND vcpkg_meson_cross_file) + z_vcpkg_meson_generate_cross_file_config(DEBUG) endif() - if(NOT VCPKG_MESON_CROSS_FILE_RELEASE AND VCPKG_MESON_CROSS_FILE) - vcpkg_internal_meson_generate_cross_file_config(RELEASE) + if(NOT VCPKG_MESON_CROSS_FILE_RELEASE AND vcpkg_meson_cross_file) + z_vcpkg_meson_generate_cross_file_config(RELEASE) endif() - if(VCPKG_MESON_CROSS_FILE) - list(APPEND _vcm_OPTIONS --cross "${VCPKG_MESON_CROSS_FILE}") + if(vcpkg_meson_cross_file) + vcpkg_list(APPEND arg_OPTIONS --cross "${vcpkg_meson_cross_file}") endif() if(VCPKG_MESON_CROSS_FILE_DEBUG) - list(APPEND _vcm_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_DEBUG --cross "${VCPKG_MESON_CROSS_FILE_DEBUG}") endif() if(VCPKG_MESON_CROSS_FILE_RELEASE) - list(APPEND _vcm_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --cross "${VCPKG_MESON_CROSS_FILE_RELEASE}") endif() - if(NOT VCPKG_MESON_NATIVE_FILE AND NOT VCPKG_MESON_CROSS_FILE) - vcpkg_internal_meson_generate_native_file("_vcm_ADDITIONAL_NATIVE_BINARIES") + if(NOT vcpkg_meson_native_file AND NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_native_file("${arg_ADDITIONAL_NATIVE_BINARIES}") endif() - if(NOT VCPKG_MESON_NATIVE_FILE_DEBUG AND NOT VCPKG_MESON_CROSS_FILE) - vcpkg_internal_meson_generate_native_file_config(DEBUG) + if(NOT vcpkg_meson_native_file_DEBUG AND NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_native_file_config(DEBUG) endif() - if(NOT VCPKG_MESON_NATIVE_FILE_RELEASE AND NOT VCPKG_MESON_CROSS_FILE) - vcpkg_internal_meson_generate_native_file_config(RELEASE) + if(NOT vcpkg_meson_native_file_RELEASE AND NOT vcpkg_meson_cross_file) + z_vcpkg_meson_generate_native_file_config(RELEASE) endif() - if(VCPKG_MESON_NATIVE_FILE AND NOT VCPKG_MESON_CROSS_FILE) - list(APPEND _vcm_OPTIONS --native "${VCPKG_MESON_NATIVE_FILE}") - list(APPEND _vcm_OPTIONS_DEBUG --native "${VCPKG_MESON_NATIVE_FILE_DEBUG}") - list(APPEND _vcm_OPTIONS_RELEASE --native "${VCPKG_MESON_NATIVE_FILE_RELEASE}") + if(vcpkg_meson_native_file AND NOT vcpkg_meson_cross_file) + vcpkg_list(APPEND arg_OPTIONS --native "${vcpkg_meson_native_file}") + vcpkg_list(APPEND arg_OPTIONS_DEBUG --native "${vcpkg_meson_native_file_DEBUG}") + vcpkg_list(APPEND arg_OPTIONS_RELEASE --native "${vcpkg_meson_native_file_RELEASE}") else() - list(APPEND _vcm_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") + vcpkg_list(APPEND arg_OPTIONS --native "${SCRIPTS}/buildsystems/meson/none.txt") endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - list(APPEND _vcm_OPTIONS --default-library shared) + vcpkg_list(APPEND arg_OPTIONS --default-library shared) else() - list(APPEND _vcm_OPTIONS --default-library static) + vcpkg_list(APPEND arg_OPTIONS --default-library static) endif() - list(APPEND _vcm_OPTIONS --libdir lib) # else meson install into an architecture describing folder - list(APPEND _vcm_OPTIONS_DEBUG -Ddebug=true --prefix ${CURRENT_PACKAGES_DIR}/debug --includedir ../include) - list(APPEND _vcm_OPTIONS_RELEASE -Ddebug=false --prefix ${CURRENT_PACKAGES_DIR}) + vcpkg_list(APPEND arg_OPTIONS --libdir lib) # else meson install into an architecture describing folder + vcpkg_list(APPEND arg_OPTIONS_DEBUG -Ddebug=true --prefix "${CURRENT_PACKAGES_DIR}/debug" --includedir ../include) + vcpkg_list(APPEND arg_OPTIONS_RELEASE -Ddebug=false --prefix "${CURRENT_PACKAGES_DIR}") # select meson cmd-line options if(VCPKG_TARGET_IS_WINDOWS) - list(APPEND _vcm_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/share']") - list(APPEND _vcm_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}/share']") + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/share']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}/share']") else() - list(APPEND _vcm_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") - list(APPEND _vcm_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") + vcpkg_list(APPEND arg_OPTIONS_DEBUG "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}/debug','${CURRENT_INSTALLED_DIR}']") + vcpkg_list(APPEND arg_OPTIONS_RELEASE "-Dcmake_prefix_path=['${CURRENT_INSTALLED_DIR}','${CURRENT_INSTALLED_DIR}/debug']") endif() - if(NOT _vcm_NO_PKG_CONFIG) + if(NOT arg_NO_PKG_CONFIG) vcpkg_find_acquire_program(PKGCONFIG) get_filename_component(PKGCONFIG_PATH ${PKGCONFIG} DIRECTORY) vcpkg_add_to_path("${PKGCONFIG_PATH}") - set(PKGCONFIG_SHARE_DIR "${CURRENT_INSTALLED_DIR}/share/pkgconfig/") + set(pkgconfig_share_dir "${CURRENT_INSTALLED_DIR}/share/pkgconfig/") endif() set(buildtypes) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - set(BUILDNAME DEBUG) - list(APPEND buildtypes ${BUILDNAME}) - set(PATH_SUFFIX_${BUILDNAME} "debug/") - set(SUFFIX_${BUILDNAME} "dbg") + set(buildname "DEBUG") + vcpkg_list(APPEND buildtypes ${buildname}) + set(path_suffix_${buildname} "debug/") + set(suffix_${buildname} "dbg") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - set(BUILDNAME RELEASE) - list(APPEND buildtypes ${BUILDNAME}) - set(PATH_SUFFIX_${BUILDNAME} "") - set(SUFFIX_${BUILDNAME} "rel") + set(buildname "RELEASE") + vcpkg_list(APPEND buildtypes ${buildname}) + set(path_suffix_${buildname} "") + set(suffix_${buildname} "rel") endif() if(VCPKG_TARGET_IS_OSX) - if(DEFINED ENV{SDKROOT}) - set(_VCPKG_ENV_SDKROOT_BACKUP $ENV{SDKROOT}) - endif() + vcpkg_backup_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) + set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") set(VCPKG_DETECTED_CMAKE_OSX_SYSROOT "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}" PARENT_SCOPE) - if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET}) - set(_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP $ENV{MACOSX_DEPLOYMENT_TARGET}) - endif() set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") set(VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}" PARENT_SCOPE) endif() - if(DEFINED ENV{INCLUDE}) - set(ENV{INCLUDE} "$ENV{INCLUDE}${VCPKG_HOST_PATH_SEPARATOR}${CURRENT_INSTALLED_DIR}/include") - else() - set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") - endif() + vcpkg_backup_env_variables(VARS INCLUDE) + vcpkg_host_path_list(APPEND ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include") # configure build foreach(buildtype IN LISTS buildtypes) - message(STATUS "Configuring ${TARGET_TRIPLET}-${SUFFIX_${buildtype}}") - file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}") + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}}") + file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}") #setting up PKGCONFIG - if(NOT _vcm_NO_PKG_CONFIG) + vcpkg_backup_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) + if(NOT arg_NO_PKG_CONFIG) set(ENV{PKG_CONFIG} "${PKGCONFIG}") # Set via native file? - set(PKGCONFIG_INSTALLED_DIR "${CURRENT_INSTALLED_DIR}/${PATH_SUFFIX_${buildtype}}lib/pkgconfig/") - if(DEFINED ENV{PKG_CONFIG_PATH}) - set(BACKUP_ENV_PKG_CONFIG_PATH_RELEASE $ENV{PKG_CONFIG_PATH}) - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}${VCPKG_HOST_PATH_SEPARATOR}$ENV{PKG_CONFIG_PATH}") - else() - set(ENV{PKG_CONFIG_PATH} "${PKGCONFIG_INSTALLED_DIR}${VCPKG_HOST_PATH_SEPARATOR}${PKGCONFIG_SHARE_DIR}") - endif() + set(pkgconfig_installed_dir "${CURRENT_INSTALLED_DIR}/${path_suffix_${buildtype}}lib/pkgconfig/") + vcpkg_host_path_list(APPEND ENV{PKG_CONFIG_PATH} "${pkgconfig_installed_dir}" "${pkgconfig_share_dir}" "$ENV{PKG_CONFIG_PATH}") endif() vcpkg_execute_required_process( - COMMAND ${MESON} ${_vcm_OPTIONS} ${_vcm_OPTIONS_${buildtype}} ${_vcm_SOURCE_PATH} - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}} - LOGNAME config-${TARGET_TRIPLET}-${SUFFIX_${buildtype}} + COMMAND ${MESON} ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}} ${arg_SOURCE_PATH} + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}" + LOGNAME config-${TARGET_TRIPLET}-${suffix_${buildtype}} ) #Copy meson log files into buildtree for CI - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/meson-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${SUFFIX_${buildtype}}.txt") - endif() - if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/install-log.txt") - file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SUFFIX_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") - file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${SUFFIX_${buildtype}}.txt") + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/meson-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/meson-log.txt" "${CURRENT_BUILDTREES_DIR}/meson-log-${suffix_${buildtype}}.txt") endif() - message(STATUS "Configuring ${TARGET_TRIPLET}-${SUFFIX_${buildtype}} done") - - if(NOT _vcm_NO_PKG_CONFIG) - #Restore PKG_CONFIG_PATH - if(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) - set(ENV{PKG_CONFIG_PATH} "${BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}}") - unset(BACKUP_ENV_PKG_CONFIG_PATH_${buildtype}) - else() - unset(ENV{PKG_CONFIG_PATH}) - endif() + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt") + file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}/meson-logs/install-log.txt" DESTINATION "${CURRENT_BUILDTREES_DIR}") + file(RENAME "${CURRENT_BUILDTREES_DIR}/install-log.txt" "${CURRENT_BUILDTREES_DIR}/install-log-${suffix_${buildtype}}.txt") endif() + message(STATUS "Configuring ${TARGET_TRIPLET}-${suffix_${buildtype}} done") + + vcpkg_restore_env_variables(VARS PKG_CONFIG PKG_CONFIG_PATH) endforeach() if(VCPKG_TARGET_IS_OSX) - if(DEFINED _VCPKG_ENV_SDKROOT_BACKUP) - set(ENV{SDKROOT} "${_VCPKG_ENV_SDKROOT_BACKUP}") - else() - unset(ENV{SDKROOT}) - endif() - if(DEFINED _VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP) - set(ENV{MACOSX_DEPLOYMENT_TARGET} "${_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP}") - else() - unset(ENV{MACOSX_DEPLOYMENT_TARGET}) - endif() + vcpkg_restore_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) endif() + vcpkg_restore_env_variables(VARS INCLUDE) endfunction() diff --git a/scripts/cmake/vcpkg_install_meson.cmake b/scripts/cmake/vcpkg_install_meson.cmake index 3e89b457e20769..e59162d0a43a73 100644 --- a/scripts/cmake/vcpkg_install_meson.cmake +++ b/scripts/cmake/vcpkg_install_meson.cmake @@ -19,87 +19,73 @@ Adds the appropriate Release and Debug `bin\` directories to the path during the #]===] function(vcpkg_install_meson) + cmake_parse_arguments(PARSE_ARGV 0 arg "ADD_BIN_TO_PATH" "" "") + vcpkg_find_acquire_program(NINJA) unset(ENV{DESTDIR}) # installation directory was already specified with '--prefix' option - cmake_parse_arguments(PARSE_ARGV 0 _im "ADD_BIN_TO_PATH" "" "") if(VCPKG_TARGET_IS_OSX) - if(DEFINED ENV{SDKROOT}) - set(_VCPKG_ENV_SDKROOT_BACKUP $ENV{SDKROOT}) - endif() + vcpkg_backup_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) set(ENV{SDKROOT} "${VCPKG_DETECTED_CMAKE_OSX_SYSROOT}") - - if(DEFINED ENV{MACOSX_DEPLOYMENT_TARGET}) - set(_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP $ENV{MACOSX_DEPLOYMENT_TARGET}) - endif() set(ENV{MACOSX_DEPLOYMENT_TARGET} "${VCPKG_DETECTED_CMAKE_OSX_DEPLOYMENT_TARGET}") endif() - foreach(BUILDTYPE "debug" "release") - if(DEFINED VCPKG_BUILD_TYPE AND NOT VCPKG_BUILD_TYPE STREQUAL BUILDTYPE) + foreach(buildtype IN ITEMS "debug" "release") + if(DEFINED VCPKG_BUILD_TYPE AND NOT VCPKG_BUILD_TYPE STREQUAL buildtype) continue() endif() - if(BUILDTYPE STREQUAL "debug") - set(SHORT_BUILDTYPE "dbg") + if(buildtype STREQUAL "debug") + set(short_buildtype "dbg") else() - set(SHORT_BUILDTYPE "rel") + set(short_buildtype "rel") endif() - message(STATUS "Package ${TARGET_TRIPLET}-${SHORT_BUILDTYPE}") - if(_im_ADD_BIN_TO_PATH) - set(_BACKUP_ENV_PATH "$ENV{PATH}") - if(BUILDTYPE STREQUAL "debug") + message(STATUS "Package ${TARGET_TRIPLET}-${short_buildtype}") + if(arg_ADD_BIN_TO_PATH) + vcpkg_backup_env_variables(VARS PATH) + if(buildtype STREQUAL "debug") vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") else() vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") endif() endif() vcpkg_execute_required_process( - COMMAND ${NINJA} install -v - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT_BUILDTYPE} - LOGNAME package-${TARGET_TRIPLET}-${SHORT_BUILDTYPE} + COMMAND "${NINJA}" install -v + WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${short_buildtype}" + LOGNAME package-${TARGET_TRIPLET}-${short_buildtype} ) - if(_im_ADD_BIN_TO_PATH) - set(ENV{PATH} "${_BACKUP_ENV_PATH}") + if(arg_ADD_BIN_TO_PATH) + vcpkg_restore_env_variables(VARS PATH) endif() endforeach() - set(RENAMED_LIBS "") + vcpkg_list(SET renamed_libs) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static AND NOT VCPKG_TARGET_IS_MINGW) # Meson names all static libraries lib.a which basically breaks the world - file(GLOB_RECURSE LIBRARIES "${CURRENT_PACKAGES_DIR}*/**/lib*.a") - foreach(_library IN LISTS LIBRARIES) - get_filename_component(LIBDIR "${_library}" DIRECTORY ) - get_filename_component(LIBNAME "${_library}" NAME) - string(REGEX REPLACE ".a$" ".lib" LIBNAMENEW "${LIBNAME}") - string(REGEX REPLACE "^lib" "" LIBNAMENEW "${LIBNAMENEW}") - file(RENAME "${_library}" "${LIBDIR}/${LIBNAMENEW}") + file(GLOB_RECURSE gen_libraries "${CURRENT_PACKAGES_DIR}*/**/lib*.a") + foreach(gen_library IN LISTS gen_libraries) + get_filename_component(libdir "${gen_library}" DIRECTORY) + get_filename_component(libname "${gen_library}" NAME) + string(REGEX REPLACE ".a$" ".lib" fixed_librawname "${libname}") + string(REGEX REPLACE "^lib" "" fixed_librawname "${fixed_librawname}") + file(RENAME "${gen_library}" "${libdir}/${fixed_librawname}") # For cmake fixes. - string(REGEX REPLACE ".a$" "" LIBRAWNAMEOLD "${LIBNAME}") - string(REGEX REPLACE ".lib$" "" LIBRAWNAMENEW "${LIBNAMENEW}") - list(APPEND RENAMED_LIBS ${LIBRAWNAMENEW}) - set(${LIBRAWNAME}_OLD ${LIBRAWNAMEOLD}) - set(${LIBRAWNAME}_NEW ${LIBRAWNAMENEW}) + string(REGEX REPLACE ".a$" "" origin_librawname "${libname}") + string(REGEX REPLACE ".lib$" "" fixed_librawname "${fixed_librawname}") + vcpkg_list(APPEND renamed_libs ${fixed_librawname}) + set(${librawname}_old ${origin_librawname}) + set(${librawname}_new ${fixed_librawname}) endforeach() - file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}*/*.cmake") - foreach(_cmake IN LISTS CMAKE_FILES) - foreach(_lib IN LISTS RENAMED_LIBS) - vcpkg_replace_string("${_cmake}" "${${_lib}_OLD}" "${${_lib}_NEW}") + file(GLOB_RECURSE cmake_files "${CURRENT_PACKAGES_DIR}*/*.cmake") + foreach(cmake_file IN LISTS cmake_files) + foreach(current_lib IN LISTS renamed_libs) + vcpkg_replace_string("${cmake_file}" "${${current_lib}_old}" "${${current_lib}_new}") endforeach() endforeach() endif() if(VCPKG_TARGET_IS_OSX) - if(DEFINED _VCPKG_ENV_SDKROOT_BACKUP) - set(ENV{SDKROOT} "${_VCPKG_ENV_SDKROOT_BACKUP}") - else() - unset(ENV{SDKROOT}) - endif() - if(DEFINED _VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP) - set(ENV{MACOSX_DEPLOYMENT_TARGET} "${_VCPKG_ENV_MACOSX_DEPLOYMENT_TARGET_BACKUP}") - else() - unset(ENV{MACOSX_DEPLOYMENT_TARGET}) - endif() + vcpkg_restore_env_variables(VARS SDKROOT MACOSX_DEPLOYMENT_TARGET) endif() endfunction() From 5ff8d113d91a5a8096248f86aef6b640c51024ce Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 8 Nov 2021 16:08:15 -0800 Subject: [PATCH 1035/1858] [Azure SDK Storage] Nov Release Update (#21247) * [azure-storage-blobs-cpp] Update to 12.2.1 ## 12.2.1 (2021-11-08) ### Other Changes - `DefaultEncryptionScope` and `PreventEncryptionScopeOverride` in `BlobContainerProperties` were changed to optional. * [azure-storage-queues-cpp] Update to 12.0.0-beta.2 ## 12.0.0-beta.2 (2021-11-08) ### Breaking Changes - Renamed `GetServicePropertiesResult` to `QueueServiceProperties`. - Renamed `GetServiceStatisticsResult` to `ServiceStatistics`. - Renamed `GetQueuePropertiesResult` to `QueueProperties`. - Renamed `GetQueueAccessPolicyResult` to `QueueAccessPolicy`. - Wrapped the first parameter of `QueueClient::SetAccessPolicy`, a vector of signed identifiers into a struct `QueueAccessPolicy`. - Renamed `ReceiveMessagesResult` to `ReceivedMessages`. - Renamed `PeekMessagesResult` to `PeekedMessages`. --- ports/azure-storage-blobs-cpp/portfile.cmake | 4 ++-- ports/azure-storage-blobs-cpp/vcpkg.json | 2 +- ports/azure-storage-queues-cpp/portfile.cmake | 4 ++-- ports/azure-storage-queues-cpp/vcpkg.json | 2 +- versions/a-/azure-storage-blobs-cpp.json | 5 +++++ versions/a-/azure-storage-queues-cpp.json | 5 +++++ versions/baseline.json | 4 ++-- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ports/azure-storage-blobs-cpp/portfile.cmake b/ports/azure-storage-blobs-cpp/portfile.cmake index 3d5acc48ab7764..bffc0c5ed56e03 100644 --- a/ports/azure-storage-blobs-cpp/portfile.cmake +++ b/ports/azure-storage-blobs-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-blobs_12.2.0 - SHA512 9e833b41b33b5889cc1b84edc64efc38341db3d9ea28e771968c1ed56686975d0b688ea48d7649845030f6c8a6327f136f5f8c1a584996bdf6ce83564c30c91f + REF azure-storage-blobs_12.2.1 + SHA512 7150b1d5c9ceb7ca2f500b3ff1fe45ca2f2769ec895191fa8b0fd0b63e5acc6f8fd58b3aec1b00ba5125d99a5f28c29335f8d13253af7d1d70b1575b98183810 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-blobs-cpp/vcpkg.json b/ports/azure-storage-blobs-cpp/vcpkg.json index f806e967deadf6..8f0295819a723d 100644 --- a/ports/azure-storage-blobs-cpp/vcpkg.json +++ b/ports/azure-storage-blobs-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-blobs-cpp", - "version-semver": "12.2.0", + "version-semver": "12.2.1", "description": [ "Microsoft Azure Storage Blobs SDK for C++", "This library provides Azure Storage Blobs SDK." diff --git a/ports/azure-storage-queues-cpp/portfile.cmake b/ports/azure-storage-queues-cpp/portfile.cmake index 8ede76b4e6a921..6adb069928c52a 100644 --- a/ports/azure-storage-queues-cpp/portfile.cmake +++ b/ports/azure-storage-queues-cpp/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Azure/azure-sdk-for-cpp - REF azure-storage-queues_12.0.0-beta.1 - SHA512 22c59e6fd6838caeb7af476a4547815115d51b26145bbb3083cf4ae6bd15a6e43d5892c02f97cfa09c5e279c219c6f0b600f65d5dd742495f72775850b7ed6e2 + REF azure-storage-queues_12.0.0-beta.2 + SHA512 43815483aa8def6eb475683d765a5315a65218bceb9dbf95b9f4e154c23ed8af1af4a52943b4b89fed35b50318407c98674e8af4c4076e42be60f460a610a118 ) vcpkg_cmake_configure( diff --git a/ports/azure-storage-queues-cpp/vcpkg.json b/ports/azure-storage-queues-cpp/vcpkg.json index ffedcc26b01970..8a8fafe2178d53 100644 --- a/ports/azure-storage-queues-cpp/vcpkg.json +++ b/ports/azure-storage-queues-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "azure-storage-queues-cpp", - "version-semver": "12.0.0-beta.1", + "version-semver": "12.0.0-beta.2", "description": [ "Microsoft Azure Storage Queues SDK for C++", "This library provides Azure Storage Queues SDK." diff --git a/versions/a-/azure-storage-blobs-cpp.json b/versions/a-/azure-storage-blobs-cpp.json index b2d89ffc484fd6..1c5fba25a27a6d 100644 --- a/versions/a-/azure-storage-blobs-cpp.json +++ b/versions/a-/azure-storage-blobs-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e52659aef1c9a99271c1d590eba0d37f5e472bb", + "version-semver": "12.2.1", + "port-version": 0 + }, { "git-tree": "a3775aa0aa8ad876fffa3d2f77b7c1e12b072a5b", "version-semver": "12.2.0", diff --git a/versions/a-/azure-storage-queues-cpp.json b/versions/a-/azure-storage-queues-cpp.json index e079b75c0b4b7e..f5e34cbe41105f 100644 --- a/versions/a-/azure-storage-queues-cpp.json +++ b/versions/a-/azure-storage-queues-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7e146970eabbdf793a50c5b511ea458b04f579a", + "version-semver": "12.0.0-beta.2", + "port-version": 0 + }, { "git-tree": "4826bb13d7feb69f3a64633d3a1ea4b4de173a71", "version-semver": "12.0.0-beta.1", diff --git a/versions/baseline.json b/versions/baseline.json index 172e68b861e842..c3ebcade0a2efb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -349,7 +349,7 @@ "port-version": 0 }, "azure-storage-blobs-cpp": { - "baseline": "12.2.0", + "baseline": "12.2.1", "port-version": 0 }, "azure-storage-common-cpp": { @@ -369,7 +369,7 @@ "port-version": 0 }, "azure-storage-queues-cpp": { - "baseline": "12.0.0-beta.1", + "baseline": "12.0.0-beta.2", "port-version": 0 }, "azure-uamqp-c": { From 184db05423611eeee3225c53daf1c342caae4787 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 8 Nov 2021 16:09:11 -0800 Subject: [PATCH 1036/1858] [srell] Update to 3.001 (#21216) * update to 3.001 * update versioning --- ports/srell/portfile.cmake | 4 ++-- ports/srell/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/srell.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/srell/portfile.cmake b/ports/srell/portfile.cmake index b7b36652c7298b..354c9da005149d 100644 --- a/ports/srell/portfile.cmake +++ b/ports/srell/portfile.cmake @@ -1,10 +1,10 @@ -set(VERSION 2_920) +set(VERSION 3_001) vcpkg_download_distfile( ARCHIVE URLS "https://www.akenotsuki.com/misc/srell/srell${VERSION}.zip" FILENAME "srell${VERSION}.zip" - SHA512 504BE3C24F497B8EA75D06787CBD3C8A475073F5881317D15619DFE6F7CBF4F75B9A81145981D1EE0F945C0D748C7BEDC60258DC52E4860FC7B769A01C9FA9FB + SHA512 6FE1DAC49B713B8FA0E4B12099E2B35017CE853CC8C7045AA808401D8C6D15E16B50E6DDFDCB0EFA9DB31188D5B9B385081C1EEB2AC413701847688B38B61B76 ) vcpkg_extract_source_archive( diff --git a/ports/srell/vcpkg.json b/ports/srell/vcpkg.json index 9aa65dcdc1b747..25549535306d1d 100644 --- a/ports/srell/vcpkg.json +++ b/ports/srell/vcpkg.json @@ -1,6 +1,6 @@ { "name": "srell", - "version-string": "2.920", + "version-string": "3.001", "description": "SRELL (std::regex-like library) is a regular expression template library for C++.", "homepage": "https://www.akenotsuki.com/misc/srell/en/" } diff --git a/versions/baseline.json b/versions/baseline.json index c3ebcade0a2efb..5594f8a59803a3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6465,7 +6465,7 @@ "port-version": 0 }, "srell": { - "baseline": "2.920", + "baseline": "3.001", "port-version": 0 }, "srpc": { diff --git a/versions/s-/srell.json b/versions/s-/srell.json index 0f69b92c4f024c..7f8cafc296f859 100644 --- a/versions/s-/srell.json +++ b/versions/s-/srell.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b687fe2dff873db6884f3eacb1b756579bee8e0e", + "version-string": "3.001", + "port-version": 0 + }, { "git-tree": "3497458c9ed34a6d973e693711dffcc387e81ad0", "version-string": "2.920", From 9dbc074a967ef19969557ef7f604ea5478f54b36 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 9 Nov 2021 01:14:11 +0100 Subject: [PATCH 1037/1858] [string-theory] Update to 3.5 (#21212) * Update string-theory to 3.5 * Update CI baseline * Fix CMake config * Update git-tree hash Co-authored-by: chausner --- ports/string-theory/portfile.cmake | 24 +++++++++--------------- ports/string-theory/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/s-/string-theory.json | 5 +++++ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/ports/string-theory/portfile.cmake b/ports/string-theory/portfile.cmake index fb4a512eef51f4..83605de51d095c 100644 --- a/ports/string-theory/portfile.cmake +++ b/ports/string-theory/portfile.cmake @@ -1,25 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zrax/string_theory - REF 3.4 - SHA512 36ad82c6da276b7cb66d350ceb4bed2a66f768a6604b2981331ceec6a96d03cc3a7e7e5f733de88ec15e0ea41f99f8657b959a51149c540f530d06268c5657ff + REF 3.5 + SHA512 30300155e64ace8197ed531baffe4e835c269ac10d6857ac9f29501e0a1f69965994d6f2fa2e64544e7d441de635e2d370be24efcf00a0d24066730d19f022a6 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/string_theory) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME string_theory CONFIG_PATH lib/cmake/string_theory) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/string-theory ${CURRENT_PACKAGES_DIR}/share/string_theory) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) - -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/string-theory) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/string-theory/LICENSE ${CURRENT_PACKAGES_DIR}/share/string-theory/copyright) -file(COPY ${CURRENT_PACKAGES_DIR}/share/string-theory/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/string_theory/copyright) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/string-theory/vcpkg.json b/ports/string-theory/vcpkg.json index 2a79ccb4f9c641..aeb3ef9eaf0392 100644 --- a/ports/string-theory/vcpkg.json +++ b/ports/string-theory/vcpkg.json @@ -1,7 +1,16 @@ { "name": "string-theory", - "version-string": "3.4", - "port-version": 1, + "version": "3.5", "description": "Flexible modern C++ string library with type-safe formatting.", - "homepage": "https://github.com/zrax/string_theory" + "homepage": "https://github.com/zrax/string_theory", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5594f8a59803a3..e43589c8da49f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6501,8 +6501,8 @@ "port-version": 1 }, "string-theory": { - "baseline": "3.4", - "port-version": 1 + "baseline": "3.5", + "port-version": 0 }, "string-view-lite": { "baseline": "1.6.0", diff --git a/versions/s-/string-theory.json b/versions/s-/string-theory.json index 56e8c8cf6aeab9..c10d120898f1d6 100644 --- a/versions/s-/string-theory.json +++ b/versions/s-/string-theory.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c02a14bfc014ccb0e31c944aac072ed64eb1136", + "version": "3.5", + "port-version": 0 + }, { "git-tree": "8af1cbe5e5d6b5d098b15f4e5548d4e315afb4b0", "version-string": "3.4", From 135beb5bd6cb9135e07b7fd6d15e1fa594835d34 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:39:26 +0100 Subject: [PATCH 1038/1858] [libmagic] no absolute paths (#21266) --- ports/libmagic/portfile.cmake | 27 ++++++++++++++------------- ports/libmagic/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libmagic.json | 5 +++++ 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index fe61ea40209e7a..ed155792b7e108 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -34,37 +34,38 @@ endif() vcpkg_configure_make( AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" ) if(VCPKG_CROSSCOMPILING) - vcpkg_add_to_path(PREPEND ${CURRENT_HOST_INSTALLED_DIR}/tools/libmagic/bin) + vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/libmagic/bin") elseif(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) set(EXTRA_ARGS "ADD_BIN_TO_PATH") endif() vcpkg_install_make(${EXTRA_ARGS}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin) +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") +vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") +vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() if(VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}/share/misc) - file(COPY ${CURRENT_PACKAGES_DIR}/share/${PORT}/misc/magic.mgc DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/share/misc) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/share/misc") + file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/misc/magic.mgc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/share/misc") endif() if(NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/share/misc) - file(COPY ${CURRENT_PACKAGES_DIR}/share/${PORT}/misc/magic.mgc DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/share/misc) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/share/misc") + file(COPY "${CURRENT_PACKAGES_DIR}/share/${PORT}/misc/magic.mgc" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/share/misc") endif() endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/man5) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/man5") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index c0c727f1d47b46..9f63ac322314d4 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libmagic", "version-string": "5.40", + "port-version": 1, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e43589c8da49f1..76956047599f10 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3590,7 +3590,7 @@ }, "libmagic": { "baseline": "5.40", - "port-version": 0 + "port-version": 1 }, "libmariadb": { "baseline": "3.1.12", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index 563e7761cc4549..9f7690d0dc4d42 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bc1a88e28473967fafa7be73db0304f127ae202", + "version-string": "5.40", + "port-version": 1 + }, { "git-tree": "0645b6d33816b293de3dae3b84828b97d06bd0ea", "version-string": "5.40", From c4cb7b2579e0b9aa33efaea4397cbd978f85e639 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:39:41 +0100 Subject: [PATCH 1039/1858] [libsrt] no absolute paths (#21265) --- ports/libsrt/portfile.cmake | 5 +++-- ports/libsrt/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libsrt.json | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ports/libsrt/portfile.cmake b/ports/libsrt/portfile.cmake index 5e806994b6ec16..23ae59ccd53db0 100644 --- a/ports/libsrt/portfile.cmake +++ b/ports/libsrt/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Haivision/srt - REF v1.4.4 - SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA + REF v1.4.4 + SHA512 0D51E0EF73F4AA7EB284288CDBBD75B1C161969C2C2FED3A6D4E13A931341CA41DFCF2D6C1B9728F72B43454A9FDE3764DA67A27AF9F0C99A6818682E4F4D4BA HEAD_REF master PATCHES fix-dependency-install.patch ) @@ -34,6 +34,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index 6ca30d7db8873f..5de788840aed97 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libsrt", "version": "1.4.4", + "port-version": 1, "description": "Secure Reliable Transport (SRT) is an open source transport technology that optimizes streaming performance across unpredictable networks, such as the Internet.", "homepage": "https://github.com/Haivision/srt", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 76956047599f10..a714ff5e5574a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3874,7 +3874,7 @@ }, "libsrt": { "baseline": "1.4.4", - "port-version": 0 + "port-version": 1 }, "libsrtp": { "baseline": "2.4.2", diff --git a/versions/l-/libsrt.json b/versions/l-/libsrt.json index 4b2c1dca1f45e6..aa407873239134 100644 --- a/versions/l-/libsrt.json +++ b/versions/l-/libsrt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8181eb237eec2ba795164edfbd47f69d6b8466d8", + "version": "1.4.4", + "port-version": 1 + }, { "git-tree": "8187d1dc57e7d3632bdabee7516a94e0ab2a0afb", "version": "1.4.4", From a785f5014401ea9a6f22f541e4eadede1263486b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:40:05 +0100 Subject: [PATCH 1040/1858] [mongo-c-driver] no absolute paths (#21264) --- ports/mongo-c-driver/portfile.cmake | 3 ++- ports/mongo-c-driver/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mongo-c-driver.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index ff22ec6c2433b6..1b4967349cd20a 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -114,10 +114,11 @@ endif() ]] LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") string(REPLACE [[PACKAGE_PREFIX_DIR]] [[_IMPORT_PREFIX]] LIBMONGOC_CONFIG_CMAKE "${LIBMONGOC_CONFIG_CMAKE}") -file(WRITE ${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake "${LIBMONGOC_CONFIG_CMAKE}") +file(WRITE "${CURRENT_PACKAGES_DIR}/share/libmongoc-1.0/libmongoc-1.0-config.cmake" "${LIBMONGOC_CONFIG_CMAKE}") file(COPY "${SOURCE_PATH}/THIRD_PARTY_NOTICES" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_fixup_pkgconfig() +file(REMOVE "${CURRENT_PACKAGES_DIR}/share/mongo-c-driver/uninstall.sh") \ No newline at end of file diff --git a/ports/mongo-c-driver/vcpkg.json b/ports/mongo-c-driver/vcpkg.json index 7f75b1c1f23416..1de4c7a9f3d41e 100644 --- a/ports/mongo-c-driver/vcpkg.json +++ b/ports/mongo-c-driver/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mongo-c-driver", "version": "1.17.6", - "port-version": 1, + "port-version": 2, "description": "Client library written in C for MongoDB.", "homepage": "https://github.com/mongodb/mongo-c-driver", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a714ff5e5574a8..34d0ae448bfeb3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4402,7 +4402,7 @@ }, "mongo-c-driver": { "baseline": "1.17.6", - "port-version": 1 + "port-version": 2 }, "mongo-cxx-driver": { "baseline": "3.6.5", diff --git a/versions/m-/mongo-c-driver.json b/versions/m-/mongo-c-driver.json index dd0a4566f94cd1..b7ced9eb8b2674 100644 --- a/versions/m-/mongo-c-driver.json +++ b/versions/m-/mongo-c-driver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0579545ecddc3bef7941e3caa19bda27c80323bc", + "version": "1.17.6", + "port-version": 2 + }, { "git-tree": "1885ed4c6d71d255e97ef46bc1dd3b5353686845", "version": "1.17.6", From c189b5446576c987e207d3e17bf65adce79c5a10 Mon Sep 17 00:00:00 2001 From: Sacha Delanoue Date: Tue, 9 Nov 2021 05:40:52 +0100 Subject: [PATCH 1041/1858] [amqpcpp] Update to 4.3.15 (#21259) Co-authored-by: Sacha Delanoue --- ports/amqpcpp/portfile.cmake | 4 ++-- ports/amqpcpp/vcpkg.json | 3 +-- versions/a-/amqpcpp.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/amqpcpp/portfile.cmake b/ports/amqpcpp/portfile.cmake index 6827a433550259..b4a0a110e02d85 100644 --- a/ports/amqpcpp/portfile.cmake +++ b/ports/amqpcpp/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO CopernicaMarketingSoftware/AMQP-CPP - REF 2749d36a9cf9def86fc8a30eceb0e3a11d85815d #v4.3.14 - SHA512 ee6df360963bb5714c7503e27a9ed0682d704a267ef615fa922bd1cb637d1c0867c9074d5aeef084621840ef39f495a4103f22bfd80b6b1dd325bc6061e9c2ca + REF b891cc37a6ff63fcff59a112de281f5964344c91 #v4.3.15 + SHA512 5c55285e2445752669bfe51a276c3c9cb294eeae74e05124fa7427737e43419493b8a8e199bedba9ab7fba5822a8da530ca442afdbe45d12c2c0c54f9fd59a0c HEAD_REF master PATCHES find-openssl.patch diff --git a/ports/amqpcpp/vcpkg.json b/ports/amqpcpp/vcpkg.json index 8252d41bf8dd38..c34f008483c073 100644 --- a/ports/amqpcpp/vcpkg.json +++ b/ports/amqpcpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "amqpcpp", - "version": "4.3.14", - "port-version": 1, + "version": "4.3.15", "description": "AMQP-CPP is a C++ library for communicating with a RabbitMQ message broker", "homepage": "https://github.com/CopernicaMarketingSoftware/AMQP-CPP", "supports": "!uwp", diff --git a/versions/a-/amqpcpp.json b/versions/a-/amqpcpp.json index 4195befef5ae5e..c16bbb5cd01a17 100644 --- a/versions/a-/amqpcpp.json +++ b/versions/a-/amqpcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f2e1a0132721d9cdb8515d40010eaba97ecc8de", + "version": "4.3.15", + "port-version": 0 + }, { "git-tree": "bb3c11de2e142fc43d0c3bbcddc2a56b563de733", "version": "4.3.14", diff --git a/versions/baseline.json b/versions/baseline.json index 34d0ae448bfeb3..ab2e43976369ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -73,8 +73,8 @@ "port-version": 1 }, "amqpcpp": { - "baseline": "4.3.14", - "port-version": 1 + "baseline": "4.3.15", + "port-version": 0 }, "anax": { "baseline": "2.1.0", From 38c6418698aacb45bdd3da048ea7604d6231f87c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:41:14 +0100 Subject: [PATCH 1042/1858] [unixodbc] no absolute paths (#21258) --- ports/unixodbc/portfile.cmake | 7 ++++--- ports/unixodbc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/unixodbc.json | 5 +++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ports/unixodbc/portfile.cmake b/ports/unixodbc/portfile.cmake index f54488163325f1..6f87f034f147ec 100644 --- a/ports/unixodbc/portfile.cmake +++ b/ports/unixodbc/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG COPY_SOURCE ) @@ -18,6 +18,7 @@ vcpkg_configure_make( vcpkg_install_make() vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") @@ -30,5 +31,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc" "${CURRENT_PACKAGES_DIR}/share/man" ) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/unixodbcConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/unixodbc/vcpkg.json b/ports/unixodbc/vcpkg.json index 0ceb1a24fa56d1..01162834c45ee9 100644 --- a/ports/unixodbc/vcpkg.json +++ b/ports/unixodbc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "unixodbc", "version-string": "2.3.7", - "port-version": 3, + "port-version": 4, "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", "homepage": "https://github.com/lurcher/unixODBC", "supports": "osx | linux" diff --git a/versions/baseline.json b/versions/baseline.json index ab2e43976369ab..fff92bbeafb3a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6882,7 +6882,7 @@ }, "unixodbc": { "baseline": "2.3.7", - "port-version": 3 + "port-version": 4 }, "unqlite": { "baseline": "1.1.9", diff --git a/versions/u-/unixodbc.json b/versions/u-/unixodbc.json index ba0873b1ea4dd3..4df7f4ffb23eb6 100644 --- a/versions/u-/unixodbc.json +++ b/versions/u-/unixodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d18b08c03d4a7b07f4bbbed662baac83955af86c", + "version-string": "2.3.7", + "port-version": 4 + }, { "git-tree": "c08774000aaa495036e36835e7a473251718d82d", "version-string": "2.3.7", From fc9dc1a33e6b3a3adc46b2651ce03e65fa4ff616 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:42:03 +0100 Subject: [PATCH 1043/1858] [ocilib] no absolute paths (#21257) --- ports/ocilib/portfile.cmake | 22 +++++++++++----------- ports/ocilib/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/ocilib.json | 5 +++++ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index b510212a50f996..5ef74744023c98 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -19,7 +19,7 @@ if(VCPKG_TARGET_IS_WINDOWS) # As it is a C library, build the release configuration and copy its output to the debug folder set(VCPKG_BUILD_TYPE release) vcpkg_install_msbuild( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH proj/dll/ocilib_dll_vs2019.sln INCLUDES_SUBPATH include LICENSE_SUBPATH LICENSE @@ -28,25 +28,25 @@ if(VCPKG_TARGET_IS_WINDOWS) USE_VCPKG_INTEGRATION ALLOW_ROOT_INCLUDES) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug) - file(COPY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug") + file(COPY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") endif() else() vcpkg_configure_make( COPY_SOURCE AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS --with-oracle-import=runtime ) vcpkg_install_make() - - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc/${PORT} ${CURRENT_PACKAGES_DIR}/share/${PORT}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) - file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc/${PORT}" "${CURRENT_PACKAGES_DIR}/share/${PORT}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") + file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) endif() diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 55fe9a9003e16f..62cb70fa815122 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ocilib", "version-string": "4.7.1", - "port-version": 1, + "port-version": 2, "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", "supports": "!(arm | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index fff92bbeafb3a7..1e11ec883e564f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4778,7 +4778,7 @@ }, "ocilib": { "baseline": "4.7.1", - "port-version": 1 + "port-version": 2 }, "octomap": { "baseline": "1.9.5", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index 706e5db6f95c09..879031d4cb2f9c 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfeb78a0e1d2f65807a7ad4925e5b6cc973c52a0", + "version-string": "4.7.1", + "port-version": 2 + }, { "git-tree": "a3316dc22d7227e1886297c9471dcb737412bc84", "version-string": "4.7.1", From 0f6f065c34c49cd4449e1b257281b874de5c50bb Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:42:39 +0100 Subject: [PATCH 1044/1858] [tcl] no absolute paths (#21256) --- ports/tcl/portfile.cmake | 65 ++++++++++++++++++++-------------------- ports/tcl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tcl.json | 5 ++++ 4 files changed, 40 insertions(+), 34 deletions(-) diff --git a/ports/tcl/portfile.cmake b/ports/tcl/portfile.cmake index 146682d26259e2..77347cb02801ab 100644 --- a/ports/tcl/portfile.cmake +++ b/ports/tcl/portfile.cmake @@ -60,10 +60,10 @@ if (VCPKG_TARGET_IS_WINDOWS) # Note: tcl shell requires it to be in a folder adjacent to the /lib/ folder, i.e. in a /bin/ folder if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) file(GLOB_RECURSE TOOL_BIN - ${CURRENT_PACKAGES_DIR}/bin/*.exe - ${CURRENT_PACKAGES_DIR}/bin/*.dll + "${CURRENT_PACKAGES_DIR}/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/bin/*.dll" ) - file(COPY ${TOOL_BIN} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/tcl/bin/) + file(COPY ${TOOL_BIN} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/tcl/bin/") # Remove .exes only after copying file(GLOB_RECURSE TOOL_EXES @@ -72,53 +72,53 @@ if (VCPKG_TARGET_IS_WINDOWS) file(REMOVE ${TOOL_EXES}) file(GLOB_RECURSE TOOLS - ${CURRENT_PACKAGES_DIR}/lib/dde1.4/* - ${CURRENT_PACKAGES_DIR}/lib/nmake/* - ${CURRENT_PACKAGES_DIR}/lib/reg1.3/* - ${CURRENT_PACKAGES_DIR}/lib/tcl8/* - ${CURRENT_PACKAGES_DIR}/lib/tcl8.6/* - ${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0/* + "${CURRENT_PACKAGES_DIR}/lib/dde1.4/*" + "${CURRENT_PACKAGES_DIR}/lib/nmake/*" + "${CURRENT_PACKAGES_DIR}/lib/reg1.3/*" + "${CURRENT_PACKAGES_DIR}/lib/tcl8/*" + "${CURRENT_PACKAGES_DIR}/lib/tcl8.6/*" + "${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0/*" ) foreach(TOOL ${TOOLS}) get_filename_component(DST_DIR ${TOOL} PATH) - file(COPY ${TOOL} DESTINATION ${DST_DIR}) + file(COPY "${TOOL}" DESTINATION ${DST_DIR}) endforeach() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/dde1.4 - ${CURRENT_PACKAGES_DIR}/lib/nmake - ${CURRENT_PACKAGES_DIR}/lib/reg1.3 - ${CURRENT_PACKAGES_DIR}/lib/tcl8 - ${CURRENT_PACKAGES_DIR}/lib/tcl8.6 - ${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0 + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/dde1.4" + "${CURRENT_PACKAGES_DIR}/lib/nmake" + "${CURRENT_PACKAGES_DIR}/lib/reg1.3" + "${CURRENT_PACKAGES_DIR}/lib/tcl8" + "${CURRENT_PACKAGES_DIR}/lib/tcl8.6" + "${CURRENT_PACKAGES_DIR}/lib/tdbcsqlite31.1.0" ) endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) file(GLOB_RECURSE TOOL_BIN - ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/*.dll + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.dll" ) - file(COPY ${TOOL_BIN} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/tcl/debug/bin/) + file(COPY ${TOOL_BIN} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/bin/") # Remove .exes only after copying file(GLOB_RECURSE EXES - ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" ) file(REMOVE ${EXES}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/dde1.4 - ${CURRENT_PACKAGES_DIR}/debug/lib/nmake - ${CURRENT_PACKAGES_DIR}/debug/lib/reg1.3 - ${CURRENT_PACKAGES_DIR}/debug/lib/tcl8 - ${CURRENT_PACKAGES_DIR}/debug/lib/tcl8.6 - ${CURRENT_PACKAGES_DIR}/debug/lib/tdbcsqlite31.1.0 + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/dde1.4" + "${CURRENT_PACKAGES_DIR}/debug/lib/nmake" + "${CURRENT_PACKAGES_DIR}/debug/lib/reg1.3" + "${CURRENT_PACKAGES_DIR}/debug/lib/tcl8" + "${CURRENT_PACKAGES_DIR}/debug/lib/tcl8.6" + "${CURRENT_PACKAGES_DIR}/debug/lib/tdbcsqlite31.1.0" ) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(CHMOD_RECURSE "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/msgs" "${CURRENT_PACKAGES_DIR}/tools/tcl/debug/lib/tcl9.0/tzdata" @@ -131,7 +131,7 @@ if (VCPKG_TARGET_IS_WINDOWS) else() file(REMOVE "${SOURCE_PATH}/unix/configure") vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH unix ) @@ -139,9 +139,10 @@ else() vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/tclConfig.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/tclConfig.sh") endif() -file(INSTALL ${SOURCE_PATH}/license.terms DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.terms" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/tcl/vcpkg.json b/ports/tcl/vcpkg.json index 4449957408ab0c..d01f3bea0763fb 100644 --- a/ports/tcl/vcpkg.json +++ b/ports/tcl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tcl", "version-string": "core-9-0-a1", - "port-version": 3, + "port-version": 4, "description": "Tcl provides a powerful platform for creating integration applications that tie together diverse applications, protocols, devices, and frameworks. When paired with the Tk toolkit, Tcl provides the fastest and most powerful way to create GUI applications that run on PCs, Unix, and Mac OS X. Tcl can also be used for a variety of web-related tasks and for creating powerful command languages for applications.", "homepage": "https://github.com/tcltk/tcl", "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 1e11ec883e564f..bcdfe640a834a1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6574,7 +6574,7 @@ }, "tcl": { "baseline": "core-9-0-a1", - "port-version": 3 + "port-version": 4 }, "tclap": { "baseline": "1.2.2", diff --git a/versions/t-/tcl.json b/versions/t-/tcl.json index 3933fe028ac4e8..e6483aba4217ac 100644 --- a/versions/t-/tcl.json +++ b/versions/t-/tcl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce21246b8ebf7e3ec20c2c8ea3abc5bbacea363e", + "version-string": "core-9-0-a1", + "port-version": 4 + }, { "git-tree": "178e263715acedbd584a7390566df8f6e75e5a9c", "version-string": "core-9-0-a1", From 73cb85fbc98446028f85bf63d3c537eb04ae3324 Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Tue, 9 Nov 2021 12:43:05 +0800 Subject: [PATCH 1045/1858] [workflow] Update version to 0.9.7 (#21252) * update port workflow version to 0.9.7 * add version * use functions * add version * fix function of fixup * add version * fix error * add version --- ports/workflow/portfile.cmake | 14 +++++++------- ports/workflow/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/w-/workflow.json | 5 +++++ 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ports/workflow/portfile.cmake b/ports/workflow/portfile.cmake index 7dfa7e906f8d87..5075bbde4b47b0 100644 --- a/ports/workflow/portfile.cmake +++ b/ports/workflow/portfile.cmake @@ -2,28 +2,28 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sogou/workflow - REF v0.9.6-win - SHA512 ecbc641d9d7bae707387248060af91375cd0c80d50eee2ae1dd24f0f61eda0d3faf0ea835bf6a03a7d25b5708771c3e432b8ad135ae5d1620e705a1ef93bb84e + REF v0.9.7-win + SHA512 c23b8c1910c4ca5d57fa732e3084f56e17fdfead5561a8eab7be469d8f6081d830555365b2cf74e27956ffa88a6fb284dbde4654b23b130da9fbb4eb404686bd HEAD_REF windows ) else() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sogou/workflow - REF v0.9.6 - SHA512 a9078223b3437bd73a3988310490ad867796707ccc25483120bca1249197a12abe07d09647df16f6efc63ba52b808d2bee8e2f2a10dd3e62335409fa06089621 + REF v0.9.7 + SHA512 4866d9cfe2d9ba30f2f7866819ee8f425b91082d7f86994c1194a6b4406e8ee99e22ce6b0bafeb22c5f098f7da30029fb6b12895c2ac45810d33c28d4bfad006 HEAD_REF master ) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/workflow/vcpkg.json b/ports/workflow/vcpkg.json index ba7f8f7baa7691..bbea8566355b1c 100644 --- a/ports/workflow/vcpkg.json +++ b/ports/workflow/vcpkg.json @@ -1,9 +1,17 @@ { "name": "workflow", - "version": "0.9.6", + "version": "0.9.7", "description": "About C++ Parallel Computing and Asynchronous Networking Engine", "homepage": "https://github.com/sogou/workflow", "dependencies": [ - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index bcdfe640a834a1..92f4f623f79421 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7141,7 +7141,7 @@ "port-version": 1 }, "workflow": { - "baseline": "0.9.6", + "baseline": "0.9.7", "port-version": 0 }, "wpilib": { diff --git a/versions/w-/workflow.json b/versions/w-/workflow.json index c6214010dc2ae5..67609cd7f7ed22 100644 --- a/versions/w-/workflow.json +++ b/versions/w-/workflow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "864387c239d4b0fadabfc4b314564d75c9bc07bc", + "version": "0.9.7", + "port-version": 0 + }, { "git-tree": "ab1da719c3684f213ddd140aa6e09994c73580ee", "version": "0.9.6", From 9ead245847f11fd4bbd04440bd395db9e2f87a92 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 9 Nov 2021 05:43:34 +0100 Subject: [PATCH 1046/1858] [ois] Update to 1.5.1 (#21244) * Update ois to 1.5.1 * Update CI baseline * Fix typo Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Add "supports", remove entries from CI baseline * Update git-tree hash Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/ois/portfile.cmake | 25 ++++++++++--------------- ports/ois/vcpkg.json | 14 ++++++++++---- scripts/ci.baseline.txt | 3 --- versions/baseline.json | 4 ++-- versions/o-/ois.json | 5 +++++ 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/ports/ois/portfile.cmake b/ports/ois/portfile.cmake index 3c06999d7ec811..69e24c4393a2cd 100644 --- a/ports/ois/portfile.cmake +++ b/ports/ois/portfile.cmake @@ -1,31 +1,26 @@ -# Automatically fail port install for UWP and ARM. Unsure if it is -# supported by library. See here: https://github.com/wgois/OIS/issues/57 -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO wgois/OIS - REF v1.5 - SHA512 5ab1dda7c25c1959ccbbb758ea3fda36bd62ad65f46e2c6b418317a5eb39e0bace52a44ae079dfb69fc58c90df54f8e50d589daae1100ec615325363c9d77513 + REF v1.5.1 + SHA512 20598aef999a70900cb7f75ffaf62059acf8e811822971cb21986b5d25d28dacb79e4b4cf4770c70e00d3c55cdd01ef3e68a77c2dd148677784fc4df38891340 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Include files should not be duplicated into the /debug/include directory -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ois/vcpkg.json b/ports/ois/vcpkg.json index 00b05789f307dc..9daa139ed56793 100644 --- a/ports/ois/vcpkg.json +++ b/ports/ois/vcpkg.json @@ -1,7 +1,13 @@ { "name": "ois", - "version-string": "1.5", - "port-version": 3, - "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatiable with many systems and operating systems.", - "homepage": "https://wgois.github.io/OIS/" + "version": "1.5.1", + "description": "Cross Platform Object Oriented Input Lib System. Meant to be very robust and compatible with many systems and operating systems.", + "homepage": "https://wgois.github.io/OIS/", + "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 917c7a47307821..ce09035bce3ba1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1029,9 +1029,6 @@ ogre-next:x64-windows = skip ogre-next:x64-windows-static = skip ogre-next:x64-windows-static-md=skip ogre-next:x86-windows = skip -ois:arm64-windows=fail -ois:arm-uwp=fail -ois:x64-uwp=fail # ompl is vulnerable to some form of race in its dependent ports, and adding 'ode' as a dependency # does not resolve the issue # src/ompl/CMakeFiles/ompl.dir/extensions/ode/src/OpenDEStateValidityChecker.cpp.o diff --git a/versions/baseline.json b/versions/baseline.json index 92f4f623f79421..23703490859b47 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4805,8 +4805,8 @@ "port-version": 2 }, "ois": { - "baseline": "1.5", - "port-version": 3 + "baseline": "1.5.1", + "port-version": 0 }, "ompl": { "baseline": "1.5.1", diff --git a/versions/o-/ois.json b/versions/o-/ois.json index bbefaa8d60a12b..d273f8c520a8f3 100644 --- a/versions/o-/ois.json +++ b/versions/o-/ois.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05dc4bcc0372eaa7b8a86f89a268c5ef0c69c5bf", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "0d8ca34b4a48f37cf731b920ab96995bcc81a8f4", "version-string": "1.5", From f0e77bb8cbb051d48ca0508a4dfbd39d866c3554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Tue, 9 Nov 2021 06:02:22 +0100 Subject: [PATCH 1047/1858] [pcre] Remove download from ftp.pcre.org (#21225) The former ftp.pcre.org FTP site is no longer available [1]. - Use sourceforge only for download - Fixes #21201 - Remove deprecated functions from portfile vcpkg_install_cmake -> vcpkg_cmake_install vcpkg_configure_cmake -> vcpkg_cmake_configure (remove PREFER_NINJA) vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup - Add double quotes to files [1] https://www.pcre.org/ --- ports/pcre/portfile.cmake | 49 +++++++++++++-------------------------- ports/pcre/vcpkg.json | 13 ++++++++++- versions/baseline.json | 2 +- versions/p-/pcre.json | 5 ++++ 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/ports/pcre/portfile.cmake b/ports/pcre/portfile.cmake index f96e2a5bfd45d6..874f666c9251d4 100644 --- a/ports/pcre/portfile.cmake +++ b/ports/pcre/portfile.cmake @@ -9,33 +9,17 @@ set(PATCHES pcre-8.45_fix_postfix_for_debug_Windows_builds.patch export-cmake-targets.patch) -vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.pcre.org/pub/pcre/pcre-${PCRE_VERSION}.zip" +vcpkg_from_sourceforge( + OUT_SOURCE_PATH SOURCE_PATH + REPO pcre/pcre + REF ${PCRE_VERSION} FILENAME "pcre-${PCRE_VERSION}.zip" SHA512 ${EXPECTED_SHA} - SILENT_EXIT + PATCHES ${PATCHES} ) -if (EXISTS "${ARCHIVE}") - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - PATCHES ${PATCHES} - ) -else() - vcpkg_from_sourceforge( - OUT_SOURCE_PATH SOURCE_PATH - REPO pcre/pcre - REF ${PCRE_VERSION} - FILENAME "pcre-${PCRE_VERSION}.zip" - SHA512 ${EXPECTED_SHA} - PATCHES ${PATCHES} - ) -endif() - -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DPCRE_BUILD_TESTS=NO -DPCRE_BUILD_PCREGREP=NO @@ -55,11 +39,11 @@ vcpkg_configure_cmake( # OPTIONS_DEBUG -DDEBUGGABLE=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME "unofficial-${PORT}" CONFIG_PATH "share/unofficial-${PORT}") -foreach(FILE ${CURRENT_PACKAGES_DIR}/include/pcre.h ${CURRENT_PACKAGES_DIR}/include/pcreposix.h) +foreach(FILE "${CURRENT_PACKAGES_DIR}/include/pcre.h" "${CURRENT_PACKAGES_DIR}/include/pcreposix.h") file(READ ${FILE} PCRE_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "defined(PCRE_STATIC)" "1" PCRE_H "${PCRE_H}") @@ -71,18 +55,17 @@ endforeach() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/man) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() -configure_file(${CMAKE_CURRENT_LIST_DIR}/unofficial-pcre-config.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-pcre/unofficial-pcre-config.cmake @ONLY) - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +configure_file("${CMAKE_CURRENT_LIST_DIR}/unofficial-pcre-config.cmake" "${CURRENT_PACKAGES_DIR}/share/unofficial-pcre/unofficial-pcre-config.cmake" @ONLY) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pcre/vcpkg.json b/ports/pcre/vcpkg.json index 2e6ddd7ca27c69..d3a6a802773039 100644 --- a/ports/pcre/vcpkg.json +++ b/ports/pcre/vcpkg.json @@ -1,6 +1,17 @@ { "name": "pcre", "version": "8.45", + "port-version": 1, "description": "Perl Compatible Regular Expressions", - "homepage": "https://www.pcre.org/" + "homepage": "https://www.pcre.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 23703490859b47..7a82a962b0ac8c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5122,7 +5122,7 @@ }, "pcre": { "baseline": "8.45", - "port-version": 0 + "port-version": 1 }, "pcre2": { "baseline": "10.37", diff --git a/versions/p-/pcre.json b/versions/p-/pcre.json index b8be22d8a3cedf..22f1e01a977382 100644 --- a/versions/p-/pcre.json +++ b/versions/p-/pcre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1eb815e0c923baec32da26918e951b288adbaa5", + "version": "8.45", + "port-version": 1 + }, { "git-tree": "665bab8c2bf878815782cff93dfff5720316ab88", "version": "8.45", From 22bcb05715c73154e9d0dd1afdf951fde3dd9215 Mon Sep 17 00:00:00 2001 From: Johan Strombom Date: Tue, 9 Nov 2021 06:02:38 +0100 Subject: [PATCH 1048/1858] [nghttp2] Update to v1.46.0 (#21243) * [nghttp2] Update to v1.46.0 Update nghttp2 from 1.45.1 to 1.46.0. * [nghttp2] Update to v1.46.0 * [nghttp2] Update to v1.46.0 --- ports/nghttp2/portfile.cmake | 4 ++-- ports/nghttp2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nghttp2.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/nghttp2/portfile.cmake b/ports/nghttp2/portfile.cmake index 911db59dc483b7..ef14b80ad6c35d 100644 --- a/ports/nghttp2/portfile.cmake +++ b/ports/nghttp2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nghttp2/nghttp2 - REF 53dfaad925dc2274488dd61bb47e613a9539371a # v1.45.1 - SHA512 35e92195434c1668b457374a4d0800d103947de1942f447a1adc5d243efad0a0b09911bfe30c62f1df9946246d61de9891529f1399c75db6ad6643e1fbd72a38 + REF 7af0c508be9cbec407268e2f546f597d268c104e # v1.46.0 + SHA512 e25e8a43d0f9523f654d9136c2b9db30cfa5e8086da3fe3e9bcf68ff8c034383550ca17d89d31cd14e23b5886a0a948d777b4e182d0a042ccfe9a8083410de93 HEAD_REF master ) diff --git a/ports/nghttp2/vcpkg.json b/ports/nghttp2/vcpkg.json index c8ae19e7212d70..9b5ce8969be7ce 100644 --- a/ports/nghttp2/vcpkg.json +++ b/ports/nghttp2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "nghttp2", - "version": "1.45.1", + "version": "1.46.0", "description": "Implementation of the Hypertext Transfer Protocol version 2 in C", "homepage": "https://github.com/nghttp2/nghttp2", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7a82a962b0ac8c..4636637a56b5d7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4641,7 +4641,7 @@ "port-version": 2 }, "nghttp2": { - "baseline": "1.45.1", + "baseline": "1.46.0", "port-version": 0 }, "ngspice": { diff --git a/versions/n-/nghttp2.json b/versions/n-/nghttp2.json index 49b7596b444efd..fe89531acd03d9 100644 --- a/versions/n-/nghttp2.json +++ b/versions/n-/nghttp2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7477580246c8547d75abc176295b832544cb132", + "version": "1.46.0", + "port-version": 0 + }, { "git-tree": "e765c53ede7876249ec80ae256b96c468d394734", "version": "1.45.1", From 5bca9491ce9f349d7bfcf39b08b36d5bce0664c4 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 06:03:08 +0100 Subject: [PATCH 1049/1858] [aws-sdk-cpp] Fix the path in the export cmake config (#21240) * Adjust exported AWSSDK_DEFAULT_ROOT_DIR for vcpkg * Update versions --- ports/aws-sdk-cpp/fix-aws-root.patch | 16 ++++++++++++++++ ports/aws-sdk-cpp/portfile.cmake | 1 + ports/aws-sdk-cpp/vcpkg.json | 2 +- versions/a-/aws-sdk-cpp.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 ports/aws-sdk-cpp/fix-aws-root.patch diff --git a/ports/aws-sdk-cpp/fix-aws-root.patch b/ports/aws-sdk-cpp/fix-aws-root.patch new file mode 100644 index 00000000000000..074e009aaae3bc --- /dev/null +++ b/ports/aws-sdk-cpp/fix-aws-root.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake +index 83eac0b..96bdbe7 100644 +--- a/cmake/AWSSDKConfig.cmake ++++ b/cmake/AWSSDKConfig.cmake +@@ -63,11 +63,9 @@ endif() + + + # Compute the default installation root relative to this file. +-# from prefix/lib/cmake/AWSSDK/xx.cmake to prefix + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) + get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_DEFAULT_ROOT_DIR "${AWSSDK_DEFAULT_ROOT_DIR}" PATH) + get_filename_component(AWS_NATIVE_SDK_ROOT "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE) + + set(CPP_STANDARD "11" CACHE STRING "Flag to upgrade the C++ standard used. The default is 11. The minimum is 11.") diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index eb22b3aa748f42..512d1a95e2cafd 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( SHA512 456d3fc256a5a26843ecf16014242514b165ae5fa35f088d57aa54a744d19e2c38bd0bed9b6a4b76948c8a49cf87a06a4c722be5a910ed41dfd9c9b9a66b398d PATCHES patch-relocatable-rpath.patch + fix-aws-root.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT) diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json index 73ba3557e91060..8da48a4fbaa06d 100644 --- a/ports/aws-sdk-cpp/vcpkg.json +++ b/ports/aws-sdk-cpp/vcpkg.json @@ -2,7 +2,7 @@ "$note": "Automatically generated by generateFeatures.ps1", "name": "aws-sdk-cpp", "version": "1.9.96", - "port-version": 3, + "port-version": 4, "description": "AWS SDK for C++", "homepage": "https://github.com/aws/aws-sdk-cpp", "supports": "!arm & !uwp", diff --git a/versions/a-/aws-sdk-cpp.json b/versions/a-/aws-sdk-cpp.json index cf6fdc1da22270..8cb3adb1210b3b 100644 --- a/versions/a-/aws-sdk-cpp.json +++ b/versions/a-/aws-sdk-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fc86d9dc77f15fb8c7c18f767cc21e01e024a8cc", + "version": "1.9.96", + "port-version": 4 + }, { "git-tree": "74ac36ae24b2c852423a57305005fd86d23d51d9", "version": "1.9.96", diff --git a/versions/baseline.json b/versions/baseline.json index 4636637a56b5d7..f0806e098b7b94 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -306,7 +306,7 @@ }, "aws-sdk-cpp": { "baseline": "1.9.96", - "port-version": 3 + "port-version": 4 }, "azmq": { "baseline": "2020-03-03", From 93e68395f59175dd9506a059aaf7bc8f84f099cb Mon Sep 17 00:00:00 2001 From: Michael Heyman Date: Tue, 9 Nov 2021 00:03:25 -0500 Subject: [PATCH 1050/1858] mapbox-geojson-cpp dependency on mapbox-variant (#21232) * [mapbox-geojson-cpp] has mapbox-variant dependency * [mapbox-geojson-cpp]: port-version bump * [mapbox-geojson-cpp] x-add-version --- ports/mapbox-geojson-cpp/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/m-/mapbox-geojson-cpp.json | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/mapbox-geojson-cpp/vcpkg.json b/ports/mapbox-geojson-cpp/vcpkg.json index e3a4f681f2b70b..c9024a360cd487 100644 --- a/ports/mapbox-geojson-cpp/vcpkg.json +++ b/ports/mapbox-geojson-cpp/vcpkg.json @@ -1,9 +1,11 @@ { "name": "mapbox-geojson-cpp", "version-semver": "0.5.1", + "port-version": 1, "description": "A C++14 library for converting GeoJSON into geometry.hpp representation", "homepage": "https://github.com/mapbox/geojson-cpp", "dependencies": [ - "mapbox-geometry" + "mapbox-geometry", + "mapbox-variant" ] } diff --git a/versions/baseline.json b/versions/baseline.json index f0806e098b7b94..4c3353dcc604ff 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4198,7 +4198,7 @@ }, "mapbox-geojson-cpp": { "baseline": "0.5.1", - "port-version": 0 + "port-version": 1 }, "mapbox-geojson-vt-cpp": { "baseline": "6.6.4", diff --git a/versions/m-/mapbox-geojson-cpp.json b/versions/m-/mapbox-geojson-cpp.json index e68a78fe449622..954f76129d6769 100644 --- a/versions/m-/mapbox-geojson-cpp.json +++ b/versions/m-/mapbox-geojson-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "62c28d375da068349db5185f5353728cfb0603a0", + "version-semver": "0.5.1", + "port-version": 1 + }, { "git-tree": "b49d52ff8e08ce5985c91e3690bf7a9866823bc1", "version-semver": "0.5.1", From 9b1842643280e6808c801b498c30b13c2fdfd64d Mon Sep 17 00:00:00 2001 From: eao197 Date: Tue, 9 Nov 2021 08:03:47 +0300 Subject: [PATCH 1051/1858] [json-dto] Update to 0.2.15 (#21230) * json-dto updated to v.0.2.15. * Baseline updated for json-dto-0.2.15. --- ports/json-dto/portfile.cmake | 4 ++-- ports/json-dto/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/j-/json-dto.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/json-dto/portfile.cmake b/ports/json-dto/portfile.cmake index feb9e3f652a883..d5a577e54e49ec 100644 --- a/ports/json-dto/portfile.cmake +++ b/ports/json-dto/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stiffstream/json_dto - REF ea2786711187d6301df9d5a2deb6974f05c5ef44 # v.0.2.14 - SHA512 6c8a664148e65e347cd793f4f03be4d01612691cc4a69a4f84b906e582ea50a42db606c04e33cedb431f4ac45bf112460f109ab581ff2f34e97c2257534b9b40 + REF c878c002109784c5d7d7dd51e94cec19a200ff79 # v.0.2.15 + SHA512 7900263ac0cf815e31e2e6d632d4093f896a34d7842a81574c71e8883c6bbee3a75fa717b7fb0ac9a0c34a4e4e1bad855b7ea0374321745a43f3235b213da9f8 ) vcpkg_cmake_configure( diff --git a/ports/json-dto/vcpkg.json b/ports/json-dto/vcpkg.json index 41106704e6cd5d..08f3170e7ca565 100644 --- a/ports/json-dto/vcpkg.json +++ b/ports/json-dto/vcpkg.json @@ -1,6 +1,6 @@ { "name": "json-dto", - "version": "0.2.14", + "version": "0.2.15", "description": "A small header-only library for converting data between json representation and c++ structs.", "homepage": "https://github.com/Stiffstream/json_dto", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 4c3353dcc604ff..88a65ba86f60d0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2953,7 +2953,7 @@ "port-version": 2 }, "json-dto": { - "baseline": "0.2.14", + "baseline": "0.2.15", "port-version": 0 }, "json-schema-validator": { diff --git a/versions/j-/json-dto.json b/versions/j-/json-dto.json index a265dae54fbc5e..75e06e7fd046a2 100644 --- a/versions/j-/json-dto.json +++ b/versions/j-/json-dto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83c0ba869841555aeff8eb4954efcc64ae25a755", + "version": "0.2.15", + "port-version": 0 + }, { "git-tree": "171dd3158b291f899517b1bab85f4c76c95a4d56", "version": "0.2.14", From 05206696375890ac5c49458f0c04b49996da62a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 8 Nov 2021 21:06:25 -0800 Subject: [PATCH 1052/1858] [rsm-bsa] Update to 4.0.0 (#21214) * update to 4.0.0 * remove extraneous version file this file is from before the name was changed to `rsm-bsa`, and should never have been committed in the first place * add xmem codec support feature * install config files to the correct directory * use spaces for indentation * update versioning --- ports/rsm-bsa/portfile.cmake | 33 +++++++++++++++++++++++++-------- ports/rsm-bsa/vcpkg.json | 18 ++++++++++++++++-- versions/b-/bsa.json | 9 --------- versions/baseline.json | 2 +- versions/r-/rsm-bsa.json | 5 +++++ 5 files changed, 47 insertions(+), 20 deletions(-) delete mode 100644 versions/b-/bsa.json diff --git a/ports/rsm-bsa/portfile.cmake b/ports/rsm-bsa/portfile.cmake index 9d94ff11f70ee2..9b457b08309b67 100644 --- a/ports/rsm-bsa/portfile.cmake +++ b/ports/rsm-bsa/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Ryan-rsm-McKenzie/bsa - REF 2.0.3 - SHA512 b54f1cbc88e55b98b0c25ee81007dc42df736836784b2a1e2e91652b46a73054671d798cc0007ea79b7cf0c8181021bb0cbc95ae407d4a538298d668b4c8fe69 + REF 4.0.0 + SHA512 9be077349cea3f4c6f2298c6286fd306f370c560d9e474516dfd7ab8dcd2313032581f86f9b4f5afb5ccd2dbb4e57663e16997253421033e00186167db15576a HEAD_REF master ) @@ -12,17 +12,34 @@ if (VCPKG_TARGET_IS_LINUX) message(WARNING "Build ${PORT} requires at least gcc 10.") endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + xmem BSA_SUPPORT_XMEM +) + +if (BSA_SUPPORT_XMEM) + vcpkg_fail_port_install( + ON_TARGET "LINUX" + MESSAGE "XMem support is only available for windows" + ) +endif() + vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/bsa") +vcpkg_cmake_config_fixup( + PACKAGE_NAME bsa + CONFIG_PATH "lib/cmake/bsa" +) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + ${CURRENT_PACKAGES_DIR}/debug/include + ${CURRENT_PACKAGES_DIR}/debug/share ) file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/rsm-bsa/vcpkg.json b/ports/rsm-bsa/vcpkg.json index a586e25659550b..fc331bb0bd77dc 100644 --- a/ports/rsm-bsa/vcpkg.json +++ b/ports/rsm-bsa/vcpkg.json @@ -1,12 +1,18 @@ { "name": "rsm-bsa", - "version-semver": "2.0.3", + "version-semver": "4.0.0", "description": "A C++ library for working with the Bethesda archive file format", "homepage": "https://github.com/Ryan-rsm-McKenzie/bsa", "documentation": "https://ryan-rsm-mckenzie.github.io/bsa/", "supports": "!x86 & !osx & !uwp", "dependencies": [ + { + "name": "directxtex", + "platform": "windows" + }, "lz4", + "rsm-binary-io", + "rsm-mmio", { "name": "vcpkg-cmake", "host": true @@ -16,5 +22,13 @@ "host": true }, "zlib" - ] + ], + "features": { + "xmem": { + "description": "Compression support for the xmem codec", + "dependencies": [ + "reproc" + ] + } + } } diff --git a/versions/b-/bsa.json b/versions/b-/bsa.json deleted file mode 100644 index ca5ea3cd9f26bd..00000000000000 --- a/versions/b-/bsa.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "versions": [ - { - "git-tree": "b7c19adba6583acb02361b53ab1d4ab66b8189ab", - "version-semver": "2.0.3", - "port-version": 0 - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 88a65ba86f60d0..731aba8303c8d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5981,7 +5981,7 @@ "port-version": 0 }, "rsm-bsa": { - "baseline": "2.0.3", + "baseline": "4.0.0", "port-version": 0 }, "rsm-mmio": { diff --git a/versions/r-/rsm-bsa.json b/versions/r-/rsm-bsa.json index 08b84e996a592f..2623b9cb98dedb 100644 --- a/versions/r-/rsm-bsa.json +++ b/versions/r-/rsm-bsa.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a41057388bf027523e46eed7031efc1fb3920c17", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "465b19a5d463c1a9b54041b30600599ad0d5ac96", "version-semver": "2.0.3", From 9cbcd72fc069f2b1b39b20efea6887ff69626456 Mon Sep 17 00:00:00 2001 From: Daniel Marshall Date: Tue, 9 Nov 2021 05:06:51 +0000 Subject: [PATCH 1053/1858] [raylib] Update to 4.0.0 (#21209) * [raylib] Update to 4.0.0 * [raylib] Update version files --- ports/raylib/portfile.cmake | 14 +++++++------- ports/raylib/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/r-/raylib.json | 5 +++++ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ports/raylib/portfile.cmake b/ports/raylib/portfile.cmake index e429052f2c65fb..a1a3ab0d99a152 100644 --- a/ports/raylib/portfile.cmake +++ b/ports/raylib/portfile.cmake @@ -16,8 +16,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO raysan5/raylib - REF b6c8d343dca2ef19c23c50975328a028124cf3cb # 3.7.0 - SHA512 565854b00452ae4ae17129f6ced83d842b06ee51a2b254cf02c881c36f9133e5cd605c07585428a7ec4c4e556d8edea908f1c09cd2ef826c30be35c9e5c2d009 + REF 4.0.0 + SHA512 e9ffab14ab902e3327202e68ca139209ff24100dab62eb03fef50adf363f81e2705d81e709c58cf1514e68e6061c8963555bd2d00744daacc3eb693825fc3417 HEAD_REF master ) @@ -36,7 +36,7 @@ else() set(DEBUG_ENABLE_SANITIZERS ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS @@ -56,11 +56,11 @@ vcpkg_configure_cmake( -DENABLE_MSAN=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) configure_file( ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake @@ -83,5 +83,5 @@ endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/${PORT}/usage @ONLY) configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/raylib/vcpkg.json b/ports/raylib/vcpkg.json index 2180f2b8c9b01d..4a27c41bfd2b24 100644 --- a/ports/raylib/vcpkg.json +++ b/ports/raylib/vcpkg.json @@ -1,10 +1,19 @@ { "name": "raylib", - "version-semver": "3.7.0", - "port-version": 2, + "version-semver": "4.0.0", "description": "A simple and easy-to-use library to enjoy videogames programming", "homepage": "https://github.com/raysan5/raylib", "supports": "!(arm | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "use-audio" ], diff --git a/versions/baseline.json b/versions/baseline.json index 731aba8303c8d2..6b66956c0f35e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5845,8 +5845,8 @@ "port-version": 1 }, "raylib": { - "baseline": "3.7.0", - "port-version": 2 + "baseline": "4.0.0", + "port-version": 0 }, "rbdl": { "baseline": "2.6.0", diff --git a/versions/r-/raylib.json b/versions/r-/raylib.json index 6b130f7906d886..27e111f9adfd63 100644 --- a/versions/r-/raylib.json +++ b/versions/r-/raylib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "394d0afab6e94ac36b289e350cdf2b8886560bb4", + "version-semver": "4.0.0", + "port-version": 0 + }, { "git-tree": "9820d99ae1c7e23e42ee1bb3372ecee0de42c2bc", "version-semver": "3.7.0", From 1cea403f1ef250febd048a0f484780322c724464 Mon Sep 17 00:00:00 2001 From: Moritz Beutel Date: Tue, 9 Nov 2021 06:07:13 +0100 Subject: [PATCH 1054/1858] [gsl-lite] Update to v0.40.0 (#21204) * [gsl-lite] Update to 0.40.0 * [gsl-lite] Update version registry --- ports/gsl-lite/portfile.cmake | 4 ++-- ports/gsl-lite/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gsl-lite.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/gsl-lite/portfile.cmake b/ports/gsl-lite/portfile.cmake index 63f2488debdf7d..1cc23b2c7c0c72 100644 --- a/ports/gsl-lite/portfile.cmake +++ b/ports/gsl-lite/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gsl-lite/gsl-lite - REF d0903fa87ff579c30f608bc363582e6563570342 - SHA512 f4032404db0073a8ca162e627af8e2741b26a9a251499b0d0009c56ae34b69904d488a4f463c107e40ec495f79b5990c685008979b397d1b670c088ceb4508a0 + REF 4b5e9ab7474841fc2d7efc2e0064ef81785535d1 + SHA512 d5678743f2aebf9b8311e1484d8d22d995f4920632c55ff2f45e463f435a087d25bbf79749c179cfa2f96e799a55e5ee2e59eb2cc6962b8f5922ea56789e16b1 HEAD_REF master ) diff --git a/ports/gsl-lite/vcpkg.json b/ports/gsl-lite/vcpkg.json index 81a2d445baf7cd..0fdc05f4195ec2 100644 --- a/ports/gsl-lite/vcpkg.json +++ b/ports/gsl-lite/vcpkg.json @@ -1,6 +1,6 @@ { "name": "gsl-lite", - "version": "0.39.0", + "version": "0.40.0", "description": "A single-file header-only implementation of ISO C++ Guidelines Support Library (GSL) for C++98, C++11 and later.", "homepage": "https://github.com/gsl-lite/gsl-lite/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6b66956c0f35e0..88a6a2bdbd9767 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2569,7 +2569,7 @@ "port-version": 0 }, "gsl-lite": { - "baseline": "0.39.0", + "baseline": "0.40.0", "port-version": 0 }, "gsoap": { diff --git a/versions/g-/gsl-lite.json b/versions/g-/gsl-lite.json index ff14b5ec23f0ef..8a386430a6930c 100644 --- a/versions/g-/gsl-lite.json +++ b/versions/g-/gsl-lite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d3c1399fe44414aaf2c88d845b8c03bfdb66d46", + "version": "0.40.0", + "port-version": 0 + }, { "git-tree": "764fdd7f284e4cbc5f8f28473c3c241e9bfa8d9c", "version": "0.39.0", From 0a740ec79e16f41a666ba02f928d346ac84daf1a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 06:07:51 +0100 Subject: [PATCH 1055/1858] [apr] no absolute paths (#21180) --- ports/apr/portfile.cmake | 41 ++++++++++++++++++++-------------------- ports/apr/vcpkg.json | 9 ++++++++- versions/a-/apr.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake index 3b9bed66415f1c..1061497a5a0191 100644 --- a/ports/apr/portfile.cmake +++ b/ports/apr/portfile.cmake @@ -1,6 +1,3 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "${PORT} does not currently support UWP") -endif() set(VERSION 1.7.0) @@ -12,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" ) if (VCPKG_TARGET_IS_WINDOWS) @@ -21,9 +18,8 @@ if (VCPKG_TARGET_IS_WINDOWS) private-headers INSTALL_PRIVATE_H ) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DINSTALL_PDB=OFF -DMIN_WINDOWS_VER=Windows7 @@ -32,23 +28,23 @@ if (VCPKG_TARGET_IS_WINDOWS) ${FEATURE_OPTIONS} ) - vcpkg_install_cmake() + vcpkg_cmake_install() # There is no way to suppress installation of the headers in debug builds. - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Both dynamic and static are built, so keep only the one needed if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/apr-1.lib - ${CURRENT_PACKAGES_DIR}/lib/aprapp-1.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/apr-1.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/aprapp-1.lib) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/apr-1.lib" + "${CURRENT_PACKAGES_DIR}/lib/aprapp-1.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/apr-1.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/aprapp-1.lib") else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libapr-1.lib - ${CURRENT_PACKAGES_DIR}/lib/libaprapp-1.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/libapr-1.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/libaprapp-1.lib) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libapr-1.lib" + "${CURRENT_PACKAGES_DIR}/lib/libaprapp-1.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/libapr-1.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/libaprapp-1.lib") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() @@ -78,15 +74,18 @@ else() vcpkg_install_make() - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/apr-1.pc" "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" ) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/apr-1.pc" "-lapr-\${APR_MAJOR_VERSION}" "-lapr-1" ) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread rt dl uuid crypt) + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}\"" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/apr-1-config" "\"${CURRENT_INSTALLED_DIR}/debug\"" "`dirname $0`/../../../..") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json index 91fb9c71307363..67bca3b0a77f2f 100644 --- a/ports/apr/vcpkg.json +++ b/ports/apr/vcpkg.json @@ -1,10 +1,17 @@ { "name": "apr", "version": "1.7.0", - "port-version": 4, + "port-version": 5, "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.", "homepage": "https://apr.apache.org/", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ], "features": { "private-headers": { "description": "Install non-standard files required for building Apache httpd" diff --git a/versions/a-/apr.json b/versions/a-/apr.json index d652415aa93e90..9f8ee67708735f 100644 --- a/versions/a-/apr.json +++ b/versions/a-/apr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3de94d87f5afac3e6800a26771517217d5113349", + "version": "1.7.0", + "port-version": 5 + }, { "git-tree": "b9e93acdaa680398eaed361f1df530096ded84ff", "version": "1.7.0", diff --git a/versions/baseline.json b/versions/baseline.json index 88a6a2bdbd9767..830937218db3b0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -110,7 +110,7 @@ }, "apr": { "baseline": "1.7.0", - "port-version": 4 + "port-version": 5 }, "apr-util": { "baseline": "1.6.1", From ffce52a31851ad1dd362beae0d1d8a9d425a81d9 Mon Sep 17 00:00:00 2001 From: Gelila Seifu Date: Mon, 8 Nov 2021 21:08:19 -0800 Subject: [PATCH 1056/1858] [hexl ] Update to v1.2.3 (#21174) * update HEXL to v1.2.3 * Update version database --- ports/hexl/portfile.cmake | 8 ++++---- ports/hexl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/h-/hexl.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/hexl/portfile.cmake b/ports/hexl/portfile.cmake index d79ea57b50c704..e6946232a3bb0e 100644 --- a/ports/hexl/portfile.cmake +++ b/ports/hexl/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/hexl - REF 343acab47f7612c76cc09bfe39ec9435283fb0e6 - SHA512 afaf0c68559547d6617cb75ff465f5c4998f00bda1e5edb399e4a80f8a67628fbbbee6b3b484ec96944c8686b9b2180e6523c1329619454b7752a46ffa2a913c - HEAD_REF 1.2.2 + REF 0858760dc957280e8eb8953af4b4b83879d7b8a4 + SHA512 f2400c4bf32d22904f5917a396fdf6fc625a8832455437429abd54cae70da51cfc42a57dc176d1faeb76f7cd4569dd7499a8f302aef2ea8463d3e8ddc3132050 + HEAD_REF 1.2.3 ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -29,7 +29,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.2") +vcpkg_cmake_config_fixup(PACKAGE_NAME "HEXL" CONFIG_PATH "lib/cmake/hexl-1.2.3") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/hexl/vcpkg.json b/ports/hexl/vcpkg.json index 87742413a5fcd8..2b3adb89759019 100644 --- a/ports/hexl/vcpkg.json +++ b/ports/hexl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "hexl", - "version": "1.2.2", + "version": "1.2.3", "description": "Intel® HEXL is an open-source library which provides efficient implementations of integer arithmetic on Galois fields.", "homepage": "https://github.com/intel/hexl", "supports": "x64 & !(windows & !static)", diff --git a/versions/baseline.json b/versions/baseline.json index 830937218db3b0..19ce671092b67d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2657,7 +2657,7 @@ "port-version": 0 }, "hexl": { - "baseline": "1.2.2", + "baseline": "1.2.3", "port-version": 0 }, "hffix": { diff --git a/versions/h-/hexl.json b/versions/h-/hexl.json index c2d44f3aac758e..c1ade71589681f 100644 --- a/versions/h-/hexl.json +++ b/versions/h-/hexl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b79e9b07e9389a78ab2d421cc45940e52948d956", + "version": "1.2.3", + "port-version": 0 + }, { "git-tree": "2780f209491bc30cb3db0bc52a48ed88bf10d9b6", "version": "1.2.2", From 4439433ff5738df9ca3535f2f022d12f3722965d Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 9 Nov 2021 08:29:35 +0300 Subject: [PATCH 1057/1858] [vcpkg-cmake-config] Fix parsing of NO_PREFIX_CORRECTION (#21062) --- ports/vcpkg-cmake-config/vcpkg.json | 2 +- ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake | 2 +- scripts/cmake/vcpkg_fixup_cmake_targets.cmake | 2 +- versions/baseline.json | 2 +- versions/v-/vcpkg-cmake-config.json | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json index 749114aa4d2a2f..ae4ba43e39bb3d 100644 --- a/ports/vcpkg-cmake-config/vcpkg.json +++ b/ports/vcpkg-cmake-config/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake-config", - "version-date": "2021-09-27" + "version-date": "2021-11-01" } diff --git a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake index 7a7a6c833b6829..f62deeeabe6378 100644 --- a/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake +++ b/ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake @@ -52,7 +52,7 @@ endif() set(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD ON CACHE INTERNAL "guard variable") function(vcpkg_cmake_config_fixup) - cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH" "PACKAGE_NAME;CONFIG_PATH;NO_PREFIX_CORRECTION" "") + cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH" "") if(DEFINED arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "vcpkg_cmake_config_fixup was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") diff --git a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake index e6fbe785b5844e..a49cfb2b555bfd 100644 --- a/scripts/cmake/vcpkg_fixup_cmake_targets.cmake +++ b/scripts/cmake/vcpkg_fixup_cmake_targets.cmake @@ -62,7 +62,7 @@ function(vcpkg_fixup_cmake_targets) message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake-config; using both vcpkg-cmake-config and vcpkg_fixup_cmake_targets in the same port is unsupported.") endif() - cmake_parse_arguments(PARSE_ARGV 0 arg "DO_NOT_DELETE_PARENT_CONFIG_PATH" "CONFIG_PATH;TARGET_PATH;NO_PREFIX_CORRECTION;TOOLS_PATH" "") + cmake_parse_arguments(PARSE_ARGV 0 arg "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "CONFIG_PATH;TARGET_PATH;TOOLS_PATH" "") if(arg_UNPARSED_ARGUMENTS) message(FATAL_ERROR "vcpkg_fixup_cmake_targets was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}") diff --git a/versions/baseline.json b/versions/baseline.json index 19ce671092b67d..a6e315791bdd7d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7001,7 +7001,7 @@ "port-version": 0 }, "vcpkg-cmake-config": { - "baseline": "2021-09-27", + "baseline": "2021-11-01", "port-version": 0 }, "vcpkg-gfortran": { diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json index cff03bb75dca0a..ebb17990d27437 100644 --- a/versions/v-/vcpkg-cmake-config.json +++ b/versions/v-/vcpkg-cmake-config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38a87ee8edd9ea8e8fff604fbcb785661a8d0e28", + "version-date": "2021-11-01", + "port-version": 0 + }, { "git-tree": "9ae99981abcd01b092344f85ef6e1de3c1f9856a", "version-date": "2021-09-27", From 478c912e392a9c2ece09d275ae05afba3e7c490f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 06:30:13 +0100 Subject: [PATCH 1058/1858] [ismrmrd] no absolute paths (#21143) --- ports/ismrmrd/portfile.cmake | 55 +++++++++++------------------------- ports/ismrmrd/vcpkg.json | 14 +++++++-- versions/baseline.json | 2 +- versions/i-/ismrmrd.json | 5 ++++ 4 files changed, 33 insertions(+), 43 deletions(-) diff --git a/ports/ismrmrd/portfile.cmake b/ports/ismrmrd/portfile.cmake index ee5a0f962e7bc2..36615b2f8bb8a9 100644 --- a/ports/ismrmrd/portfile.cmake +++ b/ports/ismrmrd/portfile.cmake @@ -9,14 +9,12 @@ vcpkg_from_github( SHA512 96e24be75ecde8e56001d805ffaf4502d39c87e2c4fe01c84c90cb01d8bd49268c48440728de2ffb4c3efa75a029b3ffc0101b5841893685f82b4fafec9b1c73 HEAD_REF master PATCHES - ${STATIC_PATCH} ${WIN32_INCLUDE_STDDEF_PATCH} fix-depends-hdf5.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_SYSTEM_PUGIXML=ON -DUSE_HDF5_DATASET_SUPPORT=ON @@ -26,49 +24,28 @@ vcpkg_configure_cmake( -DBUILD_UTILITIES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/ismrmrd/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ISMRMRD/) -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll) - file(COPY ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/ismrmrd.dll") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll) - file(COPY ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll") + file(COPY "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/ismrmrd.dll") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/FindFFTW3.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/FindFFTW3.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/ismrmrd/FindFFTW3.cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake") -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake) - -set(ISMRMRD_CMAKE_DIRS ${CURRENT_PACKAGES_DIR}/lib/cmake ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) -foreach(ISMRMRD_CMAKE_DIR IN LISTS ISMRMRD_CMAKE_DIRS) -if (EXISTS ${ISMRMRD_CMAKE_DIR}) - file(GLOB ISMRMRD_CMAKE_FILES "${ISMRMRD_CMAKE_DIR}/ISMRMRD/ISMRMRD*.cmake") - foreach(ICF ${ISMRMRD_CMAKE_FILES}) - file(COPY ${ICF} DESTINATION ${CURRENT_PACKAGES_DIR}/share/ismrmrd/cmake/) - endforeach() -endif() -endforeach() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${ISMRMRD_CMAKE_DIRS}) - -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore) - set(EXECUTABLE_SUFFIX ".exe") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/ismrmrd) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ismrmrd/vcpkg.json b/ports/ismrmrd/vcpkg.json index 27514f617e68f8..e0f2a7c74a005d 100644 --- a/ports/ismrmrd/vcpkg.json +++ b/ports/ismrmrd/vcpkg.json @@ -1,13 +1,21 @@ { "name": "ismrmrd", - "version-string": "1.5.0", - "port-version": 1, + "version": "1.5.0", + "port-version": 2, "description": "ISMRM Raw Data Format", "homepage": "https://github.com/ismrmrd/ismrmrd", "dependencies": [ "boost", "fftw3", "hdf5", - "pugixml" + "pugixml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index a6e315791bdd7d..ed5d2881ea2883 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2894,7 +2894,7 @@ }, "ismrmrd": { "baseline": "1.5.0", - "port-version": 1 + "port-version": 2 }, "itk": { "baseline": "5.1.0", diff --git a/versions/i-/ismrmrd.json b/versions/i-/ismrmrd.json index 013fd0902fb5bb..d79debc56168b1 100644 --- a/versions/i-/ismrmrd.json +++ b/versions/i-/ismrmrd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1754617a629b83fa0cec28903f26187b62b0d4fd", + "version": "1.5.0", + "port-version": 2 + }, { "git-tree": "5ede8c3ffaae84ba2f4f68f495a23adedb60bd00", "version-string": "1.5.0", From 947aa367bc37a19bd6f7d17229f0555e59028845 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 06:30:33 +0100 Subject: [PATCH 1059/1858] [libwebsockets] no absolute paths (#21137) --- ports/libwebsockets/portfile.cmake | 5 +++-- ports/libwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libwebsockets.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/libwebsockets/portfile.cmake b/ports/libwebsockets/portfile.cmake index e9013c6b56d323..2e137f072622ad 100644 --- a/ports/libwebsockets/portfile.cmake +++ b/ports/libwebsockets/portfile.cmake @@ -181,6 +181,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) endif () vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - vcpkg_fixup_pkgconfig() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lws_config.h" "${CURRENT_PACKAGES_DIR}" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libwebsockets/vcpkg.json b/ports/libwebsockets/vcpkg.json index e674bdd8c42a65..2e4054d797b4f9 100644 --- a/ports/libwebsockets/vcpkg.json +++ b/ports/libwebsockets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libwebsockets", "version-semver": "4.2.2", - "port-version": 3, + "port-version": 4, "description": "Libwebsockets is a lightweight pure C library built to use minimal CPU and memory resources, and provide fast throughput in both directions as client or server.", "homepage": "https://github.com/warmcat/libwebsockets", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index ed5d2881ea2883..044ac9cdf6d92b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4010,7 +4010,7 @@ }, "libwebsockets": { "baseline": "4.2.2", - "port-version": 3 + "port-version": 4 }, "libxdiff": { "baseline": "0.23", diff --git a/versions/l-/libwebsockets.json b/versions/l-/libwebsockets.json index e78d116b4012b9..5cd154212366ed 100644 --- a/versions/l-/libwebsockets.json +++ b/versions/l-/libwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "530aaf17892ddf6481557a04040a372281150ec6", + "version-semver": "4.2.2", + "port-version": 4 + }, { "git-tree": "579de2367eb835f65d3c480b02af4ee72b6b4f24", "version-semver": "4.2.2", From ca8d01a22c04ce86829e3bc4758f40d2316586e9 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 9 Nov 2021 05:31:08 +0000 Subject: [PATCH 1060/1858] [libpq] Android compatibility (#21073) * [libpq] Android compatibility * version --- ports/libpq/portfile.cmake | 3 +++ ports/libpq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index 35cfd9e68aade5..f0382f4df5e17c 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -278,6 +278,9 @@ else() else() list(APPEND BUILD_OPTS --without-readline) endif() + if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26) + list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no) + endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} COPY_SOURCE diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 446b58b2dc31fd..12c577f00f55a4 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "12.2", - "port-version": 18, + "port-version": 19, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 044ac9cdf6d92b..a9e2bc1543f039 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3746,7 +3746,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 18 + "port-version": 19 }, "libpqxx": { "baseline": "7.6.0", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index 4d05014195f890..c9eb1fa794f362 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ac8973569e75060efdb8091b83f64f429371a38", + "version": "12.2", + "port-version": 19 + }, { "git-tree": "03c934a8004ec6c34842748d18c06a38e7a8aa3e", "version": "12.2", From 36c22a9156e63e27d3bc5d45410f69c3484a0429 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 9 Nov 2021 19:10:08 +0100 Subject: [PATCH 1061/1858] [geos] Update to 3.10.0 (#21051) * Update geos to 3.10.0 * Enable geos on uwp * Update versions * Fix mingw build * Fix deinstallation * Update versions --- ports/geos/disable-warning-4996.patch | 13 ++++ ports/geos/dont-build-astyle.patch | 12 --- ports/geos/dont-build-docs.patch | 12 --- ports/geos/fix-exported-config.patch | 76 +++++++++++++++++++ ports/geos/fix-static-deps.patch | 68 ----------------- ports/geos/install-hpp-files.patch | 13 ++++ ports/geos/make-geos-config-relocatable.patch | 16 ---- ports/geos/pc-file-for-msvc.patch | 15 ---- ports/geos/pc-file-libs-private.patch | 12 --- ports/geos/portfile.cmake | 53 +++++++------ ports/geos/vcpkg.json | 3 +- scripts/ci.baseline.txt | 4 +- versions/baseline.json | 4 +- versions/g-/geos.json | 5 ++ 14 files changed, 143 insertions(+), 163 deletions(-) create mode 100644 ports/geos/disable-warning-4996.patch delete mode 100644 ports/geos/dont-build-astyle.patch delete mode 100644 ports/geos/dont-build-docs.patch create mode 100644 ports/geos/fix-exported-config.patch delete mode 100644 ports/geos/fix-static-deps.patch create mode 100644 ports/geos/install-hpp-files.patch delete mode 100644 ports/geos/make-geos-config-relocatable.patch delete mode 100644 ports/geos/pc-file-for-msvc.patch delete mode 100644 ports/geos/pc-file-libs-private.patch diff --git a/ports/geos/disable-warning-4996.patch b/ports/geos/disable-warning-4996.patch new file mode 100644 index 00000000000000..af39e2ed6a6320 --- /dev/null +++ b/ports/geos/disable-warning-4996.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index accc1a2..34d2055 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -174,7 +174,7 @@ target_compile_features(geos_cxx_flags INTERFACE cxx_std_11) + target_compile_options(geos_cxx_flags INTERFACE + "$<$,$>:-ffp-contract=off>" + "$<$:-ffp-contract=off>" +- "$<$:/fp:precise>" ++ $<$:/fp:precise /wd4996> + ) + + # Use -ffloat-store for 32-bit builds (needed to make some tests pass) diff --git a/ports/geos/dont-build-astyle.patch b/ports/geos/dont-build-astyle.patch deleted file mode 100644 index 0d5561d2a307a5..00000000000000 --- a/ports/geos/dont-build-astyle.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index f0f616e..8a81a2a 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -40,7 +40,6 @@ if(NOT MSVC) - - endif() - --add_subdirectory(astyle) - - # if(UNIX OR MINGW) - diff --git a/ports/geos/dont-build-docs.patch b/ports/geos/dont-build-docs.patch deleted file mode 100644 index fcd2742c8cd75a..00000000000000 --- a/ports/geos/dont-build-docs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b78ca54b..507df2af 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -264,7 +264,6 @@ add_subdirectory(benchmarks) - #----------------------------------------------------------------------------- - # Documentation/Examples - #----------------------------------------------------------------------------- --add_subdirectory(doc) - - #----------------------------------------------------------------------------- - # Install and export targets - support 'make install' or equivalent diff --git a/ports/geos/fix-exported-config.patch b/ports/geos/fix-exported-config.patch new file mode 100644 index 00000000000000..40aa835e0c397f --- /dev/null +++ b/ports/geos/fix-exported-config.patch @@ -0,0 +1,76 @@ +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index bc0e774..e3ca0bd 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -45,11 +45,18 @@ function(configure_install_geos_pc) + set(includedir "$\{prefix\}/${CMAKE_INSTALL_INCLUDEDIR}") + set(libdir "$\{exec_prefix\}/${CMAKE_INSTALL_LIBDIR}") + set(VERSION ${GEOS_VERSION}) +- set(EXTRA_LIBS "-lstdc++") ++ if(APPLE OR CMAKE_ANDROID_STL_TYPE MATCHES "^c\\+\\+") ++ set(EXTRA_LIBS "-lc++") ++ elseif(UNIX OR MINGW) ++ set(EXTRA_LIBS "-lstdc++") ++ else() ++ set(EXTRA_LIBS "") ++ endif() + if(HAVE_LIBM) + list(APPEND EXTRA_LIBS "-lm") + endif() + list(JOIN EXTRA_LIBS " " EXTRA_LIBS) ++ set(EXTRA_LIBS "${EXTRA_LIBS}" PARENT_SCOPE) # for geos-config + + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/geos.pc.in +@@ -61,9 +68,9 @@ function(configure_install_geos_pc) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endfunction() + ++configure_install_geos_pc() + if(NOT MSVC) + configure_install_geos_config() +- configure_install_geos_pc() + endif() + + option(BUILD_ASTYLE "Build astyle (Artistic Style) tool" OFF) +diff --git a/tools/geos-config.in b/tools/geos-config.in +index 6eff1eb..8827f6a 100644 +--- a/tools/geos-config.in ++++ b/tools/geos-config.in +@@ -1,9 +1,11 @@ + #!/bin/sh + +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-includedir=@includedir@ +-libdir=@libdir@ ++DIRNAME=$(dirname $0) ++TOOLS=$(dirname $DIRNAME) ++prefix=$(CDPATH= cd -- "${DIRNAME%/tools/geos/*}" && pwd -P) ++exec_prefix=${prefix} ++includedir=${prefix}/include ++libdir=${prefix}${TOOLS##*/geos}/lib + + usage() + { +@@ -47,16 +49,16 @@ while test $# -gt 0; do + echo -L${libdir} -lgeos-@VERSION_RELEASE@ + ;; + --clibs) +- echo -L${libdir} -lgeos_c ++ echo -L${libdir} -lgeos_c $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "-lgeos @EXTRA_LIBS@"; fi) + ;; + --cclibs) +- echo -L${libdir} -lgeos ++ echo -L${libdir} -lgeos $(if test "@BUILD_SHARED_LIBS@" != "ON"; then echo "@EXTRA_LIBS@"; fi) + ;; + --static-clibs) +- echo -L${libdir} -lgeos_c -lgeos -lm ++ echo -L${libdir} -lgeos_c -lgeos @EXTRA_LIBS@ + ;; + --static-cclibs) +- echo -L${libdir} -lgeos -lm ++ echo -L${libdir} -lgeos @EXTRA_LIBS@ + ;; + --cflags) + echo -I${includedir} diff --git a/ports/geos/fix-static-deps.patch b/ports/geos/fix-static-deps.patch deleted file mode 100644 index 680e185eb78395..00000000000000 --- a/ports/geos/fix-static-deps.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 8a81a2a..724a68c 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -13,6 +13,15 @@ - - - if(NOT MSVC) -+ # C++ libraries needed even for the C API, for geos-config and geos.pc. -+ set(cxx_libs "") -+ foreach(lib IN ITEMS stdc++ c++) -+ if(lib IN_LIST CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) -+ string(APPEND cxx_libs "-l${lib} ") -+ break() -+ endif() -+ endforeach() -+ - # Consider CMAKE_INSTALL_PREFIX with spaces - string(REPLACE " " "\\ " ESCAPED_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) - configure_file( -diff --git a/tools/geos-config.cmake b/tools/geos-config.cmake -index 4c546b5..4bdbc47 100644 ---- a/tools/geos-config.cmake -+++ b/tools/geos-config.cmake -@@ -29,6 +29,12 @@ if test $# -eq 0; then - usage 1 1>&2 - fi - -+if test "@BUILD_SHARED_LIBS@" = "ON"; then -+ extra_libs= -+else -+ extra_libs="-lgeos -lm @cxx_libs@" -+fi -+ - while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; -@@ -47,16 +53,16 @@ while test $# -gt 0; do - echo -L${libdir} -lgeos-@GEOS_VERSION_MAJOR@ - ;; - --clibs) -- echo -L${libdir} -lgeos_c -+ echo -L${libdir} -lgeos_c ${extra_libs} - ;; - --cclibs) -- echo -L${libdir} -lgeos -+ echo -L${libdir} -lgeos ${extra_libs#-lgeos } - ;; - --static-clibs) -- echo -L${libdir} -lgeos_c -lgeos -lm -+ echo -L${libdir} -lgeos_c -lgeos -lm @cxx_libs@ - ;; - --static-cclibs) -- echo -L${libdir} -lgeos -lm -+ echo -L${libdir} -lgeos -lm @cxx_libs@ - ;; - --cflags) - echo -I${prefix}/include -diff --git a/tools/geos.pc.cmake b/tools/geos.pc.cmake -index 53f43d9..0ebd4d5 100644 ---- a/tools/geos.pc.cmake -+++ b/tools/geos.pc.cmake -@@ -9,4 +9,4 @@ Requires: - Version: @GEOS_VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} -lgeos_c --Libs.private: -lgeos -+Libs.private: -lgeos @cxx_libs@ diff --git a/ports/geos/install-hpp-files.patch b/ports/geos/install-hpp-files.patch new file mode 100644 index 00000000000000..c5d4b21e79289e --- /dev/null +++ b/ports/geos/install-hpp-files.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 20c8907..accc1a2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -367,7 +367,7 @@ install(DIRECTORY + "${CMAKE_CURRENT_LIST_DIR}/include/geos" + "${CMAKE_CURRENT_BINARY_DIR}/include/geos" + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +- FILES_MATCHING PATTERN "*.h") ++ FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp") + if(NOT DISABLE_GEOS_INLINE) + install(DIRECTORY + "${CMAKE_CURRENT_LIST_DIR}/include/geos" diff --git a/ports/geos/make-geos-config-relocatable.patch b/ports/geos/make-geos-config-relocatable.patch deleted file mode 100644 index f3d97b6c2cdfe9..00000000000000 --- a/ports/geos/make-geos-config-relocatable.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tools/geos-config.cmake b/tools/geos-config.cmake -index 6730e215..4c546b5c 100644 ---- a/tools/geos-config.cmake -+++ b/tools/geos-config.cmake -@@ -1,7 +1,9 @@ - #!/bin/sh - --prefix=@ESCAPED_INSTALL_PREFIX@ --libdir=${prefix}/lib -+DIRNAME=$(dirname $0) -+TOOLS=$(dirname $DIRNAME) -+prefix=$(CDPATH= cd -- "${DIRNAME%/tools/geos/*}" && pwd -P) -+libdir=${prefix}${TOOLS##*/geos}/lib - - usage() - { diff --git a/ports/geos/pc-file-for-msvc.patch b/ports/geos/pc-file-for-msvc.patch deleted file mode 100644 index ad79be0720f9f7..00000000000000 --- a/ports/geos/pc-file-for-msvc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index d9267e8..26713f9 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -36,6 +36,10 @@ if(NOT MSVC) - OWNER_READ OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE) -+else() -+ set(cxx_libs "") -+endif() -+if(1) - - # pkg-config support - configure_file( diff --git a/ports/geos/pc-file-libs-private.patch b/ports/geos/pc-file-libs-private.patch deleted file mode 100644 index 51302aeb1ad4f4..00000000000000 --- a/ports/geos/pc-file-libs-private.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/geos.pc.cmake b/tools/geos.pc.cmake -index 0a9df7fb..53f43d90 100644 ---- a/tools/geos.pc.cmake -+++ b/tools/geos.pc.cmake -@@ -9,3 +9,4 @@ Requires: - Version: @GEOS_VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} -lgeos_c -+Libs.private: -lgeos --- -2.17.1 - diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake index fe8f8b0a582b74..7be171ac2fcf90 100644 --- a/ports/geos/portfile.cmake +++ b/ports/geos/portfile.cmake @@ -1,26 +1,20 @@ -set(GEOS_VERSION 3.9.1) +set(GEOS_VERSION 3.10.0) vcpkg_download_distfile(ARCHIVE - URLS "http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2" + URLS "https://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2" FILENAME "geos-${GEOS_VERSION}.tar.bz2" - SHA512 7ea131685cd110ec5e0cb7c214b52b75397371e75f011e1410b6770b6a48ca492a02337d86a7be35c852ef94604fe9d6f49634c79d4946df611aaa4f5cbaee28 + SHA512 12657c6649bfbf6efa3232a054969c6229bb23fc16a7c72d6ca5fdb662e0d08e14bbcaa6944a17de8972b6c236608d94c870ead0b04fada2d2af3d42c238058e ) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE "${ARCHIVE}" REF ${GEOS_VERSION} PATCHES - dont-build-docs.patch - dont-build-astyle.patch - pc-file-libs-private.patch - pc-file-for-msvc.patch - make-geos-config-relocatable.patch - fix-static-deps.patch + disable-warning-4996.patch + fix-exported-config.patch + install-hpp-files.patch ) -# NOTE: GEOS provides CMake as optional build configuration, it might not be actively -# maintained, so CMake build issues may happen between releases. - if(VCPKG_TARGET_IS_MINGW) set(_CMAKE_EXTRA_OPTIONS "-DDISABLE_GEOS_INLINE=ON") else() @@ -30,6 +24,9 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS + -DBUILD_ASTYLE=OFF + -DBUILD_DOCUMENTATION=OFF + -DBUILD_GEOSOP=OFF -DBUILD_TESTING=OFF -DBUILD_BENCHMARKS=OFF ${_CMAKE_EXTRA_OPTIONS} @@ -45,17 +42,29 @@ function(geos_add_debug_postfix config_file) string(REGEX REPLACE "(-lgeos(_c)?)d?([^-_d])" "\\1d\\3" fixed_contents "${contents}") file(WRITE "${config_file}" "${fixed_contents}") endfunction() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/geos.pc") - geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/geos.pc") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config") + file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config" FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + endif() endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/geos-config") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/geos-config") -endif() -if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config") - file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") - geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") +if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/geos.pc") + if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/geos-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") + geos_add_debug_postfix("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config") + file(CHMOD "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin/geos-config" FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + endif() endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/geos/vcpkg.json b/ports/geos/vcpkg.json index 851c5dcdc38e62..3a55c644241807 100644 --- a/ports/geos/vcpkg.json +++ b/ports/geos/vcpkg.json @@ -1,7 +1,6 @@ { "name": "geos", - "version": "3.9.1", - "port-version": 3, + "version": "3.10.0", "description": "Geometry Engine Open Source", "homepage": "https://www.osgeo.org/projects/geos/", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ce09035bce3ba1..65af43f105327f 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -336,8 +336,6 @@ gainput:x64-uwp=fail gasol:arm64-windows=fail gasol:arm-uwp=fail gasol:x64-uwp=fail -geos:arm-uwp=fail -geos:x64-uwp=fail # gsoap does not offer stable public source downloads gsoap:x64-windows = skip @@ -691,6 +689,8 @@ libressl:x86-windows = skip libsoundio:arm64-windows=fail libsoundio:arm-uwp=fail libsoundio:x64-uwp=fail +libspatialite:arm-uwp=fail +libspatialite:x64-uwp=fail libsrt:arm-uwp=fail libsrt:x64-uwp=fail libssh:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index a9e2bc1543f039..76f03bed73aeca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2381,8 +2381,8 @@ "port-version": 1 }, "geos": { - "baseline": "3.9.1", - "port-version": 3 + "baseline": "3.10.0", + "port-version": 0 }, "geotrans": { "baseline": "3.8", diff --git a/versions/g-/geos.json b/versions/g-/geos.json index 0f7002ddbb0671..42cd134f5c40d6 100644 --- a/versions/g-/geos.json +++ b/versions/g-/geos.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "852bf7181cbec88161abfe3cf4db2887f80ab2d4", + "version": "3.10.0", + "port-version": 0 + }, { "git-tree": "9a0a3db2edc588598505038b452c9c7c91c1be6e", "version": "3.9.1", From 68b1420bb8cac8aeb2ffbc343d2923df2d4a4878 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:44:04 +0100 Subject: [PATCH 1062/1858] [hwloc] no absolute paths (#21267) --- ports/hwloc/portfile.cmake | 6 ++++++ ports/hwloc/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/h-/hwloc.json | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ports/hwloc/portfile.cmake b/ports/hwloc/portfile.cmake index 2da5a2f5010e27..edc6f5cd97b757 100644 --- a/ports/hwloc/portfile.cmake +++ b/ports/hwloc/portfile.cmake @@ -41,6 +41,12 @@ vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/hwloc/debug/bin/hwloc-compress-dir" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +endif() # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hwloc/vcpkg.json b/ports/hwloc/vcpkg.json index 27f599aa0eb157..4910da26b942df 100644 --- a/ports/hwloc/vcpkg.json +++ b/ports/hwloc/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hwloc", "version": "2.5.0", + "port-version": 1, "maintainers": "bgoglin", "description": [ "Portable Hardware Locality (hwloc)", diff --git a/versions/baseline.json b/versions/baseline.json index 76f03bed73aeca..89529a5562ef29 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2702,7 +2702,7 @@ }, "hwloc": { "baseline": "2.5.0", - "port-version": 0 + "port-version": 1 }, "hyperscan": { "baseline": "5.3.0", diff --git a/versions/h-/hwloc.json b/versions/h-/hwloc.json index 6e03ac905d052b..4907125a4a4912 100644 --- a/versions/h-/hwloc.json +++ b/versions/h-/hwloc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bb188ce07f5e0b88685f5c6740c52c8f45636878", + "version": "2.5.0", + "port-version": 1 + }, { "git-tree": "f06abb37eb6d851f82bca48c437744fd1c642dc3", "version": "2.5.0", From 253cbc400703ec623bb2067985aabfb2edf82e83 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:44:57 +0100 Subject: [PATCH 1063/1858] [libjxl] Add new port (#21217) * Add libjxl port * Update CI baseline * Simplify cleanup * Switch to semver * Update git-tree hash Co-authored-by: chausner --- ports/libjxl/fix-dependencies.patch | 147 +++++++++++++++++++++ ports/libjxl/fix-install-directories.patch | 36 +++++ ports/libjxl/portfile.cmake | 78 +++++++++++ ports/libjxl/vcpkg.json | 22 +++ versions/baseline.json | 4 + versions/l-/libjxl.json | 9 ++ 6 files changed, 296 insertions(+) create mode 100644 ports/libjxl/fix-dependencies.patch create mode 100644 ports/libjxl/fix-install-directories.patch create mode 100644 ports/libjxl/portfile.cmake create mode 100644 ports/libjxl/vcpkg.json create mode 100644 versions/l-/libjxl.json diff --git a/ports/libjxl/fix-dependencies.patch b/ports/libjxl/fix-dependencies.patch new file mode 100644 index 00000000000000..4c6353cfc4e08a --- /dev/null +++ b/ports/libjxl/fix-dependencies.patch @@ -0,0 +1,147 @@ +diff --git a/lib/jxl.cmake b/lib/jxl.cmake +--- a/lib/jxl.cmake ++++ b/lib/jxl.cmake +@@ -3,6 +3,16 @@ + # Use of this source code is governed by a BSD-style + # license that can be found in the LICENSE file. + ++find_package(lodepng CONFIG REQUIRED) ++find_package(unofficial-brotli CONFIG REQUIRED) ++find_package(lcms2 CONFIG REQUIRED) ++ ++foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) ++ add_library(${brlib} ALIAS unofficial::brotli::${brlib}-static) ++ add_library(${brlib}-static ALIAS unofficial::brotli::${brlib}-static) ++endforeach() ++add_library(lcms2 ALIAS lcms2::lcms2) ++ + # Lists all source files for the JPEG XL decoder library. These are also used + # by the encoder: the encoder uses both dec and enc ourse files, while the + # decoder uses only dec source files. +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -88,18 +88,16 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/highway/CMakeLists.txt" AND + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/highway/LICENSE" + ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY) + else() +- pkg_check_modules(HWY libhwy) +- if (NOT HWY_FOUND) ++ find_path(HWY_INCLUDE_DIRS "hwy/highway.h") ++ find_library(HWY_LINK_LIBRARIES hwy) ++ if (NOT HWY_INCLUDE_DIRS OR NOT HWY_LINK_LIBRARIES) + message(FATAL_ERROR +- "Highway library (hwy) not found. Install libhwy-dev or download it " +- "to third_party/highway from https://github.com/google/highway . " +- "Highway is required to build JPEG XL. You can run " +- "${PROJECT_SOURCE_DIR}/deps.sh to download this dependency.") ++ "Highway library (hwy) not found.") + endif() + add_library(hwy INTERFACE IMPORTED GLOBAL) + if(${CMAKE_VERSION} VERSION_LESS "3.13.5") +- set_property(TARGET hwy PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${HWY_INCLUDE_DIR}) +- target_link_libraries(hwy INTERFACE ${HWY_LDFLAGS}) ++ set_property(TARGET hwy PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${HWY_INCLUDE_DIRS}) ++ target_link_libraries(hwy INTERFACE ${HWY_LINK_LIBRARIES}) + set_property(TARGET hwy PROPERTY INTERFACE_COMPILE_OPTIONS ${HWY_CFLAGS_OTHER}) + else() + target_include_directories(hwy INTERFACE ${HWY_INCLUDE_DIRS}) +@@ -114,82 +112,10 @@ else() + endif() + + # lodepng +-if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lodepng/lodepng.h" ) +- message(FATAL_ERROR "Please run ${PROJECT_SOURCE_DIR}/deps.sh to fetch the " +- "build dependencies.") +-endif() +-include(lodepng.cmake) +-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lodepng/LICENSE" +- ${PROJECT_BINARY_DIR}/LICENSE.lodepng COPYONLY) ++find_package(lodepng CONFIG REQUIRED) + + # brotli +-if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR +- JPEGXL_FORCE_SYSTEM_BROTLI) +- # Create the libbrotli* and libbrotli*-static targets. +- foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) +- # Use uppercase like "BROTLIENC" for the cmake variables +- string(TOUPPER "${brlib}" BRPREFIX) +- pkg_check_modules(${BRPREFIX} lib${brlib}) +- if (${BRPREFIX}_FOUND) +- if(${CMAKE_VERSION} VERSION_LESS "3.13.5") +- add_library(${brlib} INTERFACE IMPORTED GLOBAL) +- set_property(TARGET ${brlib} PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${${BRPREFIX}_INCLUDE_DIR}) +- target_link_libraries(${brlib} INTERFACE ${${BRPREFIX}_LDFLAGS}) +- set_property(TARGET ${brlib} PROPERTY INTERFACE_COMPILE_OPTIONS ${${BRPREFIX}_CFLAGS_OTHER}) +- +- add_library(${brlib}-static INTERFACE IMPORTED GLOBAL) +- set_property(TARGET ${brlib}-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${${BRPREFIX}_INCLUDE_DIR}) +- target_link_libraries(${brlib}-static INTERFACE ${${BRPREFIX}_LDFLAGS}) +- set_property(TARGET ${brlib}-static PROPERTY INTERFACE_COMPILE_OPTIONS ${${BRPREFIX}_CFLAGS_OTHER}) +- else() +- add_library(${brlib} INTERFACE IMPORTED GLOBAL) +- target_include_directories(${brlib} +- INTERFACE ${${BRPREFIX}_INCLUDE_DIRS}) +- target_link_libraries(${brlib} +- INTERFACE ${${BRPREFIX}_LINK_LIBRARIES}) +- target_link_options(${brlib} +- INTERFACE ${${BRPREFIX}_LDFLAGS_OTHER}) +- target_compile_options(${brlib} +- INTERFACE ${${BRPREFIX}_CFLAGS_OTHER}) +- +- # TODO(deymo): Remove the -static library versions, this target is +- # currently needed by brunsli.cmake. When importing it this way, the +- # brotli*-static target is just an alias. +- add_library(${brlib}-static ALIAS ${brlib}) +- endif() +- endif() +- unset(BRPREFIX) +- endforeach() +- +- if (BROTLIENC_FOUND AND BROTLIDEC_FOUND AND BROTLICOMMON_FOUND) +- set(BROTLI_FOUND 1) +- else() +- set(BROTLI_FOUND 0) +- endif() +- +- if (NOT BROTLI_FOUND) +- message(FATAL_ERROR +- "Brotli not found, install brotli-dev or download brotli source code to" +- " third_party/brotli from https://github.com/google/brotli. You can use" +- " ${PROJECT_SOURCE_DIR}/deps.sh to download this dependency.") +- endif () +- if(JPEGXL_DEP_LICENSE_DIR) +- configure_file("${JPEGXL_DEP_LICENSE_DIR}/libbrotli-dev/copyright" +- ${PROJECT_BINARY_DIR}/LICENSE.brotli COPYONLY) +- endif() # JPEGXL_DEP_LICENSE_DIR +-else() +- # Compile brotli from sources. +- set(BROTLI_DISABLE_TESTS ON CACHE STRING "Disable Brotli tests") +- add_subdirectory(brotli EXCLUDE_FROM_ALL) +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/brotli/LICENSE" +- ${PROJECT_BINARY_DIR}/LICENSE.brotli COPYONLY) +- if(BROTLI_EMSCRIPTEN) +- # Brotli only defines the -static targets when using emscripten. +- foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) +- add_library(${brlib} ALIAS ${brlib}-static) +- endforeach() +- endif() # BROTLI_EMSCRIPTEN +-endif() ++find_package(unofficial-brotli CONFIG REQUIRED) + + # *cms + if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) +@@ -202,12 +128,7 @@ if (JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) + ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY) + endif () + if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS) +- if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" ) +- message(SEND_ERROR "Please run git submodule update --init") +- endif() +- include(lcms2.cmake) +- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lcms/COPYING" +- ${PROJECT_BINARY_DIR}/LICENSE.lcms COPYONLY) ++ find_package(lcms2 CONFIG REQUIRED) + endif() + + # sjpeg diff --git a/ports/libjxl/fix-install-directories.patch b/ports/libjxl/fix-install-directories.patch new file mode 100644 index 00000000000000..d5bdc811d008c7 --- /dev/null +++ b/ports/libjxl/fix-install-directories.patch @@ -0,0 +1,36 @@ +diff --git a/lib/jxl.cmake b/lib/jxl.cmake +--- a/lib/jxl.cmake ++++ b/lib/jxl.cmake +@@ -487,8 +487,8 @@ if (NOT WIN32) + set_target_properties(jxl-static PROPERTIES OUTPUT_NAME "jxl") + set_target_properties(jxl_dec-static PROPERTIES OUTPUT_NAME "jxl_dec") + endif() +-install(TARGETS jxl-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-install(TARGETS jxl_dec-static DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS jxl-static) ++install(TARGETS jxl_dec-static) + + if (((NOT DEFINED "${TARGET_SUPPORTS_SHARED_LIBS}") OR + TARGET_SUPPORTS_SHARED_LIBS) AND NOT JPEGXL_STATIC) +@@ -548,8 +548,7 @@ endforeach() + # Only install libjxl shared library. The libjxl_dec is not installed since it + # contains symbols also in libjxl which would conflict if programs try to use + # both. +-install(TARGETS jxl +- DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS jxl) + else() + add_library(jxl ALIAS jxl-static) + add_library(jxl_dec ALIAS jxl_dec-static) +diff --git a/lib/jxl_threads.cmake b/lib/jxl_threads.cmake +--- a/lib/jxl_threads.cmake ++++ b/lib/jxl_threads.cmake +@@ -43,7 +43,7 @@ set_target_properties(${_target} PROPERTIES + if (NOT WIN32) + set_target_properties(${_target} PROPERTIES OUTPUT_NAME "jxl_threads") + endif() +-install(TARGETS ${_target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install(TARGETS ${_target}) + + endfunction() + diff --git a/ports/libjxl/portfile.cmake b/ports/libjxl/portfile.cmake new file mode 100644 index 00000000000000..039e330c9d71fe --- /dev/null +++ b/ports/libjxl/portfile.cmake @@ -0,0 +1,78 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libjxl/libjxl + REF v0.6.1 + SHA512 302935d722160b0b288ac63301f9e95caf82eccf6ad76c4f4da6316a0314ee3562115932b1ceacb0d02708de0a07788992d3478cae73af0b90193f5769f9fb52 + HEAD_REF main + PATCHES + fix-install-directories.patch + fix-dependencies.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools JPEGXL_ENABLE_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DJPEGXL_ENABLE_FUZZERS=OFF + -DJPEGXL_ENABLE_MANPAGES=OFF + -DJPEGXL_ENABLE_BENCHMARK=OFF + -DJPEGXL_ENABLE_EXAMPLES=OFF + -DJPEGXL_ENABLE_JNI=OFF + -DJPEGXL_ENABLE_SJPEG=OFF + -DJPEGXL_ENABLE_OPENEXR=OFF + -DJPEGXL_ENABLE_PLUGINS=OFF + -DJPEGXL_ENABLE_SKCMS=OFF + -DJPEGXL_FORCE_SYSTEM_HWY=ON + -DJPEGXL_FORCE_SYSTEM_BROTLI=ON + -DBUILD_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_fixup_pkgconfig() + +if(JPEGXL_ENABLE_TOOLS) + vcpkg_copy_tools(TOOL_NAMES cjxl djxl AUTO_CLEAN) +endif() + +# libjxl always builds static and dynamic libraries, so we delete the variant that we don't need +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + if(VCPKG_TARGET_IS_WINDOWS) + file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" + ) + file(REMOVE + "${CURRENT_PACKAGES_DIR}/lib/jxl.lib" + "${CURRENT_PACKAGES_DIR}/lib/jxl_threads.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/jxl.lib" + "${CURRENT_PACKAGES_DIR}/debug/lib/jxl_threads.lib" + ) + else() + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/lib/*.so*") + file(REMOVE ${FILES}) + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.so*") + file(REMOVE ${FILES}) + endif() +else() + if(VCPKG_TARGET_IS_WINDOWS) + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/lib/*-static.lib") + file(REMOVE ${FILES}) + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*-static.lib") + file(REMOVE ${FILES}) + else() + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/lib/*.a") + file(REMOVE ${FILES}) + file(GLOB FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.a") + file(REMOVE ${FILES}) + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libjxl/vcpkg.json b/ports/libjxl/vcpkg.json new file mode 100644 index 00000000000000..22dfcf6e76f819 --- /dev/null +++ b/ports/libjxl/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "libjxl", + "version-semver": "0.6.1", + "description": "JPEG XL image format reference implementation", + "homepage": "https://github.com/libjxl/libjxl", + "license": "BSD-3-Clause", + "dependencies": [ + "brotli", + "highway", + "lcms", + "lodepng", + { + "name": "vcpkg-cmake", + "host": true + } + ], + "features": { + "tools": { + "description": "Build user tools: cjxl and djxl" + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 89529a5562ef29..862fe6230ff7fb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3548,6 +3548,10 @@ "baseline": "0.9.1", "port-version": 0 }, + "libjxl": { + "baseline": "0.6.1", + "port-version": 0 + }, "libkeyfinder": { "baseline": "2.2.5", "port-version": 1 diff --git a/versions/l-/libjxl.json b/versions/l-/libjxl.json new file mode 100644 index 00000000000000..33244587504bc4 --- /dev/null +++ b/versions/l-/libjxl.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "4b89e4e9a92111a9733660afcecdfd59a6ee8d49", + "version-semver": "0.6.1", + "port-version": 0 + } + ] +} From ad31005b7a945afba96b4b6366f6b7e7245325d6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:45:15 +0100 Subject: [PATCH 1064/1858] [python3] no absolute paths (#21144) --- ports/python3/portfile.cmake | 18 ++++++++++++++++++ ports/python3/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/p-/python3.json | 5 +++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index b57de25bbbf065..74ceb801ea4038 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -194,6 +194,8 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") + + vcpkg_fixup_pkgconfig() endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") @@ -211,3 +213,19 @@ message(STATUS "Installing cmake wrappers") _generate_finder(DIRECTORY "python" PREFIX "Python") _generate_finder(DIRECTORY "python3" PREFIX "Python3") _generate_finder(DIRECTORY "pythoninterp" PREFIX "PYTHON" NO_OVERRIDE) + +if (NOT VCPKG_TARGET_IS_WINDOWS) + file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") + list(POP_FRONT python_config_files python_config_file) + vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))\n") + vcpkg_replace_string("${python_config_file}" "${CURRENT_INSTALLED_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_PACKAGES_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_BUILDTREES_DIR}" "not/existing") + + file(GLOB python_config_files "${CURRENT_PACKAGES_DIR}/debug/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/_sysconfigdata*") + list(POP_FRONT python_config_files python_config_file) + vcpkg_replace_string("${python_config_file}" "# system configuration generated and used by the sysconfig module" "# system configuration generated and used by the sysconfig module\nimport os\n_base = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))\n") + vcpkg_replace_string("${python_config_file}" "${CURRENT_INSTALLED_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_PACKAGES_DIR}" "' + _base + '") + vcpkg_replace_string("${python_config_file}" "${CURRENT_BUILDTREES_DIR}" "not/existing") +endif() diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 22ec71666224cd..358fcac48e2f43 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,6 +1,7 @@ { "name": "python3", "version-semver": "3.10.0", + "port-version": 1, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 862fe6230ff7fb..317c76da0164ef 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5414,7 +5414,7 @@ }, "python3": { "baseline": "3.10.0", - "port-version": 0 + "port-version": 1 }, "qca": { "baseline": "2.3.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 007cb9431c05af..1e408989bb001c 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b155976e5a0266f5f73e2ff642b5281303a6a73f", + "version-semver": "3.10.0", + "port-version": 1 + }, { "git-tree": "08e4258968ff551133ae315eb8ed207f87f085b6", "version-semver": "3.10.0", From 2c1219e28c5c10a09c38659ece18f77f46c69885 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:45:40 +0100 Subject: [PATCH 1065/1858] [hpx] no absolute (#21135) --- ports/hpx/portfile.cmake | 41 ++++++++++++++++++++-------------------- ports/hpx/vcpkg.json | 11 ++++++++++- versions/baseline.json | 2 +- versions/h-/hpx.json | 5 +++++ 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index e8bbd3a569f20d..3c3fd2762a785a 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -9,9 +9,8 @@ vcpkg_from_github( HEAD_REF stable ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DHPX_WITH_VCPKG=ON -DHPX_WITH_TESTS=OFF @@ -20,10 +19,10 @@ vcpkg_configure_cmake( -DHPX_WITH_RUNTIME=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() # post build cleanup -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/HPX) file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake") foreach(CMAKE_FILE IN LISTS CMAKE_FILES) @@ -50,39 +49,39 @@ vcpkg_replace_string( "list(APPEND CMAKE_MODULE_PATH") file(INSTALL - ${SOURCE_PATH}/LICENSE_1_0.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + "${SOURCE_PATH}/LICENSE_1_0.txt" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll) +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll") if(DLLS) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE ${DLLS}) endif() -file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll) +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll") if(DLLS) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/hpx") file(REMOVE ${DLLS}) endif() -file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") if(DLLS) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE ${DLLS}) endif() -file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll) +file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll") if(DLLS) - file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx) + file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/hpx") file(REMOVE ${DLLS}) endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) +vcpkg_fixup_pkgconfig() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))") vcpkg_copy_pdbs() diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json index f628a848af6644..76fdb787236e90 100644 --- a/ports/hpx/vcpkg.json +++ b/ports/hpx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hpx", "version-semver": "1.7.1", + "port-version": 1, "description": [ "The C++ Standards Library for Concurrency and Parallelism", "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case." @@ -22,6 +23,14 @@ "boost-throw-exception", "boost-variant", "boost-winapi", - "hwloc" + "hwloc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 317c76da0164ef..61b5b7fbd7b5a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2686,7 +2686,7 @@ }, "hpx": { "baseline": "1.7.1", - "port-version": 0 + "port-version": 1 }, "http-parser": { "baseline": "2.9.4", diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json index 84c8a4d9fa54d5..e35502add12cf8 100644 --- a/versions/h-/hpx.json +++ b/versions/h-/hpx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "739c83940b3bc753e7b1ada7192dd0c36970c9f5", + "version-semver": "1.7.1", + "port-version": 1 + }, { "git-tree": "d55f05944b91ea48152696beb48444cad53ba8e1", "version-semver": "1.7.1", From 52b4368a7c493e255ca3b519c8b3d9b867429039 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:48:24 +0100 Subject: [PATCH 1066/1858] [libpng] remove absolute paths (#21066) --- ports/libpng/portfile.cmake | 5 +++-- ports/libpng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpng.json | 5 +++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake index 7b50b1086f0eac..48e4c6ac007477 100644 --- a/ports/libpng/portfile.cmake +++ b/ports/libpng/portfile.cmake @@ -140,5 +140,6 @@ endif() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools" "${CURRENT_PACKAGES_DIR}/debug/tools") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpng/vcpkg.json b/ports/libpng/vcpkg.json index 78b76fb776417f..0fe109eb8074ad 100644 --- a/ports/libpng/vcpkg.json +++ b/ports/libpng/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpng", "version": "1.6.37", - "port-version": 15, + "port-version": 16, "description": "libpng is a library implementing an interface for reading and writing PNG (Portable Network Graphics) format files", "homepage": "https://github.com/glennrp/libpng", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 61b5b7fbd7b5a7..1810fcbb1b2ea6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3742,7 +3742,7 @@ }, "libpng": { "baseline": "1.6.37", - "port-version": 15 + "port-version": 16 }, "libpopt": { "baseline": "1.16", diff --git a/versions/l-/libpng.json b/versions/l-/libpng.json index 8f35b026fba60d..a9380b8c1f74c9 100644 --- a/versions/l-/libpng.json +++ b/versions/l-/libpng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b082585ac20aefc27150af5386b6a8a15473e93a", + "version": "1.6.37", + "port-version": 16 + }, { "git-tree": "09cdb4f54e6cc8a6a1eebbbc4c9f786d0ee652b8", "version": "1.6.37", From e803dd13967077aace4865f18803b91e5ded1292 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 9 Nov 2021 20:49:00 +0100 Subject: [PATCH 1067/1858] [glib] remove absolute paths (#21065) --- ports/glib/portfile.cmake | 5 +++++ ports/glib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 1a0d01a09751c8..b686970253584b 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -124,3 +124,8 @@ string(REPLACE "path = os.path.join(filedir, '..')" "path = os.path.join(filedir string(REPLACE "path = os.path.join('${CURRENT_PACKAGES_DIR}/share', 'glib-2.0')" "path = os.path.join('unuseable/share', 'glib-2.0')" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gdb") +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/glib/glib-gettextize") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/glib/glib-gettextize" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") +endif() diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 16e6b397867f99..5095a59b823866 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.66.4", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "supports": "!uwp & !(windows & static)", diff --git a/versions/baseline.json b/versions/baseline.json index 1810fcbb1b2ea6..8c183e7f412a72 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2458,7 +2458,7 @@ }, "glib": { "baseline": "2.66.4", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.68.1", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index a29fcb758d13e2..5b2f3b0012477c 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6207d9439567fbbc29f4468c831ef7c1fa2e6181", + "version": "2.66.4", + "port-version": 1 + }, { "git-tree": "341ab01f1a30e270603af6d2b934df9c68673a56", "version": "2.66.4", From 5060f18e34339e0652360378ba64fcfca4c7493c Mon Sep 17 00:00:00 2001 From: dan9er <67669146+dan9er@users.noreply.github.com> Date: Tue, 9 Nov 2021 19:51:17 +0000 Subject: [PATCH 1068/1858] [zstr] Fix include issues, add usage message override, add homepage and zlib dependency to vcpkg.json (#18068) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [zstr] Add zstr_make_unique_polyfill.h to install list Fixes microsoft#16402 * [zstr] Install inside include/ instead of include/zstr/ Fixes microsoft#18067 * [zstr] Replace CONTROL with vcpkg.json * format manifest file * Update ports/zstr/vcpkg.json * update version * [zstr] Run format-manifest * [zstr] Update port-version * [zstr] Run x-add-version * [zstr] Add usage msg override * [zstr] Rerun x-add-version Co-authored-by: JackBoosY Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/zstr/portfile.cmake | 6 +++++- ports/zstr/usage | 4 ++++ ports/zstr/vcpkg.json | 8 ++++++-- versions/baseline.json | 2 +- versions/z-/zstr.json | 5 +++++ 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 ports/zstr/usage diff --git a/ports/zstr/portfile.cmake b/ports/zstr/portfile.cmake index b44ddc3ebe259d..7db0333bd5949f 100644 --- a/ports/zstr/portfile.cmake +++ b/ports/zstr/portfile.cmake @@ -9,7 +9,11 @@ vcpkg_from_github( # Install source files file(INSTALL ${SOURCE_PATH}/src/strict_fstream.hpp ${SOURCE_PATH}/src/zstr.hpp - DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT}) + ${SOURCE_PATH}/src/zstr_make_unique_polyfill.h + DESTINATION ${CURRENT_PACKAGES_DIR}/include) # Install license file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +# Install usage +file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) diff --git a/ports/zstr/usage b/ports/zstr/usage new file mode 100644 index 00000000000000..78f9b80a189fd2 --- /dev/null +++ b/ports/zstr/usage @@ -0,0 +1,4 @@ +The package zstr is header only and can be used from CMake via: + + find_path(ZSTR_INCLUDE_DIRS "zstr.hpp") + target_include_directories(main PRIVATE ${ZSTR_INCLUDE_DIRS}) diff --git a/ports/zstr/vcpkg.json b/ports/zstr/vcpkg.json index d0f5f31b39f3fa..11d0a4981dec35 100644 --- a/ports/zstr/vcpkg.json +++ b/ports/zstr/vcpkg.json @@ -1,6 +1,10 @@ { "name": "zstr", "version-string": "1.0.4", - "port-version": 1, - "description": "This C++ header-only library enables the use of C++ standard iostreams to access ZLib-compressed streams." + "port-version": 2, + "description": "This C++ header-only library enables the use of C++ standard iostreams to access ZLib-compressed streams.", + "homepage": "https://github.com/mateidavid/zstr", + "dependencies": [ + "zlib" + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 8c183e7f412a72..c91f109be8f504 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7354,7 +7354,7 @@ }, "zstr": { "baseline": "1.0.4", - "port-version": 1 + "port-version": 2 }, "zug": { "baseline": "2021-04-23", diff --git a/versions/z-/zstr.json b/versions/z-/zstr.json index d85da33f7b8e67..906cad8775698e 100644 --- a/versions/z-/zstr.json +++ b/versions/z-/zstr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7a13e5cb665ce878aa5b6c9723a0e375e1be5c15", + "version-string": "1.0.4", + "port-version": 2 + }, { "git-tree": "339a979f431eb74d38dbb731f60b89fd6cc2a43a", "version-string": "1.0.4", From 1bde9b132d9619da87886700c5c0f0ecce392e3a Mon Sep 17 00:00:00 2001 From: georg-emg <71000124+georg-emg@users.noreply.github.com> Date: Tue, 9 Nov 2021 22:40:47 +0100 Subject: [PATCH 1069/1858] [mosquitto] fixed building of static libraries (#21131) * - updated catch2 to version 2.13.5 - replaced CONTROL file with proper manifest * vcpkg x-add-version catch2 * removed a file added to the wrong branch * [mosquitto] fixed building of static libraries * vcpkg x-add-version mosquitto --- ports/mosquitto/portfile.cmake | 28 +++++++++++++++++++++-- ports/mosquitto/vcpkg-cmake-wrapper.cmake | 8 +++---- ports/mosquitto/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mosquitto.json | 5 ++++ 5 files changed, 37 insertions(+), 8 deletions(-) diff --git a/ports/mosquitto/portfile.cmake b/ports/mosquitto/portfile.cmake index 7db0e5ee68f7be..c20fe2a9fc9707 100644 --- a/ports/mosquitto/portfile.cmake +++ b/ports/mosquitto/portfile.cmake @@ -12,15 +12,16 @@ vcpkg_from_github( 0005-websocket-shared-lib-name.patch ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_WEBSOCKETS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATIC_LINKAGE) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DWITH_STATIC_LIBRARIES=${STATIC_LINKAGE} -DWITH_SRV=OFF -DWITH_WEBSOCKETS=ON - -DSTATIC_WEBSOCKETS=${STATIC_WEBSOCKETS} + -DSTATIC_WEBSOCKETS=${STATIC_LINKAGE} -DWITH_TLS=ON -DWITH_TLS_PSK=ON -DWITH_THREADING=ON @@ -46,6 +47,29 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/mosquitto_sub${VCPKG_TARGET_EXECUTABLE_S if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}) + + file(GLOB VERSIONED_LIBRARIES LIST_DIRECTORIES FALSE + ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* + ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* + ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* + ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_SHARED_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}.* + ) + + if(NOT "x${VERSIONED_LIBRARIES}x" STREQUAL "xx") + file(REMOVE ${VERSIONED_LIBRARIES}) + endif() + + if(NOT "x${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}x" STREQUAL "xx") + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquitto${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/${VCPKG_TARGET_IMPORT_LIBRARY_PREFIX}mosquittopp${VCPKG_TARGET_IMPORT_LIBRARY_SUFFIX}) + endif() endif() configure_file(${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake @ONLY) diff --git a/ports/mosquitto/vcpkg-cmake-wrapper.cmake b/ports/mosquitto/vcpkg-cmake-wrapper.cmake index ad8124c677974e..fb7f71dc0d50cf 100644 --- a/ports/mosquitto/vcpkg-cmake-wrapper.cmake +++ b/ports/mosquitto/vcpkg-cmake-wrapper.cmake @@ -3,10 +3,10 @@ include(SelectLibraryConfigurations) find_path(MOSQUITTO_INCLUDE_DIR mosquitto.h) -find_library(MOSQUITTO_LIBRARY_DEBUG NAMES mosquitto libmosquitto NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(MOSQUITTO_LIBRARY_RELEASE NAMES mosquitto libmosquitto NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) -find_library(MOSQUITTOPP_LIBRARY_DEBUG NAMES mosquittopp libmosquittopp NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) -find_library(MOSQUITTOPP_LIBRARY_RELEASE NAMES mosquittopp libmosquittopp NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +find_library(MOSQUITTO_LIBRARY_DEBUG NAMES mosquitto libmosquitto mosquitto_static libmosquitto_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(MOSQUITTO_LIBRARY_RELEASE NAMES mosquitto libmosquitto mosquitto_static libmosquitto_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) +find_library(MOSQUITTOPP_LIBRARY_DEBUG NAMES mosquittopp libmosquittopp mosquittopp_static libmosquittopp_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH REQUIRED) +find_library(MOSQUITTOPP_LIBRARY_RELEASE NAMES mosquittopp libmosquittopp mosquittopp_static libmosquittopp_static NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH REQUIRED) select_library_configurations(MOSQUITTO) select_library_configurations(MOSQUITTOPP) diff --git a/ports/mosquitto/vcpkg.json b/ports/mosquitto/vcpkg.json index 78f4999c664d3f..b73e452f07f832 100644 --- a/ports/mosquitto/vcpkg.json +++ b/ports/mosquitto/vcpkg.json @@ -1,7 +1,7 @@ { "name": "mosquitto", "version": "2.0.12", - "port-version": 2, + "port-version": 3, "description": "Mosquitto is an open source message broker that implements the MQ Telemetry Transport protocol versions 3.1 and 3.1.1, MQTT provides a lightweight method of carrying out messaging using a publish/subscribe model, This makes it suitable for machine to machine messaging such as with low power sensors or mobile devices such as phones, embedded computers or microcontrollers like the Arduino", "homepage": "https://mosquitto.org/download/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c91f109be8f504..ad83957a1505f4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4438,7 +4438,7 @@ }, "mosquitto": { "baseline": "2.0.12", - "port-version": 2 + "port-version": 3 }, "mozjpeg": { "baseline": "2021-09-27", diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index d107dafb3ba64d..597552f8cd7ad5 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f57ff6e27ac8e72ba497868198a9c9ae3d0bd281", + "version": "2.0.12", + "port-version": 3 + }, { "git-tree": "a94c1fb81601520c8a9766865574b5e132e1c848", "version": "2.0.12", From 28e93fdb3f5497b16fc1c93000c97df3c64691f4 Mon Sep 17 00:00:00 2001 From: simon987 Date: Tue, 9 Nov 2021 16:42:04 -0500 Subject: [PATCH 1070/1858] [libmupdf] Update to 1.19.0-rc2 (#20328) * Update libmupdf to 1.19.0-rc2 * Add results of ./vcpkg x-add-version --all * minimize patch * update version * Use 4 spaces rather than 2 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Remove vcpkg-cmake-config dependency * Run x-add-version Co-authored-by: NancyLi1013 Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/libmupdf/CMakeLists.txt | 5 ++- ...nt-generate-extract-3rd-party-things.patch | 16 ++++++++ ports/libmupdf/portfile.cmake | 7 +++- .../use-if-instead-of-ifdef-in-writer.patch | 39 +++++++++++++++++++ ports/libmupdf/vcpkg.json | 6 +-- versions/baseline.json | 2 +- versions/l-/libmupdf.json | 5 +++ 7 files changed, 70 insertions(+), 10 deletions(-) create mode 100644 ports/libmupdf/dont-generate-extract-3rd-party-things.patch create mode 100644 ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch diff --git a/ports/libmupdf/CMakeLists.txt b/ports/libmupdf/CMakeLists.txt index 6800bea9aeb39b..95ec646f8bd03f 100644 --- a/ports/libmupdf/CMakeLists.txt +++ b/ports/libmupdf/CMakeLists.txt @@ -28,13 +28,14 @@ find_library(JBIG2DEC_LIB NAMES jbig2decd jbig2dec) file(GLOB_RECURSE SOURCES "source/*.c" "generated/*.c") list(FILTER SOURCES EXCLUDE REGEX "source/tools/[a-z]*\\.c$") list(FILTER SOURCES EXCLUDE REGEX "source/tests/.*.c$") +list(FILTER SOURCES EXCLUDE REGEX "source/fitz/output-docx.c") add_library(libmupdf ${SOURCES}) if(WIN32) - target_compile_definitions(libmupdf PRIVATE -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0) + target_compile_definitions(libmupdf PRIVATE -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0 -DMEMENTO_MUPDF_HACKS -DFZ_ENABLE_DOCX_OUTPUT=0 -DFZ_ENABLE_ODT_OUTPUT=0) else() - target_compile_definitions(libmupdf PRIVATE -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0 -DHAVE_PTHREAD=1) + target_compile_definitions(libmupdf PRIVATE -DHAVE_PTHREAD=1 -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DFZ_ENABLE_ICC=0 -DMEMENTO_MUPDF_HACKS -DFZ_ENABLE_DOCX_OUTPUT=0 -DFZ_ENABLE_ODT_OUTPUT=0) endif() target_include_directories(libmupdf PUBLIC diff --git a/ports/libmupdf/dont-generate-extract-3rd-party-things.patch b/ports/libmupdf/dont-generate-extract-3rd-party-things.patch new file mode 100644 index 00000000000000..ec3cb4f890ad63 --- /dev/null +++ b/ports/libmupdf/dont-generate-extract-3rd-party-things.patch @@ -0,0 +1,16 @@ +--- a/Makethird ++++ b/Makethird +@@ -238,6 +238,7 @@ endif + + # --- EXTRACT --- + ++ifeq (0, 1) + THIRD_CFLAGS += $(EXTRACT_CFLAGS) + THIRD_LIBS += $(EXTRACT_LIBS) + THIRD_SRC += $(EXTRACT_SRC) +@@ -268,3 +269,4 @@ thirdparty/extract/src/odt_template.c: thirdparty/extract/src/template.odt third + @touch $@ + + generate: thirdparty/extract/src/docx_template.c ++endif + diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake index 7eb51680f3994e..88e7b7e375b26d 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -5,9 +5,12 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ArtifexSoftware/mupdf - REF af0e25cec567868a04eaacf6410c395712fe4b90 #1.18.1-so-3.11.14 - SHA512 3dc6b75964d93af84921ee30a5b14e0ab84d16afa31f97a0fbf62e2006ace62f9c0366d1c3872cd678dab71eb23a422daeca0eb0b5db58e434f27657bbf9b5bc + REF 61b63d734a7b9df618f6b45dda2466aed442f7f0 # 1.19.0-rc2 + SHA512 16661c012e18ac72b24c46caf5c02515c29a05e0a8dcf95076eff3a1f2e87c225245037480ed37068858fe6e04ff4a404f69877599b208ab9265d054ec117820 HEAD_REF master + PATCHES + dont-generate-extract-3rd-party-things.patch + use-if-instead-of-ifdef-in-writer.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch b/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch new file mode 100644 index 00000000000000..25dff596006d17 --- /dev/null +++ b/ports/libmupdf/use-if-instead-of-ifdef-in-writer.patch @@ -0,0 +1,39 @@ +--- a/source/fitz/writer.c ++++ b/source/fitz/writer.c +@@ -169,7 +169,7 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f + format = strrchr(path, '.'); + while (format) + { +-#ifdef FZ_ENABLE_OCR_OUTPUT ++#if FZ_ENABLE_OCR_OUTPUT + if (is_extension(format, "ocr")) + return fz_new_pdfocr_writer(ctx, path, options); + #endif +@@ -219,11 +219,11 @@ fz_new_document_writer(fz_context *ctx, const char *path, const char *explicit_f + if (is_extension(format, "stext.json")) + return fz_new_text_writer(ctx, "stext.json", path, options); + +-#ifdef FZ_ENABLE_ODT_OUTPUT ++#if FZ_ENABLE_ODT_OUTPUT + if (is_extension(format, "odt")) + return fz_new_odt_writer(ctx, path, options); + #endif +-#ifdef FZ_ENABLE_DOCX_OUTPUT ++#if FZ_ENABLE_DOCX_OUTPUT + if (is_extension(format, "docx")) + return fz_new_docx_writer(ctx, path, options); + #endif +@@ -267,11 +267,11 @@ fz_new_document_writer_with_output(fz_context *ctx, fz_output *out, const char * + if (is_extension(format, "stext.json")) + return fz_new_text_writer_with_output(ctx, "stext.json", out, options); + +-#ifdef FZ_ENABLE_ODT_OUTPUT ++#if FZ_ENABLE_ODT_OUTPUT + if (is_extension(format, "odt")) + return fz_new_odt_writer_with_output(ctx, out, options); + #endif +-#ifdef FZ_ENABLE_DOCX_OUTPUT ++#if FZ_ENABLE_DOCX_OUTPUT + if (is_extension(format, "docx")) + return fz_new_docx_writer_with_output(ctx, out, options); + #endif diff --git a/ports/libmupdf/vcpkg.json b/ports/libmupdf/vcpkg.json index f0342c005e66d5..af307e1df2a62b 100644 --- a/ports/libmupdf/vcpkg.json +++ b/ports/libmupdf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libmupdf", - "version-string": "1.18.1-so-3.11.14", + "version-string": "1.19.0-rc2", "description": "a lightweight PDF, XPS, and E-book library", "homepage": "https://github.com/ArtifexSoftware/mupdf", "supports": "!osx", @@ -17,10 +17,6 @@ "name": "vcpkg-cmake", "host": true }, - { - "name": "vcpkg-cmake-config", - "host": true - }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index ad83957a1505f4..789deb4be15625 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3649,7 +3649,7 @@ "port-version": 1 }, "libmupdf": { - "baseline": "1.18.1-so-3.11.14", + "baseline": "1.19.0-rc2", "port-version": 0 }, "libmysql": { diff --git a/versions/l-/libmupdf.json b/versions/l-/libmupdf.json index 5015bebc1bea26..a900d9f5f861a8 100644 --- a/versions/l-/libmupdf.json +++ b/versions/l-/libmupdf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e91affc70edc5bab8dc75c274f14ba03b345c0bb", + "version-string": "1.19.0-rc2", + "port-version": 0 + }, { "git-tree": "20a08f46ae4e7bd7afa7eaad146a2709bd782ea3", "version-string": "1.18.1-so-3.11.14", From 513acf40837cdfce2273652a388a5ffe426aba30 Mon Sep 17 00:00:00 2001 From: Cameron Ward Date: Tue, 9 Nov 2021 19:29:09 -0500 Subject: [PATCH 1071/1858] [vcpkg baseline][pcre2] fix checksum and update to 10.39 (#21248) * [pcre2] fix checksum * [pcre2] update to 10.39 * Set static build, format code. * version * [pcre2] Add cmake wrapper to use the generated cmake file * [unicorn-lib] Fix dependency pcre2 * version * [qt5-base] Fix dependency pcre2 * [pcre2] Fix pcre2-config.cmake * version * Re-fix pcre2-config.cmake * Revert changes about pcre-config.cmake * version * remove cmake wrapper * version * Fix static name * version Co-authored-by: JackBoosY --- ports/pcre2/portfile.cmake | 43 ++++++++++++++++++-------------- ports/pcre2/vcpkg.json | 17 ++++++++++--- ports/qt5-base/portfile.cmake | 4 +-- ports/qt5-base/vcpkg.json | 2 +- ports/unicorn-lib/CMakeLists.txt | 4 +-- ports/unicorn-lib/vcpkg.json | 4 +-- versions/baseline.json | 8 +++--- versions/p-/pcre2.json | 5 ++++ versions/q-/qt5-base.json | 5 ++++ versions/u-/unicorn-lib.json | 5 ++++ 10 files changed, 63 insertions(+), 34 deletions(-) diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake index 69f2cfe8408905..2d946042692de0 100644 --- a/ports/pcre2/portfile.cmake +++ b/ports/pcre2/portfile.cmake @@ -1,54 +1,59 @@ -set(PCRE2_VERSION 10.37) -set(EXPECTED_SHA f91760a8e0747f52211612fb0e134d685e224d16bd884eb574718d077a586b1fd7b6435d4e3b75c879b12e02b252467ecc28cdc4bc2903c783dacab089f99c99) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO PhilipHazel/pcre2 - REF pcre2-${PCRE2_VERSION} - SHA512 ${EXPECTED_SHA} + REF 35fee4193b852cb504892352bd0155de10809889 # pcre2-10.39 + SHA512 a6e50f3354dc4172df05e887dd8646d4ce6a3584fe180b17dc27b42b094e13d1d1a7e5ab3cb15dd352764d81ac33cfd03e81b0c890d9ddec72d823ca6f8bd667 HEAD_REF master PATCHES pcre2-10.35_fix-uwp.patch ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) + if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "iOS") set(JIT OFF) else() set(JIT ON) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC} -DPCRE2_BUILD_PCRE2_8=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_SUPPORT_JIT=${JIT} -DPCRE2_SUPPORT_UNICODE=ON -DPCRE2_BUILD_TESTS=OFF - -DPCRE2_BUILD_PCRE2GREP=OFF) + -DPCRE2_BUILD_PCRE2GREP=OFF +) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(READ ${CURRENT_PACKAGES_DIR}/include/pcre2.h PCRE2_H) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +file(READ "${CURRENT_PACKAGES_DIR}/include/pcre2.h" PCRE2_H) +if(BUILD_STATIC) string(REPLACE "defined(PCRE2_STATIC)" "1" PCRE2_H "${PCRE2_H}") else() string(REPLACE "defined(PCRE2_STATIC)" "0" PCRE2_H "${PCRE2_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/pcre2.h "${PCRE2_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/pcre2.h" "${PCRE2_H}") vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() +# The cmake file provided by pcre2 has some problems, so don't use it for now. +#vcpkg_cmake_config_fixup(CONFIG_PATH cmake) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/cmake" "${CURRENT_PACKAGES_DIR}/debug/cmake") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/man") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/man) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/man) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +if(BUILD_STATIC) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json index f402cc0de3b2fc..edea44e6582312 100644 --- a/ports/pcre2/vcpkg.json +++ b/ports/pcre2/vcpkg.json @@ -1,7 +1,16 @@ { "name": "pcre2", - "version-string": "10.37", - "port-version": 1, - "description": "PCRE2 is a re-working of the original Perl Compatible Regular Expressions library", - "homepage": "https://pcre.org/" + "version": "10.39", + "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.", + "homepage": "https://github.com/PhilipHazel/pcre2", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 2bd8475c9cfe9d..455f1ed7eab5bc 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -171,8 +171,8 @@ endif() find_library(MYSQL_RELEASE NAMES libmysql mysqlclient PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on openssl and zlib(linux) find_library(MYSQL_DEBUG NAMES libmysql libmysqld mysqlclient mysqlclientd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) -find_library(PCRE2_RELEASE NAMES pcre2-16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) -find_library(PCRE2_DEBUG NAMES pcre2-16 pcre2-16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) +find_library(PCRE2_RELEASE NAMES pcre2-16 pcre2-16-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) +find_library(PCRE2_DEBUG NAMES pcre2-16 pcre2-16-static pcre2-16d pcre2-16-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(FREETYPE_RELEASE NAMES freetype PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #zlib, bzip2, libpng find_library(FREETYPE_DEBUG NAMES freetype freetyped PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH) find_library(DOUBLECONVERSION_RELEASE NAMES double-conversion PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 072baa2f1f1bbc..4879f807d65de4 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 12, + "port-version": 13, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/unicorn-lib/CMakeLists.txt b/ports/unicorn-lib/CMakeLists.txt index 9a9c5825e62d14..16c160080a93e1 100644 --- a/ports/unicorn-lib/CMakeLists.txt +++ b/ports/unicorn-lib/CMakeLists.txt @@ -7,8 +7,8 @@ option(UNICORN_LIB_SKIP_HEADERS "If the headers installation is skipped or not." find_path(RS_CORE_LIB_INCLUDE_DIR rs-core/common.hpp) #find_library(RW_UTILITIES_LIBRARY NAMES rw_utilities) find_package(ZLIB REQUIRED) -find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d HINTS ${INSTALLED_LIB_PATH}) -find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 HINTS ${INSTALLED_LIB_PATH}) +find_library(PCRE2_LIBRARY_DEBUG NAMES pcre2-8d pcre2-8-staticd HINTS ${INSTALLED_LIB_PATH}) +find_library(PCRE2_LIBRARY_RELEASE NAMES pcre2-8 pcre2-8-static HINTS ${INSTALLED_LIB_PATH}) select_library_configurations(PCRE2) file(GLOB_RECURSE UNICORN_LIB_SOURCES ${PROJECT_SOURCE_DIR}/unicorn/*.cpp) diff --git a/ports/unicorn-lib/vcpkg.json b/ports/unicorn-lib/vcpkg.json index 03b4dbaa4e2e11..5aee950513572c 100644 --- a/ports/unicorn-lib/vcpkg.json +++ b/ports/unicorn-lib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "unicorn-lib", - "version-string": "2020-03-02", - "port-version": 1, + "version-date": "2020-03-02", + "port-version": 2, "description": "Unicode library for C++ by Ross Smith", "homepage": "https://github.com/CaptainCrowbar/unicorn-lib", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 789deb4be15625..cb6d1f996d864a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5129,8 +5129,8 @@ "port-version": 1 }, "pcre2": { - "baseline": "10.37", - "port-version": 1 + "baseline": "10.39", + "port-version": 0 }, "pdal": { "baseline": "1.7.1", @@ -5466,7 +5466,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 12 + "port-version": 13 }, "qt5-canvas3d": { "baseline": "0", @@ -6874,7 +6874,7 @@ }, "unicorn-lib": { "baseline": "2020-03-02", - "port-version": 1 + "port-version": 2 }, "units": { "baseline": "2.3.1", diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json index 1c68dcd8e32c34..664e5218fd31e7 100644 --- a/versions/p-/pcre2.json +++ b/versions/p-/pcre2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7adfd692604527d08dfc188301fb73bae107550", + "version": "10.39", + "port-version": 0 + }, { "git-tree": "f467ee4e8312b3536d9b7af3a181630c9956db5d", "version-string": "10.37", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index e51f704074b1e3..e747601e08f901 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0254baec079c6226b73cc7580e7724cad98648c", + "version-semver": "5.15.2", + "port-version": 13 + }, { "git-tree": "9a65e1b0d631a1c2879d566140c11d634601fca6", "version-semver": "5.15.2", diff --git a/versions/u-/unicorn-lib.json b/versions/u-/unicorn-lib.json index d37bc36cc22ea7..eec55aaa604950 100644 --- a/versions/u-/unicorn-lib.json +++ b/versions/u-/unicorn-lib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e88ab2927a310295171887057ac0f6cc6502a8d5", + "version-date": "2020-03-02", + "port-version": 2 + }, { "git-tree": "a79eb0ae5746d8c2c2ebbd68557baf5975193ac8", "version-string": "2020-03-02", From 63619906825105a28095e51b30867034e91b1dac Mon Sep 17 00:00:00 2001 From: Hunter Date: Wed, 10 Nov 2021 13:48:20 -0500 Subject: [PATCH 1072/1858] Issue templates: Fix typo in build failure (#21297) --- .github/ISSUE_TEMPLATE/report-package-build-failure.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/report-package-build-failure.md b/.github/ISSUE_TEMPLATE/report-package-build-failure.md index e42ff43f817c22..785483c368b440 100644 --- a/.github/ISSUE_TEMPLATE/report-package-build-failure.md +++ b/.github/ISSUE_TEMPLATE/report-package-build-failure.md @@ -16,7 +16,7 @@ Steps to reproduce the behavior: `./vcpkg install xxxx` **Failure logs** --Cut and past the appropriate build messages from the console output. +-Cut and paste the appropriate build messages from the console output. -Please attach any additional failure logs mentioned in the console output. **Additional context** From 8b3f0b1f05a9441a257d317a550c4f3990adad26 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:48:38 +0100 Subject: [PATCH 1073/1858] [openmpi] no absolute paths (#21294) * [openmpi] no absolute paths * update version * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/openmpi/portfile.cmake | 1 + ports/openmpi/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/o-/openmpi.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/openmpi/portfile.cmake b/ports/openmpi/portfile.cmake index 43533348089c1d..09c74688362c97 100644 --- a/ports/openmpi/portfile.cmake +++ b/ports/openmpi/portfile.cmake @@ -34,6 +34,7 @@ vcpkg_configure_make( ) vcpkg_install_make(DISABLE_PARALLEL) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/openmpi/vcpkg.json b/ports/openmpi/vcpkg.json index fe5d44c181c8bf..1d371474b2d917 100644 --- a/ports/openmpi/vcpkg.json +++ b/ports/openmpi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openmpi", - "version-string": "4.1.0", - "port-version": 2, + "version": "4.1.0", + "port-version": 3, "description": "The Open MPI Project is an open source Message Passing Interface implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.", "homepage": "https://www.open-mpi.org/", "supports": "!(windows | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index cb6d1f996d864a..83881d5e4262a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4938,7 +4938,7 @@ }, "openmpi": { "baseline": "4.1.0", - "port-version": 2 + "port-version": 3 }, "openmvg": { "baseline": "1.6", diff --git a/versions/o-/openmpi.json b/versions/o-/openmpi.json index 836cc592ba7a32..e98a3395b42593 100644 --- a/versions/o-/openmpi.json +++ b/versions/o-/openmpi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d701c1350d6cb8e4380f829460e8287b0e2f6cc", + "version": "4.1.0", + "port-version": 3 + }, { "git-tree": "2c4b5b526fe4b6a8de9fa88eea30d3a1ddc7878e", "version-string": "4.1.0", From 67a512d3ebdf5a5bd0d443a51153a5a42b1059fd Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:48:59 -0800 Subject: [PATCH 1074/1858] [azure-security-keyvault-certificates-cpp] Update to 4.0.0-beta.1 (#21291) ## 4.0.0-beta.1 (2021-11-09) ### New Features - Initial beta release of Azure Security Key Vault Certificates API for CPP. - Added `Azure::Security::KeyVault::Certificates::CertificateClient` for get, create, list, delete, backup, restore, and import certificate operations. - Added high-level and simplified `keyvault_certificates.hpp` file for simpler include experience for customers. - Added model types which are returned from the `CertificateClient` operations, such as `Azure::Security::KeyVault::Certificates::KeyVaultCertificate`. --- .../portfile.cmake | 18 +++++++++++++ .../vcpkg.json | 25 +++++++++++++++++++ ...re-security-keyvault-certificates-cpp.json | 9 +++++++ versions/baseline.json | 4 +++ 4 files changed, 56 insertions(+) create mode 100644 ports/azure-security-keyvault-certificates-cpp/portfile.cmake create mode 100644 ports/azure-security-keyvault-certificates-cpp/vcpkg.json create mode 100644 versions/a-/azure-security-keyvault-certificates-cpp.json diff --git a/ports/azure-security-keyvault-certificates-cpp/portfile.cmake b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake new file mode 100644 index 00000000000000..5b0035e64d287a --- /dev/null +++ b/ports/azure-security-keyvault-certificates-cpp/portfile.cmake @@ -0,0 +1,18 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO Azure/azure-sdk-for-cpp + REF azure-security-keyvault-certificates_4.0.0-beta.1 + SHA512 8cb7fccade755cb984a311430a808e777a041e663b607a40308a79b353431abea2eaef1c49c48c783ec9020b5d0e6e53fa101f2e2432bd71bba3b578bfe810ca +) + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH}/sdk/keyvault/azure-security-keyvault-certificates/ + OPTIONS + -DWARNINGS_AS_ERRORS=OFF +) + +vcpkg_cmake_install() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_copy_pdbs() diff --git a/ports/azure-security-keyvault-certificates-cpp/vcpkg.json b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json new file mode 100644 index 00000000000000..06b6ce023199f4 --- /dev/null +++ b/ports/azure-security-keyvault-certificates-cpp/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "azure-security-keyvault-certificates-cpp", + "version-semver": "4.0.0-beta.1", + "description": [ + "Microsoft Azure Key Vault Certificates SDK for C++", + "This library provides Azure Key Vault Certificates SDK." + ], + "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/keyvault/azure-security-keyvault-certificates", + "license": "MIT", + "dependencies": [ + { + "name": "azure-core-cpp", + "default-features": false, + "version>=": "1.2.0" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/a-/azure-security-keyvault-certificates-cpp.json b/versions/a-/azure-security-keyvault-certificates-cpp.json new file mode 100644 index 00000000000000..b423c1eba4affd --- /dev/null +++ b/versions/a-/azure-security-keyvault-certificates-cpp.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5faeb850df56edd9f4689f69f4d64e6e51dde80b", + "version-semver": "4.0.0-beta.1", + "port-version": 0 + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 83881d5e4262a4..cb3505b471e1b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -336,6 +336,10 @@ "baseline": "2020-06-17", "port-version": 3 }, + "azure-security-keyvault-certificates-cpp": { + "baseline": "4.0.0-beta.1", + "port-version": 0 + }, "azure-security-keyvault-common-cpp": { "baseline": "4.0.0-beta.3", "port-version": 0 From 247d1822ab439c61c462db744b0ee753c9e3e9c6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:49:18 +0100 Subject: [PATCH 1075/1858] [icu] no absolute paths (#21288) --- ports/icu/portfile.cmake | 50 ++++++++++++++++++++-------------------- ports/icu/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/icu.json | 5 ++++ 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake index 66905dd70ea125..32c03bc5015bee 100644 --- a/ports/icu/portfile.cmake +++ b/ports/icu/portfile.cmake @@ -46,7 +46,7 @@ elseif(VCPKG_CROSSCOMPILING) endif() vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH source OPTIONS ${CONFIGURE_OPTIONS} OPTIONS_RELEASE ${CONFIGURE_OPTIONS_RELEASE} @@ -128,15 +128,15 @@ endif() vcpkg_install_make() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/share - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/lib/icu - ${CURRENT_PACKAGES_DIR}/debug/lib/icu - ${CURRENT_PACKAGES_DIR}/debug/lib/icud) + "${CURRENT_PACKAGES_DIR}/share" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/lib/icu" + "${CURRENT_PACKAGES_DIR}/debug/lib/icu" + "${CURRENT_PACKAGES_DIR}/debug/lib/icud") file(GLOB TEST_LIBS - ${CURRENT_PACKAGES_DIR}/lib/*test* - ${CURRENT_PACKAGES_DIR}/debug/lib/*test*) + "${CURRENT_PACKAGES_DIR}/lib/*test*" + "${CURRENT_PACKAGES_DIR}/debug/lib/*test*") if(TEST_LIBS) file(REMOVE ${TEST_LIBS}) endif() @@ -144,9 +144,7 @@ endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") # force U_STATIC_IMPLEMENTATION macro foreach(HEADER utypes.h utf_old.h platform.h) - file(READ ${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER} HEADER_CONTENTS) - string(REPLACE "defined(U_STATIC_IMPLEMENTATION)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER} "${HEADER_CONTENTS}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/unicode/${HEADER}" "defined(U_STATIC_IMPLEMENTATION)" "1") endforeach() endif() @@ -154,36 +152,36 @@ endif() if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) vcpkg_copy_tools( TOOL_NAMES icupkg gennorm2 gencmn genccode gensprep - SEARCH_DIR ${CURRENT_PACKAGES_DIR}/tools/icu/sbin - DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/icu/sbin" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" ) endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/tools/icu/sbin - ${CURRENT_PACKAGES_DIR}/tools/icu/debug) + "${CURRENT_PACKAGES_DIR}/tools/icu/sbin" + "${CURRENT_PACKAGES_DIR}/tools/icu/debug") # To cross compile, we need some files at specific positions. So lets copy them -file(GLOB CROSS_COMPILE_DEFS ${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/config/icucross.*) -file(INSTALL ${CROSS_COMPILE_DEFS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/config) +file(GLOB CROSS_COMPILE_DEFS "${CURRENT_BUILDTREES_DIR}/${RELEASE_TRIPLET}/config/icucross.*") +file(INSTALL ${CROSS_COMPILE_DEFS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/config") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll) - file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin) + file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll") + file(COPY ${RELEASE_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin") endif() # copy dlls if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(GLOB RELEASE_DLLS ${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll) - file(COPY ${RELEASE_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/lib/*icu*${ICU_VERSION_MAJOR}.dll") + file(COPY ${RELEASE_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(GLOB DEBUG_DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*icu*${ICU_VERSION_MAJOR}.dll) - file(COPY ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(GLOB DEBUG_DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*icu*${ICU_VERSION_MAJOR}.dll") + file(COPY ${DEBUG_DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # remove any remaining dlls in /lib -file(GLOB DUMMY_DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll) +file(GLOB DUMMY_DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll" "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll") if(DUMMY_DLLS) file(REMOVE ${DUMMY_DLLS}) endif() @@ -191,6 +189,8 @@ endif() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/icu/bin/icu-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") + # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/icu/vcpkg.json b/ports/icu/vcpkg.json index 37d08e43dc1924..990030910d1849 100644 --- a/ports/icu/vcpkg.json +++ b/ports/icu/vcpkg.json @@ -1,7 +1,7 @@ { "name": "icu", "version": "69.1", - "port-version": 15, + "port-version": 16, "description": "Mature and widely used Unicode and localization library.", "homepage": "https://icu.unicode.org/home", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index cb3505b471e1b3..b5d5b9f8a281c0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2722,7 +2722,7 @@ }, "icu": { "baseline": "69.1", - "port-version": 15 + "port-version": 16 }, "ideviceinstaller": { "baseline": "1.1.2.23", diff --git a/versions/i-/icu.json b/versions/i-/icu.json index 17f2df336b4293..a3dce8c551f9c1 100644 --- a/versions/i-/icu.json +++ b/versions/i-/icu.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "042eb68cba932ed45a95883c733406331cbaad6c", + "version": "69.1", + "port-version": 16 + }, { "git-tree": "2d08c0ceb1777074f3b31fe51e386c9ece0ca8cd", "version": "69.1", From ba15e0054d9a33a3a36bf0b7f1f1af89e7fdc652 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:50:31 +0100 Subject: [PATCH 1076/1858] [fastcgi] no absolute paths (#21272) --- ports/fastcgi/portfile.cmake | 25 +++++++++++++------------ ports/fastcgi/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/f-/fastcgi.json | 5 +++++ 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ports/fastcgi/portfile.cmake b/ports/fastcgi/portfile.cmake index eb0536ce6a420b..61d0fc839f58af 100644 --- a/ports/fastcgi/portfile.cmake +++ b/ports/fastcgi/portfile.cmake @@ -18,9 +18,9 @@ if (VCPKG_TARGET_IS_WINDOWS) CFG=debug ) - file(RENAME ${SOURCE_PATH}/include/fcgi_config_x86.h ${SOURCE_PATH}/include/fcgi_config.h) + file(RENAME "${SOURCE_PATH}/include/fcgi_config_x86.h" "${SOURCE_PATH}/include/fcgi_config.h") vcpkg_build_nmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH libfcgi PROJECT_NAME libfcgi.mak OPTIONS_RELEASE @@ -29,12 +29,12 @@ if (VCPKG_TARGET_IS_WINDOWS) "${NMAKE_OPTIONS_DBG}" ) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include DESTINATION ${CURRENT_PACKAGES_DIR}/include RENAME ${PORT}) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" DESTINATION "${CURRENT_PACKAGES_DIR}/include" RENAME ${PORT}) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") if (NOT VCPKG_CRT_LINKAGE STREQUAL static) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libfcgi/Release/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libfcgi/Debug/libfcgi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") endif() elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX @@ -47,7 +47,7 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG COPY_SOURCE ) @@ -55,14 +55,15 @@ elseif (VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Build in UNIX vcpkg_install_make() # switch ${PORT} into /${PORT} - file(RENAME ${CURRENT_PACKAGES_DIR}/include ${CURRENT_PACKAGES_DIR}/include2) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include) - file(RENAME ${CURRENT_PACKAGES_DIR}/include2 ${CURRENT_PACKAGES_DIR}/include/${PORT}) + file(RENAME "${CURRENT_PACKAGES_DIR}/include" "${CURRENT_PACKAGES_DIR}/include2") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/include") + file(RENAME "${CURRENT_PACKAGES_DIR}/include2" "${CURRENT_PACKAGES_DIR}/include/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + vcpkg_fixup_pkgconfig() else() # Other build system vcpkg_fail_port_install(ALWAYS) endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.TERMS DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.TERMS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/fastcgi/vcpkg.json b/ports/fastcgi/vcpkg.json index 83d7fa763362b2..957dcfa21551d1 100644 --- a/ports/fastcgi/vcpkg.json +++ b/ports/fastcgi/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fastcgi", - "version-string": "2020-09-11", - "port-version": 1, + "version-date": "2020-09-11", + "port-version": 2, "description": "The FastCGI interface combines the best aspects of CGI and vendor APIs. Like CGI, FastCGI applications run in separate, isolated processes.", "homepage": "https://fastcgi-archives.github.io/" } diff --git a/versions/baseline.json b/versions/baseline.json index b5d5b9f8a281c0..b2b814b0ddf70e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2098,7 +2098,7 @@ }, "fastcgi": { "baseline": "2020-09-11", - "port-version": 1 + "port-version": 2 }, "fastfeat": { "baseline": "391d5e9", diff --git a/versions/f-/fastcgi.json b/versions/f-/fastcgi.json index 8469300ffc96bb..13622e826fa8a9 100644 --- a/versions/f-/fastcgi.json +++ b/versions/f-/fastcgi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f99bded0b957390244bb1c1327dd84dbd5a43634", + "version-date": "2020-09-11", + "port-version": 2 + }, { "git-tree": "f6fb1b55b9ff65061f7be351c53397dcbdca9fa2", "version-string": "2020-09-11", From cb5a995a6de4c7606d7f269b3e35f306b9aded02 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:50:48 +0100 Subject: [PATCH 1077/1858] [libpq] no absolute paths (#21271) --- ports/libpq/portfile.cmake | 1 + ports/libpq/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libpq.json | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake index f0382f4df5e17c..811ed613e09ba4 100644 --- a/ports/libpq/portfile.cmake +++ b/ports/libpq/portfile.cmake @@ -332,3 +332,4 @@ endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json index 12c577f00f55a4..0b5ff40a5c1c27 100644 --- a/ports/libpq/vcpkg.json +++ b/ports/libpq/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libpq", "version": "12.2", - "port-version": 19, + "port-version": 20, "description": "The official database access API of postgresql", "homepage": "https://www.postgresql.org/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index b2b814b0ddf70e..1687b9e533387f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3754,7 +3754,7 @@ }, "libpq": { "baseline": "12.2", - "port-version": 19 + "port-version": 20 }, "libpqxx": { "baseline": "7.6.0", diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json index c9eb1fa794f362..af14f925114503 100644 --- a/versions/l-/libpq.json +++ b/versions/l-/libpq.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd369bc003e7ebebb688ee536065a356f1658260", + "version": "12.2", + "port-version": 20 + }, { "git-tree": "7ac8973569e75060efdb8091b83f64f429371a38", "version": "12.2", From 29210e1c68b34a46406059835384ec86abcc495c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 10 Nov 2021 19:51:16 +0100 Subject: [PATCH 1078/1858] [gperftools] no absolute paths (#21270) --- ports/gperftools/portfile.cmake | 21 +++++++++++---------- ports/gperftools/vcpkg.json | 11 +++++++++-- versions/baseline.json | 2 +- versions/g-/gperftools.json | 5 +++++ 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ports/gperftools/portfile.cmake b/ports/gperftools/portfile.cmake index 01ee219ff6877c..00b72fefc63d62 100644 --- a/ports/gperftools/portfile.cmake +++ b/ports/gperftools/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( ) if(VCPKG_TARGET_IS_WINDOWS) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") if(override IN_LIST FEATURES) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -24,22 +24,21 @@ if(VCPKG_TARGET_IS_WINDOWS) tools GPERFTOOLS_BUILD_TOOLS ) - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} ) - vcpkg_install_cmake() + vcpkg_cmake_install() vcpkg_copy_pdbs() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(GLOB gperf_public_headers ${CURRENT_PACKAGES_DIR}/include/gperftools/*.h) + file(GLOB gperf_public_headers "${CURRENT_PACKAGES_DIR}/include/gperftools/*.h") foreach(gperf_header ${gperf_public_headers}) vcpkg_replace_string(${gperf_header} "__declspec(dllimport)" "") @@ -70,14 +69,16 @@ else() endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) # https://github.com/microsoft/vcpkg/pull/8750#issuecomment-625590773 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() + + vcpkg_fixup_pkgconfig() endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/gperftools/vcpkg.json b/ports/gperftools/vcpkg.json index 8d12a9b734f4b9..6aeb5dd81d2eaf 100644 --- a/ports/gperftools/vcpkg.json +++ b/ports/gperftools/vcpkg.json @@ -1,10 +1,17 @@ { "name": "gperftools", - "version-string": "2019-09-02", - "port-version": 1, + "version-date": "2019-09-02", + "port-version": 2, "description": "A set of tools for performance profiling and memory checking", "homepage": "https://github.com/gperftools/gperftools", "supports": "!(arm | arm64 | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } + ], "features": { "override": { "description": "Override allocators" diff --git a/versions/baseline.json b/versions/baseline.json index 1687b9e533387f..a2a77e9f0682b7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2526,7 +2526,7 @@ }, "gperftools": { "baseline": "2019-09-02", - "port-version": 1 + "port-version": 2 }, "gpgme": { "baseline": "1.14.0", diff --git a/versions/g-/gperftools.json b/versions/g-/gperftools.json index 1c0987e38ae4ad..1f2a5a93258447 100644 --- a/versions/g-/gperftools.json +++ b/versions/g-/gperftools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7bf526ef5e6a6a1dfb5fa4cb6941e415b64b94b3", + "version-date": "2019-09-02", + "port-version": 2 + }, { "git-tree": "e9062481bd1f6c7f7cac6bfabe0252f862730efc", "version-string": "2019-09-02", From 8a96460b80f8413536a19c6f94c5feb96880d5b7 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:55:52 -0800 Subject: [PATCH 1079/1858] [opencv2] Fix build failure when vcpkg folder path include ++ (#21249) Co-authored-by: Cheney-Wang --- .../opencv2/fix-path-contains-++-error.patch | 49 +++++++++++++++++++ ports/opencv2/portfile.cmake | 1 + ports/opencv2/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/opencv2.json | 5 ++ 5 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 ports/opencv2/fix-path-contains-++-error.patch diff --git a/ports/opencv2/fix-path-contains-++-error.patch b/ports/opencv2/fix-path-contains-++-error.patch new file mode 100644 index 00000000000000..bb2a2a7fe665de --- /dev/null +++ b/ports/opencv2/fix-path-contains-++-error.patch @@ -0,0 +1,49 @@ +diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake +index 72df4d4..7d45974 100644 +--- a/cmake/OpenCVUtils.cmake ++++ b/cmake/OpenCVUtils.cmake +@@ -82,12 +82,42 @@ macro(ocv_check_environment_variables) + endforeach() + endmacro() + ++# check if "sub" (file or dir) is below "dir" ++function(is_subdir res dir sub ) ++ get_filename_component(dir "${dir}" ABSOLUTE) ++ get_filename_component(sub "${sub}" ABSOLUTE) ++ file(TO_CMAKE_PATH "${dir}" dir) ++ file(TO_CMAKE_PATH "${sub}" sub) ++ set(dir "${dir}/") ++ string(LENGTH "${dir}" len) ++ string(LENGTH "${sub}" len_sub) ++ if(NOT len GREATER len_sub) ++ string(SUBSTRING "${sub}" 0 ${len} prefix) ++ endif() ++ if(prefix AND prefix STREQUAL dir) ++ set(${res} TRUE PARENT_SCOPE) ++ else() ++ set(${res} FALSE PARENT_SCOPE) ++ endif() ++endfunction() ++ ++function(ocv_is_opencv_directory result_var dir) ++ set(result FALSE) ++ foreach(parent ${OpenCV_SOURCE_DIR} ${OpenCV_BINARY_DIR} ${OPENCV_EXTRA_MODULES_PATH}) ++ is_subdir(result "${parent}" "${dir}") ++ if(result) ++ break() ++ endif() ++ endforeach() ++ set(${result_var} ${result} PARENT_SCOPE) ++endfunction() ++ + # adds include directories in such a way that directories from the OpenCV source tree go first + function(ocv_include_directories) + set(__add_before "") + foreach(dir ${ARGN}) +- get_filename_component(__abs_dir "${dir}" ABSOLUTE) +- if("${__abs_dir}" MATCHES "^${OpenCV_SOURCE_DIR}" OR "${__abs_dir}" MATCHES "^${OpenCV_BINARY_DIR}") ++ ocv_is_opencv_directory(__is_opencv_dir "${dir}") ++ if(__is_opencv_dir) + list(APPEND __add_before "${dir}") + elseif(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND + dir MATCHES "/usr/include$") diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index bc6805f48ac63e..cbd4c319fb0f83 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -26,6 +26,7 @@ vcpkg_from_github( 0003-force-package-requirements.patch 0004-add-ffmpeg-missing-defines.patch 0005-fix-cuda.patch + fix-path-contains-++-error.patch ) file(REMOVE "${SOURCE_PATH}/cmake/FindCUDA.cmake") diff --git a/ports/opencv2/vcpkg.json b/ports/opencv2/vcpkg.json index db74a35649dbe3..f12dc20029c1c0 100644 --- a/ports/opencv2/vcpkg.json +++ b/ports/opencv2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv2", "version": "2.4.13.7", - "port-version": 6, + "port-version": 7, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a2a77e9f0682b7..b5f34e4d132038 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4890,7 +4890,7 @@ }, "opencv2": { "baseline": "2.4.13.7", - "port-version": 6 + "port-version": 7 }, "opencv3": { "baseline": "3.4.15", diff --git a/versions/o-/opencv2.json b/versions/o-/opencv2.json index d983d361d982bf..4edfbc549a7903 100644 --- a/versions/o-/opencv2.json +++ b/versions/o-/opencv2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d6ccb4fb79829bcf58dd79950529d7086d6b277c", + "version": "2.4.13.7", + "port-version": 7 + }, { "git-tree": "e85a45aa17a47da9f965b93cb0c6fc8273a7ca04", "version": "2.4.13.7", From 1ffc765fd5be1cbec2bf5e744ab5fc843865d4fa Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Wed, 10 Nov 2021 14:07:00 -0800 Subject: [PATCH 1080/1858] Update VMs for November Patch Tuesday (#21309) * Apply VM updates for: * https://github.com/microsoft/vcpkg/pull/13994 * https://github.com/microsoft/vcpkg/pull/20654 * https://github.com/microsoft/vcpkg/pull/20938 * Be more defensive in AzVmRunCommandWithRetries. * Update Pools. --- scripts/azure-pipelines/azure-pipelines.yml | 4 +-- .../azure-pipelines/create-vmss-helpers.psm1 | 26 +++++++++++-------- .../azure-pipelines/linux/provision-image.sh | 9 +++++++ 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index 2381887f4e1b9e..a4ac11d5679e60 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -2,8 +2,8 @@ # SPDX-License-Identifier: MIT # variables: - windows-pool: 'PrWin-2021-10-13' - linux-pool: 'PrLin-2021-10-13' + windows-pool: 'PrWin-2021-11-10' + linux-pool: 'PrLin-2021-11-10' osx-pool: 'PrOsx-2021-07-27' jobs: diff --git a/scripts/azure-pipelines/create-vmss-helpers.psm1 b/scripts/azure-pipelines/create-vmss-helpers.psm1 index b7d862cf80e8d7..8ebe8070ef7127 100755 --- a/scripts/azure-pipelines/create-vmss-helpers.psm1 +++ b/scripts/azure-pipelines/create-vmss-helpers.psm1 @@ -321,22 +321,26 @@ function Create-LockedDownNetwork { } function Invoke-AzVMRunCommandWithRetries { - try { - return Invoke-AzVMRunCommand @args - } catch { - for ($idx = 0; $idx -lt 5; $idx++) { + $result = $null + $success = $false + $attempt = 0 + while ($success -eq $false) { + try { + ++$attempt + Write-Host "Command attempt $attempt..." + $result = Invoke-AzVMRunCommand @args + $success = $true + } catch { Write-Host "Running command failed. $_ Retrying after 10 seconds..." Start-Sleep -Seconds 10 - try { - return Invoke-AzVMRunCommand @args - } catch { - # ignore + if ($attempt -eq 5) { + Write-Error "Running command failed too many times. Giving up!" + throw $_ } } - - Write-Host "Running command failed too many times. Giving up!" - throw $_ } + + return $result } Export-ModuleMember -Function Find-ResourceGroupName diff --git a/scripts/azure-pipelines/linux/provision-image.sh b/scripts/azure-pipelines/linux/provision-image.sh index 942952f0997fe4..4b1910e885a046 100755 --- a/scripts/azure-pipelines/linux/provision-image.sh +++ b/scripts/azure-pipelines/linux/provision-image.sh @@ -48,6 +48,15 @@ APT_PACKAGES="$APT_PACKAGES libwayland-dev" # Additionally required by all GN projects APT_PACKAGES="$APT_PACKAGES python2 python-is-python3" +# Additionally required by libctl +APT_PACKAGES="$APT_PACKAGES guile-2.2-dev" + +# Additionally required by gtk +APT_PACKAGES="$APT_PACKAGES libxdamage-dev" + +# Additionally required by kf5kio +APT_PACKAGES="$APT_PACKAGES libmount-dev" + # Additionally required/installed by Azure DevOps Scale Set Agents APT_PACKAGES="$APT_PACKAGES liblttng-ust0 libkrb5-3 zlib1g libicu66" From 8579d892aac6acd6c14071136c1b728bb273e89b Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 10 Nov 2021 23:54:19 +0100 Subject: [PATCH 1081/1858] [libgeotiff] Update to 1.7.0, revise features and config (#21253) * Update to 1.7.0 * Refresh patches, drop fix-proj4.patch * Restore GeoTIFF cmake package name (reverts #15750) * Add usage (reason: #15723) * Remove zlib dependency, transitive usage only * Move tools to optional feature * Modernize portfile, fix copyright * Don't install doc and man files * Trim main patch * Allow reduced tiff dependencies * Update versions * Remove libgeotiff uwp failure from CI baseline * Update GeoTIFF in gdal wrapper * Update versions * Update GeoTIFF in pdal config * Update versions * Switch to 'version' field * Update versions --- ports/gdal/vcpkg-cmake-wrapper.cmake | 2 +- ports/gdal/vcpkg.json | 2 +- ports/libgeotiff/cmakelists.patch | 44 +--------------------- ports/libgeotiff/fix-config-version.patch | 21 ----------- ports/libgeotiff/fix-proj4.patch | 32 ---------------- ports/libgeotiff/fix-staticbuild.patch | 15 +++----- ports/libgeotiff/geotiff-config.patch | 29 +++++++-------- ports/libgeotiff/portfile.cmake | 45 +++++++++++------------ ports/libgeotiff/skip-doc-install.patch | 20 ++++++++++ ports/libgeotiff/usage | 5 +++ ports/libgeotiff/vcpkg.json | 30 +++++++++++---- ports/liblas/fix-geotiff.patch | 25 ------------- ports/liblas/portfile.cmake | 1 - ports/liblas/vcpkg.json | 4 +- ports/pdal/fix-dependency.patch | 2 +- ports/pdal/geotiff.patch | 15 -------- ports/pdal/portfile.cmake | 1 - ports/pdal/vcpkg.json | 4 +- scripts/ci.baseline.txt | 2 - versions/baseline.json | 10 ++--- versions/g-/gdal.json | 5 +++ versions/l-/libgeotiff.json | 5 +++ versions/l-/liblas.json | 5 +++ versions/p-/pdal.json | 5 +++ 24 files changed, 122 insertions(+), 207 deletions(-) delete mode 100644 ports/libgeotiff/fix-config-version.patch delete mode 100644 ports/libgeotiff/fix-proj4.patch create mode 100644 ports/libgeotiff/skip-doc-install.patch create mode 100644 ports/libgeotiff/usage delete mode 100644 ports/liblas/fix-geotiff.patch delete mode 100644 ports/pdal/geotiff.patch diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 645118c349077b..772f5b9c530b96 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -85,7 +85,7 @@ if(GDAL_FOUND) if(NOT WIN32) _gdal_add_dependency(json-c::json-c json-c CONFIG) endif() - _gdal_add_dependency(geotiff_library geotiff CONFIG) + _gdal_add_dependency(geotiff_library GeoTIFF CONFIG) _gdal_add_dependency(JPEG::JPEG JPEG) _gdal_add_dependency(liblzma::liblzma liblzma CONFIG) _gdal_add_dependency(png libpng CONFIG) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 676590760c73f8..c20d97c3f1a8b0 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.3.2", - "port-version": 3, + "port-version": 4, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!arm", diff --git a/ports/libgeotiff/cmakelists.patch b/ports/libgeotiff/cmakelists.patch index 169ca0bc8dc930..472ab6f7eb9686 100644 --- a/ports/libgeotiff/cmakelists.patch +++ b/ports/libgeotiff/cmakelists.patch @@ -1,49 +1,7 @@ -diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt -index 43113fa..46331ad 100644 ---- a/libgeotiff/CMakeLists.txt -+++ b/libgeotiff/CMakeLists.txt -@@ -172,6 +172,7 @@ IF(WITH_TIFF) - endif () - - IF(TIFF_FOUND) -+ IF (0) - # Confirm required API is available - INCLUDE(CheckFunctionExists) - SET(CMAKE_REQUIRED_LIBRARIES ${TIFF_LIBRARIES}) -@@ -187,6 +188,7 @@ IF(WITH_TIFF) - SET(TIFF_FOUND) # ReSET to NOT found for TIFF library - MESSAGE(FATAL_ERROR "Failed to link with libtiff - TIFFMergeFieldInfo function not found. libtiff 3.6.0 Beta or later required. Please upgrade or use an older version of libgeotiff") - ENDIF() -+ ENDIF() - - INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) - ADD_DEFINITIONS(-DHAVE_TIFF=1) -@@ -298,11 +300,6 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1) - # INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR}) - INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include) - --############################################################################### --# Build libxtiff library -- --ADD_SUBDIRECTORY(libxtiff) -- - ############################################################################### - # Build libgeotiff library - diff --git a/libgeotiff/bin/CMakeLists.txt b/libgeotiff/bin/CMakeLists.txt index 7b12341..b6b1d0c 100644 --- a/libgeotiff/bin/CMakeLists.txt +++ b/libgeotiff/bin/CMakeLists.txt -@@ -6,9 +6,6 @@ - # - ############################################################################### - --INCLUDE_DIRECTORIES( -- . -- ${CMAKE_SOURCE_DIR}) - - IF(WIN32 AND MSVC) - SET(GETOPT_SOURCE getopt.c) @@ -22,12 +19,11 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build") FOREACH(utility ${GEOTIFF_UTILITIES}) @@ -75,7 +33,7 @@ index 47a2b00..3809ba3 100644 set (PROJECT_ROOT_DIR "..") endif () +else() -+ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME_LOWER}") ++ set (INSTALL_CMAKE_DIR "share/${PROJECT_NAME}") + set (PROJECT_ROOT_DIR "../..") +endif() diff --git a/ports/libgeotiff/fix-config-version.patch b/ports/libgeotiff/fix-config-version.patch deleted file mode 100644 index 173f483d176e64..00000000000000 --- a/ports/libgeotiff/fix-config-version.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libgeotiff/cmake/project-config-version.cmake.in b/libgeotiff/cmake/project-config-version.cmake.in -index d695aa2..efe32ba 100644 ---- a/libgeotiff/cmake/project-config-version.cmake.in -+++ b/libgeotiff/cmake/project-config-version.cmake.in -@@ -5,14 +5,14 @@ set (PACKAGE_VERSION_MAJOR "@PROJECT_VERSION_MAJOR@") - set (PACKAGE_VERSION_MINOR "@PROJECT_VERSION_MINOR@") - set (PACKAGE_VERSION_PATCH "@PROJECT_VERSION_PATCH@") - --if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME@") -+if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME_LOWER@") - # Check package name (in particular, because of the way cmake finds - # package config files, the capitalization could easily be "wrong"). - # This is necessary to ensure that the automatically generated - # variables, e.g., _FOUND, are consistently spelled. Make - # this a WARNING, because this is a user error that needs to be fixed. - message (WARNING -- "Mismatched package names: use find_package(@PROJECT_NAME@ ...) instead" -+ "Mismatched package names: use find_package(@PROJECT_NAME_LOWER@ ...) instead" - " of find_package(${PACKAGE_FIND_NAME} ...)") - set (PACKAGE_VERSION_UNSUITABLE TRUE) - elseif (NOT (APPLE OR CMAKE_SIZEOF_VOID_P EQUAL @CMAKE_SIZEOF_VOID_P@)) diff --git a/ports/libgeotiff/fix-proj4.patch b/ports/libgeotiff/fix-proj4.patch deleted file mode 100644 index 15960400fb54d7..00000000000000 --- a/ports/libgeotiff/fix-proj4.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt -index 46331ad..80fe121 100644 ---- a/libgeotiff/CMakeLists.txt -+++ b/libgeotiff/CMakeLists.txt -@@ -122,13 +122,14 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/libxtiff) - # TIFF support - required, default=ON - SET(WITH_TIFF TRUE CACHE BOOL "Choose if TIFF support should be built") - --FIND_PACKAGE(PROJ NO_MODULE QUIET) --if (NOT PROJ_FOUND) -+FIND_PACKAGE(PROJ4 CONFIG REQUIRED) -+if (NOT PROJ4_FOUND) - FIND_PACKAGE(PROJ) - endif () - --IF(PROJ_FOUND) -- INCLUDE_DIRECTORIES(${PROJ_INCLUDE_DIR}) -+IF(PROJ4_FOUND) -+ INCLUDE_DIRECTORIES(${PROJ4_INCLUDE_DIRS}) -+ ADD_DEFINITIONS(-DHAVE_LIBPROJ=1 -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1) - ELSE() - MESSAGE(FATAL_ERROR "Failed to detect PROJ >= 6") - ENDIF() -@@ -361,7 +362,7 @@ SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES - - TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_TARGET} - ${TIFF_LIBRARIES} -- ${PROJ_LIBRARIES} -+ ${PROJ4_LIBRARIES} - ${ZLIB_LIBRARIES} - ${JPEG_LIBRARIES}) - diff --git a/ports/libgeotiff/fix-staticbuild.patch b/ports/libgeotiff/fix-staticbuild.patch index 3090753559ed1a..5b47a5daba7842 100644 --- a/ports/libgeotiff/fix-staticbuild.patch +++ b/ports/libgeotiff/fix-staticbuild.patch @@ -1,19 +1,16 @@ diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt -index 80fe121..5c1430d 100644 +index b4a3cee..fd9f0a5 100644 --- a/libgeotiff/CMakeLists.txt +++ b/libgeotiff/CMakeLists.txt -@@ -80,8 +80,12 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) +@@ -80,7 +80,11 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) IF(WIN32) IF(MSVC) -- ADD_DEFINITIONS(-DBUILD_AS_DLL=1) -- ADD_DEFINITIONS(/DW4) + IF(BUILD_SHARED_LIBS) -+ ADD_DEFINITIONS(-DBUILD_AS_DLL=1) + ADD_DEFINITIONS(-DBUILD_AS_DLL=1) + ELSE() -+ ADD_DEFINITIONS(-DBUILD_AS_DLL=0) -+ ENDIF() -+ ADD_DEFINITIONS(/DW4) ++ ADD_DEFINITIONS(-DBUILD_AS_DLL=0) ++ ENDIF() + ADD_DEFINITIONS(/DW4) if (NOT (MSVC_VERSION VERSION_LESS 1400)) ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) - ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) diff --git a/ports/libgeotiff/geotiff-config.patch b/ports/libgeotiff/geotiff-config.patch index d5c6cca205b70b..59a9b4947ee52d 100644 --- a/ports/libgeotiff/geotiff-config.patch +++ b/ports/libgeotiff/geotiff-config.patch @@ -1,17 +1,14 @@ -diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in -index 0dd376aca..0615081bd 100644 ---- a/libgeotiff/cmake/project-config.cmake.in +diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in +index dc5b999..2ce07fd 100644 +--- a/libgeotiff/cmake/project-config.cmake.in +++ b/libgeotiff/cmake/project-config.cmake.in -@@ -23,6 +23,12 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") - message (STATUS - "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}") - -+#Find dependencies -+if(@WITH_PROJ4@) -+ include(CMakeFindDependencyMacro) -+ find_dependency(PROJ4) -+endif() -+ - # Tell the user project where to find our headers and libraries - get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) - get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE) +@@ -23,6 +23,9 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}") + message (STATUS + "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}") + ++include(CMakeFindDependencyMacro) ++find_dependency(PROJ) ++ + # Tell the user project where to find our headers and libraries + get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) + get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE) diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index deba3b12b04fe1..4cd525fa35f505 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -1,49 +1,48 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/libgeotiff - REF 8b1a8f52bc909f86e04ceadd699db102208074a2 #v1.6.0 - SHA512 41715d6a416307a93b2f95874c00ed27c3a0450d70311e77ed45f7ff477bd85f4a69b549bde01dfb9412a62a482467222fc8ed398478e2829e4d112012aab852 + REF 7da5bacae7814c65ebb78f0b64e1141fbcb3de1e #v1.7.0 + SHA512 36047778fbbb4a533a7b65e7b32ab8c0955f59b95417b68b68e7ddd398191445e730e00271756213bf657cbf7cd5eb028b25d4b0741e5b309c78c207b4ec01c6 HEAD_REF master PATCHES cmakelists.patch geotiff-config.patch - fix-proj4.patch fix-staticbuild.patch - fix-config-version.patch + skip-doc-install.patch ) -set(SOURCE_PATH ${SOURCE_PATH}/libgeotiff) - -# Delete FindPROJ4.cmake -file(REMOVE ${SOURCE_PATH}/cmake/FindPROJ4.cmake) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + tools WITH_JPEG + tools WITH_UTILITIES +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/libgeotiff" OPTIONS -DGEOTIFF_BIN_SUBDIR=bin -DGEOTIFF_DATA_SUBDIR=share -DWITH_TIFF=1 - -DWITH_PROJ4=1 - -DWITH_ZLIB=1 - -DWITH_JPEG=1 - -DWITH_UTILITIES=1 + -DHAVE_TIFFOPEN=1 + -DHAVE_TIFFMERGEFIELDINFO=1 -DCMAKE_MACOSX_BUNDLE=0 + ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_copy_tools(TOOL_NAMES applygeo geotifcp listgeo makegeo AUTO_CLEAN) +if(WITH_UTILITIES) + vcpkg_copy_tools(TOOL_NAMES applygeo geotifcp listgeo makegeo AUTO_CLEAN) +endif() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/geotiff TARGET_PATH share/geotiff) +vcpkg_cmake_config_fixup(PACKAGE_NAME GeoTIFF) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/geotiff/geotiff-config.cmake "if (GeoTIFF_USE_STATIC_LIBS)" "if (1)") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/GeoTIFF/geotiff-config.cmake" "if (GeoTIFF_USE_STATIC_LIBS)" "if (1)") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/doc ${CURRENT_PACKAGES_DIR}/debug/share) - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/libgeotiff/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libgeotiff/skip-doc-install.patch b/ports/libgeotiff/skip-doc-install.patch new file mode 100644 index 00000000000000..9430751f649c00 --- /dev/null +++ b/ports/libgeotiff/skip-doc-install.patch @@ -0,0 +1,20 @@ +diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt +index b4a3cee..f838a36 100644 +--- a/libgeotiff/CMakeLists.txt ++++ b/libgeotiff/CMakeLists.txt +@@ -286,6 +286,7 @@ SET(GEOTIFF_LIB_DIR ${GEOTIFF_LIB_SUBDIR}) + SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUDE_SUBDIR}) + SET(GEOTIFF_DATA_DIR ${GEOTIFF_DATA_SUBDIR}) + ++if(0) + # Install doc files + INSTALL(FILES + AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN +@@ -294,6 +295,7 @@ INSTALL(FILES + + # Install man pages + INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTINATION share/man/man1) ++endif() + + + # Install header files for development distribution diff --git a/ports/libgeotiff/usage b/ports/libgeotiff/usage new file mode 100644 index 00000000000000..df014cb55f1bb2 --- /dev/null +++ b/ports/libgeotiff/usage @@ -0,0 +1,5 @@ +The package libgeotiff provides a CMake config file: + + find_package(GeoTIFF CONFIG REQUIRED) + target_include_directories(main PRIVATE ${GEOTIFF_INCLUDE_DIR}) + target_link_libraries(main PRIVATE ${GEOTIFF_LIBRARIES}) diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json index 86ecc9b1ec7ede..ec7a39eb07d484 100644 --- a/ports/libgeotiff/vcpkg.json +++ b/ports/libgeotiff/vcpkg.json @@ -1,13 +1,29 @@ { "name": "libgeotiff", - "version-string": "1.6.0", - "port-version": 4, - "description": "Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags.", + "version": "1.7.0", + "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.", "homepage": "https://github.com/OSGeo/libgeotiff", "dependencies": [ - "libjpeg-turbo", "proj4", - "tiff", - "zlib" - ] + { + "name": "tiff", + "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Install libgeotiff utility programs", + "dependencies": [ + "libjpeg-turbo" + ] + } + } } diff --git a/ports/liblas/fix-geotiff.patch b/ports/liblas/fix-geotiff.patch deleted file mode 100644 index 360aec7ef44a99..00000000000000 --- a/ports/liblas/fix-geotiff.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d246a88..d0bba6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -248,7 +248,7 @@ endif() - # GeoTIFF support - required, default=ON - set(WITH_GEOTIFF TRUE CACHE BOOL "Choose if GeoTIFF support should be built") - --find_package (GeoTIFF 1.3.0 ) -+find_package (geotiff CONFIG REQUIRED) - if(GEOTIFF_FOUND) - set(WITH_GEOTIFF TRUE) - # Confirm required API is available -diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt -index beb83e2..650bc0c 100644 ---- a/apps/CMakeLists.txt -+++ b/apps/CMakeLists.txt -@@ -168,7 +168,6 @@ if(UNIX) - set (LIBLAS_UTILS_RPATH ${LIBLAS_UTILS_RPATH} ${LASZIP_LIBRARY_DIRS}) - endif() - if(GEOTIFF_FOUND) -- get_filename_component(GEOTIFF_LIBRARY_DIRS ${GEOTIFF_LIBRARY} PATH) - set (LIBLAS_UTILS_RPATH ${LIBLAS_UTILS_RPATH} ${GEOTIFF_LIBRARY_DIRS}) - endif() - if(GDAL_FOUND) diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake index 4f102ec831a15d..a50ede2f61d2f8 100644 --- a/ports/liblas/portfile.cmake +++ b/ports/liblas/portfile.cmake @@ -12,7 +12,6 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH PATCHES fix-boost-headers.patch - fix-geotiff.patch ) file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake) diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json index 3971b29d4c70a7..049580bde09398 100644 --- a/ports/liblas/vcpkg.json +++ b/ports/liblas/vcpkg.json @@ -1,7 +1,7 @@ { "name": "liblas", - "version-string": "1.8.1", - "port-version": 8, + "version": "1.8.1", + "port-version": 9, "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.", "dependencies": [ "boost-detail", diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch index ea2bcf8f844bd9..352eb1d43f1b17 100644 --- a/ports/pdal/fix-dependency.patch +++ b/ports/pdal/fix-dependency.patch @@ -53,7 +53,7 @@ index a03ef14..9d073e6 100644 endforeach(_dir) +include(CMakeFindDependencyMacro) -+find_dependency(geotiff) ++find_dependency(GeoTIFF) +find_dependency(CURL) +find_dependency(Boost COMPONENTS system filesystem) +find_dependency(geos CONFIG) diff --git a/ports/pdal/geotiff.patch b/ports/pdal/geotiff.patch deleted file mode 100644 index 00e376583d34b0..00000000000000 --- a/ports/pdal/geotiff.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/geotiff.cmake b/cmake/geotiff.cmake -index 1d1e8af..ec077bc 100644 ---- a/cmake/geotiff.cmake -+++ b/cmake/geotiff.cmake -@@ -2,8 +2,8 @@ - # GeoTIFF support - # - --find_package(GeoTIFF REQUIRED 1.3.0) --set_package_properties(GeoTIFF PROPERTIES TYPE REQUIRED) -+find_package(geotiff REQUIRED 1.3.0) -+set_package_properties(geotiff PROPERTIES TYPE REQUIRED) - if (GEOTIFF_FOUND) - include_directories("${GEOTIFF_INCLUDE_DIR}") - set(PDAL_HAVE_LIBGEOTIFF 1) diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake index 18d27a4c4b1cd2..4fbabc1f0f7bae 100644 --- a/ports/pdal/portfile.cmake +++ b/ports/pdal/portfile.cmake @@ -17,7 +17,6 @@ vcpkg_extract_source_archive_ex( libpq.patch fix-CPL_DLL.patch 0004-fix-const-overloaded.patch - geotiff.patch ) file(REMOVE "${SOURCE_PATH}/pdal/gitsha.cpp") diff --git a/ports/pdal/vcpkg.json b/ports/pdal/vcpkg.json index cdcbd4e7c22865..93d9cb70e9aae5 100644 --- a/ports/pdal/vcpkg.json +++ b/ports/pdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pdal", - "version-string": "1.7.1", - "port-version": 12, + "version": "1.7.1", + "port-version": 13, "description": "PDAL - Point Data Abstraction Library is a library for manipulating point cloud data.", "dependencies": [ "boost-filesystem", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 65af43f105327f..bbcb9d010a8a1d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -527,8 +527,6 @@ libcds:arm-uwp=fail libcds:x64-uwp=fail libcopp:arm64-windows=fail libcopp:arm-uwp=fail -libgeotiff:arm-uwp=fail -libgeotiff:x64-uwp=fail # Missing system libraries on linux to run/prepare autoconf libgpod:x64-linux=fail libgpod:x64-osx=fail diff --git a/versions/baseline.json b/versions/baseline.json index b5f34e4d132038..e4ed8e1515d4d6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2354,7 +2354,7 @@ }, "gdal": { "baseline": "3.3.2", - "port-version": 3 + "port-version": 4 }, "gdcm": { "baseline": "3.0.7", @@ -3449,8 +3449,8 @@ "port-version": 1 }, "libgeotiff": { - "baseline": "1.6.0", - "port-version": 4 + "baseline": "1.7.0", + "port-version": 0 }, "libgit2": { "baseline": "1.3.0", @@ -3566,7 +3566,7 @@ }, "liblas": { "baseline": "1.8.1", - "port-version": 8 + "port-version": 9 }, "liblbfgs": { "baseline": "1.10", @@ -5138,7 +5138,7 @@ }, "pdal": { "baseline": "1.7.1", - "port-version": 12 + "port-version": 13 }, "pdal-c": { "baseline": "1.8", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 47900288a77ea3..7f2784588f3ec7 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9ec2540fda2dfe657e004b70d5ca5a1cc7a2db8", + "version-semver": "3.3.2", + "port-version": 4 + }, { "git-tree": "5173c609fafae13d948b1417064517be5bd78c7f", "version-semver": "3.3.2", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index 2e1676ecd64f35..a7ca72e9aa9a0c 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f68bbf7c0472548573a69d1e41801edb1179c028", + "version": "1.7.0", + "port-version": 0 + }, { "git-tree": "2211c53755bff618e685ac712f96ee381d2ba6a6", "version-string": "1.6.0", diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json index f4b29132b1a95c..547d1f6321b2c9 100644 --- a/versions/l-/liblas.json +++ b/versions/l-/liblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005", + "version": "1.8.1", + "port-version": 9 + }, { "git-tree": "cab66222be9c25d617f6da9160ca930e0cb069dd", "version-string": "1.8.1", diff --git a/versions/p-/pdal.json b/versions/p-/pdal.json index 72d421df34d342..65cfa4505309ab 100644 --- a/versions/p-/pdal.json +++ b/versions/p-/pdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11280c0564220eb3e82eae1c596843daf5b79294", + "version": "1.7.1", + "port-version": 13 + }, { "git-tree": "836e512e2335367a76bc44197f3140c802897154", "version-string": "1.7.1", From e4d886f1edde89b31d1a2ca2dfb69270543aaf3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Thu, 11 Nov 2021 03:13:48 +0100 Subject: [PATCH 1082/1858] [qt] Fix missing Cocoa include (#21056) * [qt] Fix missing Cocoa include Fixes both Qt6 and Qt5 ports. Applies patch from: https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 Fixes #21055 * [qt] Update versions --- ports/qt5-base/patches/cocoa.patch | 12 ++++++++++++ ports/qt5-base/portfile.cmake | 1 + ports/qt5-base/vcpkg.json | 2 +- ports/qtbase/cocoa.patch | 15 +++++++++++++++ ports/qtbase/portfile.cmake | 1 + ports/qtbase/vcpkg.json | 1 + versions/baseline.json | 4 ++-- versions/q-/qt5-base.json | 5 +++++ versions/q-/qtbase.json | 5 +++++ 9 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 ports/qt5-base/patches/cocoa.patch create mode 100644 ports/qtbase/cocoa.patch diff --git a/ports/qt5-base/patches/cocoa.patch b/ports/qt5-base/patches/cocoa.patch new file mode 100644 index 00000000000000..242c38c861acac --- /dev/null +++ b/ports/qt5-base/patches/cocoa.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +index e070ba97..07c75b04 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +@@ -40,6 +40,7 @@ + #ifndef QIOSURFACEGRAPHICSBUFFER_H + #define QIOSURFACEGRAPHICSBUFFER_H + ++#include + #include + #include + diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 455f1ed7eab5bc..4b11ecc75c9310 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -81,6 +81,7 @@ qt_download_submodule( OUT_SOURCE_PATH SOURCE_PATH patches/zstdd.patch #Fix detection of zstd in debug builds patches/mysql_plugin_include.patch #Fix include path of mysql plugin patches/mysql-configure.patch #Fix mysql project + patches/cocoa.patch #Fix missing include on macOS Monterrey, https://code.qt.io/cgit/qt/qtbase.git/commit/src/plugins/platforms/cocoa?id=dece6f5840463ae2ddf927d65eb1b3680e34a547 #patches/static_opengl.patch #Use this patch if you really want to statically link angle on windows (e.g. using -opengl es2 and -static). #Be carefull since it requires definining _GDI32_ for all dependent projects due to redefinition errors in the #the windows supplied gl.h header and the angle gl.h otherwise. diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index 4879f807d65de4..8c166a84fb5e6d 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-semver": "5.15.2", - "port-version": 13, + "port-version": 14, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtbase/cocoa.patch b/ports/qtbase/cocoa.patch new file mode 100644 index 00000000000000..7242ff9ee38540 --- /dev/null +++ b/ports/qtbase/cocoa.patch @@ -0,0 +1,15 @@ +diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +index 5d4b6d6a71..cc7193d8b7 100644 +--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h ++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h +@@ -43,6 +43,7 @@ + #include + #include + ++#include + #include + + QT_BEGIN_NAMESPACE +-- +cgit v1.2.1 + diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index 60a2472544a5c2..12233c0e5e1f23 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -17,6 +17,7 @@ set(${PORT}_PATCHES fix_cmake_build.patch harfbuzz.patch fix_egl.patch + cocoa.patch ) if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 262eb9b46e3abe..a89e7b5bad1f25 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,7 @@ { "name": "qtbase", "version-semver": "6.2.1", + "port-version": 1, "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e4ed8e1515d4d6..1ff8371dacf831 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5470,7 +5470,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 13 + "port-version": 14 }, "qt5-canvas3d": { "baseline": "0", @@ -5638,7 +5638,7 @@ }, "qtbase": { "baseline": "6.2.1", - "port-version": 0 + "port-version": 1 }, "qtcharts": { "baseline": "6.2.1", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index e747601e08f901..88c2f42f1b28cb 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e5756de068474651dc8ee50fb14be3d4c236b05", + "version-semver": "5.15.2", + "port-version": 14 + }, { "git-tree": "d0254baec079c6226b73cc7580e7724cad98648c", "version-semver": "5.15.2", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index db37fe275f92d8..bdef4075f17e76 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "700e8c2e47b2d044d1623ea5062e15ac6cc9a970", + "version-semver": "6.2.1", + "port-version": 1 + }, { "git-tree": "85405a7d213571f8da152112d436292099c5a4ab", "version-semver": "6.2.1", From d08b759f26ddcae887b1371fccd119dc6d117eeb Mon Sep 17 00:00:00 2001 From: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Date: Wed, 10 Nov 2021 22:13:22 -0800 Subject: [PATCH 1083/1858] [scripts-audit] vcpkg_find_acquire_program (#21173) --- .../maintainers/vcpkg_find_acquire_program.md | 4 +- .../cmake/vcpkg_find_acquire_program.cmake | 1120 +++++++++-------- 2 files changed, 599 insertions(+), 525 deletions(-) diff --git a/docs/maintainers/vcpkg_find_acquire_program.md b/docs/maintainers/vcpkg_find_acquire_program.md index fe23d4e5dbb79d..1e8a9b8bb8578c 100644 --- a/docs/maintainers/vcpkg_find_acquire_program.md +++ b/docs/maintainers/vcpkg_find_acquire_program.md @@ -6,10 +6,10 @@ Download or find a well-known tool. ## Usage ```cmake -vcpkg_find_acquire_program() +vcpkg_find_acquire_program() ``` ## Parameters -### VAR +### program This variable specifies both the program to be acquired as well as the out parameter that will be set to the path of the program executable. ## Notes diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 4fa7782e529231..89f03fc286f64a 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -5,10 +5,10 @@ Download or find a well-known tool. ## Usage ```cmake -vcpkg_find_acquire_program() +vcpkg_find_acquire_program() ``` ## Parameters -### VAR +### program This variable specifies both the program to be acquired as well as the out parameter that will be set to the path of the program executable. ## Notes @@ -47,560 +47,634 @@ Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_ac * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake) #]===] -include(vcpkg_execute_in_download_mode) - -function(vcpkg_find_acquire_program VAR) - set(EXPANDED_VAR ${${VAR}}) - if(EXPANDED_VAR) - return() - endif() - - unset(NOEXTRACT) - unset(_vfa_RENAME) - unset(SUBDIR) - unset(PROG_PATH_SUBDIR) - unset(REQUIRED_INTERPRETER) - unset(_vfa_SUPPORTED) - unset(POST_INSTALL_COMMAND) - unset(PATHS) - - if(VAR MATCHES "PERL") - set(PROGNAME perl) - set(PERL_VERSION 5.32.1.1) - set(SUBDIR ${PERL_VERSION}) - set(PATHS ${DOWNLOADS}/tools/perl/${SUBDIR}/perl/bin) - set(BREW_PACKAGE_NAME "perl") - set(APT_PACKAGE_NAME "perl") - set(URL - "https://strawberryperl.com/download/${PERL_VERSION}/strawberry-perl-${PERL_VERSION}-32bit.zip" +function(z_vcpkg_find_acquire_program_version_check out_var) + cmake_parse_arguments(PARSE_ARGV 1 arg + "" + "MIN_VERSION;PROGRAM_NAME" + "COMMAND" ) - set(ARCHIVE "strawberry-perl-${PERL_VERSION}-32bit.zip") - set(HASH 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9) - elseif(VAR MATCHES "NASM") - set(PROGNAME nasm) - set(NASM_VERSION 2.15.05) - set(PATHS ${DOWNLOADS}/tools/nasm/nasm-${NASM_VERSION}) - set(BREW_PACKAGE_NAME "nasm") - set(APT_PACKAGE_NAME "nasm") - set(URL - "https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/win32/nasm-${NASM_VERSION}-win32.zip" - "https://fossies.org/windows/misc/nasm-${NASM_VERSION}-win32.zip" + vcpkg_execute_in_download_mode( + COMMAND ${arg_COMMAND} + WORKING_DIRECTORY "${VCPKG_ROOT_DIR}" + OUTPUT_VARIABLE program_version_output ) - set(ARCHIVE "nasm-${NASM_VERSION}-win32.zip") - set(HASH 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed) - elseif(VAR MATCHES "YASM") - set(PROGNAME yasm) - set(YASM_VERSION 1.3.0.6.g1962) - set(SUBDIR 1.3.0.6) - set(BREW_PACKAGE_NAME "yasm") - set(APT_PACKAGE_NAME "yasm") - set(URL "https://www.tortall.net/projects/yasm/snapshots/v${YASM_VERSION}/yasm-${YASM_VERSION}.exe") - set(ARCHIVE "yasm-${YASM_VERSION}.exe") - set(_vfa_RENAME "yasm.exe") - set(NOEXTRACT ON) - set(HASH c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) - elseif(VAR MATCHES "GIT") - set(PROGNAME git) - if(CMAKE_HOST_WIN32) - set(GIT_BASE_VERSION 2.32.0) - set(GIT_VERSION 2.32.0.2) - set(SUBDIR "git-${GIT_VERSION}-2-windows") - set(URL "https://github.com/git-for-windows/git/releases/download/v${GIT_BASE_VERSION}.windows.2/PortableGit-${GIT_VERSION}-32-bit.7z.exe") - set(ARCHIVE "PortableGit-${GIT_VERSION}-32-bit.7z.exe") - set(HASH 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348) - set(PATHS - "${DOWNLOADS}/tools/${SUBDIR}/mingw32/bin" - "${DOWNLOADS}/tools/git/${SUBDIR}/mingw32/bin") - else() - set(BREW_PACKAGE_NAME "git") - set(APT_PACKAGE_NAME "git") - endif() - elseif(VAR MATCHES "GN") - set(PROGNAME gn) - set(_vfa_RENAME "gn") - set(CIPD_DOWNLOAD_GN "https://chrome-infra-packages.appspot.com/dl/gn/gn") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(_vfa_SUPPORTED ON) - set(GN_VERSION "xus7xtaPhpv5vCmKFOnsBVoB-PKmhZvRsSTjbQAuF0MC") - set(GN_PLATFORM "linux-amd64") - set(HASH "871e75d7f3597b74fb99e36bb41fe5a9f8ce8a4d9f167f4729fc6e444807a59f35ec8aca70c2274a99c79d70a1108272be1ad991678a8ceb39e30f77abb13135") - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(_vfa_SUPPORTED ON) - set(GN_VERSION "qhxILDNcJ2H44HfHmfiU-XIY3E_SIXvFqLd2wvbIgOoC") - set(GN_PLATFORM "mac-amd64") - set(HASH "03ee64cb15bae7fceb412900d470601090bce147cfd45eb9b46683ac1a5dca848465a5d74c55a47df7f0e334d708151249a6d37bb021de74dd48b97ed4a07937") - else() - set(GN_VERSION "qUkAhy9J0P7c5racy-9wB6AHNK_btS18im8S06_ehhwC") - set(GN_PLATFORM "windows-amd64") - set(HASH "263e02bd79eee0cb7b664831b7898565c5656a046328d8f187ef7ae2a4d766991d477b190c9b425fcc960ab76f381cd3e396afb85cba7408ca9e74eb32c175db") - endif() - set(SUBDIR "${GN_VERSION}") - set(URL "${CIPD_DOWNLOAD_GN}/${GN_PLATFORM}/+/${GN_VERSION}") - set(ARCHIVE "gn-${GN_PLATFORM}.zip") - elseif(VAR MATCHES "GO") - set(PROGNAME go) - set(SUBDIR 1.16.6.windows-386) - set(PATHS ${DOWNLOADS}/tools/go/${SUBDIR}/go/bin) - set(BREW_PACKAGE_NAME "go") - set(APT_PACKAGE_NAME "golang-go") - set(URL "https://dl.google.com/go/go${SUBDIR}.zip") - set(ARCHIVE "go${SUBDIR}.zip") - set(HASH 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8) - elseif(VAR MATCHES "PYTHON3") - if(CMAKE_HOST_WIN32) - set(PROGNAME python) - set(PYTHON_VERSION 3.10.0) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(SUBDIR "python-${PYTHON_VERSION}-x86") - set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-win32.zip") - set(ARCHIVE "python-${PYTHON_VERSION}-embed-win32.zip") - set(HASH 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd) - else() - set(SUBDIR "python-${PYTHON_VERSION}-x64") - set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}-embed-amd64.zip") - set(ARCHIVE "python-${PYTHON_VERSION}-embed-amd64.zip") - set(HASH 23d81d007698383d8dc088da532dcb86c6ceca7eb78ba5688fc2e18ee7f33f53a5632282873762293b8164556dfb15870f8ffb7abd368faba0a3d8d5d5bc6297) - endif() - set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - set(POST_INSTALL_COMMAND ${CMAKE_COMMAND} -E rm python310._pth) - else() - set(PROGNAME python3) - set(BREW_PACKAGE_NAME "python") - set(APT_PACKAGE_NAME "python3") - endif() - elseif(VAR MATCHES "PYTHON2") - if(CMAKE_HOST_WIN32) - set(PROGNAME python) - set(PYTHON_VERSION 2.7.18) - if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(SUBDIR "python-${PYTHON_VERSION}-x86") - set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}.msi") - set(ARCHIVE "python-${PYTHON_VERSION}.msi") - set(HASH 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) - else() - set(SUBDIR "python-${PYTHON_VERSION}-x64") - set(URL "https://www.python.org/ftp/python/${PYTHON_VERSION}/python-${PYTHON_VERSION}.amd64.msi") - set(ARCHIVE "python-${PYTHON_VERSION}.amd64.msi") - set(HASH 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) - endif() - set(PATHS ${DOWNLOADS}/tools/python/${SUBDIR}) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - # macOS includes Python 2.7 built-in as `python` - set(PROGNAME python) - set(BREW_PACKAGE_NAME "python2") + string(STRIP "${program_version_output}" program_version_output) + #TODO: REGEX MATCH case for more complex cases! + if(NOT "${program_version_output}" VERSION_GREATER_EQUAL "${arg_MIN_VERSION}") + message(STATUS "Found ${arg_PROGRAM_NAME}('${program_version_output}') but at least version ${arg_MIN_VERSION} is required! Trying to use internal version if possible!") + set("${out_var}" OFF PARENT_SCOPE) else() - set(PROGNAME python2) - set(APT_PACKAGE_NAME "python") + message(STATUS "Found external ${arg_PROGRAM_NAME}('${program_version_output}').") + set("${out_var}" ON PARENT_SCOPE) endif() - elseif(VAR MATCHES "RUBY") - set(PROGNAME "ruby") - set(RUBY_VERSION 2.7.4-1) - set(PATHS ${DOWNLOADS}/tools/ruby/rubyinstaller-${RUBY_VERSION}-x86/bin) - set(URL https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${RUBY_VERSION}/rubyinstaller-${RUBY_VERSION}-x86.7z) - set(ARCHIVE rubyinstaller-${RUBY_VERSION}-x86.7z) - set(HASH 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) - elseif(VAR MATCHES "JOM") - set(PROGNAME jom) - set(SUBDIR "jom-1.1.3") - set(PATHS ${DOWNLOADS}/tools/jom/${SUBDIR}) - set(URL - "https://download.qt.io/official_releases/jom/jom_1_1_3.zip" - "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" +endfunction() + +function(z_vcpkg_find_acquire_program_find_external program) + cmake_parse_arguments(PARSE_ARGV 1 arg + "" + "INTERPRETER;MIN_VERSION;PROGRAM_NAME" + "NAMES;VERSION_COMMAND" ) - set(ARCHIVE "jom_1_1_3.zip") - set(HASH 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33) - elseif(VAR MATCHES "7Z") - set(PROGNAME 7z) - set(PATHS "${DOWNLOADS}/tools/7z/Files/7-Zip") - set(URL "https://7-zip.org/a/7z1900.msi") - set(ARCHIVE "7z1900.msi") - set(HASH f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067) - elseif(VAR MATCHES "NINJA") - set(PROGNAME ninja) - set(NINJA_VERSION 1.10.2) - set(_vfa_SUPPORTED ON) - if(CMAKE_HOST_WIN32) - set(ARCHIVE "ninja-win-${NINJA_VERSION}.zip") - set(SUBDIR "${NINJA_VERSION}-windows") - set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-win.zip") - set(HASH 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(ARCHIVE "ninja-mac-${NINJA_VERSION}.zip") - set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-mac.zip") - set(SUBDIR "${NINJA_VERSION}-osx") - set(PATHS "${DOWNLOADS}/tools/ninja-${NINJA_VERSION}-osx") - set(HASH bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") - set(PATHS "${DOWNLOADS}/tools/${SUBDIR}-freebsd") - set(_vfa_SUPPORTED OFF) + + if("${arg_INTERPRETER}" STREQUAL "") + find_program("${program}" NAMES ${arg_NAMES}) else() - set(ARCHIVE "ninja-linux-${NINJA_VERSION}.zip") - set(URL "https://github.com/ninja-build/ninja/releases/download/v${NINJA_VERSION}/ninja-linux.zip") - set(SUBDIR "${NINJA_VERSION}-linux") - set(PATHS "${DOWNLOADS}/tools/ninja-${NINJA_VERSION}-linux") - set(HASH 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + find_file(SCRIPT_${program} NAMES ${arg_NAMES}) + if(SCRIPT_${program}) + vcpkg_list(SET program_tmp ${${interpreter}} ${SCRIPT_${program}}) + set("${program}" "${program_tmp}" CACHE INTERNAL "") + endif() endif() - set(VERSION_CMD --version) - elseif(VAR MATCHES "NUGET") - set(PROGNAME nuget) - set(SUBDIR "5.11.0") - set(PATHS "${DOWNLOADS}/tools/nuget-${SUBDIR}-windows") - set(BREW_PACKAGE_NAME "nuget") - set(URL "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") - set(_vfa_RENAME "nuget.exe") - set(ARCHIVE "nuget.5.11.0.exe") - set(NOEXTRACT ON) - set(HASH 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) - elseif(VAR MATCHES "MESON") - set(MESON_VERSION 0.58.1) - set(PROGNAME meson) - set(REQUIRED_INTERPRETER PYTHON3) - set(APT_PACKAGE_NAME "meson") - set(BREW_PACKAGE_NAME "meson") - set(SCRIPTNAME meson meson.py) - set(REF aeda7f249c4a5dbbecc52e44f382246a2377b5b0) - set(PATHS ${DOWNLOADS}/tools/meson/meson-${REF}) - set(URL "https://github.com/mesonbuild/meson/archive/${REF}.tar.gz") - set(ARCHIVE "meson-${REF}.tar.gz") - #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) - #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") - #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") - set(HASH 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) - set(_vfa_SUPPORTED ON) - set(VERSION_CMD --version) - elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") - if(CMAKE_HOST_WIN32) - set(SOURCEFORGE_ARGS - REPO winflexbison - FILENAME winflexbison-2.5.16.zip - SHA512 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123 - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/winflexbison" - ) - if(VAR MATCHES "FLEX") - set(PROGNAME win_flex) - else() - set(PROGNAME win_bison) - endif() - set(PATHS ${DOWNLOADS}/tools/winflexbison/0a14154bff-a8cf65db07) - if(NOT EXISTS "${PATHS}/data/m4sugar/m4sugar.m4") - file(REMOVE_RECURSE "${PATHS}") - endif() - elseif(VAR MATCHES "FLEX") - set(PROGNAME flex) - set(APT_PACKAGE_NAME flex) - set(BREW_PACKAGE_NAME flex) + + if("${version_command}" STREQUAL "") + set(version_is_good ON) # can't check for the version being good, so assume it is else() - set(PROGNAME bison) - set(APT_PACKAGE_NAME bison) - set(BREW_PACKAGE_NAME bison) - if (APPLE) - set(PATHS /usr/local/opt/bison/bin) - endif() + z_vcpkg_find_acquire_program_version_check(version_is_good + COMMAND ${${program}} ${arg_VERSION_COMMAND} + MIN_VERSION "${arg_MIN_VERSION}" + PROGRAM_NAME "${arg_PROGRAM_NAME}" + ) endif() - elseif(VAR MATCHES "CLANG") - set(PROGNAME clang) - set(SUBDIR "clang-12.0.0") - set(LLVM_VERSION 12.0.0) - if(CMAKE_HOST_WIN32) - set(PATHS - # Support LLVM in Visual Studio 2019 - "$ENV{LLVMInstallDir}/x64/bin" - "$ENV{LLVMInstallDir}/bin" - "$ENV{VCINSTALLDIR}/Tools/Llvm/x64/bin" - "$ENV{VCINSTALLDIR}/Tools/Llvm/bin" - "${DOWNLOADS}/tools/${SUBDIR}-windows/bin" - "${DOWNLOADS}/tools/clang/${SUBDIR}/bin") - - if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) - set(HOST_ARCH_ $ENV{PROCESSOR_ARCHITEW6432}) - else() - set(HOST_ARCH_ $ENV{PROCESSOR_ARCHITECTURE}) - endif() - if(HOST_ARCH_ MATCHES "64") - set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-win64.exe") - set(ARCHIVE "LLVM-${LLVM_VERSION}-win64.7z.exe") - set(HASH 67a9b54abad5143fa5f79f0cfc184be1394c9fc894fa9cee709943cb6ccbde8f0ea6003d8fcc20eccf035631abe4009cc0f694ac84e7879331cebba8125e4c7f) - else() - set(URL "https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/LLVM-${LLVM_VERSION}-win32.exe") - set(ARCHIVE "LLVM-${LLVM_VERSION}-win32.7z.exe") - set(HASH 92fa5252fd08c1414ee6d71e2544cd2c44872124c47225f8d98b3af711d20e699f2888bc30642dfd00e005013da1607a593674fb4878951cc434694f9a119199) - endif() - endif() - set(BREW_PACKAGE_NAME "llvm") - set(APT_PACKAGE_NAME "clang") - elseif(VAR MATCHES "GPERF") - set(PROGNAME gperf) - set(GPERF_VERSION 3.0.1) - set(PATHS ${DOWNLOADS}/tools/gperf/bin) - set(URL "https://sourceforge.net/projects/gnuwin32/files/gperf/${GPERF_VERSION}/gperf-${GPERF_VERSION}-bin.zip/download") - set(ARCHIVE "gperf-${GPERF_VERSION}-bin.zip") - set(HASH 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9) - elseif(VAR MATCHES "GASPREPROCESSOR") - set(NOEXTRACT true) - set(PROGNAME gas-preprocessor) - set(SUBDIR "4daa6115") - set(REQUIRED_INTERPRETER PERL) - set(SCRIPTNAME "gas-preprocessor.pl") - set(PATHS ${DOWNLOADS}/tools/gas-preprocessor/${SUBDIR}) - set(_vfa_RENAME "gas-preprocessor.pl") - set(URL "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/4daa611556a0558dfe537b4f7ad80f7e50a079c1/gas-preprocessor.pl") - set(ARCHIVE "gas-preprocessor-${SUBDIR}.pl") - set(HASH 2737ba3c1cf85faeb1fbfe015f7bad170f43a857a50a1b3d81fa93ba325d481f73f271c5a886ff8b7eef206662e19f0e9ef24861dfc608b67b8ea8a2062dc061) - elseif(VAR MATCHES "DARK") - set(PROGNAME dark) - set(SUBDIR "wix311-binaries") - set(PATHS ${DOWNLOADS}/tools/dark/${SUBDIR}) - set(URL "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip") - set(ARCHIVE "wix311-binaries.zip") - set(HASH 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) - elseif(VAR MATCHES "SCONS") - set(PROGNAME scons) - set(SCONS_VERSION 4.1.0) - set(SUBDIR ${SCONS_VERSION}) - set(REQUIRED_INTERPRETER PYTHON2) - set(SCRIPTNAME "scons.py") - set(URL "https://sourceforge.net/projects/scons/files/scons-local-${SCONS_VERSION}.zip/download") - set(ARCHIVE "scons-local-${SCONS_VERSION}.zip") - set(HASH b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) - elseif(VAR MATCHES "SWIG") - set(SWIG_VERSION 4.0.2) - set(PROGNAME swig) - if(CMAKE_HOST_WIN32) - set(SOURCEFORGE_ARGS - REPO swig/swigwin - REF swigwin-${SWIG_VERSION} - FILENAME "swigwin-${SWIG_VERSION}.zip" - SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/swig" - ) - set(SUBDIR b8f105f9b9-f0518bc3b7/swigwin-${SWIG_VERSION}) - else() - set(APT_PACKAGE_NAME "swig") - set(BREW_PACKAGE_NAME "swig") + if(NOT version_is_good) + unset("${program}" PARENT_SCOPE) + set("${program}" "${program}-NOTFOUND" CACHE INTERNAL "") endif() +endfunction() - elseif(VAR MATCHES "DOXYGEN") - set(PROGNAME doxygen) - set(DOXYGEN_VERSION 1.9.1) - set(SOURCEFORGE_ARGS - REPO doxygen - REF rel-${DOXYGEN_VERSION} - FILENAME "doxygen-${DOXYGEN_VERSION}.windows.bin.zip" - SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b - NO_REMOVE_ONE_LEVEL - WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" - ) - set(SUBDIR c3eeb6b9fa-76d69c6db5) - elseif(VAR MATCHES "BAZEL") - set(PROGNAME bazel) - set(BAZEL_VERSION 4.1.0) - set(_vfa_RENAME "bazel") - if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(_vfa_SUPPORTED ON) - set(SUBDIR ${BAZEL_VERSION}-linux) - set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64") - set(ARCHIVE "bazel-${SUBDIR}-x86_64") - set(NOEXTRACT ON) - set(HASH 50aa0894dbeedb9189a56f17baa8cecfa55c5f9c1f93a61b9ab5e10984754a400884fc9802b4979f536778e15f813a72807396b4b47694e4c05eadb841361c69) - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(_vfa_SUPPORTED ON) - set(SUBDIR ${BAZEL_VERSION}-darwin) - set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64") - set(ARCHIVE "bazel-${SUBDIR}-x86_64") - set(NOEXTRACT ON) - set(HASH 3500560c9d49d37a1ead2d2777d673c6f1874582883e141ecd5b3991005b1b6b8aab5f255c187133d771497c2a956f5c1e0dfad04dc453525634537e65b649af) +function(z_vcpkg_find_acquire_program_find_internal program) + cmake_parse_arguments(PARSE_ARGV 1 arg + "" + "INTERPRETER" + "NAMES;PATHS" + ) + if("${arg_INTERPRETER}" STREQUAL "") + find_program(${program} + NAMES ${arg_NAMES} + PATHS ${arg_PATHS} + NO_DEFAULT_PATH) else() - set(SUBDIR ${BAZEL_VERSION}-windows) - set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${SUBDIR}-x86_64.zip") - set(ARCHIVE "bazel-${SUBDIR}-x86_64.zip") - set(HASH 3954ab54b465d62eef397767dac7ce21d06ac8ea3e1571d0e7b1f0ea8b5c2cf44eea5d252b85a63a1e1a08dbe9a219783cc23c2888673c35e2df03edfdc9e5a7) + vcpkg_find_acquire_program("${arg_INTERPRETER}") + find_file(SCRIPT_${program} + NAMES ${arg_NAMES} + PATHS ${arg_PATHS} + NO_DEFAULT_PATH) + if(SCRIPT_${program}) + set("${program}" ${${arg_INTERPRETER}} ${SCRIPT_${program}} CACHE INTERNAL "") + endif() endif() - elseif(VAR MATCHES "ARIA2") - set(PROGNAME aria2c) - set(ARIA2_VERSION 1.35.0) - set(PATHS ${DOWNLOADS}/tools/aria2c/aria2-${ARIA2_VERSION}-win-32bit-build1) - set(URL "https://github.com/aria2/aria2/releases/download/release-${ARIA2_VERSION}/aria2-${ARIA2_VERSION}-win-32bit-build1.zip") - set(ARCHIVE "aria2-${ARIA2_VERSION}-win-32bit-build1.zip") - set(HASH 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) - elseif(VAR MATCHES "PKGCONFIG") - set(PROGNAME pkg-config) - if(ENV{PKG_CONFIG}) - debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}") - set(PKGCONFIG $ENV{PKG_CONFIG} PARENT_SCOPE) - return() - elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") - # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir} - set(_vfa_SUPPORTED ON) - set(_vfa_RENAME "pkg-config") - set(PKGCONFIG_VERSION 0.29.2.1) - set(NOEXTRACT ON) - set(ARCHIVE "pkg-config.openbsd") - set(SUBDIR "openbsd") - set(URL "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config") - set(HASH b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b) - set(VERSION_CMD --version) - elseif(CMAKE_HOST_WIN32) - if(NOT EXISTS "${PKGCONFIG}") - set(VERSION 0.29.2-2) - set(LIBWINPTHREAD_VERSION git-8.0.0.5906.c9a21571-1) - vcpkg_acquire_msys( - PKGCONFIG_ROOT - NO_DEFAULT_PACKAGES - DIRECT_PACKAGES - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" - 54f8dad3b1a36a4515db47825a3214fbd2bd82f604aec72e7fb8d79068095fda3c836fb2296acd308522d6e12ce15f69e0c26dcf4eb0681fd105d057d912cdb7 - "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${LIBWINPTHREAD_VERSION}-any.pkg.tar.zst" - 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c - ) - endif() - set(${VAR} "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" PARENT_SCOPE) - return() - else() - set(BREW_PACKAGE_NAME pkg-config) - set(APT_PACKAGE_NAME pkg-config) - set(PATHS "/bin" "/usr/bin" "/usr/local/bin") +endfunction() + +function(vcpkg_find_acquire_program program) + if(${program}) + return() endif() - else() - message(FATAL "unknown tool ${VAR} -- unable to acquire.") - endif() - macro(do_version_check) - if(VERSION_CMD) - vcpkg_execute_in_download_mode( - COMMAND ${${VAR}} ${VERSION_CMD} - WORKING_DIRECTORY ${VCPKG_ROOT_DIR} - OUTPUT_VARIABLE ${VAR}_VERSION_OUTPUT + set(raw_executable "OFF") + set(program_name "") + set(program_version "") + set(search_names "") + set(download_urls "") + set(download_filename "") + set(download_sha512 "") + set(rename_binary_to "") + set(tool_subdirectory "") + set(interpreter "") + set(supported_on_unix "") + set(post_install_command "") + set(paths_to_search "") + set(version_command "") + vcpkg_list(SET sourceforge_args) + set(brew_package_name "") + set(apt_package_name "") + + if(program STREQUAL "PERL") + set(program_name perl) + set(program_version 5.32.1.1) + set(tool_subdirectory ${program_version}) + set(paths_to_search ${DOWNLOADS}/tools/perl/${tool_subdirectory}/perl/bin) + set(brew_package_name "perl") + set(apt_package_name "perl") + set(download_urls + "https://strawberryperl.com/download/${program_version}/strawberry-perl-${program_version}-32bit.zip" + ) + set(download_filename "strawberry-perl-${program_version}-32bit.zip") + set(download_sha512 936381254fea2e596db6a16c23b08ced25c4081fda484e1b8c4356755016e4b956bd00f3d2ee651d5f41a7695e9998f6c1ac3f4a237212b9c55aca8c5fea14e9) + elseif(program STREQUAL "NASM") + set(program_name nasm) + set(program_version 2.15.05) + set(paths_to_search "${DOWNLOADS}/tools/nasm/nasm-${program_version}") + set(brew_package_name "nasm") + set(apt_package_name "nasm") + set(download_urls + "https://www.nasm.us/pub/nasm/releasebuilds/${program_version}/win32/nasm-${program_version}-win32.zip" + "https://fossies.org/windows/misc/nasm-${program_version}-win32.zip" ) - string(STRIP "${${VAR}_VERSION_OUTPUT}" ${VAR}_VERSION_OUTPUT) - #TODO: REGEX MATCH case for more complex cases! - if(NOT ${VAR}_VERSION_OUTPUT VERSION_GREATER_EQUAL ${VAR}_VERSION) - message(STATUS "Found ${PROGNAME}('${${VAR}_VERSION_OUTPUT}') but at least version ${${VAR}_VERSION} is required! Trying to use internal version if possible!") - unset(${VAR}) - set(${VAR} "${VAR}-NOTFOUND" CACHE INTERNAL "") + set(download_filename "nasm-${program_version}-win32.zip") + set(download_sha512 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed) + elseif(program STREQUAL "YASM") + set(program_name yasm) + set(program_version 1.3.0.6.g1962) + set(tool_subdirectory 1.3.0.6) + set(brew_package_name "yasm") + set(apt_package_name "yasm") + set(download_urls "https://www.tortall.net/projects/yasm/snapshots/v${program_version}/yasm-${program_version}.exe") + set(download_filename "yasm-${program_version}.exe") + set(rename_binary_to "yasm.exe") + set(raw_executable ON) + set(download_sha512 c1945669d983b632a10c5ff31e86d6ecbff143c3d8b2c433c0d3d18f84356d2b351f71ac05fd44e5403651b00c31db0d14615d7f9a6ecce5750438d37105c55b) + elseif(program STREQUAL "GIT") + set(program_name git) + if(CMAKE_HOST_WIN32) + set(base_version 2.32.0) + set(program_version 2.32.0.2) + set(tool_subdirectory "git-${program_version}-2-windows") + set(download_urls "https://github.com/git-for-windows/git/releases/download/v${base_version}.windows.2/PortableGit-${program_version}-32-bit.7z.exe") + set(download_filename "PortableGit-${program_version}-32-bit.7z.exe") + set(download_sha512 867d8534972cbaf7a4224e25a14d484f8d17ef186f8d79e9a758afb90cf69541375cb7615a39702311f4809cb8371ef85c2b1a15bfffe9e48f0e597ac011b348) + set(paths_to_search + "${DOWNLOADS}/tools/${tool_subdirectory}/mingw32/bin" + "${DOWNLOADS}/tools/git/${tool_subdirectory}/mingw32/bin") else() - message(STATUS "Found external ${PROGNAME}('${${VAR}_VERSION_OUTPUT}').") + set(brew_package_name "git") + set(apt_package_name "git") endif() - endif() - endmacro() + elseif(program STREQUAL "GN") + set(program_name gn) + set(rename_binary_to "gn") + set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + set(program_version "xus7xtaPhpv5vCmKFOnsBVoB-PKmhZvRsSTjbQAuF0MC") + set(gn_platform "linux-amd64") + set(download_sha512 "871e75d7f3597b74fb99e36bb41fe5a9f8ce8a4d9f167f4729fc6e444807a59f35ec8aca70c2274a99c79d70a1108272be1ad991678a8ceb39e30f77abb13135") + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + set(program_version "qhxILDNcJ2H44HfHmfiU-XIY3E_SIXvFqLd2wvbIgOoC") + set(gn_platform "mac-amd64") + set(download_sha512 "03ee64cb15bae7fceb412900d470601090bce147cfd45eb9b46683ac1a5dca848465a5d74c55a47df7f0e334d708151249a6d37bb021de74dd48b97ed4a07937") + else() + set(program_version "qUkAhy9J0P7c5racy-9wB6AHNK_btS18im8S06_ehhwC") + set(gn_platform "windows-amd64") + set(download_sha512 "263e02bd79eee0cb7b664831b7898565c5656a046328d8f187ef7ae2a4d766991d477b190c9b425fcc960ab76f381cd3e396afb85cba7408ca9e74eb32c175db") + endif() + set(tool_subdirectory "${program_version}") + set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}") + set(download_filename "gn-${gn_platform}.zip") + elseif(program STREQUAL "GO") + set(program_name go) + set(tool_subdirectory 1.16.6.windows-386) + set(paths_to_search ${DOWNLOADS}/tools/go/${tool_subdirectory}/go/bin) + set(brew_package_name "go") + set(apt_package_name "golang-go") + set(download_urls "https://dl.google.com/go/go${tool_subdirectory}.zip") + set(download_filename "go${tool_subdirectory}.zip") + set(download_sha512 2a1e539ed628c0cca5935d24d22cf3a7165f5c80e12a4003ac184deae6a6d0aa31f582f3e8257b0730adfc09aeec3a0e62f4732e658c312d5382170bcd8c94d8) + elseif(program STREQUAL "PYTHON3") + if(CMAKE_HOST_WIN32) + set(program_name python) + set(program_version 3.10.0) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-win32.zip") + set(download_filename "python-${program_version}-embed-win32.zip") + set(download_sha512 0b007bfa02cdd48b3c260986493fa124a6b9d794da6eba2b4fad0d779fd655e9ae4e16daf5f02ff5b30a17abcfc1499bc6bee394c0f8abe933f2d4fe702af3cd) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}-embed-amd64.zip") + set(download_filename "python-${program_version}-embed-amd64.zip") + set(download_sha512 23d81d007698383d8dc088da532dcb86c6ceca7eb78ba5688fc2e18ee7f33f53a5632282873762293b8164556dfb15870f8ffb7abd368faba0a3d8d5d5bc6297) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") + vcpkg_list(SET post_install_command "${CMAKE_COMMAND}" -E rm python310._pth) + else() + set(program_name python3) + set(brew_package_name "python") + set(apt_package_name "python3") + endif() + elseif(program STREQUAL "PYTHON2") + if(CMAKE_HOST_WIN32) + set(program_name python) + set(program_version 2.7.18) + if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(tool_subdirectory "python-${program_version}-x86") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi") + set(download_filename "python-${program_version}.msi") + set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115) + else() + set(tool_subdirectory "python-${program_version}-x64") + set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi") + set(download_filename "python-${program_version}.amd64.msi") + set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e) + endif() + set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}") + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + # macOS includes Python 2.7 built-in as `python` + set(program_name python) + set(brew_package_name "python2") + else() + set(program_name python2) + set(apt_package_name "python") + endif() + elseif(program STREQUAL "RUBY") + set(program_name "ruby") + set(program_version 2.7.4-1) + set(paths_to_search "${DOWNLOADS}/tools/ruby/rubyinstaller-${program_version}-x86/bin") + set(download_urls "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-${program_version}/rubyinstaller-${program_version}-x86.7z") + set(download_filename "rubyinstaller-${program_version}-x86.7z") + set(download_sha512 4bf459c987b407bdda328c52d95060bf6ad48fc3e5ed5f64d4b205c5b4153c7a00cb6f9da6c0bcd5f2e001e9dc3dda0b72269ec4afdeffd658b93c085cd1d859) + elseif(program STREQUAL "JOM") + set(program_name jom) + set(tool_subdirectory "jom-1.1.3") + set(paths_to_search "${DOWNLOADS}/tools/jom/${tool_subdirectory}") + set(download_urls + "https://download.qt.io/official_releases/jom/jom_1_1_3.zip" + "https://mirrors.ocf.berkeley.edu/qt/official_releases/jom/jom_1_1_3.zip" + ) + set(download_filename "jom_1_1_3.zip") + set(download_sha512 5b158ead86be4eb3a6780928d9163f8562372f30bde051d8c281d81027b766119a6e9241166b91de0aa6146836cea77e5121290e62e31b7a959407840fc57b33) + elseif(program STREQUAL "7Z") + set(program_name 7z) + set(paths_to_search "${DOWNLOADS}/tools/7z/Files/7-Zip") + set(download_urls "https://7-zip.org/a/7z1900.msi") + set(download_filename "7z1900.msi") + set(download_sha512 f73b04e2d9f29d4393fde572dcf3c3f0f6fa27e747e5df292294ab7536ae24c239bf917689d71eb10cc49f6b9a4ace26d7c122ee887d93cc935f268c404e9067) + elseif(program STREQUAL "NINJA") + set(program_name ninja) + set(program_version 1.10.2) + set(supported_on_unix ON) + if(CMAKE_HOST_WIN32) + set(download_filename "ninja-win-${program_version}.zip") + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-win.zip") + set(download_sha512 6004140d92e86afbb17b49c49037ccd0786ce238f340f7d0e62b4b0c29ed0d6ad0bab11feda2094ae849c387d70d63504393714ed0a1f4d3a1f155af7a4f1ba3) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(download_filename "ninja-mac-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-mac.zip") + set(tool_subdirectory "${program_version}-osx") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-osx") + set(download_sha512 bcd12f6a3337591306d1b99a7a25a6933779ba68db79f17c1d3087d7b6308d245daac08df99087ff6be8dc7dd0dcdbb3a50839a144745fa719502b3a7a07260b) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD") + set(paths_to_search "${DOWNLOADS}/tools/${tool_subdirectory}-freebsd") + set(supported_on_unix OFF) + else() + set(download_filename "ninja-linux-${program_version}.zip") + set(download_urls "https://github.com/ninja-build/ninja/releases/download/v${program_version}/ninja-linux.zip") + set(tool_subdirectory "${program_version}-linux") + set(paths_to_search "${DOWNLOADS}/tools/ninja-${program_version}-linux") + set(download_sha512 93e802e9c17fb59636cddde4bad1ddaadad624f4ecfee00d5c78790330a4e9d433180e795718cda27da57215ce643c3929cf72c85337ee019d868c56f2deeef3) + endif() + set(version_command --version) + elseif(program STREQUAL "NUGET") + set(program_name nuget) + set(tool_subdirectory "5.11.0") + set(paths_to_search "${DOWNLOADS}/tools/nuget-${tool_subdirectory}-windows") + set(brew_package_name "nuget") + set(download_urls "https://dist.nuget.org/win-x86-commandline/v5.11.0/nuget.exe") + set(rename_binary_to "nuget.exe") + set(download_filename "nuget.5.11.0.exe") + set(raw_executable ON) + set(download_sha512 06a337c9404dec392709834ef2cdbdce611e104b510ef40201849595d46d242151749aef65bc2d7ce5ade9ebfda83b64c03ce14c8f35ca9957a17a8c02b8c4b7) + elseif(program STREQUAL "MESON") + set(program_version 0.58.1) + set(program_name meson) + set(search_names meson meson.py) + set(interpreter PYTHON3) + set(apt_package_name "meson") + set(brew_package_name "meson") + set(ref aeda7f249c4a5dbbecc52e44f382246a2377b5b0) + set(paths_to_search "${DOWNLOADS}/tools/meson/meson-${ref}") + set(download_urls "https://github.com/mesonbuild/meson/archive/${ref}.tar.gz") + set(download_filename "meson-${ref}.tar.gz") + #set(paths_to_search ${DOWNLOADS}/tools/meson/meson-${program_version}) + #set(download_urls "https://github.com/mesonbuild/meson/releases/download/${program_version}/meson-${program_version}.tar.gz") + #set(download_filename "meson-${program_version}.tar.gz") + set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) + set(supported_on_unix ON) + set(version_command --version) + elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON") + if(CMAKE_HOST_WIN32) + vcpkg_list(SET sourceforge_args + REPO winflexbison + FILENAME winflexbison-2.5.16.zip + SHA512 0a14154bff5d998feb23903c46961528f8ccb4464375d5384db8c4a7d230c0c599da9b68e7a32f3217a0a0735742242eaf3769cb4f03e00931af8640250e9123 + NO_REMOVE_ONE_LEVEL + WORKING_DIRECTORY "${DOWNLOADS}/tools/winflexbison" + ) + if(program STREQUAL "FLEX") + set(program_name win_flex) + else() + set(program_name win_bison) + endif() + set(paths_to_search ${DOWNLOADS}/tools/winflexbison/0a14154bff-a8cf65db07) + if(NOT EXISTS "${paths_to_search}/data/m4sugar/m4sugar.m4") + file(REMOVE_RECURSE "${paths_to_search}") + endif() + elseif(program STREQUAL "FLEX") + set(program_name flex) + set(apt_package_name flex) + set(brew_package_name flex) + else() + set(program_name bison) + set(apt_package_name bison) + set(brew_package_name bison) + if (APPLE) + set(paths_to_search /usr/local/opt/bison/bin) + endif() + endif() + elseif(program STREQUAL "CLANG") + set(program_name clang) + set(tool_subdirectory "clang-12.0.0") + set(program_version 12.0.0) + if(CMAKE_HOST_WIN32) + set(paths_to_search + # Support LLVM in Visual Studio 2019 + "$ENV{LLVMInstallDir}/x64/bin" + "$ENV{LLVMInstallDir}/bin" + "$ENV{VCINSTALLDIR}/Tools/Llvm/x64/bin" + "$ENV{VCINSTALLDIR}/Tools/Llvm/bin" + "${DOWNLOADS}/tools/${tool_subdirectory}-windows/bin" + "${DOWNLOADS}/tools/clang/${tool_subdirectory}/bin") + + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) + set(host_arch "$ENV{PROCESSOR_ARCHITEW6432}") + else() + set(host_arch "$ENV{PROCESSOR_ARCHITECTURE}") + endif() - macro(do_find) - if(NOT DEFINED REQUIRED_INTERPRETER) - find_program(${VAR} ${PROGNAME} PATHS ${PATHS} NO_DEFAULT_PATH) - if(NOT ${VAR}) - find_program(${VAR} ${PROGNAME}) - if(${VAR} AND NOT ${VAR}_VERSION_CHECKED) - do_version_check() - set(${VAR}_VERSION_CHECKED ON) - elseif(${VAR}_VERSION_CHECKED) - message(FATAL_ERROR "Unable to find ${PROGNAME} with min version of ${${VAR}_VERSION}") + if(host_arch MATCHES "64") + set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win64.exe") + set(download_filename "LLVM-${program_version}-win64.7z.exe") + set(download_sha512 67a9b54abad5143fa5f79f0cfc184be1394c9fc894fa9cee709943cb6ccbde8f0ea6003d8fcc20eccf035631abe4009cc0f694ac84e7879331cebba8125e4c7f) + else() + set(download_urls "https://github.com/llvm/llvm-project/releases/download/llvmorg-${program_version}/LLVM-${program_version}-win32.exe") + set(download_filename "LLVM-${program_version}-win32.7z.exe") + set(download_sha512 92fa5252fd08c1414ee6d71e2544cd2c44872124c47225f8d98b3af711d20e699f2888bc30642dfd00e005013da1607a593674fb4878951cc434694f9a119199) + endif() endif() - endif() - else() - vcpkg_find_acquire_program(${REQUIRED_INTERPRETER}) - find_file(SCRIPT_${VAR} NAMES ${SCRIPTNAME} PATHS ${PATHS} NO_DEFAULT_PATH) - if(NOT SCRIPT_${VAR}) - find_file(SCRIPT_${VAR} NAMES ${SCRIPTNAME}) - if(SCRIPT_${VAR} AND NOT ${VAR}_VERSION_CHECKED) - set(${VAR} ${${REQUIRED_INTERPRETER}} ${SCRIPT_${VAR}}) - do_version_check() - set(${VAR}_VERSION_CHECKED ON) - if(NOT ${VAR}) - unset(SCRIPT_${VAR} CACHE) + set(brew_package_name "llvm") + set(apt_package_name "clang") + elseif(program STREQUAL "GPERF") + set(program_name gperf) + set(program_version 3.0.1) + set(paths_to_search "${DOWNLOADS}/tools/gperf/bin") + set(download_urls "https://sourceforge.net/projects/gnuwin32/files/gperf/${program_version}/gperf-${program_version}-bin.zip/download") + set(download_filename "gperf-${program_version}-bin.zip") + set(download_sha512 3f2d3418304390ecd729b85f65240a9e4d204b218345f82ea466ca3d7467789f43d0d2129fcffc18eaad3513f49963e79775b10cc223979540fa2e502fe7d4d9) + elseif(program STREQUAL "GASPREPROCESSOR") + set(raw_executable true) + set(program_name gas-preprocessor) + set(tool_subdirectory "4daa6115") + set(interpreter PERL) + set(search_names "gas-preprocessor.pl") + set(paths_to_search "${DOWNLOADS}/tools/gas-preprocessor/${tool_subdirectory}") + set(rename_binary_to "gas-preprocessor.pl") + set(download_urls "https://raw.githubusercontent.com/FFmpeg/gas-preprocessor/4daa611556a0558dfe537b4f7ad80f7e50a079c1/gas-preprocessor.pl") + set(download_filename "gas-preprocessor-${tool_subdirectory}.pl") + set(download_sha512 2737ba3c1cf85faeb1fbfe015f7bad170f43a857a50a1b3d81fa93ba325d481f73f271c5a886ff8b7eef206662e19f0e9ef24861dfc608b67b8ea8a2062dc061) + elseif(program STREQUAL "DARK") + set(program_name dark) + set(tool_subdirectory "wix311-binaries") + set(paths_to_search "${DOWNLOADS}/tools/dark/${tool_subdirectory}") + set(download_urls "https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip") + set(download_filename "wix311-binaries.zip") + set(download_sha512 74f0fa29b5991ca655e34a9d1000d47d4272e071113fada86727ee943d913177ae96dc3d435eaf494d2158f37560cd4c2c5274176946ebdb17bf2354ced1c516) + elseif(program STREQUAL "SCONS") + set(program_name scons) + set(program_version 4.1.0) + set(tool_subdirectory "${program_version}") + set(interpreter PYTHON2) + set(search_names "scons.py") + set(download_urls "https://sourceforge.net/projects/scons/files/scons-local-${program_version}.zip/download") + set(download_filename "scons-local-${program_version}.zip") + set(download_sha512 b173176ce8aca25039c64fcc68ec1b9ad31e03a926fd545e7631b3f9b374d914adffc593f505e3e7e2867b0ffe85e8deb0b39afe314edf05d02974ce5db1badb) + elseif(program STREQUAL "SWIG") + set(program_version 4.0.2) + set(program_name swig) + if(CMAKE_HOST_WIN32) + vcpkg_list(SET sourceforge_args + REPO swig/swigwin + REF "swigwin-${program_version}" + FILENAME "swigwin-${program_version}.zip" + SHA512 b8f105f9b9db6acc1f6e3741990915b533cd1bc206eb9645fd6836457fd30789b7229d2e3219d8e35f2390605ade0fbca493ae162ec3b4bc4e428b57155db03d + NO_REMOVE_ONE_LEVEL + WORKING_DIRECTORY "${DOWNLOADS}/tools/swig" + ) + set(tool_subdirectory "b8f105f9b9-f0518bc3b7/swigwin-${program_version}") + else() + set(apt_package_name "swig") + set(brew_package_name "swig") + endif() + + elseif(program STREQUAL "DOXYGEN") + set(program_name doxygen) + set(program_version 1.9.1) + vcpkg_list(SET sourceforge_args + REPO doxygen + REF "rel-${program_version}" + FILENAME "doxygen-${program_version}.windows.bin.zip" + SHA512 c3eeb6b9fa4eab70fb6b0864fbbf94fb8050f3fee38d117cf470921a80e3569cc1c8b0272604d6731e05f01790cfaa70e159bec5d0882fc4f2d8ae4a5d52a21b + NO_REMOVE_ONE_LEVEL + WORKING_DIRECTORY "${DOWNLOADS}/tools/doxygen" + ) + set(tool_subdirectory c3eeb6b9fa-76d69c6db5) + elseif(program STREQUAL "BAZEL") + set(program_name bazel) + set(program_version 4.1.0) + set(rename_binary_to "bazel") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + set(supported_on_unix ON) + set(tool_subdirectory "${program_version}-linux") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") + set(download_filename "bazel-${tool_subdirectory}-x86_64") + set(raw_executable ON) + set(download_sha512 50aa0894dbeedb9189a56f17baa8cecfa55c5f9c1f93a61b9ab5e10984754a400884fc9802b4979f536778e15f813a72807396b4b47694e4c05eadb841361c69) + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") + set(supported_on_unix ON) + set(tool_subdirectory "${program_version}-darwin") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64") + set(download_filename "bazel-${tool_subdirectory}-x86_64") + set(raw_executable ON) + set(download_sha512 3500560c9d49d37a1ead2d2777d673c6f1874582883e141ecd5b3991005b1b6b8aab5f255c187133d771497c2a956f5c1e0dfad04dc453525634537e65b649af) + else() + set(tool_subdirectory "${program_version}-windows") + set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip") + set(download_filename "bazel-${tool_subdirectory}-x86_64.zip") + set(download_sha512 3954ab54b465d62eef397767dac7ce21d06ac8ea3e1571d0e7b1f0ea8b5c2cf44eea5d252b85a63a1e1a08dbe9a219783cc23c2888673c35e2df03edfdc9e5a7) + endif() + elseif(program STREQUAL "ARIA2") + set(program_name aria2c) + set(program_version 1.35.0) + set(paths_to_search "${DOWNLOADS}/tools/aria2c/aria2-${program_version}-win-32bit-build1") + set(download_urls "https://github.com/aria2/aria2/releases/download/release-${program_version}/aria2-${program_version}-win-32bit-build1.zip") + set(download_filename "aria2-${program_version}-win-32bit-build1.zip") + set(download_sha512 933537cad820b1cecf43a9eeca7e1b241dd7b1c902ee942441a166f2c38845f16046321efbdfa2f83c7e9fc50c7ecc5da6fd00e0c6e2124c07d3b783aa5092a4) + elseif(program STREQUAL "PKGCONFIG") + set(program_name pkg-config) + if(DEFINED ENV{PKG_CONFIG}) + debug_message(STATUS "PKG_CONFIG found in ENV! Using $ENV{PKG_CONFIG}") + set(PKGCONFIG "$ENV{PKG_CONFIG}" CACHE INTERNAL "") + set(PKGCONFIG "${PKGCONFIG}" PARENT_SCOPE) + return() + elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD") + # As of 6.8, the OpenBSD specific pkg-config doesn't support {pcfiledir} + set(supported_on_unix ON) + set(rename_binary_to "pkg-config") + set(program_version 0.29.2.1) + set(raw_executable ON) + set(download_filename "pkg-config.openbsd") + set(tool_subdirectory "openbsd") + set(download_urls "https://raw.githubusercontent.com/jgilje/pkg-config-openbsd/master/pkg-config") + set(download_sha512 b7ec9017b445e00ae1377e36e774cf3f5194ab262595840b449832707d11e443a102675f66d8b7e8b2e2f28cebd6e256835507b1e0c69644cc9febab8285080b) + set(version_command --version) + elseif(CMAKE_HOST_WIN32) + if(NOT EXISTS "${PKGCONFIG}") + set(VERSION 0.29.2-2) + set(program_version git-8.0.0.5906.c9a21571-1) + vcpkg_acquire_msys( + PKGCONFIG_ROOT + NO_DEFAULT_PACKAGES + DIRECT_PACKAGES + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-pkg-config-${VERSION}-any.pkg.tar.zst" + 54f8dad3b1a36a4515db47825a3214fbd2bd82f604aec72e7fb8d79068095fda3c836fb2296acd308522d6e12ce15f69e0c26dcf4eb0681fd105d057d912cdb7 + "https://repo.msys2.org/mingw/i686/mingw-w64-i686-libwinpthread-${program_version}-any.pkg.tar.zst" + 2c3d9e6b2eee6a4c16fd69ddfadb6e2dc7f31156627d85845c523ac85e5c585d4cfa978659b1fe2ec823d44ef57bc2b92a6127618ff1a8d7505458b794f3f01c + ) endif() - elseif(${VAR}_VERSION_CHECKED) - message(FATAL_ERROR "Unable to find ${PROGNAME} with min version of ${${VAR}_VERSION}") + set("${program}" "${PKGCONFIG_ROOT}/mingw32/bin/pkg-config.exe" CACHE INTERNAL "") + set("${program}" "${${program}}" PARENT_SCOPE) + return() + else() + set(brew_package_name pkg-config) + set(apt_package_name pkg-config) + set(paths_to_search "/bin" "/usr/bin" "/usr/local/bin") endif() - endif() - if(SCRIPT_${VAR}) - set(${VAR} ${${REQUIRED_INTERPRETER}} ${SCRIPT_${VAR}}) - endif() + else() + message(FATAL "unknown tool ${program} -- unable to acquire.") endif() - endmacro() - if(NOT DEFINED PROG_PATH_SUBDIR) - set(PROG_PATH_SUBDIR "${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}") - endif() - if(DEFINED SUBDIR) - list(APPEND PATHS ${PROG_PATH_SUBDIR}) - endif() - if("${PROG_PATH_SUBDIR}" MATCHES [[^(.*)[/\\]$]]) - # remove trailing slash, which may turn into a trailing `\` which CMake _does not like_ - set(PROG_PATH_SUBDIR "${CMAKE_MATCH_1}") - endif() + if("${program_name}" STREQUAL "") + message(FATAL_ERROR "Internal error: failed to initialize program_name for program ${program}") + endif() - do_find() - if(NOT ${VAR}) - if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND NOT _vfa_SUPPORTED) - set(EXAMPLE ".") - if(DEFINED BREW_PACKAGE_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") - set(EXAMPLE ":\n brew install ${BREW_PACKAGE_NAME}") - elseif(DEFINED APT_PACKAGE_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") - set(EXAMPLE ":\n sudo apt-get install ${APT_PACKAGE_NAME}") - endif() - message(FATAL_ERROR "Could not find ${PROGNAME}. Please install it via your package manager${EXAMPLE}") + set(full_subdirectory "${DOWNLOADS}/tools/${program_name}/${tool_subdirectory}") + if(NOT "${tool_subdirectory}" STREQUAL "") + list(APPEND paths_to_search ${full_subdirectory}) + endif() + if("${full_subdirectory}" MATCHES [[^(.*)[/\\]+$]]) + # remove trailing slashes, which may turn into a trailing `\` which CMake _does not like_ + set(full_subdirectory "${CMAKE_MATCH_1}") endif() - if(DEFINED SOURCEFORGE_ARGS) - # Locally change editable to suppress re-extraction each time - set(_VCPKG_EDITABLE 1) - vcpkg_from_sourceforge(OUT_SOURCE_PATH SFPATH ${SOURCEFORGE_ARGS}) - unset(_VCPKG_EDITABLE) - else() - vcpkg_download_distfile(ARCHIVE_PATH - URLS ${URL} - SHA512 ${HASH} - FILENAME ${ARCHIVE} - ) + if("${search_names}" STREQUAL "") + set(search_names "${program_name}") + endif() - file(MAKE_DIRECTORY ${PROG_PATH_SUBDIR}) - if(DEFINED NOEXTRACT) - if(DEFINED _vfa_RENAME) - file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - else() - file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + z_vcpkg_find_acquire_program_find_internal("${program}" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${search_names} + ) + if(NOT ${program}) + z_vcpkg_find_acquire_program_find_external("${program}" + PROGRAM_NAME "${program_name}" + MIN_VERSION "${program_version}" + INTERPRETER "${interpreter}" + NAMES ${search_names} + VERSION_COMMAND ${version_command} + ) + endif() + if(NOT ${program}) + if(NOT VCPKG_HOST_IS_WINDOWS AND NOT supported_on_unix) + set(example ".") + if(NOT "${brew_package_name}" STREQUAL "" AND VCPKG_HOST_IS_OSX) + set(example ":\n brew install ${brew_package_name}") + elseif(NOT "${apt_package_name}" STREQUAL "" AND VCPKG_HOST_IS_LINUX) + set(example ":\n sudo apt-get install ${apt_package_name}") + endif() + message(FATAL_ERROR "Could not find ${program_name}. Please install it via your package manager${example}") endif() - else() - get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} LAST_EXT) - string(TOLOWER "${ARCHIVE_EXTENSION}" ARCHIVE_EXTENSION) - if(ARCHIVE_EXTENSION STREQUAL ".msi") - file(TO_NATIVE_PATH "${ARCHIVE_PATH}" ARCHIVE_NATIVE_PATH) - file(TO_NATIVE_PATH "${PROG_PATH_SUBDIR}" DESTINATION_NATIVE_PATH) - vcpkg_execute_in_download_mode( - COMMAND msiexec /a ${ARCHIVE_NATIVE_PATH} /qn TARGETDIR=${DESTINATION_NATIVE_PATH} - WORKING_DIRECTORY ${DOWNLOADS} - ) - elseif("${ARCHIVE_PATH}" MATCHES ".7z.exe$") - vcpkg_find_acquire_program(7Z) - vcpkg_execute_in_download_mode( - COMMAND ${7Z} x "${ARCHIVE_PATH}" "-o${PROG_PATH_SUBDIR}" -y -bso0 -bsp0 - WORKING_DIRECTORY ${PROG_PATH_SUBDIR} - ) + + if(NOT "${sourceforge_args}" STREQUAL "") + # Locally change editable to suppress re-extraction each time + set(_VCPKG_EDITABLE 1) + vcpkg_from_sourceforge(OUT_SOURCE_PATH SFPATH ${sourceforge_args}) + unset(_VCPKG_EDITABLE) else() - vcpkg_execute_in_download_mode( - COMMAND ${CMAKE_COMMAND} -E tar xzf ${ARCHIVE_PATH} - WORKING_DIRECTORY ${PROG_PATH_SUBDIR} - ) + vcpkg_download_distfile(archive_path + URLS ${download_urls} + SHA512 "${download_sha512}" + FILENAME "${download_filename}" + ) + + file(MAKE_DIRECTORY "${full_subdirectory}") + if(raw_executable) + if(NOT "${rename_binary_to}" STREQUAL "") + file(INSTALL "${archive_path}" + DESTINATION "${full_subdirectory}" + RENAME "${rename_binary_to}" + FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + else() + file(COPY "${archive_path}" + DESTINATION "${full_subdirectory}" + FILE_PERMISSIONS + OWNER_READ OWNER_WRITE OWNER_EXECUTE + GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + ) + endif() + else() + cmake_path(GET download_filename EXTENSION archive_extension) + string(TOLOWER "${archive_extension}" archive_extension) + if("${archive_extension}" MATCHES [[\.msi$]]) + cmake_path(NATIVE_PATH archive_path archive_native_path) + cmake_path(NATIVE_PATH full_subdirectory destination_native_path) + vcpkg_execute_in_download_mode( + COMMAND msiexec + /a "${archive_native_path}" + /qn "TARGETDIR=${destination_native_path}" + WORKING_DIRECTORY "${DOWNLOADS}" + ) + elseif("${archive_extension}" MATCHES [[\.7z\.exe$]]) + vcpkg_find_acquire_program(7Z) + vcpkg_execute_in_download_mode( + COMMAND ${7Z} x + "${archive_path}" + "-o${full_subdirectory}" + -y -bso0 -bsp0 + WORKING_DIRECTORY "${full_subdirectory}" + ) + else() + vcpkg_execute_in_download_mode( + COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}" + WORKING_DIRECTORY "${full_subdirectory}" + ) + endif() + endif() endif() - endif() - endif() - if(DEFINED POST_INSTALL_COMMAND) - vcpkg_execute_required_process( - ALLOW_IN_DOWNLOAD_MODE - COMMAND ${POST_INSTALL_COMMAND} - WORKING_DIRECTORY ${PROG_PATH_SUBDIR} - LOGNAME ${VAR}-tool-post-install - ) - endif() - unset(${VAR} CACHE) - do_find() - if(NOT ${VAR}) - message(FATAL_ERROR "Unable to find ${VAR}") + if(NOT "${post_install_command}" STREQUAL "") + vcpkg_execute_required_process( + ALLOW_IN_DOWNLOAD_MODE + COMMAND ${post_install_command} + WORKING_DIRECTORY "${full_subdirectory}" + LOGNAME "${program}-tool-post-install" + ) + endif() + unset("${program}" CACHE) + z_vcpkg_find_acquire_program_find_internal("${program}" + INTERPRETER "${interpreter}" + PATHS ${paths_to_search} + NAMES ${search_names} + ) + if(NOT ${program}) + message(FATAL_ERROR "Unable to find ${program}") + endif() endif() - endif() - set(${VAR} "${${VAR}}" PARENT_SCOPE) + set("${program}" "${${program}}" PARENT_SCOPE) endfunction() From 11656d827ea3489fe06217b0df5dc99b11bb342c Mon Sep 17 00:00:00 2001 From: Kiba Amor <5093911+kibaamor@users.noreply.github.com> Date: Fri, 12 Nov 2021 02:44:05 +0800 Subject: [PATCH 1084/1858] [knet] Update to v1.1.0 (#21301) --- ports/knet/portfile.cmake | 6 ++++-- ports/knet/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/knet.json | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/knet/portfile.cmake b/ports/knet/portfile.cmake index 49487e6d16d3a3..73e97179b62d93 100644 --- a/ports/knet/portfile.cmake +++ b/ports/knet/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kibaamor/knet - REF v1.0.3 - SHA512 8bc4fb43b456d86ecae939cfae539432bde1f7ad2261abf9a7654d7476eb6502f53cd314f21dd23f77eb8d2969d293f6cb886729c688ea25911157c7fa3c8b7c + REF v1.1.0 + SHA512 22f46c2626c60798a99d7fe3027b675d40584df141fc1131a0d737df28f3e633ec798567defd131b08c3b3ec81069648ed45c2e37eacf37dc15ead45ab24ee55 HEAD_REF master ) @@ -14,6 +14,8 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} DISABLE_PARALLEL_CONFIGURE OPTIONS + -DKNET_ENABLE_LOG=OFF + -DKNET_SOCKET_STAT=OFF -DKNET_BUILD_EXAMPLE=OFF -DKNET_BUILD_TEST=OFF ) diff --git a/ports/knet/vcpkg.json b/ports/knet/vcpkg.json index 3eb8859bf4b3f2..dfad9b2c133a15 100644 --- a/ports/knet/vcpkg.json +++ b/ports/knet/vcpkg.json @@ -1,6 +1,6 @@ { "name": "knet", - "version": "1.0.3", + "version": "1.1.0", "description": "A cross platform lock-free and timer-supported C++11 network library.", "homepage": "https://github.com/kibaamor/knet", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1ff8371dacf831..c90450be354b77 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3185,7 +3185,7 @@ "port-version": 0 }, "knet": { - "baseline": "1.0.3", + "baseline": "1.1.0", "port-version": 0 }, "krabsetw": { diff --git a/versions/k-/knet.json b/versions/k-/knet.json index 38b08862c1c6c3..cb0f8496bc6c44 100644 --- a/versions/k-/knet.json +++ b/versions/k-/knet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6d45707ca4c853c0c0bcd076b98fab73c605d906", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "7dd6abd945d808be664c1b105d16b4ece4e245cf", "version": "1.0.3", From 0968d513d4a27ae92ae10c176e433344ae112400 Mon Sep 17 00:00:00 2001 From: Charles-Auguste Marois Date: Thu, 11 Nov 2021 13:44:32 -0500 Subject: [PATCH 1085/1858] [launch-darkly-server] Add new port (#21262) * [2.4.3] Add launch-darkly-server port * Review portfile * Skip database tests. --- ports/launch-darkly-server/portfile.cmake | 33 +++++++++++++++++++++++ ports/launch-darkly-server/vcpkg.json | 19 +++++++++++++ versions/baseline.json | 4 +++ versions/l-/launch-darkly-server.json | 9 +++++++ 4 files changed, 65 insertions(+) create mode 100644 ports/launch-darkly-server/portfile.cmake create mode 100644 ports/launch-darkly-server/vcpkg.json create mode 100644 versions/l-/launch-darkly-server.json diff --git a/ports/launch-darkly-server/portfile.cmake b/ports/launch-darkly-server/portfile.cmake new file mode 100644 index 00000000000000..f16ab0424308ac --- /dev/null +++ b/ports/launch-darkly-server/portfile.cmake @@ -0,0 +1,33 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO launchdarkly/c-server-sdk + REF 0d9db81862e1b17426da9b433a19376dd6458937 # 2.4.3 + SHA512 1bbafd212b0a271909a03319954ee2c92a3dde713fe7f9e0fdd79a5f011f0775701060b66ae9b3a4efad59376241b893d4b3d6679743c41e7657c355c7e3df5c + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "-DBUILD_TESTING=OFF" + "-DSKIP_DATABASE_TESTS=OFF" +) + +vcpkg_cmake_install() + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/ldserverapi.dll" "${CURRENT_PACKAGES_DIR}/bin/ldserverapi.dll") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/ldserverapi.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/ldserverapi.dll") + endif() +endif() + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + ) + +vcpkg_copy_pdbs() + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/launch-darkly-server/vcpkg.json b/ports/launch-darkly-server/vcpkg.json new file mode 100644 index 00000000000000..680d9ce9820a3e --- /dev/null +++ b/ports/launch-darkly-server/vcpkg.json @@ -0,0 +1,19 @@ +{ + "name": "launch-darkly-server", + "version": "2.4.3", + "description": "LaunchDarkly server-side SDK for C/C++", + "homepage": "https://github.com/launchdarkly/c-server-sdk", + "supports": "!uwp & !arm", + "dependencies": [ + "curl", + "pcre", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index c90450be354b77..16e8ff1ec70754 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3236,6 +3236,10 @@ "baseline": "3.4.3", "port-version": 1 }, + "launch-darkly-server": { + "baseline": "2.4.3", + "port-version": 0 + }, "lazy-importer": { "baseline": "2021-10-23", "port-version": 0 diff --git a/versions/l-/launch-darkly-server.json b/versions/l-/launch-darkly-server.json new file mode 100644 index 00000000000000..df236e72947924 --- /dev/null +++ b/versions/l-/launch-darkly-server.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "79ea5536dae8c4031640373d54bdef7d0e746483", + "version": "2.4.3", + "port-version": 0 + } + ] +} \ No newline at end of file From 9a4a40bd9ced4897814496c8a439abea05d683e1 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 12 Nov 2021 03:34:39 +0800 Subject: [PATCH 1086/1858] [gRPC] update to v1.41.0 (#20835) * [gRPC] update to v1.41.0 * update version * [upb] Update to 2021-10-19 * Update pacth * [upb] Fix upstream bug * Replace depreciate functions * version * fix code * version * revert patch format * update version * Fix review advise * update version * Remove extra spaces * update version * update version * Remove space in patch file * change patch format from CRLF to CF * update version * revert patch format * update version * revert patch format * update version * Remove unnecessary additional * update version Co-authored-by: JackBoosY Co-authored-by: NancyLi1013 --- ports/grpc/00009-use-system-upb.patch | 32 ++++++--------- ports/grpc/00010-add-feature-absl-sync.patch | 22 +++++------ ports/grpc/00014-pkgconfig-upbdefs.patch | 10 ++--- ports/grpc/portfile.cmake | 27 +++++++------ ports/grpc/snprintf.patch | 12 +++--- ports/grpc/vcpkg.json | 11 +++++- ports/upb/add-all-libs-target.patch | 41 ++++---------------- ports/upb/add-cmake-install.patch | 26 +++++-------- ports/upb/fix-cmakelists.patch | 33 ++++++++++++++++ ports/upb/no-wyhash.patch | 13 ------- ports/upb/portfile.cmake | 19 +++++---- ports/upb/vcpkg.json | 15 +++++-- versions/baseline.json | 8 ++-- versions/g-/grpc.json | 5 +++ versions/u-/upb.json | 5 +++ 15 files changed, 140 insertions(+), 139 deletions(-) create mode 100644 ports/upb/fix-cmakelists.patch delete mode 100644 ports/upb/no-wyhash.patch diff --git a/ports/grpc/00009-use-system-upb.patch b/ports/grpc/00009-use-system-upb.patch index 32946ceef92823..e40b27dbbfbf8f 100644 --- a/ports/grpc/00009-use-system-upb.patch +++ b/ports/grpc/00009-use-system-upb.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index c87e35a..24b619f 100644 +index 1c3146b..ae06ea3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,9 @@ set_property(CACHE gRPC_SSL_PROVIDER PROPERTY STRINGS "module" "package") @@ -12,32 +12,23 @@ index c87e35a..24b619f 100644 set(gRPC_PROTOBUF_PACKAGE_TYPE "" CACHE STRING "Algorithm for searching protobuf package") set_property(CACHE gRPC_PROTOBUF_PACKAGE_TYPE PROPERTY STRINGS "CONFIG" "MODULE") -@@ -2079,7 +2082,6 @@ target_link_libraries(grpc - gpr - ${_gRPC_SSL_LIBRARIES} - address_sorting +@@ -1504,7 +1507,6 @@ target_link_libraries(gpr + absl::synchronization + absl::time + absl::optional - upb ) - if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) - target_link_libraries(grpc "-framework CoreFoundation") -@@ -2624,7 +2626,6 @@ target_link_libraries(grpc_unsecure - absl::statusor - gpr - address_sorting -- upb - ) - if(_gRPC_PLATFORM_IOS OR _gRPC_PLATFORM_MAC) - target_link_libraries(grpc_unsecure "-framework CoreFoundation") -@@ -3805,7 +3806,7 @@ if(gRPC_INSTALL) - endif() + if(_gRPC_PLATFORM_ANDROID) + target_link_libraries(gpr +@@ -3927,6 +3929,7 @@ endif() endif() -- + +if (gRPC_UPB_PROVIDER STREQUAL "module") add_library(upb third_party/upb/upb/decode_fast.c third_party/upb/upb/decode.c -@@ -3863,7 +3864,7 @@ if(gRPC_INSTALL) +@@ -3984,7 +3987,7 @@ if(gRPC_INSTALL) ) endif() @@ -59,7 +50,7 @@ index 3623f4a..df6ced5 100644 # Targets include(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets.cmake) diff --git a/cmake/upb.cmake b/cmake/upb.cmake -index f2a0e50..c1c65f5 100644 +index f2a0e50..ac6d397 100644 --- a/cmake/upb.cmake +++ b/cmake/upb.cmake @@ -12,9 +12,21 @@ @@ -84,3 +75,4 @@ index f2a0e50..c1c65f5 100644 + set(upb ${_gRPC_UPB_LIBRARIES}) + set(_gRPC_FIND_UPB "if(NOT upb_FOUND)\n find_package(upb CONFIG REQUIRED)\nendif()") +endif() +\ No newline at end of file diff --git a/ports/grpc/00010-add-feature-absl-sync.patch b/ports/grpc/00010-add-feature-absl-sync.patch index e208070a9f960f..2c7df5c876afba 100644 --- a/ports/grpc/00010-add-feature-absl-sync.patch +++ b/ports/grpc/00010-add-feature-absl-sync.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 24b619f..f7a11b9 100644 +index ae06ea3..8b64438 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2076,6 +2076,8 @@ target_link_libraries(grpc +@@ -2180,6 +2180,8 @@ target_link_libraries(grpc ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_map @@ -11,24 +11,24 @@ index 24b619f..f7a11b9 100644 absl::inlined_vector absl::bind_front absl::statusor -@@ -2623,6 +2625,8 @@ target_link_libraries(grpc_unsecure +@@ -2733,6 +2735,8 @@ target_link_libraries(grpc_unsecure + ${_gRPC_UPB_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} absl::flat_hash_map - absl::inlined_vector + absl::time + absl::synchronization + absl::inlined_vector + absl::bind_front absl::statusor - gpr - address_sorting diff --git a/cmake/abseil-cpp.cmake b/cmake/abseil-cpp.cmake -index 078d495..b6f50bd 100644 +index c89ba26..68ae4fd 100644 --- a/cmake/abseil-cpp.cmake +++ b/cmake/abseil-cpp.cmake -@@ -37,4 +37,7 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") - # Use "CONFIG" as there is no built-in cmake module for absl. +@@ -35,3 +35,6 @@ elseif(gRPC_ABSL_PROVIDER STREQUAL "package") find_package(absl REQUIRED CONFIG) - set(_gRPC_FIND_ABSL "if(NOT absl_FOUND)\n find_package(absl CONFIG)\nendif()") + endif() + set(_gRPC_FIND_ABSL "if(NOT TARGET absl::strings)\n find_package(absl CONFIG)\nendif()") + if (gRPC_ABSL_SYNC_ENABLE) + add_definitions(-DGPR_ABSEIL_SYNC=1) + endif() - endif() +\ No newline at end of file diff --git a/ports/grpc/00014-pkgconfig-upbdefs.patch b/ports/grpc/00014-pkgconfig-upbdefs.patch index af4299acc43b47..2aa257b3ec3183 100644 --- a/ports/grpc/00014-pkgconfig-upbdefs.patch +++ b/ports/grpc/00014-pkgconfig-upbdefs.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3808016..059a16b 100644 +index f7d677c..d527ff4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -15516,7 +15516,7 @@ generate_pkgconfig( +@@ -17705,7 +17705,7 @@ generate_pkgconfig( "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "gpr openssl" -- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" -+ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz -labsl_statusor -labsl_status -labsl_raw_hash_set -labsl_hashtablez_sampler -labsl_synchronization -labsl_time -labsl_time_zone -labsl_civil_time -labsl_graphcycles_internal -labsl_symbolize -labsl_demangle_internal -labsl_malloc_internal -labsl_stacktrace -labsl_debugging_internal -labsl_exponential_biased -labsl_cord -labsl_str_format_internal -labsl_hash -labsl_bad_variant_access -labsl_bad_optional_access -labsl_strings -labsl_strings_internal -labsl_base -labsl_spinlock_wait -labsl_int128 -labsl_city -labsl_throw_delegate -labsl_raw_logging_internal -labsl_log_severity" + "gpr openssl absl_base absl_bind_front absl_cord absl_core_headers absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_variant" +- "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" ++ "-lgrpc -lgrpc_upbdefs -laddress_sorting -lre2 -lupb_fastdecode -lupb_json -lupb_pb -lupb_handlers -lupb_textformat -lupb_reflection -lupb -lcares -lz" "" "grpc.pc") diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake index 39aa2c5a95de81..a0015372524c74 100644 --- a/ports/grpc/portfile.cmake +++ b/ports/grpc/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO grpc/grpc - REF 44c40ac23023b7b3dd82744372c06817cc203898 # v1.37.0 - SHA512 dacd85b3a94cb759a086239aa2661f1b93728a1554ebc0f10c42aeb49c0d6309963832324773c3a153c3d2fcf807cb55b0e197b128e0a4e199c9e19a3976abd6 + REF fc662b7964384b701af5bd3ce6994d2180080eb4 # v1.41.0 + SHA512 ebb534b5d55f1a84c5ee2ea75f2ef871819d278966dec2610877c2f8ddd87bae80a63cbab0393fb37b81844f261327848821ac641b55963583288e6ec3b94e62 HEAD_REF master PATCHES 00001-fix-uwp.patch @@ -43,9 +43,8 @@ vcpkg_check_features( codegen gRPC_BUILD_CODEGEN ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DgRPC_INSTALL=ON -DgRPC_BUILD_TESTS=OFF @@ -59,20 +58,20 @@ vcpkg_configure_cmake( -DgRPC_RE2_PROVIDER=package -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER} - -DgRPC_GFLAGS_PROVIDER=none -DgRPC_BENCHMARK_PROVIDER=none - -DgRPC_INSTALL_CSHARP_EXT=OFF -DgRPC_INSTALL_BINDIR:STRING=bin -DgRPC_INSTALL_LIBDIR:STRING=lib -DgRPC_INSTALL_INCLUDEDIR:STRING=include -DgRPC_INSTALL_CMAKEDIR:STRING=share/grpc - -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX} - -DPROTOBUF_PROTOC_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX} + -D_gRPC_PROTOBUF_PROTOC_EXECUTABLE="${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + -DPROTOBUF_PROTOC_EXECUTABLE="${CURRENT_HOST_INSTALLED_DIR}/tools/protobuf/protoc${VCPKG_HOST_EXECUTABLE_SUFFIX}" + MAYBE_UNUSED_VARIABLES + gRPC_MSVC_STATIC_RUNTIME ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) +vcpkg_cmake_install(ADD_BIN_TO_PATH) -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() if (gRPC_BUILD_CODEGEN) vcpkg_copy_tools( @@ -87,14 +86,14 @@ if (gRPC_BUILD_CODEGEN) grpc_ruby_plugin ) else() - configure_file(${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake ${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake @ONLY) + configure_file("${CMAKE_CURRENT_LIST_DIR}/gRPCTargets-vcpkg-tools.cmake" "${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-vcpkg-tools.cmake" @ONLY) endif() # Ignore the C# extension DLL in bin/ SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) diff --git a/ports/grpc/snprintf.patch b/ports/grpc/snprintf.patch index d1fd52e48d893f..b5012ad2dba8bf 100644 --- a/ports/grpc/snprintf.patch +++ b/ports/grpc/snprintf.patch @@ -1,12 +1,12 @@ diff --git a/src/core/tsi/alts/crypt/aes_gcm.cc b/src/core/tsi/alts/crypt/aes_gcm.cc -index 02b1ac4492..191f462277 100644 +index b761224..88a3d6b 100644 --- a/src/core/tsi/alts/crypt/aes_gcm.cc +++ b/src/core/tsi/alts/crypt/aes_gcm.cc -@@ -26,6 +26,7 @@ - #include - #include +@@ -19,6 +19,7 @@ + #include + #include +#include - #include - + #include + #include diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json index 5d85d18445cbed..e8577e6dea1b12 100644 --- a/ports/grpc/vcpkg.json +++ b/ports/grpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "grpc", - "version-semver": "1.37.0", - "port-version": 4, + "version-semver": "1.41.0", "description": "An RPC library and framework", "homepage": "https://github.com/grpc/grpc", "dependencies": [ @@ -25,6 +24,14 @@ }, "re2", "upb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/ports/upb/add-all-libs-target.patch b/ports/upb/add-all-libs-target.patch index 701004b175579f..9a6a6d24272ccf 100644 --- a/ports/upb/add-all-libs-target.patch +++ b/ports/upb/add-all-libs-target.patch @@ -1,52 +1,25 @@ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 0155a7b..7850b2d 100644 +index b4f43f9..c90968f 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -66,7 +66,7 @@ endif() - enable_testing() - - add_library(port INTERFACE) --add_library(descriptor_upbproto INTERFACE) -+add_library(descriptor_upb_proto INTERFACE) - add_library(upb - ../upb/decode.c - ../upb/decode.int.h -@@ -167,6 +167,25 @@ target_link_libraries(upb_json - upb_pb) - add_library(wyhash INTERFACE) +@@ -137,4 +137,20 @@ add_library(table INTERFACE) + target_link_libraries(table INTERFACE + port) +add_library(all_libs INTERFACE) +target_link_libraries(all_libs + INTERFACE + upb + fastdecode -+ upb_json -+ upb_pb ++ utf8_range ++ json + port + table + descriptor_upb_proto -+ handlers + reflection + textformat +) +set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) -+set_target_properties(handlers PROPERTIES OUTPUT_NAME upb_handlers) +set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) +set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) -+ - install( - DIRECTORY ../upb - DESTINATION include -@@ -184,9 +203,11 @@ install(TARGETS - upb_pb - port - table -- descriptor_upbproto -+ descriptor_upb_proto - handlers - reflection -+ textformat -+ all_libs - EXPORT upb-config - ) - install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb) + diff --git a/ports/upb/add-cmake-install.patch b/ports/upb/add-cmake-install.patch index 0cc9aba3e87a8a..51e740d0350ea7 100644 --- a/ports/upb/add-cmake-install.patch +++ b/ports/upb/add-cmake-install.patch @@ -1,5 +1,5 @@ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index d4cbcc9..a6b432f 100644 +index c90968f..50637ec 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -8,7 +8,7 @@ else() @@ -11,17 +11,9 @@ index d4cbcc9..a6b432f 100644 cmake_policy(SET CMP0048 NEW) project(upb) -@@ -62,6 +62,7 @@ endif() - enable_testing() - - add_library(port INTERFACE) -+add_library(descriptor_upbproto INTERFACE) - add_library(upb - ../upb/decode.c - ../upb/decode.int.h -@@ -162,4 +163,27 @@ target_link_libraries(upb_json - upb_pb) - add_library(wyhash INTERFACE) +@@ -154,3 +154,27 @@ set_target_properties(reflection PROPERTIES OUTPUT_NAME upb_reflection) + set_target_properties(fastdecode PROPERTIES OUTPUT_NAME upb_fastdecode) + set_target_properties(textformat PROPERTIES OUTPUT_NAME upb_textformat) +install( + DIRECTORY ../upb @@ -35,15 +27,15 @@ index d4cbcc9..a6b432f 100644 +target_include_directories(upb PUBLIC $) +install(TARGETS + upb ++ utf8_range + fastdecode -+ upb_json -+ upb_pb ++ json + port + table -+ descriptor_upbproto -+ handlers ++ descriptor_upb_proto + reflection ++ textformat ++ all_libs + EXPORT upb-config +) +install(EXPORT upb-config NAMESPACE upb:: DESTINATION share/upb) - diff --git a/ports/upb/fix-cmakelists.patch b/ports/upb/fix-cmakelists.patch new file mode 100644 index 00000000000000..2a01d62cc52d50 --- /dev/null +++ b/ports/upb/fix-cmakelists.patch @@ -0,0 +1,33 @@ +diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt +index 6b4c50d..b4f43f9 100644 +--- a/cmake/CMakeLists.txt ++++ b/cmake/CMakeLists.txt +@@ -66,6 +66,10 @@ endif() + enable_testing() + + add_library(port INTERFACE) ++add_library(descriptor_upb_proto INTERFACE) ++add_library(utf8_range ++ ../third_party/utf8_range/utf8_range.c ++ ../third_party/utf8_range/utf8_range.h) + add_library(upb + ../upb/decode.c + ../upb/decode_internal.h +@@ -84,7 +88,7 @@ add_library(upb + target_link_libraries(upb + fastdecode + port +- /third_party/utf8_range) ++ utf8_range) + add_library(fastdecode + ../upb/decode.h + ../upb/decode_internal.h +@@ -96,7 +100,7 @@ add_library(fastdecode + target_link_libraries(fastdecode + port + table +- /third_party/utf8_range) ++ utf8_range) + add_library(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE) + target_link_libraries(generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me INTERFACE + table diff --git a/ports/upb/no-wyhash.patch b/ports/upb/no-wyhash.patch deleted file mode 100644 index e9754eedb72430..00000000000000 --- a/ports/upb/no-wyhash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index ed494d9..0155a7b 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -84,7 +84,7 @@ add_library(upb - target_link_libraries(upb - fastdecode - port -- /third_party/wyhash) -+ ) - add_library(fastdecode - ../upb/decode.int.h - ../upb/decode_fast.c diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake index 13fdc729050bb4..d7cdef2451cc50 100644 --- a/ports/upb/portfile.cmake +++ b/ports/upb/portfile.cmake @@ -3,25 +3,24 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protocolbuffers/upb - REF 60607da72e89ba0c84c84054d2e562d8b6b61177 # 2020-12-19 - SHA512 d7de03f4a4024136ecccbcd3381058f26ace480f1817cbc1874a8ed4abbbad58dcf61cc77220400004927ab8e8c95ab5a2e1f27172ee3ed3bbd3f1dda2dda07c + REF 160625a9728b4031a21ad1e1c0146ea2c3a851eb # 2021-10-19 + SHA512 13b205dd4278600e6ec05c829dc6c7e449747cccb118a3b83abc0ab5ef0ab180feb364ac84da8075471697fbba798ed3d9d763934d7fe9a64ac0560f5f9d3e83 HEAD_REF master PATCHES - add-cmake-install.patch fix-uwp.patch - no-wyhash.patch + fix-cmakelists.patch add-all-libs-target.patch + add-cmake-install.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/cmake - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cmake" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/upb/vcpkg.json b/ports/upb/vcpkg.json index 058833064dd99f..2f9c034125e43b 100644 --- a/ports/upb/vcpkg.json +++ b/ports/upb/vcpkg.json @@ -1,7 +1,16 @@ { "name": "upb", - "version-date": "2020-12-19", - "port-version": 1, + "version-date": "2021-10-19", "description": "μpb (often written 'upb') is a small protobuf implementation written in C.", - "homepage": "https://github.com/protocolbuffers/upb/" + "homepage": "https://github.com/protocolbuffers/upb/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 16e8ff1ec70754..6ea60ea3628193 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2561,8 +2561,8 @@ "port-version": 0 }, "grpc": { - "baseline": "1.37.0", - "port-version": 4 + "baseline": "1.41.0", + "port-version": 0 }, "grppi": { "baseline": "0.4.0", @@ -6905,8 +6905,8 @@ "port-version": 1 }, "upb": { - "baseline": "2020-12-19", - "port-version": 1 + "baseline": "2021-10-19", + "port-version": 0 }, "urdfdom": { "baseline": "1.0.4", diff --git a/versions/g-/grpc.json b/versions/g-/grpc.json index 0be49e1e154c65..4d776dcd42b805 100644 --- a/versions/g-/grpc.json +++ b/versions/g-/grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5e3795bf43afe5243e47e18ac66a28bc722207f5", + "version-semver": "1.41.0", + "port-version": 0 + }, { "git-tree": "ad418bfacbcb3e9e82440612ad66104f6692cae4", "version-semver": "1.37.0", diff --git a/versions/u-/upb.json b/versions/u-/upb.json index 6d0406e44aee57..50641b629ed261 100644 --- a/versions/u-/upb.json +++ b/versions/u-/upb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c61b435b6136ae6539c3991b9f6b81bfd6811dc", + "version-date": "2021-10-19", + "port-version": 0 + }, { "git-tree": "df35bcef11c276d5cc7280edeca76eeff3dad223", "version-date": "2020-12-19", From 348927ddffc277d08bfce56ccffa50c56604c64d Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:36:14 +0100 Subject: [PATCH 1087/1858] [sdformat6] no absolute paths (#21305) --- ports/sdformat6/portfile.cmake | 36 ++++++++++++++++++---------------- ports/sdformat6/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/s-/sdformat6.json | 5 +++++ 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/ports/sdformat6/portfile.cmake b/ports/sdformat6/portfile.cmake index 6e32429e37285a..8818b2be88088e 100644 --- a/ports/sdformat6/portfile.cmake +++ b/ports/sdformat6/portfile.cmake @@ -16,41 +16,43 @@ get_filename_component(RUBY_PATH ${RUBY} DIRECTORY) set(_path $ENV{PATH}) vcpkg_add_to_path(${RUBY_PATH}) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DUSE_EXTERNAL_URDF=ON -DUSE_EXTERNAL_TINYXML=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Restore original path set(ENV{PATH} ${_path}) # Move location of sdformat.dll from lib to bin -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/sdformat.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/sdformat.dll - ${CURRENT_PACKAGES_DIR}/bin/sdformat.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/sdformat.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/sdformat.dll" + "${CURRENT_PACKAGES_DIR}/bin/sdformat.dll") endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll - ${CURRENT_PACKAGES_DIR}/debug/bin/sdformat.dll) +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sdformat.dll" + "${CURRENT_PACKAGES_DIR}/debug/bin/sdformat.dll") endif() # Fix cmake targets location -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/sdformat") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/sdformat") # Remove debug files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/lib/cmake" + "${CURRENT_PACKAGES_DIR}/debug/share") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/ignition/sdformat6.yaml" "${CURRENT_PACKAGES_DIR}" "../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_SHARE_PATH \"${CURRENT_PACKAGES_DIR}/share/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/sdformat-6.2/sdf/sdf_config.h" "#define SDF_VERSION_PATH \"${CURRENT_PACKAGES_DIR}/share/sdformat/\"" "") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/sdformat6/vcpkg.json b/ports/sdformat6/vcpkg.json index 935b1be224ea16..f1ee8fccbabffe 100644 --- a/ports/sdformat6/vcpkg.json +++ b/ports/sdformat6/vcpkg.json @@ -1,7 +1,7 @@ { "name": "sdformat6", "version": "6.2.0", - "port-version": 3, + "port-version": 4, "description": "Simulation Description Format (SDF) parser and description files.", "homepage": "http://sdformat.org/", "supports": "!(arm | uwp)", @@ -10,6 +10,14 @@ "boost-variant", "ignition-math4", "tinyxml", - "urdfdom" + "urdfdom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 6ea60ea3628193..f248dd0a01f1d1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6102,7 +6102,7 @@ }, "sdformat6": { "baseline": "6.2.0", - "port-version": 3 + "port-version": 4 }, "sdformat9": { "baseline": "9.4.0", diff --git a/versions/s-/sdformat6.json b/versions/s-/sdformat6.json index e664b40922444b..2429b11d27f2cd 100644 --- a/versions/s-/sdformat6.json +++ b/versions/s-/sdformat6.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc94f6d1e0351bb777ccd1823470fe22ad896c34", + "version": "6.2.0", + "port-version": 4 + }, { "git-tree": "1273532dcedd66beb82c6ce89024abac0e385761", "version": "6.2.0", From 286d6cd430ef508df940d29449afd6ef1a12a308 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:36:33 +0100 Subject: [PATCH 1088/1858] [lager] no absolute paths (#21302) --- ports/lager/portfile.cmake | 2 ++ ports/lager/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/lager.json | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ports/lager/portfile.cmake b/ports/lager/portfile.cmake index 8df28b481385e9..737df91aaf4620 100644 --- a/ports/lager/portfile.cmake +++ b/ports/lager/portfile.cmake @@ -23,5 +23,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Lager) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/lager/resources_path.hpp" "${CURRENT_PACKAGES_DIR}" ".") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lager/vcpkg.json b/ports/lager/vcpkg.json index af6e3d5652afc5..d59ce787cf0d6e 100644 --- a/ports/lager/vcpkg.json +++ b/ports/lager/vcpkg.json @@ -1,6 +1,7 @@ { "name": "lager", "version-date": "2021-06-17", + "port-version": 1, "description": "C++ library for value-oriented design using the unidirectional data-flow architecture", "homepage": "https://sinusoid.es/lager/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f248dd0a01f1d1..be854eb84a2f23 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3218,7 +3218,7 @@ }, "lager": { "baseline": "2021-06-17", - "port-version": 0 + "port-version": 1 }, "lapack": { "baseline": "3", diff --git a/versions/l-/lager.json b/versions/l-/lager.json index 9dba0ce2287c18..1fd9e7d2fb652c 100644 --- a/versions/l-/lager.json +++ b/versions/l-/lager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c65b1f179b9d6fe4048cf44f3186de7a0332742f", + "version-date": "2021-06-17", + "port-version": 1 + }, { "git-tree": "cc45cef2ecee354f255b9026c8397ca850259ab3", "version-date": "2021-06-17", From 9235271d38a88e347ad59254f75e96dce2fb9793 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:36:51 +0100 Subject: [PATCH 1089/1858] [ace] no absolute paths (#21289) --- ports/ace/portfile.cmake | 3 +++ ports/ace/vcpkg.json | 2 +- versions/a-/ace.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index b478d120b36664..1be127756bcaa3 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -431,6 +431,9 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) # Handle copyright file(INSTALL ${ACE_ROOT}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/ace/bin/MakeProjectCreator") + file(REMOVE "${CURRENT_PACKAGES_DIR}/share/ace/ace-devel.sh") endif() vcpkg_fixup_pkgconfig() diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 77463fd0714856..55a5b76ece4662 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ace", "version": "7.0.3", - "port-version": 2, + "port-version": 3, "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", "features": { diff --git a/versions/a-/ace.json b/versions/a-/ace.json index 4e05683ae848da..f6081bc42fafe6 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c58c295074b4a00a80b4e684f9a876ed369cdd49", + "version": "7.0.3", + "port-version": 3 + }, { "git-tree": "67c57059b237310a1907da692fc75acb3d8d2726", "version": "7.0.3", diff --git a/versions/baseline.json b/versions/baseline.json index be854eb84a2f23..c9954604624a93 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -18,7 +18,7 @@ }, "ace": { "baseline": "7.0.3", - "port-version": 2 + "port-version": 3 }, "activemq-cpp": { "baseline": "3.9.5", From f7d6526b2cb0cd068a726662759cf442e78ff28b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:37:13 +0100 Subject: [PATCH 1090/1858] [botan] no absolute paths (#21287) --- ports/botan/portfile.cmake | 4 ++++ ports/botan/vcpkg.json | 2 +- versions/b-/botan.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/botan/portfile.cmake b/ports/botan/portfile.cmake index bfc7db36e49f90..ab66cf27532109 100644 --- a/ports/botan/portfile.cmake +++ b/ports/botan/portfile.cmake @@ -162,4 +162,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_PREFIX R\"(${CURRENT_PACKAGES_DIR})\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "#define BOTAN_INSTALL_LIB_DIR R\"(${CURRENT_PACKAGES_DIR}/lib)\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/botan/build.h" "--prefix=${CURRENT_PACKAGES_DIR}" "") + file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/botan/vcpkg.json b/ports/botan/vcpkg.json index 01891cc6a8ba08..1c2d7e1a30ebb2 100644 --- a/ports/botan/vcpkg.json +++ b/ports/botan/vcpkg.json @@ -1,7 +1,7 @@ { "name": "botan", "version": "2.18.1", - "port-version": 3, + "port-version": 4, "description": "A cryptography library written in C++11", "homepage": "https://botan.randombit.net", "supports": "!(windows & arm)", diff --git a/versions/b-/botan.json b/versions/b-/botan.json index 78fde907139926..8e96e8fe522916 100644 --- a/versions/b-/botan.json +++ b/versions/b-/botan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "477e259691b81a016da459532f616b5fca230a91", + "version": "2.18.1", + "port-version": 4 + }, { "git-tree": "045c95bf0e7f1352d91398bc0dc41ce5ec5a288a", "version": "2.18.1", diff --git a/versions/baseline.json b/versions/baseline.json index c9954604624a93..b8eee9ba683465 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1130,7 +1130,7 @@ }, "botan": { "baseline": "2.18.1", - "port-version": 3 + "port-version": 4 }, "box2d": { "baseline": "2.4.1", From f0beb6751c0df5ddbe6a0b0a4639734834adc97f Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:37:34 +0100 Subject: [PATCH 1091/1858] [libgpg-error] no absolute paths (#21269) --- ports/libgpg-error/portfile.cmake | 9 +++++---- ports/libgpg-error/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libgpg-error.json | 5 +++++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake index 711f7e76e62442..17d26617d24996 100644 --- a/ports/libgpg-error/portfile.cmake +++ b/ports/libgpg-error/portfile.cmake @@ -40,7 +40,7 @@ if(VCPKG_TARGET_IS_WINDOWS) vcpkg_install_msbuild( USE_VCPKG_INTEGRATION - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH SMP/libgpg-error.sln PLATFORM ${TRIPLET_SYSTEM_ARCH} LICENSE_SUBPATH COPYING.LIB @@ -81,7 +81,7 @@ else() vcpkg_configure_make( AUTOCONFIG - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS --disable-tests --disable-doc @@ -91,7 +91,8 @@ else() vcpkg_install_make() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale" "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -endif() \ No newline at end of file +endif() diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json index 81024b701a43a3..515330256255c5 100644 --- a/ports/libgpg-error/vcpkg.json +++ b/ports/libgpg-error/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libgpg-error", "version": "1.42", - "port-version": 1, + "port-version": 2, "description": "A common dependency of all GnuPG components", "homepage": "https://gnupg.org/software/libgpg-error/index.html", "supports": "!(windows & (arm | arm64))" diff --git a/versions/baseline.json b/versions/baseline.json index b8eee9ba683465..c5d78467bccbe7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3470,7 +3470,7 @@ }, "libgpg-error": { "baseline": "1.42", - "port-version": 1 + "port-version": 2 }, "libgpod": { "baseline": "2019-08-29", diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json index 395eb94f08f5fc..9d75dd02f4f995 100644 --- a/versions/l-/libgpg-error.json +++ b/versions/l-/libgpg-error.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6c78e927a70ff136576abd61f1125861824bfd2", + "version": "1.42", + "port-version": 2 + }, { "git-tree": "b5abbf9cf832337e202ff5d8d4296025b47be1a0", "version": "1.42", From 5f5fbb69eaaa6b1a783bca9615b3b460e98c440b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Thu, 11 Nov 2021 22:38:04 +0100 Subject: [PATCH 1092/1858] [graphite2] no absolute paths (#21268) * [graphite] no absolute paths * update version * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/graphite2/portfile.cmake | 18 +++++++++--------- ports/graphite2/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 2 +- versions/g-/graphite2.json | 5 +++++ 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake index 428aa3a68c047c..62a71bb171c703 100644 --- a/ports/graphite2/portfile.cmake +++ b/ports/graphite2/portfile.cmake @@ -7,21 +7,21 @@ vcpkg_from_github( PATCHES disable-tests.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DDISABLE_TESTS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libgraphite2.la" "${CURRENT_PACKAGES_DIR}/debug/lib/libgraphite2.la") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(COPY "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/graphite2/vcpkg.json b/ports/graphite2/vcpkg.json index 70a6b070fab94a..1dc5a3fc25380f 100644 --- a/ports/graphite2/vcpkg.json +++ b/ports/graphite2/vcpkg.json @@ -1,10 +1,20 @@ { "name": "graphite2", - "version-string": "1.3.14", - "port-version": 2, + "version": "1.3.14", + "port-version": 3, "description": [ "Graphite is a \"smart font\" system developed specifically to handle the complexities of lesser-known languages of the world.", "Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications." ], - "homepage": "https://github.com/silnrsi/graphite" + "homepage": "https://github.com/silnrsi/graphite", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index c5d78467bccbe7..415f9b559148bd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2546,7 +2546,7 @@ }, "graphite2": { "baseline": "1.3.14", - "port-version": 2 + "port-version": 3 }, "graphqlparser": { "baseline": "0.7.0", diff --git a/versions/g-/graphite2.json b/versions/g-/graphite2.json index 8d6de06834a4b2..19e5978ba5e1ae 100644 --- a/versions/g-/graphite2.json +++ b/versions/g-/graphite2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "247c12c09e9766df6a90a8a45dad08320f4e0493", + "version": "1.3.14", + "port-version": 3 + }, { "git-tree": "a2078beaafe054dd4f6bd162af48de28f3f9194c", "version-string": "1.3.14", From b7c264d2c70bb04e76ba9bbc1b97d18babb366cd Mon Sep 17 00:00:00 2001 From: Jonathan Sweemer Date: Fri, 12 Nov 2021 06:38:44 +0900 Subject: [PATCH 1093/1858] [quantlib] update to 1.24 (#21068) * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 * [quantlib] update to 1.24 --- ports/quantlib/disable-examples-tests.patch | 13 ------------- ports/quantlib/fix-mac-build.patch | 15 --------------- ports/quantlib/portfile.cmake | 21 +++++++++------------ ports/quantlib/vcpkg.json | 4 +++- versions/baseline.json | 2 +- versions/q-/quantlib.json | 5 +++++ 6 files changed, 18 insertions(+), 42 deletions(-) delete mode 100644 ports/quantlib/disable-examples-tests.patch delete mode 100644 ports/quantlib/fix-mac-build.patch diff --git a/ports/quantlib/disable-examples-tests.patch b/ports/quantlib/disable-examples-tests.patch deleted file mode 100644 index b42e0bc255d75e..00000000000000 --- a/ports/quantlib/disable-examples-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d046251cc..d8201bf6a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -44,8 +44,6 @@ if (Boost_FOUND) - endif (Boost_FOUND) - - add_subdirectory(ql) --add_subdirectory(Examples) --add_subdirectory(test-suite) - - # - # Copy across the ANSI config file into the build directory. Users diff --git a/ports/quantlib/fix-mac-build.patch b/ports/quantlib/fix-mac-build.patch deleted file mode 100644 index a114f96e7d56ae..00000000000000 --- a/ports/quantlib/fix-mac-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 62ab08a115..2b383c1dd5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,6 +2,10 @@ cmake_minimum_required() - - project(QuantLib) - -+if(APPLE AND NOT CMAKE_CXX_STANDARD) -+ set(CMAKE_CXX_STANDARD 11) -+endif() -+ - include(CTest) - include(${CMAKE_CURRENT_LIST_DIR}/cmake/quantlib.cmake) - diff --git a/ports/quantlib/portfile.cmake b/ports/quantlib/portfile.cmake index f7cf9b7770da75..5f110915cfa11d 100644 --- a/ports/quantlib/portfile.cmake +++ b/ports/quantlib/portfile.cmake @@ -1,26 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lballabio/QuantLib - REF QuantLib-v1.22 - SHA512 279c2e9273dd0fbc03d19ac19814e8a3b5544545cc1441982232f89bd313fe76b6e252dbcae8a3d146ecc4f1d1e64632ac412096b89da882ba879a66776fdb91 + REF QuantLib-v1.24 + SHA512 1a63d90363cda69e20e40a60a2d6357f632fac997df520b949e73feb256dac8a999395d0ebe94734ac630e9104e512b0a545f6a2111b287a41e9128127aa5bb0 HEAD_REF master - PATCHES - disable-examples-tests.patch - fix-mac-build.patch # fixed in next release ) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" USE_BOOST_DYNAMIC_LIBRARIES) - -set(QL_MSVC_RUNTIME ${VCPKG_LIBRARY_LINKAGE}) - -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +if (VCPKG_TARGET_IS_WINDOWS) + # This can (and should) be removed if QuantLib ever supports dynamically linking on Windows + vcpkg_check_linkage(ONLY_STATIC_LIBRARY) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DUSE_BOOST_DYNAMIC_LIBRARIES=${USE_BOOST_DYNAMIC_LIBRARIES} - -DMSVC_RUNTIME=${QL_MSVC_RUNTIME} + -DQL_BUILD_BENCHMARK=OFF + -DQL_BUILD_EXAMPLES=OFF + -DQL_BUILD_TEST_SUITE=OFF ) vcpkg_install_cmake() diff --git a/ports/quantlib/vcpkg.json b/ports/quantlib/vcpkg.json index ee732abc26e96f..e4d37e94445a37 100644 --- a/ports/quantlib/vcpkg.json +++ b/ports/quantlib/vcpkg.json @@ -1,8 +1,9 @@ { "name": "quantlib", - "version": "1.22", + "version": "1.24", "description": "The QuantLib C++ library", "homepage": "https://www.quantlib.org/", + "supports": "!(windows & !static)", "dependencies": [ "boost-accumulators", "boost-algorithm", @@ -30,6 +31,7 @@ "boost-serialization", "boost-signals2", "boost-smart-ptr", + "boost-test", "boost-thread", "boost-tuple", "boost-type-traits", diff --git a/versions/baseline.json b/versions/baseline.json index 415f9b559148bd..9c70bb5eb07ca4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5777,7 +5777,7 @@ "port-version": 1 }, "quantlib": { - "baseline": "1.22", + "baseline": "1.24", "port-version": 0 }, "quaternions": { diff --git a/versions/q-/quantlib.json b/versions/q-/quantlib.json index 5e0cca721eb777..3277be8627ec43 100644 --- a/versions/q-/quantlib.json +++ b/versions/q-/quantlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8519a43e706ff22152e65942f48e5abd75bb76f", + "version": "1.24", + "port-version": 0 + }, { "git-tree": "b2d3e38a4ca6467154bf1a46fd2663d937c3858b", "version": "1.22", From f1dfb3ca5f01f43a5e8b96be226fc0948dca01a6 Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Fri, 12 Nov 2021 05:47:51 +0800 Subject: [PATCH 1094/1858] [sdl2] Add feature x11 (#21188) * [ssdl2] Add feature x11 * Update dependencies * Update version files --- ports/ffmpeg/vcpkg.json | 15 ++++++-- ports/gamedev-framework/vcpkg.json | 14 +++++++- ports/pixel/vcpkg.json | 15 ++++++-- ports/sdl2/portfile.cmake | 57 +++++++++++++++++------------- ports/sdl2/vcpkg.json | 15 +++++++- versions/baseline.json | 8 ++--- versions/f-/ffmpeg.json | 5 +++ versions/g-/gamedev-framework.json | 5 +++ versions/p-/pixel.json | 5 +++ versions/s-/sdl2.json | 5 +++ 10 files changed, 109 insertions(+), 35 deletions(-) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 2b060b31aa1617..cb5e1794aa91c6 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ffmpeg", "version": "4.4", - "port-version": 17, + "port-version": 18, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." @@ -493,7 +493,18 @@ "sdl2": { "description": "Sdl2 support", "dependencies": [ - "sdl2" + { + "name": "sdl2", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "sdl2", + "platform": "!linux" + } ] }, "snappy": { diff --git a/ports/gamedev-framework/vcpkg.json b/ports/gamedev-framework/vcpkg.json index fe42c33a4a762c..e8b63f2126d85c 100644 --- a/ports/gamedev-framework/vcpkg.json +++ b/ports/gamedev-framework/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gamedev-framework", "version-semver": "0.20.0", + "port-version": 1, "maintainers": [ "Julien Bernard ", "Arthur Hugeat " @@ -16,7 +17,18 @@ "boost-heap", "freetype", "pugixml", - "sdl2", + { + "name": "sdl2", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "sdl2", + "platform": "!linux" + }, "stb", "zlib" ] diff --git a/ports/pixel/vcpkg.json b/ports/pixel/vcpkg.json index a562aa8afbdf35..df2963bc99ff8c 100644 --- a/ports/pixel/vcpkg.json +++ b/ports/pixel/vcpkg.json @@ -1,13 +1,24 @@ { "name": "pixel", "version-string": "0.3", - "port-version": 2, + "port-version": 3, "description": "Simple 2D Graphics based on standard and portable OpenGL.", "homepage": "https://github.com/dascandy/pixel", "supports": "!windows", "dependencies": [ "glew", "opengl", - "sdl2" + { + "name": "sdl2", + "default-features": false, + "features": [ + "x11" + ], + "platform": "linux" + }, + { + "name": "sdl2", + "platform": "!linux" + } ] } diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake index 391ea4f762624c..56e82dafa1be76 100644 --- a/ports/sdl2/portfile.cmake +++ b/ports/sdl2/portfile.cmake @@ -18,12 +18,19 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - vulkan VIDEO_VULKAN + vulkan VIDEO_VULKAN + x11 X11_SHARED ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +if ("x11" IN_LIST FEATURES) + if (VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature x11 only support UNIX.") + endif() + message(WARNING "You will need to install Xorg dependencies to use feature x11:\nsudo apt install libx11-dev libxft-dev libxext-dev\n") +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DSDL_STATIC=${SDL_STATIC} -DSDL_SHARED=${SDL_SHARED} @@ -31,50 +38,50 @@ vcpkg_configure_cmake( -DLIBC=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake") - vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) + vcpkg_cmake_config_fixup(CONFIG_PATH cmake) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/SDL2") - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SDL2) + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/SDL2) elseif(EXISTS "${CURRENT_PACKAGES_DIR}/SDL2.framework/Resources") - vcpkg_fixup_cmake_targets(CONFIG_PATH SDL2.framework/Resources) + vcpkg_cmake_config_fixup(CONFIG_PATH SDL2.framework/Resources) endif() file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/bin/sdl2-config - ${CURRENT_PACKAGES_DIR}/debug/bin/sdl2-config - ${CURRENT_PACKAGES_DIR}/SDL2.framework - ${CURRENT_PACKAGES_DIR}/debug/SDL2.framework + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/bin/sdl2-config" + "${CURRENT_PACKAGES_DIR}/debug/bin/sdl2-config" + "${CURRENT_PACKAGES_DIR}/SDL2.framework" + "${CURRENT_PACKAGES_DIR}/debug/SDL2.framework" ) -file(GLOB BINS ${CURRENT_PACKAGES_DIR}/debug/bin/* ${CURRENT_PACKAGES_DIR}/bin/*) +file(GLOB BINS "${CURRENT_PACKAGES_DIR}/debug/bin/*" "${CURRENT_PACKAGES_DIR}/bin/*") if(NOT BINS) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/bin - ${CURRENT_PACKAGES_DIR}/debug/bin + "${CURRENT_PACKAGES_DIR}/bin" + "${CURRENT_PACKAGES_DIR}/debug/bin" ) endif() -if(NOT VCPKG_CMAKE_SYSTEM_NAME) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/SDL2main.lib ${CURRENT_PACKAGES_DIR}/lib/manual-link/SDL2main.lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/SDL2main.lib" "${CURRENT_PACKAGES_DIR}/lib/manual-link/SDL2main.lib") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/SDL2maind.lib ${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDL2maind.lib) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/SDL2maind.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/manual-link/SDL2maind.lib") endif() - file(GLOB SHARE_FILES ${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake) + file(GLOB SHARE_FILES "${CURRENT_PACKAGES_DIR}/share/sdl2/*.cmake") foreach(SHARE_FILE ${SHARE_FILES}) vcpkg_replace_string("${SHARE_FILE}" "lib/SDL2main" "lib/manual-link/SDL2main") endforeach() endif() -configure_file(${SOURCE_PATH}/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() set(DYLIB_COMPATIBILITY_VERSION_REGEX "set\\(DYLIB_COMPATIBILITY_VERSION (.+)\\)") @@ -89,4 +96,4 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/sdl2.pc" "-lSDL2 " "-lSDL2d ") endif() -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() \ No newline at end of file diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json index 6c0ce100ab8ae1..dc5ab84190aae3 100644 --- a/ports/sdl2/vcpkg.json +++ b/ports/sdl2/vcpkg.json @@ -1,12 +1,25 @@ { "name": "sdl2", "version": "2.0.16", - "port-version": 1, + "port-version": 2, "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.", "homepage": "https://www.libsdl.org/download-2.0.php", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "vulkan": { "description": "Vulkan functionality for SDL" + }, + "x11": { + "description": "Dynamically load X11 support" } } } diff --git a/versions/baseline.json b/versions/baseline.json index 9c70bb5eb07ca4..1079671bb25e74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2134,7 +2134,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 17 + "port-version": 18 }, "ffnvcodec": { "baseline": "11.1.5.0", @@ -2330,7 +2330,7 @@ }, "gamedev-framework": { "baseline": "0.20.0", - "port-version": 0 + "port-version": 1 }, "gamenetworkingsockets": { "baseline": "1.3.0", @@ -5210,7 +5210,7 @@ }, "pixel": { "baseline": "0.3", - "port-version": 2 + "port-version": 3 }, "pixman": { "baseline": "0.40.0", @@ -6118,7 +6118,7 @@ }, "sdl2": { "baseline": "2.0.16", - "port-version": 1 + "port-version": 2 }, "sdl2-gfx": { "baseline": "1.0.4", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index e288e836faec84..0ec91d0afdfa37 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fa1d927c640e5fc9abb088c7409e90057cd0b371", + "version": "4.4", + "port-version": 18 + }, { "git-tree": "795e31317ef58fbe13247af9e8bade71f3edde5e", "version": "4.4", diff --git a/versions/g-/gamedev-framework.json b/versions/g-/gamedev-framework.json index 89dccc8d6a0339..624ae044402b47 100644 --- a/versions/g-/gamedev-framework.json +++ b/versions/g-/gamedev-framework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9771cd4f7093f5d34a78d3e2417707185444910", + "version-semver": "0.20.0", + "port-version": 1 + }, { "git-tree": "195d4f41db9d03aa44fa6cc0d984668115a17718", "version-semver": "0.20.0", diff --git a/versions/p-/pixel.json b/versions/p-/pixel.json index f3c7a0294c458e..d10f82cfa36d0a 100644 --- a/versions/p-/pixel.json +++ b/versions/p-/pixel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57198090e451e125ad231a0a1068643cbd06cb61", + "version-string": "0.3", + "port-version": 3 + }, { "git-tree": "bd45dec4585e8be40088a7017dcce546a009748f", "version-string": "0.3", diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json index 41c18aecccb5e2..2c1bd7f77e1420 100644 --- a/versions/s-/sdl2.json +++ b/versions/s-/sdl2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "120b4a3f60f1b2bfc0f20a7c20b5494fff8ea519", + "version": "2.0.16", + "port-version": 2 + }, { "git-tree": "f39203f93b1c068fca2dd7b7501891d8aca3b65d", "version": "2.0.16", From 0c83dd36470977d428687e25b8c18fe2e19985de Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 12 Nov 2021 20:52:32 +0100 Subject: [PATCH 1095/1858] fix regression in vcpkg_find_acquire_program and require exact version match for meson (#21341) --- .../cmake/vcpkg_find_acquire_program.cmake | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 89f03fc286f64a..7769cfc9059346 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -49,7 +49,7 @@ Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_ac function(z_vcpkg_find_acquire_program_version_check out_var) cmake_parse_arguments(PARSE_ARGV 1 arg - "" + "EXACT_VERSION_MATCH" "MIN_VERSION;PROGRAM_NAME" "COMMAND" ) @@ -60,8 +60,14 @@ function(z_vcpkg_find_acquire_program_version_check out_var) ) string(STRIP "${program_version_output}" program_version_output) #TODO: REGEX MATCH case for more complex cases! - if(NOT "${program_version_output}" VERSION_GREATER_EQUAL "${arg_MIN_VERSION}") - message(STATUS "Found ${arg_PROGRAM_NAME}('${program_version_output}') but at least version ${arg_MIN_VERSION} is required! Trying to use internal version if possible!") + set(version_compare VERSION_GREATER_EQUAL) + set(version_compare_msg "at least") + if(arg_EXACT_VERSION_MATCH) + set(version_compare VERSION_EQUAL) + set(version_compare_msg "exact") + endif() + if(NOT "${program_version_output}" ${version_compare} "${arg_MIN_VERSION}") + message(STATUS "Found ${arg_PROGRAM_NAME}('${program_version_output}') but ${version_compare_msg} version ${arg_MIN_VERSION} is required! Trying to use internal version if possible!") set("${out_var}" OFF PARENT_SCOPE) else() message(STATUS "Found external ${arg_PROGRAM_NAME}('${program_version_output}').") @@ -71,10 +77,13 @@ endfunction() function(z_vcpkg_find_acquire_program_find_external program) cmake_parse_arguments(PARSE_ARGV 1 arg - "" + "EXACT_VERSION_MATCH" "INTERPRETER;MIN_VERSION;PROGRAM_NAME" "NAMES;VERSION_COMMAND" ) + if(arg_EXACT_VERSION_MATCH) + set(arg_EXACT_VERSION_MATCH EXACT_VERSION_MATCH) + endif() if("${arg_INTERPRETER}" STREQUAL "") find_program("${program}" NAMES ${arg_NAMES}) @@ -84,12 +93,14 @@ function(z_vcpkg_find_acquire_program_find_external program) vcpkg_list(SET program_tmp ${${interpreter}} ${SCRIPT_${program}}) set("${program}" "${program_tmp}" CACHE INTERNAL "") endif() + unset(SCRIPT_${program} CACHE) endif() if("${version_command}" STREQUAL "") set(version_is_good ON) # can't check for the version being good, so assume it is else() z_vcpkg_find_acquire_program_version_check(version_is_good + ${arg_EXACT_VERSION_MATCH} COMMAND ${${program}} ${arg_VERSION_COMMAND} MIN_VERSION "${arg_MIN_VERSION}" PROGRAM_NAME "${arg_PROGRAM_NAME}" @@ -98,7 +109,7 @@ function(z_vcpkg_find_acquire_program_find_external program) if(NOT version_is_good) unset("${program}" PARENT_SCOPE) - set("${program}" "${program}-NOTFOUND" CACHE INTERNAL "") + unset("${program}" CACHE) endif() endfunction() @@ -122,6 +133,7 @@ function(z_vcpkg_find_acquire_program_find_internal program) if(SCRIPT_${program}) set("${program}" ${${arg_INTERPRETER}} ${SCRIPT_${program}} CACHE INTERNAL "") endif() + unset(SCRIPT_${program} CACHE) endif() endfunction() @@ -352,6 +364,7 @@ function(vcpkg_find_acquire_program program) set(download_sha512 18a012a45274dbb4582e99fd69d920f38831e788d9860f9553c64847bedb1c2010ae0b5c0ef4a4350c03f5e0f95aaa0395378e1208109b59640c1a70b1e202d2) set(supported_on_unix ON) set(version_command --version) + set(extra_search_args EXACT_VERSION_MATCH) elseif(program STREQUAL "FLEX" OR program STREQUAL "BISON") if(CMAKE_HOST_WIN32) vcpkg_list(SET sourceforge_args @@ -577,6 +590,7 @@ function(vcpkg_find_acquire_program program) ) if(NOT ${program}) z_vcpkg_find_acquire_program_find_external("${program}" + ${extra_search_args} PROGRAM_NAME "${program_name}" MIN_VERSION "${program_version}" INTERPRETER "${interpreter}" @@ -665,6 +679,7 @@ function(vcpkg_find_acquire_program program) LOGNAME "${program}-tool-post-install" ) endif() + unset("${program}") unset("${program}" CACHE) z_vcpkg_find_acquire_program_find_internal("${program}" INTERPRETER "${interpreter}" From 3d7c51315873618255a0518ab8f7b6d05ce4e11a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sat, 13 Nov 2021 01:37:46 +0100 Subject: [PATCH 1096/1858] [kdbindings] add port (#21306) * [kdbindings] add port * update version * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/kdbindings/portfile.cmake | 24 ++++++++++++++++++++++++ ports/kdbindings/vcpkg.json | 17 +++++++++++++++++ versions/baseline.json | 4 ++++ versions/k-/kdbindings.json | 9 +++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/kdbindings/portfile.cmake create mode 100644 ports/kdbindings/vcpkg.json create mode 100644 versions/k-/kdbindings.json diff --git a/ports/kdbindings/portfile.cmake b/ports/kdbindings/portfile.cmake new file mode 100644 index 00000000000000..736e8efbed177d --- /dev/null +++ b/ports/kdbindings/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDAB/KDBindings + REF bbf790fc94f3018781f32be53c6086aedc0f74ec + SHA512 4303f8e73b376e851d40cab99b848788ae2aff00e0e4ec0006655d8ef9373eebe5e04f734e78037e257d7a5101739b912da9dab15bf1985f204b31224d9c53c5 + HEAD_REF main +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKDBindings_TESTS=OFF + -DKDBindings_EXAMPLES=OFF + -DKDBindings_DOCS=OFF +) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KDBindings) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/" + "${CURRENT_PACKAGES_DIR}/lib/" +) + +file(INSTALL "${SOURCE_PATH}/LICENSES/MIT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/kdbindings/vcpkg.json b/ports/kdbindings/vcpkg.json new file mode 100644 index 00000000000000..0797c2cb15b0aa --- /dev/null +++ b/ports/kdbindings/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "kdbindings", + "version": "1.0.0", + "description": "Reactive programming & data binding in C++", + "homepage": "https://github.com/KDAB/KDBindings", + "license": "MIT OR BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1079671bb25e74..c0769459caa295 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3008,6 +3008,10 @@ "baseline": "1.9.0", "port-version": 1 }, + "kdbindings": { + "baseline": "1.0.0", + "port-version": 0 + }, "kealib": { "baseline": "1.4.14", "port-version": 0 diff --git a/versions/k-/kdbindings.json b/versions/k-/kdbindings.json new file mode 100644 index 00000000000000..fbcc9ef3c1ecfa --- /dev/null +++ b/versions/k-/kdbindings.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5dc85351398a57c7b222ac7a57952849c327c18b", + "version": "1.0.0", + "port-version": 0 + } + ] +} From b7abe33ead0ac075e4306d0a6a5b19d44629d028 Mon Sep 17 00:00:00 2001 From: seladb Date: Fri, 12 Nov 2021 16:38:03 -0800 Subject: [PATCH 1097/1858] [pcapplusplus] Update to 21.11 (#21321) * Bump PcapPlusPlus to v21.11 * Update sha --- ports/pcapplusplus/portfile.cmake | 4 ++-- ports/pcapplusplus/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/p-/pcapplusplus.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/pcapplusplus/portfile.cmake b/ports/pcapplusplus/portfile.cmake index 2ec3eea70d34f3..e280af3c3ffc64 100644 --- a/ports/pcapplusplus/portfile.cmake +++ b/ports/pcapplusplus/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO seladb/PcapPlusPlus - REF v21.05 - SHA512 35227707a48f0e41469247e0993c4aabef7f168a285354e19386b554e0e3d51dc6bf8b128658e16d50e0b6e6e0a029322dee1b4b241e84b8603e2cf73c7f3532 + REF v21.11 + SHA512 ad10034950c0c3e6a4638e8b314c8983ce42609948d7d8d40ad0ff678820a2469807bd29aff77e657a150008602475b50cea84a0766ad87ea203985519cb38ac HEAD_REF master ) diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json index 40a35228f2593f..0d37fff7eb6f33 100644 --- a/ports/pcapplusplus/vcpkg.json +++ b/ports/pcapplusplus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcapplusplus", - "version-string": "21.05", - "description": "PcapPlusPlus is a multiplatform C++ library for capturing, parsing and crafting of network packets", + "version-string": "21.11", + "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", "homepage": "https://github.com/seladb/PcapPlusPlus", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index c0769459caa295..bcacbb0558f45d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5125,7 +5125,7 @@ "port-version": 5 }, "pcapplusplus": { - "baseline": "21.05", + "baseline": "21.11", "port-version": 0 }, "pcg": { diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json index 35f3a210c0e090..7c5b4840c76e73 100644 --- a/versions/p-/pcapplusplus.json +++ b/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0480fc24edf7b699eb027d24c3737026dd1128c", + "version-string": "21.11", + "port-version": 0 + }, { "git-tree": "946d7783c459b46253318626bee9040e4e07bc56", "version-string": "21.05", From 620f25c48888bb7d7f4dcbcf483d28e7982c8a8b Mon Sep 17 00:00:00 2001 From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Date: Sat, 13 Nov 2021 08:38:22 +0800 Subject: [PATCH 1098/1858] [vtk] Fix missing includes (#21319) --- ports/vtk/missing-limits.patch | 48 ++++++++++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 9 ++++--- ports/vtk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/v-/vtk.json | 5 ++++ 5 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 ports/vtk/missing-limits.patch diff --git a/ports/vtk/missing-limits.patch b/ports/vtk/missing-limits.patch new file mode 100644 index 00000000000000..2450e480cfcf44 --- /dev/null +++ b/ports/vtk/missing-limits.patch @@ -0,0 +1,48 @@ +diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h +index ab9d572..202aaa2 100644 +--- a/Common/Core/vtkGenericDataArrayLookupHelper.h ++++ b/Common/Core/vtkGenericDataArrayLookupHelper.h +@@ -25,6 +25,7 @@ + #include "vtkIdList.h" + #include + #include ++#include + #include + #include + +diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx +index 22eca0b..11086f1 100644 +--- a/Common/DataModel/vtkPiecewiseFunction.cxx ++++ b/Common/DataModel/vtkPiecewiseFunction.cxx +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #include + +diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx +index a16bb27..1052192 100644 +--- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx ++++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx +@@ -27,6 +27,7 @@ + #include "vtkHyperTreeGridNonOrientedCursor.h" + + #include ++#include + + vtkStandardNewMacro(vtkHyperTreeGridThreshold); + +diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx +index 55c046b..1be0291 100644 +--- a/Rendering/Core/vtkColorTransferFunction.cxx ++++ b/Rendering/Core/vtkColorTransferFunction.cxx +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 89a55a25d9be2a..63bd5eec20fbd9 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -28,6 +28,7 @@ vcpkg_from_github( 156fb524.patch d107698a.patch fix-gdal.patch + missing-limits.patch # This patch can be removed in next version. Since it has been merged to upstream via https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 ) # ============================================================================= @@ -146,7 +147,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # We set all libraries to "system" and explicitly list the ones that should use embedded copies vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ${VTK_FEATURE_OPTIONS} @@ -268,9 +269,9 @@ if("paraview" IN_LIST FEATURES) endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/vtkpythonmodules/static_python) #python headers + if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/vtkpythonmodules/static_python") #python headers file(GLOB_RECURSE STATIC_PYTHON_FILES "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/CMakeFiles/*/static_python/*.h") - file(INSTALL ${STATIC_PYTHON_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}) + file(INSTALL ${STATIC_PYTHON_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") endif() endif() @@ -298,4 +299,4 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/licenses" "${CURRENT_PACKAGES_DIR}/sh # Usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) # Handle copyright -file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") \ No newline at end of file diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index ca0058ec87c2ca..f443603a6618bd 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 3, + "port-version": 4, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index bcacbb0558f45d..7f8bb2e4a46f40 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7058,7 +7058,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 3 + "port-version": 4 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 6ab4ccbbe22240..975f7bb0e105c6 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "223022edbe63b3ecdb3e9204a4ad63ab61b36ece", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 4 + }, { "git-tree": "1b201a8e060b6c2688ccc2e96cae175f2d8af205", "version-semver": "9.0.3-pv5.9.1", From eb0d4479e61f791decf30d60c62d40e789a45b2e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 13 Nov 2021 08:38:43 +0800 Subject: [PATCH 1099/1858] [eastl] update to 3.18.00 (#21315) * [eastl] Update port commit ref * update version * Bump port-version and fix version database. * Actually fix version database. Co-authored-by: Billy Robert O'Neal III --- ports/eastl/portfile.cmake | 4 ++-- ports/eastl/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/e-/eastl.json | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake index c8e198f4a095f3..d362ac0f41d1d5 100644 --- a/ports/eastl/portfile.cmake +++ b/ports/eastl/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO electronicarts/EASTL - REF 41bd2e4466e33b979d2afc37f9b98dacf1eab50b #v 3.17.03 - SHA512 3011a0a08701b683e22cc624167b4f65fce8b16d0f7a03675f6a1d5b02313c5b763bcc6c8091f65728ed60ceee8d585cbdb1968a35fb24954f4f66afabb23865 + REF e8bdd5531ed79c30ccef2fd71e070f5ab9f1222a #v3.18.00 + SHA512 3e5d97a77b8610a2efdb9156b47c91e8a8dd5629ff95ea6d2c65016b067ab645df5beddc8c7f93d89c3d1a6f404ff71282efc6db9885a6e6240fa444fe2be79c HEAD_REF master PATCHES fix_cmake_install.patch diff --git a/ports/eastl/vcpkg.json b/ports/eastl/vcpkg.json index 07c9d652a90327..e496d68076cd63 100644 --- a/ports/eastl/vcpkg.json +++ b/ports/eastl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "eastl", "version-string": "3.18.00", + "port-version": 1, "description": "Electronic Arts Standard Template Library. It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.", "homepage": "https://github.com/electronicarts/EASTL", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7f8bb2e4a46f40..ad4c06942a0f86 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1938,7 +1938,7 @@ }, "eastl": { "baseline": "3.18.00", - "port-version": 0 + "port-version": 1 }, "easycl": { "baseline": "0.3", diff --git a/versions/e-/eastl.json b/versions/e-/eastl.json index 9115dc8f0aad3e..7a67948716fa29 100644 --- a/versions/e-/eastl.json +++ b/versions/e-/eastl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41bc58f85c73fb0dec5374fc0c9b84ffc401555c", + "version-string": "3.18.00", + "port-version": 1 + }, { "git-tree": "a9f54d0c4a7a571329fd2ee5e8788c2a5a5414ca", "version-string": "3.18.00", From 3edfa5ea8d4e6fd89b0b7170e9b31c8bf8e8df23 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Sat, 13 Nov 2021 08:39:29 +0800 Subject: [PATCH 1100/1858] [ffmpeg] update version to 4.4.1 (#21049) * [ffmpeg] update to 4.4.1 * Update version database * update version * update version Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/ffmpeg/portfile.cmake | 4 ++-- ports/ffmpeg/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/f-/ffmpeg.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 9cd4a2ff62f866..668f07e414874c 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -133,8 +133,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg - REF n4.4 - SHA512 ae7426ca476df9fa9dba52cab06c38e484f835653fb2da57e7c06f5589d887c0854ee17df93a2f57191d498c1264cb1c69312cf0a8214b476800382e2d260c4b + REF n4.4.1 + SHA512 a53e617937f9892c5cfddb00896be9ad8a3e398dc7cf3b6c893b52ff38aff6ff0cbc61a44cd5f93d9a28f775e71ae82996a5e2b699a769c1de8f882aab34c797 HEAD_REF master PATCHES 0001-create-lib-libraries.patch diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index cb5e1794aa91c6..91e065ecf6cd1b 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ffmpeg", - "version": "4.4", - "port-version": 18, + "version": "4.4.1", "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index ad4c06942a0f86..80860f6afe760d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2133,8 +2133,8 @@ "port-version": 5 }, "ffmpeg": { - "baseline": "4.4", - "port-version": 18 + "baseline": "4.4.1", + "port-version": 0 }, "ffnvcodec": { "baseline": "11.1.5.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 0ec91d0afdfa37..fa79715efb5b9f 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e39b9e35530239498574713a75bd9160f23e1d20", + "version": "4.4.1", + "port-version": 0 + }, { "git-tree": "fa1d927c640e5fc9abb088c7409e90057cd0b371", "version": "4.4", From 23e02e84ff28a2f4b9edb9d60fa4a311b4d34ae3 Mon Sep 17 00:00:00 2001 From: Christian Rendina Date: Sat, 13 Nov 2021 01:39:48 +0100 Subject: [PATCH 1101/1858] Python 3.10: fix deprecated win7 support patch (#21236) * [PYTHON] Update windows7 patch * [VCPKG] Updated version --- .../0006-restore-support-for-windows-7.patch | 24 +++++++++---------- ports/python3/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/python3.json | 5 ++++ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ports/python3/0006-restore-support-for-windows-7.patch b/ports/python3/0006-restore-support-for-windows-7.patch index 837666393cb61c..e240fefffc1f9e 100644 --- a/ports/python3/0006-restore-support-for-windows-7.patch +++ b/ports/python3/0006-restore-support-for-windows-7.patch @@ -9,11 +9,11 @@ pathcch. The same mechanism is applied to fix posixmodule.c --- +index 25ddc82..ff51042 100644 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index c984e2e..6c9787a 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -18,7 +18,7 @@ +@@ -20,7 +20,7 @@ FSCTL_GET_REPARSE_POINT is not exported with WIN32_LEAN_AND_MEAN. */ # include @@ -21,26 +21,26 @@ index c984e2e..6c9787a 100644 +# include #endif - #include "pycore_ceval.h" // _PyEval_ReInitThreads() -@@ -4371,6 +4371,10 @@ os._path_splitroot - Removes everything after the root on Win32. - [clinic start generated code]*/ + #ifdef __VXWORKS__ +@@ -4410,6 +4410,10 @@ os__getvolumepathname_impl(PyObject *module, path_t *path) + return result; + } +static int _PathCchSkipRoot_Initialized = 0; +typedef HRESULT (__stdcall *PPathCchSkipRoot) (PCWSTR pszPath, PCWSTR *ppszRootEnd); +static PPathCchSkipRoot _PathCchSkipRoot; + - static PyObject * - os__path_splitroot_impl(PyObject *module, path_t *path) - /*[clinic end generated code: output=ab7f1a88b654581c input=dc93b1d3984cffb6]*/ -@@ -4380,6 +4384,19 @@ os__path_splitroot_impl(PyObject *module, path_t *path) + + /*[clinic input] + os._path_splitroot +@@ -4428,6 +4432,19 @@ os__path_splitroot_impl(PyObject *module, path_t *path) PyObject *result = NULL; HRESULT ret; + if (_PathCchSkipRoot_Initialized == 0) { + HMODULE pathapi = LoadLibraryExW(L"api-ms-win-core-path-l1-1-0.dll", NULL, + LOAD_LIBRARY_SEARCH_SYSTEM32); -+ ++ + if (pathapi) { + _PathCchSkipRoot = (PPathCchSkipRoot)GetProcAddress(pathapi, "PathCchSkipRoot"); + } else { @@ -53,7 +53,7 @@ index c984e2e..6c9787a 100644 buffer = (wchar_t*)PyMem_Malloc(sizeof(wchar_t) * (wcslen(path->wide) + 1)); if (!buffer) { return NULL; -@@ -4390,7 +4407,14 @@ os__path_splitroot_impl(PyObject *module, path_t *path) +@@ -4438,7 +4455,14 @@ os__path_splitroot_impl(PyObject *module, path_t *path) } Py_BEGIN_ALLOW_THREADS diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index 358fcac48e2f43..b0e20b8f79d5cb 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-semver": "3.10.0", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index 80860f6afe760d..175beace4eb409 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5426,7 +5426,7 @@ }, "python3": { "baseline": "3.10.0", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 1e408989bb001c..c90ee6f467c378 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8c0f995b8f1831fc7f345329c2ce0a80d717551", + "version-semver": "3.10.0", + "port-version": 2 + }, { "git-tree": "b155976e5a0266f5f73e2ff642b5281303a6a73f", "version-semver": "3.10.0", From ad4833ea573a1b4d1e5bcb14669ee82b04411ec4 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Sat, 13 Nov 2021 01:40:14 +0100 Subject: [PATCH 1102/1858] [plplot] no absolute paths (#21303) --- ports/plplot/portfile.cmake | 46 ++++++++++++++++++++----------------- ports/plplot/vcpkg.json | 12 ++++++++-- versions/baseline.json | 2 +- versions/p-/plplot.json | 5 ++++ 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/ports/plplot/portfile.cmake b/ports/plplot/portfile.cmake index cc4b7a433a2fc0..da70bbe4e67665 100644 --- a/ports/plplot/portfile.cmake +++ b/ports/plplot/portfile.cmake @@ -15,14 +15,14 @@ vcpkg_from_sourceforge( fix-pkg-config.patch ) -set(BUILD_with_wxwidgets OFF) -if("wxwidgets" IN_LIST FEATURES) - set(BUILD_with_wxwidgets ON) -endif() +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + wxwidgets BUILD_with_wxwidgets +) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_tcl=OFF -DENABLE_d=OFF @@ -31,41 +31,45 @@ vcpkg_configure_cmake( -DPL_HAVE_QHULL=OFF -DPLPLOT_USE_QT5=OFF -DPL_DOUBLE=ON - -DPLD_wxwidgets=${BUILD_with_wxwidgets} -DENABLE_DYNDRIVERS=OFF -DDATA_DIR=${CURRENT_PACKAGES_DIR}/share/plplot + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DDRV_DIR=${CURRENT_PACKAGES_DIR}/debug/bin OPTIONS_RELEASE -DDRV_DIR=${CURRENT_PACKAGES_DIR}/bin ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/plplot) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/plplot) + +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/plplot/examples/plplot-test-interactive.sh") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/plplot/examples/plplot-test-interactive.sh" "${CURRENT_PACKAGES_DIR}/share/plplot" "../") +endif() # Remove unnecessary tool file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/bin/pltek.exe - ${CURRENT_PACKAGES_DIR}/bin/pltek.exe - ${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe - ${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe + "${CURRENT_PACKAGES_DIR}/debug/bin/pltek.exe" + "${CURRENT_PACKAGES_DIR}/bin/pltek.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/wxPLViewer.exe" + "${CURRENT_PACKAGES_DIR}/bin/wxPLViewer.exe" ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") message(STATUS "Static build: Removing the full bin directory.") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/bin - ${CURRENT_PACKAGES_DIR}/bin + "${CURRENT_PACKAGES_DIR}/debug/bin" + "${CURRENT_PACKAGES_DIR}/bin" ) endif() # Remove unwanted and duplicate directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - -vcpkg_fixup_pkgconfig() +vcpkg_fixup_pkgconfig() diff --git a/ports/plplot/vcpkg.json b/ports/plplot/vcpkg.json index 80eed11923c7a1..6f7197318014ea 100644 --- a/ports/plplot/vcpkg.json +++ b/ports/plplot/vcpkg.json @@ -1,12 +1,20 @@ { "name": "plplot", - "version-string": "5.13.0", - "port-version": 11, + "version-semver": "5.13.0", + "port-version": 12, "description": "PLplot is a cross-platform software package for creating scientific plots whose (UTF-8) plot symbols and text are limited in practice only by what Unicode-aware system fonts are installed on a user's computer.", "dependencies": [ "bzip2", "freetype", "libpng", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 175beace4eb409..9c3aa29401442a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5258,7 +5258,7 @@ }, "plplot": { "baseline": "5.13.0", - "port-version": 11 + "port-version": 12 }, "plustache": { "baseline": "0.4.0", diff --git a/versions/p-/plplot.json b/versions/p-/plplot.json index ebcf8ac2b8d828..ca58d2291f3270 100644 --- a/versions/p-/plplot.json +++ b/versions/p-/plplot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81172e3761f2638245de863b13d8e13cbf08188d", + "version-semver": "5.13.0", + "port-version": 12 + }, { "git-tree": "ad6d85b2cc702beabe146047209cb580174ceea8", "version-string": "5.13.0", From f614dd9d96f6c5d8014b00207ba009678ae2fef3 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Fri, 12 Nov 2021 16:40:40 -0800 Subject: [PATCH 1103/1858] [opencascade] Update to 7.6.0 (#21314) * [opencascade] Update to 7.6.0 * add homepage Co-authored-by: Cheney-Wang --- ports/opencascade/fix-pdb-find.patch | 12 ++++++------ ports/opencascade/portfile.cmake | 13 +++++-------- ports/opencascade/vcpkg.json | 4 ++-- versions/baseline.json | 4 ++-- versions/o-/opencascade.json | 5 +++++ 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/ports/opencascade/fix-pdb-find.patch b/ports/opencascade/fix-pdb-find.patch index dd9b108637d03e..c74aba04f53fd3 100644 --- a/ports/opencascade/fix-pdb-find.patch +++ b/ports/opencascade/fix-pdb-find.patch @@ -1,5 +1,5 @@ diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake -index 6cf0cb66..2a9b1793 100644 +index a63f3ce..aa77c20 100644 --- a/adm/cmake/cotire.cmake +++ b/adm/cmake/cotire.cmake @@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) @@ -19,15 +19,15 @@ index 6cf0cb66..2a9b1793 100644 cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} ANDROID_API ANDROID_API_MIN ANDROID_GUI diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake -index 79605059..630a978e 100644 +index 2f96c6f..78f15f0 100644 --- a/adm/cmake/occt_toolkit.cmake +++ b/adm/cmake/occt_toolkit.cmake -@@ -231,7 +231,7 @@ if (EXECUTABLE_PROJECT) +@@ -235,7 +235,7 @@ if (EXECUTABLE_PROJECT) else() add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) - if (MSVC) + if (MSVC AND BUILD_SHARED_LIBS) - install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb - CONFIGURATIONS Debug RelWithDebInfo - DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}") + if (BUILD_FORCE_RelWithDebInfo) + set (aReleasePdbConf "Release") + else() diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 5188e6b0532919..a1f7e439d915b6 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -1,10 +1,8 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Open-Cascade-SAS/OCCT - REF 628c0211d53c7fe1036a85e7a7b2b067c9c50f7a #V7.5.0 - SHA512 8d946e971417642264b318353fb34ebabf214bff5c705c60818da9e56e9cd658ed15b76b73d7207edffa398c23ad9982f4e9656b218b5edada325ca05c1283bb + REF 80ffc5f84dae96de6ed093d3e5d2466a9e368b27 #V7.6.0 + SHA512 1dfee9c59eb6ea61735f0807d44ccf62019a2649f506a5a8197e04b1533592dc95d6d67ab7a3bb392785755ed60b6fc489bea049f658d4ae7d05dfe0d7d5bdcd HEAD_REF master PATCHES fix-pdb-find.patch @@ -27,13 +25,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # VTK option in opencascade not currently supported because only 6.1.0 is supported but vcpkg has >= 9.0 - # We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0 # And pre-built ActiveTCL binaries are behind a marketing wall :( # We use the Unix install layout for Windows as it matches vcpkg vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${FEATURE_OPTIONS} + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} -DBUILD_LIBRARY_TYPE=${BUILD_TYPE} -DBUILD_MODULE_Draw=OFF -DINSTALL_DIR_LAYOUT=Unix @@ -76,7 +74,6 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) # debug creates libd and bind directories that need moving file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/opencascade/vcpkg.json b/ports/opencascade/vcpkg.json index f3ffe14611ffa5..ea7ddba2961fbf 100644 --- a/ports/opencascade/vcpkg.json +++ b/ports/opencascade/vcpkg.json @@ -1,8 +1,8 @@ { "name": "opencascade", - "version-string": "7.5.0", - "port-version": 3, + "version": "7.6.0", "description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.", + "homepage": "https://github.com/Open-Cascade-SAS/OCCT", "supports": "!(uwp | osx | linux | arm)", "dependencies": [ "freetype", diff --git a/versions/baseline.json b/versions/baseline.json index 9c3aa29401442a..0caeab705254ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4865,8 +4865,8 @@ "port-version": 0 }, "opencascade": { - "baseline": "7.5.0", - "port-version": 3 + "baseline": "7.6.0", + "port-version": 0 }, "opencc": { "baseline": "2020-04-26", diff --git a/versions/o-/opencascade.json b/versions/o-/opencascade.json index 7f8934729a98ec..4c4df69f2ad2e3 100644 --- a/versions/o-/opencascade.json +++ b/versions/o-/opencascade.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1f9f32c2e0778573a20d4b59fda9be37cf6134d", + "version": "7.6.0", + "port-version": 0 + }, { "git-tree": "fc0aab2d38343a9640300fb0f46c67f5313cf16c", "version-string": "7.5.0", From 6e301d3d5a6eb9c0b80fbe05066eb7922953b523 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Sat, 13 Nov 2021 19:22:49 +0100 Subject: [PATCH 1104/1858] [uwebsockets] Update to 20.8.0 (#21367) * Update uwebsockets to 20.8.0 * Update CI baseline Co-authored-by: chausner --- ports/uwebsockets/portfile.cmake | 4 ++-- ports/uwebsockets/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/u-/uwebsockets.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/uwebsockets/portfile.cmake b/ports/uwebsockets/portfile.cmake index c23249d0af9e71..6b8e659e1b6f07 100644 --- a/ports/uwebsockets/portfile.cmake +++ b/ports/uwebsockets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO uNetworking/uWebSockets - REF v20.6.0 - SHA512 cd20e72511c1365a65be55dfdfa40b2476de2e31b90a287b69c0772fedc9b92956924f6fd3261b131ef47494a0b9710fa4ecb71eb5fbca400b67645f63568de9 + REF v20.8.0 + SHA512 2ebb75ce2cd0194b9846a16ea69eb7d9aa25e3673cca0afbb61946989380256ebc27cf24c98bee0bf1264c7b60d84ebb01511454973e5ce165fafc7f75b52902 HEAD_REF master ) diff --git a/ports/uwebsockets/vcpkg.json b/ports/uwebsockets/vcpkg.json index 794979b49bed7e..36969286415f42 100644 --- a/ports/uwebsockets/vcpkg.json +++ b/ports/uwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uwebsockets", - "version-semver": "20.6.0", + "version-semver": "20.8.0", "description": "Simple, secure & standards compliant web I/O for the most demanding of applications", "homepage": "https://github.com/uWebSockets/uWebSockets", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 0caeab705254ab..3673b7e0fc8b02 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6977,7 +6977,7 @@ "port-version": 1 }, "uwebsockets": { - "baseline": "20.6.0", + "baseline": "20.8.0", "port-version": 0 }, "v-hacd": { diff --git a/versions/u-/uwebsockets.json b/versions/u-/uwebsockets.json index 23108e64241fb4..55ffaefc7cd58e 100644 --- a/versions/u-/uwebsockets.json +++ b/versions/u-/uwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a874bc8213f0b0a2e96710cce72f6e7d344ffac", + "version-semver": "20.8.0", + "port-version": 0 + }, { "git-tree": "3b0511c1faa806578f8dc21cc3ac881db3f30aae", "version-semver": "20.6.0", From 16d7569ee2b602f38ce721ec3506fba9181fd206 Mon Sep 17 00:00:00 2001 From: Dennis Date: Sat, 13 Nov 2021 19:57:00 +0100 Subject: [PATCH 1105/1858] [asio-grpc] Update to 1.3.1 (#21263) * Update asio-grpc to v1.3.0 * Update asio-grpc baseline and versions * Remove boost-asio, libunifex and standalone-asio features from asio-grpc. Add a usage file. Update it to 1.3.1 * Remove asio-grpc 1.3.0 from versions/ --- ports/asio-grpc/portfile.cmake | 5 +++-- ports/asio-grpc/usage | 15 +++++++++++++++ ports/asio-grpc/vcpkg.json | 8 ++------ versions/a-/asio-grpc.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 ports/asio-grpc/usage diff --git a/ports/asio-grpc/portfile.cmake b/ports/asio-grpc/portfile.cmake index 7dd32692bd46ed..ee8bb3c8e2b20f 100644 --- a/ports/asio-grpc/portfile.cmake +++ b/ports/asio-grpc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Tradias/asio-grpc - REF v1.1.2 - SHA512 f55b219b9805f193b5673e91e58c3c5fc98957110fadf523c1729c92a06c8befe4ad58052c6e9aaabcf8327f2df31780d7e072a0923d77598974fa0145bf9e7f + REF v1.3.1 + SHA512 c7a9f9c85e0611fd73a827270edf27deefe59b424e6d572efc8b532d305bf41e8fccb24a6507819dca0712f40e1d6abd56a4e6b099dbee729b125b0b610cd4fb HEAD_REF master ) @@ -23,4 +23,5 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/asio-grpc) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/asio-grpc/usage b/ports/asio-grpc/usage new file mode 100644 index 00000000000000..bb11c4a9396e5e --- /dev/null +++ b/ports/asio-grpc/usage @@ -0,0 +1,15 @@ +The package asio-grpc can be used with different backends. + + find_package(asio-grpc CONFIG REQUIRED) + +The Boost.Asio backend. Install "boost-asio" and link with: + + target_link_libraries(main PRIVATE asio-grpc::asio-grpc) + +The standalone Asio backend. Install "asio" and link with: + + target_link_libraries(main PRIVATE asio-grpc::asio-grpc-standalone-asio) + +The libunifex backend. Install "libunifex" and link with: + + target_link_libraries(main PRIVATE asio-grpc::asio-grpc-unifex) diff --git a/ports/asio-grpc/vcpkg.json b/ports/asio-grpc/vcpkg.json index 2b33b17ff72e89..fc67a0f0efa9c8 100644 --- a/ports/asio-grpc/vcpkg.json +++ b/ports/asio-grpc/vcpkg.json @@ -1,13 +1,9 @@ { "name": "asio-grpc", - "version": "1.1.2", - "description": "Asynchronous gRPC with Boost.Asio executors", + "version": "1.3.1", + "description": "Asynchronous gRPC with Asio/unified executors", "homepage": "https://github.com/Tradias/asio-grpc", "dependencies": [ - "boost-asio", - "boost-core", - "boost-intrusive", - "boost-lockfree", "grpc", { "name": "vcpkg-cmake", diff --git a/versions/a-/asio-grpc.json b/versions/a-/asio-grpc.json index 6da80deb3ffb47..92bbd8c9858ad5 100644 --- a/versions/a-/asio-grpc.json +++ b/versions/a-/asio-grpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b68efdc2a8b782df2489156675bb4a4e95c7a221", + "version": "1.3.1", + "port-version": 0 + }, { "git-tree": "39ad0d8203c21698ba153d6951de8295954028eb", "version": "1.1.2", diff --git a/versions/baseline.json b/versions/baseline.json index 3673b7e0fc8b02..8dcb9ea98fdf2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -181,7 +181,7 @@ "port-version": 0 }, "asio-grpc": { - "baseline": "1.1.2", + "baseline": "1.3.1", "port-version": 0 }, "asiosdk": { From b86abaceeefa2b366f6a3bb4fa410dc89ed66a92 Mon Sep 17 00:00:00 2001 From: Simon Sobisch Date: Sat, 13 Nov 2021 20:05:14 +0100 Subject: [PATCH 1106/1858] README updated to include tool repo (#21127) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ece9836272a12..421f22cb5e8e5e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ check out our [Getting Started](#getting-started) section for how to start using For short description of available commands, once you've installed vcpkg, you can run `vcpkg help`, or `vcpkg help [command]` for command-specific help. -* Github: [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) +* Github: ports at [https://github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg), program at [https://github.com/microsoft/vcpkg-tool](https://github.com/microsoft/vcpkg-tool) * Slack: [https://cppalliance.org/slack/](https://cppalliance.org/slack/), the #vcpkg channel * Discord: [\#include \](https://www.includecpp.org), the #ðŸŒvcpkg channel * Docs: [Documentation](docs/README.md) From 5618d4794686159601e4e0037c004527e911fd61 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Sat, 13 Nov 2021 23:55:09 +0300 Subject: [PATCH 1107/1858] [libatomic-ops] New port (#21285) * [libatomic-ops] New port * [libatomic-ops] Update to vcpkg-cmake and specify PACKAGE_NAME Co-authored-by: Robert Schumacher --- ports/libatomic-ops/portfile.cmake | 24 ++++++++++++++++++++++++ ports/libatomic-ops/vcpkg.json | 15 +++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libatomic-ops.json | 9 +++++++++ 4 files changed, 52 insertions(+) create mode 100644 ports/libatomic-ops/portfile.cmake create mode 100644 ports/libatomic-ops/vcpkg.json create mode 100644 versions/l-/libatomic-ops.json diff --git a/ports/libatomic-ops/portfile.cmake b/ports/libatomic-ops/portfile.cmake new file mode 100644 index 00000000000000..357a590f2ae7e2 --- /dev/null +++ b/ports/libatomic-ops/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ivmai/libatomic_ops + REF 7a8de3bd9c6c61c68a866b849e7b1d17d76d2d36 # v7.7.0-20211109 + SHA512 05555792a199526d8e164833f590cc57c5ee34672d81952787a09dd7008e947e4e8b6ad63fb6b8ee315294b98fdf743639622b3d9156d8a8f8363b431e875c45 + HEAD_REF master +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + PREFER_NINJA + OPTIONS_DEBUG + -Dinstall_headers=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME atomic_ops CONFIG_PATH lib/cmake/atomic_ops) +vcpkg_copy_pdbs() + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_fixup_pkgconfig() diff --git a/ports/libatomic-ops/vcpkg.json b/ports/libatomic-ops/vcpkg.json new file mode 100644 index 00000000000000..7bbf9dcd6b9cf2 --- /dev/null +++ b/ports/libatomic-ops/vcpkg.json @@ -0,0 +1,15 @@ +{ + "name": "libatomic-ops", + "version": "7.7.0", + "description": "The atomic_ops project (Atomic memory update operations portable implementation)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 8dcb9ea98fdf2e..ab375e293ce0c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3304,6 +3304,10 @@ "baseline": "2.5.3", "port-version": 2 }, + "libatomic-ops": { + "baseline": "7.7.0", + "port-version": 0 + }, "libavif": { "baseline": "0.9.2", "port-version": 0 diff --git a/versions/l-/libatomic-ops.json b/versions/l-/libatomic-ops.json new file mode 100644 index 00000000000000..9103181269c3f7 --- /dev/null +++ b/versions/l-/libatomic-ops.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6d7b45bb0c10342d8e43900fab12f2baab4eb6a1", + "version": "7.7.0", + "port-version": 0 + } + ] +} From cca6c24302931bf55b539a1ff76b84ff8bbbc962 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 13 Nov 2021 23:43:11 +0100 Subject: [PATCH 1108/1858] [gdal] Update to 3.4.0, minor adjustments (#21261) * Make gdal available on arm (except windows) * Update to 3.4.0, revise patches * Stop importing legacy PROJ * Update versions * Export json-c dependency for mingw * Update versions Co-authored-by: Matthias Kuhn --- ports/gdal/0005-Fix-configure.patch | 10 +++++----- ports/gdal/0007-Control-tools.patch | 4 ++-- ports/gdal/portfile.cmake | 7 ++----- ports/gdal/vcpkg-cmake-wrapper.cmake | 2 +- ports/gdal/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/g-/gdal.json | 5 +++++ 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ports/gdal/0005-Fix-configure.patch b/ports/gdal/0005-Fix-configure.patch index 2669510589c94a..771f2c3d3fc588 100644 --- a/ports/gdal/0005-Fix-configure.patch +++ b/ports/gdal/0005-Fix-configure.patch @@ -1,17 +1,17 @@ diff --git a/gdal/configure.ac b/gdal/configure.ac -index 1f88370..1098b39 100644 +index 30cd613..43f1daf 100644 --- a/gdal/configure.ac +++ b/gdal/configure.ac -@@ -45,6 +45,8 @@ dnl Compute the canonical host-system (the system we are building for) +@@ -48,6 +48,8 @@ dnl Compute the canonical host-system (the system we are building for) dnl type variable $host AC_CANONICAL_HOST +PKG_PROG_PKG_CONFIG([0.21]) + dnl Enable as much warnings as possible - AX_CFLAGS_WARN_ALL(C_WFLAGS) - AX_CXXFLAGS_WARN_ALL(CXX_WFLAGS) -@@ -1343,12 +1345,15 @@ AC_MSG_CHECKING([for libtiff]) + AC_LANG_PUSH([C]) + AX_COMPILER_VENDOR +@@ -1336,12 +1338,15 @@ AC_MSG_CHECKING([for libtiff]) if test "x${with_libtiff}" = "xyes" -o "x${with_libtiff}" = "x" ; then diff --git a/ports/gdal/0007-Control-tools.patch b/ports/gdal/0007-Control-tools.patch index b4e708c6d5de8e..fd1f5c9a35ecf7 100644 --- a/ports/gdal/0007-Control-tools.patch +++ b/ports/gdal/0007-Control-tools.patch @@ -78,6 +78,6 @@ index 1098b39..e4d985e 100644 +fi +AC_SUBST(BUILD_TOOLS,$BUILD_TOOLS) + - AC_OUTPUT(GDALmake.opt) + AC_CONFIG_FILES([GDALmake.opt]) + AC_OUTPUT - dnl --------------------------------------------------------------------------- diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index 3221ba4c43d24a..e67faf1be83355 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "arm") - set(GDAL_PATCHES 0001-Fix-debug-crt-flags.patch 0002-Fix-build.patch @@ -15,8 +13,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/gdal - REF 348075f26f8e4c200a34818123beeb4abe53c876 # 3.3.2 - SHA512 84bd7c74a079c4aa8cbefbbb1c4ab782e74a85d37d4c875a203760939f4f7c9175c40abc5184d8c1c521fd3b37bb90bc7bf046021ade22e510810535e3f61bd2 + REF d699b38a744301368070ef780f797340da4a9c3c # 3.4.0 + SHA512 709523740a51a0a2a144debcfa5fbc5a5b3d93cc3632856cfbc37f7ca52f2e83f4942d9a27d4c723ee19d2397cc91a4b1ba4543547afdfefb3980a7ba6684bd7 HEAD_REF master PATCHES ${GDAL_PATCHES} ) @@ -61,7 +59,6 @@ if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) "PNGDIR=${PNG_INCLUDE_DIR}" "ZLIB_INC=-I${ZLIB_INCLUDE_DIR}" ZLIB_EXTERNAL_LIB=1 - ACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 MSVC_VER=1900 ) diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 772f5b9c530b96..28a1750fedddda 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -82,7 +82,7 @@ if(GDAL_FOUND) _gdal_add_dependency(GEOS::geos_c geos CONFIG) _gdal_add_dependency(GIF::GIF GIF) _gdal_add_dependency(hdf5::hdf5 hdf5 CONFIG) - if(NOT WIN32) + if(NOT WIN32 OR MINGW) _gdal_add_dependency(json-c::json-c json-c CONFIG) endif() _gdal_add_dependency(geotiff_library GeoTIFF CONFIG) diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index c20d97c3f1a8b0..1ef68a5919a4d1 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,10 +1,9 @@ { "name": "gdal", - "version-semver": "3.3.2", - "port-version": 4, + "version-semver": "3.4.0", "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", - "supports": "!arm", + "supports": "!(arm & windows)", "dependencies": [ "curl", "expat", diff --git a/versions/baseline.json b/versions/baseline.json index ab375e293ce0c3..5f6f0e721767dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2353,8 +2353,8 @@ "port-version": 1 }, "gdal": { - "baseline": "3.3.2", - "port-version": 4 + "baseline": "3.4.0", + "port-version": 0 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 7f2784588f3ec7..8db1fba51f3eac 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "097ed3ccdf77735c5b36e354138da35cfd642bcc", + "version-semver": "3.4.0", + "port-version": 0 + }, { "git-tree": "a9ec2540fda2dfe657e004b70d5ca5a1cc7a2db8", "version-semver": "3.3.2", From 42283bb29093515d0215360fa2eb5acaebb7d9a1 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Sat, 13 Nov 2021 14:46:33 -0800 Subject: [PATCH 1109/1858] [directxtk, directxtk12, directxtex, directxmesh, uvatlas] updated ports to November 2021 releases (#21273) * November 8, 2021 releases * Update baseline --- ports/directxmesh/portfile.cmake | 12 ++++++------ ports/directxmesh/vcpkg.json | 2 +- ports/directxtex/portfile.cmake | 28 ++++++++++++++-------------- ports/directxtex/vcpkg.json | 2 +- ports/directxtk/portfile.cmake | 20 ++++++++++---------- ports/directxtk/vcpkg.json | 2 +- ports/directxtk12/portfile.cmake | 20 ++++++++++---------- ports/directxtk12/vcpkg.json | 2 +- ports/uvatlas/portfile.cmake | 12 ++++++------ ports/uvatlas/vcpkg.json | 2 +- versions/baseline.json | 10 +++++----- versions/d-/directxmesh.json | 5 +++++ versions/d-/directxtex.json | 5 +++++ versions/d-/directxtk.json | 5 +++++ versions/d-/directxtk12.json | 5 +++++ versions/u-/uvatlas.json | 5 +++++ 16 files changed, 81 insertions(+), 56 deletions(-) diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake index 650cf50f1bf3e9..51f921fa4c248b 100644 --- a/ports/directxmesh/portfile.cmake +++ b/ports/directxmesh/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXMesh - REF sept2021 - SHA512 e07f944080dc7e0ffe154061057a81d7caee3c4612b9261ba5a4812b3cb45571dee0a1c9b01824ccfbe9566132eadef30b80164fefe6a3ead60a3762566e2604 + REF nov2021 + SHA512 d33ae04b5fc7dae715a0b9ceadcde02bb10807a8d26362b074caa31a631fba173f773ee49a143c44a1bdfdad19893bcca69a3bc806fbb26f74ca39194821a953 HEAD_REF master ) @@ -37,9 +37,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MESHCONVERT_EXE - URLS "https://github.com/Microsoft/DirectXMesh/releases/download/sept2021/meshconvert.exe" - FILENAME "meshconvert-sept2021.exe" - SHA512 9d527b95d3a37604ac3a4c05f8ef44e81cfd8044dd44eddc531116ee5110443679787e4719b0504dc60e406e28396e1f553388cf261b3df81103bd03391c32af + URLS "https://github.com/Microsoft/DirectXMesh/releases/download/nov2021/meshconvert.exe" + FILENAME "meshconvert-nov2021.exe" + SHA512 0f97ac49ce292b1cb90372884f1d6a4fc10eb3e92125a854ee9b7030fd9d0564536cdd88199aa4838832ae2a1e9c2df2c9e32c106705b6b06f156994b9476360 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/") @@ -48,7 +48,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${MESHCONVERT_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-nov2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json index 834581b20972e8..f5b41215197332 100644 --- a/ports/directxmesh/vcpkg.json +++ b/ports/directxmesh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxmesh", - "version-string": "sept2021", + "version-string": "nov2021", "description": "DirectXMesh geometry processing library", "homepage": "https://github.com/Microsoft/DirectXMesh", "documentation": "https://github.com/microsoft/DirectXMesh/wiki", diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake index 9c7419241533e0..3df7c99fa0d62f 100644 --- a/ports/directxtex/portfile.cmake +++ b/ports/directxtex/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTex - REF oct2021 - SHA512 3fc1f8267a4708babe91e94f2062cd9d475b3682273e5c4f704cdb6093a5aae269cf573ad75fdd3dce59a6a79e6892a4cf5630a3160257e542edde9eb9dbb51a + REF nov2021 + SHA512 c96a35c6959caaa3ea6a033404889460363a71f8035a43c91db19d7b608c38adcebe59c428b480b6c6f2e1519a3cd72ce1a828a3771a2c301d831e5b7a4212b9 HEAD_REF master ) @@ -64,23 +64,23 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES))) vcpkg_download_distfile( TEXASSEMBLE_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/sept2021/texassemble.exe" - FILENAME "texassemble-sept2021.exe" - SHA512 05539bae0f77bba1e6fa349ac483367d3f34f808857fd3c3bdecd2a956465101dbaec95cb4e61c15d5d65fd12cdc14fab17cede3a2719dc32bda8748b7a1c59a + URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texassemble.exe" + FILENAME "texassemble-nov2021.exe" + SHA512 a31151d368d41f50b58b417e8d27987fe0e3caa2c4e0d0abe7bef472db51429526277b0c554df2825c6892bb2021111f59d3d8f321ad68c71c0a153852d2c81f ) vcpkg_download_distfile( TEXCONV_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/sept2021/texconv.exe" - FILENAME "texconv-sept2021.exe" - SHA512 9ec2415d2d1b665a0a67c01c916afb5946dedede3518e3a029b83e4a8bb86d8f22b2dc0afdc7dbe0824f8f9843a86e555f3e4705570703d4447a47f2719f5b5a + URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texconv.exe" + FILENAME "texconv-nov2021.exe" + SHA512 7cb70b3cbf46c78b99aa18c28b043fc5930b6b254729efd447868fcf8cb8b77987d41b570082bdfb3bab01452e67d17e81b966bf2534036a3415fa918ddc2956 ) vcpkg_download_distfile( TEXDIAG_EXE - URLS "https://github.com/Microsoft/DirectXTex/releases/download/sept2021/texdiag.exe" - FILENAME "texdiag-sept2021.exe" - SHA512 380660fa46438368a0f30684e0b9d9f4c267d76145bacbf4e5643889e00f869b0925250c1911397ce6a3890752de87f6105ef0e60d0e0334eb36fbc7f53deea7 + URLS "https://github.com/Microsoft/DirectXTex/releases/download/nov2021/texdiag.exe" + FILENAME "texdiag-nov2021.exe" + SHA512 7826c594fa42978da8a15bd771fafe4d4f5b97d611ce62a806ddff77204cabf63eea6ac24e3409c2720631681260b7e3fa6ad5f33b2162d2266457462e6b13c9 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/") @@ -91,9 +91,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${TEXDIAG_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtex/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-sept2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-sept2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-sept2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe") elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json index 688da8e0502457..0cea8803d72ad2 100644 --- a/ports/directxtex/vcpkg.json +++ b/ports/directxtex/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtex", - "version-string": "oct2021", + "version-string": "nov2021", "description": "DirectXTex texture processing library", "homepage": "https://github.com/Microsoft/DirectXTex", "documentation": "https://github.com/microsoft/DirectXTex/wiki", diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake index 4d4e5a5b900eb3..73aa3c430741ab 100644 --- a/ports/directxtk/portfile.cmake +++ b/ports/directxtk/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK - REF oct2021b - SHA512 203e930a9d7fb8dbf3a9e9266f00ee847ceaecb462a3c0450fac54fa2e36fda206d35ab7a1eac59eb83dd433f64e4c353a38dfa40691cd7326ba76b052931bf2 + REF nov2021 + SHA512 bf9297c88b4c80e70562593d0f2a7d8cf438b0bbc731f4725287ff1155e8879e538d339e72dfb4eceb2c94a8f410ff24421a12560013ea65c4e43fe57756109c HEAD_REF master ) @@ -35,16 +35,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/oct2021/MakeSpriteFont.exe" - FILENAME "makespritefont-oct2021.exe" - SHA512 abff446bfd4cbddbca45816ec3a2230e52d9afb81c100966e4bce7e52a6e02620fd8cdcb416943090564885f63d33c4a246f43ff585c8f5686c2c9877ec50698 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/MakeSpriteFont.exe" + FILENAME "makespritefont-nov2021.exe" + SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK/releases/download/oct2021/XWBTool.exe" - FILENAME "xwbtool-oct2021.exe" - SHA512 fda62e06fb9998c41795c6be42f00a1048dcae302b20437f2a39350215789f77acfc77c0f1ebbc5bedeb986229c94f35bd1a03be37cdf4fcf4c007110f7efaa4 + URLS "https://github.com/Microsoft/DirectXTK/releases/download/nov2021/XWBTool.exe" + FILENAME "xwbtool-nov2021.exe" + SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/") @@ -54,8 +54,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe") elseif(NOT VCPKG_TARGET_IS_UWP) diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json index 22470b7ed8521c..f0379d8fa08afb 100644 --- a/ports/directxtk/vcpkg.json +++ b/ports/directxtk/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk", - "version-string": "oct2021b", + "version-string": "nov2021", "description": "A collection of helper classes for writing DirectX 11.x code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK", "documentation": "https://github.com/microsoft/DirectXTK/wiki", diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake index abdc7e415caad6..583eef246d8521 100644 --- a/ports/directxtk12/portfile.cmake +++ b/ports/directxtk12/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/DirectXTK12 - REF oct2021 - SHA512 b5b6b7d42967463bf941b41c9407417068761000344506b720e038f82b3a1aa6f44893695b2391075495d6a63eeb1d80cb011ed87e8f54430de3a77baa8cb570 + REF nov2021 + SHA512 c47dbc877599ad09240d182301198e0d8074ce319abf38958372d13c06a2a1921e2aff6c3acfb0a37a44be681933d1e86542da8491a5ca3f2b9c33fdca73beef HEAD_REF master ) @@ -21,16 +21,16 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) vcpkg_download_distfile( MAKESPRITEFONT_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/oct2021/MakeSpriteFont.exe" - FILENAME "makespritefont-oct2021.exe" - SHA512 abff446bfd4cbddbca45816ec3a2230e52d9afb81c100966e4bce7e52a6e02620fd8cdcb416943090564885f63d33c4a246f43ff585c8f5686c2c9877ec50698 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/MakeSpriteFont.exe" + FILENAME "makespritefont-nov2021.exe" + SHA512 0aab40aced022588d9c1089c5b2f297b0521497d0ae559ead98f99e1e73f2daf9f38ebecadb413095abd2a6c207183fbca582d47528c6f21258df3ac391134e5 ) vcpkg_download_distfile( XWBTOOL_EXE - URLS "https://github.com/Microsoft/DirectXTK12/releases/download/oct2021/XWBTool.exe" - FILENAME "xwbtool-oct2021.exe" - SHA512 fda62e06fb9998c41795c6be42f00a1048dcae302b20437f2a39350215789f77acfc77c0f1ebbc5bedeb986229c94f35bd1a03be37cdf4fcf4c007110f7efaa4 + URLS "https://github.com/Microsoft/DirectXTK12/releases/download/nov2021/XWBTool.exe" + FILENAME "xwbtool-nov2021.exe" + SHA512 f2f291c496500e593c0a4795fee9fafc685666682f23a38a25546bb67ec083533a26f2ce0562b819abea44bd8b403a2f246fbf978e366c457eb8a0f836fd5a2e ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") @@ -40,8 +40,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64)) ${XWBTOOL_EXE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/directxtk12/") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") - file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-oct2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe") + file(RENAME "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-nov2021.exe" "${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json index da564385669f1f..cd7d64b7041e64 100644 --- a/ports/directxtk12/vcpkg.json +++ b/ports/directxtk12/vcpkg.json @@ -1,6 +1,6 @@ { "name": "directxtk12", - "version-string": "oct2021", + "version-string": "nov2021", "description": "A collection of helper classes for writing DirectX 12 code in C++.", "homepage": "https://github.com/Microsoft/DirectXTK12", "documentation": "https://github.com/microsoft/DirectXTK12/wiki", diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake index ba71fd0997aa51..bca523b3129afd 100644 --- a/ports/uvatlas/portfile.cmake +++ b/ports/uvatlas/portfile.cmake @@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Microsoft/UVAtlas - REF sept2021 - SHA512 bb2659e83aa04ad6a43b953f40535531f4f5766d3390b9ce8ea0d83b3146cb92fe27a44c7b744da91cc20f529aabf87794b3b19272c2bd27817e65b091ffe3f5 + REF nov2021 + SHA512 06fe3eb50abd95f35741b8b7d27abbf1eb4f77e13e5c88aa199e29e0ddb979b7913d7eb766afe52382dc0bf94552b20f089681aa1cd52bb88469961d9029d5b0 HEAD_REF master ) @@ -37,9 +37,9 @@ vcpkg_cmake_config_fixup(CONFIG_PATH cmake) if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("eigen" IN_LIST FEATURES))) vcpkg_download_distfile( UVATLASTOOL_EXE - URLS "https://github.com/Microsoft/UVAtlas/releases/download/sept2021/uvatlastool.exe" - FILENAME "uvatlastool-sept2021.exe" - SHA512 56e5ca39f5e1d4fd5fc0f23dee0b2c4b814a53848614d3a470a68821177662e068e0d4e3db93446d32e734af4a6bad0f729d0691b2a3bb127e0395c14aa5a1e7 + URLS "https://github.com/Microsoft/UVAtlas/releases/download/nov2021/uvatlastool.exe" + FILENAME "uvatlastool-nov2021.exe" + SHA512 84de6bc74901f3ab888b90126cc1ac64de564eb33c605fffe37b2199ad132a53b01271f1f551fcc067c144c599380764b9e50884ce5df32f43b2c58777da0722 ) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/") @@ -48,7 +48,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ${UVATLASTOOL_EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/) - file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-sept2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-nov2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe) elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP)) diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json index 7996d056b3436f..06fff2ef51fbae 100644 --- a/ports/uvatlas/vcpkg.json +++ b/ports/uvatlas/vcpkg.json @@ -1,6 +1,6 @@ { "name": "uvatlas", - "version-string": "sept2021", + "version-string": "nov2021", "description": "UVAtlas isochart texture atlas", "homepage": "https://github.com/Microsoft/UVAtlas", "documentation": "https://github.com/Microsoft/UVAtlas/wiki", diff --git a/versions/baseline.json b/versions/baseline.json index 5f6f0e721767dd..e311661f8f5377 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1821,7 +1821,7 @@ "port-version": 1 }, "directxmesh": { - "baseline": "sept2021", + "baseline": "nov2021", "port-version": 0 }, "directxsdk": { @@ -1829,15 +1829,15 @@ "port-version": 4 }, "directxtex": { - "baseline": "oct2021", + "baseline": "nov2021", "port-version": 0 }, "directxtk": { - "baseline": "oct2021b", + "baseline": "nov2021", "port-version": 0 }, "directxtk12": { - "baseline": "oct2021", + "baseline": "nov2021", "port-version": 0 }, "dirent": { @@ -6973,7 +6973,7 @@ "port-version": 0 }, "uvatlas": { - "baseline": "sept2021", + "baseline": "nov2021", "port-version": 0 }, "uvw": { diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json index f11dd9707b5fb4..fe24f5ddc0aaad 100644 --- a/versions/d-/directxmesh.json +++ b/versions/d-/directxmesh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66d8a04c67c2ceabf4b3a6fbca5a088bf68b2663", + "version-string": "nov2021", + "port-version": 0 + }, { "git-tree": "c6e38f3e2c1f90556658d75ae6edd0e170ab0ac4", "version-string": "sept2021", diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json index ea46acb13451a0..186d179dd3800d 100644 --- a/versions/d-/directxtex.json +++ b/versions/d-/directxtex.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0323aa2d24df2bb704905d709a72bd6f57571d19", + "version-string": "nov2021", + "port-version": 0 + }, { "git-tree": "02cba4df9bb3dab0d73b32a41dcfaa624ef53044", "version-string": "oct2021", diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json index 84e15298120c0f..88d1cb26076e10 100644 --- a/versions/d-/directxtk.json +++ b/versions/d-/directxtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5087f78eea490106b9afd934e023a284a6b8b45", + "version-string": "nov2021", + "port-version": 0 + }, { "git-tree": "09200c3486444bbcce57ec680606781b5e16175c", "version-string": "oct2021b", diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json index 6dfc0d295c7c85..949f18724bca3d 100644 --- a/versions/d-/directxtk12.json +++ b/versions/d-/directxtk12.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2edb55441546d26caa15d12504be4f1cbd87986d", + "version-string": "nov2021", + "port-version": 0 + }, { "git-tree": "c3c3a04e2a9b6d1b85341e3d2dcc09d5a04df160", "version-string": "oct2021", diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json index c929a7052a25c7..89f909364b7d30 100644 --- a/versions/u-/uvatlas.json +++ b/versions/u-/uvatlas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ac15c488e3c856748164899355d3d619f4dc810", + "version-string": "nov2021", + "port-version": 0 + }, { "git-tree": "aa1c69c4376ea2d6332065397292b386d60984a4", "version-string": "sept2021", From 40d2fd8bae1be1b2972124d8f7dd983a5cd392c1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sun, 14 Nov 2021 17:48:05 +0100 Subject: [PATCH 1110/1858] [vcpkg] Revise appdeploy and copy_tool_dependencies (#21092) * Stop overwriting logs when copying tool dependencies * Deploy debug dependencies for debug tools * Deploy dependencies verbosely in debug mode * Don't silently fail deployment on mutex creation error * Construct paths portably * Fix mutex creation on Linux * Abort on mutex creation errors * Always copy tool dependencies in verbose mode --- scripts/buildsystems/msbuild/applocal.ps1 | 61 +++++++++++-------- .../cmake/vcpkg_copy_tool_dependencies.cmake | 23 ++++++- 2 files changed, 55 insertions(+), 29 deletions(-) diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index abd102ab06a2ed..412e8e56cb31df 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -4,7 +4,7 @@ param([string]$targetBinary, [string]$installedDir, [string]$tlogFile, [string]$ $g_searched = @{} # Note: installedDir is actually the bin\ directory. $g_install_root = Split-Path $installedDir -parent -$g_is_debug = $g_install_root -match '(.*\\)?debug(\\)?$' +$g_is_debug = (Split-Path $g_install_root -leaf) -eq 'debug' # Ensure we create the copied files log, even if we don't end up copying any files if ($copiedFilesLog) @@ -19,14 +19,19 @@ function computeHash([System.Security.Cryptography.HashAlgorithm]$alg, [string]$ } function getMutex([string]$targetDir) { - $sha512Hash = [System.Security.Cryptography.SHA512]::Create() - if ($sha512Hash) { - $hash = computeHash $sha512Hash $targetDir - $mtxName = "VcpkgAppLocalDeployBinary-" + $hash - return New-Object System.Threading.Mutex($false, $mtxName) - } + try { + $sha512Hash = [System.Security.Cryptography.SHA512]::Create() + if ($sha512Hash) { + $hash = (computeHash $sha512Hash $targetDir) -replace ('/' ,'-') + $mtxName = "VcpkgAppLocalDeployBinary-" + $hash + return New-Object System.Threading.Mutex($false, $mtxName) + } - return New-Object System.Threading.Mutex($false, "VcpkgAppLocalDeployBinary") + return New-Object System.Threading.Mutex($false, "VcpkgAppLocalDeployBinary") + } + catch { + Write-Error -Message $_ -ErrorAction Stop + } } # Note: this function signature is depended upon by the qtdeploy.ps1 script introduced in 5.7.1-7 @@ -37,22 +42,24 @@ function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$tar $mtx.WaitOne() | Out-Null } - if (Test-Path "$targetBinaryDir\$targetBinaryName") { - $sourceModTime = (Get-Item $SourceDir\$targetBinaryName).LastWriteTime - $destModTime = (Get-Item $targetBinaryDir\$targetBinaryName).LastWriteTime + $sourceBinaryFilePath = Join-Path $SourceDir $targetBinaryName + $targetBinaryFilePath = Join-Path $targetBinaryDir $targetBinaryName + if (Test-Path $targetBinaryFilePath) { + $sourceModTime = (Get-Item $sourceBinaryFilePath).LastWriteTime + $destModTime = (Get-Item $targetBinaryFilePath).LastWriteTime if ($destModTime -lt $sourceModTime) { - Write-Verbose " ${targetBinaryName}: Updating $SourceDir\$targetBinaryName" - Copy-Item "$SourceDir\$targetBinaryName" $targetBinaryDir + Write-Verbose " ${targetBinaryName}: Updating from $sourceBinaryFilePath" + Copy-Item $sourceBinaryFilePath $targetBinaryDir } else { Write-Verbose " ${targetBinaryName}: already present" } } else { - Write-Verbose " ${targetBinaryName}: Copying $SourceDir\$targetBinaryName" - Copy-Item "$SourceDir\$targetBinaryName" $targetBinaryDir + Write-Verbose " ${targetBinaryName}: Copying $sourceBinaryFilePath" + Copy-Item $sourceBinaryFilePath $targetBinaryDir } - if ($copiedFilesLog) { Add-Content $copiedFilesLog "$targetBinaryDir\$targetBinaryName" -Encoding UTF8 } - if ($tlogFile) { Add-Content $tlogFile "$targetBinaryDir\$targetBinaryName" -Encoding Unicode } + if ($copiedFilesLog) { Add-Content $copiedFilesLog targetBinaryFilePath -Encoding UTF8 } + if ($tlogFile) { Add-Content $tlogFile $targetBinaryFilePath -Encoding Unicode } } finally { if ($mtx) { $mtx.ReleaseMutex() | Out-Null @@ -104,24 +111,26 @@ function resolve([string]$targetBinary) { return } $g_searched.Set_Item($_, $true) - if (Test-Path "$installedDir\$_") { + $installedItemFilePath = Join-Path $installedDir $_ + $targetItemFilePath = Join-Path $targetBinaryDir $_ + if (Test-Path $installedItemFilePath) { deployBinary $baseTargetBinaryDir $installedDir "$_" - if (Test-Path function:\deployPluginsIfQt) { deployPluginsIfQt $baseTargetBinaryDir "$g_install_root\plugins" "$_" } + if (Test-Path function:\deployPluginsIfQt) { deployPluginsIfQt $baseTargetBinaryDir (Join-Path $g_install_root 'plugins') "$_" } if (Test-Path function:\deployOpenNI2) { deployOpenNI2 $targetBinaryDir "$g_install_root" "$_" } if (Test-Path function:\deployPluginsIfMagnum) { if ($g_is_debug) { - deployPluginsIfMagnum $targetBinaryDir "$g_install_root\bin\magnum-d" "$_" + deployPluginsIfMagnum $targetBinaryDir (Join-Path "$g_install_root" 'bin' 'magnum-d') "$_" } else { - deployPluginsIfMagnum $targetBinaryDir "$g_install_root\bin\magnum" "$_" + deployPluginsIfMagnum $targetBinaryDir (Join-Path "$g_install_root" 'bin' 'magnum') "$_" } } if (Test-Path function:\deployAzureKinectSensorSDK) { deployAzureKinectSensorSDK $targetBinaryDir "$g_install_root" "$_" } - resolve "$baseTargetBinaryDir\$_" - } elseif (Test-Path "$targetBinaryDir\$_") { - Write-Verbose " ${_}: $_ not found in vcpkg; locally deployed" - resolve "$targetBinaryDir\$_" + resolve (Join-Path $baseTargetBinaryDir "$_") + } elseif (Test-Path $targetItemFilePath) { + Write-Verbose " ${_}: $_ not found in $g_install_root; locally deployed" + resolve "$targetItemFilePath" } else { - Write-Verbose " ${_}: $installedDir\$_ not found" + Write-Verbose " ${_}: $installedItemFilePath not found" } } Write-Verbose "Done Resolving $targetBinary." diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 856a2d7fe25e94..b2c36a8e5b9df7 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -20,6 +20,11 @@ This command should always be called by portfiles after they have finished rearr #]===] function(z_vcpkg_copy_tool_dependencies_search tool_dir path_to_search) + if(DEFINED Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT) + set(count ${Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT}) + else() + set(count 0) + endif() file(GLOB tools "${tool_dir}/*.exe" "${tool_dir}/*.dll" "${tool_dir}/*.pyd") foreach(tool IN LISTS tools) vcpkg_execute_required_process( @@ -27,10 +32,13 @@ function(z_vcpkg_copy_tool_dependencies_search tool_dir path_to_search) -file "${SCRIPTS}/buildsystems/msbuild/applocal.ps1" -targetBinary "${tool}" -installedDir "${path_to_search}" + -verbose WORKING_DIRECTORY "${VCPKG_ROOT_DIR}" - LOGNAME copy-tool-dependencies + LOGNAME copy-tool-dependencies-${count} ) + math(EXPR count "${count} + 1") endforeach() + set(Z_VCPKG_COPY_TOOL_DEPENDENCIES_COUNT ${count} CACHE INTERNAL "") endfunction() function(vcpkg_copy_tool_dependencies tool_dir) @@ -43,7 +51,16 @@ function(vcpkg_copy_tool_dependencies tool_dir) if (NOT Z_VCPKG_POWERSHELL_CORE) message(FATAL_ERROR "Could not find PowerShell Core; please open an issue to report this.") endif() - z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_PACKAGES_DIR}/bin") - z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_INSTALLED_DIR}/bin") + cmake_path(RELATIVE_PATH tool_dir + BASE_DIRECTORY "${CURRENT_PACKAGES_DIR}" + OUTPUT_VARIABLE relative_tool_dir + ) + if(relative_tool_dir MATCHES "/debug/") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_PACKAGES_DIR}/debug/bin") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_INSTALLED_DIR}/debug/bin") + else() + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_PACKAGES_DIR}/bin") + z_vcpkg_copy_tool_dependencies_search("${tool_dir}" "${CURRENT_INSTALLED_DIR}/bin") + endif() endif() endfunction() From 925b56a5c464d7d3729ea76d405085102044502e Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sun, 14 Nov 2021 14:50:17 -0800 Subject: [PATCH 1111/1858] [libsecret] add new port with version 0.20.4 (#21419) * [libsecret] add new port with version 0.20.4 * [libsecret] Add host dependency on glib Co-authored-by: Be --- ports/libsecret/portfile.cmake | 28 ++++++++++++++++++++++++++++ ports/libsecret/vcpkg.json | 16 ++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libsecret.json | 9 +++++++++ 4 files changed, 57 insertions(+) create mode 100644 ports/libsecret/portfile.cmake create mode 100644 ports/libsecret/vcpkg.json create mode 100644 versions/l-/libsecret.json diff --git a/ports/libsecret/portfile.cmake b/ports/libsecret/portfile.cmake new file mode 100644 index 00000000000000..900762ce3d9584 --- /dev/null +++ b/ports/libsecret/portfile.cmake @@ -0,0 +1,28 @@ +vcpkg_from_gitlab( + OUT_SOURCE_PATH SOURCE_PATH + GITLAB_URL https://gitlab.gnome.org + REPO GNOME/libsecret + REF 0.20.4 + SHA512 b7357329e531ace536ac3c46ef51d022de9308181af227d2ff45c1ff6fe781a29fa93fe02e78f28c84eca8881c2cb90c92c675bcf9fd21b3d326dd84c5692ed5 + HEAD_REF master +) + +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dintrospection=false + -Dgtk_doc=false + -Dmanpage=false + -Dvapi=false + ADDITIONAL_NATIVE_BINARIES + gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen' + glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' +) +vcpkg_install_meson() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +# There is no option to disable building secret-tool, so remove the executable. +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsecret/vcpkg.json b/ports/libsecret/vcpkg.json new file mode 100644 index 00000000000000..1fbcf7b7c5989f --- /dev/null +++ b/ports/libsecret/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "libsecret", + "version": "0.20.4", + "description": "libsecret is a GObject-based library for accessing the Secret Service API of the freedesktop.org project, a cross-desktop effort to access passwords, tokens and other types of secrets. libsecret provides a convenient wrapper for these methods so consumers do not have to call the low-level DBus methods.", + "homepage": "https://gitlab.gnome.org/GNOME/libsecret/", + "license": "LGPL-2.1-or-later", + "supports": "!(windows | uwp | osx)", + "dependencies": [ + "glib", + { + "name": "glib", + "host": true + }, + "libgcrypt" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index e311661f8f5377..a9b278fe2d9948 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3844,6 +3844,10 @@ "baseline": "2.3.0", "port-version": 0 }, + "libsecret": { + "baseline": "0.20.4", + "port-version": 0 + }, "libsercomm": { "baseline": "1.3.2", "port-version": 0 diff --git a/versions/l-/libsecret.json b/versions/l-/libsecret.json new file mode 100644 index 00000000000000..bdfe26d0a1a0c0 --- /dev/null +++ b/versions/l-/libsecret.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "28e3a8bccc8c6ba0b40bf89f178e293dd282959b", + "version": "0.20.4", + "port-version": 0 + } + ] +} From a1071fa548585a8c2c17c67f86499f7324921d2b Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 15 Nov 2021 08:53:52 -0800 Subject: [PATCH 1112/1858] [qtkeychain] update to 0.13.1 (#21420) and add libsecret as a dependency for Linux Co-authored-by: Be --- ports/qtkeychain-qt6/portfile.cmake | 54 +++++++++++++++++++++++++++++ ports/qtkeychain-qt6/vcpkg.json | 27 +++++++++++++++ ports/qtkeychain/portfile.cmake | 34 +++++++++--------- ports/qtkeychain/vcpkg.json | 20 +++++++---- versions/baseline.json | 8 +++-- versions/q-/qtkeychain-qt6.json | 9 +++++ versions/q-/qtkeychain.json | 5 +++ 7 files changed, 131 insertions(+), 26 deletions(-) create mode 100644 ports/qtkeychain-qt6/portfile.cmake create mode 100644 ports/qtkeychain-qt6/vcpkg.json create mode 100644 versions/q-/qtkeychain-qt6.json diff --git a/ports/qtkeychain-qt6/portfile.cmake b/ports/qtkeychain-qt6/portfile.cmake new file mode 100644 index 00000000000000..b03ef486f5342a --- /dev/null +++ b/ports/qtkeychain-qt6/portfile.cmake @@ -0,0 +1,54 @@ +message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliated with The Qt Company") + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO frankosterfeld/qtkeychain + REF v0.13.1 + SHA512 552c1632a81f64b91dacdb0f5eb4122b4ddef53ba6621561db6c4fce9f3692761dbc4b452e578023e2882e049874148be1de014397675ce443cfc93fe96f6f70 + HEAD_REF master +) + +if(VCPKG_CROSSCOMPILING) + list(APPEND QTKEYCHAIN_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR}) + list(APPEND QTKEYCHAIN_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share) + # remove when https://github.com/microsoft/vcpkg/pull/16111 is merged + if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) + list(APPEND QTKEYCHAIN_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows) + endif() +endif() + +list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF) +# TODO: remove after next release since https://github.com/frankosterfeld/qtkeychain/pull/204 was merged +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=ON) +else() + list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=OFF) +endif() + +# FIXME: Why does build translations fail on arm64-windows? +if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_TARGET_ARCHITECTURE STREQUAL arm64) + list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=OFF) +else() + list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=ON) +endif() + +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_WITH_QT6=ON + ${QTKEYCHAIN_OPTIONS} +) +vcpkg_cmake_install() + +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qt6Keychain PACKAGE_NAME Qt6Keychain) + +# Remove unneeded dirs +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" +) + +# Handle copyright +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qtkeychain-qt6/vcpkg.json b/ports/qtkeychain-qt6/vcpkg.json new file mode 100644 index 00000000000000..49755a1eb85c54 --- /dev/null +++ b/ports/qtkeychain-qt6/vcpkg.json @@ -0,0 +1,27 @@ +{ + "name": "qtkeychain-qt6", + "version": "0.13.1", + "description": "(Unaffiliated with Qt) Platform-independent Qt6 API for storing passwords securely", + "homepage": "https://github.com/frankosterfeld/qtkeychain", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "libsecret", + "platform": "!(windows | uwp | osx)" + }, + { + "name": "qttools", + "features": [ + "linguist" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/qtkeychain/portfile.cmake b/ports/qtkeychain/portfile.cmake index 987d54fc343a65..92d2268605c60d 100644 --- a/ports/qtkeychain/portfile.cmake +++ b/ports/qtkeychain/portfile.cmake @@ -1,40 +1,38 @@ +message(WARNING "qtkeychain is a third-party extension to Qt and is not affiliated with The Qt Company") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO frankosterfeld/qtkeychain - REF 6743abd98586fbabd01da9839f53f61ccfb7f83c # v0.11.1 - SHA512 0ad6b82b972ca1cc5f1f8318899637ce0a6786f912b7f9efc1b7eea132ccefbe9a5dc0eb82d0dc9a020bcd55cd538d9e962fc40eb5c828142a7f2186b19633b1 + REF v0.13.1 + SHA512 552c1632a81f64b91dacdb0f5eb4122b4ddef53ba6621561db6c4fce9f3692761dbc4b452e578023e2882e049874148be1de014397675ce443cfc93fe96f6f70 HEAD_REF master ) -list(APPEND QTKEYCHAIN_OPTIONS -DCMAKE_DEBUG_POSTFIX=d) list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TEST_APPLICATION:BOOL=OFF) +# TODO: remove after next release since https://github.com/frankosterfeld/qtkeychain/pull/204 was merged if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=ON) else() list(APPEND QTKEYCHAIN_OPTIONS -DQTKEYCHAIN_STATIC:BOOL=OFF) endif() -if (CMAKE_HOST_WIN32) - list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=ON) -else() - list(APPEND QTKEYCHAIN_OPTIONS -DBUILD_TRANSLATIONS:BOOL=OFF) -endif() - -vcpkg_configure_cmake( +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${QTKEYCHAIN_OPTIONS} + OPTIONS + -DBUILD_WITH_QT6=OFF + ${QTKEYCHAIN_OPTIONS} ) - -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Qt5Keychain PACKAGE_NAME Qt5Keychain) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Qt5Keychain TARGET_PATH share/Qt5Keychain) # Remove unneeded dirs -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/qtkeychain/vcpkg.json b/ports/qtkeychain/vcpkg.json index acf0e19985053a..3d1aed9b63d517 100644 --- a/ports/qtkeychain/vcpkg.json +++ b/ports/qtkeychain/vcpkg.json @@ -1,14 +1,22 @@ { "name": "qtkeychain", - "version-string": "0.11.1", - "port-version": 1, - "description": "qtkeychain - Platform-independent Qt API for storing passwords securely", + "version": "0.13.1", + "description": "(Unaffiliated with Qt) Platform-independent Qt5 API for storing passwords securely", "homepage": "https://github.com/frankosterfeld/qtkeychain", + "license": "BSD-3-Clause", "dependencies": [ { - "name": "qt5-base", - "default-features": false + "name": "libsecret", + "platform": "!(windows | uwp | osx)" }, - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index a9b278fe2d9948..04ba0c59f4e774 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5685,8 +5685,12 @@ "port-version": 0 }, "qtkeychain": { - "baseline": "0.11.1", - "port-version": 1 + "baseline": "0.13.1", + "port-version": 0 + }, + "qtkeychain-qt6": { + "baseline": "0.13.1", + "port-version": 0 }, "qtlocation": { "baseline": "6.2.1", diff --git a/versions/q-/qtkeychain-qt6.json b/versions/q-/qtkeychain-qt6.json new file mode 100644 index 00000000000000..b0ba63b9ffadce --- /dev/null +++ b/versions/q-/qtkeychain-qt6.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "29acc8309b4310f9b05f7c11cd81b0fd06dcbfff", + "version": "0.13.1", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtkeychain.json b/versions/q-/qtkeychain.json index 37a40dd53b6705..9f813064c00f10 100644 --- a/versions/q-/qtkeychain.json +++ b/versions/q-/qtkeychain.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff34038b321dbfe954208b0ec4844c1066dde839", + "version": "0.13.1", + "port-version": 0 + }, { "git-tree": "477977da90b66a24d95b42e3776d17fd8e2735e0", "version-string": "0.11.1", From f6fe740731cd26595310baa8a19eddece2e3575b Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Mon, 15 Nov 2021 19:55:59 +0300 Subject: [PATCH 1113/1858] [bdwgc] Turn on C++, cords and threads support (#21412) * Remove -Dbuild_cord=OFF * Add -Denable_cplusplus=ON * Remove -Denable_threads=OFF thus enabling threads * Add libatomic-ops to dependencies * Fix 'unresolved symbol in GetModuleHandle' error (in upstream) --- ports/bdwgc/portfile.cmake | 8 ++++---- ports/bdwgc/vcpkg.json | 7 +++++-- versions/b-/bdwgc.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ports/bdwgc/portfile.cmake b/ports/bdwgc/portfile.cmake index 468154cd0b3af4..5e6f34dca0d640 100644 --- a/ports/bdwgc/portfile.cmake +++ b/ports/bdwgc/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ivmai/bdwgc - REF 59f15da55961928b05972d386054fb980bdc8cf0 # v8.2.0-20211013 - SHA512 f6b91f0ad9691d02b04d609d06b9d9aaf30a6e0bb93a5985f9e178128bc3a0b180a3366ecddafab43697fb28c6d0d5e814f99a7bbacad8da4550d3b6ea92bef6 + REF 5fab1a01931a1a6934ccf1d5eaa1e51f0a8dac4d # v8.2.0-20211115 + SHA512 b1a97aad10df33bb242985eb48f1bb2d3082d88f26c34014efce3d0f233bcd18a0f43f1bd960600ad9e22bcb19ebf04e573c74dfc1abfb771aa6b8525053c14b HEAD_REF master ) @@ -10,8 +10,8 @@ vcpkg_configure_cmake( SOURCE_PATH "${SOURCE_PATH}" PREFER_NINJA OPTIONS - -Dbuild_cord=OFF - -Denable_threads=OFF # TODO: add libatomic_ops package and turn on threads + -Denable_cplusplus=ON + -DCFLAGS_EXTRA=-I${CURRENT_INSTALLED_DIR}/include # for libatomic_ops OPTIONS_DEBUG -Dinstall_headers=OFF ) diff --git a/ports/bdwgc/vcpkg.json b/ports/bdwgc/vcpkg.json index 8923c52721762f..35e3cd85b097c5 100644 --- a/ports/bdwgc/vcpkg.json +++ b/ports/bdwgc/vcpkg.json @@ -1,6 +1,9 @@ { "name": "bdwgc", "version": "8.2.0", - "port-version": 1, - "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)" + "port-version": 2, + "description": "The Boehm-Demers-Weiser conservative C/C++ Garbage Collector (libgc, bdwgc, boehm-gc)", + "dependencies": [ + "libatomic-ops" + ] } diff --git a/versions/b-/bdwgc.json b/versions/b-/bdwgc.json index 7719dfd7208e77..e12434284ab2a5 100644 --- a/versions/b-/bdwgc.json +++ b/versions/b-/bdwgc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b7ec5e3585f7f7b71988cb7379c181a1fa9461cd", + "version": "8.2.0", + "port-version": 2 + }, { "git-tree": "84653790601fd0e28aaeb12a9a58292b7e3af1bc", "version": "8.2.0", diff --git a/versions/baseline.json b/versions/baseline.json index 04ba0c59f4e774..2bd03297c62fba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -410,7 +410,7 @@ }, "bdwgc": { "baseline": "8.2.0", - "port-version": 1 + "port-version": 2 }, "beast": { "baseline": "0", From fba4d4d886f69f471e715a73c3a203f34b762132 Mon Sep 17 00:00:00 2001 From: VuYeK Date: Mon, 15 Nov 2021 17:58:46 +0100 Subject: [PATCH 1114/1858] [New port] Added Sciter.JS port (version 4.4.8.16) (#18951) * Added Sciter.JS port (version 4.4.8.10), deprecated Sciter port * Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Update ports/sciter-js/portfile.cmake Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> * Added Sciter.JS port (version 4.4.8.10), deprecated Sciter port * Added Sciter.JS port (version 4.4.8.16) * Update ports/sciter/portfile.cmake Co-authored-by: Robert Schumacher * Update ports/sciter/vcpkg.json Co-authored-by: Robert Schumacher * Removed trailing comma * SHA update * Updated ci.baseline * Updated sciter homepage * Updated sciter SHA Co-authored-by: Billy Robert O'Neal III Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/sciter-js/portfile.cmake | 111 +++++++++++++++++++++++++++++++++ ports/sciter-js/vcpkg.json | 12 ++++ ports/sciter/portfile.cmake | 111 +++------------------------------ ports/sciter/vcpkg.json | 11 +--- scripts/ci.baseline.txt | 5 ++ versions/baseline.json | 8 ++- versions/s-/sciter-js.json | 9 +++ versions/s-/sciter.json | 5 ++ 8 files changed, 159 insertions(+), 113 deletions(-) create mode 100644 ports/sciter-js/portfile.cmake create mode 100644 ports/sciter-js/vcpkg.json create mode 100644 versions/s-/sciter-js.json diff --git a/ports/sciter-js/portfile.cmake b/ports/sciter-js/portfile.cmake new file mode 100644 index 00000000000000..b9f438d5b97211 --- /dev/null +++ b/ports/sciter-js/portfile.cmake @@ -0,0 +1,111 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +if(VCPKG_TARGET_IS_UWP) + message(FATAL_ERROR "Sciter only supports Windows Desktop") +endif() + +set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) + +set(SCITER_REVISION d5a13ff197fed3af46d4bc931c158828eb61e357) +set(SCITER_SHA 5be2db9d2e5caa19be158020a084a246acd6dad2047062f603b3af4f3cdbdd7f7750b263ad6dfaa6c3667de6c51084fc2df75cd3cb8cd60501550377dded1928) + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) + set(SCITER_ARCH x64) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) + set(SCITER_ARCH x32) +else() + message(FATAL_ERROR "Sciter only supports x86/x64") +endif() + +# check out the `https://github.com/c-smile/sciter-js-sdk/archive/${SCITER_REVISION}.tar.gz` +# hash checksum can be obtained with `curl -L -o tmp.tgz ${URL} && vcpkg hash tmp.tgz` +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO c-smile/sciter-js-sdk + REF ${SCITER_REVISION} + SHA512 ${SCITER_SHA} +) + +# install include directory +file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/sciter-js + FILES_MATCHING + PATTERN "*.cpp" + PATTERN "*.mm" + PATTERN "*.h" + PATTERN "*.hpp" +) + +set(SCITER_SHARE "${CURRENT_PACKAGES_DIR}/share/sciter-js") +set(SCITER_TOOLS ${CURRENT_PACKAGES_DIR}/tools/sciter-js) +set(TOOL_PERMS FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + +# license +file(COPY ${SOURCE_PATH}/logfile.md DESTINATION ${SCITER_SHARE}) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${SCITER_SHARE} RENAME copyright) + +# tools +if(VCPKG_TARGET_IS_LINUX AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(SCITER_BIN ${SOURCE_PATH}/bin/linux/x64) + + file(INSTALL ${SOURCE_PATH}/bin/linux/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SOURCE_PATH}/bin/linux/qjs DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SOURCE_PATH}/bin/linux/qjsc DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + + file(INSTALL ${SCITER_BIN}/usciter DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/inspector DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${SCITER_TOOLS}) + + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.lite/linux/x64) + endif() + + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +elseif(VCPKG_TARGET_IS_OSX) + set(SCITER_BIN ${SOURCE_PATH}/bin/macosx) + + file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/qjs DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + file(INSTALL ${SCITER_BIN}/qjsc DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) + + file(INSTALL ${SCITER_BIN}/inspector.app DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/usciterjs.app DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${SCITER_TOOLS}) + + execute_process(COMMAND sh -c "chmod +x usciterjs.app/Contents/MacOS/usciterjs" WORKING_DIRECTORY ${SCITER_TOOLS}) + execute_process(COMMAND sh -c "chmod +x inspector.app/Contents/MacOS/inspector" WORKING_DIRECTORY ${SCITER_TOOLS}) + + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + +elseif(VCPKG_TARGET_IS_WINDOWS) + set(SCITER_BIN ${SOURCE_PATH}/bin/windows/${SCITER_ARCH}) + set(SCITER_BIN32 ${SOURCE_PATH}/bin/windows/x32) + + file(INSTALL ${SOURCE_PATH}/bin/windows/packfolder.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin/windows/qjs.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SOURCE_PATH}/bin/windows/qjsc.exe DESTINATION ${SCITER_TOOLS}) + + file(INSTALL ${SCITER_BIN}/scapp.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/usciter.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/inspector.exe DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${SCITER_TOOLS}) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${SCITER_TOOLS}) + + if ("windowless" IN_LIST FEATURES) + set(SCITER_BIN ${SOURCE_PATH}/bin.lite/windows/${SCITER_ARCH}) + endif() + + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + + file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL ${SCITER_BIN}/sciter-sqlite.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + + message(WARNING "Sciter requires manual deployment of the correct DLL files.") +endif() diff --git a/ports/sciter-js/vcpkg.json b/ports/sciter-js/vcpkg.json new file mode 100644 index 00000000000000..46e0121088d952 --- /dev/null +++ b/ports/sciter-js/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "sciter-js", + "version-string": "4.4.8.16", + "description": "Sciter.JS - Sciter but with QuickJS on board instead of TIScript. Sciter is an embeddable HTML/CSS/scripting engine.", + "homepage": "https://github.com/c-smile/sciter-js-sdk", + "supports": "!uwp & !arm & !static", + "features": { + "windowless": { + "description": "windowless version - lite version" + } + } +} diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake index eab17e4e65cf64..8c8fe9f83956b1 100644 --- a/ports/sciter/portfile.cmake +++ b/ports/sciter/portfile.cmake @@ -1,105 +1,12 @@ -vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message(FATAL_ERROR "Sciter only supports Windows Desktop") -endif() +message(FATAL_ERROR "The sciter port is deprecated by upstream and conflicts with upstream's replacement. -# header-only library -set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) +Upstream has stopped active development of sciter and instead encourage users to move to a new library Sciter.JS that uses javascript as the internal scripting language (sciter-js in vcpkg). -set(SCITER_REVISION 29a598b6d20220b93848b5e8abab704619296857) -set(SCITER_SHA dc9ebcc59a4ca7b154efcbd96c7e0aa53dc344f6a2cfa91f8c351c1edc5a0f060129715f8eac85e00df9b6c153322a9ba36b430da5020d38769740434cbcd52c) - -if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(SCITER_ARCH x64) -elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL x86) - set(SCITER_ARCH x32) -endif() - -# check out the `https://github.com/c-smile/sciter-sdk/archive/${SCITER_REVISION}.tar.gz` -# hash checksum can be obtained with `curl -L -o tmp.tgz ${URL} && vcpkg hash tmp.tgz` -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO c-smile/sciter-sdk - REF ${SCITER_REVISION} - SHA512 ${SCITER_SHA} -) - -# install include directory -file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/sciter - FILES_MATCHING - PATTERN "*.cpp" - PATTERN "*.mm" - PATTERN "*.h" - PATTERN "*.hpp" -) - -set(SCITER_SHARE ${CURRENT_PACKAGES_DIR}/share/sciter) -set(SCITER_TOOLS ${CURRENT_PACKAGES_DIR}/tools/sciter) -set(TOOL_PERMS FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -# license -file(COPY ${SOURCE_PATH}/logfile.htm DESTINATION ${SCITER_SHARE}) -file(INSTALL ${SOURCE_PATH}/license.htm DESTINATION ${SCITER_SHARE} RENAME copyright) - -# samples & widgets -file(COPY ${SOURCE_PATH}/samples DESTINATION ${SCITER_SHARE}) -file(COPY ${SOURCE_PATH}/widgets DESTINATION ${SCITER_SHARE}) - -# tools -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Linux AND VCPKG_TARGET_ARCHITECTURE STREQUAL x64) - set(SCITER_BIN ${SOURCE_PATH}/bin.lnx/x64) - - file(INSTALL ${SOURCE_PATH}/bin.lnx/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - file(INSTALL ${SOURCE_PATH}/bin.lnx/tiscript DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - - file(INSTALL ${SCITER_BIN}/usciter DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - file(INSTALL ${SCITER_BIN}/inspector DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${SCITER_TOOLS}) - - if ("windowless" IN_LIST FEATURES) - set(SCITER_BIN ${SOURCE_PATH}/bin.lnx/x64lite) - endif() - - file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/libsciter-gtk.so DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL Darwin) - set(SCITER_BIN ${SOURCE_PATH}/bin.osx) - - file(INSTALL ${SCITER_BIN}/packfolder DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - file(INSTALL ${SCITER_BIN}/tiscript DESTINATION ${SCITER_TOOLS} ${TOOL_PERMS}) - - file(INSTALL ${SCITER_BIN}/inspector.app DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/sciter.app DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${SCITER_TOOLS}) - - # not sure whether there is a better way to do this, because - # `file(INSTALL sciter.app FILE_PERMISSIONS EXECUTE)` - # would mark everything as executable which is no go. - execute_process(COMMAND sh -c "chmod +x sciter.app/Contents/MacOS/sciter" WORKING_DIRECTORY ${SCITER_TOOLS}) - execute_process(COMMAND sh -c "chmod +x inspector.app/Contents/MacOS/inspector" WORKING_DIRECTORY ${SCITER_TOOLS}) - - file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/libsciter.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - -else() - set(SCITER_BIN ${SOURCE_PATH}/bin.win/${SCITER_ARCH}) - set(SCITER_BIN32 ${SOURCE_PATH}/bin.win/x32) - - file(INSTALL ${SOURCE_PATH}/bin.win/packfolder.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SOURCE_PATH}/bin.win/tiscript.exe DESTINATION ${SCITER_TOOLS}) - - file(INSTALL ${SCITER_BIN32}/wsciter.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN32}/inspector.exe DESTINATION ${SCITER_TOOLS}) - file(INSTALL ${SCITER_BIN32}/sciter.dll DESTINATION ${SCITER_TOOLS}) - - if ("windowless" IN_LIST FEATURES) - set(SCITER_BIN ${SOURCE_PATH}/bin.win/${SCITER_ARCH}lite) - endif() - - file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${SCITER_BIN}/sciter.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - -message(STATUS "Warning: Sciter requires manual deployment of the correct DLL files.") +Options for existing users are: +1. Depend upon `sciter-js` and change your code to work with the new library +2. Use `"overrides"` in manifest mode to pin to `"version-string": "4.4.8.3#1"` +3. Copy the last available `sciter` version into an overlay port (commit 756f1845537a916ba706f6af544b2f490c30fbb1 at subpath `ports/sciter`) +4. Use the community registry `https://github.com/VuYeK/vcpkg-registry` which may have newer versions of `sciter` available (not affiliated with Microsoft) +") diff --git a/ports/sciter/vcpkg.json b/ports/sciter/vcpkg.json index de007100f69427..f0af85560ce818 100644 --- a/ports/sciter/vcpkg.json +++ b/ports/sciter/vcpkg.json @@ -1,13 +1,6 @@ { "name": "sciter", - "version-string": "4.4.8.3", - "port-version": 1, + "version-string": "deprecated", "description": "Sciter is an embeddable HTML/CSS/scripting engine.", - "homepage": "https://github.com/c-smile/sciter-sdk", - "supports": "!uwp", - "features": { - "windowless": { - "description": "Uses Sciter.Lite builds" - } - } + "homepage": "https://github.com/c-smile/sciter-sdk" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index bbcb9d010a8a1d..dca83344c7cee2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1348,8 +1348,13 @@ ryu:x86-windows=fail ryu::arm64-windows=fail sciter:arm64-windows=fail sciter:arm-uwp=fail +sciter:x64-linux=fail +sciter:x64-osx=fail sciter:x64-uwp=fail +sciter:x64-windows=fail sciter:x64-windows-static=fail +sciter:x64-windows-static-md=fail +sciter:x86-windows=fail scnlib:arm-uwp=fail scnlib:x64-uwp=fail scylla-wrapper:arm-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 2bd03297c62fba..52ca0161231b43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6097,8 +6097,12 @@ "port-version": 0 }, "sciter": { - "baseline": "4.4.8.3", - "port-version": 1 + "baseline": "deprecated", + "port-version": 0 + }, + "sciter-js": { + "baseline": "4.4.8.16", + "port-version": 0 }, "scnlib": { "baseline": "0.4", diff --git a/versions/s-/sciter-js.json b/versions/s-/sciter-js.json new file mode 100644 index 00000000000000..7f0cd51fd30dce --- /dev/null +++ b/versions/s-/sciter-js.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d8b949852b38b18eac5c4fa0c25282d531c596fd", + "version-string": "4.4.8.16", + "port-version": 0 + } + ] +} diff --git a/versions/s-/sciter.json b/versions/s-/sciter.json index 4f00a7e85093d7..2acb342cc50b27 100644 --- a/versions/s-/sciter.json +++ b/versions/s-/sciter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ff6683a2d398db76e1791b994dc157ffb21e88c", + "version-string": "deprecated", + "port-version": 0 + }, { "git-tree": "7508c766a2564096e3ca656f6b4a26d582dcf855", "version-string": "4.4.8.3", From 18f9731b8215abd0fc0be48ccdacbb2bdce616f2 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 15 Nov 2021 18:10:29 +0100 Subject: [PATCH 1115/1858] [itk] no absolute paths (#21330) --- ports/itk/portfile.cmake | 35 +++++++++++++++++++---------------- ports/itk/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/i-/itk.json | 5 +++++ 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake index 8961379a5a66cc..055b0194f0b7cc 100644 --- a/ports/itk/portfile.cmake +++ b/ports/itk/portfile.cmake @@ -20,16 +20,17 @@ vcpkg_from_github( ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - "vtk" Module_ITKVtkGlue - "cuda" Module_ITKCudaCommon # Requires RTK? - #"cuda" CUDA_HAVE_GPU # Automatically set by FindCUDA? - "cufftw" ITK_USE_CUFFTW - "opencl" ITK_USE_GPU - "tbb" Module_ITKTBB - "rtk" Module_RTK - "tools" RTK_BUILD_APPLICATIONS - # There are a lot of more (remote) modules and options in ITK - # feel free to add those as a feature + FEATURES + "vtk" Module_ITKVtkGlue + "cuda" Module_ITKCudaCommon # Requires RTK? + #"cuda" CUDA_HAVE_GPU # Automatically set by FindCUDA? + "cufftw" ITK_USE_CUFFTW + "opencl" ITK_USE_GPU + "tbb" Module_ITKTBB + "rtk" Module_RTK + "tools" RTK_BUILD_APPLICATIONS + # There are a lot of more (remote) modules and options in ITK + # feel free to add those as a feature ) if("cufftw" IN_LIST FEATURES) @@ -117,9 +118,8 @@ if (VCPKG_TARGET_ARCHITECTURE STREQUAL x64 OR VCPKG_TARGET_ARCHITECTURE STREQUAL endif() file(REMOVE_RECURSE "${SOURCE_PATH}/CMake/FindOpenCL.cmake") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF @@ -182,9 +182,9 @@ if(BUILD_RTK) # Remote Modules are only downloaded on configure. # TODO: In the future try to download via vcpkg_from_github and move the files. That way patching does not need this workaround vcpkg_apply_patches(SOURCE_PATH "${SOURCE_PATH}/Modules/Remote/RTK" QUIET PATCHES rtk/already_defined.patch rtk/unresolved.patch) endif() -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() if(TOOL_NAMES) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) @@ -195,4 +195,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "include(${SOURCE_PATH}/CMake/UseITK.cmake)" "include(UseITK)") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/ITK-5.1/itk_eigen.h" "message(STATUS \"From ITK: Eigen3_DIR: ${CURRENT_INSTALLED_DIR}/share/eigen3\")" "") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/itk/vcpkg.json b/ports/itk/vcpkg.json index 394b45afba00f2..bf0769a766ccf0 100644 --- a/ports/itk/vcpkg.json +++ b/ports/itk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "itk", - "version-string": "5.1.0", - "port-version": 5, + "version-semver": "5.1.0", + "port-version": 6, "description": "Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.", "homepage": "https://github.com/InsightSoftwareConsortium/ITK", "dependencies": [ @@ -30,6 +30,14 @@ "default-features": false }, "tiff", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/versions/baseline.json b/versions/baseline.json index 52ca0161231b43..1f328367ae68dd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2902,7 +2902,7 @@ }, "itk": { "baseline": "5.1.0", - "port-version": 5 + "port-version": 6 }, "itpp": { "baseline": "4.3.1", diff --git a/versions/i-/itk.json b/versions/i-/itk.json index b6d62dd1f38ef8..aad8b36d01ecae 100644 --- a/versions/i-/itk.json +++ b/versions/i-/itk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "250af7e974af49d5e1c1f64c5ca1c1e3a1fbc5f6", + "version-semver": "5.1.0", + "port-version": 6 + }, { "git-tree": "58ababb668655a11289755a8069265656a2758f4", "version-string": "5.1.0", From 9c204e0919a901611cce178ab531622f1c15dfe4 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 15 Nov 2021 09:33:53 -0800 Subject: [PATCH 1116/1858] [docs] Add authentication.md (#20990) * [docs] Add docs/users/authentication.md * edits * Add link to README.md * Address CR comments * Fixup Co-authored-by: Robert Schumacher --- docs/README.md | 1 + docs/users/authentication.md | 79 ++++++++++++++++++++++++++++++++ docs/users/config-environment.md | 3 ++ docs/users/triplets.md | 1 + 4 files changed, 84 insertions(+) create mode 100644 docs/users/authentication.md diff --git a/docs/README.md b/docs/README.md index 71769a8506531f..598cb7eaf169b1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -17,6 +17,7 @@ Vcpkg helps you manage C and C++ libraries on Windows, Linux and MacOS. This too - [Buildsystem Integration](users/integration.md) - [Triplet files](users/triplets.md) - [Configuration and Environment](users/config-environment.md) +- [Authentication](users/authentication.md) - [Manifest Mode](users/manifests.md) - [Binary Caching](users/binarycaching.md) - [Asset Caching](users/assetcaching.md) diff --git a/docs/users/authentication.md b/docs/users/authentication.md new file mode 100644 index 00000000000000..727b996178e445 --- /dev/null +++ b/docs/users/authentication.md @@ -0,0 +1,79 @@ +# Authentication for Source Code + +**The latest version of this documentation is available on [GitHub](https://github.com/Microsoft/vcpkg/tree/master/docs/users/authentication.md).** + +Registries and `vcpkg_from_git()` directly use the git command line tools to fetch remote resources. Some of these resources may be protected from anonymous access and need authentication or credentials. + +The strategies below all seek to achieve the same fundamental goal: `git clone https://....` should succeed without interaction. This enables vcpkg to be separated from the specifics of your authentication scheme, ensuring forwards compatibility with any additional security improvements in the future. + +## Pre-seed git credentials + +You can pre-seed git credentials via `git credential approve`: + +Powershell: +```powershell +"url=https://github.com`npath=Microsoft/vcpkg`nusername=unused`npassword=$MY_PAT`n" | git credential approve +``` +Bash: +```sh +echo "url=https://github.com"$'\n'"path=Microsoft/vcpkg"$'\n'"username=unused"$'\n'"password=$MY_PAT"$'\n' | git credential approve +``` + +## Bearer auth + +For systems which need bearer auth, you can use `git config`: + +**Note: you must make these config changes with `--global`** +``` +git config --global --unset-all http..extraheader +git config --global http..extraheader "AUTHORIZATION: bearer " +``` +The `` can be filled in with a variety of options, documented in https://git-scm.com/docs/git-config#Documentation/git-config.txt-httplturlgt. For example, `https://dev.azure.com/MYORG/`. + +(Original Source: https://github.com/Microsoft/azure-pipelines-agent/issues/1601#issuecomment-394511048). + +**Note for Azure DevOps users:** You may need to enable access via Job authorization scope https://docs.microsoft.com/en-us/azure/devops/pipelines/process/access-tokens?view=azure-devops&tabs=yaml#job-authorization-scope. You may also need to "reference" the repo in your yaml via: + +```yaml +resources: + repositories: + - repository: + type: git + name: / + tag: tags/ + +... + +jobs: + - job: Build + uses: + repositories: [] +``` + +## Pass credentials in an environment variable (not recommended) + +Using `VCPKG_KEEP_ENV_VARS` or `VCPKG_ENV_PASSTHROUGH_UNTRACKED`, we can smuggle credential info via another var like `MY_TOKEN_VAR`. +```sh +export VCPKG_KEEP_ENV_VARS=MY_TOKEN_VAR +export MY_TOKEN_VAR=abc123 +``` +This can then be used in your private ports: +```cmake +# some/private/portfile.cmake +set(MY_TOKEN_VAR "") +if(DEFINED ENV{MY_TOKEN_VAR}) + set(MY_TOKEN_VAR "$ENV{MY_TOKEN_VAR}@") +endif() +vcpkg_from_git( + URLS "https://${MY_TOKEN_VAR}host.com/normal/url/path" + ... +) +``` +```cmake +# some/other/private/portfile.cmake +vcpkg_from_github( + AUTHORIZATION_TOKEN "$ENV{MY_TOKEN_VAR}" +) +``` + +For private ports, we recommend using `vcpkg_from_git()` instead of `vcpkg_from_github()` and the pre-seeding method above. diff --git a/docs/users/config-environment.md b/docs/users/config-environment.md index 73dd64a2120e71..1ba428a031a778 100644 --- a/docs/users/config-environment.md +++ b/docs/users/config-environment.md @@ -66,6 +66,9 @@ This environment variable, if set, suppresses the downloading of CMake and Ninja This environment variable can be set to a list of environment variables, separated by `;`, which will be propagated to the build environment. +The values of the kept variables will not be tracked in package ABIs and will not cause rebuilds when they change. To +pass in environment variables that should cause rebuilds on change, see [`VCPKG_ENV_PASSTHROUGH`](triplets.md#VCPKG_ENV_PASSTHROUGH). + Example: `FOO_SDK_DIR;BAR_SDK_DIR` #### VCPKG_MAX_CONCURRENCY diff --git a/docs/users/triplets.md b/docs/users/triplets.md index efc55ac2c0aaea..5394aa59cb2d1f 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -124,6 +124,7 @@ When this option is set to (true|1|on), the compiler is ignored in the abi track ## Windows Variables + ### VCPKG_ENV_PASSTHROUGH Instructs vcpkg to allow additional environment variables into the build process. From 18f38d65be5b9c1a7d27843d24c2b2d0d65ffac3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 15 Nov 2021 18:43:12 +0100 Subject: [PATCH 1117/1858] [applocal.ps1] Add missing '$' (#21429) --- scripts/buildsystems/msbuild/applocal.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 412e8e56cb31df..28ff1ff3c5c36c 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -58,7 +58,7 @@ function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$tar Write-Verbose " ${targetBinaryName}: Copying $sourceBinaryFilePath" Copy-Item $sourceBinaryFilePath $targetBinaryDir } - if ($copiedFilesLog) { Add-Content $copiedFilesLog targetBinaryFilePath -Encoding UTF8 } + if ($copiedFilesLog) { Add-Content $copiedFilesLog $targetBinaryFilePath -Encoding UTF8 } if ($tlogFile) { Add-Content $tlogFile $targetBinaryFilePath -Encoding Unicode } } finally { if ($mtx) { From eebbe7ef0ea83c82b70cf712b04fb24f80df6582 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:17:21 +0100 Subject: [PATCH 1118/1858] [rang] Update to 3.2 (#21413) * Update rang to 3.2 * Update CI baseline Co-authored-by: chausner --- ports/rang/CMakeLists.txt | 5 ----- ports/rang/portfile.cmake | 23 ++++++++++++----------- ports/rang/vcpkg.json | 16 +++++++++++++--- versions/baseline.json | 4 ++-- versions/r-/rang.json | 5 +++++ 5 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 ports/rang/CMakeLists.txt diff --git a/ports/rang/CMakeLists.txt b/ports/rang/CMakeLists.txt deleted file mode 100644 index 6cf64a05fd2827..00000000000000 --- a/ports/rang/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -cmake_minimum_required (VERSION 2.8) -project (rang) - -include_directories(include) -install(FILES ${PROJECT_SOURCE_DIR}/include/rang.hpp DESTINATION include) \ No newline at end of file diff --git a/ports/rang/portfile.cmake b/ports/rang/portfile.cmake index f2eead8740aa9f..9fa3eecb476f55 100644 --- a/ports/rang/portfile.cmake +++ b/ports/rang/portfile.cmake @@ -1,19 +1,20 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO agauniyal/rang - REF v3.1.0 - SHA512 3419c9d8b8177320d4254a3e317790b0ca17bb08940025a16cb6a468a5f4c6e6a8bae391441fbb61b46e94cbe760aef1cb7f31fb8a1e958312e9dcb568b04470 + REF v3.2 + SHA512 f579aaf3bddbfa2325dd31bdbe7c32598af8a340fee62c3a1e7ed1cf189af2808b7838a5fb13b3765279ddd1e7481f6229da72e72218a4916455cf3ae12b5a68 HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/rang) +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/rang/vcpkg.json b/ports/rang/vcpkg.json index c388d10d47dafd..d316d7a901de4c 100644 --- a/ports/rang/vcpkg.json +++ b/ports/rang/vcpkg.json @@ -1,6 +1,16 @@ { "name": "rang", - "version-string": "3.1.0", - "port-version": 1, - "description": "Colors for your Terminal." + "version": "3.2", + "description": "Colors for your Terminal.", + "homepage": "https://github.com/agauniyal/rang", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1f328367ae68dd..39275b42779cd5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5837,8 +5837,8 @@ "port-version": 4 }, "rang": { - "baseline": "3.1.0", - "port-version": 1 + "baseline": "3.2", + "port-version": 0 }, "range-v3": { "baseline": "0.11.0", diff --git a/versions/r-/rang.json b/versions/r-/rang.json index 91fc692420205a..d950bce50d8820 100644 --- a/versions/r-/rang.json +++ b/versions/r-/rang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b053769b91b66e49a42e7d6ea245f1ea9e018c26", + "version": "3.2", + "port-version": 0 + }, { "git-tree": "fa33c08f090f08c0b6d4d1596384b92ccbaceeb6", "version-string": "3.1.0", From 287362c08512335a2208fab2bba98e9d50b2873a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:17:48 +0100 Subject: [PATCH 1119/1858] [trompeloeil] Update to 41 (#21406) * Update trompeloeil to 41 * Update CI baseline Co-authored-by: chausner --- ports/trompeloeil/portfile.cmake | 21 +++++++++------------ ports/trompeloeil/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/t-/trompeloeil.json | 5 +++++ 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/ports/trompeloeil/portfile.cmake b/ports/trompeloeil/portfile.cmake index 130faddfa35e56..1390637eb199e0 100644 --- a/ports/trompeloeil/portfile.cmake +++ b/ports/trompeloeil/portfile.cmake @@ -1,27 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO rollbear/trompeloeil - REF 08cba57ed7207c8ad5c94fd2a20dc0bfecabe878 # v38 - SHA512 b51626eb263f971f1ed6e29d86256adde19f9f60487e00a6098933de37d0a1cb64b6d797447fcde6f5121a1b29f39bd7b6aed8f5889450d72ef6a76d46eb921f + REF v41 + SHA512 f68a3f1c5f2cd1b49fb8c90612383d68ca1a0bcd1ca6b0a0fbe6e3cef23af011b5503d788023519f182a1221d55774796115f9248caf33175f919fd18e5e43f9 HEAD_REF master PATCHES disable_master_project.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS - -DBUILD_TESTING=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/trompeloeil) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/trompeloeil) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") -if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/trompeloeil.hpp) +if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/trompeloeil.hpp") message(FATAL_ERROR "Main includes have moved. Please update the forwarder.") endif() -configure_file(${SOURCE_PATH}/LICENSE_1_0.txt ${CURRENT_PACKAGES_DIR}/share/trompeloeil/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE_1_0.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/trompeloeil/vcpkg.json b/ports/trompeloeil/vcpkg.json index 8084fce18c190d..6c70e20d341aee 100644 --- a/ports/trompeloeil/vcpkg.json +++ b/ports/trompeloeil/vcpkg.json @@ -1,7 +1,16 @@ { "name": "trompeloeil", - "version-string": "38", - "port-version": 1, + "version": "41", "description": "A thread-safe header-only mocking framework for C++11/14 using the Boost Software License 1.0", - "homepage": "https://github.com/rollbear/trompeloeil" + "homepage": "https://github.com/rollbear/trompeloeil", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 39275b42779cd5..5ef67a6ee2e4cd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6849,8 +6849,8 @@ "port-version": 1 }, "trompeloeil": { - "baseline": "38", - "port-version": 1 + "baseline": "41", + "port-version": 0 }, "tsl-hopscotch-map": { "baseline": "2.3.0", diff --git a/versions/t-/trompeloeil.json b/versions/t-/trompeloeil.json index ebbcf0ce16ea6d..3765977685eb3a 100644 --- a/versions/t-/trompeloeil.json +++ b/versions/t-/trompeloeil.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7345802a43866751e65d0ce0caaa24566a1b7a3a", + "version": "41", + "port-version": 0 + }, { "git-tree": "5691d561cb4ae588d604882cd58539b406222cac", "version-string": "38", From 834f6c812608bb53df9964f6730f41876a4bdd5f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:18:12 +0100 Subject: [PATCH 1120/1858] [mp-units] Update to 0.7.0 (#21405) * Update mp-units to 0.7.0 * Update CI baseline Co-authored-by: chausner --- ports/mp-units/cmake.patch | 31 +++++++++++++------------------ ports/mp-units/config.patch | 21 +++++++++++++-------- ports/mp-units/portfile.cmake | 18 +++++++++--------- ports/mp-units/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/m-/mp-units.json | 5 +++++ 6 files changed, 52 insertions(+), 40 deletions(-) diff --git a/ports/mp-units/cmake.patch b/ports/mp-units/cmake.patch index d5a57ce8b8c5c9..d2d4a1a54c4557 100644 --- a/ports/mp-units/cmake.patch +++ b/ports/mp-units/cmake.patch @@ -2,34 +2,29 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index b18a30a96..d89248aa1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -40,14 +40,24 @@ conan_init(cmake) +@@ -66,11 +66,21 @@ conan_init(cmake) add_subdirectory(src) - - # set restrictive compilation warnings --set_warnings(mp-units) -+# set_warnings(mp-units) - - # add unit tests --enable_testing() --add_subdirectory(test) -+option(BUILD_TESTING "Build tests" OFF) -+if(BUILD_TESTING) -+ set_warnings(mp-units) -+ enable_testing() -+ add_subdirectory(test) -+endif() - + # add usage example -add_subdirectory(example) -- +option(BUILD_EXAMPLES "Build usage examples" OFF) +if(BUILD_EXAMPLES) + add_subdirectory(example) +endif() + # generate project documentation -add_subdirectory(docs) -+ +option(BUILD_DOCS "Generate docs" OFF) +if(BUILD_DOCS) + add_subdirectory(docs) +endif() + + # add unit tests +-enable_testing() +-add_subdirectory(test) ++option(BUILD_TESTING "Build tests" OFF) ++if(BUILD_TESTING) ++ set_warnings(mp-units) ++ enable_testing() ++ add_subdirectory(test) ++endif() diff --git a/ports/mp-units/config.patch b/ports/mp-units/config.patch index 5bd81c927aa088..b5f6bd6d20884b 100644 --- a/ports/mp-units/config.patch +++ b/ports/mp-units/config.patch @@ -1,9 +1,14 @@ -diff --git a/cmake/common/simple-config.cmake.in b/cmake/common/simple-config.cmake.in -index f40ebfa88..d521e0ba8 100644 ---- a/cmake/common/simple-config.cmake.in -+++ b/cmake/common/simple-config.cmake.in -@@ -1 +1,4 @@ -+include(CMakeFindDependencyMacro) +diff --git a/src/mp-unitsConfig.cmake b/src/mp-unitsConfig.cmake +--- a/src/mp-unitsConfig.cmake ++++ b/src/mp-unitsConfig.cmake +@@ -39,8 +39,8 @@ function(__check_libcxx_in_use variable) + endfunction() + + include(CMakeFindDependencyMacro) +-find_dependency(fmt) +-find_dependency(gsl-lite) +find_dependency(fmt CONFIG) -+find_dependency(Microsoft.GSL CONFIG) - include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake") ++find_dependency(gsl-lite CONFIG) + + # add range-v3 dependency only for clang + libc++ + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") diff --git a/ports/mp-units/portfile.cmake b/ports/mp-units/portfile.cmake index 1200c171976114..f608f1af1e9c6d 100644 --- a/ports/mp-units/portfile.cmake +++ b/ports/mp-units/portfile.cmake @@ -1,24 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mpusz/units - REF 33ad51311b835efb7f7767473f971c02a3140073 - SHA512 18c9a4bb1812d7ab59e86d3eef5f62aa760c8f78eac81086bd3b25f7e2d359f2fba71b0298cf91ecb31dbe13846f2e5ce75133b0db534020102b788dd1c1a1da + REF v0.7.0 + SHA512 72175f34f358d0741650ce9c8a7b28fced90cc45ddd3f1662ae1cb9ff7d31403ff742ee07ab4c96bd2d95af714d9111a888cf6acccb91e568e12d1ef663b2f64 PATCHES cmake.patch config.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) # Handle copyright/readme/package files -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") # Header only \ No newline at end of file diff --git a/ports/mp-units/vcpkg.json b/ports/mp-units/vcpkg.json index 34ca3b8f0540c8..e4cc95da2ecd6a 100644 --- a/ports/mp-units/vcpkg.json +++ b/ports/mp-units/vcpkg.json @@ -1,11 +1,18 @@ { "name": "mp-units", - "version-string": "0.6.0", - "port-version": 1, + "version-semver": "0.7.0", "description": "mp-units - A Units Library for C++", "homepage": "https://github.com/mpusz/units", "dependencies": [ "fmt", - "ms-gsl" + "gsl-lite", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 5ef67a6ee2e4cd..6ab33ce926afaa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4465,8 +4465,8 @@ "port-version": 0 }, "mp-units": { - "baseline": "0.6.0", - "port-version": 1 + "baseline": "0.7.0", + "port-version": 0 }, "mp3lame": { "baseline": "3.100", diff --git a/versions/m-/mp-units.json b/versions/m-/mp-units.json index 9319735f0b2a2e..a8e54c22c1564d 100644 --- a/versions/m-/mp-units.json +++ b/versions/m-/mp-units.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ed05b65c897d6508b0b5f88f8a97373cf8fd8715", + "version-semver": "0.7.0", + "port-version": 0 + }, { "git-tree": "f39d5365e27cf32f149da1ef78f0ae6cd09e9039", "version-string": "0.6.0", From c5ca49491e0035ac7918f464ff4c0268c2751d31 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:18:41 +0100 Subject: [PATCH 1121/1858] [libsigcpp] Update to 3.0.7 (#21404) * Update libsigcpp to 3.0.7 * Update CI baseline Co-authored-by: chausner --- ports/libsigcpp/fix-shared-windows-build.patch | 17 +++++++++++++++++ ports/libsigcpp/portfile.cmake | 13 +++++++------ ports/libsigcpp/vcpkg.json | 15 ++++++++++++--- ports/libsigcpp/version.patch | 2 +- versions/baseline.json | 4 ++-- versions/l-/libsigcpp.json | 5 +++++ 6 files changed, 44 insertions(+), 12 deletions(-) create mode 100644 ports/libsigcpp/fix-shared-windows-build.patch diff --git a/ports/libsigcpp/fix-shared-windows-build.patch b/ports/libsigcpp/fix-shared-windows-build.patch new file mode 100644 index 00000000000000..f62e1eb14a197a --- /dev/null +++ b/ports/libsigcpp/fix-shared-windows-build.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,8 +53,11 @@ set (PROJECT_SOURCE_DIR "${sigc++_SOURCE_DIR}/sigc++") + include_directories (${sigc++_SOURCE_DIR}) + include_directories (${sigc++_BINARY_DIR}) + +-if(BUILD_SHARED_LIBS) +- add_compile_options(-DBUILD_SHARED) ++if (BUILD_SHARED_LIBS) ++ add_compile_options (-DBUILD_SHARED) ++ if (MSVC) ++ add_compile_options (-D_WINDLL) ++ endif() + endif() + + configure_file (sigc++config.h.cmake sigc++config.h) diff --git a/ports/libsigcpp/portfile.cmake b/ports/libsigcpp/portfile.cmake index 2328d35626c319..278dc310a9f40f 100644 --- a/ports/libsigcpp/portfile.cmake +++ b/ports/libsigcpp/portfile.cmake @@ -1,22 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libsigcplusplus/libsigcplusplus - REF 7e20b36bddab74faed39aa3768d07fd372fce596 - SHA512 6220a3974ee90afb5028a5b60ffcbff353fffbbfcf1570d8db05b6d91604324a73badcb17c73c852d6c5265e2b31e1c2de1b3ea20c0e60ecdb17ce90c9ca40bd + REF 3.0.7 + SHA512 4c9251613c30cc5d455dc30a039a12b73d6369ac03583dab382307b894f93d4733cebea0a6eef82e8d80b1354c812b4ff6bfc68913f0df5a61146d56a6afde13 HEAD_REF master PATCHES disable_tests_enable_static_build.patch version.patch fix-usage-in-static-build.patch + fix-shared-windows-build.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/sigc++-3 TARGET_PATH share/sigc++-3) +vcpkg_cmake_config_fixup(PACKAGE_NAME sigc++-3 CONFIG_PATH lib/cmake/sigc++-3) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/sigc++-3.0/include/sigc++config.h" "ifdef BUILD_SHARED" "if 1") diff --git a/ports/libsigcpp/vcpkg.json b/ports/libsigcpp/vcpkg.json index 780711131ee00d..51286da7838e1f 100644 --- a/ports/libsigcpp/vcpkg.json +++ b/ports/libsigcpp/vcpkg.json @@ -1,7 +1,16 @@ { "name": "libsigcpp", - "version": "3.0.3", - "port-version": 1, + "version": "3.0.7", "description": "Typesafe callback framework for C++", - "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/" + "homepage": "https://libsigcplusplus.github.io/libsigcplusplus/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libsigcpp/version.patch b/ports/libsigcpp/version.patch index dd485021edbf48..1492bed70dfe24 100644 --- a/ports/libsigcpp/version.patch +++ b/ports/libsigcpp/version.patch @@ -11,7 +11,7 @@ index b06ef121c..9b9520342 100644 -set (SIGCXX_MICRO_VERSION 1) +set (SIGCXX_MAJOR_VERSION 3) +set (SIGCXX_MINOR_VERSION 0) -+set (SIGCXX_MICRO_VERSION 3) ++set (SIGCXX_MICRO_VERSION 7) set (SIGCXX_API_VERSION 3.0) set (PACKAGE_VERSION ${SIGCXX_MAJOR_VERSION}.${SIGCXX_MINOR_VERSION}.${SIGCXX_MICRO_VERSION}) diff --git a/versions/baseline.json b/versions/baseline.json index 6ab33ce926afaa..9c9ff74ea7531e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3853,8 +3853,8 @@ "port-version": 0 }, "libsigcpp": { - "baseline": "3.0.3", - "port-version": 1 + "baseline": "3.0.7", + "port-version": 0 }, "libsigcpp-3": { "baseline": "3.0.3", diff --git a/versions/l-/libsigcpp.json b/versions/l-/libsigcpp.json index bf0f60e47e98ff..4191440741216b 100644 --- a/versions/l-/libsigcpp.json +++ b/versions/l-/libsigcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bdb51863c5589b8e47c717b7c96a1ead39d4dd27", + "version": "3.0.7", + "port-version": 0 + }, { "git-tree": "462e27cfc4abccd4d3157b2ae8b22c4bb6b82c67", "version": "3.0.3", From 61a56db8235dde36cfaeca576aa1dadc13a72e59 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:19:05 +0100 Subject: [PATCH 1122/1858] [bfgroup-lyra] Update to 1.5.1 (#21402) * Update bfgroup-lyra to 1.5.1 * Update CI baseline Co-authored-by: chausner --- ports/bfgroup-lyra/portfile.cmake | 17 ++++++++--------- ports/bfgroup-lyra/vcpkg.json | 15 ++++++++++++--- versions/b-/bfgroup-lyra.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/ports/bfgroup-lyra/portfile.cmake b/ports/bfgroup-lyra/portfile.cmake index c7c27bb14cf41a..fb9848a4fdca56 100644 --- a/ports/bfgroup-lyra/portfile.cmake +++ b/ports/bfgroup-lyra/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO bfgroup/Lyra - REF 1.5 - SHA512 1f8e505a487a9421a59afed0ee0c68894fb479117ac20c0bbb8d77ccf50ab938a68c93068f26871b9ddff0a21732d8bb1c6cc997b295a2a39c9363d32e320b3b + REF 1.5.1 + SHA512 e349c57614fe18cfee49b6a3977f133de3e567aa6b1c148abf9510432f7db34b75488739850e48c7943a15151fe2eedb129179d8d73eb61fb4f9a11c54b61086 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_install() +vcpkg_cmake_config_fixup( + PACKAGE_NAME lyra CONFIG_PATH share/lyra/cmake - TARGET_PATH share/lyra ) # Library is header-only, so no debug content. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/bfgroup-lyra/vcpkg.json b/ports/bfgroup-lyra/vcpkg.json index a7515048b8f30d..88b0d01efb8581 100644 --- a/ports/bfgroup-lyra/vcpkg.json +++ b/ports/bfgroup-lyra/vcpkg.json @@ -1,7 +1,16 @@ { "name": "bfgroup-lyra", - "version-string": "1.5", - "port-version": 1, + "version": "1.5.1", "description": "A simple to use, composable, command line parser for C++ 11 and beyond", - "homepage": "https://bfgroup.github.io/Lyra/" + "homepage": "https://bfgroup.github.io/Lyra/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/b-/bfgroup-lyra.json b/versions/b-/bfgroup-lyra.json index 507995fea83740..0a6e8cf000d393 100644 --- a/versions/b-/bfgroup-lyra.json +++ b/versions/b-/bfgroup-lyra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d06d9dff4b3cb6ea57292cb81460f113a905e3ea", + "version": "1.5.1", + "port-version": 0 + }, { "git-tree": "0cfb523191016e3f686356b2d522034a2b7a47da", "version-string": "1.5", diff --git a/versions/baseline.json b/versions/baseline.json index 9c9ff74ea7531e..71898eb249411f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -449,8 +449,8 @@ "port-version": 0 }, "bfgroup-lyra": { - "baseline": "1.5", - "port-version": 1 + "baseline": "1.5.1", + "port-version": 0 }, "bigint": { "baseline": "2010.04.30", From 638a9302c968a38d5b91742ee3003c064e9a968c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:32:12 +0100 Subject: [PATCH 1123/1858] [cgltf] Update to 1.11 (#21401) * Update cgltf to 1.11 * Update CI baseline Co-authored-by: chausner --- ports/cgltf/portfile.cmake | 4 ++-- ports/cgltf/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cgltf.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cgltf/portfile.cmake b/ports/cgltf/portfile.cmake index 54b8dade60c78a..181e95d98bd93f 100644 --- a/ports/cgltf/portfile.cmake +++ b/ports/cgltf/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jkuhlmann/cgltf - REF 1bdc84d3bb81fa69bcf71ed5cafe63e58df1448a #v1.10 - SHA512 d7f06912a2654633e6d596805e09dbb315453837d066189091c78f7eb837a2caff1768d79f15e8b0536105ffeb67a46e7093e2d6b61091301754f4722c494ada + REF v1.11 + SHA512 b3350d34670dac6756ea010bd030c4709f3a6c86d43b5099d10b505437422951e5db7f8e521ec9590a7aada535146614936ff990533d07084b1e50c216572943 HEAD_REF master ) diff --git a/ports/cgltf/vcpkg.json b/ports/cgltf/vcpkg.json index aa9ebec52890df..e787feea1ed13c 100644 --- a/ports/cgltf/vcpkg.json +++ b/ports/cgltf/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cgltf", - "version": "1.10", + "version": "1.11", "description": "Single-file glTF 2.0 loader and writer written in C99", "homepage": "https://github.com/jkuhlmann/cgltf" } diff --git a/versions/baseline.json b/versions/baseline.json index 71898eb249411f..b8feec230fecbf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1305,7 +1305,7 @@ "port-version": 0 }, "cgltf": { - "baseline": "1.10", + "baseline": "1.11", "port-version": 0 }, "cgns": { diff --git a/versions/c-/cgltf.json b/versions/c-/cgltf.json index 6d241058830e03..2e9f77ff64b52d 100644 --- a/versions/c-/cgltf.json +++ b/versions/c-/cgltf.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2b793ed9e4345b733ec3897b1fbed4e152b5fc4a", + "version": "1.11", + "port-version": 0 + }, { "git-tree": "3fc2cb13947f1e5bdabb4333fbc2a4f5ec3128f7", "version": "1.10", From c2a169cf341a5638392909a6375ab4799544bed1 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:32:32 +0100 Subject: [PATCH 1124/1858] [cwalk] Update to 1.2.6 (#21400) * Update cwalk to 1.2.6 * Update CI baseline Co-authored-by: chausner --- ports/cwalk/portfile.cmake | 15 +++++++-------- ports/cwalk/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/c-/cwalk.json | 5 +++++ 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ports/cwalk/portfile.cmake b/ports/cwalk/portfile.cmake index 419b81efb98f77..a795d1a4019ae1 100644 --- a/ports/cwalk/portfile.cmake +++ b/ports/cwalk/portfile.cmake @@ -1,22 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO likle/cwalk - REF v1.2.5 - SHA512 904e095e375d0c98dedbb17ddf805397387f8f473a708b310ba3086bbd4445bde7d0a037fbe9caed97c9cc793219a3d976cef010d76a32812c4fe2b3b7cde575 + REF v1.2.6 + SHA512 d43f339178367facd2f80944f5491631edab24fa4a92e30fd8f4d9c533ec3a2edbc04105066148be8458b64d0fac9e7d86408ca9601db291b93df222dc875fd4 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/cwalk) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cwalk) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/cwalk/vcpkg.json b/ports/cwalk/vcpkg.json index c7d9b713e43018..d3e1cf9c10d869 100644 --- a/ports/cwalk/vcpkg.json +++ b/ports/cwalk/vcpkg.json @@ -1,6 +1,16 @@ { "name": "cwalk", - "version-string": "1.2.5", + "version": "1.2.6", "description": "Path library for C/C++. Cross-Platform for Windows, MacOS and Linux. Supports UNIX and Windows path styles on those platforms.", - "homepage": "https://likle.github.io/cwalk/" + "homepage": "https://likle.github.io/cwalk/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index b8feec230fecbf..a925baf94d9e8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1713,7 +1713,7 @@ "port-version": 1 }, "cwalk": { - "baseline": "1.2.5", + "baseline": "1.2.6", "port-version": 0 }, "cxxopts": { diff --git a/versions/c-/cwalk.json b/versions/c-/cwalk.json index 16a560bb3a3473..d6992311104b8a 100644 --- a/versions/c-/cwalk.json +++ b/versions/c-/cwalk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d538350d056fb42b77d28894f67a2bc9dbfe1403", + "version": "1.2.6", + "port-version": 0 + }, { "git-tree": "5cec9575426a50a36612850c9681b8216572a3db", "version-string": "1.2.5", From da1e076a8d568c5bf14d783607c9e7785756ca82 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:32:51 +0100 Subject: [PATCH 1125/1858] [font-chef] Update to 1.1.0 (#21398) * Update font-chef to 1.1.0 * Update CI baseline * Fix build on 64 bit platforms * Update git-tree hash * Add comment * Update git-tree hash Co-authored-by: chausner --- .../font-chef/disable-warnings-as-errors.patch | 12 ++++++++++++ ports/font-chef/portfile.cmake | 17 +++++++++-------- ports/font-chef/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/f-/font-chef.json | 5 +++++ 5 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 ports/font-chef/disable-warnings-as-errors.patch diff --git a/ports/font-chef/disable-warnings-as-errors.patch b/ports/font-chef/disable-warnings-as-errors.patch new file mode 100644 index 00000000000000..31b69f82a64359 --- /dev/null +++ b/ports/font-chef/disable-warnings-as-errors.patch @@ -0,0 +1,12 @@ +diff --git a/src/font-chef/CMakeLists.txt b/src/font-chef/CMakeLists.txt +--- a/src/font-chef/CMakeLists.txt ++++ b/src/font-chef/CMakeLists.txt +@@ -68,7 +68,7 @@ target_include_directories(font-chef++ INTERFACE + if (NOT CMAKE_BUILD_TYPE MATCHES "Release") + target_compile_options(font-chef PRIVATE + $<$,$>:-Wall -Wextra -pedantic -fvisibility=hidden -Werror> +- $<$:/W3 /WX /wd4820 /wd4668 /wd4204> ++ $<$:/W3 /wd4820 /wd4668 /wd4204> + ) + endif() + diff --git a/ports/font-chef/portfile.cmake b/ports/font-chef/portfile.cmake index 2ae280bdcf67f1..304d870f4988d3 100644 --- a/ports/font-chef/portfile.cmake +++ b/ports/font-chef/portfile.cmake @@ -1,23 +1,24 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mobius3/font-chef - REF v1.0.1 - SHA512 0d73d095a2f6346cde5fc58a07be7cbe2c180ab5c83a4af21f765a6be1e9dcc5a403fa1d4c64f71dad5609eb72c8b05df8606b4035fceadca74fe6a87bb8efef + REF v1.1.0 + SHA512 3df1e31e4405bcbb05ffed8fe618eb953498389adef3d83d337ac570644008bee031e08cd64382443ad123c4abf7e0acca5e3e16288caf6225672d6796a9494f HEAD_REF master + PATCHES + disable-warnings-as-errors.patch # to workaround https://github.com/mobius3/font-chef/issues/3 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/${PORT}") +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/font-chef/vcpkg.json b/ports/font-chef/vcpkg.json index 0203b566112afa..a293eb6ba8b75b 100644 --- a/ports/font-chef/vcpkg.json +++ b/ports/font-chef/vcpkg.json @@ -1,7 +1,16 @@ { "name": "font-chef", - "version-string": "1.0.1", - "port-version": 1, + "version": "1.1.0", "description": "A font cooking library", - "homepage": "https://github.com/mobius3/font-chef" + "homepage": "https://github.com/mobius3/font-chef", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a925baf94d9e8e..ba6c7202fa7281 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2213,8 +2213,8 @@ "port-version": 3 }, "font-chef": { - "baseline": "1.0.1", - "port-version": 1 + "baseline": "1.1.0", + "port-version": 0 }, "fontconfig": { "baseline": "2.13.94", diff --git a/versions/f-/font-chef.json b/versions/f-/font-chef.json index 0b81ddab76ff5f..fc2079aa9720ad 100644 --- a/versions/f-/font-chef.json +++ b/versions/f-/font-chef.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "38744fa5fa1e86217669332c7860e193550b1a81", + "version": "1.1.0", + "port-version": 0 + }, { "git-tree": "907533e8f03e495fcddd47a6c0cd59cc73dfcc0b", "version-string": "1.0.1", From c1de8242d4ce42ec5b5fca8ebbfd081ed723cb5d Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:33:10 +0100 Subject: [PATCH 1126/1858] [ghc-filesystem] Update to 1.5.10 (#21397) * Update ghc-filesystem to 1.5.10 * Update CI baseline Co-authored-by: chausner --- ports/ghc-filesystem/portfile.cmake | 13 ++++++------- ports/ghc-filesystem/vcpkg.json | 5 ++--- versions/baseline.json | 4 ++-- versions/g-/ghc-filesystem.json | 5 +++++ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ports/ghc-filesystem/portfile.cmake b/ports/ghc-filesystem/portfile.cmake index 781933c2c25a5a..369cc089316cac 100644 --- a/ports/ghc-filesystem/portfile.cmake +++ b/ports/ghc-filesystem/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gulrak/filesystem - REF v1.5.4 + REF v1.5.10 HEAD_REF master - SHA512 01fb69ce46259d25d152667943c20e013c90e005647ca1c9c64e0721882236079bac160c04b5edf310e1163bdf8cb6fc0343680de686a1329777027008c301bf + SHA512 470dd9e1c4358f9d8d9f531d8c3c6716cdd156c815315748436a1dc3caf095d320e58eae2274df8c15e293cc96170752fb00aed8ad2210d417b174c13297fbac ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGHC_FILESYSTEM_BUILD_TESTING=OFF -DGHC_FILESYSTEM_BUILD_EXAMPLES=OFF @@ -19,7 +19,6 @@ vcpkg_cmake_config_fixup( CONFIG_PATH lib/cmake/ghc_filesystem ) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib -) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/ghc-filesystem/vcpkg.json b/ports/ghc-filesystem/vcpkg.json index 648a6fdd90e26d..03117dfae17915 100644 --- a/ports/ghc-filesystem/vcpkg.json +++ b/ports/ghc-filesystem/vcpkg.json @@ -1,8 +1,7 @@ { "name": "ghc-filesystem", - "version": "1.5.4", - "port-version": 1, - "description": "An implementation of C++17 std::filesystem for C++11 /C++14/C++17/C++20 on Windows, macOS, Linux and FreeBSD", + "version": "1.5.10", + "description": "An implementation of C++17 std::filesystem for C++11/C++14/C++17/C++20 on Windows, macOS, Linux and FreeBSD", "homepage": "https://github.com/gulrak/filesystem", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index ba6c7202fa7281..a1179bfbeb1023 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2417,8 +2417,8 @@ "port-version": 5 }, "ghc-filesystem": { - "baseline": "1.5.4", - "port-version": 1 + "baseline": "1.5.10", + "port-version": 0 }, "gherkin-c": { "baseline": "2019-10-07", diff --git a/versions/g-/ghc-filesystem.json b/versions/g-/ghc-filesystem.json index 516c9564a1b1d2..8c7d3dc339433a 100644 --- a/versions/g-/ghc-filesystem.json +++ b/versions/g-/ghc-filesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d4afd633149f9feea72ebfc90f1ab86135fb5f2", + "version": "1.5.10", + "port-version": 0 + }, { "git-tree": "7b793d2816cd9bd4d242e09b3d9638d760216797", "version": "1.5.4", From 9c575a656da2df7c25d9fd066e978e846eb47eb0 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:33:27 +0100 Subject: [PATCH 1127/1858] [glfw3] Update to 3.3.5 (#21396) * Update glfw3 to 3.3.5 * Update CI baseline Co-authored-by: chausner --- ports/glfw3/portfile.cmake | 17 ++++++++--------- ports/glfw3/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/g-/glfw3.json | 5 +++++ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 0b9d9d6314d0c2..4eb911174b16a0 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO glfw/glfw - REF 814b7929c5add4b0541ccad26fb81f28b71dc4d8 #v3.3.4 - SHA512 8e34d011ab49940b405998312af4807e4c9837a44d95d873cb3723e7c141da6a10c1dfaf1652f03b31b911f0ae4515ded52cac02844435dc374b93d376921e43 + REF 3.3.5 + SHA512 cbb8ebf25d3d826eb1daeff3ad2e0e965ce9def3352955f297743d918f625d96bc05bf87c90f7b57ec53376a0f2f6ce62f80b57fac4e81e023400de275e97beb HEAD_REF master ) @@ -17,23 +17,22 @@ if(VCPKG_TARGET_IS_LINUX) These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxcursor-dev xorg-dev libglu1-mesa-dev") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glfw3) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/glfw3) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/glfw3/vcpkg.json b/ports/glfw3/vcpkg.json index f152921cc8251d..581dae957f02dc 100644 --- a/ports/glfw3/vcpkg.json +++ b/ports/glfw3/vcpkg.json @@ -1,6 +1,16 @@ { "name": "glfw3", - "version-semver": "3.3.4", + "version-semver": "3.3.5", "description": "GLFW is a free, Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan application development. It provides a simple, platform-independent API for creating windows, contexts and surfaces, reading input, handling events, etc.", - "homepage": "https://github.com/glfw/glfw" + "homepage": "https://github.com/glfw/glfw", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a1179bfbeb1023..15bc9fc901c25c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2453,7 +2453,7 @@ "port-version": 0 }, "glfw3": { - "baseline": "3.3.4", + "baseline": "3.3.5", "port-version": 0 }, "gli": { diff --git a/versions/g-/glfw3.json b/versions/g-/glfw3.json index e555e6841bbc86..cd5908a984a0be 100644 --- a/versions/g-/glfw3.json +++ b/versions/g-/glfw3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90c6416669c2154f54d3f65e3a2afb8f75ab2aaa", + "version-semver": "3.3.5", + "port-version": 0 + }, { "git-tree": "aa7325438c3156b62488a559218d12e7e860196c", "version-semver": "3.3.4", From 526d726ab886f6c964e62541d52963c7b056efb3 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:33:49 +0100 Subject: [PATCH 1128/1858] [gmmlib] Update to 21.3.2 (#21395) * Update gmmlib to 21.3.2 * Update CI baseline Co-authored-by: chausner --- ports/gmmlib/portfile.cmake | 22 ++++++++++------------ ports/gmmlib/vcpkg.json | 14 ++++++++++---- versions/baseline.json | 4 ++-- versions/g-/gmmlib.json | 5 +++++ 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/ports/gmmlib/portfile.cmake b/ports/gmmlib/portfile.cmake index b09ba8c84c4307..eef38b62225e2a 100644 --- a/ports/gmmlib/portfile.cmake +++ b/ports/gmmlib/portfile.cmake @@ -7,24 +7,22 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO intel/gmmlib - REF f6c91364b0911a7513e9543fd874360ec8901742 # intel-gmmlib-20.3.1 - SHA512 c46d5cba30db1d06134d2606ad9806a84b0e1248313a61c5d073fc5fe7570b864a4d5e9cf73dc6832102ace476839dbff1e3782f08a4cdcb62c04c40708a5710 + REF intel-gmmlib-21.3.2 + SHA512 155f7077f3135ff812b9fe759e56fecd595f1c5dde9a377df31a9acedcfeea9d93751badba68077c00929a21cb87e1bd69b8fe3961ac61765fabbc5d6d89e6be HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DARCH=64 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/gmmlib/copyright COPYONLY) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Scripts) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/Resource) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/igdgmm/GmmLib/GlobalInfo) +configure_file("${SOURCE_PATH}/LICENSE.md" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/gmmlib/vcpkg.json b/ports/gmmlib/vcpkg.json index 613b45e830a184..96a697a3db4877 100644 --- a/ports/gmmlib/vcpkg.json +++ b/ports/gmmlib/vcpkg.json @@ -1,7 +1,13 @@ { "name": "gmmlib", - "version-string": "20.3.1", - "port-version": 1, - "description": "intel's graphics memory management library", - "supports": "linux" + "version": "21.3.2", + "description": "Intel(R) Graphics Memory Management Library", + "homepage": "https://github.com/intel/gmmlib", + "supports": "linux", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 15bc9fc901c25c..8306b954acbc5b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2497,8 +2497,8 @@ "port-version": 2 }, "gmmlib": { - "baseline": "20.3.1", - "port-version": 1 + "baseline": "21.3.2", + "port-version": 0 }, "gmp": { "baseline": "6.2.1", diff --git a/versions/g-/gmmlib.json b/versions/g-/gmmlib.json index 64ad7d7f5430c1..dac45e5eec1af1 100644 --- a/versions/g-/gmmlib.json +++ b/versions/g-/gmmlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5b69783d8bdff160371ecc494af42d6ec8d8ffa0", + "version": "21.3.2", + "port-version": 0 + }, { "git-tree": "1d1a120fb9b513b005575b6324b9eaa13d900192", "version-string": "20.3.1", From 6ea1e3d23bf2a47faf0ae3baae2073a46c3247ff Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:35:34 +0100 Subject: [PATCH 1129/1858] [hypre] Update to 2.23.0 (#21394) * Update hypre to 2.23.0 * Update CI baseline * Add back vcpkg_check_linkage(ONLY_STATIC_LIBRARY) on Windows * Update CI baseline Co-authored-by: chausner --- ports/hypre/fix-dll-install-destination.patch | 12 +++++++ ports/hypre/portfile.cmake | 31 +++++++++---------- ports/hypre/vcpkg.json | 15 ++++++--- versions/baseline.json | 4 +-- versions/h-/hypre.json | 5 +++ 5 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 ports/hypre/fix-dll-install-destination.patch diff --git a/ports/hypre/fix-dll-install-destination.patch b/ports/hypre/fix-dll-install-destination.patch new file mode 100644 index 00000000000000..68d335ccfd5f50 --- /dev/null +++ b/ports/hypre/fix-dll-install-destination.patch @@ -0,0 +1,12 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -459,7 +459,7 @@ install(TARGETS ${PROJECT_NAME} + EXPORT HYPRETargets + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + install(FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") + diff --git a/ports/hypre/portfile.cmake b/ports/hypre/portfile.cmake index 5d854d98522b1d..8645eaef1b8335 100644 --- a/ports/hypre/portfile.cmake +++ b/ports/hypre/portfile.cmake @@ -5,38 +5,35 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO hypre-space/hypre - REF v2.19.0 - SHA512 999979bc2e7d32aef7c084fc8508fb818e6f904db0ee3ebf6b8e8132f290201c407aaba0aa89e7bf09e7264f4e99caf04f3147458847de816fc8ffc81dbee2df + REF v2.23.0 + SHA512 bed8426d093e2290ab443f49deffad96a64e1b3844a4236bc59af19523b16ea8bf2318db21e42ab2b8a4dd529246ba1d9a4eb0cb3bd943633569d03e6311f67f HEAD_REF master + PATCHES + fix-dll-install-destination.patch ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(OPTIONS -DHYPRE_SHARED=ON) -else() - set(OPTIONS -DHYPRE_SHARED=OFF) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" HYPRE_SHARED) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/src - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/src" OPTIONS - ${OPTIONS} + -DHYPRE_SHARED=${HYPRE_SHARED} -DHYPRE_ENABLE_HYPRE_BLAS=OFF -DHYPRE_ENABLE_HYPRE_LAPACK=OFF OPTIONS_RELEASE -DHYPRE_BUILD_TYPE=Release - -DHYPRE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR} + "-DHYPRE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}" OPTIONS_DEBUG -DHYPRE_BUILD_TYPE=Debug - -DHYPRE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug + "-DHYPRE_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HYPRE) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/HYPRE) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/hypre/vcpkg.json b/ports/hypre/vcpkg.json index 4ca1f11b40d7b4..bcdb97323c23a8 100644 --- a/ports/hypre/vcpkg.json +++ b/ports/hypre/vcpkg.json @@ -1,12 +1,19 @@ { "name": "hypre", - "version-string": "2.19.0", - "port-version": 1, - "description": "SCALABLE LINEAR SOLVERS AND MULTIGRID METHODS", + "version": "2.23.0", + "description": "Parallel solvers for sparse linear systems featuring multigrid methods", "homepage": "https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods", "dependencies": [ "blas", "lapack", - "mpi" + "mpi", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 8306b954acbc5b..e861b7a5d969ab 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2717,8 +2717,8 @@ "port-version": 0 }, "hypre": { - "baseline": "2.19.0", - "port-version": 1 + "baseline": "2.23.0", + "port-version": 0 }, "icu": { "baseline": "69.1", diff --git a/versions/h-/hypre.json b/versions/h-/hypre.json index f304c44b254bb5..758633abb6cf97 100644 --- a/versions/h-/hypre.json +++ b/versions/h-/hypre.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e59caf45e83417ef29aec09ecb532d5e39ef6b5", + "version": "2.23.0", + "port-version": 0 + }, { "git-tree": "35d58add9c09f800e2895bacf563de15f031f7be", "version-string": "2.19.0", From 7c11775f1449c7a36c398afffc805f09fdb45426 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:35:54 +0100 Subject: [PATCH 1130/1858] [iir1] Update to 1.9.0 (#21392) * Update iir1 to 1.9.0 * Update CI baseline * Formatting tweak * Update CI baseline Co-authored-by: chausner --- ports/iir1/portfile.cmake | 20 ++++++++------------ ports/iir1/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/i-/iir1.json | 5 +++++ 4 files changed, 27 insertions(+), 17 deletions(-) diff --git a/ports/iir1/portfile.cmake b/ports/iir1/portfile.cmake index 3babc1b2e395d2..0cd648c67ca8f8 100644 --- a/ports/iir1/portfile.cmake +++ b/ports/iir1/portfile.cmake @@ -1,25 +1,21 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO berndporr/iir1 - REF 67591c8eac591c576b9aabe9a2f288296bb263f0 #1.8.0 - SHA512 7bea56bd3a5251656834f43ea55e1a8bff48ed2b5576ea9d7bc058e371457b7a3e8fe26111ec9457d4aa9e397f3267d330c5353aea00810a5cc4d9bec2bdcc72 + REF 1.9.0 + SHA512 9dced1610fbbfd7194874e984f969880dc76df3562df575c07d022b9ac96c67334b542acea395531423dfb5b8d692b14abdaff0235f048ab6ca7221bfc57fdba HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} - RENAME copyright -) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/iir1/vcpkg.json b/ports/iir1/vcpkg.json index 3b79f3d6f3c5f1..db60d1efbf5294 100644 --- a/ports/iir1/vcpkg.json +++ b/ports/iir1/vcpkg.json @@ -1,9 +1,18 @@ { "name": "iir1", - "version": "1.8.0", - "port-version": 1, + "version": "1.9.0", "description": "Realtime C++ filter library", "homepage": "https://github.com/berndporr/iir1", "license": "MIT", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index e861b7a5d969ab..0da9ccad1efb64 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2809,8 +2809,8 @@ "port-version": 1 }, "iir1": { - "baseline": "1.8.0", - "port-version": 1 + "baseline": "1.9.0", + "port-version": 0 }, "ijg-libjpeg": { "baseline": "9d", diff --git a/versions/i-/iir1.json b/versions/i-/iir1.json index ae15bbc5fa9ddf..0cb293f69f330f 100644 --- a/versions/i-/iir1.json +++ b/versions/i-/iir1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "45098a249e45e71b1efa228efae07950b4499be4", + "version": "1.9.0", + "port-version": 0 + }, { "git-tree": "2cab65e09816beaca2cdc9688f4d61ae448f6877", "version": "1.8.0", From 3cea0115ea8ecb10844ba53cd5c8cca2e7efb952 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:36:13 +0100 Subject: [PATCH 1131/1858] [influxdb-cxx] Update to 0.6.7 (#21390) * Update influxdb-cxx to 0.6.7 * Update CI baseline Co-authored-by: chausner --- ports/influxdb-cxx/portfile.cmake | 14 +++++++------- ports/influxdb-cxx/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/i-/influxdb-cxx.json | 5 +++++ 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ports/influxdb-cxx/portfile.cmake b/ports/influxdb-cxx/portfile.cmake index cbdc50a5c6e69b..e666277a79363a 100644 --- a/ports/influxdb-cxx/portfile.cmake +++ b/ports/influxdb-cxx/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO offa/influxdb-cxx - REF v0.6.6 - SHA512 4c9a9bf7ccf430caaed088830dceda8cc4b4ec6b78187e5238c5e73f17583781d9d00e08db1011b86a4f418cdfbbfc8b000500461d013872a62096de456e47ea + REF v0.6.7 + SHA512 4e871c6d06c94b24b45aeedb7c74c75aed17332fbde76fc1e6c2ad06aeb41e268a95f4cab1c12c4402765c11811feb84bf48d60b138717c485327848782e402c HEAD_REF master ) @@ -11,18 +11,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS boost INFLUXCXX_WITH_BOOST ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DINFLUXCXX_TESTING=OFF -DINFLUXCXX_SYSTEMTEST=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/influxdb-cxx/vcpkg.json b/ports/influxdb-cxx/vcpkg.json index a54ce151214352..59724c89ae8c2f 100644 --- a/ports/influxdb-cxx/vcpkg.json +++ b/ports/influxdb-cxx/vcpkg.json @@ -1,10 +1,18 @@ { "name": "influxdb-cxx", - "version": "0.6.6", + "version": "0.6.7", "description": "InfluxDB C++ client library", "homepage": "https://github.com/offa/influxdb-cxx", "dependencies": [ - "curl" + "curl", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "boost": { diff --git a/versions/baseline.json b/versions/baseline.json index 0da9ccad1efb64..db9a307868d9ed 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2849,7 +2849,7 @@ "port-version": 0 }, "influxdb-cxx": { - "baseline": "0.6.6", + "baseline": "0.6.7", "port-version": 0 }, "infoware": { diff --git a/versions/i-/influxdb-cxx.json b/versions/i-/influxdb-cxx.json index 316994fa71fb25..d4e9ce4c0ed7c9 100644 --- a/versions/i-/influxdb-cxx.json +++ b/versions/i-/influxdb-cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ddcc844c034b136efc1bd9946e37fb98617acd88", + "version": "0.6.7", + "port-version": 0 + }, { "git-tree": "ed824d6b1c309c2e7e347960bfb44ab43885e7bc", "version": "0.6.6", From c2da46c0ba8dc275304264fc46054a5ee4991675 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:53:15 +0100 Subject: [PATCH 1132/1858] [jsoncpp] Update to 1.9.5 (#21389) * Update jsoncpp to 1.9.5 * Update CI baseline Co-authored-by: chausner --- ports/jsoncpp/portfile.cmake | 19 ++++++++++--------- ports/jsoncpp/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/j-/jsoncpp.json | 5 +++++ 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/ports/jsoncpp/portfile.cmake b/ports/jsoncpp/portfile.cmake index e722bde64c2b81..84c1a54616361c 100644 --- a/ports/jsoncpp/portfile.cmake +++ b/ports/jsoncpp/portfile.cmake @@ -1,31 +1,32 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-source-parsers/jsoncpp - REF 9059f5cad030ba11d37818847443a53918c327b1 # 1.9.4 - SHA512 8062c83cad9dc453f1eb4886e63e054570e0f29dcd6594330d3b3628ba994915e26e08690cd28118805a766be200ac99ad4fbc131db3af895122a8d1bd87ef31 + REF 1.9.5 + SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873 HEAD_REF master ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC) +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DJSONCPP_WITH_CMAKE_PACKAGE=ON -DBUILD_STATIC_LIBS=${JSONCPP_STATIC} + -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT} -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_EXAMPLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/jsoncpp) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/jsoncpp/vcpkg.json b/ports/jsoncpp/vcpkg.json index c334a11c112b09..f9daea0f09a9a7 100644 --- a/ports/jsoncpp/vcpkg.json +++ b/ports/jsoncpp/vcpkg.json @@ -1,7 +1,16 @@ { "name": "jsoncpp", - "version-string": "1.9.4", - "port-version": 1, + "version": "1.9.5", "description": "jsoncpp is an implementation of a JSON reader and writer in C++. JSON (JavaScript Object Notation) is a lightweight data-interchange format that it is easy to parse and redeable for human.", - "homepage": "https://github.com/open-source-parsers/jsoncpp" + "homepage": "https://github.com/open-source-parsers/jsoncpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index db9a307868d9ed..aced314db75b97 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2981,8 +2981,8 @@ "port-version": 1 }, "jsoncpp": { - "baseline": "1.9.4", - "port-version": 1 + "baseline": "1.9.5", + "port-version": 0 }, "jsonnet": { "baseline": "0.17.0", diff --git a/versions/j-/jsoncpp.json b/versions/j-/jsoncpp.json index b96484d4635aa2..ca8db93235910b 100644 --- a/versions/j-/jsoncpp.json +++ b/versions/j-/jsoncpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee92c743e235ebd2eda342c656704f20a329bda9", + "version": "1.9.5", + "port-version": 0 + }, { "git-tree": "444e56d175225f268ea77433982e81ef131a6d1d", "version-string": "1.9.4", From 820210de76de887357c8188ebdf6aab6e3cb6568 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:53:45 +0100 Subject: [PATCH 1133/1858] [libdivide] Update to 5.0 (#21388) * Update libdivide to 5.0 * Update CI baseline Co-authored-by: chausner --- ports/libdivide/portfile.cmake | 33 +++++++++++++++++---------------- ports/libdivide/vcpkg.json | 13 +++++++++++-- versions/baseline.json | 4 ++-- versions/l-/libdivide.json | 5 +++++ 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/ports/libdivide/portfile.cmake b/ports/libdivide/portfile.cmake index 32ea56b258d205..78f42e5bd6f878 100644 --- a/ports/libdivide/portfile.cmake +++ b/ports/libdivide/portfile.cmake @@ -1,32 +1,33 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ridiculousfish/libdivide - REF v4.0.0 - SHA512 662b8f479c3f822563d4f1c85c77c204f47e992391cd5ca3376d6e19e4d2132c28ad59b8e3179edd706fceeabf0d1bc7be5e713eeb669523952155a2d7770326 + REF 5.0 + SHA512 89581efab63a0668405196d4d8188e03f3b87027e9014ef7238e1d79fe369d8abbca0e44b00cf02b00be29c272feb34c9b9290313596adbef9b46ae0715c29dd HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - test BUILD_TESTS + test BUILD_TESTS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${FEATURE_OPTIONS} - -DLIBDIVIDE_SSE2=OFF - -DLIBDIVIDE_AVX2=OFF - -DLIBDIVIDE_AVX512=OFF - -DENABLE_VECTOR_EXTENSIONS=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + -DLIBDIVIDE_SSE2=OFF + -DLIBDIVIDE_AVX2=OFF + -DLIBDIVIDE_AVX512=OFF + -DLIBDIVIDE_NEON=OFF + -DENABLE_VECTOR_EXTENSIONS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libdivide/vcpkg.json b/ports/libdivide/vcpkg.json index 5ae81457514ae0..ff29d9d5d3e32e 100644 --- a/ports/libdivide/vcpkg.json +++ b/ports/libdivide/vcpkg.json @@ -1,9 +1,18 @@ { "name": "libdivide", - "version-string": "4.0.0", - "port-version": 1, + "version": "5.0", "description": "libdivide.h is a header-only C/C++ library for optimizing integer division.", "homepage": "https://github.com/ridiculousfish/libdivide", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "test": { "description": "Build test" diff --git a/versions/baseline.json b/versions/baseline.json index aced314db75b97..d09bf118206df1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3385,8 +3385,8 @@ "port-version": 8 }, "libdivide": { - "baseline": "4.0.0", - "port-version": 1 + "baseline": "5.0", + "port-version": 0 }, "libdjinterop": { "baseline": "0.16.0", diff --git a/versions/l-/libdivide.json b/versions/l-/libdivide.json index 747b96345c5935..ac46b6fe3f5890 100644 --- a/versions/l-/libdivide.json +++ b/versions/l-/libdivide.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b13f3b926e61d104e85e04bf192fabe29cd5f05e", + "version": "5.0", + "port-version": 0 + }, { "git-tree": "a632ce1c591ebeff2d020222f9a7cac938d3a623", "version-string": "4.0.0", From 379193866642eae244d5130ba5dd0c1e2a463df0 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:54:04 +0100 Subject: [PATCH 1134/1858] [libxlsxwriter] Update to 1.1.4 (#21387) * Update libxlsxwriter to 1.1.4 * Update CI baseline Co-authored-by: chausner --- ports/libxlsxwriter/portfile.cmake | 10 +++++----- ports/libxlsxwriter/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libxlsxwriter.json | 5 +++++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ports/libxlsxwriter/portfile.cmake b/ports/libxlsxwriter/portfile.cmake index f2bf4f7e04be53..b95032196f2b49 100644 --- a/ports/libxlsxwriter/portfile.cmake +++ b/ports/libxlsxwriter/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jmcnamara/libxlsxwriter - REF 576d169463c7f9990045fd9223f5cf688150def0 #RELEASE_1.1.3 - SHA512 376db117df3ab48a6471d7004fc77fb8bd9b5d9dfaff53675f1bd99c8bc9bec7cadcefbd7116b206ef4703b9146cf097ad3b8aadff36b66302f1c82e8e1fa988 + REF RELEASE_1.1.4 + SHA512 fad36f7882fcb21b87e13cf603022cfad3f14e6f955a06e2771712facd0fe12f83f4d1655dc1a744724bda1ac83af7e7bf1393457c5507d8983f63002ab294b5 HEAD_REF master ) @@ -19,10 +19,10 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_copy_pdbs() +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_fixup_pkgconfig() diff --git a/ports/libxlsxwriter/vcpkg.json b/ports/libxlsxwriter/vcpkg.json index d54a1f03618565..f72992f7879d96 100644 --- a/ports/libxlsxwriter/vcpkg.json +++ b/ports/libxlsxwriter/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libxlsxwriter", - "version-semver": "1.1.3", - "port-version": 1, + "version-semver": "1.1.4", "description": "Libxlsxwriter is a C library that can be used to write text, numbers, formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.", "homepage": "https://github.com/jmcnamara/libxlsxwriter", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d09bf118206df1..711e37f46eb61e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4041,8 +4041,8 @@ "port-version": 1 }, "libxlsxwriter": { - "baseline": "1.1.3", - "port-version": 1 + "baseline": "1.1.4", + "port-version": 0 }, "libxml2": { "baseline": "2.9.12", diff --git a/versions/l-/libxlsxwriter.json b/versions/l-/libxlsxwriter.json index c68eb249ae2a50..53b304b03b5143 100644 --- a/versions/l-/libxlsxwriter.json +++ b/versions/l-/libxlsxwriter.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e7e4072f13a2839135caf76e0b0ef31ee13bc48", + "version-semver": "1.1.4", + "port-version": 0 + }, { "git-tree": "13265cc8f10d1cd14a723dfda351ac6ad6625e60", "version-semver": "1.1.3", From 9e76abab02a752cb778acbf737d2918119149e79 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:54:22 +0100 Subject: [PATCH 1135/1858] [libosmium] Update to 2.17.1 (#21386) * Update libosmium to 2.17.1 * Update CI baseline Co-authored-by: chausner --- ports/libosmium/portfile.cmake | 4 ++-- ports/libosmium/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libosmium.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/libosmium/portfile.cmake b/ports/libosmium/portfile.cmake index ebc364284db92d..f764134df63a07 100644 --- a/ports/libosmium/portfile.cmake +++ b/ports/libosmium/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO osmcode/libosmium - REF b263ba5e85c9ac254fa4090c855ec6f0556795e2 #v2.17.0 - SHA512 fd2955af6153ef58d76cca1e5b83cb70cd33cb616a3e221a80df94ee1256eeeaa5f15f4727cd1023f0335e55d7f3f36e3f9f5490bcd78ba9d267b2075480d1ba + REF v2.17.1 + SHA512 08d1eb272b82364118b97213310e5d62fdbb071cfad74989bdc5bb25f9e14b067d53016d19bfed3972d3385343fc74edf86407860be83c59e74902cd1f26bb33 ) set(BOOST_ROOT "${CURRENT_INSTALLED_DIR}") diff --git a/ports/libosmium/vcpkg.json b/ports/libosmium/vcpkg.json index 2bd42371b58b87..904c1e22a35bb5 100644 --- a/ports/libosmium/vcpkg.json +++ b/ports/libosmium/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libosmium", - "version-semver": "2.17.0", + "version-semver": "2.17.1", "description": "A fast and flexible C++ library for working with OpenStreetMap data", "homepage": "https://osmcode.org/libosmium/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 711e37f46eb61e..fcaf783fd5a3a6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3725,7 +3725,7 @@ "port-version": 1 }, "libosmium": { - "baseline": "2.17.0", + "baseline": "2.17.1", "port-version": 0 }, "libosmscout": { diff --git a/versions/l-/libosmium.json b/versions/l-/libosmium.json index 7d8e06643abcab..acf60f09b41e6f 100644 --- a/versions/l-/libosmium.json +++ b/versions/l-/libosmium.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "862e140771bed4c7e9b7bc8ffc798edbbd3daa1c", + "version-semver": "2.17.1", + "port-version": 0 + }, { "git-tree": "3cfda0b067f25efdb3d3f35421c5eb898cba74c3", "version-semver": "2.17.0", From 406ee279ee47da916dfcd26b54274e8960e043a2 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:54:45 +0100 Subject: [PATCH 1136/1858] [libepoxy] Update to 1.5.9 (#21385) * Update libepoxy to 1.5.9 * Update CI baseline Co-authored-by: chausner --- ports/libepoxy/portfile.cmake | 6 +++--- ports/libepoxy/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libepoxy.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 83a32bb74d8767..ff72544e28cc09 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -9,8 +9,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO anholt/libepoxy - REF 1.5.5 - SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45 + REF 1.5.9 + SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8 HEAD_REF master ) @@ -24,7 +24,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_configure_meson( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} -Dtests=false diff --git a/ports/libepoxy/vcpkg.json b/ports/libepoxy/vcpkg.json index d5f7b4259c3013..b786ce4e4cacf2 100644 --- a/ports/libepoxy/vcpkg.json +++ b/ports/libepoxy/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libepoxy", - "version-semver": "1.5.5", - "port-version": 1, + "version-semver": "1.5.9", "description": "Epoxy is a library for handling OpenGL function pointer management for you", "homepage": "https://github.com/anholt/libepoxy", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index fcaf783fd5a3a6..ce82cf12d85d51 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3405,8 +3405,8 @@ "port-version": 0 }, "libepoxy": { - "baseline": "1.5.5", - "port-version": 1 + "baseline": "1.5.9", + "port-version": 0 }, "libevent": { "baseline": "2.1.12", diff --git a/versions/l-/libepoxy.json b/versions/l-/libepoxy.json index 71194cc67a05b6..7af49b945ea4cc 100644 --- a/versions/l-/libepoxy.json +++ b/versions/l-/libepoxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6441c5ae7e331cdd952258f9806972ca7d173c8b", + "version-semver": "1.5.9", + "port-version": 0 + }, { "git-tree": "66e28966117a23b6e9ac6cba7e71ecad8a2803ea", "version-semver": "1.5.5", From 375053470259a2ffca3b253bf44418be56b8cbba Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Mon, 15 Nov 2021 23:55:11 +0100 Subject: [PATCH 1137/1858] [mdns] Update to 1.4.1 (#21380) * Update mdns to 1.4.1 * Update CI baseline Co-authored-by: chausner --- ports/mdns/portfile.cmake | 13 ++++++------- ports/mdns/vcpkg.json | 10 ++++++++-- versions/baseline.json | 2 +- versions/m-/mdns.json | 5 +++++ 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ports/mdns/portfile.cmake b/ports/mdns/portfile.cmake index d465759444e0be..665b7a99a4c225 100644 --- a/ports/mdns/portfile.cmake +++ b/ports/mdns/portfile.cmake @@ -3,19 +3,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mjansson/mdns - REF 1.1 - SHA512 03e4682d87e9c1157bba04e04a3dfbb2ed7e25df31f00834fbc7bf4275e5c7f7406e590c8bdc386a4e6fbe6a5667f700e146d39758aa8ee0a47f735547cacd31 + REF 1.4.1 + SHA512 f1268841b5e4ba40ba62e7e08d55ac7f83b675f76c694976097a1c17dd6c662ced953230a4556b81ff5a39a969c67e01d040f1b6c83b9dd27b2cb0adc6af05b9 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMDNS_BUILD_EXAMPLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mdns/vcpkg.json b/ports/mdns/vcpkg.json index d86276ac0667c7..2cb48af8d6c748 100644 --- a/ports/mdns/vcpkg.json +++ b/ports/mdns/vcpkg.json @@ -1,6 +1,12 @@ { "name": "mdns", - "version-string": "1.1", + "version": "1.4.1", "description": "Public domain mDNS/DNS-SD library in C", - "homepage": "https://github.com/mjansson/mdns" + "homepage": "https://github.com/mjansson/mdns", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index ce82cf12d85d51..25de0a62edc72b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4289,7 +4289,7 @@ "port-version": 3 }, "mdns": { - "baseline": "1.1", + "baseline": "1.4.1", "port-version": 0 }, "mdnsresponder": { diff --git a/versions/m-/mdns.json b/versions/m-/mdns.json index e937c76a90bc19..b902fa0fd6050b 100644 --- a/versions/m-/mdns.json +++ b/versions/m-/mdns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4983c367da3c0798e1e0a7b9d8844eeba57c5b97", + "version": "1.4.1", + "port-version": 0 + }, { "git-tree": "9c60d4da58f24c63fd92500fcb516adb157cb180", "version-string": "1.1", From a9749677b81399de89bc65ac7a330e3d73ae954f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:31:31 +0100 Subject: [PATCH 1138/1858] [refl-cpp] Update to 0.12.1 (#21372) * Update refl-cpp to 0.12.1 * Update CI baseline Co-authored-by: chausner --- ports/refl-cpp/portfile.cmake | 8 ++++---- ports/refl-cpp/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/refl-cpp.json | 5 +++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ports/refl-cpp/portfile.cmake b/ports/refl-cpp/portfile.cmake index 9f4fc7bfa41409..de642ed180e039 100644 --- a/ports/refl-cpp/portfile.cmake +++ b/ports/refl-cpp/portfile.cmake @@ -3,11 +3,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO veselink1/refl-cpp - REF v0.12.0 - SHA512 e9103ac491cc2d06cd5223a55094473f479eabd49c733d2d4a11e560f3063474e34785e2681a4c5fcec3f2912c3cccefca7fa1c40bd95fd01f4d40df6c322648 + REF v0.12.1 + SHA512 7f1b9473512e305181f2c46940d34aa75a9cee65c69340ddb68b7e5bb2346206ff2c5b83c5d8460bac4a738258e4f6305b6fe8bc3044a1bcb69b30d79dcd5107 HEAD_REF master ) -file(COPY ${SOURCE_PATH}/refl.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(COPY "${SOURCE_PATH}/refl.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/refl-cpp/vcpkg.json b/ports/refl-cpp/vcpkg.json index 4674807c923025..b8cbc487e89173 100644 --- a/ports/refl-cpp/vcpkg.json +++ b/ports/refl-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "refl-cpp", - "version-string": "0.12.0", - "port-version": 1, + "version": "0.12.1", "description": "A compile-time reflection library for modern C++ with support for overloads, templates, attributes and proxies", "homepage": "https://github.com/veselink1/refl-cpp" } diff --git a/versions/baseline.json b/versions/baseline.json index 25de0a62edc72b..a7f59459da1ded 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5917,8 +5917,8 @@ "port-version": 1 }, "refl-cpp": { - "baseline": "0.12.0", - "port-version": 1 + "baseline": "0.12.1", + "port-version": 0 }, "refprop-headers": { "baseline": "2019-04-14", diff --git a/versions/r-/refl-cpp.json b/versions/r-/refl-cpp.json index 9e20fe4a91bf45..cdd68689d9e586 100644 --- a/versions/r-/refl-cpp.json +++ b/versions/r-/refl-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "109d4729d1755ca3cc45a9b9e54b8e62e2ad20cd", + "version": "0.12.1", + "port-version": 0 + }, { "git-tree": "393ab14793adcef501554fcd747eb3d68bf21500", "version-string": "0.12.0", From ba1c7d9d42798fd4de8f483851694aecbef9c802 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:32:11 +0100 Subject: [PATCH 1139/1858] [mqtt-cpp] Update to 12.0.0 (#21379) * Update mqtt-cpp to 12.0.0 * Update CI baseline Co-authored-by: chausner --- ports/mqtt-cpp/portfile.cmake | 19 +++++++++---------- ports/mqtt-cpp/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/m-/mqtt-cpp.json | 5 +++++ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ports/mqtt-cpp/portfile.cmake b/ports/mqtt-cpp/portfile.cmake index c29588e9185188..a41fc5c7cd34b7 100644 --- a/ports/mqtt-cpp/portfile.cmake +++ b/ports/mqtt-cpp/portfile.cmake @@ -1,24 +1,23 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO redboltz/mqtt_cpp - REF v9.0.0 - SHA512 4c9bef6abdb6bdec6ac60976f78e3e02c29d11c74cad0d3191e1d9b7befd327cd06f8a62e398d5997358b7e6974af3d6a73f68de47dd07ff099d46ba35fc84d8 + REF v12.0.0 + SHA512 60f2497633373a316724b7c8f87c090eb2bb26202bf48a55c32a13888bf3ec5e9bdc8854056735f625af5b016bcd9bca179d980077fb8752e16710992a0ea0c5 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DMQTT_BUILD_EXAMPLES=OFF -DMQTT_BUILD_TESTS=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mqtt_cpp_iface) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mqtt_cpp_iface) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib) -file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib") +file(INSTALL "${SOURCE_PATH}/LICENSE_1_0.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mqtt-cpp/vcpkg.json b/ports/mqtt-cpp/vcpkg.json index dac362846bfbff..2f20851fbf5a3d 100644 --- a/ports/mqtt-cpp/vcpkg.json +++ b/ports/mqtt-cpp/vcpkg.json @@ -1,7 +1,6 @@ { "name": "mqtt-cpp", - "version-string": "9.0.0", - "port-version": 1, + "version-semver": "12.0.0", "description": "Header-only MQTT client/server for C++14 based on Boost.Asio.", "homepage": "https://github.com/redboltz/mqtt_cpp", "dependencies": [ @@ -9,6 +8,14 @@ "boost-asio", "boost-log", "boost-multi-index", - "boost-type-erasure" + "boost-type-erasure", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index a7f59459da1ded..5476f21daa6958 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4501,8 +4501,8 @@ "port-version": 1 }, "mqtt-cpp": { - "baseline": "9.0.0", - "port-version": 1 + "baseline": "12.0.0", + "port-version": 0 }, "ms-angle": { "baseline": "alias", diff --git a/versions/m-/mqtt-cpp.json b/versions/m-/mqtt-cpp.json index 24567c512f9a5b..482ba03f61862e 100644 --- a/versions/m-/mqtt-cpp.json +++ b/versions/m-/mqtt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "869a51ca4a2e5b126e9de0af838a24fb9e7c3ab1", + "version-semver": "12.0.0", + "port-version": 0 + }, { "git-tree": "9f27414bfee2919393dcfd5da41342fab9ba13ae", "version-string": "9.0.0", From afadffde9d1b8c312b5a88be7f7bd15c7605f534 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:32:28 +0100 Subject: [PATCH 1140/1858] [ocilib] Update to 4.7.3 (#21378) * Update ocilib to 4.7.3 * Update CI baseline Co-authored-by: chausner --- ports/ocilib/portfile.cmake | 4 ++-- ports/ocilib/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/o-/ocilib.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake index 5ef74744023c98..139ccab3f4049f 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO vrogier/ocilib - REF 8573bce60d4aa4ac421445149003424fc7a69e6d v4.7.1 - SHA512 862c2df2f8e356bfafda32bba2c4564464104afea047b6297241a5ec2da9e1d73f3cd33f55e5bcd0018fb1b3625e756c22baf6821ab51c789359266f989137c8 + REF v4.7.3 + SHA512 80cf1f76420b506789b1f7edd9af826801236499dd0757be3438e3cdf286b95ddd7dd35909622b3862244f6b535a8744f0b25989fb3740a4a0fd984410fb420b HEAD_REF master ) diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json index 62cb70fa815122..6c7a56a11c9a96 100644 --- a/ports/ocilib/vcpkg.json +++ b/ports/ocilib/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ocilib", - "version-string": "4.7.1", - "port-version": 2, + "version": "4.7.3", "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.", "homepage": "https://vrogier.github.io/ocilib/", "supports": "!(arm | uwp)" diff --git a/versions/baseline.json b/versions/baseline.json index 5476f21daa6958..636c9b805aec20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4801,8 +4801,8 @@ "port-version": 1 }, "ocilib": { - "baseline": "4.7.1", - "port-version": 2 + "baseline": "4.7.3", + "port-version": 0 }, "octomap": { "baseline": "1.9.5", diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json index 879031d4cb2f9c..a5249e866d173b 100644 --- a/versions/o-/ocilib.json +++ b/versions/o-/ocilib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc328210424ed585e62cd1ec47b1a48b3a2174c2", + "version": "4.7.3", + "port-version": 0 + }, { "git-tree": "dfeb78a0e1d2f65807a7ad4925e5b6cc973c52a0", "version-string": "4.7.1", From 2fb968b0e8e4c2f88926091d20c6da68c535c135 Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Tue, 16 Nov 2021 01:32:46 +0100 Subject: [PATCH 1141/1858] [autodock-vina] Update to v1.2.3 (#21377) Signed-off-by: Vitalii Koshura --- ports/autodock-vina/01-windows.patch | 12 --------- ports/autodock-vina/CMakeLists.txt | 38 ++++++++++++++-------------- ports/autodock-vina/portfile.cmake | 6 ++--- ports/autodock-vina/vcpkg.json | 2 +- versions/a-/autodock-vina.json | 5 ++++ versions/baseline.json | 2 +- 6 files changed, 28 insertions(+), 37 deletions(-) delete mode 100644 ports/autodock-vina/01-windows.patch diff --git a/ports/autodock-vina/01-windows.patch b/ports/autodock-vina/01-windows.patch deleted file mode 100644 index 89c3bfd3ad408b..00000000000000 --- a/ports/autodock-vina/01-windows.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/lib/forcefield.h b/src/lib/forcefield.h -index 81bd4c1..44761e2 100644 ---- a/src/lib/forcefield.h -+++ b/src/lib/forcefield.h -@@ -24,6 +24,7 @@ - #define VINA_FORCEFIELD_H - - -+#include - #include - #include - #include diff --git a/ports/autodock-vina/CMakeLists.txt b/ports/autodock-vina/CMakeLists.txt index 2390d9753d318e..5099bc23edb193 100644 --- a/ports/autodock-vina/CMakeLists.txt +++ b/ports/autodock-vina/CMakeLists.txt @@ -3,10 +3,10 @@ cmake_policy(VERSION 3.11) project(autodock-vina) -set(GIT_VERSION v1.2.2) +set(GIT_VERSION v1.2.3) set(CMAKE_CXX_STANDARD 11) -find_package(Boost REQUIRED COMPONENTS +find_package(Boost REQUIRED COMPONENTS filesystem log math_tr1 @@ -32,34 +32,34 @@ file(GLOB HEADERS add_library(vina ${SRC_AUTODOCK_VINA_LIBS}) add_library(vina_split ${SRC_AUTODOCK_VINA_SPLIT}) -target_include_directories(vina - PUBLIC - $ +target_include_directories(vina + PUBLIC + $ $ - PRIVATE + PRIVATE $ ) -target_include_directories(vina_split - PUBLIC - $ +target_include_directories(vina_split + PUBLIC + $ $ - PRIVATE - $ + PRIVATE + $ ) -target_compile_definitions(vina - PUBLIC +target_compile_definitions(vina + PUBLIC -DVERSION=\"${GIT_VERSION}\" ) -target_compile_definitions(vina_split - PUBLIC +target_compile_definitions(vina_split + PUBLIC -DVERSION=\"${GIT_VERSION}\" ) -target_link_libraries(vina - PRIVATE +target_link_libraries(vina + PRIVATE Boost::boost Boost::filesystem Boost::log @@ -71,8 +71,8 @@ target_link_libraries(vina Boost::timer ) -target_link_libraries(vina_split - PRIVATE +target_link_libraries(vina_split + PRIVATE Boost::boost Boost::filesystem Boost::log diff --git a/ports/autodock-vina/portfile.cmake b/ports/autodock-vina/portfile.cmake index 7ba0823884ca91..b910a40e64b4f3 100644 --- a/ports/autodock-vina/portfile.cmake +++ b/ports/autodock-vina/portfile.cmake @@ -3,11 +3,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ccsb-scripps/AutoDock-Vina - REF v1.2.2 - SHA512 a6117137292b9b77afd3dff4a5ca31c65c9e85edd0b2351795fb2cccc06eca5b865b7dc054bb2859d0cf32abb6f6a72aaf62647e6d53709be879cc12a0336ba8 + REF v1.2.3 + SHA512 ea3d3008553665af5fbafa3b4dfe379df257d9c5b957d81a91ec8b92f06a8d0f4c2dfc30b515a64c0bc6dcc70acedfdd498c3bb9a21cac58e43d4da37d2ff606 HEAD_REF develop - PATCHES - 01-windows.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") diff --git a/ports/autodock-vina/vcpkg.json b/ports/autodock-vina/vcpkg.json index b3384a570262b6..c8d9df0fa65bd8 100644 --- a/ports/autodock-vina/vcpkg.json +++ b/ports/autodock-vina/vcpkg.json @@ -1,6 +1,6 @@ { "name": "autodock-vina", - "version-semver": "1.2.2", + "version-semver": "1.2.3", "description": "AutoDock Vina is one of the fastest and most widely used open-source docking engines.", "homepage": "http://vina.scripps.edu/", "dependencies": [ diff --git a/versions/a-/autodock-vina.json b/versions/a-/autodock-vina.json index 4f2281800ca2aa..c0e43d1be7e91f 100644 --- a/versions/a-/autodock-vina.json +++ b/versions/a-/autodock-vina.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "05bd7ebce99db7a1d6fb9fa3194e53583d2b3b25", + "version-semver": "1.2.3", + "port-version": 0 + }, { "git-tree": "393884054347c19ff78db882674ce17dd51476e0", "version-semver": "1.2.2", diff --git a/versions/baseline.json b/versions/baseline.json index 636c9b805aec20..26aece1f3e2805 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -237,7 +237,7 @@ "port-version": 1 }, "autodock-vina": { - "baseline": "1.2.2", + "baseline": "1.2.3", "port-version": 0 }, "avcpp": { From 95a39c9f350bf8823e86a1b770e15af79a4b5f91 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:33:05 +0100 Subject: [PATCH 1142/1858] [onednn] Update to 2.4.3 (#21376) * Update onednn to 2.4.3 * Update CI baseline Co-authored-by: chausner --- ports/onednn/portfile.cmake | 6 +++--- ports/onednn/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/onednn.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/onednn/portfile.cmake b/ports/onednn/portfile.cmake index 69d0a17e7d5799..964ed488c278e7 100644 --- a/ports/onednn/portfile.cmake +++ b/ports/onednn/portfile.cmake @@ -3,13 +3,13 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO oneapi-src/oneDNN - REF v2.3.2 - SHA512 14B3E6E40F29250AAE1FC677E6723953CA3BFBC9544B32CA1AE51ABA35DAB53C8CFCC58DD57610E644EB324821F3F370A31E8D960B1E4D5AF0C066441ED7FF45 + REF v2.4.3 + SHA512 6a597be1b6b50d252e346a96d3c9b4771e9d8e8fc495a09b638ea296d53e71d51ea2e2be04cc20de1bca17215a7a7e5f22a1808628bcdf98180def2d91b2c9e3 HEAD_REF master ) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(DNNL_OPTIONS "-DDNNL_LIBRARY_TYPE=STATIC") + set(DNNL_OPTIONS "-DDNNL_LIBRARY_TYPE=STATIC") endif() vcpkg_cmake_configure( diff --git a/ports/onednn/vcpkg.json b/ports/onednn/vcpkg.json index 7e46d72ba515ad..c34f03429ef5cd 100644 --- a/ports/onednn/vcpkg.json +++ b/ports/onednn/vcpkg.json @@ -1,6 +1,6 @@ { "name": "onednn", - "version-semver": "2.3.2", + "version-semver": "2.4.3", "description": "oneAPI Deep Neural Network Library (oneDNN)", "homepage": "https://github.com/oneapi-src/oneDNN", "supports": "x64 & !uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 26aece1f3e2805..6c365e80642954 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4841,7 +4841,7 @@ "port-version": 0 }, "onednn": { - "baseline": "2.3.2", + "baseline": "2.4.3", "port-version": 0 }, "oniguruma": { diff --git a/versions/o-/onednn.json b/versions/o-/onednn.json index c3cfeb88686e31..9a62af9fd4aee4 100644 --- a/versions/o-/onednn.json +++ b/versions/o-/onednn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d2c75b6924fc7301f68d484674419fad3f076ca5", + "version-semver": "2.4.3", + "port-version": 0 + }, { "git-tree": "3d3bacca42ae3bc1a41217c50f23953f13220732", "version-semver": "2.3.2", From 83c8f068e9b93c212b7cd83ab20ebf6f2a45e2ea Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:33:24 +0100 Subject: [PATCH 1143/1858] [pegtl] Update to 3.2.2 (#21375) * Update pegtl to 3.2.2 * Update CI baseline Co-authored-by: chausner --- ports/pegtl/portfile.cmake | 4 ++-- ports/pegtl/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pegtl.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/pegtl/portfile.cmake b/ports/pegtl/portfile.cmake index f54e1d239c68fd..c6c99ee784005f 100644 --- a/ports/pegtl/portfile.cmake +++ b/ports/pegtl/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO taocpp/pegtl - REF 3.2.1 - SHA512 6297ADEA085BB3043A60C28EB3A868A7C2D203B351F907EA3FDC4EF34C63F87A5786AC7D297531F8B8C8C3414F5DDEF658A025A7BAE2515BDC750E974975F6FF + REF 3.2.2 + SHA512 7ad055e38b362d6b90a49d5deb400948febfbcc30898e05548424bc758f38ffb3f69ca0db41e4480697f8916c90bdb3e48927a4db0caa7a20c8012b1a6d1fe08 HEAD_REF master ) diff --git a/ports/pegtl/vcpkg.json b/ports/pegtl/vcpkg.json index 9db2de5a3009db..95a4f011a5e893 100644 --- a/ports/pegtl/vcpkg.json +++ b/ports/pegtl/vcpkg.json @@ -1,6 +1,6 @@ { "name": "pegtl", - "version-semver": "3.2.1", + "version-semver": "3.2.2", "description": "The Parsing Expression Grammar Template Library (PEGTL) is a zero-dependency C++ header-only parser combinator library for creating parsers according to a Parsing Expression Grammar (PEG).", "homepage": "https://github.com/taocpp/PEGTL", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 6c365e80642954..5465c822eafedf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5173,7 +5173,7 @@ "port-version": 0 }, "pegtl": { - "baseline": "3.2.1", + "baseline": "3.2.2", "port-version": 0 }, "pegtl-2": { diff --git a/versions/p-/pegtl.json b/versions/p-/pegtl.json index abc03684dff518..8e6ca64f091608 100644 --- a/versions/p-/pegtl.json +++ b/versions/p-/pegtl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9e9bdd7c1860ebc540ca2df7ab8451e596dfff3a", + "version-semver": "3.2.2", + "port-version": 0 + }, { "git-tree": "4a95202decfce79a39190525dea1c3a135bf393f", "version-semver": "3.2.1", From 5596ae3fa1b2e2fe5175affe4c983b02e7a0e0ab Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:33:47 +0100 Subject: [PATCH 1144/1858] [re2] Update to 2021-11-01 (#21373) * Update re2 to 2021-11-01 * Update CI baseline Co-authored-by: chausner --- ports/re2/portfile.cmake | 4 ++-- ports/re2/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/re2.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ports/re2/portfile.cmake b/ports/re2/portfile.cmake index 677e31fc85c336..3adf713fd97e3a 100644 --- a/ports/re2/portfile.cmake +++ b/ports/re2/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/re2 - REF 2021-09-01 - SHA512 d0e13ce3e345edf7a3927756269ef8670240e364e75af2386cd03870fea14d8c957db46ca6bf7000077acb1ef4244d8f3f77b654fe0d297d11c5100f3a380c5f + REF 2021-11-01 + SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122 HEAD_REF master ) diff --git a/ports/re2/vcpkg.json b/ports/re2/vcpkg.json index 4ae3f218126e59..be979d97bc1de7 100644 --- a/ports/re2/vcpkg.json +++ b/ports/re2/vcpkg.json @@ -1,7 +1,6 @@ { "name": "re2", - "version-date": "2021-09-01", - "port-version": 1, + "version-date": "2021-11-01", "description": "RE2 is a fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python. It is a C++ library.", "homepage": "https://github.com/google/re2", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 5465c822eafedf..543bc8495a961b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5885,8 +5885,8 @@ "port-version": 0 }, "re2": { - "baseline": "2021-09-01", - "port-version": 1 + "baseline": "2021-11-01", + "port-version": 0 }, "readerwriterqueue": { "baseline": "1.0.5", diff --git a/versions/r-/re2.json b/versions/r-/re2.json index e1b856d9253b90..5b1f86ba8e53bc 100644 --- a/versions/r-/re2.json +++ b/versions/r-/re2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "484badfb46eb8db12106ed1017ddf4029e37d575", + "version-date": "2021-11-01", + "port-version": 0 + }, { "git-tree": "f3b26aeb23d7c925e205b158b0a05b7d446f154d", "version-date": "2021-09-01", From 0323ba0ef36dc917ddfbece35048f7c2b3ff2155 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:34:31 +0100 Subject: [PATCH 1145/1858] [sentencepiece] Update to 0.1.96 (#21370) * Update sentencepiece to 0.1.96 * Update CI baseline Co-authored-by: chausner --- ports/sentencepiece/portfile.cmake | 27 +++++++++++++-------------- ports/sentencepiece/vcpkg.json | 11 ++++++++--- versions/baseline.json | 4 ++-- versions/s-/sentencepiece.json | 5 +++++ 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ports/sentencepiece/portfile.cmake b/ports/sentencepiece/portfile.cmake index e05fe13f3b3005..3f862e90b89a28 100644 --- a/ports/sentencepiece/portfile.cmake +++ b/ports/sentencepiece/portfile.cmake @@ -5,30 +5,29 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/sentencepiece - REF v0.1.95 - SHA512 22484cf0311315e25a3184561f4e18b45286ad068bfb722c860e1b44fb16913c96d34723b486fab5e4e1e69f4b620a0e3cff410f56cb6561a67193ebaf565a31 + REF v0.1.96 + SHA512 c3f23b483ebe148a37a01908f5624f06536efcba5609192957239d844244ab445d39e59b1b44b6df1f182166d58a6df38c046506ce45160a272f1e7f46c25010 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSPM_ENABLE_SHARED=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") if(NOT VCPKG_CMAKE_SYSTEM_NAME) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece.lib ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepieced.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib ${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepieced.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_train.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/sentencepiece_traind.lib") endif() -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) vcpkg_copy_pdbs() - -vcpkg_fixup_pkgconfig() + +vcpkg_fixup_pkgconfig() diff --git a/ports/sentencepiece/vcpkg.json b/ports/sentencepiece/vcpkg.json index e13c6f989e94de..ed0f04c456d0af 100644 --- a/ports/sentencepiece/vcpkg.json +++ b/ports/sentencepiece/vcpkg.json @@ -1,6 +1,11 @@ { "name": "sentencepiece", - "version": "0.1.95", - "port-version": 1, - "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training" + "version": "0.1.96", + "description": "SentencePiece is an unsupervised text tokenizer and detokenizer mainly for Neural Network-based text generation systems where the vocabulary size is predetermined prior to the neural model training", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 543bc8495a961b..af47f8c69dc45a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6177,8 +6177,8 @@ "port-version": 5 }, "sentencepiece": { - "baseline": "0.1.95", - "port-version": 1 + "baseline": "0.1.96", + "port-version": 0 }, "sentry-native": { "baseline": "0.4.12", diff --git a/versions/s-/sentencepiece.json b/versions/s-/sentencepiece.json index f4c97fd2a99403..311ecd37394d4d 100644 --- a/versions/s-/sentencepiece.json +++ b/versions/s-/sentencepiece.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b83e7b28dc28e405cfee3c94385e2039c8564040", + "version": "0.1.96", + "port-version": 0 + }, { "git-tree": "f7469c8030fdd88ef6beb9aef9458c91269a5bb8", "version": "0.1.95", From 0ca1e2a3d124fdcc22778e80e2828de39523209c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:34:51 +0100 Subject: [PATCH 1146/1858] [spectra] Update to 1.0.0 (#21369) * Update spectra to 1.0.0 * Update CI baseline Co-authored-by: chausner --- ports/spectra/portfile.cmake | 15 +++++++-------- ports/spectra/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/s-/spectra.json | 5 +++++ 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/ports/spectra/portfile.cmake b/ports/spectra/portfile.cmake index 6fefd4abb156f8..9a2394490bcee4 100644 --- a/ports/spectra/portfile.cmake +++ b/ports/spectra/portfile.cmake @@ -1,19 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO yixuan/spectra - REF ec27cfd2210a9b2322825c4cb8e5d47f014e1ac3 # v0.9.0 - SHA512 c383405faab851ab302ee1ccb78741c60ab250c05321eee65078f72769ced396b2c8b4a49442cb5836f659e27adbbc3b538198ee877495e49a980a185d49d420 + REF v1.0.0 + SHA512 45540b12d370a28029f507f503618a0be9c19ec3a41813e23e036211dbc98237ac502c7f60cd42ccaa262f9dc0ebc02aabdefcd314f0c98c1e3dc925df02d783 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH cmake) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH share/spectra/cmake) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/spectra/vcpkg.json b/ports/spectra/vcpkg.json index 96bdfd299d85d9..83d1c1fc46d168 100644 --- a/ports/spectra/vcpkg.json +++ b/ports/spectra/vcpkg.json @@ -1,12 +1,19 @@ { "name": "spectra", - "version": "0.9.0", - "port-version": 1, + "version": "1.0.0", "description": "A header-only C++ library for large scale eigenvalue problems", "homepage": "https://spectralib.org", "documentation": "https://spectralib.org/quick-start.html", "license": "MPL-2.0", "dependencies": [ - "eigen3" + "eigen3", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index af47f8c69dc45a..0d99b0805dee53 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6417,8 +6417,8 @@ "port-version": 0 }, "spectra": { - "baseline": "0.9.0", - "port-version": 1 + "baseline": "1.0.0", + "port-version": 0 }, "speex": { "baseline": "1.2.0", diff --git a/versions/s-/spectra.json b/versions/s-/spectra.json index 0cfb2cd7d86e01..93fa4767692434 100644 --- a/versions/s-/spectra.json +++ b/versions/s-/spectra.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1ba33cde480488a9a7d4f98f6f2f26e591feb019", + "version": "1.0.0", + "port-version": 0 + }, { "git-tree": "79e61cb55ecfe0e16944d963259bf758b5405a74", "version": "0.9.0", From 91d8d598cfe07f44f8f164034f6dd0e1259a7b9b Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:35:11 +0100 Subject: [PATCH 1147/1858] [tmx] Update to 1.2.0 (#21368) * Update tmx to 1.2.0 * Update CI baseline Co-authored-by: chausner --- ports/tmx/portfile.cmake | 23 +++++++++++------------ ports/tmx/vcpkg.json | 11 +++++++++-- versions/baseline.json | 4 ++-- versions/t-/tmx.json | 5 +++++ 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/ports/tmx/portfile.cmake b/ports/tmx/portfile.cmake index 4a3801b8a0f798..1ddf5a4f2020c5 100644 --- a/ports/tmx/portfile.cmake +++ b/ports/tmx/portfile.cmake @@ -1,27 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO baylej/tmx - REF tmx_1.1.0 + REF tmx_1.2.0 HEAD_REF master - SHA512 4f57cea30cf01518812cb7279e4d09fd3524e02a29950c2a40aed07ed0f5bd44601517d8a6216a3ca878e1d6bfa15651e92b9e8024e0325baae1dadc7a79acd1 + SHA512 cb29c67af560a1844e798d3fe2677a6b71866943b233c0700212b91de35f252a0a465c33911a2c432aa54be309e3ac10770bc95c6450227e39abe049c1fbbdd1 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxExports.cmake ${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxTargets.cmake) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tmx) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/tmx/tmxTargets.cmake ${CURRENT_PACKAGES_DIR}/share/tmx/tmxExports.cmake) +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxExports.cmake" "${CURRENT_PACKAGES_DIR}/lib/cmake/tmx/tmxTargets.cmake") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/tmx) +file(RENAME "${CURRENT_PACKAGES_DIR}/share/tmx/tmxTargets.cmake" "${CURRENT_PACKAGES_DIR}/share/tmx/tmxExports.cmake") file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/debug/share + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" ) # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/tmx/vcpkg.json b/ports/tmx/vcpkg.json index bad3ca97e2ea1d..f21eba4edd8abf 100644 --- a/ports/tmx/vcpkg.json +++ b/ports/tmx/vcpkg.json @@ -1,10 +1,17 @@ { "name": "tmx", - "version-string": "1.1.0", - "port-version": 1, + "version": "1.2.0", "description": "A portable C library to load tiled maps in your games.", "dependencies": [ "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 0d99b0805dee53..7e75b57ba19075 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6797,8 +6797,8 @@ "port-version": 2 }, "tmx": { - "baseline": "1.1.0", - "port-version": 1 + "baseline": "1.2.0", + "port-version": 0 }, "tmxlite": { "baseline": "1.3.0", diff --git a/versions/t-/tmx.json b/versions/t-/tmx.json index 5975ee2d58cf2e..d362504b41da52 100644 --- a/versions/t-/tmx.json +++ b/versions/t-/tmx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "207601a8ff1891880a88013e3b36ea0f81979010", + "version": "1.2.0", + "port-version": 0 + }, { "git-tree": "bfe6a8ece200881d1c7e3a33b0fd14f4279c3d1b", "version-string": "1.1.0", From 12e0d426a3c364ec89c65d51c2419537e8ff19bf Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:36:05 +0100 Subject: [PATCH 1148/1858] [zlib-ng] Update to 2.0.5 (#21366) * Update zlib-ng to 2.0.5 * Update CI baseline Co-authored-by: chausner --- ports/zlib-ng/portfile.cmake | 14 +++++++------- ports/zlib-ng/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/z-/zlib-ng.json | 5 +++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ports/zlib-ng/portfile.cmake b/ports/zlib-ng/portfile.cmake index 778e08c9d1e392..f1f4e3cafbf6b6 100644 --- a/ports/zlib-ng/portfile.cmake +++ b/ports/zlib-ng/portfile.cmake @@ -1,13 +1,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zlib-ng/zlib-ng - REF 2.0.3 - SHA512 e1afe91e1a8b4c54a004b672f539ae68f7dc1f1b08ba93514c0de674230354c944d496753f00ad272f16ef322705f275b5b72dac6c2a757ec741ef3f1ea1d59a + REF 2.0.5 + SHA512 a643089a8189bf8bd24d679b84f07ae14932b4d88b88e94c44cca23350d6a9bbdaa411822d3651c2b0bf79f30c9f99514cc252cf9e9ab0b3a840540206466654 HEAD_REF master ) vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DZLIB_FULL_VERSION=2.0.3 -DZLIB_ENABLE_TESTS=OFF @@ -19,9 +19,9 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share - ${CURRENT_PACKAGES_DIR}/debug/include +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" ) -file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright +file(INSTALL "${SOURCE_PATH}/LICENSE.md" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) \ No newline at end of file diff --git a/ports/zlib-ng/vcpkg.json b/ports/zlib-ng/vcpkg.json index b7b2ae46305939..2822189a6dd2dd 100644 --- a/ports/zlib-ng/vcpkg.json +++ b/ports/zlib-ng/vcpkg.json @@ -1,6 +1,6 @@ { "name": "zlib-ng", - "version": "2.0.3", + "version": "2.0.5", "description": "zlib replacement with optimizations for 'next generation' systems", "homepage": "https://github.com/zlib-ng/zlib-ng", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index 7e75b57ba19075..21d9d2b2a8acee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7361,7 +7361,7 @@ "port-version": 13 }, "zlib-ng": { - "baseline": "2.0.3", + "baseline": "2.0.5", "port-version": 0 }, "zookeeper": { diff --git a/versions/z-/zlib-ng.json b/versions/z-/zlib-ng.json index 2898b850311fb3..6c2249e9b075fe 100644 --- a/versions/z-/zlib-ng.json +++ b/versions/z-/zlib-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1edea9190001c716b745514982d2ee684f1183e8", + "version": "2.0.5", + "port-version": 0 + }, { "git-tree": "7020274700cc1aaa817aa752f36a423fed7c095c", "version": "2.0.3", From 602085d38098bd4b144c08c92178dd2ed355da62 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:45:07 +0100 Subject: [PATCH 1149/1858] [replxx] Update to 0.0.4 (#21371) * Update replxx to 0.0.4 * Update CI baseline Co-authored-by: chausner --- ports/replxx/portfile.cmake | 4 ++-- ports/replxx/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/r-/replxx.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/replxx/portfile.cmake b/ports/replxx/portfile.cmake index 9dfbbe06191be9..e9fc798467db64 100644 --- a/ports/replxx/portfile.cmake +++ b/ports/replxx/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO AmokHuginnsson/replxx - REF release-0.0.3 - SHA512 039812B65D96C44907105D409E608132A115314BEA8616F79DA928BFEECEBFF64381F063D7B1C971B61C449FA24552E001767D61C57F65AF9EBD8F0B3AC62B18 + REF release-0.0.4 + SHA512 5b87d3b53a99ead00a1ff0ee7a158b13339446682da630989643db7d47d4877d5d97c46954dc51cd282c8130c62a4fed5ce74d73d193690a1518fef974c8b497 HEAD_REF master ) diff --git a/ports/replxx/vcpkg.json b/ports/replxx/vcpkg.json index b82ef13a11f1bd..58c74968d9961a 100644 --- a/ports/replxx/vcpkg.json +++ b/ports/replxx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "replxx", - "version": "0.0.3", + "version": "0.0.4", "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", "homepage": "https://github.com/AmokHuginnsson/replxx", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 21d9d2b2a8acee..10c8966115cb79 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5925,7 +5925,7 @@ "port-version": 1 }, "replxx": { - "baseline": "0.0.3", + "baseline": "0.0.4", "port-version": 0 }, "reproc": { diff --git a/versions/r-/replxx.json b/versions/r-/replxx.json index 30716375770733..1481e75958a087 100644 --- a/versions/r-/replxx.json +++ b/versions/r-/replxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d4ea343882654077d63b8e2781b380a545331935", + "version": "0.0.4", + "port-version": 0 + }, { "git-tree": "e6d52564217b918d799280703fdfde6e600272d4", "version": "0.0.3", From 0f5a6756e0dc2690de3f6076e3a90f3637d4c541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horv=C3=A1t?= Date: Tue, 16 Nov 2021 01:46:23 +0100 Subject: [PATCH 1150/1858] [igraph] update to 0.9.5 (#21346) * [igraph] update to 0.9.5 * [igraph] x-add-version for 0.9.5 * [igraph] get rid of deprecated functions * [igraph] format-manifest * [igraph] x-add-version * Update ports/igraph/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * [igraph] x-add-version Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> --- ports/igraph/portfile.cmake | 19 +++++++++---------- ports/igraph/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/i-/igraph.json | 5 +++++ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 2d57f74509d425..22e26a741978e0 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -4,9 +4,9 @@ # - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex. vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/igraph/igraph/releases/download/0.9.4/igraph-0.9.4.tar.gz" - FILENAME "igraph-0.9.4.tar.gz" - SHA512 1188d69b95f581d7dac5874dcdb2d1b1a322e39b275c6f092c199ed6214def814062bd46d573bdaa4bc8f4514d6840c6e93dedbe0f6c99a15de33cbc39356573 + URLS "https://github.com/igraph/igraph/releases/download/0.9.5/igraph-0.9.5.tar.gz" + FILENAME "igraph-0.9.5.tar.gz" + SHA512 2eb562bb898ff19f8e4ebb2d9f3393000b66154cb87318999bbb920793657e4e3a0b52d10bc8cbe4d2c3a5d27258fd8156df97f778065a92b969bfcb7d9fc28c ) vcpkg_extract_source_archive_ex( @@ -20,7 +20,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS openmp IGRAPH_OPENMP_SUPPORT ) -# Allow cross-compilation. See https://igraph.org/c/doc/igraph-Installation.html#idm207877354096 +# Allow cross-compilation. See https://igraph.org/c/html/latest/igraph-Installation.html#igraph-Installation-cross-compiling set(ARITH_H "") if (VCPKG_TARGET_IS_OSX) set(ARITH_H ${CURRENT_PORT_DIR}/arith_osx.h) @@ -32,9 +32,8 @@ elseif (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) endif() endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DIGRAPH_ENABLE_LTO=AUTO # ARPACK not yet available in vcpkg. @@ -46,19 +45,19 @@ vcpkg_configure_cmake( -DIGRAPH_USE_INTERNAL_CXSPARSE=OFF # GLPK is not yet available in vcpkg. -DIGRAPH_USE_INTERNAL_GLPK=ON - # Currently, external GMP provides no performance of functionality benefits. + # Currently, external GMP provides no performance or functionality benefits. -DIGRAPH_USE_INTERNAL_GMP=ON -DF2C_EXTERNAL_ARITH_HEADER=${ARITH_H} ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/igraph) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/igraph) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 33f6b1df8a74de..a339a6ac75e958 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,11 +1,18 @@ { "name": "igraph", - "version": "0.9.4", - "port-version": 1, + "version": "0.9.5", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "dependencies": [ - "suitesparse" + "suitesparse", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "default-features": [ "graphml" diff --git a/versions/baseline.json b/versions/baseline.json index 10c8966115cb79..ce068464df34a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2805,8 +2805,8 @@ "port-version": 1 }, "igraph": { - "baseline": "0.9.4", - "port-version": 1 + "baseline": "0.9.5", + "port-version": 0 }, "iir1": { "baseline": "1.9.0", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index f8db7cf33b15fe..1bf767e4597da2 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e1ad33d42918b67a81d068be60950b488829811f", + "version": "0.9.5", + "port-version": 0 + }, { "git-tree": "9814112513cedc4fdc1d0eaf8f633278c792decb", "version": "0.9.4", From 136e4e22038e9a72246356e38a1f2bd7ee14e74d Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Tue, 16 Nov 2021 08:46:48 +0800 Subject: [PATCH 1151/1858] [winpcap] Fix error hash (#21274) * [winpcap] Fix error hash * update version * Add double quotes to the path * update version --- ports/winpcap/portfile.cmake | 30 +++++++++++++++--------------- ports/winpcap/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/w-/winpcap.json | 5 +++++ 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 8549c543d26c8a..196ad02b8f8623 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(COPYRIGHT URLS "https://www.winpcap.org/misc/copyright.htm" FILENAME "Wpcap_license.htm" - SHA512 661e848f229612a4354e8243cdb0cb7ef387abc8933412b8c09ccfcaa3335143a958ea9ec9da558f89afe71afea29f0548872e3544ea51144c297a1aa1276718 + SHA512 bb2519e8f3d02c408fa3f2ef339adda1cc31338d05d2fa4ce25d5369427243fd3e2abc4b21aa654b2be5791f53c2281847a4a15778ffcb90576fd166140c7d2e ) # MSBuild performs in-source builds, so to ensure reliability we must clear them each time @@ -45,7 +45,7 @@ vcpkg_extract_source_archive_ex( "${CMAKE_CURRENT_LIST_DIR}/fix-create-lib-batch.patch" ) -file(COPY "${CURRENT_PORT_DIR}/create_bin.bat" DESTINATION ${SOURCE_PATH}) +file(COPY "${CURRENT_PORT_DIR}/create_bin.bat" DESTINATION "${SOURCE_PATH}") if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(PLATFORM Win32) @@ -57,12 +57,12 @@ vcpkg_execute_required_process( COMMAND "devenv.exe" "Packet.sln" /Upgrade - WORKING_DIRECTORY ${SOURCE_PATH}/packetNtx/Dll/Project + WORKING_DIRECTORY "${SOURCE_PATH}/packetNtx/Dll/Project" LOGNAME upgrade-Packet-${TARGET_TRIPLET} ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CURRENT_PORT_DIR}/Packet.vcxproj DESTINATION ${SOURCE_PATH}/packetNtx/Dll/Project/) + file(COPY "${CURRENT_PORT_DIR}/Packet.vcxproj" DESTINATION "${SOURCE_PATH}/packetNtx/Dll/Project/") endif() vcpkg_build_msbuild( @@ -90,7 +90,7 @@ vcpkg_execute_required_process( ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(COPY ${CURRENT_PORT_DIR}/wpcap.vcxproj DESTINATION ${SOURCE_PATH}/wpcap/PRJ/) + file(COPY "${CURRENT_PORT_DIR}/wpcap.vcxproj" DESTINATION "${SOURCE_PATH}/wpcap/PRJ/") endif() vcpkg_build_msbuild( @@ -116,7 +116,7 @@ file(INSTALL "${SOURCE_PATH}/WpdPack/Include/pcap-stdinc.h" "${SOURCE_PATH}/WpdPack/Include/remote-ext.h" "${SOURCE_PATH}/WpdPack/Include/Win32-Extensions.h" - DESTINATION ${CURRENT_PACKAGES_DIR}/include) + DESTINATION "${CURRENT_PACKAGES_DIR}/include") file(INSTALL "${SOURCE_PATH}/WpdPack/Include/pcap/bluetooth.h" @@ -126,7 +126,7 @@ file(INSTALL "${SOURCE_PATH}/WpdPack/Include/pcap/sll.h" "${SOURCE_PATH}/WpdPack/Include/pcap/usb.h" "${SOURCE_PATH}/WpdPack/Include/pcap/vlan.h" - DESTINATION ${CURRENT_PACKAGES_DIR}/include/pcap) + DESTINATION "${CURRENT_PACKAGES_DIR}/include/pcap") vcpkg_execute_required_process( COMMAND ${SOURCE_PATH}/create_lib.bat @@ -142,17 +142,17 @@ endif() file(INSTALL "${PCAP_LIBRARY_PATH}/Packet.lib" "${PCAP_LIBRARY_PATH}/wpcap.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + DESTINATION "${CURRENT_PACKAGES_DIR}/lib") file(INSTALL "${PCAP_LIBRARY_PATH}/debug/Packet.lib" "${PCAP_LIBRARY_PATH}/debug/wpcap.lib" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_execute_required_process( - COMMAND ${SOURCE_PATH}/create_bin.bat - WORKING_DIRECTORY ${SOURCE_PATH} + COMMAND "${SOURCE_PATH}/create_bin.bat" + WORKING_DIRECTORY "${SOURCE_PATH}" LOGNAME create_bin-${TARGET_TRIPLET} ) @@ -164,14 +164,14 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") file(INSTALL "${PCAP_BINARY_PATH}/Packet.dll" "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(INSTALL "${PCAP_BINARY_PATH}/Packet.dll" "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h" "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") -configure_file(${COPYRIGHT} ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file(${COPYRIGHT} "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/winpcap/vcpkg.json b/ports/winpcap/vcpkg.json index b584c0f6bd6bd1..aa4d923477fb3c 100644 --- a/ports/winpcap/vcpkg.json +++ b/ports/winpcap/vcpkg.json @@ -1,7 +1,7 @@ { "name": "winpcap", - "version-string": "4.1.3", - "port-version": 5, + "version": "4.1.3", + "port-version": 6, "description": "WinPcap is the industry-standard tool for link-layer network access in Windows environments.", "homepage": "https://www.winpcap.org" } diff --git a/versions/baseline.json b/versions/baseline.json index ce068464df34a7..a321bad16d8d22 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7150,7 +7150,7 @@ }, "winpcap": { "baseline": "4.1.3", - "port-version": 5 + "port-version": 6 }, "winreg": { "baseline": "4.1.2", diff --git a/versions/w-/winpcap.json b/versions/w-/winpcap.json index aa9b2301abfee1..9d8a244b8fdc06 100644 --- a/versions/w-/winpcap.json +++ b/versions/w-/winpcap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "12c456f2d3fc78f821ff85ac7bb55d89ce140ed6", + "version": "4.1.3", + "port-version": 6 + }, { "git-tree": "cf7d08eca18c0a361f4852847260da415a29fa29", "version-string": "4.1.3", From e697014fd061aee1c1e2d755ba35f4803f49af2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 16 Nov 2021 08:51:11 +0800 Subject: [PATCH 1152/1858] [vcpkg baseline][kf5solid] Fix usage (#21344) * [vcpkg baseline][kf5solid] Fix usage * version * change to version * version * Apply suggestion * version * Apply suggestion * version --- ports/kf5solid/fix-libmount.patch | 15 +++++++++++++++ ports/kf5solid/portfile.cmake | 4 +++- ports/kf5solid/vcpkg.json | 4 ++-- versions/baseline.json | 2 +- versions/k-/kf5solid.json | 5 +++++ 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 ports/kf5solid/fix-libmount.patch diff --git a/ports/kf5solid/fix-libmount.patch b/ports/kf5solid/fix-libmount.patch new file mode 100644 index 00000000000000..592f96ce98a34d --- /dev/null +++ b/ports/kf5solid/fix-libmount.patch @@ -0,0 +1,15 @@ +diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in +index 0a23f44..7020804 100644 +--- a/KF5SolidConfig.cmake.in ++++ b/KF5SolidConfig.cmake.in +@@ -23,6 +23,10 @@ if (NOT @BUILD_SHARED_LIBS@) + find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) + find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) + ++ if (@HAVE_LIBMOUNT@) ++ find_dependency(LibMount) ++ endif() ++ + if (@Qt5DBus_FOUND@) + find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) + endif() diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 9474f1c001b37d..ae63332f793e29 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix_config_cmake.patch # https://invent.kde.org/frameworks/solid/-/merge_requests/53 + fix-libmount.patch ) if(VCPKG_TARGET_IS_OSX) @@ -38,8 +39,9 @@ file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: fals vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - OPTIONS + OPTIONS -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LibMount=ON ) vcpkg_cmake_install() diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index c825d05b8df875..f2924d6642acc6 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5solid", - "version-semver": "5.84.0", - "port-version": 2, + "version": "5.84.0", + "port-version": 3, "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index a321bad16d8d22..20f132c293160f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3138,7 +3138,7 @@ }, "kf5solid": { "baseline": "5.84.0", - "port-version": 2 + "port-version": 3 }, "kf5sonnet": { "baseline": "5.84.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index 332603a1b8a377..0691de71027e47 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77af969f1b19c937d7f41651b657a774cd3802c7", + "version": "5.84.0", + "port-version": 3 + }, { "git-tree": "f0a82387f00cd2a61e6f1751bb1c94c9d706fddb", "version-semver": "5.84.0", From a5651ff7df3825afc4244461123f9258b913eb31 Mon Sep 17 00:00:00 2001 From: Osyotr Date: Tue, 16 Nov 2021 05:50:07 +0300 Subject: [PATCH 1153/1858] [libxslt] Fix linux dynamic build and replace absolute paths with relative (#21441) * [libxslt] Fix linux dynamic build and replace absolute paths with relative Also remove docs, python and plugins since they all do nothing * [libxslt] Use pkg-config for libxml2; provide libxslt.pc on Windows * [libxslt] Update version db * [libxslt] Revert change to vcpkg_copy_tools * [libxslt] Typo COPY_RECURSE Co-authored-by: Osyotr <8740768+Osyotr@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/libxslt/portfile.cmake | 142 ++++++++++++++++++----------------- ports/libxslt/vcpkg.json | 9 ++- versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 ++ 4 files changed, 88 insertions(+), 70 deletions(-) diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 2c72cf8d025b6a..8013d34bd7842e 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -5,10 +5,13 @@ vcpkg_download_distfile( SHA512 d08a06616d732993f2131826ca06fafc2e9f561cb1edb17eaf2adaf78e276bb03cba92a773143eb939da04781f5b5e0a09b351d8e4622a941de3cb3d11da731c ) +# Get this value from configure.ac:21 +set(LIBEXSLT_VERSION 0.8.20) +set(VERSION 1.1.34) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO GNOME/libxslt - REF v1.1.34 + REF v${VERSION} SHA512 fc57affb236e5f7602ee53c8090a854c6b950d1e6526ae3488bca41d8d421ec70433d88eb227c71c2a61213bc364517bdad907125e36486da1754fe9e460601f HEAD_REF master PATCHES @@ -21,9 +24,9 @@ vcpkg_from_github( if (VCPKG_TARGET_IS_WINDOWS) # Create some directories ourselves, because the makefile doesn't - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") endif() set(CONFIGURE_COMMAND_TEMPLATE cruntime=@CRUNTIME@ @@ -37,12 +40,14 @@ if (VCPKG_TARGET_IS_WINDOWS) zlib=yes lzma=yes ) + # Common if(VCPKG_LIBRARY_LINKAGE STREQUAL static) set(BUILDSTATIC yes) else() set(BUILDSTATIC no) endif() + # Release params if(VCPKG_CRT_LINKAGE STREQUAL dynamic) set(CRUNTIME /MD) @@ -50,13 +55,14 @@ if (VCPKG_TARGET_IS_WINDOWS) set(CRUNTIME /MT) endif() set(DEBUGMODE no) - set(LIB_DIR ${CURRENT_INSTALLED_DIR}/lib) - set(INCLUDE_DIR ${CURRENT_INSTALLED_DIR}/include) - set(INSTALL_DIR ${CURRENT_PACKAGES_DIR}) + set(LIB_DIR "${CURRENT_INSTALLED_DIR}/lib") + set(INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include") + set(INSTALL_DIR "${CURRENT_PACKAGES_DIR}") file(TO_NATIVE_PATH "${LIB_DIR}" LIB_DIR) file(TO_NATIVE_PATH "${INCLUDE_DIR}" INCLUDE_DIR) file(TO_NATIVE_PATH "${INSTALL_DIR}" INSTALL_DIR) string(CONFIGURE "${CONFIGURE_COMMAND_TEMPLATE}" CONFIGURE_COMMAND_REL) + # Debug params if(VCPKG_CRT_LINKAGE STREQUAL dynamic) set(CRUNTIME /MDd) @@ -64,110 +70,112 @@ if (VCPKG_TARGET_IS_WINDOWS) set(CRUNTIME /MTd) endif() set(DEBUGMODE yes) - set(LIB_DIR ${CURRENT_INSTALLED_DIR}/debug/lib) - set(INSTALL_DIR ${CURRENT_PACKAGES_DIR}/debug) + set(LIB_DIR "${CURRENT_INSTALLED_DIR}/debug/lib") + set(INSTALL_DIR "${CURRENT_PACKAGES_DIR}/debug") file(TO_NATIVE_PATH "${LIB_DIR}" LIB_DIR) file(TO_NATIVE_PATH "${INSTALL_DIR}" INSTALL_DIR) string(CONFIGURE "${CONFIGURE_COMMAND_TEMPLATE}" CONFIGURE_COMMAND_DBG) - + vcpkg_install_nmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" PROJECT_SUBPATH win32 PROJECT_NAME Makefile.msvc PRERUN_SHELL_DEBUG cscript configure.js ${CONFIGURE_COMMAND_DBG} PRERUN_SHELL_RELEASE cscript configure.js ${CONFIGURE_COMMAND_REL} OPTIONS rebuild ) - + vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) - + # The makefile builds both static and dynamic libraries, so remove the ones we don't want if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") # Rename the libs to match the dynamic lib names - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() + + set(prefix "") + set(exec_prefix "") + set(libdir "\${prefix}/lib") + set(includedir "\${prefix}/include") + set(XSLT_INCLUDEDIR "-I\${includedir}") + set(XSLT_LIBDIR "-L\${libdir}") + set(XSLT_LIBS "-lxslt") + set(XSLT_PRIVATE_LIBS "") + set(EXSLT_INCLUDEDIR "-I\${includedir}") + set(EXSLT_LIBDIR "-L\${libdir}") + set(EXSLT_LIBS "-lexslt") + set(EXSLT_PRIVATE_LIBS "") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") + configure_file("${SOURCE_PATH}/libxslt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libxslt.pc" "\nRequires: " "\nRequires: liblzma ") + configure_file("${SOURCE_PATH}/libexslt.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" @ONLY) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libexslt.pc" "\nRequires: " "\nRequires: libxslt ") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") endif() else() - vcpkg_find_acquire_program(PYTHON2) - get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) - - find_library(LibXml2_DEBUG_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/debug/lib REQUIRED) - find_library(LibXml2_RELEASE_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/lib REQUIRED) - - if (VCPKG_TARGET_IS_OSX ) - set(LIBICONV "-liconv") - else() - set(LIBICONV "") - endif() - vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS + --without-python + --without-plugins --with-crypto - --with-plugins - --with-libxml-include-prefix=${CURRENT_INSTALLED_DIR}/include - --with-python=${PYTHON2_DIR} OPTIONS_DEBUG --with-mem-debug --with-debug --with-debugger - --with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/debug/lib -lxml2 -lz -llzmad ${LIBICONV}" - --with-html-dir=${CURRENT_INSTALLED_DIR}/debug/tools - --with-html-subdir=${CURRENT_INSTALLED_DIR}/debug/tools - OPTIONS_RELEASE - --with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/lib -lxml2 -lz -llzma ${LIBICONV}" - --with-html-dir=${CURRENT_INSTALLED_DIR}/tools - --with-html-subdir=${CURRENT_INSTALLED_DIR}/tools - ) - + ) + vcpkg_install_make() - vcpkg_fixup_pkgconfig() - - if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY ${CURRENT_PACKAGES_DIR}/lib/libxslt.so ${CURRENT_PACKAGES_DIR}/bin/) - else() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libxslt-plugins ${CURRENT_PACKAGES_DIR}/debug/lib/libxslt-plugins) - endif() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libxslt.so) + + file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/xsltConf.sh" "${CURRENT_PACKAGES_DIR}/debug/lib/xsltConf.sh") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libxslt-plugins" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt-plugins") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/aclocal") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/doc") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man1") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man3") + + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") endif() + +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + # # Cleanup # # You have to define LIB(E)XSLT_STATIC or not, depending on how you link -file(READ ${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h XSLTEXPORTS_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" XSLTEXPORTS_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "!defined(LIBXSLT_STATIC)" "0" XSLTEXPORTS_H "${XSLTEXPORTS_H}") else() string(REPLACE "!defined(LIBXSLT_STATIC)" "1" XSLTEXPORTS_H "${XSLTEXPORTS_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h "${XSLTEXPORTS_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/libxslt/xsltexports.h" "${XSLTEXPORTS_H}") -file(READ ${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h EXSLTEXPORTS_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" EXSLTEXPORTS_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") string(REPLACE "!defined(LIBEXSLT_STATIC)" "0" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") else() string(REPLACE "!defined(LIBEXSLT_STATIC)" "1" EXSLTEXPORTS_H "${EXSLTEXPORTS_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h "${EXSLTEXPORTS_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h" "${EXSLTEXPORTS_H}") # Remove tools and debug include directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - vcpkg_copy_pdbs() -endif() - -file(INSTALL ${SOURCE_PATH}/Copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/Copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 74f77de2ab6799..2f63cdfda2b2a6 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,12 +1,17 @@ { "name": "libxslt", "version": "1.1.34", - "port-version": 1, + "port-version": 2, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "supports": "!uwp", "dependencies": [ "liblzma", - "libxml2" + "libxml2", + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true, + "platform": "!windows" + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 20f132c293160f..7ef8e9240129c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4062,7 +4062,7 @@ }, "libxslt": { "baseline": "1.1.34", - "port-version": 1 + "port-version": 2 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 64c6ee78caf1e7..6af4a5a14568b5 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f0b69e249f116b5e20999f9c4c16004093b49ec", + "version": "1.1.34", + "port-version": 2 + }, { "git-tree": "d5021817ac7038fcfc53721d55a17fbab42ceb59", "version": "1.1.34", From 505410df1f396ef215fc14ac9671867afd76949b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 16 Nov 2021 18:24:54 +0100 Subject: [PATCH 1154/1858] [offscale-libetcd-cpp] no absolute paths (#21168) --- ports/offscale-libetcd-cpp/install-debug.patch | 11 +++++++++++ ports/offscale-libetcd-cpp/portfile.cmake | 16 +++++++++------- ports/offscale-libetcd-cpp/vcpkg.json | 14 +++++++++++--- versions/baseline.json | 2 +- versions/o-/offscale-libetcd-cpp.json | 5 +++++ 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 ports/offscale-libetcd-cpp/install-debug.patch diff --git a/ports/offscale-libetcd-cpp/install-debug.patch b/ports/offscale-libetcd-cpp/install-debug.patch new file mode 100644 index 00000000000000..ee63620f0710bf --- /dev/null +++ b/ports/offscale-libetcd-cpp/install-debug.patch @@ -0,0 +1,11 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0d9aad9..7bdde1b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,5 +77,5 @@ install(TARGETS etcdcpp EXPORT etcdcpp DESTINATION lib) + + if (${CMAKE_BUILD_TYPE} STREQUAL "Release") + install(FILES ${proto_hs} DESTINATION include/libetcd/) +- install(EXPORT etcdcpp DESTINATION share/etcdcpp/ FILE etcdcppConfig.cmake) + endif() ++install(EXPORT etcdcpp DESTINATION share/etcdcpp/ FILE etcdcppConfig.cmake) diff --git a/ports/offscale-libetcd-cpp/portfile.cmake b/ports/offscale-libetcd-cpp/portfile.cmake index e6857aa3d437e6..a299682f54b2df 100644 --- a/ports/offscale-libetcd-cpp/portfile.cmake +++ b/ports/offscale-libetcd-cpp/portfile.cmake @@ -4,15 +4,17 @@ vcpkg_from_github( REF 8607d8d7080c6eb447bc41b799a24bfdb87cf638 SHA512 9bf4bf14fd52f4f6bbf8cf68de61e6a19eeffbdc501f05c8f614b5f13f206410884afd7fe226a077448e58e02990c65a6b27ee895ed34ba5ee701abe0500b875 HEAD_REF master - PATCHES fix-dependency-grpc.patch + PATCHES + fix-dependency-grpc.patch + install-debug.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + DISABLE_PARALLEL_CONFIGURE # see https://github.com/microsoft/vcpkg/pull/21168#issuecomment-961588989 why ) -vcpkg_install_cmake() - +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME etcdcpp) vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE-MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE-MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/offscale-libetcd-cpp/vcpkg.json b/ports/offscale-libetcd-cpp/vcpkg.json index b6c2f5164cf77f..f2f2ec16cbe140 100644 --- a/ports/offscale-libetcd-cpp/vcpkg.json +++ b/ports/offscale-libetcd-cpp/vcpkg.json @@ -1,11 +1,19 @@ { "name": "offscale-libetcd-cpp", - "version-string": "2019-07-10", - "port-version": 2, + "version-date": "2019-07-10", + "port-version": 3, "description": "A C++ client library for etcd. etcd is a distributed, reliable key-value store.", "homepage": "https://github.com/offscale/libetcd-cpp", "dependencies": [ "grpc", - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 7ef8e9240129c4..e7111afd9ef66a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4814,7 +4814,7 @@ }, "offscale-libetcd-cpp": { "baseline": "2019-07-10", - "port-version": 2 + "port-version": 3 }, "ogdf": { "baseline": "2019-08-23", diff --git a/versions/o-/offscale-libetcd-cpp.json b/versions/o-/offscale-libetcd-cpp.json index 729cae973b9dde..bf4ad5b12d10d0 100644 --- a/versions/o-/offscale-libetcd-cpp.json +++ b/versions/o-/offscale-libetcd-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70eb4516cd664f01e89d2701ae45ba05ea4c9d7a", + "version-date": "2019-07-10", + "port-version": 3 + }, { "git-tree": "58aea86d7da68c1cad8d684197c39e23945b8d91", "version-string": "2019-07-10", From 8d95f5c1986eb31274caada8612033abc1baf6ae Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Tue, 16 Nov 2021 10:13:33 -0800 Subject: [PATCH 1155/1858] [SEAL/APSI]Updated SEAL to 3.7.2 and APSI to 0.5.0 (#21454) * Updated ports/seal to 3.7.2 and ports/apsi to 0.5.0. * Updated versioning. --- ports/apsi/portfile.cmake | 6 +++--- ports/apsi/vcpkg.json | 2 +- ports/seal/portfile.cmake | 4 ++-- ports/seal/vcpkg.json | 2 +- versions/a-/apsi.json | 5 +++++ versions/baseline.json | 4 ++-- versions/s-/seal.json | 5 +++++ 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index 95f63b17bd0323..7e2266e00e4202 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI - REF 7fbeefbd42f4884da95073d40de22ba46fc0f1f5 - SHA512 dfa4b7571b355646004d5b8823f250b56cda6e84d348a6a013f45fbf5c119e49bda28ac8a75f8ec06738814c50e34e66805994c7bc780ddfd57cc2067ffa745a + REF 4e412e6c89a2729a09aa2a998b212dec0fa9a0fc + SHA512 8cabe842884a90bd3de5156af964f68efe77c55c1ff773ce3a64a0c4e3380868dd5ee79f4db2033278eba2c7cf5561c225b1625313a7ac89f068218d5cb9f40c HEAD_REF main ) @@ -29,7 +29,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.3") +vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.5") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index e3416047304d22..6ee65d00369124 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "apsi", - "version-semver": "0.3.1", + "version-semver": "0.5.0", "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", "supports": "static", diff --git a/ports/seal/portfile.cmake b/ports/seal/portfile.cmake index 29535cc2618539..0806056029f4f8 100644 --- a/ports/seal/portfile.cmake +++ b/ports/seal/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/SEAL - REF 608fb1b9717ec6effe707758a636e0a0df76fc26 - SHA512 4d73e44955dcf7424318d1f46dd2b38b08592fd649a208953dbb9da30e7befdb6bf9f50ab364732d0ded7c9d977fd9bbad9fd1e2d2ff6ea2931d418a87be6d27 + REF 79234726053c45eede688400aa219fdec0810bd8 + SHA512 634ad75d70f04cce220bfa9f6d13e8ddb293e8403ebd195e2c8b522b751a1a268021feea7843038037ed6d1b354b2e470ad565966a117613cf5371073afda9a4 HEAD_REF main ) diff --git a/ports/seal/vcpkg.json b/ports/seal/vcpkg.json index 20ca7bec42cf12..7ff225449d0a9a 100644 --- a/ports/seal/vcpkg.json +++ b/ports/seal/vcpkg.json @@ -1,6 +1,6 @@ { "name": "seal", - "version-semver": "3.7.1", + "version-semver": "3.7.2", "description": "Microsoft SEAL is an easy-to-use and powerful homomorphic encryption library.", "homepage": "https://github.com/microsoft/SEAL", "supports": "!windows | (windows & static)", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index 30ac0723370d6b..fa1c3690f2d7e6 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff4f1e6dfc87696ea2da4bd557e15b1f2034f340", + "version-semver": "0.5.0", + "port-version": 0 + }, { "git-tree": "3cfe8c41e42a7aa179511d6f6ead1c47bb8f3327", "version-semver": "0.3.1", diff --git a/versions/baseline.json b/versions/baseline.json index e7111afd9ef66a..c26ad16702cf43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -117,7 +117,7 @@ "port-version": 4 }, "apsi": { - "baseline": "0.3.1", + "baseline": "0.5.0", "port-version": 0 }, "arb": { @@ -6165,7 +6165,7 @@ "port-version": 1 }, "seal": { - "baseline": "3.7.1", + "baseline": "3.7.2", "port-version": 0 }, "secp256k1": { diff --git a/versions/s-/seal.json b/versions/s-/seal.json index 01951b3b5b2b9b..f8d84e29d260e7 100644 --- a/versions/s-/seal.json +++ b/versions/s-/seal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f60c9b8a5bafea149666d032b375f1b3980dd3ca", + "version-semver": "3.7.2", + "port-version": 0 + }, { "git-tree": "dc1789c424c644a859870fb66288c5bfacb62d35", "version-semver": "3.7.1", From 09c8d4f201f26e72231b123939baf98474dcd60e Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 16 Nov 2021 19:26:33 +0100 Subject: [PATCH 1156/1858] [imath] no absolute paths (#21452) --- ports/imath/portfile.cmake | 1 + ports/imath/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/i-/imath.json | 5 +++++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/imath/portfile.cmake b/ports/imath/portfile.cmake index a1c87da56e7ee8..ca245a1cbaa0e1 100644 --- a/ports/imath/portfile.cmake +++ b/ports/imath/portfile.cmake @@ -17,6 +17,7 @@ vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Imath) +vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/imath/vcpkg.json b/ports/imath/vcpkg.json index 3383d617d3c08e..c8bc20ac6c9258 100644 --- a/ports/imath/vcpkg.json +++ b/ports/imath/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imath", "version": "3.1.3", + "port-version": 1, "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", "homepage": "https://github.com/AcademySoftwareFoundation/Imath", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c26ad16702cf43..ce183d866c84e0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2822,7 +2822,7 @@ }, "imath": { "baseline": "3.1.3", - "port-version": 0 + "port-version": 1 }, "imgui": { "baseline": "1.85", diff --git a/versions/i-/imath.json b/versions/i-/imath.json index 88b098345fe651..0053f4defc1202 100644 --- a/versions/i-/imath.json +++ b/versions/i-/imath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f8d9cbaa52114f1030e4bc9ee0e075da76d7be5c", + "version": "3.1.3", + "port-version": 1 + }, { "git-tree": "a244498f54d1b743d54d9d4a89d5ea556346a22e", "version": "3.1.3", From fa9673dee3b2a4c4eaa2913ae2c8029ca8797a0c Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 16 Nov 2021 19:31:54 +0100 Subject: [PATCH 1157/1858] [memorymodule] use supports expression (#21450) --- ports/memorymodule/portfile.cmake | 28 +++++++++++++--------------- ports/memorymodule/vcpkg.json | 9 ++++++++- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/m-/memorymodule.json | 5 +++++ 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ports/memorymodule/portfile.cmake b/ports/memorymodule/portfile.cmake index 7c772711d5860a..af5fade33a52e0 100644 --- a/ports/memorymodule/portfile.cmake +++ b/ports/memorymodule/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO fancycode/MemoryModule @@ -12,34 +10,34 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - unicode UNICODE + FEATURES + unicode UNICODE ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS -DTESTSUITE=OFF ${FEATURE_OPTIONS} ) -vcpkg_build_cmake(TARGET MemoryModule) +vcpkg_cmake_build(TARGET MemoryModule) -file(INSTALL ${SOURCE_PATH}/MemoryModule.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/MemoryModule.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib) +if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib") file(INSTALL - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib" ) endif() -if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib) +if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib") file(INSTALL - ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib" + DESTINATION "${CURRENT_PACKAGES_DIR}/lib" ) endif() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/memorymodule/vcpkg.json b/ports/memorymodule/vcpkg.json index 3e5ca2f3a06e4b..49b5726ad7adaa 100644 --- a/ports/memorymodule/vcpkg.json +++ b/ports/memorymodule/vcpkg.json @@ -1,9 +1,16 @@ { "name": "memorymodule", "version-string": "2019-12-31", - "port-version": 1, + "port-version": 2, "description": "Library to load a DLL from memory", "homepage": "https://github.com/fancycode/MemoryModule", + "supports": "!linux & !osx & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "default-features": [ "unicode" ], diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dca83344c7cee2..c45282e3924ffc 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -835,10 +835,6 @@ mecab:x64-windows = skip mecab:x64-windows-static = skip mecab:x64-windows-static-md=skip mecab:x86-windows = skip -memorymodule:arm-uwp=fail -memorymodule:x64-linux=fail -memorymodule:x64-osx=fail -memorymodule:x64-uwp=fail # Due to static crt. mesa:x64-windows-static=fail mesa:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index ce183d866c84e0..a2e6668647d82a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4306,7 +4306,7 @@ }, "memorymodule": { "baseline": "2019-12-31", - "port-version": 1 + "port-version": 2 }, "mesa": { "baseline": "21.2.0", diff --git a/versions/m-/memorymodule.json b/versions/m-/memorymodule.json index 45da1309cbd53b..990365470d08f9 100644 --- a/versions/m-/memorymodule.json +++ b/versions/m-/memorymodule.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7818f51e182a651a0b090ea0d315c32b928d7c3", + "version-string": "2019-12-31", + "port-version": 2 + }, { "git-tree": "55a786b4bc6d55f353749c06afa40b809ff8c9c4", "version-string": "2019-12-31", From 5eb29b565a2b99f61b8a024c8ed879d0ec7d6897 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:21:16 +0100 Subject: [PATCH 1158/1858] [gdal] no absolute paths (#21451) --- ports/gdal/portfile.cmake | 5 +++++ ports/gdal/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/gdal.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake index e67faf1be83355..0556278a8df83f 100644 --- a/ports/gdal/portfile.cmake +++ b/ports/gdal/portfile.cmake @@ -366,6 +366,11 @@ else() vcpkg_replace_string("${pc_file_debug}" "${exec_prefix}/include" "${prefix}/../include") endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/gdal/debug/bin/gdal-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cpl_config.h" "#define GDAL_PREFIX \"${CURRENT_INSTALLED_DIR}\"" "") endif() file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 1ef68a5919a4d1..e17bd14689826e 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,6 +1,7 @@ { "name": "gdal", "version-semver": "3.4.0", + "port-version": 1, "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data", "homepage": "https://gdal.org", "supports": "!(arm & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index a2e6668647d82a..8cacbb2663da61 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2354,7 +2354,7 @@ }, "gdal": { "baseline": "3.4.0", - "port-version": 0 + "port-version": 1 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 8db1fba51f3eac..677ba947743fd6 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5580a73ced0a55c4659874d1755239c76e9168c", + "version-semver": "3.4.0", + "port-version": 1 + }, { "git-tree": "097ed3ccdf77735c5b36e354138da35cfd642bcc", "version-semver": "3.4.0", From fc04b718e04320a10031cc14579eaf92afed06c6 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:25:28 +0100 Subject: [PATCH 1159/1858] [teemo] use supports expression (#21449) --- ports/teemo/portfile.cmake | 31 ++++++++++++------------------- ports/teemo/vcpkg.json | 11 ++++++++++- scripts/ci.baseline.txt | 4 ---- versions/baseline.json | 2 +- versions/t-/teemo.json | 5 +++++ 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ports/teemo/portfile.cmake b/ports/teemo/portfile.cmake index 94118a36d95c36..d8b045a79228da 100644 --- a/ports/teemo/portfile.cmake +++ b/ports/teemo/portfile.cmake @@ -10,32 +10,25 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" TEEMO_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DTEEMO_STATIC:BOOL=${TEEMO_STATIC} -DBUILD_TESTS:BOOL=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/teemo) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/teemo) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/share/teemo) - vcpkg_fixup_cmake_targets(CONFIG_PATH share/teemo) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/teemo") + vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/teemo) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/share/teemo") + vcpkg_cmake_config_fixup(CONFIG_PATH share/teemo) endif() -file(READ ${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h TEEMO_H) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - string(REPLACE "#ifdef TEEMO_STATIC" "#if 1" TEEMO_H "${TEEMO_H}") -else() - string(REPLACE "#ifdef TEEMO_STATIC" "#if 0" TEEMO_H "${TEEMO_H}") -endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h "${TEEMO_H}") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/teemo/teemo.h" "#ifdef TEEMO_STATIC" "#if $") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_copy_pdbs() \ No newline at end of file +vcpkg_copy_pdbs() diff --git a/ports/teemo/vcpkg.json b/ports/teemo/vcpkg.json index 4905c32f965dec..c03bd600c59d19 100644 --- a/ports/teemo/vcpkg.json +++ b/ports/teemo/vcpkg.json @@ -1,13 +1,22 @@ { "name": "teemo", "version-string": "2.2", - "port-version": 1, + "port-version": 2, "description": "C++ File Download Library, support Multithreading, Breakpoint Transmission, Speed Limit, Real-time Speed.", "homepage": "https://github.com/winsoft666/teemo", + "supports": "!osx & !uwp & !arm", "dependencies": [ { "name": "curl", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index c45282e3924ffc..82d6017eb2f876 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1478,10 +1478,6 @@ tbb:x64-uwp=fail tcl:arm-uwp=fail tcl:arm64-windows=fail tcl:x64-uwp=fail -teemo:x64-uwp=fail -teemo:arm-uwp=fail -teemo:arm64-windows=fail -teemo:x64-osx=fail telnetpp:arm-uwp=fail telnetpp:x64-uwp=fail theia:arm64-windows = skip diff --git a/versions/baseline.json b/versions/baseline.json index 8cacbb2663da61..1e1bbbec91bbe4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6614,7 +6614,7 @@ }, "teemo": { "baseline": "2.2", - "port-version": 1 + "port-version": 2 }, "telnetpp": { "baseline": "2.1.2", diff --git a/versions/t-/teemo.json b/versions/t-/teemo.json index 6a711fa93f64b6..ac6ec23e5cbfe8 100644 --- a/versions/t-/teemo.json +++ b/versions/t-/teemo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8939caebc11b8bbb1efe958bb349511a50e00289", + "version-string": "2.2", + "port-version": 2 + }, { "git-tree": "0ba6666678630113a8080448b6751fa3a2eacbef", "version-string": "2.2", From f43d7de3174897430ab1e7b017270f88fb13e309 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:28:00 +0100 Subject: [PATCH 1160/1858] [libudns] use supports expression (#21448) --- ports/libudns/portfile.cmake | 2 -- ports/libudns/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 8 -------- versions/baseline.json | 2 +- versions/l-/libudns.json | 5 +++++ 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ports/libudns/portfile.cmake b/ports/libudns/portfile.cmake index 826c4c6c3cddc0..a1169d438dad50 100644 --- a/ports/libudns/portfile.cmake +++ b/ports/libudns/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ortclib/udns diff --git a/ports/libudns/vcpkg.json b/ports/libudns/vcpkg.json index 9d328490cb36b6..f1b9679a3b223b 100644 --- a/ports/libudns/vcpkg.json +++ b/ports/libudns/vcpkg.json @@ -1,7 +1,8 @@ { "name": "libudns", "version-string": "0.4", - "port-version": 3, + "port-version": 4, "description": "The DNS library, udns, implements thread-safe stub DNS resolver functionality, which may be used both traditional, syncronous way and asyncronously, with application-supplied event loop.", - "homepage": "https://github.com/ortclib/udns" + "homepage": "https://github.com/ortclib/udns", + "supports": "!windows & !osx" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 82d6017eb2f876..dd37ec58533a41 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -704,14 +704,6 @@ libudis86:arm-uwp=fail libudis86:x64-linux=fail libudis86:x64-osx=fail libudis86:x64-uwp=fail -libudns:arm64-windows=fail -libudns:arm-uwp=fail -libudns:x64-uwp=fail -libudns:x64-windows=fail -libudns:x64-windows-static=fail -libudns:x64-windows-static-md=fail -libudns:x86-windows=fail -libudns:x64-osx=fail libui:arm-uwp=fail libui:x64-linux=fail libui:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 1e1bbbec91bbe4..90ac2b04ab507b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3962,7 +3962,7 @@ }, "libudns": { "baseline": "0.4", - "port-version": 3 + "port-version": 4 }, "libui": { "baseline": "2018-11-03", diff --git a/versions/l-/libudns.json b/versions/l-/libudns.json index 79e72cc0662856..f1851a16901814 100644 --- a/versions/l-/libudns.json +++ b/versions/l-/libudns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "277ba57e6f9840670698c62196ea9b30c74485e0", + "version-string": "0.4", + "port-version": 4 + }, { "git-tree": "a05d58223d5adb1f421bbde4a0ac44ce72a3a1c9", "version-string": "0.4", From a44a758cfd333342d070dee1fa4cc002dae27474 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:32:29 +0100 Subject: [PATCH 1161/1858] [ctp] use supports expression (#21439) --- ports/ctp/portfile.cmake | 1 - ports/ctp/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/c-/ctp.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/ctp/portfile.cmake b/ports/ctp/portfile.cmake index 65c61802cdf71e..2c291b8ab6d3e3 100644 --- a/ports/ctp/portfile.cmake +++ b/ports/ctp/portfile.cmake @@ -1,6 +1,5 @@ message(STATUS "Note: the downloading server may only be avilable from 8:00AM-5:00PM (UTC+8), Mon-Fri (except public holidays in China)") -vcpkg_fail_port_install(ON_TARGET "OSX" "UWP" ON_ARCH "arm") vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_download_distfile(TRADEAPI_ARCHIVE diff --git a/ports/ctp/vcpkg.json b/ports/ctp/vcpkg.json index 640df906dcf762..e568df5f701fd2 100644 --- a/ports/ctp/vcpkg.json +++ b/ports/ctp/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ctp", "version-string": "6.6.1_P1_20210406_se", - "port-version": 1, + "port-version": 2, "description": "The Comprehensive Transaction Platform (CTP) is a future brokerage management system developed specially for futures companies. CTP API client library allows users to connect to CTP gateway for algorithmic trading.", "homepage": "http://www.sfit.com.cn/index.htm", + "supports": "!osx & !uwp & !arm", "features": { "datacollect": { "description": "Data collect support of CTP" diff --git a/versions/baseline.json b/versions/baseline.json index 90ac2b04ab507b..c4c8b2e688dec2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1674,7 +1674,7 @@ }, "ctp": { "baseline": "6.6.1_P1_20210406_se", - "port-version": 1 + "port-version": 2 }, "ctre": { "baseline": "3.4.1", diff --git a/versions/c-/ctp.json b/versions/c-/ctp.json index 8be7ab0c0400f7..3382ae094b0941 100644 --- a/versions/c-/ctp.json +++ b/versions/c-/ctp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7160f9a456cfd057dee1cb0a92f92a4f16876fe8", + "version-string": "6.6.1_P1_20210406_se", + "port-version": 2 + }, { "git-tree": "abd1e961a096126b01df7a0b3362d5e8223ea9d7", "version-string": "6.6.1_P1_20210406_se", From df366a1fcd63c16dd78ecf8807acc4345b414f3a Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:32:52 +0100 Subject: [PATCH 1162/1858] [epsilon] only support windows (#21436) --- ports/epsilon/vcpkg.json | 3 ++- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/e-/epsilon.json | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/epsilon/vcpkg.json b/ports/epsilon/vcpkg.json index de99c7e705b810..d19ef5749b4126 100644 --- a/ports/epsilon/vcpkg.json +++ b/ports/epsilon/vcpkg.json @@ -1,9 +1,10 @@ { "name": "epsilon", "version-string": "0.9.2", - "port-version": 5, + "port-version": 6, "description": "EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing.", "homepage": "https://sourceforge.net/projects/epsilon-project/", + "supports": "windows", "dependencies": [ "libpopt" ] diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index dd37ec58533a41..65a79b3045b07d 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -269,8 +269,6 @@ embree2:x64-osx=skip enet:arm-uwp=fail enet:x64-uwp=fail epsilon:arm-uwp=fail -epsilon:x64-linux=fail -epsilon:x64-osx=fail epsilon:x64-uwp=fail epsilon:x64-windows-static=fail faad2:x64-linux=fail diff --git a/versions/baseline.json b/versions/baseline.json index c4c8b2e688dec2..ff35445e055355 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2030,7 +2030,7 @@ }, "epsilon": { "baseline": "0.9.2", - "port-version": 5 + "port-version": 6 }, "esaxx": { "baseline": "ca7cb332011ec37", diff --git a/versions/e-/epsilon.json b/versions/e-/epsilon.json index e6828152b64290..ab89b1e6aa80d2 100644 --- a/versions/e-/epsilon.json +++ b/versions/e-/epsilon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ad0883f9e090b404fcef27b3e4304df44472bf90", + "version-string": "0.9.2", + "port-version": 6 + }, { "git-tree": "54824ec07afd73fa5bb369acc97e44f4754cc368", "version-string": "0.9.2", From 37af5b55ef7ef28ae5fd92c1c6bdd48d5c406a6c Mon Sep 17 00:00:00 2001 From: Buck Yeh Date: Wed, 17 Nov 2021 08:33:49 +0800 Subject: [PATCH 1163/1858] [buck-yeh-bux] Update to 1.6.2 (#21434) * [bux] Add new port * Corrections according to Create Pull Request suggested questions * SHA512 * Mark fails into .\scripts\ci.baseline.txt * Mark fails into .\scripts\ci.baseline.txt * No need of "port-version": 1 in vcpkg.json * Update version database * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/portfile.cmake Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update ports/bux/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * Update bux.json * Update ports/bux/vcpkg.json * update version * Update scripts/ci.baseline.txt Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * update bux support * update version * update version * Rename bux to buck-yeh-bux * Update version database * [buck-yeh-bux] upgrade to v1.5.0 1. [New] `bux::C_ParaLog` is ready for a variety of parallel logging configurations, filtered or unfiltered. 2. [New] Necessary helper classes for implementation _s.t_ logger users no longer need to declare child source instances explicitly. 3. [New] Add methods to `ParaLog.h` & `SyncLog.h` to support testability. 4. [New] Add unit test cases to `ParaLog.h` & `SyncLog.h` (test_paralog & test_logger) 5. [New] Update what are found in `test/` to `test/archlinux/aur_poc/` 6. [Bug] `std::uniform_int_distribution` no longer allowed. 7. [Change] `CUR_FUNC_` for Windows (MSVC) 8. [Change] `tbb` is no longer implicitly needed by C++ standard library. 9. [Change] `smoke_filtlog.cpp` verifies 2-level log filters ok. * Missing comma in versions/b-/buck-yeh-bux.json * buck-yeh-bux 1.6.0 * Corrections made according to NancyLi1013's requests in PR #20813 * Fix SHA key in versions/b-/buck-yeh-bux.json * Update to buxk-yeh-bux v1.6.2 Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/buck-yeh-bux/portfile.cmake | 4 ++-- ports/buck-yeh-bux/vcpkg.json | 2 +- versions/b-/buck-yeh-bux.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/buck-yeh-bux/portfile.cmake b/ports/buck-yeh-bux/portfile.cmake index 0e9c75cf5fb9df..f1a754fddc0604 100644 --- a/ports/buck-yeh-bux/portfile.cmake +++ b/ports/buck-yeh-bux/portfile.cmake @@ -2,8 +2,8 @@ vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "uwp" "osx") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO buck-yeh/bux - REF 9e971731ec8c50425754af030fbe16ec603c3d22 # v1.6.0 - SHA512 2e689b4e1ffc2f5e472e0ee8c87857336b4e049969600c82c8f576e2c82939d65658bb6ef62fbe751c03b92f6f14d1b9bcf7a085d2848c0556e3039a5906261d + REF 4e64bc28c482df45a2e15afd8fea928d82897783 # v1.6.2 + SHA512 b409cddc15116e4c1f6142f5d07449bfc44e4c7386bde6884ca232e30a7057a04144cd5564c4c9fb86e74160b9c52d097185f63ebbd751cfe8e7520e8181f404 HEAD_REF main ) diff --git a/ports/buck-yeh-bux/vcpkg.json b/ports/buck-yeh-bux/vcpkg.json index 9e8492a0e7a911..7c5365932591a7 100644 --- a/ports/buck-yeh-bux/vcpkg.json +++ b/ports/buck-yeh-bux/vcpkg.json @@ -1,6 +1,6 @@ { "name": "buck-yeh-bux", - "version": "1.6.0", + "version": "1.6.2", "description": "A supplemental C++ library with functionalities not directly supported from Modern C++ standard.", "homepage": "https://github.com/buck-yeh/bux", "supports": "!(arm | uwp | osx | linux)", diff --git a/versions/b-/buck-yeh-bux.json b/versions/b-/buck-yeh-bux.json index 66df1a49d0a47a..7a2d0905f1048d 100644 --- a/versions/b-/buck-yeh-bux.json +++ b/versions/b-/buck-yeh-bux.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c952bbb93f152d6db8e4bc8d0fbed4fb6e7ead2a", + "version": "1.6.2", + "port-version": 0 + }, { "git-tree": "fa8f4e2afd3a69f94ed947a1dfc0dcb4006ae9c9", "version": "1.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index ff35445e055355..b39fed57e1cbd3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1169,7 +1169,7 @@ "port-version": 0 }, "buck-yeh-bux": { - "baseline": "1.6.0", + "baseline": "1.6.2", "port-version": 0 }, "bullet3": { From 9b8bbb791b52088ea1e1fdb4d1b5c65405a8ee95 Mon Sep 17 00:00:00 2001 From: Michal Cepek <93604224+mc-askia@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:41:50 +0100 Subject: [PATCH 1164/1858] [nanodbc] enable unixODBC dependecy from vcpkg (#21433) --- ports/nanodbc/find-unixodbc.patch | 24 ++++++++++++++++++++++++ ports/nanodbc/portfile.cmake | 1 + ports/nanodbc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/n-/nanodbc.json | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 ports/nanodbc/find-unixodbc.patch diff --git a/ports/nanodbc/find-unixodbc.patch b/ports/nanodbc/find-unixodbc.patch new file mode 100644 index 00000000000000..071bb62d8d5eca --- /dev/null +++ b/ports/nanodbc/find-unixodbc.patch @@ -0,0 +1,24 @@ +--- "a/CMakeLists.txt" ++++ "b/CMakeLists.txt" +@@ -110,6 +110,13 @@ message(STATUS "nanodbc feature: Enable SQL_NO_DATA bug workaround - ${NANODBC_E + ## find unixODBC or iODBC config binary + ######################################## + if(UNIX) ++ # Try to find unixodbc package first ++ find_package(unixodbc) ++ if(unixodbc_FOUND) ++ message(STATUS "nanodbc build: unixODBC package found") ++ set(ODBCLIB UNIX::odbc) ++ set(ODBC_CONFIG true) ++ else() + # Try to find unixODBC first via odbc_config program. + find_program(ODBC_CONFIG odbc_config + PATHS $ENV{ODBC_PATH}/bin /usr/bin /usr/local/bin) +@@ -158,6 +165,7 @@ if(UNIX) + endif() + endif() + endif() ++ endif() + + if(NOT ODBC_CONFIG) + message(FATAL_ERROR "can not find a suitable odbc driver manager") diff --git a/ports/nanodbc/portfile.cmake b/ports/nanodbc/portfile.cmake index 7397bc75bb1e9c..60da9c25176ee5 100644 --- a/ports/nanodbc/portfile.cmake +++ b/ports/nanodbc/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( PATCHES rename-version.patch add-missing-include.patch + find-unixodbc.patch ) file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt") diff --git a/ports/nanodbc/vcpkg.json b/ports/nanodbc/vcpkg.json index bc62f207d11846..35fd067a31f008 100644 --- a/ports/nanodbc/vcpkg.json +++ b/ports/nanodbc/vcpkg.json @@ -1,7 +1,7 @@ { "name": "nanodbc", "version": "2.13.0", - "port-version": 5, + "port-version": 6, "description": "A small C++ wrapper for the native C ODBC API.", "homepage": "https://github.com/nanodbc/nanodbc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index b39fed57e1cbd3..87b4c66a6e1bfa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4586,7 +4586,7 @@ }, "nanodbc": { "baseline": "2.13.0", - "port-version": 5 + "port-version": 6 }, "nanoflann": { "baseline": "1.3.2", diff --git a/versions/n-/nanodbc.json b/versions/n-/nanodbc.json index 163962a437d25d..ef870e92744836 100644 --- a/versions/n-/nanodbc.json +++ b/versions/n-/nanodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7de6296fc337f181517f8ed4c2e6ed35d749e414", + "version": "2.13.0", + "port-version": 6 + }, { "git-tree": "82bfc56de1430aa6fec9c27925d46a72e1b800a0", "version": "2.13.0", From 4feccca453b8f64ddb3d86e385745719cd316697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 17 Nov 2021 08:42:13 +0800 Subject: [PATCH 1165/1858] [libarchive] Fix usage (#21426) * [libarchive] Fix usage * version --- ports/libarchive/usage | 2 +- ports/libarchive/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libarchive.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/libarchive/usage b/ports/libarchive/usage index 57f9f2ba23248a..cf8c24304535e8 100644 --- a/ports/libarchive/usage +++ b/ports/libarchive/usage @@ -1,5 +1,5 @@ The package libarchive is compatible with built-in CMake targets: - find_package(libarchive REQUIRED) + find_package(LibArchive REQUIRED) target_include_directories(main PRIVATE ${LibArchive_INCLUDE_DIRS}) target_link_libraries(main PRIVATE ${LibArchive_LIBRARIES}) diff --git a/ports/libarchive/vcpkg.json b/ports/libarchive/vcpkg.json index c8060441126495..0eb93f942a66d5 100644 --- a/ports/libarchive/vcpkg.json +++ b/ports/libarchive/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libarchive", "version-semver": "3.5.2", - "port-version": 1, + "port-version": 2, "description": "Library for reading and writing streaming archives", "homepage": "https://github.com/libarchive/libarchive", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 87b4c66a6e1bfa..61ac95ca8005a9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3294,7 +3294,7 @@ }, "libarchive": { "baseline": "3.5.2", - "port-version": 1 + "port-version": 2 }, "libass": { "baseline": "0.15.2", diff --git a/versions/l-/libarchive.json b/versions/l-/libarchive.json index 02943237824672..cd9e96f7632457 100644 --- a/versions/l-/libarchive.json +++ b/versions/l-/libarchive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d79d7deb863644fb2bd6570d17cfa88386fc4156", + "version-semver": "3.5.2", + "port-version": 2 + }, { "git-tree": "1fb5fbe606242275316a4368c88327e123ab01ad", "version-semver": "3.5.2", From e7904a527a48ed56b1c1c2c2b48b867c0bbf1198 Mon Sep 17 00:00:00 2001 From: Mathis Logemann Date: Wed, 17 Nov 2021 01:42:49 +0100 Subject: [PATCH 1166/1858] [mapnik] update to latest commit (#21421) * update mapnik * remove old vars * version * fix * version * update * version * update * version * arg hash * version --- ports/mapnik/cairo-find-fix.patch | 21 --------------------- ports/mapnik/portfile.cmake | 10 +++------- ports/mapnik/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mapnik.json | 5 +++++ 5 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 ports/mapnik/cairo-find-fix.patch diff --git a/ports/mapnik/cairo-find-fix.patch b/ports/mapnik/cairo-find-fix.patch deleted file mode 100644 index 9d151ceea3b86c..00000000000000 --- a/ports/mapnik/cairo-find-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 47bbaa1..43f384d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -296,9 +296,14 @@ if(USE_WEBP) - endif() - - if(USE_CAIRO) -- mapnik_find_package(Cairo REQUIRED) -+ if(WIN32) -+ mapnik_find_package(Cairo REQUIRED) -+ list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo) -+ else() -+ pkg_check_modules(Cairo REQUIRED IMPORTED_TARGET cairo) -+ list(APPEND MAPNIK_OPTIONAL_LIBS PkgConfig::Cairo) -+ endif() - list(APPEND MAPNIK_COMPILE_DEFS HAVE_CAIRO) -- list(APPEND MAPNIK_OPTIONAL_LIBS Cairo::Cairo) - endif() - - if(USE_PROJ) diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index ed83b3694c67bb..cd219bed56d716 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -4,11 +4,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapnik/mapnik - REF 4695c42b51bc633e10b15c30ba580093ca0dda4f - SHA512 c0e6c77b6c859ac03a2169d8f71ee2d68e6b76dd0295a0656f278f31ccf531b02f2a5bc5cce7e78177872fba2e5dda95dc00685d6157043fa3a246a072ab7075 + REF 14f913d6ab3b0903dd36a1cb2d22f7d5493b8bb8 + SHA512 f90762594d46946ddc512bb19b21c4d6a2f1ce81b7500a326ad512fae3a3f77e49ef3eb727ff8f98a31596e4132528212e0fa146e2eee0a9965a16551cfd0386 HEAD_REF master - PATCHES - cairo-find-fix.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -47,10 +45,8 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DCOPY_LIBRARIES_FOR_EXECUTABLES=OFF - -DCOPY_FONTS_AND_PLUGINS_FOR_EXECUTABLES=OFF -DINSTALL_DEPENDENCIES=OFF - -DBUILD_TEST=OFF + -DBUILD_TESTING=OFF -DBUILD_BENCHMARK=OFF -DBUILD_DEMO_CPP=OFF -DUSE_EXTERNAL_MAPBOX_GEOMETRY=ON diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 42d5b3680359f9..582ba8497383f5 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapnik", - "version-date": "2021-10-18", + "version-date": "2021-11-15", "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", diff --git a/versions/baseline.json b/versions/baseline.json index 61ac95ca8005a9..e47500dd432bca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4245,7 +4245,7 @@ "port-version": 0 }, "mapnik": { - "baseline": "2021-10-18", + "baseline": "2021-11-15", "port-version": 0 }, "marble": { diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 63b745dfa264f8..6031bfaea3a05d 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d1ae6b45aea26d1bbed2716beaaaeaf3719fbefa", + "version-date": "2021-11-15", + "port-version": 0 + }, { "git-tree": "1702be859d2d61c42ba67c3d4e2c474db6a2d874", "version-date": "2021-10-18", From f44022426e82656182d66ec3b38916d058a3132f Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:44:24 +0100 Subject: [PATCH 1167/1858] [protobuf-c] Update to 1.4.0 (#21418) * Update protobuf-c to 1.4.0 * Update CI baseline * Remove entries from CI baseline * Fix CRT linkage * Update CI baseline * Minimize patch * Update CI baseline Co-authored-by: chausner --- ports/protobuf-c/fix-crt-linkage.patch | 12 +++++ ports/protobuf-c/fix-features.patch | 62 -------------------------- ports/protobuf-c/fix-usage-issue.patch | 36 --------------- ports/protobuf-c/portfile.cmake | 38 ++++++++++------ ports/protobuf-c/vcpkg.json | 13 +++--- scripts/ci.baseline.txt | 7 --- versions/baseline.json | 4 +- versions/p-/protobuf-c.json | 5 +++ 8 files changed, 51 insertions(+), 126 deletions(-) create mode 100644 ports/protobuf-c/fix-crt-linkage.patch delete mode 100644 ports/protobuf-c/fix-features.patch delete mode 100644 ports/protobuf-c/fix-usage-issue.patch diff --git a/ports/protobuf-c/fix-crt-linkage.patch b/ports/protobuf-c/fix-crt-linkage.patch new file mode 100644 index 00000000000000..974c6e6200ab9f --- /dev/null +++ b/ports/protobuf-c/fix-crt-linkage.patch @@ -0,0 +1,12 @@ +diff --git a/build-cmake/CMakeLists.txt b/build-cmake/CMakeLists.txt +--- a/build-cmake/CMakeLists.txt ++++ b/build-cmake/CMakeLists.txt +@@ -70,7 +70,7 @@ if (BUILD_PROTO3) + endif() + ENDIF() + +-if (MSVC AND NOT BUILD_SHARED_LIBS) ++if (0) + # In case we are building static libraries, link also the runtime library statically + # so that MSVCR*.DLL is not required at runtime. + # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx diff --git a/ports/protobuf-c/fix-features.patch b/ports/protobuf-c/fix-features.patch deleted file mode 100644 index 89b2dd43201763..00000000000000 --- a/ports/protobuf-c/fix-features.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/build-cmake/CMakeLists.txt b/build-cmake/CMakeLists.txt -index bc1728f..7c6a04d 100644 ---- a/build-cmake/CMakeLists.txt -+++ b/build-cmake/CMakeLists.txt -@@ -61,11 +61,15 @@ if (MSVC AND MSVC_STATIC_BUILD) - endif(${flag_var} MATCHES "/MD") - endforeach(flag_var) - endif (MSVC AND MSVC_STATIC_BUILD) -+ -+IF(WITH_TOOLS) - FILE(GLOB PROTOC_GEN_C_SRC ${MAIN_DIR}/protoc-c/*.h ${MAIN_DIR}/protoc-c/*.cc ) - ADD_EXECUTABLE(protoc-gen-c ${PROTOC_GEN_C_SRC}) - - TARGET_LINK_LIBRARIES(protoc-gen-c ${PROTOBUF_PROTOC_LIBRARY} ${PROTOBUF_LIBRARY}) -+ENDIF() - -+IF(WITH_TEST AND WITH_TOOLS) - IF(CMAKE_HOST_UNIX) - ADD_CUSTOM_COMMAND(TARGET ${PROJECT_NAME} POST_BUILD - COMMAND ln -sf protoc-gen-c protoc-c -@@ -79,8 +83,6 @@ FUNCTION(GENERATE_TEST_SOURCES PROTO_FILE SRC HDR) - DEPENDS protoc-gen-c) - ENDFUNCTION() - -- --IF(CMAKE_BUILD_TYPE MATCHES Debug) - ENABLE_TESTING() - - GENERATE_TEST_SOURCES(${TEST_DIR}/test.proto t/test.pb-c.c t/test.pb-c.h) -@@ -126,17 +128,17 @@ GENERATE_TEST_SOURCES(${TEST_DIR}/test-proto3.proto t/test-proto3.pb-c.c t/test- - ADD_EXECUTABLE(test-generated-code3 ${TEST_DIR}/generated-code/test-generated-code.c t/test-proto3.pb-c.c t/test-proto3.pb-c.h) - TARGET_COMPILE_DEFINITIONS(test-generated-code3 PUBLIC -DPROTO3) - TARGET_LINK_LIBRARIES(test-generated-code3 protobuf-c) -- - ENDIF() - --INSTALL(TARGETS protoc-gen-c protobuf-c RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) --INSTALL(FILES ${MAIN_DIR}/protobuf-c/protobuf-c.h DESTINATION include/protobuf-c) --INSTALL(FILES ${MAIN_DIR}/protobuf-c/protobuf-c.h DESTINATION include) -+IF (WITH_TOOLS) -+INSTALL(TARGETS protoc-gen-c RUNTIME DESTINATION tools LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+ENDIF() - - IF(CMAKE_HOST_UNIX) - INSTALL(CODE "EXECUTE_PROCESS (COMMAND ln -sf protoc-gen-c protoc-c WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)") - ENDIF() - -+IF (WITH_TEST) - INCLUDE(Dart) - - SET(DART_TESTING_TIMEOUT 5) -@@ -147,5 +149,10 @@ ADD_TEST(test-issue220 test-issue220) - ADD_TEST(test-issue251 test-issue251) - ADD_TEST(test-version test-version) - -+ENDIF() -+ -+INSTALL(TARGETS protobuf-c RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+INSTALL(FILES ${MAIN_DIR}/protobuf-c/protobuf-c.h DESTINATION include/protobuf-c) -+INSTALL(FILES ${MAIN_DIR}/protobuf-c/protobuf-c.h DESTINATION include) - - INCLUDE(CPack) diff --git a/ports/protobuf-c/fix-usage-issue.patch b/ports/protobuf-c/fix-usage-issue.patch deleted file mode 100644 index ce5e4cfa212c3a..00000000000000 --- a/ports/protobuf-c/fix-usage-issue.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/build-cmake/CMakeLists.txt b/build-cmake/CMakeLists.txt -index 7c6a04d..83534cb 100644 ---- a/build-cmake/CMakeLists.txt -+++ b/build-cmake/CMakeLists.txt -@@ -14,6 +14,11 @@ option(BUILD_PROTO3 "BUILD_PROTO3" ON) - INCLUDE(TestBigEndian) - TEST_BIG_ENDIAN(WORDS_BIGENDIAN) - -+ -+IF(CMAKE_HOST_UNIX) -+ FIND_PACKAGE(Threads REQUIRED) -+ENDIF() -+ - SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") - ADD_DEFINITIONS(-DPACKAGE_VERSION="${PACKAGE_VERSION}") - ADD_DEFINITIONS(-DPACKAGE_STRING="${PACKAGE_STRING}") -@@ -67,6 +72,9 @@ FILE(GLOB PROTOC_GEN_C_SRC ${MAIN_DIR}/protoc-c/*.h ${MAIN_DIR}/protoc-c/*.cc ) - ADD_EXECUTABLE(protoc-gen-c ${PROTOC_GEN_C_SRC}) - - TARGET_LINK_LIBRARIES(protoc-gen-c ${PROTOBUF_PROTOC_LIBRARY} ${PROTOBUF_LIBRARY}) -+IF(CMAKE_HOST_UNIX) -+ TARGET_LINK_LIBRARIES(protoc-gen-c ${CMAKE_THREAD_LIBS_INIT}) -+ENDIF() - ENDIF() - - IF(WITH_TEST AND WITH_TOOLS) -@@ -99,6 +107,9 @@ GENERATE_TEST_SOURCES(${TEST_DIR}/test-full.proto t/test-full.pb-c.c t/test-full - - ADD_EXECUTABLE(cxx-generate-packed-data ${TEST_DIR}/generated-code2/cxx-generate-packed-data.cc t/test-full.pb.h t/test-full.pb.cc) - TARGET_LINK_LIBRARIES(cxx-generate-packed-data ${PROTOBUF_LIBRARY}) -+IF (CMAKE_HOST_UNIX) -+ TARGET_LINK_LIBRARIES(cxx-generate-packed-data ${CMAKE_THREAD_LIBS_INIT}) -+ENDIF() - - FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/t/generated-code2) - ADD_CUSTOM_COMMAND(OUTPUT t/generated-code2/test-full-cxx-output.inc diff --git a/ports/protobuf-c/portfile.cmake b/ports/protobuf-c/portfile.cmake index 98f7035f642cff..4bcce7017d18cc 100644 --- a/ports/protobuf-c/portfile.cmake +++ b/ports/protobuf-c/portfile.cmake @@ -1,32 +1,42 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO protobuf-c/protobuf-c - REF 1390409f4ee4e26d0635310995b516eb702c3f9e #1.3.2 - SHA512 5c60883c4ef064c641875bfe7f89bf255a29dd20b5e0be5878cbaec03f2efd1f926c3e40dc0090cb172b8eef227fddafe86051f08edb3e1c26d0bd6aca673e41 + REF v1.4.0 + SHA512 cba4c6116c0f2ebb034236e8455d493bfaa2517733befcd87b6f8d6d3df0c0149b17fcbf59cd1763fa2318119c664d0dae3d2d3a46ebfe2a0fec3ef4719b033b HEAD_REF master PATCHES - fix-features.patch - fix-usage-issue.patch + fix-crt-linkage.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - tools WITH_TOOLS - test WITH_TEST + FEATURES + tools BUILD_PROTOC + test BUILD_TESTS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/build-cmake - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/build-cmake" DISABLE_PARALLEL_CONFIGURE OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install(ADD_BIN_TO_PATH) +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES protoc-gen-c + AUTO_CLEAN + ) +endif() # Include files should not be duplicated into the /debug/include directory. -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +# Remove duplicate PDB files (vcpkg_copy_pdbs already copied them to "bin") +file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/protobuf-c.pdb") +file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/protobuf-c.pdb") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/protobuf-c/vcpkg.json b/ports/protobuf-c/vcpkg.json index 548cce39b6c9a7..73fbd998299e2e 100644 --- a/ports/protobuf-c/vcpkg.json +++ b/ports/protobuf-c/vcpkg.json @@ -1,15 +1,18 @@ { "name": "protobuf-c", - "version-string": "1.3.2", - "port-version": 3, + "version-semver": "1.4.0", "description": "This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format.", "homepage": "https://github.com/protobuf-c/protobuf-c", "dependencies": [ - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + } ], "features": { "test": { - "description": "build test project.", + "description": "Build test project.", "dependencies": [ { "name": "protobuf-c", @@ -20,7 +23,7 @@ ] }, "tools": { - "description": "build tools." + "description": "Build tools (protoc-gen-c)." } } } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 65a79b3045b07d..f9af0f8b53a396 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1179,13 +1179,6 @@ poppler:arm64-windows=fail portable-snippets:arm-uwp=fail pqp:arm-uwp=fail pqp:x64-uwp=fail -protobuf-c:x86-windows=fail -protobuf-c:x64-windows=fail -protobuf-c:x64-windows-static=fail -protobuf-c:x64-windows-static-md=fail -protobuf-c:x64-uwp=fail -protobuf-c:arm64-windows=fail -protobuf-c:arm-uwp=fail python2:arm64-windows=fail python2:arm-uwp=fail python2:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index e47500dd432bca..1543c445f9537c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5381,8 +5381,8 @@ "port-version": 0 }, "protobuf-c": { - "baseline": "1.3.2", - "port-version": 3 + "baseline": "1.4.0", + "port-version": 0 }, "protopuf": { "baseline": "2.1.0", diff --git a/versions/p-/protobuf-c.json b/versions/p-/protobuf-c.json index 886b4ec8d5644f..7d592e5993b3ab 100644 --- a/versions/p-/protobuf-c.json +++ b/versions/p-/protobuf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "649c1df0b6207662ec75fed4bbd999a7a42afb4b", + "version-semver": "1.4.0", + "port-version": 0 + }, { "git-tree": "7786538f69991494262bd14f710e2dd8c6062bea", "version-string": "1.3.2", From 4782addcfcc85a274b884887f12874f3e16cb4ed Mon Sep 17 00:00:00 2001 From: Erwan BERNARD Date: Wed, 17 Nov 2021 01:45:32 +0100 Subject: [PATCH 1168/1858] [kissfft] update, add missing file (#21410) * [kissfft] update, add kiss_fftr * [kissfft] remove deprecated vcpkg function * [kissfft] update version in vcpkg index * [kissfft] export symbol * [kissfft] update version * [kissfft] change version * [kissfft] bump version hash --- ports/kissfft/CMakeLists.txt | 5 ++++- ports/kissfft/exports.def | 11 ++++++++++- ports/kissfft/portfile.cmake | 14 ++++++-------- ports/kissfft/vcpkg.json | 15 ++++++++++++--- versions/baseline.json | 4 ++-- versions/k-/kissfft.json | 5 +++++ 6 files changed, 39 insertions(+), 15 deletions(-) diff --git a/ports/kissfft/CMakeLists.txt b/ports/kissfft/CMakeLists.txt index 8d522ecb9205b0..d209dfbb04bafd 100644 --- a/ports/kissfft/CMakeLists.txt +++ b/ports/kissfft/CMakeLists.txt @@ -16,7 +16,7 @@ endif () # TODO: FIXED_POINT # TODO: -msse -set(kissfft_sources kiss_fft.c) +set(kissfft_sources kiss_fft.c kiss_fftr.c kiss_fftnd.c kiss_fftndr.c) if (WIN32 AND BUILD_SHARED_LIBS) list(APPEND kissfft_sources exports.def) @@ -49,6 +49,9 @@ if (KF_INSTALL_HEADERS) FILES _kiss_fft_guts.h kiss_fft.h + kiss_fftr.h + kiss_fftnd.h + kiss_fftndr.h kissfft.hh kissfft_i32.hh DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} diff --git a/ports/kissfft/exports.def b/ports/kissfft/exports.def index 09897b9da58dbc..53984a6fe00e7c 100644 --- a/ports/kissfft/exports.def +++ b/ports/kissfft/exports.def @@ -1,6 +1,15 @@ -EXPORTS +EXPORTS kiss_fft_alloc kiss_fft + kiss_fftr_alloc + kiss_fftr + kiss_fftri + kiss_fft + kiss_fftnd_alloc + kiss_fftnd + kiss_fftndr_alloc + kiss_fftndr + kiss_fftndri kiss_fft_stride kiss_fft_cleanup kiss_fft_next_fast_size diff --git a/ports/kissfft/portfile.cmake b/ports/kissfft/portfile.cmake index d5eea7889a5d6e..ccb77514b736b6 100644 --- a/ports/kissfft/portfile.cmake +++ b/ports/kissfft/portfile.cmake @@ -1,30 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mborgerding/kissfft - REF 3f3fc6ab55da8610aba7fe89dcda09cf3a31f4e6 - SHA512 5d3781a82d067cebd0a20c6b35a2d806598ba66f3bbf282c49a2ac9a6d09e1307dca1f8bc5fcc4c5955dc2f66aa94ca4dcfe00e6b31ea4694aa9d507f194554e + REF 8f47a67f595a6641c566087bf5277034be64f24d + SHA512 ae39438b6d029296a440e1421f30731f371364107744fe9bad68e835e939f9a06d63016a99f5395a490ee0b1b1c33d46faafc651d91f13b8733d366e04dc861a HEAD_REF master ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/exports.def DESTINATION ${SOURCE_PATH}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS_DEBUG -DKF_INSTALL_HEADERS=OFF OPTIONS_RELEASE -DKF_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() - +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets( +vcpkg_cmake_config_fixup( + PACKAGE_NAME unofficial-${PORT} CONFIG_PATH lib/cmake/unofficial-${PORT} - TARGET_PATH share/unofficial-${PORT} ) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kissfft/vcpkg.json b/ports/kissfft/vcpkg.json index b3e0193da6ada6..48e6b5c19c8b12 100644 --- a/ports/kissfft/vcpkg.json +++ b/ports/kissfft/vcpkg.json @@ -1,7 +1,16 @@ { "name": "kissfft", - "version-string": "2020-03-30", - "port-version": 1, + "version-date": "2021-11-14", "description": "A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid", - "homepage": "https://github.com/mborgerding/kissfft" + "homepage": "https://github.com/mborgerding/kissfft", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 1543c445f9537c..84f664ed961f2c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3181,8 +3181,8 @@ "port-version": 3 }, "kissfft": { - "baseline": "2020-03-30", - "port-version": 1 + "baseline": "2021-11-14", + "port-version": 0 }, "klein": { "baseline": "2021-05-09", diff --git a/versions/k-/kissfft.json b/versions/k-/kissfft.json index ecd9591ab3f4cf..83643505536553 100644 --- a/versions/k-/kissfft.json +++ b/versions/k-/kissfft.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f55a890b3e3bf5068dfdcf921ceb36080a146d9d", + "version-date": "2021-11-14", + "port-version": 0 + }, { "git-tree": "95aab04fc0758cad41ad4724c17490d54b5cb139", "version-string": "2020-03-30", From 1880769a112c0d07dfc51eba2e532bfef55516a5 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:46:54 +0100 Subject: [PATCH 1169/1858] [libzip] Update to 1.8.0 (#21407) * Update libzip to 1.8.0 * Update CI baseline Co-authored-by: chausner --- ports/libzip/fix-dependency.patch | 5 +++- ports/libzip/fix-findpackage.patch | 17 ------------- ports/libzip/portfile.cmake | 40 +++++++++++++++--------------- ports/libzip/vcpkg.json | 19 +++++++++++--- versions/baseline.json | 4 +-- versions/l-/libzip.json | 5 ++++ 6 files changed, 47 insertions(+), 43 deletions(-) delete mode 100644 ports/libzip/fix-findpackage.patch diff --git a/ports/libzip/fix-dependency.patch b/ports/libzip/fix-dependency.patch index e04d271382a6f3..c3d0ec294abe1d 100644 --- a/ports/libzip/fix-dependency.patch +++ b/ports/libzip/fix-dependency.patch @@ -2,7 +2,7 @@ diff --git a/libzip-config.cmake.in b/libzip-config.cmake.in index 5b9aa55..0723f3c 100644 --- a/libzip-config.cmake.in +++ b/libzip-config.cmake.in -@@ -1,8 +1,17 @@ +@@ -1,8 +1,20 @@ @PACKAGE_INIT@ # only needed for static library, and doesn't work as-is @@ -15,6 +15,9 @@ index 5b9aa55..0723f3c 100644 +if(@ENABLE_LZMA@) + find_dependency(LibLZMA) +endif() ++if(@ENABLE_ZSTD@) ++ find_dependency(Zstd) ++endif() +if(@ENABLE_OPENSSL@) + find_dependency(OpenSSL) +endif() diff --git a/ports/libzip/fix-findpackage.patch b/ports/libzip/fix-findpackage.patch deleted file mode 100644 index 7080a9ea01789f..00000000000000 --- a/ports/libzip/fix-findpackage.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 017f7cf0..9770c158 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -437,10 +437,10 @@ export(TARGETS zip - if(LIBZIP_DO_INSTALL) - install(FILES ${PROJECT_BINARY_DIR}/zipconf.h DESTINATION include) - install(FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake ${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake - ) - install(EXPORT ${PROJECT_NAME}-targets NAMESPACE libzip:: FILE ${PROJECT_NAME}-targets.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake - ) - endif() - diff --git a/ports/libzip/portfile.cmake b/ports/libzip/portfile.cmake index 23155a5e0a749d..9670853e738f41 100644 --- a/ports/libzip/portfile.cmake +++ b/ports/libzip/portfile.cmake @@ -1,27 +1,27 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO nih-at/libzip - REF 66e496489bdae81bfda8b0088172871d8fda0032 #v1.7.3 - SHA512 ae0cda3e9decf5a71bf1e0907a2a21b2c0d83e6e576faf4d9401d6954707ae298c1c09febbc5339f457ace3577fdd405a790c819ef24778990ca6bf1e9516d54 - HEAD_REF v1.7.3 - PATCHES - fix-findpackage.patch + REF v1.8.0 + SHA512 f7a78ff6d964a485b8fe3dfb7a61afae69984e67367e6de78c3cb10f15a0904800a1aeca9d33b63bc24ca926fff98638914343a35e7c3a4c3ec8b7594fc25fc1 + HEAD_REF master + PATCHES fix-dependency.patch ) vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS - bzip2 ENABLE_BZIP2 - liblzma ENABLE_LZMA - openssl ENABLE_OPENSSL - wincrypto ENABLE_WINDOWS_CRYPTO - commoncrypto ENABLE_COMMONCRYPTO - mbedtls ENABLE_MBEDTLS + FEATURES + bzip2 ENABLE_BZIP2 + liblzma ENABLE_LZMA + zstd ENABLE_ZSTD + openssl ENABLE_OPENSSL + wincrypto ENABLE_WINDOWS_CRYPTO + commoncrypto ENABLE_COMMONCRYPTO + mbedtls ENABLE_MBEDTLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} -DBUILD_DOC=OFF @@ -31,18 +31,18 @@ vcpkg_configure_cmake( -DENABLE_GNUTLS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libzip) vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Remove include directories from lib -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/libzip ${CURRENT_PACKAGES_DIR}/debug/lib/libzip) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libzip" "${CURRENT_PACKAGES_DIR}/debug/lib/libzip") # Remove debug include -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Copy copright information -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libzip/vcpkg.json b/ports/libzip/vcpkg.json index eb56141f86d935..4468266c72e6ae 100644 --- a/ports/libzip/vcpkg.json +++ b/ports/libzip/vcpkg.json @@ -1,10 +1,17 @@ { "name": "libzip", - "version-semver": "1.7.3", - "port-version": 2, + "version-semver": "1.8.0", "description": "A library for reading, creating, and modifying zip archives.", "homepage": "https://github.com/nih-at/libzip", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "default-features": [ @@ -19,7 +26,7 @@ ] }, "commoncrypto": { - "description": "AES( encryption) support using Apple's Common Crypto API" + "description": "AES (encryption) support using Apple's Common Crypto API" }, "default-aes": { "description": "Use default AES", @@ -70,6 +77,12 @@ }, "wincrypto": { "description": "AES (encryption) support using Windows Crypto API" + }, + "zstd": { + "description": "Support Zstandard-compressed zip archives", + "dependencies": [ + "zstd" + ] } } } diff --git a/versions/baseline.json b/versions/baseline.json index 84f664ed961f2c..34a65d43dcbcd3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4077,8 +4077,8 @@ "port-version": 1 }, "libzip": { - "baseline": "1.7.3", - "port-version": 2 + "baseline": "1.8.0", + "port-version": 0 }, "libzippp": { "baseline": "5.0-1.8.0", diff --git a/versions/l-/libzip.json b/versions/l-/libzip.json index 1d40ee0934a3da..e14cc3658efab4 100644 --- a/versions/l-/libzip.json +++ b/versions/l-/libzip.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "aac0a6e50e8ada73d9bfeb5a5ce5e631fd37fce8", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "519b00c1db73782b3527816055dffbcbdde805a0", "version-semver": "1.7.3", From 6ec689ee87831a3282a28d75f658cf9545c0561e Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:47:33 +0100 Subject: [PATCH 1170/1858] [mapbox-geojson-vt-cpp] Update to 6.6.5 (#21384) * Update mapbox-geojson-vt-cpp to 6.6.5 * Update CI baseline Co-authored-by: chausner --- ports/mapbox-geojson-vt-cpp/portfile.cmake | 8 ++++---- ports/mapbox-geojson-vt-cpp/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/m-/mapbox-geojson-vt-cpp.json | 5 +++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ports/mapbox-geojson-vt-cpp/portfile.cmake b/ports/mapbox-geojson-vt-cpp/portfile.cmake index 324fc9269ff24d..7c8567301f8cfa 100644 --- a/ports/mapbox-geojson-vt-cpp/portfile.cmake +++ b/ports/mapbox-geojson-vt-cpp/portfile.cmake @@ -3,13 +3,13 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mapbox/geojson-vt-cpp - REF v6.6.4 - SHA512 8a78159112be3e6a1a477fbb92e7bd9645b0b174ab6db7ef72557e154d53c3a9fb818d62b6f0d0a5b8b8a9839132c523fb44efa038388d4cd2b46c5bea60d2da + REF v6.6.5 + SHA512 4989522c19f35ba13096958ad1041ec09745020955fad99ee02116393885a9d0a835911a42167a76d5efb2a5dd167077bcd451c9a77444f2eaa26893a1bff062 HEAD_REF master ) # Copy header files -file(COPY ${SOURCE_PATH}/include/mapbox/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/mapbox FILES_MATCHING PATTERN "*.hpp") +file(COPY "${SOURCE_PATH}/include/mapbox/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/mapbox" FILES_MATCHING PATTERN "*.hpp") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mapbox-geojson-vt-cpp/vcpkg.json b/ports/mapbox-geojson-vt-cpp/vcpkg.json index e12741484f117f..29876c2d41d37e 100644 --- a/ports/mapbox-geojson-vt-cpp/vcpkg.json +++ b/ports/mapbox-geojson-vt-cpp/vcpkg.json @@ -1,6 +1,6 @@ { "name": "mapbox-geojson-vt-cpp", - "version-semver": "6.6.4", + "version-semver": "6.6.5", "description": "Port to C++ of JS GeoJSON-VT for slicing GeoJSON into vector tiles on the fly", "homepage": "https://github.com/mapbox/geojson-vt-cpp", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 34a65d43dcbcd3..caa988a29bd580 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4225,7 +4225,7 @@ "port-version": 1 }, "mapbox-geojson-vt-cpp": { - "baseline": "6.6.4", + "baseline": "6.6.5", "port-version": 0 }, "mapbox-geometry": { diff --git a/versions/m-/mapbox-geojson-vt-cpp.json b/versions/m-/mapbox-geojson-vt-cpp.json index a988ecd71d3ce1..f270a24594f54c 100644 --- a/versions/m-/mapbox-geojson-vt-cpp.json +++ b/versions/m-/mapbox-geojson-vt-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93dae1428f22ec1cbd1ad8fa45427a78528a96be", + "version-semver": "6.6.5", + "port-version": 0 + }, { "git-tree": "61a9b2210212dbddceb433d2f61baa1da834ca8c", "version-semver": "6.6.4", From dd1a761dedf7d8caa56a81d0a129aed337e043a0 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 17 Nov 2021 01:48:12 +0100 Subject: [PATCH 1171/1858] [matroska] Update to 1.6.3 (#21383) * Update matroska to 1.6.3 * Update CI baseline * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update CI baseline Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/matroska/portfile.cmake | 20 ++++++++++---------- ports/matroska/vcpkg.json | 13 ++++++++++--- versions/baseline.json | 4 ++-- versions/m-/matroska.json | 5 +++++ 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/ports/matroska/portfile.cmake b/ports/matroska/portfile.cmake index 2a729f0ed59f09..eac14d7b7d7d4f 100644 --- a/ports/matroska/portfile.cmake +++ b/ports/matroska/portfile.cmake @@ -5,22 +5,22 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Matroska-Org/libmatroska - REF 684560a3ce962a7abe89be93cc8ffa483f7f853f # release-1.6.2 - SHA512 d9b0e392cc99d9eec99ef90431589778976508c5ccbd8bbb166f390653c27b4cc84de189f7cd3bf5b039ecb38a96b0e341cc39195099ec415cc48d40e0b78c01 + REF release-1.6.3 + SHA512 f4b4cd5b5e76c452fb559ead28c4bcb5ec4e28d74898f13c1709a6ab75d95cf82b319118445d7a7f895708bb0d5d1f3c09040d3e3263c6a2f2a27ffc92d35c2f HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS -DDISABLE_PKGCONFIG=1 +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDISABLE_PKGCONFIG=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Matroska) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Matroska) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.LGPL DESTINATION ${CURRENT_PACKAGES_DIR}/share/matroska RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE.LGPL" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/matroska/vcpkg.json b/ports/matroska/vcpkg.json index 339ca0355a1a12..2987f36de745b2 100644 --- a/ports/matroska/vcpkg.json +++ b/ports/matroska/vcpkg.json @@ -1,11 +1,18 @@ { "name": "matroska", - "version-string": "1.6.2", - "port-version": 1, + "version": "1.6.3", "description": "a C++ library to parse Matroska files (.mkv and .mka)", "homepage": "https://github.com/Matroska-Org/libmatroska", "supports": "!uwp", "dependencies": [ - "ebml" + "ebml", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/baseline.json b/versions/baseline.json index caa988a29bd580..671b3e9d4dc95a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4277,8 +4277,8 @@ "port-version": 5 }, "matroska": { - "baseline": "1.6.2", - "port-version": 1 + "baseline": "1.6.3", + "port-version": 0 }, "mbedtls": { "baseline": "2.24.0", diff --git a/versions/m-/matroska.json b/versions/m-/matroska.json index 10fa7d2aa6244a..8bf36eb8f64a2c 100644 --- a/versions/m-/matroska.json +++ b/versions/m-/matroska.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4f42c70e6e7b730f43e59e3dd7e0b4b8e7e7abd8", + "version": "1.6.3", + "port-version": 0 + }, { "git-tree": "6f1a45086676ff21d75b117b36ae0a3b75e88feb", "version-string": "1.6.2", From f7990dc308897c7d33e32da82fabd80efb9c4ea5 Mon Sep 17 00:00:00 2001 From: simon987 Date: Tue, 16 Nov 2021 19:50:43 -0500 Subject: [PATCH 1172/1858] Fix cpu detection in meson configuration script (#21382) --- scripts/cmake/vcpkg_configure_meson.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake index e0eab209875eaf..4c5d7be6410a44 100644 --- a/scripts/cmake/vcpkg_configure_meson.cmake +++ b/scripts/cmake/vcpkg_configure_meson.cmake @@ -241,7 +241,7 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu # Show real machine architecture to visually understand whether we are in a native Apple Silicon terminal or running under Rosetta emulation debug_message("Machine: ${MACHINE}") - if(MACHINE MATCHES "arm64") + if(MACHINE MATCHES "arm64|aarch64") set(build_cpu_fam aarch64) set(build_cpu armv8) elseif(MACHINE MATCHES "x86_64|amd64") From b6b62fafaed60b368572e6fc9797fbe9dafac9eb Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Tue, 16 Nov 2021 16:59:59 -0800 Subject: [PATCH 1173/1858] [libmodplug] Patch CMakeLists.txt to fix install paths (#21381) * [libmodplug] fix paths * Update version database --- ports/libmodplug/005-fix-install-paths.patch | 16 ++++++++++++++++ ports/libmodplug/portfile.cmake | 14 ++------------ ports/libmodplug/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libmodplug.json | 5 +++++ 5 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 ports/libmodplug/005-fix-install-paths.patch diff --git a/ports/libmodplug/005-fix-install-paths.patch b/ports/libmodplug/005-fix-install-paths.patch new file mode 100644 index 00000000000000..a41acf0b53b5f0 --- /dev/null +++ b/ports/libmodplug/005-fix-install-paths.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 468f1a3..b58b11e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,10 @@ add_library(modplug ${LIB_TYPE} + ) + + # install the library: +-install(TARGETS modplug DESTINATION lib) ++install(TARGETS modplug ++ RUNTIME DESTINATION bin ++ LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib) + + # incstall the headers: + install(FILES diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake index 5df935579492b4..a7af03816114d3 100644 --- a/ports/libmodplug/portfile.cmake +++ b/ports/libmodplug/portfile.cmake @@ -14,6 +14,7 @@ vcpkg_from_github(ARCHIVE 002-detect_sinf.patch 003-use-static-cast-for-ctype.patch 004-export-pkgconfig.patch # https://github.com/Konstanty/libmodplug/pull/59 + 005-fix-install-paths.patch # https://github.com/Konstanty/libmodplug/pull/61 ) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA) @@ -22,18 +23,7 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_TARGET_IS_MINGW) - set(BIN_NAME libmodplug.dll) - else() - set(BIN_NAME modplug.dll) - endif() - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/bin/${BIN_NAME}) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/${BIN_NAME} ${CURRENT_PACKAGES_DIR}/debug/bin/${BIN_NAME}) - vcpkg_copy_pdbs() -endif() +vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() diff --git a/ports/libmodplug/vcpkg.json b/ports/libmodplug/vcpkg.json index 854e034e1835ea..d5c841955434f3 100644 --- a/ports/libmodplug/vcpkg.json +++ b/ports/libmodplug/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmodplug", "version-string": "0.8.9.0", - "port-version": 8, + "port-version": 9, "description": "The ModPlug mod file playing library.", "homepage": "https://github.com/Konstanty/libmodplug", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index 671b3e9d4dc95a..84e33d858d41cf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3646,7 +3646,7 @@ }, "libmodplug": { "baseline": "0.8.9.0", - "port-version": 8 + "port-version": 9 }, "libmorton": { "baseline": "0.2.8", diff --git a/versions/l-/libmodplug.json b/versions/l-/libmodplug.json index e32694d51a6f22..a342cd4762cdf8 100644 --- a/versions/l-/libmodplug.json +++ b/versions/l-/libmodplug.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28b465d4794e5c5545cb486da31a9a7ce208654b", + "version-string": "0.8.9.0", + "port-version": 9 + }, { "git-tree": "b6798791f0c306dcc5a5b9a445b618046dc7e097", "version-string": "0.8.9.0", From d5b600cdd0d872a87255b0a6772daa16e7e31494 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 16 Nov 2021 18:31:04 -0800 Subject: [PATCH 1174/1858] Update tool to 2021-11-15. (#21471) --- scripts/bootstrap.ps1 | 2 +- scripts/bootstrap.sh | 10 +++++----- scripts/vcpkgTools.xml | 21 +++++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1 index af62fde1b6290e..a78ace278ea7ec 100644 --- a/scripts/bootstrap.ps1 +++ b/scripts/bootstrap.ps1 @@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root")) Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found" -$versionDate = '2021-11-02' +$versionDate = '2021-11-15' if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64') { & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe" } else { diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 0da88be2a3d79c..d36f7ef1f07daf 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -124,23 +124,23 @@ fi # Choose the vcpkg binary to download vcpkgDownloadTool="ON" -vcpkgToolReleaseTag="2021-11-02" +vcpkgToolReleaseTag="2021-11-15" if [ "$UNAME" = "Darwin" ]; then echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha="f60e19bb3c457731b9321580b7b29bde18c103fe6b78bfbeceabdf35ca573f498cf72e09500d9a1805c9f5f8983bd06bc8a1f511d01ece8b38b0b2ae529c8365" + vcpkgToolReleaseSha="2dc3b9fc8dde1eebdc76e1d40c4e9078d7a892487552349ac75df8e9c33d601830ab06b2283a7ba163de0d70f441574501de6cc1198930a346a3a642e677f93f" vcpkgToolName="vcpkg-macos" elif [ "$vcpkgUseMuslC" = "ON" ]; then echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha="cbef5be0430d58179882d921d8647b374d377e66b73abe84e6ea6b4333d231e7ef6bd1b2619544548c53cf98af0465e0a5b0ede954305e4f0b17380b79f520b6" + vcpkgToolReleaseSha="4e5e349c608f7263cbed38f800051ea0165966d472f697a47225183e00f7e09791f5663f8f6ec87f9b00803f91ddbd8c716e45e718fc2987ba03070671deaf21" vcpkgToolName="vcpkg-muslc" elif [ "$ARCH" = "x86_64" ]; then echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha="9b6836d9d28a7f5e4ed33ea9c22458a6c9ce9cc253c7bb16c3f78ffd9b812b87a53f74f19e575a2005f4c163b0e242809f678f54c5c6871d9c55068391563b63" + vcpkgToolReleaseSha="c574ca0978a7a5a1b7ea636c4c9b201fb7446a5b413820e0d08e7934818a2041e53b8caefa32317d4c6f81d872c90f09463f0952861593e3f1e0c47239cf766b" vcpkgToolName="vcpkg-glibc" else echo "Unable to determine a binary release of vcpkg; attempting to build from source." vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha="2c50a5a360ca34eeaf00def29c9092c38225d9c70f1b3ad4b8f81e5a4bab027e215e8a65d28d38422229129959bb7d1c1d709e1f2d8b7c3efed024d67d8c3307" + vcpkgToolReleaseSha="d94b00fd8d0b3abb0379390fc12c9103f209621e899df11c1ccfd9d15558908dbe0cd3e61cf7fe89a28a6a2b42eeb311d74cf1ebcb0f8e8debc671e9be123ec7" fi # Do the download or build. diff --git a/scripts/vcpkgTools.xml b/scripts/vcpkgTools.xml index 18ecfceb6ef83c..e1f18c0dc3c861 100644 --- a/scripts/vcpkgTools.xml +++ b/scripts/vcpkgTools.xml @@ -168,4 +168,25 @@ cf30f80edb57f37501c4a380a8ddd8adf016a51a988a315e15ef517fdae42313ddf5260d8374db65ef12808ec980118bc8b543256df0c1d641a5b8355a80ba7b PowerShell-7.1.4-win-x86.zip + + 16.12.0 + node-v16.12.0-win-x64\node.exe + https://nodejs.org/dist/v16.12.0/node-v16.12.0-win-x64.7z + 0bb793fce8140bd59c17f3ac9661b062eac0f611d704117774f5cb2453d717da94b1e8b17d021d47baff598dc023fb7068ed1f8a7678e446260c3db3537fa888 + node-v16.12.0-win-x64.7z + + + 16.12.0 + node-v16.12.0-linux-x64/bin/node + https://nodejs.org/dist/v16.12.0/node-v16.12.0-linux-x64.tar.gz + 45658083c35c13f2bc4b88d68a12c76213bdaf2235776e041c9937ce912a83cb49d655965568c99a5e139ff5c03b1e460c13ad8ab7f0c5570b531907715f6e0f + node-v16.12.0-linux-x64.tar.gz + + + 16.12.0 + node-v16.12.0-darwin-x64/bin/node + https://nodejs.org/dist/v16.12.0/node-v16.12.0-darwin-x64.tar.gz + f758a90d3dcc3adf296abbed01b69a3a27e63c2085b7f604d83550714b1ac374f36e73fc02dd31bf60e532205d92e1605a05b35642142d20ac07c4bb98c69f70 + node-v16.12.0-darwin-x64.tar.gz + From 1f7671bc75b1affb218c3ace29ea09b5b5129d70 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Wed, 17 Nov 2021 06:10:45 -0800 Subject: [PATCH 1175/1858] [libxslt] Remove unneeded helper (#21480) * [libxslt] Remove unneeded helper * [libxslt] Fix release-only builds for Linux --- ports/libxslt/portfile.cmake | 10 +++++++--- ports/libxslt/vcpkg.json | 9 ++------- versions/baseline.json | 2 +- versions/l-/libxslt.json | 5 +++++ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 8013d34bd7842e..05df04a3189a3d 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -98,8 +98,10 @@ if (VCPKG_TARGET_IS_WINDOWS) # Rename the libs to match the dynamic lib names file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + if(NOT VCPKG_BUILD_TYPE) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libxslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/lib/libexslt${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}") + endif() endif() set(prefix "") @@ -146,7 +148,9 @@ else() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/libxslt/man3") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libxslt/debug/bin/xslt-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../../") + endif() vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libxslt/xsltconfig.h" "#define LIBXSLT_DEFAULT_PLUGINS_PATH() \"${CURRENT_INSTALLED_DIR}/lib/libxslt-plugins\"" "") endif() diff --git a/ports/libxslt/vcpkg.json b/ports/libxslt/vcpkg.json index 2f63cdfda2b2a6..99ea78fa87d9b0 100644 --- a/ports/libxslt/vcpkg.json +++ b/ports/libxslt/vcpkg.json @@ -1,17 +1,12 @@ { "name": "libxslt", "version": "1.1.34", - "port-version": 2, + "port-version": 3, "description": "Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT", "homepage": "https://github.com/GNOME/libxslt", "supports": "!uwp", "dependencies": [ "liblzma", - "libxml2", - { - "name": "vcpkg-pkgconfig-get-modules", - "host": true, - "platform": "!windows" - } + "libxml2" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 84e33d858d41cf..ccff6ffb502fea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4062,7 +4062,7 @@ }, "libxslt": { "baseline": "1.1.34", - "port-version": 2 + "port-version": 3 }, "libyaml": { "baseline": "0.2.5", diff --git a/versions/l-/libxslt.json b/versions/l-/libxslt.json index 6af4a5a14568b5..00300beaa376a9 100644 --- a/versions/l-/libxslt.json +++ b/versions/l-/libxslt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f139a7054e2347bc0f48ba6cabe14a74e7d1db36", + "version": "1.1.34", + "port-version": 3 + }, { "git-tree": "0f0b69e249f116b5e20999f9c4c16004093b49ec", "version": "1.1.34", From fac74d641094b9a7574589aab9c11a76400511c3 Mon Sep 17 00:00:00 2001 From: winsoft666 <46803815+winsoft666@users.noreply.github.com> Date: Thu, 18 Nov 2021 04:16:38 +0800 Subject: [PATCH 1176/1858] [cpp-ipc] Update to 1.0.1 (#21481) * [cpp-ipc] Update 1.0.1 * [cpp-ipc] Update version and ci.baseline * [cpp-ipc] Remove cpp-ipc from ci.baseline.txt --- ports/cpp-ipc/portfile.cmake | 4 ++-- ports/cpp-ipc/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/cpp-ipc.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/cpp-ipc/portfile.cmake b/ports/cpp-ipc/portfile.cmake index 0f3d3981cbfd5b..4842897fb51201 100644 --- a/ports/cpp-ipc/portfile.cmake +++ b/ports/cpp-ipc/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mutouyun/cpp-ipc - REF df3cf1b4c42143e6675c6fb0f33f85a48b7c7701 #v1.0.0 - SHA512 de319d48ac396f567b2f5faae87a264b9ebfbaf0559a3e00de61facd6a3f2de1739e064c6e037ad694111ed211c0fb9ea6ec2db0259c100e2bafe553c15ed2f6 + REF a5722957b25a2a429e4e893c427ecd278f2eb0fe #v1.0.1 + SHA512 e5eb7dbec8a3932db78f658422dfe32d377edf50ec594810765718896b32f61b4e6c02e29225cb103279e3313650e31e2b4241ac1adb538172af50fc75a6b0bb HEAD_REF master ) diff --git a/ports/cpp-ipc/vcpkg.json b/ports/cpp-ipc/vcpkg.json index 5e42a0a659da50..b0d59447b46208 100644 --- a/ports/cpp-ipc/vcpkg.json +++ b/ports/cpp-ipc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "cpp-ipc", - "version": "1.0.0", + "version": "1.0.1", "description": "C++ IPC Library: A high-performance inter-process communication using shared memory on Linux/Windows.", "homepage": "https://github.com/mutouyun/cpp-ipc", "supports": "!osx", diff --git a/versions/baseline.json b/versions/baseline.json index ccff6ffb502fea..896af40d60cf2d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1521,7 +1521,7 @@ "port-version": 0 }, "cpp-ipc": { - "baseline": "1.0.0", + "baseline": "1.0.1", "port-version": 0 }, "cpp-jwt": { diff --git a/versions/c-/cpp-ipc.json b/versions/c-/cpp-ipc.json index 75ed310a17e201..97dce1abedddd6 100644 --- a/versions/c-/cpp-ipc.json +++ b/versions/c-/cpp-ipc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "28482723c3bf4c785828c44d7df79bb901404afd", + "version": "1.0.1", + "port-version": 0 + }, { "git-tree": "a54fbdb4b0fa6b820b1f6a55004f5622f3c02941", "version": "1.0.0", From 9d3fc967a20867c0d8461e583e13800d104cf35c Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 17 Nov 2021 21:24:43 +0100 Subject: [PATCH 1177/1858] [palsigslot] Update to 1.2.1 (#21473) * Update palsigslot to 1.2.1 * Update CI baseline Co-authored-by: chausner --- ports/palsigslot/portfile.cmake | 19 +++++++++---------- ports/palsigslot/usage | 4 ---- ports/palsigslot/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/p-/palsigslot.json | 5 +++++ 5 files changed, 27 insertions(+), 17 deletions(-) delete mode 100644 ports/palsigslot/usage diff --git a/ports/palsigslot/portfile.cmake b/ports/palsigslot/portfile.cmake index 0ec29449202d85..4ab6d29cbff759 100644 --- a/ports/palsigslot/portfile.cmake +++ b/ports/palsigslot/portfile.cmake @@ -1,26 +1,25 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO palacaze/sigslot - REF v1.2.0 - SHA512 6a6fb862a9eeea78732f2191916c7384a4bcb65e42c948f726459ee3cb446f90c4bd18c7c94ee4f9b15c81c5aa729094013805161d532c2284d9e77cdffaa468 + REF v1.2.1 + SHA512 cd79985a09ad41562dc8e582d30bc9df0fdc9409ee3676919b56d0d70a6c1af9414587b61977d2fa2ba763ef8df65b30c7b7dc883629e016660baeb998e708f5 HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DSIGSLOT_COMPILE_EXAMPLES=OFF -DSIGSLOT_COMPILE_TESTS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/PalSigslot TARGET_PATH share/PalSigslot) +vcpkg_cmake_config_fixup(PACKAGE_NAME PalSigslot CONFIG_PATH lib/cmake/PalSigslot) file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug - ${CURRENT_PACKAGES_DIR}/lib + "${CURRENT_PACKAGES_DIR}/debug" + "${CURRENT_PACKAGES_DIR}/lib" ) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/palsigslot/usage b/ports/palsigslot/usage deleted file mode 100644 index 6242d2829b8f33..00000000000000 --- a/ports/palsigslot/usage +++ /dev/null @@ -1,4 +0,0 @@ -The package palsigslot is compatible with built-in CMake targets: - - find_package(PalSigslot CONFIG REQUIRED) - target_link_libraries(main PRIVATE Pal::Sigslot) diff --git a/ports/palsigslot/vcpkg.json b/ports/palsigslot/vcpkg.json index d3b7e9f898e142..29c68fa94197b0 100644 --- a/ports/palsigslot/vcpkg.json +++ b/ports/palsigslot/vcpkg.json @@ -1,6 +1,16 @@ { "name": "palsigslot", - "version-string": "1.2.0", + "version": "1.2.1", "description": "A header-only, thread safe implementation of signal-slots for C++.", - "homepage": "https://github.com/palacaze/sigslot" + "homepage": "https://github.com/palacaze/sigslot", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 896af40d60cf2d..62a2f65dde4bc3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5089,7 +5089,7 @@ "port-version": 0 }, "palsigslot": { - "baseline": "1.2.0", + "baseline": "1.2.1", "port-version": 0 }, "pango": { diff --git a/versions/p-/palsigslot.json b/versions/p-/palsigslot.json index fc5487dc09a6d9..0339cee7a880ae 100644 --- a/versions/p-/palsigslot.json +++ b/versions/p-/palsigslot.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd7ff9df2ee3a39656ab22a6fc6f210afa843513", + "version": "1.2.1", + "port-version": 0 + }, { "git-tree": "e9a60795ed6d2384819646000af70ab33604184b", "version-string": "1.2.0", From 3898cd1fa7ccf3b3c39673ddf528275ac82a062a Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 17 Nov 2021 21:27:02 +0100 Subject: [PATCH 1178/1858] [casclib] Update to 2021-11-16 (#21472) * Update casclib to 2021-11-16 * Update CI baseline * Add patch for shared Windows builds * Update CI baseline * Fix find_package * Update CI baseline Co-authored-by: chausner --- ports/casclib/CMakeLists.txt | 83 ------------------- ports/casclib/Config.cmake.in | 7 -- ports/casclib/ctype_for_mac.patch | 22 ----- ports/casclib/fix-shared-windows-builds.patch | 20 +++++ ports/casclib/portfile.cmake | 35 ++++---- ports/casclib/vcpkg.json | 12 ++- versions/baseline.json | 4 +- versions/c-/casclib.json | 5 ++ 8 files changed, 53 insertions(+), 135 deletions(-) delete mode 100644 ports/casclib/CMakeLists.txt delete mode 100644 ports/casclib/Config.cmake.in delete mode 100644 ports/casclib/ctype_for_mac.patch create mode 100644 ports/casclib/fix-shared-windows-builds.patch diff --git a/ports/casclib/CMakeLists.txt b/ports/casclib/CMakeLists.txt deleted file mode 100644 index ad05df424cd4a6..00000000000000 --- a/ports/casclib/CMakeLists.txt +++ /dev/null @@ -1,83 +0,0 @@ -cmake_minimum_required(VERSION 3.9) - -project(casclib) -set(PROJECT_VERSION_MAJOR 1) -set(PROJECT_VERSION_MINOR 50) - -option(INSTALL_HEADERS "Install header files" ON) - -set(SRC_FILES - src/CascLib.def - src/CascCommon.cpp - src/CascDecompress.cpp - src/CascDecrypt.cpp - src/CascDumpData.cpp - src/CascFiles.cpp - src/CascFindFile.cpp - src/CascIndexFiles.cpp - src/CascOpenFile.cpp - src/CascOpenStorage.cpp - src/CascReadFile.cpp - src/CascRootFile_Diablo3.cpp - src/CascRootFile_Install.cpp - src/CascRootFile_MNDX.cpp - src/CascRootFile_OW.cpp - src/CascRootFile_Text.cpp - src/CascRootFile_TVFS.cpp - src/CascRootFile_WoW.cpp - src/common/Common.cpp - src/common/Csv.cpp - src/common/Directory.cpp - src/common/FileStream.cpp - src/common/FileTree.cpp - src/common/ListFile.cpp - src/common/RootHandler.cpp - src/jenkins/lookup3.c -) - -set(MD5_FILES - src/md5/md5.cpp -) - -set(ZLIB_FILES - src/zlib/adler32.c - src/zlib/crc32.c - src/zlib/inffast.c - src/zlib/inflate.c - src/zlib/inftrees.c - src/zlib/zutil.c -) - -add_library(casclib ${SRC_FILES} ${ZLIB_FILES} ${MD5_FILES}) -target_include_directories(casclib - PUBLIC - $ - $) -if(WIN32) - target_compile_definitions(casclib PRIVATE UNICODE _UNICODE) -endif() - -install(TARGETS casclib - EXPORT casclibTargets - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib -) - -include(CMakePackageConfigHelpers) - -set(VERSION_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/temp/casclibConfigVersion.cmake") -set(PROJECT_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/temp/casclibConfig.cmake") -set(INSTALL_DIR "share/casclib") - -write_basic_package_version_file("${VERSION_CONFIG}" VERSION 1.50 COMPATIBILITY SameMajorVersion) -configure_package_config_file("Config.cmake.in" - "${PROJECT_CONFIG}" - INSTALL_DESTINATION "${INSTALL_DIR}") - -install(FILES "${PROJECT_CONFIG}" "${VERSION_CONFIG}" DESTINATION "${INSTALL_DIR}") -install(EXPORT casclibTargets DESTINATION "${INSTALL_DIR}") - -if(INSTALL_HEADERS) - install(FILES "src/CascLib.h" "src/CascPort.h" DESTINATION include/casclib) -endif() diff --git a/ports/casclib/Config.cmake.in b/ports/casclib/Config.cmake.in deleted file mode 100644 index 96f5154279dfc1..00000000000000 --- a/ports/casclib/Config.cmake.in +++ /dev/null @@ -1,7 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) -find_dependency(ZLIB REQUIRED) - -include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -check_required_components("@PROJECT_NAME@") diff --git a/ports/casclib/ctype_for_mac.patch b/ports/casclib/ctype_for_mac.patch deleted file mode 100644 index dc1a67dff70734..00000000000000 --- a/ports/casclib/ctype_for_mac.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/CascPort.h b/src/CascPort.h -index 3bd08d4..201f7dd 100644 ---- a/src/CascPort.h -+++ b/src/CascPort.h -@@ -85,10 +85,17 @@ - #include - #include - #include -+ #include - #include -+ #include -+ #include -+ #include -+ #include - #include - #include -+ #include - #include -+ #include - - // Support for PowerPC on Max OS X - #if (__ppc__ == 1) || (__POWERPC__ == 1) || (_ARCH_PPC == 1) diff --git a/ports/casclib/fix-shared-windows-builds.patch b/ports/casclib/fix-shared-windows-builds.patch new file mode 100644 index 00000000000000..d12ef301f9beae --- /dev/null +++ b/ports/casclib/fix-shared-windows-builds.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,8 +51,15 @@ set(SRC_FILES + src/CascRootFile_WoW.cpp + ) + ++if(WIN32) ++ set(SRC_FILES ${SRC_FILES} ++ src/DllMain.c ++ src/DllMain.def ++ ) ++endif() ++ + set(LINK_LIBS) +-find_package(ZLIB) ++find_package(ZLIB REQUIRED) + if (ZLIB_FOUND) + set(LINK_LIBS ${LINK_LIBS} ZLIB::ZLIB) + add_definitions(-DCASC_USE_SYSTEM_ZLIB) diff --git a/ports/casclib/portfile.cmake b/ports/casclib/portfile.cmake index a93b6f8573c5e6..d53cc8124aea40 100644 --- a/ports/casclib/portfile.cmake +++ b/ports/casclib/portfile.cmake @@ -1,31 +1,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ladislav-zezula/CascLib - REF 1.50b - SHA512 f32cc592f454db4815c0dfd18a9c0076d85b1582e6974d241d1d4094269c42a978fa42186504988ced2c8f4a0b598f41e3ec8a95ddc3c0551af997e37708b1f5 + REF 07bfe85fd0804cba49f072819af716274d82b855 + SHA512 b333fe6318aa95629aa67613287ac71b1931c6443985e7e52412066d769f7996bffca1c19e890851eba976f572c7a11f14a8ff5fb95433577e1c9af8de0f34af HEAD_REF master PATCHES - ctype_for_mac.patch + fix-shared-windows-builds.patch ) -file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in - DESTINATION - ${SOURCE_PATH} -) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CASC_BUILD_SHARED_LIB) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CASC_BUILD_STATIC_LIB) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS_DEBUG - -DINSTALL_HEADERS=OFF +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCASC_BUILD_SHARED_LIB=${CASC_BUILD_SHARED_LIB} + -DCASC_BUILD_STATIC_LIB=${CASC_BUILD_STATIC_LIB} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/CascLib) -vcpkg_fixup_cmake_targets() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE - DESTINATION ${CURRENT_PACKAGES_DIR}/share/casclib - RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/casclib/vcpkg.json b/ports/casclib/vcpkg.json index a97d0344496a2f..99aa90327ce6b8 100644 --- a/ports/casclib/vcpkg.json +++ b/ports/casclib/vcpkg.json @@ -1,9 +1,17 @@ { "name": "casclib", - "version-string": "1.50b", - "port-version": 2, + "version-date": "2021-11-16", "description": "An open-source implementation of library for reading CASC storage from Blizzard games since 2014", + "homepage": "http://www.zezula.net/en/casc/casclib.html", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 62a2f65dde4bc3..addfd191d0a487 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1237,8 +1237,8 @@ "port-version": 4 }, "casclib": { - "baseline": "1.50b", - "port-version": 2 + "baseline": "2021-11-16", + "port-version": 0 }, "catch": { "baseline": "alias", diff --git a/versions/c-/casclib.json b/versions/c-/casclib.json index c9e453d1bb2c85..14dcef298d9306 100644 --- a/versions/c-/casclib.json +++ b/versions/c-/casclib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "20768d4f95c896b3b416aab76cc04c8dfa6e1244", + "version-date": "2021-11-16", + "port-version": 0 + }, { "git-tree": "b0e61662e214e54008bdc8842b865a3f3fccb821", "version-string": "1.50b", From 932a935aa34a9c543f87b6ea29dadcf3456e0e85 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 17 Nov 2021 21:30:15 +0100 Subject: [PATCH 1179/1858] [gettext] no absolute paths (#21468) --- ports/gettext/portfile.cmake | 4 ++++ ports/gettext/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gettext.json | 5 +++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 0c351d73505490..73e68ca1d7a7fa 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -157,3 +157,7 @@ endif() if("tools" IN_LIST FEATURES AND NOT VCPKG_CROSSCOMPILING) file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gettext") endif() + +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/gettext/user-email") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +endif() diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index bd1f1d4b6c9857..94af3e586034ae 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.21", - "port-version": 6, + "port-version": 7, "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index addfd191d0a487..f8ed9e8941b9ee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2406,7 +2406,7 @@ }, "gettext": { "baseline": "0.21", - "port-version": 6 + "port-version": 7 }, "gettimeofday": { "baseline": "2017-10-14", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index adb7fea987cdb4..b93c98ee93d27d 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f843c5eedf82612df5fef2bfadfe4df8426301a6", + "version": "0.21", + "port-version": 7 + }, { "git-tree": "72394a1e7b0ea6333d78849f864c4b7bc8c7e8dc", "version": "0.21", From 6760b0079621e965c9480f1856019a41f7352e6e Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 18 Nov 2021 04:30:39 +0800 Subject: [PATCH 1180/1858] [imgui-sfml] update to v2.4 (#21460) * [imgui-sfml] update to v2.4 * update version --- ports/imgui-sfml/0002-fix_imgui_config.patch | 10 ---------- ports/imgui-sfml/portfile.cmake | 5 ++--- ports/imgui-sfml/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/i-/imgui-sfml.json | 5 +++++ 5 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 ports/imgui-sfml/0002-fix_imgui_config.patch diff --git a/ports/imgui-sfml/0002-fix_imgui_config.patch b/ports/imgui-sfml/0002-fix_imgui_config.patch deleted file mode 100644 index f5b7c7fc37d8ea..00000000000000 --- a/ports/imgui-sfml/0002-fix_imgui_config.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/imconfig-SFML.h b/imconfig-SFML.h -index ddfe05d..4e7634e 100644 ---- a/imconfig-SFML.h -+++ b/imconfig-SFML.h -@@ -23,5 +23,3 @@ - return sf::Color(static_cast(x * 255.f), static_cast(y * 255.f), \ - static_cast(z * 255.f), static_cast(w * 255.f)); \ - } -- --#define ImTextureID unsigned int diff --git a/ports/imgui-sfml/portfile.cmake b/ports/imgui-sfml/portfile.cmake index be89c847ca3d9f..290278406ca94b 100644 --- a/ports/imgui-sfml/portfile.cmake +++ b/ports/imgui-sfml/portfile.cmake @@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO eliasdaler/imgui-sfml - REF 82dc2033e51b8323857c3ae1cf1f458b3a933c35 #v2.3 - SHA512 f27a0e65aa20229c73b27c4232269908dfeb5d78b1cef7299a179ecac6194d9829e148e95ed54b4500ffd36ada09fdbfadf67588c78bee87aff446ae80347bcf + REF 9cc8c57a4565551087be0d9aeb3ae55490aa1207 #v2.4 + SHA512 d44d85e44d17d05c4e21f71acbf5bf544364a9bbe4871be896edd29f9926948cd1ea7627b7d54524f7da64c494638fc126744ced57ea7997a4b712dd26eb6183 HEAD_REF master PATCHES 0001-fix_find_package.patch - 0002-fix_imgui_config.patch 004-fix-find-sfml.patch ) diff --git a/ports/imgui-sfml/vcpkg.json b/ports/imgui-sfml/vcpkg.json index 807fdd125c005d..5fb0c04043560b 100644 --- a/ports/imgui-sfml/vcpkg.json +++ b/ports/imgui-sfml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "imgui-sfml", - "version": "2.3", + "version": "2.4", "description": "ImGui binding for use with SFML", "homepage": "https://github.com/eliasdaler/imgui-sfml", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index f8ed9e8941b9ee..5325559a4fe561 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2829,7 +2829,7 @@ "port-version": 0 }, "imgui-sfml": { - "baseline": "2.3", + "baseline": "2.4", "port-version": 0 }, "imguizmo": { diff --git a/versions/i-/imgui-sfml.json b/versions/i-/imgui-sfml.json index f801f774d0b7ea..22476de960bc8e 100644 --- a/versions/i-/imgui-sfml.json +++ b/versions/i-/imgui-sfml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c81a9d0362c06279990e889cb56f9ebf71bde380", + "version": "2.4", + "port-version": 0 + }, { "git-tree": "2ece5bd925368d6ef9b7295b31f7f2de86179f4e", "version": "2.3", From 5318733c956c9bd7e4939de3cc2e7bc3b8442289 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 17 Nov 2021 21:33:09 +0100 Subject: [PATCH 1181/1858] [faad2] only support windows (#21438) --- ports/faad2/portfile.cmake | 16 +++++++--------- ports/faad2/vcpkg.json | 11 +++++++++-- scripts/ci.baseline.txt | 2 -- versions/baseline.json | 2 +- versions/f-/faad2.json | 5 +++++ 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ports/faad2/portfile.cmake b/ports/faad2/portfile.cmake index 9daa8d49268f11..8596e1a8bae054 100644 --- a/ports/faad2/portfile.cmake +++ b/ports/faad2/portfile.cmake @@ -1,4 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Windows platform." ON_TARGET "Linux" "OSX") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO knik0/faad2 @@ -11,23 +10,22 @@ vcpkg_from_github( 0003-Initialize-pointers.patch # https://github.com/knik0/faad2/pull/44 ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES build-decoder FAAD_BUILD_BINARIES ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/include" DESTINATION "${CURRENT_PACKAGES_DIR}") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/faad2/vcpkg.json b/ports/faad2/vcpkg.json index 856b88daf4161b..f456d0b2d3093b 100644 --- a/ports/faad2/vcpkg.json +++ b/ports/faad2/vcpkg.json @@ -1,9 +1,16 @@ { "name": "faad2", - "version-string": "2.9.1", - "port-version": 3, + "version": "2.9.1", + "port-version": 4, "description": "Freeware Advanced Audio (AAC) Decoder", "homepage": "https://sourceforge.net/projects/faac/", + "supports": "windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "build-decoder": { "description": "Build the embedded decoder executable" diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index f9af0f8b53a396..a5dfc91b89514e 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -271,8 +271,6 @@ enet:x64-uwp=fail epsilon:arm-uwp=fail epsilon:x64-uwp=fail epsilon:x64-windows-static=fail -faad2:x64-linux=fail -faad2:x64-osx=fail fann:x64-windows-static=fail fastrtps:arm-uwp=fail fastrtps:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 5325559a4fe561..e43f2c18b83a28 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2062,7 +2062,7 @@ }, "faad2": { "baseline": "2.9.1", - "port-version": 3 + "port-version": 4 }, "fadbad": { "baseline": "2.1.0", diff --git a/versions/f-/faad2.json b/versions/f-/faad2.json index dfd990a5664804..18db5fc847ec47 100644 --- a/versions/f-/faad2.json +++ b/versions/f-/faad2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a1ec8e5247412b2ba6584c63307f88fe91d12251", + "version": "2.9.1", + "port-version": 4 + }, { "git-tree": "b931758d2574476cbd463ac773b192746e2dc80d", "version-string": "2.9.1", From c75cf19b9a2a3fc324a7a7ce13a2eb6ec8fd62f6 Mon Sep 17 00:00:00 2001 From: Park DongHa Date: Thu, 18 Nov 2021 05:35:02 +0900 Subject: [PATCH 1182/1858] [onnx] update version to 1.10.2 and change patches (#21409) * [onnx] build onnxifi targets without SHARED/MODULE * update version to 1.10.2 * provide license field in vcpkg.json * [onnx] update version, baseline * [onnx] remove vcpkg_fail_port_install for UWP * it's already described in the "supports" --- ports/onnx/fix-cmakelists.patch | 18 +++++++++++ ports/onnx/portfile.cmake | 25 +++++++-------- ports/onnx/vcpkg.json | 5 +-- ports/onnx/wrap-onnxifi-targets.patch | 44 --------------------------- versions/baseline.json | 2 +- versions/o-/onnx.json | 5 +++ 6 files changed, 38 insertions(+), 61 deletions(-) delete mode 100644 ports/onnx/wrap-onnxifi-targets.patch diff --git a/ports/onnx/fix-cmakelists.patch b/ports/onnx/fix-cmakelists.patch index e6c68370b27992..c5863deafe53b8 100644 --- a/ports/onnx/fix-cmakelists.patch +++ b/ports/onnx/fix-cmakelists.patch @@ -66,3 +66,21 @@ index 628dcaa..300e4ea 100644 install(DIRECTORY ${ONNX_ROOT}/onnx DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING +@@ -639,7 +639,7 @@ endif() + + if (NOT ANDROID AND NOT IOS) + # ---[ ONNXIFI wrapper +- add_library(onnxifi_wrapper MODULE onnx/onnxifi_wrapper.c) ++ add_library(onnxifi_wrapper onnx/onnxifi_wrapper.c) + if(MSVC) + add_msvc_runtime_flag(onnxifi_wrapper) + endif() +@@ -669,7 +669,7 @@ if (NOT ANDROID AND NOT IOS) + endif() + + # ---[ ONNXIFI dummy backend +-add_library(onnxifi_dummy SHARED onnx/onnxifi_dummy.c) ++add_library(onnxifi_dummy onnx/onnxifi_dummy.c) + + if(ONNXIFI_ENABLE_EXT) + add_definitions(-DONNXIFI_ENABLE_EXT=ON) diff --git a/ports/onnx/portfile.cmake b/ports/onnx/portfile.cmake index d523a0eedc0cad..61c36b56f24c7f 100644 --- a/ports/onnx/portfile.cmake +++ b/ports/onnx/portfile.cmake @@ -1,23 +1,15 @@ -# uwp: LOAD_LIBRARY_SEARCH_DEFAULT_DIRS undefined identifier -vcpkg_fail_port_install(ON_TARGET "uwp") vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO onnx/onnx - REF v1.10.1 - SHA512 927b6d74dcf41b62c1290674cebb8e6c054acf101214352a0c5414d9b2eafa2d1e144f4d361452cd7494fb228e26c2ce2676fb1212aff1eeb3f889dc2faf5438 + REF v1.10.2 + SHA512 7519d326cd2b2b13a269ec0d01af07c32115d183dae6e1eaae55f5b23b6c92b2aadbb2b1e555557f4201bbcf921fa563d09d45d7f1d3bd2399c1a94a6ef63303 PATCHES fix-cmakelists.patch - wrap-onnxifi-targets.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) - list(APPEND PLATFORM_OPTIONS - -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME} - ) -endif() +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" USE_STATIC_RUNTIME) # ONNX_USE_PROTOBUF_SHARED_LIBS: find the library and check its file extension find_library(PROTOBUF_LIBPATH NAMES protobuf PATHS "${CURRENT_INSTALLED_DIR}/bin" "${CURRENT_INSTALLED_DIR}/lib" REQUIRED) @@ -36,7 +28,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # Like protoc, python is required for codegen. vcpkg_find_acquire_program(PYTHON3) -# PATH for .bat scripts can find 'python' +# PATH for .bat scripts so it can find 'python' get_filename_component(PYTHON_DIR "${PYTHON3}" PATH) vcpkg_add_to_path(PREPEND "${PYTHON_DIR}") @@ -50,15 +42,17 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - ${FEATURE_OPTIONS} ${PLATFORM_OPTIONS} + ${FEATURE_OPTIONS} -DPython3_EXECUTABLE=${PYTHON3} -DONNX_ML=ON -DONNX_GEN_PB_TYPE_STUBS=ON -DONNX_USE_PROTOBUF_SHARED_LIBS=${USE_PROTOBUF_SHARED} -DONNX_USE_LITE_PROTO=OFF - -DONNXIFI_ENABLE_EXT=OFF + -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME} -DONNX_BUILD_TESTS=OFF -DONNX_BUILD_BENCHMARKS=OFF + MAYBE_UNUSED_VARIABLES + ONNX_USE_MSVC_STATIC_RUNTIME ) if("pybind11" IN_LIST FEATURES) @@ -94,4 +88,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_cpp2py_export" "${CURRENT_PACKAGES_DIR}/include/onnx/test" "${CURRENT_PACKAGES_DIR}/include/onnx/tools" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_ml" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_data" + "${CURRENT_PACKAGES_DIR}/include/onnx/onnx_operators_ml" ) diff --git a/ports/onnx/vcpkg.json b/ports/onnx/vcpkg.json index 36da8b39b19124..069934dd73562a 100644 --- a/ports/onnx/vcpkg.json +++ b/ports/onnx/vcpkg.json @@ -1,9 +1,10 @@ { "name": "onnx", - "version-semver": "1.10.1", + "version-semver": "1.10.2", "description": "Open standard for machine learning interoperability", "homepage": "https://onnx.ai", - "supports": "!uwp & static", + "license": "Apache-2.0", + "supports": "!uwp", "dependencies": [ "protobuf", { diff --git a/ports/onnx/wrap-onnxifi-targets.patch b/ports/onnx/wrap-onnxifi-targets.patch deleted file mode 100644 index 598edf6030b079..00000000000000 --- a/ports/onnx/wrap-onnxifi-targets.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 300e4ea..155dd0d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -614,6 +614,7 @@ if(APPLE) - set_target_properties(onnx PROPERTIES LINK_FLAGS "-undefined dynamic_lookup") - endif() - -+if(ONNXIFI_ENABLE_EXT) - # ---[ ONNX Interface for Framework Integratin (ONNXIFI) - add_library(onnxifi INTERFACE) - target_include_directories(onnxifi INTERFACE -@@ -688,6 +689,7 @@ if(MSVC) - # lists from 'identifier2' - ) - endif() -+endif() # ONNXIFI_ENABLE_EXT - - include(GNUInstallDirs) - -@@ -737,8 +739,14 @@ install(FILES - install(EXPORT ONNXTargets DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/ONNX") - install(TARGETS - onnx onnx_proto -- onnxifi onnxifi_dummy onnxifi_loader - EXPORT ONNXTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+if(ONNXIFI_ENABLE_EXT) -+ install(TARGETS -+ onnxifi onnxifi_dummy onnxifi_loader -+ EXPORT ONNXTargets -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(NOT ANDROID AND NOT IOS) - install(TARGETS onnxifi_wrapper -@@ -748,6 +756,7 @@ endif() - if(ONNXIFI_DUMMY_BACKEND) - add_definitions(-DONNXIFI_DUMMY_BACKEND=1) - endif() -+endif() # ONNXIFI_ENABLE_EXT - - if(ONNX_BUILD_TESTS) - include(${ONNX_ROOT}/cmake/unittest.cmake) diff --git a/versions/baseline.json b/versions/baseline.json index e43f2c18b83a28..4eab4a9885bbe0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4849,7 +4849,7 @@ "port-version": 1 }, "onnx": { - "baseline": "1.10.1", + "baseline": "1.10.2", "port-version": 0 }, "onnx-optimizer": { diff --git a/versions/o-/onnx.json b/versions/o-/onnx.json index 6ca70e229024f9..de8a62fc6f5682 100644 --- a/versions/o-/onnx.json +++ b/versions/o-/onnx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a83605bd84787898f92ada1bf1874e162a441c10", + "version-semver": "1.10.2", + "port-version": 0 + }, { "git-tree": "a526e5d7f54e5fc32529bf72b29457f408af0e28", "version-semver": "1.10.1", From 61773a8a5942f529351d5b4ad5c47718cabd4e75 Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Wed, 17 Nov 2021 12:45:16 -0800 Subject: [PATCH 1183/1858] [libtcod] Update to 1.19.0 (#21355) * [libtcod] Update to 1.19.0 * Fail UWP triplets for libtcod in CI baseline. This was because of internal deprecations being treated as errors. --- ports/libtcod/portfile.cmake | 4 ++-- ports/libtcod/vcpkg.json | 2 +- scripts/ci.baseline.txt | 2 ++ versions/baseline.json | 2 +- versions/l-/libtcod.json | 5 +++++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index c836477f7326ff..e28639eef3a647 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.18.0 - SHA512 4191353c422e96987977ffc2a2f816381aa5c2e82cc0ccf80a902a0ff32023ec7a824e9845eb7c220d9e2a2fdb90be3aff1c3e05893f45a7326a89292aa11a4d + REF 1.19.0 + SHA512 462c3deadaeaaf3adb44427d41c4e8c1acc2c37ef90677d8d60e8194f9c190bc7e02b0cf2b285e248171354f8d73f1dd28144cfe8a98a469e1071448bce9e68b HEAD_REF develop ) diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index 418bddcdcbb3bb..2f3f2db951bd5f 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version-semver": "1.18.0", + "version-semver": "1.19.0", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a5dfc91b89514e..fbc94ec4ba8c30 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -692,6 +692,8 @@ libssh:arm-uwp=fail libssh:x64-uwp=fail libstk:arm-uwp=fail libstk:x64-uwp=fail +libtcod:arm-uwp=fail +libtcod:x64-uwp=fail libtins:arm-uwp=fail libtins:x64-uwp=fail libtomcrypt:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 4eab4a9885bbe0..0ba285bdbfcc89 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3929,7 +3929,7 @@ "port-version": 3 }, "libtcod": { - "baseline": "1.18.0", + "baseline": "1.19.0", "port-version": 0 }, "libtheora": { diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index b971b3d0a7a042..eb40f06b1eb734 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ab01712cf4356c3364d01b0e2c2c8cbbad760a3", + "version-semver": "1.19.0", + "port-version": 0 + }, { "git-tree": "e136d01e9084bb2c6bdc0494a6b6374adb29dbfa", "version-semver": "1.18.0", From 2ee78c7319b405675214bd7b9fd3e8d048f3ee89 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 18 Nov 2021 00:33:26 +0100 Subject: [PATCH 1184/1858] [libmariadb] Update (#21359) * Update to 3.1.15 * Modernize portfile * Keep plugins * Always use vcpkg zlib instead vendored copy * Use zlib and openssl modules in pc file * Always install pc file, drop non-relocatable mariadb_config * UWP is not supported * Use schannel SSL backend on windows * Fix exported includedir and libdir * Fixup windows pc file * Disable extra static lib * Disable plugins with extra dependencies * [libmariadb] Namespace targets with unofficial:: * Update versions * Enable CI for x86-windows: no conflict with mysql * Re-enable lib mariadbclient via feature * Use openssl targets to handle multi-config * Update versions * CR request * Update versions --- ports/libmariadb/export-cmake-targets.patch | 17 ++-- ports/libmariadb/fix-InstallPath.patch | 6 +- .../fix-build-error-with-cmake3.20.patch | 13 ---- ports/libmariadb/fix-openssl.patch | 13 ++++ ports/libmariadb/no-extra-static-lib.patch | 19 +++++ ports/libmariadb/pkgconfig.patch | 60 +++++++++++++++ ports/libmariadb/portfile.cmake | 77 +++++++++---------- ports/libmariadb/vcpkg.json | 50 ++++++++++-- ports/poco/fix_dependency.patch | 2 +- ports/poco/vcpkg.json | 1 + scripts/ci.baseline.txt | 1 - versions/baseline.json | 6 +- versions/l-/libmariadb.json | 5 ++ versions/p-/poco.json | 5 ++ 14 files changed, 199 insertions(+), 76 deletions(-) delete mode 100644 ports/libmariadb/fix-build-error-with-cmake3.20.patch create mode 100644 ports/libmariadb/fix-openssl.patch create mode 100644 ports/libmariadb/no-extra-static-lib.patch create mode 100644 ports/libmariadb/pkgconfig.patch diff --git a/ports/libmariadb/export-cmake-targets.patch b/ports/libmariadb/export-cmake-targets.patch index c841a1fe917a0b..13c6c1a61bc29c 100644 --- a/ports/libmariadb/export-cmake-targets.patch +++ b/ports/libmariadb/export-cmake-targets.patch @@ -3,14 +3,14 @@ index c109a20..e1fa3f1 100644 --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt @@ -405,6 +405,7 @@ ELSE() - TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE mariadbclient) + ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) ENDIF() +TARGET_INCLUDE_DIRECTORIES(libmariadb PUBLIC $) TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE ${SYSTEM_LIBS}) -@@ -453,13 +454,25 @@ ENDIF() +@@ -453,13 +454,30 @@ ENDIF() INSTALL(TARGETS mariadbclient COMPONENT Development @@ -23,15 +23,20 @@ index c109a20..e1fa3f1 100644 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+install(EXPORT unofficial-libmariadb-targets DESTINATION share/unofficial-libmariadb) ++install(EXPORT unofficial-libmariadb-targets ++ NAMESPACE unofficial:: ++ DESTINATION share/unofficial-libmariadb ++) + -+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" ++file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" +[[include(CMakeFindDependencyMacro) +find_dependency(ZLIB) -+find_dependency(OpenSSL) ++if("@WITH_SSL@" STREQUAL "OPENSSL") ++ find_dependency(OpenSSL) ++endif() +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-libmariadb-targets.cmake") +]]) -+ ++configure_file("${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake" @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libmariadb-config.cmake DESTINATION share/unofficial-libmariadb) IF(0) diff --git a/ports/libmariadb/fix-InstallPath.patch b/ports/libmariadb/fix-InstallPath.patch index bdf81788e3554a..c9794fc58fa4e3 100644 --- a/ports/libmariadb/fix-InstallPath.patch +++ b/ports/libmariadb/fix-InstallPath.patch @@ -23,11 +23,11 @@ index bcfd4de..c109a20 100644 + ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE}) SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}") ELSE() -- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} mariadbclient.def) -+ ADD_LIBRARY(libmariadb ${libmariadb_RC} mariadbclient.def) - TARGET_LINK_LIBRARIES(libmariadb LINK_PRIVATE mariadbclient) +- ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) ++ ADD_LIBRARY(libmariadb ${libmariadb_RC} ${MARIADB_OBJECTS} mariadbclient.def) SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINKER_LANGUAGE C) ENDIF() + @@ -453,13 +453,15 @@ ENDIF() INSTALL(TARGETS mariadbclient diff --git a/ports/libmariadb/fix-build-error-with-cmake3.20.patch b/ports/libmariadb/fix-build-error-with-cmake3.20.patch deleted file mode 100644 index 1eed4ee4741b0d..00000000000000 --- a/ports/libmariadb/fix-build-error-with-cmake3.20.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake -index b7bbbad..357b8ac 100644 ---- a/cmake/ConnectorName.cmake -+++ b/cmake/ConnectorName.cmake -@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows") - SET(MACHINE_NAME "x64") - ELSE() - SET(MACHINE_NAME "32") -- END() -+ ENDIF() - ENDIF() - - SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}") diff --git a/ports/libmariadb/fix-openssl.patch b/ports/libmariadb/fix-openssl.patch new file mode 100644 index 00000000000000..01b3b5e0101fcf --- /dev/null +++ b/ports/libmariadb/fix-openssl.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 33565f5..d83176d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -280,7 +280,7 @@ IF(NOT WITH_SSL STREQUAL "OFF") + IF(OPENSSL_FOUND) + ADD_DEFINITIONS(-DHAVE_OPENSSL -DHAVE_TLS) + SET(SSL_SOURCES "${CC_SOURCE_DIR}/libmariadb/secure/openssl.c") +- SET(SSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}) ++ SET(SSL_LIBRARIES OpenSSL::SSL) + IF(WIN32) + CHECK_INCLUDE_FILES (${OPENSSL_INCLUDE_DIR}/openssl/applink.c HAVE_OPENSSL_APPLINK_C) + ENDIF() diff --git a/ports/libmariadb/no-extra-static-lib.patch b/ports/libmariadb/no-extra-static-lib.patch new file mode 100644 index 00000000000000..333be12495de45 --- /dev/null +++ b/ports/libmariadb/no-extra-static-lib.patch @@ -0,0 +1,19 @@ +diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt +index 39fa709..a726a6d 100644 +--- a/libmariadb/CMakeLists.txt ++++ b/libmariadb/CMakeLists.txt +@@ -455,10 +455,14 @@ IF(NOT WIN32) + SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}") + ENDIF() + ++if(VCPKG_MARIADBCLIENT) + INSTALL(TARGETS mariadbclient + COMPONENT Development + EXPORT unofficial-libmariadb-targets + LIBRARY DESTINATION lib) ++else() ++ set_target_properties(mariadbclient PROPERTIES EXCLUDE_FROM_ALL 1) ++endif() + INSTALL(TARGETS libmariadb + COMPONENT SharedLibraries + EXPORT unofficial-libmariadb-targets diff --git a/ports/libmariadb/pkgconfig.patch b/ports/libmariadb/pkgconfig.patch new file mode 100644 index 00000000000000..a0cc1c18d48d2e --- /dev/null +++ b/ports/libmariadb/pkgconfig.patch @@ -0,0 +1,60 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0be0fb1..33565f5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -393,7 +393,7 @@ ENDIF() + INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) + ADD_SUBDIRECTORY(include) + ADD_SUBDIRECTORY(libmariadb) +-IF(NOT WIN32) ++IF(1) + ADD_SUBDIRECTORY(mariadb_config) + ENDIF() + +diff --git a/mariadb_config/CMakeLists.txt b/mariadb_config/CMakeLists.txt +index 70e619b..7a22fa1 100644 +--- a/mariadb_config/CMakeLists.txt ++++ b/mariadb_config/CMakeLists.txt +@@ -30,6 +30,15 @@ IF(${rllength} GREATER 0) + LIST(REMOVE_DUPLICATES SYSTEM_LIBS) + ENDIF() + ++set(REQUIRES_PRIVATE "" CACHE STRING "") ++if(WITH_SSL STREQUAL "OPENSSL") ++ list(REMOVE_ITEM SYSTEM_LIBS ${SSL_LIBRARIES}) ++ string(APPEND REQUIRES_PRIVATE " openssl") ++endif() ++if(WITH_EXTERNAL_ZLIB) ++ string(APPEND REQUIRES_PRIVATE " zlib") ++endif() ++ + FOREACH (LIB_NAME ${SYSTEM_LIBS}) + GET_LIB_NAME(${LIB_NAME} LIB_OUT) + SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} ${LIB_OUT}") +@@ -50,6 +59,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY) + ++if(0) + ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) + + IF(CMAKE_SYSTEM_NAME MATCHES AIX) +@@ -61,6 +71,7 @@ ENDIF() + INSTALL(TARGETS mariadb_config + DESTINATION "bin" + COMPONENT Development) ++endif() + + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc + DESTINATION "${INSTALL_PCDIR}" +diff --git a/mariadb_config/libmariadb.pc.in b/mariadb_config/libmariadb.pc.in +index 968181a..3f0410d 100644 +--- a/mariadb_config/libmariadb.pc.in ++++ b/mariadb_config/libmariadb.pc.in +@@ -16,5 +16,6 @@ Description: MariaDB Connector/C dynamic library + Cflags: -I${includedir} + Libs: -L${libdir} -lmariadb + Libs.private: @extra_dynamic_LDFLAGS@ ++Requires.private: @REQUIRES_PRIVATE@ + + diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 6f8da25bea9370..5ec7726802d862 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -2,11 +2,19 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/libmysql") message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") endif() +if("openssl" IN_LIST FEATURES AND "schannel" IN_LIST FEATURES) + message(FATAL_ERROR "Only one SSL backend must be selected.") +endif() + +if("schannel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_WINDOWS) + message(FATAL_ERROR "Feature schannel not supported on non-Windows platforms.") +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO mariadb-corporation/mariadb-connector-c - REF 7d304d26c787a3f0430624db977b615aba56e4bb # v3.1.12 - SHA512 16e74b2cbe401492ef294e2442a00ef1739089152a88d9263ca4d17b65260554b330630e9405813fd9089fa445d676e3b6aa91ac94128ad6b0a299e8b7edc1b3 + REF b2bb1b213c79169b7c994a99f21f47f11be465d4 # v3.1.15 + SHA512 51ebd2e9fd505eebc7691c60fe0b86cfc5368f8b370fba6c3ec8f5514319ef1e0de4910ad5e093cd7d5e5c7782120e22e8c85c94af9389fa4e240cedf012d755 HEAD_REF 3.1 PATCHES arm64.patch @@ -15,68 +23,55 @@ vcpkg_from_github( fix-InstallPath.patch fix-iconv.patch export-cmake-targets.patch - fix-build-error-with-cmake3.20.patch #This can be removed in next release, which has been merged to upstream. + pkgconfig.patch + no-extra-static-lib.patch + fix-openssl.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - zlib WITH_EXTERNAL_ZLIB iconv WITH_ICONV + mariadbclient VCPKG_MARIADBCLIENT ) if("openssl" IN_LIST FEATURES) set(WITH_SSL OPENSSL) +elseif("schannel" IN_LIST FEATURES) + set(WITH_SSL ON) else() set(WITH_SSL OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} - -DINSTALL_PLUGINDIR=plugin/${PORT} + -DINSTALL_INCLUDEDIR=include/mysql # legacy port decisiong + -DINSTALL_LIBDIR=lib + -DINSTALL_PLUGINDIR=plugins/${PORT} -DWITH_UNIT_TESTS=OFF -DWITH_CURL=OFF + -DWITH_EXTERNAL_ZLIB=ON -DWITH_SSL=${WITH_SSL} + -DREMOTEIO_PLUGIN_TYPE=OFF + -DAUTH_GSSAPI_PLUGIN_TYPE=OFF + MAYBE_UNUSED_VARIABLES + AUTH_GSSAPI_PLUGIN_TYPE ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libmariadb TARGET_PATH share/unofficial-libmariadb) - -vcpkg_fixup_pkgconfig() - -if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - # remove debug header - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -endif() +vcpkg_cmake_install() -if(VCPKG_BUILD_TYPE STREQUAL "debug") - # move headers - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/include - ${CURRENT_PACKAGES_DIR}/include) -endif() +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libmariadb) -if (NOT VCPKG_TARGET_IS_WINDOWS) - vcpkg_copy_tools(TOOL_NAMES mariadb_config AUTO_CLEAN) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libmariadb.pc" " -lmariadb" " -llibmariadb") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libmariadb.pc" " -lmariadb" " -llibmariadb") + endif() endif() +vcpkg_fixup_pkgconfig() -# remove plugin folder -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib/mariadb - ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb) - -# copy & remove header files -file(REMOVE - ${CURRENT_PACKAGES_DIR}/include/mariadb/my_config.h.in - ${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in - ${CURRENT_PACKAGES_DIR}/include/mariadb/CMakeLists.txt - ${CURRENT_PACKAGES_DIR}/include/mariadb/Makefile.am) -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/mariadb - ${CURRENT_PACKAGES_DIR}/include/mysql) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # copy license file -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json index 5658ced391a47c..6d0742e7fd14f0 100644 --- a/ports/libmariadb/vcpkg.json +++ b/ports/libmariadb/vcpkg.json @@ -1,13 +1,23 @@ { "name": "libmariadb", - "version-semver": "3.1.12", - "port-version": 2, + "version-semver": "3.1.15", "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases", "homepage": "https://github.com/MariaDB/mariadb-connector-c", - "default-features": [ - "openssl", + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], + "default-features": [ + "ssl" + ], "features": { "iconv": { "description": "Enables character set conversion", @@ -15,17 +25,41 @@ "libiconv" ] }, + "mariadbclient": { + "description": "Build the static mariadbclient library" + }, "openssl": { - "description": "Enable SSL support", + "description": "SSL support (OpenSSL)", "dependencies": [ "openssl" ] }, - "zlib": { - "description": "Use internal zlib", + "schannel": { + "description": "SSL support (Secure Channel)" + }, + "ssl": { + "description": "Default SSL backend", "dependencies": [ - "zlib" + { + "name": "libmariadb", + "default-features": false, + "features": [ + "schannel" + ], + "platform": "windows | mingw" + }, + { + "name": "libmariadb", + "default-features": false, + "features": [ + "openssl" + ], + "platform": "!windows & !mingw" + } ] + }, + "zlib": { + "description": "Obsolete. zlib is always used. This feature is left for compatibility." } } } diff --git a/ports/poco/fix_dependency.patch b/ports/poco/fix_dependency.patch index 2fd917affa77de..4b47bfddb299eb 100644 --- a/ports/poco/fix_dependency.patch +++ b/ports/poco/fix_dependency.patch @@ -33,7 +33,7 @@ index 4e05272..44dd7cb 100644 + find_package(libmysql) + if (NOT libmysql_FOUND) + find_package(unofficial-libmariadb CONFIG REQUIRED) -+ set(MYSQL_LIBRARIES libmariadb) ++ set(MYSQL_LIBRARIES unofficial::libmariadb) + endif() endif() diff --git a/ports/poco/vcpkg.json b/ports/poco/vcpkg.json index 0f6f37ab5ac9cf..2090861431af97 100644 --- a/ports/poco/vcpkg.json +++ b/ports/poco/vcpkg.json @@ -1,6 +1,7 @@ { "name": "poco", "version-semver": "1.11.0", + "port-version": 1, "description": "Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.", "homepage": "https://github.com/pocoproject/poco", "supports": "!uwp", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index fbc94ec4ba8c30..4bfdb19a1f6f2c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -607,7 +607,6 @@ libmariadb:x64-uwp = skip libmariadb:x64-windows = skip libmariadb:x64-windows-static = skip libmariadb:x64-windows-static-md=skip -libmariadb:x86-windows = skip # libmesh installs tons of problematic files that conflict with other ports (boost, eigen, etc) libmesh:arm64-windows=skip libmesh:arm-uwp=skip diff --git a/versions/baseline.json b/versions/baseline.json index 0ba285bdbfcc89..08e122171290f1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3613,8 +3613,8 @@ "port-version": 1 }, "libmariadb": { - "baseline": "3.1.12", - "port-version": 2 + "baseline": "3.1.15", + "port-version": 0 }, "libmaxminddb": { "baseline": "1.4.3", @@ -5286,7 +5286,7 @@ }, "poco": { "baseline": "1.11.0", - "port-version": 0 + "port-version": 1 }, "podofo": { "baseline": "0.9.7", diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json index ea10d0ad8f7689..2a3c4716b4dcd0 100644 --- a/versions/l-/libmariadb.json +++ b/versions/l-/libmariadb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c51d4e78081ee708c1cdebeaaa201aa0064079e3", + "version-semver": "3.1.15", + "port-version": 0 + }, { "git-tree": "64479ab60db54486912b858f760af83dd2474f1c", "version-semver": "3.1.12", diff --git a/versions/p-/poco.json b/versions/p-/poco.json index c66b34c0a4778f..69062dd6e92abc 100644 --- a/versions/p-/poco.json +++ b/versions/p-/poco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "83279266114bf6eab34a86e6009313e10f3aa11e", + "version-semver": "1.11.0", + "port-version": 1 + }, { "git-tree": "e8f4d5c1548d23526e05b069ee626d7d7f9a4399", "version-semver": "1.11.0", From 171ca6883c857e8b9d1510cff8bd2d9a5c9ca5c9 Mon Sep 17 00:00:00 2001 From: markle11m Date: Wed, 17 Nov 2021 15:35:14 -0800 Subject: [PATCH 1185/1858] [docs] Extend platform expressions to support media query syntax (#21444) * extend platform expressions to support media query syntax - terminals 'and', 'not' and ',' for logical-and, -not and -or operators * add support for breaks (whitespace or parens) that delimit operator keywords * fix typos * optional whitespace needed between 'not' and '(expr)' --- docs/maintainers/manifest-files.md | 32 +++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/docs/maintainers/manifest-files.md b/docs/maintainers/manifest-files.md index 590edb24558ab7..a10f5464e72373 100644 --- a/docs/maintainers/manifest-files.md +++ b/docs/maintainers/manifest-files.md @@ -354,6 +354,7 @@ whitespace-character = | ? U+000D "CARRIAGE RETURN" ? | ? U+0020 "SPACE" ? ; optional-whitespace = { whitespace-character } ; +required-whitespace = whitespace-character, { optional-whitespace } ; lowercase-alpha = | "a" | "b" | "c" | "d" | "e" | "f" | "g" | "h" | "i" | "j" | "k" | "l" | "m" @@ -365,6 +366,9 @@ identifier-character = | lowercase-alpha | digit ; +platform-expression-list = +| platform-expression { ",", optional-whitespace, platform-expression } ; + platform-expression = | platform-expression-not | platform-expression-and @@ -373,21 +377,39 @@ platform-expression = platform-expression-identifier = | identifier-character, { identifier-character }, optional-whitespace ; +platform-expression-grouped = +| "(", optional-whitespace, platform-expression, ")", optional-whitespace ; + platform-expression-simple = | platform-expression-identifier -| "(", optional-whitespace, platform-expression, ")", optional-whitespace ; +| platform-expression-grouped ; + +platform-expression-unary-keyword-operand = +| required-whitespace, platform-expression-simple +| optional-whitespace, platform-expression-grouped ; platform-expression-not = | platform-expression-simple -| "!", optional-whitespace, platform-expression-simple ; +| "!", optional-whitespace, platform-expression-simple +| "not", platform-expression-unary-keyword-operand ; + +platform-expression-binary-keyword-first-operand = +| platform-expression-not, required-whitespace +| platform-expression-grouped ; + +platform-expression-binary-keyword-second-operand = +| required-whitespace, platform-expression-not +| platform-expression-grouped ; platform-expression-and = -| platform-expression-not, { "&", optional-whitespace, platform-expression-not } ; +| platform-expression-not, { "&", optional-whitespace, platform-expression-not } +| platform-expression-binary-keyword-first-operand, { "and", platform-expression-binary-keyword-second-operand } ; platform-expression-or = -| platform-expression-not, { "|", optional-whitespace, platform-expression-not } ; +| platform-expression-not, { "|", optional-whitespace, platform-expression-not } +| platform-expression-binary-keyword-first-operand, { "or", platform-expression-binary-keyword-second-operand } (* to allow for future extension *) ; -top-level-platform-expression = optional-whitespace, platform-expression ; +top-level-platform-expression = optional-whitespace, platform-expression-list ; ``` Basically, there are four kinds of expressions -- identifiers, negations, ands, and ors. From b788fc1606c8bf82ffe8735768e61b42fd462b79 Mon Sep 17 00:00:00 2001 From: pezcode Date: Fri, 19 Nov 2021 05:13:14 +0100 Subject: [PATCH 1186/1858] [magnum-plugins] Update head features and bundled dependency (#21307) * [magnum-plugins] Update head features and bundled dependency * [magnum-plugins] Format vcpkg.json * [magnum-plugins] Use vcpkg_extract_source_archive * [magnum-plugins] Formatting * [magnum-plugins] Replace deprecated functions * [magnum-plugins] add zstd dependency to basisimageconverter and basisimporter * [magnum-plugins] Update version --- ports/magnum-plugins/portfile.cmake | 42 +++++++----- ports/magnum-plugins/vcpkg.json | 101 +++++++++++++++++++++++++--- versions/baseline.json | 2 +- versions/m-/magnum-plugins.json | 5 ++ 4 files changed, 123 insertions(+), 27 deletions(-) diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake index b3ed961df89687..6f784552b8bbc8 100644 --- a/ports/magnum-plugins/portfile.cmake +++ b/ports/magnum-plugins/portfile.cmake @@ -9,24 +9,31 @@ vcpkg_from_github( ) if("basisimporter" IN_LIST FEATURES OR "basisimageconverter" IN_LIST FEATURES) - # Bundle Basis Universal, a commit that's before the UASTC support (which - # is not implemented yet). The repo has big unrequired files in its + # Bundle Basis Universal. The repo has big unrequired files in its # history, so we're downloading just a snapshot instead of a git clone. - vcpkg_download_distfile( - _BASIS_UNIVERSAL_PATCHES - URLS "https://github.com/BinomialLLC/basis_universal/commit/e9c55faac7745ebf38d08cd3b4f71aaf542f8191.diff" - FILENAME "e9c55faac7745ebf38d08cd3b4f71aaf542f8191.patch" - SHA512 e5dda11de2ba8cfd39728e69c74a7656bb522e509786fe5673c94b26be9bd4bee897510096479ee6323f5276d34cba1c44c60804a515c0b35ff7b6ac9d625b88 - ) - set(_BASIS_VERSION "8565af680d1bd2ad56ab227ca7d96c56dfbe93ed") + if(VCPKG_USE_HEAD_VERSION) + # v1_15_update2 + set(_BASIS_VERSION "v1_15_update2") + set(_BASIS_SHA512 "a898a057b57ac64f6c0bf5fce0b599e23421ccdd015ea7bb668bce8b9292ef55b098f3d05854a2fb5363959932b75cd0a842664ae7d4f71f3537dc11301c1b32") + else() + # A commit that's before the UASTC support (which is not implemented yet) + vcpkg_download_distfile( + _BASIS_UNIVERSAL_PATCHES + URLS "https://github.com/BinomialLLC/basis_universal/commit/e9c55faac7745ebf38d08cd3b4f71aaf542f8191.diff" + FILENAME "e9c55faac7745ebf38d08cd3b4f71aaf542f8191.patch" + SHA512 e5dda11de2ba8cfd39728e69c74a7656bb522e509786fe5673c94b26be9bd4bee897510096479ee6323f5276d34cba1c44c60804a515c0b35ff7b6ac9d625b88 + ) + set(_BASIS_VERSION "8565af680d1bd2ad56ab227ca7d96c56dfbe93ed") + set(_BASIS_SHA512 "65062ab3ba675c46760f56475a7528189ed4097fb9bab8316e25d9e23ffec2a9560eb9a6897468baf2a6ab2bd698b5907283e96deaeaef178085a47f9d371bb2") + endif() vcpkg_download_distfile( _BASIS_UNIVERSAL_ARCHIVE URLS "https://github.com/BinomialLLC/basis_universal/archive/${_BASIS_VERSION}.tar.gz" FILENAME "basis-universal-${_BASIS_VERSION}.tar.gz" - SHA512 65062ab3ba675c46760f56475a7528189ed4097fb9bab8316e25d9e23ffec2a9560eb9a6897468baf2a6ab2bd698b5907283e96deaeaef178085a47f9d371bb2 + SHA512 ${_BASIS_SHA512} ) - vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH _BASIS_UNIVERSAL_SOURCE + vcpkg_extract_source_archive( + _BASIS_UNIVERSAL_SOURCE ARCHIVE ${_BASIS_UNIVERSAL_ARCHIVE} WORKING_DIRECTORY "${SOURCE_PATH}/src/external" PATCHES @@ -46,8 +53,10 @@ endif() # Head only features set(ALL_SUPPORTED_FEATURES ${ALL_FEATURES}) if(NOT VCPKG_USE_HEAD_VERSION) - list(REMOVE_ITEM ALL_SUPPORTED_FEATURES glslangshaderconverter spirvtoolsshaderconverter) - message(WARNING "Features glslangshaderconverter and spirvtoolsshaderconverter are not avaliable when building non-head version.") + list(REMOVE_ITEM ALL_SUPPORTED_FEATURES cgltfimporter glslangshaderconverter + ktximageconverter ktximporter openexrimageconverter openexrimporter + spirvtoolsshaderconverter stbdxtimageconverter) + message(WARNING "Features cgltfimporter, glslangshaderconverter, ktximageconverter, ktximporter, openexrimageconverter, openexrimporter, spirvtoolsshaderconverter and stbdxtimageconverter are not available when building non-head version.") endif() set(_COMPONENTS "") @@ -65,9 +74,8 @@ endforeach() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES ${_COMPONENTS}) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA # Disable this option if project cannot be built with Ninja OPTIONS ${FEATURE_OPTIONS} -DBUILD_STATIC=${BUILD_PLUGINS_STATIC} @@ -76,7 +84,7 @@ vcpkg_configure_cmake( -DMAGNUM_PLUGINS_RELEASE_DIR=${CURRENT_INSTALLED_DIR}/bin/magnum ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Debug includes and share are the same as release file(REMOVE_RECURSE diff --git a/ports/magnum-plugins/vcpkg.json b/ports/magnum-plugins/vcpkg.json index d4280e76b889a8..d6ba4d9ae70b82 100644 --- a/ports/magnum-plugins/vcpkg.json +++ b/ports/magnum-plugins/vcpkg.json @@ -1,18 +1,25 @@ { "name": "magnum-plugins", "version-string": "2020.06", - "port-version": 7, + "port-version": 8, "description": "Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization", "homepage": "https://magnum.graphics/", "dependencies": [ { "name": "magnum", "default-features": false + }, + { + "name": "vcpkg-cmake", + "host": true } ], "default-features": [ + "cgltfimporter", "ddsimporter", "icoimporter", + "ktximageconverter", + "ktximporter", "miniexrimageconverter", "opengeximporter", "stanfordimporter", @@ -51,12 +58,33 @@ "features": [ "trade" ] - } + }, + "zstd" ] }, "basisimporter": { "description": "BasisImporter plugin", "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "zstd" + ] + }, + "cgltfimporter": { + "description": "CgltfImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "anyimageimporter" + ] + }, { "name": "magnum", "default-features": false, @@ -204,6 +232,30 @@ } ] }, + "ktximageconverter": { + "description": "KtxImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, + "ktximporter": { + "description": "KtxImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, "meshoptimizersceneconverter": { "description": "MeshOptimizerSceneConverter plugin", "dependencies": [ @@ -232,6 +284,32 @@ "openddl": { "description": "OpenDdl library" }, + "openexrimageconverter": { + "description": "OpenExrImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "openexr" + ] + }, + "openexrimporter": { + "description": "OpenExrImporter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + }, + "openexr" + ] + }, "opengeximporter": { "description": "OpenGexImporter plugin", "dependencies": [ @@ -321,6 +399,18 @@ } ] }, + "stbdxtimageconverter": { + "description": "StbDxtImageConverter plugin", + "dependencies": [ + { + "name": "magnum", + "default-features": false, + "features": [ + "trade" + ] + } + ] + }, "stbimageconverter": { "description": "StbImageConverter plugin", "dependencies": [ @@ -397,13 +487,6 @@ "features": [ "trade" ] - }, - { - "name": "magnum-plugins", - "default-features": false, - "features": [ - "stbimageimporter" - ] } ] } diff --git a/versions/baseline.json b/versions/baseline.json index 08e122171290f1..f5c30bd644d449 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4214,7 +4214,7 @@ }, "magnum-plugins": { "baseline": "2020.06", - "port-version": 7 + "port-version": 8 }, "mailio": { "baseline": "0.20.0", diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json index 87c471d0ccde04..f646d309488c32 100644 --- a/versions/m-/magnum-plugins.json +++ b/versions/m-/magnum-plugins.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a4d77bfcdfaad1b288a26ad6ac7fe086e356f71", + "version-string": "2020.06", + "port-version": 8 + }, { "git-tree": "241189f2a82d541c88b682f409518b5802dcb39e", "version-string": "2020.06", From 6bc0fb9a8594f1ef74f79a9764fc15712f23d565 Mon Sep 17 00:00:00 2001 From: Wei Dai Date: Thu, 18 Nov 2021 20:15:08 -0800 Subject: [PATCH 1187/1858] [apsi ]Updated to version 0.7.0 (#21527) * Updated ports/apsi to 0.7.0. * Updated versioning. --- ports/apsi/portfile.cmake | 6 +++--- ports/apsi/vcpkg.json | 2 +- versions/a-/apsi.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/apsi/portfile.cmake b/ports/apsi/portfile.cmake index 7e2266e00e4202..5002c99a028370 100644 --- a/ports/apsi/portfile.cmake +++ b/ports/apsi/portfile.cmake @@ -7,8 +7,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO microsoft/APSI - REF 4e412e6c89a2729a09aa2a998b212dec0fa9a0fc - SHA512 8cabe842884a90bd3de5156af964f68efe77c55c1ff773ce3a64a0c4e3380868dd5ee79f4db2033278eba2c7cf5561c225b1625313a7ac89f068218d5cb9f40c + REF 6365cb774b81a2a731334c656db21e5fdfb92870 + SHA512 f21d710a345663aeb35035565c55fd900076589d087a03a1ad7df8b8004ae0e059196f3c94ee63b5ad815a858e5404eea34ae203f7778d4190fd323fd08b7084 HEAD_REF main ) @@ -29,7 +29,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() -vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.5") +vcpkg_cmake_config_fixup(PACKAGE_NAME "APSI" CONFIG_PATH "lib/cmake/APSI-0.7") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/apsi/vcpkg.json b/ports/apsi/vcpkg.json index 6ee65d00369124..97792cc04d4bff 100644 --- a/ports/apsi/vcpkg.json +++ b/ports/apsi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "apsi", - "version-semver": "0.5.0", + "version-semver": "0.7.0", "description": "APSI is a research library for asymmetric private set intersection.", "homepage": "https://github.com/microsoft/APSI", "supports": "static", diff --git a/versions/a-/apsi.json b/versions/a-/apsi.json index fa1c3690f2d7e6..2719543e4b4824 100644 --- a/versions/a-/apsi.json +++ b/versions/a-/apsi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "652d69df44a689fa55f1b757db46c97bcb840c13", + "version-semver": "0.7.0", + "port-version": 0 + }, { "git-tree": "ff4f1e6dfc87696ea2da4bd557e15b1f2034f340", "version-semver": "0.5.0", diff --git a/versions/baseline.json b/versions/baseline.json index f5c30bd644d449..2e5ac15b91e619 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -117,7 +117,7 @@ "port-version": 4 }, "apsi": { - "baseline": "0.5.0", + "baseline": "0.7.0", "port-version": 0 }, "arb": { From a665f19adfd78dd96d516673c68c5d4be4f01fb6 Mon Sep 17 00:00:00 2001 From: Ahmed Yarub Hani Al Nuaimi Date: Fri, 19 Nov 2021 01:17:09 -0300 Subject: [PATCH 1188/1858] [kubernetes] Update to the latest version (#21503) * Update kubernetes library * Update versions * Fix port version * Update versions * update kubernetes to latest commit * update version * revert kubernetes.json Co-authored-by: Ahmed Yarub Hani Al Nuaimi Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/kubernetes/portfile.cmake | 4 ++-- ports/kubernetes/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kubernetes.json | 5 +++++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ports/kubernetes/portfile.cmake b/ports/kubernetes/portfile.cmake index 8e9f36c9355b20..a2f0e67e07c3ce 100644 --- a/ports/kubernetes/portfile.cmake +++ b/ports/kubernetes/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO kubernetes-client/c - REF ecc9efc23656e747e97f86fbe2810f7e8471990f - SHA512 e9bb1b6f68aacd82df2b33fcb432fdfee5fb56e0426835f8480afff1c2545f483eb0f4edeafb2e866ea74918d748aa48655b5819909c13a88f693e371047e8b7 + REF f16ac13090902373e3e3c9deef064659a3c9215e + SHA512 07857a6aae4116a51b776af7ba4ede12c1f479b535b5b8b2e373e73eac718b367e84eb87b60faeb1174be0562d35ac78f36469f2128294c028a96ecb181580eb HEAD_REF master PATCHES 001-fix-destination.patch diff --git a/ports/kubernetes/vcpkg.json b/ports/kubernetes/vcpkg.json index 351c86073acd13..549bbe296b080f 100644 --- a/ports/kubernetes/vcpkg.json +++ b/ports/kubernetes/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kubernetes", - "version": "0.0.1", + "version-date": "2021-11-18", "description": "Kubernetes C client", "homepage": "https://github.com/kubernetes-client/c/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 2e5ac15b91e619..0e82d6ea9307ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3205,7 +3205,7 @@ "port-version": 1 }, "kubernetes": { - "baseline": "0.0.1", + "baseline": "2021-11-18", "port-version": 0 }, "kuku": { diff --git a/versions/k-/kubernetes.json b/versions/k-/kubernetes.json index 8ef4fa381b03f4..ef7522f463b1f1 100644 --- a/versions/k-/kubernetes.json +++ b/versions/k-/kubernetes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "58621c0fcfc7ea0c0ecc7808991c1c90c3a0d808", + "version-date": "2021-11-18", + "port-version": 0 + }, { "git-tree": "d52624c3f3a26d3ad801cca6af68e7bd8273b29b", "version": "0.0.1", From ff28799bf403950b89d816dfd002b6db0301331d Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 19 Nov 2021 05:19:38 +0100 Subject: [PATCH 1189/1858] [prometheus-cpp] Update to version 1.0.0 (#21500) --- ports/prometheus-cpp/portfile.cmake | 39 +++++++++++++---------------- ports/prometheus-cpp/vcpkg.json | 12 ++++++++- versions/baseline.json | 2 +- versions/p-/prometheus-cpp.json | 5 ++++ 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/ports/prometheus-cpp/portfile.cmake b/ports/prometheus-cpp/portfile.cmake index ce2c018fff765a..256f69c8ddc3cc 100644 --- a/ports/prometheus-cpp/portfile.cmake +++ b/ports/prometheus-cpp/portfile.cmake @@ -3,40 +3,35 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO jupp0r/prometheus-cpp - REF 342de5e93bd0cbafde77ec801f9dd35a03bceb3f # v0.13.0 - SHA512 2edd093dff57109f4e7050f7d870010e696642f0445a8d50f689a9a7e8f4704e74659846c1afcdfcd700ceeb64b48ea83159e87ca00ca58de4866dd39975590b + REF 4ea303fa66e4c26dc4df67045fa0edf09c2f3077 # v1.0.0 + SHA512 f97f380182cb7d8576f444e263159d5cc4572d71020b14a2d599041a6a4e5e2cb677a80c637b5a2bca55d4f0e570e87c2863d5dd48e317e9a912cca5a192e81a HEAD_REF master ) -macro(feature FEATURENAME OPTIONNAME) - if("${FEATURENAME}" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -D${OPTIONNAME}=TRUE) - else() - list(APPEND FEATURE_OPTIONS -D${OPTIONNAME}=FALSE) - endif() -endmacro() - -feature(compression ENABLE_COMPRESSION) -feature(pull ENABLE_PULL) -feature(push ENABLE_PUSH) -feature(tests ENABLE_TESTING) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + compression ENABLE_COMPRESSION + pull ENABLE_PULL + push ENABLE_PUSH + tests ENABLE_TESTING +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DUSE_THIRDPARTY_LIBRARIES=OFF # use vcpkg packages -DGENERATE_PKGCONFIG=OFF ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/prometheus-cpp) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/prometheus-cpp") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/prometheus-cpp/vcpkg.json b/ports/prometheus-cpp/vcpkg.json index 371b1e7380deb0..1f5ae41ba9c897 100644 --- a/ports/prometheus-cpp/vcpkg.json +++ b/ports/prometheus-cpp/vcpkg.json @@ -1,7 +1,17 @@ { "name": "prometheus-cpp", - "version-semver": "0.13.0", + "version-semver": "1.0.0", "description": "Prometheus Client Library for Modern C++", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "compression", "pull" diff --git a/versions/baseline.json b/versions/baseline.json index 0e82d6ea9307ac..37fd637010caba 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5369,7 +5369,7 @@ "port-version": 7 }, "prometheus-cpp": { - "baseline": "0.13.0", + "baseline": "1.0.0", "port-version": 0 }, "promise-cpp": { diff --git a/versions/p-/prometheus-cpp.json b/versions/p-/prometheus-cpp.json index 5b58285a32b923..9ca74e847480d1 100644 --- a/versions/p-/prometheus-cpp.json +++ b/versions/p-/prometheus-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f679ed963f525e155342a6be082d02e03c96856", + "version-semver": "1.0.0", + "port-version": 0 + }, { "git-tree": "ae46bbdb51c6ff3e330c607e46b911b79e0ce7e3", "version-semver": "0.13.0", From 97ef3cb737b25d5eec8123c5809cb6859d845279 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Fri, 19 Nov 2021 12:36:13 +0800 Subject: [PATCH 1190/1858] [zydis] update to 3.2.1 (#21490) * [zydis] update to 3.2.1 * update version * update portfile.cmake * update version --- ports/zydis/portfile.cmake | 46 +++++++++++++++++--------------------- ports/zydis/vcpkg.json | 15 ++++++++++--- versions/baseline.json | 4 ++-- versions/z-/zydis.json | 5 +++++ 4 files changed, 39 insertions(+), 31 deletions(-) diff --git a/ports/zydis/portfile.cmake b/ports/zydis/portfile.cmake index eea63d5a7771b0..cd9b5c43a9f106 100644 --- a/ports/zydis/portfile.cmake +++ b/ports/zydis/portfile.cmake @@ -1,52 +1,46 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO zyantific/zydis - REF bfee99f49274a0eec3ffea16ede3a5bda9cda88f - SHA512 de47c4a22d22e753b3d06cb6210a9df2f944b0828e49d573cadb9b0c37d590a44db74542e07eced4b0188a97b825f4990943bab1b14edfd58d80368de4299759 + REF 4022f22f9280650082a9480519c86a6e2afde2f3 #v3.2.1 + SHA512 da3ff582d3c4cbb5e4053cd468f181550f02d0a1713a39944266e6d1b0e3249e24461f87171ef99e249e6d5b2fc39fcca402518c569399ae5d4a64e0d3dc4b3b HEAD_REF master ) vcpkg_from_github( OUT_SOURCE_PATH ZYCORE_SOURCE_PATH REPO zyantific/zycore-c - REF 3435866ecaa837376807ce934d2088ae46aa3fa3 - SHA512 7e25254a0c17158789a3eca417cea8abe6a938cdc91cb395bd0ce1d791c8bd6b4ee0c994ca6c8372e17c03abfb3653c9053c5d56e0a4641d765c8474fae771d2 + REF 8983325bf0007f0d6d2ea28a49040a77f47bd611 #2021-11-17 + SHA512 e41dc70413d2a5bb5ac549ab602c54bfaba3ea61dcd0817bfdf20e4e12d6b3e1cc587fa58ba653bd7513aa735311d3b7b4bc408d8092a98ab6cf1b44012e4e22 HEAD_REF master ) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - set(ZYDIS_BUILD_SHARED_LIB OFF) -else() - set(ZYDIS_BUILD_SHARED_LIB ON) -endif() +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZYDIS_BUILD_SHARED_LIB) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - "-DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}" - "-DZYDIS_ZYCORE_PATH=${ZYCORE_SOURCE_PATH}" + "-DZYDIS_BUILD_SHARED_LIB=${ZYDIS_BUILD_SHARED_LIB}" + "-DZYDIS_ZYCORE_PATH=${ZYCORE_SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_configure_cmake( - SOURCE_PATH ${ZYCORE_SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${ZYCORE_SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(EXES) - file(REMOVE ${EXES}) -endif() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) + +vcpkg_copy_tools(TOOL_NAMES ZydisDisasm ZydisInfo AUTO_CLEAN) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/zydis/vcpkg.json b/ports/zydis/vcpkg.json index 1a04f16a8731ee..46ce46fb27aeb2 100644 --- a/ports/zydis/vcpkg.json +++ b/ports/zydis/vcpkg.json @@ -1,7 +1,16 @@ { "name": "zydis", - "version-string": "3.1.0", - "port-version": 2, + "version-semver": "3.2.1", "description": "Fast and lightweight x86/x86-64 disassembler library.", - "homepage": "https://zydis.re" + "homepage": "https://zydis.re", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 37fd637010caba..135bdbae7018a0 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7393,8 +7393,8 @@ "port-version": 3 }, "zydis": { - "baseline": "3.1.0", - "port-version": 2 + "baseline": "3.2.1", + "port-version": 0 }, "zyre": { "baseline": "2019-07-07", diff --git a/versions/z-/zydis.json b/versions/z-/zydis.json index dd303323889870..c3338b5555827d 100644 --- a/versions/z-/zydis.json +++ b/versions/z-/zydis.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ea22eba12ef8bd109c21b3684abe6513070e122f", + "version-semver": "3.2.1", + "port-version": 0 + }, { "git-tree": "1377782663be41b89898db78843a8e35417f90e9", "version-string": "3.1.0", From 50d9d7ad410c82406005d727657518f9acc8f302 Mon Sep 17 00:00:00 2001 From: Jonathan Giannuzzi Date: Fri, 19 Nov 2021 05:39:34 +0100 Subject: [PATCH 1191/1858] Enable arm64 build for Arrow (#21467) * Enable arm64 build for Arrow * Fix deprecated function warning * Update Arrow port version --- ports/arrow/portfile.cmake | 9 ++++----- ports/arrow/vcpkg.json | 12 ++++++++++-- versions/a-/arrow.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ports/arrow/portfile.cmake b/ports/arrow/portfile.cmake index e5a1dcc6c6245f..225dd7426c4f67 100644 --- a/ports/arrow/portfile.cmake +++ b/ports/arrow/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(ON_ARCH "x86" "arm" "arm64") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO apache/arrow @@ -61,12 +59,13 @@ else() set(THRIFT_USE_SHARED ${ARROW_DEPENDENCY_USE_SHARED}) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH}/cpp PREFER_NINJA OPTIONS ${FEATURE_OPTIONS} ${MALLOC_OPTIONS} + -DCMAKE_SYSTEM_PROCESSOR=${VCPKG_TARGET_ARCHITECTURE} -DARROW_BUILD_SHARED=${ARROW_BUILD_SHARED} -DARROW_BUILD_STATIC=${ARROW_BUILD_STATIC} -DARROW_BUILD_TESTS=OFF @@ -83,7 +82,7 @@ vcpkg_configure_cmake( -DZSTD_MSVC_LIB_PREFIX= ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() @@ -91,7 +90,7 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/arrow_static.lib) message(FATAL_ERROR "Installed lib file should be named 'arrow.lib' via patching the upstream build.") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/arrow) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/arrow) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) diff --git a/ports/arrow/vcpkg.json b/ports/arrow/vcpkg.json index cdddf011af6dc6..2f73bca2088ece 100644 --- a/ports/arrow/vcpkg.json +++ b/ports/arrow/vcpkg.json @@ -1,10 +1,10 @@ { "name": "arrow", "version": "5.0.0", - "port-version": 1, + "port-version": 2, "description": "Cross-language development platform for in-memory analytics", "homepage": "https://arrow.apache.org", - "supports": "x64", + "supports": "x64 | (arm64 & !windows)", "dependencies": [ "boost-filesystem", "boost-multiprecision", @@ -19,6 +19,14 @@ "snappy", "thrift", "utf8proc", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib", "zstd" ], diff --git a/versions/a-/arrow.json b/versions/a-/arrow.json index 8d0b86eb61ad1c..bae3c3e99dc910 100644 --- a/versions/a-/arrow.json +++ b/versions/a-/arrow.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a30c7d6553216924aa3a3957ceb87d0fda39592", + "version": "5.0.0", + "port-version": 2 + }, { "git-tree": "79938475d53bb40ad7bf8d0fbda9e65f7630dde7", "version": "5.0.0", diff --git a/versions/baseline.json b/versions/baseline.json index 135bdbae7018a0..8bc3d48de443a2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -170,7 +170,7 @@ }, "arrow": { "baseline": "5.0.0", - "port-version": 1 + "port-version": 2 }, "ashes": { "baseline": "2021-06-18", From 2be6c3abe306e0331e020cbfacb18d484705163b Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 19 Nov 2021 05:42:56 +0100 Subject: [PATCH 1192/1858] [apr-util] no absolute paths (#21453) --- ports/apr-util/portfile.cmake | 21 ++++++++++++++------- ports/apr-util/vcpkg.json | 9 +++++++-- versions/a-/apr-util.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake index 1065bdb7234c0c..befefb4fca2ea2 100644 --- a/ports/apr-util/portfile.cmake +++ b/ports/apr-util/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_download_distfile(ARCHIVE if(VCPKG_TARGET_IS_WINDOWS) vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE "${ARCHIVE}" PATCHES use-vcpkg-expat.patch apr.patch @@ -22,9 +22,8 @@ if(VCPKG_TARGET_IS_WINDOWS) set(APU_DECLARE_STATIC ON) endif() - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DAPU_DECLARE_EXPORT=${APU_DECLARE_EXPORT} -DAPU_DECLARE_STATIC=${APU_DECLARE_STATIC} @@ -32,7 +31,7 @@ if(VCPKG_TARGET_IS_WINDOWS) -DDISABLE_INSTALL_HEADERS=ON ) - vcpkg_install_cmake() + vcpkg_cmake_install() vcpkg_copy_pdbs() file(READ ${CURRENT_PACKAGES_DIR}/include/apu.h APU_H) @@ -43,7 +42,7 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() file(WRITE ${CURRENT_PACKAGES_DIR}/include/apu.h "${APU_H}") -else(VCPKG_TARGET_IS_WINDOWS) +else() vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} @@ -77,7 +76,15 @@ else(VCPKG_TARGET_IS_WINDOWS) vcpkg_install_make() + vcpkg_fixup_pkgconfig() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/bin/apu-1-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/bin/apu-1-config" "${CURRENT_BUILDTREES_DIR}" "not/existing") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/debug/bin/apu-1-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/apr-util/debug/bin/apu-1-config" "${CURRENT_BUILDTREES_DIR}" "not/existing") + endif() + endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json index aa7937210aa20c..7398beb9caa9e1 100644 --- a/ports/apr-util/vcpkg.json +++ b/ports/apr-util/vcpkg.json @@ -1,12 +1,17 @@ { "name": "apr-util", "version-string": "1.6.1", - "port-version": 4, + "port-version": 5, "description": "Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation", "homepage": "https://apr.apache.org/", "dependencies": [ "apr", "expat", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true, + "platform": "windows" + } ] } diff --git a/versions/a-/apr-util.json b/versions/a-/apr-util.json index a2629d38521bba..642c2d01f6fa1d 100644 --- a/versions/a-/apr-util.json +++ b/versions/a-/apr-util.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dfc76280690e9d419c43ee5242466de5b4e317c2", + "version-string": "1.6.1", + "port-version": 5 + }, { "git-tree": "cf1a0e97d00a5748dc58db7d0a5da0fd7d5efb66", "version-string": "1.6.1", diff --git a/versions/baseline.json b/versions/baseline.json index 8bc3d48de443a2..bc614aee347b8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -114,7 +114,7 @@ }, "apr-util": { "baseline": "1.6.1", - "port-version": 4 + "port-version": 5 }, "apsi": { "baseline": "0.7.0", From a96231037daed45e03ec677061a34d0cfa44d348 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 19 Nov 2021 07:48:58 +0300 Subject: [PATCH 1193/1858] [winpty, ptyqt] Added ptyqt and winpty ports (#21440) * Added ptyqt and winpty ports * Fix part of issues * Build fixes for Windows * PR suggestions * Update versions * Update CI Baseline * Fix PR review suggestions * fix version * Fix baseline and versions * Adjust winpty patch * Versions updated --- ports/ptyqt/portfile.cmake | 42 +++++++ ports/ptyqt/vcpkg.json | 21 ++++ ports/winpty/CMakeLists.txt | 172 ++++++++++++++++++++++++++ ports/winpty/allow-build-static.patch | 45 +++++++ ports/winpty/portfile.cmake | 32 +++++ ports/winpty/vcpkg.json | 16 +++ versions/baseline.json | 8 ++ versions/p-/ptyqt.json | 9 ++ versions/w-/winpty.json | 9 ++ 9 files changed, 354 insertions(+) create mode 100644 ports/ptyqt/portfile.cmake create mode 100644 ports/ptyqt/vcpkg.json create mode 100644 ports/winpty/CMakeLists.txt create mode 100644 ports/winpty/allow-build-static.patch create mode 100644 ports/winpty/portfile.cmake create mode 100644 ports/winpty/vcpkg.json create mode 100644 versions/p-/ptyqt.json create mode 100644 versions/w-/winpty.json diff --git a/ports/ptyqt/portfile.cmake b/ports/ptyqt/portfile.cmake new file mode 100644 index 00000000000000..055f15768171bf --- /dev/null +++ b/ports/ptyqt/portfile.cmake @@ -0,0 +1,42 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO kafeg/ptyqt + REF 0.6.3 + SHA512 7a490a6d0cca500d202b0524abf8596d70872c224eea778efd941ad2a995a8a53d295e3ac000ca8fb63e02467f1191ae6bddfd8469fe5df2aca8af972d06fcff + HEAD_REF master +) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -lrt") + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -lrt") + + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") + file(READ ${SOURCE_PATH}/core/CMakeLists.txt filedata) + string(REPLACE "-static-libstdc++" "-static-libstdc++ -lglib-2.0" filedata "${filedata}") + file(WRITE ${SOURCE_PATH}/core/CMakeLists.txt "${filedata}") + else() + file(READ ${SOURCE_PATH}/core/CMakeLists.txt filedata) + string(REPLACE "-static-libstdc++ -lglib-2.0" "-static-libstdc++" filedata "${filedata}") + file(WRITE ${SOURCE_PATH}/core/CMakeLists.txt "${filedata}") + endif() +endif() + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE SHARED) +else() + set(BUILD_TYPE STATIC) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DNO_BUILD_TESTS=1 + -DNO_BUILD_EXAMPLES=1 + -DBUILD_TYPE=${BUILD_TYPE} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/ptyqt/vcpkg.json b/ports/ptyqt/vcpkg.json new file mode 100644 index 00000000000000..9a47dfc35090ec --- /dev/null +++ b/ports/ptyqt/vcpkg.json @@ -0,0 +1,21 @@ +{ + "name": "ptyqt", + "version": "0.6.3", + "description": "PtyQt - C++ library for work with PseudoTerminals", + "supports": "!uwp", + "dependencies": [ + "qt5-base", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + { + "name": "winpty", + "platform": "windows" + } + ] +} diff --git a/ports/winpty/CMakeLists.txt b/ports/winpty/CMakeLists.txt new file mode 100644 index 00000000000000..ce3eb00212baec --- /dev/null +++ b/ports/winpty/CMakeLists.txt @@ -0,0 +1,172 @@ +cmake_minimum_required(VERSION 3.12.0) + +set(PROJECT_VERSION "0.4.3") +project(winpty VERSION ${PROJECT_VERSION} LANGUAGES CXX) + +add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}") +add_definitions(-D_WIN32_WINNT=0x0600) +add_definitions(-DUNICODE) +add_definitions(-D_UNICODE) +add_definitions(-DNOMINMAX) + +if("${BUILD_TYPE}" STREQUAL "STATIC") + add_definitions(-DBUILD_STATIC) +else() + add_definitions(-DCOMPILING_WINPTY_DLL) +endif() + +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(WINPTY_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) +set(WINPTY_INSTALL_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin) +set(WINPTY_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib) + +include_directories(${WINPTY_INSTALL_INCLUDE_DIR}) + +#winpty library +set(WINPTYLIB_SOURCE_FILES + src/include/winpty.h + src/libwinpty/AgentLocation.cc + src/libwinpty/AgentLocation.h + src/libwinpty/winpty.cc + src/shared/AgentMsg.h + src/shared/BackgroundDesktop.h + src/shared/BackgroundDesktop.cc + src/shared/Buffer.h + src/shared/Buffer.cc + src/shared/DebugClient.h + src/shared/DebugClient.cc + src/shared/GenRandom.h + src/shared/GenRandom.cc + src/shared/OsModule.h + src/shared/OwnedHandle.h + src/shared/OwnedHandle.cc + src/shared/StringBuilder.h + src/shared/StringUtil.cc + src/shared/StringUtil.h + src/shared/WindowsSecurity.cc + src/shared/WindowsSecurity.h + src/shared/WindowsVersion.h + src/shared/WindowsVersion.cc + src/shared/WinptyAssert.h + src/shared/WinptyAssert.cc + src/shared/WinptyException.h + src/shared/WinptyException.cc + src/shared/WinptyVersion.h + src/shared/WinptyVersion.cc + src/shared/winpty_snprintf.h +) + +add_library( winpty ${BUILD_TYPE} ${WINPTYLIB_SOURCE_FILES} ) + +#winpty agent executable +set(WINPTYAGENT_SOURCE_FILES + src/agent/Agent.h + src/agent/Agent.cc + src/agent/AgentCreateDesktop.h + src/agent/AgentCreateDesktop.cc + src/agent/ConsoleFont.cc + src/agent/ConsoleFont.h + src/agent/ConsoleInput.cc + src/agent/ConsoleInput.h + src/agent/ConsoleInputReencoding.cc + src/agent/ConsoleInputReencoding.h + src/agent/ConsoleLine.cc + src/agent/ConsoleLine.h + src/agent/Coord.h + src/agent/DebugShowInput.h + src/agent/DebugShowInput.cc + src/agent/DefaultInputMap.h + src/agent/DefaultInputMap.cc + src/agent/DsrSender.h + src/agent/EventLoop.h + src/agent/EventLoop.cc + src/agent/InputMap.h + src/agent/InputMap.cc + src/agent/LargeConsoleRead.h + src/agent/LargeConsoleRead.cc + src/agent/NamedPipe.h + src/agent/NamedPipe.cc + src/agent/Scraper.h + src/agent/Scraper.cc + src/agent/SimplePool.h + src/agent/SmallRect.h + src/agent/Terminal.h + src/agent/Terminal.cc + src/agent/UnicodeEncoding.h + src/agent/Win32Console.cc + src/agent/Win32Console.h + src/agent/Win32ConsoleBuffer.cc + src/agent/Win32ConsoleBuffer.h + src/agent/main.cc + src/shared/AgentMsg.h + src/shared/BackgroundDesktop.h + src/shared/BackgroundDesktop.cc + src/shared/Buffer.h + src/shared/Buffer.cc + src/shared/DebugClient.h + src/shared/DebugClient.cc + src/shared/GenRandom.h + src/shared/GenRandom.cc + src/shared/OsModule.h + src/shared/OwnedHandle.h + src/shared/OwnedHandle.cc + src/shared/StringBuilder.h + src/shared/StringUtil.cc + src/shared/StringUtil.h + src/shared/UnixCtrlChars.h + src/shared/WindowsSecurity.cc + src/shared/WindowsSecurity.h + src/shared/WindowsVersion.h + src/shared/WindowsVersion.cc + src/shared/WinptyAssert.h + src/shared/WinptyAssert.cc + src/shared/WinptyException.h + src/shared/WinptyException.cc + src/shared/WinptyVersion.h + src/shared/WinptyVersion.cc + src/shared/winpty_snprintf.h +) + +add_executable(winpty-agent ${WINPTYAGENT_SOURCE_FILES}) +target_compile_definitions(winpty-agent PRIVATE -DWINPTY_AGENT_ASSERT) + + +#winpty debugserver executable +set(WINPTYAGENT_SOURCE_FILES + src/debugserver/DebugServer.cc + src/shared/DebugClient.h + src/shared/DebugClient.cc + src/shared/OwnedHandle.h + src/shared/OwnedHandle.cc + src/shared/OsModule.h + src/shared/StringBuilder.h + src/shared/StringUtil.cc + src/shared/StringUtil.h + src/shared/WindowsSecurity.h + src/shared/WindowsSecurity.cc + src/shared/WindowsVersion.h + src/shared/WindowsVersion.cc + src/shared/WinptyAssert.h + src/shared/WinptyAssert.cc + src/shared/WinptyException.h + src/shared/WinptyException.cc + src/shared/winpty_snprintf.h +) + +add_executable(winpty-debugserver ${WINPTYAGENT_SOURCE_FILES}) + + +if("${BUILD_TYPE}" STREQUAL "STATIC") + install(TARGETS winpty DESTINATION ${WINPTY_INSTALL_LIB_DIR}) +else() + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpty.dll DESTINATION ${WINPTY_INSTALL_BIN_DIR}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/winpty.lib DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) +endif() +install(TARGETS winpty-agent DESTINATION ${WINPTY_INSTALL_BIN_DIR}) +install(TARGETS winpty-debugserver DESTINATION ${WINPTY_INSTALL_BIN_DIR}) +install(FILES src/include/winpty.h src/include/winpty_constants.h DESTINATION ${WINPTY_INSTALL_INCLUDE_DIR}) + + + diff --git a/ports/winpty/allow-build-static.patch b/ports/winpty/allow-build-static.patch new file mode 100644 index 00000000000000..14447dfbd22b5e --- /dev/null +++ b/ports/winpty/allow-build-static.patch @@ -0,0 +1,45 @@ +diff --git a/src/include/winpty.h b/src/include/winpty.h +index fdfe4bc..7864d96 100644 +--- a/src/include/winpty.h ++++ b/src/include/winpty.h +@@ -32,11 +32,15 @@ + * When compiled with __declspec(dllexport), with either MinGW or MSVC, the + * winpty functions are unadorned--no underscore prefix or '@nn' suffix--so + * GetProcAddress can be used easily. */ ++#ifndef BUILD_STATIC + #ifdef COMPILING_WINPTY_DLL + #define WINPTY_API __declspec(dllexport) + #else + #define WINPTY_API __declspec(dllimport) + #endif ++#else ++#define WINPTY_API ++#endif + + #ifdef __cplusplus + extern "C" { +diff --git a/src/shared/WinptyVersion.cc b/src/shared/WinptyVersion.cc +index 76bb8a5..33a2c23 100644 +--- a/src/shared/WinptyVersion.cc ++++ b/src/shared/WinptyVersion.cc +@@ -28,15 +28,15 @@ + // This header is auto-generated by either the Makefile (Unix) or + // UpdateGenVersion.bat (gyp). It is placed in a 'gen' directory, which is + // added to the search path. +-#include "GenVersion.h" ++//#include "GenVersion.h" + + void dumpVersionToStdout() { +- printf("winpty version %s\n", GenVersion_Version); +- printf("commit %s\n", GenVersion_Commit); ++ printf("winpty version %s\n", PROJECT_VERSION); ++ printf("commit %s\n", "empty"); + } + + void dumpVersionToTrace() { + trace("winpty version %s (commit %s)", +- GenVersion_Version, +- GenVersion_Commit); ++ PROJECT_VERSION, ++ "empty"); + } diff --git a/ports/winpty/portfile.cmake b/ports/winpty/portfile.cmake new file mode 100644 index 00000000000000..87cecef41f0ebc --- /dev/null +++ b/ports/winpty/portfile.cmake @@ -0,0 +1,32 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO rprichard/winpty + REF antivirus + SHA512 8f5539c1af2a1127219278446c1d028079867cecdeb03c4f208c7d8176e8802e8075ce1b6992e0ef73db34c69e58f73d3828698d865deb35cb883821ee245e4d + HEAD_REF master + PATCHES + allow-build-static.patch +) + +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") + +if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + set(BUILD_TYPE SHARED) +else() + set(BUILD_TYPE STATIC) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_TYPE=${BUILD_TYPE} +) + +vcpkg_cmake_install() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +vcpkg_copy_tools(TOOL_NAMES winpty-agent winpty-debugserver AUTO_CLEAN) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/winpty/vcpkg.json b/ports/winpty/vcpkg.json new file mode 100644 index 00000000000000..dc2288546b1cab --- /dev/null +++ b/ports/winpty/vcpkg.json @@ -0,0 +1,16 @@ +{ + "name": "winpty", + "version": "0.4.3", + "description": "winpty is a Windows software package providing an interface similar to a Unix pty-master for communicating with Windows console programs", + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index bc614aee347b8e..338f619a95d690 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5416,6 +5416,10 @@ "baseline": "3.0.0", "port-version": 10 }, + "ptyqt": { + "baseline": "0.6.3", + "port-version": 0 + }, "pugixml": { "baseline": "1.11.4", "port-version": 1 @@ -7152,6 +7156,10 @@ "baseline": "4.1.3", "port-version": 6 }, + "winpty": { + "baseline": "0.4.3", + "port-version": 0 + }, "winreg": { "baseline": "4.1.2", "port-version": 0 diff --git a/versions/p-/ptyqt.json b/versions/p-/ptyqt.json new file mode 100644 index 00000000000000..98a380ff521bb7 --- /dev/null +++ b/versions/p-/ptyqt.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f1290a650fa42cb4cb9caf9fe04d47d2b3506248", + "version": "0.6.3", + "port-version": 0 + } + ] +} diff --git a/versions/w-/winpty.json b/versions/w-/winpty.json new file mode 100644 index 00000000000000..3ee29ec3b893e6 --- /dev/null +++ b/versions/w-/winpty.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5e8c617e9c5e12b7e760808bdea82f3c3ccc6153", + "version": "0.4.3", + "port-version": 0 + } + ] +} From 8437e61250fbe2e9d58f33622c47aef6bb6b728c Mon Sep 17 00:00:00 2001 From: Michal Cepek <93604224+mc-askia@users.noreply.github.com> Date: Fri, 19 Nov 2021 05:53:45 +0100 Subject: [PATCH 1194/1858] [unixodbc] update to v2.3.9 (#21432) * [unixODBC] update to 2.3.9 * [unixodbc] convenience update for dynamic/static linking of ltdl and Iconv * [unixodbc] update to 2.3.9 - review findings --- ports/unixodbc/portfile.cmake | 23 ++++++++++++++--------- ports/unixodbc/unixodbcConfig.cmake | 19 +++++++++++++++++-- ports/unixodbc/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/u-/unixodbc.json | 5 +++++ 5 files changed, 39 insertions(+), 15 deletions(-) diff --git a/ports/unixodbc/portfile.cmake b/ports/unixodbc/portfile.cmake index 6f87f034f147ec..cc92b8c84fad05 100644 --- a/ports/unixodbc/portfile.cmake +++ b/ports/unixodbc/portfile.cmake @@ -1,18 +1,23 @@ -vcpkg_fail_port_install(ON_TARGET "UWP" "Windows") vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO lurcher/unixODBC - REF 2.3.7 - SHA512 94e95730304990fc5ed4f76ebfb283d8327a59a3329badaba752a502a2d705549013fd95f0c92704828c301eae54081c8704acffb412fd1e1a71f4722314cec0 - HEAD_REF master + OUT_SOURCE_PATH SOURCE_PATH + REPO lurcher/unixODBC + REF v2.3.9 + SHA512 473f8d39f5976b4c34394d880d6e511b73e33a1fbd6b828a0929787983cd9b5fe7e16776ed51776ce44b54aa61c62be689c0731489b3989acb99c135fb492ec5 + HEAD_REF master ) set(ENV{CFLAGS} "$ENV{CFLAGS} -Wno-error=implicit-function-declaration") + +if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_LINUX) + list(APPEND OPTIONS --with-included-ltdl) +endif() + vcpkg_configure_make( - SOURCE_PATH "${SOURCE_PATH}" - AUTOCONFIG - COPY_SOURCE + SOURCE_PATH "${SOURCE_PATH}" + AUTOCONFIG + COPY_SOURCE + OPTIONS ${OPTIONS} ) vcpkg_install_make() diff --git a/ports/unixodbc/unixodbcConfig.cmake b/ports/unixodbc/unixodbcConfig.cmake index c0bd25993eaf15..e8565517a227d2 100644 --- a/ports/unixodbc/unixodbcConfig.cmake +++ b/ports/unixodbc/unixodbcConfig.cmake @@ -1,11 +1,26 @@ -function(set_library_target NAMESPACE LIB_NAME DEBUG_LIB_FILE_NAME RELEASE_LIB_FILE_NAME INCLUDE_DIR) +function(set_library_target NAMESPACE LIB_NAME DEBUG_DIR RELEASE_DIR INCLUDE_DIR) add_library(${NAMESPACE}::${LIB_NAME} STATIC IMPORTED) + + find_library (RELEASE_LIB_FILE_NAME NAMES "lib${LIB_NAME}.a" PATHS ${RELEASE_DIR} NO_DEFAULT_PATH) + if (RELEASE_LIB_FILE_NAME) + set(LIBODBC_USE_STATIC_LIB true) + endif() + find_library (RELEASE_LIB_FILE_NAME NAMES ${LIB_NAME} PATHS ${RELEASE_DIR} NO_DEFAULT_PATH) + find_library (DEBUG_LIB_FILE_NAME NAMES "lib${LIB_NAME}.a" PATHS ${DEBUG_DIR} NO_DEFAULT_PATH) + if (DEBUG_LIB_FILE_NAME) + set(LIBODBC_USE_STATIC_LIB true) + endif() + find_library (DEBUG_LIB_FILE_NAME NAMES ${LIB_NAME} PATHS ${DEBUG_DIR} NO_DEFAULT_PATH) set_target_properties(${NAMESPACE}::${LIB_NAME} PROPERTIES IMPORTED_CONFIGURATIONS "RELEASE;DEBUG" IMPORTED_LOCATION_RELEASE "${RELEASE_LIB_FILE_NAME}" IMPORTED_LOCATION_DEBUG "${DEBUG_LIB_FILE_NAME}" INTERFACE_INCLUDE_DIRECTORIES "${INCLUDE_DIR}" ) + if(LIBODBC_USE_STATIC_LIB) + find_package(Iconv MODULE) + set_property(TARGET ${NAMESPACE}::${LIB_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS} Iconv::Iconv) + endif() set(${NAMESPACE}_${LIB_NAME}_FOUND 1) endfunction() @@ -13,4 +28,4 @@ get_filename_component(ROOT "${CMAKE_CURRENT_LIST_FILE}" PATH) get_filename_component(ROOT "${ROOT}" PATH) get_filename_component(ROOT "${ROOT}" PATH) -set_library_target("UNIX" "odbc" "${ROOT}/debug/lib/libodbc.so" "${ROOT}/lib/libodbc.so" "${ROOT}/include/") \ No newline at end of file +set_library_target("UNIX" "odbc" "${ROOT}/debug/lib/" "${ROOT}/lib/" "${ROOT}/include/") \ No newline at end of file diff --git a/ports/unixodbc/vcpkg.json b/ports/unixodbc/vcpkg.json index 01162834c45ee9..eace4508be5779 100644 --- a/ports/unixodbc/vcpkg.json +++ b/ports/unixodbc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "unixodbc", - "version-string": "2.3.7", - "port-version": 4, + "version": "2.3.9", "description": "unixODBC is an Open Source ODBC sub-system and an ODBC SDK for Linux, Mac OSX, and UNIX", "homepage": "https://github.com/lurcher/unixODBC", "supports": "osx | linux" diff --git a/versions/baseline.json b/versions/baseline.json index 338f619a95d690..36aa4eff0659f5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6917,8 +6917,8 @@ "port-version": 3 }, "unixodbc": { - "baseline": "2.3.7", - "port-version": 4 + "baseline": "2.3.9", + "port-version": 0 }, "unqlite": { "baseline": "1.1.9", diff --git a/versions/u-/unixodbc.json b/versions/u-/unixodbc.json index 4df7f4ffb23eb6..59f0979ab87bda 100644 --- a/versions/u-/unixodbc.json +++ b/versions/u-/unixodbc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7576aa3f19845c2388e7786118082d4cfa9efb49", + "version": "2.3.9", + "port-version": 0 + }, { "git-tree": "d18b08c03d4a7b07f4bbbed662baac83955af86c", "version-string": "2.3.7", From e64ea4b283d08c25acce8a745426235980b07777 Mon Sep 17 00:00:00 2001 From: Charles Helmich Date: Thu, 18 Nov 2021 21:54:17 -0700 Subject: [PATCH 1195/1858] [fontconfig] Fix dead link to homepage (#21416) * [fontconfig] Fix dead link to homepage * [fontconfig] Properly update baseline * Update version database --- ports/fontconfig/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index c0e13fdb83c94a..b7f1469804f2d8 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,8 +1,9 @@ { "name": "fontconfig", "version": "2.13.94", + "port-version": 1, "description": "Library for configuring and customizing font access.", - "homepage": "https://www.freedesktop.org/software/fontconfig/front.html", + "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "dependencies": [ "dirent", "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 36aa4eff0659f5..b37529521b842f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2218,7 +2218,7 @@ }, "fontconfig": { "baseline": "2.13.94", - "port-version": 0 + "port-version": 1 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index f484792148f928..51b0daf242b00f 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "606b2d7ca0ba11e29552311100b66d8c5052faeb", + "version": "2.13.94", + "port-version": 1 + }, { "git-tree": "73929965b1d7992064fec1f69c6225a3d73a262b", "version": "2.13.94", From 71fa5afc693a22f2e2938904fbbc39915ebf2bf4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 19 Nov 2021 05:56:16 +0100 Subject: [PATCH 1196/1858] [ace] Upgrade to ACE 7.0.5, added myself as maintainer (#21322) * [ace] Upgrade to ACE 7.0.4, added myself as maintainer, added some todo's for ACE 7.0.5 when it becomes available * ports/ace/portfile.cmake: * ports/ace/vcpkg.json: * [ace] Update port file * ports/ace/vcpkg.json: * [ace] Upgrade to 7.0.4 * [ace] Updated version database * update version * [ace] Upgrade to 7.0.5 * ports/ace/portfile.cmake: * ports/ace/vcpkg.json: * [ace] Updated version database * [ace] Make platform toolset more maintainable * ports/ace/portfile.cmake: * Updated version database Co-authored-by: Jonliu1993 <13720414433@163.com> --- ports/ace/portfile.cmake | 34 ++++++++++------------------------ ports/ace/vcpkg.json | 4 ++-- versions/a-/ace.json | 5 +++++ versions/baseline.json | 4 ++-- 4 files changed, 19 insertions(+), 28 deletions(-) diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake index 1be127756bcaa3..5c49c9284aba69 100644 --- a/ports/ace/portfile.cmake +++ b/ports/ace/portfile.cmake @@ -1,7 +1,7 @@ # Using zip archive under Linux would cause sh/perl to report "No such file or directory" or "bad interpreter" # when invoking `prj_install.pl`. # So far this issue haven't yet be triggered under WSL 1 distributions. Not sure the root cause of it. -set(ACE_VERSION 7.0.3) +set(ACE_VERSION 7.0.5) string(REPLACE "." "_" ACE_VERSION_DIRECTORY ${ACE_VERSION}) if("tao" IN_LIST FEATURES) @@ -10,14 +10,14 @@ if("tao" IN_LIST FEATURES) vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.zip" FILENAME ACE-TAO-${ACE_VERSION}.zip - SHA512 714d2c25bd4be44a03d350b2457b613b5d2d079fc294f287d10968ed02af5c9c82a2a0c10937acf46a4babfd4582cdc5fa23d6080dadd5cbc4f7f694037033f9 + SHA512 3ea0cc7b35433d7c41f51137caacd394a976cf4d5c2972a35015901b3ba172bacff0216a3146bf632b929a63853b7123019382c22d14c6d64e43a71a61b88023 ) else() # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz" FILENAME ACE-TAO-${ACE_VERSION}.tar.gz - SHA512 e48df1c63bfd02f3a14d049efbcb9a2f476597deaa2b9259d4d852ddfea2319af14e6a1071139b091bff856619e11c650771bfe92c3220d198ec6e931cdd35de + SHA512 65c6557f72a57dc137882bbf6cbb009ae2e403c9848e3e4c3165f1ed55865c5e08fc0226dcf715b33bfa501b13b3863f5c40403791b0dcd29b7c88fec20a9660 ) endif() else() @@ -26,14 +26,14 @@ else() vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.zip" FILENAME ACE-src-${ACE_VERSION}.zip - SHA512 3232ea5437b5fa4a36f4b9d5586c1435a5e2f2dcb34770919a1d1dfe6ebe12e33b316f3c0a1275cdc40c12135800f8cb000ac12b4775f9c31d3ddc48b41bd375 + SHA512 73707c92a0533ab60f090cfb620d508755b8267e2b83fb52d9903c4d780d2e2b504545433fdbe34801d4895cf938ecc5a5f26c34528851080bcce07f5a501ac1 ) else(VCPKG_TARGET_IS_WINDOWS) # VCPKG_TARGET_IS_LINUX vcpkg_download_distfile(ARCHIVE URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz" FILENAME ACE-src-${ACE_VERSION}.tar.gz - SHA512 019ec5c9f23c103d659ec57f6c7bfda3d6d12fc4ca77373353d6232c5fa24c03ffba222af45bd4afe997f02a81f834546cfbcb0e667000857b6e12f2ca3effaa + SHA512 6e5e43e600763e612c292cb88443e4dce1be94d049e2a784c5a4d4720314b484cccec4f7f05534c6ef824d86bef8bfe4ff5bce5f7998896cdaa599302b5b2562 ) endif() endif() @@ -89,12 +89,14 @@ endif() # Add ace/config.h file # see https://htmlpreview.github.io/?https://github.com/DOCGroup/ACE_TAO/blob/master/ACE/ACE-INSTALL.html if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_PLATFORM_TOOLSET MATCHES "v142") - set(SOLUTION_TYPE vs2019) + if(VCPKG_PLATFORM_TOOLSET MATCHES "v140") + set(SOLUTION_TYPE vc14) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(SOLUTION_TYPE vs2017) + elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142") + set(SOLUTION_TYPE vs2019) else() - set(SOLUTION_TYPE vc14) + set(SOLUTION_TYPE vs2022) endif() file(WRITE ${ACE_SOURCE_PATH}/config.h "#include \"ace/config-windows.h\"") elseif(VCPKG_TARGET_IS_LINUX) @@ -310,22 +312,6 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() endif() - # remove (erroneous) duplicate libs - if("tao" IN_LIST FEATURES) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(REMOVE - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosconcurrency.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosevent.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_coslifecycle.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosnaming.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_cosnotification.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_costrading.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_imr_activator.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_imr_locator.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/tao_rtevent.lib) - endif() - endif() - vcpkg_clean_msbuild() elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) FIND_PROGRAM(MAKE make) diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json index 55a5b76ece4662..1c6cc5e7284238 100644 --- a/ports/ace/vcpkg.json +++ b/ports/ace/vcpkg.json @@ -1,7 +1,7 @@ { "name": "ace", - "version": "7.0.3", - "port-version": 3, + "version": "7.0.5", + "maintainers": "Johnny Willemsen ", "description": "The ADAPTIVE Communication Environment", "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html", "features": { diff --git a/versions/a-/ace.json b/versions/a-/ace.json index f6081bc42fafe6..465a32bcd48a7f 100644 --- a/versions/a-/ace.json +++ b/versions/a-/ace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bcc74bda3a7d8c6a93ff6ff5866de20612661fc3", + "version": "7.0.5", + "port-version": 0 + }, { "git-tree": "c58c295074b4a00a80b4e684f9a876ed369cdd49", "version": "7.0.3", diff --git a/versions/baseline.json b/versions/baseline.json index b37529521b842f..00d7cb54495032 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -17,8 +17,8 @@ "port-version": 1 }, "ace": { - "baseline": "7.0.3", - "port-version": 3 + "baseline": "7.0.5", + "port-version": 0 }, "activemq-cpp": { "baseline": "3.9.5", From a9174bdaa52fa8ca8bd84877f8c0cedc06dd4837 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 19 Nov 2021 05:57:02 +0100 Subject: [PATCH 1197/1858] [docs] Document `VCPKG_BUILD_TYPE` (#21469) * [docs] Document `VCPKG_BUILD_TYPE` * Update docs/users/triplets.md Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- docs/users/triplets.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/users/triplets.md b/docs/users/triplets.md index 5394aa59cb2d1f..8aba906f369b32 100644 --- a/docs/users/triplets.md +++ b/docs/users/triplets.md @@ -43,6 +43,9 @@ Specifies the preferred library linkage. Valid options are `dynamic` and `static`. Note that libraries can ignore this setting if they do not support the preferred linkage type. +### VCPKG_BUILD_TYPE +You can set this value to `release` to only build release versions of the ports. By default this value is empty and release and debug versions of a port are built. + ### VCPKG_CMAKE_SYSTEM_NAME Specifies the target platform. From 65c6dcc05a8cbd981a8b6b9e7214f9ea67c00f89 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Fri, 19 Nov 2021 06:02:06 +0100 Subject: [PATCH 1198/1858] [dcmtk] no absolute paths (#21277) --- ports/dcmtk/portfile.cmake | 20 ++++++++++++-------- ports/dcmtk/usage | 18 ++++++++++++++++++ ports/dcmtk/vcpkg.json | 14 ++++++++++++-- versions/baseline.json | 2 +- versions/d-/dcmtk.json | 5 +++++ 5 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 ports/dcmtk/usage diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index a9b60e95a92de0..7e792dfed6126b 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -9,9 +9,8 @@ vcpkg_from_github( PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DDCMTK_WITH_DOXYGEN=OFF -DDCMTK_WITH_ZLIB=OFF @@ -34,13 +33,18 @@ vcpkg_configure_cmake( -DINSTALL_OTHER=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCMTK_PREFIX \"${CURRENT_PACKAGES_DIR}\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCM_DICT_DEFAULT_PATH \"${CURRENT_PACKAGES_DIR}/share/dcmtk/dicom.dic:${CURRENT_PACKAGES_DIR}/share/dcmtk/private.dic\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_CONFIGURATION_DIR \"${CURRENT_PACKAGES_DIR}/etc/dcmtk/\"" "") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/dcmtk RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/dcmtk" RENAME copyright) diff --git a/ports/dcmtk/usage b/ports/dcmtk/usage new file mode 100644 index 00000000000000..7702d1c408198f --- /dev/null +++ b/ports/dcmtk/usage @@ -0,0 +1,18 @@ +The package dcmtk provides CMake targets: + + find_package(DCMTK CONFIG REQUIRED) + # Note: 23 target(s) were omitted. + target_link_libraries(main PRIVATE cmr i2d ijg8 dcmfg) + +Add the following cmake code to your CMakeLists.txt to create definitions for DCMTK + if ("${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" STREQUAL "/") + message(WARNING "No vcpkg install dir found, DCMTK definitions are not set") + else() + target_compile_definitions(main + PUBLIC + "DCMTK_PREFIX=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" + "DCM_DICT_DEFAULT_PATH=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/dicom.dic:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/private.dic" + "DEFAULT_CONFIGURATION_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/etc/dcmtk/" + "DEFAULT_SUPPORT_DATA_DIR=${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/dcmtk/" + ) + endif() diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index a75b5a7bd4bf44..10616156b799d6 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,6 +1,16 @@ { "name": "dcmtk", "version-string": "3.6.6", - "port-version": 1, - "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard." + "port-version": 2, + "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 00d7cb54495032..0b6fbac7502543 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1786,7 +1786,7 @@ }, "dcmtk": { "baseline": "3.6.6", - "port-version": 1 + "port-version": 2 }, "debug-assert": { "baseline": "1.3.3", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index cf145878ee6b83..98820308ec2379 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "24716759e4aa3fb67b014163ae3be95ad88120b6", + "version-string": "3.6.6", + "port-version": 2 + }, { "git-tree": "6b830172b906fea2468685175d0ecca5f374217c", "version-string": "3.6.6", From 4858fef741e756cd35d6cb3dada0aeb5c6d9a882 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 19 Nov 2021 06:25:08 +0100 Subject: [PATCH 1199/1858] [netcdf-c] Update to 4.8.1, revise features (#21239) * Consolidate netcdf-c ZLIB patching * Update to 4.8.1, refresh patches * Resolve parameter warning * Decouple netcdf-4 feature from hdf5 * Expose NCZarr features * Break vcpkg CI cascade * Fix hdf5 szip support detection for static linkage * Allow curl, hdf5, libzip with minimal dependencies * Disable fatal warnings on uwp * Update versions * Fix libzip dependency * Fix and simplify szip config patch * Revert nczarr-s3 feature for now * Update versions * [skip actions] CI * [skip actions] Debug ci failure * Revert "[skip actions] Debug ci failure" This reverts commit 03f3d52623026e9f16f8be067a07499aa5788b55. --- ports/hdf5/pkgconfig-requires.patch | 13 ++- ports/hdf5/szip.patch | 33 +++---- ports/hdf5/vcpkg.json | 1 + ports/netcdf-c/fix-dependency-libmath.patch | 4 +- ports/netcdf-c/fix-dependency-libzip.patch | 34 +++++++ ports/netcdf-c/fix-dependency-zlib.patch | 6 +- ports/netcdf-c/fix-linkage-error.patch | 10 +-- ports/netcdf-c/fix-manpage-msys.patch | 4 +- ports/netcdf-c/fix-pkgconfig.patch | 5 +- ports/netcdf-c/no-install-deps.patch | 4 +- ports/netcdf-c/portfile.cmake | 47 +++++++--- ports/netcdf-c/use_targets.patch | 99 ++++++++------------- ports/netcdf-c/vcpkg.json | 73 +++++++++++++-- versions/baseline.json | 6 +- versions/h-/hdf5.json | 5 ++ versions/n-/netcdf-c.json | 5 ++ 16 files changed, 222 insertions(+), 127 deletions(-) create mode 100644 ports/netcdf-c/fix-dependency-libzip.patch diff --git a/ports/hdf5/pkgconfig-requires.patch b/ports/hdf5/pkgconfig-requires.patch index 14ef3cf6d060c1..c95f0ab43bdc80 100644 --- a/ports/hdf5/pkgconfig-requires.patch +++ b/ports/hdf5/pkgconfig-requires.patch @@ -10,17 +10,14 @@ index 141ab44..66b7efa 100644 else () if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") EXTERNAL_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT}) -@@ -128,8 +129,10 @@ if (HDF5_ENABLE_SZIP_SUPPORT) +@@ -134,6 +135,7 @@ if (HDF5_ENABLE_SZIP_SUPPORT) else() - get_target_property(SZIP_STATIC_LIBRARY szip-shared IMPORTED_LOCATION_${upper_build_type}) + set(SZIP_STATIC_LIBRARY szip-static) endif() + set(szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}") - elseif (TARGET szip-static) - get_target_property(SZIP_STATIC_LIBRARY szip-static IMPORTED_LOCATION_${upper_build_type}) -+ set(szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}") - elseif (SZIP_FOUND) - set (H5_HAVE_FILTER_SZIP 1) - set (H5_HAVE_SZLIB_H 1) + else () + if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING}) diff --git a/CMakeLists.txt b/CMakeLists.txt index b75fdd2..a2e88fd 100644 --- a/CMakeLists.txt diff --git a/ports/hdf5/szip.patch b/ports/hdf5/szip.patch index 27b9c3dde47c7b..98702bbdcfbadc 100644 --- a/ports/hdf5/szip.patch +++ b/ports/hdf5/szip.patch @@ -2,25 +2,20 @@ diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake index d5f801e..141ab44 100644 --- a/CMakeFilters.cmake +++ b/CMakeFilters.cmake -@@ -117,8 +117,20 @@ if (HDF5_ENABLE_SZIP_SUPPORT) - set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES}) - endif () - endif () -+ else() +@@ -124,6 +124,16 @@ if (HDF5_ENABLE_SZIP_SUPPORT) + set (H5_HAVE_LIBSZ 1) + set (SZIP_INCLUDE_DIR_GEN ${SZIP_INCLUDE_DIR}) + set (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIRS} ${SZIP_INCLUDE_DIR}) ++ elseif(1) + find_package(szip CONFIG REQUIRED) - endif () -- if (SZIP_FOUND) -+ string(TOUPPER ${CMAKE_BUILD_TYPE} upper_build_type) -+ # SZIP_STATIC_LIBRARY will be used in cmake and pkgconfig, so it must be a absolute path -+ if (TARGET szip-shared) -+ if (WIN32) -+ get_target_property(SZIP_STATIC_LIBRARY szip-shared IMPORTED_IMPLIB_${upper_build_type}) ++ set(SZIP_INCLUDE_DIRS "") ++ # SZIP_STATIC_LIBRARY will be used in linking, in cmake and in pkgconfig, ++ # but the actual linkage doesn't matter. ++ if (TARGET szip-shared) ++ set(SZIP_STATIC_LIBRARY szip-shared) + else() -+ get_target_property(SZIP_STATIC_LIBRARY szip-shared IMPORTED_LOCATION_${upper_build_type}) ++ set(SZIP_STATIC_LIBRARY szip-static) + endif() -+ elseif (TARGET szip-static) -+ get_target_property(SZIP_STATIC_LIBRARY szip-static IMPORTED_LOCATION_${upper_build_type}) -+ elseif (SZIP_FOUND) - set (H5_HAVE_FILTER_SZIP 1) - set (H5_HAVE_SZLIB_H 1) - set (H5_HAVE_LIBSZ 1) + else () + if (HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF5_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ") + EXTERNAL_SZIP_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${HDF5_ENABLE_SZIP_ENCODING}) diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json index 28d7104d137e97..25c2acc283d523 100644 --- a/ports/hdf5/vcpkg.json +++ b/ports/hdf5/vcpkg.json @@ -1,6 +1,7 @@ { "name": "hdf5", "version": "1.12.1", + "port-version": 1, "description": "HDF5 is a data model, library, and file format for storing and managing data", "homepage": "https://www.hdfgroup.org/downloads/hdf5/", "supports": "!uwp", diff --git a/ports/netcdf-c/fix-dependency-libmath.patch b/ports/netcdf-c/fix-dependency-libmath.patch index d6b4c214e92f91..7b9f6a541618c4 100644 --- a/ports/netcdf-c/fix-dependency-libmath.patch +++ b/ports/netcdf-c/fix-dependency-libmath.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd7c4f8..03b7ccf 100644 +index c36908b..390ac0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -866,7 +866,7 @@ ENDIF() +@@ -944,7 +944,7 @@ OPTION(ENABLE_BYTERANGE "Enable byte-range access to remote datasets.." OFF) # Check for the math library so it can be explicitly linked. IF(NOT WIN32) diff --git a/ports/netcdf-c/fix-dependency-libzip.patch b/ports/netcdf-c/fix-dependency-libzip.patch new file mode 100644 index 00000000000000..9422198a2210bd --- /dev/null +++ b/ports/netcdf-c/fix-dependency-libzip.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b93a141..c3763a7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -957,7 +957,14 @@ OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) + SET(REMOTETESTSERVERS "remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test") + + # See if we have libzip +-FIND_PACKAGE(Zip) ++if(ENABLE_NCZARR_ZIP) ++ find_package(libzip CONFIG REQUIRED) ++ set(Zip_LIBRARIES libzip::zip) ++ set(Zip_FOUND TRUE) ++else() ++ set(Zip_LIBRARIES "") ++ set(Zip_FOUND FALSE) ++endif() + + # Define a test flag for have curl library + IF(Zip_FOUND) +diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in +index b3be259..72b4b25 100644 +--- a/netCDFConfig.cmake.in ++++ b/netCDFConfig.cmake.in +@@ -15,6 +15,9 @@ set(netCDF_LIBRARIES netCDF::netcdf) + include(CMakeFindDependencyMacro) + find_dependency(HDF5 CONFIG) + find_dependency(CURL CONFIG) ++if(@ENABLE_NCZARR_ZIP@) ++ find_dependency(libzip CONFIG) ++endif() + include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") + + # Compiling Options diff --git a/ports/netcdf-c/fix-dependency-zlib.patch b/ports/netcdf-c/fix-dependency-zlib.patch index 52c5d2ecdaef94..a7ec3a91a1499d 100644 --- a/ports/netcdf-c/fix-dependency-zlib.patch +++ b/ports/netcdf-c/fix-dependency-zlib.patch @@ -1,12 +1,12 @@ diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index 5b578f7..0731460 100644 +index be72612..5e1692f 100644 --- a/liblib/CMakeLists.txt +++ b/liblib/CMakeLists.txt -@@ -58,7 +58,7 @@ ENDIF() +@@ -67,7 +67,7 @@ ENDIF() SET(TLL_LIBS "") --SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) +SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM}) # Add extra dependencies specified via NC_EXTRA_DEPS diff --git a/ports/netcdf-c/fix-linkage-error.patch b/ports/netcdf-c/fix-linkage-error.patch index e71c30fdef4859..df2539aba6cee1 100644 --- a/ports/netcdf-c/fix-linkage-error.patch +++ b/ports/netcdf-c/fix-linkage-error.patch @@ -1,9 +1,9 @@ diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index 8aeeab7..5b578f7 100644 +index 9e126ec..1363d35 100644 --- a/liblib/CMakeLists.txt +++ b/liblib/CMakeLists.txt -@@ -70,8 +70,14 @@ ENDIF() - IF(USE_HDF5 OR USE_NETCDF4) +@@ -79,8 +79,14 @@ ENDIF() + IF(USE_HDF5) if(TARGET hdf5::hdf5-shared) SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) + if(USE_PARALLEL) @@ -15,5 +15,5 @@ index 8aeeab7..5b578f7 100644 + list(APPEND TLL_LIBS ${MPI_C_LIBRARIES}) + endif() endif() - ENDIF() - + elseif(0) + IF(NOT MSVC) diff --git a/ports/netcdf-c/fix-manpage-msys.patch b/ports/netcdf-c/fix-manpage-msys.patch index 24374c95e62469..ec087dc4fce02c 100644 --- a/ports/netcdf-c/fix-manpage-msys.patch +++ b/ports/netcdf-c/fix-manpage-msys.patch @@ -1,8 +1,8 @@ diff --git a/libsrc/CMakeLists.txt b/libsrc/CMakeLists.txt -index 65a3f87..30a008d 100644 +index 4583733..20ce3bf 100644 --- a/libsrc/CMakeLists.txt +++ b/libsrc/CMakeLists.txt -@@ -61,7 +61,7 @@ IF(HAVE_M4) +@@ -64,7 +64,7 @@ IF(HAVE_M4) IF(NOT MSVC) ADD_CUSTOM_TARGET(manpage ALL diff --git a/ports/netcdf-c/fix-pkgconfig.patch b/ports/netcdf-c/fix-pkgconfig.patch index f7827d6cb50c10..6fff98ac2ba61b 100644 --- a/ports/netcdf-c/fix-pkgconfig.patch +++ b/ports/netcdf-c/fix-pkgconfig.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 57d2d4b..3de6f8c 100644 +index 390ac0a..4bcd909 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1892,6 +1892,20 @@ LIST(REMOVE_DUPLICATES LINKFLAGS) +@@ -2100,6 +2100,21 @@ STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") SET(LIBS ${NC_LIBS}) SET(NC_LIBS "-lnetcdf") @@ -17,6 +17,7 @@ index 57d2d4b..3de6f8c 100644 +replace_pkgconfig_module("-lhdf5_hl" "hdf5_hl") +replace_pkgconfig_module("-lhdf5" "hdf5") +replace_pkgconfig_module("-lmpi" "ompi-c") ++replace_pkgconfig_module("-lzip" "libzip") +replace_pkgconfig_module("-lCURL[^ ]*" "libcurl") +replace_pkgconfig_module("-lZLIB[^ ]*" "zlib") + diff --git a/ports/netcdf-c/no-install-deps.patch b/ports/netcdf-c/no-install-deps.patch index 535a0dc088a5bc..63feba87306351 100644 --- a/ports/netcdf-c/no-install-deps.patch +++ b/ports/netcdf-c/no-install-deps.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd7c4f8..95fb01c 100644 +index 6b39f0e..507eb4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1830,7 +1830,7 @@ ADD_SUBDIRECTORY(docs) +@@ -2028,7 +2028,7 @@ ADD_SUBDIRECTORY(docs) # install them in the binary dir. Grab all of the .libs, put them # in the libdir. ## diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index f51081d8be893b..36282b471c3d98 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -1,17 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Unidata/netcdf-c - REF 26fba54a58fa02af92d84441ed90b417c1d08161 # v4.7.4 - SHA512 7144374b5bd3574ea422de07ffb30fecc4e5f560f9b46f62762cc0cce511dd33068b8df9244fe94ae3cc7b3a9bb9fe398c7e67c3e5ac2109768e5a9b984f24fb + REF cd6173f472b778fa0e558982c59f7183aa5b8e47 # v4.8.1 + SHA512 e965b9c865f31abcd0ae045cb709a41710e72bcf5bd237972cd62688f0f099f1b12be316a448d22315b1c73eb99fae3ea38072e9a3646a4f70ba42507d82f537 HEAD_REF master PATCHES no-install-deps.patch + fix-dependency-zlib.patch use_targets.patch fix-dependency-libmath.patch fix-linkage-error.patch fix-pkgconfig.patch - fix-dependency-zlib.patch fix-manpage-msys.patch + fix-dependency-libzip.patch ) #Remove outdated find modules @@ -19,22 +20,44 @@ file(REMOVE "${SOURCE_PATH}/cmake/modules/FindSZIP.cmake") file(REMOVE "${SOURCE_PATH}/cmake/modules/FindZLIB.cmake") file(REMOVE "${SOURCE_PATH}/cmake/modules/windows/FindHDF5.cmake") -if(VCPKG_CRT_LINKAGE STREQUAL "static") - set(NC_USE_STATIC_CRT ON) +if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_MINGW) + set(CRT_OPTION "") +elseif(VCPKG_CRT_LINKAGE STREQUAL "static") + set(CRT_OPTION -DNC_USE_STATIC_CRT=ON) else() - set(NC_USE_STATIC_CRT OFF) + set(CRT_OPTION -DNC_USE_STATIC_CRT=OFF) endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES dap ENABLE_DAP netcdf-4 ENABLE_NETCDF_4 - netcdf-4 USE_HDF5 + hdf5 ENABLE_HDF5 + nczarr ENABLE_NCZARR + nczarr-zip ENABLE_NCZARR_ZIP tools BUILD_UTILITIES - INVERTED_FEATURES - dap CMAKE_DISABLE_FIND_PACKAGE_CURL - netcdf-4 CMAKE_DISABLE_FIND_PACKAGE_HDF5 -) + ) + +if(NOT ENABLE_DAP AND NOT ENABLE_NCZARR) + list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_CURL=ON") +endif() + +if(ENABLE_HDF5) + # Fix hdf5 szip support detection for static linkage. + x_vcpkg_pkgconfig_get_modules( + PREFIX HDF5 + MODULES hdf5 + LIBRARIES + ) + if(HDF5_LIBRARIES_RELEASE MATCHES "szip") + list(APPEND FEATURE_OPTIONS "-DUSE_SZIP=ON") + endif() +endif() + +if(VCPKG_TARGET_IS_UWP) + set(ENV{CFLAGS} "$ENV{CFLAGS} /wd4996 /wd4703") + set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} /wd4996 /wd4703") +endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -46,7 +69,7 @@ vcpkg_cmake_configure( -DENABLE_FILTER_TESTING=OFF -DENABLE_DAP_REMOTE_TESTS=OFF -DDISABLE_INSTALL_DEPENDENCIES=ON - -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} + ${CRT_OPTION} ${FEATURE_OPTIONS} ) diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch index d15ab749524294..541be65b593967 100644 --- a/ports/netcdf-c/use_targets.patch +++ b/ports/netcdf-c/use_targets.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd7c4f8..9e09cf3 100644 +index 507eb4c..c36908b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -430,7 +430,6 @@ IF(NC_EXTRA_DEPS) +@@ -433,7 +433,6 @@ IF(NC_EXTRA_DEPS) SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}") ENDFOREACH() MESSAGE("Extra deps: ${EXTRA_DEPS}") @@ -10,7 +10,7 @@ index bd7c4f8..9e09cf3 100644 SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS}) ENDIF() ### -@@ -598,15 +597,6 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -628,15 +627,6 @@ IF(USE_HDF5) # we will use a static library. This can be toggled # by explicitly modifying NC_FIND_SHARED_LIBS. ## @@ -26,7 +26,7 @@ index bd7c4f8..9e09cf3 100644 ##### # First, find the C and HL libraries. -@@ -619,7 +609,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -649,7 +639,7 @@ IF(USE_HDF5) SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME}) FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE}) ELSE(MSVC) @@ -35,7 +35,7 @@ index bd7c4f8..9e09cf3 100644 ENDIF(MSVC) ## -@@ -701,6 +691,19 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +@@ -726,6 +716,19 @@ IF(USE_HDF5) SET(HDF5_C_LIBRARY hdf5) ENDIF() ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) @@ -55,27 +55,17 @@ index bd7c4f8..9e09cf3 100644 FIND_PACKAGE(Threads) -@@ -728,17 +731,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS) - - #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip. -- CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP) -+ set(USE_SZIP ${HDF5_ENABLE_SZIP_SUPPORT}) +@@ -745,6 +748,8 @@ IF(USE_HDF5) IF(USE_SZIP) -- FIND_LIBRARY(SZIP NAMES szip sz) -- IF(SZIP) - SET(HAVE_H5Z_SZIP 1) -- SET(SZIP_LIBRARY ${SZIP}) -- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP}) -- MESSAGE(STATUS "HDF5 has szip.") -- ELSE() -- MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.") -- ENDIF() - ENDIF() - - CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS) -@@ -788,8 +783,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - ENDIF(USE_HDF5 OR ENABLE_NETCDF_4) + # If user has specified the `SZIP_LIBRARY`, use it; otherwise try to find... + IF(NOT SZIP_LIBRARY) ++ set(SZIP_LIBRARY "") ++ ELSEIF(0) + FIND_LIBRARY(SZIP PATH NAMES szip sz) + SET(SZIP_LIBRARY ${SZIP}) + IF(NOT SZIP) +@@ -847,8 +852,7 @@ IF(USE_HDF5) + ENDIF(USE_HDF5) # See if we have libcurl -FIND_PACKAGE(CURL) @@ -83,63 +73,47 @@ index bd7c4f8..9e09cf3 100644 +FIND_PACKAGE(CURL CONFIG) INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS}) - # Check to see if CURLOPT_USERNAME is defined. -@@ -1893,7 +1887,6 @@ ENDIF() - - STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") + # Define a test flag for have curl library +@@ -2089,10 +2093,9 @@ IF(NC_LIBS) + STRING(REPLACE "-lhdf5::hdf5_hl-static" "-lhdf5_hl" NC_LIBS ${NC_LIBS}) + ENDIF() +-STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") +- -LIST(REMOVE_DUPLICATES NC_LIBS) ++LIST(REMOVE_ITEM LINKFLAGS "-L") LIST(REMOVE_DUPLICATES LINKFLAGS) ++STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}") SET(LIBS ${NC_LIBS}) + SET(NC_LIBS "-lnetcdf") diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt -index ea9b029..8aeeab7 100644 +index 5e1692f..9e126ec 100644 --- a/liblib/CMakeLists.txt +++ b/liblib/CMakeLists.txt -@@ -58,7 +58,7 @@ ENDIF() - - SET(TLL_LIBS "") - --SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ${ZLIB_LIBRARY}) -+SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) - - # Add extra dependencies specified via NC_EXTRA_DEPS - SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) -@@ -68,27 +68,15 @@ IF(HAVE_LIBDL) +@@ -77,6 +77,12 @@ IF(HAVE_LIBDL) ENDIF() - IF(USE_HDF5 OR USE_NETCDF4) -- IF(NOT MSVC) -- # Some version of cmake define HDF5_hdf5_LIBRARY instead of -- # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES -- IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) -- SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) -- ENDIF() -- IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) -- SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) -- ENDIF() -- # The order of the libraries is important here for static -- # builds: -- # Make sure that HDF5_C_LIBRARY appears *after* -- # HDF5_HL_LIBRARY. -- SET(TLL_LIBS ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -- ELSE() # Windows CMake defines HDF5_LIBRARIES. -- SET(TLL_LIBS ${HDF5_LIBRARIES} ${TLL_LIBS} ${SZIP_LIBRARY}) -- ENDIF() + IF(USE_HDF5) + if(TARGET hdf5::hdf5-shared) + SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-shared hdf5::hdf5_hl-shared) + else() + SET(TLL_LIBS ${TLL_LIBS} hdf5::hdf5-static hdf5::hdf5_hl-static) + endif() ++elseif(0) + IF(NOT MSVC) + # Some version of cmake define HDF5_hdf5_LIBRARY instead of + # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES +@@ -97,7 +103,7 @@ IF(USE_HDF5) ENDIF() - IF(USE_DAP) + IF(FOUND_CURL) - SET(TLL_LIBS ${TLL_LIBS} ${CURL_LIBRARY}) + SET(TLL_LIBS ${TLL_LIBS} CURL::libcurl) ENDIF() IF(USE_HDF4) -@@ -100,7 +88,6 @@ IF(ENABLE_PNETCDF AND PNETCDF) +@@ -118,7 +124,6 @@ IF(ENABLE_S3_SDK) ENDIF() IF(TLL_LIBS) @@ -148,15 +122,14 @@ index ea9b029..8aeeab7 100644 TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS}) diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in -index 9d68eec..b8f6113 100644 +index 9d68eec..b3be259 100644 --- a/netCDFConfig.cmake.in +++ b/netCDFConfig.cmake.in -@@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") +@@ -12,6 +12,9 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") set(netCDF_LIBRARIES netCDF::netcdf) # include target information +include(CMakeFindDependencyMacro) -+find_dependency(ZLIB) +find_dependency(HDF5 CONFIG) +find_dependency(CURL CONFIG) include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake") diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index 256a401b46b678..e1ba70f343dfcc 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -1,7 +1,6 @@ { "name": "netcdf-c", - "version": "4.7.4", - "port-version": 4, + "version": "4.8.1", "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ @@ -16,23 +15,85 @@ ], "default-features": [ "dap", - "netcdf-4" + "nczarr", + "netcdf-4", + "platform-default-features" ], "features": { "dap": { "description": "Build with DAP remote access client support", "dependencies": [ - "curl" + { + "name": "curl", + "default-features": false + } ] }, - "netcdf-4": { - "description": "Build with netCDF-4/HDF5 support", + "hdf5": { + "description": "Build with HDF5 support", "dependencies": [ { "name": "hdf5", + "default-features": false, "features": [ "zlib" ] + }, + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "netcdf-4" + ] + }, + { + "name": "vcpkg-pkgconfig-get-modules", + "host": true + } + ] + }, + "nczarr": { + "description": "Build with NCZarr cloud storage access support", + "dependencies": [ + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "netcdf-4" + ] + } + ] + }, + "nczarr-zip": { + "description": "Build with NCZarr ZIP support", + "dependencies": [ + { + "name": "libzip", + "default-features": false + }, + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "nczarr" + ] + } + ] + }, + "netcdf-4": { + "description": "Build with netCDF-4 support" + }, + "platform-default-features": { + "$comment": "Break vcpkg CI cascade.", + "description": "Enable platform-dependent default features", + "dependencies": [ + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "hdf5" + ], + "platform": "!uwp & !(arm64 & windows)" } ] }, diff --git a/versions/baseline.json b/versions/baseline.json index 0b6fbac7502543..e4a50fdb0e543c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2650,7 +2650,7 @@ }, "hdf5": { "baseline": "1.12.1", - "port-version": 0 + "port-version": 1 }, "healpix": { "baseline": "1.12.10", @@ -4645,8 +4645,8 @@ "port-version": 0 }, "netcdf-c": { - "baseline": "4.7.4", - "port-version": 4 + "baseline": "4.8.1", + "port-version": 0 }, "netcdf-cxx4": { "baseline": "4.3.1", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index 76be320bdbfd15..8ac9d72b84d6bd 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b3c8c63454b3e098a9e03ea654eef206769e31c1", + "version": "1.12.1", + "port-version": 1 + }, { "git-tree": "bf638074020559930d6e73c72bc9937bfef5ba57", "version": "1.12.1", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index 4b1157b9a26e00..8aed42aefaf61f 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e6529a5673ac8494b62443a9fab590ce6810826", + "version": "4.8.1", + "port-version": 0 + }, { "git-tree": "6af71c6bbdb51d1cbbade70010ccf9c628938ac2", "version": "4.7.4", From 425e89d9e32cb9dcd05e305f67ccda479228a2bc Mon Sep 17 00:00:00 2001 From: Christopher Schwartz <71826935+ChristopherSchwartzXRITE@users.noreply.github.com> Date: Fri, 19 Nov 2021 06:28:02 +0100 Subject: [PATCH 1200/1858] [openblas] make openblas build on MinGW (#20986) * [openblas] make openblas build on MinGW * Portfile cleanup: Join separate vcpkg_check_feature calls and add double quotes according to maintainer guidelines. * Portfile cleanup: Migrate vcpkg cmake commands from deprecated to new functions. * Portfile cleanup: Migrate vcpkg cmake commands from deprecated to new functions (2) - missed a spot. * Re-factory code * version * [shogun] Fix include cblas path * version Co-authored-by: JackBoosY --- ports/openblas/install-tools.patch | 22 ++++++ ports/openblas/portfile.cmake | 109 +++++++++++------------------ ports/openblas/vcpkg.json | 13 ++++ ports/shogun/fix-cblas-path.patch | 13 ++++ ports/shogun/portfile.cmake | 1 + ports/shogun/vcpkg.json | 2 +- versions/baseline.json | 4 +- versions/o-/openblas.json | 5 ++ versions/s-/shogun.json | 5 ++ 9 files changed, 102 insertions(+), 72 deletions(-) create mode 100644 ports/openblas/install-tools.patch create mode 100644 ports/shogun/fix-cblas-path.patch diff --git a/ports/openblas/install-tools.patch b/ports/openblas/install-tools.patch new file mode 100644 index 00000000000000..5d9e4061b8802c --- /dev/null +++ b/ports/openblas/install-tools.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake +index 0c126e3..bb0124b 100644 +--- a/cmake/prebuild.cmake ++++ b/cmake/prebuild.cmake +@@ -558,6 +558,8 @@ else(NOT CMAKE_CROSSCOMPILING) + if (NOT ${GETARCH_RESULT}) + MESSAGE(FATAL_ERROR "Compiling getarch failed ${GETARCH_LOG}") + endif () ++ ++ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" DESTINATION bin) + endif () + unset (HAVE_AVX2) + unset (HAVE_AVX) +@@ -601,6 +603,8 @@ execute_process(COMMAND "${BLASHELPER_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIA + if (NOT ${GETARCH2_RESULT}) + MESSAGE(FATAL_ERROR "Compiling getarch_2nd failed ${GETARCH2_LOG}") + endif () ++ ++ install(FILES "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" DESTINATION bin) + endif () + + # use the cmake binary w/ the -E param to run a shell command in a cross-platform way diff --git a/ports/openblas/portfile.cmake b/ports/openblas/portfile.cmake index cec9cf2a98c99e..34e321a6864de5 100644 --- a/ports/openblas/portfile.cmake +++ b/ports/openblas/portfile.cmake @@ -10,17 +10,18 @@ vcpkg_from_github( fix-redefinition-function.patch fix-uwp-build.patch fix-marco-conflict.patch + install-tools.patch ) find_program(GIT NAMES git git.cmd) # sed and awk are installed with git but in a different directory -get_filename_component(GIT_EXE_PATH ${GIT} DIRECTORY) +get_filename_component(GIT_EXE_PATH "${GIT}" DIRECTORY) set(SED_EXE_PATH "${GIT_EXE_PATH}/../usr/bin") # openblas require perl to generate .def for exports vcpkg_find_acquire_program(PERL) -get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY) set(PATH_BACKUP "$ENV{PATH}") vcpkg_add_to_path("${PERL_EXE_PATH}") vcpkg_add_to_path("${SED_EXE_PATH}") @@ -29,15 +30,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES threads USE_THREAD simplethread USE_SIMPLE_THREADED_LEVEL3 + "dynamic-arch" DYNAMIC_ARCH ) set(COMMON_OPTIONS -DBUILD_WITHOUT_LAPACK=ON) -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "dynamic-arch" DYNAMIC_ARCH -) - if(VCPKG_TARGET_IS_OSX) if("dynamic-arch" IN_LIST FEATURES) vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) @@ -45,67 +42,41 @@ if(VCPKG_TARGET_IS_OSX) endif() endif() +set(OPENBLAS_EXTRA_OPTIONS) # for UWP version, must build non uwp first for helper # binaries. -if(VCPKG_TARGET_IS_UWP) - message(STATUS "Building Windows helper files") - set(TEMP_CMAKE_SYSTEM_NAME "${VCPKG_CMAKE_SYSTEM_NAME}") - set(TEMP_CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}") - set(TEMP_TARGET_TRIPLET "${TARGET_TRIPLET}") - unset(VCPKG_CMAKE_SYSTEM_NAME) - unset(VCPKG_CMAKE_SYSTEM_VERSION) - set(TARGET_TRIPLET "x64-windows") - - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${FEATURE_OPTIONS} - ${COMMON_OPTIONS} - -DTARGET=NEHALEM - ) - - # add just built path to environment for gen_config_h.exe, - # getarch.exe and getarch_2nd.exe - vcpkg_add_to_path("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - - # restore target build information - set(VCPKG_CMAKE_SYSTEM_NAME "${TEMP_CMAKE_SYSTEM_NAME}") - set(VCPKG_CMAKE_SYSTEM_VERSION "${TEMP_CMAKE_SYSTEM_VERSION}") - set(TARGET_TRIPLET "${TEMP_TARGET_TRIPLET}") - - message(STATUS "Finished building Windows helper files") - - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${COMMON_OPTIONS} - -DCMAKE_SYSTEM_PROCESSOR=AMD64 - -DVS_WINRT_COMPONENT=TRUE - "-DBLASHELPER_BINARY_DIR=${CURRENT_BUILDTREES_DIR}/x64-windows-rel") - -elseif(VCPKG_TARGET_IS_WINDOWS) - vcpkg_configure_cmake( - PREFER_NINJA - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${COMMON_OPTIONS} - ${FEATURE_OPTIONS} - ) -else() +if(VCPKG_TARGET_IS_UWP) + list(APPEND OPENBLAS_EXTRA_OPTIONS -DCMAKE_SYSTEM_PROCESSOR=AMD64 + "-DBLASHELPER_BINARY_DIR=${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}") +elseif(NOT (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)) string(APPEND VCPKG_C_FLAGS " -DNEEDBUNDERSCORE") # Required to get common BLASFUNC to append extra _ string(APPEND VCPKG_CXX_FLAGS " -DNEEDBUNDERSCORE") - vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - ${COMMON_OPTIONS} - ${FEATURE_OPTIONS} - -DNOFORTRAN=ON - -DBU=_ #required for all blas functions to append extra _ using NAME - ) + list(APPEND OPENBLAS_EXTRA_OPTIONS + -DNOFORTRAN=ON + -DBU=_ #required for all blas functions to append extra _ using NAME + ) endif() +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + ${COMMON_OPTIONS} + ${OPENBLAS_EXTRA_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/OpenBLAS) + +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_copy_tools(TOOL_NAMES getarch AUTO_CLEAN) +endif() +if (EXISTS "${CURRENT_PACKAGES_DIR}/bin/getarch_2nd${VCPKG_HOST_EXECUTABLE_SUFFIX}") + vcpkg_copy_tools(TOOL_NAMES getarch_2nd AUTO_CLEAN) +endif() -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/OpenBLAS TARGET_PATH share/openblas) set(ENV{PATH} "${PATH_BACKUP}") set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/openblas.pc") @@ -128,14 +99,14 @@ vcpkg_fixup_pkgconfig() # openblas do not make the config file , so I manually made this # but I think in most case, libraries will not include these files, they define their own used function prototypes # this is only to quite vcpkg -file(COPY ${CMAKE_CURRENT_LIST_DIR}/openblas_common.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) - -file(READ ${SOURCE_PATH}/cblas.h CBLAS_H) -string(REPLACE "#include \"common.h\"" "#include \"openblas_common.h\"" CBLAS_H "${CBLAS_H}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/cblas.h "${CBLAS_H}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/openblas_common.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -vcpkg_copy_pdbs() +vcpkg_replace_string( + "${SOURCE_PATH}/cblas.h" + "#include \"common.h\"" + "#include \"openblas_common.h\"" +) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/openblas/vcpkg.json b/ports/openblas/vcpkg.json index e0206c35c26925..041c0f3e309b4a 100644 --- a/ports/openblas/vcpkg.json +++ b/ports/openblas/vcpkg.json @@ -1,12 +1,25 @@ { "name": "openblas", "version": "0.3.15", + "port-version": 1, "description": "OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version.", "homepage": "https://github.com/xianyi/OpenBLAS", "dependencies": [ + { + "name": "openblas", + "host": true + }, { "name": "pthread", "platform": "!windows & !uwp" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ], "features": { diff --git a/ports/shogun/fix-cblas-path.patch b/ports/shogun/fix-cblas-path.patch new file mode 100644 index 00000000000000..e21a3723c48a40 --- /dev/null +++ b/ports/shogun/fix-cblas-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/shogun/mathematics/lapack.h b/src/shogun/mathematics/lapack.h +index 6ba466f..f5de479 100644 +--- a/src/shogun/mathematics/lapack.h ++++ b/src/shogun/mathematics/lapack.h +@@ -38,7 +38,7 @@ extern "C" { + #include + #endif + #else +-#include ++#include + #endif + + #ifdef HAVE_ACML diff --git a/ports/shogun/portfile.cmake b/ports/shogun/portfile.cmake index 05ca61af0811c7..454245027a3654 100644 --- a/ports/shogun/portfile.cmake +++ b/ports/shogun/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( cmake-config.in.patch fix-dirent.patch fix-ASSERT-not-found.patch + fix-cblas-path.patch ) vcpkg_find_acquire_program(PYTHON3) diff --git a/ports/shogun/vcpkg.json b/ports/shogun/vcpkg.json index 6711f2bfbf11cd..5ef5cf9444d662 100644 --- a/ports/shogun/vcpkg.json +++ b/ports/shogun/vcpkg.json @@ -1,7 +1,7 @@ { "name": "shogun", "version-string": "6.1.4", - "port-version": 5, + "port-version": 6, "description": "Unified and efficient Machine Learning", "homepage": "https://github.com/shogun-toolbox/shogun", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index e4a50fdb0e543c..8068e1461a7ebc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4870,7 +4870,7 @@ }, "openblas": { "baseline": "0.3.15", - "port-version": 0 + "port-version": 1 }, "opencascade": { "baseline": "7.6.0", @@ -6238,7 +6238,7 @@ }, "shogun": { "baseline": "6.1.4", - "port-version": 5 + "port-version": 6 }, "signalrclient": { "baseline": "1.0.0-beta1-9", diff --git a/versions/o-/openblas.json b/versions/o-/openblas.json index b7a541443a7f5e..7a54f9b2cca3cc 100644 --- a/versions/o-/openblas.json +++ b/versions/o-/openblas.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "048ae3833af8e5633ce86c3174e20c2794fe573d", + "version": "0.3.15", + "port-version": 1 + }, { "git-tree": "2a214e1bac47c70d932caef7d74771c8658b1f7a", "version": "0.3.15", diff --git a/versions/s-/shogun.json b/versions/s-/shogun.json index 185412f8283ee2..8fd9b801eb00ae 100644 --- a/versions/s-/shogun.json +++ b/versions/s-/shogun.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ae86e647188a99b1602164f4614ba54d55cf22a", + "version-string": "6.1.4", + "port-version": 6 + }, { "git-tree": "bc5a003bcb8a42fc935726d0d8de55156318a3db", "version-string": "6.1.4", From 3d55d74a3d26fdfe7aabd943f98317ab7603ee7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 19 Nov 2021 06:29:48 +0100 Subject: [PATCH 1201/1858] [libical] new port (#20965) * new port for libical * ports/libical/portfile.cmake - cleanup * [libical] implement fixes from pull request * [libical] update to 3.0.11, modernize port file * [libical] make rscale a default feature * [libical] update versions * [libical] don't make rscale deault for now, disable on static * [libical] update versions Co-authored-by: Allen Winter --- ports/libical/portfile.cmake | 41 ++++++++++++++++++++++++++++++++++++ ports/libical/vcpkg.json | 25 ++++++++++++++++++++++ versions/baseline.json | 4 ++++ versions/l-/libical.json | 9 ++++++++ 4 files changed, 79 insertions(+) create mode 100644 ports/libical/portfile.cmake create mode 100644 ports/libical/vcpkg.json create mode 100644 versions/l-/libical.json diff --git a/ports/libical/portfile.cmake b/ports/libical/portfile.cmake new file mode 100644 index 00000000000000..93c9355de0cc95 --- /dev/null +++ b/ports/libical/portfile.cmake @@ -0,0 +1,41 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO libical/libical + REF v3.0.11 + SHA512 cdee86c50edc2373ab2024d7d4ae26dd4b9a728dbc13083472c4923c67f61ff3cef7d43edca762c6a11979d2040fc1576a033eaa23a19e58af8f14a7d67fc139 +) + +vcpkg_find_acquire_program(PERL) +get_filename_component(PERL_PATH ${PERL} DIRECTORY) +vcpkg_add_to_path(${PERL_PATH}) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + "rscale" CMAKE_DISABLE_FIND_PACKAGE_ICU +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + list(APPEND FEATURE_OPTIONS -DSTATIC_ONLY=ON) +else() + list(APPEND FEATURE_OPTIONS -DSHARED_ONLY=ON) +endif() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_BDB=ON + -DUSE_BUILTIN_TZDATA=ON + -DICAL_GLIB=OFF + -DICAL_BUILD_DOCS=OFF + -DLIBICAL_BUILD_TESTING=OFF + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(PACKAGE_NAME LibIcal CONFIG_PATH CONFIG_PATH lib/cmake/LibIcal) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libical/vcpkg.json b/ports/libical/vcpkg.json new file mode 100644 index 00000000000000..7ff86fb1199a06 --- /dev/null +++ b/ports/libical/vcpkg.json @@ -0,0 +1,25 @@ +{ + "name": "libical", + "version": "3.0.11", + "description": "Reference implementation of the iCalendar data type and serialization format", + "homepage": "https://github.com/libical/libical", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "rscale": { + "description": "Support for RSCALE element", + "supports": "!static", + "dependencies": [ + "icu" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 8068e1461a7ebc..d57d160de49ed8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3524,6 +3524,10 @@ "baseline": "2019-08-11", "port-version": 1 }, + "libical": { + "baseline": "3.0.11", + "port-version": 0 + }, "libiconv": { "baseline": "1.16", "port-version": 11 diff --git a/versions/l-/libical.json b/versions/l-/libical.json new file mode 100644 index 00000000000000..f6491239927091 --- /dev/null +++ b/versions/l-/libical.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "f4ab3492c90b3d683702cacb90aaea839cfc3d8f", + "version": "3.0.11", + "port-version": 0 + } + ] +} From 73ba9c8213dff606b4a62e68b75144b8e6de2ec0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 19 Nov 2021 06:36:42 +0100 Subject: [PATCH 1202/1858] [libspatialite] Use pkgconfig for nmake and autotools (#20480) * Enable CI for libspatialite:x64-windows-static-md * Use pkgconfig for nmake * Use pkgconfig for autotools; fix mingw * Install pc file for windows * Add feature interface, make GPLv2+ features optional * spatialite-tools need libspatialite[rttopo] * Update versions --- ports/libspatialite/fix-linux-configure.patch | 30 +-- ports/libspatialite/gaiaconfig-msvc.patch | 31 +++ ports/libspatialite/portfile.cmake | 222 ++++++++++++------ ports/libspatialite/vcpkg.json | 30 ++- ports/spatialite-tools/vcpkg.json | 10 +- scripts/ci.baseline.txt | 1 - versions/baseline.json | 4 +- versions/l-/libspatialite.json | 5 + versions/s-/spatialite-tools.json | 5 + 9 files changed, 234 insertions(+), 104 deletions(-) create mode 100644 ports/libspatialite/gaiaconfig-msvc.patch diff --git a/ports/libspatialite/fix-linux-configure.patch b/ports/libspatialite/fix-linux-configure.patch index 426ab3b3527f6f..39883193d53c31 100644 --- a/ports/libspatialite/fix-linux-configure.patch +++ b/ports/libspatialite/fix-linux-configure.patch @@ -18,7 +18,7 @@ index ead87caff..47abb90f0 100644 AC_SUBST([GEOS_LDFLAGS]) AC_SUBST([GEOS_CFLAGS]) # Ensure that we can parse geos_c.h -@@ -335,11 +337,14 @@ if test x"$enable_geos" != "xno"; then +@@ -335,11 +337,13 @@ if test x"$enable_geos" != "xno"; then AC_CHECK_HEADERS([geos_c.h],, [AC_MSG_ERROR([could not find geos_c.h - you may need to specify the directory of a geos-config file using --with-geosconfig])]) CPPFLAGS="$CPPFLAGS_SAVE" # Ensure we can link against libgeos_c @@ -29,34 +29,6 @@ index ead87caff..47abb90f0 100644 LIBS="$LIBS_SAVE" LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c" + fi -+ LIBS="$LIBS $GEOS_LDFLAGS" #----------------------------------------------------------------------- # --enable-controlpoints -@@ -358,7 +363,7 @@ if test x"$enable_geos" != "xno"; then - [--enable-geosadvanced], [enables GEOS advanced features [default=yes]])], - [], [enable_geosadvanced=yes]) - if test x"$enable_geosadvanced" != "xno"; then -- AC_SEARCH_LIBS(GEOSDelaunayTriangulation,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.4.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosadvanced parameter.])) -+ #AC_SEARCH_LIBS(GEOSDelaunayTriangulation,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.4.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosadvanced parameter.])) - AC_DEFINE(GEOS_ADVANCED) - fi - -@@ -369,7 +374,7 @@ if test x"$enable_geos" != "xno"; then - [--enable-geosreentrant], [enables GEOS reentrant (fully thread safe) [default=yes]])], - [], [enable_geosreentrant=yes]) - if test x"$enable_geosreentrant" != "xno"; then -- AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.5.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosreentrant parameter.])) -+ #AC_SEARCH_LIBS(GEOSContext_setErrorMessageHandler_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.5.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geosreentrant parameter.])) - AC_DEFINE(GEOS_REENTRANT) - fi - -@@ -390,7 +395,7 @@ if test x"$enable_geos" != "xno"; then - [--enable-geos370], [enables GEOS 3.7.0 features [default=yes]])], - [], [enable_geos370=yes]) - if test x"$enable_geos370" != "xno"; then -- AC_SEARCH_LIBS(GEOSFrechetDistance_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.7.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geos370 parameter.])) -+ #AC_SEARCH_LIBS(GEOSFrechetDistance_r,geos_c,,AC_MSG_ERROR(['libgeos_c' (>= v.3.7.0) is required but it doesn't seem to be installed on this system. You may need to try re-running configure with a --disable-geos370 parameter.])) - AC_DEFINE(GEOS_370) - fi - diff --git a/ports/libspatialite/gaiaconfig-msvc.patch b/ports/libspatialite/gaiaconfig-msvc.patch new file mode 100644 index 00000000000000..3bf276d70d4dfe --- /dev/null +++ b/ports/libspatialite/gaiaconfig-msvc.patch @@ -0,0 +1,31 @@ +diff --git a/src/headers/spatialite/gaiaconfig-msvc.h b/src/headers/spatialite/gaiaconfig-msvc.h +index 37f0bd1..0053258 100644 +--- a/src/headers/spatialite/gaiaconfig-msvc.h ++++ b/src/headers/spatialite/gaiaconfig-msvc.h +@@ -2,7 +2,7 @@ + /* ./src/headers/spatialite/gaiaconfig-msvc.h.in - manually maintained */ + + /* Should be defined in order to enable GCP support. */ +-#define ENABLE_GCP 1 ++// #define ENABLE_GCP 1 + + /* Should be defined in order to enable GeoPackage support. */ + #define ENABLE_GEOPACKAGE 1 +@@ -11,7 +11,7 @@ + #define ENABLE_LIBXML2 1 + + /* Should be defined in order to enable RTTOPO support. */ +-#define ENABLE_RTTOPO 1 ++// #define ENABLE_RTTOPO 1 + + /* Should be defined in order to enable GEOS_370 support. */ + #define GEOS_370 1 +@@ -32,7 +32,7 @@ + /* #undef OMIT_FREEXL */ + + /* Should be defined in order to disable GEOCALLBACKS support. */ +-#define OMIT_GEOCALLBACKS 1 ++// #define OMIT_GEOCALLBACKS 1 + + /* Should be defined in order to disable GEOS support. */ + /* #undef OMIT_GEOS */ diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake index 0865dda66de08d..20971f65681107 100644 --- a/ports/libspatialite/portfile.cmake +++ b/ports/libspatialite/portfile.cmake @@ -11,62 +11,72 @@ vcpkg_extract_source_archive_ex( PATCHES fix-makefiles.patch fix-linux-configure.patch + gaiaconfig-msvc.patch ) -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_CRT_LINKAGE STREQUAL "dynamic") - set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib") - set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib") - set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib") - set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") - set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") - else() - set(GEOS_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/geos_c.lib ${CURRENT_INSTALLED_DIR}/lib/geos.lib") - set(GEOS_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/geos_cd.lib ${CURRENT_INSTALLED_DIR}/debug/lib/geosd.lib") - set(LIBXML2_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/lib/lzma.lib ws2_32.lib") - set(LIBXML2_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib ${CURRENT_INSTALLED_DIR}/debug/lib/lzmad.lib ws2_32.lib") - set(LIBRTTOPO_LIBS_REL "${CURRENT_INSTALLED_DIR}/lib/librttopo.lib") - set(LIBRTTOPO_LIBS_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/librttopo.lib") +vcpkg_check_features(OUT_FEATURE_OPTIONS unused + FEATURES + freexl ENABLE_FREEXL + gcp ENABLE_GCP + geocallbacks ENABLE_GEOCALLBACKS + rttopo ENABLE_RTTOPO +) + +set(pkg_config_modules geos libxml-2.0 proj sqlite3 zlib) +if(ENABLE_FREEXL) + list(APPEND pkg_config_modules freexl) +endif() +if(ENABLE_RTTOPO) + list(APPEND pkg_config_modules rttopo) +endif() + +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) + set(CL_FLAGS "") + if(NOT ENABLE_FREEXL) + string(APPEND CL_FLAGS " /DOMIT_FREEXL") + endif() + if(ENABLE_GCP) + string(APPEND CL_FLAGS " /DENABLE_GCP") + endif() + if(NOT ENABLE_GEOCALLBACKS) + string(APPEND CL_FLAGS " /DOMIT_GEOCALLBACKS") + endif() + if(ENABLE_RTTOPO) + string(APPEND CL_FLAGS " /DENABLE_RTTOPO") endif() - set(LIBS_ALL_DBG - "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \ - ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \ - ${LIBXML2_LIBS_DBG} \ - ${GEOS_LIBS_DBG} \ - ${LIBRTTOPO_LIBS_DBG} \ - ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib ole32.lib shell32.lib" + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES --msvc-syntax ${pkg_config_modules} + LIBS ) - set(LIBS_ALL_REL - "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \ - ${CURRENT_INSTALLED_DIR}/lib/charset.lib \ - ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \ - ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \ - ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \ - ${LIBXML2_LIBS_REL} \ - ${GEOS_LIBS_REL} \ - ${LIBRTTOPO_LIBS_REL} \ - ${CURRENT_INSTALLED_DIR}/lib/proj.lib ole32.lib shell32.lib" + string(JOIN " " LIBS_ALL_DEBUG + "/LIBPATH:${CURRENT_INSTALLED_DIR}/debug/lib" + "${PKGCONFIG_LIBS_DEBUG}" + iconv.lib charset.lib + ) + string(JOIN " " LIBS_ALL_RELEASE + "/LIBPATH:${CURRENT_INSTALLED_DIR}/lib" + "${PKGCONFIG_LIBS_RELEASE}" + iconv.lib charset.lib ) string(REPLACE "/" "\\\\" INST_DIR "${CURRENT_PACKAGES_DIR}") - list(APPEND OPTIONS_RELEASE - "INST_DIR=${INST_DIR}" "LIBS_ALL=${LIBS_ALL_REL}" - ) - list(APPEND OPTIONS_DEBUG - "LINK_FLAGS=/debug" "INST_DIR=${INST_DIR}\\debug" "LIBS_ALL=${LIBS_ALL_DBG}" - ) + if(ENABLE_RTTOPO) + list(APPEND pkg_config_modules rttopo) + endif() vcpkg_install_nmake( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + "CL_FLAGS=${CL_FLAGS}" OPTIONS_RELEASE - ${OPTIONS_RELEASE} + "INST_DIR=${INST_DIR}" + "LIBS_ALL=${LIBS_ALL_RELEASE}" OPTIONS_DEBUG - ${OPTIONS_DEBUG} + "INST_DIR=${INST_DIR}\\debug" + "LIBS_ALL=${LIBS_ALL_DEBUG}" + "LINK_FLAGS=/debug" ) vcpkg_copy_pdbs() @@ -84,39 +94,84 @@ if(VCPKG_TARGET_IS_WINDOWS) file(RENAME "${CURRENT_PACKAGES_DIR}/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/lib/spatialite.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite_i.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/spatialite.lib") endif() -else() # Build in UNIX - if(VCPKG_TARGET_IS_LINUX) - set(STDLIB stdc++) + + set(infile "${SOURCE_PATH}/spatialite.pc.in") + set(VERSION "${LIBSPATIALITE_VERSION_STR}") + set(libdir [[${prefix}/lib]]) + set(exec_prefix [[${prefix}]]) + list(JOIN pkg_config_modules " " requires_private) + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + set(includedir [[${prefix}/include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/spatialite.pc") + configure_file("${infile}" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" "Libs:" "Requires.private: ${requires_private}\nLibs.private: -liconv -lcharset\nLibs:") + vcpkg_replace_string("${outfile}" " -lm" " ") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + set(includedir [[${prefix}/../include]]) + set(outfile "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/spatialite.pc") + configure_file("${infile}" "${outfile}" @ONLY) + vcpkg_replace_string("${outfile}" "Libs:" "Requires.private: ${requires_private}\nLibs.private: -liconv -lcharset\nLibs:") + vcpkg_replace_string("${outfile}" " -lm" " ") + endif() +else() + if(ENABLE_FREEXL) + set(FREEXL_OPTION "--enable-freexl") + else() + set(FREEXL_OPTION "--disable-freexl") + endif() + if(ENABLE_GCP) + set(GCP_OPTION "--enable-gcp") else() - set(STDLIB c++) + set(GCP_OPTION "--disable-gcp") endif() - if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - SET(EXTRALIBS "-lpthread") + if(ENABLE_GEOCALLBACKS) + set(GEOCALLBACKS_OPTION "--enable-geocallbacks") + else() + set(GEOCALLBACKS_OPTION "--disable-geocallbacks") endif() - list(APPEND OPTIONS_RELEASE - "LIBXML2_LIBS=-lxml2 -llzma" - "GEOS_LDFLAGS=-lgeos_c -lgeos -l${STDLIB}" - ) - list(APPEND OPTIONS_DEBUG - "LIBXML2_LIBS=-lxml2 -llzmad" - "GEOS_LDFLAGS=-lgeos_cd -lgeosd -l${STDLIB}" + if(ENABLE_RTTOPO) + set(RTTOPO_OPTION "--enable-rttopo") + else() + set(RTTOPO_OPTION "--disable-rttopo") + endif() + list(REMOVE_ITEM pkg_config_modules libxml2) # handled properly by configure + x_vcpkg_pkgconfig_get_modules( + PREFIX PKGCONFIG + MODULES ${pkg_config_modules} + LIBS ) - + if(VCPKG_TARGET_IS_MINGW) + # Avoid system libs (as detected by cmake) in exported pc files + set(SYSTEM_LIBS "") + else() + set(SYSTEM_LIBS "\$LIBS") + endif() + # libspatialite needs some targets literally + if(VCPKG_TARGET_IS_ANDROID) + set(TARGET_ALIAS "--target=android") + elseif(VCPKG_TARGET_IS_MINGW) + set(TARGET_ALIAS "--target=mingw32") + elseif(VCPKG_TARGET_IS_OSX) + set(TARGET_ALIAS "--target=macosx") + else() + set(TARGET_ALIAS "") + endif() vcpkg_configure_make( SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG OPTIONS - "LIBS=${EXTRALIBS} -ldl -lm -l${STDLIB}" - "LIBXML2_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include" - "--enable-rttopo" - "--enable-gcp" - "--enable-geocallbacks" + ${TARGET_ALIAS} + ${FREEXL_OPTION} + ${GCP_OPTION} + ${GEOCALLBACKS_OPTION} + ${RTTOPO_OPTION} "--disable-examples" "--disable-minizip" OPTIONS_DEBUG - ${OPTIONS_DEBUG} + "LIBS=${PKGCONFIG_LIBS_DEBUG} ${SYSTEM_LIBS}" OPTIONS_RELEASE - ${OPTIONS_RELEASE} + "LIBS=${PKGCONFIG_LIBS_RELEASE} ${SYSTEM_LIBS}" ) # automake adds the basedir of the generated config to `DEFAULT_INCLUDES`, @@ -130,9 +185,42 @@ else() # Build in UNIX endforeach() vcpkg_install_make() - vcpkg_fixup_pkgconfig() + + if(VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/plugins/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/mod_spatialite.dll" "${CURRENT_PACKAGES_DIR}/plugins/${PORT}/mod_spatialite.dll") + endif() + if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}") + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/mod_spatialite.dll" "${CURRENT_PACKAGES_DIR}/debug/plugins/${PORT}/mod_spatialite.dll") + endif() + endif() endif() +vcpkg_fixup_pkgconfig() + # Handle copyright -# With rttopo and ground control points enabled, the license is GPLv2+. -file(INSTALL "${SOURCE_PATH}/src/control_points/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +set(outfile "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +if(NOT ENABLE_GCP AND NOT ENABLE_RTTOPO) + file(READ "${SOURCE_PATH}/COPYING" mpl) + file(WRITE "${outfile}" + "SpatiaLite[${FEATURES}] is licensed under the MPL tri-license terms;\n" + "you are free to choose the best-fit license between:\n" + "- the MPL 1.1\n" + "- the GPL v2.0 or any subsequent version\n" + "- the LGPL v2.1 or any subsequent version.\n\n" + "# MPL 1.1 (from COPYING)\n\n" + "${mpl}\n" + ) +else() + file(WRITE "${outfile}" + "SpatiaLite[${FEATURES}] is licensed under:\n" + "the GPL v2.0 or any subsequent version.\n\n" + ) +endif() +file(READ "${SOURCE_PATH}/src/control_points/COPYING" gpl) +file(APPEND "${outfile}" + "# GPL v2.0 (from src/control_points/COPYING)\n\n" + "${gpl}\n" +) diff --git a/ports/libspatialite/vcpkg.json b/ports/libspatialite/vcpkg.json index e8fd1d30cf3d3d..fbea1b6af9d545 100644 --- a/ports/libspatialite/vcpkg.json +++ b/ports/libspatialite/vcpkg.json @@ -1,16 +1,40 @@ { "name": "libspatialite", "version": "5.0.1", + "port-version": 1, "description": "SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.", "homepage": "https://www.gaia-gis.it/gaia-sins/libspatialite-sources", "dependencies": [ - "freexl", "geos", "libiconv", - "librttopo", "libxml2", "proj4", "sqlite3", + "vcpkg-pkgconfig-get-modules", "zlib" - ] + ], + "default-features": [ + "freexl", + "geocallbacks" + ], + "features": { + "freexl": { + "description": "FreeXL spreadsheet file support.", + "dependencies": [ + "freexl" + ] + }, + "gcp": { + "description": "Ground control points support. This feature reduces the license options to GPLv2+." + }, + "geocallbacks": { + "description": "Geometry callbacks support." + }, + "rttopo": { + "description": "RTTOPO support. This feature reduces the license options to GPLv2+.", + "dependencies": [ + "librttopo" + ] + } + } } diff --git a/ports/spatialite-tools/vcpkg.json b/ports/spatialite-tools/vcpkg.json index a1a5bc3bb28984..3637c2807140c7 100644 --- a/ports/spatialite-tools/vcpkg.json +++ b/ports/spatialite-tools/vcpkg.json @@ -1,7 +1,7 @@ { "name": "spatialite-tools", "version-string": "5.0.0", - "port-version": 3, + "port-version": 4, "description": "Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)", "homepage": "https://www.gaia-gis.it/fossil/spatialite-tools/index", "dependencies": [ @@ -9,7 +9,13 @@ "geos", "libiconv", "librttopo", - "libspatialite", + { + "name": "libspatialite", + "features": [ + "gcp", + "rttopo" + ] + }, "proj4", "readosm", "sqlite3", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 4bfdb19a1f6f2c..eedfb117f1fbe1 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1656,7 +1656,6 @@ gmp:x64-windows-static-md=fail ijg-libjpeg:x64-windows-static-md=fail libcerf:x64-windows-static-md=fail libmicrohttpd:x64-windows-static-md=fail -libspatialite:x64-windows-static-md=fail linenoise-ng:x64-windows-static-md=fail mmloader:x64-windows-static-md=fail netcdf-cxx4:x64-windows-static-md=fail diff --git a/versions/baseline.json b/versions/baseline.json index d57d160de49ed8..8801bf05acc68f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3890,7 +3890,7 @@ }, "libspatialite": { "baseline": "5.0.1", - "port-version": 0 + "port-version": 1 }, "libspnav": { "baseline": "0.2.3", @@ -6402,7 +6402,7 @@ }, "spatialite-tools": { "baseline": "5.0.0", - "port-version": 3 + "port-version": 4 }, "spdk": { "baseline": "19.01.1", diff --git a/versions/l-/libspatialite.json b/versions/l-/libspatialite.json index 1e8dd8dd84c1ec..a41a3c5f9e8eb0 100644 --- a/versions/l-/libspatialite.json +++ b/versions/l-/libspatialite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9a0fe08cf3273de9def88a4fd388a1ade854cfac", + "version": "5.0.1", + "port-version": 1 + }, { "git-tree": "22ad27813f5f3bc3382718115ce3eb5a45174afd", "version": "5.0.1", diff --git a/versions/s-/spatialite-tools.json b/versions/s-/spatialite-tools.json index c3e83a118b6cae..5d2f0218897d9c 100644 --- a/versions/s-/spatialite-tools.json +++ b/versions/s-/spatialite-tools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e31f1f43c34f7ab68bfbfcfe1a9edcd8040c3373", + "version-string": "5.0.0", + "port-version": 4 + }, { "git-tree": "f9263bb3c351d6d5333538e6d22e29da6253a702", "version-string": "5.0.0", From 96721e1cb1be9971dc1a7b70ba9754250886db2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 19 Nov 2021 06:40:22 +0100 Subject: [PATCH 1203/1858] [libalkimia] new port (#20207) * Add libalkimia port * [libalkimia] convert manifest to JSON * [libalkimia] use gettext port * [libalkimia] update to HEAD * [libalkimia] remove unused options * [libalkimia] use current spec * [libalkimia] only remove what's needed * [libalkimia] use KDE_INSTALL_QMLDIR instead of manual renaming * [libalkimia] wrap paths in quotes * [libalkimia] update versions * [libalkimia] enable parallel builds * [libalkimia] update versions * [libalkimia] enable extra features * [libalkimia] update versions * [libalkimia] update versions * [libalkimia] static build fixes * [libalkimia] update versions * [libalkimia] only copy tools if feature enabled * [libalkimia] update versions * [libalkimia] mark BUNDLE_INSTALL_DIR as maybe unused * [libalkimia] cleanup leftover static DLLs * [libalkimia] update versions * [libalkimia] limit DLL cleanup to Windows * [libalkimia] update versions * [libalkimia] DLL leftovers patched upstream * [libalkimia] update versions * [libalkimia] AUTO_CLEAN tools after copying * [libalkimia] update versions --- ports/libalkimia/dll_names.diff | 21 ++++++ ports/libalkimia/fix_explicit_shared_lib.diff | 70 +++++++++++++++++++ ports/libalkimia/portfile.cmake | 50 +++++++++++++ ports/libalkimia/vcpkg.json | 47 +++++++++++++ versions/baseline.json | 4 ++ versions/l-/libalkimia.json | 9 +++ 6 files changed, 201 insertions(+) create mode 100644 ports/libalkimia/dll_names.diff create mode 100644 ports/libalkimia/fix_explicit_shared_lib.diff create mode 100644 ports/libalkimia/portfile.cmake create mode 100644 ports/libalkimia/vcpkg.json create mode 100644 versions/l-/libalkimia.json diff --git a/ports/libalkimia/dll_names.diff b/ports/libalkimia/dll_names.diff new file mode 100644 index 00000000000000..3fb5a3a3649dae --- /dev/null +++ b/ports/libalkimia/dll_names.diff @@ -0,0 +1,21 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 643ffcf3d7b4ce59285343f92a1407927c111881..382d3c6ed244e24dec9f144c02e0c3459e8369a9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -156,10 +156,12 @@ install( + + generate_export_header(alkimia BASE_NAME alk EXPORT_FILE_NAME alkimia/alk_export.h) + +-if(WIN32) +- set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") +-else() +- set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION}) ++if(BUILD_SHARED_LIBS) ++ if(WIN32) ++ set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ else() ++ set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION}) ++ endif() + endif() + set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX}) + set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) diff --git a/ports/libalkimia/fix_explicit_shared_lib.diff b/ports/libalkimia/fix_explicit_shared_lib.diff new file mode 100644 index 00000000000000..598ee3d60fb028 --- /dev/null +++ b/ports/libalkimia/fix_explicit_shared_lib.diff @@ -0,0 +1,70 @@ +diff --git a/qml/CMakeLists.txt b/qml/CMakeLists.txt +index f74449b591bafd4ad0c41627139a08e29028ab21..a317307a438542e4cf26d50643057b5e9b649594 100644 +--- a/qml/CMakeLists.txt ++++ b/qml/CMakeLists.txt +@@ -22,7 +22,7 @@ else() + endif() + + configure_file(qmldir ${IMPORTS_DIR}/qmldir) +-add_library(qmlalkimia SHARED qmlalkimiaplugin.cpp) ++add_library(qmlalkimia qmlalkimiaplugin.cpp) + target_link_libraries(qmlalkimia ${LIBS} alkimia) + + install(TARGETS qmlalkimia +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index e57c94adf6c3785e5c646c7c95b586392737d686..b467849c7ff25d2ce424b30591cfe9a1e9357a46 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -103,7 +103,7 @@ endforeach() + add_definitions(-DKNSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + + ki18n_wrap_ui(alkimia_LIB_SRCS ${alkimia_UI} ) +-add_library(alkimia SHARED ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS}) ++add_library(alkimia ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS} ${alkimia_LIB_PRIVATE_HEADERS}) + + kde_target_enable_exceptions(alkimia PUBLIC) + if(BUILD_QT4) +@@ -164,7 +164,13 @@ endif() + set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX}) + set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX}) + +-install(TARGETS alkimia ++if(${BUILD_SHARED_LIBS}) ++ set(alkimia_export_targets alkimia) ++else() ++ set(alkimia_export_targets alkimia alkimia-internal) ++endif() ++ ++install(TARGETS ${alkimia_export_targets} + EXPORT alkimiaTargets + ${INSTALL_TARGETS_DEFAULT_ARGS} + ) +@@ -228,7 +234,7 @@ configure_package_config_file( + + ########### install files ############### + +-export(TARGETS alkimia ++export(TARGETS ${alkimia_export_targets} + FILE "${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Targets.cmake" + NAMESPACE Alkimia:: + ) +diff --git a/src/LibAlkimiaConfig.cmake.in b/src/LibAlkimiaConfig.cmake.in +index a8893c6fe347ce2d2fe1e0a2854a206e0e41901c..8dcfdf8c13f4306a349052d1c4194e65725a50b4 100644 +--- a/src/LibAlkimiaConfig.cmake.in ++++ b/src/LibAlkimiaConfig.cmake.in +@@ -12,6 +12,15 @@ else() + endif() + find_dependency(@MP_CMAKE_MODULE@) + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(KF5Completion) ++ find_dependency(KF5I18n) ++ find_dependency(KF5NewStuff) ++ find_dependency(KF5IconThemes) ++ find_dependency(KF5TextWidgets) ++ find_dependency(KF5KIO) ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/LibAlkimia@ALKIMIA_PATH_SUFFIX@Targets.cmake") + + set_and_check(LIBALKIMIA_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") diff --git a/ports/libalkimia/portfile.cmake b/ports/libalkimia/portfile.cmake new file mode 100644 index 00000000000000..4d12566d2f70a8 --- /dev/null +++ b/ports/libalkimia/portfile.cmake @@ -0,0 +1,50 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/alkimia + REF 595186bee8409f30e5db091fffa245fc53ad92e8 + SHA512 509082e22bc0a2ce0586e1167df14fd42ac85321315c1ee2914f60e695d1e2e8beae4fc93d16d0053edb520fc391a3dbe30777638285b295e761ad70512688ca + HEAD_REF master + PATCHES + fix_explicit_shared_lib.diff + dll_names.diff # https://invent.kde.org/office/alkimia/-/commit/0ff901025a747ab31ab7efba9f8899b06774f60a +) + +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + webengine BUILD_WITH_WEBENGINE + tools BUILD_TOOLS +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DKDE_INSTALL_QMLDIR=qml + -DBUNDLE_INSTALL_DIR=bin + -DBUILD_TESTING=OFF + -DBUILD_DOXYGEN_DOCS=OFF + -DBUILD_WITH_WEBKIT=OFF + -DBUILD_APPLETS=OFF + ${FEATURE_OPTIONS} + MAYBE_UNUSED_VARIABLES + BUNDLE_INSTALL_DIR +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME LibAlkimia5 CONFIG_PATH lib/cmake/LibAlkimia5-8.1) +vcpkg_copy_pdbs() + +if ("tools" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES onlinequoteseditor5 AUTO_CLEAN) +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libalkimia/vcpkg.json b/ports/libalkimia/vcpkg.json new file mode 100644 index 00000000000000..4c1e965d81a168 --- /dev/null +++ b/ports/libalkimia/vcpkg.json @@ -0,0 +1,47 @@ +{ + "name": "libalkimia", + "version": "8.1.70", + "description": "Common functionality for finance applications.", + "homepage": "https://community.kde.org/Alkimia/libalkimia", + "dependencies": [ + "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, + "gmp", + "kf5completion", + "kf5config", + "kf5coreaddons", + "kf5i18n", + "kf5iconthemes", + "kf5kio", + "kf5newstuff", + "kf5textwidgets", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "features": { + "tools": { + "description": "Enables tools, including Online Quotes Editor" + }, + "webengine": { + "description": "Enables JavaScript support for parsing feature-rich websites", + "dependencies": [ + "qt5-webengine" + ] + } + } +} diff --git a/versions/baseline.json b/versions/baseline.json index 8801bf05acc68f..89e9da93c6c146 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3292,6 +3292,10 @@ "baseline": "5.0", "port-version": 7 }, + "libalkimia": { + "baseline": "8.1.70", + "port-version": 0 + }, "libarchive": { "baseline": "3.5.2", "port-version": 2 diff --git a/versions/l-/libalkimia.json b/versions/l-/libalkimia.json new file mode 100644 index 00000000000000..4b64a7e12973ef --- /dev/null +++ b/versions/l-/libalkimia.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "6cf107a0e18ea3b0238500ece6257e212a6ddd2b", + "version": "8.1.70", + "port-version": 0 + } + ] +} From def4be783e7f656532217c6f3702bf20a36c77bf Mon Sep 17 00:00:00 2001 From: Bert Huijben Date: Fri, 19 Nov 2021 06:42:18 +0100 Subject: [PATCH 1204/1858] [proj4] Update to 8.0.0 (#16494) * [proj4,vtk,mapnik] Upgrade to proj 8.0.0. Make vtk compatible via upstream patch and mapnik by buildscript tweak. * [mapnik, proj4, vtk]: add versions --- ports/mapnik/portfile.cmake | 2 + ports/mapnik/proj-find-fix.patch | 13 +++ ports/mapnik/vcpkg.json | 1 + ports/proj4/portfile.cmake | 4 +- ports/proj4/vcpkg.json | 3 +- ports/vtk/UseProj5Api.patch | 149 +++++++++++++++++++++++++++++++ ports/vtk/portfile.cmake | 3 +- ports/vtk/vcpkg.json | 2 +- versions/baseline.json | 8 +- versions/m-/mapnik.json | 5 ++ versions/p-/proj4.json | 5 ++ versions/v-/vtk.json | 5 ++ 12 files changed, 190 insertions(+), 10 deletions(-) create mode 100644 ports/mapnik/proj-find-fix.patch create mode 100644 ports/vtk/UseProj5Api.patch diff --git a/ports/mapnik/portfile.cmake b/ports/mapnik/portfile.cmake index cd219bed56d716..a093014a901588 100644 --- a/ports/mapnik/portfile.cmake +++ b/ports/mapnik/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_github( REF 14f913d6ab3b0903dd36a1cb2d22f7d5493b8bb8 SHA512 f90762594d46946ddc512bb19b21c4d6a2f1ce81b7500a326ad512fae3a3f77e49ef3eb727ff8f98a31596e4132528212e0fa146e2eee0a9965a16551cfd0386 HEAD_REF master + PATCHES + proj-find-fix.patch # Quiet search with version range somehow fails for proj8+ ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/mapnik/proj-find-fix.patch b/ports/mapnik/proj-find-fix.patch new file mode 100644 index 00000000000000..4fb3537610e061 --- /dev/null +++ b/ports/mapnik/proj-find-fix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47bbaa1..43f384d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -304,7 +304,7 @@ if(USE_WEBP) + + if(USE_PROJ) + #https://proj.org/development/cmake.html +- mapnik_find_package(PROJ ${PROJ_MIN_VERSION} QUIET) ++ mapnik_find_package(PROJ REQUIRED) + # currently the cmake files are not installed, when installing proj via apt-get. So search via pkg-config + if(NOT PROJ_FOUND) + message(STATUS "PROJ not found via FindPROJ. Searching via pkg-config...") diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index 582ba8497383f5..64f53ec587f94c 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mapnik", "version-date": "2021-11-15", + "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 7933cf711939af..2a0a83e24bca53 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -1,9 +1,9 @@ -set(VERSION 7.2.1) # Variable used for pc file +set(VERSION 8.0.0) # Variable used for pc file vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO OSGeo/PROJ REF "${VERSION}" - SHA512 e6e77266dcd70c939c16667c916cccab8de161221d2ef600cfca43382f50da2dc8d790561556b4416adbb4ac6fba939004e0cc936c278e0e808dc3566e9a70d4 + SHA512 353f0e14ba6c11bfcec8a30b3f322842e8a3103546e0fd40871e341c859ca7ae2b9411425be5b588eb45cc5716255d2ea81d6357407bcfb9506a0edb161376f5 HEAD_REF master PATCHES fix-filemanager-uwp.patch diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index 9aed018aa871bd..b1c9f2034c0407 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "proj4", - "version-semver": "7.2.1", - "port-version": 7, + "version-semver": "8.0.0", "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ diff --git a/ports/vtk/UseProj5Api.patch b/ports/vtk/UseProj5Api.patch new file mode 100644 index 00000000000000..7ee7adae3a9673 --- /dev/null +++ b/ports/vtk/UseProj5Api.patch @@ -0,0 +1,149 @@ +From 0325638832e35c8c8c6fc96e2c1d887aeea3dd43 Mon Sep 17 00:00:00 2001 +From: Julien Schueller +Date: Mon, 8 Mar 2021 10:57:46 +0100 +Subject: [PATCH] Geovis: Use proj>=5 api + +Closes #18130 +--- + Geovis/Core/vtkGeoProjection.cxx | 17 ++++++++++++++++- + Geovis/Core/vtkGeoTransform.cxx | 28 ++++++++++++++-------------- + ThirdParty/libproj/vtk_libproj.h.in | 7 +------ + 3 files changed, 31 insertions(+), 21 deletions(-) + +diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx +index 7ff6526a5d..0a0d06eba1 100644 +--- a/Geovis/Core/vtkGeoProjection.cxx ++++ b/Geovis/Core/vtkGeoProjection.cxx +@@ -121,7 +121,11 @@ vtkGeoProjection::~vtkGeoProjection() + this->SetPROJ4String(nullptr); + if (this->Projection) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ proj_destroy(this->Projection); ++#else + pj_free(this->Projection); ++#endif + } + delete this->Internals; + this->Internals = nullptr; +@@ -185,13 +189,21 @@ int vtkGeoProjection::UpdateProjection() + + if (this->Projection) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ proj_destroy(this->Projection); ++#else + pj_free(this->Projection); ++#endif + this->Projection = nullptr; + } + + if (this->PROJ4String && strlen(this->PROJ4String)) + { ++#if PROJ_VERSION_MAJOR >= 5 ++ this->Projection = proj_create(PJ_DEFAULT_CTX, this->PROJ4String); ++#else + this->Projection = pj_init_plus(this->PROJ4String); ++#endif + if (!this->Projection) + { + vtkErrorMacro("Cannot set projection with string " << this->PROJ4String); +@@ -234,8 +246,11 @@ int vtkGeoProjection::UpdateProjection() + stringHolder[i] = param.str(); + pjArgs[3 + i] = stringHolder[i].c_str(); + } +- ++#if PROJ_VERSION_MAJOR >= 5 ++ this->Projection = proj_create_argv(PJ_DEFAULT_CTX, argSize, const_cast(pjArgs)); ++#else + this->Projection = pj_init(argSize, const_cast(pjArgs)); ++#endif + delete[] pjArgs; + } + this->ProjectionMTime = this->GetMTime(); +diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx +index 5c2c74279d..1c99b6b11b 100644 +--- a/Geovis/Core/vtkGeoTransform.cxx ++++ b/Geovis/Core/vtkGeoTransform.cxx +@@ -163,8 +163,12 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s + projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : nullptr; + projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : nullptr; + int delta = stride - 2; ++#if PROJ_VERSION_MAJOR >= 5 ++ PJ_COORD c, c_out; ++#else + projLP lp; + projXY xy; ++#endif + if (src) + { + // Convert from src system to lat/long using inverse of src transform +@@ -172,17 +176,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s + for (vtkIdType i = 0; i < numPts; ++i) + { + #if PROJ_VERSION_MAJOR >= 5 +- xy.x = coord[0]; +- xy.y = coord[1]; ++ c.xy.x = coord[0]; ++ c.xy.y = coord[1]; ++ c_out = proj_trans(src, PJ_INV, c); ++ coord[0] = c_out.lp.lam; ++ coord[1] = c_out.lp.phi; + #else + xy.u = coord[0]; + xy.v = coord[1]; +-#endif + lp = pj_inv(xy, src); +-#if PROJ_VERSION_MAJOR >= 5 +- coord[0] = lp.lam; +- coord[1] = lp.phi; +-#else + coord[0] = lp.u; + coord[1] = lp.v; + #endif +@@ -208,17 +210,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s + for (vtkIdType i = 0; i < numPts; ++i) + { + #if PROJ_VERSION_MAJOR >= 5 +- lp.lam = coord[0]; +- lp.phi = coord[1]; ++ c.lp.lam = coord[0]; ++ c.lp.phi = coord[1]; ++ c_out = proj_trans(src, PJ_FWD, c); ++ coord[0] = c_out.xy.x; ++ coord[1] = c_out.xy.y; + #else + lp.u = coord[0]; + lp.v = coord[1]; +-#endif + xy = pj_fwd(lp, dst); +-#if PROJ_VERSION_MAJOR >= 5 +- coord[0] = xy.x; +- coord[1] = xy.y; +-#else + coord[0] = xy.u; + coord[1] = xy.v; + #endif +diff --git a/ThirdParty/libproj/vtk_libproj.h.in b/ThirdParty/libproj/vtk_libproj.h.in +index 4d8ffc3c5d..c4182c4db2 100644 +--- a/ThirdParty/libproj/vtk_libproj.h.in ++++ b/ThirdParty/libproj/vtk_libproj.h.in +@@ -28,14 +28,9 @@ + #if VTK_MODULE_USE_EXTERNAL_vtklibproj + # if VTK_LibPROJ_MAJOR_VERSION >= 5 + # include +-# endif +-# if VTK_LibPROJ_MAJOR_VERSION < 6 ++# else + # include + # endif +-# if VTK_LibPROJ_MAJOR_VERSION >= 6 +-# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 +-# endif +-# include + # include + #else + # include +-- +2.32.0.windows.1 + diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 63bd5eec20fbd9..cff5332c1fe36c 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -29,6 +29,7 @@ vcpkg_from_github( d107698a.patch fix-gdal.patch missing-limits.patch # This patch can be removed in next version. Since it has been merged to upstream via https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 + UseProj5Api.patch # Allow Proj 8.0+ (commit b66e4a7, backported). Should be in soon after 9.0.3 ) # ============================================================================= @@ -299,4 +300,4 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/share/licenses" "${CURRENT_PACKAGES_DIR}/sh # Usage configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY) # Handle copyright -file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/Copyright.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index f443603a6618bd..2ce6162f33feba 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "vtk", "version-semver": "9.0.3-pv5.9.1", - "port-version": 4, + "port-version": 5, "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 89e9da93c6c146..dbcde5a8020b8e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4254,7 +4254,7 @@ }, "mapnik": { "baseline": "2021-11-15", - "port-version": 0 + "port-version": 1 }, "marble": { "baseline": "19.08.2", @@ -5373,8 +5373,8 @@ "port-version": 1 }, "proj4": { - "baseline": "7.2.1", - "port-version": 7 + "baseline": "8.0.0", + "port-version": 0 }, "prometheus-cpp": { "baseline": "1.0.0", @@ -7086,7 +7086,7 @@ }, "vtk": { "baseline": "9.0.3-pv5.9.1", - "port-version": 4 + "port-version": 5 }, "vtk-dicom": { "baseline": "0.8.12", diff --git a/versions/m-/mapnik.json b/versions/m-/mapnik.json index 6031bfaea3a05d..faee7dbb0d57a2 100644 --- a/versions/m-/mapnik.json +++ b/versions/m-/mapnik.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f8eb08ffc7a02dd08de30c0851587d9537fc72e", + "version-date": "2021-11-15", + "port-version": 1 + }, { "git-tree": "d1ae6b45aea26d1bbed2716beaaaeaf3719fbefa", "version-date": "2021-11-15", diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json index da6bb80887ba84..c9c039a63a6ff8 100644 --- a/versions/p-/proj4.json +++ b/versions/p-/proj4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1939ed4483f6f1d75f6ddacb6a741090144bcfb", + "version-semver": "8.0.0", + "port-version": 0 + }, { "git-tree": "991dc069b2b9acb50da346e27f48100d5d8f8186", "version-semver": "7.2.1", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 975f7bb0e105c6..36d887d4c23cee 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd6ac57e684fd8a2234509813248f64a6cb522d5", + "version-semver": "9.0.3-pv5.9.1", + "port-version": 5 + }, { "git-tree": "223022edbe63b3ecdb3e9204a4ad63ab61b36ece", "version-semver": "9.0.3-pv5.9.1", From 39931eafad505cfefb12acf3968ac72aebb6dc46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Tassoux?= Date: Fri, 19 Nov 2021 14:49:33 +0100 Subject: [PATCH 1205/1858] [vcpkg.targets] Add vcpkg installed libraries to MSBuild external include path (#18820) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Rémy Tassoux --- scripts/buildsystems/msbuild/vcpkg.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 7a5bb3c9824934..03f71e6ae8a429 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -44,6 +44,8 @@ VcpkgTriplet=$(VcpkgTriplet):$(ProjectStateLine) + + %(ExternalIncludePath);$(_ZVcpkgCurrentInstalledDir)include VcpkgTriplet=$(VcpkgTriplet):$(ProjectStateLine) - - %(ExternalIncludePath);$(_ZVcpkgCurrentInstalledDir)include